Merge pull request #394 from Treece-Burgess/06-02-2025-amd-cmps-init

rocm_smi/rocp_sdk: Restructure init_private functions to avoid setting initialized equal to 1 even when initialization fails

Author: Treece-Burgess

src/components/rocm_smi/linux-rocm-smi.c

@@ -114,12 +114,16 @@ _rocm_smi_init_private(void)
 
     int count = 0;
     papi_errno = evt_get_count(&count);
+    if (papi_errno != PAPI_OK) {
+        goto fn_fail;
+    }
     _rocm_smi_vector.cmp_info.num_native_events = count;
     _rocm_smi_vector.cmp_info.num_cntrs = count;
     _rocm_smi_vector.cmp_info.num_mpx_cntrs = count;
 
-  fn_exit:
     _rocm_smi_vector.cmp_info.initialized = 1;
+
+  fn_exit:
     _rocm_smi_vector.cmp_info.disabled = papi_errno;
     PAPI_unlock(COMPONENT_LOCK);
     return papi_errno;

src/components/rocp_sdk/rocp_sdk.c

@@ -222,12 +222,16 @@ rocp_sdk_init_private(void)
 
     int count = 0;
     papi_errno = evt_get_count(&count);
+    if (papi_errno != PAPI_OK) {
+        goto fn_fail;
+    }
     _rocp_sdk_vector.cmp_info.num_native_events = count;
     _rocp_sdk_vector.cmp_info.num_cntrs = count;
     _rocp_sdk_vector.cmp_info.num_mpx_cntrs = count;
 
-  fn_exit:
     _rocp_sdk_vector.cmp_info.initialized = 1;
+
+  fn_exit:
     _rocp_sdk_vector.cmp_info.disabled = papi_errno;
     _papi_hwi_unlock(COMPONENT_LOCK);
     return papi_errno;

src/components/template/template.c

@@ -167,11 +167,15 @@ templ_init_private(void)
 
     int count = 0;
     papi_errno = evt_get_count(&count);
+    if (papi_errno != PAPI_OK) {
+        goto fn_fail;
+    }
     _template_vector.cmp_info.num_native_events = count;
     _template_vector.cmp_info.num_cntrs = count;
 
-  fn_exit:
     _template_vector.cmp_info.initialized = 1;
+
+  fn_exit:
     _template_vector.cmp_info.disabled = papi_errno;
     _papi_hwi_unlock(COMPONENT_LOCK);
     return papi_errno;