Skip to content

[mlir][sparse] Finish migrating integration tests to use sparse_tensor.print #84997

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Mar 13, 2024
Merged

[mlir][sparse] Finish migrating integration tests to use sparse_tensor.print #84997

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
883628a
migrate more
yinying-lisa-li Mar 12, 2024
6f9a028
address comments
yinying-lisa-li Mar 13, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
367 changes: 165 additions & 202 deletions mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_conversion.mlir
View file
Open in desktop

Large diffs are not rendered by default.

70 changes: 43 additions & 27 deletions mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_conversion_block.mlir
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
// DEFINE: %{compile} = mlir-opt %s --sparsifier="%{sparsifier_opts}"
// DEFINE: %{compile_sve} = mlir-opt %s --sparsifier="%{sparsifier_opts_sve}"
// DEFINE: %{run_libs} = -shared-libs=%mlir_c_runner_utils,%mlir_runner_utils
// DEFINE: %{run_opts} = -e entry -entry-point-result=void
// DEFINE: %{run_opts} = -e main -entry-point-result=void
// DEFINE: %{run} = mlir-cpu-runner %{run_opts} %{run_libs}
// DEFINE: %{run_sve} = %mcr_aarch64_cmd --march=aarch64 --mattr="+sve" %{run_opts} %{run_libs}
//
Expand Down Expand Up @@ -52,21 +52,10 @@
// Integration test that tests conversions between sparse tensors.
//
module {
//
// Output utilities.
//
func.func @dumpf64(%arg0: memref<?xf64>) {
%c0 = arith.constant 0 : index
%d0 = arith.constant -1.0 : f64
%0 = vector.transfer_read %arg0[%c0], %d0: memref<?xf64>, vector<8xf64>
vector.print %0 : vector<8xf64>
return
}

//
// Main driver.
//
func.func @entry() {
func.func @main() {
%c0 = arith.constant 0 : index
%c1 = arith.constant 1 : index
%c2 = arith.constant 2 : index
Expand All @@ -88,20 +77,47 @@ module {
%3 = sparse_tensor.convert %1 : tensor<2x4xf64, #BSR> to tensor<2x4xf64, #CSR>
%4 = sparse_tensor.convert %1 : tensor<2x4xf64, #BSR> to tensor<2x4xf64, #CSC>

%v1 = sparse_tensor.values %1 : tensor<2x4xf64, #BSR> to memref<?xf64>
%v2 = sparse_tensor.values %2 : tensor<2x4xf64, #BSR> to memref<?xf64>
%v3 = sparse_tensor.values %3 : tensor<2x4xf64, #CSR> to memref<?xf64>
%v4 = sparse_tensor.values %4 : tensor<2x4xf64, #CSC> to memref<?xf64>


// CHECK: ( 1, 2, 5, 6, 3, 4, 7, 8 )
// CHECK-NEXT: ( 1, 2, 5, 6, 3, 4, 7, 8 )
// CHECK-NEXT: ( 1, 2, 3, 4, 5, 6, 7, 8 )
// CHECK-NEXT: ( 1, 5, 2, 6, 3, 7, 4, 8 )
call @dumpf64(%v1) : (memref<?xf64>) -> ()
call @dumpf64(%v2) : (memref<?xf64>) -> ()
call @dumpf64(%v3) : (memref<?xf64>) -> ()
call @dumpf64(%v4) : (memref<?xf64>) -> ()
//
// CHECK: ---- Sparse Tensor ----
// CHECK-NEXT: nse = 8
// CHECK-NEXT: dim = ( 2, 4 )
// CHECK-NEXT: lvl = ( 1, 2, 2, 2 )
// CHECK-NEXT: pos[1] : ( 0, 2
// CHECK-NEXT: crd[1] : ( 0, 1
// CHECK-NEXT: values : ( 1, 2, 5, 6, 3, 4, 7, 8
// CHECK-NEXT: ----
//
// CHECK: ---- Sparse Tensor ----
// CHECK-NEXT: nse = 8
// CHECK-NEXT: dim = ( 2, 4 )
// CHECK-NEXT: lvl = ( 1, 2, 2, 2 )
// CHECK-NEXT: pos[1] : ( 0, 2
// CHECK-NEXT: crd[1] : ( 0, 1
// CHECK-NEXT: values : ( 1, 2, 5, 6, 3, 4, 7, 8
// CHECK-NEXT: ----
//
// CHECK: ---- Sparse Tensor ----
// CHECK-NEXT: nse = 8
// CHECK-NEXT: dim = ( 2, 4 )
// CHECK-NEXT: lvl = ( 2, 4 )
// CHECK-NEXT: pos[1] : ( 0, 4, 8
// CHECK-NEXT: crd[1] : ( 0, 1, 2, 3, 0, 1, 2, 3
// CHECK-NEXT: values : ( 1, 2, 3, 4, 5, 6, 7, 8
// CHECK-NEXT: ----
//
// CHECK: ---- Sparse Tensor ----
// CHECK-NEXT: nse = 8
// CHECK-NEXT: dim = ( 2, 4 )
// CHECK-NEXT: lvl = ( 4, 2 )
// CHECK-NEXT: pos[1] : ( 0, 2, 4, 6, 8
// CHECK-NEXT: crd[1] : ( 0, 1, 0, 1, 0, 1, 0, 1
// CHECK-NEXT: values : ( 1, 5, 2, 6, 3, 7, 4, 8
// CHECK-NEXT: ----
//
sparse_tensor.print %1 : tensor<2x4xf64, #BSR>
sparse_tensor.print %2 : tensor<2x4xf64, #BSR>
sparse_tensor.print %3 : tensor<2x4xf64, #CSR>
sparse_tensor.print %4 : tensor<2x4xf64, #CSC>

// TODO: Fix memory leaks.
bufferization.dealloc_tensor %1 : tensor<2x4xf64, #BSR>
Expand Down
122 changes: 73 additions & 49 deletions mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_conversion_dyn.mlir
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
// DEFINE: %{compile} = mlir-opt %s --sparsifier="%{sparsifier_opts}"
// DEFINE: %{compile_sve} = mlir-opt %s --sparsifier="%{sparsifier_opts_sve}"
// DEFINE: %{run_libs} = -shared-libs=%mlir_c_runner_utils,%mlir_runner_utils
// DEFINE: %{run_opts} = -e entry -entry-point-result=void
// DEFINE: %{run_opts} = -e main -entry-point-result=void
// DEFINE: %{run} = mlir-cpu-runner %{run_opts} %{run_libs}
// DEFINE: %{run_sve} = %mcr_aarch64_cmd --march=aarch64 --mattr="+sve" %{run_opts} %{run_libs}
//
Expand Down Expand Up @@ -44,19 +44,7 @@
// may change (the actual underlying sizes obviously never change).
//
module {

func.func private @printMemref1dF64(%ptr : memref<?xf64>) attributes { llvm.emit_c_interface }

//
// Helper method to print values array. The transfer actually
// reads more than required to verify size of buffer as well.
//
func.func @dump(%arg0: memref<?xf64>) {
call @printMemref1dF64(%arg0) : (memref<?xf64>) -> ()
return
}

func.func @entry() {
func.func @main() {
%t1 = arith.constant sparse<
[ [0,0], [0,1], [0,63], [1,0], [1,1], [31,0], [31,63] ],
[ 1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0 ]> : tensor<32x64xf64>
Expand All @@ -72,45 +60,81 @@ module {
%5 = sparse_tensor.convert %3 : tensor<?x?xf64, #DCSR> to tensor<?x?xf64, #DCSC>
%6 = sparse_tensor.convert %4 : tensor<?x?xf64, #DCSC> to tensor<?x?xf64, #DCSR>

//
// Check number_of_entries.
//
// CHECK-COUNT-6: 7
%n1 = sparse_tensor.number_of_entries %1 : tensor<?x?xf64, #DCSR>
%n2 = sparse_tensor.number_of_entries %2 : tensor<?x?xf64, #DCSC>
%n3 = sparse_tensor.number_of_entries %3 : tensor<?x?xf64, #DCSR>
%n4 = sparse_tensor.number_of_entries %4 : tensor<?x?xf64, #DCSC>
%n5 = sparse_tensor.number_of_entries %5 : tensor<?x?xf64, #DCSC>
%n6 = sparse_tensor.number_of_entries %6 : tensor<?x?xf64, #DCSR>
vector.print %n1 : index
vector.print %n2 : index
vector.print %n3 : index
vector.print %n4 : index
vector.print %n5 : index
vector.print %n6 : index

// Verify the outputs.
//
// CHECK: ---- Sparse Tensor ----
// CHECK-NEXT: nse = 7
// CHECK-NEXT: dim = ( 32, 64 )
// CHECK-NEXT: lvl = ( 32, 64 )
// CHECK-NEXT: pos[0] : ( 0, 3
// CHECK-NEXT: crd[0] : ( 0, 1, 31
// CHECK-NEXT: pos[1] : ( 0, 3, 5, 7
// CHECK-NEXT: crd[1] : ( 0, 1, 63, 0, 1, 0, 63
// CHECK-NEXT: values : ( 1, 2, 3, 4, 5, 6, 7
// CHECK-NEXT: ----
//
// CHECK: ---- Sparse Tensor ----
// CHECK-NEXT: nse = 7
// CHECK-NEXT: dim = ( 32, 64 )
// CHECK-NEXT: lvl = ( 64, 32 )
// CHECK-NEXT: pos[0] : ( 0, 3
// CHECK-NEXT: crd[0] : ( 0, 1, 63
// CHECK-NEXT: pos[1] : ( 0, 3, 5, 7
// CHECK-NEXT: crd[1] : ( 0, 1, 31, 0, 1, 0, 31
// CHECK-NEXT: values : ( 1, 4, 6, 2, 5, 3, 7
// CHECK-NEXT: ----
//
// CHECK: ---- Sparse Tensor ----
// CHECK-NEXT: nse = 7
// CHECK-NEXT: dim = ( 32, 64 )
// CHECK-NEXT: lvl = ( 32, 64 )
// CHECK-NEXT: pos[0] : ( 0, 3
// CHECK-NEXT: crd[0] : ( 0, 1, 31
// CHECK-NEXT: pos[1] : ( 0, 3, 5, 7
// CHECK-NEXT: crd[1] : ( 0, 1, 63, 0, 1, 0, 63
// CHECK-NEXT: values : ( 1, 2, 3, 4, 5, 6, 7
// CHECK-NEXT: ----
//
// CHECK: ---- Sparse Tensor ----
// CHECK-NEXT: nse = 7
// CHECK-NEXT: dim = ( 32, 64 )
// CHECK-NEXT: lvl = ( 64, 32 )
// CHECK-NEXT: pos[0] : ( 0, 3
// CHECK-NEXT: crd[0] : ( 0, 1, 63
// CHECK-NEXT: pos[1] : ( 0, 3, 5, 7
// CHECK-NEXT: crd[1] : ( 0, 1, 31, 0, 1, 0, 31
// CHECK-NEXT: values : ( 1, 4, 6, 2, 5, 3, 7
// CHECK-NEXT: ----
//
// All proper row-/column-wise?
// CHECK: ---- Sparse Tensor ----
// CHECK-NEXT: nse = 7
// CHECK-NEXT: dim = ( 32, 64 )
// CHECK-NEXT: lvl = ( 64, 32 )
// CHECK-NEXT: pos[0] : ( 0, 3
// CHECK-NEXT: crd[0] : ( 0, 1, 63
// CHECK-NEXT: pos[1] : ( 0, 3, 5, 7
// CHECK-NEXT: crd[1] : ( 0, 1, 31, 0, 1, 0, 31
// CHECK-NEXT: values : ( 1, 4, 6, 2, 5, 3, 7
// CHECK-NEXT: ----
//
// CHECK: [1, 2, 3, 4, 5, 6, 7
// CHECK: [1, 4, 6, 2, 5, 3, 7
// CHECK: [1, 2, 3, 4, 5, 6, 7
// CHECK: [1, 4, 6, 2, 5, 3, 7
// CHECK: [1, 4, 6, 2, 5, 3, 7
// CHECK: [1, 2, 3, 4, 5, 6, 7
// CHECK: ---- Sparse Tensor ----
// CHECK-NEXT: nse = 7
// CHECK-NEXT: dim = ( 32, 64 )
// CHECK-NEXT: lvl = ( 32, 64 )
// CHECK-NEXT: pos[0] : ( 0, 3
// CHECK-NEXT: crd[0] : ( 0, 1, 31
// CHECK-NEXT: pos[1] : ( 0, 3, 5, 7
// CHECK-NEXT: crd[1] : ( 0, 1, 63, 0, 1, 0, 63
// CHECK-NEXT: values : ( 1, 2, 3, 4, 5, 6, 7
// CHECK-NEXT: ----
//
%m1 = sparse_tensor.values %1 : tensor<?x?xf64, #DCSR> to memref<?xf64>
%m2 = sparse_tensor.values %2 : tensor<?x?xf64, #DCSC> to memref<?xf64>
%m3 = sparse_tensor.values %3 : tensor<?x?xf64, #DCSR> to memref<?xf64>
%m4 = sparse_tensor.values %4 : tensor<?x?xf64, #DCSC> to memref<?xf64>
%m5 = sparse_tensor.values %5 : tensor<?x?xf64, #DCSC> to memref<?xf64>
%m6 = sparse_tensor.values %6 : tensor<?x?xf64, #DCSR> to memref<?xf64>
call @dump(%m1) : (memref<?xf64>) -> ()
call @dump(%m2) : (memref<?xf64>) -> ()
call @dump(%m3) : (memref<?xf64>) -> ()
call @dump(%m4) : (memref<?xf64>) -> ()
call @dump(%m5) : (memref<?xf64>) -> ()
call @dump(%m6) : (memref<?xf64>) -> ()
sparse_tensor.print %1 : tensor<?x?xf64, #DCSR>
sparse_tensor.print %2 : tensor<?x?xf64, #DCSC>
sparse_tensor.print %3 : tensor<?x?xf64, #DCSR>
sparse_tensor.print %4 : tensor<?x?xf64, #DCSC>
sparse_tensor.print %5 : tensor<?x?xf64, #DCSC>
sparse_tensor.print %6 : tensor<?x?xf64, #DCSR>

// Release the resources.
bufferization.dealloc_tensor %1 : tensor<?x?xf64, #DCSR>
Expand Down
4 changes: 2 additions & 2 deletions mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_conversion_element.mlir
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
// DEFINE: %{compile} = mlir-opt %s --sparsifier="%{sparsifier_opts}"
// DEFINE: %{compile_sve} = mlir-opt %s --sparsifier="%{sparsifier_opts_sve}"
// DEFINE: %{run_libs} = -shared-libs=%mlir_c_runner_utils,%mlir_runner_utils
// DEFINE: %{run_opts} = -e entry -entry-point-result=void
// DEFINE: %{run_opts} = -e main -entry-point-result=void
// DEFINE: %{run} = mlir-cpu-runner %{run_opts} %{run_libs}
// DEFINE: %{run_sve} = %mcr_aarch64_cmd --march=aarch64 --mattr="+sve" %{run_opts} %{run_libs}
//
Expand Down Expand Up @@ -55,7 +55,7 @@ module {
//
// The first test suite (for non-singleton LevelTypes).
//
func.func @entry() {
func.func @main() {
//
// Initialize a 3-dim dense tensor.
//
Expand Down
Loading