diff options
| -rw-r--r-- | include/clang/Basic/arm_neon.td | 12 | ||||
| -rw-r--r-- | lib/CodeGen/CGBuiltin.cpp | 46 |
2 files changed, 8 insertions, 50 deletions
diff --git a/include/clang/Basic/arm_neon.td b/include/clang/Basic/arm_neon.td index f4cc2322ba..008558aa25 100644 --- a/include/clang/Basic/arm_neon.td +++ b/include/clang/Basic/arm_neon.td @@ -16,7 +16,11 @@ class Op; def OP_NONE : Op; def OP_ADD : Op; +def OP_ADDL : Op; +def OP_ADDW : Op; def OP_SUB : Op; +def OP_SUBL : Op; +def OP_SUBW : Op; def OP_MUL : Op; def OP_MULL : Op; def OP_MLA : Op; @@ -112,8 +116,8 @@ class WInst<string n, string p, string t> : Inst<n, p, t, OP_NONE> {} //////////////////////////////////////////////////////////////////////////////// // E.3.1 Addition def VADD : Inst<"vadd", "ddd", "csilfUcUsUiUlQcQsQiQlQfQUcQUsQUiQUl", OP_ADD>; -def VADDL : SInst<"vaddl", "wdd", "csiUcUsUi">; -def VADDW : SInst<"vaddw", "wwd", "csiUcUsUi">; +def VADDL : Inst<"vaddl", "wdd", "csiUcUsUi", OP_ADDL>; +def VADDW : Inst<"vaddw", "wwd", "csiUcUsUi", OP_ADDW>; def VHADD : SInst<"vhadd", "ddd", "csiUcUsUiQcQsQiQUcQUsQUi">; def VRHADD : SInst<"vrhadd", "ddd", "csiUcUsUiQcQsQiQUcQUsQUi">; def VQADD : SInst<"vqadd", "ddd", "csilUcUsUiUlQcQsQiQlQUcQUsQUiQUl">; @@ -139,8 +143,8 @@ def VQDMULL : SInst<"vqdmull", "wdd", "si">; //////////////////////////////////////////////////////////////////////////////// // E.3.3 Subtraction def VSUB : Inst<"vsub", "ddd", "csilfUcUsUiUlQcQsQiQlQfQUcQUsQUiQUl", OP_SUB>; -def VSUBL : SInst<"vsubl", "wdd", "csiUcUsUi">; -def VSUBW : SInst<"vsubw", "wwd", "csiUcUsUi">; +def VSUBL : Inst<"vsubl", "wdd", "csiUcUsUi", OP_SUBL>; +def VSUBW : Inst<"vsubw", "wwd", "csiUcUsUi", OP_SUBW>; def VQSUB : SInst<"vqsub", "ddd", "csilUcUsUiUlQcQsQiQlQUcQUsQUiQUl">; def VHSUB : SInst<"vhsub", "ddd", "csiUcUsUiQcQsQiQUcQUsQUi">; def VSUBHN : IInst<"vsubhn", "dww", "csiUcUsUi">; diff --git a/lib/CodeGen/CGBuiltin.cpp b/lib/CodeGen/CGBuiltin.cpp index 23e8c0cb3a..318c02aa43 100644 --- a/lib/CodeGen/CGBuiltin.cpp +++ b/lib/CodeGen/CGBuiltin.cpp @@ -1218,29 +1218,6 @@ Value *CodeGenFunction::EmitARMBuiltinExpr(unsigned BuiltinID, case ARM::BI__builtin_neon_vaddhn_v: return EmitNeonCall(CGM.getIntrinsic(Intrinsic::arm_neon_vaddhn, &Ty, 1), Ops, "vaddhn"); - case ARM::BI__builtin_neon_vaddl_v: { - const llvm::Type *DTy =llvm::VectorType::getTruncatedElementVectorType(VTy); - Ops[0] = Builder.CreateBitCast(Ops[0], DTy); - Ops[1] = Builder.CreateBitCast(Ops[1], DTy); - if (usgn) { - Ops[0] = Builder.CreateZExt(Ops[0], Ty); - Ops[1] = Builder.CreateZExt(Ops[1], Ty); - } else { - Ops[0] = Builder.CreateSExt(Ops[0], Ty); - Ops[1] = Builder.CreateSExt(Ops[1], Ty); - } - return Builder.CreateAdd(Ops[0], Ops[1], "vaddl"); - } - case ARM::BI__builtin_neon_vaddw_v: { - const llvm::Type *DTy =llvm::VectorType::getTruncatedElementVectorType(VTy); - Ops[0] = Builder.CreateBitCast(Ops[0], Ty); - Ops[1] = Builder.CreateBitCast(Ops[1], DTy); - if (usgn) - Ops[1] = Builder.CreateZExt(Ops[1], Ty); - else - Ops[1] = Builder.CreateSExt(Ops[1], Ty); - return Builder.CreateAdd(Ops[0], Ops[1], "vaddw"); - } case ARM::BI__builtin_neon_vcale_v: std::swap(Ops[0], Ops[1]); case ARM::BI__builtin_neon_vcage_v: { @@ -1737,29 +1714,6 @@ Value *CodeGenFunction::EmitARMBuiltinExpr(unsigned BuiltinID, case ARM::BI__builtin_neon_vsubhn_v: return EmitNeonCall(CGM.getIntrinsic(Intrinsic::arm_neon_vsubhn, &Ty, 1), Ops, "vsubhn"); - case ARM::BI__builtin_neon_vsubl_v: { - const llvm::Type *DTy =llvm::VectorType::getTruncatedElementVectorType(VTy); - Ops[0] = Builder.CreateBitCast(Ops[0], DTy); - Ops[1] = Builder.CreateBitCast(Ops[1], DTy); - if (usgn) { - Ops[0] = Builder.CreateZExt(Ops[0], Ty); - Ops[1] = Builder.CreateZExt(Ops[1], Ty); - } else { - Ops[0] = Builder.CreateSExt(Ops[0], Ty); - Ops[1] = Builder.CreateSExt(Ops[1], Ty); - } - return Builder.CreateSub(Ops[0], Ops[1], "vsubl"); - } - case ARM::BI__builtin_neon_vsubw_v: { - const llvm::Type *DTy =llvm::VectorType::getTruncatedElementVectorType(VTy); - Ops[0] = Builder.CreateBitCast(Ops[0], Ty); - Ops[1] = Builder.CreateBitCast(Ops[1], DTy); - if (usgn) - Ops[1] = Builder.CreateZExt(Ops[1], Ty); - else - Ops[1] = Builder.CreateSExt(Ops[1], Ty); - return Builder.CreateSub(Ops[0], Ops[1], "vsubw"); - } case ARM::BI__builtin_neon_vtbl1_v: return EmitNeonCall(CGM.getIntrinsic(Intrinsic::arm_neon_vtbl1), Ops, "vtbl1"); |