6.4 fixes for HSA and HIP (#191)

* Adding support for hsa_amd_signal_wait_all

* Fixes for HIP

---------

Co-authored-by: Ammar ELWazir <aelwazir@amd.com>

[ROCm/rocprofiler-sdk commit: 02a519e84e]

projects/rocprofiler-sdk/source/include/rocprofiler-sdk/hsa/amd_ext_api_id.h

@@ -112,6 +112,9 @@ typedef enum  // NOLINT(performance-enum-size)
 #    if HSA_AMD_EXT_API_TABLE_STEP_VERSION >= 0x04
     ROCPROFILER_HSA_AMD_EXT_API_ID_hsa_amd_enable_logging,
 #    endif
+#    if HSA_AMD_EXT_API_TABLE_STEP_VERSION >= 0x05
+    ROCPROFILER_HSA_AMD_EXT_API_ID_hsa_amd_signal_wait_all,
+#    endif
 #endif
 
     ROCPROFILER_HSA_AMD_EXT_API_ID_LAST,

projects/rocprofiler-sdk/source/include/rocprofiler-sdk/hsa/api_args.h

@@ -1414,6 +1414,18 @@ typedef union rocprofiler_hsa_api_args_t
         void*    file;
     } hsa_amd_enable_logging;
 #    endif
+#    if HSA_AMD_EXT_API_TABLE_STEP_VERSION >= 0x05
+    struct
+    {
+        uint32_t                signal_count;
+        hsa_signal_t*           signals;
+        hsa_signal_condition_t* conds;
+        hsa_signal_value_t*     values;
+        uint64_t                timeout_hint;
+        hsa_wait_state_t        wait_hint;
+        hsa_signal_value_t*     satisfying_values;
+    } hsa_amd_signal_wait_all;
+#    endif
 #endif
 } rocprofiler_hsa_api_args_t;
 

projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/hip/details/format.hpp

@@ -223,6 +223,9 @@ struct formatter<hipGraphNodeType> : rocprofiler::hip::details::base_formatter
             ROCP_SDK_HIP_FORMAT_CASE_STMT(hipGraphNodeType, MemcpyToSymbol);
             ROCP_SDK_HIP_FORMAT_CASE_STMT(hipGraphNodeType, Empty);
             ROCP_SDK_HIP_FORMAT_CASE_STMT(hipGraphNodeType, Count);
+#if HIP_RUNTIME_API_TABLE_STEP_VERSION >= 7
+            ROCP_SDK_HIP_FORMAT_CASE_STMT(hipGraphNodeType, BatchMemOp);
+#endif
             ROCP_SDK_HIP_FORMAT_DFLT_CASE(hipGraphNodeType);
         }
         return fmt::format_to(ctx.out(), "Unknown");

projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/hsa/abi.cpp

@@ -51,6 +51,8 @@ ROCP_SDK_ENFORCE_ABI_VERSIONING(::AmdExtTable, 70);
 ROCP_SDK_ENFORCE_ABI_VERSIONING(::AmdExtTable, 71);
 #elif HSA_AMD_EXT_API_TABLE_STEP_VERSION == 0x04
 ROCP_SDK_ENFORCE_ABI_VERSIONING(::AmdExtTable, 72);
+#elif HSA_AMD_EXT_API_TABLE_STEP_VERSION == 0x05
+ROCP_SDK_ENFORCE_ABI_VERSIONING(::AmdExtTable, 73);
 #else
 INTERNAL_CI_ROCP_SDK_ENFORCE_ABI_VERSIONING(::AmdExtTable, 0);
 #endif
@@ -278,6 +280,9 @@ ROCP_SDK_ENFORCE_ABI(::AmdExtTable, hsa_amd_vmem_address_reserve_align_fn, 70);
 #if HSA_AMD_EXT_API_TABLE_STEP_VERSION >= 0x04
 ROCP_SDK_ENFORCE_ABI(::AmdExtTable, hsa_amd_enable_logging_fn, 71);
 #endif
+#if HSA_AMD_EXT_API_TABLE_STEP_VERSION >= 0x05
+ROCP_SDK_ENFORCE_ABI(::AmdExtTable, hsa_amd_signal_wait_all_fn, 72);
+#endif
 
 ROCP_SDK_ENFORCE_ABI(::ImageExtTable, hsa_ext_image_get_capability_fn, 1);
 ROCP_SDK_ENFORCE_ABI(::ImageExtTable, hsa_ext_image_data_get_info_fn, 2);

projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/hsa/hsa.def.cpp

@@ -463,6 +463,19 @@ HSA_API_INFO_DEFINITION_V(ROCPROFILER_HSA_TABLE_ID_AmdExt,
                           flags,
                           file)
 #        endif
+#        if HSA_AMD_EXT_API_TABLE_STEP_VERSION >= 0x05
+HSA_API_INFO_DEFINITION_V(ROCPROFILER_HSA_TABLE_ID_AmdExt,
+                          ROCPROFILER_HSA_AMD_EXT_API_ID_hsa_amd_signal_wait_all,
+                          hsa_amd_signal_wait_all,
+                          hsa_amd_signal_wait_all_fn,
+                          signal_count,
+                          signals,
+                          conds,
+                          values,
+                          timeout_hint,
+                          wait_hint,
+                          satisfying_values)
+#        endif
 #    endif
 
 #elif defined(ROCPROFILER_LIB_ROCPROFILER_HSA_ASYNC_COPY_CPP_IMPL) &&                              \