@@ -791,8 +791,8 @@ static bool allSameType(ArrayRef<Value *> VL) {
791
791
792
792
/// \returns True if in-tree use also needs extract. This refers to
793
793
/// possible scalar operand in vectorized instruction.
794
- static bool InTreeUserNeedToExtract (Value *Scalar, Instruction *UserInst,
795
- TargetLibraryInfo *TLI) {
794
+ static bool doesInTreeUserNeedToExtract (Value *Scalar, Instruction *UserInst,
795
+ TargetLibraryInfo *TLI) {
796
796
unsigned Opcode = UserInst->getOpcode();
797
797
switch (Opcode) {
798
798
case Instruction::Load: {
@@ -3663,7 +3663,7 @@ template <> struct GraphTraits<BoUpSLP *> {
3663
3663
template <> struct DOTGraphTraits<BoUpSLP *> : public DefaultDOTGraphTraits {
3664
3664
using TreeEntry = BoUpSLP::TreeEntry;
3665
3665
3666
- DOTGraphTraits(bool isSimple = false) : DefaultDOTGraphTraits(isSimple ) {}
3666
+ DOTGraphTraits(bool IsSimple = false) : DefaultDOTGraphTraits(IsSimple ) {}
3667
3667
3668
3668
std::string getNodeLabel(const TreeEntry *Entry, const BoUpSLP *R) {
3669
3669
std::string Str;
@@ -4947,7 +4947,7 @@ void BoUpSLP::buildExternalUses(
4947
4947
if (UseScalar != U ||
4948
4948
UseEntry->State == TreeEntry::ScatterVectorize ||
4949
4949
UseEntry->State == TreeEntry::PossibleStridedVectorize ||
4950
- !InTreeUserNeedToExtract (Scalar, UserInst, TLI)) {
4950
+ !doesInTreeUserNeedToExtract (Scalar, UserInst, TLI)) {
4951
4951
LLVM_DEBUG(dbgs() << "SLP: \tInternal user will be removed:" << *U
4952
4952
<< ".\n");
4953
4953
assert(UseEntry->State != TreeEntry::NeedToGather && "Bad state");
@@ -12763,7 +12763,7 @@ void BoUpSLP::BlockScheduling::calculateDependencies(ScheduleData *SD,
12763
12763
}
12764
12764
}
12765
12765
12766
- auto makeControlDependent = [&](Instruction *I) {
12766
+ auto MakeControlDependent = [&](Instruction *I) {
12767
12767
auto *DepDest = getScheduleData(I);
12768
12768
assert(DepDest && "must be in schedule window");
12769
12769
DepDest->ControlDependencies.push_back(BundleMember);
@@ -12785,7 +12785,7 @@ void BoUpSLP::BlockScheduling::calculateDependencies(ScheduleData *SD,
12785
12785
continue;
12786
12786
12787
12787
// Add the dependency
12788
- makeControlDependent (I);
12788
+ MakeControlDependent (I);
12789
12789
12790
12790
if (!isGuaranteedToTransferExecutionToSuccessor(I))
12791
12791
// Everything past here must be control dependent on I.
@@ -12811,7 +12811,7 @@ void BoUpSLP::BlockScheduling::calculateDependencies(ScheduleData *SD,
12811
12811
continue;
12812
12812
12813
12813
// Add the dependency
12814
- makeControlDependent (I);
12814
+ MakeControlDependent (I);
12815
12815
}
12816
12816
}
12817
12817
@@ -12829,7 +12829,7 @@ void BoUpSLP::BlockScheduling::calculateDependencies(ScheduleData *SD,
12829
12829
continue;
12830
12830
12831
12831
// Add the dependency
12832
- makeControlDependent (I);
12832
+ MakeControlDependent (I);
12833
12833
break;
12834
12834
}
12835
12835
}
@@ -12844,7 +12844,7 @@ void BoUpSLP::BlockScheduling::calculateDependencies(ScheduleData *SD,
12844
12844
"NextLoadStore list for non memory effecting bundle?");
12845
12845
MemoryLocation SrcLoc = getLocation(SrcInst);
12846
12846
bool SrcMayWrite = BundleMember->Inst->mayWriteToMemory();
12847
- unsigned numAliased = 0;
12847
+ unsigned NumAliased = 0;
12848
12848
unsigned DistToSrc = 1;
12849
12849
12850
12850
for (; DepDest; DepDest = DepDest->NextLoadStore) {
@@ -12859,13 +12859,13 @@ void BoUpSLP::BlockScheduling::calculateDependencies(ScheduleData *SD,
12859
12859
// check this limit even between two read-only instructions.
12860
12860
if (DistToSrc >= MaxMemDepDistance ||
12861
12861
((SrcMayWrite || DepDest->Inst->mayWriteToMemory()) &&
12862
- (numAliased >= AliasedCheckLimit ||
12862
+ (NumAliased >= AliasedCheckLimit ||
12863
12863
SLP->isAliased(SrcLoc, SrcInst, DepDest->Inst)))) {
12864
12864
12865
12865
// We increment the counter only if the locations are aliased
12866
12866
// (instead of counting all alias checks). This gives a better
12867
12867
// balance between reduced runtime and accurate dependencies.
12868
- numAliased ++;
12868
+ NumAliased ++;
12869
12869
12870
12870
DepDest->MemoryDependencies.push_back(BundleMember);
12871
12871
BundleMember->Dependencies++;
@@ -12967,20 +12967,20 @@ void BoUpSLP::scheduleBlock(BlockScheduling *BS) {
12967
12967
12968
12968
// Do the "real" scheduling.
12969
12969
while (!ReadyInsts.empty()) {
12970
- ScheduleData *picked = *ReadyInsts.begin();
12970
+ ScheduleData *Picked = *ReadyInsts.begin();
12971
12971
ReadyInsts.erase(ReadyInsts.begin());
12972
12972
12973
12973
// Move the scheduled instruction(s) to their dedicated places, if not
12974
12974
// there yet.
12975
- for (ScheduleData *BundleMember = picked ; BundleMember;
12975
+ for (ScheduleData *BundleMember = Picked ; BundleMember;
12976
12976
BundleMember = BundleMember->NextInBundle) {
12977
- Instruction *pickedInst = BundleMember->Inst;
12978
- if (pickedInst ->getNextNode() != LastScheduledInst)
12979
- pickedInst ->moveBefore(LastScheduledInst);
12980
- LastScheduledInst = pickedInst ;
12977
+ Instruction *PickedInst = BundleMember->Inst;
12978
+ if (PickedInst ->getNextNode() != LastScheduledInst)
12979
+ PickedInst ->moveBefore(LastScheduledInst);
12980
+ LastScheduledInst = PickedInst ;
12981
12981
}
12982
12982
12983
- BS->schedule(picked , ReadyInsts);
12983
+ BS->schedule(Picked , ReadyInsts);
12984
12984
}
12985
12985
12986
12986
// Check that we didn't break any of our invariants.
@@ -13695,8 +13695,8 @@ bool SLPVectorizerPass::tryToVectorizeList(ArrayRef<Value *> VL, BoUpSLP &R,
13695
13695
// NOTE: the following will give user internal llvm type name, which may
13696
13696
// not be useful.
13697
13697
R.getORE()->emit([&]() {
13698
- std::string type_str ;
13699
- llvm::raw_string_ostream rso(type_str );
13698
+ std::string TypeStr ;
13699
+ llvm::raw_string_ostream rso(TypeStr );
13700
13700
Ty->print(rso);
13701
13701
return OptimizationRemarkMissed(SV_NAME, "UnsupportedType", I0)
13702
13702
<< "Cannot SLP vectorize list: type "
0 commit comments