Skip to content

Commit 5561e17

Browse files
aartbikaartbik
committed
Revert "[mlir] Make the vast majority of integration and runner tests work on Windows"
This reverts commit 161b9d7. REASON: cmake --build . --target check-mlir-integration Failed Tests (186):   MLIR :: Integration/Dialect/Arith/CPU/test-wide-int-emulation-addi-i16.mlir   MLIR :: Integration/Dialect/Arith/CPU/test-wide-int-emulation-cmpi-i16.mlir   MLIR :: Integration/Dialect/Arith/CPU/test-wide-int-emulation-compare-results-i16.mlir   MLIR :: Integration/Dialect/Arith/CPU/test-wide-int-emulation-constants-i16.mlir   MLIR :: Integration/Dialect/Arith/CPU/test-wide-int-emulation-max-min-i16.mlir   MLIR :: Integration/Dialect/Arith/CPU/test-wide-int-emulation-muli-i16.mlir   MLIR :: Integration/Dialect/Arith/CPU/test-wide-int-emulation-shli-i16.mlir   MLIR :: Integration/Dialect/Arith/CPU/test-wide-int-emulation-shrsi-i16.mlir   MLIR :: Integration/Dialect/Arith/CPU/test-wide-int-emulation-shrui-i16.mlir   MLIR :: Integration/Dialect/Async/CPU/microbench-linalg-async-parallel-for.mlir   MLIR :: Integration/Dialect/Async/CPU/microbench-scf-async-parallel-for.mlir   MLIR :: Integration/Dialect/Async/CPU/test-async-parallel-for-1d.mlir   MLIR :: Integration/Dialect/Async/CPU/test-async-parallel-for-2d.mlir   MLIR :: Integration/Dialect/Complex/CPU/correctness.mlir   MLIR :: Integration/Dialect/LLVMIR/CPU/X86/test-inline-asm-vector.mlir   MLIR :: Integration/Dialect/LLVMIR/CPU/X86/test-inline-asm.mlir   MLIR :: Integration/Dialect/LLVMIR/CPU/test-vector-reductions-fp.mlir   MLIR :: Integration/Dialect/LLVMIR/CPU/test-vector-reductions-int.mlir   MLIR :: Integration/Dialect/Linalg/CPU/matmul-vs-matvec.mlir   MLIR :: Integration/Dialect/Linalg/CPU/rank-reducing-subview.mlir   MLIR :: Integration/Dialect/Linalg/CPU/test-collapse-tensor.mlir   MLIR :: Integration/Dialect/Linalg/CPU/test-conv-1d-call.mlir   MLIR :: Integration/Dialect/Linalg/CPU/test-conv-1d-nwc-wcf-call.mlir   MLIR :: Integration/Dialect/Linalg/CPU/test-conv-2d-call.mlir   MLIR :: Integration/Dialect/Linalg/CPU/test-conv-2d-nhwc-hwcf-call.mlir   MLIR :: Integration/Dialect/Linalg/CPU/test-conv-3d-call.mlir   MLIR :: Integration/Dialect/Linalg/CPU/test-conv-3d-ndhwc-dhwcf-call.mlir   MLIR :: Integration/Dialect/Linalg/CPU/test-elementwise.mlir   MLIR :: Integration/Dialect/Linalg/CPU/test-expand-tensor.mlir   MLIR :: Integration/Dialect/Linalg/CPU/test-one-shot-bufferize.mlir   MLIR :: Integration/Dialect/Linalg/CPU/test-padtensor.mlir   MLIR :: Integration/Dialect/Linalg/CPU/test-subtensor-insert-multiple-uses.mlir   MLIR :: Integration/Dialect/Linalg/CPU/test-subtensor-insert.mlir   MLIR :: Integration/Dialect/Linalg/CPU/test-tensor-e2e.mlir   MLIR :: Integration/Dialect/Linalg/CPU/test-tensor-matmul.mlir   MLIR :: Integration/Dialect/Memref/cast-runtime-verification.mlir   MLIR :: Integration/Dialect/SparseTensor/CPU/concatenate.mlir   MLIR :: Integration/Dialect/SparseTensor/CPU/dense_output.mlir   MLIR :: Integration/Dialect/SparseTensor/CPU/dense_output_bf16.mlir   MLIR :: Integration/Dialect/SparseTensor/CPU/dense_output_f16.mlir   MLIR :: Integration/Dialect/SparseTensor/CPU/sparse_abs.mlir   MLIR :: Integration/Dialect/SparseTensor/CPU/sparse_binary.mlir   MLIR :: Integration/Dialect/SparseTensor/CPU/sparse_cast.mlir   MLIR :: Integration/Dialect/SparseTensor/CPU/sparse_codegen_dim.mlir   MLIR :: Integration/Dialect/SparseTensor/CPU/sparse_codegen_foreach.mlir   MLIR :: Integration/Dialect/SparseTensor/CPU/sparse_complex32.mlir   MLIR :: Integration/Dialect/SparseTensor/CPU/sparse_complex64.mlir   MLIR :: Integration/Dialect/SparseTensor/CPU/sparse_complex_ops.mlir   MLIR :: Integration/Dialect/SparseTensor/CPU/sparse_constant_to_sparse_tensor.mlir   MLIR :: Integration/Dialect/SparseTensor/CPU/sparse_conv_1d_nwc_wcf.mlir   MLIR :: Integration/Dialect/SparseTensor/CPU/sparse_conv_2d.mlir   MLIR :: Integration/Dialect/SparseTensor/CPU/sparse_conv_2d_nhwc_hwcf.mlir   MLIR :: Integration/Dialect/SparseTensor/CPU/sparse_conv_3d.mlir   MLIR :: Integration/Dialect/SparseTensor/CPU/sparse_conv_3d_ndhwc_dhwcf.mlir   MLIR :: Integration/Dialect/SparseTensor/CPU/sparse_conversion.mlir   MLIR :: Integration/Dialect/SparseTensor/CPU/sparse_conversion_dyn.mlir   MLIR :: Integration/Dialect/SparseTensor/CPU/sparse_conversion_ptr.mlir   MLIR :: Integration/Dialect/SparseTensor/CPU/sparse_conversion_sparse2dense.mlir   MLIR :: Integration/Dialect/SparseTensor/CPU/sparse_conversion_sparse2sparse.mlir   MLIR :: Integration/Dialect/SparseTensor/CPU/sparse_dot.mlir   MLIR :: Integration/Dialect/SparseTensor/CPU/sparse_expand.mlir   MLIR :: Integration/Dialect/SparseTensor/CPU/sparse_file_io.mlir   MLIR :: Integration/Dialect/SparseTensor/CPU/sparse_filter_conv2d.mlir   MLIR :: Integration/Dialect/SparseTensor/CPU/sparse_flatten.mlir   MLIR :: Integration/Dialect/SparseTensor/CPU/sparse_foreach_slices.mlir   MLIR :: Integration/Dialect/SparseTensor/CPU/sparse_index.mlir   MLIR :: Integration/Dialect/SparseTensor/CPU/sparse_index_dense.mlir   MLIR :: Integration/Dialect/SparseTensor/CPU/sparse_insert_1d.mlir   MLIR :: Integration/Dialect/SparseTensor/CPU/sparse_insert_2d.mlir   MLIR :: Integration/Dialect/SparseTensor/CPU/sparse_insert_3d.mlir   MLIR :: Integration/Dialect/SparseTensor/CPU/sparse_matmul.mlir   MLIR :: Integration/Dialect/SparseTensor/CPU/sparse_matrix_ops.mlir   MLIR :: Integration/Dialect/SparseTensor/CPU/sparse_matvec.mlir   MLIR :: Integration/Dialect/SparseTensor/CPU/sparse_mttkrp.mlir   MLIR :: Integration/Dialect/SparseTensor/CPU/sparse_out_mult_elt.mlir   MLIR :: Integration/Dialect/SparseTensor/CPU/sparse_out_reduction.mlir   MLIR :: Integration/Dialect/SparseTensor/CPU/sparse_out_simple.mlir   MLIR :: Integration/Dialect/SparseTensor/CPU/sparse_pack.mlir   MLIR :: Integration/Dialect/SparseTensor/CPU/sparse_quantized_matmul.mlir   MLIR :: Integration/Dialect/SparseTensor/CPU/sparse_re_im.mlir   MLIR :: Integration/Dialect/SparseTensor/CPU/sparse_reduce_custom.mlir   MLIR :: Integration/Dialect/SparseTensor/CPU/sparse_reduce_custom_prod.mlir   MLIR :: Integration/Dialect/SparseTensor/CPU/sparse_reductions.mlir   MLIR :: Integration/Dialect/SparseTensor/CPU/sparse_reductions_prod.mlir   MLIR :: Integration/Dialect/SparseTensor/CPU/sparse_reshape.mlir   MLIR :: Integration/Dialect/SparseTensor/CPU/sparse_rewrite_push_back.mlir   MLIR :: Integration/Dialect/SparseTensor/CPU/sparse_rewrite_sort.mlir   MLIR :: Integration/Dialect/SparseTensor/CPU/sparse_rewrite_sort_coo.mlir   MLIR :: Integration/Dialect/SparseTensor/CPU/sparse_sampled_matmul.mlir   MLIR :: Integration/Dialect/SparseTensor/CPU/sparse_sampled_mm_fusion.mlir   MLIR :: Integration/Dialect/SparseTensor/CPU/sparse_scale.mlir   MLIR :: Integration/Dialect/SparseTensor/CPU/sparse_scf_nested.mlir   MLIR :: Integration/Dialect/SparseTensor/CPU/sparse_select.mlir   MLIR :: Integration/Dialect/SparseTensor/CPU/sparse_sign.mlir   MLIR :: Integration/Dialect/SparseTensor/CPU/sparse_sorted_coo.mlir   MLIR :: Integration/Dialect/SparseTensor/CPU/sparse_spmm.mlir   MLIR :: Integration/Dialect/SparseTensor/CPU/sparse_storage.mlir   MLIR :: Integration/Dialect/SparseTensor/CPU/sparse_sum.mlir   MLIR :: Integration/Dialect/SparseTensor/CPU/sparse_sum_bf16.mlir   MLIR :: Integration/Dialect/SparseTensor/CPU/sparse_sum_c32.mlir   MLIR :: Integration/Dialect/SparseTensor/CPU/sparse_sum_f16.mlir   MLIR :: Integration/Dialect/SparseTensor/CPU/sparse_tanh.mlir   MLIR :: Integration/Dialect/SparseTensor/CPU/sparse_tensor_mul.mlir   MLIR :: Integration/Dialect/SparseTensor/CPU/sparse_tensor_ops.mlir   MLIR :: Integration/Dialect/SparseTensor/CPU/sparse_transpose.mlir   MLIR :: Integration/Dialect/SparseTensor/CPU/sparse_unary.mlir   MLIR :: Integration/Dialect/SparseTensor/CPU/sparse_vector_ops.mlir   MLIR :: Integration/Dialect/SparseTensor/python/test_SDDMM.py   MLIR :: Integration/Dialect/SparseTensor/python/test_SpMM.py   MLIR :: Integration/Dialect/SparseTensor/python/test_elementwise_add_sparse_output.py   MLIR :: Integration/Dialect/SparseTensor/python/test_output.py   MLIR :: Integration/Dialect/SparseTensor/python/test_stress.py   MLIR :: Integration/Dialect/SparseTensor/taco/test_MTTKRP.py   MLIR :: Integration/Dialect/SparseTensor/taco/test_SDDMM.py   MLIR :: Integration/Dialect/SparseTensor/taco/test_SpMM.py   MLIR :: Integration/Dialect/SparseTensor/taco/test_SpMV.py   MLIR :: Integration/Dialect/SparseTensor/taco/test_Tensor.py   MLIR :: Integration/Dialect/SparseTensor/taco/test_scalar_tensor_algebra.py   MLIR :: Integration/Dialect/SparseTensor/taco/test_simple_tensor_algebra.py   MLIR :: Integration/Dialect/SparseTensor/taco/test_tensor_complex.py   MLIR :: Integration/Dialect/SparseTensor/taco/test_tensor_types.py   MLIR :: Integration/Dialect/SparseTensor/taco/test_tensor_unary_ops.py   MLIR :: Integration/Dialect/SparseTensor/taco/test_true_dense_tensor_algebra.py   MLIR :: Integration/Dialect/SparseTensor/taco/unit_test_tensor_core.py   MLIR :: Integration/Dialect/SparseTensor/taco/unit_test_tensor_io.py   MLIR :: Integration/Dialect/SparseTensor/taco/unit_test_tensor_utils.py   MLIR :: Integration/Dialect/Standard/CPU/test-ceil-floor-pos-neg.mlir   MLIR :: Integration/Dialect/Standard/CPU/test_subview.mlir   MLIR :: Integration/Dialect/Vector/CPU/AMX/test-mulf-full.mlir   MLIR :: Integration/Dialect/Vector/CPU/AMX/test-mulf.mlir   MLIR :: Integration/Dialect/Vector/CPU/AMX/test-muli-ext.mlir   MLIR :: Integration/Dialect/Vector/CPU/AMX/test-muli-full.mlir   MLIR :: Integration/Dialect/Vector/CPU/AMX/test-muli.mlir   MLIR :: Integration/Dialect/Vector/CPU/AMX/test-tilezero-block.mlir   MLIR :: Integration/Dialect/Vector/CPU/AMX/test-tilezero.mlir   MLIR :: Integration/Dialect/Vector/CPU/X86Vector/test-dot.mlir   MLIR :: Integration/Dialect/Vector/CPU/X86Vector/test-inline-asm-vector-avx512.mlir   MLIR :: Integration/Dialect/Vector/CPU/X86Vector/test-mask-compress.mlir   MLIR :: Integration/Dialect/Vector/CPU/X86Vector/test-rsqrt.mlir   MLIR :: Integration/Dialect/Vector/CPU/X86Vector/test-sparse-dot-product.mlir   MLIR :: Integration/Dialect/Vector/CPU/X86Vector/test-vp2intersect-i32.mlir   MLIR :: Integration/Dialect/Vector/CPU/test-0-d-vectors.mlir   MLIR :: Integration/Dialect/Vector/CPU/test-broadcast.mlir   MLIR :: Integration/Dialect/Vector/CPU/test-compress.mlir   MLIR :: Integration/Dialect/Vector/CPU/test-constant-mask.mlir   MLIR :: Integration/Dialect/Vector/CPU/test-contraction.mlir   MLIR :: Integration/Dialect/Vector/CPU/test-create-mask-v4i1.mlir   MLIR :: Integration/Dialect/Vector/CPU/test-create-mask.mlir   MLIR :: Integration/Dialect/Vector/CPU/test-expand.mlir   MLIR :: Integration/Dialect/Vector/CPU/test-extract-strided-slice.mlir   MLIR :: Integration/Dialect/Vector/CPU/test-flat-transpose-col.mlir   MLIR :: Integration/Dialect/Vector/CPU/test-flat-transpose-row.mlir   MLIR :: Integration/Dialect/Vector/CPU/test-fma.mlir   MLIR :: Integration/Dialect/Vector/CPU/test-gather.mlir   MLIR :: Integration/Dialect/Vector/CPU/test-index-vectors.mlir   MLIR :: Integration/Dialect/Vector/CPU/test-insert-strided-slice.mlir   MLIR :: Integration/Dialect/Vector/CPU/test-maskedload.mlir   MLIR :: Integration/Dialect/Vector/CPU/test-maskedstore.mlir   MLIR :: Integration/Dialect/Vector/CPU/test-matrix-multiply-col.mlir   MLIR :: Integration/Dialect/Vector/CPU/test-matrix-multiply-row.mlir   MLIR :: Integration/Dialect/Vector/CPU/test-outerproduct-f32.mlir   MLIR :: Integration/Dialect/Vector/CPU/test-outerproduct-i64.mlir   MLIR :: Integration/Dialect/Vector/CPU/test-print-int.mlir   MLIR :: Integration/Dialect/Vector/CPU/test-realloc.mlir   MLIR :: Integration/Dialect/Vector/CPU/test-reductions-f32-reassoc.mlir   MLIR :: Integration/Dialect/Vector/CPU/test-reductions-f32.mlir   MLIR :: Integration/Dialect/Vector/CPU/test-reductions-f64-reassoc.mlir   MLIR :: Integration/Dialect/Vector/CPU/test-reductions-f64.mlir   MLIR :: Integration/Dialect/Vector/CPU/test-reductions-i32.mlir   MLIR :: Integration/Dialect/Vector/CPU/test-reductions-i4.mlir   MLIR :: Integration/Dialect/Vector/CPU/test-reductions-i64.mlir   MLIR :: Integration/Dialect/Vector/CPU/test-reductions-si4.mlir   MLIR :: Integration/Dialect/Vector/CPU/test-reductions-ui4.mlir   MLIR :: Integration/Dialect/Vector/CPU/test-scan.mlir   MLIR :: Integration/Dialect/Vector/CPU/test-scatter.mlir   MLIR :: Integration/Dialect/Vector/CPU/test-shape-cast.mlir   MLIR :: Integration/Dialect/Vector/CPU/test-shuffle.mlir   MLIR :: Integration/Dialect/Vector/CPU/test-sparse-dot-matvec.mlir   MLIR :: Integration/Dialect/Vector/CPU/test-sparse-saxpy-jagged-matvec.mlir   MLIR :: Integration/Dialect/Vector/CPU/test-transfer-read-1d.mlir   MLIR :: Integration/Dialect/Vector/CPU/test-transfer-read-2d.mlir   MLIR :: Integration/Dialect/Vector/CPU/test-transfer-read-3d.mlir   MLIR :: Integration/Dialect/Vector/CPU/test-transfer-read.mlir   MLIR :: Integration/Dialect/Vector/CPU/test-transfer-to-loops.mlir   MLIR :: Integration/Dialect/Vector/CPU/test-transfer-write.mlir   MLIR :: Integration/Dialect/Vector/CPU/test-transpose.mlir Testing Time: 0.29s   Unsupported:  31   Passed     :   5   Failed     : 186 Differential Revision: https://reviews.llvm.org/D143970
1 parent 6637259 commit 5561e17

File tree

250 files changed

+374
-420
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

+374
-420
lines changed

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

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

4039
#include "mlir/ExecutionEngine/CRunnerUtils.h"
4140

4241
template <typename T, typename StreamType>
4342
void printMemRefMetaData(StreamType &os, const DynamicMemRefType<T> &v) {
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;
43+
os << "base@ = " << reinterpret_cast<void *>(v.data) << " rank = " << v.rank
44+
<< " offset = " << v.offset;
4945
auto print = [&](const int64_t *ptr) {
5046
if (v.rank == 0)
5147
return;

‎mlir/test/CMakeLists.txt

+2-32
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,6 @@ 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-
128
# Provide the MLIR CMake module dir so that the out of tree Standalone
139
# dialect and can add it to the module path.
1410
set(MLIR_CMAKE_DIR
@@ -57,39 +53,12 @@ llvm_canonicalize_cmake_booleans(
5753
MLIR_RUN_ARM_SVE_TESTS
5854
)
5955

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.
8256
configure_lit_site_cfg(
8357
${CMAKE_CURRENT_SOURCE_DIR}/lit.site.cfg.py.in
84-
${CMAKE_CURRENT_BINARY_DIR}/lit.site.cfg.py.in
58+
${CMAKE_CURRENT_BINARY_DIR}/lit.site.cfg.py
8559
MAIN_CONFIG
8660
${CMAKE_CURRENT_SOURCE_DIR}/lit.cfg.py
8761
)
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-
9362
configure_lit_site_cfg(
9463
${CMAKE_CURRENT_SOURCE_DIR}/Unit/lit.site.cfg.py.in
9564
${CMAKE_CURRENT_BINARY_DIR}/Unit/lit.site.cfg.py
@@ -162,6 +131,7 @@ if(LLVM_BUILD_EXAMPLES)
162131
endif()
163132

164133
if(MLIR_ENABLE_SPIRV_CPU_RUNNER)
134+
add_subdirectory(mlir-spirv-cpu-runner)
165135
list(APPEND MLIR_TEST_DEPENDS
166136
mlir-spirv-cpu-runner
167137
mlir_test_spirv_cpu_runner_c_wrappers

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

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
import sys
2+
3+
# No JIT on win32.
4+
if sys.platform == 'win32':
5+
config.unsupported = True

‎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_c_runner_utils | \
7+
// RUN: --shared-libs=%mlir_lib_dir/libmlir_c_runner_utils%shlibext | \
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_c_runner_utils | \
14+
// RUN: --shared-libs=%mlir_lib_dir/libmlir_c_runner_utils%shlibext | \
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_c_runner_utils | \
8+
// RUN: --shared-libs=%mlir_lib_dir/libmlir_c_runner_utils%shlibext | \
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_c_runner_utils | \
15+
// RUN: --shared-libs=%mlir_lib_dir/libmlir_c_runner_utils%shlibext | \
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_c_runner_utils,%mlir_runner_utils" | \
8+
// RUN: --shared-libs="%mlir_lib_dir/libmlir_c_runner_utils%shlibext,%mlir_lib_dir/libmlir_runner_utils%shlibext" | \
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_c_runner_utils | \
8+
// RUN: --shared-libs=%mlir_lib_dir/libmlir_c_runner_utils%shlibext | \
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_c_runner_utils | \
8+
// RUN: --shared-libs=%mlir_lib_dir/libmlir_c_runner_utils%shlibext | \
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_c_runner_utils | \
15+
// RUN: --shared-libs=%mlir_lib_dir/libmlir_c_runner_utils%shlibext | \
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_c_runner_utils | \
7+
// RUN: --shared-libs=%mlir_lib_dir/libmlir_c_runner_utils%shlibext | \
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_c_runner_utils | \
14+
// RUN: --shared-libs=%mlir_lib_dir/libmlir_c_runner_utils%shlibext | \
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_c_runner_utils | \
7+
// RUN: --shared-libs=%mlir_lib_dir/libmlir_c_runner_utils%shlibext | \
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_c_runner_utils | \
14+
// RUN: --shared-libs=%mlir_lib_dir/libmlir_c_runner_utils%shlibext | \
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_c_runner_utils | \
7+
// RUN: --shared-libs=%mlir_lib_dir/libmlir_c_runner_utils%shlibext | \
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_c_runner_utils | \
14+
// RUN: --shared-libs=%mlir_lib_dir/libmlir_c_runner_utils%shlibext | \
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_c_runner_utils | \
7+
// RUN: --shared-libs=%mlir_lib_dir/libmlir_c_runner_utils%shlibext | \
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_c_runner_utils | \
14+
// RUN: --shared-libs=%mlir_lib_dir/libmlir_c_runner_utils%shlibext | \
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-
# Windows does not have aligned_alloc
3+
# No JIT on win32.
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_runner_utils \
18-
// RUN: -shared-libs=%mlir_c_runner_utils\
19-
// RUN: -shared-libs=%mlir_async_runtime \
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 \
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_runner_utils \
32-
// RUN: -shared-libs=%mlir_c_runner_utils\
33-
// RUN: -shared-libs=%mlir_async_runtime \
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 \
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_runner_utils \
18-
// RUN: -shared-libs=%mlir_c_runner_utils\
19-
// RUN: -shared-libs=%mlir_async_runtime \
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 \
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_runner_utils \
39-
// RUN: -shared-libs=%mlir_c_runner_utils\
40-
// RUN: -shared-libs=%mlir_async_runtime \
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 \
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_runner_utils \
53-
// RUN: -shared-libs=%mlir_c_runner_utils\
54-
// RUN: -shared-libs=%mlir_async_runtime \
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 \
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_runner_utils \
15-
// RUN: -shared-libs=%mlir_async_runtime\
14+
// RUN: -shared-libs=%mlir_lib_dir/libmlir_runner_utils%shlibext \
15+
// RUN: -shared-libs=%mlir_lib_dir/libmlir_async_runtime%shlibext\
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_runner_utils \
31-
// RUN: -shared-libs=%mlir_async_runtime\
30+
// RUN: -shared-libs=%mlir_lib_dir/libmlir_runner_utils%shlibext \
31+
// RUN: -shared-libs=%mlir_lib_dir/libmlir_async_runtime%shlibext\
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_runner_utils \
50-
// RUN: -shared-libs=%mlir_async_runtime\
49+
// RUN: -shared-libs=%mlir_lib_dir/libmlir_runner_utils%shlibext \
50+
// RUN: -shared-libs=%mlir_lib_dir/libmlir_async_runtime%shlibext\
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_runner_utils \
14-
// RUN: -shared-libs=%mlir_async_runtime\
13+
// RUN: -shared-libs=%mlir_lib_dir/libmlir_runner_utils%shlibext \
14+
// RUN: -shared-libs=%mlir_lib_dir/libmlir_async_runtime%shlibext\
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_runner_utils \
29-
// RUN: -shared-libs=%mlir_async_runtime\
28+
// RUN: -shared-libs=%mlir_lib_dir/libmlir_runner_utils%shlibext \
29+
// RUN: -shared-libs=%mlir_lib_dir/libmlir_async_runtime%shlibext\
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_runner_utils \
47-
// RUN: -shared-libs=%mlir_async_runtime\
46+
// RUN: -shared-libs=%mlir_lib_dir/libmlir_runner_utils%shlibext \
47+
// RUN: -shared-libs=%mlir_lib_dir/libmlir_async_runtime%shlibext\
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_c_runner_utils |\
9+
// RUN: -shared-libs=%mlir_lib_dir/libmlir_c_runner_utils%shlibext |\
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,3 +2,7 @@ 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_c_runner_utils
3+
// RUN: -shared-libs=%mlir_lib_dir/libmlir_c_runner_utils%shlibext
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_c_runner_utils | \
2+
// RUN: -shared-libs=%mlir_lib_dir/libmlir_c_runner_utils%shlibext | \
33
// RUN: FileCheck %s
44

55
module {

0 commit comments

Comments
 (0)