Index: mlir/include/mlir/ExecutionEngine/RunnerUtils.h =================================================================== --- mlir/include/mlir/ExecutionEngine/RunnerUtils.h +++ mlir/include/mlir/ExecutionEngine/RunnerUtils.h @@ -34,14 +34,18 @@ #include #include #include +#include #include #include "mlir/ExecutionEngine/CRunnerUtils.h" template void printMemRefMetaData(StreamType &os, const DynamicMemRefType &v) { - os << "base@ = " << reinterpret_cast(v.data) << " rank = " << v.rank - << " offset = " << v.offset; + // Make the printed pointer format platform independent by casting it to an + // integer and manually formatting it to a hex with prefix as tests expect. + os << "base@ = " << std::hex << std::showbase + << reinterpret_cast(v.data) << std::dec << std::noshowbase + << " rank = " << v.rank << " offset = " << v.offset; auto print = [&](const int64_t *ptr) { if (v.rank == 0) return; Index: mlir/test/CMakeLists.txt =================================================================== --- mlir/test/CMakeLists.txt +++ mlir/test/CMakeLists.txt @@ -5,6 +5,10 @@ add_subdirectory(python) endif() +if (MLIR_ENABLE_SPIRV_CPU_RUNNER) + add_subdirectory(mlir-spirv-cpu-runner) +endif() + # Provide the MLIR CMake module dir so that the out of tree Standalone # dialect and can add it to the module path. set(MLIR_CMAKE_DIR @@ -53,12 +57,39 @@ MLIR_RUN_ARM_SVE_TESTS ) +set(MLIR_RUNNER_UTILS "$") +set(MLIR_C_RUNNER_UTILS "$") +set(MLIR_ASYNC_RUNTIME "$") + +if (MLIR_ENABLE_VULKAN_RUNNER) + set(MLIR_VULKAN_RUNTIME_WRAPPERS "$") +endif () + +if (MLIR_ENABLE_CUDA_RUNNER) + set(MLIR_CUDA_RUNTIME "$") +endif () + +if (MLIR_ENABLE_ROCM_RUNNER) + set(MLIR_ROCM_RUNTIME "$") +endif () + +if (MLIR_ENABLE_SPIRV_CPU_RUNNER) + set(MLIR_TEST_SPRIV_CPU_RUNNER_C_WRAPPERS "$") +endif () + +# configure below runs at configure time and does not support the use of generator expressions. +# We therefore use it only to substitute the generator expressions above into the lit.site.cfg.py.in. configure_lit_site_cfg( ${CMAKE_CURRENT_SOURCE_DIR}/lit.site.cfg.py.in - ${CMAKE_CURRENT_BINARY_DIR}/lit.site.cfg.py + ${CMAKE_CURRENT_BINARY_DIR}/lit.site.cfg.py.in MAIN_CONFIG ${CMAKE_CURRENT_SOURCE_DIR}/lit.cfg.py ) +# GENERATE runs at generation time (so at the beginning of the build) and substitutes the generator expressions +# with the actual paths of the target binaries. +file(GENERATE OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/lit.site.cfg.py + INPUT ${CMAKE_CURRENT_BINARY_DIR}/lit.site.cfg.py.in) + configure_lit_site_cfg( ${CMAKE_CURRENT_SOURCE_DIR}/Unit/lit.site.cfg.py.in ${CMAKE_CURRENT_BINARY_DIR}/Unit/lit.site.cfg.py @@ -131,7 +162,6 @@ endif() if(MLIR_ENABLE_SPIRV_CPU_RUNNER) - add_subdirectory(mlir-spirv-cpu-runner) list(APPEND MLIR_TEST_DEPENDS mlir-spirv-cpu-runner mlir_test_spirv_cpu_runner_c_wrappers Index: mlir/test/Integration/Dialect/Arith/CPU/lit.local.cfg =================================================================== --- mlir/test/Integration/Dialect/Arith/CPU/lit.local.cfg +++ /dev/null @@ -1,5 +0,0 @@ -import sys - -# No JIT on win32. -if sys.platform == 'win32': - config.unsupported = True Index: mlir/test/Integration/Dialect/Arith/CPU/test-wide-int-emulation-addi-i16.mlir =================================================================== --- mlir/test/Integration/Dialect/Arith/CPU/test-wide-int-emulation-addi-i16.mlir +++ mlir/test/Integration/Dialect/Arith/CPU/test-wide-int-emulation-addi-i16.mlir @@ -4,14 +4,14 @@ // RUN: mlir-opt %s --convert-scf-to-cf --convert-cf-to-llvm --convert-vector-to-llvm \ // RUN: --convert-func-to-llvm --convert-arith-to-llvm | \ // RUN: mlir-cpu-runner -e entry -entry-point-result=void \ -// RUN: --shared-libs=%mlir_lib_dir/libmlir_c_runner_utils%shlibext | \ +// RUN: --shared-libs=%mlir_c_runner_utils | \ // RUN: FileCheck %s --match-full-lines // RUN: mlir-opt %s --test-arith-emulate-wide-int="widest-int-supported=8" \ // RUN: --convert-scf-to-cf --convert-cf-to-llvm --convert-vector-to-llvm \ // RUN: --convert-func-to-llvm --convert-arith-to-llvm | \ // RUN: mlir-cpu-runner -e entry -entry-point-result=void \ -// RUN: --shared-libs=%mlir_lib_dir/libmlir_c_runner_utils%shlibext | \ +// RUN: --shared-libs=%mlir_c_runner_utils | \ // RUN: FileCheck %s --match-full-lines // Ops in this function *only* will be emulated using i8 types. Index: mlir/test/Integration/Dialect/Arith/CPU/test-wide-int-emulation-cmpi-i16.mlir =================================================================== --- mlir/test/Integration/Dialect/Arith/CPU/test-wide-int-emulation-cmpi-i16.mlir +++ mlir/test/Integration/Dialect/Arith/CPU/test-wide-int-emulation-cmpi-i16.mlir @@ -5,14 +5,14 @@ // RUN: mlir-opt %s --convert-scf-to-cf --convert-cf-to-llvm --convert-vector-to-llvm \ // RUN: --convert-func-to-llvm --convert-arith-to-llvm | \ // RUN: mlir-cpu-runner -e entry -entry-point-result=void \ -// RUN: --shared-libs=%mlir_lib_dir/libmlir_c_runner_utils%shlibext | \ +// RUN: --shared-libs=%mlir_c_runner_utils | \ // RUN: FileCheck %s --match-full-lines // RUN: mlir-opt %s --test-arith-emulate-wide-int="widest-int-supported=8" \ // RUN: --convert-scf-to-cf --convert-cf-to-llvm --convert-vector-to-llvm \ // RUN: --convert-func-to-llvm --convert-arith-to-llvm | \ // RUN: mlir-cpu-runner -e entry -entry-point-result=void \ -// RUN: --shared-libs=%mlir_lib_dir/libmlir_c_runner_utils%shlibext | \ +// RUN: --shared-libs=%mlir_c_runner_utils | \ // RUN: FileCheck %s --match-full-lines func.func @emulate_cmpi_eq(%lhs : i16, %rhs : i16) -> (i1) { Index: mlir/test/Integration/Dialect/Arith/CPU/test-wide-int-emulation-compare-results-i16.mlir =================================================================== --- mlir/test/Integration/Dialect/Arith/CPU/test-wide-int-emulation-compare-results-i16.mlir +++ mlir/test/Integration/Dialect/Arith/CPU/test-wide-int-emulation-compare-results-i16.mlir @@ -5,7 +5,7 @@ // RUN: --convert-scf-to-cf --convert-cf-to-llvm --convert-vector-to-llvm \ // RUN: --convert-func-to-llvm --convert-arith-to-llvm | \ // RUN: mlir-cpu-runner -e entry -entry-point-result=void \ -// RUN: --shared-libs="%mlir_lib_dir/libmlir_c_runner_utils%shlibext,%mlir_lib_dir/libmlir_runner_utils%shlibext" | \ +// RUN: --shared-libs="%mlir_c_runner_utils,%mlir_runner_utils" | \ // RUN: FileCheck %s // CHECK-NOT: Mismatch Index: mlir/test/Integration/Dialect/Arith/CPU/test-wide-int-emulation-constants-i16.mlir =================================================================== --- mlir/test/Integration/Dialect/Arith/CPU/test-wide-int-emulation-constants-i16.mlir +++ mlir/test/Integration/Dialect/Arith/CPU/test-wide-int-emulation-constants-i16.mlir @@ -5,7 +5,7 @@ // RUN: --convert-scf-to-cf --convert-cf-to-llvm --convert-vector-to-llvm \ // RUN: --convert-func-to-llvm --convert-arith-to-llvm | \ // RUN: mlir-cpu-runner -e entry -entry-point-result=void \ -// RUN: --shared-libs=%mlir_lib_dir/libmlir_c_runner_utils%shlibext | \ +// RUN: --shared-libs=%mlir_c_runner_utils | \ // RUN: FileCheck %s --match-full-lines --check-prefix=EMULATED func.func @entry() { Index: mlir/test/Integration/Dialect/Arith/CPU/test-wide-int-emulation-max-min-i16.mlir =================================================================== --- mlir/test/Integration/Dialect/Arith/CPU/test-wide-int-emulation-max-min-i16.mlir +++ mlir/test/Integration/Dialect/Arith/CPU/test-wide-int-emulation-max-min-i16.mlir @@ -5,14 +5,14 @@ // RUN: mlir-opt %s --convert-scf-to-cf --convert-cf-to-llvm --convert-vector-to-llvm \ // RUN: --convert-func-to-llvm --convert-arith-to-llvm | \ // RUN: mlir-cpu-runner -e entry -entry-point-result=void \ -// RUN: --shared-libs=%mlir_lib_dir/libmlir_c_runner_utils%shlibext | \ +// RUN: --shared-libs=%mlir_c_runner_utils | \ // RUN: FileCheck %s --match-full-lines // RUN: mlir-opt %s --test-arith-emulate-wide-int="widest-int-supported=8" \ // RUN: --convert-scf-to-cf --convert-cf-to-llvm --convert-vector-to-llvm \ // RUN: --convert-func-to-llvm --convert-arith-to-llvm | \ // RUN: mlir-cpu-runner -e entry -entry-point-result=void \ -// RUN: --shared-libs=%mlir_lib_dir/libmlir_c_runner_utils%shlibext | \ +// RUN: --shared-libs=%mlir_c_runner_utils | \ // RUN: FileCheck %s --match-full-lines func.func @emulate_maxui(%lhs : i16, %rhs : i16) -> (i16) { Index: mlir/test/Integration/Dialect/Arith/CPU/test-wide-int-emulation-muli-i16.mlir =================================================================== --- mlir/test/Integration/Dialect/Arith/CPU/test-wide-int-emulation-muli-i16.mlir +++ mlir/test/Integration/Dialect/Arith/CPU/test-wide-int-emulation-muli-i16.mlir @@ -4,14 +4,14 @@ // RUN: mlir-opt %s --convert-scf-to-cf --convert-cf-to-llvm --convert-vector-to-llvm \ // RUN: --convert-func-to-llvm --convert-arith-to-llvm | \ // RUN: mlir-cpu-runner -e entry -entry-point-result=void \ -// RUN: --shared-libs=%mlir_lib_dir/libmlir_c_runner_utils%shlibext | \ +// RUN: --shared-libs=%mlir_c_runner_utils | \ // RUN: FileCheck %s --match-full-lines // RUN: mlir-opt %s --test-arith-emulate-wide-int="widest-int-supported=8" \ // RUN: --convert-scf-to-cf --convert-cf-to-llvm --convert-vector-to-llvm \ // RUN: --convert-func-to-llvm --convert-arith-to-llvm | \ // RUN: mlir-cpu-runner -e entry -entry-point-result=void \ -// RUN: --shared-libs=%mlir_lib_dir/libmlir_c_runner_utils%shlibext | \ +// RUN: --shared-libs=%mlir_c_runner_utils | \ // RUN: FileCheck %s --match-full-lines // Ops in this function *only* will be emulated using i8 types. Index: mlir/test/Integration/Dialect/Arith/CPU/test-wide-int-emulation-shli-i16.mlir =================================================================== --- mlir/test/Integration/Dialect/Arith/CPU/test-wide-int-emulation-shli-i16.mlir +++ mlir/test/Integration/Dialect/Arith/CPU/test-wide-int-emulation-shli-i16.mlir @@ -4,14 +4,14 @@ // RUN: mlir-opt %s --convert-scf-to-cf --convert-cf-to-llvm --convert-vector-to-llvm \ // RUN: --convert-func-to-llvm --convert-arith-to-llvm | \ // RUN: mlir-cpu-runner -e entry -entry-point-result=void \ -// RUN: --shared-libs=%mlir_lib_dir/libmlir_c_runner_utils%shlibext | \ +// RUN: --shared-libs=%mlir_c_runner_utils | \ // RUN: FileCheck %s --match-full-lines // RUN: mlir-opt %s --test-arith-emulate-wide-int="widest-int-supported=8" \ // RUN: --convert-scf-to-cf --convert-cf-to-llvm --convert-vector-to-llvm \ // RUN: --convert-func-to-llvm --convert-arith-to-llvm | \ // RUN: mlir-cpu-runner -e entry -entry-point-result=void \ -// RUN: --shared-libs=%mlir_lib_dir/libmlir_c_runner_utils%shlibext | \ +// RUN: --shared-libs=%mlir_c_runner_utils | \ // RUN: FileCheck %s --match-full-lines // Ops in this function *only* will be emulated using i8 types. Index: mlir/test/Integration/Dialect/Arith/CPU/test-wide-int-emulation-shrsi-i16.mlir =================================================================== --- mlir/test/Integration/Dialect/Arith/CPU/test-wide-int-emulation-shrsi-i16.mlir +++ mlir/test/Integration/Dialect/Arith/CPU/test-wide-int-emulation-shrsi-i16.mlir @@ -4,14 +4,14 @@ // RUN: mlir-opt %s --convert-scf-to-cf --convert-cf-to-llvm --convert-vector-to-llvm \ // RUN: --convert-func-to-llvm --convert-arith-to-llvm | \ // RUN: mlir-cpu-runner -e entry -entry-point-result=void \ -// RUN: --shared-libs=%mlir_lib_dir/libmlir_c_runner_utils%shlibext | \ +// RUN: --shared-libs=%mlir_c_runner_utils | \ // RUN: FileCheck %s --match-full-lines // RUN: mlir-opt %s --test-arith-emulate-wide-int="widest-int-supported=8" \ // RUN: --convert-scf-to-cf --convert-cf-to-llvm --convert-vector-to-llvm \ // RUN: --convert-func-to-llvm --convert-arith-to-llvm | \ // RUN: mlir-cpu-runner -e entry -entry-point-result=void \ -// RUN: --shared-libs=%mlir_lib_dir/libmlir_c_runner_utils%shlibext | \ +// RUN: --shared-libs=%mlir_c_runner_utils | \ // RUN: FileCheck %s --match-full-lines // Ops in this function *only* will be emulated using i8 types. Index: mlir/test/Integration/Dialect/Arith/CPU/test-wide-int-emulation-shrui-i16.mlir =================================================================== --- mlir/test/Integration/Dialect/Arith/CPU/test-wide-int-emulation-shrui-i16.mlir +++ mlir/test/Integration/Dialect/Arith/CPU/test-wide-int-emulation-shrui-i16.mlir @@ -4,14 +4,14 @@ // RUN: mlir-opt %s --convert-scf-to-cf --convert-cf-to-llvm --convert-vector-to-llvm \ // RUN: --convert-func-to-llvm --convert-arith-to-llvm | \ // RUN: mlir-cpu-runner -e entry -entry-point-result=void \ -// RUN: --shared-libs=%mlir_lib_dir/libmlir_c_runner_utils%shlibext | \ +// RUN: --shared-libs=%mlir_c_runner_utils | \ // RUN: FileCheck %s --match-full-lines // RUN: mlir-opt %s --test-arith-emulate-wide-int="widest-int-supported=8" \ // RUN: --convert-scf-to-cf --convert-cf-to-llvm --convert-vector-to-llvm \ // RUN: --convert-func-to-llvm --convert-arith-to-llvm | \ // RUN: mlir-cpu-runner -e entry -entry-point-result=void \ -// RUN: --shared-libs=%mlir_lib_dir/libmlir_c_runner_utils%shlibext | \ +// RUN: --shared-libs=%mlir_c_runner_utils | \ // RUN: FileCheck %s --match-full-lines // Ops in this function *only* will be emulated using i8 types. Index: mlir/test/Integration/Dialect/Async/CPU/lit.local.cfg =================================================================== --- mlir/test/Integration/Dialect/Async/CPU/lit.local.cfg +++ mlir/test/Integration/Dialect/Async/CPU/lit.local.cfg @@ -1,5 +1,5 @@ import sys -# No JIT on win32. +# Windows does not have aligned_alloc if sys.platform == 'win32': config.unsupported = True Index: mlir/test/Integration/Dialect/Async/CPU/microbench-linalg-async-parallel-for.mlir =================================================================== --- mlir/test/Integration/Dialect/Async/CPU/microbench-linalg-async-parallel-for.mlir +++ mlir/test/Integration/Dialect/Async/CPU/microbench-linalg-async-parallel-for.mlir @@ -14,9 +14,9 @@ // RUN: -reconcile-unrealized-casts \ // RUN: | mlir-cpu-runner \ // RUN: -e entry -entry-point-result=void -O3 \ -// RUN: -shared-libs=%mlir_lib_dir/libmlir_runner_utils%shlibext \ -// RUN: -shared-libs=%mlir_lib_dir/libmlir_c_runner_utils%shlibext\ -// RUN: -shared-libs=%mlir_lib_dir/libmlir_async_runtime%shlibext \ +// RUN: -shared-libs=%mlir_runner_utils \ +// RUN: -shared-libs=%mlir_c_runner_utils\ +// RUN: -shared-libs=%mlir_async_runtime \ // RUN: | FileCheck %s --dump-input=always // RUN: mlir-opt %s \ @@ -28,9 +28,9 @@ // RUN: -reconcile-unrealized-casts \ // RUN: | mlir-cpu-runner \ // RUN: -e entry -entry-point-result=void -O3 \ -// RUN: -shared-libs=%mlir_lib_dir/libmlir_runner_utils%shlibext \ -// RUN: -shared-libs=%mlir_lib_dir/libmlir_c_runner_utils%shlibext\ -// RUN: -shared-libs=%mlir_lib_dir/libmlir_async_runtime%shlibext \ +// RUN: -shared-libs=%mlir_runner_utils \ +// RUN: -shared-libs=%mlir_c_runner_utils\ +// RUN: -shared-libs=%mlir_async_runtime \ // RUN: | FileCheck %s --dump-input=always #map0 = affine_map<(d0, d1) -> (d0, d1)> Index: mlir/test/Integration/Dialect/Async/CPU/microbench-scf-async-parallel-for.mlir =================================================================== --- mlir/test/Integration/Dialect/Async/CPU/microbench-scf-async-parallel-for.mlir +++ mlir/test/Integration/Dialect/Async/CPU/microbench-scf-async-parallel-for.mlir @@ -14,9 +14,9 @@ // RUN: -reconcile-unrealized-casts \ // RUN: | mlir-cpu-runner \ // RUN: -e entry -entry-point-result=void -O3 \ -// RUN: -shared-libs=%mlir_lib_dir/libmlir_runner_utils%shlibext \ -// RUN: -shared-libs=%mlir_lib_dir/libmlir_c_runner_utils%shlibext\ -// RUN: -shared-libs=%mlir_lib_dir/libmlir_async_runtime%shlibext \ +// RUN: -shared-libs=%mlir_runner_utils \ +// RUN: -shared-libs=%mlir_c_runner_utils\ +// RUN: -shared-libs=%mlir_async_runtime \ // RUN: | FileCheck %s --dump-input=always // RUN: mlir-opt %s \ @@ -35,9 +35,9 @@ // RUN: -reconcile-unrealized-casts \ // RUN: | mlir-cpu-runner \ // RUN: -e entry -entry-point-result=void -O3 \ -// RUN: -shared-libs=%mlir_lib_dir/libmlir_runner_utils%shlibext \ -// RUN: -shared-libs=%mlir_lib_dir/libmlir_c_runner_utils%shlibext\ -// RUN: -shared-libs=%mlir_lib_dir/libmlir_async_runtime%shlibext \ +// RUN: -shared-libs=%mlir_runner_utils \ +// RUN: -shared-libs=%mlir_c_runner_utils\ +// RUN: -shared-libs=%mlir_async_runtime \ // RUN: | FileCheck %s --dump-input=always // RUN: mlir-opt %s \ @@ -49,9 +49,9 @@ // RUN: -reconcile-unrealized-casts \ // RUN: | mlir-cpu-runner \ // RUN: -e entry -entry-point-result=void -O3 \ -// RUN: -shared-libs=%mlir_lib_dir/libmlir_runner_utils%shlibext \ -// RUN: -shared-libs=%mlir_lib_dir/libmlir_c_runner_utils%shlibext\ -// RUN: -shared-libs=%mlir_lib_dir/libmlir_async_runtime%shlibext \ +// RUN: -shared-libs=%mlir_runner_utils \ +// RUN: -shared-libs=%mlir_c_runner_utils\ +// RUN: -shared-libs=%mlir_async_runtime \ // RUN: | FileCheck %s --dump-input=always #map0 = affine_map<(d0, d1) -> (d0, d1)> Index: mlir/test/Integration/Dialect/Async/CPU/test-async-parallel-for-1d.mlir =================================================================== --- mlir/test/Integration/Dialect/Async/CPU/test-async-parallel-for-1d.mlir +++ mlir/test/Integration/Dialect/Async/CPU/test-async-parallel-for-1d.mlir @@ -11,8 +11,8 @@ // RUN: -reconcile-unrealized-casts \ // RUN: | mlir-cpu-runner \ // RUN: -e entry -entry-point-result=void -O0 \ -// RUN: -shared-libs=%mlir_lib_dir/libmlir_runner_utils%shlibext \ -// RUN: -shared-libs=%mlir_lib_dir/libmlir_async_runtime%shlibext\ +// RUN: -shared-libs=%mlir_runner_utils \ +// RUN: -shared-libs=%mlir_async_runtime\ // RUN: | FileCheck %s --dump-input=always // RUN: mlir-opt %s -async-parallel-for \ @@ -27,8 +27,8 @@ // RUN: -reconcile-unrealized-casts \ // RUN: | mlir-cpu-runner \ // RUN: -e entry -entry-point-result=void -O0 \ -// RUN: -shared-libs=%mlir_lib_dir/libmlir_runner_utils%shlibext \ -// RUN: -shared-libs=%mlir_lib_dir/libmlir_async_runtime%shlibext\ +// RUN: -shared-libs=%mlir_runner_utils \ +// RUN: -shared-libs=%mlir_async_runtime\ // RUN: | FileCheck %s --dump-input=always // RUN: mlir-opt %s -async-parallel-for="async-dispatch=false \ @@ -46,8 +46,8 @@ // RUN: -reconcile-unrealized-casts \ // RUN: | mlir-cpu-runner \ // RUN: -e entry -entry-point-result=void -O0 \ -// RUN: -shared-libs=%mlir_lib_dir/libmlir_runner_utils%shlibext \ -// RUN: -shared-libs=%mlir_lib_dir/libmlir_async_runtime%shlibext\ +// RUN: -shared-libs=%mlir_runner_utils \ +// RUN: -shared-libs=%mlir_async_runtime\ // RUN: | FileCheck %s --dump-input=always // Suppress constant folding by introducing "dynamic" zero value at runtime. Index: mlir/test/Integration/Dialect/Async/CPU/test-async-parallel-for-2d.mlir =================================================================== --- mlir/test/Integration/Dialect/Async/CPU/test-async-parallel-for-2d.mlir +++ mlir/test/Integration/Dialect/Async/CPU/test-async-parallel-for-2d.mlir @@ -10,8 +10,8 @@ // RUN: -reconcile-unrealized-casts \ // RUN: | mlir-cpu-runner \ // RUN: -e entry -entry-point-result=void -O0 \ -// RUN: -shared-libs=%mlir_lib_dir/libmlir_runner_utils%shlibext \ -// RUN: -shared-libs=%mlir_lib_dir/libmlir_async_runtime%shlibext\ +// RUN: -shared-libs=%mlir_runner_utils \ +// RUN: -shared-libs=%mlir_async_runtime\ // RUN: | FileCheck %s --dump-input=always // RUN: mlir-opt %s -async-parallel-for \ @@ -25,8 +25,8 @@ // RUN: -reconcile-unrealized-casts \ // RUN: | mlir-cpu-runner \ // RUN: -e entry -entry-point-result=void -O0 \ -// RUN: -shared-libs=%mlir_lib_dir/libmlir_runner_utils%shlibext \ -// RUN: -shared-libs=%mlir_lib_dir/libmlir_async_runtime%shlibext\ +// RUN: -shared-libs=%mlir_runner_utils \ +// RUN: -shared-libs=%mlir_async_runtime\ // RUN: | FileCheck %s --dump-input=always // RUN: mlir-opt %s -async-parallel-for="async-dispatch=false \ @@ -43,8 +43,8 @@ // RUN: -reconcile-unrealized-casts \ // RUN: | mlir-cpu-runner \ // RUN: -e entry -entry-point-result=void -O0 \ -// RUN: -shared-libs=%mlir_lib_dir/libmlir_runner_utils%shlibext \ -// RUN: -shared-libs=%mlir_lib_dir/libmlir_async_runtime%shlibext\ +// RUN: -shared-libs=%mlir_runner_utils \ +// RUN: -shared-libs=%mlir_async_runtime\ // RUN: | FileCheck %s --dump-input=always func.func @entry() { Index: mlir/test/Integration/Dialect/Complex/CPU/correctness.mlir =================================================================== --- mlir/test/Integration/Dialect/Complex/CPU/correctness.mlir +++ mlir/test/Integration/Dialect/Complex/CPU/correctness.mlir @@ -6,7 +6,7 @@ // RUN: -convert-func-to-llvm -reconcile-unrealized-casts |\ // RUN: mlir-cpu-runner \ // RUN: -e entry -entry-point-result=void \ -// RUN: -shared-libs=%mlir_lib_dir/libmlir_c_runner_utils%shlibext |\ +// RUN: -shared-libs=%mlir_c_runner_utils |\ // RUN: FileCheck %s // XFAIL: target=aarch64{{.*}} Index: mlir/test/Integration/Dialect/LLVMIR/CPU/X86/lit.local.cfg =================================================================== --- mlir/test/Integration/Dialect/LLVMIR/CPU/X86/lit.local.cfg +++ mlir/test/Integration/Dialect/LLVMIR/CPU/X86/lit.local.cfg @@ -2,7 +2,3 @@ if platform.machine() != 'x86_64': config.unsupported = True - -# No JIT on win32. -if sys.platform == 'win32': - config.unsupported = True Index: mlir/test/Integration/Dialect/LLVMIR/CPU/X86/test-inline-asm-vector.mlir =================================================================== --- mlir/test/Integration/Dialect/LLVMIR/CPU/X86/test-inline-asm-vector.mlir +++ mlir/test/Integration/Dialect/LLVMIR/CPU/X86/test-inline-asm-vector.mlir @@ -1,6 +1,6 @@ // RUN: mlir-opt %s -convert-vector-to-llvm | \ // RUN: mlir-cpu-runner -e entry_point_with_all_constants -entry-point-result=void \ -// RUN: -shared-libs=%mlir_lib_dir/libmlir_c_runner_utils%shlibext +// RUN: -shared-libs=%mlir_c_runner_utils module { llvm.func @function_to_run(%a: vector<8xf32>, %b: vector<8xf32>) { Index: mlir/test/Integration/Dialect/LLVMIR/CPU/X86/test-inline-asm.mlir =================================================================== --- mlir/test/Integration/Dialect/LLVMIR/CPU/X86/test-inline-asm.mlir +++ mlir/test/Integration/Dialect/LLVMIR/CPU/X86/test-inline-asm.mlir @@ -1,5 +1,5 @@ // RUN: mlir-cpu-runner %s -e entry -entry-point-result=void \ -// RUN: -shared-libs=%mlir_lib_dir/libmlir_c_runner_utils%shlibext | \ +// RUN: -shared-libs=%mlir_c_runner_utils | \ // RUN: FileCheck %s module { Index: mlir/test/Integration/Dialect/LLVMIR/CPU/lit.local.cfg =================================================================== --- mlir/test/Integration/Dialect/LLVMIR/CPU/lit.local.cfg +++ mlir/test/Integration/Dialect/LLVMIR/CPU/lit.local.cfg @@ -1,9 +1,5 @@ import sys -# No JIT on win32. -if sys.platform == 'win32': - config.unsupported = True - lli_cmd = 'lli' if config.riscv_emulator_lli_executable: lli_cmd = config.riscv_emulator_lli_executable Index: mlir/test/Integration/Dialect/LLVMIR/CPU/test-vector-reductions-fp.mlir =================================================================== --- mlir/test/Integration/Dialect/LLVMIR/CPU/test-vector-reductions-fp.mlir +++ mlir/test/Integration/Dialect/LLVMIR/CPU/test-vector-reductions-fp.mlir @@ -1,5 +1,5 @@ // RUN: mlir-cpu-runner %s -e entry -entry-point-result=void \ -// RUN: -shared-libs=%mlir_lib_dir/libmlir_c_runner_utils%shlibext | \ +// RUN: -shared-libs=%mlir_c_runner_utils | \ // RUN: FileCheck %s // End-to-end test of all fp reduction intrinsics (not exhaustive unit tests). Index: mlir/test/Integration/Dialect/LLVMIR/CPU/test-vector-reductions-int.mlir =================================================================== --- mlir/test/Integration/Dialect/LLVMIR/CPU/test-vector-reductions-int.mlir +++ mlir/test/Integration/Dialect/LLVMIR/CPU/test-vector-reductions-int.mlir @@ -1,5 +1,5 @@ // RUN: mlir-cpu-runner %s -e entry -entry-point-result=void \ -// RUN: -shared-libs=%mlir_lib_dir/libmlir_c_runner_utils%shlibext | \ +// RUN: -shared-libs=%mlir_c_runner_utils | \ // RUN: FileCheck %s // End-to-end test of all int reduction intrinsics (not exhaustive unit tests). Index: mlir/test/Integration/Dialect/LLVMIR/CPU/test-vp-intrinsic.mlir =================================================================== --- mlir/test/Integration/Dialect/LLVMIR/CPU/test-vp-intrinsic.mlir +++ mlir/test/Integration/Dialect/LLVMIR/CPU/test-vp-intrinsic.mlir @@ -5,6 +5,9 @@ // RUN: --dlopen=%mlir_native_utils_lib_dir/libmlir_c_runner_utils%shlibext | \ // RUN: FileCheck %s +// %mlir_native_utils_lib_dir is incorrect on Windows +// UNSUPPORTED: system-windows + memref.global "private" @gv_i32 : memref<20xi32> = dense<[0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19]> Index: mlir/test/Integration/Dialect/Linalg/CPU/matmul-vs-matvec.mlir =================================================================== --- mlir/test/Integration/Dialect/Linalg/CPU/matmul-vs-matvec.mlir +++ mlir/test/Integration/Dialect/Linalg/CPU/matmul-vs-matvec.mlir @@ -1,6 +1,6 @@ // RUN: mlir-opt %s -convert-linalg-to-loops -convert-scf-to-cf -convert-linalg-to-llvm -expand-strided-metadata -lower-affine -convert-arith-to-llvm -finalize-memref-to-llvm -convert-func-to-llvm -reconcile-unrealized-casts | \ // RUN: mlir-cpu-runner -O3 -e main -entry-point-result=void \ -// RUN: -shared-libs=%mlir_lib_dir/libmlir_runner_utils%shlibext \ +// RUN: -shared-libs=%mlir_runner_utils \ // RUN: | FileCheck %s func.func private @printMemrefF32(memref<*xf32>) Index: mlir/test/Integration/Dialect/Linalg/CPU/rank-reducing-subview.mlir =================================================================== --- mlir/test/Integration/Dialect/Linalg/CPU/rank-reducing-subview.mlir +++ mlir/test/Integration/Dialect/Linalg/CPU/rank-reducing-subview.mlir @@ -1,6 +1,6 @@ // RUN: mlir-opt %s -convert-linalg-to-loops -convert-scf-to-cf -convert-linalg-to-llvm -expand-strided-metadata -lower-affine -convert-arith-to-llvm -finalize-memref-to-llvm -convert-func-to-llvm -reconcile-unrealized-casts | \ // RUN: mlir-cpu-runner -O3 -e main -entry-point-result=void \ -// RUN: -shared-libs=%mlir_lib_dir/libmlir_runner_utils%shlibext \ +// RUN: -shared-libs=%mlir_runner_utils \ // RUN: | FileCheck %s func.func private @printMemrefF32(memref<*xf32>) Index: mlir/test/Integration/Dialect/Linalg/CPU/test-collapse-tensor.mlir =================================================================== --- mlir/test/Integration/Dialect/Linalg/CPU/test-collapse-tensor.mlir +++ mlir/test/Integration/Dialect/Linalg/CPU/test-collapse-tensor.mlir @@ -4,7 +4,7 @@ // RUN: -expand-strided-metadata -lower-affine \ // RUN: -finalize-memref-to-llvm -convert-func-to-llvm -reconcile-unrealized-casts | \ // RUN: mlir-cpu-runner -e main -entry-point-result=void \ -// RUN: -shared-libs=%mlir_lib_dir/libmlir_runner_utils%shlibext \ +// RUN: -shared-libs=%mlir_runner_utils \ // RUN: | FileCheck %s Index: mlir/test/Integration/Dialect/Linalg/CPU/test-conv-1d-call.mlir =================================================================== --- mlir/test/Integration/Dialect/Linalg/CPU/test-conv-1d-call.mlir +++ mlir/test/Integration/Dialect/Linalg/CPU/test-conv-1d-call.mlir @@ -1,12 +1,12 @@ // RUN: mlir-opt %s -test-transform-dialect-erase-schedule -convert-linalg-to-loops -convert-scf-to-cf -convert-linalg-to-llvm -expand-strided-metadata -lower-affine -convert-arith-to-llvm -convert-scf-to-cf --finalize-memref-to-llvm -convert-func-to-llvm -reconcile-unrealized-casts | \ // RUN: mlir-cpu-runner -e main -entry-point-result=void \ -// RUN: -shared-libs=%mlir_lib_dir/libmlir_runner_utils%shlibext \ +// RUN: -shared-libs=%mlir_runner_utils \ // RUN: | FileCheck %s // RUN: mlir-opt %s -test-transform-dialect-interpreter -test-transform-dialect-erase-schedule -convert-linalg-to-loops -convert-scf-to-cf \ // RUN: -convert-linalg-to-llvm -expand-strided-metadata -lower-affine -convert-arith-to-llvm -convert-scf-to-cf --finalize-memref-to-llvm -convert-func-to-llvm -reconcile-unrealized-casts | \ // RUN: mlir-cpu-runner -e main -entry-point-result=void \ -// RUN: -shared-libs=%mlir_lib_dir/libmlir_runner_utils%shlibext \ +// RUN: -shared-libs=%mlir_runner_utils \ // RUN: | FileCheck %s func.func private @printMemrefF32(memref<*xf32>) Index: mlir/test/Integration/Dialect/Linalg/CPU/test-conv-1d-nwc-wcf-call.mlir =================================================================== --- mlir/test/Integration/Dialect/Linalg/CPU/test-conv-1d-nwc-wcf-call.mlir +++ mlir/test/Integration/Dialect/Linalg/CPU/test-conv-1d-nwc-wcf-call.mlir @@ -1,12 +1,12 @@ // RUN: mlir-opt %s -test-transform-dialect-erase-schedule -convert-linalg-to-loops -convert-scf-to-cf -convert-linalg-to-llvm -expand-strided-metadata -lower-affine -convert-arith-to-llvm -convert-scf-to-cf --finalize-memref-to-llvm -convert-func-to-llvm -reconcile-unrealized-casts | \ // RUN: mlir-cpu-runner -e main -entry-point-result=void \ -// RUN: -shared-libs=%mlir_lib_dir/libmlir_runner_utils%shlibext \ +// RUN: -shared-libs=%mlir_runner_utils \ // RUN: | FileCheck %s // RUN: mlir-opt %s -test-transform-dialect-interpreter -test-transform-dialect-erase-schedule -convert-linalg-to-loops -convert-scf-to-cf \ // RUN: -convert-linalg-to-llvm -expand-strided-metadata -lower-affine -convert-arith-to-llvm -convert-scf-to-cf --finalize-memref-to-llvm -convert-func-to-llvm -reconcile-unrealized-casts | \ // RUN: mlir-cpu-runner -e main -entry-point-result=void \ -// RUN: -shared-libs=%mlir_lib_dir/libmlir_runner_utils%shlibext \ +// RUN: -shared-libs=%mlir_runner_utils \ // RUN: | FileCheck %s func.func private @printMemrefF32(memref<*xf32>) Index: mlir/test/Integration/Dialect/Linalg/CPU/test-conv-2d-call.mlir =================================================================== --- mlir/test/Integration/Dialect/Linalg/CPU/test-conv-2d-call.mlir +++ mlir/test/Integration/Dialect/Linalg/CPU/test-conv-2d-call.mlir @@ -1,12 +1,12 @@ // RUN: mlir-opt %s -test-transform-dialect-erase-schedule -convert-linalg-to-loops -convert-scf-to-cf -convert-linalg-to-llvm -expand-strided-metadata -lower-affine -convert-arith-to-llvm -convert-scf-to-cf --finalize-memref-to-llvm -convert-func-to-llvm -reconcile-unrealized-casts | \ // RUN: mlir-cpu-runner -e main -entry-point-result=void \ -// RUN: -shared-libs=%mlir_lib_dir/libmlir_runner_utils%shlibext \ +// RUN: -shared-libs=%mlir_runner_utils \ // RUN: | FileCheck %s // RUN: mlir-opt %s -test-transform-dialect-interpreter -test-transform-dialect-erase-schedule -convert-linalg-to-loops -convert-scf-to-cf \ // RUN: -convert-linalg-to-llvm -expand-strided-metadata -lower-affine -convert-arith-to-llvm -convert-scf-to-cf --finalize-memref-to-llvm -convert-func-to-llvm -reconcile-unrealized-casts | \ // RUN: mlir-cpu-runner -e main -entry-point-result=void \ -// RUN: -shared-libs=%mlir_lib_dir/libmlir_runner_utils%shlibext \ +// RUN: -shared-libs=%mlir_runner_utils \ // RUN: | FileCheck %s func.func private @printMemrefF32(memref<*xf32>) Index: mlir/test/Integration/Dialect/Linalg/CPU/test-conv-2d-nhwc-hwcf-call.mlir =================================================================== --- mlir/test/Integration/Dialect/Linalg/CPU/test-conv-2d-nhwc-hwcf-call.mlir +++ mlir/test/Integration/Dialect/Linalg/CPU/test-conv-2d-nhwc-hwcf-call.mlir @@ -1,12 +1,12 @@ // RUN: mlir-opt %s -test-transform-dialect-erase-schedule -convert-linalg-to-loops -convert-scf-to-cf -convert-linalg-to-llvm -expand-strided-metadata -lower-affine -convert-arith-to-llvm -convert-scf-to-cf --finalize-memref-to-llvm -convert-func-to-llvm -reconcile-unrealized-casts | \ // RUN: mlir-cpu-runner -e main -entry-point-result=void \ -// RUN: -shared-libs=%mlir_lib_dir/libmlir_runner_utils%shlibext \ +// RUN: -shared-libs=%mlir_runner_utils \ // RUN: | FileCheck %s // RUN: mlir-opt %s -test-transform-dialect-interpreter -test-transform-dialect-erase-schedule -convert-linalg-to-loops -convert-scf-to-cf \ // RUN: -convert-linalg-to-llvm -expand-strided-metadata -lower-affine -convert-arith-to-llvm -convert-scf-to-cf --finalize-memref-to-llvm -convert-func-to-llvm -reconcile-unrealized-casts | \ // RUN: mlir-cpu-runner -e main -entry-point-result=void \ -// RUN: -shared-libs=%mlir_lib_dir/libmlir_runner_utils%shlibext \ +// RUN: -shared-libs=%mlir_runner_utils \ // RUN: | FileCheck %s func.func private @printMemrefF32(memref<*xf32>) Index: mlir/test/Integration/Dialect/Linalg/CPU/test-conv-3d-call.mlir =================================================================== --- mlir/test/Integration/Dialect/Linalg/CPU/test-conv-3d-call.mlir +++ mlir/test/Integration/Dialect/Linalg/CPU/test-conv-3d-call.mlir @@ -1,12 +1,12 @@ // RUN: mlir-opt %s -test-transform-dialect-erase-schedule -convert-linalg-to-loops -convert-scf-to-cf -convert-linalg-to-llvm -expand-strided-metadata -lower-affine -convert-arith-to-llvm -convert-scf-to-cf --finalize-memref-to-llvm -convert-func-to-llvm -reconcile-unrealized-casts | \ // RUN: mlir-cpu-runner -e main -entry-point-result=void \ -// RUN: -shared-libs=%mlir_lib_dir/libmlir_runner_utils%shlibext \ +// RUN: -shared-libs=%mlir_runner_utils \ // RUN: | FileCheck %s // RUN: mlir-opt %s -test-transform-dialect-interpreter -test-transform-dialect-erase-schedule -convert-linalg-to-loops -convert-scf-to-cf \ // RUN: -convert-linalg-to-llvm -expand-strided-metadata -lower-affine -convert-arith-to-llvm -convert-scf-to-cf --finalize-memref-to-llvm -convert-func-to-llvm -reconcile-unrealized-casts | \ // RUN: mlir-cpu-runner -e main -entry-point-result=void \ -// RUN: -shared-libs=%mlir_lib_dir/libmlir_runner_utils%shlibext \ +// RUN: -shared-libs=%mlir_runner_utils \ // RUN: | FileCheck %s func.func private @printMemrefF32(memref<*xf32>) Index: mlir/test/Integration/Dialect/Linalg/CPU/test-conv-3d-ndhwc-dhwcf-call.mlir =================================================================== --- mlir/test/Integration/Dialect/Linalg/CPU/test-conv-3d-ndhwc-dhwcf-call.mlir +++ mlir/test/Integration/Dialect/Linalg/CPU/test-conv-3d-ndhwc-dhwcf-call.mlir @@ -1,12 +1,12 @@ // RUN: mlir-opt %s -test-transform-dialect-erase-schedule -convert-linalg-to-loops -convert-scf-to-cf -convert-linalg-to-llvm -expand-strided-metadata -lower-affine -convert-arith-to-llvm -convert-scf-to-cf --finalize-memref-to-llvm -convert-func-to-llvm -reconcile-unrealized-casts | \ // RUN: mlir-cpu-runner -e main -entry-point-result=void \ -// RUN: -shared-libs=%mlir_lib_dir/libmlir_runner_utils%shlibext \ +// RUN: -shared-libs=%mlir_runner_utils \ // RUN: | FileCheck %s // RUN: mlir-opt %s -test-transform-dialect-interpreter -test-transform-dialect-erase-schedule -convert-linalg-to-loops -convert-scf-to-cf \ // RUN: -convert-linalg-to-llvm -expand-strided-metadata -lower-affine -convert-arith-to-llvm -convert-scf-to-cf --finalize-memref-to-llvm -convert-func-to-llvm -reconcile-unrealized-casts | \ // RUN: mlir-cpu-runner -e main -entry-point-result=void \ -// RUN: -shared-libs=%mlir_lib_dir/libmlir_runner_utils%shlibext \ +// RUN: -shared-libs=%mlir_runner_utils \ // RUN: | FileCheck %s func.func private @printMemrefF32(memref<*xf32>) Index: mlir/test/Integration/Dialect/Linalg/CPU/test-elementwise.mlir =================================================================== --- mlir/test/Integration/Dialect/Linalg/CPU/test-elementwise.mlir +++ mlir/test/Integration/Dialect/Linalg/CPU/test-elementwise.mlir @@ -4,7 +4,7 @@ // RUN: -convert-linalg-to-llvm --finalize-memref-to-llvm -convert-func-to-llvm \ // RUN: -reconcile-unrealized-casts | \ // RUN: mlir-cpu-runner -e main -entry-point-result=void \ -// RUN: -shared-libs=%mlir_lib_dir/libmlir_runner_utils%shlibext \ +// RUN: -shared-libs=%mlir_runner_utils \ // RUN: | FileCheck %s func.func @main() { Index: mlir/test/Integration/Dialect/Linalg/CPU/test-expand-tensor.mlir =================================================================== --- mlir/test/Integration/Dialect/Linalg/CPU/test-expand-tensor.mlir +++ mlir/test/Integration/Dialect/Linalg/CPU/test-expand-tensor.mlir @@ -4,7 +4,7 @@ // RUN: -expand-strided-metadata -lower-affine \ // RUN: -finalize-memref-to-llvm -convert-func-to-llvm -reconcile-unrealized-casts | \ // RUN: mlir-cpu-runner -e main -entry-point-result=void \ -// RUN: -shared-libs=%mlir_lib_dir/libmlir_runner_utils%shlibext \ +// RUN: -shared-libs=%mlir_runner_utils \ // RUN: | FileCheck %s Index: mlir/test/Integration/Dialect/Linalg/CPU/test-one-shot-bufferize.mlir =================================================================== --- mlir/test/Integration/Dialect/Linalg/CPU/test-one-shot-bufferize.mlir +++ mlir/test/Integration/Dialect/Linalg/CPU/test-one-shot-bufferize.mlir @@ -3,7 +3,7 @@ // RUN: mlir-opt -pass-pipeline="builtin.module(func.func(canonicalize,convert-scf-to-cf),convert-vector-to-llvm,expand-strided-metadata,lower-affine,convert-arith-to-llvm,finalize-memref-to-llvm,convert-func-to-llvm,reconcile-unrealized-casts)" | \ // RUN: mlir-cpu-runner -O3 -e main -entry-point-result=void \ -// RUN: -shared-libs=%mlir_lib_dir/libmlir_runner_utils%shlibext,%mlir_lib_dir/libmlir_c_runner_utils%shlibext |\ +// RUN: -shared-libs=%mlir_runner_utils,%mlir_c_runner_utils |\ // RUN: FileCheck %s #map0 = affine_map<(d0, d1)[s0] -> ((d1 - d0) ceildiv s0)> Index: mlir/test/Integration/Dialect/Linalg/CPU/test-padtensor.mlir =================================================================== --- mlir/test/Integration/Dialect/Linalg/CPU/test-padtensor.mlir +++ mlir/test/Integration/Dialect/Linalg/CPU/test-padtensor.mlir @@ -4,7 +4,7 @@ // RUN: -finalizing-bufferize -buffer-deallocation \ // RUN: -convert-linalg-to-loops -convert-scf-to-cf -convert-linalg-to-llvm -expand-strided-metadata -lower-affine -convert-arith-to-llvm -finalize-memref-to-llvm -convert-func-to-llvm -reconcile-unrealized-casts | \ // RUN: mlir-cpu-runner -e main -entry-point-result=void \ -// RUN: -shared-libs=%mlir_lib_dir/libmlir_c_runner_utils%shlibext,%mlir_lib_dir/libmlir_runner_utils%shlibext \ +// RUN: -shared-libs=%mlir_c_runner_utils,%mlir_runner_utils \ // RUN: | FileCheck %s Index: mlir/test/Integration/Dialect/Linalg/CPU/test-subtensor-insert-multiple-uses.mlir =================================================================== --- mlir/test/Integration/Dialect/Linalg/CPU/test-subtensor-insert-multiple-uses.mlir +++ mlir/test/Integration/Dialect/Linalg/CPU/test-subtensor-insert-multiple-uses.mlir @@ -3,7 +3,7 @@ // RUN: -finalizing-bufferize -buffer-deallocation \ // RUN: -convert-linalg-to-loops -convert-scf-to-cf -convert-linalg-to-llvm -expand-strided-metadata -lower-affine -convert-arith-to-llvm --finalize-memref-to-llvm -convert-func-to-llvm -reconcile-unrealized-casts | \ // RUN: mlir-cpu-runner -e main -entry-point-result=void \ -// RUN: -shared-libs=%mlir_lib_dir/libmlir_c_runner_utils%shlibext,%mlir_lib_dir/libmlir_runner_utils%shlibext \ +// RUN: -shared-libs=%mlir_c_runner_utils,%mlir_runner_utils \ // RUN: | FileCheck %s func.func @main() { Index: mlir/test/Integration/Dialect/Linalg/CPU/test-subtensor-insert.mlir =================================================================== --- mlir/test/Integration/Dialect/Linalg/CPU/test-subtensor-insert.mlir +++ mlir/test/Integration/Dialect/Linalg/CPU/test-subtensor-insert.mlir @@ -3,7 +3,7 @@ // RUN: -finalizing-bufferize -buffer-deallocation \ // RUN: -convert-linalg-to-loops -convert-scf-to-cf -convert-linalg-to-llvm -expand-strided-metadata -lower-affine -convert-arith-to-llvm --finalize-memref-to-llvm -convert-func-to-llvm -reconcile-unrealized-casts | \ // RUN: mlir-cpu-runner -e main -entry-point-result=void \ -// RUN: -shared-libs=%mlir_lib_dir/libmlir_runner_utils%shlibext \ +// RUN: -shared-libs=%mlir_runner_utils \ // RUN: | FileCheck %s func.func @main() { Index: mlir/test/Integration/Dialect/Linalg/CPU/test-tensor-e2e.mlir =================================================================== --- mlir/test/Integration/Dialect/Linalg/CPU/test-tensor-e2e.mlir +++ mlir/test/Integration/Dialect/Linalg/CPU/test-tensor-e2e.mlir @@ -2,7 +2,7 @@ // RUN: -tensor-bufferize -func-bufferize -finalizing-bufferize -buffer-deallocation -convert-linalg-to-loops \ // RUN: -convert-linalg-to-llvm --finalize-memref-to-llvm -convert-func-to-llvm -reconcile-unrealized-casts | \ // RUN: mlir-cpu-runner -e main -entry-point-result=void \ -// RUN: -shared-libs=%mlir_lib_dir/libmlir_runner_utils%shlibext \ +// RUN: -shared-libs=%mlir_runner_utils \ // RUN: | FileCheck %s func.func @foo() -> tensor<4xf32> { Index: mlir/test/Integration/Dialect/Linalg/CPU/test-tensor-matmul.mlir =================================================================== --- mlir/test/Integration/Dialect/Linalg/CPU/test-tensor-matmul.mlir +++ mlir/test/Integration/Dialect/Linalg/CPU/test-tensor-matmul.mlir @@ -3,7 +3,7 @@ // RUN: -tensor-bufferize -func-bufferize -finalizing-bufferize -buffer-deallocation -convert-linalg-to-loops -convert-scf-to-cf \ // RUN: -convert-linalg-to-llvm -expand-strided-metadata -lower-affine -convert-arith-to-llvm -convert-scf-to-cf --finalize-memref-to-llvm -convert-func-to-llvm -reconcile-unrealized-casts | \ // RUN: mlir-cpu-runner -e main -entry-point-result=void \ -// RUN: -shared-libs=%mlir_lib_dir/libmlir_c_runner_utils%shlibext,%mlir_lib_dir/libmlir_runner_utils%shlibext \ +// RUN: -shared-libs=%mlir_c_runner_utils,%mlir_runner_utils \ // RUN: | FileCheck %s // RUN: mlir-opt %s -test-transform-dialect-interpreter -test-transform-dialect-erase-schedule -linalg-bufferize \ @@ -12,7 +12,7 @@ // RUN: -finalizing-bufferize -convert-linalg-to-loops -convert-scf-to-cf -convert-scf-to-cf \ // RUN: -convert-linalg-to-llvm -expand-strided-metadata -lower-affine -convert-arith-to-llvm -convert-scf-to-cf --finalize-memref-to-llvm -convert-func-to-llvm -reconcile-unrealized-casts | \ // RUN: mlir-cpu-runner -e main -entry-point-result=void \ -// RUN: -shared-libs=%mlir_lib_dir/libmlir_c_runner_utils%shlibext,%mlir_lib_dir/libmlir_runner_utils%shlibext \ +// RUN: -shared-libs=%mlir_c_runner_utils,%mlir_runner_utils \ // RUN: | FileCheck %s func.func @main() { Index: mlir/test/Integration/Dialect/Memref/cast-runtime-verification.mlir =================================================================== --- mlir/test/Integration/Dialect/Memref/cast-runtime-verification.mlir +++ mlir/test/Integration/Dialect/Memref/cast-runtime-verification.mlir @@ -2,7 +2,7 @@ // RUN: -test-cf-assert \ // RUN: -convert-func-to-llvm -reconcile-unrealized-casts | \ // RUN: mlir-cpu-runner -e main -entry-point-result=void \ -// RUN: -shared-libs=%mlir_lib_dir/libmlir_runner_utils%shlibext 2>&1 | \ +// RUN: -shared-libs=%mlir_runner_utils 2>&1 | \ // RUN: FileCheck %s func.func @cast_to_static_dim(%m: memref) -> memref<10xf32> { Index: mlir/test/Integration/Dialect/SparseTensor/CPU/concatenate.mlir =================================================================== --- mlir/test/Integration/Dialect/SparseTensor/CPU/concatenate.mlir +++ mlir/test/Integration/Dialect/SparseTensor/CPU/concatenate.mlir @@ -2,7 +2,7 @@ // DEFINE: %{compile} = mlir-opt %s --sparse-compiler=%{option} // DEFINE: %{run} = mlir-cpu-runner \ // DEFINE: -e entry -entry-point-result=void \ -// DEFINE: -shared-libs=%mlir_lib_dir/libmlir_c_runner_utils%shlibext,%mlir_lib_dir/libmlir_runner_utils%shlibext | \ +// DEFINE: -shared-libs=%mlir_c_runner_utils,%mlir_runner_utils | \ // DEFINE: FileCheck %s // // RUN: %{compile} | %{run} @@ -22,7 +22,7 @@ // REDEFINE: --entry-function=entry_lli \ // REDEFINE: --extra-module=%S/Inputs/main_for_lli.ll \ // REDEFINE: %VLA_ARCH_ATTR_OPTIONS \ -// REDEFINE: --dlopen=%mlir_native_utils_lib_dir/libmlir_c_runner_utils%shlibext --dlopen=%mlir_lib_dir/libmlir_runner_utils%shlibext | \ +// REDEFINE: --dlopen=%mlir_native_utils_lib_dir/libmlir_c_runner_utils%shlibext --dlopen=%mlir_runner_utils | \ // REDEFINE: FileCheck %s // RUN: %{compile} | mlir-translate -mlir-to-llvmir | %{run} Index: mlir/test/Integration/Dialect/SparseTensor/CPU/dense_output.mlir =================================================================== --- mlir/test/Integration/Dialect/SparseTensor/CPU/dense_output.mlir +++ mlir/test/Integration/Dialect/SparseTensor/CPU/dense_output.mlir @@ -3,7 +3,7 @@ // DEFINE: %{run} = TENSOR0="%mlir_src_dir/test/Integration/data/test.mtx" \ // DEFINE: mlir-cpu-runner \ // DEFINE: -e entry -entry-point-result=void \ -// DEFINE: -shared-libs=%mlir_lib_dir/libmlir_c_runner_utils%shlibext,%mlir_lib_dir/libmlir_runner_utils%shlibext | \ +// DEFINE: -shared-libs=%mlir_c_runner_utils,%mlir_runner_utils | \ // DEFINE: FileCheck %s // // RUN: %{compile} | %{run} @@ -24,7 +24,7 @@ // REDEFINE: --entry-function=entry_lli \ // REDEFINE: --extra-module=%S/Inputs/main_for_lli.ll \ // REDEFINE: %VLA_ARCH_ATTR_OPTIONS \ -// REDEFINE: --dlopen=%mlir_native_utils_lib_dir/libmlir_c_runner_utils%shlibext --dlopen=%mlir_lib_dir/libmlir_runner_utils%shlibext | \ +// REDEFINE: --dlopen=%mlir_native_utils_lib_dir/libmlir_c_runner_utils%shlibext --dlopen=%mlir_runner_utils | \ // REDEFINE: FileCheck %s // RUN: %{compile} | mlir-translate -mlir-to-llvmir | %{run} Index: mlir/test/Integration/Dialect/SparseTensor/CPU/dense_output_bf16.mlir =================================================================== --- mlir/test/Integration/Dialect/SparseTensor/CPU/dense_output_bf16.mlir +++ mlir/test/Integration/Dialect/SparseTensor/CPU/dense_output_bf16.mlir @@ -2,7 +2,7 @@ // DEFINE: %{command} = mlir-opt %s --sparse-compiler=%{option} | \ // DEFINE: mlir-cpu-runner \ // DEFINE: -e entry -entry-point-result=void \ -// DEFINE: -shared-libs=%mlir_lib_dir/libmlir_c_runner_utils%shlibext | \ +// DEFINE: -shared-libs=%mlir_c_runner_utils | \ // DEFINE: FileCheck %s // // RUN: %{command} Index: mlir/test/Integration/Dialect/SparseTensor/CPU/dense_output_f16.mlir =================================================================== --- mlir/test/Integration/Dialect/SparseTensor/CPU/dense_output_f16.mlir +++ mlir/test/Integration/Dialect/SparseTensor/CPU/dense_output_f16.mlir @@ -2,7 +2,7 @@ // DEFINE: %{compile} = mlir-opt %s --sparse-compiler=%{option} // DEFINE: %{run} = mlir-cpu-runner \ // DEFINE: -e entry -entry-point-result=void \ -// DEFINE: -shared-libs=%mlir_lib_dir/libmlir_c_runner_utils%shlibext | \ +// DEFINE: -shared-libs=%mlir_c_runner_utils | \ // DEFINE: FileCheck %s // // RUN: %{compile} | %{run} Index: mlir/test/Integration/Dialect/SparseTensor/CPU/lit.local.cfg =================================================================== --- mlir/test/Integration/Dialect/SparseTensor/CPU/lit.local.cfg +++ mlir/test/Integration/Dialect/SparseTensor/CPU/lit.local.cfg @@ -1,6 +1,6 @@ import sys -# No JIT on win32. +# FIXME: %mlir_native_utils_lib_dir is set incorrectly on Windows if sys.platform == 'win32': config.unsupported = True Index: mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_abs.mlir =================================================================== --- mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_abs.mlir +++ mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_abs.mlir @@ -2,7 +2,7 @@ // DEFINE: %{compile} = mlir-opt %s --sparse-compiler=%{option} // DEFINE: %{run} = mlir-cpu-runner \ // DEFINE: -e entry -entry-point-result=void \ -// DEFINE: -shared-libs=%mlir_lib_dir/libmlir_c_runner_utils%shlibext | \ +// DEFINE: -shared-libs=%mlir_c_runner_utils | \ // DEFINE: FileCheck %s // // RUN: %{compile} | %{run} Index: mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_binary.mlir =================================================================== --- mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_binary.mlir +++ mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_binary.mlir @@ -2,7 +2,7 @@ // DEFINE: %{compile} = mlir-opt %s --sparse-compiler=%{option} // DEFINE: %{run} = mlir-cpu-runner \ // DEFINE: -e entry -entry-point-result=void \ -// DEFINE: -shared-libs=%mlir_lib_dir/libmlir_c_runner_utils%shlibext | \ +// DEFINE: -shared-libs=%mlir_c_runner_utils | \ // DEFINE: FileCheck %s // // RUN: %{compile} | %{run} Index: mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_cast.mlir =================================================================== --- mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_cast.mlir +++ mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_cast.mlir @@ -2,7 +2,7 @@ // DEFINE: %{compile} = mlir-opt %s --sparse-compiler=%{option} // DEFINE: %{run} = mlir-cpu-runner \ // DEFINE: -e entry -entry-point-result=void \ -// DEFINE: -shared-libs=%mlir_lib_dir/libmlir_c_runner_utils%shlibext | \ +// DEFINE: -shared-libs=%mlir_c_runner_utils | \ // DEFINE: FileCheck %s // // RUN: %{compile} | %{run} Index: mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_codegen_dim.mlir =================================================================== --- mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_codegen_dim.mlir +++ mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_codegen_dim.mlir @@ -2,7 +2,7 @@ // DEFINE: %{compile} = mlir-opt %s --sparse-compiler=%{option} // DEFINE: %{run} = mlir-cpu-runner \ // DEFINE: -e entry -entry-point-result=void \ -// DEFINE: -shared-libs=%mlir_lib_dir/libmlir_c_runner_utils%shlibext | \ +// DEFINE: -shared-libs=%mlir_c_runner_utils | \ // DEFINE: FileCheck %s // // RUN: %{compile} | %{run} Index: mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_codegen_foreach.mlir =================================================================== --- mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_codegen_foreach.mlir +++ mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_codegen_foreach.mlir @@ -2,7 +2,7 @@ // DEFINE: %{compile} = mlir-opt %s --sparse-compiler=%{option} // DEFINE: %{run} = mlir-cpu-runner \ // DEFINE: -e entry -entry-point-result=void \ -// DEFINE: -shared-libs=%mlir_lib_dir/libmlir_c_runner_utils%shlibext | \ +// DEFINE: -shared-libs=%mlir_c_runner_utils | \ // DEFINE: FileCheck %s // // RUN: %{compile} | %{run} Index: mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_complex32.mlir =================================================================== --- mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_complex32.mlir +++ mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_complex32.mlir @@ -2,7 +2,7 @@ // DEFINE: %{compile} = mlir-opt %s --sparse-compiler=%{option} // DEFINE: %{run} = mlir-cpu-runner \ // DEFINE: -e entry -entry-point-result=void \ -// DEFINE: -shared-libs=%mlir_lib_dir/libmlir_c_runner_utils%shlibext | \ +// DEFINE: -shared-libs=%mlir_c_runner_utils | \ // DEFINE: FileCheck %s // // RUN: %{compile} | %{run} Index: mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_complex64.mlir =================================================================== --- mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_complex64.mlir +++ mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_complex64.mlir @@ -2,7 +2,7 @@ // DEFINE: %{compile} = mlir-opt %s --sparse-compiler=%{option} // DEFINE: %{run} = mlir-cpu-runner \ // DEFINE: -e entry -entry-point-result=void \ -// DEFINE: -shared-libs=%mlir_lib_dir/libmlir_c_runner_utils%shlibext | \ +// DEFINE: -shared-libs=%mlir_c_runner_utils | \ // DEFINE: FileCheck %s // // RUN: %{compile} | %{run} Index: mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_complex_ops.mlir =================================================================== --- mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_complex_ops.mlir +++ mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_complex_ops.mlir @@ -2,7 +2,7 @@ // DEFINE: %{compile} = mlir-opt %s --sparse-compiler=%{option} // DEFINE: %{run} = mlir-cpu-runner \ // DEFINE: -e entry -entry-point-result=void \ -// DEFINE: -shared-libs=%mlir_lib_dir/libmlir_c_runner_utils%shlibext | \ +// DEFINE: -shared-libs=%mlir_c_runner_utils | \ // DEFINE: FileCheck %s // // RUN: %{compile} | %{run} Index: mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_constant_to_sparse_tensor.mlir =================================================================== --- mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_constant_to_sparse_tensor.mlir +++ mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_constant_to_sparse_tensor.mlir @@ -2,7 +2,7 @@ // DEFINE: %{compile} = mlir-opt %s --sparse-compiler=%{option} // DEFINE: %{run} = mlir-cpu-runner \ // DEFINE: -e entry -entry-point-result=void \ -// DEFINE: -shared-libs=%mlir_lib_dir/libmlir_c_runner_utils%shlibext | \ +// DEFINE: -shared-libs=%mlir_c_runner_utils | \ // DEFINE: FileCheck %s // // RUN: %{compile} | %{run} Index: mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_conv_1d_nwc_wcf.mlir =================================================================== --- mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_conv_1d_nwc_wcf.mlir +++ mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_conv_1d_nwc_wcf.mlir @@ -2,7 +2,7 @@ // DEFINE: %{compile} = mlir-opt %s --sparse-compiler=%{option} // DEFINE: %{run} = mlir-cpu-runner \ // DEFINE: -e entry -entry-point-result=void \ -// DEFINE: -shared-libs=%mlir_lib_dir/libmlir_c_runner_utils%shlibext | \ +// DEFINE: -shared-libs=%mlir_c_runner_utils | \ // DEFINE: FileCheck %s // // RUN: %{compile} | %{run} Index: mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_conv_2d.mlir =================================================================== --- mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_conv_2d.mlir +++ mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_conv_2d.mlir @@ -2,7 +2,7 @@ // DEFINE: %{compile} = mlir-opt %s --sparse-compiler=%{option} // DEFINE: %{run} = mlir-cpu-runner \ // DEFINE: -e entry -entry-point-result=void \ -// DEFINE: -shared-libs=%mlir_lib_dir/libmlir_c_runner_utils%shlibext | \ +// DEFINE: -shared-libs=%mlir_c_runner_utils | \ // DEFINE: FileCheck %s // // RUN: %{compile} | %{run} Index: mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_conv_2d_nhwc_hwcf.mlir =================================================================== --- mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_conv_2d_nhwc_hwcf.mlir +++ mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_conv_2d_nhwc_hwcf.mlir @@ -2,7 +2,7 @@ // DEFINE: %{compile} = mlir-opt %s --sparse-compiler=%{option} // DEFINE: %{run} = mlir-cpu-runner \ // DEFINE: -e entry -entry-point-result=void \ -// DEFINE: -shared-libs=%mlir_lib_dir/libmlir_c_runner_utils%shlibext | \ +// DEFINE: -shared-libs=%mlir_c_runner_utils | \ // DEFINE: FileCheck %s // // RUN: %{compile} | %{run} Index: mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_conv_3d.mlir =================================================================== --- mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_conv_3d.mlir +++ mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_conv_3d.mlir @@ -2,7 +2,7 @@ // DEFINE: %{compile} = mlir-opt %s --sparse-compiler=%{option} // DEFINE: %{run} = mlir-cpu-runner \ // DEFINE: -e entry -entry-point-result=void \ -// DEFINE: -shared-libs=%mlir_lib_dir/libmlir_c_runner_utils%shlibext | \ +// DEFINE: -shared-libs=%mlir_c_runner_utils | \ // DEFINE: FileCheck %s // // RUN: %{compile} | %{run} Index: mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_conv_3d_ndhwc_dhwcf.mlir =================================================================== --- mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_conv_3d_ndhwc_dhwcf.mlir +++ mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_conv_3d_ndhwc_dhwcf.mlir @@ -2,7 +2,7 @@ // DEFINE: %{compile} = mlir-opt %s --sparse-compiler=%{option} // DEFINE: %{run} = mlir-cpu-runner \ // DEFINE: -e entry -entry-point-result=void \ -// DEFINE: -shared-libs=%mlir_lib_dir/libmlir_c_runner_utils%shlibext | \ +// DEFINE: -shared-libs=%mlir_c_runner_utils | \ // DEFINE: FileCheck %s // // RUN: %{compile} | %{run} Index: mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_conversion.mlir =================================================================== --- mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_conversion.mlir +++ mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_conversion.mlir @@ -2,7 +2,7 @@ // DEFINE: %{compile} = mlir-opt %s --sparse-compiler=%{option} // DEFINE: %{run} = mlir-cpu-runner \ // DEFINE: -e entry -entry-point-result=void \ -// DEFINE: -shared-libs=%mlir_lib_dir/libmlir_c_runner_utils%shlibext | \ +// DEFINE: -shared-libs=%mlir_c_runner_utils | \ // DEFINE: FileCheck %s // // RUN: %{compile} | %{run} Index: mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_conversion_dyn.mlir =================================================================== --- mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_conversion_dyn.mlir +++ mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_conversion_dyn.mlir @@ -2,7 +2,7 @@ // DEFINE: %{compile} = mlir-opt %s --sparse-compiler=%{option} // DEFINE: %{run} = mlir-cpu-runner \ // DEFINE: -e entry -entry-point-result=void \ -// DEFINE: -shared-libs=%mlir_lib_dir/libmlir_c_runner_utils%shlibext,%mlir_lib_dir/libmlir_runner_utils%shlibext | \ +// DEFINE: -shared-libs=%mlir_c_runner_utils,%mlir_runner_utils | \ // DEFINE: FileCheck %s // // RUN: %{compile} | %{run} @@ -22,7 +22,7 @@ // REDEFINE: --entry-function=entry_lli \ // REDEFINE: --extra-module=%S/Inputs/main_for_lli.ll \ // REDEFINE: %VLA_ARCH_ATTR_OPTIONS \ -// REDEFINE: --dlopen=%mlir_native_utils_lib_dir/libmlir_c_runner_utils%shlibext --dlopen=%mlir_lib_dir/libmlir_runner_utils%shlibext | \ +// REDEFINE: --dlopen=%mlir_native_utils_lib_dir/libmlir_c_runner_utils%shlibext --dlopen=%mlir_runner_utils | \ // REDEFINE: FileCheck %s // RUN: %{compile} | mlir-translate -mlir-to-llvmir | %{run} Index: mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_conversion_ptr.mlir =================================================================== --- mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_conversion_ptr.mlir +++ mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_conversion_ptr.mlir @@ -2,7 +2,7 @@ // DEFINE: %{compile} = mlir-opt %s --sparse-compiler=%{option} // DEFINE: %{run} = mlir-cpu-runner \ // DEFINE: -e entry -entry-point-result=void \ -// DEFINE: -shared-libs=%mlir_lib_dir/libmlir_c_runner_utils%shlibext,%mlir_lib_dir/libmlir_runner_utils%shlibext | \ +// DEFINE: -shared-libs=%mlir_c_runner_utils,%mlir_runner_utils | \ // DEFINE: FileCheck %s // // RUN: %{compile} | %{run} Index: mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_conversion_sparse2dense.mlir =================================================================== --- mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_conversion_sparse2dense.mlir +++ mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_conversion_sparse2dense.mlir @@ -2,7 +2,7 @@ // DEFINE: %{compile} = mlir-opt %s --sparse-compiler=%{option} // DEFINE: %{run} = mlir-cpu-runner \ // DEFINE: -e entry -entry-point-result=void \ -// DEFINE: -shared-libs=%mlir_lib_dir/libmlir_c_runner_utils%shlibext,%mlir_lib_dir/libmlir_runner_utils%shlibext | \ +// DEFINE: -shared-libs=%mlir_c_runner_utils,%mlir_runner_utils | \ // DEFINE: FileCheck %s // // RUN: %{compile} | %{run} Index: mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_conversion_sparse2sparse.mlir =================================================================== --- mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_conversion_sparse2sparse.mlir +++ mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_conversion_sparse2sparse.mlir @@ -3,7 +3,7 @@ // DEFINE: %{compile} = mlir-opt %s --sparse-compiler=%{option} // DEFINE: %{run} = mlir-cpu-runner \ // DEFINE: -e entry -entry-point-result=void \ -// DEFINE: -shared-libs=%mlir_lib_dir/libmlir_c_runner_utils%shlibext | \ +// DEFINE: -shared-libs=%mlir_c_runner_utils | \ // DEFINE: FileCheck %s // // RUN: %{compile} | %{run} Index: mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_dot.mlir =================================================================== --- mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_dot.mlir +++ mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_dot.mlir @@ -2,7 +2,7 @@ // DEFINE: %{compile} = mlir-opt %s --sparse-compiler=%{option} // DEFINE: %{run} = mlir-cpu-runner \ // DEFINE: -e entry -entry-point-result=void \ -// DEFINE: -shared-libs=%mlir_lib_dir/libmlir_c_runner_utils%shlibext | \ +// DEFINE: -shared-libs=%mlir_c_runner_utils | \ // DEFINE: FileCheck %s // // RUN: %{compile} | %{run} Index: mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_expand.mlir =================================================================== --- mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_expand.mlir +++ mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_expand.mlir @@ -2,7 +2,7 @@ // DEFINE: %{compile} = mlir-opt %s --sparse-compiler=%{option} // DEFINE: %{run} = mlir-cpu-runner \ // DEFINE: -e entry -entry-point-result=void \ -// DEFINE: -shared-libs=%mlir_lib_dir/libmlir_c_runner_utils%shlibext,%mlir_lib_dir/libmlir_runner_utils%shlibext | \ +// DEFINE: -shared-libs=%mlir_c_runner_utils,%mlir_runner_utils | \ // DEFINE: FileCheck %s // // RUN: %{compile} | %{run} @@ -21,7 +21,7 @@ // REDEFINE: --entry-function=entry_lli \ // REDEFINE: --extra-module=%S/Inputs/main_for_lli.ll \ // REDEFINE: %VLA_ARCH_ATTR_OPTIONS \ -// REDEFINE: --dlopen=%mlir_native_utils_lib_dir/libmlir_c_runner_utils%shlibext --dlopen=%mlir_lib_dir/libmlir_runner_utils%shlibext | \ +// REDEFINE: --dlopen=%mlir_native_utils_lib_dir/libmlir_c_runner_utils%shlibext --dlopen=%mlir_runner_utils | \ // REDEFINE: FileCheck %s // RUN: %{compile} | mlir-translate -mlir-to-llvmir | %{run} Index: mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_file_io.mlir =================================================================== --- mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_file_io.mlir +++ mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_file_io.mlir @@ -3,7 +3,7 @@ // DEFINE: %{run} = TENSOR0="%mlir_src_dir/test/Integration/data/wide.mtx" TENSOR1="" \ // DEFINE: mlir-cpu-runner \ // DEFINE: -e entry -entry-point-result=void \ -// DEFINE: -shared-libs=%mlir_lib_dir/libmlir_c_runner_utils%shlibext | \ +// DEFINE: -shared-libs=%mlir_c_runner_utils | \ // DEFINE: FileCheck %s // // RUN: %{compile} | %{run} Index: mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_filter_conv2d.mlir =================================================================== --- mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_filter_conv2d.mlir +++ mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_filter_conv2d.mlir @@ -2,7 +2,7 @@ // DEFINE: %{compile} = mlir-opt %s --sparse-compiler=%{option} // DEFINE: %{run} = mlir-cpu-runner \ // DEFINE: -e entry -entry-point-result=void \ -// DEFINE: -shared-libs=%mlir_lib_dir/libmlir_c_runner_utils%shlibext | \ +// DEFINE: -shared-libs=%mlir_c_runner_utils | \ // DEFINE: FileCheck %s // // RUN: %{compile} | %{run} Index: mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_flatten.mlir =================================================================== --- mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_flatten.mlir +++ mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_flatten.mlir @@ -3,7 +3,7 @@ // DEFINE: %{run} = TENSOR0="%mlir_src_dir/test/Integration/data/test.tns" \ // DEFINE: mlir-cpu-runner \ // DEFINE: -e entry -entry-point-result=void \ -// DEFINE: -shared-libs=%mlir_lib_dir/libmlir_c_runner_utils%shlibext,%mlir_lib_dir/libmlir_runner_utils%shlibext | \ +// DEFINE: -shared-libs=%mlir_c_runner_utils,%mlir_runner_utils | \ // DEFINE: FileCheck %s // // RUN: %{compile} | %{run} @@ -24,7 +24,7 @@ // REDEFINE: --entry-function=entry_lli \ // REDEFINE: --extra-module=%S/Inputs/main_for_lli.ll \ // REDEFINE: %VLA_ARCH_ATTR_OPTIONS \ -// REDEFINE: --dlopen=%mlir_native_utils_lib_dir/libmlir_c_runner_utils%shlibext --dlopen=%mlir_lib_dir/libmlir_runner_utils%shlibext | \ +// REDEFINE: --dlopen=%mlir_native_utils_lib_dir/libmlir_c_runner_utils%shlibext --dlopen=%mlir_runner_utils | \ // REDEFINE: FileCheck %s // RUN: %{compile} | mlir-translate -mlir-to-llvmir | %{run} Index: mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_foreach_slices.mlir =================================================================== --- mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_foreach_slices.mlir +++ mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_foreach_slices.mlir @@ -2,7 +2,7 @@ // DEFINE: %{command} = mlir-opt %s --sparse-compiler=%{option} | \ // DEFINE: mlir-cpu-runner \ // DEFINE: -e entry -entry-point-result=void \ -// DEFINE: -shared-libs=%mlir_lib_dir/libmlir_c_runner_utils%shlibext | \ +// DEFINE: -shared-libs=%mlir_c_runner_utils | \ // DEFINE: FileCheck %s // // RUN: %{command} Index: mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_index.mlir =================================================================== --- mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_index.mlir +++ mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_index.mlir @@ -2,7 +2,7 @@ // DEFINE: %{compile} = mlir-opt %s --sparse-compiler=%{option} // DEFINE: %{run} = mlir-cpu-runner \ // DEFINE: -e entry -entry-point-result=void \ -// DEFINE: -shared-libs=%mlir_lib_dir/libmlir_c_runner_utils%shlibext | \ +// DEFINE: -shared-libs=%mlir_c_runner_utils | \ // DEFINE: FileCheck %s // // RUN: %{compile} | %{run} Index: mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_index_dense.mlir =================================================================== --- mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_index_dense.mlir +++ mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_index_dense.mlir @@ -2,7 +2,7 @@ // DEFINE: %{compile} = mlir-opt %s --sparse-compiler=%{option} // DEFINE: %{run} = mlir-cpu-runner \ // DEFINE: -e entry -entry-point-result=void \ -// DEFINE: -shared-libs=%mlir_lib_dir/libmlir_c_runner_utils%shlibext | \ +// DEFINE: -shared-libs=%mlir_c_runner_utils | \ // DEFINE: FileCheck %s // // RUN: %{compile} | %{run} Index: mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_insert_1d.mlir =================================================================== --- mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_insert_1d.mlir +++ mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_insert_1d.mlir @@ -2,7 +2,7 @@ // DEFINE: %{compile} = mlir-opt %s --sparse-compiler=%{option} // DEFINE: %{run} = mlir-cpu-runner \ // DEFINE: -e entry -entry-point-result=void \ -// DEFINE: -shared-libs=%mlir_lib_dir/libmlir_c_runner_utils%shlibext | \ +// DEFINE: -shared-libs=%mlir_c_runner_utils | \ // DEFINE: FileCheck %s // // RUN: %{compile} | %{run} Index: mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_insert_2d.mlir =================================================================== --- mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_insert_2d.mlir +++ mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_insert_2d.mlir @@ -2,7 +2,7 @@ // DEFINE: %{compile} = mlir-opt %s --sparse-compiler=%{option} // DEFINE: %{run} = mlir-cpu-runner \ // DEFINE: -e entry -entry-point-result=void \ -// DEFINE: -shared-libs=%mlir_lib_dir/libmlir_c_runner_utils%shlibext | \ +// DEFINE: -shared-libs=%mlir_c_runner_utils | \ // DEFINE: FileCheck %s // // RUN: %{compile} | %{run} Index: mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_insert_3d.mlir =================================================================== --- mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_insert_3d.mlir +++ mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_insert_3d.mlir @@ -2,7 +2,7 @@ // DEFINE: %{compile} = mlir-opt %s --sparse-compiler=%{option} // DEFINE: %{run} = mlir-cpu-runner \ // DEFINE: -e entry -entry-point-result=void \ -// DEFINE: -shared-libs=%mlir_lib_dir/libmlir_c_runner_utils%shlibext | \ +// DEFINE: -shared-libs=%mlir_c_runner_utils | \ // DEFINE: FileCheck %s // // RUN: %{compile} | %{run} Index: mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_matmul.mlir =================================================================== --- mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_matmul.mlir +++ mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_matmul.mlir @@ -2,7 +2,7 @@ // DEFINE: %{compile} = mlir-opt %s --sparse-compiler=%{option} // DEFINE: %{run} = mlir-cpu-runner \ // DEFINE: -e entry -entry-point-result=void \ -// DEFINE: -shared-libs=%mlir_lib_dir/libmlir_c_runner_utils%shlibext,%mlir_lib_dir/libmlir_runner_utils%shlibext | \ +// DEFINE: -shared-libs=%mlir_c_runner_utils,%mlir_runner_utils | \ // DEFINE: FileCheck %s // // RUN: %{compile} | %{run} @@ -30,7 +30,7 @@ // REDEFINE: --entry-function=entry_lli \ // REDEFINE: --extra-module=%S/Inputs/main_for_lli.ll \ // REDEFINE: %VLA_ARCH_ATTR_OPTIONS \ -// REDEFINE: --dlopen=%mlir_native_utils_lib_dir/libmlir_c_runner_utils%shlibext --dlopen=%mlir_lib_dir/libmlir_runner_utils%shlibext | \ +// REDEFINE: --dlopen=%mlir_native_utils_lib_dir/libmlir_c_runner_utils%shlibext --dlopen=%mlir_runner_utils | \ // REDEFINE: FileCheck %s // RUN: %{compile} | mlir-translate -mlir-to-llvmir | %{run} Index: mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_matrix_ops.mlir =================================================================== --- mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_matrix_ops.mlir +++ mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_matrix_ops.mlir @@ -2,7 +2,7 @@ // DEFINE: %{compile} = mlir-opt %s --sparse-compiler=%{option} // DEFINE: %{run} = mlir-cpu-runner \ // DEFINE: -e entry -entry-point-result=void \ -// DEFINE: -shared-libs=%mlir_lib_dir/libmlir_c_runner_utils%shlibext,%mlir_lib_dir/libmlir_runner_utils%shlibext | \ +// DEFINE: -shared-libs=%mlir_c_runner_utils,%mlir_runner_utils | \ // DEFINE: FileCheck %s // // RUN: %{compile} | %{run} @@ -22,7 +22,7 @@ // REDEFINE: --entry-function=entry_lli \ // REDEFINE: --extra-module=%S/Inputs/main_for_lli.ll \ // REDEFINE: %VLA_ARCH_ATTR_OPTIONS \ -// REDEFINE: --dlopen=%mlir_native_utils_lib_dir/libmlir_c_runner_utils%shlibext --dlopen=%mlir_lib_dir/libmlir_runner_utils%shlibext | \ +// REDEFINE: --dlopen=%mlir_native_utils_lib_dir/libmlir_c_runner_utils%shlibext --dlopen=%mlir_runner_utils | \ // REDEFINE: FileCheck %s // RUN: %{compile} | mlir-translate -mlir-to-llvmir | %{run} Index: mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_matvec.mlir =================================================================== --- mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_matvec.mlir +++ mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_matvec.mlir @@ -3,7 +3,7 @@ // DEFINE: %{run} = TENSOR0="%mlir_src_dir/test/Integration/data/wide.mtx" \ // DEFINE: mlir-cpu-runner \ // DEFINE: -e entry -entry-point-result=void \ -// DEFINE: -shared-libs=%mlir_lib_dir/libmlir_c_runner_utils%shlibext | \ +// DEFINE: -shared-libs=%mlir_c_runner_utils | \ // DEFINE: FileCheck %s // RUN: %{compile} | %{run} // Index: mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_mttkrp.mlir =================================================================== --- mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_mttkrp.mlir +++ mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_mttkrp.mlir @@ -3,7 +3,7 @@ // DEFINE: %{run} = TENSOR0="%mlir_src_dir/test/Integration/data/mttkrp_b.tns" \ // DEFINE: mlir-cpu-runner \ // DEFINE: -e entry -entry-point-result=void \ -// DEFINE: -shared-libs=%mlir_lib_dir/libmlir_c_runner_utils%shlibext,%mlir_lib_dir/libmlir_runner_utils%shlibext | \ +// DEFINE: -shared-libs=%mlir_c_runner_utils,%mlir_runner_utils | \ // DEFINE: FileCheck %s // // RUN: %{compile} | %{run} @@ -24,7 +24,7 @@ // REDEFINE: --entry-function=entry_lli \ // REDEFINE: --extra-module=%S/Inputs/main_for_lli.ll \ // REDEFINE: %VLA_ARCH_ATTR_OPTIONS \ -// REDEFINE: --dlopen=%mlir_native_utils_lib_dir/libmlir_c_runner_utils%shlibext -dlopen=%mlir_lib_dir/libmlir_runner_utils%shlibext| \ +// REDEFINE: --dlopen=%mlir_native_utils_lib_dir/libmlir_c_runner_utils%shlibext -dlopen=%mlir_runner_utils| \ // REDEFINE: FileCheck %s // RUN: %{compile} | mlir-translate -mlir-to-llvmir | %{run} Index: mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_out_mult_elt.mlir =================================================================== --- mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_out_mult_elt.mlir +++ mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_out_mult_elt.mlir @@ -2,7 +2,7 @@ // DEFINE: %{compile} = mlir-opt %s --sparse-compiler=%{option} // DEFINE: %{run} = mlir-cpu-runner \ // DEFINE: -e entry -entry-point-result=void \ -// DEFINE: -shared-libs=%mlir_lib_dir/libmlir_c_runner_utils%shlibext | \ +// DEFINE: -shared-libs=%mlir_c_runner_utils | \ // DEFINE: FileCheck %s // // RUN: %{compile} | %{run} Index: mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_out_reduction.mlir =================================================================== --- mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_out_reduction.mlir +++ mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_out_reduction.mlir @@ -2,7 +2,7 @@ // DEFINE: %{compile} = mlir-opt %s --sparse-compiler=%{option} // DEFINE: %{run} = mlir-cpu-runner \ // DEFINE: -e entry -entry-point-result=void \ -// DEFINE: -shared-libs=%mlir_lib_dir/libmlir_c_runner_utils%shlibext | \ +// DEFINE: -shared-libs=%mlir_c_runner_utils | \ // DEFINE: FileCheck %s // // RUN: %{compile} | %{run} Index: mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_out_simple.mlir =================================================================== --- mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_out_simple.mlir +++ mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_out_simple.mlir @@ -3,7 +3,7 @@ // DEFINE: %{run} = TENSOR0="%mlir_src_dir/test/Integration/data/test.mtx" \ // DEFINE: mlir-cpu-runner \ // DEFINE: -e entry -entry-point-result=void \ -// DEFINE: -shared-libs=%mlir_lib_dir/libmlir_c_runner_utils%shlibext | \ +// DEFINE: -shared-libs=%mlir_c_runner_utils | \ // DEFINE: FileCheck %s // // RUN: %{compile} | %{run} Index: mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_pack.mlir =================================================================== --- mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_pack.mlir +++ mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_pack.mlir @@ -2,7 +2,7 @@ // DEFINE: %{compile} = mlir-opt %s --sparse-compiler=%{option} // DEFINE: %{run} = mlir-cpu-runner \ // DEFINE: -e entry -entry-point-result=void \ -// DEFINE: -shared-libs=%mlir_lib_dir/libmlir_c_runner_utils%shlibext | \ +// DEFINE: -shared-libs=%mlir_c_runner_utils | \ // DEFINE: FileCheck %s // // RUN: %{compile} | %{run} Index: mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_quantized_matmul.mlir =================================================================== --- mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_quantized_matmul.mlir +++ mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_quantized_matmul.mlir @@ -2,7 +2,7 @@ // DEFINE: %{compile} = mlir-opt %s --sparse-compiler=%{option} // DEFINE: %{run} = mlir-cpu-runner \ // DEFINE: -e entry -entry-point-result=void \ -// DEFINE: -shared-libs=%mlir_lib_dir/libmlir_c_runner_utils%shlibext | \ +// DEFINE: -shared-libs=%mlir_c_runner_utils | \ // DEFINE: FileCheck %s // // RUN: %{compile} | %{run} Index: mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_re_im.mlir =================================================================== --- mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_re_im.mlir +++ mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_re_im.mlir @@ -2,7 +2,7 @@ // DEFINE: %{compile} = mlir-opt %s --sparse-compiler=%{option} // DEFINE: %{run} = mlir-cpu-runner \ // DEFINE: -e entry -entry-point-result=void \ -// DEFINE: -shared-libs=%mlir_lib_dir/libmlir_c_runner_utils%shlibext | \ +// DEFINE: -shared-libs=%mlir_c_runner_utils | \ // DEFINE: FileCheck %s // // RUN: %{compile} | %{run} Index: mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_reduce_custom.mlir =================================================================== --- mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_reduce_custom.mlir +++ mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_reduce_custom.mlir @@ -2,7 +2,7 @@ // DEFINE: %{compile} = mlir-opt %s --sparse-compiler=%{option} // DEFINE: %{run} = mlir-cpu-runner \ // DEFINE: -e entry -entry-point-result=void \ -// DEFINE: -shared-libs=%mlir_lib_dir/libmlir_c_runner_utils%shlibext | \ +// DEFINE: -shared-libs=%mlir_c_runner_utils | \ // DEFINE: FileCheck %s // // RUN: %{compile} | %{run} Index: mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_reduce_custom_prod.mlir =================================================================== --- mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_reduce_custom_prod.mlir +++ mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_reduce_custom_prod.mlir @@ -2,7 +2,7 @@ // DEFINE: %{compile} = mlir-opt %s --sparse-compiler=%{option} // DEFINE: %{run} = mlir-cpu-runner \ // DEFINE: -e entry -entry-point-result=void \ -// DEFINE: -shared-libs=%mlir_lib_dir/libmlir_c_runner_utils%shlibext | \ +// DEFINE: -shared-libs=%mlir_c_runner_utils | \ // DEFINE: FileCheck %s // // RUN: %{compile} | %{run} Index: mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_reductions.mlir =================================================================== --- mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_reductions.mlir +++ mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_reductions.mlir @@ -2,7 +2,7 @@ // DEFINE: %{compile} = mlir-opt %s --sparse-compiler=%{option} // DEFINE: %{run} = mlir-cpu-runner \ // DEFINE: -e entry -entry-point-result=void \ -// DEFINE: -shared-libs=%mlir_lib_dir/libmlir_c_runner_utils%shlibext | \ +// DEFINE: -shared-libs=%mlir_c_runner_utils | \ // DEFINE: FileCheck %s // // RUN: %{compile} | %{run} Index: mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_reductions_prod.mlir =================================================================== --- mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_reductions_prod.mlir +++ mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_reductions_prod.mlir @@ -2,7 +2,7 @@ // DEFINE: %{command} = mlir-opt %s --sparse-compiler=%{option} | \ // DEFINE: mlir-cpu-runner \ // DEFINE: -e entry -entry-point-result=void \ -// DEFINE: -shared-libs=%mlir_lib_dir/libmlir_c_runner_utils%shlibext | \ +// DEFINE: -shared-libs=%mlir_c_runner_utils | \ // DEFINE: FileCheck %s // // RUN: %{command} Index: mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_reshape.mlir =================================================================== --- mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_reshape.mlir +++ mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_reshape.mlir @@ -2,7 +2,7 @@ // DEFINE: %{compile} = mlir-opt %s --sparse-compiler=%{option} // DEFINE: %{run} = mlir-cpu-runner \ // DEFINE: -e entry -entry-point-result=void \ -// DEFINE: -shared-libs=%mlir_lib_dir/libmlir_c_runner_utils%shlibext | \ +// DEFINE: -shared-libs=%mlir_c_runner_utils | \ // DEFINE: FileCheck %s // // RUN: %{compile} | %{run} Index: mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_rewrite_push_back.mlir =================================================================== --- mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_rewrite_push_back.mlir +++ mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_rewrite_push_back.mlir @@ -2,7 +2,7 @@ // DEFINE: %{compile} = mlir-opt %s --sparse-compiler=%{option} // DEFINE: %{run} = mlir-cpu-runner \ // DEFINE: -e entry -entry-point-result=void \ -// DEFINE: -shared-libs=%mlir_lib_dir/libmlir_c_runner_utils%shlibext | \ +// DEFINE: -shared-libs=%mlir_c_runner_utils | \ // DEFINE: FileCheck %s // // RUN: %{compile} | %{run} Index: mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_rewrite_sort.mlir =================================================================== --- mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_rewrite_sort.mlir +++ mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_rewrite_sort.mlir @@ -2,7 +2,7 @@ // DEFINE: %{compile} = mlir-opt %s --sparse-compiler=%{option} // DEFINE: %{run} = mlir-cpu-runner \ // DEFINE: -e entry -entry-point-result=void \ -// DEFINE: -shared-libs=%mlir_lib_dir/libmlir_c_runner_utils%shlibext,%mlir_lib_dir/libmlir_runner_utils%shlibext | \ +// DEFINE: -shared-libs=%mlir_c_runner_utils,%mlir_runner_utils | \ // DEFINE: FileCheck %s // // RUN: %{compile} | %{run} @@ -14,7 +14,7 @@ // REDEFINE: --entry-function=entry_lli \ // REDEFINE: --extra-module=%S/Inputs/main_for_lli.ll \ // REDEFINE: %VLA_ARCH_ATTR_OPTIONS \ -// REDEFINE: --dlopen=%mlir_native_utils_lib_dir/libmlir_c_runner_utils%shlibext --dlopen=%mlir_lib_dir/libmlir_runner_utils%shlibext | \ +// REDEFINE: --dlopen=%mlir_native_utils_lib_dir/libmlir_c_runner_utils%shlibext --dlopen=%mlir_runner_utils | \ // REDEFINE: FileCheck %s // RUN: %{compile} | mlir-translate -mlir-to-llvmir | %{run} Index: mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_rewrite_sort_coo.mlir =================================================================== --- mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_rewrite_sort_coo.mlir +++ mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_rewrite_sort_coo.mlir @@ -2,7 +2,7 @@ // DEFINE: %{compile} = mlir-opt %s --sparse-compiler=%{option} // DEFINE: %{run} = mlir-cpu-runner \ // DEFINE: -e entry -entry-point-result=void \ -// DEFINE: -shared-libs=%mlir_lib_dir/libmlir_c_runner_utils%shlibext | \ +// DEFINE: -shared-libs=%mlir_c_runner_utils | \ // DEFINE: FileCheck %s // // RUN: %{compile} | %{run} Index: mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_sampled_matmul.mlir =================================================================== --- mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_sampled_matmul.mlir +++ mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_sampled_matmul.mlir @@ -3,7 +3,7 @@ // DEFINE: %{run} = TENSOR0="%mlir_src_dir/test/Integration/data/test.mtx" \ // DEFINE: mlir-cpu-runner \ // DEFINE: -e entry -entry-point-result=void \ -// DEFINE: -shared-libs=%mlir_lib_dir/libmlir_c_runner_utils%shlibext | \ +// DEFINE: -shared-libs=%mlir_c_runner_utils | \ // DEFINE: FileCheck %s // // RUN: %{compile} | %{run} Index: mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_sampled_mm_fusion.mlir =================================================================== --- mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_sampled_mm_fusion.mlir +++ mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_sampled_mm_fusion.mlir @@ -2,7 +2,7 @@ // DEFINE: %{compile} = mlir-opt %s --sparse-compiler=%{option} // DEFINE: %{run} = mlir-cpu-runner \ // DEFINE: -e entry -entry-point-result=void \ -// DEFINE: -shared-libs=%mlir_lib_dir/libmlir_c_runner_utils%shlibext | \ +// DEFINE: -shared-libs=%mlir_c_runner_utils | \ // DEFINE: FileCheck %s // // RUN: %{compile} | %{run} Index: mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_scale.mlir =================================================================== --- mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_scale.mlir +++ mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_scale.mlir @@ -2,7 +2,7 @@ // DEFINE: %{compile} = mlir-opt %s --sparse-compiler=%{option} // DEFINE: %{run} = mlir-cpu-runner \ // DEFINE: -e entry -entry-point-result=void \ -// DEFINE: -shared-libs=%mlir_lib_dir/libmlir_c_runner_utils%shlibext | \ +// DEFINE: -shared-libs=%mlir_c_runner_utils | \ // DEFINE: FileCheck %s // // RUN: %{compile} | %{run} Index: mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_scf_nested.mlir =================================================================== --- mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_scf_nested.mlir +++ mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_scf_nested.mlir @@ -2,7 +2,7 @@ // DEFINE: %{compile} = mlir-opt %s --sparse-compiler=%{option} // DEFINE: %{run} = mlir-cpu-runner \ // DEFINE: -e entry -entry-point-result=void \ -// DEFINE: -shared-libs=%mlir_lib_dir/libmlir_c_runner_utils%shlibext | \ +// DEFINE: -shared-libs=%mlir_c_runner_utils | \ // DEFINE: FileCheck %s // // RUN: %{compile} | %{run} Index: mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_select.mlir =================================================================== --- mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_select.mlir +++ mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_select.mlir @@ -2,7 +2,7 @@ // DEFINE: %{compile} = mlir-opt %s --sparse-compiler=%{option} // DEFINE: %{run} = mlir-cpu-runner \ // DEFINE: -e entry -entry-point-result=void \ -// DEFINE: -shared-libs=%mlir_lib_dir/libmlir_c_runner_utils%shlibext | \ +// DEFINE: -shared-libs=%mlir_c_runner_utils | \ // DEFINE: FileCheck %s // // RUN: %{compile} | %{run} Index: mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_sign.mlir =================================================================== --- mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_sign.mlir +++ mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_sign.mlir @@ -2,7 +2,7 @@ // DEFINE: %{compile} = mlir-opt %s --sparse-compiler=%{option} // DEFINE: %{run} = mlir-cpu-runner \ // DEFINE: -e entry -entry-point-result=void \ -// DEFINE: -shared-libs=%mlir_lib_dir/libmlir_c_runner_utils%shlibext | \ +// DEFINE: -shared-libs=%mlir_c_runner_utils | \ // DEFINE: FileCheck %s // // RUN: %{compile} | %{run} Index: mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_sorted_coo.mlir =================================================================== --- mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_sorted_coo.mlir +++ mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_sorted_coo.mlir @@ -4,7 +4,7 @@ // DEFINE: TENSOR1="%mlir_src_dir/test/Integration/data/mttkrp_b.tns" \ // DEFINE: mlir-cpu-runner \ // DEFINE: -e entry -entry-point-result=void \ -// DEFINE: -shared-libs=%mlir_lib_dir/libmlir_c_runner_utils%shlibext | \ +// DEFINE: -shared-libs=%mlir_c_runner_utils | \ // DEFINE: FileCheck %s // // RUN: %{compile} | %{run} Index: mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_spmm.mlir =================================================================== --- mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_spmm.mlir +++ mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_spmm.mlir @@ -3,7 +3,7 @@ // DEFINE: %{run} = TENSOR0="%mlir_src_dir/test/Integration/data/wide.mtx" \ // DEFINE: mlir-cpu-runner \ // DEFINE: -e entry -entry-point-result=void \ -// DEFINE: -shared-libs=%mlir_lib_dir/libmlir_c_runner_utils%shlibext | \ +// DEFINE: -shared-libs=%mlir_c_runner_utils | \ // DEFINE: FileCheck %s // // RUN: %{compile} | %{run} Index: mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_storage.mlir =================================================================== --- mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_storage.mlir +++ mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_storage.mlir @@ -2,7 +2,7 @@ // DEFINE: %{compile} = mlir-opt %s --sparse-compiler=%{option} // DEFINE: %{run} = mlir-cpu-runner \ // DEFINE: -e entry -entry-point-result=void \ -// DEFINE: -shared-libs=%mlir_lib_dir/libmlir_c_runner_utils%shlibext | \ +// DEFINE: -shared-libs=%mlir_c_runner_utils | \ // DEFINE: FileCheck %s // // RUN: %{compile} | %{run} Index: mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_sum.mlir =================================================================== --- mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_sum.mlir +++ mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_sum.mlir @@ -3,7 +3,7 @@ // DEFINE: %{run} = TENSOR0="%mlir_src_dir/test/Integration/data/test_symmetric.mtx" \ // DEFINE: mlir-cpu-runner \ // DEFINE: -e entry -entry-point-result=void \ -// DEFINE: -shared-libs=%mlir_lib_dir/libmlir_c_runner_utils%shlibext | \ +// DEFINE: -shared-libs=%mlir_c_runner_utils | \ // DEFINE: FileCheck %s // // RUN: %{compile} | %{run} Index: mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_sum_bf16.mlir =================================================================== --- mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_sum_bf16.mlir +++ mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_sum_bf16.mlir @@ -2,7 +2,7 @@ // DEFINE: %{command} = mlir-opt %s --sparse-compiler=%{option} | \ // DEFINE: mlir-cpu-runner \ // DEFINE: -e entry -entry-point-result=void \ -// DEFINE: -shared-libs=%mlir_lib_dir/libmlir_c_runner_utils%shlibext | \ +// DEFINE: -shared-libs=%mlir_c_runner_utils | \ // DEFINE: FileCheck %s // // RUN: %{command} Index: mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_sum_c32.mlir =================================================================== --- mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_sum_c32.mlir +++ mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_sum_c32.mlir @@ -3,7 +3,7 @@ // DEFINE: %{run} = TENSOR0="%mlir_src_dir/test/Integration/data/test_symmetric_complex.mtx" \ // DEFINE: mlir-cpu-runner \ // DEFINE: -e entry -entry-point-result=void \ -// DEFINE: -shared-libs=%mlir_lib_dir/libmlir_c_runner_utils%shlibext | \ +// DEFINE: -shared-libs=%mlir_c_runner_utils | \ // DEFINE: FileCheck %s // // RUN: %{compile} | %{run} Index: mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_sum_f16.mlir =================================================================== --- mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_sum_f16.mlir +++ mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_sum_f16.mlir @@ -2,7 +2,7 @@ // DEFINE: %{compile} = mlir-opt %s --sparse-compiler=%{option} // DEFINE: %{run} = mlir-cpu-runner \ // DEFINE: -e entry -entry-point-result=void \ -// DEFINE: -shared-libs=%mlir_lib_dir/libmlir_c_runner_utils%shlibext | \ +// DEFINE: -shared-libs=%mlir_c_runner_utils | \ // DEFINE: FileCheck %s // // RUN: %{compile} | %{run} Index: mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_tanh.mlir =================================================================== --- mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_tanh.mlir +++ mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_tanh.mlir @@ -2,7 +2,7 @@ // DEFINE: %{compile} = mlir-opt %s --sparse-compiler=%{option} // DEFINE: %{run} = mlir-cpu-runner \ // DEFINE: -e entry -entry-point-result=void \ -// DEFINE: -shared-libs=%mlir_lib_dir/libmlir_c_runner_utils%shlibext | \ +// DEFINE: -shared-libs=%mlir_c_runner_utils | \ // DEFINE: FileCheck %s // // RUN: %{compile} | %{run} Index: mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_tensor_mul.mlir =================================================================== --- mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_tensor_mul.mlir +++ mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_tensor_mul.mlir @@ -2,7 +2,7 @@ // DEFINE: %{compile} = mlir-opt %s --sparse-compiler=%{option} // DEFINE: %{run} = mlir-cpu-runner \ // DEFINE: -e entry -entry-point-result=void \ -// DEFINE: -shared-libs=%mlir_lib_dir/libmlir_c_runner_utils%shlibext | \ +// DEFINE: -shared-libs=%mlir_c_runner_utils | \ // DEFINE: FileCheck %s // // RUN: %{compile} | %{run} Index: mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_tensor_ops.mlir =================================================================== --- mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_tensor_ops.mlir +++ mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_tensor_ops.mlir @@ -2,7 +2,7 @@ // DEFINE: %{compile} = mlir-opt %s --sparse-compiler=%{option} // DEFINE: %{run} = mlir-cpu-runner \ // DEFINE: -e entry -entry-point-result=void \ -// DEFINE: -shared-libs=%mlir_lib_dir/libmlir_c_runner_utils%shlibext | \ +// DEFINE: -shared-libs=%mlir_c_runner_utils | \ // DEFINE: FileCheck %s // // RUN: %{compile} | %{run} Index: mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_transpose.mlir =================================================================== --- mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_transpose.mlir +++ mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_transpose.mlir @@ -2,7 +2,7 @@ // DEFINE: %{compile} = mlir-opt %s --sparse-compiler=%{option} // DEFINE: %{run} = mlir-cpu-runner \ // DEFINE: -e entry -entry-point-result=void \ -// DEFINE: -shared-libs=%mlir_lib_dir/libmlir_c_runner_utils%shlibext | \ +// DEFINE: -shared-libs=%mlir_c_runner_utils | \ // DEFINE: FileCheck %s // // RUN: %{compile} | %{run} Index: mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_unary.mlir =================================================================== --- mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_unary.mlir +++ mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_unary.mlir @@ -2,7 +2,7 @@ // DEFINE: %{compile} = mlir-opt %s --sparse-compiler=%{option} // DEFINE: %{run} = mlir-cpu-runner \ // DEFINE: -e entry -entry-point-result=void \ -// DEFINE: -shared-libs=%mlir_lib_dir/libmlir_c_runner_utils%shlibext | \ +// DEFINE: -shared-libs=%mlir_c_runner_utils | \ // DEFINE: FileCheck %s // // RUN: %{compile} | %{run} Index: mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_vector_ops.mlir =================================================================== --- mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_vector_ops.mlir +++ mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_vector_ops.mlir @@ -2,7 +2,7 @@ // DEFINE: %{compile} = mlir-opt %s --sparse-compiler=%{option} // DEFINE: %{run} = mlir-cpu-runner \ // DEFINE: -e entry -entry-point-result=void \ -// DEFINE: -shared-libs=%mlir_lib_dir/libmlir_c_runner_utils%shlibext | \ +// DEFINE: -shared-libs=%mlir_c_runner_utils | \ // DEFINE: FileCheck %s // // RUN: %{compile} | %{run} Index: mlir/test/Integration/Dialect/SparseTensor/python/test_SDDMM.py =================================================================== --- mlir/test/Integration/Dialect/SparseTensor/python/test_SDDMM.py +++ mlir/test/Integration/Dialect/SparseTensor/python/test_SDDMM.py @@ -1,4 +1,4 @@ -# RUN: SUPPORT_LIB=%mlir_lib_dir/libmlir_c_runner_utils%shlibext \ +# RUN: env SUPPORT_LIB=%mlir_c_runner_utils \ # RUN: %PYTHON %s | FileCheck %s import ctypes Index: mlir/test/Integration/Dialect/SparseTensor/python/test_SpMM.py =================================================================== --- mlir/test/Integration/Dialect/SparseTensor/python/test_SpMM.py +++ mlir/test/Integration/Dialect/SparseTensor/python/test_SpMM.py @@ -1,4 +1,4 @@ -# RUN: SUPPORT_LIB=%mlir_lib_dir/libmlir_c_runner_utils%shlibext \ +# RUN: env SUPPORT_LIB=%mlir_c_runner_utils \ # RUN: %PYTHON %s | FileCheck %s import ctypes Index: mlir/test/Integration/Dialect/SparseTensor/python/test_elementwise_add_sparse_output.py =================================================================== --- mlir/test/Integration/Dialect/SparseTensor/python/test_elementwise_add_sparse_output.py +++ mlir/test/Integration/Dialect/SparseTensor/python/test_elementwise_add_sparse_output.py @@ -1,4 +1,4 @@ -# RUN: SUPPORT_LIB=%mlir_lib_dir/libmlir_c_runner_utils%shlibext %PYTHON %s | FileCheck %s +# RUN: env SUPPORT_LIB=%mlir_c_runner_utils %PYTHON %s | FileCheck %s import ctypes import numpy as np Index: mlir/test/Integration/Dialect/SparseTensor/python/test_output.py =================================================================== --- mlir/test/Integration/Dialect/SparseTensor/python/test_output.py +++ mlir/test/Integration/Dialect/SparseTensor/python/test_output.py @@ -1,4 +1,4 @@ -# RUN: SUPPORT_LIB=%mlir_lib_dir/libmlir_c_runner_utils%shlibext \ +# RUN: env SUPPORT_LIB=%mlir_c_runner_utils \ # RUN: %PYTHON %s | FileCheck %s import ctypes Index: mlir/test/Integration/Dialect/SparseTensor/python/test_stress.py =================================================================== --- mlir/test/Integration/Dialect/SparseTensor/python/test_stress.py +++ mlir/test/Integration/Dialect/SparseTensor/python/test_stress.py @@ -1,4 +1,4 @@ -# RUN: SUPPORT_LIB=%mlir_lib_dir/libmlir_c_runner_utils%shlibext \ +# RUN: env SUPPORT_LIB=%mlir_c_runner_utils \ # RUN: %PYTHON %s | FileCheck %s import ctypes Index: mlir/test/Integration/Dialect/SparseTensor/taco/test_MTTKRP.py =================================================================== --- mlir/test/Integration/Dialect/SparseTensor/taco/test_MTTKRP.py +++ mlir/test/Integration/Dialect/SparseTensor/taco/test_MTTKRP.py @@ -1,4 +1,4 @@ -# RUN: SUPPORTLIB=%mlir_lib_dir/libmlir_c_runner_utils%shlibext %PYTHON %s | FileCheck %s +# RUN: env SUPPORTLIB=%mlir_c_runner_utils %PYTHON %s | FileCheck %s import numpy as np import os Index: mlir/test/Integration/Dialect/SparseTensor/taco/test_SDDMM.py =================================================================== --- mlir/test/Integration/Dialect/SparseTensor/taco/test_SDDMM.py +++ mlir/test/Integration/Dialect/SparseTensor/taco/test_SDDMM.py @@ -1,4 +1,4 @@ -# RUN: SUPPORTLIB=%mlir_lib_dir/libmlir_c_runner_utils%shlibext %PYTHON %s | FileCheck %s +# RUN: env SUPPORTLIB=%mlir_c_runner_utils %PYTHON %s | FileCheck %s import filecmp import numpy as np Index: mlir/test/Integration/Dialect/SparseTensor/taco/test_SpMM.py =================================================================== --- mlir/test/Integration/Dialect/SparseTensor/taco/test_SpMM.py +++ mlir/test/Integration/Dialect/SparseTensor/taco/test_SpMM.py @@ -1,4 +1,4 @@ -# RUN: SUPPORTLIB=%mlir_lib_dir/libmlir_c_runner_utils%shlibext %PYTHON %s | FileCheck %s +# RUN: env SUPPORTLIB=%mlir_c_runner_utils %PYTHON %s | FileCheck %s import filecmp import numpy as np Index: mlir/test/Integration/Dialect/SparseTensor/taco/test_SpMV.py =================================================================== --- mlir/test/Integration/Dialect/SparseTensor/taco/test_SpMV.py +++ mlir/test/Integration/Dialect/SparseTensor/taco/test_SpMV.py @@ -1,4 +1,4 @@ -# RUN: SUPPORTLIB=%mlir_lib_dir/libmlir_c_runner_utils%shlibext %PYTHON %s | FileCheck %s +# RUN: env SUPPORTLIB=%mlir_c_runner_utils %PYTHON %s | FileCheck %s import numpy as np import os Index: mlir/test/Integration/Dialect/SparseTensor/taco/test_Tensor.py =================================================================== --- mlir/test/Integration/Dialect/SparseTensor/taco/test_Tensor.py +++ mlir/test/Integration/Dialect/SparseTensor/taco/test_Tensor.py @@ -1,4 +1,4 @@ -# RUN: SUPPORTLIB=%mlir_lib_dir/libmlir_c_runner_utils%shlibext %PYTHON %s | FileCheck %s +# RUN: env SUPPORTLIB=%mlir_c_runner_utils %PYTHON %s | FileCheck %s import filecmp import numpy as np Index: mlir/test/Integration/Dialect/SparseTensor/taco/test_scalar_tensor_algebra.py =================================================================== --- mlir/test/Integration/Dialect/SparseTensor/taco/test_scalar_tensor_algebra.py +++ mlir/test/Integration/Dialect/SparseTensor/taco/test_scalar_tensor_algebra.py @@ -1,4 +1,4 @@ -# RUN: SUPPORTLIB=%mlir_lib_dir/libmlir_c_runner_utils%shlibext %PYTHON %s | FileCheck %s +# RUN: env SUPPORTLIB=%mlir_c_runner_utils %PYTHON %s | FileCheck %s import numpy as np import os Index: mlir/test/Integration/Dialect/SparseTensor/taco/test_simple_tensor_algebra.py =================================================================== --- mlir/test/Integration/Dialect/SparseTensor/taco/test_simple_tensor_algebra.py +++ mlir/test/Integration/Dialect/SparseTensor/taco/test_simple_tensor_algebra.py @@ -1,4 +1,4 @@ -# RUN: SUPPORTLIB=%mlir_lib_dir/libmlir_c_runner_utils%shlibext %PYTHON %s | FileCheck %s +# RUN: env SUPPORTLIB=%mlir_c_runner_utils %PYTHON %s | FileCheck %s import numpy as np import os Index: mlir/test/Integration/Dialect/SparseTensor/taco/test_tensor_complex.py =================================================================== --- mlir/test/Integration/Dialect/SparseTensor/taco/test_tensor_complex.py +++ mlir/test/Integration/Dialect/SparseTensor/taco/test_tensor_complex.py @@ -1,4 +1,4 @@ -# RUN: SUPPORTLIB=%mlir_lib_dir/libmlir_c_runner_utils%shlibext %PYTHON %s | FileCheck %s +# RUN: env SUPPORTLIB=%mlir_c_runner_utils %PYTHON %s | FileCheck %s import numpy as np import os import sys Index: mlir/test/Integration/Dialect/SparseTensor/taco/test_tensor_types.py =================================================================== --- mlir/test/Integration/Dialect/SparseTensor/taco/test_tensor_types.py +++ mlir/test/Integration/Dialect/SparseTensor/taco/test_tensor_types.py @@ -1,4 +1,4 @@ -# RUN: SUPPORTLIB=%mlir_lib_dir/libmlir_c_runner_utils%shlibext %PYTHON %s | FileCheck %s +# RUN: env SUPPORTLIB=%mlir_c_runner_utils %PYTHON %s | FileCheck %s import numpy as np import os Index: mlir/test/Integration/Dialect/SparseTensor/taco/test_tensor_unary_ops.py =================================================================== --- mlir/test/Integration/Dialect/SparseTensor/taco/test_tensor_unary_ops.py +++ mlir/test/Integration/Dialect/SparseTensor/taco/test_tensor_unary_ops.py @@ -1,4 +1,4 @@ -# RUN: SUPPORTLIB=%mlir_lib_dir/libmlir_c_runner_utils%shlibext %PYTHON %s | FileCheck %s +# RUN: env SUPPORTLIB=%mlir_c_runner_utils %PYTHON %s | FileCheck %s import numpy as np import os Index: mlir/test/Integration/Dialect/SparseTensor/taco/test_true_dense_tensor_algebra.py =================================================================== --- mlir/test/Integration/Dialect/SparseTensor/taco/test_true_dense_tensor_algebra.py +++ mlir/test/Integration/Dialect/SparseTensor/taco/test_true_dense_tensor_algebra.py @@ -1,4 +1,4 @@ -# RUN: SUPPORTLIB=%mlir_lib_dir/libmlir_c_runner_utils%shlibext %PYTHON %s | FileCheck %s +# RUN: env SUPPORTLIB=%mlir_c_runner_utils %PYTHON %s | FileCheck %s import numpy as np import os Index: mlir/test/Integration/Dialect/SparseTensor/taco/unit_test_tensor_core.py =================================================================== --- mlir/test/Integration/Dialect/SparseTensor/taco/unit_test_tensor_core.py +++ mlir/test/Integration/Dialect/SparseTensor/taco/unit_test_tensor_core.py @@ -1,4 +1,4 @@ -# RUN: SUPPORTLIB=%mlir_lib_dir/libmlir_c_runner_utils%shlibext %PYTHON %s | FileCheck %s +# RUN: env SUPPORTLIB=%mlir_c_runner_utils %PYTHON %s | FileCheck %s from string import Template Index: mlir/test/Integration/Dialect/SparseTensor/taco/unit_test_tensor_io.py =================================================================== --- mlir/test/Integration/Dialect/SparseTensor/taco/unit_test_tensor_io.py +++ mlir/test/Integration/Dialect/SparseTensor/taco/unit_test_tensor_io.py @@ -1,4 +1,4 @@ -# RUN: SUPPORTLIB=%mlir_lib_dir/libmlir_c_runner_utils%shlibext %PYTHON %s | FileCheck %s +# RUN: env SUPPORTLIB=%mlir_c_runner_utils %PYTHON %s | FileCheck %s from string import Template Index: mlir/test/Integration/Dialect/SparseTensor/taco/unit_test_tensor_utils.py =================================================================== --- mlir/test/Integration/Dialect/SparseTensor/taco/unit_test_tensor_utils.py +++ mlir/test/Integration/Dialect/SparseTensor/taco/unit_test_tensor_utils.py @@ -1,4 +1,4 @@ -# RUN: SUPPORTLIB=%mlir_lib_dir/libmlir_c_runner_utils%shlibext %PYTHON %s | FileCheck %s +# RUN: env SUPPORTLIB=%mlir_c_runner_utils %PYTHON %s | FileCheck %s from typing import Sequence import dataclasses Index: mlir/test/Integration/Dialect/Standard/CPU/test-ceil-floor-pos-neg.mlir =================================================================== --- mlir/test/Integration/Dialect/Standard/CPU/test-ceil-floor-pos-neg.mlir +++ mlir/test/Integration/Dialect/Standard/CPU/test-ceil-floor-pos-neg.mlir @@ -1,6 +1,6 @@ // RUN: mlir-opt %s -pass-pipeline="builtin.module(func.func(convert-vector-to-scf,lower-affine,convert-scf-to-cf,memref-expand,arith-expand),convert-vector-to-llvm,finalize-memref-to-llvm,convert-func-to-llvm,reconcile-unrealized-casts)" | \ // RUN: mlir-cpu-runner -e entry -entry-point-result=void \ -// RUN: -shared-libs=%mlir_lib_dir/libmlir_c_runner_utils%shlibext | \ +// RUN: -shared-libs=%mlir_c_runner_utils | \ // RUN: FileCheck %s func.func @transfer_read_2d(%A : memref<40xi32>, %base1: index) { Index: mlir/test/Integration/Dialect/Standard/CPU/test_subview.mlir =================================================================== --- mlir/test/Integration/Dialect/Standard/CPU/test_subview.mlir +++ mlir/test/Integration/Dialect/Standard/CPU/test_subview.mlir @@ -1,6 +1,6 @@ // RUN: mlir-opt %s -expand-strided-metadata -lower-affine -convert-arith-to-llvm -finalize-memref-to-llvm -convert-func-to-llvm -reconcile-unrealized-casts | \ // RUN: mlir-cpu-runner -e main -entry-point-result=void \ -// RUN: -shared-libs=%mlir_lib_dir/libmlir_runner_utils%shlibext | FileCheck %s +// RUN: -shared-libs=%mlir_runner_utils | FileCheck %s memref.global "private" constant @__constant_5x3xf32 : memref<5x3xf32> = dense<[[0.0, 1.0, 2.0], Index: mlir/test/Integration/Dialect/Vector/CPU/AMX/test-mulf-full.mlir =================================================================== --- mlir/test/Integration/Dialect/Vector/CPU/AMX/test-mulf-full.mlir +++ mlir/test/Integration/Dialect/Vector/CPU/AMX/test-mulf-full.mlir @@ -3,7 +3,7 @@ // RUN: -finalize-memref-to-llvm -convert-func-to-llvm -reconcile-unrealized-casts | \ // RUN: mlir-translate -mlir-to-llvmir | \ // RUN: %lli --entry-function=entry --mattr="+amx-tile,+amx-int8,+amx-bf16" \ -// RUN: --dlopen=%mlir_lib_dir/libmlir_c_runner_utils%shlibext | \ +// RUN: --dlopen=%mlir_c_runner_utils | \ // RUN: FileCheck %s // Note: To run this test, your CPU must support AMX. Index: mlir/test/Integration/Dialect/Vector/CPU/AMX/test-mulf.mlir =================================================================== --- mlir/test/Integration/Dialect/Vector/CPU/AMX/test-mulf.mlir +++ mlir/test/Integration/Dialect/Vector/CPU/AMX/test-mulf.mlir @@ -1,6 +1,6 @@ // RUN: mlir-opt %s -convert-vector-to-scf -lower-affine -convert-scf-to-cf -convert-vector-to-llvm="enable-amx" -finalize-memref-to-llvm -convert-func-to-llvm -reconcile-unrealized-casts | \ // RUN: mlir-translate -mlir-to-llvmir | \ -// RUN: %lli --entry-function=entry --mattr="+amx-tile,+amx-int8,+amx-bf16" --dlopen=%mlir_lib_dir/libmlir_c_runner_utils%shlibext | \ +// RUN: %lli --entry-function=entry --mattr="+amx-tile,+amx-int8,+amx-bf16" --dlopen=%mlir_c_runner_utils | \ // RUN: FileCheck %s // Note: To run this test, your CPU must support AMX. Index: mlir/test/Integration/Dialect/Vector/CPU/AMX/test-muli-ext.mlir =================================================================== --- mlir/test/Integration/Dialect/Vector/CPU/AMX/test-muli-ext.mlir +++ mlir/test/Integration/Dialect/Vector/CPU/AMX/test-muli-ext.mlir @@ -1,6 +1,6 @@ // RUN: mlir-opt %s -convert-vector-to-scf -lower-affine -convert-scf-to-cf -convert-vector-to-llvm="enable-amx" -finalize-memref-to-llvm -convert-func-to-llvm -reconcile-unrealized-casts | \ // RUN: mlir-translate -mlir-to-llvmir | \ -// RUN: %lli --entry-function=entry --mattr="+amx-tile,+amx-int8,+amx-bf16" --dlopen=%mlir_lib_dir/libmlir_c_runner_utils%shlibext | \ +// RUN: %lli --entry-function=entry --mattr="+amx-tile,+amx-int8,+amx-bf16" --dlopen=%mlir_c_runner_utils | \ // RUN: FileCheck %s // Note: To run this test, your CPU must support AMX. Index: mlir/test/Integration/Dialect/Vector/CPU/AMX/test-muli-full.mlir =================================================================== --- mlir/test/Integration/Dialect/Vector/CPU/AMX/test-muli-full.mlir +++ mlir/test/Integration/Dialect/Vector/CPU/AMX/test-muli-full.mlir @@ -3,7 +3,7 @@ // RUN: -finalize-memref-to-llvm -convert-func-to-llvm -reconcile-unrealized-casts | \ // RUN: mlir-translate -mlir-to-llvmir | \ // RUN: %lli --entry-function=entry --mattr="+amx-tile,+amx-int8,+amx-bf16" \ -// RUN: --dlopen=%mlir_lib_dir/libmlir_c_runner_utils%shlibext | \ +// RUN: --dlopen=%mlir_c_runner_utils | \ // RUN: FileCheck %s // Note: To run this test, your CPU must support AMX. Index: mlir/test/Integration/Dialect/Vector/CPU/AMX/test-muli.mlir =================================================================== --- mlir/test/Integration/Dialect/Vector/CPU/AMX/test-muli.mlir +++ mlir/test/Integration/Dialect/Vector/CPU/AMX/test-muli.mlir @@ -1,6 +1,6 @@ // RUN: mlir-opt %s -convert-vector-to-scf -lower-affine -convert-scf-to-cf -convert-vector-to-llvm="enable-amx" -finalize-memref-to-llvm -convert-func-to-llvm -reconcile-unrealized-casts | \ // RUN: mlir-translate -mlir-to-llvmir | \ -// RUN: %lli --entry-function=entry --mattr="+amx-tile,+amx-int8,+amx-bf16" --dlopen=%mlir_lib_dir/libmlir_c_runner_utils%shlibext | \ +// RUN: %lli --entry-function=entry --mattr="+amx-tile,+amx-int8,+amx-bf16" --dlopen=%mlir_c_runner_utils | \ // RUN: FileCheck %s // Note: To run this test, your CPU must support AMX. Index: mlir/test/Integration/Dialect/Vector/CPU/AMX/test-tilezero-block.mlir =================================================================== --- mlir/test/Integration/Dialect/Vector/CPU/AMX/test-tilezero-block.mlir +++ mlir/test/Integration/Dialect/Vector/CPU/AMX/test-tilezero-block.mlir @@ -1,6 +1,6 @@ // RUN: mlir-opt %s -convert-vector-to-scf -lower-affine -convert-scf-to-cf -convert-vector-to-llvm="enable-amx" -finalize-memref-to-llvm -convert-func-to-llvm -reconcile-unrealized-casts | \ // RUN: mlir-translate -mlir-to-llvmir | \ -// RUN: %lli --entry-function=entry --mattr="+amx-tile,+amx-int8,+amx-bf16" --dlopen=%mlir_lib_dir/libmlir_c_runner_utils%shlibext | \ +// RUN: %lli --entry-function=entry --mattr="+amx-tile,+amx-int8,+amx-bf16" --dlopen=%mlir_c_runner_utils | \ // RUN: FileCheck %s // Note: To run this test, your CPU must support AMX. Index: mlir/test/Integration/Dialect/Vector/CPU/AMX/test-tilezero.mlir =================================================================== --- mlir/test/Integration/Dialect/Vector/CPU/AMX/test-tilezero.mlir +++ mlir/test/Integration/Dialect/Vector/CPU/AMX/test-tilezero.mlir @@ -1,6 +1,6 @@ // RUN: mlir-opt %s -convert-vector-to-scf -lower-affine -convert-scf-to-cf -convert-vector-to-llvm="enable-amx" -finalize-memref-to-llvm -convert-func-to-llvm -reconcile-unrealized-casts | \ // RUN: mlir-translate -mlir-to-llvmir | \ -// RUN: %lli --entry-function=entry --mattr="+amx-tile,+amx-int8,+amx-bf16" --dlopen=%mlir_lib_dir/libmlir_c_runner_utils%shlibext | \ +// RUN: %lli --entry-function=entry --mattr="+amx-tile,+amx-int8,+amx-bf16" --dlopen=%mlir_c_runner_utils | \ // RUN: FileCheck %s // Note: To run this test, your CPU must support AMX. Index: mlir/test/Integration/Dialect/Vector/CPU/X86Vector/test-dot.mlir =================================================================== --- mlir/test/Integration/Dialect/Vector/CPU/X86Vector/test-dot.mlir +++ mlir/test/Integration/Dialect/Vector/CPU/X86Vector/test-dot.mlir @@ -1,6 +1,6 @@ // RUN: mlir-opt %s -convert-scf-to-cf -convert-vector-to-llvm="enable-x86vector" -convert-func-to-llvm -reconcile-unrealized-casts | \ // RUN: mlir-translate --mlir-to-llvmir | \ -// RUN: %lli --entry-function=entry --mattr="avx" --dlopen=%mlir_lib_dir/libmlir_c_runner_utils%shlibext | \ +// RUN: %lli --entry-function=entry --mattr="avx" --dlopen=%mlir_c_runner_utils | \ // RUN: FileCheck %s func.func @entry() -> i32 { Index: mlir/test/Integration/Dialect/Vector/CPU/X86Vector/test-inline-asm-vector-avx512.mlir =================================================================== --- mlir/test/Integration/Dialect/Vector/CPU/X86Vector/test-inline-asm-vector-avx512.mlir +++ mlir/test/Integration/Dialect/Vector/CPU/X86Vector/test-inline-asm-vector-avx512.mlir @@ -1,6 +1,6 @@ // RUN: mlir-opt %s -convert-linalg-to-loops -convert-vector-to-scf='full-unroll=true' -lower-affine -convert-scf-to-cf -convert-vector-to-llvm -finalize-memref-to-llvm -convert-func-to-llvm='use-bare-ptr-memref-call-conv=1' -convert-arith-to-llvm -reconcile-unrealized-casts |\ // RUN: mlir-translate --mlir-to-llvmir |\ -// RUN: %lli --entry-function=entry --mattr="avx512f" --dlopen=%mlir_lib_dir/libmlir_c_runner_utils%shlibext |\ +// RUN: %lli --entry-function=entry --mattr="avx512f" --dlopen=%mlir_c_runner_utils |\ // RUN: FileCheck %s module { Index: mlir/test/Integration/Dialect/Vector/CPU/X86Vector/test-mask-compress.mlir =================================================================== --- mlir/test/Integration/Dialect/Vector/CPU/X86Vector/test-mask-compress.mlir +++ mlir/test/Integration/Dialect/Vector/CPU/X86Vector/test-mask-compress.mlir @@ -1,6 +1,6 @@ // RUN: mlir-opt %s -convert-scf-to-cf -convert-vector-to-llvm="enable-x86vector" -convert-func-to-llvm -reconcile-unrealized-casts | \ // RUN: mlir-translate --mlir-to-llvmir | \ -// RUN: %lli --entry-function=entry --mattr="avx512bw" --dlopen=%mlir_lib_dir/libmlir_c_runner_utils%shlibext | \ +// RUN: %lli --entry-function=entry --mattr="avx512bw" --dlopen=%mlir_c_runner_utils | \ // RUN: FileCheck %s func.func @entry() -> i32 { Index: mlir/test/Integration/Dialect/Vector/CPU/X86Vector/test-rsqrt.mlir =================================================================== --- mlir/test/Integration/Dialect/Vector/CPU/X86Vector/test-rsqrt.mlir +++ mlir/test/Integration/Dialect/Vector/CPU/X86Vector/test-rsqrt.mlir @@ -1,6 +1,6 @@ // RUN: mlir-opt %s -convert-vector-to-llvm="enable-x86vector" -convert-func-to-llvm | \ // RUN: mlir-translate --mlir-to-llvmir | \ -// RUN: %lli --entry-function=entry --mattr="avx" --dlopen=%mlir_lib_dir/libmlir_c_runner_utils%shlibext | \ +// RUN: %lli --entry-function=entry --mattr="avx" --dlopen=%mlir_c_runner_utils | \ // RUN: FileCheck %s func.func @entry() -> i32 { Index: mlir/test/Integration/Dialect/Vector/CPU/X86Vector/test-sparse-dot-product.mlir =================================================================== --- mlir/test/Integration/Dialect/Vector/CPU/X86Vector/test-sparse-dot-product.mlir +++ mlir/test/Integration/Dialect/Vector/CPU/X86Vector/test-sparse-dot-product.mlir @@ -1,6 +1,6 @@ // RUN: mlir-opt %s -convert-scf-to-cf -convert-vector-to-llvm="enable-x86vector" -finalize-memref-to-llvm -convert-func-to-llvm -reconcile-unrealized-casts | \ // RUN: mlir-translate --mlir-to-llvmir | \ -// RUN: %lli --entry-function=entry --mattr="avx512bw,avx512vp2intersect" --dlopen=%mlir_lib_dir/libmlir_c_runner_utils%shlibext | \ +// RUN: %lli --entry-function=entry --mattr="avx512bw,avx512vp2intersect" --dlopen=%mlir_c_runner_utils | \ // RUN: FileCheck %s // This test shows how to implement a sparse vector-vector dot product with Index: mlir/test/Integration/Dialect/Vector/CPU/X86Vector/test-vp2intersect-i32.mlir =================================================================== --- mlir/test/Integration/Dialect/Vector/CPU/X86Vector/test-vp2intersect-i32.mlir +++ mlir/test/Integration/Dialect/Vector/CPU/X86Vector/test-vp2intersect-i32.mlir @@ -1,6 +1,6 @@ // RUN: mlir-opt %s -convert-scf-to-cf -convert-vector-to-llvm="enable-x86vector" -convert-func-to-llvm -reconcile-unrealized-casts | \ // RUN: mlir-translate --mlir-to-llvmir | \ -// RUN: %lli --entry-function=entry --mattr="avx512bw,avx512vp2intersect" --dlopen=%mlir_lib_dir/libmlir_c_runner_utils%shlibext | \ +// RUN: %lli --entry-function=entry --mattr="avx512bw,avx512vp2intersect" --dlopen=%mlir_c_runner_utils | \ // RUN: FileCheck %s // Note: To run this test, your CPU must support AVX512 vp2intersect. Index: mlir/test/Integration/Dialect/Vector/CPU/lit.local.cfg =================================================================== --- mlir/test/Integration/Dialect/Vector/CPU/lit.local.cfg +++ /dev/null @@ -1,5 +0,0 @@ -import sys - -# No JIT on win32. -if sys.platform == 'win32': - config.unsupported = True Index: mlir/test/Integration/Dialect/Vector/CPU/test-0-d-vectors.mlir =================================================================== --- mlir/test/Integration/Dialect/Vector/CPU/test-0-d-vectors.mlir +++ mlir/test/Integration/Dialect/Vector/CPU/test-0-d-vectors.mlir @@ -1,6 +1,6 @@ // RUN: mlir-opt %s -convert-scf-to-cf -convert-vector-to-llvm -finalize-memref-to-llvm -convert-func-to-llvm -reconcile-unrealized-casts | \ // RUN: mlir-cpu-runner -e entry -entry-point-result=void \ -// RUN: -shared-libs=%mlir_lib_dir/libmlir_c_runner_utils%shlibext | \ +// RUN: -shared-libs=%mlir_c_runner_utils | \ // RUN: FileCheck %s func.func @extract_element_0d(%a: vector) { Index: mlir/test/Integration/Dialect/Vector/CPU/test-broadcast.mlir =================================================================== --- mlir/test/Integration/Dialect/Vector/CPU/test-broadcast.mlir +++ mlir/test/Integration/Dialect/Vector/CPU/test-broadcast.mlir @@ -1,6 +1,6 @@ // RUN: mlir-opt %s -convert-scf-to-cf -convert-vector-to-llvm -convert-func-to-llvm -reconcile-unrealized-casts | \ // RUN: mlir-cpu-runner -e entry -entry-point-result=void \ -// RUN: -shared-libs=%mlir_lib_dir/libmlir_c_runner_utils%shlibext | \ +// RUN: -shared-libs=%mlir_c_runner_utils | \ // RUN: FileCheck %s func.func @entry() { Index: mlir/test/Integration/Dialect/Vector/CPU/test-compress.mlir =================================================================== --- mlir/test/Integration/Dialect/Vector/CPU/test-compress.mlir +++ mlir/test/Integration/Dialect/Vector/CPU/test-compress.mlir @@ -1,6 +1,6 @@ // RUN: mlir-opt %s -convert-scf-to-cf -convert-vector-to-llvm -finalize-memref-to-llvm -convert-func-to-llvm -reconcile-unrealized-casts | \ // RUN: mlir-cpu-runner -e entry -entry-point-result=void \ -// RUN: -shared-libs=%mlir_lib_dir/libmlir_c_runner_utils%shlibext | \ +// RUN: -shared-libs=%mlir_c_runner_utils | \ // RUN: FileCheck %s func.func @compress16(%base: memref, Index: mlir/test/Integration/Dialect/Vector/CPU/test-constant-mask.mlir =================================================================== --- mlir/test/Integration/Dialect/Vector/CPU/test-constant-mask.mlir +++ mlir/test/Integration/Dialect/Vector/CPU/test-constant-mask.mlir @@ -1,6 +1,6 @@ // RUN: mlir-opt %s -convert-scf-to-cf -convert-vector-to-llvm -convert-func-to-llvm -reconcile-unrealized-casts | \ // RUN: mlir-cpu-runner -e entry -entry-point-result=void \ -// RUN: -shared-libs=%mlir_lib_dir/libmlir_c_runner_utils%shlibext | \ +// RUN: -shared-libs=%mlir_c_runner_utils | \ // RUN: FileCheck %s func.func @entry() { Index: mlir/test/Integration/Dialect/Vector/CPU/test-contraction.mlir =================================================================== --- mlir/test/Integration/Dialect/Vector/CPU/test-contraction.mlir +++ mlir/test/Integration/Dialect/Vector/CPU/test-contraction.mlir @@ -1,6 +1,6 @@ // RUN: mlir-opt %s -convert-scf-to-cf -convert-vector-to-llvm -convert-func-to-llvm -reconcile-unrealized-casts | \ // RUN: mlir-cpu-runner -e entry -entry-point-result=void \ -// RUN: -shared-libs=%mlir_lib_dir/libmlir_c_runner_utils%shlibext | \ +// RUN: -shared-libs=%mlir_c_runner_utils | \ // RUN: FileCheck %s #dotp_accesses = [ Index: mlir/test/Integration/Dialect/Vector/CPU/test-create-mask-v4i1.mlir =================================================================== --- mlir/test/Integration/Dialect/Vector/CPU/test-create-mask-v4i1.mlir +++ mlir/test/Integration/Dialect/Vector/CPU/test-create-mask-v4i1.mlir @@ -1,6 +1,6 @@ // RUN: mlir-opt %s -convert-scf-to-cf -convert-vector-to-llvm -convert-func-to-llvm -reconcile-unrealized-casts | \ // RUN: mlir-cpu-runner -e entry -entry-point-result=void \ -// RUN: -shared-libs=%mlir_lib_dir/libmlir_c_runner_utils%shlibext | \ +// RUN: -shared-libs=%mlir_c_runner_utils | \ // RUN: FileCheck %s // NOTE: This is similar to test-create-mask.mlir, but with a different length, Index: mlir/test/Integration/Dialect/Vector/CPU/test-create-mask.mlir =================================================================== --- mlir/test/Integration/Dialect/Vector/CPU/test-create-mask.mlir +++ mlir/test/Integration/Dialect/Vector/CPU/test-create-mask.mlir @@ -1,6 +1,6 @@ // RUN: mlir-opt %s -convert-scf-to-cf -convert-vector-to-llvm -convert-func-to-llvm -reconcile-unrealized-casts | \ // RUN: mlir-cpu-runner -e entry -entry-point-result=void \ -// RUN: -shared-libs=%mlir_lib_dir/libmlir_c_runner_utils%shlibext | \ +// RUN: -shared-libs=%mlir_c_runner_utils | \ // RUN: FileCheck %s func.func @entry() { Index: mlir/test/Integration/Dialect/Vector/CPU/test-expand.mlir =================================================================== --- mlir/test/Integration/Dialect/Vector/CPU/test-expand.mlir +++ mlir/test/Integration/Dialect/Vector/CPU/test-expand.mlir @@ -1,6 +1,6 @@ // RUN: mlir-opt %s -convert-scf-to-cf -convert-vector-to-llvm -finalize-memref-to-llvm -convert-func-to-llvm -reconcile-unrealized-casts | \ // RUN: mlir-cpu-runner -e entry -entry-point-result=void \ -// RUN: -shared-libs=%mlir_lib_dir/libmlir_c_runner_utils%shlibext | \ +// RUN: -shared-libs=%mlir_c_runner_utils | \ // RUN: FileCheck %s func.func @expand16(%base: memref, Index: mlir/test/Integration/Dialect/Vector/CPU/test-extract-strided-slice.mlir =================================================================== --- mlir/test/Integration/Dialect/Vector/CPU/test-extract-strided-slice.mlir +++ mlir/test/Integration/Dialect/Vector/CPU/test-extract-strided-slice.mlir @@ -1,6 +1,6 @@ // RUN: mlir-opt %s -convert-scf-to-cf -convert-vector-to-llvm -convert-func-to-llvm -reconcile-unrealized-casts | \ // RUN: mlir-cpu-runner -e entry -entry-point-result=void \ -// RUN: -shared-libs=%mlir_lib_dir/libmlir_c_runner_utils%shlibext | \ +// RUN: -shared-libs=%mlir_c_runner_utils | \ // RUN: FileCheck %s func.func @entry() { Index: mlir/test/Integration/Dialect/Vector/CPU/test-flat-transpose-col.mlir =================================================================== --- mlir/test/Integration/Dialect/Vector/CPU/test-flat-transpose-col.mlir +++ mlir/test/Integration/Dialect/Vector/CPU/test-flat-transpose-col.mlir @@ -1,7 +1,7 @@ // RUN: mlir-opt %s -convert-scf-to-cf -convert-vector-to-llvm -convert-func-to-llvm -reconcile-unrealized-casts | \ // RUN: mlir-cpu-runner -e entry -entry-point-result=void \ // RUN: -O0 -enable-matrix -matrix-allow-contract -matrix-default-layout=column-major \ -// RUN: -shared-libs=%mlir_lib_dir/libmlir_c_runner_utils%shlibext | \ +// RUN: -shared-libs=%mlir_c_runner_utils | \ // RUN: FileCheck %s func.func @entry() { Index: mlir/test/Integration/Dialect/Vector/CPU/test-flat-transpose-row.mlir =================================================================== --- mlir/test/Integration/Dialect/Vector/CPU/test-flat-transpose-row.mlir +++ mlir/test/Integration/Dialect/Vector/CPU/test-flat-transpose-row.mlir @@ -1,7 +1,7 @@ // RUN: mlir-opt %s -convert-scf-to-cf -convert-vector-to-llvm -convert-func-to-llvm -reconcile-unrealized-casts | \ // RUN: mlir-cpu-runner -e entry -entry-point-result=void \ // RUN: -O0 -enable-matrix -matrix-allow-contract -matrix-default-layout=row-major \ -// RUN: -shared-libs=%mlir_lib_dir/libmlir_c_runner_utils%shlibext | \ +// RUN: -shared-libs=%mlir_c_runner_utils | \ // RUN: FileCheck %s func.func @entry() { Index: mlir/test/Integration/Dialect/Vector/CPU/test-fma.mlir =================================================================== --- mlir/test/Integration/Dialect/Vector/CPU/test-fma.mlir +++ mlir/test/Integration/Dialect/Vector/CPU/test-fma.mlir @@ -1,6 +1,6 @@ // RUN: mlir-opt %s -convert-scf-to-cf -convert-vector-to-llvm -convert-func-to-llvm -reconcile-unrealized-casts | \ // RUN: mlir-cpu-runner -e entry -entry-point-result=void \ -// RUN: -shared-libs=%mlir_lib_dir/libmlir_c_runner_utils%shlibext | \ +// RUN: -shared-libs=%mlir_c_runner_utils | \ // RUN: FileCheck %s func.func @entry() { Index: mlir/test/Integration/Dialect/Vector/CPU/test-gather.mlir =================================================================== --- mlir/test/Integration/Dialect/Vector/CPU/test-gather.mlir +++ mlir/test/Integration/Dialect/Vector/CPU/test-gather.mlir @@ -1,6 +1,6 @@ // RUN: mlir-opt %s -convert-scf-to-cf -convert-vector-to-llvm -finalize-memref-to-llvm -convert-func-to-llvm -reconcile-unrealized-casts | \ // RUN: mlir-cpu-runner -e entry -entry-point-result=void \ -// RUN: -shared-libs=%mlir_lib_dir/libmlir_c_runner_utils%shlibext | \ +// RUN: -shared-libs=%mlir_c_runner_utils | \ // RUN: FileCheck %s func.func @gather8(%base: memref, %indices: vector<8xi32>, Index: mlir/test/Integration/Dialect/Vector/CPU/test-index-vectors.mlir =================================================================== --- mlir/test/Integration/Dialect/Vector/CPU/test-index-vectors.mlir +++ mlir/test/Integration/Dialect/Vector/CPU/test-index-vectors.mlir @@ -1,6 +1,6 @@ // RUN: mlir-opt %s -convert-vector-to-llvm -convert-func-to-llvm -reconcile-unrealized-casts | \ // RUN: mlir-cpu-runner -e entry -entry-point-result=void \ -// RUN: -shared-libs=%mlir_lib_dir/libmlir_c_runner_utils%shlibext | \ +// RUN: -shared-libs=%mlir_c_runner_utils | \ // RUN: FileCheck %s func.func @entry() { Index: mlir/test/Integration/Dialect/Vector/CPU/test-insert-strided-slice.mlir =================================================================== --- mlir/test/Integration/Dialect/Vector/CPU/test-insert-strided-slice.mlir +++ mlir/test/Integration/Dialect/Vector/CPU/test-insert-strided-slice.mlir @@ -1,6 +1,6 @@ // RUN: mlir-opt %s -convert-scf-to-cf -convert-vector-to-llvm -convert-func-to-llvm -reconcile-unrealized-casts | \ // RUN: mlir-cpu-runner -e entry -entry-point-result=void \ -// RUN: -shared-libs=%mlir_lib_dir/libmlir_c_runner_utils%shlibext | \ +// RUN: -shared-libs=%mlir_c_runner_utils | \ // RUN: FileCheck %s func.func @entry() { Index: mlir/test/Integration/Dialect/Vector/CPU/test-maskedload.mlir =================================================================== --- mlir/test/Integration/Dialect/Vector/CPU/test-maskedload.mlir +++ mlir/test/Integration/Dialect/Vector/CPU/test-maskedload.mlir @@ -1,6 +1,6 @@ // RUN: mlir-opt %s -convert-scf-to-cf -convert-vector-to-llvm -finalize-memref-to-llvm -convert-func-to-llvm -reconcile-unrealized-casts | \ // RUN: mlir-cpu-runner -e entry -entry-point-result=void \ -// RUN: -shared-libs=%mlir_lib_dir/libmlir_c_runner_utils%shlibext | \ +// RUN: -shared-libs=%mlir_c_runner_utils | \ // RUN: FileCheck %s func.func @maskedload16(%base: memref, %mask: vector<16xi1>, Index: mlir/test/Integration/Dialect/Vector/CPU/test-maskedstore.mlir =================================================================== --- mlir/test/Integration/Dialect/Vector/CPU/test-maskedstore.mlir +++ mlir/test/Integration/Dialect/Vector/CPU/test-maskedstore.mlir @@ -1,6 +1,6 @@ // RUN: mlir-opt %s -convert-scf-to-cf -convert-vector-to-llvm -finalize-memref-to-llvm -convert-func-to-llvm -reconcile-unrealized-casts | \ // RUN: mlir-cpu-runner -e entry -entry-point-result=void \ -// RUN: -shared-libs=%mlir_lib_dir/libmlir_c_runner_utils%shlibext | \ +// RUN: -shared-libs=%mlir_c_runner_utils | \ // RUN: FileCheck %s func.func @maskedstore16(%base: memref, Index: mlir/test/Integration/Dialect/Vector/CPU/test-matrix-multiply-col.mlir =================================================================== --- mlir/test/Integration/Dialect/Vector/CPU/test-matrix-multiply-col.mlir +++ mlir/test/Integration/Dialect/Vector/CPU/test-matrix-multiply-col.mlir @@ -1,7 +1,7 @@ // RUN: mlir-opt %s -convert-scf-to-cf -convert-vector-to-llvm -convert-func-to-llvm -reconcile-unrealized-casts | \ // RUN: mlir-cpu-runner -e entry -entry-point-result=void \ // RUN: -O0 -enable-matrix -matrix-allow-contract -matrix-default-layout=column-major \ -// RUN: -shared-libs=%mlir_lib_dir/libmlir_c_runner_utils%shlibext | \ +// RUN: -shared-libs=%mlir_c_runner_utils | \ // RUN: FileCheck %s func.func @entry() { Index: mlir/test/Integration/Dialect/Vector/CPU/test-matrix-multiply-row.mlir =================================================================== --- mlir/test/Integration/Dialect/Vector/CPU/test-matrix-multiply-row.mlir +++ mlir/test/Integration/Dialect/Vector/CPU/test-matrix-multiply-row.mlir @@ -1,7 +1,7 @@ // RUN: mlir-opt %s -convert-scf-to-cf -convert-vector-to-llvm -convert-func-to-llvm -reconcile-unrealized-casts | \ // RUN: mlir-cpu-runner -e entry -entry-point-result=void \ // RUN: -O0 -enable-matrix -matrix-allow-contract -matrix-default-layout=row-major \ -// RUN: -shared-libs=%mlir_lib_dir/libmlir_c_runner_utils%shlibext | \ +// RUN: -shared-libs=%mlir_c_runner_utils | \ // RUN: FileCheck %s func.func @entry() { Index: mlir/test/Integration/Dialect/Vector/CPU/test-outerproduct-f32.mlir =================================================================== --- mlir/test/Integration/Dialect/Vector/CPU/test-outerproduct-f32.mlir +++ mlir/test/Integration/Dialect/Vector/CPU/test-outerproduct-f32.mlir @@ -1,6 +1,6 @@ // RUN: mlir-opt %s -convert-scf-to-cf -convert-vector-to-llvm -convert-func-to-llvm -reconcile-unrealized-casts | \ // RUN: mlir-cpu-runner -e entry -entry-point-result=void \ -// RUN: -shared-libs=%mlir_lib_dir/libmlir_c_runner_utils%shlibext | \ +// RUN: -shared-libs=%mlir_c_runner_utils | \ // RUN: FileCheck %s !vector_type_A = vector<8xf32> Index: mlir/test/Integration/Dialect/Vector/CPU/test-outerproduct-i64.mlir =================================================================== --- mlir/test/Integration/Dialect/Vector/CPU/test-outerproduct-i64.mlir +++ mlir/test/Integration/Dialect/Vector/CPU/test-outerproduct-i64.mlir @@ -1,6 +1,6 @@ // RUN: mlir-opt %s -convert-scf-to-cf -convert-vector-to-llvm -convert-func-to-llvm -reconcile-unrealized-casts | \ // RUN: mlir-cpu-runner -e entry -entry-point-result=void \ -// RUN: -shared-libs=%mlir_lib_dir/libmlir_c_runner_utils%shlibext | \ +// RUN: -shared-libs=%mlir_c_runner_utils | \ // RUN: FileCheck %s !vector_type_A = vector<8xi64> Index: mlir/test/Integration/Dialect/Vector/CPU/test-print-int.mlir =================================================================== --- mlir/test/Integration/Dialect/Vector/CPU/test-print-int.mlir +++ mlir/test/Integration/Dialect/Vector/CPU/test-print-int.mlir @@ -1,6 +1,6 @@ // RUN: mlir-opt %s -convert-scf-to-cf -convert-vector-to-llvm -convert-func-to-llvm -reconcile-unrealized-casts | \ // RUN: mlir-cpu-runner -e entry -entry-point-result=void \ -// RUN: -shared-libs=%mlir_lib_dir/libmlir_c_runner_utils%shlibext | \ +// RUN: -shared-libs=%mlir_c_runner_utils | \ // RUN: FileCheck %s // Index: mlir/test/Integration/Dialect/Vector/CPU/test-realloc.mlir =================================================================== --- mlir/test/Integration/Dialect/Vector/CPU/test-realloc.mlir +++ mlir/test/Integration/Dialect/Vector/CPU/test-realloc.mlir @@ -1,9 +1,12 @@ // RUN: mlir-opt %s -convert-scf-to-cf -convert-vector-to-llvm -finalize-memref-to-llvm -convert-func-to-llvm -reconcile-unrealized-casts |\ // RUN: mlir-cpu-runner -e entry -entry-point-result=void \ -// RUN: -shared-libs=%mlir_lib_dir/libmlir_c_runner_utils%shlibext +// RUN: -shared-libs=%mlir_c_runner_utils // RUN: mlir-opt %s -convert-scf-to-cf -convert-vector-to-llvm -finalize-memref-to-llvm='use-aligned-alloc=1' -convert-func-to-llvm -arith-expand -reconcile-unrealized-casts |\ // RUN: mlir-cpu-runner -e entry -entry-point-result=void \ -// RUN: -shared-libs=%mlir_lib_dir/libmlir_c_runner_utils%shlibext | FileCheck %s +// RUN: -shared-libs=%mlir_c_runner_utils | FileCheck %s + +// FIXME: Windows does not have aligned_alloc +// UNSUPPORTED: system-windows func.func @entry() { // Set up memory. Index: mlir/test/Integration/Dialect/Vector/CPU/test-reductions-f32-reassoc.mlir =================================================================== --- mlir/test/Integration/Dialect/Vector/CPU/test-reductions-f32-reassoc.mlir +++ mlir/test/Integration/Dialect/Vector/CPU/test-reductions-f32-reassoc.mlir @@ -2,7 +2,7 @@ // RUN: -convert-vector-to-llvm='reassociate-fp-reductions' \ // RUN: -convert-func-to-llvm -reconcile-unrealized-casts | \ // RUN: mlir-cpu-runner -e entry -entry-point-result=void \ -// RUN: -shared-libs=%mlir_lib_dir/libmlir_c_runner_utils%shlibext | \ +// RUN: -shared-libs=%mlir_c_runner_utils | \ // RUN: FileCheck %s func.func @entry() { Index: mlir/test/Integration/Dialect/Vector/CPU/test-reductions-f32.mlir =================================================================== --- mlir/test/Integration/Dialect/Vector/CPU/test-reductions-f32.mlir +++ mlir/test/Integration/Dialect/Vector/CPU/test-reductions-f32.mlir @@ -1,6 +1,6 @@ // RUN: mlir-opt %s -convert-scf-to-cf -convert-vector-to-llvm -convert-func-to-llvm -reconcile-unrealized-casts | \ // RUN: mlir-cpu-runner -e entry -entry-point-result=void \ -// RUN: -shared-libs=%mlir_lib_dir/libmlir_c_runner_utils%shlibext | \ +// RUN: -shared-libs=%mlir_c_runner_utils | \ // RUN: FileCheck %s func.func @entry() { Index: mlir/test/Integration/Dialect/Vector/CPU/test-reductions-f64-reassoc.mlir =================================================================== --- mlir/test/Integration/Dialect/Vector/CPU/test-reductions-f64-reassoc.mlir +++ mlir/test/Integration/Dialect/Vector/CPU/test-reductions-f64-reassoc.mlir @@ -2,7 +2,7 @@ // RUN: -convert-vector-to-llvm='reassociate-fp-reductions' \ // RUN: -convert-func-to-llvm -reconcile-unrealized-casts | \ // RUN: mlir-cpu-runner -e entry -entry-point-result=void \ -// RUN: -shared-libs=%mlir_lib_dir/libmlir_c_runner_utils%shlibext | \ +// RUN: -shared-libs=%mlir_c_runner_utils | \ // RUN: FileCheck %s func.func @entry() { Index: mlir/test/Integration/Dialect/Vector/CPU/test-reductions-f64.mlir =================================================================== --- mlir/test/Integration/Dialect/Vector/CPU/test-reductions-f64.mlir +++ mlir/test/Integration/Dialect/Vector/CPU/test-reductions-f64.mlir @@ -1,6 +1,6 @@ // RUN: mlir-opt %s -convert-scf-to-cf -convert-vector-to-llvm -convert-func-to-llvm -reconcile-unrealized-casts | \ // RUN: mlir-cpu-runner -e entry -entry-point-result=void \ -// RUN: -shared-libs=%mlir_lib_dir/libmlir_c_runner_utils%shlibext | \ +// RUN: -shared-libs=%mlir_c_runner_utils | \ // RUN: FileCheck %s func.func @entry() { Index: mlir/test/Integration/Dialect/Vector/CPU/test-reductions-i32.mlir =================================================================== --- mlir/test/Integration/Dialect/Vector/CPU/test-reductions-i32.mlir +++ mlir/test/Integration/Dialect/Vector/CPU/test-reductions-i32.mlir @@ -1,6 +1,6 @@ // RUN: mlir-opt %s -convert-scf-to-cf -convert-vector-to-llvm -convert-func-to-llvm -reconcile-unrealized-casts | \ // RUN: mlir-cpu-runner -e entry -entry-point-result=void \ -// RUN: -shared-libs=%mlir_lib_dir/libmlir_c_runner_utils%shlibext | \ +// RUN: -shared-libs=%mlir_c_runner_utils | \ // RUN: FileCheck %s func.func @entry() { Index: mlir/test/Integration/Dialect/Vector/CPU/test-reductions-i4.mlir =================================================================== --- mlir/test/Integration/Dialect/Vector/CPU/test-reductions-i4.mlir +++ mlir/test/Integration/Dialect/Vector/CPU/test-reductions-i4.mlir @@ -1,6 +1,6 @@ // RUN: mlir-opt %s -convert-scf-to-cf -convert-vector-to-llvm -convert-func-to-llvm -reconcile-unrealized-casts | \ // RUN: mlir-cpu-runner -e entry -entry-point-result=void \ -// RUN: -shared-libs=%mlir_lib_dir/libmlir_c_runner_utils%shlibext | \ +// RUN: -shared-libs=%mlir_c_runner_utils | \ // RUN: FileCheck %s func.func @entry() { Index: mlir/test/Integration/Dialect/Vector/CPU/test-reductions-i64.mlir =================================================================== --- mlir/test/Integration/Dialect/Vector/CPU/test-reductions-i64.mlir +++ mlir/test/Integration/Dialect/Vector/CPU/test-reductions-i64.mlir @@ -1,6 +1,6 @@ // RUN: mlir-opt %s -convert-scf-to-cf -convert-vector-to-llvm -convert-func-to-llvm -reconcile-unrealized-casts | \ // RUN: mlir-cpu-runner -e entry -entry-point-result=void \ -// RUN: -shared-libs=%mlir_lib_dir/libmlir_c_runner_utils%shlibext | \ +// RUN: -shared-libs=%mlir_c_runner_utils | \ // RUN: FileCheck %s func.func @entry() { Index: mlir/test/Integration/Dialect/Vector/CPU/test-reductions-si4.mlir =================================================================== --- mlir/test/Integration/Dialect/Vector/CPU/test-reductions-si4.mlir +++ mlir/test/Integration/Dialect/Vector/CPU/test-reductions-si4.mlir @@ -1,6 +1,6 @@ // RUN: mlir-opt %s -convert-scf-to-cf -convert-vector-to-llvm -convert-func-to-llvm -reconcile-unrealized-casts | \ // RUN: mlir-cpu-runner -e entry -entry-point-result=void \ -// RUN: -shared-libs=%mlir_lib_dir/libmlir_c_runner_utils%shlibext | \ +// RUN: -shared-libs=%mlir_c_runner_utils | \ // RUN: FileCheck %s func.func @entry() { Index: mlir/test/Integration/Dialect/Vector/CPU/test-reductions-ui4.mlir =================================================================== --- mlir/test/Integration/Dialect/Vector/CPU/test-reductions-ui4.mlir +++ mlir/test/Integration/Dialect/Vector/CPU/test-reductions-ui4.mlir @@ -1,6 +1,6 @@ // RUN: mlir-opt %s -convert-scf-to-cf -convert-vector-to-llvm -convert-func-to-llvm -reconcile-unrealized-casts | \ // RUN: mlir-cpu-runner -e entry -entry-point-result=void \ -// RUN: -shared-libs=%mlir_lib_dir/libmlir_c_runner_utils%shlibext | \ +// RUN: -shared-libs=%mlir_c_runner_utils | \ // RUN: FileCheck %s func.func @entry() { Index: mlir/test/Integration/Dialect/Vector/CPU/test-scan.mlir =================================================================== --- mlir/test/Integration/Dialect/Vector/CPU/test-scan.mlir +++ mlir/test/Integration/Dialect/Vector/CPU/test-scan.mlir @@ -1,6 +1,6 @@ // RUN: mlir-opt %s -test-vector-scan-lowering -convert-scf-to-cf -convert-vector-to-llvm -convert-func-to-llvm -reconcile-unrealized-casts | \ // RUN: mlir-cpu-runner -e entry -entry-point-result=void \ -// RUN: -shared-libs=%mlir_lib_dir/libmlir_c_runner_utils%shlibext | \ +// RUN: -shared-libs=%mlir_c_runner_utils | \ // RUN: FileCheck %s func.func @entry() { Index: mlir/test/Integration/Dialect/Vector/CPU/test-scatter.mlir =================================================================== --- mlir/test/Integration/Dialect/Vector/CPU/test-scatter.mlir +++ mlir/test/Integration/Dialect/Vector/CPU/test-scatter.mlir @@ -1,6 +1,6 @@ // RUN: mlir-opt %s -convert-scf-to-cf -convert-vector-to-llvm -finalize-memref-to-llvm -convert-func-to-llvm -reconcile-unrealized-casts | \ // RUN: mlir-cpu-runner -e entry -entry-point-result=void \ -// RUN: -shared-libs=%mlir_lib_dir/libmlir_c_runner_utils%shlibext | \ +// RUN: -shared-libs=%mlir_c_runner_utils | \ // RUN: FileCheck %s func.func @scatter8(%base: memref, Index: mlir/test/Integration/Dialect/Vector/CPU/test-shape-cast.mlir =================================================================== --- mlir/test/Integration/Dialect/Vector/CPU/test-shape-cast.mlir +++ mlir/test/Integration/Dialect/Vector/CPU/test-shape-cast.mlir @@ -1,6 +1,6 @@ // RUN: mlir-opt %s -convert-scf-to-cf -convert-vector-to-llvm -convert-func-to-llvm -reconcile-unrealized-casts | \ // RUN: mlir-cpu-runner -e entry -entry-point-result=void \ -// RUN: -shared-libs=%mlir_lib_dir/libmlir_c_runner_utils%shlibext | \ +// RUN: -shared-libs=%mlir_c_runner_utils | \ // RUN: FileCheck %s func.func @entry() { Index: mlir/test/Integration/Dialect/Vector/CPU/test-shuffle.mlir =================================================================== --- mlir/test/Integration/Dialect/Vector/CPU/test-shuffle.mlir +++ mlir/test/Integration/Dialect/Vector/CPU/test-shuffle.mlir @@ -1,6 +1,6 @@ // RUN: mlir-opt %s -convert-scf-to-cf -convert-vector-to-llvm -convert-func-to-llvm -reconcile-unrealized-casts | \ // RUN: mlir-cpu-runner -e entry -entry-point-result=void \ -// RUN: -shared-libs=%mlir_lib_dir/libmlir_c_runner_utils%shlibext | \ +// RUN: -shared-libs=%mlir_c_runner_utils | \ // RUN: FileCheck %s func.func @entry() { Index: mlir/test/Integration/Dialect/Vector/CPU/test-sparse-dot-matvec.mlir =================================================================== --- mlir/test/Integration/Dialect/Vector/CPU/test-sparse-dot-matvec.mlir +++ mlir/test/Integration/Dialect/Vector/CPU/test-sparse-dot-matvec.mlir @@ -1,6 +1,6 @@ // RUN: mlir-opt %s -convert-scf-to-cf -convert-vector-to-llvm -finalize-memref-to-llvm -convert-func-to-llvm -reconcile-unrealized-casts | \ // RUN: mlir-cpu-runner -e entry -entry-point-result=void \ -// RUN: -shared-libs=%mlir_lib_dir/libmlir_c_runner_utils%shlibext | \ +// RUN: -shared-libs=%mlir_c_runner_utils | \ // RUN: FileCheck %s // Illustrates an 8x8 Sparse Matrix x Vector implemented with only operations Index: mlir/test/Integration/Dialect/Vector/CPU/test-sparse-saxpy-jagged-matvec.mlir =================================================================== --- mlir/test/Integration/Dialect/Vector/CPU/test-sparse-saxpy-jagged-matvec.mlir +++ mlir/test/Integration/Dialect/Vector/CPU/test-sparse-saxpy-jagged-matvec.mlir @@ -1,6 +1,6 @@ // RUN: mlir-opt %s -convert-scf-to-cf -convert-vector-to-llvm -finalize-memref-to-llvm -convert-func-to-llvm -reconcile-unrealized-casts | \ // RUN: mlir-cpu-runner -e entry -entry-point-result=void \ -// RUN: -shared-libs=%mlir_lib_dir/libmlir_c_runner_utils%shlibext | \ +// RUN: -shared-libs=%mlir_c_runner_utils | \ // RUN: FileCheck %s // Illustrates an 8x8 Sparse Matrix x Vector implemented with only operations Index: mlir/test/Integration/Dialect/Vector/CPU/test-transfer-read-1d.mlir =================================================================== --- mlir/test/Integration/Dialect/Vector/CPU/test-transfer-read-1d.mlir +++ mlir/test/Integration/Dialect/Vector/CPU/test-transfer-read-1d.mlir @@ -1,11 +1,11 @@ // RUN: mlir-opt %s -pass-pipeline="builtin.module(func.func(convert-vector-to-scf,expand-strided-metadata,lower-affine,convert-arith-to-llvm,convert-scf-to-cf),convert-vector-to-llvm,finalize-memref-to-llvm,convert-func-to-llvm,reconcile-unrealized-casts)" | \ // RUN: mlir-cpu-runner -e entry -entry-point-result=void \ -// RUN: -shared-libs=%mlir_lib_dir/libmlir_c_runner_utils%shlibext | \ +// RUN: -shared-libs=%mlir_c_runner_utils | \ // RUN: FileCheck %s // RUN: mlir-opt %s -pass-pipeline="builtin.module(func.func(convert-vector-to-scf{full-unroll=true},expand-strided-metadata,lower-affine,convert-arith-to-llvm,convert-scf-to-cf),convert-vector-to-llvm,finalize-memref-to-llvm,convert-func-to-llvm,reconcile-unrealized-casts)" | \ // RUN: mlir-cpu-runner -e entry -entry-point-result=void \ -// RUN: -shared-libs=%mlir_lib_dir/libmlir_c_runner_utils%shlibext | \ +// RUN: -shared-libs=%mlir_c_runner_utils | \ // RUN: FileCheck %s // Test for special cases of 1D vector transfer ops. Index: mlir/test/Integration/Dialect/Vector/CPU/test-transfer-read-2d.mlir =================================================================== --- mlir/test/Integration/Dialect/Vector/CPU/test-transfer-read-2d.mlir +++ mlir/test/Integration/Dialect/Vector/CPU/test-transfer-read-2d.mlir @@ -1,11 +1,11 @@ // RUN: mlir-opt %s -pass-pipeline="builtin.module(func.func(convert-vector-to-scf,lower-affine,convert-scf-to-cf),convert-vector-to-llvm,finalize-memref-to-llvm,convert-func-to-llvm,reconcile-unrealized-casts)" | \ // RUN: mlir-cpu-runner -e entry -entry-point-result=void \ -// RUN: -shared-libs=%mlir_lib_dir/libmlir_c_runner_utils%shlibext | \ +// RUN: -shared-libs=%mlir_c_runner_utils | \ // RUN: FileCheck %s // RUN: mlir-opt %s -pass-pipeline="builtin.module(func.func(convert-vector-to-scf{full-unroll=true},lower-affine,convert-scf-to-cf),convert-vector-to-llvm,finalize-memref-to-llvm,convert-func-to-llvm,reconcile-unrealized-casts)" | \ // RUN: mlir-cpu-runner -e entry -entry-point-result=void \ -// RUN: -shared-libs=%mlir_lib_dir/libmlir_c_runner_utils%shlibext | \ +// RUN: -shared-libs=%mlir_c_runner_utils | \ // RUN: FileCheck %s memref.global "private" @gv : memref<3x4xf32> = dense<[[0. , 1. , 2. , 3. ], Index: mlir/test/Integration/Dialect/Vector/CPU/test-transfer-read-3d.mlir =================================================================== --- mlir/test/Integration/Dialect/Vector/CPU/test-transfer-read-3d.mlir +++ mlir/test/Integration/Dialect/Vector/CPU/test-transfer-read-3d.mlir @@ -1,11 +1,11 @@ // RUN: mlir-opt %s -pass-pipeline="builtin.module(func.func(convert-vector-to-scf,lower-affine,convert-scf-to-cf),convert-vector-to-llvm,finalize-memref-to-llvm,convert-func-to-llvm,reconcile-unrealized-casts)" | \ // RUN: mlir-cpu-runner -e entry -entry-point-result=void \ -// RUN: -shared-libs=%mlir_lib_dir/libmlir_c_runner_utils%shlibext | \ +// RUN: -shared-libs=%mlir_c_runner_utils | \ // RUN: FileCheck %s // RUN: mlir-opt %s -pass-pipeline="builtin.module(func.func(convert-vector-to-scf{full-unroll=true},lower-affine,convert-scf-to-cf),convert-vector-to-llvm,finalize-memref-to-llvm,convert-func-to-llvm,reconcile-unrealized-casts)" | \ // RUN: mlir-cpu-runner -e entry -entry-point-result=void \ -// RUN: -shared-libs=%mlir_lib_dir/libmlir_c_runner_utils%shlibext | \ +// RUN: -shared-libs=%mlir_c_runner_utils | \ // RUN: FileCheck %s func.func @transfer_read_3d(%A : memref, Index: mlir/test/Integration/Dialect/Vector/CPU/test-transfer-read.mlir =================================================================== --- mlir/test/Integration/Dialect/Vector/CPU/test-transfer-read.mlir +++ mlir/test/Integration/Dialect/Vector/CPU/test-transfer-read.mlir @@ -1,11 +1,11 @@ // RUN: mlir-opt %s -pass-pipeline="builtin.module(func.func(convert-vector-to-scf,lower-affine,convert-scf-to-cf),convert-vector-to-llvm,finalize-memref-to-llvm,convert-func-to-llvm,reconcile-unrealized-casts)" | \ // RUN: mlir-cpu-runner -e entry -entry-point-result=void \ -// RUN: -shared-libs=%mlir_lib_dir/libmlir_c_runner_utils%shlibext | \ +// RUN: -shared-libs=%mlir_c_runner_utils | \ // RUN: FileCheck %s // RUN: mlir-opt %s -pass-pipeline="builtin.module(func.func(convert-vector-to-scf{full-unroll=true},lower-affine,convert-scf-to-cf),convert-vector-to-llvm,finalize-memref-to-llvm,convert-func-to-llvm,reconcile-unrealized-casts)" | \ // RUN: mlir-cpu-runner -e entry -entry-point-result=void \ -// RUN: -shared-libs=%mlir_lib_dir/libmlir_c_runner_utils%shlibext | \ +// RUN: -shared-libs=%mlir_c_runner_utils | \ // RUN: FileCheck %s func.func @transfer_read_1d(%A : memref, %base: index) { Index: mlir/test/Integration/Dialect/Vector/CPU/test-transfer-to-loops.mlir =================================================================== --- mlir/test/Integration/Dialect/Vector/CPU/test-transfer-to-loops.mlir +++ mlir/test/Integration/Dialect/Vector/CPU/test-transfer-to-loops.mlir @@ -1,11 +1,11 @@ // RUN: mlir-opt %s -pass-pipeline="builtin.module(func.func(convert-vector-to-scf,lower-affine,convert-scf-to-cf),convert-vector-to-llvm,finalize-memref-to-llvm,convert-func-to-llvm,reconcile-unrealized-casts)" | \ // RUN: mlir-cpu-runner -e main -entry-point-result=void \ -// RUN: -shared-libs=%mlir_lib_dir/libmlir_runner_utils%shlibext,%mlir_lib_dir/libmlir_c_runner_utils%shlibext | \ +// RUN: -shared-libs=%mlir_runner_utils,%mlir_c_runner_utils | \ // RUN: FileCheck %s // RUN: mlir-opt %s -pass-pipeline="builtin.module(func.func(convert-vector-to-scf{full-unroll=true},lower-affine,convert-scf-to-cf),convert-vector-to-llvm,finalize-memref-to-llvm,convert-func-to-llvm,reconcile-unrealized-casts)" | \ // RUN: mlir-cpu-runner -e main -entry-point-result=void \ -// RUN: -shared-libs=%mlir_lib_dir/libmlir_runner_utils%shlibext,%mlir_lib_dir/libmlir_c_runner_utils%shlibext | \ +// RUN: -shared-libs=%mlir_runner_utils,%mlir_c_runner_utils | \ // RUN: FileCheck %s #map0 = affine_map<(d0, d1) -> (d1, d0)> Index: mlir/test/Integration/Dialect/Vector/CPU/test-transfer-write.mlir =================================================================== --- mlir/test/Integration/Dialect/Vector/CPU/test-transfer-write.mlir +++ mlir/test/Integration/Dialect/Vector/CPU/test-transfer-write.mlir @@ -1,6 +1,6 @@ // RUN: mlir-opt %s -convert-vector-to-scf -convert-scf-to-cf -convert-vector-to-llvm -finalize-memref-to-llvm -convert-func-to-llvm -reconcile-unrealized-casts | \ // RUN: mlir-cpu-runner -e entry -entry-point-result=void \ -// RUN: -shared-libs=%mlir_lib_dir/libmlir_c_runner_utils%shlibext | \ +// RUN: -shared-libs=%mlir_c_runner_utils | \ // RUN: FileCheck %s func.func @transfer_write16_inbounds_1d(%A : memref, %base: index) { Index: mlir/test/Integration/Dialect/Vector/CPU/test-transpose.mlir =================================================================== --- mlir/test/Integration/Dialect/Vector/CPU/test-transpose.mlir +++ mlir/test/Integration/Dialect/Vector/CPU/test-transpose.mlir @@ -1,6 +1,6 @@ // RUN: mlir-opt %s -convert-scf-to-cf -convert-vector-to-llvm -convert-func-to-llvm -reconcile-unrealized-casts | \ // RUN: mlir-cpu-runner -e entry -entry-point-result=void \ -// RUN: -shared-libs=%mlir_lib_dir/libmlir_c_runner_utils%shlibext | \ +// RUN: -shared-libs=%mlir_c_runner_utils | \ // RUN: FileCheck %s func.func @entry() { Index: mlir/test/Integration/Dialect/Vector/GPU/CUDA/test-reduction-distribute.mlir =================================================================== --- mlir/test/Integration/Dialect/Vector/GPU/CUDA/test-reduction-distribute.mlir +++ mlir/test/Integration/Dialect/Vector/GPU/CUDA/test-reduction-distribute.mlir @@ -5,9 +5,9 @@ // RUN: mlir-opt -pass-pipeline='builtin.module(gpu.module(strip-debuginfo,convert-gpu-to-nvvm,reconcile-unrealized-casts,gpu-to-cubin))' |\ // RUN: mlir-opt -gpu-to-llvm -reconcile-unrealized-casts |\ // RUN: mlir-cpu-runner -e main -entry-point-result=void \ -// RUN: -shared-libs=%mlir_lib_dir/libmlir_cuda_runtime%shlibext \ -// RUN: -shared-libs=%mlir_lib_dir/libmlir_c_runner_utils%shlibext \ -// RUN: -shared-libs=%mlir_lib_dir/libmlir_runner_utils%shlibext | \ +// RUN: -shared-libs=%mlir_cuda_runtime \ +// RUN: -shared-libs=%mlir_c_runner_utils \ +// RUN: -shared-libs=%mlir_runner_utils | \ // RUN: FileCheck %s // Run a tiled reduction fused with an elementwise op. Index: mlir/test/Integration/Dialect/Vector/GPU/CUDA/test-warp-distribute.mlir =================================================================== --- mlir/test/Integration/Dialect/Vector/GPU/CUDA/test-warp-distribute.mlir +++ mlir/test/Integration/Dialect/Vector/GPU/CUDA/test-warp-distribute.mlir @@ -6,9 +6,9 @@ // RUN: mlir-opt -pass-pipeline='builtin.module(gpu.module(strip-debuginfo,convert-gpu-to-nvvm,reconcile-unrealized-casts,gpu-to-cubin))' |\ // RUN: mlir-opt -gpu-to-llvm -reconcile-unrealized-casts |\ // RUN: mlir-cpu-runner -e main -entry-point-result=void \ -// RUN: -shared-libs=%mlir_lib_dir/libmlir_cuda_runtime%shlibext \ -// RUN: -shared-libs=%mlir_lib_dir/libmlir_c_runner_utils%shlibext \ -// RUN: -shared-libs=%mlir_lib_dir/libmlir_runner_utils%shlibext | \ +// RUN: -shared-libs=%mlir_cuda_runtime \ +// RUN: -shared-libs=%mlir_c_runner_utils \ +// RUN: -shared-libs=%mlir_runner_utils | \ // RUN: FileCheck %s // Run the same test cases with distribution and propagation. @@ -19,9 +19,9 @@ // RUN: mlir-opt -pass-pipeline='builtin.module(gpu.module(strip-debuginfo,convert-gpu-to-nvvm,reconcile-unrealized-casts,gpu-to-cubin))' |\ // RUN: mlir-opt -gpu-to-llvm -reconcile-unrealized-casts |\ // RUN: mlir-cpu-runner -e main -entry-point-result=void \ -// RUN: -shared-libs=%mlir_lib_dir/libmlir_cuda_runtime%shlibext \ -// RUN: -shared-libs=%mlir_lib_dir/libmlir_c_runner_utils%shlibext \ -// RUN: -shared-libs=%mlir_lib_dir/libmlir_runner_utils%shlibext | \ +// RUN: -shared-libs=%mlir_cuda_runtime \ +// RUN: -shared-libs=%mlir_c_runner_utils \ +// RUN: -shared-libs=%mlir_runner_utils | \ // RUN: FileCheck %s // RUN: mlir-opt %s -test-vector-warp-distribute="hoist-uniform distribute-transfer-write propagate-distribution" \ @@ -31,9 +31,9 @@ // RUN: mlir-opt -pass-pipeline='builtin.module(gpu.module(strip-debuginfo,convert-gpu-to-nvvm,reconcile-unrealized-casts,gpu-to-cubin))' |\ // RUN: mlir-opt -gpu-to-llvm -reconcile-unrealized-casts |\ // RUN: mlir-cpu-runner -e main -entry-point-result=void \ -// RUN: -shared-libs=%mlir_lib_dir/libmlir_cuda_runtime%shlibext \ -// RUN: -shared-libs=%mlir_lib_dir/libmlir_c_runner_utils%shlibext \ -// RUN: -shared-libs=%mlir_lib_dir/libmlir_runner_utils%shlibext | \ +// RUN: -shared-libs=%mlir_cuda_runtime \ +// RUN: -shared-libs=%mlir_c_runner_utils \ +// RUN: -shared-libs=%mlir_runner_utils | \ // RUN: FileCheck %s func.func @gpu_func(%arg1: memref<32xf32>, %arg2: memref<32xf32>) { Index: mlir/test/Integration/GPU/CUDA/TensorCore/wmma-matmul-f16.mlir =================================================================== --- mlir/test/Integration/GPU/CUDA/TensorCore/wmma-matmul-f16.mlir +++ mlir/test/Integration/GPU/CUDA/TensorCore/wmma-matmul-f16.mlir @@ -3,8 +3,8 @@ // RUN: | mlir-opt -pass-pipeline='builtin.module(gpu.module(strip-debuginfo,convert-gpu-to-nvvm,gpu-to-cubin{chip=sm_70}))' \ // RUN: | mlir-opt --convert-scf-to-cf -gpu-to-llvm \ // RUN: | mlir-cpu-runner \ -// RUN: --shared-libs=%mlir_lib_dir/libmlir_cuda_runtime%shlibext \ -// RUN: --shared-libs=%mlir_lib_dir/libmlir_runner_utils%shlibext \ +// RUN: --shared-libs=%mlir_cuda_runtime \ +// RUN: --shared-libs=%mlir_runner_utils \ // RUN: --entry-point-result=void \ // RUN: | FileCheck %s // Test case to check the working of Tensor cores on Nvidia GPUs. The kernel has already Index: mlir/test/Integration/GPU/CUDA/TensorCore/wmma-matmul-f32.mlir =================================================================== --- mlir/test/Integration/GPU/CUDA/TensorCore/wmma-matmul-f32.mlir +++ mlir/test/Integration/GPU/CUDA/TensorCore/wmma-matmul-f32.mlir @@ -3,8 +3,8 @@ // RUN: | mlir-opt -pass-pipeline='builtin.module(gpu.module(strip-debuginfo,convert-gpu-to-nvvm,gpu-to-cubin{chip=sm_70}))' \ // RUN: | mlir-opt --convert-scf-to-cf -gpu-to-llvm \ // RUN: | mlir-cpu-runner \ -// RUN: --shared-libs=%mlir_lib_dir/libmlir_cuda_runtime%shlibext \ -// RUN: --shared-libs=%mlir_lib_dir/libmlir_runner_utils%shlibext \ +// RUN: --shared-libs=%mlir_cuda_runtime \ +// RUN: --shared-libs=%mlir_runner_utils \ // RUN: --entry-point-result=void \ // RUN: | FileCheck %s Index: mlir/test/Integration/GPU/CUDA/all-reduce-and.mlir =================================================================== --- mlir/test/Integration/GPU/CUDA/all-reduce-and.mlir +++ mlir/test/Integration/GPU/CUDA/all-reduce-and.mlir @@ -3,8 +3,8 @@ // RUN: | mlir-opt -pass-pipeline='builtin.module(gpu.module(strip-debuginfo,convert-gpu-to-nvvm,gpu-to-cubin))' \ // RUN: | mlir-opt -gpu-to-llvm \ // RUN: | mlir-cpu-runner \ -// RUN: --shared-libs=%mlir_lib_dir/libmlir_cuda_runtime%shlibext \ -// RUN: --shared-libs=%mlir_lib_dir/libmlir_runner_utils%shlibext \ +// RUN: --shared-libs=%mlir_cuda_runtime \ +// RUN: --shared-libs=%mlir_runner_utils \ // RUN: --entry-point-result=void \ // RUN: | FileCheck %s Index: mlir/test/Integration/GPU/CUDA/all-reduce-max.mlir =================================================================== --- mlir/test/Integration/GPU/CUDA/all-reduce-max.mlir +++ mlir/test/Integration/GPU/CUDA/all-reduce-max.mlir @@ -3,8 +3,8 @@ // RUN: | mlir-opt -pass-pipeline='builtin.module(gpu.module(strip-debuginfo,convert-gpu-to-nvvm,gpu-to-cubin))' \ // RUN: | mlir-opt -gpu-to-llvm \ // RUN: | mlir-cpu-runner \ -// RUN: --shared-libs=%mlir_lib_dir/libmlir_cuda_runtime%shlibext \ -// RUN: --shared-libs=%mlir_lib_dir/libmlir_runner_utils%shlibext \ +// RUN: --shared-libs=%mlir_cuda_runtime \ +// RUN: --shared-libs=%mlir_runner_utils \ // RUN: --entry-point-result=void \ // RUN: | FileCheck %s Index: mlir/test/Integration/GPU/CUDA/all-reduce-min.mlir =================================================================== --- mlir/test/Integration/GPU/CUDA/all-reduce-min.mlir +++ mlir/test/Integration/GPU/CUDA/all-reduce-min.mlir @@ -3,8 +3,8 @@ // RUN: | mlir-opt -pass-pipeline='builtin.module(gpu.module(strip-debuginfo,convert-gpu-to-nvvm,gpu-to-cubin))' \ // RUN: | mlir-opt -gpu-to-llvm \ // RUN: | mlir-cpu-runner \ -// RUN: --shared-libs=%mlir_lib_dir/libmlir_cuda_runtime%shlibext \ -// RUN: --shared-libs=%mlir_lib_dir/libmlir_runner_utils%shlibext \ +// RUN: --shared-libs=%mlir_cuda_runtime \ +// RUN: --shared-libs=%mlir_runner_utils \ // RUN: --entry-point-result=void \ // RUN: | FileCheck %s Index: mlir/test/Integration/GPU/CUDA/all-reduce-op.mlir =================================================================== --- mlir/test/Integration/GPU/CUDA/all-reduce-op.mlir +++ mlir/test/Integration/GPU/CUDA/all-reduce-op.mlir @@ -3,8 +3,8 @@ // RUN: | mlir-opt -pass-pipeline='builtin.module(gpu.module(strip-debuginfo,convert-gpu-to-nvvm,gpu-to-cubin))' \ // RUN: | mlir-opt -gpu-to-llvm \ // RUN: | mlir-cpu-runner \ -// RUN: --shared-libs=%mlir_lib_dir/libmlir_cuda_runtime%shlibext \ -// RUN: --shared-libs=%mlir_lib_dir/libmlir_runner_utils%shlibext \ +// RUN: --shared-libs=%mlir_cuda_runtime \ +// RUN: --shared-libs=%mlir_runner_utils \ // RUN: --entry-point-result=void \ // RUN: | FileCheck %s Index: mlir/test/Integration/GPU/CUDA/all-reduce-or.mlir =================================================================== --- mlir/test/Integration/GPU/CUDA/all-reduce-or.mlir +++ mlir/test/Integration/GPU/CUDA/all-reduce-or.mlir @@ -3,8 +3,8 @@ // RUN: | mlir-opt -pass-pipeline='builtin.module(gpu.module(strip-debuginfo,convert-gpu-to-nvvm,gpu-to-cubin))' \ // RUN: | mlir-opt -gpu-to-llvm \ // RUN: | mlir-cpu-runner \ -// RUN: --shared-libs=%mlir_lib_dir/libmlir_cuda_runtime%shlibext \ -// RUN: --shared-libs=%mlir_lib_dir/libmlir_runner_utils%shlibext \ +// RUN: --shared-libs=%mlir_cuda_runtime \ +// RUN: --shared-libs=%mlir_runner_utils \ // RUN: --entry-point-result=void \ // RUN: | FileCheck %s Index: mlir/test/Integration/GPU/CUDA/all-reduce-region.mlir =================================================================== --- mlir/test/Integration/GPU/CUDA/all-reduce-region.mlir +++ mlir/test/Integration/GPU/CUDA/all-reduce-region.mlir @@ -3,8 +3,8 @@ // RUN: | mlir-opt -pass-pipeline='builtin.module(gpu.module(strip-debuginfo,convert-gpu-to-nvvm,gpu-to-cubin))' \ // RUN: | mlir-opt -gpu-to-llvm \ // RUN: | mlir-cpu-runner \ -// RUN: --shared-libs=%mlir_lib_dir/libmlir_cuda_runtime%shlibext \ -// RUN: --shared-libs=%mlir_lib_dir/libmlir_runner_utils%shlibext \ +// RUN: --shared-libs=%mlir_cuda_runtime \ +// RUN: --shared-libs=%mlir_runner_utils \ // RUN: --entry-point-result=void \ // RUN: | FileCheck %s Index: mlir/test/Integration/GPU/CUDA/all-reduce-xor.mlir =================================================================== --- mlir/test/Integration/GPU/CUDA/all-reduce-xor.mlir +++ mlir/test/Integration/GPU/CUDA/all-reduce-xor.mlir @@ -3,8 +3,8 @@ // RUN: | mlir-opt -pass-pipeline='builtin.module(gpu.module(strip-debuginfo,convert-gpu-to-nvvm,gpu-to-cubin))' \ // RUN: | mlir-opt -gpu-to-llvm \ // RUN: | mlir-cpu-runner \ -// RUN: --shared-libs=%mlir_lib_dir/libmlir_cuda_runtime%shlibext \ -// RUN: --shared-libs=%mlir_lib_dir/libmlir_runner_utils%shlibext \ +// RUN: --shared-libs=%mlir_cuda_runtime \ +// RUN: --shared-libs=%mlir_runner_utils \ // RUN: --entry-point-result=void \ // RUN: | FileCheck %s Index: mlir/test/Integration/GPU/CUDA/async.mlir =================================================================== --- mlir/test/Integration/GPU/CUDA/async.mlir +++ mlir/test/Integration/GPU/CUDA/async.mlir @@ -5,9 +5,9 @@ // RUN: | mlir-opt -async-to-async-runtime -async-runtime-ref-counting \ // RUN: | mlir-opt -convert-async-to-llvm -convert-func-to-llvm \ // RUN: | mlir-cpu-runner \ -// RUN: --shared-libs=%mlir_lib_dir/libmlir_cuda_runtime%shlibext \ -// RUN: --shared-libs=%mlir_lib_dir/libmlir_async_runtime%shlibext \ -// RUN: --shared-libs=%mlir_lib_dir/libmlir_runner_utils%shlibext \ +// RUN: --shared-libs=%mlir_cuda_runtime \ +// RUN: --shared-libs=%mlir_async_runtime \ +// RUN: --shared-libs=%mlir_runner_utils \ // RUN: --entry-point-result=void -O0 \ // RUN: | FileCheck %s Index: mlir/test/Integration/GPU/CUDA/gpu-to-cubin.mlir =================================================================== --- mlir/test/Integration/GPU/CUDA/gpu-to-cubin.mlir +++ mlir/test/Integration/GPU/CUDA/gpu-to-cubin.mlir @@ -3,9 +3,9 @@ // RUN: | mlir-opt -pass-pipeline='builtin.module(gpu.module(strip-debuginfo,convert-gpu-to-nvvm,gpu-to-cubin))' \ // RUN: | mlir-opt -gpu-to-llvm \ // RUN: | mlir-cpu-runner \ -// RUN: --shared-libs=%mlir_lib_dir/libmlir_cuda_runtime%shlibext \ -// RUN: --shared-libs=%mlir_lib_dir/libmlir_runner_utils%shlibext \ -// RUN: --shared-libs=%mlir_lib_dir/libmlir_c_runner_utils%shlibext \ +// RUN: --shared-libs=%mlir_cuda_runtime \ +// RUN: --shared-libs=%mlir_runner_utils \ +// RUN: --shared-libs=%mlir_c_runner_utils \ // RUN: --entry-point-result=void \ // RUN: | FileCheck %s Index: mlir/test/Integration/GPU/CUDA/multiple-all-reduce.mlir =================================================================== --- mlir/test/Integration/GPU/CUDA/multiple-all-reduce.mlir +++ mlir/test/Integration/GPU/CUDA/multiple-all-reduce.mlir @@ -3,8 +3,8 @@ // RUN: | mlir-opt -pass-pipeline='builtin.module(gpu.module(strip-debuginfo,convert-gpu-to-nvvm,gpu-to-cubin))' \ // RUN: | mlir-opt -gpu-to-llvm \ // RUN: | mlir-cpu-runner \ -// RUN: --shared-libs=%mlir_lib_dir/libmlir_cuda_runtime%shlibext \ -// RUN: --shared-libs=%mlir_lib_dir/libmlir_runner_utils%shlibext \ +// RUN: --shared-libs=%mlir_cuda_runtime \ +// RUN: --shared-libs=%mlir_runner_utils \ // RUN: --entry-point-result=void \ // RUN: | FileCheck %s Index: mlir/test/Integration/GPU/CUDA/printf.mlir =================================================================== --- mlir/test/Integration/GPU/CUDA/printf.mlir +++ mlir/test/Integration/GPU/CUDA/printf.mlir @@ -2,8 +2,8 @@ // RUN: | mlir-opt -pass-pipeline='builtin.module(gpu.module(strip-debuginfo,convert-gpu-to-nvvm,gpu-to-cubin))' \ // RUN: | mlir-opt -gpu-to-llvm \ // RUN: | mlir-cpu-runner \ -// RUN: --shared-libs=%mlir_lib_dir/libmlir_cuda_runtime%shlibext \ -// RUN: --shared-libs=%mlir_lib_dir/libmlir_runner_utils%shlibext \ +// RUN: --shared-libs=%mlir_cuda_runtime \ +// RUN: --shared-libs=%mlir_runner_utils \ // RUN: --entry-point-result=void \ // RUN: | FileCheck %s Index: mlir/test/Integration/GPU/CUDA/shuffle.mlir =================================================================== --- mlir/test/Integration/GPU/CUDA/shuffle.mlir +++ mlir/test/Integration/GPU/CUDA/shuffle.mlir @@ -3,8 +3,8 @@ // RUN: | mlir-opt -pass-pipeline='builtin.module(gpu.module(strip-debuginfo,convert-gpu-to-nvvm,gpu-to-cubin))' \ // RUN: | mlir-opt -gpu-to-llvm \ // RUN: | mlir-cpu-runner \ -// RUN: --shared-libs=%mlir_lib_dir/libmlir_cuda_runtime%shlibext \ -// RUN: --shared-libs=%mlir_lib_dir/libmlir_runner_utils%shlibext \ +// RUN: --shared-libs=%mlir_cuda_runtime \ +// RUN: --shared-libs=%mlir_runner_utils \ // RUN: --entry-point-result=void \ // RUN: | FileCheck %s Index: mlir/test/Integration/GPU/CUDA/two-modules.mlir =================================================================== --- mlir/test/Integration/GPU/CUDA/two-modules.mlir +++ mlir/test/Integration/GPU/CUDA/two-modules.mlir @@ -3,8 +3,8 @@ // RUN: | mlir-opt -pass-pipeline='builtin.module(gpu.module(strip-debuginfo,convert-gpu-to-nvvm,gpu-to-cubin))' \ // RUN: | mlir-opt -gpu-to-llvm \ // RUN: | mlir-cpu-runner \ -// RUN: --shared-libs=%mlir_lib_dir/libmlir_cuda_runtime%shlibext \ -// RUN: --shared-libs=%mlir_lib_dir/libmlir_runner_utils%shlibext \ +// RUN: --shared-libs=%mlir_cuda_runtime \ +// RUN: --shared-libs=%mlir_runner_utils \ // RUN: --entry-point-result=void \ // RUN: | FileCheck %s Index: mlir/test/Integration/GPU/ROCM/gpu-to-hsaco.mlir =================================================================== --- mlir/test/Integration/GPU/ROCM/gpu-to-hsaco.mlir +++ mlir/test/Integration/GPU/ROCM/gpu-to-hsaco.mlir @@ -3,8 +3,8 @@ // RUN: | mlir-opt -pass-pipeline='builtin.module(gpu.module(strip-debuginfo,convert-gpu-to-rocdl,gpu-to-hsaco{chip=%chip}))' \ // RUN: | mlir-opt -gpu-to-llvm \ // RUN: | mlir-cpu-runner \ -// RUN: --shared-libs=%mlir_lib_dir/libmlir_rocm_runtime%shlibext \ -// RUN: --shared-libs=%mlir_lib_dir/libmlir_runner_utils%shlibext \ +// RUN: --shared-libs=%mlir_rocm_runtime \ +// RUN: --shared-libs=%mlir_runner_utils \ // RUN: --entry-point-result=void \ // RUN: | FileCheck %s Index: mlir/test/Integration/GPU/ROCM/printf.mlir =================================================================== --- mlir/test/Integration/GPU/ROCM/printf.mlir +++ mlir/test/Integration/GPU/ROCM/printf.mlir @@ -2,8 +2,8 @@ // RUN: | mlir-opt -pass-pipeline='builtin.module(gpu.module(strip-debuginfo,convert-gpu-to-rocdl{index-bitwidth=32 runtime=HIP},gpu-to-hsaco{chip=%chip}))' \ // RUN: | mlir-opt -gpu-to-llvm \ // RUN: | mlir-cpu-runner \ -// RUN: --shared-libs=%mlir_lib_dir/libmlir_rocm_runtime%shlibext \ -// RUN: --shared-libs=%mlir_lib_dir/libmlir_runner_utils%shlibext \ +// RUN: --shared-libs=%mlir_rocm_runtime \ +// RUN: --shared-libs=%mlir_runner_utils \ // RUN: --entry-point-result=void \ // RUN: | FileCheck %s Index: mlir/test/Integration/GPU/ROCM/two-modules.mlir =================================================================== --- mlir/test/Integration/GPU/ROCM/two-modules.mlir +++ mlir/test/Integration/GPU/ROCM/two-modules.mlir @@ -3,8 +3,8 @@ // RUN: | mlir-opt -pass-pipeline='builtin.module(gpu.module(strip-debuginfo,convert-gpu-to-rocdl,gpu-to-hsaco{chip=%chip}))' \ // RUN: | mlir-opt -gpu-to-llvm \ // RUN: | mlir-cpu-runner \ -// RUN: --shared-libs=%mlir_lib_dir/libmlir_rocm_runtime%shlibext \ -// RUN: --shared-libs=%mlir_lib_dir/libmlir_runner_utils%shlibext \ +// RUN: --shared-libs=%mlir_rocm_runtime \ +// RUN: --shared-libs=%mlir_runner_utils \ // RUN: --entry-point-result=void \ // RUN: | FileCheck %s Index: mlir/test/Integration/GPU/ROCM/vecadd.mlir =================================================================== --- mlir/test/Integration/GPU/ROCM/vecadd.mlir +++ mlir/test/Integration/GPU/ROCM/vecadd.mlir @@ -4,8 +4,8 @@ // RUN: | mlir-opt -pass-pipeline='builtin.module(gpu.module(strip-debuginfo,convert-gpu-to-rocdl{use-bare-ptr-memref-call-conv=true},gpu-to-hsaco{chip=%chip}))' \ // RUN: | mlir-opt -gpu-to-llvm=use-bare-pointers-for-kernels=true \ // RUN: | mlir-cpu-runner \ -// RUN: --shared-libs=%mlir_lib_dir/libmlir_rocm_runtime%shlibext \ -// RUN: --shared-libs=%mlir_lib_dir/libmlir_runner_utils%shlibext \ +// RUN: --shared-libs=%mlir_rocm_runtime \ +// RUN: --shared-libs=%mlir_runner_utils \ // RUN: --entry-point-result=void \ // RUN: | FileCheck %s Index: mlir/test/Integration/GPU/ROCM/vector-transferops.mlir =================================================================== --- mlir/test/Integration/GPU/ROCM/vector-transferops.mlir +++ mlir/test/Integration/GPU/ROCM/vector-transferops.mlir @@ -4,8 +4,8 @@ // RUN: | mlir-opt -pass-pipeline='builtin.module(gpu.module(strip-debuginfo,convert-gpu-to-rocdl{chipset=%chip index-bitwidth=32},gpu-to-hsaco{chip=%chip}))' \ // RUN: | mlir-opt -gpu-to-llvm \ // RUN: | mlir-cpu-runner \ -// RUN: --shared-libs=%mlir_lib_dir/libmlir_rocm_runtime%shlibext \ -// RUN: --shared-libs=%mlir_lib_dir/libmlir_runner_utils%shlibext \ +// RUN: --shared-libs=%mlir_rocm_runtime \ +// RUN: --shared-libs=%mlir_runner_utils \ // RUN: --entry-point-result=void \ // RUN: | FileCheck %s Index: mlir/test/lit.cfg.py =================================================================== --- mlir/test/lit.cfg.py +++ mlir/test/lit.cfg.py @@ -34,6 +34,13 @@ config.substitutions.append(("%mlir_src_root", config.mlir_src_root)) config.substitutions.append(("%host_cxx", config.host_cxx)) config.substitutions.append(("%host_cc", config.host_cc)) +config.substitutions.append(("%mlir_vulkan_runtime_wrappers", config.mlir_vulkan_runtime_wrappers)) +config.substitutions.append(("%mlir_runner_utils", config.mlir_runner_utils)) +config.substitutions.append(("%mlir_c_runner_utils", config.mlir_c_runner_utils)) +config.substitutions.append(("%mlir_async_runtime", config.mlir_async_runtime)) +config.substitutions.append(("%mlir_cuda_runtime", config.mlir_cuda_runtime)) +config.substitutions.append(("%mlir_rocm_runtime", config.mlir_rocm_runtime)) +config.substitutions.append(("%mlir_test_spirv_cpu_runner_c_wrappers", config.mlir_test_spirv_cpu_runner_c_wrappers)) llvm_config.with_system_environment( ['HOME', 'INCLUDE', 'LIB', 'TMP', 'TEMP']) Index: mlir/test/lit.site.cfg.py.in =================================================================== --- mlir/test/lit.site.cfg.py.in +++ mlir/test/lit.site.cfg.py.in @@ -23,6 +23,14 @@ config.mlir_cmake_dir = "@MLIR_CMAKE_DIR@" config.mlir_lib_dir = "@MLIR_LIB_DIR@" +config.mlir_vulkan_runtime_wrappers = "@MLIR_VULKAN_RUNTIME_WRAPPERS@" +config.mlir_runner_utils = "@MLIR_RUNNER_UTILS@" +config.mlir_c_runner_utils = "@MLIR_C_RUNNER_UTILS@" +config.mlir_async_runtime = "@MLIR_ASYNC_RUNTIME@" +config.mlir_cuda_runtime = "@MLIR_CUDA_RUNTIME@" +config.mlir_rocm_runtime = "@MLIR_ROCM_RUNTIME@" +config.mlir_test_spirv_cpu_runner_c_wrappers = "@MLIR_TEST_SPRIV_CPU_RUNNER_C_WRAPPERS@" + config.build_examples = @LLVM_BUILD_EXAMPLES@ config.run_cuda_tests = @MLIR_ENABLE_CUDA_CONVERSIONS@ config.enable_cuda_runner = @MLIR_ENABLE_CUDA_RUNNER@ Index: mlir/test/mlir-cpu-runner/X86Vector/math-polynomial-approx-avx2.mlir =================================================================== --- mlir/test/mlir-cpu-runner/X86Vector/math-polynomial-approx-avx2.mlir +++ mlir/test/mlir-cpu-runner/X86Vector/math-polynomial-approx-avx2.mlir @@ -6,8 +6,8 @@ // RUN: -reconcile-unrealized-casts \ // RUN: | mlir-cpu-runner \ // RUN: -e main -entry-point-result=void -O0 \ -// RUN: -shared-libs=%mlir_lib_dir/libmlir_c_runner_utils%shlibext \ -// RUN: -shared-libs=%mlir_lib_dir/libmlir_runner_utils%shlibext \ +// RUN: -shared-libs=%mlir_c_runner_utils \ +// RUN: -shared-libs=%mlir_runner_utils \ // RUN: | FileCheck %s // -------------------------------------------------------------------------- // Index: mlir/test/mlir-cpu-runner/async-error.mlir =================================================================== --- mlir/test/mlir-cpu-runner/async-error.mlir +++ mlir/test/mlir-cpu-runner/async-error.mlir @@ -1,13 +1,15 @@ // RUN: mlir-opt %s -pass-pipeline="builtin.module(async-to-async-runtime,func.func(async-runtime-ref-counting,async-runtime-ref-counting-opt),convert-async-to-llvm,func.func(convert-linalg-to-loops,convert-scf-to-cf),convert-linalg-to-llvm,convert-vector-to-llvm,func.func(convert-arith-to-llvm),convert-func-to-llvm,reconcile-unrealized-casts)" \ // RUN: | mlir-cpu-runner \ // RUN: -e main -entry-point-result=void -O0 \ -// RUN: -shared-libs=%mlir_lib_dir/libmlir_c_runner_utils%shlibext \ -// RUN: -shared-libs=%mlir_lib_dir/libmlir_runner_utils%shlibext \ -// RUN: -shared-libs=%mlir_lib_dir/libmlir_async_runtime%shlibext \ +// RUN: -shared-libs=%mlir_c_runner_utils \ +// RUN: -shared-libs=%mlir_runner_utils \ +// RUN: -shared-libs=%mlir_async_runtime \ // RUN: | FileCheck %s --dump-input=always // FIXME: https://github.com/llvm/llvm-project/issues/57231 // UNSUPPORTED: hwasan +// FIXME: Windows does not have aligned_alloc +// UNSUPPORTED: system-windows func.func @main() { %false = arith.constant 0 : i1 Index: mlir/test/mlir-cpu-runner/async-func.mlir =================================================================== --- mlir/test/mlir-cpu-runner/async-func.mlir +++ mlir/test/mlir-cpu-runner/async-func.mlir @@ -1,13 +1,15 @@ // RUN: mlir-opt %s -pass-pipeline="builtin.module(async-func-to-async-runtime,async-to-async-runtime,func.func(async-runtime-ref-counting,async-runtime-ref-counting-opt),convert-async-to-llvm,func.func(convert-linalg-to-loops,convert-scf-to-cf),convert-linalg-to-llvm,convert-vector-to-llvm,func.func(convert-arith-to-llvm),convert-func-to-llvm,reconcile-unrealized-casts)" \ // RUN: | mlir-cpu-runner \ // RUN: -e main -entry-point-result=void -O0 \ -// RUN: -shared-libs=%mlir_lib_dir/libmlir_c_runner_utils%shlibext \ -// RUN: -shared-libs=%mlir_lib_dir/libmlir_runner_utils%shlibext \ -// RUN: -shared-libs=%mlir_lib_dir/libmlir_async_runtime%shlibext \ +// RUN: -shared-libs=%mlir_c_runner_utils \ +// RUN: -shared-libs=%mlir_runner_utils \ +// RUN: -shared-libs=%mlir_async_runtime \ // RUN: | FileCheck %s --dump-input=always // FIXME: https://github.com/llvm/llvm-project/issues/57231 // UNSUPPORTED: hwasan +// FIXME: Windows does not have aligned_alloc +// UNSUPPORTED: system-windows async.func @async_func_empty() -> !async.token { return Index: mlir/test/mlir-cpu-runner/async-group.mlir =================================================================== --- mlir/test/mlir-cpu-runner/async-group.mlir +++ mlir/test/mlir-cpu-runner/async-group.mlir @@ -1,9 +1,9 @@ // RUN: mlir-opt %s -pass-pipeline="builtin.module(async-to-async-runtime,func.func(async-runtime-ref-counting,async-runtime-ref-counting-opt),convert-async-to-llvm,func.func(convert-arith-to-llvm),convert-func-to-llvm,reconcile-unrealized-casts)" \ // RUN: | mlir-cpu-runner \ // RUN: -e main -entry-point-result=void -O0 \ -// RUN: -shared-libs=%mlir_lib_dir/libmlir_c_runner_utils%shlibext \ -// RUN: -shared-libs=%mlir_lib_dir/libmlir_runner_utils%shlibext \ -// RUN: -shared-libs=%mlir_lib_dir/libmlir_async_runtime%shlibext \ +// RUN: -shared-libs=%mlir_c_runner_utils \ +// RUN: -shared-libs=%mlir_runner_utils \ +// RUN: -shared-libs=%mlir_async_runtime \ // RUN: | FileCheck %s // This is crashing in CI "most of the time" on a AMD Rome CPU VM on GCP with: @@ -15,6 +15,8 @@ // FIXME: https://github.com/llvm/llvm-project/issues/57231 // UNSUPPORTED: hwasan +// FIXME: Windows does not have aligned_alloc +// UNSUPPORTED: system-windows func.func @main() { %c1 = arith.constant 1 : index Index: mlir/test/mlir-cpu-runner/async-value.mlir =================================================================== --- mlir/test/mlir-cpu-runner/async-value.mlir +++ mlir/test/mlir-cpu-runner/async-value.mlir @@ -1,13 +1,15 @@ // RUN: mlir-opt %s -pass-pipeline="builtin.module(async-to-async-runtime,func.func(async-runtime-ref-counting,async-runtime-ref-counting-opt),convert-async-to-llvm,func.func(convert-arith-to-llvm),convert-vector-to-llvm,finalize-memref-to-llvm,convert-func-to-llvm,reconcile-unrealized-casts)" \ // RUN: | mlir-cpu-runner \ // RUN: -e main -entry-point-result=void -O0 \ -// RUN: -shared-libs=%mlir_lib_dir/libmlir_c_runner_utils%shlibext \ -// RUN: -shared-libs=%mlir_lib_dir/libmlir_runner_utils%shlibext \ -// RUN: -shared-libs=%mlir_lib_dir/libmlir_async_runtime%shlibext \ +// RUN: -shared-libs=%mlir_c_runner_utils \ +// RUN: -shared-libs=%mlir_runner_utils \ +// RUN: -shared-libs=%mlir_async_runtime \ // RUN: | FileCheck %s --dump-input=always // FIXME: https://github.com/llvm/llvm-project/issues/57231 // UNSUPPORTED: hwasan +// FIXME: Windows does not have aligned_alloc +// UNSUPPORTED: system-windows func.func @main() { Index: mlir/test/mlir-cpu-runner/async.mlir =================================================================== --- mlir/test/mlir-cpu-runner/async.mlir +++ mlir/test/mlir-cpu-runner/async.mlir @@ -1,14 +1,16 @@ // RUN: mlir-opt %s -pass-pipeline="builtin.module(async-to-async-runtime,func.func(async-runtime-ref-counting,async-runtime-ref-counting-opt),convert-async-to-llvm,func.func(convert-linalg-to-loops,convert-scf-to-cf),convert-linalg-to-llvm,finalize-memref-to-llvm,func.func(convert-arith-to-llvm),convert-func-to-llvm,reconcile-unrealized-casts)" \ // RUN: | mlir-cpu-runner \ // RUN: -e main -entry-point-result=void -O0 \ -// RUN: -shared-libs=%mlir_lib_dir/libmlir_c_runner_utils%shlibext \ -// RUN: -shared-libs=%mlir_lib_dir/libmlir_runner_utils%shlibext \ -// RUN: -shared-libs=%mlir_lib_dir/libmlir_async_runtime%shlibext \ +// RUN: -shared-libs=%mlir_c_runner_utils \ +// RUN: -shared-libs=%mlir_runner_utils \ +// RUN: -shared-libs=%mlir_async_runtime \ // RUN: | FileCheck %s // FIXME: https://github.com/llvm/llvm-project/issues/57231 // UNSUPPORTED: asan // UNSUPPORTED: hwasan +// FIXME: Windows does not have aligned_alloc +// UNSUPPORTED: system-windows func.func @main() { %i0 = arith.constant 0 : index Index: mlir/test/mlir-cpu-runner/bare-ptr-call-conv.mlir =================================================================== --- mlir/test/mlir-cpu-runner/bare-ptr-call-conv.mlir +++ mlir/test/mlir-cpu-runner/bare-ptr-call-conv.mlir @@ -1,4 +1,4 @@ -// RUN: mlir-opt %s -pass-pipeline="builtin.module(func.func(convert-scf-to-cf,convert-arith-to-llvm),finalize-memref-to-llvm,convert-func-to-llvm{use-bare-ptr-memref-call-conv=1},reconcile-unrealized-casts)" | mlir-cpu-runner -shared-libs=%mlir_lib_dir/libmlir_c_runner_utils%shlibext -entry-point-result=void | FileCheck %s +// RUN: mlir-opt %s -pass-pipeline="builtin.module(func.func(convert-scf-to-cf,convert-arith-to-llvm),finalize-memref-to-llvm,convert-func-to-llvm{use-bare-ptr-memref-call-conv=1},reconcile-unrealized-casts)" | mlir-cpu-runner -shared-libs=%mlir_c_runner_utils -entry-point-result=void | FileCheck %s // Verify bare pointer memref calling convention. `simple_add1_add2_test` // gets two 2xf32 memrefs, adds 1.0f to the first one and 2.0f to the second Index: mlir/test/mlir-cpu-runner/copy.mlir =================================================================== --- mlir/test/mlir-cpu-runner/copy.mlir +++ mlir/test/mlir-cpu-runner/copy.mlir @@ -1,6 +1,6 @@ // RUN: mlir-opt %s -pass-pipeline="builtin.module(func.func(convert-scf-to-cf,convert-arith-to-llvm),finalize-memref-to-llvm,convert-func-to-llvm,reconcile-unrealized-casts)" \ // RUN: | mlir-cpu-runner -e main -entry-point-result=void \ -// RUN: -shared-libs=%mlir_lib_dir/libmlir_runner_utils%shlibext,%mlir_lib_dir/libmlir_c_runner_utils%shlibext \ +// RUN: -shared-libs=%mlir_runner_utils,%mlir_c_runner_utils \ // RUN: | FileCheck %s func.func private @printMemrefF32(memref<*xf32>) attributes { llvm.emit_c_interface } Index: mlir/test/mlir-cpu-runner/global-memref.mlir =================================================================== --- mlir/test/mlir-cpu-runner/global-memref.mlir +++ mlir/test/mlir-cpu-runner/global-memref.mlir @@ -1,4 +1,4 @@ -// RUN: mlir-opt %s -pass-pipeline="builtin.module(func.func(convert-arith-to-llvm),finalize-memref-to-llvm,convert-func-to-llvm,reconcile-unrealized-casts)" | mlir-cpu-runner -e main -entry-point-result=void -shared-libs=%mlir_lib_dir/libmlir_runner_utils%shlibext,%mlir_lib_dir/libmlir_c_runner_utils%shlibext | FileCheck %s +// RUN: mlir-opt %s -pass-pipeline="builtin.module(func.func(convert-arith-to-llvm),finalize-memref-to-llvm,convert-func-to-llvm,reconcile-unrealized-casts)" | mlir-cpu-runner -e main -entry-point-result=void -shared-libs=%mlir_runner_utils,%mlir_c_runner_utils | FileCheck %s func.func private @printMemrefF32(memref<*xf32>) attributes { llvm.emit_c_interface } func.func private @printMemrefI32(memref<*xi32>) attributes { llvm.emit_c_interface } Index: mlir/test/mlir-cpu-runner/lit.local.cfg =================================================================== --- mlir/test/mlir-cpu-runner/lit.local.cfg +++ mlir/test/mlir-cpu-runner/lit.local.cfg @@ -1,9 +1,5 @@ import sys -# FIXME: llvm orc does not support the COFF rtld. -if sys.platform == 'win32': - config.unsupported = True - # MSAN does not work with JIT. if 'msan' in config.available_features: config.unsupported = True Index: mlir/test/mlir-cpu-runner/math-polynomial-approx.mlir =================================================================== --- mlir/test/mlir-cpu-runner/math-polynomial-approx.mlir +++ mlir/test/mlir-cpu-runner/math-polynomial-approx.mlir @@ -1,8 +1,8 @@ // RUN: mlir-opt %s -pass-pipeline="builtin.module(func.func(test-math-polynomial-approximation,convert-arith-to-llvm),convert-vector-to-llvm,func.func(convert-math-to-llvm),convert-func-to-llvm,reconcile-unrealized-casts)" \ // RUN: | mlir-cpu-runner \ // RUN: -e main -entry-point-result=void -O0 \ -// RUN: -shared-libs=%mlir_lib_dir/libmlir_c_runner_utils%shlibext \ -// RUN: -shared-libs=%mlir_lib_dir/libmlir_runner_utils%shlibext \ +// RUN: -shared-libs=%mlir_c_runner_utils \ +// RUN: -shared-libs=%mlir_runner_utils \ // RUN: | FileCheck %s // -------------------------------------------------------------------------- // Index: mlir/test/mlir-cpu-runner/memref-reinterpret-cast.mlir =================================================================== --- mlir/test/mlir-cpu-runner/memref-reinterpret-cast.mlir +++ mlir/test/mlir-cpu-runner/memref-reinterpret-cast.mlir @@ -1,6 +1,6 @@ // RUN: mlir-opt %s -pass-pipeline="builtin.module(func.func(convert-scf-to-cf),finalize-memref-to-llvm,func.func(convert-arith-to-llvm),convert-func-to-llvm,reconcile-unrealized-casts)" \ // RUN: | mlir-cpu-runner -e main -entry-point-result=void \ -// RUN: -shared-libs=%mlir_lib_dir/libmlir_runner_utils%shlibext,%mlir_lib_dir/libmlir_c_runner_utils%shlibext \ +// RUN: -shared-libs=%mlir_runner_utils,%mlir_c_runner_utils \ // RUN: | FileCheck %s func.func private @printMemrefF32(memref<*xf32>) attributes { llvm.emit_c_interface } Index: mlir/test/mlir-cpu-runner/memref-reshape.mlir =================================================================== --- mlir/test/mlir-cpu-runner/memref-reshape.mlir +++ mlir/test/mlir-cpu-runner/memref-reshape.mlir @@ -1,6 +1,6 @@ // RUN: mlir-opt %s -pass-pipeline="builtin.module(func.func(convert-scf-to-cf,memref-expand,convert-arith-to-llvm),finalize-memref-to-llvm,convert-func-to-llvm,reconcile-unrealized-casts)" \ // RUN: | mlir-cpu-runner -e main -entry-point-result=void \ -// RUN: -shared-libs=%mlir_lib_dir/libmlir_runner_utils%shlibext,%mlir_lib_dir/libmlir_c_runner_utils%shlibext \ +// RUN: -shared-libs=%mlir_runner_utils,%mlir_c_runner_utils \ // RUN: | FileCheck %s Index: mlir/test/mlir-cpu-runner/print.mlir =================================================================== --- mlir/test/mlir-cpu-runner/print.mlir +++ mlir/test/mlir-cpu-runner/print.mlir @@ -1,6 +1,6 @@ // RUN: mlir-opt %s -pass-pipeline="builtin.module(convert-func-to-llvm,reconcile-unrealized-casts)" \ // RUN: | mlir-cpu-runner -e main -entry-point-result=void \ -// RUN: -shared-libs=%mlir_lib_dir/libmlir_runner_utils%shlibext,%mlir_lib_dir/libmlir_c_runner_utils%shlibext \ +// RUN: -shared-libs=%mlir_runner_utils,%mlir_c_runner_utils \ // RUN: | FileCheck %s Index: mlir/test/mlir-cpu-runner/sgemm-naive-codegen.mlir =================================================================== --- mlir/test/mlir-cpu-runner/sgemm-naive-codegen.mlir +++ mlir/test/mlir-cpu-runner/sgemm-naive-codegen.mlir @@ -1,4 +1,4 @@ -// RUN: mlir-opt -pass-pipeline="builtin.module(func.func(convert-linalg-to-loops,lower-affine,convert-scf-to-cf,convert-arith-to-llvm),convert-vector-to-llvm,finalize-memref-to-llvm,convert-func-to-llvm,reconcile-unrealized-casts)" %s | mlir-cpu-runner -O3 -e main -entry-point-result=void -shared-libs=%mlir_lib_dir/libmlir_c_runner_utils%shlibext | FileCheck %s +// RUN: mlir-opt -pass-pipeline="builtin.module(func.func(convert-linalg-to-loops,lower-affine,convert-scf-to-cf,convert-arith-to-llvm),convert-vector-to-llvm,finalize-memref-to-llvm,convert-func-to-llvm,reconcile-unrealized-casts)" %s | mlir-cpu-runner -O3 -e main -entry-point-result=void -shared-libs=%mlir_c_runner_utils | FileCheck %s func.func @main() { %A = memref.alloc() : memref<16x16xf32> Index: mlir/test/mlir-cpu-runner/simple.mlir =================================================================== --- mlir/test/mlir-cpu-runner/simple.mlir +++ mlir/test/mlir-cpu-runner/simple.mlir @@ -14,17 +14,17 @@ // RUN: rm %T/test.o // Declarations of C library functions. -llvm.func @fabsf(f32) -> f32 +llvm.func @logbf(f32) -> f32 llvm.func @malloc(i64) -> !llvm.ptr llvm.func @free(!llvm.ptr) // Check that a simple function with a nested call works. llvm.func @main() -> f32 { %0 = llvm.mlir.constant(-4.200000e+02 : f32) : f32 - %1 = llvm.call @fabsf(%0) : (f32) -> f32 + %1 = llvm.call @logbf(%0) : (f32) -> f32 llvm.return %1 : f32 } -// CHECK: 4.200000e+02 +// CHECK: 8.000000e+00 // Helper typed functions wrapping calls to "malloc" and "free". llvm.func @allocation() -> !llvm.ptr { Index: mlir/test/mlir-cpu-runner/unranked-memref.mlir =================================================================== --- mlir/test/mlir-cpu-runner/unranked-memref.mlir +++ mlir/test/mlir-cpu-runner/unranked-memref.mlir @@ -1,6 +1,6 @@ // RUN: mlir-opt %s -pass-pipeline="builtin.module(func.func(convert-linalg-to-loops,convert-scf-to-cf,convert-arith-to-llvm),convert-linalg-to-llvm,finalize-memref-to-llvm,convert-func-to-llvm,reconcile-unrealized-casts)" | \ // RUN: mlir-cpu-runner -e main -entry-point-result=void \ -// RUN: -shared-libs=%mlir_lib_dir/libmlir_runner_utils%shlibext,%mlir_lib_dir/libmlir_c_runner_utils%shlibext | FileCheck %s +// RUN: -shared-libs=%mlir_runner_utils,%mlir_c_runner_utils | FileCheck %s // CHECK: rank = 2 // CHECK-SAME: sizes = [10, 3] Index: mlir/test/mlir-cpu-runner/utils.mlir =================================================================== --- mlir/test/mlir-cpu-runner/utils.mlir +++ mlir/test/mlir-cpu-runner/utils.mlir @@ -1,7 +1,7 @@ -// RUN: mlir-opt %s -pass-pipeline="builtin.module(func.func(convert-linalg-to-loops,convert-scf-to-cf,convert-arith-to-llvm),convert-linalg-to-llvm,finalize-memref-to-llvm,convert-func-to-llvm,reconcile-unrealized-casts)" | mlir-cpu-runner -e print_0d -entry-point-result=void -shared-libs=%mlir_lib_dir/libmlir_runner_utils%shlibext -shared-libs=%mlir_lib_dir/libmlir_c_runner_utils%shlibext | FileCheck %s --check-prefix=PRINT-0D -// RUN: mlir-opt %s -pass-pipeline="builtin.module(func.func(convert-linalg-to-loops,convert-scf-to-cf,convert-arith-to-llvm),convert-linalg-to-llvm,finalize-memref-to-llvm,convert-func-to-llvm,reconcile-unrealized-casts)" | mlir-cpu-runner -e print_1d -entry-point-result=void -shared-libs=%mlir_lib_dir/libmlir_runner_utils%shlibext -shared-libs=%mlir_lib_dir/libmlir_c_runner_utils%shlibext | FileCheck %s --check-prefix=PRINT-1D -// RUN: mlir-opt %s -pass-pipeline="builtin.module(func.func(convert-linalg-to-loops,convert-scf-to-cf,convert-arith-to-llvm),convert-linalg-to-llvm,finalize-memref-to-llvm,convert-func-to-llvm,reconcile-unrealized-casts)" | mlir-cpu-runner -e print_3d -entry-point-result=void -shared-libs=%mlir_lib_dir/libmlir_runner_utils%shlibext -shared-libs=%mlir_lib_dir/libmlir_c_runner_utils%shlibext | FileCheck %s --check-prefix=PRINT-3D -// RUN: mlir-opt %s -pass-pipeline="builtin.module(func.func(convert-linalg-to-loops,convert-scf-to-cf,convert-arith-to-llvm),convert-linalg-to-llvm,finalize-memref-to-llvm,convert-func-to-llvm,reconcile-unrealized-casts)" | mlir-cpu-runner -e vector_splat_2d -entry-point-result=void -shared-libs=%mlir_lib_dir/libmlir_runner_utils%shlibext -shared-libs=%mlir_lib_dir/libmlir_c_runner_utils%shlibext | FileCheck %s --check-prefix=PRINT-VECTOR-SPLAT-2D +// RUN: mlir-opt %s -pass-pipeline="builtin.module(func.func(convert-linalg-to-loops,convert-scf-to-cf,convert-arith-to-llvm),convert-linalg-to-llvm,finalize-memref-to-llvm,convert-func-to-llvm,reconcile-unrealized-casts)" | mlir-cpu-runner -e print_0d -entry-point-result=void -shared-libs=%mlir_runner_utils -shared-libs=%mlir_c_runner_utils | FileCheck %s --check-prefix=PRINT-0D +// RUN: mlir-opt %s -pass-pipeline="builtin.module(func.func(convert-linalg-to-loops,convert-scf-to-cf,convert-arith-to-llvm),convert-linalg-to-llvm,finalize-memref-to-llvm,convert-func-to-llvm,reconcile-unrealized-casts)" | mlir-cpu-runner -e print_1d -entry-point-result=void -shared-libs=%mlir_runner_utils -shared-libs=%mlir_c_runner_utils | FileCheck %s --check-prefix=PRINT-1D +// RUN: mlir-opt %s -pass-pipeline="builtin.module(func.func(convert-linalg-to-loops,convert-scf-to-cf,convert-arith-to-llvm),convert-linalg-to-llvm,finalize-memref-to-llvm,convert-func-to-llvm,reconcile-unrealized-casts)" | mlir-cpu-runner -e print_3d -entry-point-result=void -shared-libs=%mlir_runner_utils -shared-libs=%mlir_c_runner_utils | FileCheck %s --check-prefix=PRINT-3D +// RUN: mlir-opt %s -pass-pipeline="builtin.module(func.func(convert-linalg-to-loops,convert-scf-to-cf,convert-arith-to-llvm),convert-linalg-to-llvm,finalize-memref-to-llvm,convert-func-to-llvm,reconcile-unrealized-casts)" | mlir-cpu-runner -e vector_splat_2d -entry-point-result=void -shared-libs=%mlir_runner_utils -shared-libs=%mlir_c_runner_utils | FileCheck %s --check-prefix=PRINT-VECTOR-SPLAT-2D func.func @print_0d() { %f = arith.constant 2.00000e+00 : f32 Index: mlir/test/mlir-cpu-runner/x86-varargs.mlir =================================================================== --- mlir/test/mlir-cpu-runner/x86-varargs.mlir +++ mlir/test/mlir-cpu-runner/x86-varargs.mlir @@ -1,6 +1,7 @@ // RUN: mlir-cpu-runner %s -e caller --entry-point-result=i32 | FileCheck %s // Varaidic argument list (va_list) and the extraction logics are ABI-specific. // REQUIRES: x86-native-target +// UNSUPPORTED: system-windows // Check if variadic functions can be called and the correct variadic argument // can be extracted. Index: mlir/test/mlir-spirv-cpu-runner/double.mlir =================================================================== --- mlir/test/mlir-spirv-cpu-runner/double.mlir +++ mlir/test/mlir-spirv-cpu-runner/double.mlir @@ -1,4 +1,4 @@ -// RUN: mlir-spirv-cpu-runner %s -e main --entry-point-result=void --shared-libs=%mlir_lib_dir/libmlir_runner_utils%shlibext,%mlir_lib_dir/libmlir_test_spirv_cpu_runner_c_wrappers%shlibext +// RUN: mlir-spirv-cpu-runner %s -e main --entry-point-result=void --shared-libs=%mlir_runner_utils,%mlir_test_spirv_cpu_runner_c_wrappers // CHECK: [8, 8, 8, 8, 8, 8] module attributes { Index: mlir/test/mlir-spirv-cpu-runner/lit.local.cfg =================================================================== --- mlir/test/mlir-spirv-cpu-runner/lit.local.cfg +++ mlir/test/mlir-spirv-cpu-runner/lit.local.cfg @@ -1,8 +1,4 @@ import sys -# FIXME: llvm orc does not support the COFF rtld. -if sys.platform == 'win32': - config.unsupported = True - if not config.enable_spirv_cpu_runner: config.unsupported = True Index: mlir/test/mlir-spirv-cpu-runner/mlir_test_spirv_cpu_runner_c_wrappers.cpp =================================================================== --- mlir/test/mlir-spirv-cpu-runner/mlir_test_spirv_cpu_runner_c_wrappers.cpp +++ mlir/test/mlir-spirv-cpu-runner/mlir_test_spirv_cpu_runner_c_wrappers.cpp @@ -12,27 +12,33 @@ #include "mlir/ExecutionEngine/RunnerUtils.h" +#ifdef _WIN32 +#define EXPORT __declspec(dllexport) +#else +#define EXPORT __attribute__((visibility("default"))) +#endif + // NOLINTBEGIN(*-identifier-naming) -extern "C" void +extern "C" EXPORT void _mlir_ciface_fillI32Buffer(StridedMemRefType *mem_ref, int32_t value) { std::fill_n(mem_ref->basePtr, mem_ref->sizes[0], value); } -extern "C" void +extern "C" EXPORT void _mlir_ciface_fillF32Buffer1D(StridedMemRefType *mem_ref, float value) { std::fill_n(mem_ref->basePtr, mem_ref->sizes[0], value); } -extern "C" void +extern "C" EXPORT void _mlir_ciface_fillF32Buffer2D(StridedMemRefType *mem_ref, float value) { std::fill_n(mem_ref->basePtr, mem_ref->sizes[0] * mem_ref->sizes[1], value); } -extern "C" void +extern "C" EXPORT void _mlir_ciface_fillF32Buffer3D(StridedMemRefType *mem_ref, float value) { std::fill_n(mem_ref->basePtr, Index: mlir/test/mlir-spirv-cpu-runner/simple_add.mlir =================================================================== --- mlir/test/mlir-spirv-cpu-runner/simple_add.mlir +++ mlir/test/mlir-spirv-cpu-runner/simple_add.mlir @@ -1,4 +1,4 @@ -// RUN: mlir-spirv-cpu-runner %s -e main --entry-point-result=void --shared-libs=%mlir_lib_dir/libmlir_runner_utils%shlibext,%mlir_lib_dir/libmlir_test_spirv_cpu_runner_c_wrappers%shlibext +// RUN: mlir-spirv-cpu-runner %s -e main --entry-point-result=void --shared-libs=%mlir_runner_utils,%mlir_test_spirv_cpu_runner_c_wrappers // CHECK: [[[7.7, 0, 0], [7.7, 0, 0], [7.7, 0, 0]], [[0, 7.7, 0], [0, 7.7, 0], [0, 7.7, 0]], [[0, 0, 7.7], [0, 0, 7.7], [0, 0, 7.7]]] module attributes { Index: mlir/test/mlir-vulkan-runner/addf.mlir =================================================================== --- mlir/test/mlir-vulkan-runner/addf.mlir +++ mlir/test/mlir-vulkan-runner/addf.mlir @@ -1,4 +1,4 @@ -// RUN: mlir-vulkan-runner %s --shared-libs=%mlir_lib_dir/libvulkan-runtime-wrappers%shlibext,%mlir_lib_dir/libmlir_runner_utils%shlibext --entry-point-result=void | FileCheck %s +// RUN: mlir-vulkan-runner %s --shared-libs=%mlir_vulkan_runtime_wrappers,%mlir_runner_utils --entry-point-result=void | FileCheck %s // CHECK: [3.3, 3.3, 3.3, 3.3, 3.3, 3.3, 3.3, 3.3] module attributes { Index: mlir/test/mlir-vulkan-runner/addi.mlir =================================================================== --- mlir/test/mlir-vulkan-runner/addi.mlir +++ mlir/test/mlir-vulkan-runner/addi.mlir @@ -1,4 +1,4 @@ -// RUN: mlir-vulkan-runner %s --shared-libs=%mlir_lib_dir/libvulkan-runtime-wrappers%shlibext,%mlir_lib_dir/libmlir_runner_utils%shlibext --entry-point-result=void | FileCheck %s +// RUN: mlir-vulkan-runner %s --shared-libs=%mlir_vulkan_runtime_wrappers,%mlir_runner_utils --entry-point-result=void | FileCheck %s // CHECK-COUNT-64: [3, 3, 3, 3, 3, 3, 3, 3] module attributes { Index: mlir/test/mlir-vulkan-runner/addi8.mlir =================================================================== --- mlir/test/mlir-vulkan-runner/addi8.mlir +++ mlir/test/mlir-vulkan-runner/addi8.mlir @@ -1,4 +1,4 @@ -// RUN: mlir-vulkan-runner %s --shared-libs=%mlir_lib_dir/libvulkan-runtime-wrappers%shlibext,%mlir_lib_dir/libmlir_runner_utils%shlibext --entry-point-result=void | FileCheck %s +// RUN: mlir-vulkan-runner %s --shared-libs=%mlir_vulkan_runtime_wrappers,%mlir_runner_utils --entry-point-result=void | FileCheck %s // CHECK-COUNT-64: [3, 3, 3, 3, 3, 3, 3, 3] module attributes { Index: mlir/test/mlir-vulkan-runner/mulf.mlir =================================================================== --- mlir/test/mlir-vulkan-runner/mulf.mlir +++ mlir/test/mlir-vulkan-runner/mulf.mlir @@ -1,4 +1,4 @@ -// RUN: mlir-vulkan-runner %s --shared-libs=%mlir_lib_dir/libvulkan-runtime-wrappers%shlibext,%mlir_lib_dir/libmlir_runner_utils%shlibext --entry-point-result=void | FileCheck %s +// RUN: mlir-vulkan-runner %s --shared-libs=%mlir_vulkan_runtime_wrappers,%mlir_runner_utils --entry-point-result=void | FileCheck %s // CHECK-COUNT-4: [6, 6, 6, 6] module attributes { Index: mlir/test/mlir-vulkan-runner/smul_extended.mlir =================================================================== --- mlir/test/mlir-vulkan-runner/smul_extended.mlir +++ mlir/test/mlir-vulkan-runner/smul_extended.mlir @@ -2,11 +2,11 @@ // with and without expansion to primitive mul/add ops for WebGPU. // RUN: mlir-vulkan-runner %s \ -// RUN: --shared-libs=%mlir_lib_dir/libvulkan-runtime-wrappers%shlibext,%mlir_lib_dir/libmlir_runner_utils%shlibext \ +// RUN: --shared-libs=%mlir_vulkan_runtime_wrappers,%mlir_runner_utils \ // RUN: --entry-point-result=void | FileCheck %s // RUN: mlir-vulkan-runner %s --vulkan-runner-spirv-webgpu-prepare \ -// RUN: --shared-libs=%mlir_lib_dir/libvulkan-runtime-wrappers%shlibext,%mlir_lib_dir/libmlir_runner_utils%shlibext \ +// RUN: --shared-libs=%mlir_vulkan_runtime_wrappers,%mlir_runner_utils \ // RUN: --entry-point-result=void | FileCheck %s // CHECK: [0, 1, -2, 1, 1048560, -87620295, -131071, 560969770] Index: mlir/test/mlir-vulkan-runner/subf.mlir =================================================================== --- mlir/test/mlir-vulkan-runner/subf.mlir +++ mlir/test/mlir-vulkan-runner/subf.mlir @@ -1,4 +1,4 @@ -// RUN: mlir-vulkan-runner %s --shared-libs=%mlir_lib_dir/libvulkan-runtime-wrappers%shlibext,%mlir_lib_dir/libmlir_runner_utils%shlibext --entry-point-result=void | FileCheck %s +// RUN: mlir-vulkan-runner %s --shared-libs=%mlir_vulkan_runtime_wrappers,%mlir_runner_utils --entry-point-result=void | FileCheck %s // CHECK-COUNT-32: [2.2, 2.2, 2.2, 2.2] module attributes { Index: mlir/test/mlir-vulkan-runner/time.mlir =================================================================== --- mlir/test/mlir-vulkan-runner/time.mlir +++ mlir/test/mlir-vulkan-runner/time.mlir @@ -1,4 +1,4 @@ -// RUN: mlir-vulkan-runner %s --shared-libs=%mlir_lib_dir/libvulkan-runtime-wrappers%shlibext,%mlir_lib_dir/libmlir_runner_utils%shlibext --entry-point-result=void | FileCheck %s +// RUN: mlir-vulkan-runner %s --shared-libs=%mlir_vulkan_runtime_wrappers,%mlir_runner_utils --entry-point-result=void | FileCheck %s // CHECK: Compute shader execution time // CHECK: Command buffer submit time Index: mlir/test/mlir-vulkan-runner/umul_extended.mlir =================================================================== --- mlir/test/mlir-vulkan-runner/umul_extended.mlir +++ mlir/test/mlir-vulkan-runner/umul_extended.mlir @@ -2,11 +2,11 @@ // with and without expansion to primitive mul/add ops for WebGPU. // RUN: mlir-vulkan-runner %s \ -// RUN: --shared-libs=%mlir_lib_dir/libvulkan-runtime-wrappers%shlibext,%mlir_lib_dir/libmlir_runner_utils%shlibext \ +// RUN: --shared-libs=%mlir_vulkan_runtime_wrappers,%mlir_runner_utils \ // RUN: --entry-point-result=void | FileCheck %s // RUN: mlir-vulkan-runner %s --vulkan-runner-spirv-webgpu-prepare \ -// RUN: --shared-libs=%mlir_lib_dir/libvulkan-runtime-wrappers%shlibext,%mlir_lib_dir/libmlir_runner_utils%shlibext \ +// RUN: --shared-libs=%mlir_vulkan_runtime_wrappers,%mlir_runner_utils \ // RUN: --entry-point-result=void | FileCheck %s // CHECK: [0, 1, -2, 1, 1048560, -87620295, -131071, -49]