From 4a6d735105ffac5f58499ef5a5de8713b458b233 Mon Sep 17 00:00:00 2001 From: Jim Grosbach Date: Fri, 11 Mar 2011 02:19:02 +0000 Subject: Teach TableGen to pre-calculate register enum values when creating the CodeGenRegister entries. Use this information to more intelligently build the literal register entires in the DAGISel matcher table. Specifically, use a single-byte OPC_EmitRegister entry for registers with a value of less than 256 and OPC_EmitRegister2 entry for registers with a larger value. rdar://9066491 git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@127456 91177308-0d34-0410-b5e6-96231b3b80d8 --- utils/TableGen/DAGISelMatcherEmitter.cpp | 39 +++++++++++++------------------- 1 file changed, 16 insertions(+), 23 deletions(-) (limited to 'utils/TableGen/DAGISelMatcherEmitter.cpp') diff --git a/utils/TableGen/DAGISelMatcherEmitter.cpp b/utils/TableGen/DAGISelMatcherEmitter.cpp index 3a71ddb712..0b69af4870 100644 --- a/utils/TableGen/DAGISelMatcherEmitter.cpp +++ b/utils/TableGen/DAGISelMatcherEmitter.cpp @@ -43,11 +43,9 @@ class MatcherTableEmitter { DenseMap NodeXFormMap; std::vector NodeXForms; - bool useEmitRegister2; - public: - MatcherTableEmitter(const CodeGenDAGPatterns &cgp, bool _useEmitRegister2) - : CGP(cgp), useEmitRegister2(_useEmitRegister2) {} + MatcherTableEmitter(const CodeGenDAGPatterns &cgp) + : CGP(cgp) {} unsigned EmitMatcherList(const Matcher *N, unsigned Indent, unsigned StartIdx, formatted_raw_ostream &OS); @@ -431,25 +429,20 @@ EmitMatcher(const Matcher *N, unsigned Indent, unsigned CurrentIdx, return 3; } - case Matcher::EmitRegister: - if (useEmitRegister2) { - OS << "OPC_EmitRegister2, " - << getEnumName(cast(N)->getVT()) << ", "; - if (Record *R = cast(N)->getReg()) - OS << "TARGET_VAL(" << getQualifiedName(R) << "),\n"; - else { - OS << "TARGET_VAL(0) "; - if (!OmitComments) - OS << "/*zero_reg*/"; - OS << ",\n"; - } + case Matcher::EmitRegister: { + const EmitRegisterMatcher *Matcher = cast(N); + const CodeGenRegister *Reg = Matcher->getReg(); + // If the enum value of the register is larger than one byte can handle, + // use EmitRegister2. + if (Reg && Reg->EnumValue > 255) { + OS << "OPC_EmitRegister2, " << getEnumName(Matcher->getVT()) << ", "; + OS << "TARGET_VAL(" << getQualifiedName(Reg->TheDef) << "),\n"; return 4; } else { - OS << "OPC_EmitRegister, " - << getEnumName(cast(N)->getVT()) << ", "; - if (Record *R = cast(N)->getReg()) - OS << getQualifiedName(R) << ",\n"; - else { + OS << "OPC_EmitRegister, " << getEnumName(Matcher->getVT()) << ", "; + if (Reg) { + OS << getQualifiedName(Reg->TheDef) << ",\n"; + } else { OS << "0 "; if (!OmitComments) OS << "/*zero_reg*/"; @@ -457,6 +450,7 @@ EmitMatcher(const Matcher *N, unsigned Indent, unsigned CurrentIdx, } return 3; } + } case Matcher::EmitConvertToTarget: OS << "OPC_EmitConvertToTarget, " @@ -800,14 +794,13 @@ void MatcherTableEmitter::EmitHistogram(const Matcher *M, void llvm::EmitMatcherTable(const Matcher *TheMatcher, const CodeGenDAGPatterns &CGP, - bool useEmitRegister2, raw_ostream &O) { formatted_raw_ostream OS(O); OS << "// The main instruction selector code.\n"; OS << "SDNode *SelectCode(SDNode *N) {\n"; - MatcherTableEmitter MatcherEmitter(CGP, useEmitRegister2); + MatcherTableEmitter MatcherEmitter(CGP); OS << " // Some target values are emitted as 2 bytes, TARGET_VAL handles\n"; OS << " // this.\n"; -- cgit v1.2.3