[llvm] [LoopInterchange] Modernize loops (NFC) (PR #146105)
Ramkumar Ramachandra via llvm-commits
llvm-commits at lists.llvm.org
Fri Jun 27 09:21:55 PDT 2025
https://github.com/artagnon created https://github.com/llvm/llvm-project/pull/146105
None
>From bb5a7e164958287380fe6c668a9f051ba4a57820 Mon Sep 17 00:00:00 2001
From: Ramkumar Ramachandra <ramkumar.ramachandra at codasip.com>
Date: Fri, 27 Jun 2025 17:10:20 +0100
Subject: [PATCH] [LoopInterchange] Modernize loops (NFC)
---
.../lib/Transforms/Scalar/LoopInterchange.cpp | 25 ++++++++-----------
1 file changed, 11 insertions(+), 14 deletions(-)
diff --git a/llvm/lib/Transforms/Scalar/LoopInterchange.cpp b/llvm/lib/Transforms/Scalar/LoopInterchange.cpp
index 9e3b4b82cc454..51971a47527bd 100644
--- a/llvm/lib/Transforms/Scalar/LoopInterchange.cpp
+++ b/llvm/lib/Transforms/Scalar/LoopInterchange.cpp
@@ -551,12 +551,10 @@ 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;
- }
- }
+ if (CC)
+ for (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
// the innermost loop, move it outwards to the best possible position
@@ -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;
@@ -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;
@@ -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 (auto Dep : DepMatrix) {
+ char Dir = Dep[LoopId];
if (Dir != 'I' && Dir != '=')
return false;
}
More information about the llvm-commits
mailing list