Skip to content

Commit 5dcfc32

Browse files
rotaterightrotateright
committed
[InstCombine] allow more commutative matches for logical-and to select fold
This is a sibling transform to the fold just above it. That was changed to allow the corresponding commuted patterns with: 3073074 e1bd759 8628e6d
1 parent 0de10a6 commit 5dcfc32

File tree

2 files changed

+21
-35
lines changed

2 files changed

+21
-35
lines changed

‎llvm/lib/Transforms/InstCombine/InstCombineSelect.cpp

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2867,11 +2867,20 @@ Instruction *InstCombinerImpl::visitSelectInst(SelectInst &SI) {
28672867
}
28682868

28692869
// (!C && A) || (C && B) --> sel C, B, A
2870+
// (A && !C) || (C && B) --> sel C, B, A
28702871
// (!C && A) || (B && C) --> sel C, B, A
2871-
// TODO: Allow more commutes as with the previous fold.
2872-
if (match(CondVal, m_LogicalAnd(m_Not(m_Value(C)), m_Value(A))) &&
2873-
match(FalseVal, m_c_LogicalAnd(m_Specific(C), m_Value(B))))
2872+
// (A && !C) || (B && C) --> sel C, B, A (may require freeze)
2873+
if (match(CondVal, m_c_LogicalAnd(m_Not(m_Value(C)), m_Value(A))) &&
2874+
match(FalseVal, m_c_LogicalAnd(m_Specific(C), m_Value(B)))) {
2875+
auto *SelCond = dyn_cast<SelectInst>(CondVal);
2876+
auto *SelFVal = dyn_cast<SelectInst>(FalseVal);
2877+
bool MayNeedFreeze = SelCond && SelFVal &&
2878+
match(SelCond->getTrueValue(),
2879+
m_Not(m_Specific(SelFVal->getTrueValue())));
2880+
if (MayNeedFreeze)
2881+
C = Builder.CreateFreeze(C);
28742882
return SelectInst::Create(C, B, A);
2883+
}
28752884
}
28762885
}
28772886

‎llvm/test/Transforms/InstCombine/select-safe-transforms.ll

Lines changed: 9 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -207,10 +207,7 @@ define i1 @bools_logical_commute0_and1_and2(i1 %a, i1 %b, i1 %c) {
207207

208208
define i1 @bools_logical_commute1(i1 %a, i1 %b, i1 %c) {
209209
; CHECK-LABEL: @bools_logical_commute1(
210-
; CHECK-NEXT: [[NOT:%.*]] = xor i1 [[C:%.*]], true
211-
; CHECK-NEXT: [[AND1:%.*]] = select i1 [[A:%.*]], i1 [[NOT]], i1 false
212-
; CHECK-NEXT: [[AND2:%.*]] = select i1 [[C]], i1 [[B:%.*]], i1 false
213-
; CHECK-NEXT: [[OR:%.*]] = select i1 [[AND1]], i1 true, i1 [[AND2]]
210+
; CHECK-NEXT: [[OR:%.*]] = select i1 [[C:%.*]], i1 [[B:%.*]], i1 [[A:%.*]]
214211
; CHECK-NEXT: ret i1 [[OR]]
215212
;
216213
%not = xor i1 %c, -1
@@ -223,10 +220,7 @@ define i1 @bools_logical_commute1(i1 %a, i1 %b, i1 %c) {
223220
define i1 @bools_logical_commute1_and1(i1 %b, i1 %c) {
224221
; CHECK-LABEL: @bools_logical_commute1_and1(
225222
; CHECK-NEXT: [[A:%.*]] = call i1 @gen1()
226-
; CHECK-NEXT: [[NOT:%.*]] = xor i1 [[C:%.*]], true
227-
; CHECK-NEXT: [[AND1:%.*]] = and i1 [[A]], [[NOT]]
228-
; CHECK-NEXT: [[AND2:%.*]] = select i1 [[C]], i1 [[B:%.*]], i1 false
229-
; CHECK-NEXT: [[OR:%.*]] = select i1 [[AND1]], i1 true, i1 [[AND2]]
223+
; CHECK-NEXT: [[OR:%.*]] = select i1 [[C:%.*]], i1 [[B:%.*]], i1 [[A]]
230224
; CHECK-NEXT: ret i1 [[OR]]
231225
;
232226
%a = call i1 @gen1()
@@ -239,10 +233,7 @@ define i1 @bools_logical_commute1_and1(i1 %b, i1 %c) {
239233

240234
define i1 @bools_logical_commute1_and2(i1 %a, i1 %b, i1 %c) {
241235
; CHECK-LABEL: @bools_logical_commute1_and2(
242-
; CHECK-NEXT: [[NOT:%.*]] = xor i1 [[C:%.*]], true
243-
; CHECK-NEXT: [[AND1:%.*]] = select i1 [[A:%.*]], i1 [[NOT]], i1 false
244-
; CHECK-NEXT: [[AND2:%.*]] = and i1 [[C]], [[B:%.*]]
245-
; CHECK-NEXT: [[OR:%.*]] = select i1 [[AND1]], i1 true, i1 [[AND2]]
236+
; CHECK-NEXT: [[OR:%.*]] = select i1 [[C:%.*]], i1 [[B:%.*]], i1 [[A:%.*]]
246237
; CHECK-NEXT: ret i1 [[OR]]
247238
;
248239
%not = xor i1 %c, -1
@@ -255,10 +246,7 @@ define i1 @bools_logical_commute1_and2(i1 %a, i1 %b, i1 %c) {
255246
define i1 @bools_logical_commute1_and1_and2(i1 %b, i1 %c) {
256247
; CHECK-LABEL: @bools_logical_commute1_and1_and2(
257248
; CHECK-NEXT: [[A:%.*]] = call i1 @gen1()
258-
; CHECK-NEXT: [[NOT:%.*]] = xor i1 [[C:%.*]], true
259-
; CHECK-NEXT: [[AND1:%.*]] = and i1 [[A]], [[NOT]]
260-
; CHECK-NEXT: [[AND2:%.*]] = and i1 [[C]], [[B:%.*]]
261-
; CHECK-NEXT: [[OR:%.*]] = select i1 [[AND1]], i1 true, i1 [[AND2]]
249+
; CHECK-NEXT: [[OR:%.*]] = select i1 [[C:%.*]], i1 [[B:%.*]], i1 [[A]]
262250
; CHECK-NEXT: ret i1 [[OR]]
263251
;
264252
%a = call i1 @gen1()
@@ -319,10 +307,8 @@ define <2 x i1> @bools_logical_commute2_and1_and2(<2 x i1> %a, <2 x i1> %b, <2 x
319307

320308
define i1 @bools_logical_commute3(i1 %a, i1 %b, i1 %c) {
321309
; CHECK-LABEL: @bools_logical_commute3(
322-
; CHECK-NEXT: [[NOT:%.*]] = xor i1 [[C:%.*]], true
323-
; CHECK-NEXT: [[AND1:%.*]] = select i1 [[A:%.*]], i1 [[NOT]], i1 false
324-
; CHECK-NEXT: [[AND2:%.*]] = select i1 [[B:%.*]], i1 [[C]], i1 false
325-
; CHECK-NEXT: [[OR:%.*]] = select i1 [[AND1]], i1 true, i1 [[AND2]]
310+
; CHECK-NEXT: [[TMP1:%.*]] = freeze i1 [[C:%.*]]
311+
; CHECK-NEXT: [[OR:%.*]] = select i1 [[TMP1]], i1 [[B:%.*]], i1 [[A:%.*]]
326312
; CHECK-NEXT: ret i1 [[OR]]
327313
;
328314
%not = xor i1 %c, -1
@@ -335,10 +321,7 @@ define i1 @bools_logical_commute3(i1 %a, i1 %b, i1 %c) {
335321
define i1 @bools_logical_commute3_and1(i1 %b, i1 %c) {
336322
; CHECK-LABEL: @bools_logical_commute3_and1(
337323
; CHECK-NEXT: [[A:%.*]] = call i1 @gen1()
338-
; CHECK-NEXT: [[NOT:%.*]] = xor i1 [[C:%.*]], true
339-
; CHECK-NEXT: [[AND1:%.*]] = and i1 [[A]], [[NOT]]
340-
; CHECK-NEXT: [[AND2:%.*]] = select i1 [[B:%.*]], i1 [[C]], i1 false
341-
; CHECK-NEXT: [[OR:%.*]] = select i1 [[AND1]], i1 true, i1 [[AND2]]
324+
; CHECK-NEXT: [[OR:%.*]] = select i1 [[C:%.*]], i1 [[B:%.*]], i1 [[A]]
342325
; CHECK-NEXT: ret i1 [[OR]]
343326
;
344327
%a = call i1 @gen1()
@@ -351,10 +334,7 @@ define i1 @bools_logical_commute3_and1(i1 %b, i1 %c) {
351334

352335
define i1 @bools_logical_commute3_and2(i1 %a, i1 %b, i1 %c) {
353336
; CHECK-LABEL: @bools_logical_commute3_and2(
354-
; CHECK-NEXT: [[NOT:%.*]] = xor i1 [[C:%.*]], true
355-
; CHECK-NEXT: [[AND1:%.*]] = select i1 [[A:%.*]], i1 [[NOT]], i1 false
356-
; CHECK-NEXT: [[AND2:%.*]] = and i1 [[B:%.*]], [[C]]
357-
; CHECK-NEXT: [[OR:%.*]] = select i1 [[AND1]], i1 true, i1 [[AND2]]
337+
; CHECK-NEXT: [[OR:%.*]] = select i1 [[C:%.*]], i1 [[B:%.*]], i1 [[A:%.*]]
358338
; CHECK-NEXT: ret i1 [[OR]]
359339
;
360340
%not = xor i1 %c, -1
@@ -367,10 +347,7 @@ define i1 @bools_logical_commute3_and2(i1 %a, i1 %b, i1 %c) {
367347
define i1 @bools_logical_commute3_and1_and2(i1 %b, i1 %c) {
368348
; CHECK-LABEL: @bools_logical_commute3_and1_and2(
369349
; CHECK-NEXT: [[A:%.*]] = call i1 @gen1()
370-
; CHECK-NEXT: [[NOT:%.*]] = xor i1 [[C:%.*]], true
371-
; CHECK-NEXT: [[AND1:%.*]] = and i1 [[A]], [[NOT]]
372-
; CHECK-NEXT: [[AND2:%.*]] = and i1 [[B:%.*]], [[C]]
373-
; CHECK-NEXT: [[OR:%.*]] = select i1 [[AND1]], i1 true, i1 [[AND2]]
350+
; CHECK-NEXT: [[OR:%.*]] = select i1 [[C:%.*]], i1 [[B:%.*]], i1 [[A]]
374351
; CHECK-NEXT: ret i1 [[OR]]
375352
;
376353
%a = call i1 @gen1()

0 commit comments

Comments
 (0)