/**************************************************************************
*
* Copyright 2012 VMware, Inc.
+ * Copyright 2013 Intel, Inc.
* All Rights Reserved.
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
struct Profile {
struct Call {
unsigned no;
+
+ unsigned program;
+
int64_t gpuStart;
int64_t gpuDuration;
+
int64_t cpuStart;
int64_t cpuDuration;
+
+ int64_t vsizeStart;
+ int64_t vsizeDuration;
+ int64_t rssStart;
+ int64_t rssDuration;
+
int64_t pixels;
- unsigned program;
- std::string name;
- typedef std::vector<Call>::iterator iterator;
- typedef std::vector<Call>::const_iterator const_iterator;
+ std::string name;
};
struct Frame {
unsigned no;
+
int64_t gpuStart;
int64_t gpuDuration;
+
int64_t cpuStart;
int64_t cpuDuration;
- std::vector<Call> calls;
+ int64_t vsizeStart;
+ int64_t vsizeDuration;
+ int64_t rssStart;
+ int64_t rssDuration;
+
+ /* Indices to profile->calls array */
+ struct {
+ unsigned begin;
+ unsigned end;
+ } calls;
+ };
+
+ struct Program {
+ Program() : gpuTotal(0), cpuTotal(0), pixelTotal(0) {}
+
+ uint64_t gpuTotal;
+ uint64_t cpuTotal;
+ uint64_t pixelTotal;
+ int64_t vsizeTotal;
+ int64_t rssTotal;
- typedef std::vector<Frame>::iterator iterator;
- typedef std::vector<Frame>::const_iterator const_iterator;
+ /* Indices to profile->calls array */
+ std::vector<unsigned> calls;
};
+ std::vector<Call> calls;
std::vector<Frame> frames;
+ std::vector<Program> programs;
};
class Profiler
Profiler();
~Profiler();
- void setup(bool cpuTimes_, bool gpuTimes_, bool pixelsDrawn_);
- void setBaseTimes(int64_t gpuStart, int64_t cpuStart);
- bool hasBaseTimes();
-
- void addFrameStart(unsigned no, int64_t gpuStart, int64_t cpuStart);
- void addFrameEnd(int64_t gpuEnd, int64_t cpuEnd);
+ void setup(bool cpuTimes_, bool gpuTimes_, bool pixelsDrawn_, bool memoryUsage_);
void addCall(unsigned no,
const char* name,
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);
+
+ void addFrameEnd();
+
+ bool hasBaseTimes();
+
+ void setBaseCpuTime(int64_t cpuStart);
+ void setBaseGpuTime(int64_t gpuStart);
+ void setBaseVsizeUsage(int64_t vsizeStart);
+ void setBaseRssUsage(int64_t rssStart);
+
+ int64_t getBaseCpuTime();
+ int64_t getBaseGpuTime();
+ int64_t getBaseVsizeUsage();
+ int64_t getBaseRssUsage();
static void parseLine(const char* line, Profile* profile);
private:
int64_t baseGpuTime;
int64_t baseCpuTime;
+ int64_t minCpuTime;
+ int64_t baseVsizeUsage;
+ int64_t baseRssUsage;
bool cpuTimes;
bool gpuTimes;
bool pixelsDrawn;
-
- struct {
- unsigned no;
- int64_t gpuStart;
- int64_t cpuStart;
- } lastFrame;
+ bool memoryUsage;
};
}