Remove the canCombineSubRegIndices() target hook.

[oota-llvm.git] / lib / Target / Hexagon / HexagonVLIWPacketizer.cpp

diff --git a/lib/Target/Hexagon/HexagonVLIWPacketizer.cpp b/lib/Target/Hexagon/HexagonVLIWPacketizer.cpp
index 6b9e3bfa2ff92de148b030c7f50a0e22c040085d..3d5f685028eade1b124e2294ba67f2e3e5cec7f2 100644 (file)
--- a/lib/Target/Hexagon/HexagonVLIWPacketizer.cpp
+++ b/lib/Target/Hexagon/HexagonVLIWPacketizer.cpp
@@ -102,7 +102,7 @@ namespace {
                           MachineDominatorTree &MDT);
 
     // initPacketizerState - initialize some internal flags.
-    void initPacketizerState(void);
+    void initPacketizerState();
 
     // ignorePseudoInstruction - Ignore bundling of pseudo instructions.
     bool ignorePseudoInstruction(MachineInstr *MI, MachineBasicBlock *MBB);
@@ -290,7 +290,8 @@ bool HexagonPacketizerList::IsCallDependent(MachineInstr* MI,
                                           unsigned DepReg) {
 
   const HexagonInstrInfo *QII = (const HexagonInstrInfo *) TII;
-  const HexagonRegisterInfo* QRI = (const HexagonRegisterInfo *) TM.getRegisterInfo();
+  const HexagonRegisterInfo* QRI =
+              (const HexagonRegisterInfo *) TM.getRegisterInfo();
 
   // Check for lr dependence
   if (DepReg == QRI->getRARegister()) {
@@ -365,7 +366,8 @@ bool HexagonPacketizerList::isNewValueInst(MachineInstr* MI) {
 // to the new-value stores.
 
 bool HexagonPacketizerList::IsNewifyStore (MachineInstr* MI) {
-  const HexagonRegisterInfo* QRI = (const HexagonRegisterInfo *) TM.getRegisterInfo();
+  const HexagonRegisterInfo* QRI =
+                          (const HexagonRegisterInfo *) TM.getRegisterInfo();
   switch (MI->getOpcode())
   {
     // store byte
@@ -2166,6 +2168,7 @@ static bool GetPredicateSense(MachineInstr* MI,
                               const HexagonInstrInfo *QII) {
 
   switch (MI->getOpcode()) {
+  default: llvm_unreachable("Unknown predicate sense of the instruction");
   case Hexagon::TFR_cPt:
   case Hexagon::TFR_cdnPt:
   case Hexagon::TFRI_cPt:
@@ -2508,9 +2511,6 @@ static bool GetPredicateSense(MachineInstr* MI,
   case Hexagon::STh_GP_cdnNotPt_V4 :
   case Hexagon::STw_GP_cdnNotPt_V4 :
     return false;
-
-  default:
-    assert (false && "Unknown predicate sense of the instruction");
   }
   // return *some value* to avoid compiler warning
   return false;
@@ -2708,7 +2708,6 @@ bool HexagonPacketizerList::isDotNewInst(MachineInstr* MI) {
   case Hexagon::STh_GP_cdnNotPt_V4:
   case Hexagon::STw_GP_cdnPt_V4:
   case Hexagon::STw_GP_cdnNotPt_V4:
-
     return true;
   }
   return false;
@@ -2791,12 +2790,13 @@ bool HexagonPacketizerList::CanPromoteToNewValueStore( MachineInstr *MI,
       GetStoreValueOperand(MI).getReg() != DepReg)
     return false;
 
-  const HexagonRegisterInfo* QRI = (const HexagonRegisterInfo *) TM.getRegisterInfo();
+  const HexagonRegisterInfo* QRI = 
+                            (const HexagonRegisterInfo *) TM.getRegisterInfo();
   const MCInstrDesc& MCID = PacketMI->getDesc();
   // first operand is always the result
 
   const HexagonInstrInfo *QII = (const HexagonInstrInfo *) TII;
-  const TargetRegisterClass* PacketRC = QII->getRegClass(MCID, 0, QRI);
+  const TargetRegisterClass* PacketRC = QII->getRegClass(MCID, 0, QRI, MF);
 
   // if there is already an store in the packet, no can do new value store
   // Arch Spec 3.4.4.2.
@@ -2837,17 +2837,17 @@ bool HexagonPacketizerList::CanPromoteToNewValueStore( MachineInstr *MI,
     return false;
   }
 
-  // If the source that feeds the store is predicated, new value store must also be
-  // also predicated.
+  // If the source that feeds the store is predicated, new value store must
+  // also be also predicated.
   if (QII->isPredicated(PacketMI)) {
     if (!QII->isPredicated(MI))
       return false;
 
     // Check to make sure that they both will have their predicates
     // evaluate identically
-    unsigned predRegNumSrc;
-    unsigned predRegNumDst;
-    const TargetRegisterClass* predRegClass;
+    unsigned predRegNumSrc = 0;
+    unsigned predRegNumDst = 0;
+    const TargetRegisterClass* predRegClass = NULL;
 
     // Get predicate register used in the source instruction
     for(unsigned opNum = 0; opNum < PacketMI->getNumOperands(); opNum++) {
@@ -2918,7 +2918,8 @@ bool HexagonPacketizerList::CanPromoteToNewValueStore( MachineInstr *MI,
 
     for(unsigned opNum = 0; opNum < MI->getNumOperands(); opNum++) {
       if (MI->getOperand(opNum).isReg() &&
-          TempSU->getInstr()->modifiesRegister(MI->getOperand(opNum).getReg(), QRI))
+          TempSU->getInstr()->modifiesRegister(MI->getOperand(opNum).getReg(),
+                                               QRI))
         return false;
     }
   }
@@ -2964,7 +2965,8 @@ bool HexagonPacketizerList::CanPromoteToNewValue( MachineInstr *MI,
                 MachineBasicBlock::iterator &MII)
 {
 
-  const HexagonRegisterInfo* QRI = (const HexagonRegisterInfo *) TM.getRegisterInfo();
+  const HexagonRegisterInfo* QRI =
+                            (const HexagonRegisterInfo *) TM.getRegisterInfo();
   if (!QRI->Subtarget.hasV4TOps() ||
       !IsNewifyStore(MI))
     return false;
@@ -3011,7 +3013,8 @@ bool HexagonPacketizerList::CanPromoteToDotNew( MachineInstr *MI,
     int NewOpcode = GetDotNewOp(MI->getOpcode());
     const MCInstrDesc &desc = QII->get(NewOpcode);
     DebugLoc dl;
-    MachineInstr *NewMI = MI->getParent()->getParent()->CreateMachineInstr(desc, dl);
+    MachineInstr *NewMI =
+                    MI->getParent()->getParent()->CreateMachineInstr(desc, dl);
     bool ResourcesAvailable = ResourceTracker->canReserveResources(NewMI);
     MI->getParent()->getParent()->DeleteMachineInstr(NewMI);
 
@@ -3153,7 +3156,7 @@ bool HexagonPacketizerList::ArePredicatesComplements (MachineInstr* MI1,
 }
 
 // initPacketizerState - Initialize packetizer flags
-void HexagonPacketizerList::initPacketizerState(void) {
+void HexagonPacketizerList::initPacketizerState() {
 
   Dependence = false;
   PromotedToDotNew = false;
@@ -3178,7 +3181,8 @@ bool HexagonPacketizerList::ignorePseudoInstruction(MachineInstr *MI,
   // If it doesn't, we ignore the instruction.
   const MCInstrDesc& TID = MI->getDesc();
   unsigned SchedClass = TID.getSchedClass();
-  const InstrStage* IS = ResourceTracker->getInstrItins()->beginStage(SchedClass);
+  const InstrStage* IS =
+                    ResourceTracker->getInstrItins()->beginStage(SchedClass);
   unsigned FuncUnits = IS->getUnits();
   return !FuncUnits;
 }
@@ -3217,7 +3221,8 @@ bool HexagonPacketizerList::isLegalToPacketizeTogether(SUnit *SUI, SUnit *SUJ) {
   MachineBasicBlock::iterator II = I;
 
   const unsigned FrameSize = MF.getFrameInfo()->getStackSize();
-  const HexagonRegisterInfo* QRI = (const HexagonRegisterInfo *) TM.getRegisterInfo();
+  const HexagonRegisterInfo* QRI =
+                      (const HexagonRegisterInfo *) TM.getRegisterInfo();
   const HexagonInstrInfo *QII = (const HexagonInstrInfo *) TII;
 
   // Inline asm cannot go in the packet.
@@ -3469,8 +3474,8 @@ bool HexagonPacketizerList::isLegalToPacketizeTogether(SUnit *SUI, SUnit *SUJ) {
       // 1. Two loads unless they are volatile.
       // 2. Two stores in V4 unless they are volatile.
       else if ((DepType == SDep::Order) &&
-               !I->hasVolatileMemoryRef() &&
-               !J->hasVolatileMemoryRef()) {
+               !I->hasOrderedMemoryRef() &&
+               !J->hasOrderedMemoryRef()) {
         if (QRI->Subtarget.hasV4TOps() &&
             // hexagonv4 allows dual store.
             MCIDI.mayStore() && MCIDJ.mayStore()) {
@@ -3536,8 +3541,7 @@ bool HexagonPacketizerList::isLegalToPacketizeTogether(SUnit *SUI, SUnit *SUJ) {
 // isLegalToPruneDependencies
 bool HexagonPacketizerList::isLegalToPruneDependencies(SUnit *SUI, SUnit *SUJ) {
   MachineInstr *I = SUI->getInstr();
-  MachineInstr *J = SUJ->getInstr();
-  assert(I && J && "Unable to packetize null instruction!");
+  assert(I && SUJ->getInstr() && "Unable to packetize null instruction!");
 
   const unsigned FrameSize = MF.getFrameInfo()->getStackSize();
 
@@ -3562,7 +3566,8 @@ bool HexagonPacketizerList::isLegalToPruneDependencies(SUnit *SUI, SUnit *SUJ) {
   return true;
 }
 
-MachineBasicBlock::iterator HexagonPacketizerList::addToPacket(MachineInstr *MI) {
+MachineBasicBlock::iterator
+HexagonPacketizerList::addToPacket(MachineInstr *MI) {
 
     MachineBasicBlock::iterator MII = MI;
     MachineBasicBlock *MBB = MI->getParent();
@@ -3595,7 +3600,8 @@ MachineBasicBlock::iterator HexagonPacketizerList::addToPacket(MachineInstr *MI)
             && (!tryAllocateResourcesForConstExt(nvjMI)
                 || !ResourceTracker->canReserveResources(nvjMI)))
         || // For non-extended instruction, no need to allocate extra 4 bytes.
-        (!QII->isExtended(nvjMI) && !ResourceTracker->canReserveResources(nvjMI)))
+        (!QII->isExtended(nvjMI) && 
+              !ResourceTracker->canReserveResources(nvjMI)))
       {
         endPacket(MBB, MI);
         // A new and empty packet starts.