Skip to content

Commit 1ba2768

Browse files
author
Peiming Liu
authored
[mlir][sparse] expose emit strategy option to mini pipeline (#96238)
1 parent fd001c1 commit 1ba2768

File tree

5 files changed

+22
-5
lines changed

5 files changed

+22
-5
lines changed

mlir/include/mlir/Dialect/SparseTensor/Transforms/Passes.h

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -262,7 +262,8 @@ std::unique_ptr<Pass> createSparsificationAndBufferizationPass(
262262
const SparsificationOptions &sparsificationOptions,
263263
bool createSparseDeallocs, bool enableRuntimeLibrary,
264264
bool enableBufferInitialization, unsigned vectorLength,
265-
bool enableVLAVectorization, bool enableSIMDIndex32, bool enableGPULibgen);
265+
bool enableVLAVectorization, bool enableSIMDIndex32, bool enableGPULibgen,
266+
SparseEmitStrategy emitStrategy);
266267

267268
//===----------------------------------------------------------------------===//
268269
// Sparse Iteration Transform Passes

mlir/include/mlir/Dialect/SparseTensor/Transforms/Passes.td

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -475,6 +475,15 @@ def SparsificationAndBufferization : Pass<"sparsification-and-bufferization", "M
475475
"Enable i32 indexing into vectors (for efficient gather/scatter)">,
476476
Option<"enableGPULibgen", "enable-gpu-libgen", "bool", "false",
477477
"Enable GPU acceleration by means of direct library calls">,
478+
Option<"sparseEmitStrategy", "sparse-emit-strategy", "mlir::SparseEmitStrategy",
479+
"mlir::SparseEmitStrategy::kFunctional",
480+
"Emit functional code or interfaces (to debug) for sparse loops", [{llvm::cl::values(
481+
clEnumValN(mlir::SparseEmitStrategy::kFunctional, "functional",
482+
"Emit functional code (with scf.for/while)."),
483+
clEnumValN(mlir::SparseEmitStrategy::kSparseIterator, "sparse-iterator",
484+
"Emit (experimental) loops (with sparse.iterate)."),
485+
clEnumValN(mlir::SparseEmitStrategy::kDebugInterface, "debug-interface",
486+
"Emit non-functional but easy-to-read interfaces to debug."))}]>,
478487
];
479488
}
480489

mlir/lib/Dialect/SparseTensor/Pipelines/SparseTensorPipelines.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,8 @@ void mlir::sparse_tensor::buildSparsifier(OpPassManager &pm,
4444
options.vectorLength,
4545
/*enableVLAVectorization=*/options.armSVE,
4646
/*enableSIMDIndex32=*/options.force32BitVectorIndices,
47-
options.enableGPULibgen));
47+
options.enableGPULibgen,
48+
options.sparsificationOptions().sparseEmitStrategy));
4849

4950
// Bail-early for test setup.
5051
if (options.testBufferizationAnalysisOnly)

mlir/lib/Dialect/SparseTensor/Transforms/SparsificationAndBufferizationPass.cpp

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ class SparsificationAndBufferizationPass
7878
const SparsificationOptions &sparsificationOptions,
7979
bool createSparseDeallocs, bool enableRuntimeLibrary,
8080
bool enableBufferInitialization, unsigned vl, bool vla, bool index32,
81-
bool gpu)
81+
bool gpu, SparseEmitStrategy emitStrategy)
8282
: bufferizationOptions(bufferizationOptions),
8383
sparsificationOptions(sparsificationOptions),
8484
createSparseDeallocs(createSparseDeallocs),
@@ -89,6 +89,7 @@ class SparsificationAndBufferizationPass
8989
enableVLAVectorization = vla;
9090
enableSIMDIndex32 = index32;
9191
enableGPULibgen = gpu;
92+
sparseEmitStrategy = emitStrategy;
9293
}
9394

9495
/// Bufferize all dense ops. This assumes that no further analysis is needed
@@ -120,6 +121,9 @@ class SparsificationAndBufferizationPass
120121
}
121122

122123
void runOnOperation() override {
124+
// Overrides the default emit strategy using user-provided value.
125+
this->sparsificationOptions.sparseEmitStrategy = sparseEmitStrategy;
126+
123127
// Run enabling transformations.
124128
{
125129
OpPassManager pm("builtin.module");
@@ -243,10 +247,11 @@ std::unique_ptr<mlir::Pass> mlir::createSparsificationAndBufferizationPass(
243247
const SparsificationOptions &sparsificationOptions,
244248
bool createSparseDeallocs, bool enableRuntimeLibrary,
245249
bool enableBufferInitialization, unsigned vectorLength,
246-
bool enableVLAVectorization, bool enableSIMDIndex32, bool enableGPULibgen) {
250+
bool enableVLAVectorization, bool enableSIMDIndex32, bool enableGPULibgen,
251+
SparseEmitStrategy emitStrategy) {
247252
return std::make_unique<
248253
mlir::sparse_tensor::SparsificationAndBufferizationPass>(
249254
bufferizationOptions, sparsificationOptions, createSparseDeallocs,
250255
enableRuntimeLibrary, enableBufferInitialization, vectorLength,
251-
enableVLAVectorization, enableSIMDIndex32, enableGPULibgen);
256+
enableVLAVectorization, enableSIMDIndex32, enableGPULibgen, emitStrategy);
252257
}

mlir/test/Dialect/SparseTensor/sparse_iteration_to_scf.mlir

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
// RUN: mlir-opt %s --lower-sparse-iteration-to-scf | FileCheck %s
22
// RUN: mlir-opt %s --sparse-space-collapse --lower-sparse-iteration-to-scf | FileCheck %s --check-prefix COLLAPSED
3+
// RUN: mlir-opt %s --sparsification-and-bufferization="sparse-emit-strategy=sparse-iterator" | FileCheck %s --check-prefix COLLAPSED
34

45
#COO = #sparse_tensor.encoding<{
56
map = (i, j) -> (

0 commit comments

Comments
 (0)