[llvm] [Matrix] Don't update Changed based on Visit* return value (NFC). (PR #142417)
Florian Hahn via llvm-commits
llvm-commits at lists.llvm.org
Mon Jun 2 08:45:47 PDT 2025
https://github.com/fhahn created https://github.com/llvm/llvm-project/pull/142417
Visit* are always modifying the IR, remove the boolean result.
Depends on https://github.com/llvm/llvm-project/pull/142416.
>From 3ac2a0dad731deea26ca62b7c2161640add623a4 Mon Sep 17 00:00:00 2001
From: Florian Hahn <flo at fhahn.com>
Date: Mon, 2 Jun 2025 16:33:12 +0100
Subject: [PATCH 1/2] [Matrix] Assert that there's shapeinfo in Visit* (NFC).
We should only call Visit* for instructions with shape info. Turn early
exit into assert.
---
.../Scalar/LowerMatrixIntrinsics.cpp | 18 ++++++++----------
1 file changed, 8 insertions(+), 10 deletions(-)
diff --git a/llvm/lib/Transforms/Scalar/LowerMatrixIntrinsics.cpp b/llvm/lib/Transforms/Scalar/LowerMatrixIntrinsics.cpp
index 787e107464c0a..fb5e081acf7c5 100644
--- a/llvm/lib/Transforms/Scalar/LowerMatrixIntrinsics.cpp
+++ b/llvm/lib/Transforms/Scalar/LowerMatrixIntrinsics.cpp
@@ -2107,9 +2107,8 @@ class LowerMatrixIntrinsics {
/// Lower load instructions, if shape information is available.
bool VisitLoad(LoadInst *Inst, Value *Ptr, IRBuilder<> &Builder) {
auto I = ShapeMap.find(Inst);
- if (I == ShapeMap.end())
- return false;
-
+ assert(I != ShapeMap.end() &&
+ "must only visit instructions with shape info");
LowerLoad(Inst, Ptr, Inst->getAlign(),
Builder.getInt64(I->second.getStride()), Inst->isVolatile(),
I->second);
@@ -2119,9 +2118,8 @@ class LowerMatrixIntrinsics {
bool VisitStore(StoreInst *Inst, Value *StoredVal, Value *Ptr,
IRBuilder<> &Builder) {
auto I = ShapeMap.find(StoredVal);
- if (I == ShapeMap.end())
- return false;
-
+ assert(I != ShapeMap.end() &&
+ "must only visit instructions with shape info");
LowerStore(Inst, StoredVal, Ptr, Inst->getAlign(),
Builder.getInt64(I->second.getStride()), Inst->isVolatile(),
I->second);
@@ -2131,8 +2129,8 @@ class LowerMatrixIntrinsics {
/// Lower binary operators, if shape information is available.
bool VisitBinaryOperator(BinaryOperator *Inst) {
auto I = ShapeMap.find(Inst);
- if (I == ShapeMap.end())
- return false;
+ assert(I != ShapeMap.end() &&
+ "must only visit instructions with shape info");
Value *Lhs = Inst->getOperand(0);
Value *Rhs = Inst->getOperand(1);
@@ -2163,8 +2161,8 @@ class LowerMatrixIntrinsics {
/// Lower unary operators, if shape information is available.
bool VisitUnaryOperator(UnaryOperator *Inst) {
auto I = ShapeMap.find(Inst);
- if (I == ShapeMap.end())
- return false;
+ assert(I != ShapeMap.end() &&
+ "must only visit instructions with shape info");
Value *Op = Inst->getOperand(0);
>From 870c7ca7dd6b9bb710f5a404833717dab4c6cfec Mon Sep 17 00:00:00 2001
From: Florian Hahn <flo at fhahn.com>
Date: Mon, 2 Jun 2025 16:41:10 +0100
Subject: [PATCH 2/2] [Matrix] Don't update Changed based on Visit* return
value (NFC).
Visit* are always modifying the IR, remove the boolean result.
Depends on https://github.com/llvm/llvm-project/pull/142416.
---
.../Scalar/LowerMatrixIntrinsics.cpp | 23 +++++++++----------
1 file changed, 11 insertions(+), 12 deletions(-)
diff --git a/llvm/lib/Transforms/Scalar/LowerMatrixIntrinsics.cpp b/llvm/lib/Transforms/Scalar/LowerMatrixIntrinsics.cpp
index fb5e081acf7c5..e6e8c30b9260a 100644
--- a/llvm/lib/Transforms/Scalar/LowerMatrixIntrinsics.cpp
+++ b/llvm/lib/Transforms/Scalar/LowerMatrixIntrinsics.cpp
@@ -1062,13 +1062,16 @@ class LowerMatrixIntrinsics {
Value *Op1;
Value *Op2;
if (auto *BinOp = dyn_cast<BinaryOperator>(Inst))
- Changed |= VisitBinaryOperator(BinOp);
+ VisitBinaryOperator(BinOp);
if (auto *UnOp = dyn_cast<UnaryOperator>(Inst))
- Changed |= VisitUnaryOperator(UnOp);
+ VisitUnaryOperator(UnOp);
if (match(Inst, m_Load(m_Value(Op1))))
- Changed |= VisitLoad(cast<LoadInst>(Inst), Op1, Builder);
+ VisitLoad(cast<LoadInst>(Inst), Op1, Builder);
else if (match(Inst, m_Store(m_Value(Op1), m_Value(Op2))))
- Changed |= VisitStore(cast<StoreInst>(Inst), Op1, Op2, Builder);
+ VisitStore(cast<StoreInst>(Inst), Op1, Op2, Builder);
+ else
+ continue;
+ Changed = true;
}
if (ORE) {
@@ -2105,17 +2108,16 @@ class LowerMatrixIntrinsics {
}
/// Lower load instructions, if shape information is available.
- bool VisitLoad(LoadInst *Inst, Value *Ptr, IRBuilder<> &Builder) {
+ void VisitLoad(LoadInst *Inst, Value *Ptr, IRBuilder<> &Builder) {
auto I = ShapeMap.find(Inst);
assert(I != ShapeMap.end() &&
"must only visit instructions with shape info");
LowerLoad(Inst, Ptr, Inst->getAlign(),
Builder.getInt64(I->second.getStride()), Inst->isVolatile(),
I->second);
- return true;
}
- bool VisitStore(StoreInst *Inst, Value *StoredVal, Value *Ptr,
+ void VisitStore(StoreInst *Inst, Value *StoredVal, Value *Ptr,
IRBuilder<> &Builder) {
auto I = ShapeMap.find(StoredVal);
assert(I != ShapeMap.end() &&
@@ -2123,11 +2125,10 @@ class LowerMatrixIntrinsics {
LowerStore(Inst, StoredVal, Ptr, Inst->getAlign(),
Builder.getInt64(I->second.getStride()), Inst->isVolatile(),
I->second);
- return true;
}
/// Lower binary operators, if shape information is available.
- bool VisitBinaryOperator(BinaryOperator *Inst) {
+ void VisitBinaryOperator(BinaryOperator *Inst) {
auto I = ShapeMap.find(Inst);
assert(I != ShapeMap.end() &&
"must only visit instructions with shape info");
@@ -2155,11 +2156,10 @@ class LowerMatrixIntrinsics {
Result.addNumComputeOps(getNumOps(Result.getVectorTy()) *
Result.getNumVectors()),
Builder);
- return true;
}
/// Lower unary operators, if shape information is available.
- bool VisitUnaryOperator(UnaryOperator *Inst) {
+ void VisitUnaryOperator(UnaryOperator *Inst) {
auto I = ShapeMap.find(Inst);
assert(I != ShapeMap.end() &&
"must only visit instructions with shape info");
@@ -2191,7 +2191,6 @@ class LowerMatrixIntrinsics {
Result.addNumComputeOps(getNumOps(Result.getVectorTy()) *
Result.getNumVectors()),
Builder);
- return true;
}
/// Helper to linearize a matrix expression tree into a string. Currently
More information about the llvm-commits
mailing list