Merge pull request open-mpi#12159 from edgargabriel/topic/rocm-ipc-rcache

convert last components to use accelerator framework

Author: edgargabriel

ompi/mca/pml/ob1/pml_ob1_accelerator.c

@@ -223,7 +223,7 @@ int mca_pml_ob1_accelerator_init(void)
 
     /* Create the events since they can be reused. */
     for (i = 0; i < accelerator_event_max; i++) {
-        result = opal_accelerator.create_event(MCA_ACCELERATOR_NO_DEVICE_ID, &accelerator_event_dtoh_array[i]);
+        result = opal_accelerator.create_event(MCA_ACCELERATOR_NO_DEVICE_ID, &accelerator_event_dtoh_array[i], false);
         if (OPAL_SUCCESS != result) {
             opal_output_verbose(1, mca_pml_ob1_output, "Accelerator create event failed.");
             rc = OPAL_ERROR;
@@ -256,7 +256,7 @@ int mca_pml_ob1_accelerator_init(void)
 
     /* Create the events since they can be reused. */
     for (i = 0; i < accelerator_event_max; i++) {
-        result = opal_accelerator.create_event(MCA_ACCELERATOR_NO_DEVICE_ID, &accelerator_event_htod_array[i]);
+        result = opal_accelerator.create_event(MCA_ACCELERATOR_NO_DEVICE_ID, &accelerator_event_htod_array[i], false);
         if (OPAL_SUCCESS != result) {
             opal_output_verbose(1, mca_pml_ob1_output, "Accelerator create event failed.");
             rc = OPAL_ERROR;

opal/include/opal/Makefile.am

@@ -30,7 +30,7 @@ headers += \
 	opal/frameworks.h \
 	opal/opal_portable_platform.h \
 	opal/opal_portable_platform_real.h \
-	opal/opal_cuda.h
+	opal/opal_gpu.h
 
 nodist_headers += \
 	opal/version.h

opal/include/opal/opal_cuda.h renamed to opal/include/opal/opal_gpu.h

@@ -15,36 +15,33 @@
  *                         reserved.
  * Copyright (c) 2022      Amazon.com, Inc. or its affiliates.
  *                         All Rights reserved.
+ * Copyright (c) 2023      Advanced Micro Devices, Inc. 
+ *                         All Rights reserved.
  * $COPYRIGHT$
  *
  * Additional copyrights may follow
  *
  * $HEADER$
  *
- * This file is intended only to carry shared types. If actual cuda
- * symbols are required, they need to be added to a new common cuda
- * component.
  */
 
-#ifndef OPAL_CUDA_H
-#define OPAL_CUDA_H
+#ifndef OPAL_GPU_H
+#define OPAL_GPU_H
 #include "opal/mca/rcache/rcache.h"
+#include "opal/mca/accelerator/accelerator.h"
 
-#define MEMHANDLE_SIZE 8
-#define EVTHANDLE_SIZE 8
-
-struct mca_opal_cuda_reg_data_t {
-    uint64_t memHandle[MEMHANDLE_SIZE];
-    uint64_t evtHandle[EVTHANDLE_SIZE];
-    uint64_t event;
-    opal_ptr_t memh_seg_addr;
-    size_t memh_seg_len;
+struct mca_opal_gpu_reg_data_t {
+    opal_accelerator_ipc_handle_t       ipcHandle;
+    opal_accelerator_ipc_event_handle_t ipcEventHandle;
+    opal_accelerator_event_t            *event;
+    opal_ptr_t                          memh_seg_addr;
+    size_t                              memh_seg_len;
 };
-typedef struct mca_opal_cuda_reg_data_t mca_opal_cuda_reg_data_t;
+typedef struct mca_opal_gpu_reg_data_t mca_opal_gpu_reg_data_t;
 
-struct mca_opal_cuda_reg_t {
+struct mca_opal_gpu_reg_t {
     mca_rcache_base_registration_t base;
-    mca_opal_cuda_reg_data_t data;
+    mca_opal_gpu_reg_data_t data;
 };
-typedef struct mca_opal_cuda_reg_t mca_opal_cuda_reg_t;
-#endif /* OPAL_CUDA_H */
+typedef struct mca_opal_gpu_reg_t mca_opal_gpu_reg_t;
+#endif /* OPAL_GPU_H */

opal/mca/accelerator/accelerator.h

@@ -4,6 +4,8 @@
  *                         reserved.
  * Copyright (c)           Amazon.com, Inc. or its affiliates.
  *                         All Rights reserved.
+ * Copyright (c) 2023      Advanced Micro Devices, Inc. All Rights reserved.
+ *
  * $COPYRIGHT$
  *
  * Additional copyrights may follow
@@ -110,19 +112,28 @@ struct opal_accelerator_stream_t {
     void *stream;
 };
 typedef struct opal_accelerator_stream_t opal_accelerator_stream_t;
+OBJ_CLASS_DECLARATION(opal_accelerator_stream_t);
+
+/* Constant indicating the default/zero stream */
+#define MCA_ACCELERATOR_STREAM_DEFAULT (opal_accelerator_stream_t *)0x00000002
 
 #define IPC_MAX_HANDLE_SIZE 64
 struct opal_accelerator_ipc_handle_t {
+    opal_object_t super;
     size_t size;
     uint8_t handle[IPC_MAX_HANDLE_SIZE];
+    void* dev_ptr;
 };
 typedef struct opal_accelerator_ipc_handle_t opal_accelerator_ipc_handle_t;
+OBJ_CLASS_DECLARATION(opal_accelerator_ipc_handle_t);
 
 struct opal_accelerator_ipc_event_handle_t {
+    opal_object_t super;
     size_t size;
     uint8_t handle[IPC_MAX_HANDLE_SIZE];
 };
 typedef struct opal_accelerator_ipc_event_handle_t opal_accelerator_ipc_event_handle_t;
+OBJ_CLASS_DECLARATION(opal_accelerator_ipc_event_handle_t);
 
 struct opal_accelerator_pci_attr_t {
     uint16_t domain_id;
@@ -132,7 +143,6 @@ struct opal_accelerator_pci_attr_t {
 };
 typedef struct opal_accelerator_pci_attr_t opal_accelerator_pci_attr_t;
 
-OBJ_CLASS_DECLARATION(opal_accelerator_stream_t);
 
 struct opal_accelerator_event_t {
     opal_object_t super;
@@ -180,14 +190,15 @@ typedef int (*opal_accelerator_base_module_create_stream_fn_t)(
  * corresponding stream. This function will allocate memory for the object.
  * To release the memory, call OBJ_RELEASE(*event);
  *
- * @param[IN] dev_id         Associated device for the event or
+ * @param[IN]  dev_id        Associated device for the event or
  *                           MCA_ACCELERATOR_NO_DEVICE_ID
- * @param[IN] event          Event to create
+ * @param[OUT] event         Event to create
+ * @param[IN]  enable_ipc    support inter-process tracking of the event 
  *
  * @return                   OPAL_SUCCESS or error status on failure.
  */
 typedef int (*opal_accelerator_base_module_create_event_fn_t)(
-    int dev_id, opal_accelerator_event_t **event);
+      int dev_id, opal_accelerator_event_t **event, bool enable_ipc);
 
 /**
  * Records an event on a stream. An event recorded on the stream is
@@ -219,6 +230,19 @@ typedef int (*opal_accelerator_base_module_record_event_fn_t)(
 typedef int (*opal_accelerator_base_module_query_event_fn_t)(
     int dev_id, opal_accelerator_event_t *event);
 
+/**
+ * Make a stream wait on an event
+ *
+ * @param[IN] dev_id         Associated device for the event or
+ *                           MCA_ACCELERATOR_NO_DEVICE_ID
+ * @param[IN] event          Event to wait on
+ * @param[IN] stream         Stream to wait
+ *
+ * @return                   OPAL_SUCCESS or error status on failure
+ */
+typedef int (*opal_accelerator_base_module_wait_event_fn_t)(
+   int dev_id, opal_accelerator_event_t *event,  opal_accelerator_stream_t *stream);
+
 /**
  * Copies memory asynchronously from src to dest. Memory of dest and src
  * may not overlap. Optionally can specify the transfer type to
@@ -342,8 +366,10 @@ typedef int (*opal_accelerator_base_module_get_address_range_fn_t)(
  *
  * opal_accelerator_base_module_get_ipc_handle_fn_t()
  * opal_accelerator_base_module_open_ipc_handle_fn_t()
+ * opal_accelerator_base_module_import_ipc_event_handle_fn_t()
  * opal_accelerator_base_module_get_ipc_event_handle_fn_t()
  * opal_accelerator_base_module_open_ipc_event_handle_fn_t()
+ * opal_accelerator_base_module_import_ipc_event_handle_fn_t()
  *
  * must be implemented.
  *
@@ -354,6 +380,8 @@ typedef bool (*opal_accelerator_base_module_is_ipc_enabled_fn_t)(void);
 
 /**
  * Gets an IPC memory handle for an existing device memory allocation.
+ * This interface assumes that the object has been declared statically,
+ * hence one has to call OBJ_DESTRUCT(handle) on it.
  *
  * @param[IN]  dev_id        Associated device for the IPC memory handle or
  *                           MCA_ACCELERATOR_NO_DEVICE_ID
@@ -366,31 +394,67 @@ typedef bool (*opal_accelerator_base_module_is_ipc_enabled_fn_t)(void);
 typedef int (*opal_accelerator_base_module_get_ipc_handle_fn_t)(
     int dev_id, void *dev_ptr, opal_accelerator_ipc_handle_t *handle);
 
+/**
+ * Creates an opal_accelerator_ipc_handle object given the 64byte IPC handle,
+ * which was created using module_get_ipc_handle_fn on another process.
+ * This interface assumes that the object has been declared statically,
+ * hence one has to call OBJ_DESTRUCT(handle) on it.
+ *
+ * @param[IN]  dev_id        Associated device for the IPC memory handle or
+ *                           MCA_ACCELERATOR_NO_DEVICE_ID
+ * @param[IN]  ipc_handle    64 byte IPC handle transfered from another process
+ * @param[OUT] handle        Pointer to IPC handle object
+ *
+ * @return                   OPAL_SUCCESS or error status on failure
+ *
+ */
+typedef int (*opal_accelerator_base_module_import_ipc_handle_fn_t)(
+    int dev_id, uint8_t ipc_handle[IPC_MAX_HANDLE_SIZE], opal_accelerator_ipc_handle_t *handle);
+
 /**
  * Opens an IPC memory handle from another process and returns
  * a device pointer usable in the local process.
  *
  * @param[IN]  dev_id        Associated device for the IPC memory handle or
  *                           MCA_ACCELERATOR_NO_DEVICE_ID
- * @param[IN]  handle        IPC handle object from another process
+ * @param[IN]  handle        IPC handle created using the module_create_ipc_handle_fn
  * @param[OUT] dev_ptr       Returned device pointer
  *
- * @return                   OPAL_SUCCESS or error status on failure
+ * @return                   OPAL_SUCCESS on success,
+ *                           OPAL_ERR_WOULD_BLOCK if the memory region is already mapped
+ *                           or error status on other failures
  */
 typedef int (*opal_accelerator_base_module_open_ipc_handle_fn_t)(
     int dev_id, opal_accelerator_ipc_handle_t *handle, void **dev_ptr);
 
 /**
  * Gets an IPC event handle for an event created by opal_accelerator_base_module_create_event_fn_t.
+ * This interface assumes that the object has been declared statically,
+ * hence one has to call OBJ_DESTRUCT(handle) on it.
  *
- * @param[IN]  event         Event created previously
- * @param[OUT] handle        Pointer to IPC event handle object
+ * @param[IN] event          Event created previously
+ * @param[IN] handle         Pointer to IPC event handle object
  *
  * @return                   OPAL_SUCCESS or error status on failure
  */
 typedef int (*opal_accelerator_base_module_get_ipc_event_handle_fn_t)(
     opal_accelerator_event_t *event, opal_accelerator_ipc_event_handle_t *handle);
 
+/**
+ * Creates an opal_accelerator_ipc_event_handle object using the 64 byte IPC event handle
+ * which was created using module_get_ipc_event_handle_fn on another process.
+ * This interface assumes that the object has been declared statically,
+ * hence one has to call OBJ_DESTRUCT(handle) on it.
+ *
+ * @param[IN] event          Event created previously
+ * @param[IN] ipc_handle     64 byte IPC handle object
+ * @param[OUT] handle        Pointer to IPC event handle object
+ *
+ * @return                   OPAL_SUCCESS or error status on failure
+ */
+typedef int (*opal_accelerator_base_module_import_ipc_event_handle_fn_t)(
+     uint8_t ipc_handle[IPC_MAX_HANDLE_SIZE], opal_accelerator_ipc_event_handle_t *handle);
+
 /**
  * Opens an IPC event handle from another process opened by
  * opal_accelerator_base_module_get_ipc_event_handle_fn_t.
@@ -490,6 +554,7 @@ typedef struct {
     opal_accelerator_base_module_create_event_fn_t create_event;
     opal_accelerator_base_module_record_event_fn_t record_event;
     opal_accelerator_base_module_query_event_fn_t query_event;
+    opal_accelerator_base_module_wait_event_fn_t wait_event;
 
     opal_accelerator_base_module_memcpy_async_fn_t mem_copy_async;
     opal_accelerator_base_module_memcpy_fn_t mem_copy;
@@ -501,8 +566,10 @@ typedef struct {
 
     opal_accelerator_base_module_is_ipc_enabled_fn_t is_ipc_enabled;
     opal_accelerator_base_module_get_ipc_handle_fn_t get_ipc_handle;
+    opal_accelerator_base_module_import_ipc_handle_fn_t import_ipc_handle;
     opal_accelerator_base_module_open_ipc_handle_fn_t open_ipc_handle;
     opal_accelerator_base_module_get_ipc_event_handle_fn_t get_ipc_event_handle;
+    opal_accelerator_base_module_import_ipc_event_handle_fn_t import_ipc_event_handle;
     opal_accelerator_base_module_open_ipc_event_handle_fn_t open_ipc_event_handle;
 
     opal_accelerator_base_module_host_register_fn_t host_register;

opal/mca/accelerator/base/accelerator_base_frame.c

@@ -57,6 +57,19 @@ OBJ_CLASS_INSTANCE(
     NULL,
     NULL);
 
+OBJ_CLASS_INSTANCE(
+    opal_accelerator_ipc_handle_t,
+    opal_object_t,
+    NULL,
+    NULL);
+
+OBJ_CLASS_INSTANCE(
+    opal_accelerator_ipc_event_handle_t,
+    opal_object_t,
+    NULL,
+    NULL);
+
+
 MCA_BASE_FRAMEWORK_DECLARE(opal, accelerator, "OPAL Accelerator Framework",
                            opal_accelerator_base_frame_register, opal_accelerator_base_frame_open,
                            opal_accelerator_base_frame_close, mca_accelerator_base_static_components,