[Lldb-commits] [lldb] [lldb] Add symbol/table count into statistics (PR #136226)
via lldb-commits
lldb-commits at lists.llvm.org
Thu Apr 17 17:15:02 PDT 2025
https://github.com/royitaqi updated https://github.com/llvm/llvm-project/pull/136226
>From 4157b0d1426830a4c19af7401728ef86dbc2d8c9 Mon Sep 17 00:00:00 2001
From: Roy Shi <royshi at meta.com>
Date: Wed, 16 Apr 2025 09:19:04 -0700
Subject: [PATCH 1/2] [lldb] Add new stats (# symbols loaded, # symbol tables
loaded) to module and target
Summary:
Test Plan:
Reviewers:
Subscribers:
Tasks:
Tags:
Differential Revision: https://phabricator.intern.facebook.com/D73117709
---
lldb/include/lldb/Target/Statistics.h | 1 +
lldb/source/Target/Statistics.cpp | 18 +++++++++++----
.../commands/statistics/basic/TestStats.py | 23 +++++++++++++++----
3 files changed, 32 insertions(+), 10 deletions(-)
diff --git a/lldb/include/lldb/Target/Statistics.h b/lldb/include/lldb/Target/Statistics.h
index ee365357fcf31..b87a12a8ab9cd 100644
--- a/lldb/include/lldb/Target/Statistics.h
+++ b/lldb/include/lldb/Target/Statistics.h
@@ -120,6 +120,7 @@ struct ModuleStats {
llvm::StringMap<llvm::json::Value> type_system_stats;
double symtab_parse_time = 0.0;
double symtab_index_time = 0.0;
+ uint32_t num_symbols_loaded = 0;
double debug_parse_time = 0.0;
double debug_index_time = 0.0;
uint64_t debug_info_size = 0;
diff --git a/lldb/source/Target/Statistics.cpp b/lldb/source/Target/Statistics.cpp
index b5d2e7bda1edf..f70fb529544a5 100644
--- a/lldb/source/Target/Statistics.cpp
+++ b/lldb/source/Target/Statistics.cpp
@@ -71,6 +71,7 @@ json::Value ModuleStats::ToJSON() const {
module.try_emplace("debugInfoHadIncompleteTypes",
debug_info_had_incomplete_types);
module.try_emplace("symbolTableStripped", symtab_stripped);
+ module.try_emplace("symbolsLoaded", num_symbols_loaded);
if (!symfile_path.empty())
module.try_emplace("symbolFilePath", symfile_path);
@@ -293,7 +294,8 @@ llvm::json::Value DebuggerStats::ReportStatistics(
double debug_parse_time = 0.0;
double debug_index_time = 0.0;
uint32_t symtabs_loaded = 0;
- uint32_t symtabs_saved = 0;
+ uint32_t symtabs_loaded_from_cache = 0;
+ uint32_t symtabs_saved_to_cache = 0;
uint32_t debug_index_loaded = 0;
uint32_t debug_index_saved = 0;
uint64_t debug_info_size = 0;
@@ -309,6 +311,7 @@ llvm::json::Value DebuggerStats::ReportStatistics(
uint32_t num_modules_with_variable_errors = 0;
uint32_t num_modules_with_incomplete_types = 0;
uint32_t num_stripped_modules = 0;
+ uint32_t num_symbols_loaded = 0;
for (size_t image_idx = 0; image_idx < num_modules; ++image_idx) {
Module *module = target != nullptr
? target->GetImages().GetModuleAtIndex(image_idx).get()
@@ -318,12 +321,15 @@ llvm::json::Value DebuggerStats::ReportStatistics(
module_stat.symtab_index_time = module->GetSymtabIndexTime().get().count();
Symtab *symtab = module->GetSymtab(/*can_create=*/false);
if (symtab) {
+ module_stat.num_symbols_loaded = symtab->GetNumSymbols();
+ num_symbols_loaded += module_stat.num_symbols_loaded;
+ symtabs_loaded++;
module_stat.symtab_loaded_from_cache = symtab->GetWasLoadedFromCache();
if (module_stat.symtab_loaded_from_cache)
- ++symtabs_loaded;
+ ++symtabs_loaded_from_cache;
module_stat.symtab_saved_to_cache = symtab->GetWasSavedToCache();
if (module_stat.symtab_saved_to_cache)
- ++symtabs_saved;
+ ++symtabs_saved_to_cache;
}
SymbolFile *sym_file = module->GetSymbolFile(/*can_create=*/false);
if (sym_file) {
@@ -393,8 +399,9 @@ llvm::json::Value DebuggerStats::ReportStatistics(
json::Object global_stats{
{"totalSymbolTableParseTime", symtab_parse_time},
{"totalSymbolTableIndexTime", symtab_index_time},
- {"totalSymbolTablesLoadedFromCache", symtabs_loaded},
- {"totalSymbolTablesSavedToCache", symtabs_saved},
+ {"totalSymbolTablesLoaded", symtabs_loaded},
+ {"totalSymbolTablesLoadedFromCache", symtabs_loaded_from_cache},
+ {"totalSymbolTablesSavedToCache", symtabs_saved_to_cache},
{"totalDebugInfoParseTime", debug_parse_time},
{"totalDebugInfoIndexTime", debug_index_time},
{"totalDebugInfoIndexLoadedFromCache", debug_index_loaded},
@@ -407,6 +414,7 @@ llvm::json::Value DebuggerStats::ReportStatistics(
num_modules_with_incomplete_types},
{"totalDebugInfoEnabled", num_debug_info_enabled_modules},
{"totalSymbolTableStripped", num_stripped_modules},
+ {"totalSymbolsLoaded", num_symbols_loaded},
};
if (include_targets) {
diff --git a/lldb/test/API/commands/statistics/basic/TestStats.py b/lldb/test/API/commands/statistics/basic/TestStats.py
index 54881c13bcb68..1ecbe89e3b3d4 100644
--- a/lldb/test/API/commands/statistics/basic/TestStats.py
+++ b/lldb/test/API/commands/statistics/basic/TestStats.py
@@ -159,6 +159,8 @@ def test_default_no_run(self):
"""
self.build()
target = self.createTestTarget()
+
+ # Verify top-level keys.
debug_stats = self.get_stats()
debug_stat_keys = [
"memory",
@@ -168,6 +170,7 @@ def test_default_no_run(self):
"totalSymbolTableIndexTime",
"totalSymbolTablesLoadedFromCache",
"totalSymbolTablesSavedToCache",
+ "totalSymbolsLoaded",
"totalDebugInfoByteSize",
"totalDebugInfoIndexTime",
"totalDebugInfoIndexLoadedFromCache",
@@ -175,16 +178,26 @@ def test_default_no_run(self):
"totalDebugInfoParseTime",
]
self.verify_keys(debug_stats, '"debug_stats"', debug_stat_keys, None)
- stats = debug_stats["targets"][0]
- keys_exist = [
+
+ # Verify target stats keys.
+ target_stats = debug_stats["targets"][0]
+ target_stat_keys_exist = [
"expressionEvaluation",
"frameVariable",
"moduleIdentifiers",
"targetCreateTime",
]
- keys_missing = ["firstStopTime", "launchOrAttachTime"]
- self.verify_keys(stats, '"stats"', keys_exist, keys_missing)
- self.assertGreater(stats["targetCreateTime"], 0.0)
+ target_stat_keys_missing = ["firstStopTime", "launchOrAttachTime"]
+ self.verify_keys(target_stats, '"target_stats"', target_stat_keys_exist, target_stat_keys_missing)
+ self.assertGreater(target_stats["targetCreateTime"], 0.0)
+
+ # Verify module stats keys.
+ for module_stats in debug_stats["modules"]:
+ module_stat_keys_exist = [
+ "symbolsLoaded",
+ ]
+ self.verify_keys(module_stats, '"module_stats"', module_stat_keys_exist, None)
+
def test_default_with_run(self):
"""Test "statistics dump" when running the target to a breakpoint.
>From 7a61b7fd3c6cbd2a82cd70256ef6c4b66f499ce4 Mon Sep 17 00:00:00 2001
From: Roy Shi <royshi at meta.com>
Date: Thu, 17 Apr 2025 17:13:42 -0700
Subject: [PATCH 2/2] Address David's comments
---
lldb/source/Target/Statistics.cpp | 2 +-
.../API/commands/statistics/basic/TestStats.py | 16 +++++++++++++---
2 files changed, 14 insertions(+), 4 deletions(-)
diff --git a/lldb/source/Target/Statistics.cpp b/lldb/source/Target/Statistics.cpp
index f70fb529544a5..2bb93dfffa5aa 100644
--- a/lldb/source/Target/Statistics.cpp
+++ b/lldb/source/Target/Statistics.cpp
@@ -323,7 +323,7 @@ llvm::json::Value DebuggerStats::ReportStatistics(
if (symtab) {
module_stat.num_symbols_loaded = symtab->GetNumSymbols();
num_symbols_loaded += module_stat.num_symbols_loaded;
- symtabs_loaded++;
+ ++symtabs_loaded;
module_stat.symtab_loaded_from_cache = symtab->GetWasLoadedFromCache();
if (module_stat.symtab_loaded_from_cache)
++symtabs_loaded_from_cache;
diff --git a/lldb/test/API/commands/statistics/basic/TestStats.py b/lldb/test/API/commands/statistics/basic/TestStats.py
index 1ecbe89e3b3d4..0265a0d7c9948 100644
--- a/lldb/test/API/commands/statistics/basic/TestStats.py
+++ b/lldb/test/API/commands/statistics/basic/TestStats.py
@@ -171,6 +171,7 @@ def test_default_no_run(self):
"totalSymbolTablesLoadedFromCache",
"totalSymbolTablesSavedToCache",
"totalSymbolsLoaded",
+ "totalSymbolTablesLoaded",
"totalDebugInfoByteSize",
"totalDebugInfoIndexTime",
"totalDebugInfoIndexLoadedFromCache",
@@ -178,6 +179,8 @@ def test_default_no_run(self):
"totalDebugInfoParseTime",
]
self.verify_keys(debug_stats, '"debug_stats"', debug_stat_keys, None)
+ self.assertGreater(debug_stats["totalSymbolsLoaded"], 0)
+ self.assertGreater(debug_stats["totalSymbolTablesLoaded"], 0)
# Verify target stats keys.
target_stats = debug_stats["targets"][0]
@@ -188,7 +191,12 @@ def test_default_no_run(self):
"targetCreateTime",
]
target_stat_keys_missing = ["firstStopTime", "launchOrAttachTime"]
- self.verify_keys(target_stats, '"target_stats"', target_stat_keys_exist, target_stat_keys_missing)
+ self.verify_keys(
+ target_stats,
+ '"target_stats"',
+ target_stat_keys_exist,
+ target_stat_keys_missing,
+ )
self.assertGreater(target_stats["targetCreateTime"], 0.0)
# Verify module stats keys.
@@ -196,8 +204,10 @@ def test_default_no_run(self):
module_stat_keys_exist = [
"symbolsLoaded",
]
- self.verify_keys(module_stats, '"module_stats"', module_stat_keys_exist, None)
-
+ self.verify_keys(
+ module_stats, '"module_stats"', module_stat_keys_exist, None
+ )
+ self.assertGreater(module_stats["symbolsLoaded"], 0)
def test_default_with_run(self):
"""Test "statistics dump" when running the target to a breakpoint.
More information about the lldb-commits
mailing list