From 114ce854d1c75b9d544d75eccd33f3c3e6fa5723 Mon Sep 17 00:00:00 2001 From: Owen Anderson Date: Mon, 16 Jun 2008 07:10:49 +0000 Subject: [PATCH] Make indexing empty basic blocks an option for the moment. llvm-svn: 52306 --- lib/CodeGen/LiveIntervalAnalysis.cpp | 30 +++++++++++++++++++--------- 1 file changed, 21 insertions(+), 9 deletions(-) diff --git a/lib/CodeGen/LiveIntervalAnalysis.cpp b/lib/CodeGen/LiveIntervalAnalysis.cpp index 5bb3cfa4596..f265e639786 100644 --- a/lib/CodeGen/LiveIntervalAnalysis.cpp +++ b/lib/CodeGen/LiveIntervalAnalysis.cpp @@ -44,6 +44,8 @@ static cl::opt SplitAtBB("split-intervals-at-bb", cl::init(true), cl::Hidden); static cl::opt SplitLimit("split-limit", cl::init(-1), cl::Hidden); +static cl::opt EmptyBBIndex("empty-bb-index", + cl::init(false), cl::Hidden); STATISTIC(numIntervals, "Number of original intervals"); STATISTIC(numIntervalsAfter, "Number of intervals after coalescing"); @@ -100,15 +102,23 @@ void LiveIntervals::computeNumbering() { i2miMap_.push_back(I); MIIndex += InstrSlots::NUM; } - - if (StartIdx == MIIndex) { - // Empty MBB - MIIndex += InstrSlots::NUM; - i2miMap_.push_back(0); - } + // Set the MBB2IdxMap entry for this MBB. - MBB2IdxMap[MBB->getNumber()] = std::make_pair(StartIdx, MIIndex - 1); - Idx2MBBMap.push_back(std::make_pair(StartIdx, MBB)); + if (!EmptyBBIndex) { + MBB2IdxMap[MBB->getNumber()] = (StartIdx == MIIndex) + ? std::make_pair(StartIdx, StartIdx) // Empty MBB + : std::make_pair(StartIdx, MIIndex - 1); + Idx2MBBMap.push_back(std::make_pair(StartIdx, MBB)); + } else { + if (StartIdx == MIIndex) { + // Empty MBB + MIIndex += InstrSlots::NUM; + i2miMap_.push_back(0); + } + + MBB2IdxMap[MBB->getNumber()] = std::make_pair(StartIdx, MIIndex - 1); + Idx2MBBMap.push_back(std::make_pair(StartIdx, MBB)); + } } std::sort(Idx2MBBMap.begin(), Idx2MBBMap.end(), Idx2MBBCompare()); @@ -665,7 +675,9 @@ void LiveIntervals::computeIntervals() { MIIndex += InstrSlots::NUM; } - if (MBB->begin() == miEnd) MIIndex += InstrSlots::NUM; // Empty MBB + if (EmptyBBIndex) { + if (MBB->begin() == miEnd) MIIndex += InstrSlots::NUM; // Empty MBB + } } }