Skip to content

Commit 3b9f183

Browse files
[AMDGPU] Use llvm::any_of, llvm::all_of, and llvm::none_of (NFC) (#103007)
1 parent aa03327 commit 3b9f183

File tree

3 files changed

+20
-27
lines changed

3 files changed

+20
-27
lines changed

llvm/lib/Target/AMDGPU/AMDGPUCallLowering.cpp

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1371,12 +1371,12 @@ bool AMDGPUCallLowering::lowerChainCall(MachineIRBuilder &MIRBuilder,
13711371
// The function that we're calling cannot be vararg (only the intrinsic is).
13721372
Info.IsVarArg = false;
13731373

1374-
assert(std::all_of(SGPRArgs.Flags.begin(), SGPRArgs.Flags.end(),
1375-
[](ISD::ArgFlagsTy F) { return F.isInReg(); }) &&
1376-
"SGPR arguments should be marked inreg");
1377-
assert(std::none_of(VGPRArgs.Flags.begin(), VGPRArgs.Flags.end(),
1378-
[](ISD::ArgFlagsTy F) { return F.isInReg(); }) &&
1379-
"VGPR arguments should not be marked inreg");
1374+
assert(
1375+
all_of(SGPRArgs.Flags, [](ISD::ArgFlagsTy F) { return F.isInReg(); }) &&
1376+
"SGPR arguments should be marked inreg");
1377+
assert(
1378+
none_of(VGPRArgs.Flags, [](ISD::ArgFlagsTy F) { return F.isInReg(); }) &&
1379+
"VGPR arguments should not be marked inreg");
13801380

13811381
SmallVector<ArgInfo, 8> OutArgs;
13821382
splitToValueTypes(SGPRArgs, OutArgs, DL, Info.CallConv);

llvm/lib/Target/AMDGPU/AMDGPUIGroupLP.cpp

Lines changed: 10 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -955,10 +955,9 @@ class MFMAExpInterleaveOpt final : public IGLPStrategy {
955955
return false;
956956
}
957957

958-
auto Reaches = (std::any_of(
959-
Cache->begin(), Cache->end(), [&SU, &DAG](SUnit *TargetSU) {
960-
return DAG->IsReachable(TargetSU, const_cast<SUnit *>(SU));
961-
}));
958+
auto Reaches = any_of(*Cache, [&SU, &DAG](SUnit *TargetSU) {
959+
return DAG->IsReachable(TargetSU, const_cast<SUnit *>(SU));
960+
});
962961

963962
return Reaches;
964963
}
@@ -1477,10 +1476,9 @@ bool MFMAExpInterleaveOpt::analyzeDAG(const SIInstrInfo *TII) {
14771476
for (auto &MFMAPipeSU : MFMAPipeSUs) {
14781477
if (is_contained(MFMAChainSeeds, MFMAPipeSU))
14791478
continue;
1480-
if (!std::any_of(MFMAPipeSU->Preds.begin(), MFMAPipeSU->Preds.end(),
1481-
[&TII](SDep &Succ) {
1482-
return TII->isMFMAorWMMA(*Succ.getSUnit()->getInstr());
1483-
})) {
1479+
if (none_of(MFMAPipeSU->Preds, [&TII](SDep &Succ) {
1480+
return TII->isMFMAorWMMA(*Succ.getSUnit()->getInstr());
1481+
})) {
14841482
MFMAChainSeeds.push_back(MFMAPipeSU);
14851483
++MFMAChains;
14861484
}
@@ -1939,14 +1937,10 @@ class MFMASmallGemmSingleWaveOpt final : public IGLPStrategy {
19391937
return true;
19401938

19411939
// Does the previous VALU have this DS_Write as a successor
1942-
return (std::any_of(OtherGroup->Collection.begin(),
1943-
OtherGroup->Collection.end(), [&SU](SUnit *Elt) {
1944-
return std::any_of(Elt->Succs.begin(),
1945-
Elt->Succs.end(),
1946-
[&SU](SDep &Succ) {
1947-
return Succ.getSUnit() == SU;
1948-
});
1949-
}));
1940+
return any_of(OtherGroup->Collection, [&SU](SUnit *Elt) {
1941+
return any_of(Elt->Succs,
1942+
[&SU](SDep &Succ) { return Succ.getSUnit() == SU; });
1943+
});
19501944
}
19511945
IsSuccOfPrevGroup(const SIInstrInfo *TII, unsigned SGID,
19521946
bool NeedsCache = false)

llvm/lib/Target/AMDGPU/GCNSchedStrategy.cpp

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1647,11 +1647,10 @@ void GCNScheduleDAGMILive::updateRegionBoundaries(
16471647
}
16481648

16491649
static bool hasIGLPInstrs(ScheduleDAGInstrs *DAG) {
1650-
return std::any_of(
1651-
DAG->begin(), DAG->end(), [](MachineBasicBlock::iterator MI) {
1652-
unsigned Opc = MI->getOpcode();
1653-
return Opc == AMDGPU::SCHED_GROUP_BARRIER || Opc == AMDGPU::IGLP_OPT;
1654-
});
1650+
return any_of(*DAG, [](MachineBasicBlock::iterator MI) {
1651+
unsigned Opc = MI->getOpcode();
1652+
return Opc == AMDGPU::SCHED_GROUP_BARRIER || Opc == AMDGPU::IGLP_OPT;
1653+
});
16551654
}
16561655

16571656
GCNPostScheduleDAGMILive::GCNPostScheduleDAGMILive(

0 commit comments

Comments
 (0)