From cf55652cf668c1402eee0b12edd2e5a1bc34d7a1 Mon Sep 17 00:00:00 2001 From: Bob Wilson Date: Tue, 7 Dec 2010 22:40:02 +0000 Subject: [PATCH] Stop using a clang builtin for Neon vdup_lane intrinsics. git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@121191 91177308-0d34-0410-b5e6-96231b3b80d8 --- include/clang/Basic/arm_neon.td | 5 +++-- lib/CodeGen/CGBuiltin.cpp | 10 +--------- lib/CodeGen/CodeGenFunction.h | 3 +-- 3 files changed, 5 insertions(+), 13 deletions(-) diff --git a/include/clang/Basic/arm_neon.td b/include/clang/Basic/arm_neon.td index 2bea694c23..4ea5192d09 100644 --- a/include/clang/Basic/arm_neon.td +++ b/include/clang/Basic/arm_neon.td @@ -46,6 +46,7 @@ def OP_HI : Op; def OP_LO : Op; def OP_CONC : Op; def OP_DUP : Op; +def OP_DUP_LN: Op; def OP_SEL : Op; def OP_REV64 : Op; def OP_REV32 : Op; @@ -264,8 +265,8 @@ def VDUP_N : Inst<"vdup_n", "ds", "UcUsUicsiPcPsfQUcQUsQUiQcQsQiQPcQPsQflUlQlQUl", OP_DUP>; def VMOV_N : Inst<"vmov_n", "ds", "UcUsUicsiPcPsfQUcQUsQUiQcQsQiQPcQPsQflUlQlQUl", OP_DUP>; -def VDUP_LANE : WInst<"vdup_lane", "dgi", - "UcUsUicsiPcPsfQUcQUsQUiQcQsQiQPcQPsQflUlQlQUl">; +def VDUP_LANE : Inst<"vdup_lane", "dgi", + "UcUsUicsiPcPsfQUcQUsQUiQcQsQiQPcQPsQflUlQlQUl",OP_DUP_LN>; //////////////////////////////////////////////////////////////////////////////// // E.3.20 Combining vectors diff --git a/lib/CodeGen/CGBuiltin.cpp b/lib/CodeGen/CGBuiltin.cpp index 89d8863c0e..0839a061a6 100644 --- a/lib/CodeGen/CGBuiltin.cpp +++ b/lib/CodeGen/CGBuiltin.cpp @@ -1066,10 +1066,8 @@ const llvm::VectorType *GetNeonType(LLVMContext &C, unsigned type, bool q) { return 0; } -Value *CodeGenFunction::EmitNeonSplat(Value *V, Constant *C, bool widen) { +Value *CodeGenFunction::EmitNeonSplat(Value *V, Constant *C) { unsigned nElts = cast(V->getType())->getNumElements(); - if (widen) - nElts <<= 1; SmallVector Indices(nElts, C); Value* SV = llvm::ConstantVector::get(Indices.begin(), Indices.size()); return Builder.CreateShuffleVector(V, V, SV, "lane"); @@ -1314,12 +1312,6 @@ Value *CodeGenFunction::EmitARMBuiltinExpr(unsigned BuiltinID, Function *F = CGM.getIntrinsic(Int, Tys, 2); return EmitNeonCall(F, Ops, "vcvt_n"); } - case ARM::BI__builtin_neon_vdup_lane_v: - Ops[0] = Builder.CreateBitCast(Ops[0], Ty); - return EmitNeonSplat(Ops[0], cast(Ops[1])); - case ARM::BI__builtin_neon_vdupq_lane_v: - Ops[0] = Builder.CreateBitCast(Ops[0], Ty); - return EmitNeonSplat(Ops[0], cast(Ops[1]), true); case ARM::BI__builtin_neon_vext_v: case ARM::BI__builtin_neon_vextq_v: { ConstantInt *C = dyn_cast(Ops[2]); diff --git a/lib/CodeGen/CodeGenFunction.h b/lib/CodeGen/CodeGenFunction.h index 2f6c58e779..8782f7859e 100644 --- a/lib/CodeGen/CodeGenFunction.h +++ b/lib/CodeGen/CodeGenFunction.h @@ -1532,8 +1532,7 @@ public: llvm::SmallVectorImpl &O, const char *name, bool splat = false, unsigned shift = 0, bool rightshift = false); - llvm::Value *EmitNeonSplat(llvm::Value *V, llvm::Constant *Idx, - bool widen = false); + llvm::Value *EmitNeonSplat(llvm::Value *V, llvm::Constant *Idx); llvm::Value *EmitNeonShiftVector(llvm::Value *V, const llvm::Type *Ty, bool negateForRightShift); -- 2.40.0