[llvm] r191941 - Revert r191940 to see if it fixes the build bots.
Craig Topper
craig.topper at gmail.com
Thu Oct 3 22:52:17 PDT 2013
Author: ctopper
Date: Fri Oct 4 00:52:17 2013
New Revision: 191941
URL: http://llvm.org/viewvc/llvm-project?rev=191941&view=rev
Log:
Revert r191940 to see if it fixes the build bots.
Modified:
llvm/trunk/include/llvm/CodeGen/SelectionDAGISel.h
llvm/trunk/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp
llvm/trunk/utils/TableGen/DAGISelMatcher.cpp
llvm/trunk/utils/TableGen/DAGISelMatcher.h
llvm/trunk/utils/TableGen/DAGISelMatcherEmitter.cpp
llvm/trunk/utils/TableGen/DAGISelMatcherOpt.cpp
Modified: llvm/trunk/include/llvm/CodeGen/SelectionDAGISel.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/CodeGen/SelectionDAGISel.h?rev=191941&r1=191940&r2=191941&view=diff
==============================================================================
--- llvm/trunk/include/llvm/CodeGen/SelectionDAGISel.h (original)
+++ llvm/trunk/include/llvm/CodeGen/SelectionDAGISel.h Fri Oct 4 00:52:17 2013
@@ -113,8 +113,6 @@ public:
OPC_MoveChild,
OPC_MoveParent,
OPC_CheckSame,
- OPC_CheckChild0Same, OPC_CheckChild1Same,
- OPC_CheckChild2Same, OPC_CheckChild3Same,
OPC_CheckPatternPredicate,
OPC_CheckPredicate,
OPC_CheckOpcode,
Modified: llvm/trunk/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp?rev=191941&r1=191940&r2=191941&view=diff
==============================================================================
--- llvm/trunk/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp (original)
+++ llvm/trunk/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp Fri Oct 4 00:52:17 2013
@@ -2097,18 +2097,6 @@ CheckSame(const unsigned char *MatcherTa
return N == RecordedNodes[RecNo].first;
}
-/// CheckChildSame - Implements OP_CheckChildXSame.
-LLVM_ATTRIBUTE_ALWAYS_INLINE static bool
-CheckChildSame(const unsigned char *MatcherTable, unsigned &MatcherIndex,
- SDValue N,
- const SmallVectorImpl<std::pair<SDValue, SDNode*> > &RecordedNodes,
- unsigned ChildNo) {
- if (ChildNo >= N.getNumOperands())
- return false; // Match fails if out of range child #.
- return ::CheckSame(MatcherTable, MatcherIndex, N.getOperand(ChildNo),
- RecordedNodes);
-}
-
/// CheckPatternPredicate - Implements OP_CheckPatternPredicate.
LLVM_ATTRIBUTE_ALWAYS_INLINE static bool
CheckPatternPredicate(const unsigned char *MatcherTable, unsigned &MatcherIndex,
@@ -2223,13 +2211,6 @@ static unsigned IsPredicateKnownToFail(c
case SelectionDAGISel::OPC_CheckSame:
Result = !::CheckSame(Table, Index, N, RecordedNodes);
return Index;
- case SelectionDAGISel::OPC_CheckChild0Same:
- case SelectionDAGISel::OPC_CheckChild1Same:
- case SelectionDAGISel::OPC_CheckChild2Same:
- case SelectionDAGISel::OPC_CheckChild3Same:
- Result = !::CheckChildSame(Table, Index, N, RecordedNodes,
- Table[Index-1] - SelectionDAGISel::OPC_CheckChild0Same);
- return Index;
case SelectionDAGISel::OPC_CheckPatternPredicate:
Result = !::CheckPatternPredicate(Table, Index, SDISel);
return Index;
@@ -2527,14 +2508,6 @@ SelectCodeCommon(SDNode *NodeToMatch, co
case OPC_CheckSame:
if (!::CheckSame(MatcherTable, MatcherIndex, N, RecordedNodes)) break;
continue;
-
- case OPC_CheckChild0Same: case OPC_CheckChild1Same:
- case OPC_CheckChild2Same: case OPC_CheckChild3Same:
- if (!::CheckChildSame(MatcherTable, MatcherIndex, N, RecordedNodes,
- Opcode-OPC_CheckChild0Same))
- break;
- continue;
-
case OPC_CheckPatternPredicate:
if (!::CheckPatternPredicate(MatcherTable, MatcherIndex, *this)) break;
continue;
Modified: llvm/trunk/utils/TableGen/DAGISelMatcher.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/utils/TableGen/DAGISelMatcher.cpp?rev=191941&r1=191940&r2=191941&view=diff
==============================================================================
--- llvm/trunk/utils/TableGen/DAGISelMatcher.cpp (original)
+++ llvm/trunk/utils/TableGen/DAGISelMatcher.cpp Fri Oct 4 00:52:17 2013
@@ -134,10 +134,6 @@ void CheckSameMatcher::printImpl(raw_ost
OS.indent(indent) << "CheckSame " << MatchNumber << '\n';
}
-void CheckChildSameMatcher::printImpl(raw_ostream &OS, unsigned indent) const {
- OS.indent(indent) << "CheckChild" << ChildNo << "Same\n";
-}
-
void CheckPatternPredicateMatcher::
printImpl(raw_ostream &OS, unsigned indent) const {
OS.indent(indent) << "CheckPatternPredicate " << Predicate << '\n';
Modified: llvm/trunk/utils/TableGen/DAGISelMatcher.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/utils/TableGen/DAGISelMatcher.h?rev=191941&r1=191940&r2=191941&view=diff
==============================================================================
--- llvm/trunk/utils/TableGen/DAGISelMatcher.h (original)
+++ llvm/trunk/utils/TableGen/DAGISelMatcher.h Fri Oct 4 00:52:17 2013
@@ -55,7 +55,6 @@ public:
// Predicate checking.
CheckSame, // Fail if not same as prev match.
- CheckChildSame, // Fail if child not same as prev match.
CheckPatternPredicate,
CheckPredicate, // Fail if node predicate fails.
CheckOpcode, // Fail if not opcode.
@@ -123,7 +122,6 @@ public:
switch (getKind()) {
default: return false;
case CheckSame:
- case CheckChildSame:
case CheckPatternPredicate:
case CheckPredicate:
case CheckOpcode:
@@ -394,34 +392,6 @@ private:
virtual unsigned getHashImpl() const { return getMatchNumber(); }
};
-/// CheckChildSameMatcher - This checks to see if child node is exactly the same
-/// node as the specified match that was recorded with 'Record'. This is used
-/// when patterns have the same name in them, like '(mul GPR:$in, GPR:$in)'.
-class CheckChildSameMatcher : public Matcher {
- unsigned ChildNo;
- unsigned MatchNumber;
-public:
- CheckChildSameMatcher(unsigned childno, unsigned matchnumber)
- : Matcher(CheckChildSame), ChildNo(childno), MatchNumber(matchnumber) {}
-
- unsigned getChildNo() const { return ChildNo; }
- unsigned getMatchNumber() const { return MatchNumber; }
-
- static inline bool classof(const Matcher *N) {
- return N->getKind() == CheckChildSame;
- }
-
- virtual bool isSafeToReorderWithPatternPredicate() const { return true; }
-
-private:
- virtual void printImpl(raw_ostream &OS, unsigned indent) const;
- virtual bool isEqualImpl(const Matcher *M) const {
- return cast<CheckChildSameMatcher>(M)->ChildNo == ChildNo &&
- cast<CheckChildSameMatcher>(M)->MatchNumber == MatchNumber;
- }
- virtual unsigned getHashImpl() const { return (MatchNumber << 2) | ChildNo; }
-};
-
/// CheckPatternPredicateMatcher - This checks the target-specific predicate
/// to see if the entire pattern is capable of matching. This predicate does
/// not take a node as input. This is used for subtarget feature checks etc.
Modified: llvm/trunk/utils/TableGen/DAGISelMatcherEmitter.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/utils/TableGen/DAGISelMatcherEmitter.cpp?rev=191941&r1=191940&r2=191941&view=diff
==============================================================================
--- llvm/trunk/utils/TableGen/DAGISelMatcherEmitter.cpp (original)
+++ llvm/trunk/utils/TableGen/DAGISelMatcherEmitter.cpp Fri Oct 4 00:52:17 2013
@@ -242,12 +242,6 @@ EmitMatcher(const Matcher *N, unsigned I
<< cast<CheckSameMatcher>(N)->getMatchNumber() << ",\n";
return 2;
- case Matcher::CheckChildSame:
- OS << "OPC_CheckChild"
- << cast<CheckChildSameMatcher>(N)->getChildNo() << "Same, "
- << cast<CheckChildSameMatcher>(N)->getMatchNumber() << ",\n";
- return 2;
-
case Matcher::CheckPatternPredicate: {
StringRef Pred =cast<CheckPatternPredicateMatcher>(N)->getPredicate();
OS << "OPC_CheckPatternPredicate, " << getPatternPredicate(Pred) << ',';
@@ -759,7 +753,6 @@ void MatcherTableEmitter::EmitHistogram(
case Matcher::MoveChild: OS << "OPC_MoveChild"; break;
case Matcher::MoveParent: OS << "OPC_MoveParent"; break;
case Matcher::CheckSame: OS << "OPC_CheckSame"; break;
- case Matcher::CheckChildSame: OS << "OPC_CheckChildSame"; break;
case Matcher::CheckPatternPredicate:
OS << "OPC_CheckPatternPredicate"; break;
case Matcher::CheckPredicate: OS << "OPC_CheckPredicate"; break;
Modified: llvm/trunk/utils/TableGen/DAGISelMatcherOpt.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/utils/TableGen/DAGISelMatcherOpt.cpp?rev=191941&r1=191940&r2=191941&view=diff
==============================================================================
--- llvm/trunk/utils/TableGen/DAGISelMatcherOpt.cpp (original)
+++ llvm/trunk/utils/TableGen/DAGISelMatcherOpt.cpp Fri Oct 4 00:52:17 2013
@@ -51,11 +51,7 @@ static void ContractNodes(OwningPtr<Matc
if (MC->getChildNo() < 8 && // Only have CheckChildType0...7
CT->getResNo() == 0) // CheckChildType checks res #0
New = new CheckChildTypeMatcher(MC->getChildNo(), CT->getType());
-
- if (CheckSameMatcher *CS = dyn_cast<CheckSameMatcher>(MC->getNext()))
- if (MC->getChildNo() < 4) // Only have CheckChildSame0...3
- New = new CheckChildSameMatcher(MC->getChildNo(), CS->getMatchNumber());
-
+
if (New) {
// Insert the new node.
New->setNext(MatcherPtr.take());
More information about the llvm-commits
mailing list