diff options
| author | Jakob Stoklund Olesen <stoklund@2pi.dk> | 2012-09-13 00:25:00 +0000 |
|---|---|---|
| committer | Jakob Stoklund Olesen <stoklund@2pi.dk> | 2012-09-13 00:25:00 +0000 |
| commit | bfacef45eb217477c76049ff48549217822e478e (patch) | |
| tree | 830f167a6212d7092290d9c81a7636f74785c624 /llvm/lib/Target | |
| parent | edf22edca014b5e347cb138cad5d21b6203fa38d (diff) | |
| download | bcm5719-llvm-bfacef45eb217477c76049ff48549217822e478e.tar.gz bcm5719-llvm-bfacef45eb217477c76049ff48549217822e478e.zip | |
Don't fold indexed loads into TCRETURNmi64.
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>
llvm-svn: 163761
Diffstat (limited to 'llvm/lib/Target')
| -rw-r--r-- | llvm/lib/Target/X86/X86ISelDAGToDAG.cpp | 28 | ||||
| -rw-r--r-- | llvm/lib/Target/X86/X86InstrCompiler.td | 8 | ||||
| -rw-r--r-- | llvm/lib/Target/X86/X86InstrInfo.td | 4 |
3 files changed, 39 insertions, 1 deletions
diff --git a/llvm/lib/Target/X86/X86ISelDAGToDAG.cpp b/llvm/lib/Target/X86/X86ISelDAGToDAG.cpp index d836c29d6bd..88cfe10dfa9 100644 --- a/llvm/lib/Target/X86/X86ISelDAGToDAG.cpp +++ b/llvm/lib/Target/X86/X86ISelDAGToDAG.cpp @@ -204,6 +204,9 @@ namespace { 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 @@ bool X86DAGToDAGISel::SelectAddr(SDNode *Parent, SDValue N, SDValue &Base, 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. diff --git a/llvm/lib/Target/X86/X86InstrCompiler.td b/llvm/lib/Target/X86/X86InstrCompiler.td index 99c2b8f955e..25404557856 100644 --- a/llvm/lib/Target/X86/X86InstrCompiler.td +++ b/llvm/lib/Target/X86/X86InstrCompiler.td @@ -1041,7 +1041,13 @@ def : Pat<(X86tcret ptr_rc_tailcall:$dst, imm:$off), (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]>; diff --git a/llvm/lib/Target/X86/X86InstrInfo.td b/llvm/lib/Target/X86/X86InstrInfo.td index aabb442f741..b91f3c0ad45 100644 --- a/llvm/lib/Target/X86/X86InstrInfo.td +++ b/llvm/lib/Target/X86/X86InstrInfo.td @@ -543,6 +543,10 @@ def tls64addr : ComplexPattern<i64, 5, "SelectTLSADDRAddr", 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()">; |

