Skip to content

Commit dce7a7c

Browse files
TimAtGoogleTimAtGoogle
authored
Changed all code and comments that used the phrase "sparse compiler" to instead use "sparsifier" (#71875)
The changes in this p.r. mostly center around the tests that use the flag sparse_compiler (also: sparse-compiler).
1 parent 0901f91 commit dce7a7c

File tree

112 files changed

+595
-590
lines changed

Some content is hidden

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

112 files changed

+595
-590
lines changed

‎mlir/benchmark/python/common.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ def setup_passes(mlir_module):
1515
"parallelization-strategy=none"
1616
" vectorization-strategy=none vl=1 enable-simd-index32=False"
1717
)
18-
pipeline = f"sparse-compiler{{{opt}}}"
18+
pipeline = f"sparsifier{{{opt}}}"
1919
PassManager.parse(pipeline).run(mlir_module)
2020

2121

‎mlir/include/mlir/Dialect/SparseTensor/IR/SparseTensorType.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ namespace sparse_tensor {
2323
///
2424
/// (1) To provide a uniform API for querying aspects of sparse-tensor
2525
/// types; in particular, to make the "dimension" vs "level" distinction
26-
/// overt (i.e., explicit everywhere). Thus, throughout the sparse-compiler
26+
/// overt (i.e., explicit everywhere). Thus, throughout the sparsifier
2727
/// this class should be preferred over using `RankedTensorType` or
2828
/// `ShapedType` directly, since the methods of the latter do not make
2929
/// the "dimension" vs "level" distinction overt.
@@ -34,7 +34,7 @@ namespace sparse_tensor {
3434
/// That is, we want to manipulate dense-tensor types using the same API
3535
/// that we use for manipulating sparse-tensor types; both to keep the
3636
/// "dimension" vs "level" distinction overt, and to avoid needing to
37-
/// handle certain cases specially in the sparse-compiler.
37+
/// handle certain cases specially in the sparsifier.
3838
///
3939
/// (3) To provide uniform handling of "defaults". In particular
4040
/// this means that dense-tensors should always return the same answers

‎mlir/include/mlir/Dialect/SparseTensor/Pipelines/Passes.h

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -23,12 +23,11 @@ using namespace llvm::cl;
2323
namespace mlir {
2424
namespace sparse_tensor {
2525

26-
/// Options for the "sparse-compiler" pipeline. So far this only contains
26+
/// Options for the "sparsifier" pipeline. So far this only contains
2727
/// a subset of the options that can be set for the underlying passes,
2828
/// because it must be manually kept in sync with the tablegen files
2929
/// for those passes.
30-
struct SparseCompilerOptions
31-
: public PassPipelineOptions<SparseCompilerOptions> {
30+
struct SparsifierOptions : public PassPipelineOptions<SparsifierOptions> {
3231
// These options must be kept in sync with `SparsificationBase`.
3332
// TODO(57514): These options are duplicated in Passes.td.
3433
PassOptions::Option<mlir::SparseParallelizationStrategy> parallelization{
@@ -164,15 +163,14 @@ struct SparseCompilerOptions
164163
// Building and Registering.
165164
//===----------------------------------------------------------------------===//
166165

167-
/// Adds the "sparse-compiler" pipeline to the `OpPassManager`. This
166+
/// Adds the "sparsifier" pipeline to the `OpPassManager`. This
168167
/// is the standard pipeline for taking sparsity-agnostic IR using
169168
/// the sparse-tensor type and lowering it to LLVM IR with concrete
170169
/// representations and algorithms for sparse tensors.
171-
void buildSparseCompiler(OpPassManager &pm,
172-
const SparseCompilerOptions &options);
170+
void buildSparsifier(OpPassManager &pm, const SparsifierOptions &options);
173171

174172
/// Registers all pipelines for the `sparse_tensor` dialect. At present,
175-
/// this includes only "sparse-compiler".
173+
/// this includes only "sparsifier".
176174
void registerSparseTensorPipelines();
177175

178176
} // namespace sparse_tensor

‎mlir/lib/Dialect/SparseTensor/Pipelines/SparseTensorPipelines.cpp

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,10 @@
2929
// Pipeline implementation.
3030
//===----------------------------------------------------------------------===//
3131

32-
void mlir::sparse_tensor::buildSparseCompiler(
33-
OpPassManager &pm, const SparseCompilerOptions &options) {
32+
void mlir::sparse_tensor::buildSparsifier(OpPassManager &pm,
33+
const SparsifierOptions &options) {
3434
// Rewrite named linalg ops into generic ops.
35+
3536
pm.addNestedPass<func::FuncOp>(createLinalgGeneralizationPass());
3637

3738
// Sparsification and bufferization mini-pipeline.
@@ -108,10 +109,10 @@ void mlir::sparse_tensor::buildSparseCompiler(
108109
//===----------------------------------------------------------------------===//
109110

110111
void mlir::sparse_tensor::registerSparseTensorPipelines() {
111-
PassPipelineRegistration<SparseCompilerOptions>(
112-
"sparse-compiler",
112+
PassPipelineRegistration<SparsifierOptions>(
113+
"sparsifier",
113114
"The standard pipeline for taking sparsity-agnostic IR using the"
114115
" sparse-tensor type, and lowering it to LLVM IR with concrete"
115116
" representations and algorithms for sparse tensors.",
116-
buildSparseCompiler);
117+
buildSparsifier);
117118
}

‎mlir/test/Dialect/SparseTensor/sparse_vector_concat.mlir

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// RUN: mlir-opt %s --sparse-compiler="enable-runtime-library=false vl=2 reassociate-fp-reductions=true enable-index-optimizations=true"
1+
// RUN: mlir-opt %s --sparsifier="enable-runtime-library=false vl=2 reassociate-fp-reductions=true enable-index-optimizations=true"
22

33
#MAT_D_C = #sparse_tensor.encoding<{
44
map = (d0, d1) -> (d0 : dense, d1 : compressed)

‎mlir/test/Dialect/SparseTensor/sparse_vector_mv.mlir

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// RUN: mlir-opt %s -sparse-compiler="vl=8" | FileCheck %s
1+
// RUN: mlir-opt %s -sparsifier="vl=8" | FileCheck %s
22

33
#Dense = #sparse_tensor.encoding<{
44
map = (d0, d1) -> (d0 : dense, d1 : dense)

‎mlir/test/Integration/Dialect/SparseTensor/CPU/block.mlir

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@
55
// config could be moved to lit.local.cfg. However, there are downstream users that
66
// do not use these LIT config files. Hence why this is kept inline.
77
//
8-
// DEFINE: %{sparse_compiler_opts} = enable-runtime-library=true
9-
// DEFINE: %{sparse_compiler_opts_sve} = enable-arm-sve=true %{sparse_compiler_opts}
10-
// DEFINE: %{compile} = mlir-opt %s --sparse-compiler="%{sparse_compiler_opts}"
11-
// DEFINE: %{compile_sve} = mlir-opt %s --sparse-compiler="%{sparse_compiler_opts_sve}"
8+
// DEFINE: %{sparsifier_opts} = enable-runtime-library=true
9+
// DEFINE: %{sparsifier_opts_sve} = enable-arm-sve=true %{sparsifier_opts}
10+
// DEFINE: %{compile} = mlir-opt %s --sparsifier="%{sparsifier_opts}"
11+
// DEFINE: %{compile_sve} = mlir-opt %s --sparsifier="%{sparsifier_opts_sve}"
1212
// DEFINE: %{run_libs} = -shared-libs=%mlir_c_runner_utils,%mlir_runner_utils
1313
// DEFINE: %{run_opts} = -e entry -entry-point-result=void
1414
// DEFINE: %{run} = mlir-cpu-runner %{run_opts} %{run_libs}
@@ -22,7 +22,7 @@
2222
//
2323
// TODO: enable!
2424
// Do the same run, but now with direct IR generation.
25-
// REDEFINE: %{sparse_compiler_opts} = enable-runtime-library=false
25+
// REDEFINE: %{sparsifier_opts} = enable-runtime-library=false
2626
// R_UN: %{compile} | env %{env} %{run} | FileCheck %s
2727

2828
!Filename = !llvm.ptr

‎mlir/test/Integration/Dialect/SparseTensor/CPU/concatenate_dim_0.mlir

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@
55
// config could be moved to lit.local.cfg. However, there are downstream users that
66
// do not use these LIT config files. Hence why this is kept inline.
77
//
8-
// DEFINE: %{sparse_compiler_opts} = enable-runtime-library=true
9-
// DEFINE: %{sparse_compiler_opts_sve} = enable-arm-sve=true %{sparse_compiler_opts}
10-
// DEFINE: %{compile} = mlir-opt %s --sparse-compiler="%{sparse_compiler_opts}"
11-
// DEFINE: %{compile_sve} = mlir-opt %s --sparse-compiler="%{sparse_compiler_opts_sve}"
8+
// DEFINE: %{sparsifier_opts} = enable-runtime-library=true
9+
// DEFINE: %{sparsifier_opts_sve} = enable-arm-sve=true %{sparsifier_opts}
10+
// DEFINE: %{compile} = mlir-opt %s --sparsifier="%{sparsifier_opts}"
11+
// DEFINE: %{compile_sve} = mlir-opt %s --sparsifier="%{sparsifier_opts_sve}"
1212
// DEFINE: %{run_libs} = -shared-libs=%mlir_c_runner_utils,%mlir_runner_utils
1313
// DEFINE: %{run_opts} = -e entry -entry-point-result=void
1414
// DEFINE: %{run} = mlir-cpu-runner %{run_opts} %{run_libs}
@@ -20,11 +20,11 @@
2020
// RUN: %{compile} | %{run} | FileCheck %s
2121
//
2222
// Do the same run, but now with direct IR generation.
23-
// REDEFINE: %{sparse_compiler_opts} = enable-runtime-library=false enable-buffer-initialization=true
23+
// REDEFINE: %{sparsifier_opts} = enable-runtime-library=false enable-buffer-initialization=true
2424
// RUN: %{compile} | %{run} | FileCheck %s
2525
//
2626
// Do the same run, but now with direct IR generation and vectorization.
27-
// REDEFINE: %{sparse_compiler_opts} = enable-runtime-library=false enable-buffer-initialization=true vl=2 reassociate-fp-reductions=true enable-index-optimizations=true
27+
// REDEFINE: %{sparsifier_opts} = enable-runtime-library=false enable-buffer-initialization=true vl=2 reassociate-fp-reductions=true enable-index-optimizations=true
2828
// RUN: %{compile} | %{run} | FileCheck %s
2929
//
3030
// Do the same run, but now with direct IR generation and VLA vectorization.

‎mlir/test/Integration/Dialect/SparseTensor/CPU/concatenate_dim_0_permute.mlir

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@
55
// config could be moved to lit.local.cfg. However, there are downstream users that
66
// do not use these LIT config files. Hence why this is kept inline.
77
//
8-
// DEFINE: %{sparse_compiler_opts} = enable-runtime-library=true
9-
// DEFINE: %{sparse_compiler_opts_sve} = enable-arm-sve=true %{sparse_compiler_opts}
10-
// DEFINE: %{compile} = mlir-opt %s --sparse-compiler="%{sparse_compiler_opts}"
11-
// DEFINE: %{compile_sve} = mlir-opt %s --sparse-compiler="%{sparse_compiler_opts_sve}"
8+
// DEFINE: %{sparsifier_opts} = enable-runtime-library=true
9+
// DEFINE: %{sparsifier_opts_sve} = enable-arm-sve=true %{sparsifier_opts}
10+
// DEFINE: %{compile} = mlir-opt %s --sparsifier="%{sparsifier_opts}"
11+
// DEFINE: %{compile_sve} = mlir-opt %s --sparsifier="%{sparsifier_opts_sve}"
1212
// DEFINE: %{run_libs} = -shared-libs=%mlir_c_runner_utils,%mlir_runner_utils
1313
// DEFINE: %{run_opts} = -e entry -entry-point-result=void
1414
// DEFINE: %{run} = mlir-cpu-runner %{run_opts} %{run_libs}
@@ -20,11 +20,11 @@
2020
// RUN: %{compile} | %{run} | FileCheck %s
2121
//
2222
// Do the same run, but now with direct IR generation.
23-
// REDEFINE: %{sparse_compiler_opts} = enable-runtime-library=false enable-buffer-initialization=true
23+
// REDEFINE: %{sparsifier_opts} = enable-runtime-library=false enable-buffer-initialization=true
2424
// RUN: %{compile} | %{run} | FileCheck %s
2525
//
2626
// Do the same run, but now with direct IR generation and vectorization.
27-
// REDEFINE: %{sparse_compiler_opts} = enable-runtime-library=false enable-buffer-initialization=true vl=2 reassociate-fp-reductions=true enable-index-optimizations=true
27+
// REDEFINE: %{sparsifier_opts} = enable-runtime-library=false enable-buffer-initialization=true vl=2 reassociate-fp-reductions=true enable-index-optimizations=true
2828
// RUN: %{compile} | %{run} | FileCheck %s
2929
//
3030
// Do the same run, but now with direct IR generation and VLA vectorization.

‎mlir/test/Integration/Dialect/SparseTensor/CPU/concatenate_dim_1.mlir

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@
55
// config could be moved to lit.local.cfg. However, there are downstream users that
66
// do not use these LIT config files. Hence why this is kept inline.
77
//
8-
// DEFINE: %{sparse_compiler_opts} = enable-runtime-library=true
9-
// DEFINE: %{sparse_compiler_opts_sve} = enable-arm-sve=true %{sparse_compiler_opts}
10-
// DEFINE: %{compile} = mlir-opt %s --sparse-compiler="%{sparse_compiler_opts}"
11-
// DEFINE: %{compile_sve} = mlir-opt %s --sparse-compiler="%{sparse_compiler_opts_sve}"
8+
// DEFINE: %{sparsifier_opts} = enable-runtime-library=true
9+
// DEFINE: %{sparsifier_opts_sve} = enable-arm-sve=true %{sparsifier_opts}
10+
// DEFINE: %{compile} = mlir-opt %s --sparsifier="%{sparsifier_opts}"
11+
// DEFINE: %{compile_sve} = mlir-opt %s --sparsifier="%{sparsifier_opts_sve}"
1212
// DEFINE: %{run_libs} = -shared-libs=%mlir_c_runner_utils,%mlir_runner_utils
1313
// DEFINE: %{run_opts} = -e entry -entry-point-result=void
1414
// DEFINE: %{run} = mlir-cpu-runner %{run_opts} %{run_libs}
@@ -20,11 +20,11 @@
2020
// RUN: %{compile} | %{run} | FileCheck %s
2121
//
2222
// Do the same run, but now with direct IR generation.
23-
// REDEFINE: %{sparse_compiler_opts} = enable-runtime-library=false enable-buffer-initialization=true
23+
// REDEFINE: %{sparsifier_opts} = enable-runtime-library=false enable-buffer-initialization=true
2424
// RUN: %{compile} | %{run} | FileCheck %s
2525
//
2626
// Do the same run, but now with direct IR generation and vectorization.
27-
// REDEFINE: %{sparse_compiler_opts} = enable-runtime-library=false enable-buffer-initialization=true vl=4 reassociate-fp-reductions=true enable-index-optimizations=true
27+
// REDEFINE: %{sparsifier_opts} = enable-runtime-library=false enable-buffer-initialization=true vl=4 reassociate-fp-reductions=true enable-index-optimizations=true
2828
// RUN: %{compile} | %{run} | FileCheck %s
2929

3030
#MAT_C_C = #sparse_tensor.encoding<{map = (d0, d1) -> (d0 : compressed, d1 : compressed)}>

‎mlir/test/Integration/Dialect/SparseTensor/CPU/concatenate_dim_1_permute.mlir

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@
55
// config could be moved to lit.local.cfg. However, there are downstream users that
66
// do not use these LIT config files. Hence why this is kept inline.
77
//
8-
// DEFINE: %{sparse_compiler_opts} = enable-runtime-library=true
9-
// DEFINE: %{sparse_compiler_opts_sve} = enable-arm-sve=true %{sparse_compiler_opts}
10-
// DEFINE: %{compile} = mlir-opt %s --sparse-compiler="%{sparse_compiler_opts}"
11-
// DEFINE: %{compile_sve} = mlir-opt %s --sparse-compiler="%{sparse_compiler_opts_sve}"
8+
// DEFINE: %{sparsifier_opts} = enable-runtime-library=true
9+
// DEFINE: %{sparsifier_opts_sve} = enable-arm-sve=true %{sparsifier_opts}
10+
// DEFINE: %{compile} = mlir-opt %s --sparsifier="%{sparsifier_opts}"
11+
// DEFINE: %{compile_sve} = mlir-opt %s --sparsifier="%{sparsifier_opts_sve}"
1212
// DEFINE: %{run_libs} = -shared-libs=%mlir_c_runner_utils,%mlir_runner_utils
1313
// DEFINE: %{run_opts} = -e entry -entry-point-result=void
1414
// DEFINE: %{run} = mlir-cpu-runner %{run_opts} %{run_libs}
@@ -20,11 +20,11 @@
2020
// RUN: %{compile} | %{run} | FileCheck %s
2121
//
2222
// Do the same run, but now with direct IR generation.
23-
// REDEFINE: %{sparse_compiler_opts} = enable-runtime-library=false enable-buffer-initialization=true
23+
// REDEFINE: %{sparsifier_opts} = enable-runtime-library=false enable-buffer-initialization=true
2424
// RUN: %{compile} | %{run} | FileCheck %s
2525
//
2626
// Do the same run, but now with direct IR generation and vectorization.
27-
// REDEFINE: %{sparse_compiler_opts} = enable-runtime-library=false enable-buffer-initialization=true vl=2 reassociate-fp-reductions=true enable-index-optimizations=true
27+
// REDEFINE: %{sparsifier_opts} = enable-runtime-library=false enable-buffer-initialization=true vl=2 reassociate-fp-reductions=true enable-index-optimizations=true
2828
// RUN: %{compile} | %{run} | FileCheck %s
2929
//
3030
// Do the same run, but now with direct IR generation and VLA vectorization.

‎mlir/test/Integration/Dialect/SparseTensor/CPU/dense_output.mlir

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@
55
// config could be moved to lit.local.cfg. However, there are downstream users that
66
// do not use these LIT config files. Hence why this is kept inline.
77
//
8-
// DEFINE: %{sparse_compiler_opts} = enable-runtime-library=true
9-
// DEFINE: %{sparse_compiler_opts_sve} = enable-arm-sve=true %{sparse_compiler_opts}
10-
// DEFINE: %{compile} = mlir-opt %s --sparse-compiler="%{sparse_compiler_opts}"
11-
// DEFINE: %{compile_sve} = mlir-opt %s --sparse-compiler="%{sparse_compiler_opts_sve}"
8+
// DEFINE: %{sparsifier_opts} = enable-runtime-library=true
9+
// DEFINE: %{sparsifier_opts_sve} = enable-arm-sve=true %{sparsifier_opts}
10+
// DEFINE: %{compile} = mlir-opt %s --sparsifier="%{sparsifier_opts}"
11+
// DEFINE: %{compile_sve} = mlir-opt %s --sparsifier="%{sparsifier_opts_sve}"
1212
// DEFINE: %{run_libs} = -shared-libs=%mlir_c_runner_utils,%mlir_runner_utils
1313
// DEFINE: %{run_opts} = -e entry -entry-point-result=void
1414
// DEFINE: %{run} = mlir-cpu-runner %{run_opts} %{run_libs}
@@ -21,11 +21,11 @@
2121
// RUN: %{compile} | env %{env} %{run} | FileCheck %s
2222
//
2323
// Do the same run, but now with direct IR generation.
24-
// REDEFINE: %{sparse_compiler_opts} = enable-runtime-library=false
24+
// REDEFINE: %{sparsifier_opts} = enable-runtime-library=false
2525
// RUN: %{compile} | env %{env} %{run} | FileCheck %s
2626
//
2727
// Do the same run, but now with direct IR generation and vectorization.
28-
// REDEFINE: %{sparse_compiler_opts} = enable-runtime-library=false vl=2 reassociate-fp-reductions=true enable-index-optimizations=true
28+
// REDEFINE: %{sparsifier_opts} = enable-runtime-library=false vl=2 reassociate-fp-reductions=true enable-index-optimizations=true
2929
// RUN: %{compile} | env %{env} %{run} | FileCheck %s
3030
//
3131
// Do the same run, but now with direct IR generation and VLA vectorization.

‎mlir/test/Integration/Dialect/SparseTensor/CPU/dense_output_bf16.mlir

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@
55
// config could be moved to lit.local.cfg. However, there are downstream users that
66
// do not use these LIT config files. Hence why this is kept inline.
77
//
8-
// DEFINE: %{sparse_compiler_opts} = enable-runtime-library=true
9-
// DEFINE: %{sparse_compiler_opts_sve} = enable-arm-sve=true %{sparse_compiler_opts}
10-
// DEFINE: %{compile} = mlir-opt %s --sparse-compiler="%{sparse_compiler_opts}"
11-
// DEFINE: %{compile_sve} = mlir-opt %s --sparse-compiler="%{sparse_compiler_opts_sve}"
8+
// DEFINE: %{sparsifier_opts} = enable-runtime-library=true
9+
// DEFINE: %{sparsifier_opts_sve} = enable-arm-sve=true %{sparsifier_opts}
10+
// DEFINE: %{compile} = mlir-opt %s --sparsifier="%{sparsifier_opts}"
11+
// DEFINE: %{compile_sve} = mlir-opt %s --sparsifier="%{sparsifier_opts_sve}"
1212
// DEFINE: %{run_libs} = -shared-libs=%mlir_c_runner_utils,%mlir_runner_utils
1313
// DEFINE: %{run_opts} = -e entry -entry-point-result=void
1414
// DEFINE: %{run} = mlir-cpu-runner %{run_opts} %{run_libs}
@@ -20,11 +20,11 @@
2020
// RUN: %{compile} | %{run} | FileCheck %s
2121
//
2222
// Do the same run, but now with direct IR generation.
23-
// REDEFINE: %{sparse_compiler_opts} = enable-runtime-library=false
23+
// REDEFINE: %{sparsifier_opts} = enable-runtime-library=false
2424
// RUN: %{compile} | %{run} | FileCheck %s
2525
//
2626
// Do the same run, but now with direct IR generation and vectorization.
27-
// REDEFINE: %{sparse_compiler_opts} = enable-runtime-library=false vl=2 reassociate-fp-reductions=true enable-index-optimizations=true
27+
// REDEFINE: %{sparsifier_opts} = enable-runtime-library=false vl=2 reassociate-fp-reductions=true enable-index-optimizations=true
2828
// RUN: %{compile} | %{run} | FileCheck %s
2929

3030
// UNSUPPORTED: target=aarch64{{.*}}

‎mlir/test/Integration/Dialect/SparseTensor/CPU/dense_output_f16.mlir

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@
55
// config could be moved to lit.local.cfg. However, there are downstream users that
66
// do not use these LIT config files. Hence why this is kept inline.
77
//
8-
// DEFINE: %{sparse_compiler_opts} = enable-runtime-library=true
9-
// DEFINE: %{sparse_compiler_opts_sve} = enable-arm-sve=true %{sparse_compiler_opts}
10-
// DEFINE: %{compile} = mlir-opt %s --sparse-compiler="%{sparse_compiler_opts}"
11-
// DEFINE: %{compile_sve} = mlir-opt %s --sparse-compiler="%{sparse_compiler_opts_sve}"
8+
// DEFINE: %{sparsifier_opts} = enable-runtime-library=true
9+
// DEFINE: %{sparsifier_opts_sve} = enable-arm-sve=true %{sparsifier_opts}
10+
// DEFINE: %{compile} = mlir-opt %s --sparsifier="%{sparsifier_opts}"
11+
// DEFINE: %{compile_sve} = mlir-opt %s --sparsifier="%{sparsifier_opts_sve}"
1212
// DEFINE: %{run_libs} = -shared-libs=%mlir_c_runner_utils,%mlir_runner_utils
1313
// DEFINE: %{run_opts} = -e entry -entry-point-result=void
1414
// DEFINE: %{run} = mlir-cpu-runner %{run_opts} %{run_libs}
@@ -20,11 +20,11 @@
2020
// RUN: %{compile} | %{run} | FileCheck %s
2121
//
2222
// Do the same run, but now with direct IR generation.
23-
// REDEFINE: %{sparse_compiler_opts} = enable-runtime-library=false
23+
// REDEFINE: %{sparsifier_opts} = enable-runtime-library=false
2424
// RUN: %{compile} | %{run} | FileCheck %s
2525
//
2626
// Do the same run, but now with direct IR generation and vectorization.
27-
// REDEFINE: %{sparse_compiler_opts} = enable-runtime-library=false vl=2 reassociate-fp-reductions=true enable-index-optimizations=true
27+
// REDEFINE: %{sparsifier_opts} = enable-runtime-library=false vl=2 reassociate-fp-reductions=true enable-index-optimizations=true
2828
// RUN: %{compile} | %{run} | FileCheck %s
2929
//
3030
// Do the same run, but now with direct IR generation and VLA vectorization.

0 commit comments

Comments
 (0)