[llvm-commits] [llvm] r132471 - /llvm/trunk/lib/CodeGen/RegAllocFast.cpp

[Eli Friedman]

On Thu, Jun 2, 2011 at 11:35 AM, Jakob Stoklund Olesen <stoklund at 2pi.dk> wrote:
> Author: stoklund
> Date: Thu Jun  2 13:35:30 2011
> New Revision: 132471
>
> URL: http://llvm.org/viewvc/llvm-project?rev=132471&view=rev
> Log:
> Use RegisterClassInfo::getOrder in RAFast.
>
> This saves two virtual function calls and an Allocatable BitVector test,
> making RAFast run 2% faster.

This appears to be responsible for the failures on
http://smooshlab.apple.com:8013/builders/llvm-gcc-i386-darwin9-RA .

-Eli

> Modified:
>    llvm/trunk/lib/CodeGen/RegAllocFast.cpp
>
> Modified: llvm/trunk/lib/CodeGen/RegAllocFast.cpp
> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/RegAllocFast.cpp?rev=132471&r1=132470&r2=132471&view=diff
> ==============================================================================
> --- llvm/trunk/lib/CodeGen/RegAllocFast.cpp (original)
> +++ llvm/trunk/lib/CodeGen/RegAllocFast.cpp Thu Jun  2 13:35:30 2011
> @@ -13,6 +13,7 @@
>  //===----------------------------------------------------------------------===//
>
>  #define DEBUG_TYPE "regalloc"
> +#include "RegisterClassInfo.h"
>  #include "llvm/BasicBlock.h"
>  #include "llvm/CodeGen/MachineFunctionPass.h"
>  #include "llvm/CodeGen/MachineInstr.h"
> @@ -58,6 +59,7 @@
>     MachineRegisterInfo *MRI;
>     const TargetRegisterInfo *TRI;
>     const TargetInstrInfo *TII;
> +    RegisterClassInfo RegClassInfo;
>
>     // Basic block currently being allocated.
>     MachineBasicBlock *MBB;
> @@ -499,14 +501,12 @@
>     }
>   }
>
> -  TargetRegisterClass::iterator AOB = RC->allocation_order_begin(*MF);
> -  TargetRegisterClass::iterator AOE = RC->allocation_order_end(*MF);
> +  ArrayRef<unsigned> AO = RegClassInfo.getOrder(RC);
>
>   // First try to find a completely free register.
> -  for (TargetRegisterClass::iterator I = AOB; I != AOE; ++I) {
> +  for (ArrayRef<unsigned>::iterator I = AO.begin(), E = AO.end(); I != E; ++I) {
>     unsigned PhysReg = *I;
> -    if (PhysRegState[PhysReg] == regFree && !UsedInInstr.test(PhysReg) &&
> -        Allocatable.test(PhysReg))
> +    if (PhysRegState[PhysReg] == regFree && !UsedInInstr.test(PhysReg))
>       return assignVirtToPhysReg(LRE, PhysReg);
>   }
>
> @@ -514,11 +514,7 @@
>                << RC->getName() << "\n");
>
>   unsigned BestReg = 0, BestCost = spillImpossible;
> -  for (TargetRegisterClass::iterator I = AOB; I != AOE; ++I) {
> -    if (!Allocatable.test(*I)) {
> -      DEBUG(dbgs() << "\tRegister " << *I << " is not allocatable.\n");
> -      continue;
> -    }
> +  for (ArrayRef<unsigned>::iterator I = AO.begin(), E = AO.end(); I != E; ++I) {
>     unsigned Cost = calcSpillCost(*I);
>     DEBUG(dbgs() << "\tRegister: " << *I << "\n");
>     DEBUG(dbgs() << "\tCost: " << Cost << "\n");
> @@ -1048,6 +1044,7 @@
>   TM = &Fn.getTarget();
>   TRI = TM->getRegisterInfo();
>   TII = TM->getInstrInfo();
> +  RegClassInfo.runOnMachineFunction(Fn);
>
>   UsedInInstr.resize(TRI->getNumRegs());
>   Allocatable = TRI->getAllocatableSet(*MF);
>
>
> _______________________________________________
> llvm-commits mailing list
> llvm-commits at cs.uiuc.edu
> http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits
>