projects
/
oota-llvm.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Pass a std::uinque_ptr to ParseAssembly to make the ownership explicit. NFC.
[oota-llvm.git]
/
lib
/
Support
/
Timer.cpp
diff --git
a/lib/Support/Timer.cpp
b/lib/Support/Timer.cpp
index bf4595484981e9dcaa92337fd5ac5ca31218e35f..210bda754e74957db524630e2b1c18830702a707 100644
(file)
--- a/
lib/Support/Timer.cpp
+++ b/
lib/Support/Timer.cpp
@@
-12,16
+12,16
@@
//===----------------------------------------------------------------------===//
#include "llvm/Support/Timer.h"
//===----------------------------------------------------------------------===//
#include "llvm/Support/Timer.h"
+#include "llvm/ADT/StringMap.h"
#include "llvm/Support/CommandLine.h"
#include "llvm/Support/Debug.h"
#include "llvm/Support/CommandLine.h"
#include "llvm/Support/Debug.h"
+#include "llvm/Support/FileSystem.h"
+#include "llvm/Support/Format.h"
#include "llvm/Support/ManagedStatic.h"
#include "llvm/Support/ManagedStatic.h"
+#include "llvm/Support/Mutex.h"
+#include "llvm/Support/MutexGuard.h"
+#include "llvm/Support/Process.h"
#include "llvm/Support/raw_ostream.h"
#include "llvm/Support/raw_ostream.h"
-#include "llvm/Support/Format.h"
-#include "llvm/System/Mutex.h"
-#include "llvm/System/Process.h"
-#include "llvm/ADT/OwningPtr.h"
-#include "llvm/ADT/STLExtras.h"
-#include "llvm/ADT/StringMap.h"
using namespace llvm;
// CreateInfoOutputFile - Return a file stream to print our output on.
using namespace llvm;
// CreateInfoOutputFile - Return a file stream to print our output on.
@@
-67,8
+67,8
@@
raw_ostream *llvm::CreateInfoOutputFile() {
// compensate for this, the test-suite Makefiles have code to delete the
// info output file before running commands which write to it.
std::string Error;
// compensate for this, the test-suite Makefiles have code to delete the
// info output file before running commands which write to it.
std::string Error;
- raw_ostream *Result = new raw_fd_ostream(
OutputFilename.c_str(),
-
Error, raw_fd_ostream::F_Append
);
+ raw_ostream *Result = new raw_fd_ostream(
+
OutputFilename.c_str(), Error, sys::fs::F_Append | sys::fs::F_Text
);
if (Error.empty())
return Result;
if (Error.empty())
return Result;
@@
-79,20
+79,19
@@
raw_ostream *llvm::CreateInfoOutputFile() {
}
}
-static TimerGroup *DefaultTimerGroup =
0
;
+static TimerGroup *DefaultTimerGroup =
nullptr
;
static TimerGroup *getDefaultTimerGroup() {
TimerGroup *tmp = DefaultTimerGroup;
sys::MemoryFence();
if (tmp) return tmp;
static TimerGroup *getDefaultTimerGroup() {
TimerGroup *tmp = DefaultTimerGroup;
sys::MemoryFence();
if (tmp) return tmp;
-
llvm_acquire_global_lock(
);
+
sys::SmartScopedLock<true> Lock(*TimerLock
);
tmp = DefaultTimerGroup;
if (!tmp) {
tmp = new TimerGroup("Miscellaneous Ungrouped Timers");
sys::MemoryFence();
DefaultTimerGroup = tmp;
}
tmp = DefaultTimerGroup;
if (!tmp) {
tmp = new TimerGroup("Miscellaneous Ungrouped Timers");
sys::MemoryFence();
DefaultTimerGroup = tmp;
}
- llvm_release_global_lock();
return tmp;
}
return tmp;
}
@@
-102,7
+101,7
@@
static TimerGroup *getDefaultTimerGroup() {
//===----------------------------------------------------------------------===//
void Timer::init(StringRef N) {
//===----------------------------------------------------------------------===//
void Timer::init(StringRef N) {
- assert(
TG == 0
&& "Timer already initialized");
+ assert(
!TG
&& "Timer already initialized");
Name.assign(N.begin(), N.end());
Started = false;
TG = getDefaultTimerGroup();
Name.assign(N.begin(), N.end());
Started = false;
TG = getDefaultTimerGroup();
@@
-110,7
+109,7
@@
void Timer::init(StringRef N) {
}
void Timer::init(StringRef N, TimerGroup &tg) {
}
void Timer::init(StringRef N, TimerGroup &tg) {
- assert(
TG == 0
&& "Timer already initialized");
+ assert(
!TG
&& "Timer already initialized");
Name.assign(N.begin(), N.end());
Started = false;
TG = &tg;
Name.assign(N.begin(), N.end());
Started = false;
TG = &tg;
@@
-169,10
+168,8
@@
void Timer::stopTimer() {
static void printVal(double Val, double Total, raw_ostream &OS) {
if (Total < 1e-7) // Avoid dividing by zero.
OS << " ----- ";
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) << "%)";
- }
+ else
+ OS << format(" %7.4f (%5.1f%%)", Val, Val*100/Total);
}
void TimeRecord::print(const TimeRecord &Total, raw_ostream &OS) const {
}
void TimeRecord::print(const TimeRecord &Total, raw_ostream &OS) const {
@@
-187,7
+184,7
@@
void TimeRecord::print(const TimeRecord &Total, raw_ostream &OS) const {
OS << " ";
if (Total.getMemUsed())
OS << " ";
if (Total.getMemUsed())
- OS << format("%9
lld", (long long)getMemUsed()) << " "
;
+ OS << format("%9
" PRId64 " ", (int64_t)getMemUsed())
;
}
}
@@
-239,11
+236,11
@@
static Timer &getNamedRegionTimer(StringRef Name) {
NamedRegionTimer::NamedRegionTimer(StringRef Name,
bool Enabled)
NamedRegionTimer::NamedRegionTimer(StringRef Name,
bool Enabled)
- : TimeRegion(!Enabled ?
0
: &getNamedRegionTimer(Name)) {}
+ : TimeRegion(!Enabled ?
nullptr
: &getNamedRegionTimer(Name)) {}
NamedRegionTimer::NamedRegionTimer(StringRef Name, StringRef GroupName,
bool Enabled)
NamedRegionTimer::NamedRegionTimer(StringRef Name, StringRef GroupName,
bool Enabled)
- : TimeRegion(!Enabled ?
0 : &NamedGroupedTimers->get(Name, GroupName))
{}
+ : TimeRegion(!Enabled ?
nullptr : &NamedGroupedTimers->get(Name, GroupName))
{}
//===----------------------------------------------------------------------===//
// TimerGroup Implementation
//===----------------------------------------------------------------------===//
// TimerGroup Implementation
@@
-251,10
+248,10
@@
NamedRegionTimer::NamedRegionTimer(StringRef Name, StringRef GroupName,
/// TimerGroupList - This is the global list of TimerGroups, maintained by the
/// TimerGroup ctor/dtor and is protected by the TimerLock lock.
/// TimerGroupList - This is the global list of TimerGroups, maintained by the
/// TimerGroup ctor/dtor and is protected by the TimerLock lock.
-static TimerGroup *TimerGroupList =
0
;
+static TimerGroup *TimerGroupList =
nullptr
;
TimerGroup::TimerGroup(StringRef name)
TimerGroup::TimerGroup(StringRef name)
- : Name(name.begin(), name.end()), FirstTimer(
0
) {
+ : Name(name.begin(), name.end()), FirstTimer(
nullptr
) {
// Add the group to TimerGroupList.
sys::SmartScopedLock<true> L(*TimerLock);
// Add the group to TimerGroupList.
sys::SmartScopedLock<true> L(*TimerLock);
@@
-268,7
+265,7
@@
TimerGroup::TimerGroup(StringRef name)
TimerGroup::~TimerGroup() {
// If the timer group is destroyed before the timers it owns, accumulate and
// print the timing data.
TimerGroup::~TimerGroup() {
// If the timer group is destroyed before the timers it owns, accumulate and
// print the timing data.
- while (FirstTimer
!= 0
)
+ while (FirstTimer)
removeTimer(*FirstTimer);
// Remove the group from the TimerGroupList.
removeTimer(*FirstTimer);
// Remove the group from the TimerGroupList.
@@
-286,7
+283,7
@@
void TimerGroup::removeTimer(Timer &T) {
if (T.Started)
TimersToPrint.push_back(std::make_pair(T.Time, T.Name));
if (T.Started)
TimersToPrint.push_back(std::make_pair(T.Time, T.Name));
- T.TG =
0
;
+ T.TG =
nullptr
;
// Unlink the timer from our list.
*T.Prev = T.Next;
// Unlink the timer from our list.
*T.Prev = T.Next;
@@
-295,7
+292,7
@@
void TimerGroup::removeTimer(Timer &T) {
// Print the report when all timers in this group are destroyed if some of
// them were started.
// Print the report when all timers in this group are destroyed if some of
// them were started.
- if (FirstTimer
!= 0
|| TimersToPrint.empty())
+ if (FirstTimer || TimersToPrint.empty())
return;
raw_ostream *OutStream = CreateInfoOutputFile();
return;
raw_ostream *OutStream = CreateInfoOutputFile();
@@
-316,8
+313,8
@@
void TimerGroup::addTimer(Timer &T) {
void TimerGroup::PrintQueuedTimers(raw_ostream &OS) {
// Sort the timers in descending order by amount of time taken.
void TimerGroup::PrintQueuedTimers(raw_ostream &OS) {
// Sort the timers in descending order by amount of time taken.
-
array_pod_
sort(TimersToPrint.begin(), TimersToPrint.end());
-
+
std::
sort(TimersToPrint.begin(), TimersToPrint.end());
+
TimeRecord Total;
for (unsigned i = 0, e = TimersToPrint.size(); i != e; ++i)
Total += TimersToPrint[i].first;
TimeRecord Total;
for (unsigned i = 0, e = TimersToPrint.size(); i != e; ++i)
Total += TimersToPrint[i].first;
@@
-333,11
+330,9
@@
void TimerGroup::PrintQueuedTimers(raw_ostream &OS) {
// 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
// TOTAL line to make the percentages make sense.
// 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
// TOTAL line to make the percentages make sense.
- if (this != DefaultTimerGroup) {
- OS << " Total Execution Time: ";
- OS << format("%5.4f", Total.getProcessTime()) << " seconds (";
- OS << format("%5.4f", Total.getWallTime()) << " wall clock)\n";
- }
+ if (this != DefaultTimerGroup)
+ OS << format(" Total Execution Time: %5.4f seconds (%5.4f wall clock)\n",
+ Total.getProcessTime(), Total.getWallTime());
OS << '\n';
if (Total.getUserTime())
OS << '\n';
if (Total.getUserTime())