Skip to content

[mlir][sparse] first end-to-end linalg.generic op on BSR #70880

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 1, 2023
Merged

[mlir][sparse] first end-to-end linalg.generic op on BSR #70880

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
83a4ae3
[mlir][sparse] first end-to-end linalg.generic op on BSR
aartbik Nov 1, 2023
5042ad2
typo
aartbik Nov 1, 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
8 changes: 3 additions & 5 deletions mlir/include/mlir/Dialect/SparseTensor/IR/SparseTensorType.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -341,11 +341,9 @@ template <typename T>
inline SparseTensorType getSparseTensorType(T t) {
return SparseTensorType(getRankedTensorType(t));
}
template <typename T>
inline std::optional<SparseTensorType> tryGetSparseTensorType(T t) {
RankedTensorType rtp = getRankedTensorType(t);
if (rtp)
return SparseTensorType(rtp);
inline std::optional<SparseTensorType> tryGetSparseTensorType(Value v) {
if (isa<RankedTensorType>(v.getType()))
return getSparseTensorType(v);
return std::nullopt;
}

Expand Down
8 changes: 4 additions & 4 deletions mlir/lib/Dialect/SparseTensor/Transforms/SparseReinterpretMap.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,11 +116,11 @@ struct GenericOpReinterpretMap : public OpRewritePattern<linalg::GenericOp> {
if (map.getResult(i).getKind() != AffineExprKind::DimId)
return failure();
// Inspect sparse operands.
auto stt = getSparseTensorType(t.get());
if (stt.hasEncoding()) {
if (stt.isPermutation())
auto stt = tryGetSparseTensorType(t.get());
if (stt && stt->hasEncoding()) {
if (stt->isPermutation())
continue;
assert(stt.getDimRank() < stt.getLvlRank()); // only allowed non-perm
assert(stt->getDimRank() < stt->getLvlRank()); // only allowed non-perm
if (tx)
return failure(); // more than one non-perm
if (!map.isIdentity())
Expand Down
6 changes: 4 additions & 2 deletions mlir/lib/Dialect/SparseTensor/Transforms/SparsificationAndBufferizationPass.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,8 +104,8 @@ class SparsificationAndBufferizationPass
}

void runOnOperation() override {
// Run enabling transformations.
{
// Run enabling transformations.
OpPassManager pm("builtin.module");
pm.addPass(createPreSparsificationRewritePass());
pm.addNestedPass<func::FuncOp>(
Expand All @@ -128,7 +128,7 @@ class SparsificationAndBufferizationPass
bufferizationOptions)))
return signalPassFailure();

// `testAnalysisOnly` is a debug/testing flag. If set, the results of
// Option `testAnalysisOnly` is a debug/testing flag. If set, the results of
// OneShotAnalysis are added to the IR via attributes. In that case, do not
// continue with the remaining pipeline.
if (bufferizationOptions.testAnalysisOnly)
Expand All @@ -139,6 +139,8 @@ class SparsificationAndBufferizationPass
// of `bufferization.alloc_tensor` ops.
{
OpPassManager pm("builtin.module");
pm.addPass(
createSparseReinterpretMapPass(ReinterpretMapScope::kGenericOnly));
pm.addPass(createSparsificationPass(sparsificationOptions));
pm.addNestedPass<func::FuncOp>(createStageSparseOperationsPass());
pm.addPass(createLowerSparseOpsToForeachPass(enableRuntimeLibrary,
Expand Down
27 changes: 25 additions & 2 deletions mlir/test/Integration/Dialect/SparseTensor/CPU/block.mlir
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,8 @@
// REDEFINE: %{sparse_compiler_opts} = enable-runtime-library=false
// R_UN: %{compile} | env %{env} %{run} | FileCheck %s

!Filename = !llvm.ptr<i8>

#BSR = #sparse_tensor.encoding<{
map = (i, j) ->
( i floordiv 2 : dense
Expand All @@ -38,8 +40,12 @@
map = (i, j, k, l) -> ( i : dense, j : compressed, k : dense, l : dense)
}>


!Filename = !llvm.ptr<i8>
#trait_scale_inplace = {
indexing_maps = [
affine_map<(i,j) -> (i,j)> // X (out)
],
iterator_types = ["parallel", "parallel"]
}

//
// Example 2x2 block storage:
Expand All @@ -62,6 +68,17 @@ module {

func.func private @getTensorFilename(index) -> (!Filename)

func.func @scale(%arg0: tensor<?x?xf64, #BSR>) -> tensor<?x?xf64, #BSR> {
%c = arith.constant 3.0 : f64
%0 = linalg.generic #trait_scale_inplace
outs(%arg0: tensor<?x?xf64, #BSR>) {
^bb(%x: f64):
%1 = arith.mulf %x, %c : f64
linalg.yield %1 : f64
} -> tensor<?x?xf64, #BSR>
return %0 : tensor<?x?xf64, #BSR>
}

func.func @entry() {
%c0 = arith.constant 0 : index
%f0 = arith.constant 0.0 : f64
Expand Down Expand Up @@ -89,6 +106,12 @@ module {
%vecdsdd = vector.transfer_read %vdsdd[%c0], %f0 : memref<?xf64>, vector<12xf64>
vector.print %vecdsdd : vector<12xf64>

// CHECK-NEXT: ( 3, 6, 0, 9, 12, 0, 0, 15, 18, 21, 24, 0 )
%As = call @scale(%A) : (tensor<?x?xf64, #BSR>) -> (tensor<?x?xf64, #BSR>)
%vals = sparse_tensor.values %As : tensor<?x?xf64, #BSR> to memref<?xf64>
%vecs = vector.transfer_read %vals[%c0], %f0 : memref<?xf64>, vector<12xf64>
vector.print %vecs : vector<12xf64>

// Release the resources.
bufferization.dealloc_tensor %A: tensor<?x?xf64, #BSR>

Expand Down