Skip to content

[TableGen] Don't print the instruction enum value in multiple comments in GenInstrInfo.inc. #156960

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 1 commit into from
Sep 4, 2025
Merged

[TableGen] Don't print the instruction enum value in multiple comments in GenInstrInfo.inc. #156960

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion llvm/test/TableGen/def-multiple-operands.td
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ def Reg3Opnd : Operand<OtherVT> {
// CHECK: archInstrTable {{.* = \{}}
// CHECK: {{\{}}
// CHECK: {{\{}} [[ID:[0-9]+]], 4, 3, 13, {{.+\}, \/\/}}
// CHECK-SAME: Inst #[[ID]] = InstA
// CHECK-SAME: InstA
def InstA : Instruction {
let Namespace = "MyNS";
let Size = 13;
Expand Down
12 changes: 6 additions & 6 deletions llvm/utils/TableGen/InstrInfoEmitter.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -760,8 +760,9 @@ void InstrInfoEmitter::emitFeatureVerifier(raw_ostream &OS,
OS << " };\n"
<< " static constexpr " << getMinimalTypeForRange(FeatureBitsets.size())
<< " RequiredFeaturesRefs[] = {\n";
unsigned InstIdx = 0;
for (const CodeGenInstruction *Inst : Target.getInstructions()) {
ArrayRef<const CodeGenInstruction *> NumberedInstructions =
Target.getInstructions();
for (const CodeGenInstruction *Inst : NumberedInstructions) {
OS << " CEFBS";
unsigned NumPredicates = 0;
for (const Record *Predicate :
Expand All @@ -774,11 +775,10 @@ void InstrInfoEmitter::emitFeatureVerifier(raw_ostream &OS,
}
if (!NumPredicates)
OS << "_None";
OS << ", // " << Inst->TheDef->getName() << " = " << InstIdx << '\n';
InstIdx++;
OS << ", // " << Inst->TheDef->getName() << '\n';
}
OS << " };\n\n"
<< " assert(Opcode < " << InstIdx << ");\n"
<< " assert(Opcode < " << NumberedInstructions.size() << ");\n"
<< " return FeatureBitsets[RequiredFeaturesRefs[Opcode]];\n"
<< "}\n\n";

Expand Down Expand Up @@ -1284,7 +1284,7 @@ void InstrInfoEmitter::emitRecord(
OS.write_hex(Value);
OS << "ULL";

OS << " }, // Inst #" << Num << " = " << Inst.TheDef->getName() << '\n';
OS << " }, // " << Inst.TheDef->getName() << '\n';
}

// emitEnums - Print out enum values for all of the instructions.
Expand Down