projects
/
oota-llvm.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
on darwin<10, fallback to .weak_definition (PPC,X86)
[oota-llvm.git]
/
lib
/
CodeGen
/
ScoreboardHazardRecognizer.cpp
diff --git
a/lib/CodeGen/ScoreboardHazardRecognizer.cpp
b/lib/CodeGen/ScoreboardHazardRecognizer.cpp
index 7110b7566aba0e32c3e6afd81f7e444cf79e4ad5..2cd84d670aaa7a96234e73d1fa8c695574dbb4f3 100644
(file)
--- a/
lib/CodeGen/ScoreboardHazardRecognizer.cpp
+++ b/
lib/CodeGen/ScoreboardHazardRecognizer.cpp
@@
-72,10
+72,12
@@
ScoreboardHazardRecognizer(const InstrItineraryData *II,
ReservedScoreboard.reset(ScoreboardDepth);
RequiredScoreboard.reset(ScoreboardDepth);
ReservedScoreboard.reset(ScoreboardDepth);
RequiredScoreboard.reset(ScoreboardDepth);
+ // If MaxLookAhead is not set above, then we are not enabled.
if (!isEnabled())
DEBUG(dbgs() << "Disabled scoreboard hazard recognizer\n");
else {
if (!isEnabled())
DEBUG(dbgs() << "Disabled scoreboard hazard recognizer\n");
else {
- IssueWidth = ItinData->Props.IssueWidth;
+ // A nonempty itinerary must have a SchedModel.
+ IssueWidth = ItinData->SchedModel->IssueWidth;
DEBUG(dbgs() << "Using scoreboard hazard recognizer: Depth = "
<< ScoreboardDepth << '\n');
}
DEBUG(dbgs() << "Using scoreboard hazard recognizer: Depth = "
<< ScoreboardDepth << '\n');
}
@@
-87,6
+89,7
@@
void ScoreboardHazardRecognizer::Reset() {
ReservedScoreboard.reset();
}
ReservedScoreboard.reset();
}
+#if !defined(NDEBUG) || defined(LLVM_ENABLE_DUMP)
void ScoreboardHazardRecognizer::Scoreboard::dump() const {
dbgs() << "Scoreboard:\n";
void ScoreboardHazardRecognizer::Scoreboard::dump() const {
dbgs() << "Scoreboard:\n";
@@
-102,6
+105,7
@@
void ScoreboardHazardRecognizer::Scoreboard::dump() const {
dbgs() << '\n';
}
}
dbgs() << '\n';
}
}
+#endif
bool ScoreboardHazardRecognizer::atIssueLimit() const {
if (IssueWidth == 0)
bool ScoreboardHazardRecognizer::atIssueLimit() const {
if (IssueWidth == 0)