diff --git a/mlir/test/Integration/Dialect/LLVMIR/CPU/test-vp-intrinsic.mlir b/mlir/test/Integration/Dialect/LLVMIR/CPU/test-vp-intrinsic.mlir --- a/mlir/test/Integration/Dialect/LLVMIR/CPU/test-vp-intrinsic.mlir +++ b/mlir/test/Integration/Dialect/LLVMIR/CPU/test-vp-intrinsic.mlir @@ -1,7 +1,7 @@ // RUN: mlir-opt %s -convert-vector-to-llvm -convert-memref-to-llvm \ // RUN: -convert-func-to-llvm -reconcile-unrealized-casts | \ // RUN: mlir-translate -mlir-to-llvmir | \ -// RUN: %lli --entry-function=entry \ +// RUN: lli --entry-function=entry \ // RUN: --dlopen=%mlir_native_utils_lib_dir/libmlir_c_runner_utils%shlibext | \ // RUN: FileCheck %s diff --git a/mlir/test/Integration/Dialect/SparseTensor/CPU/ArmSVE/lit.local.cfg b/mlir/test/Integration/Dialect/SparseTensor/CPU/ArmSVE/lit.local.cfg new file mode 100644 --- /dev/null +++ b/mlir/test/Integration/Dialect/SparseTensor/CPU/ArmSVE/lit.local.cfg @@ -0,0 +1,25 @@ +import sys + +# ArmSVE tests must be enabled via build flag. +if not config.mlir_run_arm_sve_tests: + config.unsupported = True + +# No JIT on win32. +if sys.platform == 'win32': + config.unsupported = True + +if config.arm_emulator_lli_executable: + lli_cmd = config.arm_emulator_lli_executable + +if config.arm_emulator_utils_lib_dir: + config.substitutions.append(('%mlir_native_utils_lib_dir', config.arm_emulator_utils_lib_dir)) +else: + config.substitutions.append(('%mlir_native_utils_lib_dir', config.mlir_lib_dir)) + +if config.arm_emulator_executable: + # Run test in emulator (qemu or armie) + emulation_cmd = config.arm_emulator_executable + if config.arm_emulator_options: + emulation_cmd = emulation_cmd + ' ' + config.arm_emulator_options + emulation_cmd = emulation_cmd + ' ' + lli_cmd + config.substitutions.append(('%lli', emulation_cmd)) diff --git a/mlir/test/Integration/Dialect/SparseTensor/CPU/ArmSVE/sparse_reductions_vla.mlir b/mlir/test/Integration/Dialect/SparseTensor/CPU/ArmSVE/sparse_reductions_vla.mlir new file mode 100644 --- /dev/null +++ b/mlir/test/Integration/Dialect/SparseTensor/CPU/ArmSVE/sparse_reductions_vla.mlir @@ -0,0 +1,173 @@ +// RUN: mlir-opt %s --sparse-compiler="enable-runtime-library=true vl=4 enable-arm-sve=%ENABLE_VLA" | \ +// RUN: mlir-translate -mlir-to-llvmir | \ +// RUN: lli --entry-function=entry %VLA_ARCH_ATTR_OPTIONS --dlopen=%mlir_native_utils_lib_dir/libmlir_c_runner_utils%shlibext | \ +// RUN: FileCheck %s + +#SV = #sparse_tensor.encoding<{ dimLevelType = [ "compressed" ] }> +#DV = #sparse_tensor.encoding<{ dimLevelType = [ "dense" ] }> + +#trait_reduction = { + indexing_maps = [ + affine_map<(i) -> (i)>, // a + affine_map<(i) -> ()> // x (scalar out) + ], + iterator_types = ["reduction"], + doc = "x += OPER_i a(i)" +} + +// An example of vector reductions. +module { + + func.func @sum_reduction_i32(%arga: tensor<32xi32, #SV>, + %argx: tensor) -> tensor { + %0 = linalg.generic #trait_reduction + ins(%arga: tensor<32xi32, #SV>) + outs(%argx: tensor) { + ^bb(%a: i32, %x: i32): + %0 = arith.addi %x, %a : i32 + linalg.yield %0 : i32 + } -> tensor + return %0 : tensor + } + + func.func @sum_reduction_f32(%arga: tensor<32xf32, #SV>, + %argx: tensor) -> tensor { + %0 = linalg.generic #trait_reduction + ins(%arga: tensor<32xf32, #SV>) + outs(%argx: tensor) { + ^bb(%a: f32, %x: f32): + %0 = arith.addf %x, %a : f32 + linalg.yield %0 : f32 + } -> tensor + return %0 : tensor + } + + func.func @and_reduction_i32(%arga: tensor<32xi32, #DV>, + %argx: tensor) -> tensor { + %0 = linalg.generic #trait_reduction + ins(%arga: tensor<32xi32, #DV>) + outs(%argx: tensor) { + ^bb(%a: i32, %x: i32): + %0 = arith.andi %x, %a : i32 + linalg.yield %0 : i32 + } -> tensor + return %0 : tensor + } + + func.func @or_reduction_i32(%arga: tensor<32xi32, #SV>, + %argx: tensor) -> tensor { + %0 = linalg.generic #trait_reduction + ins(%arga: tensor<32xi32, #SV>) + outs(%argx: tensor) { + ^bb(%a: i32, %x: i32): + %0 = arith.ori %x, %a : i32 + linalg.yield %0 : i32 + } -> tensor + return %0 : tensor + } + + func.func @xor_reduction_i32(%arga: tensor<32xi32, #SV>, + %argx: tensor) -> tensor { + %0 = linalg.generic #trait_reduction + ins(%arga: tensor<32xi32, #SV>) + outs(%argx: tensor) { + ^bb(%a: i32, %x: i32): + %0 = arith.xori %x, %a : i32 + linalg.yield %0 : i32 + } -> tensor + return %0 : tensor + } + + func.func @dump_i32(%arg0 : memref) { + %v = memref.load %arg0[] : memref + vector.print %v : i32 + return + } + + func.func @dump_f32(%arg0 : memref) { + %v = memref.load %arg0[] : memref + vector.print %v : f32 + return + } + + func.func @entry() -> i32 { + %z = arith.constant 0 : index + %i = arith.constant 0 : i32 + %ri = arith.constant dense< 7 > : tensor + %rf = arith.constant dense< 2.0 > : tensor + + %c_0_i32 = arith.constant dense<[ + 0, 2, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 4, 0, 0, 0, + 0, 0, 0, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 9, 0 + ]> : tensor<32xi32> + + %c_0_f32 = arith.constant dense<[ + 0.0, 1.0, 0.0, 0.0, 4.0, 0.0, 0.0, 0.0, + 0.0, 0.0, 3.0, 0.0, 0.0, 0.0, 0.0, 0.0, + 0.0, 0.0, 0.0, 0.0, 2.5, 0.0, 0.0, 0.0, + 2.0, 0.0, 0.0, 0.0, 0.0, 4.0, 0.0, 9.0 + ]> : tensor<32xf32> + + %c_1_i32 = arith.constant dense<[ + 1, 1, 7, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 7, 3 + ]> : tensor<32xi32> + + %c_1_f32 = arith.constant dense<[ + 1.0, 1.0, 1.0, 3.5, 1.0, 1.0, 1.0, 1.0, + 1.0, 1.0, 2.0, 1.0, 1.0, 1.0, 1.0, 1.0, + 1.0, 1.0, 1.0, 1.0, 3.0, 1.0, 1.0, 1.0, + 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 4.0 + ]> : tensor<32xf32> + + // Convert constants to annotated tensors. + %sparse_input_i32 = sparse_tensor.convert %c_0_i32 + : tensor<32xi32> to tensor<32xi32, #SV> + %sparse_input_f32 = sparse_tensor.convert %c_0_f32 + : tensor<32xf32> to tensor<32xf32, #SV> + %dense_input_i32 = sparse_tensor.convert %c_1_i32 + : tensor<32xi32> to tensor<32xi32, #DV> + %dense_input_f32 = sparse_tensor.convert %c_1_f32 + : tensor<32xf32> to tensor<32xf32, #DV> + + // Call the kernels. + %0 = call @sum_reduction_i32(%sparse_input_i32, %ri) + : (tensor<32xi32, #SV>, tensor) -> tensor + %1 = call @sum_reduction_f32(%sparse_input_f32, %rf) + : (tensor<32xf32, #SV>, tensor) -> tensor + %4 = call @and_reduction_i32(%dense_input_i32, %ri) + : (tensor<32xi32, #DV>, tensor) -> tensor + %5 = call @or_reduction_i32(%sparse_input_i32, %ri) + : (tensor<32xi32, #SV>, tensor) -> tensor + %6 = call @xor_reduction_i32(%sparse_input_i32, %ri) + : (tensor<32xi32, #SV>, tensor) -> tensor + + // Verify results. + // + // CHECK: 26 + // CHECK: 27.5 + // CHECK: 1 + // CHECK: 15 + // CHECK: 10 + // + %v0 = tensor.extract %0[] : tensor + vector.print %v0 : i32 + %v1 = tensor.extract %1[] : tensor + vector.print %v1 : f32 + %v4 = tensor.extract %4[] : tensor + vector.print %v4 : i32 + %v5 = tensor.extract %5[] : tensor + vector.print %v5 : i32 + %v6 = tensor.extract %6[] : tensor + vector.print %v6 : i32 + + // Release the resources. + bufferization.dealloc_tensor %sparse_input_i32 : tensor<32xi32, #SV> + bufferization.dealloc_tensor %sparse_input_f32 : tensor<32xf32, #SV> + bufferization.dealloc_tensor %dense_input_i32 : tensor<32xi32, #DV> + bufferization.dealloc_tensor %dense_input_f32 : tensor<32xf32, #DV> + + %i0 = arith.constant 0 : i32 + return %i0 : i32 + } +} diff --git a/mlir/test/Integration/Dialect/SparseTensor/CPU/lit.local.cfg b/mlir/test/Integration/Dialect/SparseTensor/CPU/lit.local.cfg --- a/mlir/test/Integration/Dialect/SparseTensor/CPU/lit.local.cfg +++ b/mlir/test/Integration/Dialect/SparseTensor/CPU/lit.local.cfg @@ -3,3 +3,27 @@ # No JIT on win32. if sys.platform == 'win32': config.unsupported = True + +# ArmSVE tests must be enabled via build flag. +if config.mlir_run_arm_sve_tests: + config.substitutions.append(('%ENABLE_VLA', 'true')) + config.substitutions.append(('%VLA_ARCH_ATTR_OPTIONS', '--march=aarch64 --mattr="+sve"')) + lli_cmd = 'lli' + if config.arm_emulator_lli_executable: + lli_cmd = config.arm_emulator_lli_executable + + if config.arm_emulator_utils_lib_dir: + config.substitutions.append(('%mlir_native_utils_lib_dir', config.arm_emulator_utils_lib_dir)) + else: + config.substitutions.append(('%mlir_native_utils_lib_dir', config.mlir_lib_dir)) + + if config.arm_emulator_executable: + # Run test in emulator (qemu or armie) + emulation_cmd = config.arm_emulator_executable + if config.arm_emulator_options: + emulation_cmd = emulation_cmd + ' ' + config.arm_emulator_options + emulation_cmd = emulation_cmd + ' ' + lli_cmd + config.substitutions.append(('%lli', emulation_cmd)) +else: + config.substitutions.append(('%ENABLE_VLA', 'false')) + config.substitutions.append(('%VLA_ARCH_ATTR_OPTIONS', '')) diff --git a/mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_cast.mlir b/mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_cast.mlir --- a/mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_cast.mlir +++ b/mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_cast.mlir @@ -1,15 +1,27 @@ // DEFINE: %{option} = enable-runtime-library=true -// DEFINE: %{command} = mlir-opt %s --sparse-compiler=%{option} | \ -// DEFINE: mlir-cpu-runner \ +// DEFINE: %{sparse-vec-ops} = +// DEFINE: %{compile} = mlir-opt %s --sparse-compiler="%{option} %{sparse-vec-ops}" +// DEFINE: %{run} = mlir-cpu-runner \ // DEFINE: -e entry -entry-point-result=void \ // DEFINE: -shared-libs=%mlir_lib_dir/libmlir_c_runner_utils%shlibext | \ // DEFINE: FileCheck %s // -// RUN: %{command} +// RUN: %{compile} | %{run} // // Do the same run, but now with direct IR generation. // REDEFINE: %{option} = enable-runtime-library=false -// RUN: %{command} +// RUN: %{compile} | %{run} + +// +// If SVE is available, test VLA vectorization. +// +// REDEFINE: %{sparse-vec-ops} = vl=4 enable-arm-sve=true +// REDEFINE: %{run} = lli \ +// REDEFINE: --entry-function=entry_lli \ +// REDEFINE: %VLA_ARCH_ATTR_OPTIONS \ +// REDEFINE: --dlopen=%mlir_native_utils_lib_dir/libmlir_c_runner_utils%shlibext | \ +// REDEFINE: FileCheck %s +// RUN: %{compile} | mlir-translate -mlir-to-llvmir | %{run} #SV = #sparse_tensor.encoding<{ dimLevelType = [ "compressed" ] }> @@ -263,4 +275,13 @@ return } + + // Dummy wrapper required by lli, which does not support void functions (i.e. + // it fails if non-zero code is returned) + func.func @entry_lli() -> i32 { + call @entry() : () -> () + + %c0 = arith.constant 0 : i32 + return %c0 : i32 + } } diff --git a/mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_filter_conv2d.mlir b/mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_filter_conv2d.mlir --- a/mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_filter_conv2d.mlir +++ b/mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_filter_conv2d.mlir @@ -1,15 +1,27 @@ // DEFINE: %{option} = enable-runtime-library=true -// DEFINE: %{command} = mlir-opt %s --sparse-compiler=%{option} | \ -// DEFINE: mlir-cpu-runner \ +// DEFINE: %{sparse-vec-ops} = +// DEFINE: %{compile} = mlir-opt %s --sparse-compiler="%{option} %{sparse-vec-ops}" +// DEFINE: %{run} = mlir-cpu-runner \ // DEFINE: -e entry -entry-point-result=void \ // DEFINE: -shared-libs=%mlir_lib_dir/libmlir_c_runner_utils%shlibext | \ // DEFINE: FileCheck %s // -// RUN: %{command} +// RUN: %{compile} | %{run} // // Do the same run, but now with direct IR generation. // REDEFINE: %{option} = enable-runtime-library=false -// RUN: %{command} +// RUN: %{compile} | %{run} + +// +// If SVE is available, test VLA vectorization. +// +// REDEFINE: %{sparse-vec-ops} = vl=4 enable-arm-sve=true +// REDEFINE: %{run} = lli \ +// REDEFINE: --entry-function=entry_lli \ +// REDEFINE: %VLA_ARCH_ATTR_OPTIONS \ +// REDEFINE: --dlopen=%mlir_native_utils_lib_dir/libmlir_c_runner_utils%shlibext | \ +// REDEFINE: FileCheck %s +// RUN: %{compile} | mlir-translate -mlir-to-llvmir | %{run} #DCSR = #sparse_tensor.encoding<{ dimLevelType = [ "compressed", "compressed" ] }> @@ -98,6 +110,16 @@ // Release the resources. bufferization.dealloc_tensor %sparse_filter : tensor<3x3xi32, #DCSR> bufferization.dealloc_tensor %1 : tensor<6x6xi32, #DCSR> + return } + + // Dummy wrapper required by lli, which does not support void functions (i.e. + // it fails if non-zero code is returned) + func.func @entry_lli() -> i32 { + call @entry() : () -> () + + %c0 = arith.constant 0 : i32 + return %c0 : i32 + } } diff --git a/mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_flatten.mlir b/mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_flatten.mlir --- a/mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_flatten.mlir +++ b/mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_flatten.mlir @@ -1,16 +1,30 @@ // DEFINE: %{option} = enable-runtime-library=true -// DEFINE: %{command} = mlir-opt %s --sparse-compiler=%{option} | \ -// DEFINE: TENSOR0="%mlir_src_dir/test/Integration/data/test.tns" \ +// DEFINE: %{sparse-vec-ops} = +// DEFINE: %{compile} = mlir-opt %s --sparse-compiler="%{option} %{sparse-vec-ops}" +// 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: FileCheck %s // -// RUN: %{command} +// RUN: %{compile} | %{run} // // Do the same run, but now with direct IR generation. // REDEFINE: %{option} = enable-runtime-library=false -// RUN: %{command} +// RUN: %{compile} | %{run} + +// +// If SVE is available, test VLA vectorization. +// +// REDEFINE: %{sparse-vec-ops} = -sparse-vectorization="vl=4 enable-vla-vectorization=%ENABLE_VLA" +// REDEFINE: %{sparse-vec-ops} = vl=4 enable-arm-sve=true +// REDEFINE: %{run} = TENSOR0="%mlir_src_dir/test/Integration/data/test.tns" \ +// REDEFINE: lli \ +// REDEFINE: --entry-function=entry_lli \ +// 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: FileCheck %s +// RUN: %{compile} | mlir-translate -mlir-to-llvmir | %{run} !Filename = !llvm.ptr @@ -97,4 +111,13 @@ return } + + // Dummy wrapper required by lli, which does not support void functions (i.e. + // it fails if non-zero code is returned) + func.func @entry_lli() -> i32 { + call @entry() : () -> () + + %c0 = arith.constant 0 : i32 + return %c0 : i32 + } } diff --git a/mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_index_dense.mlir b/mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_index_dense.mlir --- a/mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_index_dense.mlir +++ b/mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_index_dense.mlir @@ -1,15 +1,27 @@ // DEFINE: %{option} = enable-runtime-library=true -// DEFINE: %{command} = mlir-opt %s --sparse-compiler=%{option} | \ -// DEFINE: mlir-cpu-runner \ +// DEFINE: %{sparse-vec-ops} = +// DEFINE: %{compile} = mlir-opt %s --sparse-compiler="%{option} %{sparse-vec-ops}" +// DEFINE: %{run} = mlir-cpu-runner \ // DEFINE: -e entry -entry-point-result=void \ // DEFINE: -shared-libs=%mlir_lib_dir/libmlir_c_runner_utils%shlibext | \ // DEFINE: FileCheck %s // -// RUN: %{command} +// RUN: %{compile} | %{run} // // Do the same run, but now with direct IR generation. // REDEFINE: %{option} = enable-runtime-library=false -// RUN: %{command} +// RUN: %{compile} | %{run} + +// +// If SVE is available, test VLA vectorization. +// +// REDEFINE: %{sparse-vec-ops} = vl=4 enable-arm-sve=true +// REDEFINE: %{run} = lli \ +// REDEFINE: --entry-function=entry_lli \ +// REDEFINE: %VLA_ARCH_ATTR_OPTIONS \ +// REDEFINE: --dlopen=%mlir_native_utils_lib_dir/libmlir_c_runner_utils%shlibext | \ +// REDEFINE: FileCheck %s +// RUN: %{compile} | mlir-translate -mlir-to-llvmir | %{run} #SparseVector = #sparse_tensor.encoding<{ dimLevelType = ["compressed"] @@ -192,4 +204,13 @@ return } + + // Dummy wrapper required by lli, which does not support void functions (i.e. + // it fails if non-zero code is returned) + func.func @entry_lli() -> i32 { + call @entry() : () -> () + + %c0 = arith.constant 0 : i32 + return %c0 : i32 + } } diff --git a/mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_matvec.mlir b/mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_matvec.mlir --- a/mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_matvec.mlir +++ b/mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_matvec.mlir @@ -1,24 +1,37 @@ // DEFINE: %{option} = enable-runtime-library=true -// DEFINE: %{command} = mlir-opt %s --sparse-compiler=%{option} | \ -// DEFINE: TENSOR0="%mlir_src_dir/test/Integration/data/wide.mtx" \ +// DEFINE: %{sparse-vec-ops} = +// DEFINE: %{compile} = mlir-opt %s --sparse-compiler="%{option} %{sparse-vec-ops}" +// 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: FileCheck %s -// -// RUN: %{command} +// RUN: %{compile} | %{run} // // Do the same run, but now with direct IR generation. // REDEFINE: %{option} = enable-runtime-library=false -// RUN: %{command} +// RUN: %{compile} | %{run} // // Do the same run, but now with parallelization strategy. -// REDEFINE: %{option} = "enable-runtime-library=true parallelization-strategy=any-storage-any-loop" -// RUN: %{command} +// REDEFINE: %{option} = enable-runtime-library=true parallelization-strategy=any-storage-any-loop +// RUN: %{compile} | %{run} // // Do the same run, but now with direct IR generation and parallelization strategy. -// REDEFINE: %{option} = "enable-runtime-library=false parallelization-strategy=any-storage-any-loop" -// RUN: %{command} +// REDEFINE: %{option} = enable-runtime-library=false parallelization-strategy=any-storage-any-loop +// RUN: %{compile} | %{run} + +// +// If SVE is available, test VLA vectorization. +// +// REDEFINE: %{option} = enable-runtime-library=true +// REDEFINE: %{sparse-vec-ops} = vl=4 enable-arm-sve=%ENABLE_VLA +// REDEFINE: %{run} = TENSOR0="%mlir_src_dir/test/Integration/data/wide.mtx" \ +// REDEFINE: lli \ +// REDEFINE: --entry-function=entry_lli \ +// REDEFINE: %VLA_ARCH_ATTR_OPTIONS \ +// REDEFINE: --dlopen=%mlir_native_utils_lib_dir/libmlir_c_runner_utils%shlibext | \ +// REDEFINE: FileCheck %s +// RUN: %{compile} | mlir-translate -mlir-to-llvmir | %{run} !Filename = !llvm.ptr @@ -108,4 +121,13 @@ return } + + // Dummy wrapper required by lli, which does not support void functions (i.e. + // it fails if non-zero code is returned) + func.func @entry_lli() -> i32 { + call @entry() : () -> () + + %c0 = arith.constant 0 : i32 + return %c0 : i32 + } } diff --git a/mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_mttkrp.mlir b/mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_mttkrp.mlir --- a/mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_mttkrp.mlir +++ b/mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_mttkrp.mlir @@ -1,16 +1,29 @@ // DEFINE: %{option} = enable-runtime-library=true -// DEFINE: %{command} = mlir-opt %s --sparse-compiler=%{option} | \ -// DEFINE: TENSOR0="%mlir_src_dir/test/Integration/data/mttkrp_b.tns" \ +// DEFINE: %{sparse-vec-ops} = +// DEFINE: %{compile} = mlir-opt %s --sparse-compiler="%{option} %{sparse-vec-ops}" +// 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: FileCheck %s // -// RUN: %{command} +// RUN: %{compile} | %{run} // // Do the same run, but now with direct IR generation. // REDEFINE: %{option} = enable-runtime-library=false -// RUN: %{command} +// RUN: %{compile} | %{run} + +// +// If SVE is available, test VLA vectorization. +// +// REDEFINE: %{sparse-vec-ops} = vl=4 enable-arm-sve=%ENABLE_VLA +// REDEFINE: %{run} = TENSOR0="%mlir_src_dir/test/Integration/data/mttkrp_b.tns" \ +// REDEFINE: lli \ +// REDEFINE: --entry-function=entry_lli \ +// 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: FileCheck %s +// RUN: %{compile} | mlir-translate -mlir-to-llvmir | %{run} !Filename = !llvm.ptr @@ -125,4 +138,13 @@ return } + + // Dummy wrapper required by lli, which does not support void functions (i.e. + // it fails if non-zero code is returned) + func.func @entry_lli() -> i32 { + call @entry() : () -> () + + %c0 = arith.constant 0 : i32 + return %c0 : i32 + } } diff --git a/mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_out_simple.mlir b/mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_out_simple.mlir --- a/mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_out_simple.mlir +++ b/mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_out_simple.mlir @@ -1,16 +1,30 @@ // DEFINE: %{option} = enable-runtime-library=true -// DEFINE: %{command} = mlir-opt %s --sparse-compiler=%{option} | \ -// DEFINE: TENSOR0="%mlir_src_dir/test/Integration/data/test.mtx" \ +// DEFINE: %{sparse-vec-ops} = +// DEFINE: %{compile} = mlir-opt %s --sparse-compiler="%{option} %{sparse-vec-ops}" +// 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: FileCheck %s // -// RUN: %{command} +// RUN: %{compile} | %{run} // // Do the same run, but now with direct IR generation. // REDEFINE: %{option} = enable-runtime-library=false -// RUN: %{command} +// RUN: %{compile} | %{run} + +// +// If SVE is available, test VLA vectorization. +// +// REDEFINE: %{sparse-vec-ops} = -sparse-vectorization="vl=4 enable-vla-vectorization=%ENABLE_VLA" +// REDEFINE: %{sparse-vec-ops} = vl=4 enable-arm-sve=%ENABLE_VLA +// REDEFINE: %{run} = TENSOR0="%mlir_src_dir/test/Integration/data/test.mtx" \ +// REDEFINE: lli \ +// REDEFINE: --entry-function=entry_lli \ +// REDEFINE: %VLA_ARCH_ATTR_OPTIONS \ +// REDEFINE: --dlopen=%mlir_native_utils_lib_dir/libmlir_c_runner_utils%shlibext | \ +// REDEFINE: FileCheck %s +// RUN: %{compile} | mlir-translate -mlir-to-llvmir | %{run} !Filename = !llvm.ptr @@ -79,4 +93,13 @@ return } + + // Dummy wrapper required by lli, which does not support void functions (i.e. + // it fails if non-zero code is returned) + func.func @entry_lli() -> i32 { + call @entry() : () -> () + + %c0 = arith.constant 0 : i32 + return %c0 : i32 + } } diff --git a/mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_quantized_matmul.mlir b/mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_quantized_matmul.mlir --- a/mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_quantized_matmul.mlir +++ b/mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_quantized_matmul.mlir @@ -1,15 +1,27 @@ // DEFINE: %{option} = enable-runtime-library=true -// DEFINE: %{command} = mlir-opt %s --sparse-compiler=%{option} | \ -// DEFINE: mlir-cpu-runner \ +// DEFINE: %{sparse-vec-ops} = +// DEFINE: %{compile} = mlir-opt %s --sparse-compiler="%{option} %{sparse-vec-ops}" +// DEFINE: %{run} = mlir-cpu-runner \ // DEFINE: -e entry -entry-point-result=void \ // DEFINE: -shared-libs=%mlir_lib_dir/libmlir_c_runner_utils%shlibext | \ // DEFINE: FileCheck %s // -// RUN: %{command} +// RUN: %{compile} | %{run} // // Do the same run, but now with direct IR generation. // REDEFINE: %{option} = enable-runtime-library=false -// RUN: %{command} +// RUN: %{compile} | %{run} + +// +// If SVE is available, test VLA vectorization. +// +// REDEFINE: %{sparse-vec-ops} = vl=4 enable-arm-sve=true +// REDEFINE: %{run} = lli \ +// REDEFINE: --entry-function=entry_lli \ +// REDEFINE: %VLA_ARCH_ATTR_OPTIONS \ +// REDEFINE: --dlopen=%mlir_native_utils_lib_dir/libmlir_c_runner_utils%shlibext | \ +// REDEFINE: FileCheck %s +// RUN: %{compile} | mlir-translate -mlir-to-llvmir | %{run} #DCSR = #sparse_tensor.encoding<{ dimLevelType = [ "compressed", "compressed" ] }> @@ -75,4 +87,13 @@ return } + + // Dummy wrapper required by lli, which does not support void functions (i.e. + // it fails if non-zero code is returned) + func.func @entry_lli() -> i32 { + call @entry() : () -> () + + %c0 = arith.constant 0 : i32 + return %c0 : i32 + } } diff --git a/mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_sampled_matmul.mlir b/mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_sampled_matmul.mlir --- a/mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_sampled_matmul.mlir +++ b/mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_sampled_matmul.mlir @@ -1,16 +1,29 @@ // DEFINE: %{option} = enable-runtime-library=true -// DEFINE: %{command} = mlir-opt %s --sparse-compiler=%{option} | \ -// DEFINE: TENSOR0="%mlir_src_dir/test/Integration/data/test.mtx" \ +// DEFINE: %{sparse-vec-ops} = +// DEFINE: %{compile} = mlir-opt %s --sparse-compiler="%{option} %{sparse-vec-ops}" +// 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: FileCheck %s // -// RUN: %{command} +// RUN: %{compile} | %{run} // // Do the same run, but now with direct IR generation. // REDEFINE: %{option} = enable-runtime-library=false -// RUN: %{command} +// RUN: %{compile} | %{run} + +// +// If SVE is available, test VLA vectorization. +// +// REDEFINE: %{sparse-vec-ops} = vl=4 enable-arm-sve=%ENABLE_VLA +// REDEFINE: %{run} = TENSOR0="%mlir_src_dir/test/Integration/data/test.mtx" \ +// REDEFINE: lli \ +// REDEFINE: --entry-function=entry_lli \ +// REDEFINE: %VLA_ARCH_ATTR_OPTIONS \ +// REDEFINE: --dlopen=%mlir_native_utils_lib_dir/libmlir_c_runner_utils%shlibext | \ +// REDEFINE: FileCheck %s +// RUN: %{compile} | mlir-translate -mlir-to-llvmir | %{run} !Filename = !llvm.ptr @@ -117,4 +130,13 @@ return } + + // Dummy wrapper required by lli, which does not support void functions (i.e. + // it fails if non-zero code is returned) + func.func @entry_lli() -> i32 { + call @entry() : () -> () + + %c0 = arith.constant 0 : i32 + return %c0 : i32 + } } diff --git a/mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_sampled_mm_fusion.mlir b/mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_sampled_mm_fusion.mlir old mode 100755 new mode 100644 --- a/mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_sampled_mm_fusion.mlir +++ b/mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_sampled_mm_fusion.mlir @@ -1,15 +1,27 @@ // DEFINE: %{option} = enable-runtime-library=true -// DEFINE: %{command} = mlir-opt %s --sparse-compiler=%{option} | \ -// DEFINE: mlir-cpu-runner \ +// DEFINE: %{sparse-vec-ops} = +// DEFINE: %{compile} = mlir-opt %s --sparse-compiler="%{option} %{sparse-vec-ops}" +// DEFINE: %{run} = mlir-cpu-runner \ // DEFINE: -e entry -entry-point-result=void \ // DEFINE: -shared-libs=%mlir_lib_dir/libmlir_c_runner_utils%shlibext | \ // DEFINE: FileCheck %s // -// RUN: %{command} +// RUN: %{compile} | %{run} // // Do the same run, but now with direct IR generation. -// REDEFINE: %{option} = "enable-runtime-library=false enable-buffer-initialization=true" -// RUN: %{command} +// REDEFINE: %{option} = enable-runtime-library=false +// RUN: %{compile} | %{run} + +// +// If SVE is available, test VLA vectorization. +// +// REDEFINE: %{sparse-vec-ops} = vl=4 enable-arm-sve=true +// REDEFINE: %{run} = lli \ +// REDEFINE: --entry-function=entry_lli \ +// REDEFINE: %VLA_ARCH_ATTR_OPTIONS \ +// REDEFINE: --dlopen=%mlir_native_utils_lib_dir/libmlir_c_runner_utils%shlibext | \ +// REDEFINE: FileCheck %s +// RUN: %{compile} | mlir-translate -mlir-to-llvmir | %{run} #SM = #sparse_tensor.encoding<{ dimLevelType = [ "compressed", "compressed" ] }> @@ -213,4 +225,13 @@ return } + + // Dummy wrapper required by lli, which does not support void functions (i.e. + // it fails if non-zero code is returned) + func.func @entry_lli() -> i32 { + call @entry() : () -> () + + %c0 = arith.constant 0 : i32 + return %c0 : i32 + } } diff --git a/mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_scale.mlir b/mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_scale.mlir --- a/mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_scale.mlir +++ b/mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_scale.mlir @@ -1,15 +1,27 @@ // DEFINE: %{option} = enable-runtime-library=true -// DEFINE: %{command} = mlir-opt %s --sparse-compiler=%{option} | \ -// DEFINE: mlir-cpu-runner \ +// DEFINE: %{sparse-vec-ops} = +// DEFINE: %{compile} = mlir-opt %s --sparse-compiler="%{option} %{sparse-vec-ops}" +// DEFINE: %{run} = mlir-cpu-runner \ // DEFINE: -e entry -entry-point-result=void \ // DEFINE: -shared-libs=%mlir_lib_dir/libmlir_c_runner_utils%shlibext | \ // DEFINE: FileCheck %s // -// RUN: %{command} +// RUN: %{compile} | %{run} // // Do the same run, but now with direct IR generation. // REDEFINE: %{option} = enable-runtime-library=false -// RUN: %{command} +// RUN: %{compile} | %{run} + +// +// If SVE is available, test VLA vectorization. +// +// REDEFINE: %{sparse-vec-ops} = vl=4 enable-arm-sve=true +// REDEFINE: %{run} = lli \ +// REDEFINE: --entry-function=entry_lli \ +// REDEFINE: %VLA_ARCH_ATTR_OPTIONS \ +// REDEFINE: --dlopen=%mlir_native_utils_lib_dir/libmlir_c_runner_utils%shlibext | \ +// REDEFINE: FileCheck %s +// RUN: %{compile} | mlir-translate -mlir-to-llvmir | %{run} #CSR = #sparse_tensor.encoding<{ dimLevelType = [ "dense", "compressed" ] }> @@ -80,4 +92,13 @@ return } + + // Dummy wrapper required by lli, which does not support void functions (i.e. + // it fails if non-zero code is returned) + func.func @entry_lli() -> i32 { + call @entry() : () -> () + + %c0 = arith.constant 0 : i32 + return %c0 : i32 + } } diff --git a/mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_spmm.mlir b/mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_spmm.mlir --- a/mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_spmm.mlir +++ b/mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_spmm.mlir @@ -1,16 +1,29 @@ // DEFINE: %{option} = enable-runtime-library=true -// DEFINE: %{command} = mlir-opt %s --sparse-compiler=%{option} | \ -// DEFINE: TENSOR0="%mlir_src_dir/test/Integration/data/wide.mtx" \ +// DEFINE: %{sparse-vec-ops} = +// DEFINE: %{compile} = mlir-opt %s --sparse-compiler="%{option} %{sparse-vec-ops}" +// 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: FileCheck %s // -// RUN: %{command} +// RUN: %{compile} | %{run} // // Do the same run, but now with direct IR generation. // REDEFINE: %{option} = enable-runtime-library=false -// RUN: %{command} +// RUN: %{compile} | %{run} + +// +// If SVE is available, test VLA vectorization. +// +// REDEFINE: %{sparse-vec-ops} = vl=4 enable-arm-sve=%ENABLE_VLA +// REDEFINE: %{run} = TENSOR0="%mlir_src_dir/test/Integration/data/wide.mtx" \ +// REDEFINE: lli \ +// REDEFINE: --entry-function=entry_lli \ +// REDEFINE: %VLA_ARCH_ATTR_OPTIONS \ +// REDEFINE: --dlopen=%mlir_native_utils_lib_dir/libmlir_c_runner_utils%shlibext | \ +// REDEFINE: FileCheck %s +// RUN: %{compile} | mlir-translate -mlir-to-llvmir | %{run} !Filename = !llvm.ptr @@ -100,4 +113,13 @@ return } + + // Dummy wrapper required by lli, which does not support void functions (i.e. + // it fails if non-zero code is returned) + func.func @entry_lli() -> i32 { + call @entry() : () -> () + + %c0 = arith.constant 0 : i32 + return %c0 : i32 + } } diff --git a/mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_sum.mlir b/mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_sum.mlir --- a/mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_sum.mlir +++ b/mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_sum.mlir @@ -1,16 +1,29 @@ // DEFINE: %{option} = enable-runtime-library=true -// DEFINE: %{command} = mlir-opt %s --sparse-compiler=%{option} | \ -// DEFINE: TENSOR0="%mlir_src_dir/test/Integration/data/test_symmetric.mtx" \ +// DEFINE: %{sparse-vec-ops} = +// DEFINE: %{compile} = mlir-opt %s --sparse-compiler="%{option} %{sparse-vec-ops}" +// 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: FileCheck %s // -// RUN: %{command} +// RUN: %{compile} | %{run} // // Do the same run, but now with direct IR generation. // REDEFINE: %{option} = enable-runtime-library=false -// RUN: %{command} +// RUN: %{compile} | %{run} + +// +// If SVE is available, test VLA vectorization. +// +// REDEFINE: %{sparse-vec-ops} = vl=4 enable-arm-sve=%ENABLE_VLA +// REDEFINE: %{run} = TENSOR0="%mlir_src_dir/test/Integration/data/test_symmetric.mtx" \ +// REDEFINE: lli \ +// REDEFINE: --entry-function=entry_lli \ +// REDEFINE: %VLA_ARCH_ATTR_OPTIONS \ +// REDEFINE: --dlopen=%mlir_native_utils_lib_dir/libmlir_c_runner_utils%shlibext | \ +// REDEFINE: FileCheck %s +// RUN: %{compile} | mlir-translate -mlir-to-llvmir | %{run} !Filename = !llvm.ptr @@ -81,4 +94,13 @@ return } + + // Dummy wrapper required by lli, which does not support void functions (i.e. + // it fails if non-zero code is returned) + func.func @entry_lli() -> i32 { + call @entry() : () -> () + + %c0 = arith.constant 0 : i32 + return %c0 : i32 + } } diff --git a/mlir/test/Integration/Dialect/Vector/CPU/ArmSVE/test-sve.mlir b/mlir/test/Integration/Dialect/Vector/CPU/ArmSVE/test-sve.mlir --- a/mlir/test/Integration/Dialect/Vector/CPU/ArmSVE/test-sve.mlir +++ b/mlir/test/Integration/Dialect/Vector/CPU/ArmSVE/test-sve.mlir @@ -1,6 +1,6 @@ // RUN: mlir-opt %s -lower-affine -convert-scf-to-cf -convert-vector-to-llvm="enable-arm-sve" -convert-memref-to-llvm -convert-func-to-llvm -convert-arith-to-llvm -canonicalize | \ // RUN: mlir-translate -mlir-to-llvmir | \ -// RUN: %lli --entry-function=entry --march=aarch64 --mattr="+sve" --dlopen=%mlir_native_utils_lib_dir/libmlir_c_runner_utils%shlibext | \ +// RUN: lli --entry-function=entry --march=aarch64 --mattr="+sve" --dlopen=%mlir_native_utils_lib_dir/libmlir_c_runner_utils%shlibext | \ // RUN: FileCheck %s // Note: To run this test, your CPU must support SVE diff --git a/mlir/test/lit.cfg.py b/mlir/test/lit.cfg.py --- a/mlir/test/lit.cfg.py +++ b/mlir/test/lit.cfg.py @@ -69,6 +69,7 @@ 'mlir-reduce', 'mlir-pdll', 'not', + 'lli', ] if config.enable_spirv_cpu_runner: