Skip to content

Commit 7b9149c

Browse files
lipracerlipracer
committed
rebase
1 parent 55a54f9 commit 7b9149c

File tree

2 files changed

+23
-23
lines changed

2 files changed

+23
-23
lines changed

‎mlir/include/mlir/IR/AffineExprVisitor.h

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -76,31 +76,31 @@ class AffineExprVisitorBase {
7676
auto self = static_cast<SubClass *>(this);
7777
switch (expr.getKind()) {
7878
case AffineExprKind::Add: {
79-
auto binOpExpr = expr.cast<AffineBinaryOpExpr>();
79+
auto binOpExpr = cast<AffineBinaryOpExpr>(expr);
8080
return self->visitAddExpr(binOpExpr);
8181
}
8282
case AffineExprKind::Mul: {
83-
auto binOpExpr = expr.cast<AffineBinaryOpExpr>();
83+
auto binOpExpr = cast<AffineBinaryOpExpr>(expr);
8484
return self->visitMulExpr(binOpExpr);
8585
}
8686
case AffineExprKind::Mod: {
87-
auto binOpExpr = expr.cast<AffineBinaryOpExpr>();
87+
auto binOpExpr = cast<AffineBinaryOpExpr>(expr);
8888
return self->visitModExpr(binOpExpr);
8989
}
9090
case AffineExprKind::FloorDiv: {
91-
auto binOpExpr = expr.cast<AffineBinaryOpExpr>();
91+
auto binOpExpr = cast<AffineBinaryOpExpr>(expr);
9292
return self->visitFloorDivExpr(binOpExpr);
9393
}
9494
case AffineExprKind::CeilDiv: {
95-
auto binOpExpr = expr.cast<AffineBinaryOpExpr>();
95+
auto binOpExpr = cast<AffineBinaryOpExpr>(expr);
9696
return self->visitCeilDivExpr(binOpExpr);
9797
}
9898
case AffineExprKind::Constant:
99-
return self->visitConstantExpr(expr.cast<AffineConstantExpr>());
99+
return self->visitConstantExpr(cast<AffineConstantExpr>(expr));
100100
case AffineExprKind::DimId:
101-
return self->visitDimExpr(expr.cast<AffineDimExpr>());
101+
return self->visitDimExpr(cast<AffineDimExpr>(expr));
102102
case AffineExprKind::SymbolId:
103-
return self->visitSymbolExpr(expr.cast<AffineSymbolExpr>());
103+
return self->visitSymbolExpr(cast<AffineSymbolExpr>(expr));
104104
}
105105
llvm_unreachable("Unknown AffineExpr");
106106
}
@@ -174,11 +174,11 @@ class AffineExprVisitor : public AffineExprVisitorBase<SubClass, RetTy> {
174174
return self->visitCeilDivExpr(binOpExpr);
175175
}
176176
case AffineExprKind::Constant:
177-
return self->visitConstantExpr(expr.cast<AffineConstantExpr>());
177+
return self->visitConstantExpr(cast<AffineConstantExpr>(expr));
178178
case AffineExprKind::DimId:
179-
return self->visitDimExpr(expr.cast<AffineDimExpr>());
179+
return self->visitDimExpr(cast<AffineDimExpr>(expr));
180180
case AffineExprKind::SymbolId:
181-
return self->visitSymbolExpr(expr.cast<AffineSymbolExpr>());
181+
return self->visitSymbolExpr(cast<AffineSymbolExpr>(expr));
182182
}
183183
llvm_unreachable("Unknown AffineExpr");
184184
}
@@ -205,41 +205,41 @@ class AffineExprVisitor<SubClass, LogicalResult>
205205
auto self = static_cast<SubClass *>(this);
206206
switch (expr.getKind()) {
207207
case AffineExprKind::Add: {
208-
auto binOpExpr = expr.cast<AffineBinaryOpExpr>();
208+
auto binOpExpr = cast<AffineBinaryOpExpr>(expr);
209209
if (failed(walkOperandsPostOrder(binOpExpr)))
210210
return failure();
211211
return self->visitAddExpr(binOpExpr);
212212
}
213213
case AffineExprKind::Mul: {
214-
auto binOpExpr = expr.cast<AffineBinaryOpExpr>();
214+
auto binOpExpr = cast<AffineBinaryOpExpr>(expr);
215215
if (failed(walkOperandsPostOrder(binOpExpr)))
216216
return failure();
217217
return self->visitMulExpr(binOpExpr);
218218
}
219219
case AffineExprKind::Mod: {
220-
auto binOpExpr = expr.cast<AffineBinaryOpExpr>();
220+
auto binOpExpr = cast<AffineBinaryOpExpr>(expr);
221221
if (failed(walkOperandsPostOrder(binOpExpr)))
222222
return failure();
223223
return self->visitModExpr(binOpExpr);
224224
}
225225
case AffineExprKind::FloorDiv: {
226-
auto binOpExpr = expr.cast<AffineBinaryOpExpr>();
226+
auto binOpExpr = cast<AffineBinaryOpExpr>(expr);
227227
if (failed(walkOperandsPostOrder(binOpExpr)))
228228
return failure();
229229
return self->visitFloorDivExpr(binOpExpr);
230230
}
231231
case AffineExprKind::CeilDiv: {
232-
auto binOpExpr = expr.cast<AffineBinaryOpExpr>();
232+
auto binOpExpr = cast<AffineBinaryOpExpr>(expr);
233233
if (failed(walkOperandsPostOrder(binOpExpr)))
234234
return failure();
235235
return self->visitCeilDivExpr(binOpExpr);
236236
}
237237
case AffineExprKind::Constant:
238-
return self->visitConstantExpr(expr.cast<AffineConstantExpr>());
238+
return self->visitConstantExpr(cast<AffineConstantExpr>(expr));
239239
case AffineExprKind::DimId:
240-
return self->visitDimExpr(expr.cast<AffineDimExpr>());
240+
return self->visitDimExpr(cast<AffineDimExpr>(expr));
241241
case AffineExprKind::SymbolId:
242-
return self->visitSymbolExpr(expr.cast<AffineSymbolExpr>());
242+
return self->visitSymbolExpr(cast<AffineSymbolExpr>(expr));
243243
}
244244
llvm_unreachable("Unknown AffineExpr");
245245
}

‎mlir/lib/Dialect/Affine/IR/AffineOps.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -722,11 +722,11 @@ getBoundForExpr(AffineExpr expr, unsigned numDims, unsigned numSymbols,
722722
ArrayRef<std::optional<int64_t>> constUpperBounds,
723723
bool isUpper) {
724724
// Handle divs and mods.
725-
if (auto binOpExpr = expr.dyn_cast<AffineBinaryOpExpr>()) {
725+
if (auto binOpExpr = dyn_cast<AffineBinaryOpExpr>(expr)) {
726726
// If the LHS of a floor or ceil is bounded and the RHS is a constant, we
727727
// can compute an upper bound.
728728
if (binOpExpr.getKind() == AffineExprKind::FloorDiv) {
729-
auto rhsConst = binOpExpr.getRHS().dyn_cast<AffineConstantExpr>();
729+
auto rhsConst = dyn_cast<AffineConstantExpr>(binOpExpr.getRHS());
730730
if (!rhsConst || rhsConst.getValue() < 1)
731731
return std::nullopt;
732732
std::optional<int64_t> bound =
@@ -737,7 +737,7 @@ getBoundForExpr(AffineExpr expr, unsigned numDims, unsigned numSymbols,
737737
return mlir::floorDiv(*bound, rhsConst.getValue());
738738
}
739739
if (binOpExpr.getKind() == AffineExprKind::CeilDiv) {
740-
auto rhsConst = binOpExpr.getRHS().dyn_cast<AffineConstantExpr>();
740+
auto rhsConst = dyn_cast<AffineConstantExpr>(binOpExpr.getRHS());
741741
if (rhsConst && rhsConst.getValue() >= 1) {
742742
std::optional<int64_t> bound =
743743
getBoundForExpr(binOpExpr.getLHS(), numDims, numSymbols,
@@ -752,7 +752,7 @@ getBoundForExpr(AffineExpr expr, unsigned numDims, unsigned numSymbols,
752752
// lhs mod c is always <= c - 1 and non-negative. In addition, if `lhs` is
753753
// bounded such that lb <= lhs <= ub and lb floordiv c == ub floordiv c
754754
// (same "interval"), then lb mod c <= lhs mod c <= ub mod c.
755-
auto rhsConst = binOpExpr.getRHS().dyn_cast<AffineConstantExpr>();
755+
auto rhsConst = dyn_cast<AffineConstantExpr>(binOpExpr.getRHS());
756756
if (rhsConst && rhsConst.getValue() >= 1) {
757757
int64_t rhsConstVal = rhsConst.getValue();
758758
std::optional<int64_t> lb =

0 commit comments

Comments
 (0)