diff options
-rw-r--r-- | include/llvm/Target/TargetInstrInfo.h | 6 | ||||
-rw-r--r-- | lib/CodeGen/MachineScheduler.cpp | 3 |
2 files changed, 4 insertions, 5 deletions
diff --git a/include/llvm/Target/TargetInstrInfo.h b/include/llvm/Target/TargetInstrInfo.h index 97fddeeca1..95d2b916aa 100644 --- a/include/llvm/Target/TargetInstrInfo.h +++ b/include/llvm/Target/TargetInstrInfo.h @@ -628,9 +628,9 @@ public: return false; } - virtual bool shouldScheduleLoadsNear(MachineInstr *FirstLdSt, - MachineInstr *SecondLdSt, - unsigned NumLoads) const { + virtual bool shouldClusterLoads(MachineInstr *FirstLdSt, + MachineInstr *SecondLdSt, + unsigned NumLoads) const { return false; } diff --git a/lib/CodeGen/MachineScheduler.cpp b/lib/CodeGen/MachineScheduler.cpp index b05d7263cd..ee8138c0c4 100644 --- a/lib/CodeGen/MachineScheduler.cpp +++ b/lib/CodeGen/MachineScheduler.cpp @@ -754,8 +754,7 @@ void LoadClusterMutation::clusterNeighboringLoads(ArrayRef<SUnit*> Loads, 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(" |