Adds ROCmProfilerService and fixes NVProfilerService.

HeterogeneousCore/CUDAServices/plugins/BuildFile.xml

@@ -9,6 +9,7 @@
   <use name="FWCore/ParameterSet"/>
   <use name="FWCore/ServiceRegistry"/>
   <use name="FWCore/Utilities"/>
+  <use name="PerfTools/ProfilerService"/>
   <use name="HLTrigger/Timer"/>
   <use name="HeterogeneousCore/CUDAServices"/>
   <use name="HeterogeneousCore/CUDAUtilities"/>

HeterogeneousCore/ROCmServices/BuildFile.xml

@@ -1,4 +1,5 @@
 <use name="FWCore/ServiceRegistry"/>
+<use name="PerfTools/ProfilerService" source_only="true"/>
 <use name="HeterogeneousCore/ROCmUtilities" source_only="true"/>
 <export>
   <lib name="1"/>

HeterogeneousCore/ROCmServices/plugins/BuildFile.xml

@@ -1,5 +1,6 @@
 <iftool name="rocm">
   <use name="rocm"/>
+  <use name="rocm-rocprofiler-sdk"/>
   <use name="DataFormats/Provenance" source_only="1"/>
   <use name="FWCore/AbstractServices"/>
   <use name="FWCore/MessageLogger"/>
@@ -8,7 +9,7 @@
   <use name="FWCore/Utilities"/>
   <use name="HeterogeneousCore/ROCmServices"/>
   <use name="HeterogeneousCore/ROCmUtilities" source_only="true"/>
-  <library file="ROCmMonitoringService.cc ROCmService.cc" name="HeterogeneousCoreROCmServicesPlugins">
+  <library file="ROCmMonitoringService.cc ROCmService.cc ROCmProfilerService.cc" name="HeterogeneousCoreROCmServicesPlugins">
     <flags EDM_PLUGIN="1"/>
   </library>
 </iftool>

HeterogeneousCore/ROCmServices/plugins/ROCmProfilerService.cc

@@ -0,0 +1,137 @@
+#include <rocprofiler-sdk-roctx/roctx.h>
+
+#include "HeterogeneousCore/ROCmServices/interface/ROCmInterface.h"
+
+#include "PerfTools/ProfilerService/interface/ProfilerService.h"
+
+namespace {
+  /**
+   * \brief Backend for ROCm profiling.
+   * \note All APIs used are part of ROCTX. See documentation at 
+   * https://rocm.docs.amd.com/projects/rocprofiler-sdk/en/latest/how-to/using-rocprofiler-sdk-roctx.html
+   */
+  class ROCmBackend {
+  public:
+    // Forward definitions
+    using Color = ProfilerServiceBase::Color;
+    using SpinLock = ProfilerServiceBase::SpinLock;
+    class Range;
+    class Domain;
+    static void mark(const Domain& domain, const char* message, Color color);
+    /**
+     * \note Latest doc is broken at time of writing, but older version is useful:
+     * https://rocm.docs.amd.com/projects/rocprofiler-sdk/en/docs-7.0.2/api-reference/rocprofiler-sdk-roctx_api/roctx_modules/profiler-control.html
+     */
+    static void profilerStart() {
+      // 0 for all threads.
+      roctxProfilerResume(0);
+    }
+    static void profilerStop() {
+      // 0 for all threads.
+      roctxProfilerPause(0);
+    }
+
+  public:
+    using EDMService = edm::Service<ROCmInterface>;
+    class Domain {
+    public:
+      friend class Range;
+      friend void ROCmBackend::mark(const Domain& domain, const char* message, Color color);
+      Domain() = default;
+      ~Domain() = default;
+      void create(const std::string& name) {
+        // Assert the domain is created only once
+        assert(domain_.empty());
+        domain_ = name;
+      }
+      void destroy() { domain_.clear(); }
+
+    private:
+      const std::string& nativeHandle() const { return domain_; }
+      std::string domain_;
+    };
+
+    class Range {
+    public:
+      friend void ROCmBackend::mark(const Domain& domain, const char* message, Color color);
+      Range() = default;
+      // copy constructor deleted
+      Range(const Range&) = delete;
+      /// Move copy constructor: we take a lock and move the contents
+      /// We need it to resize vectors of unique_range_in
+      Range(Range&& o) noexcept {
+        std::scoped_lock lock(o.mtx_);
+        std::scoped_lock lock2(mtx_);
+        domain_ = o.domain_;
+        range_ = o.range_;
+        o.domain_.clear();
+        o.range_ = roctxInvalidRangeId;
+      }
+      ~Range() {
+        std::scoped_lock lock(mtx_);
+        if (range_ != roctxInvalidRangeId)
+          roctxRangeStop(range_);
+      }
+
+    private:
+      roctx_range_id_t roctxDomainRangeStartColor(const Domain& domain, const char* message, uint32_t color) {
+        return roctxRangeStartA((domain.nativeHandle() + "-" + message).c_str());
+      }
+
+      static constexpr roctx_range_id_t roctxInvalidRangeId = ~0ul;
+
+    public:
+      void startColorIn(const Domain& domain, const char* message, Color color, const char* where) {
+        std::scoped_lock lock(mtx_);
+        if (range_ != roctxInvalidRangeId) {
+          std::string fullmsg =
+              fmt::sprintf("Warning: previous range not ended before starting a new one in %s for %s", where, message);
+          roctxMarkA((domain_ + "-" + fullmsg).c_str());
+          roctxRangeStop(range_);
+        }
+        domain_ = domain.nativeHandle();
+        range_ = roctxRangeStartA((domain_ + "-" + message).c_str());
+      }
+
+      void endIn(const Domain& domain, const char* message, const char* where) {
+        std::scoped_lock lock(mtx_);
+        if (range_ != roctxInvalidRangeId) {
+          roctxRangeStop(range_);
+          range_ = roctxInvalidRangeId;
+          domain_.clear();
+        } else {
+          std::string fullmsg =
+              fmt::sprintf("Warning: trying to end a range that is not started in %s for %s", where, message);
+          roctxMarkA((domain_ + "-" + fullmsg).c_str());
+        }
+      }
+
+    private:
+      roctx_range_id_t range_ = roctxInvalidRangeId;
+      std::string domain_;
+      SpinLock mtx_ = SpinLock{};
+    };
+
+    static std::string shortName() { return "ROCm"; }
+    static std::string serviceComment() {
+      return R"(This Service provides CMSSW-aware annotations to nvprof/nvvm.
+
+Notes on nvprof options:
+  - the option '--profile-from-start off' should be used if skipFirstEvent is True.
+ - the option '--cpu-profiling on' currently results in cmsRun being stuck at the beginning of the job.
+ - the option '--cpu-thread-tracing on' is not compatible with jemalloc, and should only be used with cmsRunGlibC.)";
+    }
+  };
+
+  void ROCmBackend::mark(const ROCmBackend::Domain& domain, const char* message, Color color) {
+    roctxMark(("[" + domain.nativeHandle() + "]: " + std::string(message)).c_str());
+  }
+}  // namespace
+
+class ROCmProfilerService : public ProfilerService<ROCmBackend> {
+public:
+  using ProfilerService<ROCmBackend>::ProfilerService;
+};
+
+#include "FWCore/ServiceRegistry/interface/ServiceMaker.h"
+DEFINE_FWK_SERVICE(ROCmProfilerService);

PerfTools/ProfilerService/BuildFile.xml

@@ -0,0 +1,10 @@
+<export>
+  <use name="boost"/>
+  <use name="fmt" />
+  <use name="tbb"/>
+  <use name="DataFormats/Provenance"/>
+  <use name="FWCore/Framework"/>
+  <use name="FWCore/ParameterSet"/>
+  <use name="FWCore/ServiceRegistry"/>
+</export>
+