Allow showing sample data for whole symbol.

This commit is contained in:
Bartosz Taudul 2020-04-09 22:23:57 +02:00
parent a2385a8b24
commit 9d2c03bc5b
2 changed files with 60 additions and 37 deletions

View File

@ -36,6 +36,7 @@ SourceView::SourceView( ImFont* font )
, m_highlightAddr( 0 ) , m_highlightAddr( 0 )
, m_asmRelative( false ) , m_asmRelative( false )
, m_asmShowSourceLocation( true ) , m_asmShowSourceLocation( true )
, m_calcInlineStats( true )
, m_showJumps( true ) , m_showJumps( true )
{ {
} }
@ -416,7 +417,7 @@ void SourceView::RenderSymbolView( const Worker& worker )
inlineList++; inlineList++;
} }
ImGui::TextDisabled( ICON_FA_SITEMAP " Function:" ); SmallCheckbox( ICON_FA_SITEMAP " Function:", &m_calcInlineStats );
ImGui::SameLine(); ImGui::SameLine();
ImGui::SetNextItemWidth( -1 ); ImGui::SetNextItemWidth( -1 );
ImGui::PushStyleVar( ImGuiStyleVar_FramePadding, ImVec2( 0, 0 ) ); ImGui::PushStyleVar( ImGuiStyleVar_FramePadding, ImVec2( 0, 0 ) );
@ -472,48 +473,31 @@ void SourceView::RenderSymbolView( const Worker& worker )
uint32_t iptotalSrc = 0, iptotalAsm = 0; uint32_t iptotalSrc = 0, iptotalAsm = 0;
unordered_flat_map<uint64_t, uint32_t> ipcountSrc, ipcountAsm; unordered_flat_map<uint64_t, uint32_t> ipcountSrc, ipcountAsm;
auto ipmap = worker.GetSymbolInstructionPointers( m_symAddr ); if( m_calcInlineStats )
if( ipmap )
{ {
for( auto& ip : *ipmap ) GatherIpStats( m_symAddr, iptotalSrc, iptotalAsm, ipcountSrc, ipcountAsm, worker );
}
else
{
GatherIpStats( m_baseAddr, iptotalSrc, iptotalAsm, ipcountSrc, ipcountAsm, worker );
auto iptr = worker.GetInlineSymbolList( m_baseAddr, m_codeLen );
if( iptr )
{ {
if( m_file ) const auto symEnd = m_baseAddr + m_codeLen;
while( *iptr < symEnd )
{ {
auto frame = worker.GetCallstackFrame( ip.first ); GatherIpStats( *iptr, iptotalSrc, iptotalAsm, ipcountSrc, ipcountAsm, worker );
if( frame ) iptr++;
{
auto ffn = worker.GetString( frame->data[0].file );
if( strcmp( ffn, m_file ) == 0 )
{
const auto line = frame->data[0].line;
auto it = ipcountSrc.find( line );
if( it == ipcountSrc.end() )
{
ipcountSrc.emplace( line, ip.second );
}
else
{
it->second += ip.second;
}
iptotalSrc += ip.second;
}
}
} }
auto addr = worker.GetCanonicalPointer( ip.first );
assert( ipcountAsm.find( addr ) == ipcountAsm.end() );
ipcountAsm.emplace( addr, ip.second );
iptotalAsm += ip.second;
}
if( iptotalAsm > 0 )
{
ImGui::SameLine();
ImGui::Spacing();
ImGui::SameLine();
TextFocused( ICON_FA_EYE_DROPPER " Samples:", RealToString( iptotalAsm ) );
} }
} }
if( iptotalAsm > 0 )
{
ImGui::SameLine();
ImGui::Spacing();
ImGui::SameLine();
TextFocused( ICON_FA_EYE_DROPPER " Samples:", RealToString( iptotalAsm ) );
}
ImGui::Separator(); ImGui::Separator();
@ -1175,4 +1159,40 @@ 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 )
{
auto ipmap = worker.GetSymbolInstructionPointers( addr );
if( !ipmap ) return;
for( auto& ip : *ipmap )
{
if( m_file )
{
auto frame = worker.GetCallstackFrame( ip.first );
if( frame )
{
auto ffn = worker.GetString( frame->data[0].file );
if( strcmp( ffn, m_file ) == 0 )
{
const auto line = frame->data[0].line;
auto it = ipcountSrc.find( line );
if( it == ipcountSrc.end() )
{
ipcountSrc.emplace( line, ip.second );
}
else
{
it->second += ip.second;
}
iptotalSrc += ip.second;
}
}
}
auto addr = worker.GetCanonicalPointer( ip.first );
assert( ipcountAsm.find( addr ) == ipcountAsm.end() );
ipcountAsm.emplace( addr, ip.second );
iptotalAsm += ip.second;
}
}
} }

View File

@ -70,6 +70,8 @@ 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 );
ImFont* m_font; ImFont* m_font;
const char* m_file; const char* m_file;
uint32_t m_fileStringIdx; uint32_t m_fileStringIdx;
@ -87,6 +89,7 @@ private:
DecayValue<uint64_t> m_highlightAddr; DecayValue<uint64_t> m_highlightAddr;
bool m_asmRelative; bool m_asmRelative;
bool m_asmShowSourceLocation; bool m_asmShowSourceLocation;
bool m_calcInlineStats;
std::vector<Line> m_lines; std::vector<Line> m_lines;
std::vector<AsmLine> m_asm; std::vector<AsmLine> m_asm;