[PATCH 3/3] R600: Implement 64bit SRA
Tom Stellard
tom at stellard.net
Tue Jun 17 14:18:58 PDT 2014
On Tue, Jun 17, 2014 at 04:50:05PM -0400, Jan Vesely wrote:
> Signed-off-by: Jan Vesely <jan.vesely at rutgers.edu>
> ---
> lib/Target/R600/R600ISelLowering.cpp | 12 ++--
> test/CodeGen/R600/sra.ll | 130 +++++++++++++++++++++++++++++++++++
> 2 files changed, 137 insertions(+), 5 deletions(-)
>
> diff --git a/lib/Target/R600/R600ISelLowering.cpp b/lib/Target/R600/R600ISelLowering.cpp
> index e314aca..586bdba 100644
> --- a/lib/Target/R600/R600ISelLowering.cpp
> +++ b/lib/Target/R600/R600ISelLowering.cpp
> @@ -161,6 +161,7 @@ R600TargetLowering::R600TargetLowering(TargetMachine &TM) :
> // to be Legal/Custom in order to avoid library calls.
> setOperationAction(ISD::SHL_PARTS, MVT::i32, Custom);
> setOperationAction(ISD::SRL_PARTS, MVT::i32, Custom);
> + setOperationAction(ISD::SRA_PARTS, MVT::i32, Custom);
>
> setOperationAction(ISD::GlobalAddress, MVT::i32, Custom);
>
> @@ -558,6 +559,7 @@ SDValue R600TargetLowering::LowerOperation(SDValue Op, SelectionDAG &DAG) const
> case ISD::EXTRACT_VECTOR_ELT: return LowerEXTRACT_VECTOR_ELT(Op, DAG);
> case ISD::INSERT_VECTOR_ELT: return LowerINSERT_VECTOR_ELT(Op, DAG);
> case ISD::SHL_PARTS: return LowerSHLParts(Op, DAG);
> + case ISD::SRA_PARTS:
> case ISD::SRL_PARTS: return LowerSRXParts(Op, DAG);
> case ISD::FCOS:
> case ISD::FSIN: return LowerTrig(Op, DAG);
> @@ -959,6 +961,8 @@ SDValue R600TargetLowering::LowerSRXParts(SDValue Op, SelectionDAG &DAG) const {
> SDValue Zero = DAG.getConstant(0, VT);
> SDValue One = DAG.getConstant(1, VT);
>
> + const bool sra = Op.getOpcode() == ISD::SRA_PARTS;
Variable names should start with a capital letter. Otherwise, LGTM.
> +
> SDValue Width = DAG.getConstant(VT.getSizeInBits(), VT);
> SDValue Width1 = DAG.getConstant(VT.getSizeInBits() - 1, VT);
> SDValue BigShift = DAG.getNode(ISD::SUB, DL, VT, Shift, Width);
> @@ -973,14 +977,12 @@ SDValue R600TargetLowering::LowerSRXParts(SDValue Op, SelectionDAG &DAG) const {
> SDValue Overflow = DAG.getNode(ISD::SHL, DL, VT, Hi, CompShift);
> Overflow = DAG.getNode(ISD::SHL, DL, VT, Overflow, One);
>
> - // TODO: SRA support here
> - SDValue HiSmall = DAG.getNode(ISD::SRL, DL, VT, Hi, Shift);
> + SDValue HiSmall = DAG.getNode(sra ? ISD::SRA : ISD::SRL, DL, VT, Hi, Shift);
> SDValue LoSmall = DAG.getNode(ISD::SRL, DL, VT, Lo, Shift);
> LoSmall = DAG.getNode(ISD::OR, DL, VT, LoSmall, Overflow);
>
> - // TODO: SRA support here
> - SDValue LoBig = DAG.getNode(ISD::SRL, DL, VT, Hi, BigShift);
> - SDValue HiBig = Zero;
> + SDValue LoBig = DAG.getNode(sra ? ISD::SRA : ISD::SRL, DL, VT, Hi, BigShift);
> + SDValue HiBig = sra ? DAG.getNode(ISD::SRA, DL, VT, Hi, Width1) : Zero;
>
> Hi = DAG.getSelectCC(DL, Shift, Width, HiSmall, HiBig, ISD::SETULT);
> Lo = DAG.getSelectCC(DL, Shift, Width, LoSmall, LoBig, ISD::SETULT);
> diff --git a/test/CodeGen/R600/sra.ll b/test/CodeGen/R600/sra.ll
> index fe9df10..9eb3dc5 100644
> --- a/test/CodeGen/R600/sra.ll
> +++ b/test/CodeGen/R600/sra.ll
> @@ -52,3 +52,133 @@ entry:
> ret void
> }
>
> +;EG-CHECK-LABEL: @ashr_i64_2
> +;EG-CHECK: SUB_INT {{\*? *}}[[COMPSH:T[0-9]+\.[XYZW]]], {{literal.[xy]}}, [[SHIFT:T[0-9]+\.[XYZW]]]
> +;EG-CHECK: LSHL {{\* *}}[[TEMP:T[0-9]+\.[XYZW]]], [[OPHI:T[0-9]+\.[XYZW]]], {{[[COMPSH]]|PV.[XYZW]}}
> +;EG-CHECK: LSHL {{\*? *}}[[OVERF:T[0-9]+\.[XYZW]]], {{[[TEMP]]|PV.[XYZW]}}, 1
> +;EG_CHECK-DAG: ADD_INT {{\*? *}}[[BIGSH:T[0-9]+\.[XYZW]]], [[SHIFT]], literal
> +;EG-CHECK-DAG: LSHR {{\*? *}}[[LOSMTMP:T[0-9]+\.[XYZW]]], [[OPLO:T[0-9]+\.[XYZW]]], [[SHIFT]]
> +;EG-CHECK-DAG: OR_INT {{\*? *}}[[LOSM:T[0-9]+\.[XYZW]]], {{[[LOSMTMP]]|PV.[XYZW]}}, {{[[OVERF]]|PV.[XYZW]}}
> +;EG-CHECK-DAG: ASHR {{\*? *}}[[HISM:T[0-9]+\.[XYZW]]], [[OPHI]], {{PS|[[SHIFT]]}}
> +;EG-CHECK-DAG: ASHR {{\*? *}}[[LOBIG:T[0-9]+\.[XYZW]]], [[OPHI]], literal
> +;EG-CHECK-DAG: ASHR {{\*? *}}[[HIBIG:T[0-9]+\.[XYZW]]], [[OPHI]], literal
> +;EG-CHECK-DAG: SETGT_UINT {{\*? *}}[[RESC:T[0-9]+\.[XYZW]]], [[SHIFT]], literal
> +;EG-CHECK-DAG: CNDE_INT {{\*? *}}[[RESLO:T[0-9]+\.[XYZW]]], {{T[0-9]+\.[XYZW]}}
> +;EG-CHECK-DAG: CNDE_INT {{\*? *}}[[RESHI:T[0-9]+\.[XYZW]]], {{T[0-9]+\.[XYZW]}}
> +
> +;SI-CHECK-LABEL: @ashr_i64_2
> +;SI-CHECK: V_ASHR_I64 {{v\[[0-9]+:[0-9]+\], v\[[0-9]+:[0-9]+\], v[0-9]+}}
> +define void @ashr_i64_2(i64 addrspace(1)* %out, i64 addrspace(1)* %in) {
> +entry:
> + %b_ptr = getelementptr i64 addrspace(1)* %in, i64 1
> + %a = load i64 addrspace(1) * %in
> + %b = load i64 addrspace(1) * %b_ptr
> + %result = ashr i64 %a, %b
> + store i64 %result, i64 addrspace(1)* %out
> + ret void
> +}
> +
> +;EG-CHECK-LABEL: @ashr_v2i64
> +;EG-CHECK-DAG: SUB_INT {{\*? *}}[[COMPSHA:T[0-9]+\.[XYZW]]], {{literal.[xy]}}, [[SHA:T[0-9]+\.[XYZW]]]
> +;EG-CHECK-DAG: SUB_INT {{\*? *}}[[COMPSHB:T[0-9]+\.[XYZW]]], {{literal.[xy]}}, [[SHB:T[0-9]+\.[XYZW]]]
> +;EG-CHECK-DAG: LSHL {{\*? *}}[[COMPSHA]]
> +;EG-CHECK-DAG: LSHL {{\*? *}}[[COMPSHB]]
> +;EG-CHECK-DAG: LSHL {{.*}}, 1
> +;EG-CHECK-DAG: LSHL {{.*}}, 1
> +;EG-CHECK-DAG: ASHR {{.*}}, [[SHA]]
> +;EG-CHECK-DAG: ASHR {{.*}}, [[SHB]]
> +;EG-CHECK-DAG: LSHR {{.*}}, [[SHA]]
> +;EG-CHECK-DAG: LSHR {{.*}}, [[SHB]]
> +;EG-CHECK-DAG: OR_INT
> +;EG-CHECK-DAG: OR_INT
> +;EG-CHECK-DAG: ADD_INT {{\*? *}}[[BIGSHA:T[0-9]+\.[XYZW]]]{{.*}}, literal
> +;EG-CHECK-DAG: ADD_INT {{\*? *}}[[BIGSHB:T[0-9]+\.[XYZW]]]{{.*}}, literal
> +;EG-CHECK-DAG: ASHR
> +;EG-CHECK-DAG: ASHR
> +;EG-CHECK-DAG: ASHR {{.*}}, literal
> +;EG-CHECK-DAG: ASHR {{.*}}, literal
> +;EG-CHECK-DAG: SETGT_UINT {{\*? *T[0-9]\.[XYZW]}}, [[SHA]], literal
> +;EG-CHECK-DAG: SETGT_UINT {{\*? *T[0-9]\.[XYZW]}}, [[SHB]], literal
> +;EG-CHECK-DAG: CNDE_INT
> +;EG-CHECK-DAG: CNDE_INT
> +;EG-CHECK-DAG: CNDE_INT
> +;EG-CHECK-DAG: CNDE_INT
> +
> +;SI-CHECK-LABEL: @ashr_v2i64
> +;SI-CHECK: V_ASHR_I64 {{v\[[0-9]+:[0-9]+\], v\[[0-9]+:[0-9]+\], v[0-9]+}}
> +;SI-CHECK: V_ASHR_I64 {{v\[[0-9]+:[0-9]+\], v\[[0-9]+:[0-9]+\], v[0-9]+}}
> +
> +define void @ashr_v2i64(<2 x i64> addrspace(1)* %out, <2 x i64> addrspace(1)* %in) {
> + %b_ptr = getelementptr <2 x i64> addrspace(1)* %in, i64 1
> + %a = load <2 x i64> addrspace(1) * %in
> + %b = load <2 x i64> addrspace(1) * %b_ptr
> + %result = ashr <2 x i64> %a, %b
> + store <2 x i64> %result, <2 x i64> addrspace(1)* %out
> + ret void
> +}
> +
> +;EG-CHECK-LABEL: @ashr_v4i64
> +;EG-CHECK-DAG: SUB_INT {{\*? *}}[[COMPSHA:T[0-9]+\.[XYZW]]], {{literal.[xy]}}, [[SHA:T[0-9]+\.[XYZW]]]
> +;EG-CHECK-DAG: SUB_INT {{\*? *}}[[COMPSHB:T[0-9]+\.[XYZW]]], {{literal.[xy]}}, [[SHB:T[0-9]+\.[XYZW]]]
> +;EG-CHECK-DAG: SUB_INT {{\*? *}}[[COMPSHC:T[0-9]+\.[XYZW]]], {{literal.[xy]}}, [[SHC:T[0-9]+\.[XYZW]]]
> +;EG-CHECK-DAG: SUB_INT {{\*? *}}[[COMPSHD:T[0-9]+\.[XYZW]]], {{literal.[xy]}}, [[SHD:T[0-9]+\.[XYZW]]]
> +;EG-CHECK-DAG: LSHL {{\*? *}}[[COMPSHA]]
> +;EG-CHECK-DAG: LSHL {{\*? *}}[[COMPSHB]]
> +;EG-CHECK-DAG: LSHL {{\*? *}}[[COMPSHC]]
> +;EG-CHECK-DAG: LSHL {{\*? *}}[[COMPSHD]]
> +;EG-CHECK-DAG: LSHL {{.*}}, 1
> +;EG-CHECK-DAG: LSHL {{.*}}, 1
> +;EG-CHECK-DAG: LSHL {{.*}}, 1
> +;EG-CHECK-DAG: LSHL {{.*}}, 1
> +;EG-CHECK-DAG: ASHR {{.*}}, [[SHA]]
> +;EG-CHECK-DAG: ASHR {{.*}}, [[SHB]]
> +;EG-CHECK-DAG: ASHR {{.*}}, [[SHC]]
> +;EG-CHECK-DAG: ASHR {{.*}}, [[SHD]]
> +;EG-CHECK-DAG: LSHR {{.*}}, [[SHA]]
> +;EG-CHECK-DAG: LSHR {{.*}}, [[SHB]]
> +;EG-CHECK-DAG: LSHR {{.*}}, [[SHA]]
> +;EG-CHECK-DAG: LSHR {{.*}}, [[SHB]]
> +;EG-CHECK-DAG: OR_INT
> +;EG-CHECK-DAG: OR_INT
> +;EG-CHECK-DAG: OR_INT
> +;EG-CHECK-DAG: OR_INT
> +;EG-CHECK-DAG: ADD_INT {{\*? *}}[[BIGSHA:T[0-9]+\.[XYZW]]]{{.*}}, literal
> +;EG-CHECK-DAG: ADD_INT {{\*? *}}[[BIGSHB:T[0-9]+\.[XYZW]]]{{.*}}, literal
> +;EG-CHECK-DAG: ADD_INT {{\*? *}}[[BIGSHC:T[0-9]+\.[XYZW]]]{{.*}}, literal
> +;EG-CHECK-DAG: ADD_INT {{\*? *}}[[BIGSHD:T[0-9]+\.[XYZW]]]{{.*}}, literal
> +;EG-CHECK-DAG: ASHR
> +;EG-CHECK-DAG: ASHR
> +;EG-CHECK-DAG: ASHR
> +;EG-CHECK-DAG: ASHR
> +;EG-CHECK-DAG: ASHR {{.*}}, literal
> +;EG-CHECK-DAG: ASHR {{.*}}, literal
> +;EG-CHECK-DAG: ASHR {{.*}}, literal
> +;EG-CHECK-DAG: ASHR {{.*}}, literal
> +;EG-CHECK-DAG: SETGT_UINT {{\*? *T[0-9]\.[XYZW]}}, [[SHA]], literal
> +;EG-CHECK-DAG: SETGT_UINT {{\*? *T[0-9]\.[XYZW]}}, [[SHB]], literal
> +;EG-CHECK-DAG: SETGT_UINT {{\*? *T[0-9]\.[XYZW]}}, [[SHC]], literal
> +;EG-CHECK-DAG: SETGT_UINT {{\*? *T[0-9]\.[XYZW]}}, [[SHD]], literal
> +;EG-CHECK-DAG: CNDE_INT
> +;EG-CHECK-DAG: CNDE_INT
> +;EG-CHECK-DAG: CNDE_INT
> +;EG-CHECK-DAG: CNDE_INT
> +;EG-CHECK-DAG: CNDE_INT
> +;EG-CHECK-DAG: CNDE_INT
> +;EG-CHECK-DAG: CNDE_INT
> +;EG-CHECK-DAG: CNDE_INT
> +
> +;SI-CHECK-LABEL: @ashr_v4i64
> +;SI-CHECK: V_ASHR_I64 {{v\[[0-9]+:[0-9]+\], v\[[0-9]+:[0-9]+\], v[0-9]+}}
> +;SI-CHECK: V_ASHR_I64 {{v\[[0-9]+:[0-9]+\], v\[[0-9]+:[0-9]+\], v[0-9]+}}
> +;SI-CHECK: V_ASHR_I64 {{v\[[0-9]+:[0-9]+\], v\[[0-9]+:[0-9]+\], v[0-9]+}}
> +;SI-CHECK: V_ASHR_I64 {{v\[[0-9]+:[0-9]+\], v\[[0-9]+:[0-9]+\], v[0-9]+}}
> +
> +define void @ashr_v4i64(<4 x i64> addrspace(1)* %out, <4 x i64> addrspace(1)* %in) {
> + %b_ptr = getelementptr <4 x i64> addrspace(1)* %in, i64 1
> + %a = load <4 x i64> addrspace(1) * %in
> + %b = load <4 x i64> addrspace(1) * %b_ptr
> + %result = ashr <4 x i64> %a, %b
> + store <4 x i64> %result, <4 x i64> addrspace(1)* %out
> + ret void
> +}
> +
> --
> 1.9.3
>
> _______________________________________________
> llvm-commits mailing list
> llvm-commits at cs.uiuc.edu
> http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits
More information about the llvm-commits
mailing list