Target mapping and ctest fixes A few fixes to enable running bazel_to_cmake across the project again. 1. Add mapping for AllPassesAndDialects[NoRegistration] 2. Set the IREE_VULKAN_DISABLE env variable when running ctest through the CI script 3. Disable iree_vm_bytecode_module_benchmark through the ctest script. It takes longer than all the other tests combined. Closes https://github.com/google/iree/pull/775 COPYBARA_INTEGRATE_REVIEW=https://github.com/google/iree/pull/775 from GMNGeoffrey:bazel-to-cmake-fixup e9181b0c4d7be2279371cc1643a1f47196bc4b94 PiperOrigin-RevId: 295769953
diff --git a/build_tools/bazel_to_cmake/bazel_to_cmake_targets.py b/build_tools/bazel_to_cmake/bazel_to_cmake_targets.py index 87778d7..1cdedfb 100644 --- a/build_tools/bazel_to_cmake/bazel_to_cmake_targets.py +++ b/build_tools/bazel_to_cmake/bazel_to_cmake_targets.py
@@ -62,6 +62,10 @@ } MLIR_EXPLICIT_TARGET_MAPPING = { + "@llvm-project//mlir:AllPassesAndDialects": ["MLIRAllDialects"], + "@llvm-project//mlir:AllPassesAndDialectsNoRegistration": [ + "MLIRAllDialects" + ], "@llvm-project//mlir:AffineDialectRegistration": ["MLIRAffineOps"], "@llvm-project//mlir:AffineToStandardTransforms": ["MLIRAffineToStandard"], "@llvm-project//mlir:CFGTransforms": ["MLIRLoopToStandard"],
diff --git a/build_tools/cmake/test.sh b/build_tools/cmake/test.sh index fecc793..b64f7c9 100755 --- a/build_tools/cmake/test.sh +++ b/build_tools/cmake/test.sh
@@ -24,6 +24,8 @@ # Respect the user setting, but default to as many jobs as we have cores. export CTEST_PARALLEL_LEVEL=${CTEST_PARALLEL_LEVEL:-$(nproc)} +export IREE_VULKAN_DISABLE=${IREE_VULKAN_DISABLE:-1} + EXCLUDED_TESTS=( iree_compiler_Translation_SPIRV_LinalgToSPIRV_test_pw_add.mlir.test iree_hal_vulkan_dynamic_symbols_test @@ -31,6 +33,7 @@ iree_tools_test_multiple_args.mlir.test iree_tools_test_scalars.mlir.test iree_tools_test_simple.mlir.test + iree_vm_bytecode_module_benchmark # Make this test not take an eternity ) # Join with | and add anchors