diff --git a/llvm/lib/Target/AArch64/AArch64ISelLowering.cpp b/llvm/lib/Target/AArch64/AArch64ISelLowering.cpp index 7ab3fc06715ec..75f0bae84db67 100644 --- a/llvm/lib/Target/AArch64/AArch64ISelLowering.cpp +++ b/llvm/lib/Target/AArch64/AArch64ISelLowering.cpp @@ -21814,7 +21814,7 @@ SDValue tryLowerPartialReductionToWideAdd(SDNode *N, Intrinsic::experimental_vector_partial_reduce_add && "Expected a partial reduction node"); - if (!Subtarget->isSVEorStreamingSVEAvailable()) + if (!Subtarget->hasSVE2() && !Subtarget->isStreamingSVEAvailable()) return SDValue(); SDLoc DL(N); diff --git a/llvm/test/CodeGen/AArch64/sve-partial-reduce-wide-add.ll b/llvm/test/CodeGen/AArch64/sve-partial-reduce-wide-add.ll index 1d05649964670..b4b946c68566e 100644 --- a/llvm/test/CodeGen/AArch64/sve-partial-reduce-wide-add.ll +++ b/llvm/test/CodeGen/AArch64/sve-partial-reduce-wide-add.ll @@ -1,12 +1,21 @@ ; NOTE: Assertions have been autogenerated by utils/update_llc_test_checks.py UTC_ARGS: --version 5 -; RUN: llc -mtriple=aarch64 -mattr=+sve2 %s -o - | FileCheck %s +; RUN: llc -mtriple=aarch64 -mattr=+sve2 %s -o - | FileCheck %s --check-prefixes=CHECK,CHECK-SVE2 +; RUN: llc -mtriple=aarch64 -mattr=+sve %s -o - | FileCheck %s --check-prefixes=CHECK,CHECK-SVE define @signed_wide_add_nxv4i32( %acc, %input){ -; CHECK-LABEL: signed_wide_add_nxv4i32: -; CHECK: // %bb.0: // %entry -; CHECK-NEXT: saddwb z0.d, z0.d, z1.s -; CHECK-NEXT: saddwt z0.d, z0.d, z1.s -; CHECK-NEXT: ret +; CHECK-SVE2-LABEL: signed_wide_add_nxv4i32: +; CHECK-SVE2: // %bb.0: // %entry +; CHECK-SVE2-NEXT: saddwb z0.d, z0.d, z1.s +; CHECK-SVE2-NEXT: saddwt z0.d, z0.d, z1.s +; CHECK-SVE2-NEXT: ret +; +; CHECK-SVE-LABEL: signed_wide_add_nxv4i32: +; CHECK-SVE: // %bb.0: // %entry +; CHECK-SVE-NEXT: sunpklo z2.d, z1.s +; CHECK-SVE-NEXT: sunpkhi z1.d, z1.s +; CHECK-SVE-NEXT: add z0.d, z0.d, z2.d +; CHECK-SVE-NEXT: add z0.d, z1.d, z0.d +; CHECK-SVE-NEXT: ret entry: %input.wide = sext %input to %partial.reduce = tail call @llvm.experimental.vector.partial.reduce.add.nxv2i64.nxv4i64( %acc, %input.wide) @@ -14,11 +23,19 @@ entry: } define @unsigned_wide_add_nxv4i32( %acc, %input){ -; CHECK-LABEL: unsigned_wide_add_nxv4i32: -; CHECK: // %bb.0: // %entry -; CHECK-NEXT: uaddwb z0.d, z0.d, z1.s -; CHECK-NEXT: uaddwt z0.d, z0.d, z1.s -; CHECK-NEXT: ret +; CHECK-SVE2-LABEL: unsigned_wide_add_nxv4i32: +; CHECK-SVE2: // %bb.0: // %entry +; CHECK-SVE2-NEXT: uaddwb z0.d, z0.d, z1.s +; CHECK-SVE2-NEXT: uaddwt z0.d, z0.d, z1.s +; CHECK-SVE2-NEXT: ret +; +; CHECK-SVE-LABEL: unsigned_wide_add_nxv4i32: +; CHECK-SVE: // %bb.0: // %entry +; CHECK-SVE-NEXT: uunpklo z2.d, z1.s +; CHECK-SVE-NEXT: uunpkhi z1.d, z1.s +; CHECK-SVE-NEXT: add z0.d, z0.d, z2.d +; CHECK-SVE-NEXT: add z0.d, z1.d, z0.d +; CHECK-SVE-NEXT: ret entry: %input.wide = zext %input to %partial.reduce = tail call @llvm.experimental.vector.partial.reduce.add.nxv2i64.nxv4i64( %acc, %input.wide) @@ -26,11 +43,19 @@ entry: } define @signed_wide_add_nxv8i16( %acc, %input){ -; CHECK-LABEL: signed_wide_add_nxv8i16: -; CHECK: // %bb.0: // %entry -; CHECK-NEXT: saddwb z0.s, z0.s, z1.h -; CHECK-NEXT: saddwt z0.s, z0.s, z1.h -; CHECK-NEXT: ret +; CHECK-SVE2-LABEL: signed_wide_add_nxv8i16: +; CHECK-SVE2: // %bb.0: // %entry +; CHECK-SVE2-NEXT: saddwb z0.s, z0.s, z1.h +; CHECK-SVE2-NEXT: saddwt z0.s, z0.s, z1.h +; CHECK-SVE2-NEXT: ret +; +; CHECK-SVE-LABEL: signed_wide_add_nxv8i16: +; CHECK-SVE: // %bb.0: // %entry +; CHECK-SVE-NEXT: sunpklo z2.s, z1.h +; CHECK-SVE-NEXT: sunpkhi z1.s, z1.h +; CHECK-SVE-NEXT: add z0.s, z0.s, z2.s +; CHECK-SVE-NEXT: add z0.s, z1.s, z0.s +; CHECK-SVE-NEXT: ret entry: %input.wide = sext %input to %partial.reduce = tail call @llvm.experimental.vector.partial.reduce.add.nxv4i32.nxv8i32( %acc, %input.wide) @@ -38,11 +63,19 @@ entry: } define @unsigned_wide_add_nxv8i16( %acc, %input){ -; CHECK-LABEL: unsigned_wide_add_nxv8i16: -; CHECK: // %bb.0: // %entry -; CHECK-NEXT: uaddwb z0.s, z0.s, z1.h -; CHECK-NEXT: uaddwt z0.s, z0.s, z1.h -; CHECK-NEXT: ret +; CHECK-SVE2-LABEL: unsigned_wide_add_nxv8i16: +; CHECK-SVE2: // %bb.0: // %entry +; CHECK-SVE2-NEXT: uaddwb z0.s, z0.s, z1.h +; CHECK-SVE2-NEXT: uaddwt z0.s, z0.s, z1.h +; CHECK-SVE2-NEXT: ret +; +; CHECK-SVE-LABEL: unsigned_wide_add_nxv8i16: +; CHECK-SVE: // %bb.0: // %entry +; CHECK-SVE-NEXT: uunpklo z2.s, z1.h +; CHECK-SVE-NEXT: uunpkhi z1.s, z1.h +; CHECK-SVE-NEXT: add z0.s, z0.s, z2.s +; CHECK-SVE-NEXT: add z0.s, z1.s, z0.s +; CHECK-SVE-NEXT: ret entry: %input.wide = zext %input to %partial.reduce = tail call @llvm.experimental.vector.partial.reduce.add.nxv4i32.nxv8i32( %acc, %input.wide) @@ -50,11 +83,19 @@ entry: } define @signed_wide_add_nxv16i8( %acc, %input){ -; CHECK-LABEL: signed_wide_add_nxv16i8: -; CHECK: // %bb.0: // %entry -; CHECK-NEXT: saddwb z0.h, z0.h, z1.b -; CHECK-NEXT: saddwt z0.h, z0.h, z1.b -; CHECK-NEXT: ret +; CHECK-SVE2-LABEL: signed_wide_add_nxv16i8: +; CHECK-SVE2: // %bb.0: // %entry +; CHECK-SVE2-NEXT: saddwb z0.h, z0.h, z1.b +; CHECK-SVE2-NEXT: saddwt z0.h, z0.h, z1.b +; CHECK-SVE2-NEXT: ret +; +; CHECK-SVE-LABEL: signed_wide_add_nxv16i8: +; CHECK-SVE: // %bb.0: // %entry +; CHECK-SVE-NEXT: sunpklo z2.h, z1.b +; CHECK-SVE-NEXT: sunpkhi z1.h, z1.b +; CHECK-SVE-NEXT: add z0.h, z0.h, z2.h +; CHECK-SVE-NEXT: add z0.h, z1.h, z0.h +; CHECK-SVE-NEXT: ret entry: %input.wide = sext %input to %partial.reduce = tail call @llvm.experimental.vector.partial.reduce.add.nxv8i16.nxv16i16( %acc, %input.wide) @@ -62,11 +103,19 @@ entry: } define @unsigned_wide_add_nxv16i8( %acc, %input){ -; CHECK-LABEL: unsigned_wide_add_nxv16i8: -; CHECK: // %bb.0: // %entry -; CHECK-NEXT: uaddwb z0.h, z0.h, z1.b -; CHECK-NEXT: uaddwt z0.h, z0.h, z1.b -; CHECK-NEXT: ret +; CHECK-SVE2-LABEL: unsigned_wide_add_nxv16i8: +; CHECK-SVE2: // %bb.0: // %entry +; CHECK-SVE2-NEXT: uaddwb z0.h, z0.h, z1.b +; CHECK-SVE2-NEXT: uaddwt z0.h, z0.h, z1.b +; CHECK-SVE2-NEXT: ret +; +; CHECK-SVE-LABEL: unsigned_wide_add_nxv16i8: +; CHECK-SVE: // %bb.0: // %entry +; CHECK-SVE-NEXT: uunpklo z2.h, z1.b +; CHECK-SVE-NEXT: uunpkhi z1.h, z1.b +; CHECK-SVE-NEXT: add z0.h, z0.h, z2.h +; CHECK-SVE-NEXT: add z0.h, z1.h, z0.h +; CHECK-SVE-NEXT: ret entry: %input.wide = zext %input to %partial.reduce = tail call @llvm.experimental.vector.partial.reduce.add.nxv8i16.nxv16i16( %acc, %input.wide)