Skip to content

[LoopInterchange] Modernize loops (NFC) #146105

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.

Sign up for GitHub

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 3 commits into from
Jun 28, 2025
Merged

[LoopInterchange] Modernize loops (NFC) #146105

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
bb5a7e1
[LoopInterchange] Modernize loops (NFC)
artagnon Jun 27, 2025
9e9ce50
[LoopInterchange] Use const auto & in a couple of places
artagnon Jun 27, 2025
19a427b
[LoopInterchange] Address nit
artagnon Jun 27, 2025
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
21 changes: 9 additions & 12 deletions llvm/lib/Transforms/Scalar/LoopInterchange.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -552,10 +552,8 @@ struct LoopInterchange {
// For the old pass manager CacheCost would be null.
DenseMap<const Loop *, unsigned> CostMap;
if (CC != nullptr) {
const auto &LoopCosts = CC->getLoopCosts();
for (unsigned i = 0; i < LoopCosts.size(); i++) {
CostMap[LoopCosts[i].first] = i;
}
for (const auto &[Idx, Cost] : enumerate(CC->getLoopCosts()))
CostMap[Cost.first] = Idx;
}
// We try to achieve the globally optimal memory access for the loopnest,
// and do interchange based on a bubble-sort fasion. We start from
Expand Down Expand Up @@ -972,8 +970,8 @@ areInnerLoopExitPHIsSupported(Loop *InnerL, Loop *OuterL,
static bool areOuterLoopExitPHIsSupported(Loop *OuterLoop, Loop *InnerLoop) {
BasicBlock *LoopNestExit = OuterLoop->getUniqueExitBlock();
for (PHINode &PHI : LoopNestExit->phis()) {
for (unsigned i = 0; i < PHI.getNumIncomingValues(); i++) {
Instruction *IncomingI = dyn_cast<Instruction>(PHI.getIncomingValue(i));
for (Value *Incoming : PHI.incoming_values()) {
Instruction *IncomingI = dyn_cast<Instruction>(Incoming);
if (!IncomingI || IncomingI->getParent() != OuterLoop->getLoopLatch())
continue;

Expand Down Expand Up @@ -1132,15 +1130,14 @@ int LoopInterchangeProfitability::getInstrOrderCost() {
for (BasicBlock *BB : InnerLoop->blocks()) {
for (Instruction &Ins : *BB) {
if (const GetElementPtrInst *GEP = dyn_cast<GetElementPtrInst>(&Ins)) {
unsigned NumOp = GEP->getNumOperands();
bool FoundInnerInduction = false;
bool FoundOuterInduction = false;
for (unsigned i = 0; i < NumOp; ++i) {
for (Value *Op : GEP->operands()) {
// Skip operands that are not SCEV-able.
if (!SE->isSCEVable(GEP->getOperand(i)->getType()))
if (!SE->isSCEVable(Op->getType()))
continue;

const SCEV *OperandVal = SE->getSCEV(GEP->getOperand(i));
const SCEV *OperandVal = SE->getSCEV(Op);
const SCEVAddRecExpr *AR = dyn_cast<SCEVAddRecExpr>(OperandVal);
if (!AR)
continue;
Expand Down Expand Up @@ -1220,8 +1217,8 @@ LoopInterchangeProfitability::isProfitablePerInstrOrderCost() {

/// Return true if we can vectorize the loop specified by \p LoopId.
static bool canVectorize(const CharMatrix &DepMatrix, unsigned LoopId) {
for (unsigned I = 0; I != DepMatrix.size(); I++) {
char Dir = DepMatrix[I][LoopId];
for (const auto &Dep : DepMatrix) {
char Dir = Dep[LoopId];
if (Dir != 'I' && Dir != '=')
return false;
}
Expand Down