diff options
Diffstat (limited to 'mlir/test/Integration/Dialect')
80 files changed, 197 insertions, 197 deletions
diff --git a/mlir/test/Integration/Dialect/SparseTensor/CPU/concatenate_dim_0.mlir b/mlir/test/Integration/Dialect/SparseTensor/CPU/concatenate_dim_0.mlir index f0408a56c6d6..746881ed6527 100644 --- a/mlir/test/Integration/Dialect/SparseTensor/CPU/concatenate_dim_0.mlir +++ b/mlir/test/Integration/Dialect/SparseTensor/CPU/concatenate_dim_0.mlir @@ -26,26 +26,26 @@ // REDEFINE: FileCheck %s // RUN: %{compile} | mlir-translate -mlir-to-llvmir | %{run} -#MAT_C_C = #sparse_tensor.encoding<{dimLevelType = ["compressed", "compressed"]}> -#MAT_D_C = #sparse_tensor.encoding<{dimLevelType = ["dense", "compressed"]}> -#MAT_C_D = #sparse_tensor.encoding<{dimLevelType = ["compressed", "dense"]}> +#MAT_C_C = #sparse_tensor.encoding<{lvlTypes = ["compressed", "compressed"]}> +#MAT_D_C = #sparse_tensor.encoding<{lvlTypes = ["dense", "compressed"]}> +#MAT_C_D = #sparse_tensor.encoding<{lvlTypes = ["compressed", "dense"]}> #MAT_D_D = #sparse_tensor.encoding<{ - dimLevelType = ["dense", "dense"], + lvlTypes = ["dense", "dense"], dimOrdering = affine_map<(i,j) -> (j,i)> }> #MAT_C_C_P = #sparse_tensor.encoding<{ - dimLevelType = [ "compressed", "compressed" ], + lvlTypes = [ "compressed", "compressed" ], dimOrdering = affine_map<(i,j) -> (j,i)> }> #MAT_C_D_P = #sparse_tensor.encoding<{ - dimLevelType = [ "compressed", "dense" ], + lvlTypes = [ "compressed", "dense" ], dimOrdering = affine_map<(i,j) -> (j,i)> }> #MAT_D_C_P = #sparse_tensor.encoding<{ - dimLevelType = [ "dense", "compressed" ], + lvlTypes = [ "dense", "compressed" ], dimOrdering = affine_map<(i,j) -> (j,i)> }> diff --git a/mlir/test/Integration/Dialect/SparseTensor/CPU/concatenate_dim_0_permute.mlir b/mlir/test/Integration/Dialect/SparseTensor/CPU/concatenate_dim_0_permute.mlir index 30427d9c2594..e9c430a10459 100644 --- a/mlir/test/Integration/Dialect/SparseTensor/CPU/concatenate_dim_0_permute.mlir +++ b/mlir/test/Integration/Dialect/SparseTensor/CPU/concatenate_dim_0_permute.mlir @@ -26,26 +26,26 @@ // REDEFINE: FileCheck %s // RUN: %{compile} | mlir-translate -mlir-to-llvmir | %{run} -#MAT_C_C = #sparse_tensor.encoding<{dimLevelType = ["compressed", "compressed"]}> -#MAT_D_C = #sparse_tensor.encoding<{dimLevelType = ["dense", "compressed"]}> -#MAT_C_D = #sparse_tensor.encoding<{dimLevelType = ["compressed", "dense"]}> +#MAT_C_C = #sparse_tensor.encoding<{lvlTypes = ["compressed", "compressed"]}> +#MAT_D_C = #sparse_tensor.encoding<{lvlTypes = ["dense", "compressed"]}> +#MAT_C_D = #sparse_tensor.encoding<{lvlTypes = ["compressed", "dense"]}> #MAT_D_D = #sparse_tensor.encoding<{ - dimLevelType = ["dense", "dense"], + lvlTypes = ["dense", "dense"], dimOrdering = affine_map<(i,j) -> (j,i)> }> #MAT_C_C_P = #sparse_tensor.encoding<{ - dimLevelType = [ "compressed", "compressed" ], + lvlTypes = [ "compressed", "compressed" ], dimOrdering = affine_map<(i,j) -> (j,i)> }> #MAT_C_D_P = #sparse_tensor.encoding<{ - dimLevelType = [ "compressed", "dense" ], + lvlTypes = [ "compressed", "dense" ], dimOrdering = affine_map<(i,j) -> (j,i)> }> #MAT_D_C_P = #sparse_tensor.encoding<{ - dimLevelType = [ "dense", "compressed" ], + lvlTypes = [ "dense", "compressed" ], dimOrdering = affine_map<(i,j) -> (j,i)> }> diff --git a/mlir/test/Integration/Dialect/SparseTensor/CPU/concatenate_dim_1.mlir b/mlir/test/Integration/Dialect/SparseTensor/CPU/concatenate_dim_1.mlir index 9af88ba40f30..d5e47b985bcd 100644 --- a/mlir/test/Integration/Dialect/SparseTensor/CPU/concatenate_dim_1.mlir +++ b/mlir/test/Integration/Dialect/SparseTensor/CPU/concatenate_dim_1.mlir @@ -16,26 +16,26 @@ // REDEFINE: %{option} = "enable-runtime-library=false enable-buffer-initialization=true vl=4 reassociate-fp-reductions=true enable-index-optimizations=true" // RUN: %{compile} | %{run} -#MAT_C_C = #sparse_tensor.encoding<{dimLevelType = ["compressed", "compressed"]}> -#MAT_D_C = #sparse_tensor.encoding<{dimLevelType = ["dense", "compressed"]}> -#MAT_C_D = #sparse_tensor.encoding<{dimLevelType = ["compressed", "dense"]}> +#MAT_C_C = #sparse_tensor.encoding<{lvlTypes = ["compressed", "compressed"]}> +#MAT_D_C = #sparse_tensor.encoding<{lvlTypes = ["dense", "compressed"]}> +#MAT_C_D = #sparse_tensor.encoding<{lvlTypes = ["compressed", "dense"]}> #MAT_D_D = #sparse_tensor.encoding<{ - dimLevelType = ["dense", "dense"], + lvlTypes = ["dense", "dense"], dimOrdering = affine_map<(i,j) -> (j,i)> }> #MAT_C_C_P = #sparse_tensor.encoding<{ - dimLevelType = [ "compressed", "compressed" ], + lvlTypes = [ "compressed", "compressed" ], dimOrdering = affine_map<(i,j) -> (j,i)> }> #MAT_C_D_P = #sparse_tensor.encoding<{ - dimLevelType = [ "compressed", "dense" ], + lvlTypes = [ "compressed", "dense" ], dimOrdering = affine_map<(i,j) -> (j,i)> }> #MAT_D_C_P = #sparse_tensor.encoding<{ - dimLevelType = [ "dense", "compressed" ], + lvlTypes = [ "dense", "compressed" ], dimOrdering = affine_map<(i,j) -> (j,i)> }> diff --git a/mlir/test/Integration/Dialect/SparseTensor/CPU/concatenate_dim_1_permute.mlir b/mlir/test/Integration/Dialect/SparseTensor/CPU/concatenate_dim_1_permute.mlir index 92ffb4c10a65..760390eeb1f5 100644 --- a/mlir/test/Integration/Dialect/SparseTensor/CPU/concatenate_dim_1_permute.mlir +++ b/mlir/test/Integration/Dialect/SparseTensor/CPU/concatenate_dim_1_permute.mlir @@ -26,26 +26,26 @@ // REDEFINE: FileCheck %s // RUN: %{compile} | mlir-translate -mlir-to-llvmir | %{run} -#MAT_C_C = #sparse_tensor.encoding<{dimLevelType = ["compressed", "compressed"]}> -#MAT_D_C = #sparse_tensor.encoding<{dimLevelType = ["dense", "compressed"]}> -#MAT_C_D = #sparse_tensor.encoding<{dimLevelType = ["compressed", "dense"]}> +#MAT_C_C = #sparse_tensor.encoding<{lvlTypes = ["compressed", "compressed"]}> +#MAT_D_C = #sparse_tensor.encoding<{lvlTypes = ["dense", "compressed"]}> +#MAT_C_D = #sparse_tensor.encoding<{lvlTypes = ["compressed", "dense"]}> #MAT_D_D = #sparse_tensor.encoding<{ - dimLevelType = ["dense", "dense"], + lvlTypes = ["dense", "dense"], dimOrdering = affine_map<(i,j) -> (j,i)> }> #MAT_C_C_P = #sparse_tensor.encoding<{ - dimLevelType = [ "compressed", "compressed" ], + lvlTypes = [ "compressed", "compressed" ], dimOrdering = affine_map<(i,j) -> (j,i)> }> #MAT_C_D_P = #sparse_tensor.encoding<{ - dimLevelType = [ "compressed", "dense" ], + lvlTypes = [ "compressed", "dense" ], dimOrdering = affine_map<(i,j) -> (j,i)> }> #MAT_D_C_P = #sparse_tensor.encoding<{ - dimLevelType = [ "dense", "compressed" ], + lvlTypes = [ "dense", "compressed" ], dimOrdering = affine_map<(i,j) -> (j,i)> }> diff --git a/mlir/test/Integration/Dialect/SparseTensor/CPU/dense_output.mlir b/mlir/test/Integration/Dialect/SparseTensor/CPU/dense_output.mlir index 0f45ea8a3fce..32efaf7857c6 100644 --- a/mlir/test/Integration/Dialect/SparseTensor/CPU/dense_output.mlir +++ b/mlir/test/Integration/Dialect/SparseTensor/CPU/dense_output.mlir @@ -31,12 +31,12 @@ !Filename = !llvm.ptr<i8> #DenseMatrix = #sparse_tensor.encoding<{ - dimLevelType = [ "dense", "dense" ], + lvlTypes = [ "dense", "dense" ], dimOrdering = affine_map<(i,j) -> (i,j)> }> #SparseMatrix = #sparse_tensor.encoding<{ - dimLevelType = [ "dense", "compressed" ], + lvlTypes = [ "dense", "compressed" ], dimOrdering = affine_map<(i,j) -> (i,j)> }> diff --git a/mlir/test/Integration/Dialect/SparseTensor/CPU/dense_output_bf16.mlir b/mlir/test/Integration/Dialect/SparseTensor/CPU/dense_output_bf16.mlir index 9af4e6454762..ee88a5185207 100644 --- a/mlir/test/Integration/Dialect/SparseTensor/CPU/dense_output_bf16.mlir +++ b/mlir/test/Integration/Dialect/SparseTensor/CPU/dense_output_bf16.mlir @@ -17,8 +17,8 @@ // UNSUPPORTED: target=aarch64{{.*}} -#SparseVector = #sparse_tensor.encoding<{dimLevelType = ["compressed"]}> -#DenseVector = #sparse_tensor.encoding<{dimLevelType = ["dense"]}> +#SparseVector = #sparse_tensor.encoding<{lvlTypes = ["compressed"]}> +#DenseVector = #sparse_tensor.encoding<{lvlTypes = ["dense"]}> #trait_vec_op = { indexing_maps = [ diff --git a/mlir/test/Integration/Dialect/SparseTensor/CPU/dense_output_f16.mlir b/mlir/test/Integration/Dialect/SparseTensor/CPU/dense_output_f16.mlir index 03b05b156418..411eca591c14 100644 --- a/mlir/test/Integration/Dialect/SparseTensor/CPU/dense_output_f16.mlir +++ b/mlir/test/Integration/Dialect/SparseTensor/CPU/dense_output_f16.mlir @@ -26,8 +26,8 @@ // REDEFINE: FileCheck %s // RUN: %{compile} | mlir-translate -mlir-to-llvmir | %{run} -#SparseVector = #sparse_tensor.encoding<{dimLevelType = ["compressed"]}> -#DenseVector = #sparse_tensor.encoding<{dimLevelType = ["dense"]}> +#SparseVector = #sparse_tensor.encoding<{lvlTypes = ["compressed"]}> +#DenseVector = #sparse_tensor.encoding<{lvlTypes = ["dense"]}> #trait_vec_op = { indexing_maps = [ diff --git a/mlir/test/Integration/Dialect/SparseTensor/CPU/reshape_dot.mlir b/mlir/test/Integration/Dialect/SparseTensor/CPU/reshape_dot.mlir index 7ae4d59c3a90..1d67db01db11 100644 --- a/mlir/test/Integration/Dialect/SparseTensor/CPU/reshape_dot.mlir +++ b/mlir/test/Integration/Dialect/SparseTensor/CPU/reshape_dot.mlir @@ -16,8 +16,8 @@ // REDEFINE: %{option} = "enable-runtime-library=false vl=2 reassociate-fp-reductions=true enable-index-optimizations=true" // RUN: %{compile} | %{run} -#COO_2D = #sparse_tensor.encoding<{ dimLevelType = [ "compressed-nu", "singleton" ], posWidth = 32, crdWidth = 32 }> -#COO_3D = #sparse_tensor.encoding<{ dimLevelType = [ "compressed-nu", "singleton-nu", "singleton" ], posWidth = 32, crdWidth = 32 }> +#COO_2D = #sparse_tensor.encoding<{ lvlTypes = [ "compressed-nu", "singleton" ], posWidth = 32, crdWidth = 32 }> +#COO_3D = #sparse_tensor.encoding<{ lvlTypes = [ "compressed-nu", "singleton-nu", "singleton" ], posWidth = 32, crdWidth = 32 }> module { func.func private @printMemref3dF32(%ptr : tensor<?x?x?xf32>) attributes { llvm.emit_c_interface } diff --git a/mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_abs.mlir b/mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_abs.mlir index 69336f1964d7..bc4a6e461852 100644 --- a/mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_abs.mlir +++ b/mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_abs.mlir @@ -26,7 +26,7 @@ // REDEFINE: FileCheck %s // RUN: %{compile} | mlir-translate -mlir-to-llvmir | %{run} -#SparseVector = #sparse_tensor.encoding<{ dimLevelType = [ "compressed" ] }> +#SparseVector = #sparse_tensor.encoding<{ lvlTypes = [ "compressed" ] }> #trait_op = { indexing_maps = [ diff --git a/mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_binary.mlir b/mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_binary.mlir index 8a1d92fe9973..4f478412a157 100644 --- a/mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_binary.mlir +++ b/mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_binary.mlir @@ -26,8 +26,8 @@ // REDEFINE: FileCheck %s // RUN: %{compile} | mlir-translate -mlir-to-llvmir | %{run} -#SparseVector = #sparse_tensor.encoding<{dimLevelType = ["compressed"]}> -#DCSR = #sparse_tensor.encoding<{dimLevelType = ["compressed", "compressed"]}> +#SparseVector = #sparse_tensor.encoding<{lvlTypes = ["compressed"]}> +#DCSR = #sparse_tensor.encoding<{lvlTypes = ["compressed", "compressed"]}> // // Traits for tensor operations. diff --git a/mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_cast.mlir b/mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_cast.mlir index 0571104e7870..f683dabb46a9 100644 --- a/mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_cast.mlir +++ b/mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_cast.mlir @@ -26,7 +26,7 @@ // REDEFINE: FileCheck %s // RUN: %{compile} | mlir-translate -mlir-to-llvmir | %{run} -#SV = #sparse_tensor.encoding<{ dimLevelType = [ "compressed" ] }> +#SV = #sparse_tensor.encoding<{ lvlTypes = [ "compressed" ] }> #trait_cast = { indexing_maps = [ diff --git a/mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_codegen_dim.mlir b/mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_codegen_dim.mlir index cdfd87e339f8..ea61dddfb9bd 100644 --- a/mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_codegen_dim.mlir +++ b/mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_codegen_dim.mlir @@ -27,7 +27,7 @@ // RUN: %{compile} | mlir-translate -mlir-to-llvmir | %{run} #DCSR = #sparse_tensor.encoding<{ - dimLevelType = [ "compressed", "compressed"] + lvlTypes = [ "compressed", "compressed"] }> module { diff --git a/mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_codegen_foreach.mlir b/mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_codegen_foreach.mlir index 1b2492aecc2f..c3fb424d2361 100644 --- a/mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_codegen_foreach.mlir +++ b/mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_codegen_foreach.mlir @@ -27,29 +27,29 @@ // RUN: %{compile} | mlir-translate -mlir-to-llvmir | %{run} #Row = #sparse_tensor.encoding<{ - dimLevelType = [ "compressed", "dense" ] + lvlTypes = [ "compressed", "dense" ] }> #CSR = #sparse_tensor.encoding<{ - dimLevelType = [ "dense", "compressed" ] + lvlTypes = [ "dense", "compressed" ] }> #DCSC = #sparse_tensor.encoding<{ - dimLevelType = [ "compressed", "compressed" ], + lvlTypes = [ "compressed", "compressed" ], dimOrdering = affine_map<(i,j) -> (j,i)> }> #SortedCOO = #sparse_tensor.encoding<{ - dimLevelType = [ "compressed-nu", "singleton" ] + lvlTypes = [ "compressed-nu", "singleton" ] }> #SortedCOOPerm = #sparse_tensor.encoding<{ - dimLevelType = [ "compressed-nu", "singleton" ], + lvlTypes = [ "compressed-nu", "singleton" ], dimOrdering = affine_map<(i,j) -> (j,i)> }> #CCCPerm = #sparse_tensor.encoding<{ - dimLevelType = [ "compressed", "compressed", "compressed"], + lvlTypes = [ "compressed", "compressed", "compressed"], dimOrdering = affine_map<(d0, d1, d2) -> (d1, d2, d0)> }> diff --git a/mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_collapse_shape.mlir b/mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_collapse_shape.mlir index 16a0e790c129..6d14aa5572b4 100755 --- a/mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_collapse_shape.mlir +++ b/mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_collapse_shape.mlir @@ -27,19 +27,19 @@ // RUN: %{compile} | mlir-translate -mlir-to-llvmir | %{run} #SparseVector = #sparse_tensor.encoding<{ - dimLevelType = ["compressed"] + lvlTypes = ["compressed"] }> #SparseMatrix = #sparse_tensor.encoding<{ - dimLevelType = ["compressed", "compressed"] + lvlTypes = ["compressed", "compressed"] }> #Sparse3dTensor = #sparse_tensor.encoding<{ - dimLevelType = ["compressed", "compressed", "compressed"] + lvlTypes = ["compressed", "compressed", "compressed"] }> #Sparse4dTensor = #sparse_tensor.encoding<{ - dimLevelType = ["compressed", "compressed", "compressed", "compressed"] + lvlTypes = ["compressed", "compressed", "compressed", "compressed"] }> // diff --git a/mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_complex32.mlir b/mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_complex32.mlir index c4f00b1e6a3a..4f01ee24700e 100644 --- a/mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_complex32.mlir +++ b/mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_complex32.mlir @@ -26,7 +26,7 @@ // REDEFINE: FileCheck %s // RUN: %{compile} | mlir-translate -mlir-to-llvmir | %{run} -#SparseVector = #sparse_tensor.encoding<{dimLevelType = ["compressed"]}> +#SparseVector = #sparse_tensor.encoding<{lvlTypes = ["compressed"]}> #trait_op = { indexing_maps = [ diff --git a/mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_complex64.mlir b/mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_complex64.mlir index f87af2aa5343..d3b686f69041 100644 --- a/mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_complex64.mlir +++ b/mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_complex64.mlir @@ -26,7 +26,7 @@ // REDEFINE: FileCheck %s // RUN: %{compile} | mlir-translate -mlir-to-llvmir | %{run} -#SparseVector = #sparse_tensor.encoding<{dimLevelType = ["compressed"]}> +#SparseVector = #sparse_tensor.encoding<{lvlTypes = ["compressed"]}> #trait_op = { indexing_maps = [ diff --git a/mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_complex_ops.mlir b/mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_complex_ops.mlir index 2a83410cb34d..06eaeba36a01 100644 --- a/mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_complex_ops.mlir +++ b/mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_complex_ops.mlir @@ -26,7 +26,7 @@ // REDEFINE: FileCheck %s // RUN: %{compile} | mlir-translate -mlir-to-llvmir | %{run} -#SparseVector = #sparse_tensor.encoding<{dimLevelType = ["compressed"]}> +#SparseVector = #sparse_tensor.encoding<{lvlTypes = ["compressed"]}> #trait_op1 = { indexing_maps = [ diff --git a/mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_constant_to_sparse_tensor.mlir b/mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_constant_to_sparse_tensor.mlir index f49cd630d98a..d05fbefb343b 100644 --- a/mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_constant_to_sparse_tensor.mlir +++ b/mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_constant_to_sparse_tensor.mlir @@ -27,7 +27,7 @@ // RUN: %{compile} | mlir-translate -mlir-to-llvmir | %{run} #Tensor1 = #sparse_tensor.encoding<{ - dimLevelType = [ "compressed", "compressed"] + lvlTypes = [ "compressed", "compressed"] }> // diff --git a/mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_conv_1d_nwc_wcf.mlir b/mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_conv_1d_nwc_wcf.mlir index c91466b71e1c..58ef79dbb77f 100644 --- a/mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_conv_1d_nwc_wcf.mlir +++ b/mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_conv_1d_nwc_wcf.mlir @@ -27,10 +27,10 @@ // RUN: %{compile} | mlir-translate -mlir-to-llvmir | %{run} #CCC = #sparse_tensor.encoding<{ - dimLevelType = [ "compressed", "compressed", "compressed" ] }> + lvlTypes = [ "compressed", "compressed", "compressed" ] }> #CDC = #sparse_tensor.encoding<{ - dimLevelType = [ "compressed", "dense", "compressed" ] + lvlTypes = [ "compressed", "dense", "compressed" ] // FIXME: Still inadmissible might need investigation // dimOrdering = affine_map<(i,j,k) -> (j,k,i)> }> diff --git a/mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_conv_2d.mlir b/mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_conv_2d.mlir index 65aa6f894df0..21d6792b04a6 100644 --- a/mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_conv_2d.mlir +++ b/mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_conv_2d.mlir @@ -26,11 +26,11 @@ // REDEFINE: FileCheck %s // RUN: %{compile} | mlir-translate -mlir-to-llvmir | %{run} -#DCSR = #sparse_tensor.encoding<{ dimLevelType = [ "compressed", "compressed" ] }> -#CSR = #sparse_tensor.encoding<{dimLevelType = ["dense", "compressed"]}> -#CDR = #sparse_tensor.encoding<{dimLevelType = ["compressed", "dense"]}> +#DCSR = #sparse_tensor.encoding<{ lvlTypes = [ "compressed", "compressed" ] }> +#CSR = #sparse_tensor.encoding<{lvlTypes = ["dense", "compressed"]}> +#CDR = #sparse_tensor.encoding<{lvlTypes = ["compressed", "dense"]}> #CSC = #sparse_tensor.encoding<{ - dimLevelType = [ "dense", "compressed" ], + lvlTypes = [ "dense", "compressed" ], dimOrdering = affine_map<(i,j) -> (j,i)> }> diff --git a/mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_conv_2d_nhwc_hwcf.mlir b/mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_conv_2d_nhwc_hwcf.mlir index 902496e6eac1..4aca7a73dc8a 100644 --- a/mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_conv_2d_nhwc_hwcf.mlir +++ b/mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_conv_2d_nhwc_hwcf.mlir @@ -27,11 +27,11 @@ // RUN: %{compile} | mlir-translate -mlir-to-llvmir | %{run} #CCCC = #sparse_tensor.encoding<{ - dimLevelType = [ "compressed", "compressed", "compressed", "compressed" ] + lvlTypes = [ "compressed", "compressed", "compressed", "compressed" ] }> #CDCD = #sparse_tensor.encoding<{ - dimLevelType = [ "compressed", "dense", "compressed", "dense" ] + lvlTypes = [ "compressed", "dense", "compressed", "dense" ] }> // Creates and returns 4-D buffer of size (%s1, %s2, %s3, %s4) filled with the value %f diff --git a/mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_conv_3d.mlir b/mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_conv_3d.mlir index 8e2f162ec959..6de03f4c7ba0 100644 --- a/mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_conv_3d.mlir +++ b/mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_conv_3d.mlir @@ -27,15 +27,15 @@ // RUN: %{compile} | mlir-translate -mlir-to-llvmir | %{run} #CCC = #sparse_tensor.encoding<{ - dimLevelType = [ "compressed", "compressed", "compressed" ] + lvlTypes = [ "compressed", "compressed", "compressed" ] }> #CDC = #sparse_tensor.encoding<{ - dimLevelType = [ "compressed", "dense", "compressed" ] + lvlTypes = [ "compressed", "dense", "compressed" ] }> #DDC = #sparse_tensor.encoding<{ - dimLevelType = [ "dense", "compressed", "compressed" ] + lvlTypes = [ "dense", "compressed", "compressed" ] }> // Creates and returns 3-D buffer of size (%s1, %s2, %s3) filled with the value %f diff --git a/mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_conv_3d_ndhwc_dhwcf.mlir b/mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_conv_3d_ndhwc_dhwcf.mlir index ff792d33268f..5dc701e5907b 100644 --- a/mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_conv_3d_ndhwc_dhwcf.mlir +++ b/mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_conv_3d_ndhwc_dhwcf.mlir @@ -27,11 +27,11 @@ // RUN: %{compile} | mlir-translate -mlir-to-llvmir | %{run} #CCCCC = #sparse_tensor.encoding<{ - dimLevelType = [ "compressed", "compressed", "compressed", "compressed", "compressed" ] + lvlTypes = [ "compressed", "compressed", "compressed", "compressed", "compressed" ] }> #CDCDC = #sparse_tensor.encoding<{ - dimLevelType = [ "compressed", "dense", "compressed", "dense", "compressed"] + lvlTypes = [ "compressed", "dense", "compressed", "dense", "compressed"] }> // Creates and returns 5-D buffer of size (%s1, %s2, %s3, %s4, %s5) filled with the value %f diff --git a/mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_conversion.mlir b/mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_conversion.mlir index 05f9a560bd5f..8d62efecb016 100644 --- a/mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_conversion.mlir +++ b/mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_conversion.mlir @@ -27,17 +27,17 @@ // RUN: %{compile} | mlir-translate -mlir-to-llvmir | %{run} #Tensor1 = #sparse_tensor.encoding<{ - dimLevelType = [ "compressed", "compressed", "compressed" ], + lvlTypes = [ "compressed", "compressed", "compressed" ], dimOrdering = affine_map<(i,j,k) -> (i,j,k)> }> #Tensor2 = #sparse_tensor.encoding<{ - dimLevelType = [ "compressed", "compressed", "compressed" ], + lvlTypes = [ "compressed", "compressed", "compressed" ], dimOrdering = affine_map<(i,j,k) -> (j,k,i)> }> #Tensor3 = #sparse_tensor.encoding<{ - dimLevelType = [ "compressed", "compressed", "compressed" ], + lvlTypes = [ "compressed", "compressed", "compressed" ], dimOrdering = affine_map<(i,j,k) -> (k,i,j)> }> diff --git a/mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_conversion_dyn.mlir b/mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_conversion_dyn.mlir index a829d73e1551..e2fcdc2b56ad 100644 --- a/mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_conversion_dyn.mlir +++ b/mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_conversion_dyn.mlir @@ -27,11 +27,11 @@ // RUN: %{compile} | mlir-translate -mlir-to-llvmir | %{run} #DCSR = #sparse_tensor.encoding<{ - dimLevelType = [ "compressed", "compressed" ] + lvlTypes = [ "compressed", "compressed" ] }> #DCSC = #sparse_tensor.encoding<{ - dimLevelType = [ "compressed", "compressed" ], + lvlTypes = [ "compressed", "compressed" ], dimOrdering = affine_map<(i,j) -> (j,i)> }> diff --git a/mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_conversion_element.mlir b/mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_conversion_element.mlir index 564ee40c1a2f..e3fbc71880d0 100644 --- a/mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_conversion_element.mlir +++ b/mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_conversion_element.mlir @@ -23,15 +23,15 @@ // RUN: %{compile} | mlir-translate -mlir-to-llvmir | %{run} #Tensor1 = #sparse_tensor.encoding<{ - dimLevelType = [ "compressed-nu", "singleton-nu", "singleton" ] + lvlTypes = [ "compressed-nu", "singleton-nu", "singleton" ] }> #Tensor2 = #sparse_tensor.encoding<{ - dimLevelType = [ "dense", "compressed", "dense" ] + lvlTypes = [ "dense", "compressed", "dense" ] }> #Tensor3 = #sparse_tensor.encoding<{ - dimLevelType = [ "dense", "dense", "compressed" ], + lvlTypes = [ "dense", "dense", "compressed" ], dimOrdering = affine_map<(i,j,k) -> (i,k,j)> }> diff --git a/mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_conversion_ptr.mlir b/mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_conversion_ptr.mlir index 6f5fadaa2035..bff64ea0b71d 100644 --- a/mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_conversion_ptr.mlir +++ b/mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_conversion_ptr.mlir @@ -27,20 +27,20 @@ // RUN: %{compile} | mlir-translate -mlir-to-llvmir | %{run} #DCSR = #sparse_tensor.encoding<{ - dimLevelType = [ "compressed", "compressed" ], + lvlTypes = [ "compressed", "compressed" ], posWidth = 8, crdWidth = 8 }> #DCSC = #sparse_tensor.encoding<{ - dimLevelType = [ "compressed", "compressed" ], + lvlTypes = [ "compressed", "compressed" ], dimOrdering = affine_map<(i,j) -> (j,i)>, posWidth = 64, crdWidth = 64 }> #CSC = #sparse_tensor.encoding<{ - dimLevelType = [ "dense", "compressed" ], + lvlTypes = [ "dense", "compressed" ], dimOrdering = affine_map<(i,j) -> (j,i)>, posWidth = 16, crdWidth = 32 diff --git a/mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_conversion_sparse2dense.mlir b/mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_conversion_sparse2dense.mlir index 64e17e961be3..d2658afe0850 100644 --- a/mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_conversion_sparse2dense.mlir +++ b/mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_conversion_sparse2dense.mlir @@ -27,32 +27,32 @@ // RUN: %{compile} | mlir-translate -mlir-to-llvmir | %{run} #Tensor1 = #sparse_tensor.encoding<{ - dimLevelType = [ "compressed", "compressed", "compressed" ], + lvlTypes = [ "compressed", "compressed", "compressed" ], dimOrdering = affine_map<(i,j,k) -> (i,j,k)> }> #Tensor2 = #sparse_tensor.encoding<{ - dimLevelType = [ "compressed", "compressed", "compressed" ], + lvlTypes = [ "compressed", "compressed", "compressed" ], dimOrdering = affine_map<(i,j,k) -> (j,k,i)> }> #Tensor3 = #sparse_tensor.encoding<{ - dimLevelType = [ "compressed", "compressed", "compressed" ], + lvlTypes = [ "compressed", "compressed", "compressed" ], dimOrdering = affine_map<(i,j,k) -> (k,i,j)> }> #Tensor4 = #sparse_tensor.encoding<{ - dimLevelType = [ "dense", "compressed", "compressed" ], + lvlTypes = [ "dense", "compressed", "compressed" ], dimOrdering = affine_map<(i,j,k) -> (i,j,k)> }> #Tensor5 = #sparse_tensor.encoding<{ - dimLevelType = [ "dense", "compressed", "compressed" ], + lvlTypes = [ "dense", "compressed", "compressed" ], dimOrdering = affine_map<(i,j,k) -> (j,k,i)> }> #Tensor6 = #sparse_tensor.encoding<{ - dimLevelType = [ "dense", "compressed", "compressed" ], + lvlTypes = [ "dense", "compressed", "compressed" ], dimOrdering = affine_map<(i,j,k) -> (k,i,j)> }> diff --git a/mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_conversion_sparse2sparse.mlir b/mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_conversion_sparse2sparse.mlir index 393dee01b07b..318d24fc6727 100644 --- a/mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_conversion_sparse2sparse.mlir +++ b/mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_conversion_sparse2sparse.mlir @@ -28,32 +28,32 @@ // RUN: %{compile} | mlir-translate -mlir-to-llvmir | %{run} #Tensor1 = #sparse_tensor.encoding<{ - dimLevelType = [ "dense", "dense", "compressed" ] + lvlTypes = [ "dense", "dense", "compressed" ] }> // NOTE: dense after compressed is not currently supported for the target // of direct-sparse2sparse conversion. (It's fine for the source though.) #Tensor2 = #sparse_tensor.encoding<{ - dimLevelType = [ "dense", "compressed", "dense" ] + lvlTypes = [ "dense", "compressed", "dense" ] }> #Tensor3 = #sparse_tensor.encoding<{ - dimLevelType = [ "dense", "dense", "compressed" ], + lvlTypes = [ "dense", "dense", "compressed" ], dimOrdering = affine_map<(i,j,k) -> (i,k,j)> }> #SingletonTensor1 = #sparse_tensor.encoding<{ - dimLevelType = [ "dense", "compressed", "singleton" ] + lvlTypes = [ "dense", "compressed", "singleton" ] }> // This also checks the compressed->dense conversion (when there are zeros). #SingletonTensor2 = #sparse_tensor.encoding<{ - dimLevelType = [ "dense", "dense", "singleton" ] + lvlTypes = [ "dense", "dense", "singleton" ] }> // This also checks the singleton->compressed conversion. #SingletonTensor3 = #sparse_tensor.encoding<{ - dimLevelType = [ "dense", "dense", "compressed" ] + lvlTypes = [ "dense", "dense", "compressed" ] }> module { diff --git a/mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_coo_test.mlir b/mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_coo_test.mlir index bffd171bee4d..ca0abc7be676 100644 --- a/mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_coo_test.mlir +++ b/mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_coo_test.mlir @@ -27,11 +27,11 @@ // RUN: %{compile} | mlir-translate -mlir-to-llvmir | %{run} #SortedCOO = #sparse_tensor.encoding<{ - dimLevelType = [ "compressed-nu", "singleton" ] + lvlTypes = [ "compressed-nu", "singleton" ] }> #CSR = #sparse_tensor.encoding<{ - dimLevelType = [ "dense", "compressed" ] + lvlTypes = [ "dense", "compressed" ] }> #trait = { @@ -181,4 +181,4 @@ module { return } -}
\ No newline at end of file +} diff --git a/mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_dot.mlir b/mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_dot.mlir index 5e52415c34ea..39b30f9872c9 100644 --- a/mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_dot.mlir +++ b/mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_dot.mlir @@ -26,7 +26,7 @@ // REDEFINE: FileCheck %s // RUN: %{compile} | mlir-translate -mlir-to-llvmir | %{run} -#SparseVector = #sparse_tensor.encoding<{ dimLevelType = [ "compressed" ] }> +#SparseVector = #sparse_tensor.encoding<{ lvlTypes = [ "compressed" ] }> module { diff --git a/mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_expand.mlir b/mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_expand.mlir index f22e04685edc..a00f3d7a3011 100644 --- a/mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_expand.mlir +++ b/mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_expand.mlir @@ -26,7 +26,7 @@ // RUN: %{compile} | mlir-translate -mlir-to-llvmir | %{run} #CSC = #sparse_tensor.encoding<{ - dimLevelType = [ "dense", "compressed" ], + lvlTypes = [ "dense", "compressed" ], dimOrdering = affine_map<(i,j) -> (j,i)> }> diff --git a/mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_expand_shape.mlir b/mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_expand_shape.mlir index 8b4863e069b2..5ee8f968e8d0 100644 --- a/mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_expand_shape.mlir +++ b/mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_expand_shape.mlir @@ -27,19 +27,19 @@ // RUN: %{compile} | mlir-translate -mlir-to-llvmir | %{run} #SparseVector = #sparse_tensor.encoding<{ - dimLevelType = ["compressed"] + lvlTypes = ["compressed"] }> #SparseMatrix = #sparse_tensor.encoding<{ - dimLevelType = ["compressed", "compressed"] + lvlTypes = ["compressed", "compressed"] }> #Sparse3dTensor = #sparse_tensor.encoding<{ - dimLevelType = ["compressed", "compressed", "compressed"] + lvlTypes = ["compressed", "compressed", "compressed"] }> #Sparse4dTensor = #sparse_tensor.encoding<{ - dimLevelType = ["compressed", "compressed", "compressed", "compressed"] + lvlTypes = ["compressed", "compressed", "compressed", "compressed"] }> // diff --git a/mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_filter_conv2d.mlir b/mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_filter_conv2d.mlir index 69fa2cc57eac..8c42edbab64a 100644 --- a/mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_filter_conv2d.mlir +++ b/mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_filter_conv2d.mlir @@ -26,7 +26,7 @@ // REDEFINE: FileCheck %s // RUN: %{compile} | mlir-translate -mlir-to-llvmir | %{run} -#DCSR = #sparse_tensor.encoding<{ dimLevelType = [ "compressed", "compressed" ] }> +#DCSR = #sparse_tensor.encoding<{ lvlTypes = [ "compressed", "compressed" ] }> // An example of a 2D convolution with a sparse filter. module { diff --git a/mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_flatten.mlir b/mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_flatten.mlir index bdb167366158..7109ef481c5d 100644 --- a/mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_flatten.mlir +++ b/mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_flatten.mlir @@ -31,7 +31,7 @@ !Filename = !llvm.ptr<i8> #SparseTensor = #sparse_tensor.encoding<{ - dimLevelType = [ "compressed", "compressed", "compressed", "compressed", + lvlTypes = [ "compressed", "compressed", "compressed", "compressed", "compressed", "compressed", "compressed", "compressed" ], // Note that any dimOrdering permutation should give the same results // since, even though it impacts the sparse storage scheme layout, diff --git a/mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_foreach_slices.mlir b/mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_foreach_slices.mlir index d51374b1fe3f..43b75f8aa2fe 100644 --- a/mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_foreach_slices.mlir +++ b/mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_foreach_slices.mlir @@ -11,30 +11,30 @@ // TODO: support slices on lib path #CSR = #sparse_tensor.encoding<{ - dimLevelType = [ "dense", "compressed" ] + lvlTypes = [ "dense", "compressed" ] }> #CSR_SLICE = #sparse_tensor.encoding<{ - dimLevelType = [ "dense", "compressed" ], + lvlTypes = [ "dense", "compressed" ], slice = [ (1, 4, 1), (1, 4, 2) ] }> #CSR_SLICE_DYN = #sparse_tensor.encoding<{ - dimLevelType = [ "dense", "compressed" ], + lvlTypes = [ "dense", "compressed" ], slice = [ (?, ?, ?), (?, ?, ?) ] }> #COO = #sparse_tensor.encoding<{ - dimLevelType = [ "compressed-nu", "singleton" ] + lvlTypes = [ "compressed-nu", "singleton" ] }> #COO_SLICE = #sparse_tensor.encoding<{ - dimLevelType = [ "compressed-nu", "singleton" ], + lvlTypes = [ "compressed-nu", "singleton" ], slice = [ (1, 4, 1), (1, 4, 2) ] }> #COO_SLICE_DYN = #sparse_tensor.encoding<{ - dimLevelType = [ "compressed-nu", "singleton" ], + lvlTypes = [ "compressed-nu", "singleton" ], slice = [ (?, ?, ?), (?, ?, ?) ] }> diff --git a/mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_index.mlir b/mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_index.mlir index ecfa5682aa56..cbbae029aefd 100644 --- a/mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_index.mlir +++ b/mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_index.mlir @@ -27,11 +27,11 @@ // RUN: %{compile} | mlir-translate -mlir-to-llvmir | %{run} #SparseVector = #sparse_tensor.encoding<{ - dimLevelType = ["compressed"] + lvlTypes = ["compressed"] }> #SparseMatrix = #sparse_tensor.encoding<{ - dimLevelType = ["compressed", "compressed"] + lvlTypes = ["compressed", "compressed"] }> #trait_1d = { diff --git a/mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_index_dense.mlir b/mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_index_dense.mlir index 31fd43be936e..4b3a562fe444 100644 --- a/mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_index_dense.mlir +++ b/mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_index_dense.mlir @@ -27,11 +27,11 @@ // RUN: %{compile} | mlir-translate -mlir-to-llvmir | %{run} #SparseVector = #sparse_tensor.encoding<{ - dimLevelType = ["compressed"] + lvlTypes = ["compressed"] }> #SparseMatrix = #sparse_tensor.encoding<{ - dimLevelType = ["compressed", "compressed"] + lvlTypes = ["compressed", "compressed"] }> #trait_1d = { diff --git a/mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_insert_1d.mlir b/mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_insert_1d.mlir index 027be9d4f7dc..8b91b05a99a1 100644 --- a/mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_insert_1d.mlir +++ b/mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_insert_1d.mlir @@ -24,7 +24,7 @@ // Insertion example using pure codegen (no sparse runtime support lib). -#SparseVector = #sparse_tensor.encoding<{ dimLevelType = [ "compressed" ] }> +#SparseVector = #sparse_tensor.encoding<{ lvlTypes = [ "compressed" ] }> #trait_mul_s = { indexing_maps = [ diff --git a/mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_insert_2d.mlir b/mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_insert_2d.mlir index d07712b28326..e79c55e4a807 100644 --- a/mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_insert_2d.mlir +++ b/mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_insert_2d.mlir @@ -23,23 +23,23 @@ // RUN: %{compile} | mlir-translate -mlir-to-llvmir | %{run} #Dense = #sparse_tensor.encoding<{ - dimLevelType = ["dense", "dense"] + lvlTypes = ["dense", "dense"] }> #SortedCOO = #sparse_tensor.encoding<{ - dimLevelType = [ "compressed-nu", "singleton" ] + lvlTypes = [ "compressed-nu", "singleton" ] }> #CSR = #sparse_tensor.encoding<{ - dimLevelType = [ "dense", "compressed" ] + lvlTypes = [ "dense", "compressed" ] }> #DCSR = #sparse_tensor.encoding<{ - dimLevelType = [ "compressed", "compressed" ] + lvlTypes = [ "compressed", "compressed" ] }> #Row = #sparse_tensor.encoding<{ - dimLevelType = [ "compressed", "dense" ] + lvlTypes = [ "compressed", "dense" ] }> module { diff --git a/mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_insert_3d.mlir b/mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_insert_3d.mlir index 1c804b622eaa..848ed1a8afbe 100644 --- a/mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_insert_3d.mlir +++ b/mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_insert_3d.mlir @@ -23,19 +23,19 @@ // RUN: %{compile} | mlir-translate -mlir-to-llvmir | %{run} #TensorCSR = #sparse_tensor.encoding<{ - dimLevelType = [ "compressed", "dense", "compressed" ] + lvlTypes = [ "compressed", "dense", "compressed" ] }> #TensorRow = #sparse_tensor.encoding<{ - dimLevelType = [ "compressed", "compressed", "dense" ] + lvlTypes = [ "compressed", "compressed", "dense" ] }> #CCoo = #sparse_tensor.encoding<{ - dimLevelType = [ "compressed", "compressed-nu", "singleton" ] + lvlTypes = [ "compressed", "compressed-nu", "singleton" ] }> #DCoo = #sparse_tensor.encoding<{ - dimLevelType = [ "dense", "compressed-nu", "singleton" ] + lvlTypes = [ "dense", "compressed-nu", "singleton" ] }> diff --git a/mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_matmul.mlir b/mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_matmul.mlir index e768389b8afb..fbcb6ecf8a4c 100644 --- a/mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_matmul.mlir +++ b/mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_matmul.mlir @@ -37,12 +37,12 @@ // TODO: Investigate the output generated for SVE, see https://github.com/llvm/llvm-project/issues/60626 #CSR = #sparse_tensor.encoding<{ - dimLevelType = [ "dense", "compressed" ], + lvlTypes = [ "dense", "compressed" ], dimOrdering = affine_map<(i,j) -> (i,j)> }> #DCSR = #sparse_tensor.encoding<{ - dimLevelType = [ "compressed", "compressed" ], + lvlTypes = [ "compressed", "compressed" ], dimOrdering = affine_map<(i,j) -> (i,j)> }> diff --git a/mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_matmul_slice.mlir b/mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_matmul_slice.mlir index 1187cfe9655a..c5d6032db0e6 100644 --- a/mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_matmul_slice.mlir +++ b/mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_matmul_slice.mlir @@ -11,54 +11,54 @@ // TODO: support lib path. #DCSR = #sparse_tensor.encoding<{ - dimLevelType = [ "compressed", "compressed" ] + lvlTypes = [ "compressed", "compressed" ] }> #DCSR_SLICE = #sparse_tensor.encoding<{ - dimLevelType = [ "compressed", "compressed" ], + lvlTypes = [ "compressed", "compressed" ], slice = [ (0, 4, 1), (0, 8, 1) ] }> #CSR = #sparse_tensor.encoding<{ - dimLevelType = [ "dense", "compressed" ] + lvlTypes = [ "dense", "compressed" ] }> #CSR_SLICE = #sparse_tensor.encoding<{ - dimLevelType = [ "dense", "compressed" ], + lvlTypes = [ "dense", "compressed" ], slice = [ (0, 4, 1), (0, 8, 1) ] }> #COO = #sparse_tensor.encoding<{ - dimLevelType = [ "compressed-nu", "singleton" ] + lvlTypes = [ "compressed-nu", "singleton" ] }> #CSR_SLICE_1 = #sparse_tensor.encoding<{ - dimLevelType = [ "dense", "compressed" ], + lvlTypes = [ "dense", "compressed" ], slice = [ (0, 4, 2), (0, 4, 1) ] }> #DCSR_SLICE_1 = #sparse_tensor.encoding<{ - dimLevelType = [ "compressed", "compressed" ], + lvlTypes = [ "compressed", "compressed" ], slice = [ (0, 4, 2), (1, 4, 1) ] }> #COO_SLICE_1 = #sparse_tensor.encoding<{ - dimLevelType = [ "compressed-nu", "singleton" ], + lvlTypes = [ "compressed-nu", "singleton" ], slice = [ (0, 4, 2), (0, 4, 1) ] }> #COO_SLICE_2 = #sparse_tensor.encoding<{ - dimLevelType = [ "compressed-nu", "singleton" ], + lvlTypes = [ "compressed-nu", "singleton" ], slice = [ (0, 4, 2), (1, 4, 1) ] }> #CSR_SLICE_dyn = #sparse_tensor.encoding<{ - dimLevelType = [ "dense", "compressed" ], + lvlTypes = [ "dense", "compressed" ], slice = [ (?, 4, ?), (?, 4, ?) ] }> #DCSR_SLICE_dyn = #sparse_tensor.encoding<{ - dimLevelType = [ "compressed", "compressed" ], + lvlTypes = [ "compressed", "compressed" ], slice = [ (?, 4, ?), (?, 4, ?) ] }> diff --git a/mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_matrix_ops.mlir b/mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_matrix_ops.mlir index 729f8212ce17..c29d387c878f 100644 --- a/mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_matrix_ops.mlir +++ b/mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_matrix_ops.mlir @@ -26,7 +26,7 @@ // REDEFINE: FileCheck %s // RUN: %{compile} | mlir-translate -mlir-to-llvmir | %{run} -#DCSR = #sparse_tensor.encoding<{dimLevelType = ["compressed", "compressed"]}> +#DCSR = #sparse_tensor.encoding<{lvlTypes = ["compressed", "compressed"]}> // // Traits for 2-d tensor (aka matrix) operations. diff --git a/mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_matvec.mlir b/mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_matvec.mlir index 91381ecd9efe..39a6687f6140 100644 --- a/mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_matvec.mlir +++ b/mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_matvec.mlir @@ -38,7 +38,7 @@ !Filename = !llvm.ptr<i8> #SparseMatrix = #sparse_tensor.encoding<{ - dimLevelType = [ "dense", "compressed" ], + lvlTypes = [ "dense", "compressed" ], posWidth = 8, crdWidth = 8 }> diff --git a/mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_mttkrp.mlir b/mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_mttkrp.mlir index 646f328a8b3a..b3ac552382c2 100644 --- a/mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_mttkrp.mlir +++ b/mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_mttkrp.mlir @@ -31,7 +31,7 @@ !Filename = !llvm.ptr<i8> #SparseTensor = #sparse_tensor.encoding<{ - dimLevelType = [ "compressed", "compressed", "compressed" ] + lvlTypes = [ "compressed", "compressed", "compressed" ] }> #mttkrp = { diff --git a/mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_out_mult_elt.mlir b/mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_out_mult_elt.mlir index 29e0b134cfa3..a960a626afc3 100644 --- a/mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_out_mult_elt.mlir +++ b/mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_out_mult_elt.mlir @@ -27,7 +27,7 @@ // RUN: %{compile} | mlir-translate -mlir-to-llvmir | %{run} #DCSR = #sparse_tensor.encoding<{ - dimLevelType = [ "compressed", "compressed" ] + lvlTypes = [ "compressed", "compressed" ] }> #trait_mult_elt = { diff --git a/mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_out_reduction.mlir b/mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_out_reduction.mlir index ad18bd18cf5d..de2b76ad98e8 100644 --- a/mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_out_reduction.mlir +++ b/mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_out_reduction.mlir @@ -27,11 +27,11 @@ // RUN: %{compile} | mlir-translate -mlir-to-llvmir | %{run} #SparseMatrix = #sparse_tensor.encoding<{ - dimLevelType = [ "compressed", "compressed" ] + lvlTypes = [ "compressed", "compressed" ] }> #SparseTensor = #sparse_tensor.encoding<{ - dimLevelType = [ "compressed", "compressed", "compressed" ] + lvlTypes = [ "compressed", "compressed", "compressed" ] }> #redsum = { diff --git a/mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_out_simple.mlir b/mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_out_simple.mlir index 9fb98913a781..5b3493a7aa9a 100644 --- a/mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_out_simple.mlir +++ b/mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_out_simple.mlir @@ -31,7 +31,7 @@ !Filename = !llvm.ptr<i8> #DCSR = #sparse_tensor.encoding<{ - dimLevelType = [ "compressed", "compressed" ], + lvlTypes = [ "compressed", "compressed" ], dimOrdering = affine_map<(i,j) -> (i,j)> }> diff --git a/mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_pack.mlir b/mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_pack.mlir index 34f0188a9272..bc1b24ddea6a 100644 --- a/mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_pack.mlir +++ b/mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_pack.mlir @@ -22,17 +22,17 @@ // TODO: Pack only support CodeGen Path #SortedCOO = #sparse_tensor.encoding<{ - dimLevelType = [ "compressed-nu", "singleton" ] + lvlTypes = [ "compressed-nu", "singleton" ] }> #SortedCOOI32 = #sparse_tensor.encoding<{ - dimLevelType = [ "compressed-nu", "singleton" ], + lvlTypes = [ "compressed-nu", "singleton" ], posWidth = 32, crdWidth = 32 }> #BCOO = #sparse_tensor.encoding<{ - dimLevelType = [ "dense", "compressed-hi-nu", "singleton" ] + lvlTypes = [ "dense", "compressed-hi-nu", "singleton" ] }> module { diff --git a/mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_quantized_matmul.mlir b/mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_quantized_matmul.mlir index e6f79cfbc9cb..29dc30a872ef 100644 --- a/mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_quantized_matmul.mlir +++ b/mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_quantized_matmul.mlir @@ -26,7 +26,7 @@ // REDEFINE: FileCheck %s // RUN: %{compile} | mlir-translate -mlir-to-llvmir | %{run} -#DCSR = #sparse_tensor.encoding<{ dimLevelType = [ "compressed", "compressed" ] }> +#DCSR = #sparse_tensor.encoding<{ lvlTypes = [ "compressed", "compressed" ] }> // An example of a quantized sparse matmul. With the zero offset for the // sparse input, the sparse compiler generates very efficient code for the diff --git a/mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_re_im.mlir b/mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_re_im.mlir index 76f2bb0415f2..c700440353af 100644 --- a/mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_re_im.mlir +++ b/mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_re_im.mlir @@ -26,7 +26,7 @@ // REDEFINE: FileCheck %s // RUN: %{compile} | mlir-translate -mlir-to-llvmir | %{run} -#SparseVector = #sparse_tensor.encoding<{dimLevelType = ["compressed"]}> +#SparseVector = #sparse_tensor.encoding<{lvlTypes = ["compressed"]}> #trait_op = { indexing_maps = [ diff --git a/mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_reduce_custom.mlir b/mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_reduce_custom.mlir index cc28defe78ab..babb0cbfdd40 100644 --- a/mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_reduce_custom.mlir +++ b/mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_reduce_custom.mlir @@ -28,10 +28,10 @@ // Reduction in this file _are_ supported by the AArch64 SVE backend -#SparseVector = #sparse_tensor.encoding<{dimLevelType = ["compressed"]}> -#CSR = #sparse_tensor.encoding<{dimLevelType = ["dense", "compressed"]}> +#SparseVector = #sparse_tensor.encoding<{lvlTypes = ["compressed"]}> +#CSR = #sparse_tensor.encoding<{lvlTypes = ["dense", "compressed"]}> #CSC = #sparse_tensor.encoding<{ - dimLevelType = [ "dense", "compressed" ], + lvlTypes = [ "dense", "compressed" ], dimOrdering = affine_map<(i,j) -> (j,i)> }> diff --git a/mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_reduce_custom_prod.mlir b/mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_reduce_custom_prod.mlir index daab251bc7e1..b31793dd62bb 100644 --- a/mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_reduce_custom_prod.mlir +++ b/mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_reduce_custom_prod.mlir @@ -19,10 +19,10 @@ // the AArch64 SVE backend (so the set-up is a bit different to // sparse_reducitons.mlir) -#SparseVector = #sparse_tensor.encoding<{dimLevelType = ["compressed"]}> -#CSR = #sparse_tensor.encoding<{dimLevelType = ["dense", "compressed"]}> +#SparseVector = #sparse_tensor.encoding<{lvlTypes = ["compressed"]}> +#CSR = #sparse_tensor.encoding<{lvlTypes = ["dense", "compressed"]}> #CSC = #sparse_tensor.encoding<{ - dimLevelType = [ "dense", "compressed" ], + lvlTypes = [ "dense", "compressed" ], dimOrdering = affine_map<(i,j) -> (j,i)> }> diff --git a/mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_reductions.mlir b/mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_reductions.mlir index 6e7163494a23..eb4b50b1dd4c 100644 --- a/mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_reductions.mlir +++ b/mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_reductions.mlir @@ -27,8 +27,8 @@ // Reduction in this file _are_ supported by the AArch64 SVE backend -#SV = #sparse_tensor.encoding<{ dimLevelType = [ "compressed" ] }> -#DV = #sparse_tensor.encoding<{ dimLevelType = [ "dense" ] }> +#SV = #sparse_tensor.encoding<{ lvlTypes = [ "compressed" ] }> +#DV = #sparse_tensor.encoding<{ lvlTypes = [ "dense" ] }> #trait_reduction = { indexing_maps = [ diff --git a/mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_reductions_prod.mlir b/mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_reductions_prod.mlir index bcaf08ce7e59..bd232465107d 100644 --- a/mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_reductions_prod.mlir +++ b/mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_reductions_prod.mlir @@ -19,8 +19,8 @@ // the AArch64 SVE backend (so the set-up is a bit different to // sparse_reducitons.mlir) -#SV = #sparse_tensor.encoding<{ dimLevelType = [ "compressed" ] }> -#DV = #sparse_tensor.encoding<{ dimLevelType = [ "dense" ] }> +#SV = #sparse_tensor.encoding<{ lvlTypes = [ "compressed" ] }> +#DV = #sparse_tensor.encoding<{ lvlTypes = [ "dense" ] }> #trait_reduction = { indexing_maps = [ diff --git a/mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_sampled_matmul.mlir b/mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_sampled_matmul.mlir index f678cdd3f07f..247e49ef76fa 100644 --- a/mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_sampled_matmul.mlir +++ b/mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_sampled_matmul.mlir @@ -31,7 +31,7 @@ !Filename = !llvm.ptr<i8> #SparseMatrix = #sparse_tensor.encoding<{ - dimLevelType = [ "compressed", "compressed" ], + lvlTypes = [ "compressed", "compressed" ], posWidth = 32, crdWidth = 32 }> 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 index 8b373e7038e6..80d5857ce0f6 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 @@ -26,7 +26,7 @@ // REDEFINE: FileCheck %s // RUN: %{compile} | mlir-translate -mlir-to-llvmir | %{run} -#SM = #sparse_tensor.encoding<{ dimLevelType = [ "compressed", "compressed" ] }> +#SM = #sparse_tensor.encoding<{ lvlTypes = [ "compressed", "compressed" ] }> #trait_sampled_dense_dense = { indexing_maps = [ diff --git a/mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_scale.mlir b/mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_scale.mlir index b429fc87bba7..869f87f9ec7e 100644 --- a/mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_scale.mlir +++ b/mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_scale.mlir @@ -22,7 +22,7 @@ // REDEFINE: FileCheck %s // RUN: %{compile} | mlir-translate -mlir-to-llvmir | %{run} -#CSR = #sparse_tensor.encoding<{ dimLevelType = [ "dense", "compressed" ] }> +#CSR = #sparse_tensor.encoding<{ lvlTypes = [ "dense", "compressed" ] }> #trait_scale = { indexing_maps = [ diff --git a/mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_scf_nested.mlir b/mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_scf_nested.mlir index 1be70b56d799..ab226740983f 100644 --- a/mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_scf_nested.mlir +++ b/mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_scf_nested.mlir @@ -23,7 +23,7 @@ // RUN: %{compile} | mlir-translate -mlir-to-llvmir | %{run} #map = affine_map<(d0, d1, d2) -> (d0, d1, d2)> -#SparseMatrix = #sparse_tensor.encoding<{ dimLevelType = [ "compressed", "compressed", "compressed" ] }> +#SparseMatrix = #sparse_tensor.encoding<{ lvlTypes = [ "compressed", "compressed", "compressed" ] }> module @func_sparse.2 { // Do elementwise x+1 when true, x-1 when false diff --git a/mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_select.mlir b/mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_select.mlir index cf103a7239e8..8aeb6a3a5bf5 100644 --- a/mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_select.mlir +++ b/mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_select.mlir @@ -22,10 +22,10 @@ // REDEFINE: FileCheck %s // RUN: %{compile} | mlir-translate -mlir-to-llvmir | %{run} -#SparseVector = #sparse_tensor.encoding<{dimLevelType = ["compressed"]}> -#CSR = #sparse_tensor.encoding<{dimLevelType = ["dense", "compressed"]}> +#SparseVector = #sparse_tensor.encoding<{lvlTypes = ["compressed"]}> +#CSR = #sparse_tensor.encoding<{lvlTypes = ["dense", "compressed"]}> #CSC = #sparse_tensor.encoding<{ - dimLevelType = [ "dense", "compressed" ], + lvlTypes = [ "dense", "compressed" ], dimOrdering = affine_map<(i,j) -> (j,i)> }> diff --git a/mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_sign.mlir b/mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_sign.mlir index 11db2c2ff6e8..e3d89ff150e7 100644 --- a/mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_sign.mlir +++ b/mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_sign.mlir @@ -22,7 +22,7 @@ // REDEFINE: FileCheck %s // RUN: %{compile} | mlir-translate -mlir-to-llvmir | %{run} -#SparseVector = #sparse_tensor.encoding<{ dimLevelType = [ "compressed" ] }> +#SparseVector = #sparse_tensor.encoding<{ lvlTypes = [ "compressed" ] }> #trait_op = { indexing_maps = [ diff --git a/mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_sorted_coo.mlir b/mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_sorted_coo.mlir index 224dedf48a70..f4e46944c79d 100644 --- a/mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_sorted_coo.mlir +++ b/mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_sorted_coo.mlir @@ -29,20 +29,20 @@ !Filename = !llvm.ptr<i8> #SortedCOO = #sparse_tensor.encoding<{ - dimLevelType = [ "compressed-nu", "singleton" ] + lvlTypes = [ "compressed-nu", "singleton" ] }> #SortedCOOPermuted = #sparse_tensor.encoding<{ - dimLevelType = [ "compressed-nu", "singleton" ], + lvlTypes = [ "compressed-nu", "singleton" ], dimOrdering = affine_map<(i,j) -> (j,i)> }> #SortedCOO3D = #sparse_tensor.encoding<{ - dimLevelType = [ "compressed-nu", "singleton-nu", "singleton" ] + lvlTypes = [ "compressed-nu", "singleton-nu", "singleton" ] }> #SortedCOO3DPermuted = #sparse_tensor.encoding<{ - dimLevelType = [ "compressed-nu", "singleton-nu", "singleton" ], + lvlTypes = [ "compressed-nu", "singleton-nu", "singleton" ], dimOrdering = affine_map<(i,j,k) -> (k,i,j)> }> diff --git a/mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_spmm.mlir b/mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_spmm.mlir index c32ae69720bc..dd0280f3c0cc 100644 --- a/mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_spmm.mlir +++ b/mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_spmm.mlir @@ -31,7 +31,7 @@ !Filename = !llvm.ptr<i8> #SparseMatrix = #sparse_tensor.encoding<{ - dimLevelType = [ "dense", "compressed" ] + lvlTypes = [ "dense", "compressed" ] }> #spmm = { diff --git a/mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_storage.mlir b/mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_storage.mlir index 56c9511f63d0..2ec6e00447e8 100644 --- a/mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_storage.mlir +++ b/mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_storage.mlir @@ -31,33 +31,33 @@ // #Dense = #sparse_tensor.encoding<{ - dimLevelType = [ "dense", "dense" ] + lvlTypes = [ "dense", "dense" ] }> #CSR = #sparse_tensor.encoding<{ - dimLevelType = [ "dense", "compressed" ] + lvlTypes = [ "dense", "compressed" ] }> #DCSR = #sparse_tensor.encoding<{ - dimLevelType = [ "compressed", "compressed" ] + lvlTypes = [ "compressed", "compressed" ] }> #CSC = #sparse_tensor.encoding<{ - dimLevelType = [ "dense", "compressed" ], + lvlTypes = [ "dense", "compressed" ], dimOrdering = affine_map<(i,j) -> (j,i)> }> #DCSC = #sparse_tensor.encoding<{ - dimLevelType = [ "compressed", "compressed" ], + lvlTypes = [ "compressed", "compressed" ], dimOrdering = affine_map<(i,j) -> (j,i)> }> #BlockRow = #sparse_tensor.encoding<{ - dimLevelType = [ "compressed", "dense" ] + lvlTypes = [ "compressed", "dense" ] }> #BlockCol = #sparse_tensor.encoding<{ - dimLevelType = [ "compressed", "dense" ], + lvlTypes = [ "compressed", "dense" ], dimOrdering = affine_map<(i,j) -> (j,i)> }> diff --git a/mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_sum.mlir b/mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_sum.mlir index f9b1ad72ed54..be40e7030b20 100644 --- a/mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_sum.mlir +++ b/mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_sum.mlir @@ -34,7 +34,7 @@ !Filename = !llvm.ptr<i8> #SparseMatrix = #sparse_tensor.encoding<{ - dimLevelType = [ "compressed", "compressed" ] + lvlTypes = [ "compressed", "compressed" ] }> #trait_sum_reduce = { diff --git a/mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_sum_bf16.mlir b/mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_sum_bf16.mlir index 0b5e6ec78672..013a1c716d63 100644 --- a/mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_sum_bf16.mlir +++ b/mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_sum_bf16.mlir @@ -20,7 +20,7 @@ !Filename = !llvm.ptr<i8> #SparseMatrix = #sparse_tensor.encoding<{ - dimLevelType = [ "compressed", "compressed" ] + lvlTypes = [ "compressed", "compressed" ] }> #trait_sum_reduce = { diff --git a/mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_sum_c32.mlir b/mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_sum_c32.mlir index cdbe550ea4ad..0b71fec22449 100644 --- a/mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_sum_c32.mlir +++ b/mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_sum_c32.mlir @@ -34,7 +34,7 @@ !Filename = !llvm.ptr<i8> #SparseMatrix = #sparse_tensor.encoding<{ - dimLevelType = [ "compressed", "compressed" ] + lvlTypes = [ "compressed", "compressed" ] }> #trait_sum_reduce = { diff --git a/mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_sum_f16.mlir b/mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_sum_f16.mlir index 1769455b2a8d..357a8772c211 100644 --- a/mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_sum_f16.mlir +++ b/mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_sum_f16.mlir @@ -29,7 +29,7 @@ !Filename = !llvm.ptr<i8> #SparseMatrix = #sparse_tensor.encoding<{ - dimLevelType = [ "compressed", "compressed" ] + lvlTypes = [ "compressed", "compressed" ] }> #trait_sum_reduce = { diff --git a/mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_tanh.mlir b/mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_tanh.mlir index 91981bd02899..a39cac3ec256 100644 --- a/mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_tanh.mlir +++ b/mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_tanh.mlir @@ -29,7 +29,7 @@ // REDEFINE: FileCheck %s // RUN: %{compile} | mlir-translate -mlir-to-llvmir | %{run} -#SparseVector = #sparse_tensor.encoding<{ dimLevelType = [ "compressed" ] }> +#SparseVector = #sparse_tensor.encoding<{ lvlTypes = [ "compressed" ] }> #trait_op = { indexing_maps = [ diff --git a/mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_tensor_mul.mlir b/mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_tensor_mul.mlir index 4a3cc7597fa8..b3262c337b56 100644 --- a/mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_tensor_mul.mlir +++ b/mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_tensor_mul.mlir @@ -26,7 +26,7 @@ // REDEFINE: FileCheck %s // RUN: %{compile} | mlir-translate -mlir-to-llvmir | %{run} -#ST = #sparse_tensor.encoding<{dimLevelType = ["compressed", "compressed", "compressed"]}> +#ST = #sparse_tensor.encoding<{lvlTypes = ["compressed", "compressed", "compressed"]}> // // Trait for 3-d tensor element wise multiplication. diff --git a/mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_tensor_ops.mlir b/mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_tensor_ops.mlir index b269a486f29c..7de862e773e4 100644 --- a/mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_tensor_ops.mlir +++ b/mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_tensor_ops.mlir @@ -26,8 +26,8 @@ // REDEFINE: FileCheck %s // RUN: %{compile} | mlir-translate -mlir-to-llvmir | %{run} -#ST1 = #sparse_tensor.encoding<{dimLevelType = ["compressed", "compressed", "compressed"]}> -#ST2 = #sparse_tensor.encoding<{dimLevelType = ["compressed", "compressed", "dense"]}> +#ST1 = #sparse_tensor.encoding<{lvlTypes = ["compressed", "compressed", "compressed"]}> +#ST2 = #sparse_tensor.encoding<{lvlTypes = ["compressed", "compressed", "dense"]}> // // Trait for 3-d tensor operation. diff --git a/mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_transpose.mlir b/mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_transpose.mlir index c7e1e09dad8d..4481ff570c6e 100644 --- a/mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_transpose.mlir +++ b/mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_transpose.mlir @@ -27,11 +27,11 @@ // RUN: %{compile} | mlir-translate -mlir-to-llvmir | %{run} #DCSR = #sparse_tensor.encoding<{ - dimLevelType = [ "compressed", "compressed" ] + lvlTypes = [ "compressed", "compressed" ] }> #DCSC = #sparse_tensor.encoding<{ - dimLevelType = [ "compressed", "compressed" ], + lvlTypes = [ "compressed", "compressed" ], dimOrdering = affine_map<(i,j) -> (j,i)> }> diff --git a/mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_transpose_coo.mlir b/mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_transpose_coo.mlir index ebf1638c3256..27be2c8ddc55 100644 --- a/mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_transpose_coo.mlir +++ b/mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_transpose_coo.mlir @@ -28,7 +28,7 @@ // RUN: %{compile} | mlir-translate -mlir-to-llvmir | %{run} #SortedCOO = #sparse_tensor.encoding<{ - dimLevelType = [ "compressed-nu", "singleton" ] + lvlTypes = [ "compressed-nu", "singleton" ] }> module { diff --git a/mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_unary.mlir b/mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_unary.mlir index 4af564723094..63c6d0ed608c 100644 --- a/mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_unary.mlir +++ b/mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_unary.mlir @@ -26,8 +26,8 @@ // REDEFINE: FileCheck %s // RUN: %{compile} | mlir-translate -mlir-to-llvmir | %{run} -#SparseVector = #sparse_tensor.encoding<{dimLevelType = ["compressed"]}> -#DCSR = #sparse_tensor.encoding<{dimLevelType = ["compressed", "compressed"]}> +#SparseVector = #sparse_tensor.encoding<{lvlTypes = ["compressed"]}> +#DCSR = #sparse_tensor.encoding<{lvlTypes = ["compressed", "compressed"]}> // // Traits for tensor operations. diff --git a/mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_vector_ops.mlir b/mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_vector_ops.mlir index b8200851b100..1abffb268a46 100644 --- a/mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_vector_ops.mlir +++ b/mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_vector_ops.mlir @@ -26,8 +26,8 @@ // REDEFINE: FileCheck %s // RUN: %{compile} | mlir-translate -mlir-to-llvmir | %{run} -#SparseVector = #sparse_tensor.encoding<{dimLevelType = ["compressed"]}> -#DenseVector = #sparse_tensor.encoding<{dimLevelType = ["dense"]}> +#SparseVector = #sparse_tensor.encoding<{lvlTypes = ["compressed"]}> +#DenseVector = #sparse_tensor.encoding<{lvlTypes = ["dense"]}> // // Traits for 1-d tensor (aka vector) operations. diff --git a/mlir/test/Integration/Dialect/SparseTensor/GPU/CUDA/sparse-matvec-const.mlir b/mlir/test/Integration/Dialect/SparseTensor/GPU/CUDA/sparse-matvec-const.mlir index 2be01e4fa71d..2c09ae298e35 100644 --- a/mlir/test/Integration/Dialect/SparseTensor/GPU/CUDA/sparse-matvec-const.mlir +++ b/mlir/test/Integration/Dialect/SparseTensor/GPU/CUDA/sparse-matvec-const.mlir @@ -9,7 +9,7 @@ // RUN: --e main --entry-point-result=void \ // RUN: | FileCheck %s -#CSR = #sparse_tensor.encoding<{ dimLevelType = [ "dense", "compressed" ] }> +#CSR = #sparse_tensor.encoding<{ lvlTypes = [ "dense", "compressed" ] }> module { // Compute matrix vector y = Ax diff --git a/mlir/test/Integration/Dialect/SparseTensor/GPU/CUDA/sparse-matvec.mlir b/mlir/test/Integration/Dialect/SparseTensor/GPU/CUDA/sparse-matvec.mlir index 4576e7c0d2d8..c032201b781f 100644 --- a/mlir/test/Integration/Dialect/SparseTensor/GPU/CUDA/sparse-matvec.mlir +++ b/mlir/test/Integration/Dialect/SparseTensor/GPU/CUDA/sparse-matvec.mlir @@ -9,7 +9,7 @@ // RUN: --e main --entry-point-result=void \ // RUN: | FileCheck %s -#CSR = #sparse_tensor.encoding<{ dimLevelType = [ "dense", "compressed" ] }> +#CSR = #sparse_tensor.encoding<{ lvlTypes = [ "dense", "compressed" ] }> module { // Compute matrix vector y = Ax diff --git a/mlir/test/Integration/Dialect/SparseTensor/python/test_elementwise_add_sparse_output.py b/mlir/test/Integration/Dialect/SparseTensor/python/test_elementwise_add_sparse_output.py index e0f4b2751929..b29b029c7a33 100644 --- a/mlir/test/Integration/Dialect/SparseTensor/python/test_elementwise_add_sparse_output.py +++ b/mlir/test/Integration/Dialect/SparseTensor/python/test_elementwise_add_sparse_output.py @@ -20,7 +20,7 @@ from tools import sparse_compiler # handle sparse tensor outputs. _KERNEL_STR = """ #DCSR = #sparse_tensor.encoding<{ - dimLevelType = [ "compressed", "compressed" ] + lvlTypes = [ "compressed", "compressed" ] }> #trait_add_elt = { diff --git a/mlir/test/Integration/Dialect/SparseTensor/taco/tools/mlir_pytaco_utils.py b/mlir/test/Integration/Dialect/SparseTensor/taco/tools/mlir_pytaco_utils.py index bd382c0bc9fe..988c57b3b33f 100644 --- a/mlir/test/Integration/Dialect/SparseTensor/taco/tools/mlir_pytaco_utils.py +++ b/mlir/test/Integration/Dialect/SparseTensor/taco/tools/mlir_pytaco_utils.py @@ -255,7 +255,7 @@ def _get_create_sparse_tensor_kernel( return f""" !Ptr = !llvm.ptr<i8> #enc = #sparse_tensor.encoding<{{ - dimLevelType = [ {sparsity} ] + lvlTypes = [ {sparsity} ] }}> func.func @{_ENTRY_NAME}(%filename: !Ptr) -> (tensor<{shape}x{type}, #enc>, memref<{rank}xindex>) attributes {{ llvm.emit_c_interface }} {{ @@ -331,7 +331,7 @@ def _get_output_sparse_tensor_kernel( return f""" !Ptr = !llvm.ptr<i8> #enc = #sparse_tensor.encoding<{{ - dimLevelType = [ {sparsity} ] + lvlTypes = [ {sparsity} ] }}> func.func @{_ENTRY_NAME}(%t: tensor<{shape}x{type}, #enc>, %filename: !Ptr) attributes {{ llvm.emit_c_interface }} {{ |