Skip to content

Commit bc386a8

Browse files
authored
[TableGen] Replace some uses of make_range with methods that already return a range. NFC (#123453)
1 parent 9f7c85f commit bc386a8

File tree

2 files changed

+8
-12
lines changed

2 files changed

+8
-12
lines changed

llvm/utils/TableGen/Common/CodeGenSchedule.cpp

+7-10
Original file line numberDiff line numberDiff line change
@@ -979,8 +979,9 @@ unsigned CodeGenSchedModels::addSchedClass(const Record *ItinClassDef,
979979
return SC.isKeyEqual(ItinClassDef, OperWrites, OperReads);
980980
};
981981

982-
auto I = find_if(make_range(schedClassBegin(), schedClassEnd()), IsKeyEqual);
983-
unsigned Idx = I == schedClassEnd() ? 0 : std::distance(schedClassBegin(), I);
982+
auto I = find_if(SchedClasses, IsKeyEqual);
983+
unsigned Idx =
984+
I == SchedClasses.end() ? 0 : std::distance(SchedClasses.begin(), I);
984985
if (Idx || SchedClasses[0].isKeyEqual(ItinClassDef, OperWrites, OperReads)) {
985986
IdxVec PI;
986987
std::set_union(SchedClasses[Idx].ProcIndices.begin(),
@@ -1103,8 +1104,7 @@ void CodeGenSchedModels::createInstRWClass(const Record *InstRWDef) {
11031104

11041105
// True if collectProcItins found anything.
11051106
bool CodeGenSchedModels::hasItineraries() const {
1106-
for (const CodeGenProcModel &PM :
1107-
make_range(procModelBegin(), procModelEnd()))
1107+
for (const CodeGenProcModel &PM : procModels())
11081108
if (PM.hasItineraries())
11091109
return true;
11101110
return false;
@@ -1129,8 +1129,7 @@ void CodeGenSchedModels::collectProcItins() {
11291129
const Record *ItinDef = ItinData->getValueAsDef("TheClass");
11301130
bool FoundClass = false;
11311131

1132-
for (const CodeGenSchedClass &SC :
1133-
make_range(schedClassBegin(), schedClassEnd())) {
1132+
for (const CodeGenSchedClass &SC : schedClasses()) {
11341133
// Multiple SchedClasses may share an itinerary. Update all of them.
11351134
if (SC.ItinClassDef == ItinDef) {
11361135
ProcModel.ItinDefList[SC.Index] = ItinData;
@@ -1420,8 +1419,7 @@ void PredTransitions::getIntersectingVariants(
14201419
if (AliasProcIdx && AliasProcIdx != TransVec[TransIdx].ProcIndex)
14211420
continue;
14221421
if (!Variants.empty()) {
1423-
const CodeGenProcModel &PM =
1424-
*(SchedModels.procModelBegin() + AliasProcIdx);
1422+
const CodeGenProcModel &PM = SchedModels.procModels()[AliasProcIdx];
14251423
PrintFatalError((*AI)->getLoc(),
14261424
"Multiple variants defined for processor " +
14271425
PM.ModelName +
@@ -1834,8 +1832,7 @@ void CodeGenSchedModels::collectProcResources() {
18341832
// Add any subtarget-specific SchedReadWrites that are directly associated
18351833
// with processor resources. Refer to the parent SchedClass's ProcIndices to
18361834
// determine which processors they apply to.
1837-
for (const CodeGenSchedClass &SC :
1838-
make_range(schedClassBegin(), schedClassEnd())) {
1835+
for (const CodeGenSchedClass &SC : schedClasses()) {
18391836
if (SC.ItinClassDef) {
18401837
collectItinProcResources(SC.ItinClassDef);
18411838
continue;

llvm/utils/TableGen/SubtargetEmitter.cpp

+1-2
Original file line numberDiff line numberDiff line change
@@ -1104,8 +1104,7 @@ void SubtargetEmitter::genSchedClassTables(const CodeGenProcModel &ProcModel,
11041104

11051105
// A Variant SchedClass has no resources of its own.
11061106
bool HasVariants = false;
1107-
for (const CodeGenSchedTransition &CGT :
1108-
make_range(SC.Transitions.begin(), SC.Transitions.end())) {
1107+
for (const CodeGenSchedTransition &CGT : SC.Transitions) {
11091108
if (CGT.ProcIndex == ProcModel.Index) {
11101109
HasVariants = true;
11111110
break;

0 commit comments

Comments
 (0)