Skip to content

Commit e2e429d

Browse files
yinying-lisa-liyinying-lisa-li
authored
[mlir][sparse] Migrate more tests to new syntax (#66309)
CSR: `lvlTypes = [ "dense", "compressed" ]` to `map = (d0, d1) -> (d0 : dense, d1 : compressed)` CSC: `lvlTypes = [ "dense", "compressed" ], dimToLvl = affine_map<(d0, d1) -> (d1, d0)>` to `map = (d0, d1) -> (d1 : dense, d0 : compressed)` This is an ongoing effort: #66146
1 parent 1db6b12 commit e2e429d

File tree

68 files changed

+99
-124
lines changed

Some content is hidden

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

68 files changed

+99
-124
lines changed

‎mlir/test/Dialect/Bufferization/ops.mlir

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
// RUN: mlir-opt %s --mlir-print-op-generic | mlir-opt | FileCheck %s
33

44
#CSR = #sparse_tensor.encoding<{
5-
lvlTypes = ["dense", "compressed"]
5+
map = (d0, d1) -> (d0 : dense, d1 : compressed)
66
}>
77

88
// CHECK-LABEL: func @test_clone

‎mlir/test/Dialect/Linalg/drop-unit-extent-dims.mlir

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -854,7 +854,7 @@ func.func @input_stays_same(%arg0 : memref<?x1x?xf32, strided<[?, 1, 1]>>, %arg1
854854
iterator_types = ["parallel", "reduction"]
855855
}
856856

857-
#CSR = #sparse_tensor.encoding<{ lvlTypes = ["dense", "compressed"] }>
857+
#CSR = #sparse_tensor.encoding<{ map = (d0, d1) -> (d0 : dense, d1 : compressed) }>
858858

859859
func.func @sparse_case(%arg0: tensor<8x8xf32, #CSR>, %arg1: tensor<8xf32>) -> tensor<8xf32> {
860860
%0 = tensor.empty() : tensor<8xf32>

‎mlir/test/Dialect/SparseTensor/GPU/gpu_combi.mlir

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
// RUN: --sparsification="parallelization-strategy=dense-outer-loop" \
44
// RUN: --sparse-gpu-codegen | FileCheck %s
55

6-
#CSR = #sparse_tensor.encoding<{ lvlTypes = [ "dense", "compressed" ] }>
6+
#CSR = #sparse_tensor.encoding<{ map = (d0, d1) -> (d0 : dense, d1 : compressed) }>
77

88
//
99
// CHECK-LABEL: gpu.module @sparse_kernels

‎mlir/test/Dialect/SparseTensor/GPU/gpu_matmul.mlir

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
// RUN: --sparsification="parallelization-strategy=dense-outer-loop" \
44
// RUN: --sparse-gpu-codegen | FileCheck %s
55

6-
#CSR = #sparse_tensor.encoding<{ lvlTypes = [ "dense", "compressed" ] }>
6+
#CSR = #sparse_tensor.encoding<{ map = (d0, d1) -> (d0 : dense, d1 : compressed) }>
77

88
//
99
// Compute matrix matrix C = AB

‎mlir/test/Dialect/SparseTensor/GPU/gpu_matmul_lib.mlir

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// RUN: mlir-opt %s --linalg-generalize-named-ops \
22
// RUN: --sparsification="enable-gpu-libgen" | FileCheck %s
33

4-
#CSR = #sparse_tensor.encoding<{ lvlTypes = [ "dense", "compressed" ] }>
4+
#CSR = #sparse_tensor.encoding<{ map = (d0, d1) -> (d0 : dense, d1 : compressed) }>
55

66
//
77
// Compute matrix matrix C = AB

‎mlir/test/Dialect/SparseTensor/GPU/gpu_matvec.mlir

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
// RUN: --sparsification="parallelization-strategy=dense-outer-loop" \
44
// RUN: --sparse-gpu-codegen | FileCheck %s
55

6-
#CSR = #sparse_tensor.encoding<{ lvlTypes = [ "dense", "compressed" ] }>
6+
#CSR = #sparse_tensor.encoding<{ map = (d0, d1) -> (d0 : dense, d1 : compressed) }>
77

88
//
99
// Compute matrix vector y = Ax

‎mlir/test/Dialect/SparseTensor/GPU/gpu_sampled_matmul_lib.mlir

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
iterator_types = ["parallel", "parallel"]
2020
}
2121

22-
#CSR = #sparse_tensor.encoding<{ lvlTypes = [ "dense", "compressed" ] }>
22+
#CSR = #sparse_tensor.encoding<{ map = (d0, d1) -> (d0 : dense, d1 : compressed) }>
2323

2424
// CHECK-LABEL: func.func @sparse_sampled_dd(
2525
// CHECK-SAME: %[[VAL_0:.*]]: tensor<8x8xf64, #sparse_tensor.encoding<{ lvlTypes = [ "dense", "compressed" ] }>>,

‎mlir/test/Dialect/SparseTensor/GPU/gpu_spgemm_lib.mlir

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// RUN: mlir-opt %s --linalg-generalize-named-ops \
22
// RUN: --sparsification="enable-gpu-libgen" | FileCheck %s
33

4-
#CSR = #sparse_tensor.encoding<{ lvlTypes = [ "dense", "compressed" ] }>
4+
#CSR = #sparse_tensor.encoding<{ map = (d0, d1) -> (d0 : dense, d1 : compressed) }>
55

66
// CHECK-LABEL: func.func @matmulCSR(
77
// CHECK-SAME: %[[VAL_0:.*0]]: tensor<8x8xf32, #{{.*}}>,

‎mlir/test/Dialect/SparseTensor/codegen.mlir

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
}>
2222

2323
#CSR = #sparse_tensor.encoding<{
24-
lvlTypes = [ "dense", "compressed" ],
24+
map = (d0, d1) -> (d0 : dense, d1 : compressed),
2525
crdWidth = 64,
2626
posWidth = 32
2727
}>
@@ -31,8 +31,7 @@
3131
}>
3232

3333
#CSC = #sparse_tensor.encoding<{
34-
lvlTypes = [ "dense", "compressed" ],
35-
dimToLvl = affine_map<(i, j) -> (j, i)>
34+
map = (d0, d1) -> (d1 : dense, d0 : compressed)
3635
}>
3736

3837
#DCSR = #sparse_tensor.encoding<{

‎mlir/test/Dialect/SparseTensor/codegen_sparse_alloc.mlir

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// RUN: mlir-opt %s --sparse-tensor-codegen --canonicalize --cse | FileCheck %s
22

3-
#CSR = #sparse_tensor.encoding<{ lvlTypes = ["dense", "compressed"]}>
3+
#CSR = #sparse_tensor.encoding<{ map = (d0, d1) -> (d0 : dense, d1 : compressed)}>
44
#COO = #sparse_tensor.encoding<{ lvlTypes = ["compressed_nu", "singleton"]}>
55

66
// CHECK-LABEL: func.func @sparse_alloc_copy_CSR(

‎mlir/test/Dialect/SparseTensor/codegen_sparse_dealloc.mlir

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,9 @@
66
// RUN: --sparse-tensor-codegen=create-sparse-deallocs=true \
77
// RUN: --canonicalize --cse | FileCheck %s -check-prefix=CHECK-DEALLOC
88

9-
#CSR = #sparse_tensor.encoding<{ lvlTypes = ["dense", "compressed"]}>
9+
#CSR = #sparse_tensor.encoding<{ map = (d0, d1) -> (d0 : dense, d1 : compressed)}>
1010
#CSC = #sparse_tensor.encoding<{
11-
lvlTypes = ["dense", "compressed"],
12-
dimToLvl = affine_map<(i,j) -> (j,i)>
11+
map = (d0, d1) -> (d1 : dense, d0 : compressed),
1312
}>
1413

1514
//

‎mlir/test/Dialect/SparseTensor/conversion.mlir

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,11 @@
1717
}>
1818

1919
#CSR = #sparse_tensor.encoding<{
20-
lvlTypes = ["dense", "compressed"]
20+
map = (d0, d1) -> (d0 : dense, d1 : compressed)
2121
}>
2222

2323
#CSC = #sparse_tensor.encoding<{
24-
lvlTypes = ["dense", "compressed"],
25-
dimToLvl = affine_map<(i,j) -> (j,i)>
24+
map = (d0, d1) -> (d1 : dense, d0 : compressed)
2625
}>
2726

2827
#SparseTensor = #sparse_tensor.encoding<{

‎mlir/test/Dialect/SparseTensor/convert_dense2sparse.mlir

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,11 @@
77
}>
88

99
#CSR = #sparse_tensor.encoding<{
10-
lvlTypes = ["dense", "compressed"]
10+
map = (d0, d1) -> (d0 : dense, d1 : compressed)
1111
}>
1212

1313
#CSC = #sparse_tensor.encoding<{
14-
lvlTypes = [ "dense", "compressed" ],
15-
dimToLvl = affine_map<(i, j) -> (j, i)>
14+
map = (d0, d1) -> (d1 : dense, d0 : compressed)
1615
}>
1716

1817
#SparseTensor = #sparse_tensor.encoding<{

‎mlir/test/Dialect/SparseTensor/convert_sparse2dense.mlir

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
}>
99

1010
#SparseMatrix = #sparse_tensor.encoding<{
11-
lvlTypes = ["dense", "compressed"]
11+
map = (d0, d1) -> (d0 : dense, d1 : compressed)
1212
}>
1313

1414
#SparseTensor = #sparse_tensor.encoding<{

‎mlir/test/Dialect/SparseTensor/invalid.mlir

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ func.func @invalid_pack_type(%values: tensor<6xf64>, %pos: tensor<2xi32>, %coord
4444

4545
// -----
4646

47-
#CSR = #sparse_tensor.encoding<{lvlTypes = ["dense", "compressed"], posWidth=32, crdWidth=32}>
47+
#CSR = #sparse_tensor.encoding<{map = (d0, d1) -> (d0 : dense, d1 : compressed), posWidth=32, crdWidth=32}>
4848

4949
func.func @invalid_pack_mis_position(%values: tensor<6xf64>, %coordinates: tensor<6xi32>)
5050
-> tensor<2x100xf64, #CSR> {
@@ -80,7 +80,7 @@ func.func @invalid_unpack_type(%sp: tensor<100x2xf64, #SparseVector>, %values: t
8080

8181
// -----
8282

83-
#CSR = #sparse_tensor.encoding<{lvlTypes = ["dense", "compressed"], posWidth=32, crdWidth=32}>
83+
#CSR = #sparse_tensor.encoding<{map = (d0, d1) -> (d0 : dense, d1 : compressed), posWidth=32, crdWidth=32}>
8484

8585
func.func @invalid_unpack_mis_position(%sp: tensor<2x100xf64, #CSR>, %values: tensor<6xf64>, %coordinates: tensor<6xi32>) {
8686
// expected-error@+1 {{inconsistent number of fields between input/output}}
@@ -297,7 +297,7 @@ func.func @sparse_unannotated_insert(%arg0: tensor<128xf64>, %arg1: index, %arg2
297297

298298
// -----
299299

300-
#CSR = #sparse_tensor.encoding<{lvlTypes = ["dense", "compressed"]}>
300+
#CSR = #sparse_tensor.encoding<{map = (d0, d1) -> (d0 : dense, d1 : compressed)}>
301301

302302
func.func @sparse_wrong_arity_insert(%arg0: tensor<128x64xf64, #CSR>, %arg1: index, %arg2: f64) {
303303
// expected-error@+1 {{'sparse_tensor.insert' op incorrect number of coordinates}}
@@ -347,7 +347,7 @@ func.func @sparse_unannotated_compression(%arg0: memref<?xf64>,
347347

348348
// -----
349349

350-
#CSR = #sparse_tensor.encoding<{lvlTypes = ["dense", "compressed"]}>
350+
#CSR = #sparse_tensor.encoding<{map = (d0, d1) -> (d0 : dense, d1 : compressed)}>
351351

352352
func.func @sparse_wrong_arity_compression(%arg0: memref<?xf64>,
353353
%arg1: memref<?xi1>,
@@ -381,7 +381,7 @@ func.func @sparse_convert_rank_mismatch(%arg0: tensor<10x10xf64, #DCSR>) -> tens
381381

382382
// -----
383383

384-
#CSR = #sparse_tensor.encoding<{lvlTypes = ["dense", "compressed"]}>
384+
#CSR = #sparse_tensor.encoding<{map = (d0, d1) -> (d0 : dense, d1 : compressed)}>
385385

386386
func.func @sparse_convert_dim_mismatch(%arg0: tensor<10x?xf32>) -> tensor<10x10xf32, #CSR> {
387387
// expected-error@+1 {{unexpected conversion mismatch in dimension 1}}
@@ -632,7 +632,7 @@ func.func @invalid_select_wrong_yield(%arg0: f64) -> f64 {
632632

633633
// -----
634634

635-
#DC = #sparse_tensor.encoding<{lvlTypes = ["dense", "compressed"]}>
635+
#DC = #sparse_tensor.encoding<{map = (d0, d1) -> (d0 : dense, d1 : compressed)}>
636636
func.func @invalid_concat_less_inputs(%arg: tensor<9x4xf64, #DC>) -> tensor<9x4xf64, #DC> {
637637
// expected-error@+1 {{Need at least two tensors to concatenate.}}
638638
%0 = sparse_tensor.concatenate %arg {dimension = 1 : index}
@@ -642,7 +642,7 @@ func.func @invalid_concat_less_inputs(%arg: tensor<9x4xf64, #DC>) -> tensor<9x4x
642642

643643
// -----
644644

645-
#DC = #sparse_tensor.encoding<{lvlTypes = ["dense", "compressed"]}>
645+
#DC = #sparse_tensor.encoding<{map = (d0, d1) -> (d0 : dense, d1 : compressed)}>
646646
func.func @invalid_concat_dim(%arg0: tensor<2x4xf64, #DC>,
647647
%arg1: tensor<3x4xf64, #DC>,
648648
%arg2: tensor<4x4xf64, #DC>) -> tensor<9x4xf64, #DC> {
@@ -657,7 +657,7 @@ func.func @invalid_concat_dim(%arg0: tensor<2x4xf64, #DC>,
657657
// -----
658658

659659
#C = #sparse_tensor.encoding<{map = (d0) -> (d0 : compressed)}>
660-
#DC = #sparse_tensor.encoding<{lvlTypes = ["dense", "compressed"]}>
660+
#DC = #sparse_tensor.encoding<{map = (d0, d1) -> (d0 : dense, d1 : compressed)}>
661661
#DCC = #sparse_tensor.encoding<{lvlTypes = ["dense", "compressed", "compressed"]}>
662662
func.func @invalid_concat_rank_mismatch(%arg0: tensor<2xf64, #C>,
663663
%arg1: tensor<3x4xf64, #DC>,
@@ -672,7 +672,7 @@ func.func @invalid_concat_rank_mismatch(%arg0: tensor<2xf64, #C>,
672672

673673
// -----
674674

675-
#DC = #sparse_tensor.encoding<{lvlTypes = ["dense", "compressed"]}>
675+
#DC = #sparse_tensor.encoding<{map = (d0, d1) -> (d0 : dense, d1 : compressed)}>
676676
func.func @invalid_concat_size_mismatch_dyn(%arg0: tensor<?x4xf64, #DC>,
677677
%arg1: tensor<5x4xf64, #DC>,
678678
%arg2: tensor<4x4xf64, #DC>) -> tensor<9x4xf64, #DC> {
@@ -686,7 +686,7 @@ func.func @invalid_concat_size_mismatch_dyn(%arg0: tensor<?x4xf64, #DC>,
686686

687687
// -----
688688

689-
#DC = #sparse_tensor.encoding<{lvlTypes = ["dense", "compressed"]}>
689+
#DC = #sparse_tensor.encoding<{map = (d0, d1) -> (d0 : dense, d1 : compressed)}>
690690
func.func @invalid_concat_size_mismatch(%arg0: tensor<3x4xf64, #DC>,
691691
%arg1: tensor<5x4xf64, #DC>,
692692
%arg2: tensor<4x4xf64, #DC>) -> tensor<9x4xf64, #DC> {
@@ -700,7 +700,7 @@ func.func @invalid_concat_size_mismatch(%arg0: tensor<3x4xf64, #DC>,
700700

701701
// -----
702702

703-
#DC = #sparse_tensor.encoding<{lvlTypes = ["dense", "compressed"]}>
703+
#DC = #sparse_tensor.encoding<{map = (d0, d1) -> (d0 : dense, d1 : compressed)}>
704704
func.func @invalid_concat_size_mismatch(%arg0: tensor<2x4xf64, #DC>,
705705
%arg1: tensor<3x3xf64, #DC>,
706706
%arg2: tensor<4x4xf64, #DC>) -> tensor<9x4xf64, #DC> {
@@ -844,7 +844,7 @@ func.func @sparse_sort_coo_y_too_small(%arg0: memref<60xindex>, %arg1: memref<10
844844

845845
// -----
846846

847-
#CSR = #sparse_tensor.encoding<{lvlTypes = ["dense", "compressed"]}>
847+
#CSR = #sparse_tensor.encoding<{map = (d0, d1) -> (d0 : dense, d1 : compressed)}>
848848

849849
func.func @sparse_alloc_escapes(%arg0: index) -> tensor<10x?xf64, #CSR> {
850850
// expected-error@+1 {{sparse tensor allocation should not escape function}}

‎mlir/test/Dialect/SparseTensor/invalid_encoding.mlir

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,13 @@ func.func private @scalar(%arg0: tensor<f64, #a>) -> ()
77
// -----
88

99
// expected-error@+2 {{dimension-rank mismatch between encoding and tensor shape: 2 != 1}}
10-
#a = #sparse_tensor.encoding<{lvlTypes = ["dense", "compressed"]}>
10+
#a = #sparse_tensor.encoding<{map = (d0, d1) -> (d0 : dense, d1 : compressed)}>
1111
func.func private @tensor_dimlevel_size_mismatch(%arg0: tensor<8xi32, #a>) -> ()
1212

1313
// -----
1414

15-
// expected-error@+1 {{level-rank mismatch between dimToLvl and lvlTypes: 1 != 2}}
16-
#a = #sparse_tensor.encoding<{lvlTypes = ["dense", "compressed"], dimToLvl = affine_map<(i) -> (i)>}>
15+
// expected-error@+1 {{use of undeclared identifier}}
16+
#a = #sparse_tensor.encoding<{map = (d0) -> (d0 : dense, d1 : compressed)}>
1717
func.func private @tensor_sizes_mismatch(%arg0: tensor<8xi32, #a>) -> ()
1818

1919
// -----
@@ -34,7 +34,7 @@ func.func private @tensor_dimtolvl_mismatch(%arg0: tensor<8xi32, #a>) -> ()
3434
// -----
3535

3636
// expected-error@+1 {{expected a permutation affine map for dimToLvl}}
37-
#a = #sparse_tensor.encoding<{lvlTypes = ["dense", "compressed"], dimToLvl = affine_map<(i,j) -> (i,i)>}>
37+
#a = #sparse_tensor.encoding<{map = (d0, d1) -> (d0 : dense, d0 : compressed)}>
3838
func.func private @tensor_no_permutation(%arg0: tensor<16x32xf32, #a>) -> ()
3939

4040
// -----

‎mlir/test/Dialect/SparseTensor/pack_copy.mlir

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
// RUN: mlir-opt %s --sparsification-and-bufferization | FileCheck %s
22

33
#CSR = #sparse_tensor.encoding<{
4-
lvlTypes = ["dense","compressed"],
5-
dimToLvl = affine_map<(i,j) -> (i,j)>,
4+
map = (d0, d1) -> (d0 : dense, d1 : compressed),
65
crdWidth = 32,
76
posWidth = 32
87
}>

‎mlir/test/Dialect/SparseTensor/rewriting_for_codegen.mlir

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,11 @@
22
// RUN: FileCheck %s
33

44
#CSR = #sparse_tensor.encoding<{
5-
lvlTypes = ["dense", "compressed"]
5+
map = (d0, d1) -> (d0 : dense, d1 : compressed)
66
}>
77

88
#CSC = #sparse_tensor.encoding<{
9-
lvlTypes = [ "dense", "compressed" ],
10-
dimToLvl = affine_map<(i, j) -> (j, i)>
9+
map = (d0, d1) -> (d1 : dense, d0 : compressed)
1110
}>
1211

1312
#COO = #sparse_tensor.encoding<{

‎mlir/test/Dialect/SparseTensor/semi_ring.mlir

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// RUN: mlir-opt %s -sparsification | FileCheck %s
22

3-
#SM = #sparse_tensor.encoding<{ lvlTypes = [ "dense", "compressed" ] }>
3+
#SM = #sparse_tensor.encoding<{ map = (d0, d1) -> (d0 : dense, d1 : compressed) }>
44

55
#trait = {
66
indexing_maps = [

‎mlir/test/Dialect/SparseTensor/sparse_2d.mlir

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
// RUN: mlir-opt %s -sparsification | FileCheck %s
33

44
#Tdd = #sparse_tensor.encoding<{ lvlTypes = [ "dense", "dense" ] }>
5-
#Tds = #sparse_tensor.encoding<{ lvlTypes = [ "dense", "compressed" ] }>
5+
#Tds = #sparse_tensor.encoding<{ map = (d0, d1) -> (d0 : dense, d1 : compressed) }>
66
#Tsd = #sparse_tensor.encoding<{ lvlTypes = [ "compressed", "dense" ] }>
77
#Tss = #sparse_tensor.encoding<{ lvlTypes = [ "compressed", "compressed" ] }>
88

‎mlir/test/Dialect/SparseTensor/sparse_affine.mlir

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
// RUN: mlir-opt %s -sparsification | FileCheck %s
33

44
#SpVec = #sparse_tensor.encoding<{ map = (d0) -> (d0 : compressed) }>
5-
#CSR = #sparse_tensor.encoding<{ lvlTypes = [ "dense", "compressed" ] }>
5+
#CSR = #sparse_tensor.encoding<{ map = (d0, d1) -> (d0 : dense, d1 : compressed) }>
66
#Row = #sparse_tensor.encoding<{ lvlTypes = [ "compressed", "dense" ] }>
77
#EncDenseVec = #sparse_tensor.encoding<{ map = (d0) -> (d0 : dense) }>
88

‎mlir/test/Dialect/SparseTensor/sparse_expand.mlir

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,11 @@
88
// RUN: FileCheck %s --check-prefix=CHECK-CONVERT
99

1010
#CSR = #sparse_tensor.encoding<{
11-
lvlTypes = [ "dense", "compressed" ]
11+
map = (d0, d1) -> (d0 : dense, d1 : compressed)
1212
}>
1313

1414
#CSC = #sparse_tensor.encoding<{
15-
lvlTypes = [ "dense", "compressed" ],
16-
dimToLvl = affine_map<(i,j) -> (j,i)>
15+
map = (d0, d1) -> (d1 : dense, d0 : compressed)
1716
}>
1817

1918
#DCSC = #sparse_tensor.encoding<{

‎mlir/test/Dialect/SparseTensor/sparse_extract_slice.mlir

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// RUN: mlir-opt %s --sparse-tensor-codegen --cse | FileCheck %s
22

33
#CSR = #sparse_tensor.encoding<{
4-
lvlTypes = [ "dense", "compressed" ]
4+
map = (d0, d1) -> (d0 : dense, d1 : compressed)
55
}>
66

77
#CSR_SLICE = #sparse_tensor.encoding<{

‎mlir/test/Dialect/SparseTensor/sparse_lower.mlir

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
// RUN: --tensor-bufferize --finalizing-bufferize | \
99
// RUN: FileCheck %s --check-prefix=CHECK-LIR
1010

11-
#CSR = #sparse_tensor.encoding<{lvlTypes = [ "dense", "compressed" ]}>
11+
#CSR = #sparse_tensor.encoding<{map = (d0, d1) -> (d0 : dense, d1 : compressed)}>
1212

1313
#trait_matvec = {
1414
indexing_maps = [

‎mlir/test/Dialect/SparseTensor/sparse_lower_col.mlir

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,7 @@
99
// RUN: FileCheck %s --check-prefix=CHECK-LIR
1010

1111
#CSC = #sparse_tensor.encoding<{
12-
lvlTypes = [ "dense", "compressed" ],
13-
dimToLvl = affine_map<(i,j) -> (j,i)>
12+
map = (d0, d1) -> (d1 : dense, d0 : compressed)
1413
}>
1514

1615
#trait_matvec = {

‎mlir/test/Dialect/SparseTensor/sparse_lower_inplace.mlir

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
// RUN: --tensor-bufferize --finalizing-bufferize | \
99
// RUN: FileCheck %s --check-prefix=CHECK-LIR
1010

11-
#CSR = #sparse_tensor.encoding<{lvlTypes = [ "dense", "compressed" ]}>
11+
#CSR = #sparse_tensor.encoding<{map = (d0, d1) -> (d0 : dense, d1 : compressed)}>
1212

1313
#trait_matvec = {
1414
indexing_maps = [

‎mlir/test/Dialect/SparseTensor/sparse_matmul_codegen.mlir

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,7 @@
55
// RUN: --canonicalize --cse | FileCheck %s
66

77
#CSR = #sparse_tensor.encoding<{
8-
lvlTypes = [ "dense", "compressed" ],
9-
dimToLvl = affine_map<(i,j) -> (i,j)>
8+
map = (d0, d1) -> (d0 : dense, d1 : compressed)
109
}>
1110

1211
//

0 commit comments

Comments
 (0)