From 8dc4f2bb609989c5c73990435d1b6d1aeb13297a Mon Sep 17 00:00:00 2001 From: Chris Lattner Date: Wed, 17 Feb 2010 06:08:25 +0000 Subject: [PATCH] properly record chain inputs to complex patterns, resolving a fixme. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@96457 91177308-0d34-0410-b5e6-96231b3b80d8 --- utils/TableGen/DAGISelMatcherGen.cpp | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/utils/TableGen/DAGISelMatcherGen.cpp b/utils/TableGen/DAGISelMatcherGen.cpp index b104660cb00..e2ffb8e7171 100644 --- a/utils/TableGen/DAGISelMatcherGen.cpp +++ b/utils/TableGen/DAGISelMatcherGen.cpp @@ -155,7 +155,18 @@ void MatcherGen::EmitLeafMatchCode(const TreePatternNode *N) { // Handle complex pattern. const ComplexPattern &CP = CGP.getComplexPattern(LeafRec); - return AddMatcherNode(new CheckComplexPatMatcherNode(CP)); + AddMatcherNode(new CheckComplexPatMatcherNode(CP)); + + // If the complex pattern has a chain, then we need to keep track of the + // fact that we just recorded a chain input. The chain input will be + // matched as the last operand of the predicate if it was successful. + if (CP.hasProperty(SDNPHasChain)) { + // It is the last operand recorded. + assert(NextRecordedOperandNo > 1 && + "Should have recorded input/result chains at least!"); + InputChains.push_back(NextRecordedOperandNo-1); + } + return; } errs() << "Unknown leaf kind: " << *N << "\n"; @@ -203,9 +214,6 @@ void MatcherGen::EmitOperatorMatchCode(const TreePatternNode *N, // the child numbers of the node are all offset by one. unsigned OpNo = 0; if (N->NodeHasProperty(SDNPHasChain, CGP)) { - // FIXME: Not correct for complex patterns, they need to push their own - // *matched* input chain. - // Record the input chain, which is always input #0 of the SDNode. AddMatcherNode(new MoveChildMatcherNode(0)); AddMatcherNode(new RecordMatcherNode("'" + N->getOperator()->getName() + @@ -222,8 +230,7 @@ void MatcherGen::EmitOperatorMatchCode(const TreePatternNode *N, // happen if there were an intermediate node between the indbr and load, for // example. - // FIXME: Emit "lastchain.getNode() == CurrentNode || - // IsChainCompatible(lastchain.getNode(), CurrentNode)". + // FIXME: Emit "IsChainCompatible(lastchain.getNode(), CurrentNode)". // Rename IsChainCompatible -> IsChainUnreachable, add comment about // complexity. -- 2.34.1