diff options
author | Chris Lattner <sabre@nondot.org> | 2010-02-24 07:35:09 +0000 |
---|---|---|
committer | Chris Lattner <sabre@nondot.org> | 2010-02-24 07:35:09 +0000 |
commit | c84edb7bdd345db280c908583d55bdf4e670a225 (patch) | |
tree | 0e316ddeaa014355b5383313a9a3a0ab48c8bfed | |
parent | 19b5a7590b784f19875b9880ea8838c393431656 (diff) | |
download | external_llvm-c84edb7bdd345db280c908583d55bdf4e670a225.zip external_llvm-c84edb7bdd345db280c908583d55bdf4e670a225.tar.gz external_llvm-c84edb7bdd345db280c908583d55bdf4e670a225.tar.bz2 |
Since the new instruction selector now works, I don't need to keep
the old one around for comparative purposes: have the
ENABLE_NEW_ISEL #define (which is not enabled on mainline) stop
emitting the old isel at all, yay for build time win.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@97033 91177308-0d34-0410-b5e6-96231b3b80d8
-rw-r--r-- | utils/TableGen/DAGISelEmitter.cpp | 13 | ||||
-rw-r--r-- | utils/TableGen/DAGISelMatcherEmitter.cpp | 2 |
2 files changed, 7 insertions, 8 deletions
diff --git a/utils/TableGen/DAGISelEmitter.cpp b/utils/TableGen/DAGISelEmitter.cpp index 7a01caa..1acd5e1 100644 --- a/utils/TableGen/DAGISelEmitter.cpp +++ b/utils/TableGen/DAGISelEmitter.cpp @@ -1794,9 +1794,7 @@ void DAGISelEmitter::EmitInstructionSelector(raw_ostream &OS) { OS << "// The main instruction selector code.\n" << "SDNode *SelectCode(SDNode *N) {\n" -#ifdef ENABLE_NEW_ISEL << " return SelectCode2(N);\n" -#endif << " MVT::SimpleValueType NVT = N->getValueType(0).getSimpleVT().SimpleTy;\n" << " switch (N->getOpcode()) {\n" << " default:\n" @@ -1947,11 +1945,6 @@ void DAGISelEmitter::run(raw_ostream &OS) { DEBUG(errs() << "\n"); } - // At this point, we have full information about the 'Patterns' we need to - // parse, both implicitly from instructions as well as from explicit pattern - // definitions. Emit the resultant instruction selector. - EmitInstructionSelector(OS); - #ifdef ENABLE_NEW_ISEL MatcherNode *Matcher = 0; @@ -1987,5 +1980,11 @@ void DAGISelEmitter::run(raw_ostream &OS) { //Matcher->dump(); EmitMatcherTable(Matcher, OS); delete Matcher; + +#else + // At this point, we have full information about the 'Patterns' we need to + // parse, both implicitly from instructions as well as from explicit pattern + // definitions. Emit the resultant instruction selector. + EmitInstructionSelector(OS); #endif } diff --git a/utils/TableGen/DAGISelMatcherEmitter.cpp b/utils/TableGen/DAGISelMatcherEmitter.cpp index e78be79..e264d77 100644 --- a/utils/TableGen/DAGISelMatcherEmitter.cpp +++ b/utils/TableGen/DAGISelMatcherEmitter.cpp @@ -503,7 +503,7 @@ void llvm::EmitMatcherTable(const MatcherNode *Matcher, raw_ostream &O) { formatted_raw_ostream OS(O); OS << "// The main instruction selector code.\n"; - OS << "SDNode *SelectCode2(SDNode *N) {\n"; + OS << "SDNode *SelectCode(SDNode *N) {\n"; MatcherTableEmitter MatcherEmitter; |