[llvm-branch-commits] [llvm-branch] r91064 - in /llvm/branches/Apple/Leela-M1: lib/CodeGen/SimpleRegisterCoalescing.cpp test/CodeGen/X86/2009-12-12-CoalescerBug.ll

[Evan Cheng]

Author: evancheng
Date: Thu Dec 10 15:19:51 2009
New Revision: 91064

URL: http://llvm.org/viewvc/llvm-project?rev=91064&view=rev
Log:
Merged 91061.

Added:
    llvm/branches/Apple/Leela-M1/test/CodeGen/X86/2009-12-12-CoalescerBug.ll
Modified:
    llvm/branches/Apple/Leela-M1/lib/CodeGen/SimpleRegisterCoalescing.cpp

Modified: llvm/branches/Apple/Leela-M1/lib/CodeGen/SimpleRegisterCoalescing.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/Apple/Leela-M1/lib/CodeGen/SimpleRegisterCoalescing.cpp?rev=91064&r1=91063&r2=91064&view=diff

==============================================================================
--- llvm/branches/Apple/Leela-M1/lib/CodeGen/SimpleRegisterCoalescing.cpp (original)
+++ llvm/branches/Apple/Leela-M1/lib/CodeGen/SimpleRegisterCoalescing.cpp Thu Dec 10 15:19:51 2009
@@ -1312,7 +1312,13 @@
                       "coalesced to another register.\n");
       return false;  // Not coalescable.
     }
-  } else if (!tii_->isMoveInstr(*CopyMI, SrcReg, DstReg, SrcSubIdx, DstSubIdx)){
+  } else if (tii_->isMoveInstr(*CopyMI, SrcReg, DstReg, SrcSubIdx, DstSubIdx)) {
+    if (SrcSubIdx && DstSubIdx && SrcSubIdx != DstSubIdx) {
+      // e.g. %reg16404:1<def> = MOV8rr %reg16412:2<kill>
+      Again = true;
+      return false;  // Not coalescable.
+    }
+  } else {
     llvm_unreachable("Unrecognized copy instruction!");
   }
 

Added: llvm/branches/Apple/Leela-M1/test/CodeGen/X86/2009-12-12-CoalescerBug.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/Apple/Leela-M1/test/CodeGen/X86/2009-12-12-CoalescerBug.ll?rev=91064&view=auto

==============================================================================
--- llvm/branches/Apple/Leela-M1/test/CodeGen/X86/2009-12-12-CoalescerBug.ll (added)
+++ llvm/branches/Apple/Leela-M1/test/CodeGen/X86/2009-12-12-CoalescerBug.ll Thu Dec 10 15:19:51 2009
@@ -0,0 +1,40 @@
+; RUN: llc < %s -mtriple=i386-apple-darwin | FileCheck %s
+
+define i32 @do_loop(i32* nocapture %sdp, i32* nocapture %ddp, i8* %mdp, i8* nocapture %cdp, i32 %w) nounwind readonly optsize ssp {
+entry:
+  br label %bb
+
+bb:                                               ; preds = %bb5, %entry
+  %mask.1.in = load i8* undef, align 1            ; <i8> [#uses=3]
+  %0 = icmp eq i8 %mask.1.in, 0                   ; <i1> [#uses=1]
+  br i1 %0, label %bb5, label %bb1
+
+bb1:                                              ; preds = %bb
+  br i1 undef, label %bb2, label %bb3
+
+bb2:                                              ; preds = %bb1
+  %1 = zext i8 %mask.1.in to i32                  ; <i32> [#uses=1]
+  %2 = zext i8 undef to i32                       ; <i32> [#uses=1]
+  %3 = mul i32 %2, %1                             ; <i32> [#uses=1]
+  %4 = add i32 %3, 1                              ; <i32> [#uses=1]
+  %5 = add i32 %4, 0                              ; <i32> [#uses=1]
+  %6 = lshr i32 %5, 8                             ; <i32> [#uses=1]
+  %retval12.i = trunc i32 %6 to i8                ; <i8> [#uses=1]
+  br label %bb3
+
+bb3:                                              ; preds = %bb2, %bb1
+; CHECK: %bb3
+; CHECK: testb %al, %al
+  %mask.0.in = phi i8 [ %retval12.i, %bb2 ], [ %mask.1.in, %bb1 ] ; <i8> [#uses=1]
+  %7 = icmp eq i8 %mask.0.in, 0                   ; <i1> [#uses=1]
+  br i1 %7, label %bb5, label %bb4
+
+bb4:                                              ; preds = %bb3
+  br label %bb5
+
+bb5:                                              ; preds = %bb4, %bb3, %bb
+  br i1 undef, label %bb6, label %bb
+
+bb6:                                              ; preds = %bb5
+  ret i32 undef
+}