Index: llvm/trunk/lib/Transforms/InstCombine/InstCombineCalls.cpp =================================================================== --- llvm/trunk/lib/Transforms/InstCombine/InstCombineCalls.cpp +++ llvm/trunk/lib/Transforms/InstCombine/InstCombineCalls.cpp @@ -1387,6 +1387,46 @@ return maxnum(Src0, Src1); } +/// Convert a table lookup to shufflevector if the mask is constant. +/// This could benefit tbl1 if the mask is { 7,6,5,4,3,2,1,0 }, in +/// which case we could lower the shufflevector with rev64 instructions +/// as it's actually a byte reverse. +static Value *simplifyNeonTbl1(const IntrinsicInst &II, + InstCombiner::BuilderTy &Builder) { + // Bail out if the mask is not a constant. + auto *C = dyn_cast(II.getArgOperand(1)); + if (!C) + return nullptr; + + auto *VecTy = cast(II.getType()); + unsigned NumElts = VecTy->getNumElements(); + + // Only perform this transformation for <8 x i8> vector types. + if (!VecTy->getElementType()->isIntegerTy(8) || NumElts != 8) + return nullptr; + + uint32_t Indexes[8]; + + for (unsigned I = 0; I < NumElts; ++I) { + Constant *COp = C->getAggregateElement(I); + + if (!COp || !isa(COp)) + return nullptr; + + Indexes[I] = cast(COp)->getLimitedValue(); + + // Make sure the mask indices are in range. + if (Indexes[I] >= NumElts) + return nullptr; + } + + auto *ShuffleMask = ConstantDataVector::get(II.getContext(), + makeArrayRef(Indexes)); + auto *V1 = II.getArgOperand(0); + auto *V2 = Constant::getNullValue(V1->getType()); + return Builder.CreateShuffleVector(V1, V2, ShuffleMask); +} + // Returns true iff the 2 intrinsics have the same operands, limiting the // comparison to the first NumOperands. static bool haveSameOperands(const IntrinsicInst &I, const IntrinsicInst &E, @@ -2928,6 +2968,12 @@ break; } + case Intrinsic::arm_neon_vtbl1: + case Intrinsic::aarch64_neon_tbl1: + if (Value *V = simplifyNeonTbl1(*II, Builder)) + return replaceInstUsesWith(*II, V); + break; + case Intrinsic::arm_neon_vmulls: case Intrinsic::arm_neon_vmullu: case Intrinsic::aarch64_neon_smull: Index: llvm/trunk/test/Transforms/InstCombine/AArch64/tbl1.ll =================================================================== --- llvm/trunk/test/Transforms/InstCombine/AArch64/tbl1.ll +++ llvm/trunk/test/Transforms/InstCombine/AArch64/tbl1.ll @@ -0,0 +1,65 @@ +; NOTE: Assertions have been autogenerated by utils/update_test_checks.py +; RUN: opt < %s -instcombine -S | FileCheck %s + +target datalayout = "e-m:e-i8:8:32-i16:16:32-i64:64-i128:128-n32:64-S128" +target triple = "aarch64-arm-none-eabi" + +; Turning a table lookup intrinsic into a shuffle vector instruction +; can be beneficial. If the mask used for the lookup is the constant +; vector {7,6,5,4,3,2,1,0}, then the back-end generates rev64 +; instructions instead. + +define <8 x i8> @tbl1_8x8(<16 x i8> %vec) { +; CHECK-LABEL: @tbl1_8x8( +; CHECK-NEXT: entry: +; CHECK-NEXT: [[TMP0:%.*]] = shufflevector <16 x i8> [[VEC:%.*]], <16 x i8> undef, <8 x i32> +; CHECK-NEXT: ret <8 x i8> [[TMP0]] +; +entry: + %tbl1 = call <8 x i8> @llvm.aarch64.neon.tbl1.v8i8(<16 x i8> %vec, <8 x i8> ) + ret <8 x i8> %tbl1 +} + +; Bail the optimization if a mask index is out of range. +define <8 x i8> @tbl1_8x8_out_of_range(<16 x i8> %vec) { +; CHECK-LABEL: @tbl1_8x8_out_of_range( +; CHECK-NEXT: entry: +; CHECK-NEXT: [[TBL1:%.*]] = call <8 x i8> @llvm.aarch64.neon.tbl1.v8i8(<16 x i8> [[VEC:%.*]], <8 x i8> ) +; CHECK-NEXT: ret <8 x i8> [[TBL1]] +; +entry: + %tbl1 = call <8 x i8> @llvm.aarch64.neon.tbl1.v8i8(<16 x i8> %vec, <8 x i8> ) + ret <8 x i8> %tbl1 +} + +; Bail the optimization if the size of the return vector is not 8 elements. +define <16 x i8> @tbl1_16x8(<16 x i8> %vec) { +; CHECK-LABEL: @tbl1_16x8( +; CHECK-NEXT: entry: +; CHECK-NEXT: [[TBL1:%.*]] = call <16 x i8> @llvm.aarch64.neon.tbl1.v16i8(<16 x i8> [[VEC:%.*]], <16 x i8> ) +; CHECK-NEXT: ret <16 x i8> [[TBL1]] +; +entry: + %tbl1 = call <16 x i8> @llvm.aarch64.neon.tbl1.v16i8(<16 x i8> %vec, <16 x i8> ) + ret <16 x i8> %tbl1 +} + +; Bail the optimization if the elements of the return vector are not of type i8. +define <8 x i16> @tbl1_8x16(<16 x i8> %vec) { +; CHECK-LABEL: @tbl1_8x16( +; CHECK-NEXT: entry: +; CHECK-NEXT: [[TBL1:%.*]] = call <8 x i16> @llvm.aarch64.neon.tbl1.v8i16(<16 x i8> [[VEC:%.*]], <8 x i16> ) +; CHECK-NEXT: ret <8 x i16> [[TBL1]] +; +entry: + %tbl1 = call <8 x i16> @llvm.aarch64.neon.tbl1.v8i16(<16 x i8> %vec, <8 x i16> ) + ret <8 x i16> %tbl1 +} + +; The type <8 x i16> is not a valid return type for this intrinsic, +; but we want to test that the optimization won't trigger for vector +; elements of type different than i8. +declare <8 x i16> @llvm.aarch64.neon.tbl1.v8i16(<16 x i8>, <8 x i16>) + +declare <8 x i8> @llvm.aarch64.neon.tbl1.v8i8(<16 x i8>, <8 x i8>) +declare <16 x i8> @llvm.aarch64.neon.tbl1.v16i8(<16 x i8>, <16 x i8>) Index: llvm/trunk/test/Transforms/InstCombine/ARM/tbl1.ll =================================================================== --- llvm/trunk/test/Transforms/InstCombine/ARM/tbl1.ll +++ llvm/trunk/test/Transforms/InstCombine/ARM/tbl1.ll @@ -0,0 +1,35 @@ +; NOTE: Assertions have been autogenerated by utils/update_test_checks.py +; RUN: opt < %s -instcombine -S | FileCheck %s + +target datalayout = "e-m:e-p:32:32-i64:64-v128:64:128-a:0:32-n32-S64" +target triple = "armv8-arm-none-eabi" + +; Turning a table lookup intrinsic into a shuffle vector instruction +; can be beneficial. If the mask used for the lookup is the constant +; vector {7,6,5,4,3,2,1,0}, then the back-end generates rev64 +; instructions instead. + +define <8 x i8> @tbl1_8x8(<8 x i8> %vec) { +; CHECK-LABEL: @tbl1_8x8( +; CHECK-NEXT: entry: +; CHECK-NEXT: [[TMP0:%.*]] = shufflevector <8 x i8> [[VEC:%.*]], <8 x i8> undef, <8 x i32> +; CHECK-NEXT: ret <8 x i8> [[TMP0]] +; +entry: + %vtbl1 = call <8 x i8> @llvm.arm.neon.vtbl1(<8 x i8> %vec, <8 x i8> ) + ret <8 x i8> %vtbl1 +} + +; Bail the optimization if a mask index is out of range. +define <8 x i8> @tbl1_8x8_out_of_range(<8 x i8> %vec) { +; CHECK-LABEL: @tbl1_8x8_out_of_range( +; CHECK-NEXT: entry: +; CHECK-NEXT: [[VTBL1:%.*]] = call <8 x i8> @llvm.arm.neon.vtbl1(<8 x i8> [[VEC:%.*]], <8 x i8> ) +; CHECK-NEXT: ret <8 x i8> [[VTBL1]] +; +entry: + %vtbl1 = call <8 x i8> @llvm.arm.neon.vtbl1(<8 x i8> %vec, <8 x i8> ) + ret <8 x i8> %vtbl1 +} + +declare <8 x i8> @llvm.arm.neon.vtbl1(<8 x i8>, <8 x i8>)