Resolve warnings/errors with extra warnings (#171)

ROCm · Sep 28, 2022 · 4e3527f · 4e3527f
1 parent 2ed8184
commit 4e3527f
Show file tree

Hide file tree

Showing 25 changed files with 132 additions and 135 deletions.
diff --git a/cmake/BuildSettings.cmake b/cmake/BuildSettings.cmake
@@ -218,10 +218,9 @@ endif()
 # ----------------------------------------------------------------------------------------#
 # developer build flags
 #
-omnitrace_add_interface_library(omnitrace-develop-options "Adds developer compiler flags")
 if(OMNITRACE_BUILD_DEVELOPER)
-    add_target_flag_if_avail(omnitrace-develop-options "-Werror" "-Wdouble-promotion"
-                             "-Wshadow" "-Wextra" "-Wpedantic" "-Werror" "/showIncludes")
+    add_target_flag_if_avail(omnitrace-compile-options "-Werror" "-Wdouble-promotion"
+                             "-Wshadow" "-Wextra" "-Wpedantic" "/showIncludes")
 endif()
 
 # ----------------------------------------------------------------------------------------#

diff --git a/examples/mpi/mpi.cpp b/examples/mpi/mpi.cpp
@@ -52,7 +52,7 @@ get_values_str(const Tp& _data)
     for(auto&& itr : _data)
         _ss << ", " << std::setw(6) << std::setprecision(2) << std::fixed << itr;
     return _ss.str().substr(1);
-};
+}
 
 template <typename Tp, size_t N>
 auto
@@ -289,8 +289,8 @@ run_main(int argc, char** argv)
 
             int       n        = 0;
             const int ranks[7] = { 1, 2, 3, 5, 7, 11, 13 };
-            for(int rank : ranks)
-                if(rank < size) ++n;
+            for(int r : ranks)
+                if(r < size) ++n;
 
             // Construct a group containing all of the prime ranks in world_group
             MPI_Group prime_group;

diff --git a/external/timemory b/external/timemory
diff --git a/pyproject.toml b/pyproject.toml
@@ -9,7 +9,7 @@ build-backend = 'setuptools.build_meta'
 [tool.black]
 line-length = 90
 target-version = ['py38']
-include = '\.py'
+include = '\.py$'
 exclude = '''
 (
   /(

diff --git a/source/bin/omnitrace-avail/avail.cpp b/source/bin/omnitrace-avail/avail.cpp
@@ -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;

diff --git a/source/bin/omnitrace-avail/common.cpp b/source/bin/omnitrace-avail/common.cpp
@@ -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);

diff --git a/source/bin/omnitrace-avail/generate_config.cpp b/source/bin/omnitrace-avail/generate_config.cpp
@@ -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";

diff --git a/source/bin/omnitrace-critical-trace/critical-trace.cpp b/source/bin/omnitrace-critical-trace/critical-trace.cpp
@@ -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");

diff --git a/source/bin/omnitrace/module_function.cpp b/source/bin/omnitrace/module_function.cpp
@@ -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;

diff --git a/source/bin/omnitrace/omnitrace.cpp b/source/bin/omnitrace/omnitrace.cpp
@@ -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);

diff --git a/source/lib/common/setup.hpp b/source/lib/common/setup.hpp
@@ -187,7 +187,7 @@ setup_environ(int _verbose, const std::string& _search_paths = {},
     if(_omp_libs != nullptr &&
        std::string_view{ _omp_libs }.find(_omnilib_dl) == std::string::npos)
         _omni_omp_libs = common::join(':', _omp_libs, _omnilib_dl);
-    OMNITRACE_SETUP_LOG(_verbose >= 1, "setting OMP_TOOL_LIBRARIES to '%s'\n",
+    OMNITRACE_SETUP_LOG(_verbose >= 2, "setting OMP_TOOL_LIBRARIES to '%s'\n",
                         _omni_omp_libs.c_str());
     setenv("OMP_TOOL_LIBRARIES", _omni_omp_libs.c_str(), 1);
 #endif

diff --git a/source/lib/omnitrace/library.cpp b/source/lib/omnitrace/library.cpp
@@ -85,36 +85,39 @@ auto
 ensure_finalization(bool _static_init = false)
 {
     const auto& _info = thread_info::init();
-    auto        _tid  = _info->index_data;
-    OMNITRACE_CI_THROW(_tid->sequent_value != threading::get_id(),
-                       "Error! internal tid != %li :: %li", threading::get_id(),
-                       _tid->sequent_value);
-    OMNITRACE_CI_THROW(_tid->system_value != threading::get_sys_tid(),
-                       "Error! system tid != %li :: %li", threading::get_sys_tid(),
-                       _tid->system_value);
+    const auto& _tid  = _info->index_data;
+    if(_tid)
+    {
+        OMNITRACE_CI_THROW(_tid->sequent_value != threading::get_id(),
+                           "Error! internal tid != %li :: %li", threading::get_id(),
+                           _tid->sequent_value);
+        OMNITRACE_CI_THROW(_tid->system_value != threading::get_sys_tid(),
+                           "Error! system tid != %li :: %li", threading::get_sys_tid(),
+                           _tid->system_value);
+    }
 
     if(!get_env("OMNITRACE_COLORIZED_LOG", true)) tim::log::colorized() = false;
 
     (void) tim::manager::instance();
     (void) tim::settings::shared_instance();
 
-    if(!_static_init)
+    if(_static_init)
     {
-        OMNITRACE_DEBUG_F("\n");
+        OMNITRACE_BASIC_DEBUG_F("\n");
+        auto _verbose =
+            get_verbose_env() + ((get_debug_env() || get_debug_init()) ? 16 : 0);
+        auto _search_paths = JOIN(':', tim::get_env<std::string>("OMNITRACE_PATH", ""),
+                                  tim::get_env<std::string>("PWD"), ".",
+                                  tim::get_env<std::string>("LD_LIBRARY_PATH", ""),
+                                  tim::get_env<std::string>("LIBRARY_PATH", ""),
+                                  tim::get_env<std::string>("PATH", ""));
+        common::setup_environ(_verbose, _search_paths);
     }
     else
     {
-        OMNITRACE_BASIC_DEBUG_F("\n");
+        OMNITRACE_DEBUG_F("\n");
     }
 
-    auto _verbose = get_verbose_env() + ((get_debug_env() || get_debug_init()) ? 16 : 0);
-    auto _search_paths = JOIN(':', tim::get_env<std::string>("OMNITRACE_PATH", ""),
-                              tim::get_env<std::string>("PWD"), ".",
-                              tim::get_env<std::string>("LD_LIBRARY_PATH", ""),
-                              tim::get_env<std::string>("LIBRARY_PATH", ""),
-                              tim::get_env<std::string>("PATH", ""));
-    common::setup_environ(_verbose, _search_paths);
-
     return scope::destructor{ []() { omnitrace_finalize_hidden(); } };
 }
 

diff --git a/source/lib/omnitrace/library/components/cpu_freq.hpp b/source/lib/omnitrace/library/components/cpu_freq.hpp
@@ -88,6 +88,7 @@ struct cpu_freq
             operation::serialization<cpu_freq>{}(*this, _ar, _version);
         else
             _ar(tim::cereal::make_nvp("value", value));
+        (void) _version;
     }
 
     this_type& operator+=(const this_type& _rhs)

diff --git a/source/lib/omnitrace/library/components/mpi_gotcha.cpp b/source/lib/omnitrace/library/components/mpi_gotcha.cpp
@@ -281,7 +281,7 @@ mpi_gotcha::audit(const gotcha_data_t& _data, audit::incoming, comm_t _comm, int
     else
     {
         OMNITRACE_BASIC_PRINT_F("%s(<comm>, %p) :: unexpected function wrapper\n",
-                                _data.tool_id.c_str(), _val);
+                                _data.tool_id.c_str(), static_cast<void*>(_val));
     }
 }
 

diff --git a/source/lib/omnitrace/library/components/rcclp.cpp b/source/lib/omnitrace/library/components/rcclp.cpp
@@ -87,11 +87,6 @@ deactivate_rcclp(uint64_t id)
 void
 configure_rcclp(const std::set<std::string>& permit, const std::set<std::string>& reject)
 {
-    static constexpr size_t rcclp_wrapper_count = OMNITRACE_NUM_RCCLP_WRAPPERS;
-
-    using rcclp_gotcha_t =
-        tim::component::gotcha<rcclp_wrapper_count, rccl_toolset_t, category::rocm_rccl>;
-
     static bool is_initialized = false;
     if(!is_initialized)
     {

diff --git a/source/lib/omnitrace/library/components/rocprofiler.cpp b/source/lib/omnitrace/library/components/rocprofiler.cpp
@@ -94,7 +94,8 @@ rocm_event::rocm_event(uint32_t _dev, uint32_t _thr, uint32_t _queue,
                 feature_values.emplace_back(rocm_feature_value{ p->data.result_int32 });
                 break;
             case ROCPROFILER_DATA_KIND_FLOAT:
-                feature_values.emplace_back(rocm_feature_value{ p->data.result_float });
+                feature_values.emplace_back(
+                    rocm_feature_value{ static_cast<double>(p->data.result_float) });
                 break;
             case ROCPROFILER_DATA_KIND_DOUBLE:
                 feature_values.emplace_back(rocm_feature_value{ p->data.result_double });

diff --git a/source/lib/omnitrace/library/components/rocprofiler.hpp b/source/lib/omnitrace/library/components/rocprofiler.hpp
@@ -53,7 +53,7 @@ namespace component
 {
 using rocm_metric_type   = unsigned long long;
 using rocm_info_entry    = ::tim::hardware_counters::info;
-using rocm_feature_value = std::variant<uint32_t, float, uint64_t, double>;
+using rocm_feature_value = std::variant<uint32_t, uint64_t, double>;
 
 struct rocm_counter
 {

diff --git a/source/lib/omnitrace/library/coverage.cpp b/source/lib/omnitrace/library/coverage.cpp
@@ -192,13 +192,13 @@ post_process()
             auto  mitr   = _cache.find(_v.address);
             if(mitr != _cache.end()) return std::make_pair(mitr->second, true);
 
-            for(auto itr = _tmp.begin(); itr != _tmp.end(); ++itr)
+            for(auto titr = _tmp.begin(); titr != _tmp.end(); ++titr)
             {
-                if(itr->source == _v.source && itr->address != _v.address &&
-                   itr->count == _v.count)
+                if(titr->source == _v.source && titr->address != _v.address &&
+                   titr->count == _v.count)
                 {
-                    _cache[_v.address] = itr;
-                    return std::make_pair(itr, true);
+                    _cache[_v.address] = titr;
+                    return std::make_pair(titr, true);
                 }
             }
             return std::make_pair(_tmp.end(), false);

diff --git a/source/lib/omnitrace/library/critical_trace.cpp b/source/lib/omnitrace/library/critical_trace.cpp
@@ -683,7 +683,7 @@ find(
         if(std::forward<FuncT>(_func)(_v, itr)) return &itr;
     }
     return nullptr;
-};
+}
 
 template <typename FuncT = bool (*)(const entry&, const entry&)>
 inline entry*