[Cleanup] Resolve comments

This commit changes target 'tpp-check-all' or 'check-all' to 'check-tpp'. Also adds link libraries to TPPPipeline target. Signed-off-by: Dmitrii Makarenko <[email protected]>
intel-staging · Apr 23, 2024 · 375afc8 · 375afc8
1 parent bd1ef82
commit 375afc8
Show file tree

Hide file tree

Showing 8 changed files with 8 additions and 31 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -150,6 +150,3 @@ add_custom_target(reformat DEPENDS reformat-clang reformat-python)
 add_custom_target(check-python ${CI_DIR}/lint-python.sh)
 add_custom_target(check-clang  ${CI_DIR}/lint-clang.sh)
 add_custom_target(check-format DEPENDS check-clang check-python)
-
-# Check-all is just check, for now
-add_custom_target(tpp-check-all DEPENDS tpp-check)
diff --git a/README.md b/README.md
@@ -87,7 +87,7 @@ cmake -G Ninja .. \
    -DLLVM_EXTERNAL_LIT=$CUSTOM_LLVM_ROOT/bin/llvm-lit \
    -DCMAKE_C_COMPILER=clang \
    -DCMAKE_CXX_COMPILER=clang++ 
-cmake --build . --target tpp-check-all
+cmake --build . --target check-tpp
 
 popd
 ```

diff --git a/lib/TPP/CMakeLists.txt b/lib/TPP/CMakeLists.txt
@@ -19,21 +19,7 @@ add_mlir_library(TPPPipeline
 
   LINK_LIBS PUBLIC
     MLIRIR
-    MLIRMeshDialect
-    MLIRSupport
-    MLIRToLLVMIRTranslationRegistration
-    MLIRMPIDialect
-    MLIRMLProgramDialect
-    MLIRMLProgramTransforms
-    MLIRArithValueBoundsOpInterfaceImpl
-    MLIRAsyncTransforms
-    MLIRControlFlowTransforms
-    MLIRShapeOpsTransforms
-    MLIRSparseTensorTransforms
-    MLIRTensorDialect
-    MLIRTensorInferTypeOpInterfaceImpl
-    MLIRTosaDialect
-    MLIRTosaShardingInterfaceImpl
+    ${mlir_dialect_libs}
     ${conversion_libs}
     TPPGPU
   )
diff --git a/lib/TPP/Transforms/CMakeLists.txt b/lib/TPP/Transforms/CMakeLists.txt
@@ -38,19 +38,13 @@ add_mlir_library(TPPTransforms
     MLIRSupport
     MLIRBufferizationToMemRef
     MLIRBufferizationPipelines
-    # TPPTppDialect
     TPPTransformsUtils
     TPPIR
     TPPXsmmDialect
     TPPCheckToLoops
     TPPLinalgToFunc
-    # TPPLinalgToTpp
-    # TPPLinalgToXSMM
-    # TPPMemRefToXSMM
     TPPPerfToFunc
     TPPPerfToLoop
-    # TPPTppToLoops
-    # TPPTppToXSMM
     TPPXsmmToFunc
     TPPLinalgXTransformOps
   )
diff --git a/lib/TPP/Transforms/ConstantFoldPack.cpp b/lib/TPP/Transforms/ConstantFoldPack.cpp
@@ -171,7 +171,7 @@ struct ConstantFoldPack
           }
         });
 
-    bool detectSpalt = false;
+    [[maybe_unused]] bool detectSpalt = false;
     assert(DenseElementsAttr::isValidRawBuffer(packOp.getDestType(),
                                                destRawData, detectSpalt));
     auto newDense =

diff --git a/scripts/buildkite/build_llvm.sh b/scripts/buildkite/build_llvm.sh
@@ -141,7 +141,7 @@ fi
 
 # Check LLVM
 echo "--- CHECK"
-echo_run ninja -C ${LLVM_BUILD_DIR} tpp-check-all
+echo_run ninja -C ${LLVM_BUILD_DIR} check-tpp
 if [ $? != 0 ]; then
   exit 1
 fi

diff --git a/scripts/ci/build.sh b/scripts/ci/build.sh
@@ -9,7 +9,7 @@ source ${SCRIPT_DIR}/ci/common.sh
 die_syntax() {
   echo "Syntax: $0 -b BLD_DIR [-c] [-i] [-p] [-B]"
   echo ""
-  echo "  -c: Optional, runs tpp-check-all"
+  echo "  -c: Optional, runs check-tpp"
   echo "  -i: Optional, installs"
   echo "  -p: Optional, post-install (copy all build stuff to install dir)"
   echo "  -B: Optional, runs benchmarks"
@@ -28,7 +28,7 @@ while getopts "b:cipB" arg; do
       fi
       ;;
     c)
-      TARGETS="${TARGETS} tpp-check-all"
+      TARGETS="${TARGETS} check-tpp"
       ;;
     i)
       TARGETS="${TARGETS} install"

diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
@@ -14,10 +14,10 @@ set(TPP_OPT_TEST_DEPENDS
         tpp-run
         )
 
-add_lit_testsuite(tpp-check "Running the regression tests"
+add_lit_testsuite(check-tpp "Running the regression tests"
         ${CMAKE_CURRENT_BINARY_DIR}
         DEPENDS ${TPP_OPT_TEST_DEPENDS}
         )
-set_target_properties(tpp-check PROPERTIES FOLDER "Tests")
+set_target_properties(check-tpp PROPERTIES FOLDER "Tests")
 
 add_lit_testsuites(TPP_OPT ${CMAKE_CURRENT_SOURCE_DIR} DEPENDS ${TPP_OPT_TEST_DEPENDS})