Resolve warnings/errors with extra warnings (#171)

[ROCm/rocprofiler-systems commit: 4e3527f0ed]
Dieser Commit ist enthalten in:
Jonathan R. Madsen
2022-09-28 14:28:32 -05:00
committet von GitHub
Ursprung 6c8570f610
Commit 07e3cf256a
25 geänderte Dateien mit 132 neuen und 135 gelöschten Zeilen
@@ -975,13 +975,10 @@ write_hw_counter_info(std::ostream& os, const array_t<bool, N>& options,
auto _rocm_events =
(gpu_count > 0) ? omnitrace::rocprofiler::rocm_metrics() : hwcounter_info_t{};
auto _process_counters = [](auto& _events, int32_t _offset) {
for(auto& itr : _events)
{
itr.offset() += _offset;
itr.python_symbol() = "timemory.hardware_counters." + itr.python_symbol();
}
return static_cast<int32_t>(_events.size());
auto _process_counters = [](auto& _events_v, int32_t _offset_v) {
for(auto& iitr : _events_v)
iitr.offset() += _offset_v;
return static_cast<int32_t>(_events_v.size());
};
int32_t _offset = 0;
@@ -87,18 +87,18 @@ get_regex_pattern()
for(const auto& itr : regex_keys)
{
if(itr.empty()) continue;
std::string _pattern = {};
std::string _local_pattern = {};
if(itr.at(0) == '~')
{
_pattern = itr.substr(1);
_v.at(1) += "|" + _pattern;
_local_pattern = itr.substr(1);
_v.at(1) += "|" + _local_pattern;
}
else
{
_pattern = itr;
_v.at(0) += "|" + _pattern;
_local_pattern = itr;
_v.at(0) += "|" + _local_pattern;
}
lerr << "Adding regex key: '" << _pattern << "'...\n";
lerr << "Adding regex key: '" << _local_pattern << "'...\n";
}
for(auto& itr : _v)
if(!itr.empty()) itr = itr.substr(1);
@@ -188,18 +188,18 @@ get_category_regex_pattern()
for(const auto& itr : category_regex_keys)
{
if(itr.empty()) continue;
std::string _pattern = {};
std::string _local_pattern = {};
if(itr.at(0) == '~')
{
_pattern = itr.substr(1);
_v.at(1) += "|" + _pattern;
_local_pattern = itr.substr(1);
_v.at(1) += "|" + _local_pattern;
}
else
{
_pattern = itr;
_v.at(0) += "|" + _pattern;
_local_pattern = itr;
_v.at(0) += "|" + _local_pattern;
}
lerr << "Adding category regex key: '" << _pattern << "'...\n";
lerr << "Adding category regex key: '" << _local_pattern << "'...\n";
}
for(auto& itr : _v)
if(!itr.empty()) itr = itr.substr(1);
@@ -393,22 +393,22 @@ generate_config(std::string _config_file, const std::set<std::string>& _config_f
}
_line << " " << _str;
};
for(auto& itr : _desc)
_write(itr);
for(auto& iitr : _desc)
_write(iitr);
_ss << _line.str() << "\n#\n";
}
if(_options[CATEGORY] || all_info)
{
_ss << "# categories:\n";
for(const auto& itr : itr->get_categories())
_ss << "# " << itr << "\n";
for(const auto& iitr : itr->get_categories())
_ss << "# " << iitr << "\n";
_ss << "#\n";
}
if((_options[VAL] || all_info) && !itr->get_choices().empty())
{
_ss << "# choices:\n";
for(const auto& itr : itr->get_choices())
_ss << "# " << itr << "\n";
for(const auto& iitr : itr->get_choices())
_ss << "# " << iitr << "\n";
_ss << "#\n";
}
if(_has_info) _ss << "\n";
@@ -780,7 +780,7 @@ find(
if(std::forward<FuncT>(_func)(_v, itr)) return &itr;
}
return nullptr;
};
}
template <typename FuncT = bool (*)(const entry&, const entry&)>
inline entry*
@@ -845,13 +845,13 @@ compute_critical_trace()
perfstats_t _ct_perf{};
_ct_perf.start();
auto _report_perf = [](auto& _perf, const char* _func, const std::string& _label) {
_perf.stop().rekey(_label);
auto _str = JOIN("", _perf);
auto _report_perf = [](auto& _perf_v, const char* _func, const std::string& _label) {
_perf_v.stop().rekey(_label);
auto _str = JOIN("", _perf_v);
if(_str.length() > 5) _str = _str.substr(5);
OMNITRACE_BASIC_PRINT("[%s] %s\n", _func, _str.c_str());
OMNITRACE_BASIC_PRINT("\n");
_perf.reset().start();
_perf_v.reset().start();
};
OMNITRACE_BASIC_PRINT("\n");
@@ -708,10 +708,10 @@ module_function::operator()(address_space_t* _addr_space, procedure_t* _entr_tra
auto* itr = loop_blocks.at(i);
auto _is_constrained = [this](bool _v, const std::string& _label,
const std::string& _name) {
const std::string& _mname) {
if(_v)
{
messages.emplace_back(3, "Skipping", "function-loop", _label, _name);
messages.emplace_back(3, "Skipping", "function-loop", _label, _mname);
return true;
}
return false;
@@ -854,26 +854,26 @@ main(int argc, char** argv)
for(auto&& itr : _configs)
{
auto _settings = tim::settings::push<omnitrace_env_config_s>();
for(auto&& itr : *_settings)
for(auto&& iitr : *_settings)
{
itr.second->set_config_updated(false);
itr.second->set_environ_updated(false);
iitr.second->set_config_updated(false);
iitr.second->set_environ_updated(false);
}
_settings->read(itr);
for(auto&& itr : *_settings)
for(auto&& iitr : *_settings)
{
if(itr.second && itr.second->get_config_updated())
if(iitr.second && iitr.second->get_config_updated())
{
env_config_variables.emplace_back(TIMEMORY_JOIN(
'=', itr.second->get_env_name(), itr.second->as_string()));
'=', iitr.second->get_env_name(), iitr.second->as_string()));
verbprintf(1, "Exporting known config value :: %s\n",
env_config_variables.back().c_str());
}
}
for(auto&& itr : _settings->get_unknown_configs())
for(auto&& iitr : _settings->get_unknown_configs())
{
env_config_variables.emplace_back(
TIMEMORY_JOIN('=', itr.first, itr.second));
TIMEMORY_JOIN('=', iitr.first, iitr.second));
verbprintf(1, "Exporting unknown config value :: %s\n",
env_config_variables.back().c_str());
}
@@ -2508,7 +2508,7 @@ find_dyn_api_rt()
_dyn_api_rt_paths.insert(_dyn_api_rt_paths.begin(), _dyn_api_rt_abs);
else
{
auto _dyn_api_rt_abs = get_absolute_lib_filepath(
_dyn_api_rt_abs = get_absolute_lib_filepath(
_dyn_api_rt_base + ".a", "LIBRARY_PATH", _suffixes, _fallbacks);
if(_dyn_api_rt_abs != _dyn_api_rt_base + ".a")
_dyn_api_rt_paths.insert(_dyn_api_rt_paths.begin(), _dyn_api_rt_abs);