[llvm-branch-commits] [llvm-branch] r103255 - in /llvm/branches/Apple/Morbo: ./ lib/CodeGen/RegAllocLocal.cpp test/CodeGen/X86/2010-05-05-LocalAllocEarlyClobber.ll test/CodeGen/X86/2010-05-06-LocalInlineAsmClobber.ll

Jakob Stoklund Olesen stoklund at 2pi.dk
Fri May 7 08:35:38 PDT 2010 

Author: stoklund
Date: Fri May  7 10:35:37 2010
New Revision: 103255

URL: http://llvm.org/viewvc/llvm-project?rev=103255&view=rev
Log:
--- Merging r103233 into '.':
U    test/CodeGen/X86/2010-05-05-LocalAllocEarlyClobber.ll
A    test/CodeGen/X86/2010-05-06-LocalInlineAsmClobber.ll
U    lib/CodeGen/RegAllocLocal.cpp

Revert the fix for PR6520 - it caused other problems.

Added:
    llvm/branches/Apple/Morbo/test/CodeGen/X86/2010-05-06-LocalInlineAsmClobber.ll
      - copied unchanged from r103233, llvm/trunk/test/CodeGen/X86/2010-05-06-LocalInlineAsmClobber.ll
Modified:
    llvm/branches/Apple/Morbo/   (props changed)
    llvm/branches/Apple/Morbo/lib/CodeGen/RegAllocLocal.cpp
    llvm/branches/Apple/Morbo/test/CodeGen/X86/2010-05-05-LocalAllocEarlyClobber.ll

Propchange: llvm/branches/Apple/Morbo/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri May  7 10:35:37 2010
@@ -1,2 +1,2 @@
 /llvm/branches/Apple/Hermes:96832,96835,96858,96870,96876,96879
-/llvm/trunk:98602,98604,98612,98615-98616,98675,98686,98743-98744,98768,98773,98778,98780,98810,98835,98839,98845,98855,98862,98881,98920,98977,99032-99033,99043,99196,99223,99263,99282-99284,99306,99319-99321,99324,99336,99378,99418,99423,99429,99440,99455,99463,99465,99469,99484,99490,99492-99494,99507,99524,99537,99539-99540,99544,99570,99575,99598,99620,99629-99630,99636,99671,99692,99695,99697,99699,99722,99816,99835-99836,99845-99846,99848,99850,99855,99879,99881-99883,99895,99899,99910,99916,99919,99952-99954,99957,99959,99974-99975,99982,99984-99986,99988-99989,99992-99993,99995,99997-99999,100016,100035,100037-100038,100042,100044,100056,100072,100074,100078,100081-100090,100092,100094-100095,100116,100134,100184,100209,100214-100218,100220-100221,100223-100225,100231,100250,100252,100257,100261,100304,100332,100353,100384,100454-100455,100457,100466,100478,100480,100487,100494,100497,100505,100521,100553,100568,100584,100592,100609-100610,100636,100710,100736,10074
 2,100751,100768-100769,100771,100781,100797,100804,100837,100867,100892,100936-100937,101011,101023,101075,101077,101079,101081,101085,101154,101158,101162,101165,101181,101190,101202,101282,101303,101314-101315,101317,101331,101343,101383,101392,101420,101453,101604,101615,101629,101684-101686,101805,101845,101847,101851,101855,101870,101879,101897,101925,101930,101965,102120,102225,102358,102394,102405,102421,102454,102463,102468,102470,102481,102486,102504-102505,102508-102510,102513,102519,102524,102526,102531,102558,102646,102653,102655,102661-102662,102672,102743,102760,102770,102791,102948,102970,102980,103001,103133
+/llvm/trunk:98602,98604,98612,98615-98616,98675,98686,98743-98744,98768,98773,98778,98780,98810,98835,98839,98845,98855,98862,98881,98920,98977,99032-99033,99043,99196,99223,99263,99282-99284,99306,99319-99321,99324,99336,99378,99418,99423,99429,99440,99455,99463,99465,99469,99484,99490,99492-99494,99507,99524,99537,99539-99540,99544,99570,99575,99598,99620,99629-99630,99636,99671,99692,99695,99697,99699,99722,99816,99835-99836,99845-99846,99848,99850,99855,99879,99881-99883,99895,99899,99910,99916,99919,99952-99954,99957,99959,99974-99975,99982,99984-99986,99988-99989,99992-99993,99995,99997-99999,100016,100035,100037-100038,100042,100044,100056,100072,100074,100078,100081-100090,100092,100094-100095,100116,100134,100184,100209,100214-100218,100220-100221,100223-100225,100231,100250,100252,100257,100261,100304,100332,100353,100384,100454-100455,100457,100466,100478,100480,100487,100494,100497,100505,100521,100553,100568,100584,100592,100609-100610,100636,100710,100736,10074
 2,100751,100768-100769,100771,100781,100797,100804,100837,100867,100892,100936-100937,101011,101023,101075,101077,101079,101081,101085,101154,101158,101162,101165,101181,101190,101202,101282,101303,101314-101315,101317,101331,101343,101383,101392,101420,101453,101604,101615,101629,101684-101686,101805,101845,101847,101851,101855,101870,101879,101897,101925,101930,101965,102120,102225,102358,102394,102405,102421,102454,102463,102468,102470,102481,102486,102504-102505,102508-102510,102513,102519,102524,102526,102531,102558,102646,102653,102655,102661-102662,102672,102743,102760,102770,102791,102948,102970,102980,103001,103133,103233

Modified: llvm/branches/Apple/Morbo/lib/CodeGen/RegAllocLocal.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/Apple/Morbo/lib/CodeGen/RegAllocLocal.cpp?rev=103255&r1=103254&r2=103255&view=diff
==============================================================================
--- llvm/branches/Apple/Morbo/lib/CodeGen/RegAllocLocal.cpp (original)
+++ llvm/branches/Apple/Morbo/lib/CodeGen/RegAllocLocal.cpp Fri May  7 10:35:37 2010
@@ -839,18 +839,8 @@
     SmallVector<unsigned, 8> Kills;
     for (unsigned i = 0, e = MI->getNumOperands(); i != e; ++i) {
       MachineOperand &MO = MI->getOperand(i);
-      if (!MO.isReg()) continue;
-      unsigned Reg = MO.getReg();
-      if (!Reg) continue;
-
-      // Avoid allocating assigned early clobbers below.
-      if (MO.isEarlyClobber() && TargetRegisterInfo::isPhysicalRegister(Reg)) {
-        spillPhysReg(MBB, MI, Reg, true); // Spill any existing value in reg
-        PhysRegsUsed[Reg] = 0;            // It is free and reserved now
-        AddToPhysRegsUseOrder(Reg);
-      }
-
-      if (!MO.isKill()) continue;
+      if (!MO.isReg() || !MO.isKill()) continue;
+      
       if (!MO.isImplicit())
         Kills.push_back(MO.getReg());
       else if (!isReadModWriteImplicitKill(MI, MO.getReg()))

Modified: llvm/branches/Apple/Morbo/test/CodeGen/X86/2010-05-05-LocalAllocEarlyClobber.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/Apple/Morbo/test/CodeGen/X86/2010-05-05-LocalAllocEarlyClobber.ll?rev=103255&r1=103254&r2=103255&view=diff
==============================================================================
--- llvm/branches/Apple/Morbo/test/CodeGen/X86/2010-05-05-LocalAllocEarlyClobber.ll (original)
+++ llvm/branches/Apple/Morbo/test/CodeGen/X86/2010-05-05-LocalAllocEarlyClobber.ll Fri May  7 10:35:37 2010
@@ -1,5 +1,7 @@
 ; RUN: llc < %s -O0 -regalloc=local | FileCheck %s
 ; PR6520
+; XFAIL: *
+
 target datalayout = "e-p:32:32:32-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:32:64-f32:32:32-f64:32:64-v64:64:64-v128:128:128-a0:0:64-f80:128:128-n8:16:32"
 target triple = "i386-apple-darwin10.0.0"

More information about the llvm-branch-commits mailing list