CHANGES SINCE THE ORIGINAL VERSION ---------------------------------- The default test set-up was extracted from * SparseTensor/CPU/lit.local.cfg. and duplicated in all tests. This is to support downstream users that don't use these local LIT config files. SUMMARY OF CHANGES ------------------ This patch aims to reduce test duplication. This is a direct follow-up of: 1. https://reviews.llvm.org/D155403 (test duplication), and 2. https://reviews.llvm.org/D155405 (code re-use), All SVE/VLA tests are now enabled _conditionally_ and refactored to use `mlir-cpu-runner` rather than `lli`. The former helps with test duplication and the latter with code re-use. A few additional refactoring changes are included. 1. The reduce verbosity, long runtime library names like: %mlir_native_utils_lib_dir/libmlir_c_runner_utils%shlibext are replaced with: %mlir_c_runner_utils 2. In order to keep the code and the comments in sync, and to maintain consistency across the tests, the following: enable-runtime-library=true is swapped with (and vice-versa): enable-runtime-library=false Note that this change won't affect test coverage. Only few tests required such update. 3. A VLS vectorization `RUN` line is added in tests where there was a VLA/VLS `RUN` line, but no VLS `RUN` line (with a few exceptions of tests that only contained one `RUN` line to begin with). 4. A few test variables are renamed/added. Most notable example: * %{options}` --> %{sparse_compiler_opts} TEST RUNTIME IMPROVEMENT ------------------------ Tl;Dr This change improves test execution time by ~25%. At the moment, the following `llvm-lit` invocation takes ~7.30s on my AArch64 workstation (with SVE): llvm-lit <llvm-project>/mlir/test/Integration/Dialect/SparseTensor/CPU/ This timing doesn't change no matter what the value of the following CMake variable is (that should disable some tests): MLIR_RUN_ARM_SVE_TESTS With this patch, the execution time will indeed depend on the value of the above CMake variable: * with `MLIR_RUN_ARM_SVE_TESTS=true` the timing remains intact, * with `MLIR_RUN_ARM_SVE_TESTS=false` the timing drops to ~5.40s (~25% improvement). This is expected: * on average there are 4 `RUN` lines per test, * _without this change_ (and with `MLIR_RUN_ARM_SVE_TESTS=false`) the 4th `RUN` line would in most cases duplicate the 3rd `RUN` line, * _with this change) (and with `MLIR_RUN_ARM_SVE_TESTS=false`) the 4th `RUN` line becomes empty. PATCH SIZE ---------- While rather large and touching many files, most changes in this patch are rather mechanical. All test configurations have been preserved and only in a handful of cases new `RUN` lines added. Differential Revision: https://reviews.llvm.org/D156625
143 lines
5.9 KiB
MLIR
143 lines
5.9 KiB
MLIR
//--------------------------------------------------------------------------------------------------
|
|
// WHEN CREATING A NEW TEST, PLEASE JUST COPY & PASTE WITHOUT EDITS.
|
|
//
|
|
// Set-up that's shared across all tests in this directory. In principle, this
|
|
// config could be moved to lit.local.cfg. However, there are downstream users that
|
|
// do not use these LIT config files. Hence why this is kept inline.
|
|
//
|
|
// DEFINE: %{sparse_compiler_opts} = enable-runtime-library=true
|
|
// DEFINE: %{sparse_compiler_opts_sve} = enable-arm-sve=true %{sparse_compiler_opts}
|
|
// DEFINE: %{compile} = mlir-opt %s --sparse-compiler="%{sparse_compiler_opts}"
|
|
// DEFINE: %{compile_sve} = mlir-opt %s --sparse-compiler="%{sparse_compiler_opts_sve}"
|
|
// DEFINE: %{run_libs} = -shared-libs=%mlir_c_runner_utils,%mlir_runner_utils
|
|
// DEFINE: %{run_opts} = -e entry -entry-point-result=void
|
|
// DEFINE: %{run} = mlir-cpu-runner %{run_opts} %{run_libs}
|
|
// DEFINE: %{run_sve} = %mcr_aarch64_cmd --march=aarch64 --mattr="+sve" %{run_opts} %{run_libs}
|
|
//
|
|
// DEFINE: %{env} =
|
|
//--------------------------------------------------------------------------------------------------
|
|
|
|
// RUN: %{compile} | %{run} | FileCheck %s
|
|
//
|
|
// Do the same run, but now with direct IR generation.
|
|
// REDEFINE: %{sparse_compiler_opts} = enable-runtime-library=false enable-buffer-initialization=true
|
|
// RUN: %{compile} | %{run} | FileCheck %s
|
|
//
|
|
// Do the same run, but now with direct IR generation and vectorization.
|
|
// REDEFINE: %{sparse_compiler_opts} = enable-runtime-library=false vl=2 reassociate-fp-reductions=true enable-index-optimizations=true
|
|
// RUN: %{compile} | %{run} | FileCheck %s
|
|
//
|
|
// Do the same run, but now with direct IR generation and VLA vectorization.
|
|
// RUN: %if mlir_arm_sve_tests %{ %{compile_sve} | %{run_sve} | FileCheck %s %}
|
|
|
|
#SparseVector = #sparse_tensor.encoding<{ lvlTypes = [ "compressed" ] }>
|
|
|
|
#trait_op = {
|
|
indexing_maps = [
|
|
affine_map<(i) -> (i)>, // a
|
|
affine_map<(i) -> (i)> // x (out)
|
|
],
|
|
iterator_types = ["parallel"],
|
|
doc = "x(i) = OP a(i)"
|
|
}
|
|
|
|
module {
|
|
func.func @sparse_absf(%arg0: tensor<?xf64, #SparseVector>)
|
|
-> tensor<?xf64, #SparseVector> {
|
|
%c0 = arith.constant 0 : index
|
|
%d = tensor.dim %arg0, %c0 : tensor<?xf64, #SparseVector>
|
|
%xin = bufferization.alloc_tensor(%d) : tensor<?xf64, #SparseVector>
|
|
%0 = linalg.generic #trait_op
|
|
ins(%arg0: tensor<?xf64, #SparseVector>)
|
|
outs(%xin: tensor<?xf64, #SparseVector>) {
|
|
^bb0(%a: f64, %x: f64) :
|
|
%result = math.absf %a : f64
|
|
linalg.yield %result : f64
|
|
} -> tensor<?xf64, #SparseVector>
|
|
return %0 : tensor<?xf64, #SparseVector>
|
|
}
|
|
|
|
func.func @sparse_absi(%arg0: tensor<?xi32, #SparseVector>)
|
|
-> tensor<?xi32, #SparseVector> {
|
|
%c0 = arith.constant 0 : index
|
|
%d = tensor.dim %arg0, %c0 : tensor<?xi32, #SparseVector>
|
|
%xin = bufferization.alloc_tensor(%d) : tensor<?xi32, #SparseVector>
|
|
%0 = linalg.generic #trait_op
|
|
ins(%arg0: tensor<?xi32, #SparseVector>)
|
|
outs(%xin: tensor<?xi32, #SparseVector>) {
|
|
^bb0(%a: i32, %x: i32) :
|
|
%result = math.absi %a : i32
|
|
linalg.yield %result : i32
|
|
} -> tensor<?xi32, #SparseVector>
|
|
return %0 : tensor<?xi32, #SparseVector>
|
|
}
|
|
|
|
// Driver method to call and verify sign kernel.
|
|
func.func @entry() {
|
|
%c0 = arith.constant 0 : index
|
|
%df = arith.constant 99.99 : f64
|
|
%di = arith.constant 9999 : i32
|
|
|
|
%pnan = arith.constant 0x7FF0000001000000 : f64
|
|
%nnan = arith.constant 0xFFF0000001000000 : f64
|
|
%pinf = arith.constant 0x7FF0000000000000 : f64
|
|
%ninf = arith.constant 0xFFF0000000000000 : f64
|
|
|
|
// Setup sparse vectors.
|
|
%v1 = arith.constant sparse<
|
|
[ [0], [3], [5], [11], [13], [17], [18], [20], [21], [28], [29], [31] ],
|
|
[ -1.5, 1.5, -10.2, 11.3, 1.0, -1.0,
|
|
0x7FF0000001000000, // +NaN
|
|
0xFFF0000001000000, // -NaN
|
|
0x7FF0000000000000, // +Inf
|
|
0xFFF0000000000000, // -Inf
|
|
-0.0, // -Zero
|
|
0.0 // +Zero
|
|
]
|
|
> : tensor<32xf64>
|
|
%v2 = arith.constant sparse<
|
|
[ [0], [3], [5], [11], [13], [17], [18], [21], [31] ],
|
|
[ -2147483648, -2147483647, -1000, -1, 0,
|
|
1, 1000, 2147483646, 2147483647
|
|
]
|
|
> : tensor<32xi32>
|
|
%sv1 = sparse_tensor.convert %v1
|
|
: tensor<32xf64> to tensor<?xf64, #SparseVector>
|
|
%sv2 = sparse_tensor.convert %v2
|
|
: tensor<32xi32> to tensor<?xi32, #SparseVector>
|
|
|
|
// Call abs kernels.
|
|
%0 = call @sparse_absf(%sv1) : (tensor<?xf64, #SparseVector>)
|
|
-> tensor<?xf64, #SparseVector>
|
|
|
|
%1 = call @sparse_absi(%sv2) : (tensor<?xi32, #SparseVector>)
|
|
-> tensor<?xi32, #SparseVector>
|
|
|
|
//
|
|
// Verify the results.
|
|
//
|
|
// CHECK: 12
|
|
// CHECK-NEXT: ( 1.5, 1.5, 10.2, 11.3, 1, 1, nan, nan, inf, inf, 0, 0 )
|
|
// CHECK-NEXT: 9
|
|
// CHECK-NEXT: ( -2147483648, 2147483647, 1000, 1, 0, 1, 1000, 2147483646, 2147483647 )
|
|
//
|
|
%x = sparse_tensor.values %0 : tensor<?xf64, #SparseVector> to memref<?xf64>
|
|
%y = sparse_tensor.values %1 : tensor<?xi32, #SparseVector> to memref<?xi32>
|
|
%a = vector.transfer_read %x[%c0], %df: memref<?xf64>, vector<12xf64>
|
|
%b = vector.transfer_read %y[%c0], %di: memref<?xi32>, vector<9xi32>
|
|
%na = sparse_tensor.number_of_entries %0 : tensor<?xf64, #SparseVector>
|
|
%nb = sparse_tensor.number_of_entries %1 : tensor<?xi32, #SparseVector>
|
|
vector.print %na : index
|
|
vector.print %a : vector<12xf64>
|
|
vector.print %nb : index
|
|
vector.print %b : vector<9xi32>
|
|
|
|
// Release the resources.
|
|
bufferization.dealloc_tensor %sv1 : tensor<?xf64, #SparseVector>
|
|
bufferization.dealloc_tensor %sv2 : tensor<?xi32, #SparseVector>
|
|
bufferization.dealloc_tensor %0 : tensor<?xf64, #SparseVector>
|
|
bufferization.dealloc_tensor %1 : tensor<?xi32, #SparseVector>
|
|
return
|
|
}
|
|
}
|