From 3bb8dc49792a0caabfaa135c8431d7d748768737 Mon Sep 17 00:00:00 2001 From: Igor Breger Date: Mon, 21 Dec 2015 14:40:36 +0000 Subject: AVX512BW: Enable AND/OR/XOR vector byte/word paked operation by promoting to qword that natively suppored. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@256157 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/Target/X86/X86ISelLowering.cpp | 9 +- test/CodeGen/X86/avx512-logic.ll | 164 ++++++++++++++++++++++++++++++------- 2 files changed, 144 insertions(+), 29 deletions(-) diff --git a/lib/Target/X86/X86ISelLowering.cpp b/lib/Target/X86/X86ISelLowering.cpp index 04c22907b6a..c1d363d3db9 100644 --- a/lib/Target/X86/X86ISelLowering.cpp +++ b/lib/Target/X86/X86ISelLowering.cpp @@ -1689,6 +1689,13 @@ X86TargetLowering::X86TargetLowering(const X86TargetMachine &TM, for (auto VT : { MVT::v64i8, MVT::v32i16 }) { setOperationAction(ISD::BUILD_VECTOR, VT, Custom); setOperationAction(ISD::VSELECT, VT, Legal); + + setOperationAction(ISD::AND, VT, Promote); + AddPromotedToType (ISD::AND, VT, MVT::v8i64); + setOperationAction(ISD::OR, VT, Promote); + AddPromotedToType (ISD::OR, VT, MVT::v8i64); + setOperationAction(ISD::XOR, VT, Promote); + AddPromotedToType (ISD::XOR, VT, MVT::v8i64); } } @@ -13284,7 +13291,7 @@ SDValue X86TargetLowering::LowerTRUNCATE(SDValue Op, SelectionDAG &DAG) const { && InVT.getScalarSizeInBits() >= 32 && Subtarget->hasDQI() && Subtarget->hasVLX()) return Op; // legal, will go to VPMOVB2M, VPMOVQ2M - } + } if (VT.getVectorElementType() == MVT::i1) { assert(VT.getVectorElementType() == MVT::i1 && "Unexpected vector type"); diff --git a/test/CodeGen/X86/avx512-logic.ll b/test/CodeGen/X86/avx512-logic.ll index 140ce3b1ec5..c973b706e8f 100644 --- a/test/CodeGen/X86/avx512-logic.ll +++ b/test/CodeGen/X86/avx512-logic.ll @@ -1,9 +1,14 @@ -; RUN: llc < %s -mtriple=x86_64-apple-darwin -mcpu=knl | FileCheck %s +; NOTE: Assertions have been autogenerated by utils/update_llc_test_checks.py +; RUN: llc < %s -mtriple=x86_64-apple-darwin -mcpu=knl | FileCheck %s --check-prefix=ALL --check-prefix=KNL +; RUN: llc < %s -mtriple=x86_64-apple-darwin -mcpu=skx | FileCheck %s --check-prefix=ALL --check-prefix=SKX + -; CHECK-LABEL: vpandd -; CHECK: vpandd %zmm -; CHECK: ret define <16 x i32> @vpandd(<16 x i32> %a, <16 x i32> %b) nounwind uwtable readnone ssp { +; ALL-LABEL: vpandd: +; ALL: ## BB#0: ## %entry +; ALL-NEXT: vpaddd {{.*}}(%rip){1to16}, %zmm0, %zmm0 +; ALL-NEXT: vpandd %zmm1, %zmm0, %zmm0 +; ALL-NEXT: retq entry: ; Force the execution domain with an add. %a2 = add <16 x i32> %a, %x } -; CHECK-LABEL: vpord -; CHECK: vpord %zmm -; CHECK: ret define <16 x i32> @vpord(<16 x i32> %a, <16 x i32> %b) nounwind uwtable readnone ssp { +; ALL-LABEL: vpord: +; ALL: ## BB#0: ## %entry +; ALL-NEXT: vpaddd {{.*}}(%rip){1to16}, %zmm0, %zmm0 +; ALL-NEXT: vpord %zmm1, %zmm0, %zmm0 +; ALL-NEXT: retq entry: ; Force the execution domain with an add. %a2 = add <16 x i32> %a, %x } -; CHECK-LABEL: vpxord -; CHECK: vpxord %zmm -; CHECK: ret define <16 x i32> @vpxord(<16 x i32> %a, <16 x i32> %b) nounwind uwtable readnone ssp { +; ALL-LABEL: vpxord: +; ALL: ## BB#0: ## %entry +; ALL-NEXT: vpaddd {{.*}}(%rip){1to16}, %zmm0, %zmm0 +; ALL-NEXT: vpxord %zmm1, %zmm0, %zmm0 +; ALL-NEXT: retq entry: ; Force the execution domain with an add. %a2 = add <16 x i32> %a, %x } -; CHECK-LABEL: vpandq -; CHECK: vpandq %zmm -; CHECK: ret define <8 x i64> @vpandq(<8 x i64> %a, <8 x i64> %b) nounwind uwtable readnone ssp { +; ALL-LABEL: vpandq: +; ALL: ## BB#0: ## %entry +; ALL-NEXT: vpaddq {{.*}}(%rip){1to8}, %zmm0, %zmm0 +; ALL-NEXT: vpandq %zmm1, %zmm0, %zmm0 +; ALL-NEXT: retq entry: ; Force the execution domain with an add. %a2 = add <8 x i64> %a, @@ -47,10 +58,12 @@ entry: ret <8 x i64> %x } -; CHECK-LABEL: vporq -; CHECK: vporq %zmm -; CHECK: ret define <8 x i64> @vporq(<8 x i64> %a, <8 x i64> %b) nounwind uwtable readnone ssp { +; ALL-LABEL: vporq: +; ALL: ## BB#0: ## %entry +; ALL-NEXT: vpaddq {{.*}}(%rip){1to8}, %zmm0, %zmm0 +; ALL-NEXT: vporq %zmm1, %zmm0, %zmm0 +; ALL-NEXT: retq entry: ; Force the execution domain with an add. %a2 = add <8 x i64> %a, @@ -58,10 +71,12 @@ entry: ret <8 x i64> %x } -; CHECK-LABEL: vpxorq -; CHECK: vpxorq %zmm -; CHECK: ret define <8 x i64> @vpxorq(<8 x i64> %a, <8 x i64> %b) nounwind uwtable readnone ssp { +; ALL-LABEL: vpxorq: +; ALL: ## BB#0: ## %entry +; ALL-NEXT: vpaddq {{.*}}(%rip){1to8}, %zmm0, %zmm0 +; ALL-NEXT: vpxorq %zmm1, %zmm0, %zmm0 +; ALL-NEXT: retq entry: ; Force the execution domain with an add. %a2 = add <8 x i64> %a, @@ -70,28 +85,31 @@ entry: } -; CHECK-LABEL: orq_broadcast -; CHECK: vporq LCP{{.*}}(%rip){1to8}, %zmm0, %zmm0 -; CHECK: ret define <8 x i64> @orq_broadcast(<8 x i64> %a) nounwind { +; ALL-LABEL: orq_broadcast: +; ALL: ## BB#0: +; ALL-NEXT: vporq {{.*}}(%rip){1to8}, %zmm0, %zmm0 +; ALL-NEXT: retq %b = or <8 x i64> %a, ret <8 x i64> %b } -; CHECK-LABEL: andd512fold -; CHECK: vpandd (% -; CHECK: ret define <16 x i32> @andd512fold(<16 x i32> %y, <16 x i32>* %x) { +; ALL-LABEL: andd512fold: +; ALL: ## BB#0: ## %entry +; ALL-NEXT: vpandd (%rdi), %zmm0, %zmm0 +; ALL-NEXT: retq entry: %a = load <16 x i32>, <16 x i32>* %x, align 4 %b = and <16 x i32> %y, %a ret <16 x i32> %b } -; CHECK-LABEL: andqbrst -; CHECK: vpandq (%rdi){1to8}, %zmm -; CHECK: ret define <8 x i64> @andqbrst(<8 x i64> %p1, i64* %ap) { +; ALL-LABEL: andqbrst: +; ALL: ## BB#0: ## %entry +; ALL-NEXT: vpandq (%rdi){1to8}, %zmm0, %zmm0 +; ALL-NEXT: retq entry: %a = load i64, i64* %ap, align 8 %b = insertelement <8 x i64> undef, i64 %a, i32 0 @@ -99,3 +117,93 @@ entry: %d = and <8 x i64> %p1, %c ret <8 x i64>%d } + +define <64 x i8> @and_v64i8(<64 x i8> %a, <64 x i8> %b) { +; KNL-LABEL: and_v64i8: +; KNL: ## BB#0: +; KNL-NEXT: vandps %ymm2, %ymm0, %ymm0 +; KNL-NEXT: vandps %ymm3, %ymm1, %ymm1 +; KNL-NEXT: retq +; +; SKX-LABEL: and_v64i8: +; SKX: ## BB#0: +; SKX-NEXT: vpandq %zmm1, %zmm0, %zmm0 +; SKX-NEXT: retq + %res = and <64 x i8> %a, %b + ret <64 x i8> %res +} + +define <64 x i8> @or_v64i8(<64 x i8> %a, <64 x i8> %b) { +; KNL-LABEL: or_v64i8: +; KNL: ## BB#0: +; KNL-NEXT: vorps %ymm2, %ymm0, %ymm0 +; KNL-NEXT: vorps %ymm3, %ymm1, %ymm1 +; KNL-NEXT: retq +; +; SKX-LABEL: or_v64i8: +; SKX: ## BB#0: +; SKX-NEXT: vporq %zmm1, %zmm0, %zmm0 +; SKX-NEXT: retq + %res = or <64 x i8> %a, %b + ret <64 x i8> %res +} + +define <64 x i8> @xor_v64i8(<64 x i8> %a, <64 x i8> %b) { +; KNL-LABEL: xor_v64i8: +; KNL: ## BB#0: +; KNL-NEXT: vxorps %ymm2, %ymm0, %ymm0 +; KNL-NEXT: vxorps %ymm3, %ymm1, %ymm1 +; KNL-NEXT: retq +; +; SKX-LABEL: xor_v64i8: +; SKX: ## BB#0: +; SKX-NEXT: vpxorq %zmm1, %zmm0, %zmm0 +; SKX-NEXT: retq + %res = xor <64 x i8> %a, %b + ret <64 x i8> %res +} + +define <32 x i16> @and_v32i16(<32 x i16> %a, <32 x i16> %b) { +; KNL-LABEL: and_v32i16: +; KNL: ## BB#0: +; KNL-NEXT: vandps %ymm2, %ymm0, %ymm0 +; KNL-NEXT: vandps %ymm3, %ymm1, %ymm1 +; KNL-NEXT: retq +; +; SKX-LABEL: and_v32i16: +; SKX: ## BB#0: +; SKX-NEXT: vpandq %zmm1, %zmm0, %zmm0 +; SKX-NEXT: retq + %res = and <32 x i16> %a, %b + ret <32 x i16> %res +} + +define <32 x i16> @or_v32i16(<32 x i16> %a, <32 x i16> %b) { +; KNL-LABEL: or_v32i16: +; KNL: ## BB#0: +; KNL-NEXT: vorps %ymm2, %ymm0, %ymm0 +; KNL-NEXT: vorps %ymm3, %ymm1, %ymm1 +; KNL-NEXT: retq +; +; SKX-LABEL: or_v32i16: +; SKX: ## BB#0: +; SKX-NEXT: vporq %zmm1, %zmm0, %zmm0 +; SKX-NEXT: retq + %res = or <32 x i16> %a, %b + ret <32 x i16> %res +} + +define <32 x i16> @xor_v32i16(<32 x i16> %a, <32 x i16> %b) { +; KNL-LABEL: xor_v32i16: +; KNL: ## BB#0: +; KNL-NEXT: vxorps %ymm2, %ymm0, %ymm0 +; KNL-NEXT: vxorps %ymm3, %ymm1, %ymm1 +; KNL-NEXT: retq +; +; SKX-LABEL: xor_v32i16: +; SKX: ## BB#0: +; SKX-NEXT: vpxorq %zmm1, %zmm0, %zmm0 +; SKX-NEXT: retq + %res = xor <32 x i16> %a, %b + ret <32 x i16> %res +} -- cgit v1.2.3