From 07102909c27195cb08cfccdaae2b934e46630fe5 Mon Sep 17 00:00:00 2001 From: Mehdi Amini Date: Mon, 24 Jul 2023 17:18:55 -0700 Subject: [PATCH] Revert "[mlir][gpu][transforms] Only depend on ExecutionEngine if MLIR_ENABLE_CUDA_RUNNER is true" This reverts commit 68b7d3fffd7e8ebc40fdcb0acdcf2e88a93ea5c3. The mlir-nvidia bot is broken. --- mlir/test/lib/Dialect/GPU/CMakeLists.txt | 27 ++++++++++-------------- 1 file changed, 11 insertions(+), 16 deletions(-) diff --git a/mlir/test/lib/Dialect/GPU/CMakeLists.txt b/mlir/test/lib/Dialect/GPU/CMakeLists.txt index ad537be56d77c..c972a8a820468 100644 --- a/mlir/test/lib/Dialect/GPU/CMakeLists.txt +++ b/mlir/test/lib/Dialect/GPU/CMakeLists.txt @@ -8,6 +8,7 @@ set(LIBS MLIRAnalysis MLIRArithDialect MLIRBuiltinToLLVMIRTranslation + MLIRExecutionEngine MLIRFuncDialect MLIRGPUDialect MLIRGPUToGPURuntimeTransforms @@ -34,22 +35,6 @@ set(LIBS MLIRVectorToLLVM ) -# This is how it is defined in mlir/lib/Dialect/GPU/CMakeLists.txt -# We probably want something better project-wide -if(MLIR_ENABLE_CUDA_RUNNER) - # Enable gpu-to-cubin pass. - target_compile_definitions(MLIRGPUTestPasses - PRIVATE - MLIR_GPU_TO_CUBIN_PASS_ENABLE=1 - ) - - set(LIBS - ${LIBS} - - MLIRExecutionEngine - ) -endif() - add_mlir_library(MLIRGPUTestPasses TestConvertGPUKernelToCubin.cpp TestConvertGPUKernelToHsaco.cpp @@ -62,3 +47,13 @@ add_mlir_library(MLIRGPUTestPasses LINK_LIBS PUBLIC ${LIBS} ) + +# This is how it is defined in mlir/lib/Dialect/GPU/CMakeLists.txt +# We probably want something better project-wide +if(MLIR_ENABLE_CUDA_RUNNER) + # Enable gpu-to-cubin pass. + target_compile_definitions(MLIRGPUTestPasses + PRIVATE + MLIR_GPU_TO_CUBIN_PASS_ENABLE=1 + ) +endif()