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

[rocprof-sys] Use fmt APIs to construct strings instead of JOIN (#2643)

Browse Source 
## Motivation

With the introduction of the new logging system base on `spdlog` library, opportunity shows to replace `timemory` dependent JOIN implementation with `fmt` library `format` and `join` APIs, which are shipped as a part of `spdlog` lib

## Technical Details

Use `fmt` provided APIs to properly format and package strings.
This commit is contained in:
marantic-amd
2026-01-23 06:34:58 +01:00
committed by GitHub
parent 3318c540ea
commit 956a73c4c8
38 changed files with 356 additions and 357 deletions
Download Patch File Download Diff File Expand all files Collapse all files
projects/rocprofiler-systems/source/lib/core/config.cpp
+19 -21
View File
@@ -51,12 +51,13 @@
#include <timemory/utility/declaration.hpp>
#include <timemory/utility/delimit.hpp>
#include <timemory/utility/filepath.hpp>
#include <timemory/utility/join.hpp>
#include <timemory/utility/signals.hpp>
#include <timemory/utility/types.hpp>
#include "logger/debug.hpp"
#include <spdlog/fmt/ranges.h>
#include <algorithm>
#include <array>
#include <atomic>
@@ -432,7 +433,7 @@ configure_settings(bool _init)
for(const auto& itr : constraint::get_valid_clock_ids())
{
_clock_choices.emplace_back(
join("", "(", join('|', itr.name, itr.value, itr.raw_name), ")"));
fmt::format("({}|{}|{})", itr.name, itr.value, itr.raw_name));
}
ROCPROFSYS_CONFIG_SETTING(std::string, "ROCPROFSYS_TRACE_PERIODS",
@@ -1558,8 +1559,6 @@ print_banner(std::ostream& _os)
std::stringstream _version_info{};
_version_info << "rocprof-sys v" << ROCPROFSYS_VERSION_STRING;
namespace join = ::timemory::join;
// assemble the list of properties
auto _generate_properties =
[](std::initializer_list<std::pair<std::string, std::string>>&& _data) {
@@ -1570,7 +1569,7 @@ print_banner(std::ostream& _os)
if(!itr.second.empty())
_property_info.emplace_back(
itr.first.empty() ? itr.second
: join::join(": ", itr.first, itr.second));
: fmt::format("{}: {}", itr.first, itr.second));
}
return _property_info;
};
@@ -1584,7 +1583,7 @@ print_banner(std::ostream& _os)
// <NAME> <VERSION> (<PROPERTIES>)
if(!_properties.empty())
_version_info << join::join(join::array_config{ ", ", " (", ")" }, _properties);
_version_info << fmt::format(" ({})", fmt::join(_properties, ", "));
_os << _banner << "\n";
_os << _version_info.str() << "\n";
@@ -2216,8 +2215,8 @@ get_perfetto_output_filename()
if(!_val.empty() && _val.at(0) != '/')
{
auto _result =
settings::format(JOIN('/', "%env{PWD}%", _val), get_config()->get_tag());
auto _result = settings::format(fmt::format("{}/{}", getenv("PWD"), _val),
get_config()->get_tag());
LOG_DEBUG("Path is relative, prepending PWD: '{}'", _result);
return _result;
}
@@ -2472,7 +2471,8 @@ get_database_absolute_path(std::string_view database_name, std::string_view suff
setenv("ROCPROFSYS_DATABASE_DIR", _dir.c_str(), 1);
if(!_val.empty() && _val.at(0) != '/')
return settings::format(JOIN('/', "%env{PWD}%", _val), get_config()->get_tag());
return settings::format(fmt::format("{}/{}", getenv("PWD"), _val),
get_config()->get_tag());
return _val;
}
@@ -2530,8 +2530,8 @@ get_perfetto_output_filename_with_suffix(std::string_view suffix)
if(!_val.empty() && _val.at(0) != '/')
{
auto _result =
settings::format(JOIN('/', "%env{PWD}%", _val), get_config()->get_tag());
auto _result = settings::format(fmt::format("{}/{}", getenv("PWD"), _val),
get_config()->get_tag());
LOG_DEBUG("Path is relative, prepending PWD: '{}'", _result);
return _result;
}
@@ -2747,7 +2747,7 @@ get_tmp_file(std::string _basename, std::string _ext)
_cfg.use_suffix = true;
_cfg.suffix = "%pid%";
_cfg.explicit_path = get_tmpdir();
_cfg.subdirectory = JOIN('/', settings::output_path(), "%ppid%", "");
_cfg.subdirectory = fmt::format("{}/{}", settings::output_path(), "%ppid%");
auto _fname =
settings::compose_output_filename(std::move(_basename), std::move(_ext), _cfg);
@@ -2782,10 +2782,9 @@ get_causal_backend()
} catch(std::runtime_error& _e)
{
auto _mode = static_cast<tim::tsettings<std::string>&>(*_v->second).get();
throw std::runtime_error(fmt::format(
"[{}] invalid causal backend {}. Choices: {}", __FUNCTION__, _mode,
timemory::join::join(timemory::join::array_config{ ", ", "", "" },
_v->second->get_choices())));
throw std::runtime_error(
fmt::format("[{}] invalid causal backend {}. Choices: {}", __FUNCTION__,
_mode, fmt::join(_v->second->get_choices(), ", ")));
}
return CausalBackend::Auto;
}
@@ -2813,10 +2812,9 @@ get_causal_mode()
} catch(std::runtime_error& _e)
{
auto _mode = static_cast<tim::tsettings<std::string>&>(*_v->second).get();
throw std::runtime_error(fmt::format(
"[{}] invalid causal mode {}. Choices: {}", __FUNCTION__, _mode,
timemory::join::join(timemory::join::array_config{ ", ", "", "" },
_v->second->get_choices())));
throw std::runtime_error(
fmt::format("[{}] invalid causal mode {}. Choices: {}", __FUNCTION__,
_mode, fmt::join(_v->second->get_choices(), ", ")));
}
return CausalMode::Function;
}();
@@ -2871,7 +2869,7 @@ format_causal_scopes(std::vector<std::string> _value, const std::string& _tag)
{
itr = std::regex_replace(
itr, _main_re,
join("", "$1", "(", get_exe_name(), "|", get_exe_realpath(), ")", "$3"));
fmt::format("$1({}|{})$3", get_exe_name(), get_exe_realpath()));
}
// trim leading and trailing spaces since we didn't delimit spaces
if(std::regex_search(itr, _space_re))