Skip to content

Commit 7889d8e

Browse files
committed
Revert "[LoadStoreVectorize] Use '||' instead of '|' between sides with function calls. NFCI."
This broke two tests. Presumably the non-short-circuting '|' was intentional here. This reverts commit f7efea0.
1 parent 6108eb4 commit 7889d8e

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

llvm/lib/Transforms/Vectorize/LoadStoreVectorizer.cpp

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1004,7 +1004,7 @@ bool Vectorizer::vectorizeStoreChain(
10041004
LLVM_DEBUG(dbgs() << "LSV: Chain doesn't match with the vector factor."
10051005
" Creating two separate arrays.\n");
10061006
return vectorizeStoreChain(Chain.slice(0, TargetVF),
1007-
InstructionsProcessed) ||
1007+
InstructionsProcessed) |
10081008
vectorizeStoreChain(Chain.slice(TargetVF), InstructionsProcessed);
10091009
}
10101010

@@ -1022,7 +1022,7 @@ bool Vectorizer::vectorizeStoreChain(
10221022
if (accessIsMisaligned(SzInBytes, AS, Alignment)) {
10231023
if (S0->getPointerAddressSpace() != DL.getAllocaAddrSpace()) {
10241024
auto Chains = splitOddVectorElts(Chain, Sz);
1025-
return vectorizeStoreChain(Chains.first, InstructionsProcessed) ||
1025+
return vectorizeStoreChain(Chains.first, InstructionsProcessed) |
10261026
vectorizeStoreChain(Chains.second, InstructionsProcessed);
10271027
}
10281028

@@ -1035,7 +1035,7 @@ bool Vectorizer::vectorizeStoreChain(
10351035

10361036
if (!TTI.isLegalToVectorizeStoreChain(SzInBytes, Alignment, AS)) {
10371037
auto Chains = splitOddVectorElts(Chain, Sz);
1038-
return vectorizeStoreChain(Chains.first, InstructionsProcessed) ||
1038+
return vectorizeStoreChain(Chains.first, InstructionsProcessed) |
10391039
vectorizeStoreChain(Chains.second, InstructionsProcessed);
10401040
}
10411041

@@ -1153,7 +1153,7 @@ bool Vectorizer::vectorizeLoadChain(
11531153
if (ChainSize > VF || (VF != TargetVF && TargetVF < ChainSize)) {
11541154
LLVM_DEBUG(dbgs() << "LSV: Chain doesn't match with the vector factor."
11551155
" Creating two separate arrays.\n");
1156-
return vectorizeLoadChain(Chain.slice(0, TargetVF), InstructionsProcessed) ||
1156+
return vectorizeLoadChain(Chain.slice(0, TargetVF), InstructionsProcessed) |
11571157
vectorizeLoadChain(Chain.slice(TargetVF), InstructionsProcessed);
11581158
}
11591159

@@ -1165,7 +1165,7 @@ bool Vectorizer::vectorizeLoadChain(
11651165
if (accessIsMisaligned(SzInBytes, AS, Alignment)) {
11661166
if (L0->getPointerAddressSpace() != DL.getAllocaAddrSpace()) {
11671167
auto Chains = splitOddVectorElts(Chain, Sz);
1168-
return vectorizeLoadChain(Chains.first, InstructionsProcessed) ||
1168+
return vectorizeLoadChain(Chains.first, InstructionsProcessed) |
11691169
vectorizeLoadChain(Chains.second, InstructionsProcessed);
11701170
}
11711171

@@ -1175,7 +1175,7 @@ bool Vectorizer::vectorizeLoadChain(
11751175

11761176
if (!TTI.isLegalToVectorizeLoadChain(SzInBytes, Alignment, AS)) {
11771177
auto Chains = splitOddVectorElts(Chain, Sz);
1178-
return vectorizeLoadChain(Chains.first, InstructionsProcessed) ||
1178+
return vectorizeLoadChain(Chains.first, InstructionsProcessed) |
11791179
vectorizeLoadChain(Chains.second, InstructionsProcessed);
11801180
}
11811181

0 commit comments

Comments
 (0)