[DAGCombiner] Add SelectCCLike matcher and unit test-7

Author: houngkoungting

llvm/include/llvm/CodeGen/SDPatternMatch.h

@@ -130,8 +130,7 @@ struct DeferredValue_match {
 
   explicit DeferredValue_match(SDValue &Match) : MatchVal(Match) {}
 
-  template <typename MatchContext> 
-  bool match(const MatchContext &, SDValue N) {
+  template <typename MatchContext> bool match(const MatchContext &, SDValue N) {
     return N == MatchVal;
   }
 };
@@ -580,40 +579,13 @@ m_InsertSubvector(const LHS &Base, const RHS &Sub, const IDX &Idx) {
 }
 
 template <typename LTy, typename RTy, typename TTy, typename FTy, typename CCTy>
-struct SelectCC_match {
-  LTy L;
-  RTy R;
-  TTy T;
-  FTy F;
-  CCTy CC;
-
-  SelectCC_match(LTy L, RTy R, TTy T, FTy F, CCTy CC)
-      : L(std::move(L)), R(std::move(R)), T(std::move(T)), F(std::move(F)),
-        CC(std::move(CC)) {}
-
-  template <typename MatchContext>
-  bool match(MatchContext &Ctx, SDValue V) {
-    return V.getOpcode() == ISD::SELECT_CC && L.match(Ctx, V.getOperand(0)) &&
-           R.match(Ctx, V.getOperand(1)) && T.match(Ctx, V.getOperand(2)) &&
-           F.match(Ctx, V.getOperand(3)) && CC.match(Ctx, V.getOperand(4));
-  }
-};
-
-template <typename LTy, typename RTy, typename TTy, typename FTy, typename CCTy>
-inline auto m_SelectCC(LTy &&L, RTy &&R, TTy &&T, FTy &&F, CCTy &&CC) {
-  return SelectCC_match<std::decay_t<LTy>, std::decay_t<RTy>, std::decay_t<TTy>,
-                        std::decay_t<FTy>, std::decay_t<CCTy>>(
-      std::forward<LTy>(L), std::forward<RTy>(R), std::forward<TTy>(T),
-      std::forward<FTy>(F), std::forward<CCTy>(CC));
+inline auto m_SelectCC(LTy L, RTy R, TTy T, FTy F, CCTy CC) {
+  return m_Node(ISD::SELECT_CC, L, R, T, F, CC);
 }
 
 template <typename LTy, typename RTy, typename TTy, typename FTy, typename CCTy>
-inline auto m_SelectCCLike(LTy &&L, RTy &&R, TTy &&T, FTy &&F, CCTy &&CC) {
-  return SDPatternMatch::m_AnyOf(
-      SDPatternMatch::m_Select(SDPatternMatch::m_SetCC(L, R, CC), T, F),
-      m_SelectCC(std::forward<LTy>(L), std::forward<RTy>(R),
-                 std::forward<TTy>(T), std::forward<FTy>(F),
-                 std::forward<CCTy>(CC)));
+inline auto m_SelectCCLike(LTy L, RTy R, TTy T, FTy F, CCTy CC) {
+  return m_AnyOf(m_Select(m_SetCC(L, R, CC), T, F), m_SelectCC(L, R, T, F, CC));
 }
 
 // === Binary operations ===

llvm/unittests/CodeGen/SelectionDAGPatternMatchTest.cpp

@@ -955,15 +955,44 @@ TEST_F(SelectionDAGPatternMatchTest, MatchSelectCCLike) {
 
   SDValue LHS = DAG->getConstant(1, SDLoc(), MVT::i32);
   SDValue RHS = DAG->getConstant(2, SDLoc(), MVT::i32);
-  SDValue Select = DAG->getNode(ISD::SELECT_CC, SDLoc(), MVT::i32, LHS,
-                                RHS,
-                                LHS, RHS,
-                                DAG->getCondCode(ISD::SETLT));
+  SDValue TVal = DAG->getConstant(3, SDLoc(), MVT::i32);
+  SDValue FVal = DAG->getConstant(4, SDLoc(), MVT::i32);
+  SDValue Select = DAG->getNode(ISD::SELECT_CC, SDLoc(), MVT::i32, LHS, RHS,
+                                TVal, FVal, DAG->getCondCode(ISD::SETLT));
 
   ISD::CondCode CC = ISD::SETLT;
   auto Matcher =
-      m_SelectCCLike(m_Specific(LHS), m_Specific(RHS), m_Specific(LHS),
-                     m_Specific(RHS), m_CondCode(CC));
+      m_SelectCCLike(m_Specific(LHS), m_Specific(RHS), m_Specific(TVal),
+                     m_Specific(FVal), m_CondCode(CC));
+
+  struct DAGMatchContext {
+    SelectionDAG &DAG;
+    DAGMatchContext(SelectionDAG &DAG) : DAG(DAG) {}
+
+    bool match(SDValue N, unsigned Opcode) const {
+      return N.getOpcode() == Opcode;
+    }
+
+    unsigned getNumOperands(SDValue N) const { return N.getNumOperands(); }
+  };
+
+  DAGMatchContext Ctx(*DAG);
+  EXPECT_TRUE(Matcher.match(Ctx, Select));
+}
+
+TEST_F(SelectionDAGPatternMatchTest, MatchSelectCC) {
+  using namespace SDPatternMatch;
+
+  SDValue LHS = DAG->getConstant(1, SDLoc(), MVT::i32);
+  SDValue RHS = DAG->getConstant(2, SDLoc(), MVT::i32);
+  SDValue TVal = DAG->getConstant(3, SDLoc(), MVT::i32);
+  SDValue FVal = DAG->getConstant(4, SDLoc(), MVT::i32);
+  SDValue Select = DAG->getNode(ISD::SELECT_CC, SDLoc(), MVT::i32, LHS, RHS,
+                                TVal, FVal, DAG->getCondCode(ISD::SETLT));
+
+  ISD::CondCode CC = ISD::SETLT;
+  auto Matcher = m_SelectCC(m_Specific(LHS), m_Specific(RHS), m_Specific(TVal),
+                            m_Specific(FVal), m_CondCode(CC));
 
   struct DAGMatchContext {
     SelectionDAG &DAG;