Skip to content

Commit dbe1be9

Browse files
yinying-lisa-liyinying-lisa-li
authored
[mlir][sparse] Migrate tests to use new syntax (#66146)
lvlTypes = [ "compressed" ] to map = (d0) -> (d0 : compressed) lvlTypes = [ "dense" ] to map = (d0) -> (d0 : dense)
1 parent d25b4fa commit dbe1be9

File tree

64 files changed

+112
-112
lines changed

Some content is hidden

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

64 files changed

+112
-112
lines changed

‎mlir/include/mlir/Dialect/SparseTensor/IR/SparseTensorAttrDefs.td

+1-1
Original file line numberDiff line numberDiff line change
@@ -194,7 +194,7 @@ def SparseTensorEncodingAttr : SparseTensor_Attr<"SparseTensorEncoding",
194194
```mlir
195195
// Sparse vector.
196196
#SparseVector = #sparse_tensor.encoding<{
197-
lvlTypes = [ "compressed" ]
197+
map = (d0) -> (d0 : compressed)
198198
}>
199199
... tensor<?xf32, #SparseVector> ...
200200

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
// RUN: mlir-opt %s --sparse-tensor-codegen --canonicalize -cse | FileCheck %s
22

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

55
#SparseVector = #sparse_tensor.encoding<{
6-
lvlTypes = [ "compressed" ],
6+
map = (d0) -> (d0 : compressed),
77
crdWidth = 64,
88
posWidth = 32
99
}>

‎mlir/test/Dialect/SparseTensor/codegen_buffer_initialization.mlir

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// RUN: mlir-opt %s --sparse-tensor-codegen=enable-buffer-initialization=true --canonicalize --cse | FileCheck %s
22

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

55
// CHECK-LABEL: func.func @sparse_alloc_sparse_vector(
66
// CHECK-SAME: %[[VAL_0:.*]]: index) -> (memref<?xindex>, memref<?xindex>, memref<?xf64>, !sparse_tensor.storage_specifier

‎mlir/test/Dialect/SparseTensor/codegen_to_llvm.mlir

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// RUN: mlir-opt %s --sparse-tensor-codegen --sparse-storage-specifier-to-llvm | FileCheck %s
22

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

55
// CHECK-LABEL: func @sparse_nop(
66
// CHECK-SAME: %[[A0:.*0]]: memref<?xindex>,

‎mlir/test/Dialect/SparseTensor/constant_index_map.mlir

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
#map1 = affine_map<(d0) -> (0, d0)>
66
#map2 = affine_map<(d0) -> (d0)>
77

8-
#SpVec = #sparse_tensor.encoding<{ lvlTypes = [ "compressed" ] }>
8+
#SpVec = #sparse_tensor.encoding<{ map = (d0) -> (d0 : compressed) }>
99

1010
// CHECK-LABEL: func.func @main(
1111
// CHECK-SAME: %[[VAL_0:.*0]]: tensor<1x77xi1>,

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

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
// RUN: mlir-opt %s --sparse-tensor-conversion --canonicalize --cse | FileCheck %s
22

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

77
#SparseVector64 = #sparse_tensor.encoding<{
8-
lvlTypes = ["compressed"],
8+
map = (d0) -> (d0 : compressed),
99
posWidth = 64,
1010
crdWidth = 64
1111
}>
1212

1313
#SparseVector32 = #sparse_tensor.encoding<{
14-
lvlTypes = ["compressed"],
14+
map = (d0) -> (d0 : compressed),
1515
posWidth = 32,
1616
crdWidth = 32
1717
}>

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
// RUN: --canonicalize --cse | FileCheck %s --check-prefix=CHECK-RWT
44

55
#SparseVector = #sparse_tensor.encoding<{
6-
lvlTypes = ["compressed"]
6+
map = (d0) -> (d0 : compressed)
77
}>
88

99
#CSR = #sparse_tensor.encoding<{

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
// RUN: --canonicalize --cse | FileCheck %s --check-prefix=CHECK-RWT
55

66
#SparseVector = #sparse_tensor.encoding<{
7-
lvlTypes = ["compressed"]
7+
map = (d0) -> (d0 : compressed)
88
}>
99

1010
#SparseMatrix = #sparse_tensor.encoding<{

‎mlir/test/Dialect/SparseTensor/convert_sparse2sparse.mlir

+3-3
Original file line numberDiff line numberDiff line change
@@ -10,19 +10,19 @@
1010
// RUN: --canonicalize --cse | FileCheck %s --check-prefix=CHECK-RWT
1111

1212
#SparseVector64 = #sparse_tensor.encoding<{
13-
lvlTypes = ["compressed"],
13+
map = (d0) -> (d0 : compressed),
1414
posWidth = 64,
1515
crdWidth = 64
1616
}>
1717

1818
#SparseVector32 = #sparse_tensor.encoding<{
19-
lvlTypes = ["compressed"],
19+
map = (d0) -> (d0 : compressed),
2020
posWidth = 32,
2121
crdWidth = 32
2222
}>
2323

2424
#SparseVector = #sparse_tensor.encoding<{
25-
lvlTypes = ["compressed"]
25+
map = (d0) -> (d0 : compressed)
2626
}>
2727

2828
#SortedCOO2D = #sparse_tensor.encoding<{

‎mlir/test/Dialect/SparseTensor/convert_sparse2sparse_element.mlir

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
// RUN: mlir-opt %s --sparse-tensor-codegen --canonicalize --cse | FileCheck %s
22

33
#SparseVector64 = #sparse_tensor.encoding<{
4-
lvlTypes = ["compressed"],
4+
map = (d0) -> (d0 : compressed),
55
posWidth = 64,
66
crdWidth = 64
77
}>
88

99
#SparseVector32 = #sparse_tensor.encoding<{
10-
lvlTypes = ["compressed"],
10+
map = (d0) -> (d0 : compressed),
1111
posWidth = 32,
1212
crdWidth = 32
1313
}>

‎mlir/test/Dialect/SparseTensor/fold.mlir

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// RUN: mlir-opt %s --canonicalize --cse | FileCheck %s
22

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

55
// CHECK-LABEL: func @sparse_nop_dense2dense_convert(
66
// CHECK-SAME: %[[A:.*]]: tensor<64xf32>)

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

+14-14
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ func.func @invalid_new_dense(%arg0: !llvm.ptr<i8>) -> tensor<32xf32> {
88

99
// -----
1010

11-
#SparseVector = #sparse_tensor.encoding<{lvlTypes = ["compressed"], posWidth=32, crdWidth=32}>
11+
#SparseVector = #sparse_tensor.encoding<{map = (d0) -> (d0 : compressed), posWidth=32, crdWidth=32}>
1212

1313
func.func @non_static_pack_ret(%values: tensor<6xf64>, %pos: tensor<2xi32>, %coordinates: tensor<6x1xi32>)
1414
-> tensor<?xf64, #SparseVector> {
@@ -20,7 +20,7 @@ func.func @non_static_pack_ret(%values: tensor<6xf64>, %pos: tensor<2xi32>, %coo
2020

2121
// -----
2222

23-
#SparseVector = #sparse_tensor.encoding<{lvlTypes = ["compressed"], posWidth=32, crdWidth=32}>
23+
#SparseVector = #sparse_tensor.encoding<{map = (d0) -> (d0 : compressed), posWidth=32, crdWidth=32}>
2424

2525
func.func @invalid_pack_type(%values: tensor<6xf64>, %pos: tensor<2xi32>, %coordinates: tensor<6x1xi32>)
2626
-> tensor<100xf32, #SparseVector> {
@@ -56,7 +56,7 @@ func.func @invalid_pack_mis_position(%values: tensor<6xf64>, %coordinates: tenso
5656

5757
// -----
5858

59-
#SparseVector = #sparse_tensor.encoding<{lvlTypes = ["compressed"], posWidth=32, crdWidth=32}>
59+
#SparseVector = #sparse_tensor.encoding<{map = (d0) -> (d0 : compressed), posWidth=32, crdWidth=32}>
6060

6161
func.func @invalid_unpack_type(%sp: tensor<100xf32, #SparseVector>, %values: tensor<6xf64>, %pos: tensor<2xi32>, %coordinates: tensor<6x1xi32>) {
6262
// expected-error@+1 {{input/output element-types don't match}}
@@ -108,7 +108,7 @@ func.func @invalid_positions_unranked(%arg0: tensor<*xf64>) -> memref<?xindex> {
108108

109109
// -----
110110

111-
#SparseVector = #sparse_tensor.encoding<{lvlTypes = ["compressed"], posWidth=32}>
111+
#SparseVector = #sparse_tensor.encoding<{map = (d0) -> (d0 : compressed), posWidth=32}>
112112

113113
func.func @mismatch_positions_types(%arg0: tensor<128xf64, #SparseVector>) -> memref<?xindex> {
114114
// expected-error@+1 {{unexpected type for positions}}
@@ -118,7 +118,7 @@ func.func @mismatch_positions_types(%arg0: tensor<128xf64, #SparseVector>) -> me
118118

119119
// -----
120120

121-
#SparseVector = #sparse_tensor.encoding<{lvlTypes = ["compressed"]}>
121+
#SparseVector = #sparse_tensor.encoding<{map = (d0) -> (d0 : compressed)}>
122122

123123
func.func @positions_oob(%arg0: tensor<128xf64, #SparseVector>) -> memref<?xindex> {
124124
// expected-error@+1 {{requested level is out of bounds}}
@@ -144,7 +144,7 @@ func.func @invalid_indices_unranked(%arg0: tensor<*xf64>) -> memref<?xindex> {
144144

145145
// -----
146146

147-
#SparseVector = #sparse_tensor.encoding<{lvlTypes = ["compressed"]}>
147+
#SparseVector = #sparse_tensor.encoding<{map = (d0) -> (d0 : compressed)}>
148148

149149
func.func @mismatch_indices_types(%arg0: tensor<?xf64, #SparseVector>) -> memref<?xi32> {
150150
// expected-error@+1 {{unexpected type for coordinates}}
@@ -154,7 +154,7 @@ func.func @mismatch_indices_types(%arg0: tensor<?xf64, #SparseVector>) -> memref
154154

155155
// -----
156156

157-
#SparseVector = #sparse_tensor.encoding<{lvlTypes = ["compressed"]}>
157+
#SparseVector = #sparse_tensor.encoding<{map = (d0) -> (d0 : compressed)}>
158158

159159
func.func @indices_oob(%arg0: tensor<128xf64, #SparseVector>) -> memref<?xindex> {
160160
// expected-error@+1 {{requested level is out of bounds}}
@@ -172,7 +172,7 @@ func.func @invalid_values_dense(%arg0: tensor<1024xf32>) -> memref<?xf32> {
172172

173173
// -----
174174

175-
#SparseVector = #sparse_tensor.encoding<{lvlTypes = ["compressed"]}>
175+
#SparseVector = #sparse_tensor.encoding<{map = (d0) -> (d0 : compressed)}>
176176

177177
func.func @indices_buffer_noncoo(%arg0: tensor<128xf64, #SparseVector>) -> memref<?xindex> {
178178
// expected-error@+1 {{expected sparse tensor with a COO region}}
@@ -190,7 +190,7 @@ func.func @indices_buffer_dense(%arg0: tensor<1024xf32>) -> memref<?xindex> {
190190

191191
// -----
192192

193-
#SparseVector = #sparse_tensor.encoding<{lvlTypes = ["compressed"]}>
193+
#SparseVector = #sparse_tensor.encoding<{map = (d0) -> (d0 : compressed)}>
194194

195195
func.func @mismatch_values_types(%arg0: tensor<?xf64, #SparseVector>) -> memref<?xf32> {
196196
// expected-error@+1 {{unexpected mismatch in element types}}
@@ -226,7 +226,7 @@ func.func @sparse_slice_stride(%arg0: tensor<2x8xf64, #CSR_SLICE>) -> index {
226226

227227
// -----
228228

229-
#SparseVector = #sparse_tensor.encoding<{lvlTypes = ["compressed"]}>
229+
#SparseVector = #sparse_tensor.encoding<{map = (d0) -> (d0 : compressed)}>
230230

231231
func.func @sparse_get_md(%arg0: !sparse_tensor.storage_specifier<#SparseVector>) -> index {
232232
// expected-error@+1 {{redundant level argument for querying value memory size}}
@@ -237,7 +237,7 @@ func.func @sparse_get_md(%arg0: !sparse_tensor.storage_specifier<#SparseVector>)
237237

238238
// -----
239239

240-
#SparseVector = #sparse_tensor.encoding<{lvlTypes = ["compressed"]}>
240+
#SparseVector = #sparse_tensor.encoding<{map = (d0) -> (d0 : compressed)}>
241241

242242
func.func @sparse_get_md(%arg0: !sparse_tensor.storage_specifier<#SparseVector>) -> i64 {
243243
// expected-error@+1 {{requested slice data on non-slice tensor}}
@@ -248,7 +248,7 @@ func.func @sparse_get_md(%arg0: !sparse_tensor.storage_specifier<#SparseVector>)
248248

249249
// -----
250250

251-
#SparseVector = #sparse_tensor.encoding<{lvlTypes = ["compressed"]}>
251+
#SparseVector = #sparse_tensor.encoding<{map = (d0) -> (d0 : compressed)}>
252252

253253
func.func @sparse_get_md(%arg0: !sparse_tensor.storage_specifier<#SparseVector>) -> index {
254254
// expected-error@+1 {{missing level argument}}
@@ -259,7 +259,7 @@ func.func @sparse_get_md(%arg0: !sparse_tensor.storage_specifier<#SparseVector>)
259259

260260
// -----
261261

262-
#SparseVector = #sparse_tensor.encoding<{lvlTypes = ["compressed"]}>
262+
#SparseVector = #sparse_tensor.encoding<{map = (d0) -> (d0 : compressed)}>
263263

264264
func.func @sparse_get_md(%arg0: !sparse_tensor.storage_specifier<#SparseVector>) -> index {
265265
// expected-error@+1 {{requested level is out of bounds}}
@@ -656,7 +656,7 @@ func.func @invalid_concat_dim(%arg0: tensor<2x4xf64, #DC>,
656656

657657
// -----
658658

659-
#C = #sparse_tensor.encoding<{lvlTypes = ["compressed"]}>
659+
#C = #sparse_tensor.encoding<{map = (d0) -> (d0 : compressed)}>
660660
#DC = #sparse_tensor.encoding<{lvlTypes = ["dense", "compressed"]}>
661661
#DCC = #sparse_tensor.encoding<{lvlTypes = ["dense", "compressed", "compressed"]}>
662662
func.func @invalid_concat_rank_mismatch(%arg0: tensor<2xf64, #C>,

‎mlir/test/Dialect/SparseTensor/one_shot_bufferize_invalid.mlir

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// RUN: mlir-opt %s -one-shot-bufferize -verify-diagnostics
22

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

77
func.func @sparse_tensor_op(%arg0: tensor<64xf32, #SparseVector>) -> tensor<64xf32, #SparseVector> {

‎mlir/test/Dialect/SparseTensor/one_shot_bufferize_tensor_copy_insertion.mlir

+1-1
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ func.func @sparse_tensor_convert() -> tensor<20x40xf32> {
4141
return %2 : tensor<20x40xf32>
4242
}
4343

44-
#SV = #sparse_tensor.encoding<{ lvlTypes = [ "compressed" ] }>
44+
#SV = #sparse_tensor.encoding<{ map = (d0) -> (d0 : compressed) }>
4545

4646
#trait = {
4747
indexing_maps = [

‎mlir/test/Dialect/SparseTensor/post_rewriting.mlir

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// RUN: mlir-opt %s -post-sparsification-rewrite | FileCheck %s
22

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

77
#SparseMatrix = #sparse_tensor.encoding<{

‎mlir/test/Dialect/SparseTensor/pre_rewriting.mlir

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// RUN: mlir-opt %s -pre-sparsification-rewrite | FileCheck %s
22

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

77
#SortedCOO = #sparse_tensor.encoding<{

‎mlir/test/Dialect/SparseTensor/rejected.mlir

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
// The file contains examples that will be rejected by sparse compiler
55
// (we expect the linalg.generic unchanged).
6-
#SparseVector = #sparse_tensor.encoding<{lvlTypes = ["compressed"]}>
6+
#SparseVector = #sparse_tensor.encoding<{map = (d0) -> (d0 : compressed)}>
77

88
#trait = {
99
indexing_maps = [

0 commit comments

Comments
 (0)