[llvm-commits] [llvm] r163761 - in /llvm/trunk: lib/Target/X86/X86ISelDAGToDAG.cpp lib/Target/X86/X86InstrCompiler.td lib/Target/X86/X86InstrInfo.td test/CodeGen/X86/tailcall-64.ll
Duncan Sands
baldrick at free.fr
Thu Sep 13 00:36:49 PDT 2012
Hi Jakob,
On 13/09/12 02:25, Jakob Stoklund Olesen wrote:
> Author: stoklund
> Date: Wed Sep 12 19:25:00 2012
> New Revision: 163761
>
> URL: http://llvm.org/viewvc/llvm-project?rev=163761&view=rev
> Log:
> Don't fold indexed loads into TCRETURNmi64.
this seems to have caused a slew of dragonegg buildbot failures:
http://lab.llvm.org:8011/builders/dragonegg-x86_64-linux-gcc-4.6-self-host-checks/builds/1614
http://lab.llvm.org:8011/builders/dragonegg-x86_64-linux-gcc-4.6-self-host-release/builds/804
http://lab.llvm.org:8011/builders/dragonegg-x86_64-linux-gcc-4.6-self-host-debug/builds/420
http://lab.llvm.org:8011/builders/dragonegg-x86_64-linux-gcc-4.5-self-host/builds/1867
The failures all look much the same:
cc1:
/home/baldrick/osuosl/slave/dragonegg-x86_64-linux-gcc-4.5-self-host/llvm.src/lib/CodeGen/ScheduleDAG.cpp:471:
void llvm::ScheduleDAGTopologicalSort::InitDAGTopologicalSorting(): Assertion
`Node2Index[SU->NodeNum] > Node2Index[I->getSUnit()->NodeNum] && "Wrong
topological sorting"' failed.
Stack dump:
0. Running pass 'X86 DAG->DAG Instruction Selection' on function
'@c_invoke_pragma_handler'
I can try to get you the bitcode file if you like.
Ciao, Duncan.
>
> We don't have enough GR64_TC registers when calling a varargs function
> with 6 arguments. Since %al holds the number of vector registers used,
> only %r11 is available as a scratch register.
>
> This means that addressing modes using both base and index registers
> can't be folded into TCRETURNmi64.
>
> <rdar://problem/12282281>
>
> Modified:
> llvm/trunk/lib/Target/X86/X86ISelDAGToDAG.cpp
> llvm/trunk/lib/Target/X86/X86InstrCompiler.td
> llvm/trunk/lib/Target/X86/X86InstrInfo.td
> llvm/trunk/test/CodeGen/X86/tailcall-64.ll
>
> Modified: llvm/trunk/lib/Target/X86/X86ISelDAGToDAG.cpp
> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/X86/X86ISelDAGToDAG.cpp?rev=163761&r1=163760&r2=163761&view=diff
> ==============================================================================
> --- llvm/trunk/lib/Target/X86/X86ISelDAGToDAG.cpp (original)
> +++ llvm/trunk/lib/Target/X86/X86ISelDAGToDAG.cpp Wed Sep 12 19:25:00 2012
> @@ -204,6 +204,9 @@
> bool SelectAddr(SDNode *Parent, SDValue N, SDValue &Base,
> SDValue &Scale, SDValue &Index, SDValue &Disp,
> SDValue &Segment);
> + bool SelectSingleRegAddr(SDNode *Parent, SDValue N, SDValue &Base,
> + SDValue &Scale, SDValue &Index, SDValue &Disp,
> + SDValue &Segment);
> bool SelectLEAAddr(SDValue N, SDValue &Base,
> SDValue &Scale, SDValue &Index, SDValue &Disp,
> SDValue &Segment);
> @@ -1319,6 +1322,31 @@
> return true;
> }
>
> +/// SelectSingleRegAddr - Like SelectAddr, but reject any address that would
> +/// require more than one allocatable register.
> +///
> +/// This is used for a TCRETURNmi64 instruction when used to tail call a
> +/// variadic function with 6 arguments: Only %r11 is available from GR64_TC.
> +/// The other scratch register, %rax, is needed to pass in the number of vector
> +/// registers used in the variadic arguments.
> +///
> +bool X86DAGToDAGISel::SelectSingleRegAddr(SDNode *Parent, SDValue N,
> + SDValue &Base,
> + SDValue &Scale, SDValue &Index,
> + SDValue &Disp, SDValue &Segment) {
> + if (!SelectAddr(Parent, N, Base, Scale, Index, Disp, Segment))
> + return false;
> + // Anything %RIP relative is fine.
> + if (RegisterSDNode *Reg = dyn_cast<RegisterSDNode>(Base))
> + if (Reg->getReg() == X86::RIP)
> + return true;
> + // Check that the index register is 0.
> + if (RegisterSDNode *Reg = dyn_cast<RegisterSDNode>(Index))
> + if (Reg->getReg() == 0)
> + return true;
> + return false;
> +}
> +
> /// SelectScalarSSELoad - Match a scalar SSE load. In particular, we want to
> /// match a load whose top elements are either undef or zeros. The load flavor
> /// is derived from the type of N, which is either v4f32 or v2f64.
>
> Modified: llvm/trunk/lib/Target/X86/X86InstrCompiler.td
> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/X86/X86InstrCompiler.td?rev=163761&r1=163760&r2=163761&view=diff
> ==============================================================================
> --- llvm/trunk/lib/Target/X86/X86InstrCompiler.td (original)
> +++ llvm/trunk/lib/Target/X86/X86InstrCompiler.td Wed Sep 12 19:25:00 2012
> @@ -1041,7 +1041,13 @@
> (TCRETURNri64 ptr_rc_tailcall:$dst, imm:$off)>,
> Requires<[In64BitMode]>;
>
> -def : Pat<(X86tcret (load addr:$dst), imm:$off),
> +// When calling a variadic function with 6 arguments, 7 scratch registers are
> +// needed since %al holds the number of vector registers used. That leaves %r11
> +// as the only remaining GR64_TC register for the addressing mode.
> +//
> +// The single_reg_addr pattern rejects any addressing modes that would need
> +// more than one register.
> +def : Pat<(X86tcret (load single_reg_addr:$dst), imm:$off),
> (TCRETURNmi64 addr:$dst, imm:$off)>,
> Requires<[In64BitMode]>;
>
>
> Modified: llvm/trunk/lib/Target/X86/X86InstrInfo.td
> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/X86/X86InstrInfo.td?rev=163761&r1=163760&r2=163761&view=diff
> ==============================================================================
> --- llvm/trunk/lib/Target/X86/X86InstrInfo.td (original)
> +++ llvm/trunk/lib/Target/X86/X86InstrInfo.td Wed Sep 12 19:25:00 2012
> @@ -543,6 +543,10 @@
> def tls64baseaddr : ComplexPattern<i64, 5, "SelectTLSADDRAddr",
> [tglobaltlsaddr], []>;
>
> +// Same as addr, but reject addressing modes requiring more than one register.
> +def single_reg_addr : ComplexPattern<iPTR, 5, "SelectSingleRegAddr", [],
> + [SDNPWantParent]>;
> +
> //===----------------------------------------------------------------------===//
> // X86 Instruction Predicate Definitions.
> def HasCMov : Predicate<"Subtarget->hasCMov()">;
>
> Modified: llvm/trunk/test/CodeGen/X86/tailcall-64.ll
> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/X86/tailcall-64.ll?rev=163761&r1=163760&r2=163761&view=diff
> ==============================================================================
> --- llvm/trunk/test/CodeGen/X86/tailcall-64.ll (original)
> +++ llvm/trunk/test/CodeGen/X86/tailcall-64.ll Wed Sep 12 19:25:00 2012
> @@ -1,4 +1,4 @@
> -; RUN: llc < %s | FileCheck %s
> +; RUN: llc < %s -verify-machineinstrs | FileCheck %s
> target datalayout = "e-p:64:64:64-S128-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:64:64-f16:16:16-f32:32:32-f64:64:64-f128:128:128-v64:64:64-v128:128:128-a0:0:64-s0:64:64-f80:128:128-n8:16:32:64"
> target triple = "x86_64-apple-darwin11.4.0"
>
> @@ -93,4 +93,38 @@
> ret { i64, i64 } %mrv7
> }
>
> -
> +; <rdar://problem/12282281> Fold an indexed load into the tail call instruction.
> +; Calling a varargs function with 6 arguments requires 7 registers (%al is the
> +; vector count for varargs functions). This leaves %r11 as the only available
> +; scratch register.
> +;
> +; It is not possible to fold an indexed load into TCRETURNmi64 in that case.
> +;
> +; typedef int (*funcptr)(void*, ...);
> +; extern const funcptr funcs[];
> +; int f(int n) {
> +; return funcs[n](0, 0, 0, 0, 0, 0);
> +; }
> +;
> +; CHECK: rdar12282281
> +; CHECK: jmpq *%r11 # TAILCALL
> + at funcs = external constant [0 x i32 (i8*, ...)*]
> +
> +define i32 @rdar12282281(i32 %n) nounwind uwtable ssp {
> +entry:
> + %idxprom = sext i32 %n to i64
> + %arrayidx = getelementptr inbounds [0 x i32 (i8*, ...)*]* @funcs, i64 0, i64 %idxprom
> + %0 = load i32 (i8*, ...)** %arrayidx, align 8
> + %call = tail call i32 (i8*, ...)* %0(i8* null, i32 0, i32 0, i32 0, i32 0, i32 0) nounwind
> + ret i32 %call
> +}
> +
> +; Same thing, using a fixed offset. The load should foid.
> +; CHECK: rdar12282281fixed
> +; CHECK: jmpq *8(%r11) # TAILCALL
> +define i32 @rdar12282281fixed() nounwind uwtable ssp {
> +entry:
> + %0 = load i32 (i8*, ...)** getelementptr inbounds ([0 x i32 (i8*, ...)*]* @funcs, i64 0, i64 1), align 8
> + %call.i = tail call i32 (i8*, ...)* %0(i8* null, i32 0, i32 0, i32 0, i32 0, i32 0) nounwind
> + ret i32 %call.i
> +}
>
>
> _______________________________________________
> 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