Index: include/llvm/CodeGen/ScoreboardHazardRecognizer.h =================================================================== --- include/llvm/CodeGen/ScoreboardHazardRecognizer.h +++ include/llvm/CodeGen/ScoreboardHazardRecognizer.h @@ -24,7 +24,7 @@ namespace llvm { class InstrItineraryData; -class ScheduleDAG; +class ScheduleDAGInstrs; class SUnit; class ScoreboardHazardRecognizer : public ScheduleHazardRecognizer { @@ -94,7 +94,7 @@ // Itinerary data for the target. const InstrItineraryData *ItinData; - const ScheduleDAG *DAG; + const ScheduleDAGInstrs *DAG; /// IssueWidth - Max issue per cycle. 0=Unknown. unsigned IssueWidth = 0; @@ -107,7 +107,7 @@ public: ScoreboardHazardRecognizer(const InstrItineraryData *ItinData, - const ScheduleDAG *DAG, + const ScheduleDAGInstrs *DAG, const char *ParentDebugType = ""); /// atIssueLimit - Return true if no more instructions may be issued in this Index: include/llvm/CodeGen/TargetInstrInfo.h =================================================================== --- include/llvm/CodeGen/TargetInstrInfo.h +++ include/llvm/CodeGen/TargetInstrInfo.h @@ -51,6 +51,7 @@ class ScheduleHazardRecognizer; class SDNode; class SelectionDAG; +class ScheduleDAGInstrs;; class RegScavenger; class TargetRegisterClass; class TargetRegisterInfo; @@ -1238,13 +1239,13 @@ /// scheduling the machine instructions before register allocation. virtual ScheduleHazardRecognizer * CreateTargetMIHazardRecognizer(const InstrItineraryData *, - const ScheduleDAG *DAG) const; + const ScheduleDAGInstrs *DAG) const; /// Allocate and return a hazard recognizer to use for this target when /// scheduling the machine instructions after register allocation. virtual ScheduleHazardRecognizer * CreateTargetPostRAHazardRecognizer(const InstrItineraryData *, - const ScheduleDAG *DAG) const; + const ScheduleDAGInstrs *DAG) const; /// Allocate and return a hazard recognizer to use for by non-scheduling /// passes. Index: lib/CodeGen/ScoreboardHazardRecognizer.cpp =================================================================== --- lib/CodeGen/ScoreboardHazardRecognizer.cpp +++ lib/CodeGen/ScoreboardHazardRecognizer.cpp @@ -14,7 +14,7 @@ //===----------------------------------------------------------------------===// #include "llvm/CodeGen/ScoreboardHazardRecognizer.h" -#include "llvm/CodeGen/ScheduleDAG.h" +#include "llvm/CodeGen/ScheduleDAGInstrs.h" #include "llvm/CodeGen/TargetInstrInfo.h" #include "llvm/Config/llvm-config.h" #include "llvm/MC/MCInstrDesc.h" @@ -29,7 +29,7 @@ #define DEBUG_TYPE DebugType ScoreboardHazardRecognizer::ScoreboardHazardRecognizer( - const InstrItineraryData *II, const ScheduleDAG *SchedDAG, + const InstrItineraryData *II, const ScheduleDAGInstrs *SchedDAG, const char *ParentDebugType) : ScheduleHazardRecognizer(), DebugType(ParentDebugType), ItinData(II), DAG(SchedDAG) { Index: lib/CodeGen/TargetInstrInfo.cpp =================================================================== --- lib/CodeGen/TargetInstrInfo.cpp +++ lib/CodeGen/TargetInstrInfo.cpp @@ -1019,7 +1019,7 @@ // Default implementation of CreateTargetMIHazardRecognizer. ScheduleHazardRecognizer *TargetInstrInfo:: CreateTargetMIHazardRecognizer(const InstrItineraryData *II, - const ScheduleDAG *DAG) const { + const ScheduleDAGInstrs *DAG) const { return (ScheduleHazardRecognizer *) new ScoreboardHazardRecognizer(II, DAG, "misched"); } @@ -1027,7 +1027,7 @@ // Default implementation of CreateTargetPostRAHazardRecognizer. ScheduleHazardRecognizer *TargetInstrInfo:: CreateTargetPostRAHazardRecognizer(const InstrItineraryData *II, - const ScheduleDAG *DAG) const { + const ScheduleDAGInstrs *DAG) const { return (ScheduleHazardRecognizer *) new ScoreboardHazardRecognizer(II, DAG, "post-RA-sched"); }