AcoSail/llvm-project
8
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

llvm-tblgen: Cleanup for each EmitterClass to be invoked by uniform signature.

Browse Source 
Differential Revision: https://reviews.llvm.org/D144351
This commit is contained in:
NAKAMURA Takumi 2023-02-19 01:22:38 +09:00
parent f35064dbe9
commit a7e2b749b5
9 changed files with 20 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
llvm/utils/TableGen/AsmMatcherEmitter.cpp
View File

@ -3205,6 +3205,8 @@ void AsmMatcherEmitter::run(raw_ostream &OS) {
Record *AsmParser = Target.getAsmParser();
StringRef ClassName = AsmParser->getValueAsString("AsmParserClassName");
emitSourceFileHeader("Assembly Matcher Source Fragment", OS);
// Compute the information on the instructions to match.
AsmMatcherInfo Info(AsmParser, Target, Records);
Info.buildInfo();
@ -4005,7 +4007,6 @@ void AsmMatcherEmitter::run(raw_ostream &OS) {
namespace llvm {
void EmitAsmMatcher(RecordKeeper &RK, raw_ostream &OS) {
emitSourceFileHeader("Assembly Matcher Source Fragment", OS);
AsmMatcherEmitter(RK).run(OS);
}

2
llvm/utils/TableGen/AsmWriterEmitter.cpp
View File

@ -1303,6 +1303,7 @@ void AsmWriterEmitter::run(raw_ostream &O) {
std::vector<std::vector<std::string>> TableDrivenOperandPrinters;
unsigned BitsLeft = 0;
unsigned AsmStrBits = 0;
emitSourceFileHeader("Assembly Writer Source Fragment", O);
EmitGetMnemonic(O, TableDrivenOperandPrinters, BitsLeft, AsmStrBits);
EmitPrintInstruction(O, TableDrivenOperandPrinters, BitsLeft, AsmStrBits);
EmitGetRegisterName(O);
@ -1312,7 +1313,6 @@ void AsmWriterEmitter::run(raw_ostream &O) {
namespace llvm {
void EmitAsmWriter(RecordKeeper &RK, raw_ostream &OS) {
emitSourceFileHeader("Assembly Writer Source Fragment", OS);
AsmWriterEmitter(RK).run(OS);
}

6
llvm/utils/TableGen/Attributes.cpp
View File

@ -18,7 +18,7 @@ namespace {
class Attributes {
public:
Attributes(RecordKeeper &R) : Records(R) {}
void emit(raw_ostream &OS);
void run(raw_ostream &OS);
private:
void emitTargetIndependentNames(raw_ostream &OS);
@ -124,7 +124,7 @@ void Attributes::emitAttributeProperties(raw_ostream &OS) {
OS << "#endif\n";
}
void Attributes::emit(raw_ostream &OS) {
void Attributes::run(raw_ostream &OS) {
emitTargetIndependentNames(OS);
emitFnAttrCompatCheck(OS, false);
emitAttributeProperties(OS);
@ -133,7 +133,7 @@ void Attributes::emit(raw_ostream &OS) {
namespace llvm {
void EmitAttributes(RecordKeeper &RK, raw_ostream &OS) {
Attributes(RK).emit(OS);
Attributes(RK).run(OS);
}
} // namespace llvm

3
llvm/utils/TableGen/CallingConvEmitter.cpp
View File

@ -42,6 +42,8 @@ private:
} // End anonymous namespace
void CallingConvEmitter::run(raw_ostream &O) {
emitSourceFileHeader("Calling Convention Implementation Fragment", O);
std::vector<Record *> CCs = Records.getAllDerivedDefinitions("CallingConv");
// Emit prototypes for all of the non-custom CC's so that they can forward ref
@ -430,7 +432,6 @@ void CallingConvEmitter::EmitArgRegisterLists(raw_ostream &O) {
namespace llvm {
void EmitCallingConv(RecordKeeper &RK, raw_ostream &OS) {
emitSourceFileHeader("Calling Convention Implementation Fragment", OS);
CallingConvEmitter(RK).run(OS);
}

3
llvm/utils/TableGen/CodeEmitterGen.cpp
View File

@ -358,6 +358,8 @@ void CodeEmitterGen::emitInstructionBaseValues(
}
void CodeEmitterGen::run(raw_ostream &o) {
emitSourceFileHeader("Machine Code Emitter", o);
CodeGenTarget Target(Records);
std::vector<Record*> Insts = Records.getAllDerivedDefinitions("Instruction");
@ -505,7 +507,6 @@ void CodeEmitterGen::run(raw_ostream &o) {
namespace llvm {
void EmitCodeEmitter(RecordKeeper &RK, raw_ostream &OS) {
emitSourceFileHeader("Machine Code Emitter", OS);
CodeEmitterGen(RK).run(OS);
}

2
llvm/utils/TableGen/DAGISelEmitter.cpp
View File

@ -125,6 +125,7 @@ struct PatternSortingPredicate {
void DAGISelEmitter::run(raw_ostream &OS) {
Records.startTimer("Parse patterns");
emitSourceFileHeader("DAG Instruction Selector for the " +
CGP.getTargetInfo().getName().str() + " target", OS);
@ -190,7 +191,6 @@ void DAGISelEmitter::run(raw_ostream &OS) {
namespace llvm {
void EmitDAGISel(RecordKeeper &RK, raw_ostream &OS) {
RK.startTimer("Parse patterns");
DAGISelEmitter(RK).run(OS);
}

2
llvm/utils/TableGen/DFAPacketizerEmitter.cpp
View File

@ -206,6 +206,7 @@ void DFAPacketizerEmitter::createScheduleClasses(unsigned ItineraryIdx,
// Run the worklist algorithm to generate the DFA.
//
void DFAPacketizerEmitter::run(raw_ostream &OS) {
emitSourceFileHeader("Target DFA Packetizer Tables", OS);
OS << "\n"
<< "#include \"llvm/CodeGen/DFAPacketizer.h\"\n";
OS << "namespace llvm {\n";
@ -356,7 +357,6 @@ void DFAPacketizerEmitter::emitForItineraries(
namespace llvm {
void EmitDFAPacketizer(RecordKeeper &RK, raw_ostream &OS) {
emitSourceFileHeader("Target DFA Packetizer Tables", OS);
DFAPacketizerEmitter(RK).run(OS);
}

9
llvm/utils/TableGen/SubtargetEmitter.cpp
View File

@ -70,7 +70,7 @@ class SubtargetEmitter {
}
};
const CodeGenTarget &TGT;
CodeGenTarget TGT;
RecordKeeper &Records;
CodeGenSchedModels &SchedModels;
std::string Target;
@ -128,8 +128,8 @@ class SubtargetEmitter {
void ParseFeaturesFunction(raw_ostream &OS);
public:
SubtargetEmitter(RecordKeeper &R, CodeGenTarget &TGT)
: TGT(TGT), Records(R), SchedModels(TGT.getSchedModels()),
SubtargetEmitter(RecordKeeper &R)
: TGT(R), Records(R), SchedModels(TGT.getSchedModels()),
Target(TGT.getName()) {}
void run(raw_ostream &o);
@ -1988,8 +1988,7 @@ void SubtargetEmitter::run(raw_ostream &OS) {
namespace llvm {
void EmitSubtarget(RecordKeeper &RK, raw_ostream &OS) {
CodeGenTarget CGTarget(RK);
SubtargetEmitter(RK, CGTarget).run(OS);
SubtargetEmitter(RK).run(OS);
}
} // end namespace llvm

8
llvm/utils/TableGen/X86FoldTablesEmitter.cpp
View File

@ -141,7 +141,7 @@ public:
X86FoldTablesEmitter(RecordKeeper &R) : Records(R), Target(R) {}
// run - Generate the 6 X86 memory fold tables.
void run(formatted_raw_ostream &OS);
void run(raw_ostream &OS);
private:
// Decides to which table to add the entry with the given instructions.
@ -522,7 +522,8 @@ void X86FoldTablesEmitter::updateTables(const CodeGenInstruction *RegInstr,
}
}
void X86FoldTablesEmitter::run(formatted_raw_ostream &OS) {
void X86FoldTablesEmitter::run(raw_ostream &o) {
formatted_raw_ostream OS(o);
emitSourceFileHeader("X86 fold tables", OS);
// Holds all memory instructions
@ -615,8 +616,7 @@ void X86FoldTablesEmitter::run(formatted_raw_ostream &OS) {
namespace llvm {
void EmitX86FoldTables(RecordKeeper &RK, raw_ostream &o) {
formatted_raw_ostream OS(o);
void EmitX86FoldTables(RecordKeeper &RK, raw_ostream &OS) {
X86FoldTablesEmitter(RK).run(OS);
}
} // namespace llvm