From: Simon Pilgrim Date: Mon, 8 Jun 2015 16:19:00 +0000 (+0000) Subject: [DAGCombiner] Added CTLZ vector constant folding support. X-Git-Url: http://plrg.eecs.uci.edu/git/?a=commitdiff_plain;h=298222a9303317b2d44c28ec233ce12a450284af;p=oota-llvm.git [DAGCombiner] Added CTLZ vector constant folding support. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@239305 91177308-0d34-0410-b5e6-96231b3b80d8 --- diff --git a/lib/CodeGen/SelectionDAG/DAGCombiner.cpp b/lib/CodeGen/SelectionDAG/DAGCombiner.cpp index 4b9167723f4..a71c6761c75 100644 --- a/lib/CodeGen/SelectionDAG/DAGCombiner.cpp +++ b/lib/CodeGen/SelectionDAG/DAGCombiner.cpp @@ -4769,7 +4769,7 @@ SDValue DAGCombiner::visitCTLZ(SDNode *N) { EVT VT = N->getValueType(0); // fold (ctlz c1) -> c2 - if (isa(N0)) + if (isConstantIntBuildVectorOrConstantInt(N0)) return DAG.getNode(ISD::CTLZ, SDLoc(N), VT, N0); return SDValue(); } @@ -4779,7 +4779,7 @@ SDValue DAGCombiner::visitCTLZ_ZERO_UNDEF(SDNode *N) { EVT VT = N->getValueType(0); // fold (ctlz_zero_undef c1) -> c2 - if (isa(N0)) + if (isConstantIntBuildVectorOrConstantInt(N0)) return DAG.getNode(ISD::CTLZ_ZERO_UNDEF, SDLoc(N), VT, N0); return SDValue(); } diff --git a/lib/CodeGen/SelectionDAG/SelectionDAG.cpp b/lib/CodeGen/SelectionDAG/SelectionDAG.cpp index 92b6a0029b4..804c0805c34 100644 --- a/lib/CodeGen/SelectionDAG/SelectionDAG.cpp +++ b/lib/CodeGen/SelectionDAG/SelectionDAG.cpp @@ -2911,6 +2911,8 @@ SDValue SelectionDAG::getNode(unsigned Opcode, SDLoc DL, case ISD::TRUNCATE: case ISD::UINT_TO_FP: case ISD::SINT_TO_FP: + case ISD::CTLZ: + case ISD::CTLZ_ZERO_UNDEF: case ISD::CTTZ: case ISD::CTTZ_ZERO_UNDEF: case ISD::CTPOP: { diff --git a/test/CodeGen/X86/vector-lzcnt-128.ll b/test/CodeGen/X86/vector-lzcnt-128.ll new file mode 100644 index 00000000000..c0d8c53552c --- /dev/null +++ b/test/CodeGen/X86/vector-lzcnt-128.ll @@ -0,0 +1,129 @@ +; RUN: llc < %s -mtriple=x86_64-unknown-unknown -mcpu=x86-64 | FileCheck %s --check-prefix=ALL --check-prefix=SSE --check-prefix=SSE2 +; RUN: llc < %s -mtriple=x86_64-unknown-unknown -mcpu=x86-64 -mattr=+sse3 | FileCheck %s --check-prefix=ALL --check-prefix=SSE --check-prefix=SSE3 +; RUN: llc < %s -mtriple=x86_64-unknown-unknown -mcpu=x86-64 -mattr=+ssse3 | FileCheck %s --check-prefix=ALL --check-prefix=SSE --check-prefix=SSSE3 +; RUN: llc < %s -mtriple=x86_64-unknown-unknown -mcpu=x86-64 -mattr=+sse4.1 | FileCheck %s --check-prefix=ALL --check-prefix=SSE --check-prefix=SSE41 +; RUN: llc < %s -mtriple=x86_64-unknown-unknown -mcpu=x86-64 -mattr=+avx | FileCheck %s --check-prefix=ALL --check-prefix=AVX --check-prefix=AVX1 +; RUN: llc < %s -mtriple=x86_64-unknown-unknown -mcpu=x86-64 -mattr=+avx2 | FileCheck %s --check-prefix=ALL --check-prefix=AVX --check-prefix=AVX2 + +target triple = "x86_64-unknown-unknown" + +define <2 x i64> @foldv2i64() { +; SSE-LABEL: foldv2i64: +; SSE: # BB#0: +; SSE-NEXT: movl $55, %eax +; SSE-NEXT: movd %rax, %xmm0 +; SSE-NEXT: retq +; +; AVX-LABEL: foldv2i64: +; AVX: # BB#0: +; AVX-NEXT: movl $55, %eax +; AVX-NEXT: vmovq %rax, %xmm0 +; AVX-NEXT: retq + %out = call <2 x i64> @llvm.ctlz.v2i64(<2 x i64> , i1 0) + ret <2 x i64> %out +} + +define <2 x i64> @foldv2i64u() { +; SSE-LABEL: foldv2i64u: +; SSE: # BB#0: +; SSE-NEXT: movl $55, %eax +; SSE-NEXT: movd %rax, %xmm0 +; SSE-NEXT: retq +; +; AVX-LABEL: foldv2i64u: +; AVX: # BB#0: +; AVX-NEXT: movl $55, %eax +; AVX-NEXT: vmovq %rax, %xmm0 +; AVX-NEXT: retq + %out = call <2 x i64> @llvm.ctlz.v2i64(<2 x i64> , i1 -1) + ret <2 x i64> %out +} + +define <4 x i32> @foldv4i32() { +; SSE-LABEL: foldv4i32: +; SSE: # BB#0: +; SSE-NEXT: movaps {{.*#+}} xmm0 = [23,0,32,24] +; SSE-NEXT: retq +; +; AVX-LABEL: foldv4i32: +; AVX: # BB#0: +; AVX-NEXT: vmovaps {{.*#+}} xmm0 = [23,0,32,24] +; AVX-NEXT: retq + %out = call <4 x i32> @llvm.ctlz.v4i32(<4 x i32> , i1 0) + ret <4 x i32> %out +} + +define <4 x i32> @foldv4i32u() { +; SSE-LABEL: foldv4i32u: +; SSE: # BB#0: +; SSE-NEXT: movaps {{.*#+}} xmm0 = [23,0,32,24] +; SSE-NEXT: retq +; +; AVX-LABEL: foldv4i32u: +; AVX: # BB#0: +; AVX-NEXT: vmovaps {{.*#+}} xmm0 = [23,0,32,24] +; AVX-NEXT: retq + %out = call <4 x i32> @llvm.ctlz.v4i32(<4 x i32> , i1 -1) + ret <4 x i32> %out +} + +define <8 x i16> @foldv8i16() { +; SSE-LABEL: foldv8i16: +; SSE: # BB#0: +; SSE-NEXT: movaps {{.*#+}} xmm0 = [7,0,16,8,16,13,11,9] +; SSE-NEXT: retq +; +; AVX-LABEL: foldv8i16: +; AVX: # BB#0: +; AVX-NEXT: vmovaps {{.*#+}} xmm0 = [7,0,16,8,16,13,11,9] +; AVX-NEXT: retq + %out = call <8 x i16> @llvm.ctlz.v8i16(<8 x i16> , i1 0) + ret <8 x i16> %out +} + +define <8 x i16> @foldv8i16u() { +; SSE-LABEL: foldv8i16u: +; SSE: # BB#0: +; SSE-NEXT: movaps {{.*#+}} xmm0 = [7,0,16,8,16,13,11,9] +; SSE-NEXT: retq +; +; AVX-LABEL: foldv8i16u: +; AVX: # BB#0: +; AVX-NEXT: vmovaps {{.*#+}} xmm0 = [7,0,16,8,16,13,11,9] +; AVX-NEXT: retq + %out = call <8 x i16> @llvm.ctlz.v8i16(<8 x i16> , i1 -1) + ret <8 x i16> %out +} + +define <16 x i8> @foldv16i8() { +; SSE-LABEL: foldv16i8: +; SSE: # BB#0: +; SSE-NEXT: movaps {{.*#+}} xmm0 = [8,0,8,0,8,5,3,1,0,0,7,6,5,4,3,2] +; SSE-NEXT: retq +; +; AVX-LABEL: foldv16i8: +; AVX: # BB#0: +; AVX-NEXT: vmovaps {{.*#+}} xmm0 = [8,0,8,0,8,5,3,1,0,0,7,6,5,4,3,2] +; AVX-NEXT: retq + %out = call <16 x i8> @llvm.ctlz.v16i8(<16 x i8> , i1 0) + ret <16 x i8> %out +} + +define <16 x i8> @foldv16i8u() { +; SSE-LABEL: foldv16i8u: +; SSE: # BB#0: +; SSE-NEXT: movaps {{.*#+}} xmm0 = [8,0,8,0,8,5,3,1,0,0,7,6,5,4,3,2] +; SSE-NEXT: retq +; +; AVX-LABEL: foldv16i8u: +; AVX: # BB#0: +; AVX-NEXT: vmovaps {{.*#+}} xmm0 = [8,0,8,0,8,5,3,1,0,0,7,6,5,4,3,2] +; AVX-NEXT: retq + %out = call <16 x i8> @llvm.ctlz.v16i8(<16 x i8> , i1 -1) + ret <16 x i8> %out +} + +declare <2 x i64> @llvm.ctlz.v2i64(<2 x i64>, i1) +declare <4 x i32> @llvm.ctlz.v4i32(<4 x i32>, i1) +declare <8 x i16> @llvm.ctlz.v8i16(<8 x i16>, i1) +declare <16 x i8> @llvm.ctlz.v16i8(<16 x i8>, i1) diff --git a/test/CodeGen/X86/vector-lzcnt-256.ll b/test/CodeGen/X86/vector-lzcnt-256.ll new file mode 100644 index 00000000000..b7162892d9d --- /dev/null +++ b/test/CodeGen/X86/vector-lzcnt-256.ll @@ -0,0 +1,81 @@ +; RUN: llc < %s -mcpu=x86-64 -mattr=+avx | FileCheck %s --check-prefix=ALL --check-prefix=AVX --check-prefix=AVX1 +; RUN: llc < %s -mcpu=x86-64 -mattr=+avx2 | FileCheck %s --check-prefix=ALL --check-prefix=AVX --check-prefix=AVX2 + +target triple = "x86_64-unknown-unknown" + +define <4 x i64> @foldv4i64() { +; AVX-LABEL: foldv4i64: +; AVX: # BB#0: +; AVX-NEXT: vmovaps {{.*#+}} ymm0 = [55,0,64,56] +; AVX-NEXT: retq + %out = call <4 x i64> @llvm.ctlz.v4i64(<4 x i64> , i1 0) + ret <4 x i64> %out +} + +define <4 x i64> @foldv4i64u() { +; AVX-LABEL: foldv4i64u: +; AVX: # BB#0: +; AVX-NEXT: vmovaps {{.*#+}} ymm0 = [55,0,64,56] +; AVX-NEXT: retq + %out = call <4 x i64> @llvm.ctlz.v4i64(<4 x i64> , i1 -1) + ret <4 x i64> %out +} + +define <8 x i32> @foldv8i32() { +; AVX-LABEL: foldv8i32: +; AVX: # BB#0: +; AVX-NEXT: vmovaps {{.*#+}} ymm0 = [23,0,32,24,0,29,27,25] +; AVX-NEXT: retq + %out = call <8 x i32> @llvm.ctlz.v8i32(<8 x i32> , i1 0) + ret <8 x i32> %out +} + +define <8 x i32> @foldv8i32u() { +; AVX-LABEL: foldv8i32u: +; AVX: # BB#0: +; AVX-NEXT: vmovaps {{.*#+}} ymm0 = [23,0,32,24,0,29,27,25] +; AVX-NEXT: retq + %out = call <8 x i32> @llvm.ctlz.v8i32(<8 x i32> , i1 -1) + ret <8 x i32> %out +} + +define <16 x i16> @foldv16i16() { +; AVX-LABEL: foldv16i16: +; AVX: # BB#0: +; AVX-NEXT: vmovaps {{.*#+}} ymm0 = [7,0,16,8,16,13,11,9,0,8,15,14,13,12,11,10] +; AVX-NEXT: retq + %out = call <16 x i16> @llvm.ctlz.v16i16(<16 x i16> , i1 0) + ret <16 x i16> %out +} + +define <16 x i16> @foldv16i16u() { +; AVX-LABEL: foldv16i16u: +; AVX: # BB#0: +; AVX-NEXT: vmovaps {{.*#+}} ymm0 = [7,0,16,8,16,13,11,9,0,8,15,14,13,12,11,10] +; AVX-NEXT: retq + %out = call <16 x i16> @llvm.ctlz.v16i16(<16 x i16> , i1 -1) + ret <16 x i16> %out +} + +define <32 x i8> @foldv32i8() { +; AVX-LABEL: foldv32i8: +; AVX: # BB#0: +; AVX-NEXT: vmovaps {{.*#+}} ymm0 = [8,0,8,0,8,5,3,1,0,0,7,6,5,4,3,2,1,0,8,8,0,0,0,0,0,0,0,0,6,5,5,1] +; AVX-NEXT: retq + %out = call <32 x i8> @llvm.ctlz.v32i8(<32 x i8> , i1 0) + ret <32 x i8> %out +} + +define <32 x i8> @foldv32i8u() { +; AVX-LABEL: foldv32i8u: +; AVX: # BB#0: +; AVX-NEXT: vmovaps {{.*#+}} ymm0 = [8,0,8,0,8,5,3,1,0,0,7,6,5,4,3,2,1,0,8,8,0,0,0,0,0,0,0,0,6,5,5,1] +; AVX-NEXT: retq + %out = call <32 x i8> @llvm.ctlz.v32i8(<32 x i8> , i1 -1) + ret <32 x i8> %out +} + +declare <4 x i64> @llvm.ctlz.v4i64(<4 x i64>, i1) +declare <8 x i32> @llvm.ctlz.v8i32(<8 x i32>, i1) +declare <16 x i16> @llvm.ctlz.v16i16(<16 x i16>, i1) +declare <32 x i8> @llvm.ctlz.v32i8(<32 x i8>, i1)