Skip to content

Add m_SelectCCLike matcher to match SELECT_CC or SELECT with SETCC #149646

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 15 commits into from
Aug 1, 2025
Merged

Add m_SelectCCLike matcher to match SELECT_CC or SELECT with SETCC #149646

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
432880f
Add m_SelectCCLike matcher to match SELECT_CC or SELECT with SETCC
houngkoungting Jul 19, 2025
060eba0
Add m_SelectCCLike matcher to match SELECT_CC or SELECT with SETCC-1
houngkoungting Jul 19, 2025
72ad2f7
[DAGCombiner] Add SelectCCLike matcher and unit test
houngkoungting Jul 22, 2025
f703bf7
[DAGCombiner] Add SelectCCLike matcher and unit test-1
houngkoungting Jul 22, 2025
42279f8
[DAGCombiner] Add SelectCCLike matcher and unit test-2
houngkoungting Jul 22, 2025
2e22456
[DAGCombiner] Add SelectCCLike matcher and unit test-3
houngkoungting Jul 22, 2025
ebab64b
[DAGCombiner] Add SelectCCLike matcher and unit test-3
houngkoungting Jul 22, 2025
6436237
[DAGCombiner] Add SelectCCLike matcher and unit test-4
houngkoungting Jul 22, 2025
065aa5a
[DAGCombiner] Add SelectCCLike matcher and unit test-5
houngkoungting Jul 22, 2025
eca282d
[DAGCombiner] Add SelectCCLike matcher and unit test-6
houngkoungting Jul 22, 2025
4e17482
[DAGCombiner] Add SelectCCLike matcher and unit test-7
houngkoungting Jul 22, 2025
d24f058
[DAG] Add m_SelectCCLike matcher for SELECT_CC and SELECT(SETCC(...))
houngkoungting Jul 30, 2025
82b9b2c
[DAG] Add m_SelectCCLike matcher for SELECT_CC and SELECT(SETCC(...))-1
houngkoungting Jul 30, 2025
4651216
[DAG] Add m_SelectCCLike matcher for SELECT_CC and SELECT(SETCC(...))-2
houngkoungting Jul 30, 2025
06290be
Merge branch 'main' into main
RKSimon Aug 1, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 12 additions & 0 deletions llvm/include/llvm/CodeGen/SDPatternMatch.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -578,6 +578,18 @@ m_InsertSubvector(const LHS &Base, const RHS &Sub, const IDX &Idx) {
return TernaryOpc_match<LHS, RHS, IDX>(ISD::INSERT_SUBVECTOR, Base, Sub, Idx);
}

template <typename LTy, typename RTy, typename TTy, typename FTy, typename CCTy>
inline auto m_SelectCC(const LTy &L, const RTy &R, const TTy &T, const FTy &F,
const 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(const LTy &L, const RTy &R, const TTy &T,
const FTy &F, const CCTy &CC) {
return m_AnyOf(m_Select(m_SetCC(L, R, CC), T, F), m_SelectCC(L, R, T, F, CC));
}

// === Binary operations ===
template <typename LHS_P, typename RHS_P, bool Commutable = false,
bool ExcludeChain = false>
Expand Down
23 changes: 11 additions & 12 deletions llvm/lib/CodeGen/SelectionDAG/DAGCombiner.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4100,18 +4100,17 @@ SDValue DAGCombiner::visitSUB(SDNode *N) {
// (sub x, ([v]select (uge x, y), y, 0)) -> (umin x, (sub x, y))
if (N1.hasOneUse() && hasUMin(VT)) {
SDValue Y;
if (sd_match(N1, m_Select(m_SetCC(m_Specific(N0), m_Value(Y),
m_SpecificCondCode(ISD::SETULT)),
m_Zero(), m_Deferred(Y))) ||
sd_match(N1, m_Select(m_SetCC(m_Specific(N0), m_Value(Y),
m_SpecificCondCode(ISD::SETUGE)),
m_Deferred(Y), m_Zero())) ||
sd_match(N1, m_VSelect(m_SetCC(m_Specific(N0), m_Value(Y),
m_SpecificCondCode(ISD::SETULT)),
m_Zero(), m_Deferred(Y))) ||
sd_match(N1, m_VSelect(m_SetCC(m_Specific(N0), m_Value(Y),
m_SpecificCondCode(ISD::SETUGE)),
Copy link
Collaborator

@RKSimon RKSimon Jul 30, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you remove matchUMinSubSelect and revert this back to using m_Select/m_VSelect? I'm hoping that once #150019 lands m_SelectCCLike can support m_VSelect as well.

m_Deferred(Y), m_Zero())))
auto MS0 = m_Specific(N0);
auto MVY = m_Value(Y);
auto MZ = m_Zero();
auto MCC1 = m_SpecificCondCode(ISD::SETULT);
auto MCC2 = m_SpecificCondCode(ISD::SETUGE);

if (sd_match(N1, m_SelectCCLike(MS0, MVY, MZ, m_Deferred(Y), MCC1)) ||
sd_match(N1, m_SelectCCLike(MS0, MVY, m_Deferred(Y), MZ, MCC2)) ||
sd_match(N1, m_VSelect(m_SetCC(MS0, MVY, MCC1), MZ, m_Deferred(Y))) ||
sd_match(N1, m_VSelect(m_SetCC(MS0, MVY, MCC2), m_Deferred(Y), MZ)))

return DAG.getNode(ISD::UMIN, DL, VT, N0,
DAG.getNode(ISD::SUB, DL, VT, N0, Y));
}
Expand Down
32 changes: 32 additions & 0 deletions llvm/unittests/CodeGen/SelectionDAGPatternMatchTest.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -859,3 +859,35 @@ TEST_F(SelectionDAGPatternMatchTest, MatchZeroOneAllOnes) {
EXPECT_TRUE(sd_match(Vec, DAG.get(), m_AllOnes(true)));
}
}

TEST_F(SelectionDAGPatternMatchTest, MatchSelectCCLike) {
Copy link
Collaborator

@RKSimon RKSimon Jul 24, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please can you add m_SelectCC unit test coverage

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;
EXPECT_TRUE(sd_match(
Select, m_SelectCCLike(m_Specific(LHS), m_Specific(RHS), m_Specific(TVal),
m_Specific(FVal), m_CondCode(CC))));
}

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;
EXPECT_TRUE(sd_match(Select, m_SelectCC(m_Specific(LHS), m_Specific(RHS),
m_Specific(TVal), m_Specific(FVal),
m_CondCode(CC))));
}