mirrors/tracy
1
0
Fork 0
mirror of https://github.com/wolfpld/tracy synced 2025-04-29 04:23:51 +00:00
Code Issues Releases Wiki Activity

Calculate max sample counts during ip map creation.

Browse Source
This commit is contained in:
Bartosz Taudul 2020-04-11 01:34:44 +02:00
parent f9cf6df3ad
commit 2c11418d33
2 changed files with 22 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
server/TracySourceView.cpp
View File

@ -472,21 +472,22 @@ void SourceView::RenderSymbolView( const Worker& worker )
} }
uint32_t iptotalSrc = 0, iptotalAsm = 0; uint32_t iptotalSrc = 0, iptotalAsm = 0;
uint32_t ipmaxSrc = 0, ipmaxAsm = 0;
unordered_flat_map<uint64_t, uint32_t> ipcountSrc, ipcountAsm; unordered_flat_map<uint64_t, uint32_t> ipcountSrc, ipcountAsm;
if( m_calcInlineStats ) if( m_calcInlineStats )
{ {
GatherIpStats( m_symAddr, iptotalSrc, iptotalAsm, ipcountSrc, ipcountAsm, worker ); GatherIpStats( m_symAddr, iptotalSrc, iptotalAsm, ipcountSrc, ipcountAsm, ipmaxSrc, ipmaxAsm, worker );
} }
else else
{ {
GatherIpStats( m_baseAddr, iptotalSrc, iptotalAsm, ipcountSrc, ipcountAsm, worker ); GatherIpStats( m_baseAddr, iptotalSrc, iptotalAsm, ipcountSrc, ipcountAsm, ipmaxSrc, ipmaxAsm, worker );
auto iptr = worker.GetInlineSymbolList( m_baseAddr, m_codeLen ); auto iptr = worker.GetInlineSymbolList( m_baseAddr, m_codeLen );
if( iptr ) if( iptr )
{ {
const auto symEnd = m_baseAddr + m_codeLen; const auto symEnd = m_baseAddr + m_codeLen;
while( *iptr < symEnd ) while( *iptr < symEnd )
{ {
GatherIpStats( *iptr, iptotalSrc, iptotalAsm, ipcountSrc, ipcountAsm, worker ); GatherIpStats( *iptr, iptotalSrc, iptotalAsm, ipcountSrc, ipcountAsm, ipmaxSrc, ipmaxAsm, worker );
iptr++; iptr++;
} }
} }
@ -506,16 +507,16 @@ void SourceView::RenderSymbolView( const Worker& worker )
switch( m_displayMode ) switch( m_displayMode )
{ {
case DisplaySource: case DisplaySource:
RenderSymbolSourceView( iptotalSrc, ipcountSrc, worker ); RenderSymbolSourceView( iptotalSrc, ipcountSrc, ipmaxSrc, worker );
break; break;
case DisplayAsm: case DisplayAsm:
jumpOut = RenderSymbolAsmView( iptotalAsm, ipcountAsm, worker ); jumpOut = RenderSymbolAsmView( iptotalAsm, ipcountAsm, ipmaxAsm, worker );
break; break;
case DisplayMixed: case DisplayMixed:
ImGui::Columns( 2 ); ImGui::Columns( 2 );
RenderSymbolSourceView( iptotalSrc, ipcountSrc, worker ); RenderSymbolSourceView( iptotalSrc, ipcountSrc, ipmaxSrc, worker );
ImGui::NextColumn(); ImGui::NextColumn();
jumpOut = RenderSymbolAsmView( iptotalAsm, ipcountAsm, worker ); jumpOut = RenderSymbolAsmView( iptotalAsm, ipcountAsm, ipmaxAsm, worker );
ImGui::EndColumns(); ImGui::EndColumns();
break; break;
default: default:
@ -568,7 +569,7 @@ static uint32_t GetHotnessColor( uint32_t ipSum, uint32_t maxIpCount )
} }
void SourceView::RenderSymbolSourceView( uint32_t iptotal, unordered_flat_map<uint64_t, uint32_t> ipcount, const Worker& worker ) void SourceView::RenderSymbolSourceView( uint32_t iptotal, unordered_flat_map<uint64_t, uint32_t> ipcount, uint32_t ipmax, const Worker& worker )
{ {
if( m_sourceFiles.empty() ) if( m_sourceFiles.empty() )
{ {
@ -686,14 +687,9 @@ void SourceView::RenderSymbolSourceView( uint32_t iptotal, unordered_flat_map<ui
draw->AddLine( ImVec2( rect.Min.x, ly ), ImVec2( rect.Max.x, ly ), 0x88888888, 3 ); draw->AddLine( ImVec2( rect.Min.x, ly ), ImVec2( rect.Max.x, ly ), 0x88888888, 3 );
} }
uint32_t maxIpCount = 0;
std::vector<std::pair<uint64_t, uint32_t>> ipData; std::vector<std::pair<uint64_t, uint32_t>> ipData;
ipData.reserve( ipcount.size() ); ipData.reserve( ipcount.size() );
for( auto& v : ipcount ) for( auto& v : ipcount ) ipData.emplace_back( v.first, v.second );
{
if( v.second > maxIpCount ) maxIpCount = v.second;
ipData.emplace_back( v.first, v.second );
}
pdqsort_branchless( ipData.begin(), ipData.end(), []( const auto& l, const auto& r ) { return l.first < r.first; } ); pdqsort_branchless( ipData.begin(), ipData.end(), []( const auto& l, const auto& r ) { return l.first < r.first; } );
const auto step = uint32_t( m_lines.size() * 2 / rect.GetHeight() ); const auto step = uint32_t( m_lines.size() * 2 / rect.GetHeight() );
@ -711,7 +707,7 @@ void SourceView::RenderSymbolSourceView( uint32_t iptotal, unordered_flat_map<ui
++it; ++it;
} }
const auto ly = round( rect.Min.y + float( firstLine ) / m_lines.size() * rect.GetHeight() ); const auto ly = round( rect.Min.y + float( firstLine ) / m_lines.size() * rect.GetHeight() );
const uint32_t color = GetHotnessColor( ipSum, maxIpCount ); const uint32_t color = GetHotnessColor( ipSum, ipmax );
draw->AddRectFilled( ImVec2( x14, ly ), ImVec2( x34, ly+3 ), color ); draw->AddRectFilled( ImVec2( x14, ly ), ImVec2( x34, ly+3 ), color );
} }
@ -722,7 +718,7 @@ void SourceView::RenderSymbolSourceView( uint32_t iptotal, unordered_flat_map<ui
ImGui::EndChild(); ImGui::EndChild();
} }
uint64_t SourceView::RenderSymbolAsmView( uint32_t iptotal, unordered_flat_map<uint64_t, uint32_t> ipcount, const Worker& worker ) uint64_t SourceView::RenderSymbolAsmView( uint32_t iptotal, unordered_flat_map<uint64_t, uint32_t> ipcount, uint32_t ipmax, const Worker& worker )
{ {
SmallCheckbox( ICON_FA_SEARCH_LOCATION " Relative locations", &m_asmRelative ); SmallCheckbox( ICON_FA_SEARCH_LOCATION " Relative locations", &m_asmRelative );
ImGui::SameLine(); ImGui::SameLine();
@ -930,7 +926,6 @@ uint64_t SourceView::RenderSymbolAsmView( uint32_t iptotal, unordered_flat_map<u
} }
uint32_t selJumpLineStart, selJumpLineEnd, selJumpLineTarget; uint32_t selJumpLineStart, selJumpLineEnd, selJumpLineTarget;
uint32_t maxIpCount = 0;
std::vector<std::pair<uint64_t, uint32_t>> ipData; std::vector<std::pair<uint64_t, uint32_t>> ipData;
ipData.reserve( ipcount.size() ); ipData.reserve( ipcount.size() );
if( selJumpStart == 0 ) if( selJumpStart == 0 )
@ -939,7 +934,6 @@ uint64_t SourceView::RenderSymbolAsmView( uint32_t iptotal, unordered_flat_map<u
{ {
auto it = ipcount.find( m_asm[i].addr ); auto it = ipcount.find( m_asm[i].addr );
if( it == ipcount.end() ) continue; if( it == ipcount.end() ) continue;
if( it->second > maxIpCount ) maxIpCount = it->second;
ipData.emplace_back( i, it->second ); ipData.emplace_back( i, it->second );
} }
} }
@ -953,7 +947,6 @@ uint64_t SourceView::RenderSymbolAsmView( uint32_t iptotal, unordered_flat_map<u
auto it = ipcount.find( m_asm[i].addr ); auto it = ipcount.find( m_asm[i].addr );
if( it == ipcount.end() ) continue; if( it == ipcount.end() ) continue;
if( it->second > maxIpCount ) maxIpCount = it->second;
ipData.emplace_back( i, it->second ); ipData.emplace_back( i, it->second );
} }
} }
@ -974,7 +967,7 @@ uint64_t SourceView::RenderSymbolAsmView( uint32_t iptotal, unordered_flat_map<u
++it; ++it;
} }
const auto ly = round( rect.Min.y + float( firstLine ) / m_asm.size() * rect.GetHeight() ); const auto ly = round( rect.Min.y + float( firstLine ) / m_asm.size() * rect.GetHeight() );
const uint32_t color = GetHotnessColor( ipSum, maxIpCount ); const uint32_t color = GetHotnessColor( ipSum, ipmax );
draw->AddRectFilled( ImVec2( x40, ly ), ImVec2( x60, ly+3 ), color ); draw->AddRectFilled( ImVec2( x40, ly ), ImVec2( x60, ly+3 ), color );
} }
@ -1376,7 +1369,7 @@ void SourceView::SelectAsmLinesHover( uint32_t file, uint32_t line, const Worker
} }
} }
void SourceView::GatherIpStats( uint64_t addr, uint32_t& iptotalSrc, uint32_t& iptotalAsm, unordered_flat_map<uint64_t, uint32_t>& ipcountSrc, unordered_flat_map<uint64_t, uint32_t>& ipcountAsm, const Worker& worker ) void SourceView::GatherIpStats( uint64_t addr, uint32_t& iptotalSrc, uint32_t& iptotalAsm, unordered_flat_map<uint64_t, uint32_t>& ipcountSrc, unordered_flat_map<uint64_t, uint32_t>& ipcountAsm, uint32_t& ipmaxSrc, uint32_t& ipmaxAsm, const Worker& worker )
{ {
auto ipmap = worker.GetSymbolInstructionPointers( addr ); auto ipmap = worker.GetSymbolInstructionPointers( addr );
if( !ipmap ) return; if( !ipmap ) return;
@ -1395,10 +1388,13 @@ void SourceView::GatherIpStats( uint64_t addr, uint32_t& iptotalSrc, uint32_t& i
if( it == ipcountSrc.end() ) if( it == ipcountSrc.end() )
{ {
ipcountSrc.emplace( line, ip.second ); ipcountSrc.emplace( line, ip.second );
if( ipmaxSrc < ip.second ) ipmaxSrc = ip.second;
} }
else else
{ {
it->second += ip.second; const auto sum = it->second + ip.second;
it->second = sum;
if( ipmaxSrc < sum ) ipmaxSrc = sum;
} }
iptotalSrc += ip.second; iptotalSrc += ip.second;
} }
@ -1409,6 +1405,7 @@ void SourceView::GatherIpStats( uint64_t addr, uint32_t& iptotalSrc, uint32_t& i
assert( ipcountAsm.find( addr ) == ipcountAsm.end() ); assert( ipcountAsm.find( addr ) == ipcountAsm.end() );
ipcountAsm.emplace( addr, ip.second ); ipcountAsm.emplace( addr, ip.second );
iptotalAsm += ip.second; iptotalAsm += ip.second;
if( ipmaxAsm < ip.second ) ipmaxAsm = ip.second;
} }
} }

6
server/TracySourceView.hpp
View File

@ -62,8 +62,8 @@ private:
void RenderSimpleSourceView(); void RenderSimpleSourceView();
void RenderSymbolView( const Worker& worker ); void RenderSymbolView( const Worker& worker );
void RenderSymbolSourceView( uint32_t iptotal, unordered_flat_map<uint64_t, uint32_t> ipcount, const Worker& worker ); void RenderSymbolSourceView( uint32_t iptotal, unordered_flat_map<uint64_t, uint32_t> ipcount, uint32_t ipmax, const Worker& worker );
uint64_t RenderSymbolAsmView( uint32_t iptotal, unordered_flat_map<uint64_t, uint32_t> ipcount, const Worker& worker ); uint64_t RenderSymbolAsmView( uint32_t iptotal, unordered_flat_map<uint64_t, uint32_t> ipcount, uint32_t ipmax, const Worker& worker );
void RenderLine( const Line& line, int lineNum, uint32_t ipcnt, uint32_t iptotal, const Worker* worker ); void RenderLine( const Line& line, int lineNum, uint32_t ipcnt, uint32_t iptotal, const Worker* worker );
void RenderAsmLine( const AsmLine& line, uint32_t ipcnt, uint32_t iptotal, const Worker& worker, uint64_t& jumpOut, int maxAddrLen ); void RenderAsmLine( const AsmLine& line, uint32_t ipcnt, uint32_t iptotal, const Worker& worker, uint64_t& jumpOut, int maxAddrLen );
@ -72,7 +72,7 @@ private:
void SelectAsmLines( uint32_t file, uint32_t line, const Worker& worker, bool changeAsmLine = true, uint64_t targetAddr = 0 ); void SelectAsmLines( uint32_t file, uint32_t line, const Worker& worker, bool changeAsmLine = true, uint64_t targetAddr = 0 );
void SelectAsmLinesHover( uint32_t file, uint32_t line, const Worker& worker ); void SelectAsmLinesHover( uint32_t file, uint32_t line, const Worker& worker );
void GatherIpStats( uint64_t addr, uint32_t& iptotalSrc, uint32_t& iptotalAsm, unordered_flat_map<uint64_t, uint32_t>& ipcountSrc, unordered_flat_map<uint64_t, uint32_t>& ipcountAsm, const Worker& worker ); void GatherIpStats( uint64_t addr, uint32_t& iptotalSrc, uint32_t& iptotalAsm, unordered_flat_map<uint64_t, uint32_t>& ipcountSrc, unordered_flat_map<uint64_t, uint32_t>& ipcountAsm, uint32_t& ipmaxSrc, uint32_t& ipmaxAsm, const Worker& worker );
ImFont* m_font; ImFont* m_font;
const char* m_file; const char* m_file;