Skip to content

[AMDGPU] Use llvm::any_of, llvm::all_of, and llvm::none_of (NFC) #103007

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Aug 13, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions llvm/lib/Target/AMDGPU/AMDGPUCallLowering.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1371,12 +1371,12 @@ bool AMDGPUCallLowering::lowerChainCall(MachineIRBuilder &MIRBuilder,
// The function that we're calling cannot be vararg (only the intrinsic is).
Info.IsVarArg = false;

assert(std::all_of(SGPRArgs.Flags.begin(), SGPRArgs.Flags.end(),
[](ISD::ArgFlagsTy F) { return F.isInReg(); }) &&
"SGPR arguments should be marked inreg");
assert(std::none_of(VGPRArgs.Flags.begin(), VGPRArgs.Flags.end(),
[](ISD::ArgFlagsTy F) { return F.isInReg(); }) &&
"VGPR arguments should not be marked inreg");
assert(
all_of(SGPRArgs.Flags, [](ISD::ArgFlagsTy F) { return F.isInReg(); }) &&
"SGPR arguments should be marked inreg");
assert(
none_of(VGPRArgs.Flags, [](ISD::ArgFlagsTy F) { return F.isInReg(); }) &&
"VGPR arguments should not be marked inreg");

SmallVector<ArgInfo, 8> OutArgs;
splitToValueTypes(SGPRArgs, OutArgs, DL, Info.CallConv);
Expand Down
26 changes: 10 additions & 16 deletions llvm/lib/Target/AMDGPU/AMDGPUIGroupLP.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -955,10 +955,9 @@ class MFMAExpInterleaveOpt final : public IGLPStrategy {
return false;
}

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

return Reaches;
}
Expand Down Expand Up @@ -1477,10 +1476,9 @@ bool MFMAExpInterleaveOpt::analyzeDAG(const SIInstrInfo *TII) {
for (auto &MFMAPipeSU : MFMAPipeSUs) {
if (is_contained(MFMAChainSeeds, MFMAPipeSU))
continue;
if (!std::any_of(MFMAPipeSU->Preds.begin(), MFMAPipeSU->Preds.end(),
[&TII](SDep &Succ) {
return TII->isMFMAorWMMA(*Succ.getSUnit()->getInstr());
})) {
if (none_of(MFMAPipeSU->Preds, [&TII](SDep &Succ) {
return TII->isMFMAorWMMA(*Succ.getSUnit()->getInstr());
})) {
MFMAChainSeeds.push_back(MFMAPipeSU);
++MFMAChains;
}
Expand Down Expand Up @@ -1939,14 +1937,10 @@ class MFMASmallGemmSingleWaveOpt final : public IGLPStrategy {
return true;

// Does the previous VALU have this DS_Write as a successor
return (std::any_of(OtherGroup->Collection.begin(),
OtherGroup->Collection.end(), [&SU](SUnit *Elt) {
return std::any_of(Elt->Succs.begin(),
Elt->Succs.end(),
[&SU](SDep &Succ) {
return Succ.getSUnit() == SU;
});
}));
return any_of(OtherGroup->Collection, [&SU](SUnit *Elt) {
return any_of(Elt->Succs,
[&SU](SDep &Succ) { return Succ.getSUnit() == SU; });
});
}
IsSuccOfPrevGroup(const SIInstrInfo *TII, unsigned SGID,
bool NeedsCache = false)
Expand Down
9 changes: 4 additions & 5 deletions llvm/lib/Target/AMDGPU/GCNSchedStrategy.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1647,11 +1647,10 @@ void GCNScheduleDAGMILive::updateRegionBoundaries(
}

static bool hasIGLPInstrs(ScheduleDAGInstrs *DAG) {
return std::any_of(
DAG->begin(), DAG->end(), [](MachineBasicBlock::iterator MI) {
unsigned Opc = MI->getOpcode();
return Opc == AMDGPU::SCHED_GROUP_BARRIER || Opc == AMDGPU::IGLP_OPT;
});
return any_of(*DAG, [](MachineBasicBlock::iterator MI) {
unsigned Opc = MI->getOpcode();
return Opc == AMDGPU::SCHED_GROUP_BARRIER || Opc == AMDGPU::IGLP_OPT;
});
}

GCNPostScheduleDAGMILive::GCNPostScheduleDAGMILive(
Expand Down
Loading