Refactor logging functions and reduce includes

Author: DaKerboul

profiling/energy-profiler/kp_energy_profiler.cpp

@@ -16,11 +16,6 @@
 
 #include <algorithm>
 #include <chrono>
-#include <cstdarg>
-#include <cstdint>
-#include <cstdio>
-#include <exception>
-#include <cstdlib>
 #include <iostream>
 #include <memory>
 #include <mutex>
@@ -48,12 +43,9 @@ uint64_t generate_new_region_id() {
 }
 
 // Helper function for verbose logging
-void log_verbose(const char* format, ...) {
+void log_verbose(const std::string& message) {
   if (EnergyProfilerState::get_instance().get_verbose_enabled()) {
-    va_list args;
-    va_start(args, format);
-    vprintf(format, args);
-    va_end(args);
+    std::cout << message << std::endl;
   }
 }
 
@@ -174,28 +166,26 @@ void kokkosp_init_library(const int loadSeq, const uint64_t interfaceVer,
     KokkosTools::EnergyProfiler::EnergyProfilerState::get_instance()
         .set_verbose_enabled(true);
   }
-  printf(
-      "Kokkos Energy Profiler: Initializing with load sequence %d and "
-      "interface version %lu\n",
-      loadSeq, interfaceVer);
-  printf("Kokkos Energy Profiler: Library initialized\n");
+  std::cout << "Kokkos Energy Profiler: Initializing with load sequence "
+            << loadSeq << " and interface version " << interfaceVer
+            << std::endl;
+  std::cout << "Kokkos Energy Profiler: Library initialized" << std::endl;
 
   // Initialize power sampling (completely independent of timing)
   KokkosTools::EnergyProfiler::g_power_sampler.reset(
       new KokkosTools::EnergyProfiler::PowerSampler());
   if (KokkosTools::EnergyProfiler::g_power_sampler->initialize()) {
     KokkosTools::EnergyProfiler::g_power_sampler->start_sampling();
-    printf("Kokkos Energy Profiler: Power sampling started\n");
+    std::cout << "Kokkos Energy Profiler: Power sampling started" << std::endl;
   } else {
-    printf("Kokkos Energy Profiler: Power sampling initialization failed\n");
+    std::cout << "Kokkos Energy Profiler: Power sampling initialization failed" << std::endl;
   }
 }
 
 // Library finalize
 void kokkosp_finalize_library() {
-  printf("Kokkos Energy Profiler: Finalizing library\n");
+  std::cout << "Kokkos Energy Profiler: Finalizing library" << std::endl;
 
-  // Export timing data
   std::string prefix = KokkosTools::EnergyProfiler::generate_prefix();
   auto all_timings   = KokkosTools::EnergyProfiler::get_all_timings();
   KokkosTools::EnergyProfiler::print_all_timings_summary(
@@ -220,7 +210,7 @@ void kokkosp_finalize_library() {
     KokkosTools::EnergyProfiler::g_power_sampler.reset();
   }
 
-  printf("Kokkos Energy Profiler: Library finalized\n");
+  std::cout << "Kokkos Energy Profiler: Library finalized" << std::endl;
 }
 
 // Begin parallel_for
@@ -238,9 +228,9 @@ void kokkosp_begin_parallel_for(const char* name, const uint32_t devID,
   KokkosTools::EnergyProfiler::start_region(
       name, KokkosTools::EnergyProfiler::RegionType::ParallelFor, *kID);
   KokkosTools::EnergyProfiler::log_verbose(
-      "Kokkos Energy Profiler: Started parallel_for '%s' on device %u with ID "
-      "%lu\n",
-      name, devID, *kID);
+      std::string("Kokkos Energy Profiler: Started parallel_for '") + name +
+      "' on device " + std::to_string(devID) + " with ID " +
+      std::to_string(*kID));
 }
 
 // End parallel_for
@@ -251,7 +241,8 @@ void kokkosp_end_parallel_for(const uint64_t kID) {
   }
   KokkosTools::EnergyProfiler::end_region_with_id(kID);
   KokkosTools::EnergyProfiler::log_verbose(
-      "Kokkos Energy Profiler: Ended parallel_for with ID %lu\n", kID);
+      std::string("Kokkos Energy Profiler: Ended parallel_for with ID ") +
+      std::to_string(kID));
 }
 
 // Begin parallel_scan
@@ -267,9 +258,9 @@ void kokkosp_begin_parallel_scan(const char* name, const uint32_t devID,
   KokkosTools::EnergyProfiler::start_region(
       name, KokkosTools::EnergyProfiler::RegionType::ParallelScan, *kID);
   KokkosTools::EnergyProfiler::log_verbose(
-      "Kokkos Energy Profiler: Started parallel_scan '%s' on device %u with ID "
-      "%lu\n",
-      name, devID, *kID);
+      std::string("Kokkos Energy Profiler: Started parallel_scan '") + name +
+      "' on device " + std::to_string(devID) + " with ID " +
+      std::to_string(*kID));
 }
 
 // End parallel_scan
@@ -280,7 +271,8 @@ void kokkosp_end_parallel_scan(const uint64_t kID) {
   }
   KokkosTools::EnergyProfiler::end_region_with_id(kID);
   KokkosTools::EnergyProfiler::log_verbose(
-      "Kokkos Energy Profiler: Ended parallel_scan with ID %lu\n", kID);
+      std::string("Kokkos Energy Profiler: Ended parallel_scan with ID ") +
+      std::to_string(kID));
 }
 
 // Begin parallel_reduce
@@ -296,9 +288,9 @@ void kokkosp_begin_parallel_reduce(const char* name, const uint32_t devID,
   KokkosTools::EnergyProfiler::start_region(
       name, KokkosTools::EnergyProfiler::RegionType::ParallelReduce, *kID);
   KokkosTools::EnergyProfiler::log_verbose(
-      "Kokkos Energy Profiler: Started parallel_reduce '%s' on device %u with "
-      "ID %lu\n",
-      name, devID, *kID);
+      std::string("Kokkos Energy Profiler: Started parallel_reduce '") + name +
+      "' on device " + std::to_string(devID) + " with ID " +
+      std::to_string(*kID));
 }
 
 // End parallel_reduce
@@ -309,7 +301,8 @@ void kokkosp_end_parallel_reduce(const uint64_t kID) {
   }
   KokkosTools::EnergyProfiler::end_region_with_id(kID);
   KokkosTools::EnergyProfiler::log_verbose(
-      "Kokkos Energy Profiler: Ended parallel_reduce with ID %lu\n", kID);
+      std::string("Kokkos Energy Profiler: Ended parallel_reduce with ID ") +
+      std::to_string(kID));
 }
 
 // Push user region
@@ -322,15 +315,16 @@ void kokkosp_push_profile_region(char const* regionName) {
   KokkosTools::EnergyProfiler::start_region(
       regionName, KokkosTools::EnergyProfiler::RegionType::UserRegion, new_id);
   KokkosTools::EnergyProfiler::log_verbose(
-      "Kokkos Energy Profiler: Pushed profile region '%s'\n", regionName);
+      std::string("Kokkos Energy Profiler: Pushed profile region '") +
+      regionName + "'");
 }
 
 // Pop user region
 void kokkosp_pop_profile_region() {
   KokkosTools::EnergyProfiler::end_region_by_type(
       KokkosTools::EnergyProfiler::RegionType::UserRegion);
   KokkosTools::EnergyProfiler::log_verbose(
-      "Kokkos Energy Profiler: Popped profile region\n");
+      "Kokkos Energy Profiler: Popped profile region");
 }
 
 // Begin deep copy
@@ -346,17 +340,17 @@ void kokkosp_begin_deep_copy(Kokkos::Tools::SpaceHandle, const char* dst_name,
   KokkosTools::EnergyProfiler::start_region(
       name, KokkosTools::EnergyProfiler::RegionType::DeepCopy, new_id);
   KokkosTools::EnergyProfiler::log_verbose(
-      "Kokkos Energy Profiler: Started deep copy from '%s' to '%s' (size: %lu "
-      "bytes)\n",
-      src_name, dst_name, size);
+      std::string("Kokkos Energy Profiler: Started deep copy from '") +
+      src_name + "' to '" + dst_name + "' (size: " + std::to_string(size) +
+      " bytes)");
 }
 
 // End deep copy
 void kokkosp_end_deep_copy() {
   KokkosTools::EnergyProfiler::end_region_by_type(
       KokkosTools::EnergyProfiler::RegionType::DeepCopy);
   KokkosTools::EnergyProfiler::log_verbose(
-      "Kokkos Energy Profiler: Ended deep copy\n");
+      "Kokkos Energy Profiler: Ended deep copy");
 }
 
 }  // extern "C"

profiling/energy-profiler/timing_utils.hpp

@@ -90,7 +90,7 @@ void end_region_with_id(uint64_t expected_id);
 uint64_t generate_new_region_id();
 bool is_verbose_enabled();
 void set_verbose_enabled(bool enabled);
-void log_verbose(const char* format, ...);
+void log_verbose(const std::string& message);
 std::vector<TimingInfo> get_all_timings();
 
 // Filename prefix generation