[llvm] 4c82f56 - [llvm][SVE] Remove redundant and when comparing against extending load

[David Truby via llvm-commits]

Author: David Truby
Date: 2022-07-19T17:08:32+01:00
New Revision: 4c82f56d8fb9266f46d11c293aa10f53153ecf69

URL: https://github.com/llvm/llvm-project/commit/4c82f56d8fb9266f46d11c293aa10f53153ecf69
DIFF: https://github.com/llvm/llvm-project/commit/4c82f56d8fb9266f46d11c293aa10f53153ecf69.diff

LOG: [llvm][SVE] Remove redundant and when comparing against extending load

When determining if an `and` should be merged into an extending load
the constant argument to the `and` is currently not checked if the
argument requires truncation. This prevents the combine happening when
the vector width is half the normal available vector width for SVE VLA
vectors.

Reviewed By: c-rhodes

Differential Revision: https://reviews.llvm.org/D129281

Added: 
    llvm/test/CodeGen/AArch64/sve-extload-icmp.ll

Modified: 
    llvm/lib/CodeGen/SelectionDAG/DAGCombiner.cpp

Removed: 
    


################################################################################
diff  --git a/llvm/lib/CodeGen/SelectionDAG/DAGCombiner.cpp b/llvm/lib/CodeGen/SelectionDAG/DAGCombiner.cpp
index 5d739b84d261..4883b4b44477 100644
--- a/llvm/lib/CodeGen/SelectionDAG/DAGCombiner.cpp
+++ b/llvm/lib/CodeGen/SelectionDAG/DAGCombiner.cpp
@@ -6252,7 +6252,8 @@ SDValue DAGCombiner::visitAND(SDNode *N) {
     // This can be a pure constant or a vector splat, in which case we treat the
     // vector as a scalar and use the splat value.
     APInt Constant = APInt::getZero(1);
-    if (const ConstantSDNode *C = isConstOrConstSplat(N1)) {
+    if (const ConstantSDNode *C = isConstOrConstSplat(
+            N1, /*AllowUndef=*/false, /*AllowTruncation=*/true)) {
       Constant = C->getAPIntValue();
     } else if (BuildVectorSDNode *Vector = dyn_cast<BuildVectorSDNode>(N1)) {
       APInt SplatValue, SplatUndef;

diff  --git a/llvm/test/CodeGen/AArch64/sve-extload-icmp.ll b/llvm/test/CodeGen/AArch64/sve-extload-icmp.ll
new file mode 100644
index 000000000000..ad3e0b58028a
--- /dev/null
+++ b/llvm/test/CodeGen/AArch64/sve-extload-icmp.ll
@@ -0,0 +1,99 @@
+; NOTE: Assertions have been autogenerated by utils/update_llc_test_checks.py
+; RUN: llc < %s | FileCheck %s
+
+target triple = "aarch64-unknown-linux-gnu"
+
+define <vscale x 8 x i8> @extload_icmp_nxv8i8(ptr %in) #0 {
+; CHECK-LABEL: extload_icmp_nxv8i8:
+; CHECK:       // %bb.0:
+; CHECK-NEXT:    ptrue p0.h
+; CHECK-NEXT:    ld1b { z0.h }, p0/z, [x0]
+; CHECK-NEXT:    cnot z0.h, p0/m, z0.h
+; CHECK-NEXT:    ret
+  %ld = load <vscale x 8 x i8>, ptr %in
+  %cmp = icmp eq <vscale x 8 x i8> %ld, zeroinitializer
+  %ex = zext <vscale x 8 x i1> %cmp to <vscale x 8 x i8>
+  ret <vscale x 8 x i8> %ex
+}
+
+define <vscale x 16 x i8> @extload_icmp_nxv16i8(ptr %in) #0 {
+; CHECK-LABEL: extload_icmp_nxv16i8:
+; CHECK:       // %bb.0:
+; CHECK-NEXT:    ptrue p0.b
+; CHECK-NEXT:    ld1b { z0.b }, p0/z, [x0]
+; CHECK-NEXT:    cnot z0.b, p0/m, z0.b
+; CHECK-NEXT:    ret
+  %ld = load <vscale x 16 x i8>, ptr %in
+  %cmp = icmp eq <vscale x 16 x i8> %ld, zeroinitializer
+  %ex = zext <vscale x 16 x i1> %cmp to <vscale x 16 x i8>
+  ret <vscale x 16 x i8> %ex
+}
+
+define <vscale x 4 x i16> @extload_icmp_nxv4i16(ptr %in) #0 {
+; CHECK-LABEL: extload_icmp_nxv4i16:
+; CHECK:       // %bb.0:
+; CHECK-NEXT:    ptrue p0.s
+; CHECK-NEXT:    ld1h { z0.s }, p0/z, [x0]
+; CHECK-NEXT:    cnot z0.s, p0/m, z0.s
+; CHECK-NEXT:    ret
+  %ld = load <vscale x 4 x i16>, ptr %in
+  %cmp = icmp eq <vscale x 4 x i16> %ld, zeroinitializer
+  %ex = zext <vscale x 4 x i1> %cmp to <vscale x 4 x i16>
+  ret <vscale x 4 x i16> %ex
+}
+
+define <vscale x 8 x i16> @extload_icmp_nxv8i16(ptr %in) #0 {
+; CHECK-LABEL: extload_icmp_nxv8i16:
+; CHECK:       // %bb.0:
+; CHECK-NEXT:    ptrue p0.h
+; CHECK-NEXT:    ld1h { z0.h }, p0/z, [x0]
+; CHECK-NEXT:    cnot z0.h, p0/m, z0.h
+; CHECK-NEXT:    ret
+  %ld = load <vscale x 8 x i16>, ptr %in
+  %cmp = icmp eq <vscale x 8 x i16> %ld, zeroinitializer
+  %ex = zext <vscale x 8 x i1> %cmp to <vscale x 8 x i16>
+  ret <vscale x 8 x i16> %ex
+}
+
+define <vscale x 2 x i32> @extload_icmp_nxv2i32(ptr %in) #0 {
+; CHECK-LABEL: extload_icmp_nxv2i32:
+; CHECK:       // %bb.0:
+; CHECK-NEXT:    ptrue p0.d
+; CHECK-NEXT:    ld1w { z0.d }, p0/z, [x0]
+; CHECK-NEXT:    cnot z0.d, p0/m, z0.d
+; CHECK-NEXT:    ret
+  %ld = load <vscale x 2 x i32>, ptr %in
+  %cmp = icmp eq <vscale x 2 x i32> %ld, zeroinitializer
+  %ex = zext <vscale x 2 x i1> %cmp to <vscale x 2 x i32>
+  ret <vscale x 2 x i32> %ex
+}
+
+define <vscale x 4 x i32> @extload_icmp_nxv4i32(ptr %in) #0 {
+; CHECK-LABEL: extload_icmp_nxv4i32:
+; CHECK:       // %bb.0:
+; CHECK-NEXT:    ptrue p0.s
+; CHECK-NEXT:    ld1w { z0.s }, p0/z, [x0]
+; CHECK-NEXT:    cnot z0.s, p0/m, z0.s
+; CHECK-NEXT:    ret
+  %ld = load <vscale x 4 x i32>, ptr %in
+  %cmp = icmp eq <vscale x 4 x i32> %ld, zeroinitializer
+  %ex = zext <vscale x 4 x i1> %cmp to <vscale x 4 x i32>
+  ret <vscale x 4 x i32> %ex
+}
+
+define <vscale x 2 x i64> @extload_icmp_nxv2i64(ptr %in) #0 {
+; CHECK-LABEL: extload_icmp_nxv2i64:
+; CHECK:       // %bb.0:
+; CHECK-NEXT:    ptrue p0.d
+; CHECK-NEXT:    ld1d { z0.d }, p0/z, [x0]
+; CHECK-NEXT:    cnot z0.d, p0/m, z0.d
+; CHECK-NEXT:    ret
+  %ld = load <vscale x 2 x i64>, ptr %in
+  %cmp = icmp eq <vscale x 2 x i64> %ld, zeroinitializer
+  %ex = zext <vscale x 2 x i1> %cmp to <vscale x 2 x i64>
+  ret <vscale x 2 x i64> %ex
+}
+
+
+
+attributes #0 = { "target-features"="+sve" }