Skip to content

Commit 161b9d7

Browse files
zero9178zero9178
committed
[mlir] Make the vast majority of integration and runner tests work on Windows
This patch contains the changes required to make the vast majority of integration and runner tests run on Windows. Historically speaking, the JIT support for Windows has been lacking behind, but recent versions of ORC JIT have now caught up and works for basically all examples in repo. Sadly due to these tests previously not working on Windows, basically all of them are making unix-like assumptions about things like filenames, paths, shell syntax etc. This patch fixes all these issues in one big swoop and enables Windows support for the vast majority of integration tests. More specifically, following changes had to be done: * The various JIT runners used paths to the runtime libraries that assumed a Unix toolchain layout and filenames. I abstracted the specific path and filename of these runtime libraries away by making the paths to the runtime libraries be passed from cmake into lit. This now also allows a much more convenient syntax: `--shared-libs=%mlir_c_runner_utils` instead of `--shared-libs=%mlir_lib_dir/lib/libmlir_c_runner_utils%shlibext` * Some tests using python set environment variables using the `ENV=VALUE cmd` format. This works on Unix, but on Windows it has to prefixed using `env ENV=VALUE cmd` * Some tests used C functions that are simply not available or exported on Windows (`fabsf`, `aligned_alloc`). These tests have either been adjusted or explicitly marked as `UNSUPPORTED` Some tests remain disabled on Windows as before: * In SparseTensor some tests have non-trivial logic for finding the runtime libraries which seems to be required for the use of emulators. I do not have the time to port these so I simply kept them disabled * Some tests requiring special hardware which I simply cannot test remain disabled on Windows. These include usage of AVX512 or AMX The tests for `mlir-vulkan-runner` and `mlir-spirv-runner` all work now as well and so do the vast majority of `mlir-cpu-runner`. Differential Revision: https://reviews.llvm.org/D143925
1 parent 19b1e27 commit 161b9d7

File tree

250 files changed

+420
-374
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

250 files changed

+420
-374
lines changed

‎mlir/include/mlir/ExecutionEngine/RunnerUtils.h

+6-2
Original file line numberDiff line numberDiff line change
@@ -34,14 +34,18 @@
3434
#include <assert.h>
3535
#include <cmath>
3636
#include <complex>
37+
#include <iomanip>
3738
#include <iostream>
3839

3940
#include "mlir/ExecutionEngine/CRunnerUtils.h"
4041

4142
template <typename T, typename StreamType>
4243
void printMemRefMetaData(StreamType &os, const DynamicMemRefType<T> &v) {
43-
os << "base@ = " << reinterpret_cast<void *>(v.data) << " rank = " << v.rank
44-
<< " offset = " << v.offset;
44+
// Make the printed pointer format platform independent by casting it to an
45+
// integer and manually formatting it to a hex with prefix as tests expect.
46+
os << "base@ = " << std::hex << std::showbase
47+
<< reinterpret_cast<std::intptr_t>(v.data) << std::dec << std::noshowbase
48+
<< " rank = " << v.rank << " offset = " << v.offset;
4549
auto print = [&](const int64_t *ptr) {
4650
if (v.rank == 0)
4751
return;

‎mlir/test/CMakeLists.txt

+32-2
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,10 @@ if (MLIR_ENABLE_BINDINGS_PYTHON)
55
add_subdirectory(python)
66
endif()
77

8+
if (MLIR_ENABLE_SPIRV_CPU_RUNNER)
9+
add_subdirectory(mlir-spirv-cpu-runner)
10+
endif()
11+
812
# Provide the MLIR CMake module dir so that the out of tree Standalone
913
# dialect and can add it to the module path.
1014
set(MLIR_CMAKE_DIR
@@ -53,12 +57,39 @@ llvm_canonicalize_cmake_booleans(
5357
MLIR_RUN_ARM_SVE_TESTS
5458
)
5559

60+
set(MLIR_RUNNER_UTILS "$<TARGET_FILE:mlir_runner_utils>")
61+
set(MLIR_C_RUNNER_UTILS "$<TARGET_FILE:mlir_c_runner_utils>")
62+
set(MLIR_ASYNC_RUNTIME "$<TARGET_FILE:mlir_async_runtime>")
63+
64+
if (MLIR_ENABLE_VULKAN_RUNNER)
65+
set(MLIR_VULKAN_RUNTIME_WRAPPERS "$<TARGET_FILE:vulkan-runtime-wrappers>")
66+
endif ()
67+
68+
if (MLIR_ENABLE_CUDA_RUNNER)
69+
set(MLIR_CUDA_RUNTIME "$<TARGET_FILE:mlir_cuda_runtime>")
70+
endif ()
71+
72+
if (MLIR_ENABLE_ROCM_RUNNER)
73+
set(MLIR_ROCM_RUNTIME "$<TARGET_FILE:mlir_rocm_runtime>")
74+
endif ()
75+
76+
if (MLIR_ENABLE_SPIRV_CPU_RUNNER)
77+
set(MLIR_TEST_SPRIV_CPU_RUNNER_C_WRAPPERS "$<TARGET_FILE:mlir_test_spirv_cpu_runner_c_wrappers>")
78+
endif ()
79+
80+
# configure below runs at configure time and does not support the use of generator expressions.
81+
# We therefore use it only to substitute the generator expressions above into the lit.site.cfg.py.in.
5682
configure_lit_site_cfg(
5783
${CMAKE_CURRENT_SOURCE_DIR}/lit.site.cfg.py.in
58-
${CMAKE_CURRENT_BINARY_DIR}/lit.site.cfg.py
84+
${CMAKE_CURRENT_BINARY_DIR}/lit.site.cfg.py.in
5985
MAIN_CONFIG
6086
${CMAKE_CURRENT_SOURCE_DIR}/lit.cfg.py
6187
)
88+
# GENERATE runs at generation time (so at the beginning of the build) and substitutes the generator expressions
89+
# with the actual paths of the target binaries.
90+
file(GENERATE OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/lit.site.cfg.py
91+
INPUT ${CMAKE_CURRENT_BINARY_DIR}/lit.site.cfg.py.in)
92+
6293
configure_lit_site_cfg(
6394
${CMAKE_CURRENT_SOURCE_DIR}/Unit/lit.site.cfg.py.in
6495
${CMAKE_CURRENT_BINARY_DIR}/Unit/lit.site.cfg.py
@@ -131,7 +162,6 @@ if(LLVM_BUILD_EXAMPLES)
131162
endif()
132163

133164
if(MLIR_ENABLE_SPIRV_CPU_RUNNER)
134-
add_subdirectory(mlir-spirv-cpu-runner)
135165
list(APPEND MLIR_TEST_DEPENDS
136166
mlir-spirv-cpu-runner
137167
mlir_test_spirv_cpu_runner_c_wrappers

‎mlir/test/Integration/Dialect/Arith/CPU/lit.local.cfg

-5
This file was deleted.

‎mlir/test/Integration/Dialect/Arith/CPU/test-wide-int-emulation-addi-i16.mlir

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,14 @@
44
// RUN: mlir-opt %s --convert-scf-to-cf --convert-cf-to-llvm --convert-vector-to-llvm \
55
// RUN: --convert-func-to-llvm --convert-arith-to-llvm | \
66
// RUN: mlir-cpu-runner -e entry -entry-point-result=void \
7-
// RUN: --shared-libs=%mlir_lib_dir/libmlir_c_runner_utils%shlibext | \
7+
// RUN: --shared-libs=%mlir_c_runner_utils | \
88
// RUN: FileCheck %s --match-full-lines
99

1010
// RUN: mlir-opt %s --test-arith-emulate-wide-int="widest-int-supported=8" \
1111
// RUN: --convert-scf-to-cf --convert-cf-to-llvm --convert-vector-to-llvm \
1212
// RUN: --convert-func-to-llvm --convert-arith-to-llvm | \
1313
// RUN: mlir-cpu-runner -e entry -entry-point-result=void \
14-
// RUN: --shared-libs=%mlir_lib_dir/libmlir_c_runner_utils%shlibext | \
14+
// RUN: --shared-libs=%mlir_c_runner_utils | \
1515
// RUN: FileCheck %s --match-full-lines
1616

1717
// Ops in this function *only* will be emulated using i8 types.

‎mlir/test/Integration/Dialect/Arith/CPU/test-wide-int-emulation-cmpi-i16.mlir

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,14 @@
55
// RUN: mlir-opt %s --convert-scf-to-cf --convert-cf-to-llvm --convert-vector-to-llvm \
66
// RUN: --convert-func-to-llvm --convert-arith-to-llvm | \
77
// RUN: mlir-cpu-runner -e entry -entry-point-result=void \
8-
// RUN: --shared-libs=%mlir_lib_dir/libmlir_c_runner_utils%shlibext | \
8+
// RUN: --shared-libs=%mlir_c_runner_utils | \
99
// RUN: FileCheck %s --match-full-lines
1010

1111
// RUN: mlir-opt %s --test-arith-emulate-wide-int="widest-int-supported=8" \
1212
// RUN: --convert-scf-to-cf --convert-cf-to-llvm --convert-vector-to-llvm \
1313
// RUN: --convert-func-to-llvm --convert-arith-to-llvm | \
1414
// RUN: mlir-cpu-runner -e entry -entry-point-result=void \
15-
// RUN: --shared-libs=%mlir_lib_dir/libmlir_c_runner_utils%shlibext | \
15+
// RUN: --shared-libs=%mlir_c_runner_utils | \
1616
// RUN: FileCheck %s --match-full-lines
1717

1818
func.func @emulate_cmpi_eq(%lhs : i16, %rhs : i16) -> (i1) {

‎mlir/test/Integration/Dialect/Arith/CPU/test-wide-int-emulation-compare-results-i16.mlir

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
// RUN: --convert-scf-to-cf --convert-cf-to-llvm --convert-vector-to-llvm \
66
// RUN: --convert-func-to-llvm --convert-arith-to-llvm | \
77
// RUN: mlir-cpu-runner -e entry -entry-point-result=void \
8-
// RUN: --shared-libs="%mlir_lib_dir/libmlir_c_runner_utils%shlibext,%mlir_lib_dir/libmlir_runner_utils%shlibext" | \
8+
// RUN: --shared-libs="%mlir_c_runner_utils,%mlir_runner_utils" | \
99
// RUN: FileCheck %s
1010

1111
// CHECK-NOT: Mismatch

‎mlir/test/Integration/Dialect/Arith/CPU/test-wide-int-emulation-constants-i16.mlir

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
// RUN: --convert-scf-to-cf --convert-cf-to-llvm --convert-vector-to-llvm \
66
// RUN: --convert-func-to-llvm --convert-arith-to-llvm | \
77
// RUN: mlir-cpu-runner -e entry -entry-point-result=void \
8-
// RUN: --shared-libs=%mlir_lib_dir/libmlir_c_runner_utils%shlibext | \
8+
// RUN: --shared-libs=%mlir_c_runner_utils | \
99
// RUN: FileCheck %s --match-full-lines --check-prefix=EMULATED
1010

1111
func.func @entry() {

‎mlir/test/Integration/Dialect/Arith/CPU/test-wide-int-emulation-max-min-i16.mlir

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,14 @@
55
// RUN: mlir-opt %s --convert-scf-to-cf --convert-cf-to-llvm --convert-vector-to-llvm \
66
// RUN: --convert-func-to-llvm --convert-arith-to-llvm | \
77
// RUN: mlir-cpu-runner -e entry -entry-point-result=void \
8-
// RUN: --shared-libs=%mlir_lib_dir/libmlir_c_runner_utils%shlibext | \
8+
// RUN: --shared-libs=%mlir_c_runner_utils | \
99
// RUN: FileCheck %s --match-full-lines
1010

1111
// RUN: mlir-opt %s --test-arith-emulate-wide-int="widest-int-supported=8" \
1212
// RUN: --convert-scf-to-cf --convert-cf-to-llvm --convert-vector-to-llvm \
1313
// RUN: --convert-func-to-llvm --convert-arith-to-llvm | \
1414
// RUN: mlir-cpu-runner -e entry -entry-point-result=void \
15-
// RUN: --shared-libs=%mlir_lib_dir/libmlir_c_runner_utils%shlibext | \
15+
// RUN: --shared-libs=%mlir_c_runner_utils | \
1616
// RUN: FileCheck %s --match-full-lines
1717

1818
func.func @emulate_maxui(%lhs : i16, %rhs : i16) -> (i16) {

‎mlir/test/Integration/Dialect/Arith/CPU/test-wide-int-emulation-muli-i16.mlir

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,14 @@
44
// RUN: mlir-opt %s --convert-scf-to-cf --convert-cf-to-llvm --convert-vector-to-llvm \
55
// RUN: --convert-func-to-llvm --convert-arith-to-llvm | \
66
// RUN: mlir-cpu-runner -e entry -entry-point-result=void \
7-
// RUN: --shared-libs=%mlir_lib_dir/libmlir_c_runner_utils%shlibext | \
7+
// RUN: --shared-libs=%mlir_c_runner_utils | \
88
// RUN: FileCheck %s --match-full-lines
99

1010
// RUN: mlir-opt %s --test-arith-emulate-wide-int="widest-int-supported=8" \
1111
// RUN: --convert-scf-to-cf --convert-cf-to-llvm --convert-vector-to-llvm \
1212
// RUN: --convert-func-to-llvm --convert-arith-to-llvm | \
1313
// RUN: mlir-cpu-runner -e entry -entry-point-result=void \
14-
// RUN: --shared-libs=%mlir_lib_dir/libmlir_c_runner_utils%shlibext | \
14+
// RUN: --shared-libs=%mlir_c_runner_utils | \
1515
// RUN: FileCheck %s --match-full-lines
1616

1717
// Ops in this function *only* will be emulated using i8 types.

‎mlir/test/Integration/Dialect/Arith/CPU/test-wide-int-emulation-shli-i16.mlir

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,14 @@
44
// RUN: mlir-opt %s --convert-scf-to-cf --convert-cf-to-llvm --convert-vector-to-llvm \
55
// RUN: --convert-func-to-llvm --convert-arith-to-llvm | \
66
// RUN: mlir-cpu-runner -e entry -entry-point-result=void \
7-
// RUN: --shared-libs=%mlir_lib_dir/libmlir_c_runner_utils%shlibext | \
7+
// RUN: --shared-libs=%mlir_c_runner_utils | \
88
// RUN: FileCheck %s --match-full-lines
99

1010
// RUN: mlir-opt %s --test-arith-emulate-wide-int="widest-int-supported=8" \
1111
// RUN: --convert-scf-to-cf --convert-cf-to-llvm --convert-vector-to-llvm \
1212
// RUN: --convert-func-to-llvm --convert-arith-to-llvm | \
1313
// RUN: mlir-cpu-runner -e entry -entry-point-result=void \
14-
// RUN: --shared-libs=%mlir_lib_dir/libmlir_c_runner_utils%shlibext | \
14+
// RUN: --shared-libs=%mlir_c_runner_utils | \
1515
// RUN: FileCheck %s --match-full-lines
1616

1717
// Ops in this function *only* will be emulated using i8 types.

‎mlir/test/Integration/Dialect/Arith/CPU/test-wide-int-emulation-shrsi-i16.mlir

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,14 @@
44
// RUN: mlir-opt %s --convert-scf-to-cf --convert-cf-to-llvm --convert-vector-to-llvm \
55
// RUN: --convert-func-to-llvm --convert-arith-to-llvm | \
66
// RUN: mlir-cpu-runner -e entry -entry-point-result=void \
7-
// RUN: --shared-libs=%mlir_lib_dir/libmlir_c_runner_utils%shlibext | \
7+
// RUN: --shared-libs=%mlir_c_runner_utils | \
88
// RUN: FileCheck %s --match-full-lines
99

1010
// RUN: mlir-opt %s --test-arith-emulate-wide-int="widest-int-supported=8" \
1111
// RUN: --convert-scf-to-cf --convert-cf-to-llvm --convert-vector-to-llvm \
1212
// RUN: --convert-func-to-llvm --convert-arith-to-llvm | \
1313
// RUN: mlir-cpu-runner -e entry -entry-point-result=void \
14-
// RUN: --shared-libs=%mlir_lib_dir/libmlir_c_runner_utils%shlibext | \
14+
// RUN: --shared-libs=%mlir_c_runner_utils | \
1515
// RUN: FileCheck %s --match-full-lines
1616

1717
// Ops in this function *only* will be emulated using i8 types.

‎mlir/test/Integration/Dialect/Arith/CPU/test-wide-int-emulation-shrui-i16.mlir

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,14 @@
44
// RUN: mlir-opt %s --convert-scf-to-cf --convert-cf-to-llvm --convert-vector-to-llvm \
55
// RUN: --convert-func-to-llvm --convert-arith-to-llvm | \
66
// RUN: mlir-cpu-runner -e entry -entry-point-result=void \
7-
// RUN: --shared-libs=%mlir_lib_dir/libmlir_c_runner_utils%shlibext | \
7+
// RUN: --shared-libs=%mlir_c_runner_utils | \
88
// RUN: FileCheck %s --match-full-lines
99

1010
// RUN: mlir-opt %s --test-arith-emulate-wide-int="widest-int-supported=8" \
1111
// RUN: --convert-scf-to-cf --convert-cf-to-llvm --convert-vector-to-llvm \
1212
// RUN: --convert-func-to-llvm --convert-arith-to-llvm | \
1313
// RUN: mlir-cpu-runner -e entry -entry-point-result=void \
14-
// RUN: --shared-libs=%mlir_lib_dir/libmlir_c_runner_utils%shlibext | \
14+
// RUN: --shared-libs=%mlir_c_runner_utils | \
1515
// RUN: FileCheck %s --match-full-lines
1616

1717
// Ops in this function *only* will be emulated using i8 types.

‎mlir/test/Integration/Dialect/Async/CPU/lit.local.cfg

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import sys
22

3-
# No JIT on win32.
3+
# Windows does not have aligned_alloc
44
if sys.platform == 'win32':
55
config.unsupported = True

‎mlir/test/Integration/Dialect/Async/CPU/microbench-linalg-async-parallel-for.mlir

+6-6
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,9 @@
1414
// RUN: -reconcile-unrealized-casts \
1515
// RUN: | mlir-cpu-runner \
1616
// RUN: -e entry -entry-point-result=void -O3 \
17-
// RUN: -shared-libs=%mlir_lib_dir/libmlir_runner_utils%shlibext \
18-
// RUN: -shared-libs=%mlir_lib_dir/libmlir_c_runner_utils%shlibext\
19-
// RUN: -shared-libs=%mlir_lib_dir/libmlir_async_runtime%shlibext \
17+
// RUN: -shared-libs=%mlir_runner_utils \
18+
// RUN: -shared-libs=%mlir_c_runner_utils\
19+
// RUN: -shared-libs=%mlir_async_runtime \
2020
// RUN: | FileCheck %s --dump-input=always
2121

2222
// RUN: mlir-opt %s \
@@ -28,9 +28,9 @@
2828
// RUN: -reconcile-unrealized-casts \
2929
// RUN: | mlir-cpu-runner \
3030
// RUN: -e entry -entry-point-result=void -O3 \
31-
// RUN: -shared-libs=%mlir_lib_dir/libmlir_runner_utils%shlibext \
32-
// RUN: -shared-libs=%mlir_lib_dir/libmlir_c_runner_utils%shlibext\
33-
// RUN: -shared-libs=%mlir_lib_dir/libmlir_async_runtime%shlibext \
31+
// RUN: -shared-libs=%mlir_runner_utils \
32+
// RUN: -shared-libs=%mlir_c_runner_utils\
33+
// RUN: -shared-libs=%mlir_async_runtime \
3434
// RUN: | FileCheck %s --dump-input=always
3535

3636
#map0 = affine_map<(d0, d1) -> (d0, d1)>

‎mlir/test/Integration/Dialect/Async/CPU/microbench-scf-async-parallel-for.mlir

+9-9
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,9 @@
1414
// RUN: -reconcile-unrealized-casts \
1515
// RUN: | mlir-cpu-runner \
1616
// RUN: -e entry -entry-point-result=void -O3 \
17-
// RUN: -shared-libs=%mlir_lib_dir/libmlir_runner_utils%shlibext \
18-
// RUN: -shared-libs=%mlir_lib_dir/libmlir_c_runner_utils%shlibext\
19-
// RUN: -shared-libs=%mlir_lib_dir/libmlir_async_runtime%shlibext \
17+
// RUN: -shared-libs=%mlir_runner_utils \
18+
// RUN: -shared-libs=%mlir_c_runner_utils\
19+
// RUN: -shared-libs=%mlir_async_runtime \
2020
// RUN: | FileCheck %s --dump-input=always
2121

2222
// RUN: mlir-opt %s \
@@ -35,9 +35,9 @@
3535
// RUN: -reconcile-unrealized-casts \
3636
// RUN: | mlir-cpu-runner \
3737
// RUN: -e entry -entry-point-result=void -O3 \
38-
// RUN: -shared-libs=%mlir_lib_dir/libmlir_runner_utils%shlibext \
39-
// RUN: -shared-libs=%mlir_lib_dir/libmlir_c_runner_utils%shlibext\
40-
// RUN: -shared-libs=%mlir_lib_dir/libmlir_async_runtime%shlibext \
38+
// RUN: -shared-libs=%mlir_runner_utils \
39+
// RUN: -shared-libs=%mlir_c_runner_utils\
40+
// RUN: -shared-libs=%mlir_async_runtime \
4141
// RUN: | FileCheck %s --dump-input=always
4242

4343
// RUN: mlir-opt %s \
@@ -49,9 +49,9 @@
4949
// RUN: -reconcile-unrealized-casts \
5050
// RUN: | mlir-cpu-runner \
5151
// RUN: -e entry -entry-point-result=void -O3 \
52-
// RUN: -shared-libs=%mlir_lib_dir/libmlir_runner_utils%shlibext \
53-
// RUN: -shared-libs=%mlir_lib_dir/libmlir_c_runner_utils%shlibext\
54-
// RUN: -shared-libs=%mlir_lib_dir/libmlir_async_runtime%shlibext \
52+
// RUN: -shared-libs=%mlir_runner_utils \
53+
// RUN: -shared-libs=%mlir_c_runner_utils\
54+
// RUN: -shared-libs=%mlir_async_runtime \
5555
// RUN: | FileCheck %s --dump-input=always
5656

5757
#map0 = affine_map<(d0, d1) -> (d0, d1)>

‎mlir/test/Integration/Dialect/Async/CPU/test-async-parallel-for-1d.mlir

+6-6
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@
1111
// RUN: -reconcile-unrealized-casts \
1212
// RUN: | mlir-cpu-runner \
1313
// RUN: -e entry -entry-point-result=void -O0 \
14-
// RUN: -shared-libs=%mlir_lib_dir/libmlir_runner_utils%shlibext \
15-
// RUN: -shared-libs=%mlir_lib_dir/libmlir_async_runtime%shlibext\
14+
// RUN: -shared-libs=%mlir_runner_utils \
15+
// RUN: -shared-libs=%mlir_async_runtime\
1616
// RUN: | FileCheck %s --dump-input=always
1717

1818
// RUN: mlir-opt %s -async-parallel-for \
@@ -27,8 +27,8 @@
2727
// RUN: -reconcile-unrealized-casts \
2828
// RUN: | mlir-cpu-runner \
2929
// RUN: -e entry -entry-point-result=void -O0 \
30-
// RUN: -shared-libs=%mlir_lib_dir/libmlir_runner_utils%shlibext \
31-
// RUN: -shared-libs=%mlir_lib_dir/libmlir_async_runtime%shlibext\
30+
// RUN: -shared-libs=%mlir_runner_utils \
31+
// RUN: -shared-libs=%mlir_async_runtime\
3232
// RUN: | FileCheck %s --dump-input=always
3333

3434
// RUN: mlir-opt %s -async-parallel-for="async-dispatch=false \
@@ -46,8 +46,8 @@
4646
// RUN: -reconcile-unrealized-casts \
4747
// RUN: | mlir-cpu-runner \
4848
// RUN: -e entry -entry-point-result=void -O0 \
49-
// RUN: -shared-libs=%mlir_lib_dir/libmlir_runner_utils%shlibext \
50-
// RUN: -shared-libs=%mlir_lib_dir/libmlir_async_runtime%shlibext\
49+
// RUN: -shared-libs=%mlir_runner_utils \
50+
// RUN: -shared-libs=%mlir_async_runtime\
5151
// RUN: | FileCheck %s --dump-input=always
5252

5353
// Suppress constant folding by introducing "dynamic" zero value at runtime.

‎mlir/test/Integration/Dialect/Async/CPU/test-async-parallel-for-2d.mlir

+6-6
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@
1010
// RUN: -reconcile-unrealized-casts \
1111
// RUN: | mlir-cpu-runner \
1212
// RUN: -e entry -entry-point-result=void -O0 \
13-
// RUN: -shared-libs=%mlir_lib_dir/libmlir_runner_utils%shlibext \
14-
// RUN: -shared-libs=%mlir_lib_dir/libmlir_async_runtime%shlibext\
13+
// RUN: -shared-libs=%mlir_runner_utils \
14+
// RUN: -shared-libs=%mlir_async_runtime\
1515
// RUN: | FileCheck %s --dump-input=always
1616

1717
// RUN: mlir-opt %s -async-parallel-for \
@@ -25,8 +25,8 @@
2525
// RUN: -reconcile-unrealized-casts \
2626
// RUN: | mlir-cpu-runner \
2727
// RUN: -e entry -entry-point-result=void -O0 \
28-
// RUN: -shared-libs=%mlir_lib_dir/libmlir_runner_utils%shlibext \
29-
// RUN: -shared-libs=%mlir_lib_dir/libmlir_async_runtime%shlibext\
28+
// RUN: -shared-libs=%mlir_runner_utils \
29+
// RUN: -shared-libs=%mlir_async_runtime\
3030
// RUN: | FileCheck %s --dump-input=always
3131

3232
// RUN: mlir-opt %s -async-parallel-for="async-dispatch=false \
@@ -43,8 +43,8 @@
4343
// RUN: -reconcile-unrealized-casts \
4444
// RUN: | mlir-cpu-runner \
4545
// RUN: -e entry -entry-point-result=void -O0 \
46-
// RUN: -shared-libs=%mlir_lib_dir/libmlir_runner_utils%shlibext \
47-
// RUN: -shared-libs=%mlir_lib_dir/libmlir_async_runtime%shlibext\
46+
// RUN: -shared-libs=%mlir_runner_utils \
47+
// RUN: -shared-libs=%mlir_async_runtime\
4848
// RUN: | FileCheck %s --dump-input=always
4949

5050
func.func @entry() {

‎mlir/test/Integration/Dialect/Complex/CPU/correctness.mlir

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
// RUN: -convert-func-to-llvm -reconcile-unrealized-casts |\
77
// RUN: mlir-cpu-runner \
88
// RUN: -e entry -entry-point-result=void \
9-
// RUN: -shared-libs=%mlir_lib_dir/libmlir_c_runner_utils%shlibext |\
9+
// RUN: -shared-libs=%mlir_c_runner_utils |\
1010
// RUN: FileCheck %s
1111

1212
// XFAIL: target=aarch64{{.*}}

‎mlir/test/Integration/Dialect/LLVMIR/CPU/X86/lit.local.cfg

-4
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,3 @@ import platform
22

33
if platform.machine() != 'x86_64':
44
config.unsupported = True
5-
6-
# No JIT on win32.
7-
if sys.platform == 'win32':
8-
config.unsupported = True

‎mlir/test/Integration/Dialect/LLVMIR/CPU/X86/test-inline-asm-vector.mlir

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// RUN: mlir-opt %s -convert-vector-to-llvm | \
22
// RUN: mlir-cpu-runner -e entry_point_with_all_constants -entry-point-result=void \
3-
// RUN: -shared-libs=%mlir_lib_dir/libmlir_c_runner_utils%shlibext
3+
// RUN: -shared-libs=%mlir_c_runner_utils
44

55
module {
66
llvm.func @function_to_run(%a: vector<8xf32>, %b: vector<8xf32>) {

‎mlir/test/Integration/Dialect/LLVMIR/CPU/X86/test-inline-asm.mlir

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
// RUN: mlir-cpu-runner %s -e entry -entry-point-result=void \
2-
// RUN: -shared-libs=%mlir_lib_dir/libmlir_c_runner_utils%shlibext | \
2+
// RUN: -shared-libs=%mlir_c_runner_utils | \
33
// RUN: FileCheck %s
44

55
module {

0 commit comments

Comments
 (0)