[llvm-commits] [llvm] r68924 - in /llvm/trunk: lib/Target/X86/X86ISelDAGToDAG.cpp test/CodeGen/X86/2009-04-12-picrel.ll test/CodeGen/X86/abi-isel.ll

[Rafael Espindola]

Author: rafael
Date: Sun Apr 12 18:00:38 2009
New Revision: 68924

URL: http://llvm.org/viewvc/llvm-project?rev=68924&view=rev
Log:
In X86DAGToDAGISel::MatchWrapper, if base or index are set, avoid matching
only if symbolic addresses are RIP relatives.


Added:
    llvm/trunk/test/CodeGen/X86/2009-04-12-picrel.ll
Modified:
    llvm/trunk/lib/Target/X86/X86ISelDAGToDAG.cpp
    llvm/trunk/test/CodeGen/X86/abi-isel.ll

Modified: llvm/trunk/lib/Target/X86/X86ISelDAGToDAG.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/X86/X86ISelDAGToDAG.cpp?rev=68924&r1=68923&r2=68924&view=diff

==============================================================================
--- llvm/trunk/lib/Target/X86/X86ISelDAGToDAG.cpp (original)
+++ llvm/trunk/lib/Target/X86/X86ISelDAGToDAG.cpp Sun Apr 12 18:00:38 2009
@@ -787,11 +787,16 @@
   bool is64Bit = Subtarget->is64Bit();
   DOUT << "Wrapper: 64bit " << is64Bit;
   DOUT << " AM "; DEBUG(AM.dump()); DOUT << "\n";
+
   // Under X86-64 non-small code model, GV (and friends) are 64-bits.
-  // Also, base and index reg must be 0 in order to use rip as base.
-  if (is64Bit && (TM.getCodeModel() != CodeModel::Small ||
-                  AM.Base.Reg.getNode() || AM.IndexReg.getNode()))
+  if (is64Bit && (TM.getCodeModel() != CodeModel::Small))
+    return true;
+
+  // Base and index reg must be 0 in order to use rip as base.
+  bool canUsePICRel = !AM.Base.Reg.getNode() && !AM.IndexReg.getNode();
+  if (is64Bit && !canUsePICRel && TM.symbolicAddressesAreRIPRel())
     return true;
+
   if (AM.hasSymbolicDisplacement())
     return true;
   // If value is available in a register both base and index components have

Added: llvm/trunk/test/CodeGen/X86/2009-04-12-picrel.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/X86/2009-04-12-picrel.ll?rev=68924&view=auto

==============================================================================
--- llvm/trunk/test/CodeGen/X86/2009-04-12-picrel.ll (added)
+++ llvm/trunk/test/CodeGen/X86/2009-04-12-picrel.ll Sun Apr 12 18:00:38 2009
@@ -0,0 +1,13 @@
+; RUN: llvm-as < %s | llc -mtriple=x86_64-unknown-linux-gnu -march=x86-64 -relocation-model=static -code-model=small > %t
+; RUN: grep leaq %t | count 1
+
+ at dst = external global [131072 x i32]
+ at ptr = external global i32*
+
+define void @off01(i64 %i) nounwind {
+entry:
+	%.sum = add i64 %i, 16
+	%0 = getelementptr [131072 x i32]* @dst, i64 0, i64 %.sum
+	store i32* %0, i32** @ptr, align 8
+	ret void
+}

Modified: llvm/trunk/test/CodeGen/X86/abi-isel.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/X86/abi-isel.ll?rev=68924&r1=68923&r2=68924&view=diff

==============================================================================
--- llvm/trunk/test/CodeGen/X86/abi-isel.ll (original)
+++ llvm/trunk/test/CodeGen/X86/abi-isel.ll Sun Apr 12 18:00:38 2009
@@ -43,7 +43,7 @@
 ; RUN: grep movl %t | count 91
 ; RUN: not grep addl %t
 ; RUN: not grep subl %t
-; RUN: grep leaq %t | count 93
+; RUN: grep leaq %t | count 70
 ; RUN: grep movq %t | count 56
 ; RUN: grep addq %t | count 20
 ; RUN: grep subq %t | count 14
@@ -57,7 +57,7 @@
 ; RUN: not grep @PLT %t
 ; RUN: not grep @PLTOFF %t
 ; RUN: grep {call	\\\*} %t | count 10
-; RUN: grep {%rip} %t | count 162
+; RUN: grep {%rip} %t | count 139
 ; RUN: llvm-as < %s | llc -mtriple=x86_64-unknown-linux-gnu -march=x86-64 -relocation-model=pic -code-model=small > %t
 ; RUN: not grep leal %t
 ; RUN: grep movl %t | count 98
@@ -146,7 +146,7 @@
 ; RUN: grep movl %t | count 91
 ; RUN: not grep addl %t
 ; RUN: not grep subl %t
-; RUN: grep leaq %t | count 93
+; RUN: grep leaq %t | count 70
 ; RUN: grep movq %t | count 56
 ; RUN: grep addq %t | count 20
 ; RUN: grep subq %t | count 14
@@ -160,7 +160,7 @@
 ; RUN: not grep @PLT %t
 ; RUN: not grep @PLTOFF %t
 ; RUN: grep {call	\\\*} %t | count 10
-; RUN: grep {%rip} %t | count 162
+; RUN: grep {%rip} %t | count 139
 ; RUN: llvm-as < %s | llc -mtriple=x86_64-apple-darwin -march=x86-64 -relocation-model=dynamic-no-pic -code-model=small > %t
 ; RUN: not grep leal %t
 ; RUN: grep movl %t | count 95