[llvm-commits] CVS: llvm/lib/Support/Timer.cpp
Chris Lattner
lattner at cs.uiuc.edu
Mon Nov 18 15:48:00 PST 2002
Changes in directory llvm/lib/Support:
Timer.cpp updated: 1.9 -> 1.10
---
Log message:
Add peak memory usage measurement capability
Add (currently disabled) faciility to try to filter out pool allocation overhead from memory usage stats
---
Diffs of the changes:
Index: llvm/lib/Support/Timer.cpp
diff -u llvm/lib/Support/Timer.cpp:1.9 llvm/lib/Support/Timer.cpp:1.10
--- llvm/lib/Support/Timer.cpp:1.9 Mon Nov 4 15:06:54 2002
+++ llvm/lib/Support/Timer.cpp Mon Nov 18 15:47:09 2002
@@ -15,6 +15,12 @@
#include <algorithm>
#include <functional>
+// getNumBytesToNotCount - This function is supposed to return the number of
+// bytes that are to be considered not allocated, even though malloc thinks they
+// are allocated.
+//
+static unsigned getNumBytesToNotCount();
+
static TimerGroup *DefaultTimerGroup = 0;
static TimerGroup *getDefaultTimerGroup() {
if (DefaultTimerGroup) return DefaultTimerGroup;
@@ -22,13 +28,13 @@
}
Timer::Timer(const std::string &N)
- : Elapsed(0), UserTime(0), SystemTime(0), MemUsed(0), Name(N),
+ : Elapsed(0), UserTime(0), SystemTime(0), MemUsed(0), PeakMem(0), Name(N),
Started(false), TG(getDefaultTimerGroup()) {
TG->addTimer();
}
Timer::Timer(const std::string &N, TimerGroup &tg)
- : Elapsed(0), UserTime(0), SystemTime(0), MemUsed(0), Name(N),
+ : Elapsed(0), UserTime(0), SystemTime(0), MemUsed(0), PeakMem(0), Name(N),
Started(false), TG(&tg) {
TG->addTimer();
}
@@ -58,42 +64,70 @@
}
}
+static long getMemUsage() {
+ struct mallinfo MI = mallinfo();
+ return MI.uordblks/*+MI.hblkhd-getNumBytesToNotCount()*/;
+}
+
struct TimeRecord {
double Elapsed, UserTime, SystemTime;
long MemUsed;
};
-static TimeRecord getTimeRecord() {
+static TimeRecord getTimeRecord(bool Start) {
struct rusage RU;
struct timeval T;
+ long MemUsed;
+ if (Start) {
+ MemUsed = getMemUsage();
+ if (getrusage(RUSAGE_SELF, &RU))
+ perror("getrusage call failed: -time-passes info incorrect!");
+ }
gettimeofday(&T, 0);
- if (getrusage(RUSAGE_SELF, &RU)) {
- perror("getrusage call failed: -time-passes info incorrect!");
+
+ if (!Start) {
+ MemUsed = getMemUsage();
+ if (getrusage(RUSAGE_SELF, &RU))
+ perror("getrusage call failed: -time-passes info incorrect!");
}
TimeRecord Result;
Result.Elapsed = T.tv_sec + T.tv_usec/1000000.0;
Result.UserTime = RU.ru_utime.tv_sec + RU.ru_utime.tv_usec/1000000.0;
Result.SystemTime = RU.ru_stime.tv_sec + RU.ru_stime.tv_usec/1000000.0;
- Result.MemUsed = mallinfo().uordblks;
+ Result.MemUsed = MemUsed;
+
return Result;
}
+static std::vector<Timer*> ActiveTimers;
+
void Timer::startTimer() {
Started = true;
- TimeRecord TR = getTimeRecord();
+ TimeRecord TR = getTimeRecord(true);
Elapsed -= TR.Elapsed;
UserTime -= TR.UserTime;
SystemTime -= TR.SystemTime;
MemUsed -= TR.MemUsed;
+ PeakMemBase = TR.MemUsed;
+ ActiveTimers.push_back(this);
}
void Timer::stopTimer() {
- TimeRecord TR = getTimeRecord();
+ TimeRecord TR = getTimeRecord(false);
Elapsed += TR.Elapsed;
UserTime += TR.UserTime;
SystemTime += TR.SystemTime;
MemUsed += TR.MemUsed;
+
+ if (ActiveTimers.back() == this) {
+ ActiveTimers.pop_back();
+ } else {
+ std::vector<Timer*>::iterator I =
+ std::find(ActiveTimers.begin(), ActiveTimers.end(), this);
+ assert(I != ActiveTimers.end() && "stop but no startTimer?");
+ ActiveTimers.erase(I);
+ }
}
void Timer::sum(const Timer &T) {
@@ -101,8 +135,22 @@
UserTime += T.UserTime;
SystemTime += T.SystemTime;
MemUsed += T.MemUsed;
+ PeakMem += T.PeakMem;
+}
+
+/// addPeakMemoryMeasurement - This method should be called whenever memory
+/// usage needs to be checked. It adds a peak memory measurement to the
+/// currently active timers, which will be printed when the timer group prints
+///
+void Timer::addPeakMemoryMeasurement() {
+ long MemUsed = getMemUsage();
+
+ for (std::vector<Timer*>::iterator I = ActiveTimers.begin(),
+ E = ActiveTimers.end(); I != E; ++I)
+ (*I)->PeakMem = std::max((*I)->PeakMem, MemUsed-(*I)->PeakMemBase);
}
+
//===----------------------------------------------------------------------===//
// TimerGroup Implementation
//===----------------------------------------------------------------------===//
@@ -127,6 +175,12 @@
if (Total.MemUsed)
fprintf(stderr, " %8ld ", MemUsed);
+ if (Total.PeakMem) {
+ if (PeakMem)
+ fprintf(stderr, " %8ld ", PeakMem);
+ else
+ fprintf(stderr, " ");
+ }
std::cerr << Name << "\n";
Started = false; // Once printed, don't print again
@@ -168,6 +222,8 @@
std::cerr << " ---Wall Time---";
if (Total.getMemUsed())
std::cerr << " ---Mem---";
+ if (Total.getPeakMem())
+ std::cerr << " -PeakMem-";
std::cerr << " --- Name ---\n";
// Loop through all of the timing data, printing it out...
@@ -187,4 +243,61 @@
delete DefaultTimerGroup;
DefaultTimerGroup = 0;
}
+}
+
+
+
+#if (__GNUC__ == 3) && (__GNUC_MINOR__ == 2) && (__GNUC_PATCHLEVEL__ == 0)
+// If we have GCC 3.2.0, we can calculate pool allocation bookkeeping info
+#define HAVE_POOL
+extern "C" {
+ // Taken from GCC 3.2's stl_alloc.h file:
+ enum {_ALIGN = 8, _MAX_BYTES = 128, NFREE = _MAX_BYTES / _ALIGN};
+ struct FreeList { FreeList *Next; };
+
+ FreeList *_ZNSt24__default_alloc_templateILb1ELi0EE12_S_free_listE[NFREE];
+ char *_ZNSt24__default_alloc_templateILb1ELi0EE13_S_start_freeE;
+ char *_ZNSt24__default_alloc_templateILb1ELi0EE11_S_end_freeE;
+ size_t _ZNSt24__default_alloc_templateILb1ELi0EE12_S_heap_sizeE;
+
+ // Make the symbols possible to use...
+ FreeList* (&TheFreeList)[NFREE] = _ZNSt24__default_alloc_templateILb1ELi0EE12_S_free_listE;
+ char * &StartFree = _ZNSt24__default_alloc_templateILb1ELi0EE13_S_start_freeE;
+ char * &EndFree = _ZNSt24__default_alloc_templateILb1ELi0EE11_S_end_freeE;
+ size_t &HeapSize = _ZNSt24__default_alloc_templateILb1ELi0EE12_S_heap_sizeE;
+}
+#endif
+
+// getNumBytesToNotCount - This function is supposed to return the number of
+// bytes that are to be considered not allocated, even though malloc thinks they
+// are allocated.
+//
+static unsigned getNumBytesToNotCount() {
+#ifdef HAVE_POOL
+ // If we have GCC 3.2.0, we can subtract off pool allocation bookkeeping info
+
+ // Size of the free slab section...
+ unsigned FreePoolMem = (unsigned)(EndFree-StartFree);
+
+ // Walk all of the free lists, adding memory to the free counter whenever we
+ // have a free bucket.
+ for (unsigned i = 0; i != NFREE; ++i) {
+ unsigned NumEntries = 0;
+ for (FreeList *FL = TheFreeList[i]; FL; ++NumEntries, FL = FL->Next)
+ /*empty*/ ;
+
+#if 0
+ if (NumEntries)
+ std::cerr << " For Size[" << (i+1)*_ALIGN << "]: " << NumEntries
+ << " Free entries\n";
+#endif
+ FreePoolMem += NumEntries*(i+1)*_ALIGN;
+ }
+ return FreePoolMem;
+
+#else
+#warning "Don't know how to avoid pool allocation accounting overhead for this"
+#warning " compiler: Space usage numbers (with -time-passes) may be off!"
+ return 0;
+#endif
}
More information about the llvm-commits
mailing list