Skip to content

[mlir][sparse] add a csr x bsr matmul test case #73012

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
Nov 21, 2023
Merged

[mlir][sparse] add a csr x bsr matmul test case #73012

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
5416c60
[mlir][sparse] add a csr x bsr matmul test case
Nov 21, 2023
8f1d30a
address comments
Nov 21, 2023
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
3 changes: 1 addition & 2 deletions mlir/lib/Dialect/SparseTensor/Transforms/LoopEmitter.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1497,8 +1497,7 @@ void LoopEmitter::exitWhileLoop(OpBuilder &builder, Location loc,
levelReducedDep[tid][lvl]--;
if (!resolved) {
// TODO: support coiterating multiple slices
assert(loopInfo.trivialTidLvls.empty() &&
loopInfo.sliceDrivenInfo.size() == 1);
assert(loopInfo.sliceDrivenInfo.size() == 1);
auto [nxNonEmpty, nxMinCrd, nxAbsOffset] =
genSliceNextInduction(builder, loc, tid, lvl);
// Update while loop induction operands.
Expand Down
24 changes: 23 additions & 1 deletion mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_block_matmul.mlir
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,10 @@
doc = "X(i,j) *= A(i,j) * B(j,i)"
}

#CSR = #sparse_tensor.encoding<{
map = ( i, j ) -> (i : dense, j : compressed)
}>


#BSR = #sparse_tensor.encoding<{
map = ( i, j ) ->
Expand Down Expand Up @@ -89,6 +93,20 @@ func.func @mul_24(%arg0: tensor<4x8xf64>,
return %0 : tensor<4x4xf64>
}

func.func @mul_csr_bsr(%arg0: tensor<4x8xf64, #CSR>,
%arg1: tensor<4x8xf64, #BSR>) -> tensor<4x4xf64> {
%out = arith.constant dense<0.0> : tensor<4x4xf64>
%0 = linalg.generic #trait_mul
ins(%arg0, %arg1: tensor<4x8xf64, #CSR>, tensor<4x8xf64, #BSR>)
outs(%out: tensor<4x4xf64>) {
^bb(%x: f64, %y : f64, %z : f64):
%1 = arith.mulf %x, %y : f64
%2 = arith.addf %1, %z : f64
linalg.yield %2 : f64
} -> tensor<4x4xf64>
return %0 : tensor<4x4xf64>
}

func.func @mul_dense(%arg0: tensor<4x8xf64>,
%arg1: tensor<4x8xf64>) -> tensor<4x4xf64> {
%out = arith.constant dense<0.0> : tensor<4x4xf64>
Expand Down Expand Up @@ -132,18 +150,22 @@ func.func @mul_dense(%arg0: tensor<4x8xf64>,

%2 = sparse_tensor.convert %td : tensor<4x8xf64> to tensor<4x8xf64, #BSR>
%3 = sparse_tensor.convert %td : tensor<4x8xf64> to tensor<4x8xf64, #NV_24>
%4 = sparse_tensor.convert %td : tensor<4x8xf64> to tensor<4x8xf64, #CSR>

%d = call @mul_dense(%td, %td)
: (tensor<4x8xf64>, tensor<4x8xf64>) -> tensor<4x4xf64>
%s = call @mul(%td, %2)
: (tensor<4x8xf64>, tensor<4x8xf64, #BSR>) -> tensor<4x4xf64>
%s24 = call @mul_24(%td, %3)
: (tensor<4x8xf64>, tensor<4x8xf64, #NV_24>) -> tensor<4x4xf64>
%scsr = call @mul_csr_bsr(%4, %2)
: (tensor<4x8xf64, #CSR>, tensor<4x8xf64, #BSR>) -> tensor<4x4xf64>

// CHECK-COUNT-3: ( ( 46, 115, 0, 0 ), ( 115, 306, 0, 0 ), ( 0, 0, 858, 1206 ), ( 0, 0, 1206, 1698 ) )
// CHECK-COUNT-4: ( ( 46, 115, 0, 0 ), ( 115, 306, 0, 0 ), ( 0, 0, 858, 1206 ), ( 0, 0, 1206, 1698 ) )
call @dumpf64(%d) : (tensor<4x4xf64>) -> ()
call @dumpf64(%s) : (tensor<4x4xf64>) -> ()
call @dumpf64(%s24) : (tensor<4x4xf64>) -> ()
call @dumpf64(%scsr) : (tensor<4x4xf64>) -> ()

return
}
Expand Down