Move some cppcheck rules to cppcheck addon instead (#2519)

ROCm · Dec 19, 2023 · a26a796 · a26a796
1 parent 1f2792a
commit a26a796
Show file tree

Hide file tree

Showing 27 changed files with 670 additions and 526 deletions.
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -179,8 +179,8 @@ jobs:
       uses: actions/cache/restore@v3
       with:
         path: cppcheck-cache
-        key: cppcheck-cache-${{ hashFiles('cppcheck.rules', 'CMakeLists.txt') }}-${{ github.ref }}
-        restore-keys: cppcheck-cache-${{ hashFiles('cppcheck.rules', 'CMakeLists.txt') }}-
+        key: cppcheck-cache-1-${{ hashFiles('tools/cppcheck/rules.xml', 'tools/cppcheck/migraphx.py', 'CMakeLists.txt') }}-${{ github.ref }}
+        restore-keys: cppcheck-cache-1-${{ hashFiles('tools/cppcheck/rules.xml', 'tools/cppcheck/migraphx.py', 'CMakeLists.txt') }}-
 
     - name: Cppcheck
       shell: bash -c "docker run -i -v=$GITHUB_WORKSPACE:/data -w /data $DOCKER_IMAGE_UBUNTU:$DOCKER_TAG_UBUNTU bash < {0}"

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -261,10 +261,14 @@ rocm_enable_cppcheck(
         ctuOneDefinitionRuleViolation:*test/*
         useSmartPointer:*src/api/api.cpp
         useSmartPointer:*make_shared_array.hpp
+        migraphx-RedundantLocalVariable:*src/api/api.cpp
+        migraphx-UseSmartPointer:*src/api/api.cpp
     FORCE
     INCONCLUSIVE
     RULE_FILE
-        ${CMAKE_CURRENT_SOURCE_DIR}/cppcheck.rules
+        ${CMAKE_CURRENT_SOURCE_DIR}/tools/cppcheck/rules.xml
+    ADDONS
+        ${CMAKE_CURRENT_SOURCE_DIR}/tools/cppcheck/migraphx.py
     SOURCES
         examples/
         src/
@@ -278,12 +282,18 @@ rocm_enable_cppcheck(
         ${CMAKE_CURRENT_SOURCE_DIR}/test/include
     DEFINE
         MIGRAPHX_MLIR=1
+        MIGRAPHX_HAS_EXECUTORS=0
         CPPCHECK=1
+        BUILD_DEV=
         __device__=
         __host__=
         __global__=
     UNDEFINE
         MIGRAPHX_USE_CLANG_TIDY
+        DOXYGEN
+        HAS_HALF_V1
+        TYPE_ERASED_DECLARATION
+        NDEBUG
 )
 
 include(ROCMCreatePackage)