Author: Christian Sigg Date: 2021-01-21T22:38:59+01:00 New Revision: bd3a387ee76f58caa0d7901f3f84e9bb3d006f27
URL: https://github.com/llvm/llvm-project/commit/bd3a387ee76f58caa0d7901f3f84e9bb3d006f27 DIFF: https://github.com/llvm/llvm-project/commit/bd3a387ee76f58caa0d7901f3f84e9bb3d006f27.diff LOG: Revert [mlir] Link mlir_runner_utils statically into cuda/rocm-runtime-wrappers (cf50f4f76456) There are cmake failures that I do not know how to fix. Differential Revision: https://reviews.llvm.org/D95162 Added: Modified: mlir/lib/ExecutionEngine/CMakeLists.txt mlir/test/mlir-cuda-runner/all-reduce-and.mlir mlir/test/mlir-cuda-runner/all-reduce-max.mlir mlir/test/mlir-cuda-runner/all-reduce-min.mlir mlir/test/mlir-cuda-runner/all-reduce-op.mlir mlir/test/mlir-cuda-runner/all-reduce-or.mlir mlir/test/mlir-cuda-runner/all-reduce-region.mlir mlir/test/mlir-cuda-runner/all-reduce-xor.mlir mlir/test/mlir-cuda-runner/gpu-to-cubin.mlir mlir/test/mlir-cuda-runner/multiple-all-reduce.mlir mlir/test/mlir-cuda-runner/shuffle.mlir mlir/test/mlir-cuda-runner/two-modules.mlir mlir/test/mlir-rocm-runner/gpu-to-hsaco.mlir mlir/test/mlir-rocm-runner/two-modules.mlir mlir/test/mlir-rocm-runner/vecadd.mlir mlir/test/mlir-rocm-runner/vector-transferops.mlir mlir/tools/mlir-cuda-runner/CMakeLists.txt mlir/tools/mlir-rocm-runner/CMakeLists.txt Removed: ################################################################################ diff --git a/mlir/lib/ExecutionEngine/CMakeLists.txt b/mlir/lib/ExecutionEngine/CMakeLists.txt index f995ad0266d7..b8e486ca47db 100644 --- a/mlir/lib/ExecutionEngine/CMakeLists.txt +++ b/mlir/lib/ExecutionEngine/CMakeLists.txt @@ -80,7 +80,6 @@ add_mlir_library(mlir_c_runner_utils EXCLUDE_FROM_LIBMLIR ) set_property(TARGET mlir_c_runner_utils PROPERTY CXX_STANDARD 11) -target_compile_definitions(mlir_c_runner_utils PRIVATE mlir_c_runner_utils_EXPORTS) add_mlir_library(mlir_c_runner_utils_static CRunnerUtils.cpp @@ -89,6 +88,7 @@ add_mlir_library(mlir_c_runner_utils_static EXCLUDE_FROM_LIBMLIR ) set_property(TARGET mlir_c_runner_utils_static PROPERTY CXX_STANDARD 11) +target_compile_definitions(mlir_c_runner_utils PRIVATE mlir_c_runner_utils_EXPORTS) add_mlir_library(mlir_runner_utils SHARED @@ -101,15 +101,6 @@ add_mlir_library(mlir_runner_utils ) target_compile_definitions(mlir_runner_utils PRIVATE mlir_runner_utils_EXPORTS) -add_mlir_library(mlir_runner_utils_static - RunnerUtils.cpp - - EXCLUDE_FROM_LIBMLIR - - LINK_LIBS PUBLIC - mlir_c_runner_utils_static -) - add_mlir_library(mlir_async_runtime SHARED AsyncRuntime.cpp @@ -123,12 +114,3 @@ add_mlir_library(mlir_async_runtime set_property(TARGET mlir_async_runtime PROPERTY CXX_VISIBILITY_PRESET hidden) target_compile_definitions(mlir_async_runtime PRIVATE mlir_async_runtime_EXPORTS) -add_mlir_library(mlir_async_runtime_static - AsyncRuntime.cpp - - EXCLUDE_FROM_LIBMLIR - - LINK_LIBS PUBLIC - mlir_c_runner_utils_static - ${LLVM_PTHREAD_LIB} -) diff --git a/mlir/test/mlir-cuda-runner/all-reduce-and.mlir b/mlir/test/mlir-cuda-runner/all-reduce-and.mlir index 8df20401cfba..617097e2977a 100644 --- a/mlir/test/mlir-cuda-runner/all-reduce-and.mlir +++ b/mlir/test/mlir-cuda-runner/all-reduce-and.mlir @@ -1,5 +1,5 @@ // RUN: mlir-cuda-runner %s \ -// RUN: --shared-libs=%cuda_wrapper_library_dir/libcuda-runtime-wrappers%shlibext \ +// RUN: --shared-libs=%cuda_wrapper_library_dir/libcuda-runtime-wrappers%shlibext,%linalg_test_lib_dir/libmlir_runner_utils%shlibext \ // RUN: --entry-point-result=void \ // RUN: | FileCheck %s diff --git a/mlir/test/mlir-cuda-runner/all-reduce-max.mlir b/mlir/test/mlir-cuda-runner/all-reduce-max.mlir index 66a35e25988f..4d082498ee1f 100644 --- a/mlir/test/mlir-cuda-runner/all-reduce-max.mlir +++ b/mlir/test/mlir-cuda-runner/all-reduce-max.mlir @@ -1,5 +1,5 @@ // RUN: mlir-cuda-runner %s \ -// RUN: --shared-libs=%cuda_wrapper_library_dir/libcuda-runtime-wrappers%shlibext \ +// RUN: --shared-libs=%cuda_wrapper_library_dir/libcuda-runtime-wrappers%shlibext,%linalg_test_lib_dir/libmlir_runner_utils%shlibext \ // RUN: --entry-point-result=void \ // RUN: | FileCheck %s diff --git a/mlir/test/mlir-cuda-runner/all-reduce-min.mlir b/mlir/test/mlir-cuda-runner/all-reduce-min.mlir index 7f7bf6921c85..43a782e64287 100644 --- a/mlir/test/mlir-cuda-runner/all-reduce-min.mlir +++ b/mlir/test/mlir-cuda-runner/all-reduce-min.mlir @@ -1,5 +1,5 @@ // RUN: mlir-cuda-runner %s \ -// RUN: --shared-libs=%cuda_wrapper_library_dir/libcuda-runtime-wrappers%shlibext \ +// RUN: --shared-libs=%cuda_wrapper_library_dir/libcuda-runtime-wrappers%shlibext,%linalg_test_lib_dir/libmlir_runner_utils%shlibext \ // RUN: --entry-point-result=void \ // RUN: | FileCheck %s diff --git a/mlir/test/mlir-cuda-runner/all-reduce-op.mlir b/mlir/test/mlir-cuda-runner/all-reduce-op.mlir index d4857e3e6ea6..2d1a75a95483 100644 --- a/mlir/test/mlir-cuda-runner/all-reduce-op.mlir +++ b/mlir/test/mlir-cuda-runner/all-reduce-op.mlir @@ -1,5 +1,5 @@ // RUN: mlir-cuda-runner %s \ -// RUN: --shared-libs=%cuda_wrapper_library_dir/libcuda-runtime-wrappers%shlibext \ +// RUN: --shared-libs=%cuda_wrapper_library_dir/libcuda-runtime-wrappers%shlibext,%linalg_test_lib_dir/libmlir_runner_utils%shlibext \ // RUN: --entry-point-result=void \ // RUN: | FileCheck %s diff --git a/mlir/test/mlir-cuda-runner/all-reduce-or.mlir b/mlir/test/mlir-cuda-runner/all-reduce-or.mlir index dfc015a65f1a..4c67ce454b4e 100644 --- a/mlir/test/mlir-cuda-runner/all-reduce-or.mlir +++ b/mlir/test/mlir-cuda-runner/all-reduce-or.mlir @@ -1,5 +1,5 @@ // RUN: mlir-cuda-runner %s \ -// RUN: --shared-libs=%cuda_wrapper_library_dir/libcuda-runtime-wrappers%shlibext \ +// RUN: --shared-libs=%cuda_wrapper_library_dir/libcuda-runtime-wrappers%shlibext,%linalg_test_lib_dir/libmlir_runner_utils%shlibext \ // RUN: --entry-point-result=void \ // RUN: | FileCheck %s diff --git a/mlir/test/mlir-cuda-runner/all-reduce-region.mlir b/mlir/test/mlir-cuda-runner/all-reduce-region.mlir index 988ed2a2320e..707b4ee426eb 100644 --- a/mlir/test/mlir-cuda-runner/all-reduce-region.mlir +++ b/mlir/test/mlir-cuda-runner/all-reduce-region.mlir @@ -1,5 +1,5 @@ // RUN: mlir-cuda-runner %s \ -// RUN: --shared-libs=%cuda_wrapper_library_dir/libcuda-runtime-wrappers%shlibext \ +// RUN: --shared-libs=%cuda_wrapper_library_dir/libcuda-runtime-wrappers%shlibext,%linalg_test_lib_dir/libmlir_runner_utils%shlibext \ // RUN: --entry-point-result=void \ // RUN: | FileCheck %s diff --git a/mlir/test/mlir-cuda-runner/all-reduce-xor.mlir b/mlir/test/mlir-cuda-runner/all-reduce-xor.mlir index 917140ba52fc..644585cf55c6 100644 --- a/mlir/test/mlir-cuda-runner/all-reduce-xor.mlir +++ b/mlir/test/mlir-cuda-runner/all-reduce-xor.mlir @@ -1,5 +1,5 @@ // RUN: mlir-cuda-runner %s \ -// RUN: --shared-libs=%cuda_wrapper_library_dir/libcuda-runtime-wrappers%shlibext \ +// RUN: --shared-libs=%cuda_wrapper_library_dir/libcuda-runtime-wrappers%shlibext,%linalg_test_lib_dir/libmlir_runner_utils%shlibext \ // RUN: --entry-point-result=void \ // RUN: | FileCheck %s diff --git a/mlir/test/mlir-cuda-runner/gpu-to-cubin.mlir b/mlir/test/mlir-cuda-runner/gpu-to-cubin.mlir index cba504f01fa3..70c1a9f8807c 100644 --- a/mlir/test/mlir-cuda-runner/gpu-to-cubin.mlir +++ b/mlir/test/mlir-cuda-runner/gpu-to-cubin.mlir @@ -1,5 +1,5 @@ // RUN: mlir-cuda-runner %s \ -// RUN: --shared-libs=%cuda_wrapper_library_dir/libcuda-runtime-wrappers%shlibext \ +// RUN: --shared-libs=%cuda_wrapper_library_dir/libcuda-runtime-wrappers%shlibext,%linalg_test_lib_dir/libmlir_runner_utils%shlibext \ // RUN: --entry-point-result=void \ // RUN: | FileCheck %s diff --git a/mlir/test/mlir-cuda-runner/multiple-all-reduce.mlir b/mlir/test/mlir-cuda-runner/multiple-all-reduce.mlir index cd3078a70541..3ed2d5233e03 100644 --- a/mlir/test/mlir-cuda-runner/multiple-all-reduce.mlir +++ b/mlir/test/mlir-cuda-runner/multiple-all-reduce.mlir @@ -1,5 +1,5 @@ // RUN: mlir-cuda-runner %s \ -// RUN: --shared-libs=%cuda_wrapper_library_dir/libcuda-runtime-wrappers%shlibext \ +// RUN: --shared-libs=%cuda_wrapper_library_dir/libcuda-runtime-wrappers%shlibext,%linalg_test_lib_dir/libmlir_runner_utils%shlibext \ // RUN: --entry-point-result=void \ // RUN: | FileCheck %s diff --git a/mlir/test/mlir-cuda-runner/shuffle.mlir b/mlir/test/mlir-cuda-runner/shuffle.mlir index 79ab81dac2f7..cd6b0a5344b2 100644 --- a/mlir/test/mlir-cuda-runner/shuffle.mlir +++ b/mlir/test/mlir-cuda-runner/shuffle.mlir @@ -1,5 +1,5 @@ // RUN: mlir-cuda-runner %s \ -// RUN: --shared-libs=%cuda_wrapper_library_dir/libcuda-runtime-wrappers%shlibext \ +// RUN: --shared-libs=%cuda_wrapper_library_dir/libcuda-runtime-wrappers%shlibext,%linalg_test_lib_dir/libmlir_runner_utils%shlibext \ // RUN: --entry-point-result=void \ // RUN: | FileCheck %s diff --git a/mlir/test/mlir-cuda-runner/two-modules.mlir b/mlir/test/mlir-cuda-runner/two-modules.mlir index de39ca222a43..2d66bb2021e2 100644 --- a/mlir/test/mlir-cuda-runner/two-modules.mlir +++ b/mlir/test/mlir-cuda-runner/two-modules.mlir @@ -1,5 +1,5 @@ // RUN: mlir-cuda-runner %s \ -// RUN: --shared-libs=%cuda_wrapper_library_dir/libcuda-runtime-wrappers%shlibext \ +// RUN: --shared-libs=%cuda_wrapper_library_dir/libcuda-runtime-wrappers%shlibext,%linalg_test_lib_dir/libmlir_runner_utils%shlibext \ // RUN: --entry-point-result=void \ // RUN: | FileCheck %s diff --git a/mlir/test/mlir-rocm-runner/gpu-to-hsaco.mlir b/mlir/test/mlir-rocm-runner/gpu-to-hsaco.mlir index ffb6b10ca762..b60512ff321b 100644 --- a/mlir/test/mlir-rocm-runner/gpu-to-hsaco.mlir +++ b/mlir/test/mlir-rocm-runner/gpu-to-hsaco.mlir @@ -1,5 +1,5 @@ // RUN: mlir-rocm-runner %s \ -// RUN: --shared-libs=%rocm_wrapper_library_dir/librocm-runtime-wrappers%shlibext \ +// RUN: --shared-libs=%cuda_wrapper_library_dir/libcuda-runtime-wrappers%shlibext,%linalg_test_lib_dir/libmlir_runner_utils%shlibext \ // RUN: --entry-point-result=void \ // RUN: | FileCheck %s diff --git a/mlir/test/mlir-rocm-runner/two-modules.mlir b/mlir/test/mlir-rocm-runner/two-modules.mlir index 2e4306bf3f9d..2bfa93e82e36 100644 --- a/mlir/test/mlir-rocm-runner/two-modules.mlir +++ b/mlir/test/mlir-rocm-runner/two-modules.mlir @@ -1,5 +1,5 @@ // RUN: mlir-rocm-runner %s \ -// RUN: --shared-libs=%rocm_wrapper_library_dir/librocm-runtime-wrappers%shlibext \ +// RUN: --shared-libs=%cuda_wrapper_library_dir/libcuda-runtime-wrappers%shlibext,%linalg_test_lib_dir/libmlir_runner_utils%shlibext \ // RUN: --entry-point-result=void \ // RUN: | FileCheck %s diff --git a/mlir/test/mlir-rocm-runner/vecadd.mlir b/mlir/test/mlir-rocm-runner/vecadd.mlir index ceb1622441a4..d9ac62f033c3 100644 --- a/mlir/test/mlir-rocm-runner/vecadd.mlir +++ b/mlir/test/mlir-rocm-runner/vecadd.mlir @@ -1,5 +1,5 @@ // RUN: mlir-rocm-runner %s \ -// RUN: --shared-libs=%rocm_wrapper_library_dir/librocm-runtime-wrappers%shlibext \ +// RUN: --shared-libs=%cuda_wrapper_library_dir/libcuda-runtime-wrappers%shlibext,%linalg_test_lib_dir/libmlir_runner_utils%shlibext \ // RUN: --entry-point-result=void \ // RUN: | FileCheck %s diff --git a/mlir/test/mlir-rocm-runner/vector-transferops.mlir b/mlir/test/mlir-rocm-runner/vector-transferops.mlir index 85e34fd87354..d78672fd9cc9 100644 --- a/mlir/test/mlir-rocm-runner/vector-transferops.mlir +++ b/mlir/test/mlir-rocm-runner/vector-transferops.mlir @@ -1,5 +1,5 @@ // RUN: mlir-rocm-runner %s \ -// RUN: --shared-libs=%rocm_wrapper_library_dir/librocm-runtime-wrappers%shlibext \ +// RUN: --shared-libs=%cuda_wrapper_library_dir/libcuda-runtime-wrappers%shlibext,%linalg_test_lib_dir/libmlir_runner_utils%shlibext \ // RUN: --entry-point-result=void \ // RUN: | FileCheck %s diff --git a/mlir/tools/mlir-cuda-runner/CMakeLists.txt b/mlir/tools/mlir-cuda-runner/CMakeLists.txt index 9f00c26b947c..8a99418ebf65 100644 --- a/mlir/tools/mlir-cuda-runner/CMakeLists.txt +++ b/mlir/tools/mlir-cuda-runner/CMakeLists.txt @@ -37,7 +37,6 @@ if(MLIR_CUDA_RUNNER_ENABLED) target_link_libraries(cuda-runtime-wrappers PUBLIC LLVMSupport - mlir_runner_utils_static ${CUDA_RUNTIME_LIBRARY} ) diff --git a/mlir/tools/mlir-rocm-runner/CMakeLists.txt b/mlir/tools/mlir-rocm-runner/CMakeLists.txt index 910a4943101e..a4da49673027 100644 --- a/mlir/tools/mlir-rocm-runner/CMakeLists.txt +++ b/mlir/tools/mlir-rocm-runner/CMakeLists.txt @@ -61,7 +61,6 @@ if(MLIR_ROCM_RUNNER_ENABLED) target_link_libraries(rocm-runtime-wrappers PUBLIC LLVMSupport - mlir_runner_utils_static ${ROCM_RUNTIME_LIBRARY} ) _______________________________________________ llvm-branch-commits mailing list llvm-branch-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-branch-commits
