[CPU] Enable clang-tidy-18 checks on Ubuntu 24.04

openvinotoolkit · Jan 29, 2025 · 49efb10 · 49efb10
1 parent 90ae7ac
commit 49efb10
Show file tree

Hide file tree

Showing 6 changed files with 30 additions and 12 deletions.
diff --git a/.github/dockerfiles/docker_tag b/.github/dockerfiles/docker_tag
@@ -1 +1 @@
-pr-28040
+pr-28725
diff --git a/.github/dockerfiles/ov_build/ubuntu_24_04_x64/Dockerfile b/.github/dockerfiles/ov_build/ubuntu_24_04_x64/Dockerfile
@@ -31,6 +31,12 @@ RUN apt-get update && \
         python3-full \
         # For Java API
         default-jdk \
+        # Compiler \
+        clang-18 \
+        # Static analyzer
+        clang-tidy-18 \
+        # clang-tidy uses clang-format as a dependency
+        clang-format-18 \
         && \
     rm -rf /var/lib/apt/lists/*
 
@@ -40,6 +46,12 @@ RUN chmod +x /install_build_dependencies.sh && \
     /install_build_dependencies.sh && \
     rm -rf /var/lib/apt/lists/*
 
+RUN update-alternatives --install /usr/bin/clang-format clang-format $(which clang-format-18) 100 && \
+    update-alternatives --set clang-format $(which clang-format-18)
+
+RUN update-alternatives --install /usr/bin/clang-tidy clang-tidy $(which clang-tidy-18) 100 && \
+    update-alternatives --set clang-tidy $(which clang-tidy-18)
+
 # Install sccache
 ARG SCCACHE_VERSION="v0.7.5"
 ENV SCCACHE_HOME="/opt/sccache" \

diff --git a/.github/workflows/ubuntu_24.yml b/.github/workflows/ubuntu_24.yml
@@ -88,9 +88,12 @@ jobs:
       build-js: true
       build-debian-packages: true
       build-contrib: true
+      # clang-tidy static analysis check is enabled as part of collection
+      # to avoid an additional separate build execution
       cmake-options: |- 
             -G "Ninja Multi-Config" \
             -DENABLE_CPPLINT=OFF \
+            -DENABLE_CLANG_TIDY=ON \
             -DENABLE_NCC_STYLE=OFF \
             -DENABLE_TESTS=ON \
             -DENABLE_STRICT_DEPENDENCIES=OFF \

diff --git a/cmake/developer_package/clang_tidy/clang_tidy.cmake b/cmake/developer_package/clang_tidy/clang_tidy.cmake
@@ -3,23 +3,23 @@
 #
 
 if(ENABLE_CLANG_TIDY)
-    set(CLANG_TIDY_REQUIRED_VERSION 15 CACHE STRING "clang-tidy version to use")
-    set(CLANG_TIDY_FILENAME clang-tidy-${CLANG_TIDY_REQUIRED_VERSION} clang-tidy)
+    set(CLANG_TIDY_REQUIRED_VERSION 15 CACHE STRING "Minimum clang-tidy version to use")
+    set(CLANG_TIDY_FILENAME clang-tidy)
     find_host_program(CLANG_TIDY NAMES ${CLANG_TIDY_FILENAME} PATHS ENV PATH)
     if(CLANG_TIDY)
-        execute_process(COMMAND ${CLANG_TIDY} ${CMAKE_CURRENT_SOURCE_DIR} ARGS --version OUTPUT_VARIABLE CLANG_VERSION)
+        execute_process(COMMAND ${CLANG_TIDY} --version OUTPUT_VARIABLE CLANG_VERSION)
         if(NOT CLANG_VERSION)
-            message(WARNING "Supported clang-tidy version is ${CLANG_TIDY_REQUIRED_VERSION}!")
+            message(WARNING "Minimum supported clang-tidy version is ${CLANG_TIDY_REQUIRED_VERSION}!")
             set(ENABLE_CLANG_TIDY OFF)
         else()
-            string(REGEX REPLACE "[^0-9]+([0-9]+)\\..*" "\\1" CLANG_TIDY_MAJOR_VERSION ${CLANG_VERSION})
-            if(NOT CLANG_TIDY_MAJOR_VERSION EQUAL CLANG_TIDY_REQUIRED_VERSION)
-                message(WARNING "Supported clang-tidy version is ${CLANG_TIDY_REQUIRED_VERSION}! Provided version ${CLANG_TIDY_MAJOR_VERSION}")
+            string(REGEX REPLACE ".*version ([0-9]+)\\..*" "\\1" CLANG_TIDY_MAJOR_VERSION ${CLANG_VERSION})
+            if(CLANG_TIDY_MAJOR_VERSION LESS CLANG_TIDY_REQUIRED_VERSION)
+                message(WARNING "Minimum supported clang-tidy version is ${CLANG_TIDY_REQUIRED_VERSION}! Provided version ${CLANG_TIDY_MAJOR_VERSION}")
                 set(ENABLE_CLANG_TIDY OFF)
             endif()
         endif()
     else()
-        message(WARNING "Supported clang-tidy-${CLANG_TIDY_REQUIRED_VERSION} is not found!")
+        message(WARNING "clang-tidy is not found!")
         set(ENABLE_CLANG_TIDY OFF)
     endif()
 endif()
diff --git a/cmake/developer_package/compile_flags/sdl.cmake b/cmake/developer_package/compile_flags/sdl.cmake
@@ -18,13 +18,16 @@ if(CMAKE_COMPILER_IS_GNUCXX OR OV_COMPILER_IS_CLANG OR (UNIX AND OV_COMPILER_IS_
     set(CMAKE_EXE_LINKER_FLAGS_RELEASE "${CMAKE_EXE_LINKER_FLAGS_RELEASE} -pie")
 
     if(CMAKE_COMPILER_IS_GNUCXX)
-        set(OV_C_CXX_FLAGS "${OV_C_CXX_FLAGS} -fno-strict-overflow -fno-delete-null-pointer-checks -fwrapv")
+        if(NOT CMAKE_CXX_CLANG_TIDY)
+            set(OV_C_CXX_FLAGS "${OV_C_CXX_FLAGS} -fno-strict-overflow")
+        endif()
+        set(OV_C_CXX_FLAGS "${OV_C_CXX_FLAGS} -fno-delete-null-pointer-checks -fwrapv")
         if(CMAKE_CXX_COMPILER_VERSION VERSION_LESS 4.9)
             set(OV_C_CXX_FLAGS "${OV_C_CXX_FLAGS} -fstack-protector-all")
         else()
             set(OV_C_CXX_FLAGS "${OV_C_CXX_FLAGS} -fstack-protector-strong")
         endif()
-        if (NOT ENABLE_SANITIZER)
+        if (NOT ENABLE_SANITIZER AND NOT CMAKE_CXX_CLANG_TIDY)
             # Remove all symbol table and relocation information from the executable
             set(OV_C_CXX_FLAGS "${OV_C_CXX_FLAGS} -s")
         endif()

diff --git a/cmake/developer_package/plugins/plugins.cmake b/cmake/developer_package/plugins/plugins.cmake
@@ -108,7 +108,7 @@ function(ov_add_plugin)
 
         if (OV_PLUGIN_ADD_CLANG_TIDY)
             if (ENABLE_CLANG_TIDY)
-                set_target_properties(${OV_PLUGIN_NAME} PROPERTIES CXX_CLANG_TIDY clang-tidy-${CLANG_TIDY_REQUIRED_VERSION})
+                set_target_properties(${OV_PLUGIN_NAME} PROPERTIES CXX_CLANG_TIDY clang-tidy)
             endif()
         endif()