[llvm-commits] [llvm] r106434 - in /llvm/trunk: lib/Target/ARM/ARMInstrInfo.td lib/Target/ARM/ARMRegisterInfo.td test/CodeGen/ARM/2010-06-21-nondarwin-tc.ll
Rafael Espindola
espindola at google.com
Mon Jun 21 11:38:46 PDT 2010
Thanks!
I don't think the test is ultra useful as is, since the code generator
was not crashing, just producing invalid output and the test is not
checking for it.
On 21 June 2010 14:21, Dale Johannesen <dalej at apple.com> wrote:
> Author: johannes
> Date: Mon Jun 21 13:21:49 2010
> New Revision: 106434
>
> URL: http://llvm.org/viewvc/llvm-project?rev=106434&view=rev
> Log:
> Fix PR 7433. Silly typo in non-Darwin ARM tail call
> handling, plus correct R9 handling in that mode.
>
>
> Added:
> llvm/trunk/test/CodeGen/ARM/2010-06-21-nondarwin-tc.ll (with props)
> Modified:
> llvm/trunk/lib/Target/ARM/ARMInstrInfo.td
> llvm/trunk/lib/Target/ARM/ARMRegisterInfo.td
>
> Modified: llvm/trunk/lib/Target/ARM/ARMInstrInfo.td
> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/ARM/ARMInstrInfo.td?rev=106434&r1=106433&r2=106434&view=diff
> ==============================================================================
> --- llvm/trunk/lib/Target/ARM/ARMInstrInfo.td (original)
> +++ llvm/trunk/lib/Target/ARM/ARMInstrInfo.td Mon Jun 21 13:21:49 2010
> @@ -1072,7 +1072,7 @@
> Pseudo, IIC_Br,
> "@TC_RETURN","\t$dst", []>, Requires<[IsNotDarwin]>;
>
> - def TCRETURNriND : AInoP<(outs), (ins tGPR:$dst, variable_ops),
> + def TCRETURNriND : AInoP<(outs), (ins tcGPR:$dst, variable_ops),
> Pseudo, IIC_Br,
> "@TC_RETURN","\t$dst", []>, Requires<[IsNotDarwin]>;
>
> @@ -1084,7 +1084,7 @@
> IIC_Br, "b.w\t$dst @ TAILCALL",
> []>, Requires<[IsThumb, IsNotDarwin]>;
>
> - def TAILJMPrND : AXI<(outs), (ins tGPR:$dst, variable_ops),
> + def TAILJMPrND : AXI<(outs), (ins tcGPR:$dst, variable_ops),
> BrMiscFrm, IIC_Br, "bx\t$dst @ TAILCALL",
> []>, Requires<[IsNotDarwin]> {
> let Inst{7-4} = 0b0001;
>
> Modified: llvm/trunk/lib/Target/ARM/ARMRegisterInfo.td
> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/ARM/ARMRegisterInfo.td?rev=106434&r1=106433&r2=106434&view=diff
> ==============================================================================
> --- llvm/trunk/lib/Target/ARM/ARMRegisterInfo.td (original)
> +++ llvm/trunk/lib/Target/ARM/ARMRegisterInfo.td Mon Jun 21 13:21:49 2010
> @@ -386,14 +386,9 @@
> return ARM_GPR_NOR9_TC;
> else
> return ARM_GPR_R9_TC;
> - } else {
> - if (Subtarget.isR9Reserved())
> - return ARM_GPR_NOR9_TC;
> - else if (Subtarget.isThumb())
> - return ARM_GPR_R9_TC;
> - else
> - return ARM_GPR_R9_TC;
> - }
> + } else
> + // R9 is either callee-saved or reserved; can't use it.
> + return ARM_GPR_NOR9_TC;
> }
>
> tcGPRClass::iterator
> @@ -412,14 +407,9 @@
> I = ARM_GPR_NOR9_TC + (sizeof(ARM_GPR_NOR9_TC)/sizeof(unsigned));
> else
> I = ARM_GPR_R9_TC + (sizeof(ARM_GPR_R9_TC)/sizeof(unsigned));
> - } else {
> - if (Subtarget.isR9Reserved())
> - I = ARM_GPR_NOR9_TC + (sizeof(ARM_GPR_NOR9_TC)/sizeof(unsigned));
> - else if (Subtarget.isThumb())
> - I = ARM_GPR_R9_TC + (sizeof(ARM_GPR_R9_TC)/sizeof(unsigned));
> - else
> - I = ARM_GPR_R9_TC + (sizeof(ARM_GPR_R9_TC)/sizeof(unsigned));
> - }
> + } else
> + // R9 is either callee-saved or reserved; can't use it.
> + I = ARM_GPR_NOR9_TC + (sizeof(ARM_GPR_NOR9_TC)/sizeof(unsigned));
> return I;
> }
> }];
>
> Added: llvm/trunk/test/CodeGen/ARM/2010-06-21-nondarwin-tc.ll
> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/ARM/2010-06-21-nondarwin-tc.ll?rev=106434&view=auto
> ==============================================================================
> --- llvm/trunk/test/CodeGen/ARM/2010-06-21-nondarwin-tc.ll (added)
> +++ llvm/trunk/test/CodeGen/ARM/2010-06-21-nondarwin-tc.ll Mon Jun 21 13:21:49 2010
> @@ -0,0 +1,145 @@
> +; RUN: llc < %s -march=arm -mtriple=armv4t-unknown-linux-gnueabi
> +; PR 7433
> +
> +%0 = type { i8*, i8* }
> +%1 = type { i8*, i8*, i8* }
> +%"class.llvm::Record" = type { i32, %"class.std::basic_string", %"class.llvm::SMLoc", %"class.std::vector", %"class.std::vector", %"class.std::vector" }
> +%"class.llvm::RecordVal" = type { %"class.std::basic_string", %"struct.llvm::Init"*, i32, %"struct.llvm::Init"* }
> +%"class.llvm::SMLoc" = type { i8* }
> +%"class.llvm::StringInit" = type { [8 x i8], %"class.std::basic_string" }
> +%"class.std::basic_string" = type { %"class.llvm::SMLoc" }
> +%"class.std::vector" = type { [12 x i8] }
> +%"struct.llvm::Init" = type { i32 (...)** }
> +
> + at _ZTIN4llvm5RecTyE = external constant %0 ; <%0*> [#uses=1]
> + at _ZTIN4llvm4InitE = external constant %0 ; <%0*> [#uses=1]
> + at _ZTIN4llvm11RecordRecTyE = external constant %1 ; <%1*> [#uses=1]
> + at .str8 = external constant [47 x i8] ; <[47 x i8]*> [#uses=1]
> + at _ZTIN4llvm9UnsetInitE = external constant %1 ; <%1*> [#uses=1]
> + at .str51 = external constant [45 x i8] ; <[45 x i8]*> [#uses=1]
> + at __PRETTY_FUNCTION__._ZNK4llvm7VarInit12getFieldInitERNS_6RecordEPKNS_9RecordValERKSs = external constant [116 x i8] ; <[116 x i8]*> [#uses=1]
> +
> + at _ZN4llvm9RecordValC1ERKSsPNS_5RecTyEj = alias void (%"class.llvm::RecordVal"*, %"class.std::basic_string"*, %"struct.llvm::Init"*, i32)* @_ZN4llvm9RecordValC2ERKSsPNS_5RecTyEj ; <void (%"class.llvm::RecordVal"*, %"class.std::basic_string"*, %"struct.llvm::Init"*, i32)*> [#uses=0]
> +
> +declare i8* @__dynamic_cast(i8*, i8*, i8*, i32)
> +
> +declare void @__assert_fail(i8*, i8*, i32, i8*) noreturn
> +
> +declare void @_ZN4llvm9RecordValC2ERKSsPNS_5RecTyEj(%"class.llvm::RecordVal"*, %"class.std::basic_string"*, %"struct.llvm::Init"*, i32) align 2
> +
> +define %"struct.llvm::Init"* @_ZNK4llvm7VarInit12getFieldInitERNS_6RecordEPKNS_9RecordValERKSs(%"class.llvm::StringInit"* %this, %"class.llvm::Record"* %R, %"class.llvm::RecordVal"* %RV, %"class.std::basic_string"* %FieldName) align 2 {
> +;CHECK: ldmia sp!, {r4, r5, r6, r7, r8, lr}
> +;CHECK: bx r12 @ TAILCALL
> +entry:
> + %.loc = alloca i32 ; <i32*> [#uses=2]
> + %tmp.i = getelementptr inbounds %"class.llvm::StringInit"* %this, i32 0, i32 0, i32 4 ; <i8*> [#uses=1]
> + %0 = bitcast i8* %tmp.i to %"struct.llvm::Init"** ; <%"struct.llvm::Init"**> [#uses=1]
> + %tmp2.i = load %"struct.llvm::Init"** %0 ; <%"struct.llvm::Init"*> [#uses=2]
> + %1 = icmp eq %"struct.llvm::Init"* %tmp2.i, null ; <i1> [#uses=1]
> + br i1 %1, label %entry.return_crit_edge, label %tmpbb
> +
> +entry.return_crit_edge: ; preds = %entry
> + br label %return
> +
> +tmpbb: ; preds = %entry
> + %2 = bitcast %"struct.llvm::Init"* %tmp2.i to i8* ; <i8*> [#uses=1]
> + %3 = tail call i8* @__dynamic_cast(i8* %2, i8* bitcast (%0* @_ZTIN4llvm5RecTyE to i8*), i8* bitcast (%1* @_ZTIN4llvm11RecordRecTyE to i8*), i32 -1) ; <i8*> [#uses=1]
> + %phitmp = icmp eq i8* %3, null ; <i1> [#uses=1]
> + br i1 %phitmp, label %.return_crit_edge, label %if.then
> +
> +.return_crit_edge: ; preds = %tmpbb
> + br label %return
> +
> +if.then: ; preds = %tmpbb
> + %tmp2.i.i.i.i = getelementptr inbounds %"class.llvm::StringInit"* %this, i32 0, i32 1, i32 0, i32 0 ; <i8**> [#uses=1]
> + %tmp3.i.i.i.i = load i8** %tmp2.i.i.i.i ; <i8*> [#uses=2]
> + %arrayidx.i.i.i.i = getelementptr inbounds i8* %tmp3.i.i.i.i, i32 -12 ; <i8*> [#uses=1]
> + %tmp.i.i.i = bitcast i8* %arrayidx.i.i.i.i to i32* ; <i32*> [#uses=1]
> + %tmp2.i.i.i = load i32* %tmp.i.i.i ; <i32> [#uses=1]
> + %tmp.i5 = getelementptr inbounds %"class.llvm::Record"* %R, i32 0, i32 4 ; <%"class.std::vector"*> [#uses=1]
> + %tmp2.i.i = getelementptr inbounds %"class.llvm::Record"* %R, i32 0, i32 4, i32 0, i32 4 ; <i8*> [#uses=1]
> + %4 = bitcast i8* %tmp2.i.i to %"class.llvm::RecordVal"** ; <%"class.llvm::RecordVal"**> [#uses=1]
> + %tmp3.i.i6 = load %"class.llvm::RecordVal"** %4 ; <%"class.llvm::RecordVal"*> [#uses=1]
> + %tmp5.i.i = bitcast %"class.std::vector"* %tmp.i5 to %"class.llvm::RecordVal"** ; <%"class.llvm::RecordVal"**> [#uses=1]
> + %tmp6.i.i = load %"class.llvm::RecordVal"** %tmp5.i.i ; <%"class.llvm::RecordVal"*> [#uses=5]
> + %sub.ptr.lhs.cast.i.i = ptrtoint %"class.llvm::RecordVal"* %tmp3.i.i6 to i32 ; <i32> [#uses=1]
> + %sub.ptr.rhs.cast.i.i = ptrtoint %"class.llvm::RecordVal"* %tmp6.i.i to i32 ; <i32> [#uses=1]
> + %sub.ptr.sub.i.i = sub i32 %sub.ptr.lhs.cast.i.i, %sub.ptr.rhs.cast.i.i ; <i32> [#uses=1]
> + %sub.ptr.div.i.i = ashr i32 %sub.ptr.sub.i.i, 4 ; <i32> [#uses=1]
> + br label %codeRepl
> +
> +codeRepl: ; preds = %if.then
> + %targetBlock = call i1 @_ZNK4llvm7VarInit12getFieldInitERNS_6RecordEPKNS_9RecordValERKSs_for.cond.i(i32 %sub.ptr.div.i.i, %"class.llvm::RecordVal"* %tmp6.i.i, i32 %tmp2.i.i.i, i8* %tmp3.i.i.i.i, i32* %.loc) ; <i1> [#uses=1]
> + %.reload = load i32* %.loc ; <i32> [#uses=3]
> + br i1 %targetBlock, label %for.cond.i.return_crit_edge, label %_ZN4llvm6Record8getValueENS_9StringRefE.exit
> +
> +for.cond.i.return_crit_edge: ; preds = %codeRepl
> + br label %return
> +
> +_ZN4llvm6Record8getValueENS_9StringRefE.exit: ; preds = %codeRepl
> + %add.ptr.i.i = getelementptr inbounds %"class.llvm::RecordVal"* %tmp6.i.i, i32 %.reload ; <%"class.llvm::RecordVal"*> [#uses=2]
> + %tobool5 = icmp eq %"class.llvm::RecordVal"* %add.ptr.i.i, null ; <i1> [#uses=1]
> + br i1 %tobool5, label %_ZN4llvm6Record8getValueENS_9StringRefE.exit.return_crit_edge, label %if.then6
> +
> +_ZN4llvm6Record8getValueENS_9StringRefE.exit.return_crit_edge: ; preds = %_ZN4llvm6Record8getValueENS_9StringRefE.exit
> + br label %return
> +
> +if.then6: ; preds = %_ZN4llvm6Record8getValueENS_9StringRefE.exit
> + %cmp = icmp eq %"class.llvm::RecordVal"* %add.ptr.i.i, %RV ; <i1> [#uses=1]
> + br i1 %cmp, label %if.then6.if.end_crit_edge, label %land.lhs.true
> +
> +if.then6.if.end_crit_edge: ; preds = %if.then6
> + br label %if.end
> +
> +land.lhs.true: ; preds = %if.then6
> + %tobool10 = icmp eq %"class.llvm::RecordVal"* %RV, null ; <i1> [#uses=1]
> + br i1 %tobool10, label %lor.lhs.false, label %land.lhs.true.return_crit_edge
> +
> +land.lhs.true.return_crit_edge: ; preds = %land.lhs.true
> + br label %return
> +
> +lor.lhs.false: ; preds = %land.lhs.true
> + %tmp.i3 = getelementptr inbounds %"class.llvm::RecordVal"* %tmp6.i.i, i32 %.reload, i32 3 ; <%"struct.llvm::Init"**> [#uses=1]
> + %tmp2.i4 = load %"struct.llvm::Init"** %tmp.i3 ; <%"struct.llvm::Init"*> [#uses=2]
> + %5 = icmp eq %"struct.llvm::Init"* %tmp2.i4, null ; <i1> [#uses=1]
> + br i1 %5, label %lor.lhs.false.if.end_crit_edge, label %tmpbb1
> +
> +lor.lhs.false.if.end_crit_edge: ; preds = %lor.lhs.false
> + br label %if.end
> +
> +tmpbb1: ; preds = %lor.lhs.false
> + %6 = bitcast %"struct.llvm::Init"* %tmp2.i4 to i8* ; <i8*> [#uses=1]
> + %7 = tail call i8* @__dynamic_cast(i8* %6, i8* bitcast (%0* @_ZTIN4llvm4InitE to i8*), i8* bitcast (%1* @_ZTIN4llvm9UnsetInitE to i8*), i32 -1) ; <i8*> [#uses=1]
> + %phitmp32 = icmp eq i8* %7, null ; <i1> [#uses=1]
> + br i1 %phitmp32, label %.if.end_crit_edge, label %.return_crit_edge1
> +
> +.return_crit_edge1: ; preds = %tmpbb1
> + br label %return
> +
> +.if.end_crit_edge: ; preds = %tmpbb1
> + br label %if.end
> +
> +if.end: ; preds = %.if.end_crit_edge, %lor.lhs.false.if.end_crit_edge, %if.then6.if.end_crit_edge
> + %tmp.i1 = getelementptr inbounds %"class.llvm::RecordVal"* %tmp6.i.i, i32 %.reload, i32 3 ; <%"struct.llvm::Init"**> [#uses=1]
> + %tmp2.i2 = load %"struct.llvm::Init"** %tmp.i1 ; <%"struct.llvm::Init"*> [#uses=3]
> + %8 = bitcast %"class.llvm::StringInit"* %this to %"struct.llvm::Init"* ; <%"struct.llvm::Init"*> [#uses=1]
> + %cmp19 = icmp eq %"struct.llvm::Init"* %tmp2.i2, %8 ; <i1> [#uses=1]
> + br i1 %cmp19, label %cond.false, label %cond.end
> +
> +cond.false: ; preds = %if.end
> + tail call void @__assert_fail(i8* getelementptr inbounds ([45 x i8]* @.str51, i32 0, i32 0), i8* getelementptr inbounds ([47 x i8]* @.str8, i32 0, i32 0), i32 1141, i8* getelementptr inbounds ([116 x i8]* @__PRETTY_FUNCTION__._ZNK4llvm7VarInit12getFieldInitERNS_6RecordEPKNS_9RecordValERKSs, i32 0, i32 0)) noreturn
> + unreachable
> +
> +cond.end: ; preds = %if.end
> + %9 = bitcast %"struct.llvm::Init"* %tmp2.i2 to %"struct.llvm::Init"* (%"struct.llvm::Init"*, %"class.llvm::Record"*, %"class.llvm::RecordVal"*, %"class.std::basic_string"*)*** ; <%"struct.llvm::Init"* (%"struct.llvm::Init"*, %"class.llvm::Record"*, %"class.llvm::RecordVal"*, %"class.std::basic_string"*)***> [#uses=1]
> + %10 = load %"struct.llvm::Init"* (%"struct.llvm::Init"*, %"class.llvm::Record"*, %"class.llvm::RecordVal"*, %"class.std::basic_string"*)*** %9 ; <%"struct.llvm::Init"* (%"struct.llvm::Init"*, %"class.llvm::Record"*, %"class.llvm::RecordVal"*, %"class.std::basic_string"*)**> [#uses=1]
> + %vfn = getelementptr inbounds %"struct.llvm::Init"* (%"struct.llvm::Init"*, %"class.llvm::Record"*, %"class.llvm::RecordVal"*, %"class.std::basic_string"*)** %10, i32 8 ; <%"struct.llvm::Init"* (%"struct.llvm::Init"*, %"class.llvm::Record"*, %"class.llvm::RecordVal"*, %"class.std::basic_string"*)**> [#uses=1]
> + %11 = load %"struct.llvm::Init"* (%"struct.llvm::Init"*, %"class.llvm::Record"*, %"class.llvm::RecordVal"*, %"class.std::basic_string"*)** %vfn ; <%"struct.llvm::Init"* (%"struct.llvm::Init"*, %"class.llvm::Record"*, %"class.llvm::RecordVal"*, %"class.std::basic_string"*)*> [#uses=1]
> + %call25 = tail call %"struct.llvm::Init"* %11(%"struct.llvm::Init"* %tmp2.i2, %"class.llvm::Record"* %R, %"class.llvm::RecordVal"* %RV, %"class.std::basic_string"* %FieldName) ; <%"struct.llvm::Init"*> [#uses=1]
> + ret %"struct.llvm::Init"* %call25
> +
> +return: ; preds = %.return_crit_edge1, %land.lhs.true.return_crit_edge, %_ZN4llvm6Record8getValueENS_9StringRefE.exit.return_crit_edge, %for.cond.i.return_crit_edge, %.return_crit_edge, %entry.return_crit_edge
> + ret %"struct.llvm::Init"* null
> +}
> +
> +declare i1 @_ZNK4llvm7VarInit12getFieldInitERNS_6RecordEPKNS_9RecordValERKSs_for.cond.i(i32, %"class.llvm::RecordVal"*, i32, i8*, i32*)
>
> Propchange: llvm/trunk/test/CodeGen/ARM/2010-06-21-nondarwin-tc.ll
> ------------------------------------------------------------------------------
> svn:executable = *
>
>
> _______________________________________________
> llvm-commits mailing list
> llvm-commits at cs.uiuc.edu
> http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits
>
--
Rafael Ávila de Espíndola
More information about the llvm-commits
mailing list