[llvm-commits] [llvm] r167753 - in /llvm/trunk: include/llvm/Target/TargetInstrInfo.h lib/CodeGen/MachineScheduler.cpp

[Andrew Trick]

Author: atrick
Date: Mon Nov 12 15:28:10 2012
New Revision: 167753

URL: http://llvm.org/viewvc/llvm-project?rev=167753&view=rev
Log:
misched: rename interfaceto avoid gcc warnings

Modified:
    llvm/trunk/include/llvm/Target/TargetInstrInfo.h
    llvm/trunk/lib/CodeGen/MachineScheduler.cpp

Modified: llvm/trunk/include/llvm/Target/TargetInstrInfo.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/Target/TargetInstrInfo.h?rev=167753&r1=167752&r2=167753&view=diff
==============================================================================
--- llvm/trunk/include/llvm/Target/TargetInstrInfo.h (original)
+++ llvm/trunk/include/llvm/Target/TargetInstrInfo.h Mon Nov 12 15:28:10 2012
@@ -628,9 +628,9 @@
     return false;
   }
 
-  virtual bool shouldScheduleLoadsNear(MachineInstr *FirstLdSt,
-                                       MachineInstr *SecondLdSt,
-                                       unsigned NumLoads) const {
+  virtual bool shouldClusterLoads(MachineInstr *FirstLdSt,
+                                  MachineInstr *SecondLdSt,
+                                  unsigned NumLoads) const {
     return false;
   }
 

Modified: llvm/trunk/lib/CodeGen/MachineScheduler.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/MachineScheduler.cpp?rev=167753&r1=167752&r2=167753&view=diff
==============================================================================
--- llvm/trunk/lib/CodeGen/MachineScheduler.cpp (original)
+++ llvm/trunk/lib/CodeGen/MachineScheduler.cpp Mon Nov 12 15:28:10 2012
@@ -754,8 +754,7 @@
 
     SUnit *SUa = LoadRecords[Idx].SU;
     SUnit *SUb = LoadRecords[Idx+1].SU;
-    if (TII->shouldScheduleLoadsNear(SUa->getInstr(), SUb->getInstr(),
-                                     ClusterLength)
+    if (TII->shouldClusterLoads(SUa->getInstr(), SUb->getInstr(), ClusterLength)
         && DAG->addEdge(SUb, SDep(SUa, SDep::Cluster))) {
 
       DEBUG(dbgs() << "Cluster loads SU(" << SUa->NodeNum << ") - SU("