Skip to content

Commit dbbe2fe

Browse files
committed
Revert "[SLP]Do extra analysis int minbitwidth if some checks return false."
This reverts commit e4b7724 to fixx the issues reported in #84536.
1 parent 9b5d9a8 commit dbbe2fe

File tree

1 file changed

+5
-10
lines changed

1 file changed

+5
-10
lines changed

llvm/lib/Transforms/Vectorize/SLPVectorizer.cpp

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -11935,8 +11935,7 @@ Value *BoUpSLP::vectorizeTree(TreeEntry *E, bool PostponedPHIs) {
1193511935
Builder.SetCurrentDebugLocation(PH->getDebugLoc());
1193611936
Value *Vec = vectorizeOperand(E, I, /*PostponedPHIs=*/true);
1193711937
if (VecTy != Vec->getType()) {
11938-
assert((It != MinBWs.end() ||
11939-
getOperandEntry(E, I)->State == TreeEntry::NeedToGather ||
11938+
assert((getOperandEntry(E, I)->State == TreeEntry::NeedToGather ||
1194011939
MinBWs.contains(getOperandEntry(E, I))) &&
1194111940
"Expected item in MinBWs.");
1194211941
Vec = Builder.CreateIntCast(Vec, VecTy, It->second.second);
@@ -12194,8 +12193,7 @@ Value *BoUpSLP::vectorizeTree(TreeEntry *E, bool PostponedPHIs) {
1219412193
return E->VectorizedValue;
1219512194
}
1219612195
if (L->getType() != R->getType()) {
12197-
assert((It != MinBWs.end() ||
12198-
getOperandEntry(E, 0)->State == TreeEntry::NeedToGather ||
12196+
assert((getOperandEntry(E, 0)->State == TreeEntry::NeedToGather ||
1219912197
getOperandEntry(E, 1)->State == TreeEntry::NeedToGather ||
1220012198
MinBWs.contains(getOperandEntry(E, 0)) ||
1220112199
MinBWs.contains(getOperandEntry(E, 1))) &&
@@ -12234,8 +12232,7 @@ Value *BoUpSLP::vectorizeTree(TreeEntry *E, bool PostponedPHIs) {
1223412232
return E->VectorizedValue;
1223512233
}
1223612234
if (True->getType() != False->getType()) {
12237-
assert((It != MinBWs.end() ||
12238-
getOperandEntry(E, 1)->State == TreeEntry::NeedToGather ||
12235+
assert((getOperandEntry(E, 1)->State == TreeEntry::NeedToGather ||
1223912236
getOperandEntry(E, 2)->State == TreeEntry::NeedToGather ||
1224012237
MinBWs.contains(getOperandEntry(E, 1)) ||
1224112238
MinBWs.contains(getOperandEntry(E, 2))) &&
@@ -12305,8 +12302,7 @@ Value *BoUpSLP::vectorizeTree(TreeEntry *E, bool PostponedPHIs) {
1230512302
return E->VectorizedValue;
1230612303
}
1230712304
if (LHS->getType() != RHS->getType()) {
12308-
assert((It != MinBWs.end() ||
12309-
getOperandEntry(E, 0)->State == TreeEntry::NeedToGather ||
12305+
assert((getOperandEntry(E, 0)->State == TreeEntry::NeedToGather ||
1231012306
getOperandEntry(E, 1)->State == TreeEntry::NeedToGather ||
1231112307
MinBWs.contains(getOperandEntry(E, 0)) ||
1231212308
MinBWs.contains(getOperandEntry(E, 1))) &&
@@ -12544,8 +12540,7 @@ Value *BoUpSLP::vectorizeTree(TreeEntry *E, bool PostponedPHIs) {
1254412540
return E->VectorizedValue;
1254512541
}
1254612542
if (LHS && RHS && LHS->getType() != RHS->getType()) {
12547-
assert((It != MinBWs.end() ||
12548-
getOperandEntry(E, 0)->State == TreeEntry::NeedToGather ||
12543+
assert((getOperandEntry(E, 0)->State == TreeEntry::NeedToGather ||
1254912544
getOperandEntry(E, 1)->State == TreeEntry::NeedToGather ||
1255012545
MinBWs.contains(getOperandEntry(E, 0)) ||
1255112546
MinBWs.contains(getOperandEntry(E, 1))) &&

0 commit comments

Comments
 (0)