SWDEV-403398: ROCProfiler V2 Optimizations

1- Optimizations for current profiler, tracer classes
2- Adding Flush Interval functionality
3- Adding Trace Period functionality

Change-Id: I319b76b723516abad34565cd8364326e8435e634


[ROCm/rocprofiler commit: 93c28b5d39]

projects/rocprofiler/src/core/hsa/packets/packets_generator.cpp

@@ -152,17 +152,16 @@ void CheckPacketReqiurements(std::vector<hsa_agent_t>& gpu_agents) {
 // packets
 std::vector<std::pair<rocprofiler::profiling_context_t*, hsa_ven_amd_aqlprofile_profile_t*>>
 InitializeAqlPackets(hsa_agent_t cpu_agent, hsa_agent_t gpu_agent,
-                     std::vector<std::string>& counter_names, bool is_spm) {
+                     std::vector<std::string>& counter_names, rocprofiler_session_id_t session_id,
+                     bool is_spm) {
   hsa_status_t status = HSA_STATUS_SUCCESS;
 
   if (!counters_added.load(std::memory_order_acquire)) {
     for (auto& name : counter_names) {
-      if (rocprofiler::GetROCProfilerSingleton()->HasActiveSession()) {
-        rocprofiler::GetROCProfilerSingleton()
-            ->GetSession(rocprofiler::GetROCProfilerSingleton()->GetCurrentSessionId())
-            ->GetProfiler()
-            ->AddCounterName(name);
-      }
+      rocprofiler::GetROCProfilerSingleton()
+          ->GetSession(session_id)
+          ->GetProfiler()
+          ->AddCounterName(name);
     }
     counters_added.exchange(true, std::memory_order_release);
   }

projects/rocprofiler/src/core/hsa/packets/packets_generator.h

@@ -41,7 +41,8 @@ typedef hsa_ext_amd_aql_pm4_packet_t packet_t;
 
 std::vector<std::pair<rocprofiler::profiling_context_t*, hsa_ven_amd_aqlprofile_profile_t*>>
 InitializeAqlPackets(hsa_agent_t cpu_agent, hsa_agent_t gpu_agent,
-                     std::vector<std::string>& counter_names, bool is_spm = false);
+                     std::vector<std::string>& counter_names, rocprofiler_session_id_t session_id,
+                     bool is_spm = false);
 uint8_t* AllocateSysMemory(hsa_agent_t gpu_agent, size_t size, hsa_amd_memory_pool_t* cpu_pool);
 void GetCommandBufferMap(std::map<size_t, uint8_t*>);
 void GetOutputBufferMap(std::map<size_t, uint8_t*>);

projects/rocprofiler/src/core/hsa/queues/queue.cpp

@@ -366,8 +366,8 @@ void AddAttRecord(rocprofiler_record_att_tracer_t* record, hsa_agent_t gpu_agent
       buffer = Packet::AllocateSysMemory(gpu_agent, data_size, &agent_info.cpu_pool);
       if (buffer == NULL) fatal("Trace data buffer allocation failed");
 
-      auto status =
-          rocprofiler::hsa_support::GetCoreApiTable().hsa_memory_copy_fn(buffer, data_ptr, data_size);
+      auto status = rocprofiler::hsa_support::GetCoreApiTable().hsa_memory_copy_fn(buffer, data_ptr,
+                                                                                   data_size);
       if (status != HSA_STATUS_SUCCESS) fatal("Trace data memcopy to host failed");
 
       record->shader_engine_data[se_index].buffer_ptr = buffer;
@@ -386,7 +386,8 @@ bool AsyncSignalHandler(hsa_signal_value_t signal_value, void* data) {
       !GetROCProfilerSingleton()->GetSession(queue_info_session->session_id) ||
       !GetROCProfilerSingleton()->GetSession(queue_info_session->session_id)->GetProfiler())
     return true;
-  rocprofiler::Session* session = GetROCProfilerSingleton()->GetSession(queue_info_session->session_id);
+  rocprofiler::Session* session =
+      GetROCProfilerSingleton()->GetSession(queue_info_session->session_id);
   std::lock_guard<std::mutex> lock(session->GetSessionLock());
   rocprofiler::profiler::Profiler* profiler = session->GetProfiler();
   std::vector<pending_signal_t*> pending_signals = const_cast<std::vector<pending_signal_t*>&>(
@@ -396,7 +397,8 @@ bool AsyncSignalHandler(hsa_signal_value_t signal_value, void* data) {
     for (auto it = pending_signals.begin(); it != pending_signals.end();
          it = pending_signals.erase(it)) {
       auto& pending = *it;
-      if (hsa_support::GetCoreApiTable().hsa_signal_load_relaxed_fn(pending->new_signal)) return true;
+      if (hsa_support::GetCoreApiTable().hsa_signal_load_relaxed_fn(pending->new_signal))
+        return true;
       hsa_amd_profiling_dispatch_time_t time;
       hsa_support::GetAmdExtTable().hsa_amd_profiling_get_dispatch_time_fn(
           queue_info_session->agent, pending->original_signal, &time);
@@ -434,14 +436,14 @@ bool AsyncSignalHandler(hsa_signal_value_t signal_value, void* data) {
             pending->profile) {
           if (xcc_id == 0)  // call to GetCounterData() is required only once for a dispatch
             rocprofiler::metrics::GetCounterData(pending->profile, queue_info_session->agent,
-                                               pending->context->results_list);
+                                                 pending->context->results_list);
           if (is_individual_xcc_mode)
             rocprofiler::metrics::GetCountersAndMetricResultsByXcc(
                 xcc_id, pending->context->results_list, pending->context->results_map,
                 pending->context->metrics_list);
           else
             rocprofiler::metrics::GetMetricsData(pending->context->results_map,
-                                               pending->context->metrics_list);
+                                                 pending->context->metrics_list);
           AddRecordCounters(&record, pending);
         } else {
           if (session->FindBuffer(pending->buffer_id)) {
@@ -454,8 +456,9 @@ bool AsyncSignalHandler(hsa_signal_value_t signal_value, void* data) {
         // TODO(aelwazir): we need a better way of distributing events and free them
         // if (pending->profile->output_buffer.ptr)
         //   numa_free(pending->profile->output_buffer.ptr, pending->profile->output_buffer.size);
-        hsa_status_t status = rocprofiler::hsa_support::GetAmdExtTable().hsa_amd_memory_pool_free_fn(
-            (pending->profile->output_buffer.ptr));
+        hsa_status_t status =
+            rocprofiler::hsa_support::GetAmdExtTable().hsa_amd_memory_pool_free_fn(
+                (pending->profile->output_buffer.ptr));
         CHECK_HSA_STATUS("Error: Couldn't free output buffer memory", status);
         // if (pending->profile->command_buffer.ptr)
         //   numa_free(pending->profile->command_buffer.ptr, pending->profile->command_buffer.size);
@@ -488,7 +491,8 @@ bool AsyncSignalHandlerATT(hsa_signal_value_t /* signal */, void* data) {
       !GetROCProfilerSingleton()->GetSession(queue_info_session->session_id) ||
       !GetROCProfilerSingleton()->GetSession(queue_info_session->session_id)->GetAttTracer())
     return true;
-  rocprofiler::Session* session = GetROCProfilerSingleton()->GetSession(queue_info_session->session_id);
+  rocprofiler::Session* session =
+      GetROCProfilerSingleton()->GetSession(queue_info_session->session_id);
   rocprofiler::att::AttTracer* att_tracer = session->GetAttTracer();
   std::vector<att_pending_signal_t>& pending_signals =
       const_cast<std::vector<att_pending_signal_t>&>(
@@ -499,7 +503,8 @@ bool AsyncSignalHandlerATT(hsa_signal_value_t /* signal */, void* data) {
          it = pending_signals.erase(it)) {
       auto& pending = *it;
       std::lock_guard<std::mutex> lock(session->GetSessionLock());
-      if (hsa_support::GetCoreApiTable().hsa_signal_load_relaxed_fn(pending.new_signal)) return true;
+      if (hsa_support::GetCoreApiTable().hsa_signal_load_relaxed_fn(pending.new_signal))
+        return true;
       rocprofiler_record_att_tracer_t record{};
       record.kernel_id = rocprofiler_kernel_id_t{pending.kernel_descriptor};
       record.gpu_id = rocprofiler_agent_id_t{(uint64_t)queue_info_session->gpu_index};
@@ -602,7 +607,7 @@ std::vector<std::string> att_counters_names;
 
 rocprofiler::Session* session = nullptr;
 
-void ResetSessionID() { session_id = rocprofiler_session_id_t{0}; }
+void ResetSessionID(rocprofiler_session_id_t id) { session_id = id; }
 
 void CheckNeededProfileConfigs() {
   rocprofiler_session_id_t internal_session_id;
@@ -670,8 +675,9 @@ void WriteInterceptor(const void* packets, uint64_t pkt_count, uint64_t user_pkt
   std::vector<Packet::packet_t> transformed_packets;
 
   CheckNeededProfileConfigs();
+  rocprofiler_session_id_t session_id_snapshot = session_id;
 
-  if (session_id.handle > 0 && pkt_count > 0 &&
+  if (session_id_snapshot.handle > 0 && pkt_count > 0 &&
       (is_counter_collection_mode || is_timestamp_collection_mode ||
        is_pc_sampling_collection_mode) &&
       session) {
@@ -691,9 +697,10 @@ void WriteInterceptor(const void* packets, uint64_t pkt_count, uint64_t user_pkt
 
       // +Skip kernel dispatch IDs not wanted
       // Skip packets other than kernel dispatch packets.
-      if (bit_extract(original_packet.header, HSA_PACKET_HEADER_TYPE,
+      if (session_id_snapshot.handle == 0 ||
+          bit_extract(original_packet.header, HSA_PACKET_HEADER_TYPE,
                       HSA_PACKET_HEADER_TYPE + HSA_PACKET_HEADER_WIDTH_TYPE - 1) !=
-          HSA_PACKET_TYPE_KERNEL_DISPATCH) {
+              HSA_PACKET_TYPE_KERNEL_DISPATCH) {
         transformed_packets.emplace_back(packets_arr[i]);
         continue;
       }
@@ -702,7 +709,7 @@ void WriteInterceptor(const void* packets, uint64_t pkt_count, uint64_t user_pkt
       if (session_data_count > 0 && is_counter_collection_mode) {
         // Get the PM4 Packets using packets_generator
         profiles = Packet::InitializeAqlPackets(queue_info.GetCPUAgent(), queue_info.GetGPUAgent(),
-                                                session_data);
+                                                session_data, session_id_snapshot);
         replay_mode_count = profiles.size();
       }
 
@@ -740,14 +747,16 @@ void WriteInterceptor(const void* packets, uint64_t pkt_count, uint64_t user_pkt
                                     record_id);
         if (profiles.size() > 0 && replay_mode_count > 0) {
           session->GetProfiler()->AddPendingSignals(
-              writer_id, record_id, original_packet.completion_signal, dispatch_packet.completion_signal, session_id, buffer_id,
-              profile.first, profile.first->metrics_list.size(), profile.second, kernel_properties,
+              writer_id, record_id, original_packet.completion_signal,
+              dispatch_packet.completion_signal, session_id_snapshot, buffer_id, profile.first,
+              profile.first->metrics_list.size(), profile.second, kernel_properties,
               (uint32_t)syscall(__NR_gettid), user_pkt_index, correlation_id);
         } else {
           session->GetProfiler()->AddPendingSignals(
-              writer_id, record_id, original_packet.completion_signal, dispatch_packet.completion_signal, session_id, buffer_id,
-              nullptr, 0, nullptr, kernel_properties, (uint32_t)syscall(__NR_gettid),
-              user_pkt_index, correlation_id);
+              writer_id, record_id, original_packet.completion_signal,
+              dispatch_packet.completion_signal, session_id_snapshot, buffer_id, nullptr, 0,
+              nullptr, kernel_properties, (uint32_t)syscall(__NR_gettid), user_pkt_index,
+              correlation_id);
         }
       }
 
@@ -792,16 +801,16 @@ void WriteInterceptor(const void* packets, uint64_t pkt_count, uint64_t user_pkt
       //  marked complete
       SignalAsyncHandler(
           interrupt_signal,
-          new queue_info_session_t{queue_info.GetGPUAgent(), session_id, queue_info.GetQueueID(),
-                                   writer_id, interrupt_signal, agentInfo.getIndex(),
-                                   agentInfo.getXccCount()});
+          new queue_info_session_t{queue_info.GetGPUAgent(), session_id_snapshot,
+                                   queue_info.GetQueueID(), writer_id, interrupt_signal,
+                                   agentInfo.getIndex(), agentInfo.getXccCount()});
       ACTIVE_INTERRUPT_SIGNAL_COUNT.fetch_add(1, std::memory_order_relaxed);
       // profile_id++;
       // } while (replay_mode_count > 0 && profile_id < replay_mode_count);  // Profiles loop end
     }
     /* Write the transformed packets to the hardware queue.  */
     writer(&transformed_packets[0], transformed_packets.size());
-  } else if (session_id.handle > 0 && pkt_count > 0 && is_att_collection_mode && session &&
+  } else if (session_id_snapshot.handle > 0 && pkt_count > 0 && is_att_collection_mode && session &&
              KernelInterceptCount < MAX_ATT_PROFILES) {
     // att start
     // Getting Queue Data and Information
@@ -941,11 +950,13 @@ void WriteInterceptor(const void* packets, uint64_t pkt_count, uint64_t user_pkt
                                   record_id);
       if (session && profile) {
         session->GetAttTracer()->AddPendingSignals(
-            writer_id, record_id, original_packet.completion_signal, dispatch_packet.completion_signal, session_id, buffer_id, profile,
+            writer_id, record_id, original_packet.completion_signal,
+            dispatch_packet.completion_signal, session_id_snapshot, buffer_id, profile,
             kernel_properties, (uint32_t)syscall(__NR_gettid), user_pkt_index);
       } else {
         session->GetAttTracer()->AddPendingSignals(
-            writer_id, record_id, original_packet.completion_signal, dispatch_packet.completion_signal, session_id, buffer_id, nullptr,
+            writer_id, record_id, original_packet.completion_signal,
+            dispatch_packet.completion_signal, session_id_snapshot, buffer_id, nullptr,
             kernel_properties, (uint32_t)syscall(__NR_gettid), user_pkt_index);
       }
 
@@ -983,8 +994,8 @@ void WriteInterceptor(const void* packets, uint64_t pkt_count, uint64_t user_pkt
       // marked complete
       signalAsyncHandlerATT(
           interrupt_signal,
-          new queue_info_session_t{queue_info.GetGPUAgent(), session_id, queue_info.GetQueueID(),
-                                   writer_id, interrupt_signal});
+          new queue_info_session_t{queue_info.GetGPUAgent(), session_id_snapshot,
+                                   queue_info.GetQueueID(), writer_id, interrupt_signal});
     }
     /* Write the transformed packets to the hardware queue.  */
     writer(&transformed_packets[0], transformed_packets.size());

projects/rocprofiler/src/core/hsa/queues/queue.h

@@ -92,7 +92,7 @@ void InitializePools(hsa_agent_t cpu_agent, Agent::AgentInfo* agent_info);
 void InitializeGPUPool(hsa_agent_t gpu_agent, Agent::AgentInfo* agent_info);
 void CheckPacketReqiurements(std::vector<hsa_agent_t>& gpu_agents);
 
-void ResetSessionID();
+void ResetSessionID(rocprofiler_session_id_t id = rocprofiler_session_id_t{0});
 
 }  // namespace queue
 }  // namespace rocprofiler

projects/rocprofiler/src/core/session/att/att.cpp

@@ -28,7 +28,6 @@ namespace att {
 AttTracer::AttTracer(rocprofiler_buffer_id_t buffer_id, rocprofiler_filter_id_t filter_id,
                        rocprofiler_session_id_t session_id)
     : buffer_id_(buffer_id), filter_id_(filter_id), session_id_(session_id) {}
-AttTracer::~AttTracer() {}
 
 void AttTracer::AddPendingSignals(uint32_t writer_id, uint64_t kernel_object,
                                    const hsa_signal_t& original_completion_signal, const hsa_signal_t& new_completion_signal,

projects/rocprofiler/src/core/session/att/att.h

@@ -49,12 +49,13 @@ namespace att {
 class AttTracer {
  public:
   AttTracer(rocprofiler_buffer_id_t buffer_id, rocprofiler_filter_id_t filter_id,
-             rocprofiler_session_id_t session_id);
-  ~AttTracer();
+            rocprofiler_session_id_t session_id);
 
   void AddPendingSignals(uint32_t writer_id, uint64_t kernel_object,
-                         const hsa_signal_t& original_completion_signal, const hsa_signal_t& new_completion_signal, rocprofiler_session_id_t session_id,
-                         rocprofiler_buffer_id_t buffer_id, hsa_ven_amd_aqlprofile_profile_t* profile,
+                         const hsa_signal_t& original_completion_signal,
+                         const hsa_signal_t& new_completion_signal,
+                         rocprofiler_session_id_t session_id, rocprofiler_buffer_id_t buffer_id,
+                         hsa_ven_amd_aqlprofile_profile_t* profile,
                          rocprofiler_kernel_properties_t kernel_properties, uint32_t thread_id,
                          uint64_t queue_index);
 

projects/rocprofiler/src/core/session/session.cpp

@@ -48,24 +48,51 @@ Session::Session(rocprofiler_replay_mode_t replay_mode, rocprofiler_session_id_t
 Session::~Session() {
   while (GetCurrentActiveInterruptSignalsCount() > 0) {
   }
-  if (profiler_started_.load(std::memory_order_release)) {
-    rocprofiler::queue::ResetSessionID();
-    delete profiler_;
-    profiler_started_.exchange(false, std::memory_order_release);
+  {
+    std::lock_guard<std::mutex> lock(session_lock_);
+    if (FindFilterWithKind(ROCPROFILER_SPM_COLLECTION) && spmcounter_ &&
+        spm_started_.load(std::memory_order_release)) {
+      delete spmcounter_;
+    }
+    if (FindFilterWithKind(ROCPROFILER_API_TRACE) && tracer_ &&
+        tracer_started_.load(std::memory_order_release)) {
+      delete tracer_;
+      tracer_started_.exchange(false, std::memory_order_release);
+    }
+    if (FindFilterWithKind(ROCPROFILER_PC_SAMPLING_COLLECTION) && pc_sampler_ &&
+        pc_sampler_started_.load(std::memory_order_release)) {
+      delete pc_sampler_;
+      pc_sampler_started_.exchange(false, std::memory_order_release);
+    }
+
+    if (FindFilterWithKind(ROCPROFILER_COUNTERS_SAMPLER) && counters_sampler_ &&
+        counters_sampler_started_.load(std::memory_order_release)) {
+      delete counters_sampler_;
+      counters_sampler_started_.exchange(false, std::memory_order_release);
+    }
+    if ((FindFilterWithKind(ROCPROFILER_DISPATCH_TIMESTAMPS_COLLECTION) ||
+         FindFilterWithKind(ROCPROFILER_COUNTERS_COLLECTION)) &&
+        profiler_ && profiler_started_.load(std::memory_order_release)) {
+      rocprofiler::queue::ResetSessionID();
+      delete profiler_;
+      profiler_started_.exchange(false, std::memory_order_release);
+    }
+    if (FindFilterWithKind(ROCPROFILER_ATT_TRACE_COLLECTION) && att_tracer_ &&
+        att_tracer_started_.load(std::memory_order_release)) {
+      delete att_tracer_;
+      att_tracer_started_.exchange(false, std::memory_order_release);
+    }
+    for (auto& filter : filters_) {
+      if (filter) delete filter;
+    }
+    filters_.clear();
+    for (auto& buffer : *buffers_) {
+      buffer.second->Flush();
+      if (buffer.second) delete buffer.second;
+    }
+    buffers_->clear();
+    if (buffers_) delete buffers_;
   }
-  // if (tracer_started_.load(std::memory_order_release)) {
-  //   delete tracer_;
-  //   tracer_started_.exchange(false, std::memory_order_release);
-  // }
-  if (att_tracer_started_.load(std::memory_order_release)) {
-    delete att_tracer_;
-    att_tracer_started_.exchange(false, std::memory_order_release);
-  }
-  // {
-  //   std::lock_guard<std::mutex> lock(filters_lock_);
-  //   buffers_.clear();
-  // }
-  delete buffers_;
 }
 
 void Session::DisableTools(rocprofiler_buffer_id_t buffer_id) {
@@ -76,9 +103,6 @@ void Session::DisableTools(rocprofiler_buffer_id_t buffer_id) {
        GetFilter(GetFilterIdWithKind(ROCPROFILER_DISPATCH_TIMESTAMPS_COLLECTION))
                ->GetBufferId()
                .value == buffer_id.value)) {
-    if (profiler_started_.load(std::memory_order_release)) {
-      // Implement Disable Profiling
-    }
   }
   if (FindFilterWithKind(ROCPROFILER_API_TRACE) &&
       GetFilter(GetFilterIdWithKind(ROCPROFILER_API_TRACE))->GetBufferId().value ==
@@ -92,43 +116,50 @@ void Session::DisableTools(rocprofiler_buffer_id_t buffer_id) {
 void Session::Start() {
   std::lock_guard<std::mutex> lock(session_lock_);
   if (!is_active_) {
-    if (FindFilterWithKind(ROCPROFILER_DISPATCH_TIMESTAMPS_COLLECTION)) {
-      if (profiler_started_.load(std::memory_order_release)) delete profiler_;
-      profiler_ = new profiler::Profiler(
-          GetFilter(GetFilterIdWithKind(ROCPROFILER_DISPATCH_TIMESTAMPS_COLLECTION))->GetBufferId(),
-          GetFilter(GetFilterIdWithKind(ROCPROFILER_DISPATCH_TIMESTAMPS_COLLECTION))->GetId(),
-          session_id_);
-      profiler_started_.exchange(true, std::memory_order_release);
-    }
+    if (!profiler_started_.load(std::memory_order_release)) {
+      if (FindFilterWithKind(ROCPROFILER_DISPATCH_TIMESTAMPS_COLLECTION)) {
+        profiler_ = new profiler::Profiler(
+            GetFilter(GetFilterIdWithKind(ROCPROFILER_DISPATCH_TIMESTAMPS_COLLECTION))
+                ->GetBufferId(),
+            GetFilter(GetFilterIdWithKind(ROCPROFILER_DISPATCH_TIMESTAMPS_COLLECTION))->GetId(),
+            session_id_);
+        profiler_started_.exchange(true, std::memory_order_release);
+      }
 
-    if (FindFilterWithKind(ROCPROFILER_COUNTERS_COLLECTION)) {
-      if (profiler_started_.load(std::memory_order_release)) delete profiler_;
-      profiler_ = new profiler::Profiler(
-          GetFilter(GetFilterIdWithKind(ROCPROFILER_COUNTERS_COLLECTION))->GetBufferId(),
-          GetFilter(GetFilterIdWithKind(ROCPROFILER_COUNTERS_COLLECTION))->GetId(), session_id_);
-      profiler_started_.exchange(true, std::memory_order_release);
+      if (FindFilterWithKind(ROCPROFILER_COUNTERS_COLLECTION)) {
+        profiler_ = new profiler::Profiler(
+            GetFilter(GetFilterIdWithKind(ROCPROFILER_COUNTERS_COLLECTION))->GetBufferId(),
+            GetFilter(GetFilterIdWithKind(ROCPROFILER_COUNTERS_COLLECTION))->GetId(), session_id_);
+        profiler_started_.exchange(true, std::memory_order_release);
+      }
+    } else {
+      rocprofiler::queue::ResetSessionID(session_id_);
     }
     if (FindFilterWithKind(ROCPROFILER_ATT_TRACE_COLLECTION)) {
-      if (att_tracer_started_.load(std::memory_order_release)) delete att_tracer_;
-      att_tracer_ = new att::AttTracer(
-          GetFilter(GetFilterIdWithKind(ROCPROFILER_ATT_TRACE_COLLECTION))->GetBufferId(),
-          GetFilter(GetFilterIdWithKind(ROCPROFILER_ATT_TRACE_COLLECTION))->GetId(), session_id_);
-      att_tracer_started_.exchange(true, std::memory_order_release);
+      if (!att_tracer_started_.load(std::memory_order_release)) {
+        att_tracer_ = new att::AttTracer(
+            GetFilter(GetFilterIdWithKind(ROCPROFILER_ATT_TRACE_COLLECTION))->GetBufferId(),
+            GetFilter(GetFilterIdWithKind(ROCPROFILER_ATT_TRACE_COLLECTION))->GetId(), session_id_);
+        att_tracer_started_.exchange(true, std::memory_order_release);
+      }
     }
 
     if (FindFilterWithKind(ROCPROFILER_SPM_COLLECTION)) {
-      if (spm_started_.load(std::memory_order_release)) delete spmcounter_;
-      rocprofiler_spm_parameter_t* spmparameter =
-          GetFilter(GetFilterIdWithKind(ROCPROFILER_SPM_COLLECTION))->GetSpmParameterData();
-      spmcounter_ = new spm::SpmCounters(
-          GetFilter(GetFilterIdWithKind(ROCPROFILER_SPM_COLLECTION))->GetBufferId(),
-          GetFilter(GetFilterIdWithKind(ROCPROFILER_SPM_COLLECTION))->GetId(), spmparameter,
-          session_id_);
-      if (profiler_started_.load(std::memory_order_release)) delete profiler_;
-      profiler_ = new profiler::Profiler(
-          GetFilter(GetFilterIdWithKind(ROCPROFILER_SPM_COLLECTION))->GetBufferId(),
-          GetFilter(GetFilterIdWithKind(ROCPROFILER_SPM_COLLECTION))->GetId(), session_id_);
-      profiler_started_.exchange(true, std::memory_order_release);
+      if (!spm_started_.load(std::memory_order_release)) {
+        rocprofiler_spm_parameter_t* spmparameter =
+            GetFilter(GetFilterIdWithKind(ROCPROFILER_SPM_COLLECTION))->GetSpmParameterData();
+        spmcounter_ = new spm::SpmCounters(
+            GetFilter(GetFilterIdWithKind(ROCPROFILER_SPM_COLLECTION))->GetBufferId(),
+            GetFilter(GetFilterIdWithKind(ROCPROFILER_SPM_COLLECTION))->GetId(), spmparameter,
+            session_id_);
+      }
+      if (!profiler_started_.load(std::memory_order_release)) {
+        profiler_ = new profiler::Profiler(
+            GetFilter(GetFilterIdWithKind(ROCPROFILER_SPM_COLLECTION))->GetBufferId(),
+            GetFilter(GetFilterIdWithKind(ROCPROFILER_SPM_COLLECTION))->GetId(), session_id_);
+        profiler_started_.exchange(true, std::memory_order_release);
+      }
+      startSpm();
     }
 
     if (FindFilterWithKind(ROCPROFILER_API_TRACE)) {
@@ -168,7 +199,6 @@ void Session::Start() {
     }
 
     is_active_ = true;
-    if (FindFilterWithKind(ROCPROFILER_SPM_COLLECTION)) startSpm();
   }
 }
 
@@ -179,39 +209,29 @@ void Session::Terminate() {
     rocprofiler::queue::ResetSessionID();
     std::lock_guard<std::mutex> lock(session_lock_);
     if (FindFilterWithKind(ROCPROFILER_SPM_COLLECTION)) {
-      {
-        stopSpm();
-        delete spmcounter_;
-      }
+      { stopSpm(); }
     }
     if (FindFilterWithKind(ROCPROFILER_API_TRACE)) {
       std::vector<rocprofiler_tracer_activity_domain_t> domains =
           GetFilter(GetFilterIdWithKind(ROCPROFILER_API_TRACE))->GetTraceData();
       if (tracer_started_.load(std::memory_order_release)) {
         tracer_->StopRoctracer();
-        delete tracer_;
-        tracer_started_.exchange(false, std::memory_order_release);
       }
     }
     if (FindFilterWithKind(ROCPROFILER_PC_SAMPLING_COLLECTION)) {
       if (pc_sampler_started_.load(std::memory_order_release)) {
         pc_sampler_->Stop();
-        delete pc_sampler_;
-        pc_sampler_started_.exchange(false, std::memory_order_release);
       }
     }
 
     if (FindFilterWithKind(ROCPROFILER_COUNTERS_SAMPLER)) {
       if (counters_sampler_started_.load(std::memory_order_release)) {
         counters_sampler_->Stop();
-        delete counters_sampler_;
-        counters_sampler_started_.exchange(false, std::memory_order_release);
       }
     }
 
     for (auto& buffer : *buffers_) {
       buffer.second->Flush();
-      delete buffer.second;
     }
 
     is_active_ = false;

projects/rocprofiler/src/core/session/spm/spm.cpp

@@ -99,17 +99,17 @@ std::mutex processQueueLock;
 //   if (spm_buffer_params[idx].len) {
 //     uint32_t pidx = preIndex.load(std::memory_order_release);
 //     if (spm_buffer_params[idx].len == spm_buffer_params[pidx].size) {
-//       std::cout << "Buffer completely filled with bytes" << spm_buffer_params[idx].len << std::endl;
-//       fd = fopen("SPM_rocprofiler_data.txt", "wb");
-//       size_t retele = fwrite(spm_buffer_params[pidx].addr, 1, spm_buffer_params[idx].len, fd);
-//       if (retele <= 0) rocprofiler::warning("SPM Data is wrong!");
-//       fclose(fd);
+//       std::cout << "Buffer completely filled with bytes" << spm_buffer_params[idx].len <<
+//       std::endl; fd = fopen("SPM_rocprofiler_data.txt", "wb"); size_t retele =
+//       fwrite(spm_buffer_params[pidx].addr, 1, spm_buffer_params[idx].len, fd); if (retele <= 0)
+//       rocprofiler::warning("SPM Data is wrong!"); fclose(fd);
 //     } else {
 //       std::cout << "Buffer partially filled with %d bytes" << spm_buffer_params[idx].len
 //                 << std::endl;
 //     }
 //     if (timeout)
-//       if (spm_buffer_params[idx].timeout == timeout) std::cout << "Timeout occurred" << std::endl;
+//       if (spm_buffer_params[idx].timeout == timeout) std::cout << "Timeout occurred" <<
+//       std::endl;
 //     ret = ROCPROFILER_STATUS_SUCCESS;
 //   } else {
 //     std::cout << "Data collection failed" << std::endl;
@@ -188,7 +188,8 @@ std::mutex processQueueLock;
 //       }
 //       se++;
 //     }
-//     record.header.id = rocprofiler_record_id_t{rocprofiler::GetROCProfilerSingleton()->GetUniqueRecordId()};
+//     record.header.id =
+//     rocprofiler_record_id_t{rocprofiler::GetROCProfilerSingleton()->GetUniqueRecordId()};
 //     buffer->AddRecord(record);
 //     nSample++;
 //     index += 160;
@@ -240,10 +241,11 @@ uint64_t submitPacket(hsa_queue_t* queue, const void* packet) {
 
   // advance command queue
   const uint64_t write_idx =
-      rocprofiler::hsa_support::GetCoreApiTable().hsa_queue_add_write_index_scacq_screl_fn(queue, 1);
+      rocprofiler::hsa_support::GetCoreApiTable().hsa_queue_add_write_index_scacq_screl_fn(queue,
+                                                                                           1);
   while ((write_idx -
-          rocprofiler::hsa_support::GetCoreApiTable().hsa_queue_load_read_index_relaxed_fn(queue)) >=
-         queue->size) {
+          rocprofiler::hsa_support::GetCoreApiTable().hsa_queue_load_read_index_relaxed_fn(
+              queue)) >= queue->size) {
     sched_yield();  // TODO: remove
   }
 
@@ -262,7 +264,7 @@ uint64_t submitPacket(hsa_queue_t* queue, const void* packet) {
 
   // ringdoor bell
   rocprofiler::hsa_support::GetCoreApiTable().hsa_signal_store_relaxed_fn(queue->doorbell_signal,
-                                                                        write_idx);
+                                                                          write_idx);
 
   return write_idx;
 }
@@ -272,8 +274,8 @@ uint64_t submitPacket(hsa_queue_t* queue, const void* packet) {
 //   // TODO: check if API args are correct, especially UINT32_MAX
 //   hsa_status_t status;
 //   status = rocprofiler::hsa_support::GetCoreApiTable().hsa_queue_create_fn(
-//       gpu_agent, QUEUE_NUM_PACKETS, HSA_QUEUE_TYPE_SINGLE, nullptr, nullptr, UINT32_MAX, UINT32_MAX,
-//       queue);
+//       gpu_agent, QUEUE_NUM_PACKETS, HSA_QUEUE_TYPE_SINGLE, nullptr, nullptr, UINT32_MAX,
+//       UINT32_MAX, queue);
 
 //   if (status != HSA_STATUS_SUCCESS) rocprofiler::fatal("queue creation failed");
 
@@ -294,7 +296,7 @@ hsa_signal_value_t signalWait(const hsa_signal_t& signal, const hsa_signal_value
     if (ret_value == exp_value) break;
     if (ret_value != signal_value)
       rocprofiler::fatal("Error: signalWait: signal_value(%lu), ret_value(%lu)", signal_value,
-                       ret_value);
+                         ret_value);
   }
   return ret_value;
 }
@@ -315,6 +317,7 @@ spm::SpmCounters::SpmCounters(rocprofiler_buffer_id_t buffer_id, rocprofiler_fil
   get_hsa_agents_list(device_list_);
   defaultGpuNode_ = device_list_->gpu_devices[0];
   defaultCpuNode_ = device_list_->cpu_devices[0];
+  delete device_list_;
 
   // create signals
   hsa_status_t status =
@@ -333,9 +336,9 @@ rocprofiler_status_t spm::SpmCounters::startSpm() {
   else
     // else choose the default node to collect SPM
     preferredGpuNode_ = defaultGpuNode_;
-  // hsa_agent_t preferred_cpu_agent = defaultCpuNode_;
-  // int counter_count = spmparameter_->counters_count;
-  // Packet::packet_t start_packet;
+    // hsa_agent_t preferred_cpu_agent = defaultCpuNode_;
+    // int counter_count = spmparameter_->counters_count;
+    // Packet::packet_t start_packet;
 #if 0
   hsa_status_t hsa_status = hsa_support::GetAmdExtTable().hsa_amd_spm_acquire_fn(preferredGpuNode_);
   if (hsa_status == HSA_STATUS_SUCCESS) {
@@ -393,7 +396,7 @@ rocprofiler_status_t spm::SpmCounters::startSpm() {
     return ROCPROFILER_STATUS_ERROR;
   }
 #endif
-    return ROCPROFILER_STATUS_SUCCESS; //delete this line with if 0
+  return ROCPROFILER_STATUS_SUCCESS;  // delete this line with if 0
 }
 
 rocprofiler_status_t spm::SpmCounters::stopSpm() {

projects/rocprofiler/src/core/session/spm/spm.h

@@ -39,7 +39,6 @@ class SpmCounters {
  public:
   SpmCounters(rocprofiler_buffer_id_t buffer_id, rocprofiler_filter_id_t filter_id,
               rocprofiler_spm_parameter_t* spmparameter, rocprofiler_session_id_t session_id);
-  ~SpmCounters(){};
 
   rocprofiler_status_t startSpm();
   rocprofiler_status_t stopSpm();