piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-23 14:19:46 -06:00
Code Issues Packages Projects Releases Wiki Activity

VideoCommon/Statistics: Normalize statistic variable names

Browse Source 
Normalizes all variables related to statistics so that they follow our
coding style.

These are relatively low traffic areas, so this modification isn't too
noisy.
This commit is contained in:
Lioncash
2019-07-10 23:11:14 -04:00
parent 0a7395bfba
commit a99c7d01e1
19 changed files with 169 additions and 163 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Source/Core/VideoCommon/AsyncRequests.cpp
View File

@ -117,7 +117,7 @@ void AsyncRequests::HandleEvent(const AsyncRequests::Event& e)
{
case Event::EFB_POKE_COLOR:
{
INCSTAT(stats.thisFrame.numEFBPokes);
INCSTAT(stats.this_frame.num_efb_pokes);
EfbPokeData poke = {e.efb_poke.x, e.efb_poke.y, e.efb_poke.data};
g_renderer->PokeEFB(EFBAccessType::PokeColor, &poke, 1);
}
@ -125,20 +125,20 @@ void AsyncRequests::HandleEvent(const AsyncRequests::Event& e)
case Event::EFB_POKE_Z:
{
INCSTAT(stats.thisFrame.numEFBPokes);
INCSTAT(stats.this_frame.num_efb_pokes);
EfbPokeData poke = {e.efb_poke.x, e.efb_poke.y, e.efb_poke.data};
g_renderer->PokeEFB(EFBAccessType::PokeZ, &poke, 1);
}
break;
case Event::EFB_PEEK_COLOR:
INCSTAT(stats.thisFrame.numEFBPeeks);
INCSTAT(stats.this_frame.num_efb_peeks);
*e.efb_peek.data =
g_renderer->AccessEFB(EFBAccessType::PeekColor, e.efb_peek.x, e.efb_peek.y, 0);
break;
case Event::EFB_PEEK_Z:
INCSTAT(stats.thisFrame.numEFBPeeks);
INCSTAT(stats.this_frame.num_efb_peeks);
*e.efb_peek.data = g_renderer->AccessEFB(EFBAccessType::PeekZ, e.efb_peek.x, e.efb_peek.y, 0);
break;

8
Source/Core/VideoCommon/OpcodeDecoding.cpp
View File

@ -54,7 +54,7 @@ static u32 InterpretDisplayList(u32 address, u32 size)
Statistics::SwapDL();
Run(DataReader(startAddress, startAddress + size), &cycles, true);
INCSTAT(stats.thisFrame.numDListsCalled);
INCSTAT(stats.this_frame.num_dlists_called);
// un-swap
Statistics::SwapDL();
@ -114,7 +114,7 @@ u8* Run(DataReader src, u32* cycles, bool in_display_list)
u32 value = src.Read<u32>();
LoadCPReg(sub_cmd, value, is_preprocess);
if (!is_preprocess)
INCSTAT(stats.thisFrame.numCPLoads);
INCSTAT(stats.this_frame.num_cp_loads);
}
break;
@ -132,7 +132,7 @@ u8* Run(DataReader src, u32* cycles, bool in_display_list)
u32 xf_address = Cmd2 & 0xFFFF;
LoadXFReg(transfer_size, xf_address, src);
INCSTAT(stats.thisFrame.numXFLoads);
INCSTAT(stats.this_frame.num_xf_loads);
}
src.Skip<u32>(transfer_size);
}
@ -208,7 +208,7 @@ u8* Run(DataReader src, u32* cycles, bool in_display_list)
else
{
LoadBPReg(bp_cmd);
INCSTAT(stats.thisFrame.numBPLoads);
INCSTAT(stats.this_frame.num_bp_loads);
}
}
break;

4
Source/Core/VideoCommon/RenderBase.cpp
View File

@ -1280,8 +1280,8 @@ void Renderer::Swap(u32 xfb_addr, u32 fb_width, u32 fb_stride, u32 fb_height, u6
DolphinAnalytics::PerformanceSample perf_sample;
perf_sample.speed_ratio = SystemTimers::GetEstimatedEmulationPerformance();
perf_sample.num_prims = stats.thisFrame.numPrims + stats.thisFrame.numDLPrims;
perf_sample.num_draw_calls = stats.thisFrame.numDrawCalls;
perf_sample.num_prims = stats.this_frame.num_prims + stats.this_frame.num_dl_prims;
perf_sample.num_draw_calls = stats.this_frame.num_draw_calls;
DolphinAnalytics::Instance().ReportPerformanceInfo(std::move(perf_sample));
if (IsFrameDumping())

32
Source/Core/VideoCommon/ShaderCache.cpp
View File

@ -221,12 +221,12 @@ void ShaderCache::LoadShaderCache(T& cache, APIType api_type, const char* type,
switch (stage)
{
case ShaderStage::Vertex:
INCSTAT(stats.numVertexShadersCreated);
INCSTAT(stats.numVertexShadersAlive);
INCSTAT(stats.num_vertex_shaders_created);
INCSTAT(stats.num_vertex_shaders_alive);
break;
case ShaderStage::Pixel:
INCSTAT(stats.numPixelShadersCreated);
INCSTAT(stats.numPixelShadersAlive);
INCSTAT(stats.num_pixel_shaders_created);
INCSTAT(stats.num_pixel_shaders_alive);
break;
default:
break;
@ -369,10 +369,10 @@ void ShaderCache::ClearCaches()
ClearShaderCache(m_uber_vs_cache);
ClearShaderCache(m_uber_ps_cache);
SETSTAT(stats.numPixelShadersCreated, 0);
SETSTAT(stats.numPixelShadersAlive, 0);
SETSTAT(stats.numVertexShadersCreated, 0);
SETSTAT(stats.numVertexShadersAlive, 0);
SETSTAT(stats.num_pixel_shaders_created, 0);
SETSTAT(stats.num_pixel_shaders_alive, 0);
SETSTAT(stats.num_vertex_shaders_created, 0);
SETSTAT(stats.num_vertex_shaders_alive, 0);
}
void ShaderCache::CompileMissingPipelines()
@ -434,8 +434,8 @@ const AbstractShader* ShaderCache::InsertVertexShader(const VertexShaderUid& uid
if (!binary.empty())
m_vs_cache.disk_cache.Append(uid, binary.data(), static_cast<u32>(binary.size()));
}
INCSTAT(stats.numVertexShadersCreated);
INCSTAT(stats.numVertexShadersAlive);
INCSTAT(stats.num_vertex_shaders_created);
INCSTAT(stats.num_vertex_shaders_alive);
entry.shader = std::move(shader);
}
@ -456,8 +456,8 @@ const AbstractShader* ShaderCache::InsertVertexUberShader(const UberShader::Vert
if (!binary.empty())
m_uber_vs_cache.disk_cache.Append(uid, binary.data(), static_cast<u32>(binary.size()));
}
INCSTAT(stats.numVertexShadersCreated);
INCSTAT(stats.numVertexShadersAlive);
INCSTAT(stats.num_vertex_shaders_created);
INCSTAT(stats.num_vertex_shaders_alive);
entry.shader = std::move(shader);
}
@ -478,8 +478,8 @@ const AbstractShader* ShaderCache::InsertPixelShader(const PixelShaderUid& uid,
if (!binary.empty())
m_ps_cache.disk_cache.Append(uid, binary.data(), static_cast<u32>(binary.size()));
}
INCSTAT(stats.numPixelShadersCreated);
INCSTAT(stats.numPixelShadersAlive);
INCSTAT(stats.num_pixel_shaders_created);
INCSTAT(stats.num_pixel_shaders_alive);
entry.shader = std::move(shader);
}
@ -500,8 +500,8 @@ const AbstractShader* ShaderCache::InsertPixelUberShader(const UberShader::Pixel
if (!binary.empty())
m_uber_ps_cache.disk_cache.Append(uid, binary.data(), static_cast<u32>(binary.size()));
}
INCSTAT(stats.numPixelShadersCreated);
INCSTAT(stats.numPixelShadersAlive);
INCSTAT(stats.num_pixel_shaders_created);
INCSTAT(stats.num_pixel_shaders_alive);
entry.shader = std::move(shader);
}

80
Source/Core/VideoCommon/Statistics.cpp
View File

@ -14,15 +14,15 @@ Statistics stats;
void Statistics::ResetFrame()
{
thisFrame = {};
this_frame = {};
}
void Statistics::SwapDL()
{
std::swap(stats.thisFrame.numDLPrims, stats.thisFrame.numPrims);
std::swap(stats.thisFrame.numXFLoadsInDL, stats.thisFrame.numXFLoads);
std::swap(stats.thisFrame.numCPLoadsInDL, stats.thisFrame.numCPLoads);
std::swap(stats.thisFrame.numBPLoadsInDL, stats.thisFrame.numBPLoads);
std::swap(stats.this_frame.num_dl_prims, stats.this_frame.num_prims);
std::swap(stats.this_frame.num_xf_loads_in_dl, stats.this_frame.num_xf_loads);
std::swap(stats.this_frame.num_cp_loads_in_dl, stats.this_frame.num_cp_loads);
std::swap(stats.this_frame.num_bp_loads_in_dl, stats.this_frame.num_bp_loads);
}
void Statistics::Display()
@ -48,43 +48,43 @@ void Statistics::Display()
if (g_ActiveConfig.backend_info.api_type == APIType::Nothing)
{
draw_statistic("Objects", "%d", stats.thisFrame.numDrawnObjects);
draw_statistic("Vertices Loaded", "%d", stats.thisFrame.numVerticesLoaded);
draw_statistic("Triangles Input", "%d", stats.thisFrame.numTrianglesIn);
draw_statistic("Triangles Rejected", "%d", stats.thisFrame.numTrianglesRejected);
draw_statistic("Triangles Culled", "%d", stats.thisFrame.numTrianglesCulled);
draw_statistic("Triangles Clipped", "%d", stats.thisFrame.numTrianglesClipped);
draw_statistic("Triangles Drawn", "%d", stats.thisFrame.numTrianglesDrawn);
draw_statistic("Rasterized Pix", "%d", stats.thisFrame.rasterizedPixels);
draw_statistic("TEV Pix In", "%d", stats.thisFrame.tevPixelsIn);
draw_statistic("TEV Pix Out", "%d", stats.thisFrame.tevPixelsOut);
draw_statistic("Objects", "%d", stats.this_frame.num_drawn_objects);
draw_statistic("Vertices Loaded", "%d", stats.this_frame.num_vertices_loaded);
draw_statistic("Triangles Input", "%d", stats.this_frame.num_triangles_in);
draw_statistic("Triangles Rejected", "%d", stats.this_frame.num_triangles_rejected);
draw_statistic("Triangles Culled", "%d", stats.this_frame.num_triangles_culled);
draw_statistic("Triangles Clipped", "%d", stats.this_frame.num_triangles_clipped);
draw_statistic("Triangles Drawn", "%d", stats.this_frame.num_triangles_drawn);
draw_statistic("Rasterized Pix", "%d", stats.this_frame.rasterized_pixels);
draw_statistic("TEV Pix In", "%d", stats.this_frame.tev_pixels_in);
draw_statistic("TEV Pix Out", "%d", stats.this_frame.tev_pixels_out);
}
draw_statistic("Textures created", "%d", stats.numTexturesCreated);
draw_statistic("Textures uploaded", "%d", stats.numTexturesUploaded);
draw_statistic("Textures alive", "%d", stats.numTexturesAlive);
draw_statistic("pshaders created", "%d", stats.numPixelShadersCreated);
draw_statistic("pshaders alive", "%d", stats.numPixelShadersAlive);
draw_statistic("vshaders created", "%d", stats.numVertexShadersCreated);
draw_statistic("vshaders alive", "%d", stats.numVertexShadersAlive);
draw_statistic("shaders changes", "%d", stats.thisFrame.numShaderChanges);
draw_statistic("dlists called", "%d", stats.thisFrame.numDListsCalled);
draw_statistic("Primitive joins", "%d", stats.thisFrame.numPrimitiveJoins);
draw_statistic("Draw calls", "%d", stats.thisFrame.numDrawCalls);
draw_statistic("Primitives", "%d", stats.thisFrame.numPrims);
draw_statistic("Primitives (DL)", "%d", stats.thisFrame.numDLPrims);
draw_statistic("XF loads", "%d", stats.thisFrame.numXFLoads);
draw_statistic("XF loads (DL)", "%d", stats.thisFrame.numXFLoadsInDL);
draw_statistic("CP loads", "%d", stats.thisFrame.numCPLoads);
draw_statistic("CP loads (DL)", "%d", stats.thisFrame.numCPLoadsInDL);
draw_statistic("BP loads", "%d", stats.thisFrame.numBPLoads);
draw_statistic("BP loads (DL)", "%d", stats.thisFrame.numBPLoadsInDL);
draw_statistic("Vertex streamed", "%i kB", stats.thisFrame.bytesVertexStreamed / 1024);
draw_statistic("Index streamed", "%i kB", stats.thisFrame.bytesIndexStreamed / 1024);
draw_statistic("Uniform streamed", "%i kB", stats.thisFrame.bytesUniformStreamed / 1024);
draw_statistic("Vertex Loaders", "%d", stats.numVertexLoaders);
draw_statistic("EFB peeks:", "%d", stats.thisFrame.numEFBPeeks);
draw_statistic("EFB pokes:", "%d", stats.thisFrame.numEFBPokes);
draw_statistic("Textures created", "%d", stats.num_textures_created);
draw_statistic("Textures uploaded", "%d", stats.num_textures_uploaded);
draw_statistic("Textures alive", "%d", stats.num_textures_alive);
draw_statistic("pshaders created", "%d", stats.num_pixel_shaders_created);
draw_statistic("pshaders alive", "%d", stats.num_pixel_shaders_alive);
draw_statistic("vshaders created", "%d", stats.num_vertex_shaders_created);
draw_statistic("vshaders alive", "%d", stats.num_vertex_shaders_alive);
draw_statistic("shaders changes", "%d", stats.this_frame.num_shader_changes);
draw_statistic("dlists called", "%d", stats.this_frame.num_dlists_called);
draw_statistic("Primitive joins", "%d", stats.this_frame.num_primitive_joins);
draw_statistic("Draw calls", "%d", stats.this_frame.num_draw_calls);
draw_statistic("Primitives", "%d", stats.this_frame.num_prims);
draw_statistic("Primitives (DL)", "%d", stats.this_frame.num_dl_prims);
draw_statistic("XF loads", "%d", stats.this_frame.num_xf_loads);
draw_statistic("XF loads (DL)", "%d", stats.this_frame.num_xf_loads_in_dl);
draw_statistic("CP loads", "%d", stats.this_frame.num_cp_loads);
draw_statistic("CP loads (DL)", "%d", stats.this_frame.num_cp_loads_in_dl);
draw_statistic("BP loads", "%d", stats.this_frame.num_bp_loads);
draw_statistic("BP loads (DL)", "%d", stats.this_frame.num_bp_loads_in_dl);
draw_statistic("Vertex streamed", "%i kB", stats.this_frame.bytes_vertex_streamed / 1024);
draw_statistic("Index streamed", "%i kB", stats.this_frame.bytes_index_streamed / 1024);
draw_statistic("Uniform streamed", "%i kB", stats.this_frame.bytes_uniform_streamed / 1024);
draw_statistic("Vertex Loaders", "%d", stats.num_vertex_loaders);
draw_statistic("EFB peeks:", "%d", stats.this_frame.num_efb_peeks);
draw_statistic("EFB pokes:", "%d", stats.this_frame.num_efb_pokes);
ImGui::Columns(1);

72
Source/Core/VideoCommon/Statistics.h
View File

@ -8,16 +8,16 @@
struct Statistics
{
int numPixelShadersCreated;
int numPixelShadersAlive;
int numVertexShadersCreated;
int numVertexShadersAlive;
int num_pixel_shaders_created;
int num_pixel_shaders_alive;
int num_vertex_shaders_created;
int num_vertex_shaders_alive;
int numTexturesCreated;
int numTexturesUploaded;
int numTexturesAlive;
int num_textures_created;
int num_textures_uploaded;
int num_textures_alive;
int numVertexLoaders;
int num_vertex_loaders;
std::array<float, 6> proj;
std::array<float, 16> gproj;
@ -25,42 +25,42 @@ struct Statistics
struct ThisFrame
{
int numBPLoads;
int numCPLoads;
int numXFLoads;
int num_bp_loads;
int num_cp_loads;
int num_xf_loads;
int numBPLoadsInDL;
int numCPLoadsInDL;
int numXFLoadsInDL;
int num_bp_loads_in_dl;
int num_cp_loads_in_dl;
int num_xf_loads_in_dl;
int numPrims;
int numDLPrims;
int numShaderChanges;
int num_prims;
int num_dl_prims;
int num_shader_changes;
int numPrimitiveJoins;
int numDrawCalls;
int num_primitive_joins;
int num_draw_calls;
int numDListsCalled;
int num_dlists_called;
int bytesVertexStreamed;
int bytesIndexStreamed;
int bytesUniformStreamed;
int bytes_vertex_streamed;
int bytes_index_streamed;
int bytes_uniform_streamed;
int numTrianglesClipped;
int numTrianglesIn;
int numTrianglesRejected;
int numTrianglesCulled;
int numDrawnObjects;
int rasterizedPixels;
int numTrianglesDrawn;
int numVerticesLoaded;
int tevPixelsIn;
int tevPixelsOut;
int num_triangles_clipped;
int num_triangles_in;
int num_triangles_rejected;
int num_triangles_culled;
int num_drawn_objects;
int rasterized_pixels;
int num_triangles_drawn;
int num_vertices_loaded;
int tev_pixels_in;
int tev_pixels_out;
int numEFBPeeks;
int numEFBPokes;
int num_efb_peeks;
int num_efb_pokes;
};
ThisFrame thisFrame;
ThisFrame this_frame;
void ResetFrame();
static void SwapDL();
static void Display();

10
Source/Core/VideoCommon/TextureCacheBase.cpp
View File

@ -1200,8 +1200,8 @@ TextureCacheBase::GetTexture(u32 address, u32 width, u32 height, const TextureFo
}
}
INCSTAT(stats.numTexturesUploaded);
SETSTAT(stats.numTexturesAlive, textures_by_address.size());
INCSTAT(stats.num_textures_uploaded);
SETSTAT(stats.num_textures_alive, static_cast<int>(textures_by_address.size()));
entry = DoPartialTextureUpdates(iter->second, &texMem[tlutaddr], tlutfmt);
@ -1277,8 +1277,8 @@ TextureCacheBase::GetXFBTexture(u32 address, u32 width, u32 height, u32 stride,
// Insert into the texture cache so we can re-use it next frame, if needed.
textures_by_address.emplace(entry->addr, entry);
SETSTAT(stats.numTexturesAlive, textures_by_address.size());
INCSTAT(stats.numTexturesUploaded);
SETSTAT(stats.num_textures_alive, static_cast<int>(textures_by_address.size()));
INCSTAT(stats.num_textures_uploaded);
if (g_ActiveConfig.bDumpXFBTarget)
{
@ -2017,7 +2017,7 @@ TextureCacheBase::AllocateTexture(const TextureConfig& config)
}
}
INCSTAT(stats.numTexturesCreated);
INCSTAT(stats.num_textures_created);
return TexPoolEntry(std::move(texture), std::move(framebuffer));
}

8
Source/Core/VideoCommon/VertexLoaderManager.cpp
View File

@ -54,7 +54,7 @@ void Init()
map_entry = nullptr;
for (auto& map_entry : g_preprocess_cp_state.vertex_loaders)
map_entry = nullptr;
SETSTAT(stats.numVertexLoaders, 0);
SETSTAT(stats.num_vertex_loaders, 0);
}
void Clear()
@ -223,7 +223,7 @@ static VertexLoaderBase* RefreshLoader(int vtx_attr_group, bool preprocess = fal
s_vertex_loader_map[uid] =
VertexLoaderBase::CreateVertexLoader(state->vtx_desc, state->vtx_attr[vtx_attr_group]);
loader = s_vertex_loader_map[uid].get();
INCSTAT(stats.numVertexLoaders);
INCSTAT(stats.num_vertex_loaders);
}
if (check_for_native_format)
{
@ -287,8 +287,8 @@ int RunVertices(int vtx_attr_group, int primitive, int count, DataReader src, bo
g_vertex_manager->FlushData(count, loader->m_native_vtx_decl.stride);
ADDSTAT(stats.thisFrame.numPrims, count);
INCSTAT(stats.thisFrame.numPrimitiveJoins);
ADDSTAT(stats.this_frame.num_prims, count);
INCSTAT(stats.this_frame.num_primitive_joins);
return size;
}

2
Source/Core/VideoCommon/VertexManagerBase.cpp
View File

@ -442,7 +442,7 @@ void VertexManagerBase::Flush()
g_perf_query->EnableQuery(bpmem.zcontrol.early_ztest ? PQG_ZCOMP_ZCOMPLOC : PQG_ZCOMP);
DrawCurrentBatch(base_index, num_indices, base_vertex);
INCSTAT(stats.thisFrame.numDrawCalls);
INCSTAT(stats.this_frame.num_draw_calls);
if (PerfQueryBase::ShouldEmulate())
g_perf_query->DisableQuery(bpmem.zcontrol.early_ztest ? PQG_ZCOMP_ZCOMPLOC : PQG_ZCOMP);