Merge commit '31dfc0fccedbd50a93dad3ff514e74ed252ec239' into develop

projects/rdc/.github/workflows/label_cherrypicks.yml

@@ -7,7 +7,7 @@ on:
 
 jobs:
   add-label:
-    runs-on: ubuntu-latest
+    runs-on: lstt
     container:
       image: node:16-alpine
     permissions:
@@ -18,18 +18,13 @@ jobs:
         with:
           script: |
             const pr = context.payload.pull_request;
-            const headBranch = pr.head.ref;
             const baseBranch = pr.base.ref;
 
-            // Check if head branch contains cherry-pick pattern or base branch starts with release/
-            const isCherryPick = /cherry.*pick/i.test(headBranch);
             const isReleaseTarget = baseBranch.startsWith('release/');
 
-            if (isCherryPick || isReleaseTarget) {
-              // Label to apply
+            if (isReleaseTarget) {
               const labelToAdd = 'cherry-pick';
 
-              // Try to add the label
               try {
                 await github.rest.issues.addLabels({
                   owner: context.repo.owner,
@@ -37,11 +32,11 @@ jobs:
                   issue_number: pr.number,
                   labels: [labelToAdd]
                 });
-                console.log(`Added label "${labelToAdd}" to PR #${pr.number}`);
+                console.log("Added label ${labelToAdd} to PR #${pr.number}");
               } catch (error) {
-                console.error(`Error adding label: ${error.message}`);
+                console.error("Error adding label: ${error.message}");
               }
             } else {
-              console.log('PR does not match criteria for automatic labeling');
+              console.log("PR does not match criteria for automatic labeling");
             }
 

projects/rdc/.github/workflows/main.yml

@@ -67,12 +67,9 @@ jobs:
         apt install -y \
           rocm-core \
           amd-smi-lib \
-          rocblas \
-          rocblas-dev \
           rocm-developer-tools \
           rocm-device-libs \
           rocm-smi-lib \
-          rocm-validation-suite \
           rocprofiler-dev \
           rocprofiler-plugins \
           rocprofiler-register \

projects/rdc/rdc_libs/rdc_modules/rdc_rocp/RdcTelemetryLib.cc

@@ -20,11 +20,13 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 */
 
+#include <dlfcn.h>
 #include <math.h>
 #include <sys/time.h>
 
 #include <algorithm>
 #include <cstring>
+#include <filesystem>
 #include <map>
 #include <memory>
 #include <stdexcept>
@@ -64,6 +66,22 @@ rdc_status_t rdc_module_init(uint64_t /*flags*/) {
     // before the tests are. Utilize an env var instead.
     return RDC_ST_DISABLED_MODULE;
   }
+
+  Dl_info dl_info = {};
+  RDC_LOG(RDC_DEBUG, "Checking if rocprofiler is available");
+  if (dladdr(reinterpret_cast<const void*>(rdc_module_init), &dl_info) != 0) {
+    const std::filesystem::path rdc_path(dl_info.dli_fname);
+    const auto profiler_metrics_path =
+        rdc_path.parent_path().parent_path().parent_path() / "share/rocprofiler-sdk";
+    const auto rocprofiler_exists = std::filesystem::exists(profiler_metrics_path);
+    if (!rocprofiler_exists) {
+      RDC_LOG(RDC_ERROR, "rocprofiler metrics are not available at " << profiler_metrics_path);
+      return RDC_ST_FAIL_LOAD_MODULE;
+    }
+    RDC_LOG(RDC_DEBUG, "rocprofiler metrics are available at " << profiler_metrics_path);
+    setenv("ROCPROFILER_METRICS_PATH", profiler_metrics_path.c_str(), 0);
+  }
+
   rocp_p = std::make_unique<amd::rdc::RdcRocpBase>();
   return RDC_ST_OK;
 }
@@ -98,7 +116,7 @@ rdc_status_t rdc_telemetry_fields_value_get(rdc_gpu_field_t* fields, const uint3
   // Bulk fetch fields
   std::vector<rdc_gpu_field_value_t> bulk_results;
 
-  struct timeval tv {};
+  struct timeval tv{};
   gettimeofday(&tv, nullptr);
   const uint64_t curTime = static_cast<uint64_t>(tv.tv_sec) * 1000 + tv.tv_usec / 1000;