Skip to content
Open
Show file tree
Hide file tree
Changes from 17 commits
Commits
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
25 changes: 25 additions & 0 deletions llvm/lib/CodeGen/SelectionDAG/DAGCombiner.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -10197,6 +10197,31 @@ SDValue DAGCombiner::visitXOR(SDNode *N) {
}
}

// fold (not (or A, or(B, C))) -> and(not(A), and(not(B), not(C))
if (TLI.hasAndNot(SDValue(N, 0))) {
// If we have AndNot then it is profitable to apply demorgan to make use
// of the machine instruction.
Comment on lines +10202 to +10203
Copy link
Contributor

Choose a reason for hiding this comment

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

I would argue that this fold is not profitable at all on its own. It is only profitable when combined into a larger pattern like ~(A|B|C).

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Yeah that's also my impression :/
I have been updating the rest of the .ll after I "fixed" the infinite loop. And, it doesn't look so good.
I will try the larger pattern and let's see what the result is.

SDValue A;
SDValue B;
SDValue C;
APInt Cst;
if (sd_match(N, m_Xor(m_Or(m_Value(A), m_Or(m_Value(B), m_Value(C))),
m_ConstInt(Cst))) &&
Cst.isAllOnes()) {
auto Ty = N->getValueType(0);

auto NegA =
DAG.getNode(ISD::XOR, DL, VT, A, DAG.getConstant(Cst, DL, Ty));
auto NegB =
DAG.getNode(ISD::XOR, DL, VT, B, DAG.getConstant(Cst, DL, Ty));
auto NegC =
DAG.getNode(ISD::XOR, DL, VT, C, DAG.getConstant(Cst, DL, Ty));

return DAG.getNode(ISD::AND, DL, VT, NegA,
DAG.getNode(ISD::AND, DL, VT, NegB, NegC));
}
}

return SDValue();
}

Expand Down
2 changes: 2 additions & 0 deletions llvm/lib/Target/X86/X86ISelLowering.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -55615,10 +55615,12 @@ static SDValue combineAndnp(SDNode *N, SelectionDAG &DAG,

// Folds for better commutativity:
if (N1->hasOneUse()) {
/*
// ANDNP(x,NOT(y)) -> AND(NOT(x),NOT(y)) -> NOT(OR(X,Y)).
if (SDValue Not = IsNOT(N1, DAG))
return DAG.getNOT(
DL, DAG.getNode(ISD::OR, DL, VT, N0, DAG.getBitcast(VT, Not)), VT);
*/

// ANDNP(x,PSHUFB(y,z)) -> PSHUFB(y,OR(z,x))
// Zero out elements by setting the PSHUFB mask value to 0xFF.
Expand Down
139 changes: 82 additions & 57 deletions llvm/test/CodeGen/AArch64/ctlz.ll
Original file line number Diff line number Diff line change
Expand Up @@ -276,18 +276,23 @@ define <2 x i64> @v2i64(<2 x i64> %d) {
; CHECK-SD-LABEL: v2i64:
; CHECK-SD: // %bb.0: // %entry
; CHECK-SD-NEXT: ushr v1.2d, v0.2d, #1
; CHECK-SD-NEXT: orr v0.16b, v0.16b, v1.16b
; CHECK-SD-NEXT: ushr v1.2d, v0.2d, #2
; CHECK-SD-NEXT: orr v0.16b, v0.16b, v1.16b
; CHECK-SD-NEXT: ushr v1.2d, v0.2d, #4
; CHECK-SD-NEXT: orr v0.16b, v0.16b, v1.16b
; CHECK-SD-NEXT: ushr v1.2d, v0.2d, #8
; CHECK-SD-NEXT: orr v0.16b, v0.16b, v1.16b
; CHECK-SD-NEXT: ushr v1.2d, v0.2d, #16
; CHECK-SD-NEXT: orr v0.16b, v0.16b, v1.16b
; CHECK-SD-NEXT: ushr v1.2d, v0.2d, #32
; CHECK-SD-NEXT: orr v0.16b, v0.16b, v1.16b
; CHECK-SD-NEXT: orr v2.16b, v0.16b, v1.16b
; CHECK-SD-NEXT: mvn v0.16b, v0.16b
; CHECK-SD-NEXT: ushr v3.2d, v2.2d, #2
; CHECK-SD-NEXT: bic v0.16b, v0.16b, v1.16b
; CHECK-SD-NEXT: orr v2.16b, v2.16b, v3.16b
; CHECK-SD-NEXT: bic v0.16b, v0.16b, v3.16b
; CHECK-SD-NEXT: ushr v4.2d, v2.2d, #4
; CHECK-SD-NEXT: orr v2.16b, v2.16b, v4.16b
; CHECK-SD-NEXT: bic v0.16b, v0.16b, v4.16b
; CHECK-SD-NEXT: ushr v1.2d, v2.2d, #8
; CHECK-SD-NEXT: orr v2.16b, v2.16b, v1.16b
; CHECK-SD-NEXT: bic v0.16b, v0.16b, v1.16b
; CHECK-SD-NEXT: ushr v3.2d, v2.2d, #16
; CHECK-SD-NEXT: orr v1.16b, v2.16b, v3.16b
; CHECK-SD-NEXT: bic v0.16b, v0.16b, v3.16b
; CHECK-SD-NEXT: ushr v1.2d, v1.2d, #32
; CHECK-SD-NEXT: bic v0.16b, v0.16b, v1.16b
; CHECK-SD-NEXT: cnt v0.16b, v0.16b
; CHECK-SD-NEXT: uaddlp v0.8h, v0.16b
; CHECK-SD-NEXT: uaddlp v0.4s, v0.8h
Expand All @@ -314,34 +319,44 @@ define <3 x i64> @v3i64(<3 x i64> %d) {
; CHECK-SD-NEXT: // kill: def $d0 killed $d0 def $q0
; CHECK-SD-NEXT: // kill: def $d1 killed $d1 def $q1
; CHECK-SD-NEXT: // kill: def $d2 killed $d2 def $q2
; CHECK-SD-NEXT: ushr v4.2d, v2.2d, #1
; CHECK-SD-NEXT: mov v0.d[1], v1.d[0]
; CHECK-SD-NEXT: orr v6.16b, v2.16b, v4.16b
; CHECK-SD-NEXT: mvn v2.16b, v2.16b
; CHECK-SD-NEXT: ushr v1.2d, v0.2d, #1
; CHECK-SD-NEXT: orr v0.16b, v0.16b, v1.16b
; CHECK-SD-NEXT: ushr v1.2d, v2.2d, #1
; CHECK-SD-NEXT: ushr v3.2d, v0.2d, #2
; CHECK-SD-NEXT: orr v1.16b, v2.16b, v1.16b
; CHECK-SD-NEXT: orr v0.16b, v0.16b, v3.16b
; CHECK-SD-NEXT: ushr v2.2d, v1.2d, #2
; CHECK-SD-NEXT: ushr v3.2d, v0.2d, #4
; CHECK-SD-NEXT: orr v1.16b, v1.16b, v2.16b
; CHECK-SD-NEXT: orr v0.16b, v0.16b, v3.16b
; CHECK-SD-NEXT: ushr v2.2d, v1.2d, #4
; CHECK-SD-NEXT: ushr v3.2d, v0.2d, #8
; CHECK-SD-NEXT: orr v1.16b, v1.16b, v2.16b
; CHECK-SD-NEXT: orr v0.16b, v0.16b, v3.16b
; CHECK-SD-NEXT: ushr v2.2d, v1.2d, #8
; CHECK-SD-NEXT: ushr v3.2d, v0.2d, #16
; CHECK-SD-NEXT: orr v1.16b, v1.16b, v2.16b
; CHECK-SD-NEXT: orr v0.16b, v0.16b, v3.16b
; CHECK-SD-NEXT: ushr v2.2d, v1.2d, #16
; CHECK-SD-NEXT: ushr v3.2d, v0.2d, #32
; CHECK-SD-NEXT: orr v1.16b, v1.16b, v2.16b
; CHECK-SD-NEXT: orr v0.16b, v0.16b, v3.16b
; CHECK-SD-NEXT: ushr v2.2d, v1.2d, #32
; CHECK-SD-NEXT: ushr v7.2d, v6.2d, #2
; CHECK-SD-NEXT: bic v2.16b, v2.16b, v4.16b
; CHECK-SD-NEXT: orr v3.16b, v0.16b, v1.16b
; CHECK-SD-NEXT: mvn v0.16b, v0.16b
; CHECK-SD-NEXT: orr v1.16b, v1.16b, v2.16b
; CHECK-SD-NEXT: orr v6.16b, v6.16b, v7.16b
; CHECK-SD-NEXT: bic v2.16b, v2.16b, v7.16b
; CHECK-SD-NEXT: ushr v5.2d, v3.2d, #2
; CHECK-SD-NEXT: bic v0.16b, v0.16b, v1.16b
; CHECK-SD-NEXT: ushr v17.2d, v6.2d, #4
; CHECK-SD-NEXT: orr v3.16b, v3.16b, v5.16b
; CHECK-SD-NEXT: bic v0.16b, v0.16b, v5.16b
; CHECK-SD-NEXT: orr v6.16b, v6.16b, v17.16b
; CHECK-SD-NEXT: bic v2.16b, v2.16b, v17.16b
; CHECK-SD-NEXT: ushr v16.2d, v3.2d, #4
; CHECK-SD-NEXT: ushr v4.2d, v6.2d, #8
; CHECK-SD-NEXT: orr v3.16b, v3.16b, v16.16b
; CHECK-SD-NEXT: bic v0.16b, v0.16b, v16.16b
; CHECK-SD-NEXT: orr v6.16b, v6.16b, v4.16b
; CHECK-SD-NEXT: bic v2.16b, v2.16b, v4.16b
; CHECK-SD-NEXT: ushr v1.2d, v3.2d, #8
; CHECK-SD-NEXT: orr v3.16b, v3.16b, v1.16b
; CHECK-SD-NEXT: bic v0.16b, v0.16b, v1.16b
; CHECK-SD-NEXT: ushr v5.2d, v3.2d, #16
; CHECK-SD-NEXT: orr v1.16b, v3.16b, v5.16b
; CHECK-SD-NEXT: ushr v3.2d, v6.2d, #16
; CHECK-SD-NEXT: bic v0.16b, v0.16b, v5.16b
; CHECK-SD-NEXT: ushr v1.2d, v1.2d, #32
; CHECK-SD-NEXT: orr v4.16b, v6.16b, v3.16b
; CHECK-SD-NEXT: bic v0.16b, v0.16b, v1.16b
; CHECK-SD-NEXT: bic v1.16b, v2.16b, v3.16b
; CHECK-SD-NEXT: ushr v2.2d, v4.2d, #32
; CHECK-SD-NEXT: cnt v0.16b, v0.16b
; CHECK-SD-NEXT: mvn v1.16b, v1.16b
; CHECK-SD-NEXT: bic v1.16b, v1.16b, v2.16b
; CHECK-SD-NEXT: cnt v1.16b, v1.16b
; CHECK-SD-NEXT: uaddlp v0.8h, v0.16b
; CHECK-SD-NEXT: uaddlp v0.4s, v0.8h
Expand Down Expand Up @@ -377,30 +392,40 @@ define <4 x i64> @v4i64(<4 x i64> %d) {
; CHECK-SD: // %bb.0: // %entry
; CHECK-SD-NEXT: ushr v2.2d, v0.2d, #1
; CHECK-SD-NEXT: ushr v3.2d, v1.2d, #1
; CHECK-SD-NEXT: orr v0.16b, v0.16b, v2.16b
; CHECK-SD-NEXT: orr v1.16b, v1.16b, v3.16b
; CHECK-SD-NEXT: ushr v2.2d, v0.2d, #2
; CHECK-SD-NEXT: ushr v3.2d, v1.2d, #2
; CHECK-SD-NEXT: orr v0.16b, v0.16b, v2.16b
; CHECK-SD-NEXT: orr v1.16b, v1.16b, v3.16b
; CHECK-SD-NEXT: ushr v2.2d, v0.2d, #4
; CHECK-SD-NEXT: ushr v3.2d, v1.2d, #4
; CHECK-SD-NEXT: orr v0.16b, v0.16b, v2.16b
; CHECK-SD-NEXT: orr v1.16b, v1.16b, v3.16b
; CHECK-SD-NEXT: ushr v2.2d, v0.2d, #8
; CHECK-SD-NEXT: ushr v3.2d, v1.2d, #8
; CHECK-SD-NEXT: orr v0.16b, v0.16b, v2.16b
; CHECK-SD-NEXT: orr v1.16b, v1.16b, v3.16b
; CHECK-SD-NEXT: ushr v2.2d, v0.2d, #16
; CHECK-SD-NEXT: ushr v3.2d, v1.2d, #16
; CHECK-SD-NEXT: orr v0.16b, v0.16b, v2.16b
; CHECK-SD-NEXT: orr v1.16b, v1.16b, v3.16b
; CHECK-SD-NEXT: ushr v2.2d, v0.2d, #32
; CHECK-SD-NEXT: ushr v3.2d, v1.2d, #32
; CHECK-SD-NEXT: orr v0.16b, v0.16b, v2.16b
; CHECK-SD-NEXT: orr v1.16b, v1.16b, v3.16b
; CHECK-SD-NEXT: orr v4.16b, v0.16b, v2.16b
; CHECK-SD-NEXT: orr v5.16b, v1.16b, v3.16b
; CHECK-SD-NEXT: mvn v0.16b, v0.16b
; CHECK-SD-NEXT: mvn v1.16b, v1.16b
; CHECK-SD-NEXT: ushr v6.2d, v4.2d, #2
; CHECK-SD-NEXT: ushr v7.2d, v5.2d, #2
; CHECK-SD-NEXT: bic v0.16b, v0.16b, v2.16b
; CHECK-SD-NEXT: bic v1.16b, v1.16b, v3.16b
; CHECK-SD-NEXT: orr v4.16b, v4.16b, v6.16b
; CHECK-SD-NEXT: orr v5.16b, v5.16b, v7.16b
; CHECK-SD-NEXT: bic v0.16b, v0.16b, v6.16b
; CHECK-SD-NEXT: bic v1.16b, v1.16b, v7.16b
; CHECK-SD-NEXT: ushr v16.2d, v4.2d, #4
; CHECK-SD-NEXT: ushr v17.2d, v5.2d, #4
; CHECK-SD-NEXT: orr v4.16b, v4.16b, v16.16b
; CHECK-SD-NEXT: orr v5.16b, v5.16b, v17.16b
; CHECK-SD-NEXT: bic v0.16b, v0.16b, v16.16b
; CHECK-SD-NEXT: bic v1.16b, v1.16b, v17.16b
; CHECK-SD-NEXT: ushr v2.2d, v4.2d, #8
; CHECK-SD-NEXT: ushr v3.2d, v5.2d, #8
; CHECK-SD-NEXT: orr v4.16b, v4.16b, v2.16b
; CHECK-SD-NEXT: orr v5.16b, v5.16b, v3.16b
; CHECK-SD-NEXT: bic v0.16b, v0.16b, v2.16b
; CHECK-SD-NEXT: bic v1.16b, v1.16b, v3.16b
; CHECK-SD-NEXT: ushr v6.2d, v4.2d, #16
; CHECK-SD-NEXT: ushr v7.2d, v5.2d, #16
; CHECK-SD-NEXT: orr v2.16b, v4.16b, v6.16b
; CHECK-SD-NEXT: orr v3.16b, v5.16b, v7.16b
; CHECK-SD-NEXT: bic v0.16b, v0.16b, v6.16b
; CHECK-SD-NEXT: bic v1.16b, v1.16b, v7.16b
; CHECK-SD-NEXT: ushr v2.2d, v2.2d, #32
; CHECK-SD-NEXT: ushr v3.2d, v3.2d, #32
; CHECK-SD-NEXT: bic v0.16b, v0.16b, v2.16b
; CHECK-SD-NEXT: bic v1.16b, v1.16b, v3.16b
; CHECK-SD-NEXT: cnt v0.16b, v0.16b
; CHECK-SD-NEXT: cnt v1.16b, v1.16b
; CHECK-SD-NEXT: uaddlp v0.8h, v0.16b
Expand Down
22 changes: 9 additions & 13 deletions llvm/test/CodeGen/AArch64/eon.ll
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
; NOTE: Assertions have been autogenerated by utils/update_llc_test_checks.py UTC_ARGS: --version 6
; RUN: llc -mtriple=aarch64-none-linux-gnu < %s | FileCheck %s
; RUN: llc %s -pass-remarks-missed=gisel* -mtriple=aarch64-none-linux-gnu -global-isel -o - 2>&1 | FileCheck %s

Expand All @@ -6,8 +7,9 @@
; Check that the eon instruction is generated instead of eor,movn
define i64 @test1(i64 %a, i64 %b, i64 %c) {
; CHECK-LABEL: test1:
; CHECK: eon
; CHECK: ret
; CHECK: // %bb.0: // %entry
; CHECK-NEXT: eon x0, x0, x1, lsl #4
; CHECK-NEXT: ret
entry:
%shl = shl i64 %b, 4
%neg = xor i64 %a, -1
Expand All @@ -18,10 +20,11 @@ entry:
; Same check with multiple uses of %neg
define i64 @test2(i64 %a, i64 %b, i64 %c) {
; CHECK-LABEL: test2:
; CHECK: eon
; CHECK: eon
; CHECK: lsl
; CHECK: ret
; CHECK: // %bb.0: // %entry
; CHECK-NEXT: eon x8, x0, x1, lsl #4
; CHECK-NEXT: eon x9, x2, x1, lsl #4
; CHECK-NEXT: lsl x0, x8, x9
; CHECK-NEXT: ret
entry:
%shl = shl i64 %b, 4
%neg = xor i64 %shl, -1
Expand All @@ -33,20 +36,13 @@ entry:

; Check that eon is generated if the xor is a disjoint or.
define i64 @disjoint_or(i64 %a, i64 %b) {
; CHECK-LABEL: disjoint_or:
; CHECK: eon
; CHECK: ret
%or = or disjoint i64 %a, %b
%eon = xor i64 %or, -1
ret i64 %eon
}

; Check that eon is *not* generated if the or is not disjoint.
define i64 @normal_or(i64 %a, i64 %b) {
; CHECK-LABEL: normal_or:
; CHECK: orr
; CHECK: mvn
; CHECK: ret
%or = or i64 %a, %b
%not = xor i64 %or, -1
ret i64 %not
Expand Down
1 change: 1 addition & 0 deletions llvm/test/CodeGen/PowerPC/eqv-andc-orc-nor.ll
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
; NOTE: Assertions have been autogenerated by utils/update_llc_test_checks.py UTC_ARGS: --version 6
; RUN: llc -verify-machineinstrs < %s -mtriple=ppc32-- | \
; RUN: grep eqv | count 3
; RUN: llc -verify-machineinstrs < %s -mtriple=ppc32-- -mcpu=g5 | \
Expand Down
20 changes: 15 additions & 5 deletions llvm/test/CodeGen/PowerPC/vec_veqv_vnand_vorc.ll
Original file line number Diff line number Diff line change
@@ -1,29 +1,39 @@
; NOTE: Assertions have been autogenerated by utils/update_llc_test_checks.py UTC_ARGS: --version 6
; Check the miscellaneous logical vector operations added in P8
;
;
; RUN: llc -verify-machineinstrs -mtriple=powerpc64-unknown-linux-gnu -mcpu=pwr8 -mattr=-vsx < %s | FileCheck %s
; Test x eqv y
define <4 x i32> @test_veqv(<4 x i32> %x, <4 x i32> %y) nounwind {
; CHECK-LABEL: test_veqv:
; CHECK: # %bb.0:
; CHECK-NEXT: veqv 2, 2, 3
; CHECK-NEXT: blr
%tmp = xor <4 x i32> %x, %y
%ret_val = xor <4 x i32> %tmp, < i32 -1, i32 -1, i32 -1, i32 -1>
ret <4 x i32> %ret_val
; CHECK: veqv 2, 2, 3
}

; Test x vnand y
define <4 x i32> @test_vnand(<4 x i32> %x, <4 x i32> %y) nounwind {
; CHECK-LABEL: test_vnand:
; CHECK: # %bb.0:
; CHECK-NEXT: vnand 2, 2, 3
; CHECK-NEXT: blr
%tmp = and <4 x i32> %x, %y
%ret_val = xor <4 x i32> %tmp, <i32 -1, i32 -1, i32 -1, i32 -1>
ret <4 x i32> %ret_val
; CHECK: vnand 2, 2, 3
}

; Test x vorc y and variants
define <4 x i32> @test_vorc(<4 x i32> %x, <4 x i32> %y) nounwind {
; CHECK-LABEL: test_vorc:
; CHECK: # %bb.0:
; CHECK-NEXT: vorc 3, 2, 3
; CHECK-NEXT: vorc 2, 2, 3
; CHECK-NEXT: blr
%tmp1 = xor <4 x i32> %y, <i32 -1, i32 -1, i32 -1, i32 -1>
%tmp2 = or <4 x i32> %x, %tmp1
; CHECK: vorc 3, 2, 3
%tmp3 = xor <4 x i32> %tmp2, <i32 -1, i32 -1, i32 -1, i32 -1>
%tmp4 = or <4 x i32> %tmp3, %x
; CHECK: vorc 2, 2, 3
ret <4 x i32> %tmp4
}
Loading
Loading