maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

move code around and improve indentation, no functionality change. 

llvm-svn: 99831
This commit is contained in:
Chris Lattner 2010-03-29 20:35:01 +00:00
parent 7ec3d11d16
commit fafa57a82a
1 changed files with 116 additions and 118 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

234
llvm/lib/Support/Timer.cpp
View File

@ -55,22 +55,26 @@ namespace {
static TimerGroup *DefaultTimerGroup = 0; static TimerGroup *DefaultTimerGroup = 0;
static TimerGroup *getDefaultTimerGroup() { static TimerGroup *getDefaultTimerGroup() {
TimerGroup* tmp = DefaultTimerGroup; TimerGroup *tmp = DefaultTimerGroup;
sys::MemoryFence(); sys::MemoryFence();
if (tmp) return tmp;
llvm_acquire_global_lock();
tmp = DefaultTimerGroup;
if (!tmp) { if (!tmp) {
llvm_acquire_global_lock(); tmp = new TimerGroup("Miscellaneous Ungrouped Timers");
tmp = DefaultTimerGroup; sys::MemoryFence();
if (!tmp) { DefaultTimerGroup = tmp;
tmp = new TimerGroup("Miscellaneous Ungrouped Timers");
sys::MemoryFence();
DefaultTimerGroup = tmp;
}
llvm_release_global_lock();
} }
llvm_release_global_lock();
return tmp; return tmp;
} }
//===----------------------------------------------------------------------===//
// Timer Implementation
//===----------------------------------------------------------------------===//
Timer::Timer(const std::string &N) Timer::Timer(const std::string &N)
: Elapsed(0), UserTime(0), SystemTime(0), MemUsed(0), PeakMem(0), Name(N), : Elapsed(0), UserTime(0), SystemTime(0), MemUsed(0), PeakMem(0), Name(N),
Started(false), TG(getDefaultTimerGroup()) { Started(false), TG(getDefaultTimerGroup()) {
@ -89,7 +93,6 @@ Timer::Timer(const Timer &T) {
operator=(T); operator=(T);
} }
// Copy ctor, initialize with no TG member. // Copy ctor, initialize with no TG member.
Timer::Timer(bool, const Timer &T) { Timer::Timer(bool, const Timer &T) {
TG = T.TG; // Avoid assertion in operator= TG = T.TG; // Avoid assertion in operator=
@ -97,15 +100,14 @@ Timer::Timer(bool, const Timer &T) {
TG = 0; TG = 0;
} }
Timer::~Timer() { Timer::~Timer() {
if (TG) { if (!TG) return;
if (Started) {
Started = false; if (Started) {
TG->addTimerToPrint(*this); Started = false;
} TG->addTimerToPrint(*this);
TG->removeTimer();
} }
TG->removeTimer();
} }
static inline size_t getMemUsage() { static inline size_t getMemUsage() {
@ -129,17 +131,16 @@ static TimeRecord getTimeRecord(bool Start) {
ssize_t MemUsed = 0; ssize_t MemUsed = 0;
if (Start) { if (Start) {
MemUsed = getMemUsage(); MemUsed = getMemUsage();
sys::Process::GetTimeUsage(now,user,sys); sys::Process::GetTimeUsage(now, user, sys);
} else { } else {
sys::Process::GetTimeUsage(now,user,sys); sys::Process::GetTimeUsage(now, user, sys);
MemUsed = getMemUsage(); MemUsed = getMemUsage();
} }
Result.Elapsed = now.seconds() + now.microseconds() / 1000000.0; Result.Elapsed = now.seconds() + now.microseconds() / 1000000.0;
Result.UserTime = user.seconds() + user.microseconds() / 1000000.0; Result.UserTime = user.seconds() + user.microseconds() / 1000000.0;
Result.SystemTime = sys.seconds() + sys.microseconds() / 1000000.0; Result.SystemTime = sys.seconds() + sys.microseconds() / 1000000.0;
Result.MemUsed = MemUsed; Result.MemUsed = MemUsed;
return Result; return Result;
} }
@ -196,19 +197,51 @@ void Timer::addPeakMemoryMeasurement() {
(*I)->PeakMem = std::max((*I)->PeakMem, MemUsed-(*I)->PeakMemBase); (*I)->PeakMem = std::max((*I)->PeakMem, MemUsed-(*I)->PeakMemBase);
} }
static void printVal(double Val, double Total, raw_ostream &OS) {
if (Total < 1e-7) // Avoid dividing by zero...
OS << " ----- ";
else {
OS << " " << format("%7.4f", Val) << " (";
OS << format("%5.1f", Val*100/Total) << "%)";
}
}
void Timer::print(const Timer &Total, raw_ostream &OS) {
sys::SmartScopedLock<true> L(*TimerLock);
if (Total.UserTime)
printVal(UserTime, Total.UserTime, OS);
if (Total.SystemTime)
printVal(SystemTime, Total.SystemTime, OS);
if (Total.getProcessTime())
printVal(getProcessTime(), Total.getProcessTime(), OS);
printVal(Elapsed, Total.Elapsed, OS);
OS << " ";
if (Total.MemUsed) {
OS << format("%9lld", (long long)MemUsed) << " ";
}
if (Total.PeakMem) {
if (PeakMem) {
OS << format("%9lld", (long long)PeakMem) << " ";
} else
OS << " ";
}
OS << Name << "\n";
Started = false; // Once printed, don't print again
}
//===----------------------------------------------------------------------===// //===----------------------------------------------------------------------===//
// NamedRegionTimer Implementation // NamedRegionTimer Implementation
//===----------------------------------------------------------------------===// //===----------------------------------------------------------------------===//
namespace {
typedef std::map<std::string, Timer> Name2Timer; typedef std::map<std::string, Timer> Name2Timer;
typedef std::map<std::string, std::pair<TimerGroup, Name2Timer> > Name2Pair; typedef std::map<std::string, std::pair<TimerGroup, Name2Timer> > Name2Pair;
}
static ManagedStatic<Name2Timer> NamedTimers; static ManagedStatic<Name2Timer> NamedTimers;
static ManagedStatic<Name2Pair> NamedGroupedTimers; static ManagedStatic<Name2Pair> NamedGroupedTimers;
static Timer &getNamedRegionTimer(const std::string &Name) { static Timer &getNamedRegionTimer(const std::string &Name) {
@ -252,42 +285,6 @@ NamedRegionTimer::NamedRegionTimer(const std::string &Name,
// TimerGroup Implementation // TimerGroup Implementation
//===----------------------------------------------------------------------===// //===----------------------------------------------------------------------===//
static void printVal(double Val, double Total, raw_ostream &OS) {
if (Total < 1e-7) // Avoid dividing by zero...
OS << " ----- ";
else {
OS << " " << format("%7.4f", Val) << " (";
OS << format("%5.1f", Val*100/Total) << "%)";
}
}
void Timer::print(const Timer &Total, raw_ostream &OS) {
sys::SmartScopedLock<true> L(*TimerLock);
if (Total.UserTime)
printVal(UserTime, Total.UserTime, OS);
if (Total.SystemTime)
printVal(SystemTime, Total.SystemTime, OS);
if (Total.getProcessTime())
printVal(getProcessTime(), Total.getProcessTime(), OS);
printVal(Elapsed, Total.Elapsed, OS);
OS << " ";
if (Total.MemUsed) {
OS << format("%9lld", (long long)MemUsed) << " ";
}
if (Total.PeakMem) {
if (PeakMem) {
OS << format("%9lld", (long long)PeakMem) << " ";
} else
OS << " ";
}
OS << Name << "\n";
Started = false; // Once printed, don't print again
}
// GetLibSupportInfoOutputFile - Return a file stream to print our output on... // GetLibSupportInfoOutputFile - Return a file stream to print our output on...
raw_ostream * raw_ostream *
llvm::GetLibSupportInfoOutputFile() { llvm::GetLibSupportInfoOutputFile() {
@ -313,70 +310,71 @@ llvm::GetLibSupportInfoOutputFile() {
void TimerGroup::removeTimer() { void TimerGroup::removeTimer() {
sys::SmartScopedLock<true> L(*TimerLock); sys::SmartScopedLock<true> L(*TimerLock);
if (--NumTimers == 0 && !TimersToPrint.empty()) { // Print timing report... if (--NumTimers != 0 || TimersToPrint.empty())
// Sort the timers in descending order by amount of time taken... return; // Don't print timing report.
std::sort(TimersToPrint.begin(), TimersToPrint.end(),
std::greater<Timer>()); // Sort the timers in descending order by amount of time taken.
std::sort(TimersToPrint.begin(), TimersToPrint.end(),
std::greater<Timer>());
// Figure out how many spaces to indent TimerGroup name... // Figure out how many spaces to indent TimerGroup name.
unsigned Padding = (80-Name.length())/2; unsigned Padding = (80-Name.length())/2;
if (Padding > 80) Padding = 0; // Don't allow "negative" numbers if (Padding > 80) Padding = 0; // Don't allow "negative" numbers
raw_ostream *OutStream = GetLibSupportInfoOutputFile(); raw_ostream *OutStream = GetLibSupportInfoOutputFile();
++NumTimers; ++NumTimers;
{ // Scope to contain Total timer... don't allow total timer to drop us to { // Scope to contain Total timer... don't allow total timer to drop us to
// zero timers... // zero timers...
Timer Total("TOTAL"); Timer Total("TOTAL");
for (unsigned i = 0, e = TimersToPrint.size(); i != e; ++i) for (unsigned i = 0, e = TimersToPrint.size(); i != e; ++i)
Total.sum(TimersToPrint[i]); Total.sum(TimersToPrint[i]);
// Print out timing header... // Print out timing header...
*OutStream << "===" << std::string(73, '-') << "===\n" *OutStream << "===" << std::string(73, '-') << "===\n"
<< std::string(Padding, ' ') << Name << "\n" << std::string(Padding, ' ') << Name << "\n"
<< "===" << std::string(73, '-') << "===" << std::string(73, '-')
<< "===\n"; << "===\n";
// If this is not an collection of ungrouped times, print the total time. // If this is not an collection of ungrouped times, print the total time.
// Ungrouped timers don't really make sense to add up. We still print the // Ungrouped timers don't really make sense to add up. We still print the
// TOTAL line to make the percentages make sense. // TOTAL line to make the percentages make sense.
if (this != DefaultTimerGroup) { if (this != DefaultTimerGroup) {
*OutStream << " Total Execution Time: "; *OutStream << " Total Execution Time: ";
*OutStream << format("%5.4f", Total.getProcessTime()) << " seconds ("; *OutStream << format("%5.4f", Total.getProcessTime()) << " seconds (";
*OutStream << format("%5.4f", Total.getWallTime()) << " wall clock)\n"; *OutStream << format("%5.4f", Total.getWallTime()) << " wall clock)\n";
}
*OutStream << "\n";
if (Total.UserTime)
*OutStream << " ---User Time---";
if (Total.SystemTime)
*OutStream << " --System Time--";
if (Total.getProcessTime())
*OutStream << " --User+System--";
*OutStream << " ---Wall Time---";
if (Total.getMemUsed())
*OutStream << " ---Mem---";
if (Total.getPeakMem())
*OutStream << " -PeakMem-";
*OutStream << " --- Name ---\n";
// Loop through all of the timing data, printing it out...
for (unsigned i = 0, e = TimersToPrint.size(); i != e; ++i)
TimersToPrint[i].print(Total, *OutStream);
Total.print(Total, *OutStream);
*OutStream << '\n';
OutStream->flush();
} }
--NumTimers; *OutStream << "\n";
TimersToPrint.clear(); if (Total.UserTime)
*OutStream << " ---User Time---";
if (Total.SystemTime)
*OutStream << " --System Time--";
if (Total.getProcessTime())
*OutStream << " --User+System--";
*OutStream << " ---Wall Time---";
if (Total.getMemUsed())
*OutStream << " ---Mem---";
if (Total.getPeakMem())
*OutStream << " -PeakMem-";
*OutStream << " --- Name ---\n";
if (OutStream != &errs() && OutStream != &outs() && OutStream != &dbgs()) // Loop through all of the timing data, printing it out...
delete OutStream; // Close the file... for (unsigned i = 0, e = TimersToPrint.size(); i != e; ++i)
TimersToPrint[i].print(Total, *OutStream);
Total.print(Total, *OutStream);
*OutStream << '\n';
OutStream->flush();
} }
--NumTimers;
TimersToPrint.clear();
if (OutStream != &errs() && OutStream != &outs() && OutStream != &dbgs())
delete OutStream; // Close the file...
} }
void TimerGroup::addTimer() { void TimerGroup::addTimer() {