6502/llvm-6502
1
0
Fork 0
mirror of https://github.com/c64scene-ar/llvm-6502.git synced 2025-02-06 06:33:24 +00:00
Code Issues Projects Releases Wiki Activity

Reorder fields in MatchEntry and OperandMatchEntry to reduce padding. A bit tricky due to the target specific sizes for some of the fields so the ordering is only optimal for the targets in the tree.

Browse Source 
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@153865 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Craig Topper 2012-04-02 07:48:39 +00:00
parent 44b5e6de8c
commit fab3f7ee6f
1 changed files with 25 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
utils/TableGen/AsmMatcherEmitter.cpp
View File

@ -2024,12 +2024,12 @@ static void EmitCustomOperandParsing(raw_ostream &OS, CodeGenTarget &Target,
OS << "namespace {\n"; OS << "namespace {\n";
OS << " struct OperandMatchEntry {\n"; OS << " struct OperandMatchEntry {\n";
OS << " static const char *const MnemonicTable;\n"; OS << " static const char *const MnemonicTable;\n";
OS << " unsigned OperandMask;\n"; OS << " uint32_t OperandMask;\n";
OS << " unsigned Mnemonic;\n"; OS << " uint32_t Mnemonic;\n";
OS << " " << getMinimalTypeForRange(Info.Classes.size())
<< " Class;\n";
OS << " " << getMinimalTypeForRange(1ULL << Info.SubtargetFeatures.size()) OS << " " << getMinimalTypeForRange(1ULL << Info.SubtargetFeatures.size())
<< " RequiredFeatures;\n\n"; << " RequiredFeatures;\n";
OS << " " << getMinimalTypeForRange(Info.Classes.size())
<< " Class;\n\n";
OS << " StringRef getMnemonic() const {\n"; OS << " StringRef getMnemonic() const {\n";
OS << " return StringRef(MnemonicTable + Mnemonic + 1,\n"; OS << " return StringRef(MnemonicTable + Mnemonic + 1,\n";
OS << " MnemonicTable[Mnemonic]);\n"; OS << " MnemonicTable[Mnemonic]);\n";
@ -2080,10 +2080,7 @@ static void EmitCustomOperandParsing(raw_ostream &OS, CodeGenTarget &Target,
// Store a pascal-style length byte in the mnemonic. // Store a pascal-style length byte in the mnemonic.
std::string LenMnemonic = char(II.Mnemonic.size()) + II.Mnemonic.str(); std::string LenMnemonic = char(II.Mnemonic.size()) + II.Mnemonic.str();
OS << ", " << StringTable.GetOrAddStringOffset(LenMnemonic, false) OS << ", " << StringTable.GetOrAddStringOffset(LenMnemonic, false)
<< " /* " << II.Mnemonic << " */"; << " /* " << II.Mnemonic << " */, ";
OS << ", " << OMI.CI->Name
<< ", ";
// Write the required features mask. // Write the required features mask.
if (!II.RequiredFeatures.empty()) { if (!II.RequiredFeatures.empty()) {
@ -2093,6 +2090,9 @@ static void EmitCustomOperandParsing(raw_ostream &OS, CodeGenTarget &Target,
} }
} else } else
OS << "0"; OS << "0";
OS << ", " << OMI.CI->Name;
OS << " },\n"; OS << " },\n";
} }
OS << "};\n\n"; OS << "};\n\n";
@ -2321,14 +2321,14 @@ void AsmMatcherEmitter::run(raw_ostream &OS) {
OS << "namespace {\n"; OS << "namespace {\n";
OS << " struct MatchEntry {\n"; OS << " struct MatchEntry {\n";
OS << " static const char *const MnemonicTable;\n"; OS << " static const char *const MnemonicTable;\n";
OS << " uint32_t Mnemonic;\n";
OS << " uint16_t Opcode;\n"; OS << " uint16_t Opcode;\n";
OS << " unsigned Mnemonic;\n";
OS << " " << getMinimalTypeForRange(Info.Matchables.size()) OS << " " << getMinimalTypeForRange(Info.Matchables.size())
<< " ConvertFn;\n"; << " ConvertFn;\n";
OS << " " << getMinimalTypeForRange(Info.Classes.size())
<< " Classes[" << MaxNumOperands << "];\n";
OS << " " << getMinimalTypeForRange(1ULL << Info.SubtargetFeatures.size()) OS << " " << getMinimalTypeForRange(1ULL << Info.SubtargetFeatures.size())
<< " RequiredFeatures;\n"; << " RequiredFeatures;\n";
OS << " " << getMinimalTypeForRange(Info.Classes.size())
<< " Classes[" << MaxNumOperands << "];\n";
OS << " uint8_t AsmVariantID;\n\n"; OS << " uint8_t AsmVariantID;\n\n";
OS << " StringRef getMnemonic() const {\n"; OS << " StringRef getMnemonic() const {\n";
OS << " return StringRef(MnemonicTable + Mnemonic + 1,\n"; OS << " return StringRef(MnemonicTable + Mnemonic + 1,\n";
@ -2363,18 +2363,11 @@ void AsmMatcherEmitter::run(raw_ostream &OS) {
// Store a pascal-style length byte in the mnemonic. // Store a pascal-style length byte in the mnemonic.
std::string LenMnemonic = char(II.Mnemonic.size()) + II.Mnemonic.str(); std::string LenMnemonic = char(II.Mnemonic.size()) + II.Mnemonic.str();
OS << " { " << Target.getName() << "::" OS << " { " << StringTable.GetOrAddStringOffset(LenMnemonic, false)
<< " /* " << II.Mnemonic << " */, "
<< Target.getName() << "::"
<< II.getResultInst()->TheDef->getName() << ", " << II.getResultInst()->TheDef->getName() << ", "
<< StringTable.GetOrAddStringOffset(LenMnemonic, false) << II.ConversionFnKind << ", ";
<< " /* " << II.Mnemonic << " */"
<< ", " << II.ConversionFnKind << ", { ";
for (unsigned i = 0, e = II.AsmOperands.size(); i != e; ++i) {
MatchableInfo::AsmOperand &Op = II.AsmOperands[i];
if (i) OS << ", ";
OS << Op.Class->Name;
}
OS << " }, ";
// Write the required features mask. // Write the required features mask.
if (!II.RequiredFeatures.empty()) { if (!II.RequiredFeatures.empty()) {
@ -2384,7 +2377,15 @@ void AsmMatcherEmitter::run(raw_ostream &OS) {
} }
} else } else
OS << "0"; OS << "0";
OS << ", " << II.AsmVariantID;
OS << ", { ";
for (unsigned i = 0, e = II.AsmOperands.size(); i != e; ++i) {
MatchableInfo::AsmOperand &Op = II.AsmOperands[i];
if (i) OS << ", ";
OS << Op.Class->Name;
}
OS << " }, " << II.AsmVariantID;
OS << "},\n"; OS << "},\n";
} }