mirrors/bgfx
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

GL: Fixed GPU timer query.

Browse Source
This commit is contained in:
Branimir Karadžić 2015-08-16 15:37:46 -07:00
parent eb3dde0760
commit bc2077acb0
3 changed files with 105 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/renderer_d3d11.cpp
View File

@ -4798,7 +4798,7 @@ BX_PRAGMA_DIAGNOSTIC_POP();
); );
double elapsedCpuMs = double(elapsed)*toMs; double elapsedCpuMs = double(elapsed)*toMs;
tvm.printf(10, pos++, 0x8e, " Submitted: %4d (draw %4d, compute %4d) / CPU %3.4f [ms] %c GPU %3.4f [ms] (latency %d)" tvm.printf(10, pos++, 0x8e, " Submitted: %4d (draw %4d, compute %4d) / CPU %3.4f [ms] %c GPU %3.4f [ms] (latency %d) "
, _render->m_num , _render->m_num
, statsKeyType[0] , statsKeyType[0]
, statsKeyType[1] , statsKeyType[1]

71
src/renderer_gl.cpp
View File

@ -1764,7 +1764,7 @@ namespace bgfx { namespace gl
if (BX_ENABLED(BGFX_CONFIG_RENDERER_OPENGL) if (BX_ENABLED(BGFX_CONFIG_RENDERER_OPENGL)
&& m_timerQuerySupport) && m_timerQuerySupport)
{ {
m_queries.create(); m_gpuTimer.create();
} }
// Init reserved part of view name. // Init reserved part of view name.
@ -1795,7 +1795,7 @@ namespace bgfx { namespace gl
if (BX_ENABLED(BGFX_CONFIG_RENDERER_OPENGL) if (BX_ENABLED(BGFX_CONFIG_RENDERER_OPENGL)
&& m_timerQuerySupport) && m_timerQuerySupport)
{ {
m_queries.destroy(); m_gpuTimer.destroy();
} }
destroyMsaaFbo(); destroyMsaaFbo();
@ -2891,7 +2891,7 @@ namespace bgfx { namespace gl
FrameBufferGL m_frameBuffers[BGFX_CONFIG_MAX_FRAME_BUFFERS]; FrameBufferGL m_frameBuffers[BGFX_CONFIG_MAX_FRAME_BUFFERS];
UniformRegistry m_uniformReg; UniformRegistry m_uniformReg;
void* m_uniforms[BGFX_CONFIG_MAX_UNIFORMS]; void* m_uniforms[BGFX_CONFIG_MAX_UNIFORMS];
QueriesGL m_queries; TimerQueryGL m_gpuTimer;
VaoStateCache m_vaoStateCache; VaoStateCache m_vaoStateCache;
SamplerStateCache m_samplerStateCache; SamplerStateCache m_samplerStateCache;
@ -4840,7 +4840,7 @@ namespace bgfx { namespace gl
if (m_timerQuerySupport) if (m_timerQuerySupport)
{ {
m_queries.begin(0, GL_TIME_ELAPSED); m_gpuTimer.begin();
} }
if (0 < _render->m_iboffset) if (0 < _render->m_iboffset)
@ -5810,13 +5810,21 @@ namespace bgfx { namespace gl
min = min > frameTime ? frameTime : min; min = min > frameTime ? frameTime : min;
max = max < frameTime ? frameTime : max; max = max < frameTime ? frameTime : max;
static uint32_t maxGpuLatency = 0;
static double maxGpuElapsed = 0.0f;
double elapsedGpuMs = 0.0; double elapsedGpuMs = 0.0;
uint64_t elapsedGl = 0; uint64_t elapsedGl = 0;
if (m_timerQuerySupport) if (m_timerQuerySupport)
{ {
m_queries.end(GL_TIME_ELAPSED); m_gpuTimer.end();
elapsedGl = m_queries.getResult(0); while (m_gpuTimer.get() )
{
elapsedGl = m_gpuTimer.m_elapsed;
elapsedGpuMs = double(elapsedGl)/1e6; elapsedGpuMs = double(elapsedGl)/1e6;
maxGpuElapsed = elapsedGpuMs > maxGpuElapsed ? elapsedGpuMs : maxGpuElapsed;
}
maxGpuLatency = bx::uint32_imax(maxGpuLatency, m_gpuTimer.m_control.available()-1);
} }
const int64_t timerFreq = bx::getHPFrequency(); const int64_t timerFreq = bx::getHPFrequency();
@ -5844,10 +5852,10 @@ namespace bgfx { namespace gl
tvm.printf(0, pos++, BGFX_CONFIG_DEBUG ? 0x89 : 0x8f, " %s / " BX_COMPILER_NAME " / " BX_CPU_NAME " / " BX_ARCH_NAME " / " BX_PLATFORM_NAME " " tvm.printf(0, pos++, BGFX_CONFIG_DEBUG ? 0x89 : 0x8f, " %s / " BX_COMPILER_NAME " / " BX_CPU_NAME " / " BX_ARCH_NAME " / " BX_PLATFORM_NAME " "
, getRendererName() , getRendererName()
); );
tvm.printf(0, pos++, 0x8f, " Vendor: %s", m_vendor); tvm.printf(0, pos++, 0x8f, " Vendor: %s ", m_vendor);
tvm.printf(0, pos++, 0x8f, " Renderer: %s", m_renderer); tvm.printf(0, pos++, 0x8f, " Renderer: %s ", m_renderer);
tvm.printf(0, pos++, 0x8f, " Version: %s", m_version); tvm.printf(0, pos++, 0x8f, " Version: %s ", m_version);
tvm.printf(0, pos++, 0x8f, "GLSL version: %s", m_glslVersion); tvm.printf(0, pos++, 0x8f, " GLSL version: %s ", m_glslVersion);
pos = 10; pos = 10;
tvm.printf(10, pos++, 0x8e, " Frame CPU: %7.3f, % 7.3f \x1f, % 7.3f \x1e [ms] / % 6.2f FPS " tvm.printf(10, pos++, 0x8e, " Frame CPU: %7.3f, % 7.3f \x1f, % 7.3f \x1e [ms] / % 6.2f FPS "
@ -5870,18 +5878,21 @@ namespace bgfx { namespace gl
); );
double elapsedCpuMs = double(elapsed)*toMs; double elapsedCpuMs = double(elapsed)*toMs;
tvm.printf(10, pos++, 0x8e, " Submitted: %4d (draw %4d, compute %4d) / CPU %3.4f [ms] %c GPU %3.4f [ms]" tvm.printf(10, pos++, 0x8e, " Submitted: %4d (draw %4d, compute %4d) / CPU %3.4f [ms] %c GPU %3.4f [ms] (latency %d) "
, _render->m_num , _render->m_num
, statsKeyType[0] , statsKeyType[0]
, statsKeyType[1] , statsKeyType[1]
, elapsedCpuMs , elapsedCpuMs
, elapsedCpuMs > elapsedGpuMs ? '>' : '<' , elapsedCpuMs > elapsedGpuMs ? '>' : '<'
, elapsedGpuMs , maxGpuElapsed
, maxGpuLatency
); );
maxGpuLatency = 0;
maxGpuElapsed = 0.0;
for (uint32_t ii = 0; ii < BX_COUNTOF(s_primInfo); ++ii) for (uint32_t ii = 0; ii < BX_COUNTOF(s_primInfo); ++ii)
{ {
tvm.printf(10, pos++, 0x8e, " %9s: %7d (#inst: %5d), submitted: %7d" tvm.printf(10, pos++, 0x8e, " %9s: %7d (#inst: %5d), submitted: %7d "
, s_primName[ii] , s_primName[ii]
, statsNumPrimsRendered[ii] , statsNumPrimsRendered[ii]
, statsNumInstances[ii] , statsNumInstances[ii]
@ -5894,9 +5905,9 @@ namespace bgfx { namespace gl
tvm.printf(tvm.m_width-27, 0, 0x1f, " [F11 - RenderDoc capture] "); tvm.printf(tvm.m_width-27, 0, 0x1f, " [F11 - RenderDoc capture] ");
} }
tvm.printf(10, pos++, 0x8e, " Indices: %7d", statsNumIndices); tvm.printf(10, pos++, 0x8e, " Indices: %7d ", statsNumIndices);
tvm.printf(10, pos++, 0x8e, " DVB size: %7d", _render->m_vboffset); tvm.printf(10, pos++, 0x8e, " DVB size: %7d ", _render->m_vboffset);
tvm.printf(10, pos++, 0x8e, " DIB size: %7d", _render->m_iboffset); tvm.printf(10, pos++, 0x8e, " DIB size: %7d ", _render->m_iboffset);
pos++; pos++;
tvm.printf(10, pos++, 0x8e, " State cache: "); tvm.printf(10, pos++, 0x8e, " State cache: ");
@ -5905,10 +5916,6 @@ namespace bgfx { namespace gl
, m_vaoStateCache.getCount() , m_vaoStateCache.getCount()
, m_samplerStateCache.getCount() , m_samplerStateCache.getCount()
); );
pos++;
double captureMs = double(captureElapsed)*toMs;
tvm.printf(10, pos++, 0x8e, " Capture: %3.4f [ms]", captureMs);
#if BGFX_CONFIG_RENDERER_OPENGL #if BGFX_CONFIG_RENDERER_OPENGL
if (s_extension[Extension::ATI_meminfo].m_supported) if (s_extension[Extension::ATI_meminfo].m_supported)
@ -5923,7 +5930,7 @@ namespace bgfx { namespace gl
GL_CHECK(glGetIntegerv(GL_RENDERBUFFER_FREE_MEMORY_ATI, rbfFree) ); GL_CHECK(glGetIntegerv(GL_RENDERBUFFER_FREE_MEMORY_ATI, rbfFree) );
pos++; pos++;
tvm.printf(10, pos++, 0x8c, " -------------| free| free b| aux| aux fb"); tvm.printf(10, pos++, 0x8c, " -------------| free| free b| aux| aux fb ");
char tmp0[16]; char tmp0[16];
char tmp1[16]; char tmp1[16];
@ -5934,19 +5941,19 @@ namespace bgfx { namespace gl
bx::prettify(tmp1, BX_COUNTOF(tmp1), vboFree[1]); bx::prettify(tmp1, BX_COUNTOF(tmp1), vboFree[1]);
bx::prettify(tmp2, BX_COUNTOF(tmp2), vboFree[2]); bx::prettify(tmp2, BX_COUNTOF(tmp2), vboFree[2]);
bx::prettify(tmp3, BX_COUNTOF(tmp3), vboFree[3]); bx::prettify(tmp3, BX_COUNTOF(tmp3), vboFree[3]);
tvm.printf(10, pos++, 0x8e, " VBO: %10s, %10s, %10s, %10s", tmp0, tmp1, tmp2, tmp3); tvm.printf(10, pos++, 0x8e, " VBO: %10s, %10s, %10s, %10s ", tmp0, tmp1, tmp2, tmp3);
bx::prettify(tmp0, BX_COUNTOF(tmp0), texFree[0]); bx::prettify(tmp0, BX_COUNTOF(tmp0), texFree[0]);
bx::prettify(tmp1, BX_COUNTOF(tmp1), texFree[1]); bx::prettify(tmp1, BX_COUNTOF(tmp1), texFree[1]);
bx::prettify(tmp2, BX_COUNTOF(tmp2), texFree[2]); bx::prettify(tmp2, BX_COUNTOF(tmp2), texFree[2]);
bx::prettify(tmp3, BX_COUNTOF(tmp3), texFree[3]); bx::prettify(tmp3, BX_COUNTOF(tmp3), texFree[3]);
tvm.printf(10, pos++, 0x8e, " Texture: %10s, %10s, %10s, %10s", tmp0, tmp1, tmp2, tmp3); tvm.printf(10, pos++, 0x8e, " Texture: %10s, %10s, %10s, %10s ", tmp0, tmp1, tmp2, tmp3);
bx::prettify(tmp0, BX_COUNTOF(tmp0), rbfFree[0]); bx::prettify(tmp0, BX_COUNTOF(tmp0), rbfFree[0]);
bx::prettify(tmp1, BX_COUNTOF(tmp1), rbfFree[1]); bx::prettify(tmp1, BX_COUNTOF(tmp1), rbfFree[1]);
bx::prettify(tmp2, BX_COUNTOF(tmp2), rbfFree[2]); bx::prettify(tmp2, BX_COUNTOF(tmp2), rbfFree[2]);
bx::prettify(tmp3, BX_COUNTOF(tmp3), rbfFree[3]); bx::prettify(tmp3, BX_COUNTOF(tmp3), rbfFree[3]);
tvm.printf(10, pos++, 0x8e, " Render Buffer: %10s, %10s, %10s, %10s", tmp0, tmp1, tmp2, tmp3); tvm.printf(10, pos++, 0x8e, " Render Buffer: %10s, %10s, %10s, %10s ", tmp0, tmp1, tmp2, tmp3);
} }
else if (s_extension[Extension::NVX_gpu_memory_info].m_supported) else if (s_extension[Extension::NVX_gpu_memory_info].m_supported)
{ {
@ -5964,30 +5971,34 @@ namespace bgfx { namespace gl
GLint evictedMemory; GLint evictedMemory;
GL_CHECK(glGetIntegerv(GL_GPU_MEMORY_INFO_EVICTED_MEMORY_NVX, &evictedMemory) ); GL_CHECK(glGetIntegerv(GL_GPU_MEMORY_INFO_EVICTED_MEMORY_NVX, &evictedMemory) );
pos += 2; pos++;
char tmp0[16]; char tmp0[16];
char tmp1[16]; char tmp1[16];
bx::prettify(tmp0, BX_COUNTOF(tmp0), dedicated); bx::prettify(tmp0, BX_COUNTOF(tmp0), dedicated);
tvm.printf(10, pos++, 0x8e, " Dedicated: %10s", tmp0); tvm.printf(10, pos++, 0x8e, " Dedicated: %10s ", tmp0);
bx::prettify(tmp0, BX_COUNTOF(tmp0), currAvail); bx::prettify(tmp0, BX_COUNTOF(tmp0), currAvail);
bx::prettify(tmp1, BX_COUNTOF(tmp1), totalAvail); bx::prettify(tmp1, BX_COUNTOF(tmp1), totalAvail);
tvm.printf(10, pos++, 0x8e, " Available: %10s / %10s", tmp0, tmp1); tvm.printf(10, pos++, 0x8e, " Available: %10s / %10s ", tmp0, tmp1);
bx::prettify(tmp0, BX_COUNTOF(tmp0), evictedCount); bx::prettify(tmp0, BX_COUNTOF(tmp0), evictedCount);
bx::prettify(tmp1, BX_COUNTOF(tmp1), evictedMemory); bx::prettify(tmp1, BX_COUNTOF(tmp1), evictedMemory);
tvm.printf(10, pos++, 0x8e, " Eviction: %10s / %10s", tmp0, tmp1); tvm.printf(10, pos++, 0x8e, " Eviction: %10s / %10s ", tmp0, tmp1);
} }
#endif // BGFX_CONFIG_RENDERER_OPENGL #endif // BGFX_CONFIG_RENDERER_OPENGL
pos++;
double captureMs = double(captureElapsed)*toMs;
tvm.printf(10, pos++, 0x8e, " Capture: %7.4f [ms] ", captureMs);
uint8_t attr[2] = { 0x89, 0x8a }; uint8_t attr[2] = { 0x89, 0x8a };
uint8_t attrIndex = _render->m_waitSubmit < _render->m_waitRender; uint8_t attrIndex = _render->m_waitSubmit < _render->m_waitRender;
pos++; pos++;
tvm.printf(10, pos++, attr[attrIndex&1], " Submit wait: %3.4f [ms] ", double(_render->m_waitSubmit)*toMs); tvm.printf(10, pos++, attr[attrIndex&1], " Submit wait: %7.4f [ms] ", double(_render->m_waitSubmit)*toMs);
tvm.printf(10, pos++, attr[(attrIndex+1)&1], " Render wait: %3.4f [ms] ", double(_render->m_waitRender)*toMs); tvm.printf(10, pos++, attr[(attrIndex+1)&1], " Render wait: %7.4f [ms] ", double(_render->m_waitRender)*toMs);
min = frameTime; min = frameTime;
max = frameTime; max = frameTime;

67
src/renderer_gl.h
View File

@ -1084,34 +1084,91 @@ namespace bgfx { namespace gl
{ {
void create() void create()
{ {
glGenQueries(BX_COUNTOF(m_queries), m_queries); GL_CHECK(glGenQueries(BX_COUNTOF(m_queries), m_queries) );
} }
void destroy() void destroy()
{ {
glDeleteQueries(BX_COUNTOF(m_queries), m_queries); GL_CHECK(glDeleteQueries(BX_COUNTOF(m_queries), m_queries) );
} }
void begin(uint16_t _id, GLenum _target) const void begin(uint16_t _id, GLenum _target) const
{ {
glBeginQuery(_target, m_queries[_id]); GL_CHECK(glBeginQuery(_target, m_queries[_id]) );
} }
void end(GLenum _target) const void end(GLenum _target) const
{ {
glEndQuery(_target); GL_CHECK(glEndQuery(_target) );
} }
uint64_t getResult(uint16_t _id) const uint64_t getResult(uint16_t _id) const
{ {
uint64_t result; uint64_t result;
glGetQueryObjectui64v(m_queries[_id], GL_QUERY_RESULT, &result); GL_CHECK(glGetQueryObjectui64v(m_queries[_id], GL_QUERY_RESULT, &result) );
return result; return result;
} }
GLuint m_queries[64]; GLuint m_queries[64];
}; };
struct TimerQueryGL
{
TimerQueryGL()
: m_control(BX_COUNTOF(m_frame) )
{
}
void create()
{
GL_CHECK(glGenQueries(BX_COUNTOF(m_frame), m_frame) );
}
void destroy()
{
GL_CHECK(glDeleteQueries(BX_COUNTOF(m_frame), m_frame) );
}
void begin()
{
while (0 == m_control.reserve(1) )
{
get();
}
GL_CHECK(glBeginQuery(GL_TIME_ELAPSED
, m_frame[m_control.m_current]
) );
}
void end()
{
GL_CHECK(glEndQuery(GL_TIME_ELAPSED) );
m_control.commit(1);
}
bool get()
{
if (0 != m_control.available() )
{
GL_CHECK(glGetQueryObjectui64v(m_frame[m_control.m_read]
, GL_QUERY_RESULT
, &m_elapsed
) );
m_control.consume(1);
return true;
}
return false;
}
uint64_t m_elapsed;
GLuint m_frame[4];
bx::RingBufferControl m_control;
};
} /* namespace gl */ } // namespace bgfx } /* namespace gl */ } // namespace bgfx
#endif // BGFX_RENDERER_GL_H_HEADER_GUARD #endif // BGFX_RENDERER_GL_H_HEADER_GUARD