aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--lib/CodeGen/InstrSched/SchedPriorities.cpp20
-rw-r--r--lib/Target/SparcV9/InstrSched/SchedPriorities.cpp20
2 files changed, 4 insertions, 36 deletions
diff --git a/lib/CodeGen/InstrSched/SchedPriorities.cpp b/lib/CodeGen/InstrSched/SchedPriorities.cpp
index fe039cc2a7..c09f9fc24e 100644
--- a/lib/CodeGen/InstrSched/SchedPriorities.cpp
+++ b/lib/CodeGen/InstrSched/SchedPriorities.cpp
@@ -18,24 +18,9 @@
* 7/30/01 - Vikram Adve - Created
***************************************************************************/
-//************************** System Include Files **************************/
-
-#include <hash_map>
-#include <vector>
-#include <algorithm>
-#include <sys/types.h>
-
-//*************************** User Include Files ***************************/
-
-#include "llvm/Method.h"
-#include "llvm/CodeGen/MachineInstr.h"
-#include "llvm/CodeGen/InstrScheduling.h"
#include "llvm/CodeGen/SchedPriorities.h"
-//************************* Forward Declarations ***************************/
-
-/*ctor*/
SchedPriorities::SchedPriorities(const Method* method,
const SchedGraph* _graph)
: curTime(0),
@@ -219,7 +204,7 @@ SchedPriorities::getNextHighest(const SchedulingManager& S,
// it becomes empty.
nextChoice = candsAsHeap.getNode(mcands[nextIdx]);
if (getEarliestForNodeRef(nextChoice) > curTime
- || ! instrIsFeasible(S, nextChoice->getOpCode()))
+ || ! instrIsFeasible(S, nextChoice->getMachineInstr()->getOpCode()))
{
mcands.erase(mcands.begin() + nextIdx);
nextIdx = -1;
@@ -255,8 +240,7 @@ SchedPriorities::findSetWithMaxDelay(vector<candIndex>& mcands,
if (SchedDebugLevel >= Sched_PrintSchedTrace)
{
- printIndent(2);
- cout << "Cycle " << this->getTime() << ": "
+ cout << " Cycle " << this->getTime() << ": "
<< "Next highest delay = " << maxDelay << " : "
<< mcands.size() << " Nodes with this delay: ";
for (unsigned i=0; i < mcands.size(); i++)
diff --git a/lib/Target/SparcV9/InstrSched/SchedPriorities.cpp b/lib/Target/SparcV9/InstrSched/SchedPriorities.cpp
index fe039cc2a7..c09f9fc24e 100644
--- a/lib/Target/SparcV9/InstrSched/SchedPriorities.cpp
+++ b/lib/Target/SparcV9/InstrSched/SchedPriorities.cpp
@@ -18,24 +18,9 @@
* 7/30/01 - Vikram Adve - Created
***************************************************************************/
-//************************** System Include Files **************************/
-
-#include <hash_map>
-#include <vector>
-#include <algorithm>
-#include <sys/types.h>
-
-//*************************** User Include Files ***************************/
-
-#include "llvm/Method.h"
-#include "llvm/CodeGen/MachineInstr.h"
-#include "llvm/CodeGen/InstrScheduling.h"
#include "llvm/CodeGen/SchedPriorities.h"
-//************************* Forward Declarations ***************************/
-
-/*ctor*/
SchedPriorities::SchedPriorities(const Method* method,
const SchedGraph* _graph)
: curTime(0),
@@ -219,7 +204,7 @@ SchedPriorities::getNextHighest(const SchedulingManager& S,
// it becomes empty.
nextChoice = candsAsHeap.getNode(mcands[nextIdx]);
if (getEarliestForNodeRef(nextChoice) > curTime
- || ! instrIsFeasible(S, nextChoice->getOpCode()))
+ || ! instrIsFeasible(S, nextChoice->getMachineInstr()->getOpCode()))
{
mcands.erase(mcands.begin() + nextIdx);
nextIdx = -1;
@@ -255,8 +240,7 @@ SchedPriorities::findSetWithMaxDelay(vector<candIndex>& mcands,
if (SchedDebugLevel >= Sched_PrintSchedTrace)
{
- printIndent(2);
- cout << "Cycle " << this->getTime() << ": "
+ cout << " Cycle " << this->getTime() << ": "
<< "Next highest delay = " << maxDelay << " : "
<< mcands.size() << " Nodes with this delay: ";
for (unsigned i=0; i < mcands.size(); i++)