AI/rocm-systems
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove redundant ROCPROFSYS_TRACE_CACHED variable from the code (#2434)

Browse Source
This commit is contained in:
marantic-amd
2025-12-25 13:36:04 +01:00
committed by GitHub
parent c3132773c8
commit bb83791b17
23 changed files with 88 additions and 111 deletions
Download Patch File Download Diff File Expand all files Collapse all files
projects/rocprofiler-systems/source/bin/rocprof-sys-avail/generate_config.cpp
+1 -1
View File
@@ -339,7 +339,7 @@ generate_config(std::string _config_file, const std::set<std::string>& _config_f
if(_lomni && !_romni) return true;
if(_romni && !_lomni) return false;
for(const auto* itr :
{ "ROCPROFSYS_CONFIG", "ROCPROFSYS_MODE", "ROCPROFSYS_TRACE_CACHED",
{ "ROCPROFSYS_CONFIG", "ROCPROFSYS_MODE", "ROCPROFSYS_TRACE",
"ROCPROFSYS_TRACE_LEGACY", "ROCPROFSYS_PROFILE",
"ROCPROFSYS_USE_SAMPLING", "ROCPROFSYS_USE_PROCESS_SAMPLING",
"ROCPROFSYS_USE_ROCM", "ROCPROFSYS_USE_AMD_SMI",
projects/rocprofiler-systems/source/bin/rocprof-sys-causal/impl.cpp
+1 -2
View File
@@ -186,10 +186,9 @@ get_initial_environment()
update_env(_env, "ROCPROFSYS_MODE", "causal");
update_env(_env, "ROCPROFSYS_USE_CAUSAL", true);
update_env(_env, "ROCPROFSYS_USE_SAMPLING", false);
update_env(_env, "ROCPROFSYS_TRACE_CACHED", false);
update_env(_env, "ROCPROFSYS_TRACE", false);
update_env(_env, "ROCPROFSYS_PROFILE", false);
update_env(_env, "ROCPROFSYS_USE_PROCESS_SAMPLING", false);
update_env(_env, "ROCPROFSYS_TRACE_LEGACY", false);
update_env(_env, "ROCPROFSYS_THREAD_POOL_SIZE",
get_env<int>("ROCPROFSYS_THREAD_POOL_SIZE", 0));
update_env(_env, "ROCPROFSYS_LAUNCHER", "rocprof-sys-causal");
projects/rocprofiler-systems/source/bin/rocprof-sys-sample/impl.cpp
+7 -9
View File
@@ -339,19 +339,17 @@ parse_args(int argc, char** argv, std::vector<char*>& _env)
original_envs);
});
parser
.add_argument(
{ "-T", "--trace" },
"Generate a detailed trace with deferred trace generation (perfetto output)")
.add_argument({ "-T", "--trace" }, "Generate a detailed trace (perfetto output)")
.max_count(1)
.action([&](parser_t& p) {
rocprofsys::common::update_env(_env, "ROCPROFSYS_TRACE_CACHED",
p.get<bool>("trace"), update_mode::REPLACE,
":", updated_envs, original_envs);
rocprofsys::common::update_env(_env, "ROCPROFSYS_TRACE", p.get<bool>("trace"),
update_mode::REPLACE, ":", updated_envs,
original_envs);
});
parser
.add_argument(
{ "-L", "--trace-legacy" },
"Generate a detailed trace with direct mode (perfetto output, legacy)")
.add_argument({ "-L", "--trace-legacy" },
"Use legacy direct mode for tracing instead of deferred trace "
"generation (higher overhead)")
.max_count(1)
.action([&](parser_t& p) {
rocprofsys::common::update_env(
projects/rocprofiler-systems/source/lib/core/argparse.cpp
+6 -6
View File
@@ -301,17 +301,17 @@ add_core_arguments(parser_t& _parser, parser_data& _data)
if(_data.environ_filter("trace", _data))
{
_parser
.add_argument({ "-T", "--trace" }, "Generate a detailed trace with deferred "
"trace generation (perfetto output)")
.add_argument({ "-T", "--trace" },
"Generate a detailed trace (perfetto output)")
.max_count(1)
.action([&](parser_t& p) {
update_env(_data, "ROCPROFSYS_TRACE_CACHED", p.get<bool>("trace"));
update_env(_data, "ROCPROFSYS_TRACE", p.get<bool>("trace"));
});
_parser
.add_argument(
{ "-L", "--trace-legacy" },
"Generate a detailed trace with direct mode (perfetto output, legacy)")
.add_argument({ "-L", "--trace-legacy" },
"Use legacy direct mode for tracing instead of deferred trace "
"generation (higher overhead)")
.max_count(1)
.action([&](parser_t& p) {
update_env(_data, "ROCPROFSYS_TRACE_LEGACY", p.get<bool>("trace-legacy"));
projects/rocprofiler-systems/source/lib/core/config.cpp
+28 -28
View File
@@ -299,32 +299,27 @@ configure_settings(bool _init)
get_env<size_t>("ROCPROFSYS_NUM_THREADS", 1), "threading", "performance",
"sampling", "parallelism", "advanced");
ROCPROFSYS_CONFIG_SETTING(bool, "ROCPROFSYS_TRACE_CACHED",
"Enable perfetto backend with deferred trace generation "
"for minimal runtime overhead",
_default_perfetto_v, "backend", "perfetto_caching");
ROCPROFSYS_CONFIG_SETTING(bool, "ROCPROFSYS_TRACE_LEGACY",
"Enable perfetto backend (legacy, direct mode)", false,
ROCPROFSYS_CONFIG_SETTING(bool, "ROCPROFSYS_TRACE",
"Enable perfetto backend for tracing", _default_perfetto_v,
"backend", "perfetto");
ROCPROFSYS_CONFIG_SETTING(bool, "ROCPROFSYS_TRACE",
"[DEPRECATED] Renamed to ROCPROFSYS_TRACE_LEGACY", false,
"backend", "perfetto", "deprecated");
ROCPROFSYS_CONFIG_SETTING(bool, "ROCPROFSYS_TRACE_LEGACY",
"Use legacy direct mode for perfetto tracing instead of "
"deferred trace generation. When false (default), uses "
"cached mode with minimal runtime overhead.",
false, "backend", "perfetto");
ROCPROFSYS_CONFIG_SETTING(bool, "ROCPROFSYS_USE_PERFETTO",
"[DEPRECATED] Renamed to ROCPROFSYS_TRACE_LEGACY", false,
"[DEPRECATED] Renamed to ROCPROFSYS_TRACE", false,
"backend", "perfetto", "deprecated");
ROCPROFSYS_CONFIG_SETTING(bool, "ROCPROFSYS_PROFILE", "Enable timemory backend",
!(_config->get<bool>("ROCPROFSYS_TRACE_LEGACY") ||
_config->get<bool>("ROCPROFSYS_TRACE_CACHED")),
"backend", "timemory");
!_config->get<bool>("ROCPROFSYS_TRACE"), "backend",
"timemory");
ROCPROFSYS_CONFIG_SETTING(bool, "ROCPROFSYS_USE_TIMEMORY",
"[DEPRECATED] Renamed to ROCPROFSYS_PROFILE",
!_config->get<bool>("ROCPROFSYS_TRACE_LEGACY"), "backend",
"timemory", "deprecated");
ROCPROFSYS_CONFIG_SETTING(
bool, "ROCPROFSYS_USE_TIMEMORY", "[DEPRECATED] Renamed to ROCPROFSYS_PROFILE",
!_config->get<bool>("ROCPROFSYS_TRACE"), "backend", "timemory", "deprecated");
ROCPROFSYS_CONFIG_SETTING(bool, "ROCPROFSYS_USE_CAUSAL",
"Enable causal profiling analysis", false, "backend",
@@ -1080,8 +1075,7 @@ configure_settings(bool _init)
handle_deprecated_setting("ROCPROFSYS_USE_THREAD_SAMPLING",
"ROCPROFSYS_USE_PROCESS_SAMPLING");
handle_deprecated_setting("ROCPROFSYS_OUTPUT_FILE", "ROCPROFSYS_PERFETTO_FILE");
handle_deprecated_setting("ROCPROFSYS_USE_PERFETTO", "ROCPROFSYS_TRACE_LEGACY");
handle_deprecated_setting("ROCPROFSYS_TRACE", "ROCPROFSYS_TRACE_LEGACY");
handle_deprecated_setting("ROCPROFSYS_USE_PERFETTO", "ROCPROFSYS_TRACE");
handle_deprecated_setting("ROCPROFSYS_USE_TIMEMORY", "ROCPROFSYS_PROFILE");
scope::get_fields()[scope::flat::value] = _config->get_flat_profile();
@@ -1148,8 +1142,7 @@ configure_mode_settings(const std::shared_ptr<settings>& _config)
if(get_mode() == Mode::Coverage)
{
set_default_setting_value("ROCPROFSYS_USE_CODE_COVERAGE", true);
_set("ROCPROFSYS_TRACE_LEGACY", false);
_set("ROCPROFSYS_TRACE_CACHED", false);
_set("ROCPROFSYS_TRACE", false);
_set("ROCPROFSYS_PROFILE", false);
_set("ROCPROFSYS_USE_CAUSAL", false);
_set("ROCPROFSYS_USE_AMD_SMI", false);
@@ -1162,8 +1155,7 @@ configure_mode_settings(const std::shared_ptr<settings>& _config)
else if(get_mode() == Mode::Causal)
{
_set("ROCPROFSYS_USE_CAUSAL", true);
_set("ROCPROFSYS_TRACE_LEGACY", false);
_set("ROCPROFSYS_TRACE_CACHED", false);
_set("ROCPROFSYS_TRACE", false);
_set("ROCPROFSYS_PROFILE", false);
_set("ROCPROFSYS_USE_SAMPLING", false);
_set("ROCPROFSYS_USE_PROCESS_SAMPLING", false);
@@ -1859,8 +1851,12 @@ get_verbose()
bool&
get_use_perfetto()
{
static auto _v = get_config()->at("ROCPROFSYS_TRACE_LEGACY");
return static_cast<tim::tsettings<bool>&>(*_v).get();
static auto _trace_setting = get_config()->at("ROCPROFSYS_TRACE");
static auto _legacy_setting = get_config()->at("ROCPROFSYS_TRACE_LEGACY");
auto& _trace = static_cast<tim::tsettings<bool>&>(*_trace_setting).get();
auto& _legacy = static_cast<tim::tsettings<bool>&>(*_legacy_setting).get();
static bool _v = _trace && _legacy;
return _v;
}
bool&
@@ -2564,8 +2560,12 @@ get_use_rocpd()
bool&
get_caching_perfetto()
{
static auto _v = get_config()->at("ROCPROFSYS_TRACE_CACHED");
return static_cast<tim::tsettings<bool>&>(*_v).get();
static auto _trace_setting = get_config()->at("ROCPROFSYS_TRACE");
static auto _legacy_setting = get_config()->at("ROCPROFSYS_TRACE_LEGACY");
auto& _trace = static_cast<tim::tsettings<bool>&>(*_trace_setting).get();
auto& _legacy = static_cast<tim::tsettings<bool>&>(*_legacy_setting).get();
static bool _v = _trace && !_legacy;
return _v;
}
int