/**************************************************************************
*
* Copyright 2012 VMware, Inc.
+ * Copyright 2013 Intel, Inc.
* All Rights Reserved.
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
: baseGpuTime(0),
baseCpuTime(0),
minCpuTime(1000),
+ baseVsizeUsage(0),
+ baseRssUsage(0),
cpuTimes(false),
gpuTimes(true),
- pixelsDrawn(false)
+ pixelsDrawn(false),
+ memoryUsage(false)
{
}
{
}
-void Profiler::setup(bool cpuTimes_, bool gpuTimes_, bool pixelsDrawn_)
+void Profiler::setup(bool cpuTimes_, bool gpuTimes_, bool pixelsDrawn_, bool memoryUsage_)
{
cpuTimes = cpuTimes_;
gpuTimes = gpuTimes_;
pixelsDrawn = pixelsDrawn_;
+ memoryUsage = memoryUsage_;
- std::cout << "# call no gpu_start gpu_dura cpu_start cpu_dura pixels program name" << std::endl;
+ std::cout << "# call no gpu_start gpu_dura cpu_start cpu_dura vsize_start vsize_dura rss_start rss_dura pixels program name" << std::endl;
}
int64_t Profiler::getBaseCpuTime()
return baseGpuTime;
}
+int64_t Profiler::getBaseVsizeUsage()
+{
+ return baseVsizeUsage;
+}
+
+int64_t Profiler::getBaseRssUsage()
+{
+ return baseRssUsage;
+}
+
void Profiler::setBaseCpuTime(int64_t cpuStart)
{
baseCpuTime = cpuStart;
baseGpuTime = gpuStart;
}
+void Profiler::setBaseVsizeUsage(int64_t vsizeStart)
+{
+ baseVsizeUsage = vsizeStart;
+}
+
+void Profiler::setBaseRssUsage(int64_t rssStart)
+{
+ baseRssUsage = rssStart;
+}
+
bool Profiler::hasBaseTimes()
{
return baseCpuTime != 0 || baseGpuTime != 0;
unsigned program,
int64_t pixels,
int64_t gpuStart, int64_t gpuDuration,
- int64_t cpuStart, int64_t cpuDuration)
+ int64_t cpuStart, int64_t cpuDuration,
+ int64_t vsizeStart, int64_t vsizeDuration,
+ int64_t rssStart, int64_t rssDuration)
{
if (gpuTimes && gpuStart) {
gpuStart -= baseGpuTime;
}
if (cpuTimes && cpuStart) {
- double cpuTimeScale = 1.0E9 / os::timeFrequency;
- cpuStart = (cpuStart - baseCpuTime) * cpuTimeScale;
- cpuDuration = cpuDuration * cpuTimeScale;
+ cpuStart = cpuStart - baseCpuTime;
if (cpuDuration < minCpuTime) {
return;
pixels = 0;
}
+ if (!memoryUsage || !vsizeStart || !rssStart) {
+ vsizeStart = 0;
+ vsizeDuration = 0;
+ rssStart = 0;
+ rssDuration = 0;
+ }
+
std::cout << "call"
<< " " << no
<< " " << gpuStart
<< " " << gpuDuration
<< " " << cpuStart
<< " " << cpuDuration
+ << " " << vsizeStart
+ << " " << vsizeDuration
+ << " " << rssStart
+ << " " << rssDuration
<< " " << pixels
<< " " << program
<< " " << name
std::string type;
static int64_t lastGpuTime;
static int64_t lastCpuTime;
+ static int64_t lastVsizeUsage;
+ static int64_t lastRssUsage;
if (in[0] == '#' || strlen(in) < 4)
return;
- if (profile->programs.size() == 0 && profile->cpuCalls.size() == 0 && profile->frames.size() == 0) {
+ if (profile->programs.size() == 0 && profile->calls.size() == 0 && profile->frames.size() == 0) {
lastGpuTime = 0;
lastCpuTime = 0;
+ lastVsizeUsage = 0;
+ lastRssUsage = 0;
}
line >> type;
if (type.compare("call") == 0) {
- Profile::DrawCall draw;
- unsigned program;
-
- line >> draw.no
- >> draw.gpuStart
- >> draw.gpuDuration
- >> draw.cpuStart
- >> draw.cpuDuration
- >> draw.pixels
- >> program
- >> draw.name;
-
- if (lastGpuTime < draw.gpuStart + draw.gpuDuration) {
- lastGpuTime = draw.gpuStart + draw.gpuDuration;
+ Profile::Call call;
+
+ line >> call.no
+ >> call.gpuStart
+ >> call.gpuDuration
+ >> call.cpuStart
+ >> call.cpuDuration
+ >> call.vsizeStart
+ >> call.vsizeDuration
+ >> call.rssStart
+ >> call.rssDuration
+ >> call.pixels
+ >> call.program
+ >> call.name;
+
+ if (lastGpuTime < call.gpuStart + call.gpuDuration) {
+ lastGpuTime = call.gpuStart + call.gpuDuration;
}
- if (lastCpuTime < draw.cpuStart + draw.cpuDuration) {
- lastCpuTime = draw.cpuStart + draw.cpuDuration;
+ if (lastCpuTime < call.cpuStart + call.cpuDuration) {
+ lastCpuTime = call.cpuStart + call.cpuDuration;
}
- if (draw.pixels >= 0) {
- if (profile->programs.size() <= program) {
- profile->programs.resize(program + 1);
- }
+ if (lastVsizeUsage < call.vsizeStart + call.vsizeDuration) {
+ lastVsizeUsage = call.vsizeStart + call.vsizeDuration;
+ }
- profile->programs[program].cpuTotal += draw.cpuDuration;
- profile->programs[program].gpuTotal += draw.gpuDuration;
- profile->programs[program].pixelTotal += draw.pixels;
- profile->programs[program].drawCalls.push_back(draw);
+ if (lastRssUsage < call.rssStart + call.rssDuration) {
+ lastRssUsage = call.rssStart + call.rssDuration;
}
- Profile::CpuCall call;
- call.no = draw.no;
- call.name = draw.name;
- call.cpuStart = draw.cpuStart;
- call.cpuDuration = draw.cpuDuration;
- profile->cpuCalls.push_back(call);
+ profile->calls.push_back(call);
+
+ if (call.pixels >= 0) {
+ if (profile->programs.size() <= call.program) {
+ profile->programs.resize(call.program + 1);
+ }
+
+ Profile::Program& program = profile->programs[call.program];
+ program.cpuTotal += call.cpuDuration;
+ program.gpuTotal += call.gpuDuration;
+ program.pixelTotal += call.pixels;
+ program.vsizeTotal += call.vsizeDuration;
+ program.rssTotal += call.rssDuration;
+ program.calls.push_back((unsigned int)(profile->calls.size() - 1));
+ }
} else if (type.compare("frame_end") == 0) {
Profile::Frame frame;
- frame.no = profile->frames.size();
+ frame.no = unsigned(profile->frames.size());
if (frame.no == 0) {
frame.gpuStart = 0;
frame.cpuStart = 0;
+ frame.vsizeStart = 0;
+ frame.rssStart = 0;
+ frame.calls.begin = 0;
} else {
frame.gpuStart = profile->frames.back().gpuStart + profile->frames.back().gpuDuration;
frame.cpuStart = profile->frames.back().cpuStart + profile->frames.back().cpuDuration;
+ frame.vsizeStart = profile->frames.back().vsizeStart + profile->frames.back().vsizeDuration;
+ frame.rssStart = profile->frames.back().rssStart + profile->frames.back().rssDuration;
+ frame.calls.begin = profile->frames.back().calls.end + 1;
}
frame.gpuDuration = lastGpuTime - frame.gpuStart;
frame.cpuDuration = lastCpuTime - frame.cpuStart;
+ frame.vsizeDuration = lastVsizeUsage - frame.vsizeStart;
+ frame.rssDuration = lastRssUsage - frame.rssStart;
+ frame.calls.end = (unsigned int)(profile->calls.size() - 1);
+
profile->frames.push_back(frame);
}
}