Skip to content

Commit 64fe18d

Browse files
ArtemySkrebkovdhawalsr
authored andcommitted
[mlir][SCF] Add scf.index_switch support for populateSCFStructuralTypeConversionsAndLegality
1 parent a87c07c commit 64fe18d

File tree

2 files changed

+74
-6
lines changed

2 files changed

+74
-6
lines changed

mlir/lib/Dialect/SCF/Transforms/StructuralTypeConversions.cpp

Lines changed: 31 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -190,6 +190,31 @@ class ConvertWhileOpTypes
190190
};
191191
} // namespace
192192

193+
namespace {
194+
class ConvertIndexSwitchOpTypes
195+
: public Structural1ToNConversionPattern<IndexSwitchOp,
196+
ConvertIndexSwitchOpTypes> {
197+
public:
198+
using Structural1ToNConversionPattern::Structural1ToNConversionPattern;
199+
200+
std::optional<IndexSwitchOp>
201+
convertSourceOp(IndexSwitchOp op, OneToNOpAdaptor adaptor,
202+
ConversionPatternRewriter &rewriter,
203+
TypeRange dstTypes) const {
204+
auto newOp = rewriter.create<IndexSwitchOp>(
205+
op.getLoc(), dstTypes, op.getArg(), op.getCases(), op.getNumCases());
206+
207+
for (unsigned i = 0u; i < op.getNumRegions(); i++) {
208+
if (failed(rewriter.convertRegionTypes(&op.getRegion(i), *typeConverter)))
209+
return std::nullopt;
210+
auto &dstRegion = newOp.getRegion(i);
211+
rewriter.inlineRegionBefore(op.getRegion(i), dstRegion, dstRegion.end());
212+
}
213+
return newOp;
214+
}
215+
};
216+
} // namespace
217+
193218
namespace {
194219
// When the result types of a ForOp/IfOp get changed, the operand types of the
195220
// corresponding yield op need to be changed. In order to trigger the
@@ -224,19 +249,19 @@ class ConvertConditionOpTypes : public OpConversionPattern<ConditionOp> {
224249
void mlir::scf::populateSCFStructuralTypeConversions(
225250
const TypeConverter &typeConverter, RewritePatternSet &patterns) {
226251
patterns.add<ConvertForOpTypes, ConvertIfOpTypes, ConvertYieldOpTypes,
227-
ConvertWhileOpTypes, ConvertConditionOpTypes>(
228-
typeConverter, patterns.getContext());
252+
ConvertWhileOpTypes, ConvertConditionOpTypes,
253+
ConvertIndexSwitchOpTypes>(typeConverter, patterns.getContext(),
254+
benefit);
229255
}
230256

231257
void mlir::scf::populateSCFStructuralTypeConversionTarget(
232258
const TypeConverter &typeConverter, ConversionTarget &target) {
233-
target.addDynamicallyLegalOp<ForOp, IfOp>([&](Operation *op) {
234-
return typeConverter.isLegal(op->getResultTypes());
235-
});
259+
target.addDynamicallyLegalOp<ForOp, IfOp, IndexSwitchOp>(
260+
[&](Operation *op) { return typeConverter.isLegal(op->getResults()); });
236261
target.addDynamicallyLegalOp<scf::YieldOp>([&](scf::YieldOp op) {
237262
// We only have conversions for a subset of ops that use scf.yield
238263
// terminators.
239-
if (!isa<ForOp, IfOp, WhileOp>(op->getParentOp()))
264+
if (!isa<ForOp, IfOp, WhileOp, IndexSwitchOp>(op->getParentOp()))
240265
return true;
241266
return typeConverter.isLegal(op.getOperandTypes());
242267
});

mlir/test/Dialect/SparseTensor/scf_1_N_conversion.mlir

Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -86,3 +86,46 @@ func.func @while(%arg0: tensor<1024xf32, #SparseVector>, %c: i1) -> tensor<1024x
8686
}
8787
return %0: tensor<1024xf32, #SparseVector>
8888
}
89+
90+
// CHECK-LABEL: func.func @index_switch(
91+
// CHECK-SAME: %[[PRED:.*0]]: index,
92+
// CHECK-SAME: %[[VAL_A_1:.*1]]: memref<?xindex>,
93+
// CHECK-SAME: %[[VAL_A_2:.*2]]: memref<?xindex>,
94+
// CHECK-SAME: %[[VAL_A_3:.*3]]: memref<?xf32>,
95+
// CHECK-SAME: %[[VAL_A_4:.*4]]: !sparse_tensor.storage_specifier
96+
// CHECK-SAME: %[[VAL_B_1:.*5]]: memref<?xindex>,
97+
// CHECK-SAME: %[[VAL_B_2:.*6]]: memref<?xindex>,
98+
// CHECK-SAME: %[[VAL_B_3:.*7]]: memref<?xf32>,
99+
// CHECK-SAME: %[[VAL_B_4:.*8]]: !sparse_tensor.storage_specifier
100+
// CHECK-SAME: %[[VAL_C_1:.*9]]: memref<?xindex>,
101+
// CHECK-SAME: %[[VAL_C_2:.*10]]: memref<?xindex>,
102+
// CHECK-SAME: %[[VAL_C_3:.*11]]: memref<?xf32>,
103+
// CHECK-SAME: %[[VAL_C_4:.*12]]: !sparse_tensor.storage_specifier
104+
105+
// CHECK: %[[RES:.*]]:4 = scf.index_switch %[[PRED]]
106+
// CHECK: case 1 {
107+
// CHECK: scf.yield %[[VAL_A_1]], %[[VAL_A_2]], %[[VAL_A_3]], %[[VAL_A_4]]
108+
// CHECK: case 2 {
109+
// CHECK: scf.yield %[[VAL_B_1]], %[[VAL_B_2]], %[[VAL_B_3]], %[[VAL_B_4]]
110+
// CHECK: default {
111+
// CHECK: scf.yield %[[VAL_C_1]], %[[VAL_C_2]], %[[VAL_C_3]], %[[VAL_C_4]]
112+
113+
// CHECK: return %[[RES]]#0, %[[RES]]#1, %[[RES]]#2, %[[RES]]#3 :
114+
// CHECK-SAME: memref<?xindex>, memref<?xindex>, memref<?xf32>, !sparse_tensor.storage_specifier
115+
116+
func.func @index_switch(%pred: index, %a: tensor<5xf32, #SparseVector>,
117+
%b: tensor<5xf32, #SparseVector>,
118+
%c: tensor<5xf32, #SparseVector>) -> tensor<5xf32, #SparseVector> {
119+
%0 = scf.index_switch %pred -> tensor<5xf32, #SparseVector>
120+
case 1 {
121+
scf.yield %a : tensor<5xf32, #SparseVector>
122+
}
123+
case 2 {
124+
scf.yield %b : tensor<5xf32, #SparseVector>
125+
}
126+
default {
127+
scf.yield %c : tensor<5xf32, #SparseVector>
128+
}
129+
130+
return %0 : tensor<5xf32, #SparseVector>
131+
}

0 commit comments

Comments
 (0)