[llvm] ac75d32 - [SandboxVec][VecUtils] Filter out instructions not in BB in VecUtils:getLowest() (#124360)
via llvm-commits
llvm-commits at lists.llvm.org
Fri Jan 24 14:53:01 PST 2025
Author: vporpo
Date: 2025-01-24T14:52:57-08:00
New Revision: ac75d322801411f496fe5d1155c86453f915ae98
URL: https://github.com/llvm/llvm-project/commit/ac75d322801411f496fe5d1155c86453f915ae98
DIFF: https://github.com/llvm/llvm-project/commit/ac75d322801411f496fe5d1155c86453f915ae98.diff
LOG: [SandboxVec][VecUtils] Filter out instructions not in BB in VecUtils:getLowest() (#124360)
This patch changes the functionality of `VecUtils::getLowest(Vals, BB)`
such that it filters out any instructions in `Vals` that are not in BB.
This is useful when Vals contains instructions from different BBs,
because in that case we are only interested in one BB.
Added:
Modified:
llvm/include/llvm/Transforms/Vectorize/SandboxVectorizer/VecUtils.h
llvm/lib/Transforms/Vectorize/SandboxVectorizer/Passes/BottomUpVec.cpp
llvm/test/Transforms/SandboxVectorizer/cross_bbs.ll
llvm/test/Transforms/SandboxVectorizer/pack.ll
llvm/unittests/Transforms/Vectorize/SandboxVectorizer/VecUtilsTest.cpp
Removed:
################################################################################
diff --git a/llvm/include/llvm/Transforms/Vectorize/SandboxVectorizer/VecUtils.h b/llvm/include/llvm/Transforms/Vectorize/SandboxVectorizer/VecUtils.h
index 64090febc5a096..bec1cecf241f66 100644
--- a/llvm/include/llvm/Transforms/Vectorize/SandboxVectorizer/VecUtils.h
+++ b/llvm/include/llvm/Transforms/Vectorize/SandboxVectorizer/VecUtils.h
@@ -111,10 +111,12 @@ class VecUtils {
return LowestI;
}
/// \Returns the lowest instruction in \p Vals, or nullptr if no instructions
- /// are found or if not in the same BB.
- static Instruction *getLowest(ArrayRef<Value *> Vals) {
- // Find the first Instruction in Vals.
- auto It = find_if(Vals, [](Value *V) { return isa<Instruction>(V); });
+ /// are found. Skips instructions not in \p BB.
+ static Instruction *getLowest(ArrayRef<Value *> Vals, BasicBlock *BB) {
+ // Find the first Instruction in Vals that is also in `BB`.
+ auto It = find_if(Vals, [BB](Value *V) {
+ return isa<Instruction>(V) && cast<Instruction>(V)->getParent() == BB;
+ });
// If we couldn't find an instruction return nullptr.
if (It == Vals.end())
return nullptr;
@@ -122,15 +124,14 @@ class VecUtils {
// Now look for the lowest instruction in Vals starting from one position
// after FirstI.
Instruction *LowestI = FirstI;
- auto *LowestBB = LowestI->getParent();
for (auto *V : make_range(std::next(It), Vals.end())) {
auto *I = dyn_cast<Instruction>(V);
// Skip non-instructions.
if (I == nullptr)
continue;
- // If the instructions are in
diff erent BBs return nullptr.
- if (I->getParent() != LowestBB)
- return nullptr;
+ // Skips instructions not in \p BB.
+ if (I->getParent() != BB)
+ continue;
// If `LowestI` comes before `I` then `I` is the new lowest.
if (LowestI->comesBefore(I))
LowestI = I;
diff --git a/llvm/lib/Transforms/Vectorize/SandboxVectorizer/Passes/BottomUpVec.cpp b/llvm/lib/Transforms/Vectorize/SandboxVectorizer/Passes/BottomUpVec.cpp
index b3a477c64a5cc5..6f65657d297906 100644
--- a/llvm/lib/Transforms/Vectorize/SandboxVectorizer/Passes/BottomUpVec.cpp
+++ b/llvm/lib/Transforms/Vectorize/SandboxVectorizer/Passes/BottomUpVec.cpp
@@ -54,7 +54,7 @@ static SmallVector<Value *, 4> getOperand(ArrayRef<Value *> Bndl,
/// of BB if no instruction found in \p Vals.
static BasicBlock::iterator getInsertPointAfterInstrs(ArrayRef<Value *> Vals,
BasicBlock *BB) {
- auto *BotI = VecUtils::getLastPHIOrSelf(VecUtils::getLowest(Vals));
+ auto *BotI = VecUtils::getLastPHIOrSelf(VecUtils::getLowest(Vals, BB));
if (BotI == nullptr)
// We are using BB->begin() (or after PHIs) as the fallback insert point.
return BB->empty()
diff --git a/llvm/test/Transforms/SandboxVectorizer/cross_bbs.ll b/llvm/test/Transforms/SandboxVectorizer/cross_bbs.ll
index e913fc5913ba7c..6ec31060d7e0fe 100644
--- a/llvm/test/Transforms/SandboxVectorizer/cross_bbs.ll
+++ b/llvm/test/Transforms/SandboxVectorizer/cross_bbs.ll
@@ -8,10 +8,10 @@ define void @cross_bbs(ptr %ptr) {
; CHECK-NEXT: [[PTR1:%.*]] = getelementptr i8, ptr [[PTR]], i32 1
; CHECK-NEXT: [[L0:%.*]] = load i8, ptr [[PTR0]], align 1
; CHECK-NEXT: [[L1:%.*]] = load i8, ptr [[PTR1]], align 1
-; CHECK-NEXT: [[PACK:%.*]] = insertelement <2 x i8> poison, i8 [[L0]], i32 0
-; CHECK-NEXT: [[PACK1:%.*]] = insertelement <2 x i8> [[PACK]], i8 [[L1]], i32 1
; CHECK-NEXT: br label %[[BB:.*]]
; CHECK: [[BB]]:
+; CHECK-NEXT: [[PACK:%.*]] = insertelement <2 x i8> poison, i8 [[L0]], i32 0
+; CHECK-NEXT: [[PACK1:%.*]] = insertelement <2 x i8> [[PACK]], i8 [[L1]], i32 1
; CHECK-NEXT: store <2 x i8> [[PACK1]], ptr [[PTR0]], align 1
; CHECK-NEXT: ret void
;
diff --git a/llvm/test/Transforms/SandboxVectorizer/pack.ll b/llvm/test/Transforms/SandboxVectorizer/pack.ll
index 373ab743fb890d..a0aa2a79a0adef 100644
--- a/llvm/test/Transforms/SandboxVectorizer/pack.ll
+++ b/llvm/test/Transforms/SandboxVectorizer/pack.ll
@@ -59,12 +59,12 @@ define void @packFromOtherBB(ptr %ptr, i8 %val) {
; CHECK-NEXT: [[ENTRY:.*]]:
; CHECK-NEXT: [[ADD0:%.*]] = add i8 [[VAL]], 0
; CHECK-NEXT: [[MUL1:%.*]] = mul i8 [[VAL]], 1
-; CHECK-NEXT: [[PACK:%.*]] = insertelement <2 x i8> poison, i8 [[ADD0]], i32 0
-; CHECK-NEXT: [[PACK1:%.*]] = insertelement <2 x i8> [[PACK]], i8 [[MUL1]], i32 1
; CHECK-NEXT: br label %[[LOOP:.*]]
; CHECK: [[LOOP]]:
; CHECK-NEXT: [[PHI0:%.*]] = phi i8 [ 0, %[[ENTRY]] ], [ 1, %[[LOOP]] ]
; CHECK-NEXT: [[PHI1:%.*]] = phi i8 [ 0, %[[ENTRY]] ], [ 1, %[[LOOP]] ]
+; CHECK-NEXT: [[PACK:%.*]] = insertelement <2 x i8> poison, i8 [[ADD0]], i32 0
+; CHECK-NEXT: [[PACK1:%.*]] = insertelement <2 x i8> [[PACK]], i8 [[MUL1]], i32 1
; CHECK-NEXT: [[GEP0:%.*]] = getelementptr i8, ptr [[PTR]], i64 0
; CHECK-NEXT: store <2 x i8> [[PACK1]], ptr [[GEP0]], align 1
; CHECK-NEXT: br label %[[LOOP]]
diff --git a/llvm/unittests/Transforms/Vectorize/SandboxVectorizer/VecUtilsTest.cpp b/llvm/unittests/Transforms/Vectorize/SandboxVectorizer/VecUtilsTest.cpp
index a46e47afea3c71..5c062df8112f6f 100644
--- a/llvm/unittests/Transforms/Vectorize/SandboxVectorizer/VecUtilsTest.cpp
+++ b/llvm/unittests/Transforms/Vectorize/SandboxVectorizer/VecUtilsTest.cpp
@@ -461,24 +461,33 @@ define void @foo(i8 %v) {
// Check getLowest(ArrayRef<Value *>)
SmallVector<sandboxir::Value *> C1Only({C1});
- EXPECT_EQ(sandboxir::VecUtils::getLowest(C1Only), nullptr);
+ EXPECT_EQ(sandboxir::VecUtils::getLowest(C1Only, &BB), nullptr);
+ EXPECT_EQ(sandboxir::VecUtils::getLowest(C1Only, &BB0), nullptr);
SmallVector<sandboxir::Value *> AOnly({IA});
- EXPECT_EQ(sandboxir::VecUtils::getLowest(AOnly), IA);
+ EXPECT_EQ(sandboxir::VecUtils::getLowest(AOnly, &BB), IA);
+ EXPECT_EQ(sandboxir::VecUtils::getLowest(AOnly, &BB0), nullptr);
SmallVector<sandboxir::Value *> AC1({IA, C1});
- EXPECT_EQ(sandboxir::VecUtils::getLowest(AC1), IA);
+ EXPECT_EQ(sandboxir::VecUtils::getLowest(AC1, &BB), IA);
+ EXPECT_EQ(sandboxir::VecUtils::getLowest(AC1, &BB0), nullptr);
SmallVector<sandboxir::Value *> C1A({C1, IA});
- EXPECT_EQ(sandboxir::VecUtils::getLowest(C1A), IA);
+ EXPECT_EQ(sandboxir::VecUtils::getLowest(C1A, &BB), IA);
+ EXPECT_EQ(sandboxir::VecUtils::getLowest(C1A, &BB0), nullptr);
SmallVector<sandboxir::Value *> AC1B({IA, C1, IB});
- EXPECT_EQ(sandboxir::VecUtils::getLowest(AC1B), IB);
+ EXPECT_EQ(sandboxir::VecUtils::getLowest(AC1B, &BB), IB);
+ EXPECT_EQ(sandboxir::VecUtils::getLowest(AC1B, &BB0), nullptr);
SmallVector<sandboxir::Value *> ABC1({IA, IB, C1});
- EXPECT_EQ(sandboxir::VecUtils::getLowest(ABC1), IB);
+ EXPECT_EQ(sandboxir::VecUtils::getLowest(ABC1, &BB), IB);
+ EXPECT_EQ(sandboxir::VecUtils::getLowest(ABC1, &BB0), nullptr);
SmallVector<sandboxir::Value *> AC1C2({IA, C1, C2});
- EXPECT_EQ(sandboxir::VecUtils::getLowest(AC1C2), IA);
+ EXPECT_EQ(sandboxir::VecUtils::getLowest(AC1C2, &BB), IA);
+ EXPECT_EQ(sandboxir::VecUtils::getLowest(AC1C2, &BB0), nullptr);
SmallVector<sandboxir::Value *> C1C2C3({C1, C2, C3});
- EXPECT_EQ(sandboxir::VecUtils::getLowest(C1C2C3), nullptr);
+ EXPECT_EQ(sandboxir::VecUtils::getLowest(C1C2C3, &BB), nullptr);
+ EXPECT_EQ(sandboxir::VecUtils::getLowest(C1C2C3, &BB0), nullptr);
SmallVector<sandboxir::Value *> DiffBBs({BB0I, IA});
- EXPECT_EQ(sandboxir::VecUtils::getLowest(DiffBBs), nullptr);
+ EXPECT_EQ(sandboxir::VecUtils::getLowest(DiffBBs, &BB0), BB0I);
+ EXPECT_EQ(sandboxir::VecUtils::getLowest(DiffBBs, &BB), IA);
}
TEST_F(VecUtilsTest, GetLastPHIOrSelf) {
More information about the llvm-commits
mailing list