diff options
author | Christian Sigg <csigg@google.com> | 2022-09-03 09:15:34 +0200 |
---|---|---|
committer | Christian Sigg <csigg@google.com> | 2022-09-03 16:04:07 +0200 |
commit | f43c81470b9d67243c48322998c6d46eb9125eef (patch) | |
tree | 9cf77ea52ab7e7adaadc283616a06bc671d4255c /mlir/test/CMakeLists.txt | |
parent | 5c759edc57d61bf4713f7e9dbb490c7e0328136d (diff) | |
download | llvm-f43c81470b9d67243c48322998c6d46eb9125eef.zip llvm-f43c81470b9d67243c48322998c6d46eb9125eef.tar.gz llvm-f43c81470b9d67243c48322998c6d46eb9125eef.tar.bz2 |
[MLIR] Single lit config attribute for CMAKE_LIBRARY_OUTPUT_DIRECTORY
Replace the following config attributes with `mlir_lib_dir`:
- `mlir_runner_utils_dir`
- `linalg_test_lib_dir`
- `spirv_wrapper_library_dir`
- `vulkan_wrapper_library_dir`
- `mlir_integration_test_dir`
I'm going to clean up substitutions in separate changes.
Reviewed By: aartbik, mehdi_amini
Differential Revision: https://reviews.llvm.org/D133217
Diffstat (limited to 'mlir/test/CMakeLists.txt')
-rw-r--r-- | mlir/test/CMakeLists.txt | 16 |
1 files changed, 4 insertions, 12 deletions
diff --git a/mlir/test/CMakeLists.txt b/mlir/test/CMakeLists.txt index 74f8058..b8386a5 100644 --- a/mlir/test/CMakeLists.txt +++ b/mlir/test/CMakeLists.txt @@ -10,15 +10,8 @@ endif() set(MLIR_CMAKE_DIR "${CMAKE_BINARY_DIR}/lib${LLVM_LIBDIR_SUFFIX}/cmake/mlir") -# Passed to lit.site.cfg.py.in to set up the path where to find the libraries -# for linalg integration tests. -set(MLIR_DIALECT_LINALG_INTEGRATION_TEST_LIB_DIR ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}) -set(MLIR_RUNNER_UTILS_DIR ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}) - -# Passed to lit.site.cfg.py.in to set up the path where to find the libraries -# for the mlir spirv / vulkan runner tests. -set(MLIR_SPIRV_WRAPPER_LIBRARY_DIR ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}) -set(MLIR_VULKAN_WRAPPER_LIBRARY_DIR ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}) +# Passed to lit.site.cfg.py.in to set up the path where to find libraries. +set(MLIR_LIB_DIR ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}) if (MLIR_INCLUDE_INTEGRATION_TESTS) set(INTEL_SDE_EXECUTABLE "" CACHE STRING @@ -35,8 +28,6 @@ if (MLIR_INCLUDE_INTEGRATION_TESTS) option(MLIR_RUN_X86VECTOR_TESTS "Run X86Vector tests.") option(MLIR_RUN_CUDA_TENSOR_CORE_TESTS "Run CUDA Tensor core WMMA tests.") option(MLIR_RUN_ARM_SVE_TESTS "Run Arm SVE tests.") - # Passed to lit.site.cfg.py.in to set up the path where to find the libraries. - set(MLIR_INTEGRATION_TEST_DIR ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}) # The native target may not be enabled when cross compiling, raise an error. @@ -45,13 +36,14 @@ if (MLIR_INCLUDE_INTEGRATION_TESTS) endif() # Copy test data over. + # TODO: drop copy and load files relative to MLIR_SOURCE_DIR / %mlir_src_root. file(COPY ${CMAKE_CURRENT_SOURCE_DIR}/Integration/data/mttkrp_b.tns ${CMAKE_CURRENT_SOURCE_DIR}/Integration/data/test.mtx ${CMAKE_CURRENT_SOURCE_DIR}/Integration/data/test_symmetric.mtx ${CMAKE_CURRENT_SOURCE_DIR}/Integration/data/test_symmetric_complex.mtx ${CMAKE_CURRENT_SOURCE_DIR}/Integration/data/test.tns ${CMAKE_CURRENT_SOURCE_DIR}/Integration/data/wide.mtx - DESTINATION ${MLIR_INTEGRATION_TEST_DIR}/data/) + DESTINATION ${MLIR_LIB_DIR}/data/) endif() llvm_canonicalize_cmake_booleans( |