Skip to content

Commit 8a144c0

Browse files
kazutakahiratajyli0116
authored andcommitted
[AMDGPU] Use llvm::count_if (NFC) (llvm#137492)
1 parent 7312268 commit 8a144c0

File tree

1 file changed

+22
-27
lines changed

1 file changed

+22
-27
lines changed

llvm/lib/Target/AMDGPU/AMDGPUIGroupLP.cpp

Lines changed: 22 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1046,17 +1046,16 @@ class MFMAExpInterleaveOpt final : public IGLPStrategy {
10461046
if (!SyncPipe.size())
10471047
return false;
10481048

1049-
auto SuccSize = std::count_if(
1050-
SU->Succs.begin(), SU->Succs.end(),
1051-
[](const SDep &Succ) { return Succ.getKind() == SDep::Data; });
1049+
auto SuccSize = llvm::count_if(SU->Succs, [](const SDep &Succ) {
1050+
return Succ.getKind() == SDep::Data;
1051+
});
10521052
if (SuccSize >= Size)
10531053
return false;
10541054

10551055
if (HasIntermediary) {
10561056
for (auto Succ : SU->Succs) {
1057-
auto SuccSize = std::count_if(
1058-
Succ.getSUnit()->Succs.begin(), Succ.getSUnit()->Succs.end(),
1059-
[](const SDep &SuccSucc) {
1057+
auto SuccSize =
1058+
llvm::count_if(Succ.getSUnit()->Succs, [](const SDep &SuccSucc) {
10601059
return SuccSucc.getKind() == SDep::Data;
10611060
});
10621061
if (SuccSize >= Size)
@@ -1087,17 +1086,16 @@ class MFMAExpInterleaveOpt final : public IGLPStrategy {
10871086
if (!SyncPipe.size())
10881087
return false;
10891088

1090-
auto SuccSize = std::count_if(
1091-
SU->Succs.begin(), SU->Succs.end(),
1092-
[](const SDep &Succ) { return Succ.getKind() == SDep::Data; });
1089+
auto SuccSize = llvm::count_if(SU->Succs, [](const SDep &Succ) {
1090+
return Succ.getKind() == SDep::Data;
1091+
});
10931092
if (SuccSize >= Size)
10941093
return true;
10951094

10961095
if (HasIntermediary) {
10971096
for (auto Succ : SU->Succs) {
1098-
auto SuccSize = std::count_if(
1099-
Succ.getSUnit()->Succs.begin(), Succ.getSUnit()->Succs.end(),
1100-
[](const SDep &SuccSucc) {
1097+
auto SuccSize =
1098+
llvm::count_if(Succ.getSUnit()->Succs, [](const SDep &SuccSucc) {
11011099
return SuccSucc.getKind() == SDep::Data;
11021100
});
11031101
if (SuccSize >= Size)
@@ -1474,18 +1472,17 @@ bool MFMAExpInterleaveOpt::analyzeDAG(const SIInstrInfo *TII) {
14741472
MFMAChainLength = MFMAPipeCount / MFMAChains;
14751473

14761474
// The number of bit pack operations that depend on a single V_EXP
1477-
unsigned PackSuccCount = std::count_if(
1478-
PackSUs.begin(), PackSUs.end(), [this, &TempExp](SUnit *VPack) {
1475+
unsigned PackSuccCount =
1476+
llvm::count_if(PackSUs, [this, &TempExp](SUnit *VPack) {
14791477
return DAG->IsReachable(VPack, *TempExp);
14801478
});
14811479

14821480
// The number of bit pack operations an MFMA depends on
14831481
unsigned PackPredCount =
1484-
std::count_if((*TempMFMA)->Preds.begin(), (*TempMFMA)->Preds.end(),
1485-
[&isBitPack](SDep &Pred) {
1486-
auto Opc = Pred.getSUnit()->getInstr()->getOpcode();
1487-
return isBitPack(Opc);
1488-
});
1482+
llvm::count_if((*TempMFMA)->Preds, [&isBitPack](SDep &Pred) {
1483+
auto Opc = Pred.getSUnit()->getInstr()->getOpcode();
1484+
return isBitPack(Opc);
1485+
});
14891486

14901487
auto *PackPred = llvm::find_if((*TempMFMA)->Preds, [&isBitPack](SDep &Pred) {
14911488
auto Opc = Pred.getSUnit()->getInstr()->getOpcode();
@@ -1499,20 +1496,18 @@ bool MFMAExpInterleaveOpt::analyzeDAG(const SIInstrInfo *TII) {
14991496
ExpRequirement = 0;
15001497
// How many MFMAs depend on a single bit pack operation
15011498
MFMAEnablement =
1502-
std::count_if(PackPred->getSUnit()->Succs.begin(),
1503-
PackPred->getSUnit()->Succs.end(), [&TII](SDep &Succ) {
1504-
return TII->isMFMAorWMMA(*Succ.getSUnit()->getInstr());
1505-
});
1499+
llvm::count_if(PackPred->getSUnit()->Succs, [&TII](SDep &Succ) {
1500+
return TII->isMFMAorWMMA(*Succ.getSUnit()->getInstr());
1501+
});
15061502

15071503
// The number of MFMAs that depend on a single V_EXP
15081504
MFMAEnablement *= PackSuccCount;
15091505

15101506
// The number of V_EXPs required to resolve all dependencies for an MFMA
15111507
ExpRequirement =
1512-
std::count_if(ExpPipeCands.begin(), ExpPipeCands.end(),
1513-
[this, &PackPred](SUnit *ExpBase) {
1514-
return DAG->IsReachable(PackPred->getSUnit(), ExpBase);
1515-
});
1508+
llvm::count_if(ExpPipeCands, [this, &PackPred](SUnit *ExpBase) {
1509+
return DAG->IsReachable(PackPred->getSUnit(), ExpBase);
1510+
});
15161511

15171512
ExpRequirement *= PackPredCount;
15181513
return true;

0 commit comments

Comments
 (0)