Skip to content

Commit 567d304

Browse files
authored
[TableGen][NFC] Replace hardcoded opcode numbering. (#81065)
This patch uses the recently introduced CodeGenTarget::getInstrIntValue to replace hardcoded opcode enum value numbering in a few places.
1 parent 7da1dda commit 567d304

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

llvm/utils/TableGen/GlobalISelMatchTable.cpp

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1399,9 +1399,8 @@ void InstructionOpcodeMatcher::initOpcodeValuesMap(
13991399
const CodeGenTarget &Target) {
14001400
OpcodeValues.clear();
14011401

1402-
unsigned OpcodeValue = 0;
14031402
for (const CodeGenInstruction *I : Target.getInstructionsByEnumValue())
1404-
OpcodeValues[I] = OpcodeValue++;
1403+
OpcodeValues[I] = Target.getInstrIntValue(I->TheDef);
14051404
}
14061405

14071406
MatchTableRecord InstructionOpcodeMatcher::getValue() const {

llvm/utils/TableGen/InstrInfoEmitter.cpp

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1284,8 +1284,9 @@ void InstrInfoEmitter::emitEnums(raw_ostream &OS) {
12841284
OS << " enum {\n";
12851285
unsigned Num = 0;
12861286
for (const CodeGenInstruction *Inst : Target.getInstructionsByEnumValue())
1287-
OS << " " << Inst->TheDef->getName() << "\t= " << Num++ << ",\n";
1288-
OS << " INSTRUCTION_LIST_END = " << Num << "\n";
1287+
OS << " " << Inst->TheDef->getName()
1288+
<< "\t= " << (Num = Target.getInstrIntValue(Inst->TheDef)) << ",\n";
1289+
OS << " INSTRUCTION_LIST_END = " << Num + 1 << "\n";
12891290
OS << " };\n\n";
12901291
OS << "} // end namespace " << Namespace << "\n";
12911292
OS << "} // end namespace llvm\n";

0 commit comments

Comments
 (0)