[Openmp-commits] [openmp] a66826a - Revert "[OpenMP][libomptarget] Add AMDGPU NextGen plugin with asynchronous behavior"

Kevin Sala via Openmp-commits openmp-commits at lists.llvm.org
Fri Dec 16 02:54:23 PST 2022


Author: Kevin Sala
Date: 2022-12-16T11:53:45+01:00
New Revision: a66826a23381516a2cdcd99638ac9108c1469ebc

URL: https://github.com/llvm/llvm-project/commit/a66826a23381516a2cdcd99638ac9108c1469ebc
DIFF: https://github.com/llvm/llvm-project/commit/a66826a23381516a2cdcd99638ac9108c1469ebc.diff

LOG: Revert "[OpenMP][libomptarget] Add AMDGPU NextGen plugin with asynchronous behavior"

This reverts commit 87e6b96b0009983996bfe0aa27d358008c1d1087.

Added: 
    

Modified: 
    openmp/libomptarget/plugins-nextgen/CMakeLists.txt
    openmp/libomptarget/plugins/amdgpu/dynamic_hsa/hsa.h

Removed: 
    openmp/libomptarget/plugins-nextgen/amdgpu/CMakeLists.txt
    openmp/libomptarget/plugins-nextgen/amdgpu/src/rtl.cpp


################################################################################
diff  --git a/openmp/libomptarget/plugins-nextgen/CMakeLists.txt b/openmp/libomptarget/plugins-nextgen/CMakeLists.txt
index e775123d5de2b..04194be4101c2 100644
--- a/openmp/libomptarget/plugins-nextgen/CMakeLists.txt
+++ b/openmp/libomptarget/plugins-nextgen/CMakeLists.txt
@@ -77,7 +77,6 @@ endif()
 endmacro()
 
 add_subdirectory(aarch64)
-add_subdirectory(amdgpu)
 add_subdirectory(cuda)
 add_subdirectory(ppc64)
 add_subdirectory(ppc64le)

diff  --git a/openmp/libomptarget/plugins-nextgen/amdgpu/CMakeLists.txt b/openmp/libomptarget/plugins-nextgen/amdgpu/CMakeLists.txt
deleted file mode 100644
index b469850297ecc..0000000000000
--- a/openmp/libomptarget/plugins-nextgen/amdgpu/CMakeLists.txt
+++ /dev/null
@@ -1,107 +0,0 @@
-##===----------------------------------------------------------------------===##
-#
-#                     The LLVM Compiler Infrastructure
-#
-# This file is dual licensed under the MIT and the University of Illinois Open
-# Source Licenses. See LICENSE.txt for details.
-#
-##===----------------------------------------------------------------------===##
-#
-# Build a plugin for an AMDGPU machine if available.
-#
-##===----------------------------------------------------------------------===##
-
-################################################################################
-set(LIBOMPTARGET_BUILD_AMDGPU_PLUGIN TRUE CACHE BOOL
-  "Whether to build AMDGPU plugin")
-if (NOT LIBOMPTARGET_BUILD_AMDGPU_PLUGIN)
-  libomptarget_say("Not building AMDGPU NextGen offloading plugin: LIBOMPTARGET_BUILD_AMDGPU_PLUGIN is false")
-  return()
-endif()
-
-# as of rocm-3.7, hsa is installed with cmake packages and kmt is found via hsa
-find_package(hsa-runtime64 QUIET 1.2.0 HINTS ${CMAKE_INSTALL_PREFIX} PATHS /opt/rocm)
-
-if(NOT CMAKE_SYSTEM_PROCESSOR MATCHES "(x86_64)|(ppc64le)|(aarch64)$" AND CMAKE_SYSTEM_NAME MATCHES "Linux")
-  libomptarget_say("Not building AMDGPU NextGen plugin: only support AMDGPU in Linux x86_64, ppc64le, or aarch64 hosts")
-  return()
-endif()
-
-################################################################################
-# Define the suffix for the runtime messaging dumps.
-add_definitions(-DTARGET_NAME=AMDGPU)
-
-# Define debug prefix. TODO: This should be automatized in the Debug.h but it
-# requires changing the original plugins.
-add_definitions(-DDEBUG_PREFIX="TARGET AMDGPU RTL")
-
-if(CMAKE_SYSTEM_PROCESSOR MATCHES "(ppc64le)|(aarch64)$")
-   add_definitions(-DLITTLEENDIAN_CPU=1)
-endif()
-
-if(CMAKE_BUILD_TYPE MATCHES Debug)
-  add_definitions(-DDEBUG)
-endif()
-
-set(LIBOMPTARGET_DLOPEN_LIBHSA OFF)
-option(LIBOMPTARGET_FORCE_DLOPEN_LIBHSA "Build with dlopened libhsa" ${LIBOMPTARGET_DLOPEN_LIBHSA})
-
-if (${hsa-runtime64_FOUND} AND NOT LIBOMPTARGET_FORCE_DLOPEN_LIBHSA)
-  libomptarget_say("Building AMDGPU NextGen plugin linked against libhsa")
-  set(LIBOMPTARGET_EXTRA_SOURCE)
-  set(LIBOMPTARGET_DEP_LIBRARIES hsa-runtime64::hsa-runtime64)
-else()
-  libomptarget_say("Building AMDGPU NextGen plugin for dlopened libhsa")
-  include_directories(../../plugins/amdgpu/dynamic_hsa)
-  set(LIBOMPTARGET_EXTRA_SOURCE ../../plugins/amdgpu/dynamic_hsa/hsa.cpp)
-  set(LIBOMPTARGET_DEP_LIBRARIES)
-endif()
-
-if(CMAKE_SYSTEM_NAME MATCHES "FreeBSD")
-  # On FreeBSD, the 'environ' symbol is undefined at link time, but resolved by
-  # the dynamic linker at runtime. Therefore, allow the symbol to be undefined
-  # when creating a shared library.
-  set(LDFLAGS_UNDEFINED "-Wl,--allow-shlib-undefined")
-else()
-  set(LDFLAGS_UNDEFINED "-Wl,-z,defs")
-endif()
-
-add_llvm_library(omptarget.rtl.amdgpu.nextgen SHARED
-  src/rtl.cpp
-  ${LIBOMPTARGET_EXTRA_SOURCE}
-
-  ADDITIONAL_HEADER_DIRS
-  ${LIBOMPTARGET_INCLUDE_DIR}
-  ${CMAKE_CURRENT_SOURCE_DIR}/utils
-
-  LINK_COMPONENTS
-  Support
-  Object
-
-  LINK_LIBS
-  PRIVATE
-  elf_common
-  MemoryManager
-  PluginInterface
-  ${LIBOMPTARGET_DEP_LIBRARIES}
-  ${OPENMP_PTHREAD_LIB}
-  "-Wl,--version-script=${CMAKE_CURRENT_SOURCE_DIR}/../exports"
-  ${LDFLAGS_UNDEFINED}
-
-  NO_INSTALL_RPATH
-)
-add_dependencies(omptarget.rtl.amdgpu.nextgen omptarget.devicertl.amdgpu)
-
-target_include_directories(
-  omptarget.rtl.amdgpu.nextgen
-  PRIVATE
-  ${LIBOMPTARGET_INCLUDE_DIR}
-  ${CMAKE_CURRENT_SOURCE_DIR}/utils
-)
-
-
-# Install plugin under the lib destination folder.
-install(TARGETS omptarget.rtl.amdgpu.nextgen LIBRARY DESTINATION "${OPENMP_INSTALL_LIBDIR}")
-set_target_properties(omptarget.rtl.amdgpu.nextgen PROPERTIES
-  INSTALL_RPATH "$ORIGIN" BUILD_RPATH "$ORIGIN:${CMAKE_CURRENT_BINARY_DIR}/.."
-  CXX_VISIBILITY_PRESET protected)

diff  --git a/openmp/libomptarget/plugins-nextgen/amdgpu/src/rtl.cpp b/openmp/libomptarget/plugins-nextgen/amdgpu/src/rtl.cpp
deleted file mode 100644
index c90aa04ad435d..0000000000000
--- a/openmp/libomptarget/plugins-nextgen/amdgpu/src/rtl.cpp
+++ /dev/null
@@ -1,2521 +0,0 @@
-//===----RTLs/amdgpu/src/rtl.cpp - Target RTLs Implementation ----- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-//
-// RTL NextGen for AMDGPU machine
-//
-//===----------------------------------------------------------------------===//
-
-#include <atomic>
-#include <cassert>
-#include <cstddef>
-#include <deque>
-#include <hsa.h>
-#include <hsa_ext_amd.h>
-#include <mutex>
-#include <shared_mutex>
-#include <string>
-#include <unistd.h>
-#include <unordered_map>
-
-#include "Debug.h"
-#include "DeviceEnvironment.h"
-#include "GlobalHandler.h"
-#include "PluginInterface.h"
-#include "Utilities.h"
-#include "UtilitiesRTL.h"
-
-#include "llvm/ADT/StringRef.h"
-#include "llvm/BinaryFormat/ELF.h"
-#include "llvm/Frontend/OpenMP/OMPConstants.h"
-#include "llvm/Frontend/OpenMP/OMPGridValues.h"
-
-namespace llvm {
-namespace omp {
-namespace target {
-namespace plugin {
-
-/// Forward declarations for all specialized data structures.
-struct AMDGPUKernelTy;
-struct AMDGPUDeviceTy;
-struct AMDGPUPluginTy;
-struct AMDGPUStreamTy;
-struct AMDGPUEventTy;
-struct AMDGPUStreamManagerTy;
-struct AMDGPUEventManagerTy;
-struct AMDGPUDeviceImageTy;
-struct AMDGPUMemoryManagerTy;
-struct AMDGPUMemoryPoolTy;
-
-namespace utils {
-
-/// Iterate elements using an HSA iterate function. Do not use this function
-/// directly but the specialized ones below instead.
-template <typename ElemTy, typename IterFuncTy, typename CallbackTy>
-hsa_status_t iterate(IterFuncTy Func, CallbackTy Cb) {
-  auto L = [](ElemTy Elem, void *Data) -> hsa_status_t {
-    CallbackTy *Unwrapped = static_cast<CallbackTy *>(Data);
-    return (*Unwrapped)(Elem);
-  };
-  return Func(L, static_cast<void *>(&Cb));
-}
-
-/// Iterate elements using an HSA iterate function passing a parameter. Do not
-/// use this function directly but the specialized ones below instead.
-template <typename ElemTy, typename IterFuncTy, typename IterFuncArgTy,
-          typename CallbackTy>
-hsa_status_t iterate(IterFuncTy Func, IterFuncArgTy FuncArg, CallbackTy Cb) {
-  auto L = [](ElemTy Elem, void *Data) -> hsa_status_t {
-    CallbackTy *Unwrapped = static_cast<CallbackTy *>(Data);
-    return (*Unwrapped)(Elem);
-  };
-  return Func(FuncArg, L, static_cast<void *>(&Cb));
-}
-
-/// Iterate elements using an HSA iterate function passing a parameter. Do not
-/// use this function directly but the specialized ones below instead.
-template <typename Elem1Ty, typename Elem2Ty, typename IterFuncTy,
-          typename IterFuncArgTy, typename CallbackTy>
-hsa_status_t iterate(IterFuncTy Func, IterFuncArgTy FuncArg, CallbackTy Cb) {
-  auto L = [](Elem1Ty Elem1, Elem2Ty Elem2, void *Data) -> hsa_status_t {
-    CallbackTy *Unwrapped = static_cast<CallbackTy *>(Data);
-    return (*Unwrapped)(Elem1, Elem2);
-  };
-  return Func(FuncArg, L, static_cast<void *>(&Cb));
-}
-
-/// Iterate agents.
-template <typename CallbackTy> Error iterateAgents(CallbackTy Callback) {
-  hsa_status_t Status = iterate<hsa_agent_t>(hsa_iterate_agents, Callback);
-  return Plugin::check(Status, "Error in hsa_iterate_agents: %s");
-}
-
-/// Iterate ISAs of an agent.
-template <typename CallbackTy>
-Error iterateAgentISAs(hsa_agent_t Agent, CallbackTy Cb) {
-  hsa_status_t Status = iterate<hsa_isa_t>(hsa_agent_iterate_isas, Agent, Cb);
-  return Plugin::check(Status, "Error in hsa_agent_iterate_isas: %s");
-}
-
-/// Iterate memory pools of an agent.
-template <typename CallbackTy>
-Error iterateAgentMemoryPools(hsa_agent_t Agent, CallbackTy Cb) {
-  hsa_status_t Status = iterate<hsa_amd_memory_pool_t>(
-      hsa_amd_agent_iterate_memory_pools, Agent, Cb);
-  return Plugin::check(Status,
-                       "Error in hsa_amd_agent_iterate_memory_pools: %s");
-}
-
-} // namespace utils
-
-/// Utility class representing generic resource references to AMDGPU resources.
-template <typename ResourceTy>
-struct AMDGPUResourceRef : public GenericDeviceResourceRef {
-  /// Create an empty reference to an invalid resource.
-  AMDGPUResourceRef() : Resource(nullptr) {}
-
-  /// Create a reference to an existing resource.
-  AMDGPUResourceRef(ResourceTy *Resource) : Resource(Resource) {}
-
-  /// Create a new resource and save the reference. The reference must be empty
-  /// before calling to this function.
-  Error create(GenericDeviceTy &Device) override;
-
-  /// Destroy the referenced resource and invalidate the reference. The
-  /// reference must be to a valid event before calling to this function.
-  Error destroy(GenericDeviceTy &Device) override {
-    if (!Resource)
-      return Plugin::error("Destroying an invalid resource");
-
-    if (auto Err = Resource->deinit())
-      return Err;
-
-    delete Resource;
-
-    Resource = nullptr;
-    return Plugin::success();
-  }
-
-  /// Get the underlying AMDGPUSignalTy reference.
-  operator ResourceTy *() const { return Resource; }
-
-private:
-  /// The reference to the actual resource.
-  ResourceTy *Resource;
-};
-
-/// Class holding an HSA memory pool.
-struct AMDGPUMemoryPoolTy {
-  /// Create a memory pool from an HSA memory pool.
-  AMDGPUMemoryPoolTy(hsa_amd_memory_pool_t MemoryPool)
-      : MemoryPool(MemoryPool), GlobalFlags(0) {}
-
-  /// Initialize the memory pool retrieving its properties.
-  Error init() {
-    if (auto Err = getAttr(HSA_AMD_MEMORY_POOL_INFO_SEGMENT, Segment))
-      return Err;
-
-    if (auto Err = getAttr(HSA_AMD_MEMORY_POOL_INFO_GLOBAL_FLAGS, GlobalFlags))
-      return Err;
-
-    return Plugin::success();
-  }
-
-  /// Getter of the HSA memory pool.
-  hsa_amd_memory_pool_t get() const { return MemoryPool; }
-
-  /// Indicate if it belongs to the global segment.
-  bool isGlobal() const { return (Segment == HSA_AMD_SEGMENT_GLOBAL); }
-
-  /// Indicate if it is fine-grained memory. Valid only for global.
-  bool isFineGrained() const {
-    assert(isGlobal() && "Not global memory");
-    return (GlobalFlags & HSA_AMD_MEMORY_POOL_GLOBAL_FLAG_FINE_GRAINED);
-  }
-
-  /// Indicate if it is coarse-grained memory. Valid only for global.
-  bool isCoarseGrained() const {
-    assert(isGlobal() && "Not global memory");
-    return (GlobalFlags & HSA_AMD_MEMORY_POOL_GLOBAL_FLAG_COARSE_GRAINED);
-  }
-
-  /// Indicate if it supports storing kernel arguments. Valid only for global.
-  bool supportsKernelArgs() const {
-    assert(isGlobal() && "Not global memory");
-    return (GlobalFlags & HSA_AMD_MEMORY_POOL_GLOBAL_FLAG_KERNARG_INIT);
-  }
-
-  /// Allocate memory on the memory pool.
-  Error allocate(size_t Size, void **PtrStorage) {
-    hsa_status_t Status =
-        hsa_amd_memory_pool_allocate(MemoryPool, Size, 0, PtrStorage);
-    return Plugin::check(Status, "Error in hsa_amd_memory_pool_allocate: %s");
-  }
-
-  /// Return memory to the memory pool.
-  Error deallocate(void *Ptr) {
-    hsa_status_t Status = hsa_amd_memory_pool_free(Ptr);
-    return Plugin::check(Status, "Error in hsa_amd_memory_pool_free: %s");
-  }
-
-  /// Allow the device to access a specific allocation.
-  Error enableAccess(void *Ptr, int64_t Size,
-                     const llvm::SmallVector<hsa_agent_t> &Agents) const {
-#ifdef OMPTARGET_DEBUG
-    for (hsa_agent_t Agent : Agents) {
-      hsa_amd_memory_pool_access_t Access;
-      if (auto Err =
-              getAttr(Agent, HSA_AMD_AGENT_MEMORY_POOL_INFO_ACCESS, Access))
-        return Err;
-
-      // The agent is not allowed to access the memory pool in any case. Do not
-      // continue because otherwise it result in undefined behavior.
-      if (Access == HSA_AMD_MEMORY_POOL_ACCESS_NEVER_ALLOWED)
-        return Plugin::error("An agent is not allowed to access a memory pool");
-    }
-#endif
-
-    // We can access but it is disabled by default. Enable the access then.
-    hsa_status_t Status =
-        hsa_amd_agents_allow_access(Agents.size(), Agents.data(), nullptr, Ptr);
-    return Plugin::check(Status, "Error in hsa_amd_agents_allow_access: %s");
-  }
-
-private:
-  /// Get attribute from the memory pool.
-  template <typename Ty>
-  Error getAttr(hsa_amd_memory_pool_info_t Kind, Ty &Value) const {
-    hsa_status_t Status;
-    Status = hsa_amd_memory_pool_get_info(MemoryPool, Kind, &Value);
-    return Plugin::check(Status, "Error in hsa_amd_memory_pool_get_info: %s");
-  }
-
-  /// Get attribute from the memory pool relating to an agent.
-  template <typename Ty>
-  Error getAttr(hsa_agent_t Agent, hsa_amd_agent_memory_pool_info_t Kind,
-                Ty &Value) const {
-    hsa_status_t Status;
-    Status =
-        hsa_amd_agent_memory_pool_get_info(Agent, MemoryPool, Kind, &Value);
-    return Plugin::check(Status,
-                         "Error in hsa_amd_agent_memory_pool_get_info: %s");
-  }
-
-  /// The HSA memory pool.
-  hsa_amd_memory_pool_t MemoryPool;
-
-  /// The segment where the memory pool belongs to.
-  hsa_amd_segment_t Segment;
-
-  /// The global flags of memory pool. Only valid if the memory pool belongs to
-  /// the global segment.
-  uint32_t GlobalFlags;
-};
-
-/// Class that implements a memory manager that gets memory from a specific
-/// memory pool.
-struct AMDGPUMemoryManagerTy : public DeviceAllocatorTy {
-
-  /// Create an empty memory manager.
-  AMDGPUMemoryManagerTy() : MemoryPool(nullptr), MemoryManager(nullptr) {}
-
-  /// Initialize the memory manager from a memory pool.
-  Error init(AMDGPUMemoryPoolTy &MemoryPool) {
-    const uint32_t Threshold = 1 << 30;
-    this->MemoryManager = new MemoryManagerTy(*this, Threshold);
-    this->MemoryPool = &MemoryPool;
-    return Plugin::success();
-  }
-
-  /// Deinitialize the memory manager and free its allocations.
-  Error deinit() {
-    assert(MemoryManager && "Invalid memory manager");
-
-    // Delete and invalidate the memory manager. At this point, the memory
-    // manager will deallocate all its allocations.
-    delete MemoryManager;
-    MemoryManager = nullptr;
-
-    return Plugin::success();
-  }
-
-  /// Reuse or allocate memory through the memory manager.
-  Error allocate(size_t Size, void **PtrStorage) {
-    assert(MemoryManager && "Invalid memory manager");
-    assert(PtrStorage && "Invalid pointer storage");
-
-    *PtrStorage = MemoryManager->allocate(Size, nullptr);
-    if (*PtrStorage == nullptr)
-      return Plugin::error("Failure to allocate from AMDGPU memory manager");
-
-    return Plugin::success();
-  }
-
-  /// Release an allocation to be reused.
-  Error deallocate(void *Ptr) {
-    assert(Ptr && "Invalid pointer");
-
-    if (MemoryManager->free(Ptr))
-      return Plugin::error("Failure to deallocate from AMDGPU memory manager");
-
-    return Plugin::success();
-  }
-
-private:
-  /// Allocation callback that will be called once the memory manager does not
-  /// have more previously allocated buffers.
-  void *allocate(size_t Size, void *HstPtr, TargetAllocTy Kind) override;
-
-  /// Deallocation callack that will be called by the memory manager.
-  int free(void *TgtPtr, TargetAllocTy Kind) override {
-    if (auto Err = MemoryPool->deallocate(TgtPtr)) {
-      consumeError(std::move(Err));
-      return OFFLOAD_FAIL;
-    }
-    return OFFLOAD_SUCCESS;
-  }
-
-  /// The memory pool used to allocate memory.
-  AMDGPUMemoryPoolTy *MemoryPool;
-
-  /// Reference to the actual memory manager.
-  MemoryManagerTy *MemoryManager;
-};
-
-/// Class implementing the AMDGPU device images' properties.
-struct AMDGPUDeviceImageTy : public DeviceImageTy {
-  /// Create the AMDGPU image with the id and the target image pointer.
-  AMDGPUDeviceImageTy(int32_t ImageId, const __tgt_device_image *TgtImage)
-      : DeviceImageTy(ImageId, TgtImage) {}
-
-  /// Prepare and load the executable corresponding to the image.
-  Error loadExecutable(const AMDGPUDeviceTy &Device);
-
-  /// Unload the executable.
-  Error unloadExecutable() {
-    hsa_status_t Status = hsa_executable_destroy(Executable);
-    if (auto Err = Plugin::check(Status, "Error in hsa_executable_destroy: %s"))
-      return Err;
-
-    Status = hsa_code_object_destroy(CodeObject);
-    return Plugin::check(Status, "Error in hsa_code_object_destroy: %s");
-  }
-
-  /// Get the executable.
-  hsa_executable_t getExecutable() const { return Executable; }
-
-  /// Find an HSA device symbol by its name on the executable.
-  Expected<hsa_executable_symbol_t>
-  findDeviceSymbol(GenericDeviceTy &Device, StringRef SymbolName) const;
-
-private:
-  /// The exectuable loaded on the agent.
-  hsa_executable_t Executable;
-  hsa_code_object_t CodeObject;
-};
-
-/// Class implementing the AMDGPU kernel functionalities which derives from the
-/// generic kernel class.
-struct AMDGPUKernelTy : public GenericKernelTy {
-  /// Create an AMDGPU kernel with a name and an execution mode.
-  AMDGPUKernelTy(const char *Name, OMPTgtExecModeFlags ExecutionMode)
-      : GenericKernelTy(Name, ExecutionMode),
-        ImplicitArgsSize(sizeof(utils::AMDGPUImplicitArgsTy)) {}
-
-  /// Initialize the AMDGPU kernel.
-  Error initImpl(GenericDeviceTy &Device, DeviceImageTy &Image) override {
-    AMDGPUDeviceImageTy &AMDImage = static_cast<AMDGPUDeviceImageTy &>(Image);
-
-    // Kernel symbols have a ".kd" suffix.
-    std::string KernelName(getName());
-    KernelName += ".kd";
-
-    // Find the symbol on the device executable.
-    auto SymbolOrErr = AMDImage.findDeviceSymbol(Device, KernelName);
-    if (!SymbolOrErr)
-      return SymbolOrErr.takeError();
-
-    hsa_executable_symbol_t Symbol = *SymbolOrErr;
-    hsa_symbol_kind_t SymbolType;
-    hsa_status_t Status;
-
-    // Retrieve 
diff erent properties of the kernel symbol.
-    std::pair<hsa_executable_symbol_info_t, void *> RequiredInfos[] = {
-        {HSA_EXECUTABLE_SYMBOL_INFO_TYPE, &SymbolType},
-        {HSA_EXECUTABLE_SYMBOL_INFO_KERNEL_OBJECT, &KernelObject},
-        {HSA_EXECUTABLE_SYMBOL_INFO_KERNEL_KERNARG_SEGMENT_SIZE, &ArgsSize},
-        {HSA_EXECUTABLE_SYMBOL_INFO_KERNEL_GROUP_SEGMENT_SIZE, &GroupSize},
-        {HSA_EXECUTABLE_SYMBOL_INFO_KERNEL_PRIVATE_SEGMENT_SIZE, &PrivateSize}};
-
-    for (auto &Info : RequiredInfos) {
-      Status = hsa_executable_symbol_get_info(Symbol, Info.first, Info.second);
-      if (auto Err = Plugin::check(
-              Status, "Error in hsa_executable_symbol_get_info: %s"))
-        return Err;
-    }
-
-    // Make sure it is a kernel symbol.
-    if (SymbolType != HSA_SYMBOL_KIND_KERNEL)
-      return Plugin::error("Symbol %s is not a kernel function");
-
-    // TODO: Read the kernel descriptor for the max threads per block. May be
-    // read from the image.
-
-    return Plugin::success();
-  }
-
-  /// Launch the AMDGPU kernel function.
-  Error launchImpl(GenericDeviceTy &GenericDevice, uint32_t NumThreads,
-                   uint64_t NumBlocks, uint32_t DynamicMemorySize,
-                   int32_t NumKernelArgs, void *KernelArgs,
-                   AsyncInfoWrapperTy &AsyncInfoWrapper) const override;
-
-  /// The default number of blocks is common to the whole device.
-  uint64_t getDefaultNumBlocks(GenericDeviceTy &GenericDevice) const override {
-    return GenericDevice.getDefaultNumBlocks();
-  }
-
-  /// The default number of threads is common to the whole device.
-  uint32_t getDefaultNumThreads(GenericDeviceTy &GenericDevice) const override {
-    return GenericDevice.getDefaultNumThreads();
-  }
-
-  /// Get group and private segment kernel size.
-  uint32_t getGroupSize() const { return GroupSize; }
-  uint32_t getPrivateSize() const { return PrivateSize; }
-
-  /// Get the HSA kernel object representing the kernel function.
-  uint64_t getKernelObject() const { return KernelObject; }
-
-private:
-  /// The kernel object to execute.
-  uint64_t KernelObject;
-
-  /// The args, group and private segments sizes required by a kernel instance.
-  uint32_t ArgsSize;
-  uint32_t GroupSize;
-  uint32_t PrivateSize;
-
-  /// The size of implicit kernel arguments.
-  const uint32_t ImplicitArgsSize;
-};
-
-/// Class representing an HSA signal. Signals are used to define dependencies
-/// between asynchronous operations: kernel launches and memory transfers.
-struct AMDGPUSignalTy {
-  /// Create an empty signal.
-  AMDGPUSignalTy() : Signal({0}), UseCount() {}
-  AMDGPUSignalTy(AMDGPUDeviceTy &Device) : Signal({0}), UseCount() {}
-
-  /// Initialize the signal with an initial value.
-  Error init(uint32_t InitialValue = 1) {
-    hsa_status_t Status =
-        hsa_amd_signal_create(InitialValue, 0, nullptr, 0, &Signal);
-    return Plugin::check(Status, "Error in hsa_signal_create: %s");
-  }
-
-  /// Deinitialize the signal.
-  Error deinit() {
-    hsa_status_t Status = hsa_signal_destroy(Signal);
-    return Plugin::check(Status, "Error in hsa_signal_destroy: %s");
-  }
-
-  /// Wait until the signal gets a zero value.
-  Error wait() const {
-    // TODO: Is it better to use busy waiting or blocking the thread?
-    while (hsa_signal_wait_scacquire(Signal, HSA_SIGNAL_CONDITION_EQ, 0,
-                                     UINT64_MAX, HSA_WAIT_STATE_BLOCKED) != 0)
-      ;
-    return Plugin::success();
-  }
-
-  /// Load the value on the signal.
-  hsa_signal_value_t load() const { return hsa_signal_load_scacquire(Signal); }
-
-  /// Signal decrementing by one.
-  void signal() {
-    assert(load() > 0 && "Invalid signal value");
-    hsa_signal_subtract_screlease(Signal, 1);
-  }
-
-  /// Reset the signal value before reusing the signal. Do not call this
-  /// function if the signal is being currently used by any watcher, such as a
-  /// plugin thread or the HSA runtime.
-  void reset() { hsa_signal_store_screlease(Signal, 1); }
-
-  /// Increase the number of concurrent uses.
-  void increaseUseCount() { UseCount.increase(); }
-
-  /// Decrease the number of concurrent uses and return whether was the last.
-  bool decreaseUseCount() { return UseCount.decrease(); }
-
-  hsa_signal_t get() const { return Signal; }
-
-private:
-  /// The underlying HSA signal.
-  hsa_signal_t Signal;
-
-  /// Reference counter for tracking the concurrent use count. This is mainly
-  /// used for knowing how many streams are using the signal.
-  RefCountTy<> UseCount;
-};
-
-/// Classes for holding AMDGPU signals and managing signals.
-using AMDGPUSignalRef = AMDGPUResourceRef<AMDGPUSignalTy>;
-using AMDGPUSignalManagerTy = GenericDeviceResourceManagerTy<AMDGPUSignalRef>;
-
-/// Class holding an HSA queue to submit kernel and barrier packets.
-struct AMDGPUQueueTy {
-  /// Create an empty queue.
-  AMDGPUQueueTy() : Queue(nullptr), Mutex() {}
-
-  /// Initialize a new queue belonging to a specific agent.
-  Error init(hsa_agent_t Agent, int32_t QueueSize) {
-    hsa_status_t Status =
-        hsa_queue_create(Agent, QueueSize, HSA_QUEUE_TYPE_MULTI, callbackError,
-                         nullptr, UINT32_MAX, UINT32_MAX, &Queue);
-    return Plugin::check(Status, "Error in hsa_queue_create: %s");
-  }
-
-  /// Deinitialize the queue and destroy its resources.
-  Error deinit() {
-    hsa_status_t Status = hsa_queue_destroy(Queue);
-    return Plugin::check(Status, "Error in hsa_queue_destroy: %s");
-  }
-
-  /// Push a kernel launch to the queue. The kernel launch requires an output
-  /// signal and can define an optional input signal (nullptr if none).
-  Error pushKernelLaunch(const AMDGPUKernelTy &Kernel, void *KernelArgs,
-                         uint32_t NumThreads, uint64_t NumBlocks,
-                         AMDGPUSignalTy *OutputSignal,
-                         AMDGPUSignalTy *InputSignal) {
-    assert(OutputSignal && "Invalid kernel output signal");
-
-    // Lock the queue during the packet publishing process. Notice this blocks
-    // the addition of other packets to the queue. The following piece of code
-    // should be lightweight; do not block the thread, allocate memory, etc.
-    std::lock_guard<std::mutex> Lock(Mutex);
-
-    // Add a barrier packet before the kernel packet in case there is a pending
-    // preceding operation. The barrier packet will delay the processing of
-    // subsequent queue's packets until the barrier input signal are satisfied.
-    // No need output signal needed because the dependency is already guaranteed
-    // by the queue barrier itself.
-    if (InputSignal)
-      if (auto Err = pushBarrierImpl(nullptr, InputSignal))
-        return Err;
-
-    // Now prepare the kernel packet.
-    uint64_t PacketId;
-    hsa_kernel_dispatch_packet_t *Packet = acquirePacket(PacketId);
-    assert(Packet && "Invalid packet");
-
-    // The header of the packet is written in the last moment.
-    Packet->setup = UINT16_C(1) << HSA_KERNEL_DISPATCH_PACKET_SETUP_DIMENSIONS;
-    Packet->workgroup_size_x = NumThreads;
-    Packet->workgroup_size_y = 1;
-    Packet->workgroup_size_z = 1;
-    Packet->reserved0 = 0;
-    Packet->grid_size_x = NumBlocks * NumThreads;
-    Packet->grid_size_y = 1;
-    Packet->grid_size_z = 1;
-    Packet->private_segment_size = Kernel.getPrivateSize();
-    Packet->group_segment_size = Kernel.getGroupSize();
-    Packet->kernel_object = Kernel.getKernelObject();
-    Packet->kernarg_address = KernelArgs;
-    Packet->reserved2 = 0;
-    Packet->completion_signal = OutputSignal->get();
-
-    // Publish the packet. Do not modify the packet after this point.
-    publishKernelPacket(PacketId, Packet);
-
-    return Plugin::success();
-  }
-
-  /// Push a barrier packet that will wait up to two input signals. All signals
-  /// are optional (nullptr if none).
-  Error pushBarrier(AMDGPUSignalTy *OutputSignal,
-                    const AMDGPUSignalTy *InputSignal1,
-                    const AMDGPUSignalTy *InputSignal2) {
-    // Lock the queue during the packet publishing process.
-    std::lock_guard<std::mutex> Lock(Mutex);
-
-    // Push the barrier with the lock acquired.
-    return pushBarrierImpl(OutputSignal, InputSignal1, InputSignal2);
-  }
-
-private:
-  /// Push a barrier packet that will wait up to two input signals. Assumes the
-  /// the queue lock is acquired.
-  Error pushBarrierImpl(AMDGPUSignalTy *OutputSignal,
-                        const AMDGPUSignalTy *InputSignal1,
-                        const AMDGPUSignalTy *InputSignal2 = nullptr) {
-    // Add a queue barrier waiting on both the other stream's operation and the
-    // last operation on the current stream (if any).
-    uint64_t PacketId;
-    hsa_barrier_and_packet_t *Packet =
-        (hsa_barrier_and_packet_t *)acquirePacket(PacketId);
-    assert(Packet && "Invalid packet");
-
-    Packet->reserved0 = 0;
-    Packet->reserved1 = 0;
-    Packet->dep_signal[0] = {0};
-    Packet->dep_signal[1] = {0};
-    Packet->dep_signal[2] = {0};
-    Packet->dep_signal[3] = {0};
-    Packet->dep_signal[4] = {0};
-    Packet->reserved2 = 0;
-    Packet->completion_signal = {0};
-
-    // Set input and output dependencies if needed.
-    if (OutputSignal)
-      Packet->completion_signal = OutputSignal->get();
-    if (InputSignal1)
-      Packet->dep_signal[0] = InputSignal1->get();
-    if (InputSignal2)
-      Packet->dep_signal[1] = InputSignal2->get();
-
-    // Publish the packet. Do not modify the packet after this point.
-    publishBarrierPacket(PacketId, Packet);
-
-    return Plugin::success();
-  }
-
-  /// Acquire a packet from the queue. This call may block the thread if there
-  /// is no space in the underlying HSA queue. It may need to wait until the HSA
-  /// runtime processes some packets. Assumes the queue lock is acquired.
-  hsa_kernel_dispatch_packet_t *acquirePacket(uint64_t &PacketId) {
-    // Increase the queue index with relaxed memory order. Notice this will need
-    // another subsequent atomic operation with acquire order.
-    PacketId = hsa_queue_add_write_index_relaxed(Queue, 1);
-
-    // Wait for the package to be available. Notice the atomic operation uses
-    // the acquire memory order.
-    while (PacketId - hsa_queue_load_read_index_scacquire(Queue) >= Queue->size)
-      ;
-
-    // Return the packet reference.
-    const uint32_t Mask = Queue->size - 1; // The size is a power of 2.
-    return (hsa_kernel_dispatch_packet_t *)Queue->base_address +
-           (PacketId & Mask);
-  }
-
-  /// Publish the kernel packet so that the HSA runtime can start processing
-  /// the kernel launch. Do not modify the packet once this function is called.
-  /// Assumes the queue lock is acquired.
-  void publishKernelPacket(uint64_t PacketId,
-                           hsa_kernel_dispatch_packet_t *Packet) {
-    uint32_t *PacketPtr = reinterpret_cast<uint32_t *>(Packet);
-
-    uint16_t Setup = Packet->setup;
-    uint16_t Header = HSA_PACKET_TYPE_KERNEL_DISPATCH << HSA_PACKET_HEADER_TYPE;
-    Header |= HSA_FENCE_SCOPE_SYSTEM << HSA_PACKET_HEADER_ACQUIRE_FENCE_SCOPE;
-    Header |= HSA_FENCE_SCOPE_SYSTEM << HSA_PACKET_HEADER_RELEASE_FENCE_SCOPE;
-
-    // Publish the packet. Do not modify the package after this point.
-    __atomic_store_n(PacketPtr, Header | (Setup << 16), __ATOMIC_RELEASE);
-
-    // Signal the doorbell about the published packet.
-    hsa_signal_store_relaxed(Queue->doorbell_signal, PacketId);
-  }
-
-  /// Publish the barrier packet so that the HSA runtime can start processing
-  /// the barrier. Next packets in the queue will not be processed until all
-  /// barrier dependencies (signals) are satisfied. Assumes the queue is locked
-  void publishBarrierPacket(uint64_t PacketId,
-                            hsa_barrier_and_packet_t *Packet) {
-    uint32_t *PacketPtr = reinterpret_cast<uint32_t *>(Packet);
-
-    uint16_t Setup = 0;
-    uint16_t Header = HSA_PACKET_TYPE_BARRIER_AND << HSA_PACKET_HEADER_TYPE;
-    Header |= HSA_FENCE_SCOPE_SYSTEM << HSA_PACKET_HEADER_ACQUIRE_FENCE_SCOPE;
-    Header |= HSA_FENCE_SCOPE_SYSTEM << HSA_PACKET_HEADER_RELEASE_FENCE_SCOPE;
-
-    // Publish the packet. Do not modify the package after this point.
-    __atomic_store_n(PacketPtr, Header | (Setup << 16), __ATOMIC_RELEASE);
-
-    // Signal the doorbell about the published packet.
-    hsa_signal_store_relaxed(Queue->doorbell_signal, PacketId);
-  }
-
-  /// Callack that will be called when an error is detected on the HSA queue.
-  static void callbackError(hsa_status_t Status, hsa_queue_t *Source, void *) {
-    auto Err = Plugin::check(Status, "Received error in queue %p: %s", Source);
-    FATAL_MESSAGE(1, "%s", toString(std::move(Err)).data());
-  }
-
-  /// The HSA queue.
-  hsa_queue_t *Queue;
-
-  /// Mutex to protect the acquiring and publishing of packets. For the moment,
-  /// we need this mutex to prevent publishing packets that are not ready to be
-  /// published in a multi-thread scenario. Without a queue lock, a thread T1
-  /// could acquire packet P and thread T2 acquire packet P+1. Thread T2 could
-  /// publish its packet P+1 (signaling the queue's doorbell) before packet P
-  /// from T1 is ready to be processed. That scenario should be invalid. Thus,
-  /// we use the following mutex to make packet acquiring and publishing atomic.
-  /// TODO: There are other more advanced approaches to avoid this mutex using
-  /// atomic operations. We can further investigate it if this is a bottleneck.
-  std::mutex Mutex;
-};
-
-/// Struct that implements a stream of asynchronous operations for AMDGPU
-/// devices. This class relies on signals to implement streams and define the
-/// dependencies between asynchronous operations.
-struct AMDGPUStreamTy {
-private:
-  /// Utility struct holding arguments for async H2H memory copies.
-  struct MemcpyArgsTy {
-    void *Dst;
-    const void *Src;
-    size_t Size;
-  };
-
-  /// Utility struct holding arguments for freeing buffers to memory managers.
-  struct ReleaseBufferArgsTy {
-    void *Buffer;
-    AMDGPUMemoryManagerTy *MemoryManager;
-  };
-
-  /// Utility struct holding arguments for releasing signals to signal managers.
-  struct ReleaseSignalArgsTy {
-    AMDGPUSignalTy *Signal;
-    AMDGPUSignalManagerTy *SignalManager;
-  };
-
-  /// The stream is composed of N stream's slots. The struct below represents
-  /// the fields of each slot. Each slot has a signal and an optional action
-  /// function. When appending an HSA asynchronous operation to the stream, one
-  /// slot is consumed and used to store the operation's information. The
-  /// operation's output signal is set to the consumed slot's signal. If there
-  /// is a previous asynchronous operation on the previous slot, the HSA async
-  /// operation's input signal is set to the signal of the previous slot. This
-  /// way, we obtain a chain of dependant async operations. The action is a
-  /// function that will be executed eventually after the operation is
-  /// completed, e.g., for releasing a buffer.
-  struct StreamSlotTy {
-    /// The output signal of the stream operation. May be used by the subsequent
-    /// operation as input signal.
-    AMDGPUSignalTy *Signal;
-
-    /// The action that must be performed after the operation's completion. Set
-    /// to nullptr when there is no action to perform.
-    Error (*ActionFunction)(void *);
-
-    /// Space for the action's arguments. A pointer to these arguments is passed
-    /// to the action function. Notice the space of arguments is limited.
-    union {
-      MemcpyArgsTy MemcpyArgs;
-      ReleaseBufferArgsTy ReleaseBufferArgs;
-      ReleaseSignalArgsTy ReleaseSignalArgs;
-    } ActionArgs;
-
-    /// Create an empty slot.
-    StreamSlotTy() : Signal(nullptr), ActionFunction(nullptr) {}
-
-    /// Schedule a host memory copy action on the slot.
-    Error schedHostMemoryCopy(void *Dst, const void *Src, size_t Size) {
-      ActionFunction = memcpyAction;
-      ActionArgs.MemcpyArgs = MemcpyArgsTy{Dst, Src, Size};
-      return Plugin::success();
-    }
-
-    /// Schedule a release buffer action on the slot.
-    Error schedReleaseBuffer(void *Buffer, AMDGPUMemoryManagerTy &Manager) {
-      ActionFunction = releaseBufferAction;
-      ActionArgs.ReleaseBufferArgs = ReleaseBufferArgsTy{Buffer, &Manager};
-      return Plugin::success();
-    }
-
-    /// Schedule a release buffer action on the slot.
-    Error schedReleaseSignal(AMDGPUSignalTy *SignalToRelease,
-                             AMDGPUSignalManagerTy *SignalManager) {
-      ActionFunction = releaseSignalAction;
-      ActionArgs.ReleaseSignalArgs =
-          ReleaseSignalArgsTy{SignalToRelease, SignalManager};
-      return Plugin::success();
-    }
-
-    // Perform the action if needed.
-    Error performAction() {
-      if (!ActionFunction)
-        return Plugin::success();
-
-      // Perform the action.
-      if (auto Err = (*ActionFunction)(&ActionArgs))
-        return Err;
-
-      // Invalidate the action.
-      ActionFunction = nullptr;
-
-      return Plugin::success();
-    }
-  };
-
-  /// The device agent where the stream was created.
-  hsa_agent_t Agent;
-
-  /// The queue that the stream uses to launch kernels.
-  AMDGPUQueueTy &Queue;
-
-  /// The manager of signals to reuse signals.
-  AMDGPUSignalManagerTy &SignalManager;
-
-  /// Array of stream slots. Use std::deque because it can dynamically grow
-  /// without invalidating the already inserted elements. For instance, the
-  /// std::vector may invalidate the elements by reallocating the internal
-  /// array if there is not enough space on new insertions.
-  std::deque<StreamSlotTy> Slots;
-
-  /// The next available slot on the queue. This is reset to zero each time the
-  /// stream is synchronized. It also indicates the current number of consumed
-  /// slots at a given time.
-  uint32_t NextSlot;
-
-  /// The synchronization id. This number is increased each time the stream is
-  /// synchronized. It is useful to detect if an AMDGPUEventTy points to an
-  /// operation that was already finalized in a previous stream sycnhronize.
-  uint32_t SyncCycle;
-
-  /// Mutex to protect stream's management.
-  mutable std::mutex Mutex;
-
-  /// Return the current number of asychronous operations on the stream.
-  uint32_t size() const { return NextSlot; }
-
-  /// Return the last valid slot on the stream.
-  uint32_t last() const { return size() - 1; }
-
-  /// Consume one slot from the stream. Since the stream uses signals on demand
-  /// and releases them once the slot is no longer used, the function requires
-  /// an idle signal for the new consumed slot.
-  std::pair<uint32_t, AMDGPUSignalTy *> consume(AMDGPUSignalTy *OutputSignal) {
-    // Double the stream size if needed. Since we use std::deque, this operation
-    // does not invalidate the already added slots.
-    if (Slots.size() == NextSlot)
-      Slots.resize(Slots.size() * 2);
-
-    // Update the next available slot and the stream size.
-    uint32_t Curr = NextSlot++;
-
-    // Retrieve the input signal, if any, of the current operation.
-    AMDGPUSignalTy *InputSignal = (Curr > 0) ? Slots[Curr - 1].Signal : nullptr;
-
-    // Set the output signal of the current slot.
-    Slots[Curr].Signal = OutputSignal;
-
-    return std::make_pair(Curr, InputSignal);
-  }
-
-  /// Complete all pending post actions and reset the stream after synchronizing
-  /// or positively querying the stream.
-  Error complete() {
-    for (uint32_t Slot = 0; Slot < NextSlot; ++Slot) {
-      // Take the post action of the operation if any.
-      if (auto Err = Slots[Slot].performAction())
-        return Err;
-
-      // Release the slot's signal if possible. Otherwise, another user will.
-      if (Slots[Slot].Signal->decreaseUseCount())
-        SignalManager.returnResource(Slots[Slot].Signal);
-
-      Slots[Slot].Signal = nullptr;
-    }
-
-    // Reset the stream slots to zero.
-    NextSlot = 0;
-
-    // Increase the synchronization id since the stream completed a sync cycle.
-    SyncCycle += 1;
-
-    return Plugin::success();
-  }
-
-  /// Make the current stream wait on a specific operation of another stream.
-  /// The idea is to make the current stream waiting on two signals: 1) the last
-  /// signal of the current stream, and 2) the last signal of the other stream.
-  /// Use a barrier packet with two input signals.
-  Error waitOnStreamOperation(AMDGPUStreamTy &OtherStream, uint32_t Slot) {
-    /// The signal that we must wait from the other stream.
-    AMDGPUSignalTy *OtherSignal = OtherStream.Slots[Slot].Signal;
-
-    // Prevent the release of the other stream's signal.
-    OtherSignal->increaseUseCount();
-
-    // Retrieve an available signal for the operation's output.
-    AMDGPUSignalTy *OutputSignal = SignalManager.getResource();
-    OutputSignal->reset();
-    OutputSignal->increaseUseCount();
-
-    // Consume stream slot and compute dependencies.
-    auto [Curr, InputSignal] = consume(OutputSignal);
-
-    // Setup the post action to release the signal.
-    if (auto Err = Slots[Curr].schedReleaseSignal(OtherSignal, &SignalManager))
-      return Err;
-
-    // Push a barrier into the queue with both input signals.
-    return Queue.pushBarrier(OutputSignal, InputSignal, OtherSignal);
-  }
-
-  /// Callback for running a specific asynchronous operation. This callback is
-  /// used for hsa_amd_signal_async_handler. The argument is the operation that
-  /// should be executed. Notice we use the post action mechanism to codify the
-  /// asynchronous operation.
-  static bool asyncActionCallback(hsa_signal_value_t Value, void *Args) {
-    StreamSlotTy *Slot = reinterpret_cast<StreamSlotTy *>(Args);
-    assert(Slot && "Invalid slot");
-    assert(Slot->Signal && "Invalid signal");
-
-    // This thread is outside the stream mutex. Make sure the thread sees the
-    // changes on the slot.
-    std::atomic_thread_fence(std::memory_order_acquire);
-
-    // Peform the operation.
-    if (auto Err = Slot->performAction())
-      FATAL_MESSAGE(1, "Error peforming post action: %s",
-                    toString(std::move(Err)).data());
-
-    // Signal the output signal to notify the asycnhronous operation finalized.
-    Slot->Signal->signal();
-
-    // Unregister callback.
-    return false;
-  }
-
-  // Callback for host-to-host memory copies.
-  static Error memcpyAction(void *Data) {
-    MemcpyArgsTy *Args = reinterpret_cast<MemcpyArgsTy *>(Data);
-    assert(Args && "Invalid arguments");
-    assert(Args->Dst && "Invalid destination buffer");
-    assert(Args->Src && "Invalid source buffer");
-
-    std::memcpy(Args->Dst, Args->Src, Args->Size);
-
-    return Plugin::success();
-  }
-
-  // Callback for releasing a memory buffer to a memory manager.
-  static Error releaseBufferAction(void *Data) {
-    ReleaseBufferArgsTy *Args = reinterpret_cast<ReleaseBufferArgsTy *>(Data);
-    assert(Args && "Invalid arguments");
-    assert(Args->MemoryManager && "Invalid memory manager");
-    assert(Args->Buffer && "Invalid buffer");
-
-    // Release the allocation to the memory manager.
-    return Args->MemoryManager->deallocate(Args->Buffer);
-  }
-
-  static Error releaseSignalAction(void *Data) {
-    ReleaseSignalArgsTy *Args = reinterpret_cast<ReleaseSignalArgsTy *>(Data);
-    assert(Args && "Invalid arguments");
-    assert(Args->Signal && "Invalid signal");
-    assert(Args->SignalManager && "Invalid signal manager");
-
-    // Release the signal if needed.
-    if (Args->Signal->decreaseUseCount())
-      Args->SignalManager->returnResource(Args->Signal);
-
-    return Plugin::success();
-  }
-
-public:
-  /// Create an empty stream associated with a specific device.
-  AMDGPUStreamTy(AMDGPUDeviceTy &Device);
-
-  /// Intialize the stream's signals.
-  Error init() { return Plugin::success(); }
-
-  /// Deinitialize the stream's signals.
-  Error deinit() { return Plugin::success(); }
-
-  /// Push a asynchronous kernel to the stream. The kernel arguments must be
-  /// placed in a special allocation for kernel args and must keep alive until
-  /// the kernel finalizes. Once the kernel is finished, the stream will release
-  /// the kernel args buffer to the specified memory manager.
-  Error pushKernelLaunch(const AMDGPUKernelTy &Kernel, void *KernelArgs,
-                         uint32_t NumThreads, uint64_t NumBlocks,
-                         AMDGPUMemoryManagerTy &MemoryManager) {
-    // Retrieve an available signal for the operation's output.
-    AMDGPUSignalTy *OutputSignal = SignalManager.getResource();
-    OutputSignal->reset();
-    OutputSignal->increaseUseCount();
-
-    std::lock_guard<std::mutex> StreamLock(Mutex);
-
-    // Consume stream slot and compute dependencies.
-    auto [Curr, InputSignal] = consume(OutputSignal);
-
-    // Avoid defining the input dependency if already satisfied.
-    if (InputSignal && !InputSignal->load())
-      InputSignal = nullptr;
-
-    // Setup the post action to release the kernel args buffer.
-    if (auto Err = Slots[Curr].schedReleaseBuffer(KernelArgs, MemoryManager))
-      return Err;
-
-    // Push the kernel with the output signal and an input signal (optional)
-    return Queue.pushKernelLaunch(Kernel, KernelArgs, NumThreads, NumBlocks,
-                                  OutputSignal, InputSignal);
-  }
-
-  /// Push an asynchronous memory copy between pinned memory buffers.
-  Error pushPinnedMemoryCopyAsync(void *Dst, const void *Src,
-                                  uint64_t CopySize) {
-    // Retrieve an available signal for the operation's output.
-    AMDGPUSignalTy *OutputSignal = SignalManager.getResource();
-    OutputSignal->reset();
-    OutputSignal->increaseUseCount();
-
-    std::lock_guard<std::mutex> Lock(Mutex);
-
-    // Consume stream slot and compute dependencies.
-    auto [Curr, InputSignal] = consume(OutputSignal);
-
-    // Avoid defining the input dependency if already satisfied.
-    if (InputSignal && !InputSignal->load())
-      InputSignal = nullptr;
-
-    // Issue the async memory copy.
-    hsa_status_t Status;
-    if (InputSignal) {
-      hsa_signal_t InputSignalRaw = InputSignal->get();
-      Status = hsa_amd_memory_async_copy(Dst, Agent, Src, Agent, CopySize, 1,
-                                         &InputSignalRaw, OutputSignal->get());
-    } else
-      Status = hsa_amd_memory_async_copy(Dst, Agent, Src, Agent, CopySize, 0,
-                                         nullptr, OutputSignal->get());
-    return Plugin::check(Status, "Error in hsa_amd_memory_async_copy: %s");
-  }
-
-  /// Push an asynchronous memory copy device-to-host involving an unpinned
-  /// memory buffer. The operation consists of a two-step copy from the
-  /// device buffer to an intermediate pinned host buffer, and then, to a
-  /// unpinned host buffer. Both operations are asynchronous and dependant.
-  /// The intermediate pinned buffer will be released to the specified memory
-  /// manager once the operation completes.
-  Error pushMemoryCopyD2HAsync(void *Dst, const void *Src, void *Inter,
-                               uint64_t CopySize,
-                               AMDGPUMemoryManagerTy &MemoryManager) {
-    // TODO: Managers should define a function to retrieve multiple resources
-    // in a single call.
-    // Retrieve available signals for the operation's outputs.
-    AMDGPUSignalTy *OutputSignal1 = SignalManager.getResource();
-    AMDGPUSignalTy *OutputSignal2 = SignalManager.getResource();
-    OutputSignal1->reset();
-    OutputSignal2->reset();
-    OutputSignal1->increaseUseCount();
-    OutputSignal2->increaseUseCount();
-
-    std::lock_guard<std::mutex> Lock(Mutex);
-
-    // Consume stream slot and compute dependencies.
-    auto [Curr, InputSignal] = consume(OutputSignal1);
-
-    // Avoid defining the input dependency if already satisfied.
-    if (InputSignal && !InputSignal->load())
-      InputSignal = nullptr;
-
-    // Setup the post action for releasing the intermediate buffer.
-    if (auto Err = Slots[Curr].schedReleaseBuffer(Inter, MemoryManager))
-      return Err;
-
-    // Issue the first step: device to host transfer. Avoid defining the input
-    // dependency if already satisfied.
-    hsa_status_t Status;
-    if (InputSignal) {
-      hsa_signal_t InputSignalRaw = InputSignal->get();
-      Status = hsa_amd_memory_async_copy(Inter, Agent, Src, Agent, CopySize, 1,
-                                         &InputSignalRaw, OutputSignal1->get());
-    } else {
-      Status = hsa_amd_memory_async_copy(Inter, Agent, Src, Agent, CopySize, 0,
-                                         nullptr, OutputSignal1->get());
-    }
-
-    if (auto Err =
-            Plugin::check(Status, "Error in hsa_amd_memory_async_copy: %s"))
-      return Err;
-
-    // Consume another stream slot and compute dependencies.
-    std::tie(Curr, InputSignal) = consume(OutputSignal2);
-    assert(InputSignal && "Invalid input signal");
-
-    // The std::memcpy is done asynchronously using an async handler. We store
-    // the function's information in the action but it's not actually an action.
-    if (auto Err = Slots[Curr].schedHostMemoryCopy(Dst, Inter, CopySize))
-      return Err;
-
-    // Make changes on this slot visible to the async handler's thread.
-    std::atomic_thread_fence(std::memory_order_release);
-
-    // Issue the second step: host to host transfer.
-    Status = hsa_amd_signal_async_handler(
-        InputSignal->get(), HSA_SIGNAL_CONDITION_EQ, 0, asyncActionCallback,
-        (void *)&Slots[Curr]);
-
-    return Plugin::check(Status, "Error in hsa_amd_signal_async_handler: %s");
-  }
-
-  /// Push an asynchronous memory copy host-to-device involving an unpinned
-  /// memory buffer. The operation consists of a two-step copy from the
-  /// unpinned host buffer to an intermediate pinned host buffer, and then, to
-  /// the pinned host buffer. Both operations are asynchronous and dependant.
-  /// The intermediate pinned buffer will be released to the specified memory
-  /// manager once the operation completes.
-  Error pushMemoryCopyH2DAsync(void *Dst, const void *Src, void *Inter,
-                               uint64_t CopySize,
-                               AMDGPUMemoryManagerTy &MemoryManager) {
-    // Retrieve available signals for the operation's outputs.
-    AMDGPUSignalTy *OutputSignal1 = SignalManager.getResource();
-    AMDGPUSignalTy *OutputSignal2 = SignalManager.getResource();
-    OutputSignal1->reset();
-    OutputSignal2->reset();
-    OutputSignal1->increaseUseCount();
-    OutputSignal2->increaseUseCount();
-
-    AMDGPUSignalTy *OutputSignal = OutputSignal1;
-
-    std::lock_guard<std::mutex> Lock(Mutex);
-
-    // Consume stream slot and compute dependencies.
-    auto [Curr, InputSignal] = consume(OutputSignal);
-
-    // Avoid defining the input dependency if already satisfied.
-    if (InputSignal && !InputSignal->load())
-      InputSignal = nullptr;
-
-    // Issue the first step: host to host transfer.
-    if (InputSignal) {
-      // The std::memcpy is done asynchronously using an async handler. We store
-      // the function's information in the action but it is not actually a
-      // post action.
-      if (auto Err = Slots[Curr].schedHostMemoryCopy(Inter, Src, CopySize))
-        return Err;
-
-      // Make changes on this slot visible to the async handler's thread.
-      std::atomic_thread_fence(std::memory_order_release);
-
-      hsa_status_t Status = hsa_amd_signal_async_handler(
-          InputSignal->get(), HSA_SIGNAL_CONDITION_EQ, 0, asyncActionCallback,
-          (void *)&Slots[Curr]);
-
-      if (auto Err = Plugin::check(Status,
-                                   "Error in hsa_amd_signal_async_handler: %s"))
-        return Err;
-
-      // Let's use now the second output signal.
-      OutputSignal = OutputSignal2;
-
-      // Consume another stream slot and compute dependencies.
-      std::tie(Curr, InputSignal) = consume(OutputSignal);
-    } else {
-      // All preceding operations completed, copy the memory synchronously.
-      std::memcpy(Inter, Src, CopySize);
-
-      // Return the second signal because it will not be used.
-      OutputSignal2->decreaseUseCount();
-      SignalManager.returnResource(OutputSignal2);
-    }
-
-    // Setup the post action to release the intermediate pinned buffer.
-    if (auto Err = Slots[Curr].schedReleaseBuffer(Inter, MemoryManager))
-      return Err;
-
-    // Issue the second step: host to device transfer. Avoid defining the input
-    // dependency if already satisfied.
-    hsa_status_t Status;
-    if (InputSignal && InputSignal->load()) {
-      hsa_signal_t InputSignalRaw = InputSignal->get();
-      Status = hsa_amd_memory_async_copy(Dst, Agent, Inter, Agent, CopySize, 1,
-                                         &InputSignalRaw, OutputSignal->get());
-    } else
-      Status = hsa_amd_memory_async_copy(Dst, Agent, Inter, Agent, CopySize, 0,
-                                         nullptr, OutputSignal->get());
-
-    return Plugin::check(Status, "Error in hsa_amd_memory_async_copy: %s");
-  }
-
-  /// Synchronize with the stream. The current thread waits until all operations
-  /// are finalized and it performs the pending post actions (i.e., releasing
-  /// intermediate buffers).
-  Error synchronize() {
-    std::lock_guard<std::mutex> Lock(Mutex);
-
-    // No need to synchronize anything.
-    if (size() == 0)
-      return Plugin::success();
-
-    // Wait until all previous operations on the stream have completed.
-    if (auto Err = Slots[last()].Signal->wait())
-      return Err;
-
-    // Reset the stream and perform all pending post actions.
-    return complete();
-  }
-
-  /// Query the stream and complete pending post actions if operations finished.
-  /// Return whether all the operations completed. This operation does not block
-  /// the calling thread.
-  Expected<bool> query() {
-    std::lock_guard<std::mutex> Lock(Mutex);
-
-    // No need to query anything.
-    if (size() == 0)
-      return true;
-
-    // The last operation did not complete yet. Return directly.
-    if (Slots[last()].Signal->load())
-      return false;
-
-    // Reset the stream and perform all pending post actions.
-    if (auto Err = complete())
-      return std::move(Err);
-
-    return true;
-  }
-
-  /// Record the state of the stream on an event.
-  Error recordEvent(AMDGPUEventTy &Event) const;
-
-  /// Make the stream wait on an event.
-  Error waitEvent(const AMDGPUEventTy &Event);
-};
-
-/// Class representing an event on AMDGPU. The event basically stores some
-/// information regarding the state of the recorded stream.
-struct AMDGPUEventTy {
-  /// Create an empty event.
-  AMDGPUEventTy(AMDGPUDeviceTy &Device)
-      : RecordedStream(nullptr), RecordedSlot(-1), RecordedSyncCycle(-1) {}
-
-  /// Initialize and deinitialize.
-  Error init() { return Plugin::success(); }
-  Error deinit() { return Plugin::success(); }
-
-  /// Record the state of a stream on the event.
-  Error record(AMDGPUStreamTy &Stream) {
-    std::lock_guard<std::mutex> Lock(Mutex);
-
-    // Ignore the last recorded stream.
-    RecordedStream = &Stream;
-
-    return Stream.recordEvent(*this);
-  }
-
-  /// Make a stream wait on the current event.
-  Error wait(AMDGPUStreamTy &Stream) {
-    std::lock_guard<std::mutex> Lock(Mutex);
-
-    if (!RecordedStream)
-      return Plugin::error("Event does not have any recorded stream");
-
-    // Synchronizing the same stream. Do nothing.
-    if (RecordedStream == &Stream)
-      return Plugin::success();
-
-    // No need to wait anything, the recorded stream already finished the
-    // corresponding operation.
-    if (RecordedSlot < 0)
-      return Plugin::success();
-
-    return Stream.waitEvent(*this);
-  }
-
-protected:
-  /// The stream registered in this event.
-  AMDGPUStreamTy *RecordedStream;
-
-  /// The recordered operation on the recorded stream.
-  int64_t RecordedSlot;
-
-  /// The sync cycle when the stream was recorded. Used to detect stale events.
-  int64_t RecordedSyncCycle;
-
-  /// Mutex to safely access event fields.
-  mutable std::mutex Mutex;
-
-  friend struct AMDGPUStreamTy;
-};
-
-Error AMDGPUStreamTy::recordEvent(AMDGPUEventTy &Event) const {
-  std::lock_guard<std::mutex> Lock(Mutex);
-
-  if (size() > 0) {
-    // Record the synchronize identifier (to detect stale recordings) and
-    // the last valid stream's operation.
-    Event.RecordedSyncCycle = SyncCycle;
-    Event.RecordedSlot = last();
-
-    assert(Event.RecordedSyncCycle >= 0 && "Invalid recorded sync cycle");
-    assert(Event.RecordedSlot >= 0 && "Invalid recorded slot");
-  } else {
-    // The stream is empty, everything already completed, record nothing.
-    Event.RecordedSyncCycle = -1;
-    Event.RecordedSlot = -1;
-  }
-  return Plugin::success();
-}
-
-Error AMDGPUStreamTy::waitEvent(const AMDGPUEventTy &Event) {
-  // Retrieve the recorded stream on the event.
-  AMDGPUStreamTy &RecordedStream = *Event.RecordedStream;
-
-  std::scoped_lock<std::mutex, std::mutex> Lock(Mutex, RecordedStream.Mutex);
-
-  // The recorded stream already completed the operation because the synchronize
-  // identifier is already outdated.
-  if (RecordedStream.SyncCycle != (uint32_t)Event.RecordedSyncCycle)
-    return Plugin::success();
-
-  // Again, the recorded stream already completed the operation, the last
-  // operation's output signal is satisfied.
-  if (!RecordedStream.Slots[Event.RecordedSlot].Signal->load())
-    return Plugin::success();
-
-  // Otherwise, make the current stream wait on the other stream's operation.
-  return waitOnStreamOperation(RecordedStream, Event.RecordedSlot);
-}
-
-/// Abstract class that holds the common members of the actual kernel devices
-/// and the host device. Both types should inherit from this class.
-struct AMDGenericDeviceTy {
-  AMDGenericDeviceTy() {}
-
-  virtual ~AMDGenericDeviceTy() {}
-
-  /// Create all memory pools which the device has access to and classify them.
-  Error initMemoryPools() {
-    // Retrieve all memory pools from the device agent(s).
-    Error Err = retrieveAllMemoryPools();
-    if (Err)
-      return Err;
-
-    for (AMDGPUMemoryPoolTy *MemoryPool : AllMemoryPools) {
-      // Initialize the memory pool and retrieve some basic info.
-      Error Err = MemoryPool->init();
-      if (Err)
-        return Err;
-
-      if (!MemoryPool->isGlobal())
-        continue;
-
-      // Classify the memory pools depending on their properties.
-      if (MemoryPool->isFineGrained()) {
-        FineGrainedMemoryPools.push_back(MemoryPool);
-        if (MemoryPool->supportsKernelArgs())
-          ArgsMemoryPools.push_back(MemoryPool);
-      } else if (MemoryPool->isCoarseGrained()) {
-        CoarseGrainedMemoryPools.push_back(MemoryPool);
-      }
-    }
-    return Plugin::success();
-  }
-
-  /// Destroy all memory pools.
-  Error deinitMemoryPools() {
-    for (AMDGPUMemoryPoolTy *Pool : AllMemoryPools)
-      delete Pool;
-
-    AllMemoryPools.clear();
-    FineGrainedMemoryPools.clear();
-    CoarseGrainedMemoryPools.clear();
-    ArgsMemoryPools.clear();
-
-    return Plugin::success();
-  }
-
-  /// Retrieve and construct all memory pools from the device agent(s).
-  virtual Error retrieveAllMemoryPools() = 0;
-
-  /// Get the device agent.
-  virtual hsa_agent_t getAgent() const = 0;
-
-protected:
-  /// Array of all memory pools available to the host agents.
-  llvm::SmallVector<AMDGPUMemoryPoolTy *> AllMemoryPools;
-
-  /// Array of fine-grained memory pools available to the host agents.
-  llvm::SmallVector<AMDGPUMemoryPoolTy *> FineGrainedMemoryPools;
-
-  /// Array of coarse-grained memory pools available to the host agents.
-  llvm::SmallVector<AMDGPUMemoryPoolTy *> CoarseGrainedMemoryPools;
-
-  /// Array of kernel args memory pools available to the host agents.
-  llvm::SmallVector<AMDGPUMemoryPoolTy *> ArgsMemoryPools;
-};
-
-/// Class representing the host device. This host device may have more than one
-/// HSA host agent. We aggregate all its resources into the same instance.
-struct AMDHostDeviceTy : public AMDGenericDeviceTy {
-  /// Create a host device from an array of host agents.
-  AMDHostDeviceTy(const llvm::SmallVector<hsa_agent_t> &HostAgents)
-      : AMDGenericDeviceTy(), Agents(HostAgents), ArgsMemoryManager(),
-        PinnedMemoryManager() {
-    assert(HostAgents.size() && "No host agent found");
-  }
-
-  /// Initialize the host device memory pools and the memory managers for
-  /// kernel args and host pinned memory allocations.
-  Error init() {
-    if (auto Err = initMemoryPools())
-      return Err;
-
-    if (auto Err = ArgsMemoryManager.init(getArgsMemoryPool()))
-      return Err;
-
-    if (auto Err = PinnedMemoryManager.init(getHostMemoryPool()))
-      return Err;
-
-    return Plugin::success();
-  }
-
-  /// Deinitialize memory pools and managers.
-  Error deinit() {
-    if (auto Err = deinitMemoryPools())
-      return Err;
-
-    if (auto Err = ArgsMemoryManager.deinit())
-      return Err;
-
-    if (auto Err = PinnedMemoryManager.deinit())
-      return Err;
-
-    return Plugin::success();
-  }
-
-  /// Retrieve and construct all memory pools from the host agents.
-  Error retrieveAllMemoryPools() override {
-    // Iterate through the available pools across the host agents.
-    for (hsa_agent_t Agent : Agents) {
-      Error Err = utils::iterateAgentMemoryPools(
-          Agent, [&](hsa_amd_memory_pool_t HSAMemoryPool) {
-            AMDGPUMemoryPoolTy *MemoryPool =
-                new AMDGPUMemoryPoolTy(HSAMemoryPool);
-            AllMemoryPools.push_back(MemoryPool);
-            return HSA_STATUS_SUCCESS;
-          });
-      if (Err)
-        return Err;
-    }
-    return Plugin::success();
-  }
-
-  /// Get one of the host agents. Return always the first agent.
-  hsa_agent_t getAgent() const override { return Agents[0]; }
-
-  /// Get a memory pool for host pinned allocations.
-  AMDGPUMemoryPoolTy &getHostMemoryPool() {
-    assert(!FineGrainedMemoryPools.empty() && "No fine-grained mempool");
-    // Retrive any memory pool.
-    return *FineGrainedMemoryPools[0];
-  }
-
-  /// Get a memory pool for kernel args allocations.
-  AMDGPUMemoryPoolTy &getArgsMemoryPool() {
-    assert(!ArgsMemoryPools.empty() && "No kernelargs mempool");
-    // Retrieve any memory pool.
-    return *ArgsMemoryPools[0];
-  }
-
-  /// Getters for kernel args and host pinned memory managers.
-  AMDGPUMemoryManagerTy &getArgsMemoryManager() { return ArgsMemoryManager; }
-  AMDGPUMemoryManagerTy &getPinnedMemoryManager() {
-    return PinnedMemoryManager;
-  }
-
-private:
-  /// Array of agents on the host side.
-  const llvm::SmallVector<hsa_agent_t> Agents;
-
-  // Memory manager for kernel arguments.
-  AMDGPUMemoryManagerTy ArgsMemoryManager;
-
-  // Memory manager for pinned memory.
-  AMDGPUMemoryManagerTy PinnedMemoryManager;
-};
-
-/// Class implementing the AMDGPU device functionalities which derives from the
-/// generic device class.
-struct AMDGPUDeviceTy : public GenericDeviceTy, AMDGenericDeviceTy {
-  // Create an AMDGPU device with a device id and default AMDGPU grid values.
-  AMDGPUDeviceTy(int32_t DeviceId, int32_t NumDevices,
-                 AMDHostDeviceTy &HostDevice, hsa_agent_t Agent)
-      : GenericDeviceTy(DeviceId, NumDevices, {0}), AMDGenericDeviceTy(),
-        OMPX_NumQueues("LIBOMPTARGET_AMDGPU_NUM_HSA_QUEUES", 8),
-        OMPX_QueueSize("LIBOMPTARGET_AMDGPU_HSA_QUEUE_SIZE", 1024),
-        OMPX_MaxAsyncCopyBytes("LIBOMPTARGET_AMDGPU_MAX_ASYNC_COPY_BYTES",
-                               1 * 1024 * 1024), // 1MB
-        OMPX_InitialNumSignals("LIBOMPTARGET_AMDGPU_NUM_INITIAL_HSA_SIGNALS",
-                               64),
-        AMDGPUStreamManager(*this), AMDGPUEventManager(*this),
-        AMDGPUSignalManager(*this), Agent(Agent), HostDevice(HostDevice),
-        Queues() {}
-
-  ~AMDGPUDeviceTy() {}
-
-  /// Initialize the device, its resources and get its properties.
-  Error initImpl(GenericPluginTy &Plugin) override {
-    // First setup all the memory pools.
-    if (auto Err = initMemoryPools())
-      return Err;
-
-    // Get the wavefront size.
-    uint32_t WavefrontSize = 0;
-    if (auto Err = getDeviceAttr(HSA_AGENT_INFO_WAVEFRONT_SIZE, WavefrontSize))
-      return Err;
-    GridValues.GV_Warp_Size = WavefrontSize;
-
-    // Load the grid values dependending on the wavefront.
-    if (WavefrontSize == 32)
-      GridValues = getAMDGPUGridValues<32>();
-    else if (WavefrontSize == 64)
-      GridValues = getAMDGPUGridValues<64>();
-    else
-      return Plugin::error("Unexpected AMDGPU wavefront %d", WavefrontSize);
-
-    // Get maximum number of workitems per workgroup.
-    uint16_t WorkgroupMaxDim[3];
-    if (auto Err =
-            getDeviceAttr(HSA_AGENT_INFO_WORKGROUP_MAX_DIM, WorkgroupMaxDim))
-      return Err;
-    GridValues.GV_Max_WG_Size = WorkgroupMaxDim[0];
-
-    // Get maximum number of workgroups.
-    hsa_dim3_t GridMaxDim;
-    if (auto Err = getDeviceAttr(HSA_AGENT_INFO_GRID_MAX_DIM, GridMaxDim))
-      return Err;
-    GridValues.GV_Max_Teams = GridMaxDim.x / GridValues.GV_Max_WG_Size;
-    if (GridValues.GV_Max_Teams == 0)
-      return Plugin::error("Maximum number of teams cannot be zero");
-
-    // Get maximum size of any device queues and maximum number of queues.
-    uint32_t MaxQueueSize;
-    if (auto Err = getDeviceAttr(HSA_AGENT_INFO_QUEUE_MAX_SIZE, MaxQueueSize))
-      return Err;
-
-    uint32_t MaxQueues;
-    if (auto Err = getDeviceAttr(HSA_AGENT_INFO_QUEUES_MAX, MaxQueues))
-      return Err;
-
-    // Compute the number of queues and their size.
-    const uint32_t NumQueues = std::min(OMPX_NumQueues.get(), MaxQueues);
-    const uint32_t QueueSize = std::min(OMPX_QueueSize.get(), MaxQueueSize);
-
-    // Construct and initialize each device queue.
-    Queues = std::vector<AMDGPUQueueTy>(NumQueues);
-    for (AMDGPUQueueTy &Queue : Queues)
-      if (auto Err = Queue.init(Agent, QueueSize))
-        return Err;
-
-    // Initialize stream pool.
-    if (auto Err = AMDGPUStreamManager.init(OMPX_InitialNumStreams))
-      return Err;
-
-    // Initialize event pool.
-    if (auto Err = AMDGPUEventManager.init(OMPX_InitialNumEvents))
-      return Err;
-
-    // Initialize signal pool.
-    if (auto Err = AMDGPUSignalManager.init(OMPX_InitialNumSignals))
-      return Err;
-
-    return Plugin::success();
-  }
-
-  /// Deinitialize the device and release its resources.
-  Error deinitImpl() override {
-    // Deinitialize the stream and event pools.
-    if (auto Err = AMDGPUStreamManager.deinit())
-      return Err;
-
-    if (auto Err = AMDGPUEventManager.deinit())
-      return Err;
-
-    if (auto Err = AMDGPUSignalManager.deinit())
-      return Err;
-
-    // Close modules if necessary.
-    if (!LoadedImages.empty()) {
-      // Each image has its own module.
-      for (DeviceImageTy *Image : LoadedImages) {
-        AMDGPUDeviceImageTy &AMDImage =
-            static_cast<AMDGPUDeviceImageTy &>(*Image);
-
-        // Unload the executable of the image.
-        if (auto Err = AMDImage.unloadExecutable())
-          return Err;
-      }
-    }
-
-    for (AMDGPUQueueTy &Queue : Queues) {
-      if (auto Err = Queue.deinit())
-        return Err;
-    }
-
-    // Invalidate agent reference.
-    Agent = {0};
-
-    return Plugin::success();
-  }
-
-  /// Allocate and construct an AMDGPU kernel.
-  Expected<GenericKernelTy *>
-  constructKernelEntry(const __tgt_offload_entry &KernelEntry,
-                       DeviceImageTy &Image) override {
-    // Create a metadata object for the exec mode global (auto-generated).
-    StaticGlobalTy<llvm::omp::OMPTgtExecModeFlags> ExecModeGlobal(
-        KernelEntry.name, "_exec_mode");
-
-    // Retrieve execution mode for the kernel. This may fail since some kernels
-    // may not have a execution mode.
-    GenericGlobalHandlerTy &GHandler = Plugin::get().getGlobalHandler();
-    if (auto Err = GHandler.readGlobalFromImage(*this, Image, ExecModeGlobal)) {
-      DP("Failed to read execution mode for '%s': %s\n"
-         "Using default GENERIC (1) execution mode\n",
-         KernelEntry.name, toString(std::move(Err)).data());
-      // Consume the error since it is acceptable to fail.
-      consumeError(std::move(Err));
-      // In some cases the execution mode is not included, so use the default.
-      ExecModeGlobal.setValue(llvm::omp::OMP_TGT_EXEC_MODE_GENERIC);
-    }
-
-    // Check that the retrieved execution mode is valid.
-    if (!GenericKernelTy::isValidExecutionMode(ExecModeGlobal.getValue()))
-      return Plugin::error("Invalid execution mode %d for '%s'",
-                           ExecModeGlobal.getValue(), KernelEntry.name);
-
-    // Allocate and initialize the AMDGPU kernel.
-    AMDGPUKernelTy *AMDKernel = Plugin::get().allocate<AMDGPUKernelTy>();
-    new (AMDKernel) AMDGPUKernelTy(KernelEntry.name, ExecModeGlobal.getValue());
-
-    return AMDKernel;
-  }
-
-  /// Set the current context to this device's context. Do nothing since the
-  /// AMDGPU devices do not have the concept of contexts.
-  Error setContext() override { return Plugin::success(); }
-
-  /// Get the stream of the asynchronous info sructure or get a new one.
-  AMDGPUStreamTy &getStream(AsyncInfoWrapperTy &AsyncInfoWrapper) {
-    AMDGPUStreamTy *&Stream = AsyncInfoWrapper.getQueueAs<AMDGPUStreamTy *>();
-    if (!Stream)
-      Stream = AMDGPUStreamManager.getResource();
-    return *Stream;
-  }
-
-  /// Load the binary image into the device and allocate an image object.
-  Expected<DeviceImageTy *> loadBinaryImpl(const __tgt_device_image *TgtImage,
-                                           int32_t ImageId) override {
-    // Allocate and initialize the image object.
-    AMDGPUDeviceImageTy *AMDImage =
-        Plugin::get().allocate<AMDGPUDeviceImageTy>();
-    new (AMDImage) AMDGPUDeviceImageTy(ImageId, TgtImage);
-
-    // Load the HSA executable.
-    if (Error Err = AMDImage->loadExecutable(*this))
-      return std::move(Err);
-
-    return AMDImage;
-  }
-
-  /// Allocate memory on the device or related to the device.
-  void *allocate(size_t Size, void *, TargetAllocTy Kind) override;
-
-  /// Deallocate memory on the device or related to the device.
-  int free(void *TgtPtr, TargetAllocTy Kind) override {
-    if (TgtPtr == nullptr)
-      return OFFLOAD_SUCCESS;
-
-    AMDGPUMemoryPoolTy *MemoryPool = nullptr;
-    switch (Kind) {
-    case TARGET_ALLOC_DEFAULT:
-    case TARGET_ALLOC_DEVICE:
-      MemoryPool = CoarseGrainedMemoryPools[0];
-      break;
-    case TARGET_ALLOC_HOST:
-      MemoryPool = &HostDevice.getHostMemoryPool();
-      break;
-    case TARGET_ALLOC_SHARED:
-      // TODO: Not supported yet. We could look at fine-grained host memory
-      // pools that are accessible by this device. The allocation should be made
-      // explicitly accessible if it is not yet.
-      break;
-    }
-
-    if (!MemoryPool) {
-      REPORT("No memory pool for the specified allocation kind\n");
-      return OFFLOAD_FAIL;
-    }
-
-    if (Error Err = MemoryPool->deallocate(TgtPtr)) {
-      REPORT("%s\n", toString(std::move(Err)).data());
-      return OFFLOAD_FAIL;
-    }
-
-    if (Kind == TARGET_ALLOC_HOST) {
-      std::lock_guard<std::shared_mutex> Lock(HostAllocationsMutex);
-      size_t Erased = HostAllocations.erase(TgtPtr);
-      if (!Erased) {
-        REPORT("Cannot find a host allocation in the map\n");
-        return OFFLOAD_FAIL;
-      }
-    }
-
-    return OFFLOAD_SUCCESS;
-  }
-
-  /// Synchronize current thread with the pending operations on the async info.
-  Error synchronizeImpl(__tgt_async_info &AsyncInfo) override {
-    AMDGPUStreamTy *Stream =
-        reinterpret_cast<AMDGPUStreamTy *>(AsyncInfo.Queue);
-    assert(Stream && "Invalid stream");
-
-    if (auto Err = Stream->synchronize())
-      return Err;
-
-    // Once the stream is synchronized, return it to stream pool and reset
-    // AsyncInfo. This is to make sure the synchronization only works for its
-    // own tasks.
-    AMDGPUStreamManager.returnResource(Stream);
-    AsyncInfo.Queue = nullptr;
-
-    return Plugin::success();
-  }
-
-  /// Query for the completion of the pending operations on the async info.
-  Error queryAsyncImpl(__tgt_async_info &AsyncInfo) override {
-    AMDGPUStreamTy *Stream =
-        reinterpret_cast<AMDGPUStreamTy *>(AsyncInfo.Queue);
-    assert(Stream && "Invalid stream");
-
-    auto CompletedOrErr = Stream->query();
-    if (!CompletedOrErr)
-      return CompletedOrErr.takeError();
-
-    // Return if it the stream did not complete yet.
-    if (!(*CompletedOrErr))
-      return Plugin::success();
-
-    // Once the stream is completed, return it to stream pool and reset
-    // AsyncInfo. This is to make sure the synchronization only works for its
-    // own tasks.
-    AMDGPUStreamManager.returnResource(Stream);
-    AsyncInfo.Queue = nullptr;
-
-    return Plugin::success();
-  }
-
-  /// Submit data to the device (host to device transfer).
-  Error dataSubmitImpl(void *TgtPtr, const void *HstPtr, int64_t Size,
-                       AsyncInfoWrapperTy &AsyncInfoWrapper) override {
-
-    // Use one-step asynchronous operation when host memory is already pinned.
-    if (isHostPinnedMemory(HstPtr)) {
-      AMDGPUStreamTy &Stream = getStream(AsyncInfoWrapper);
-      return Stream.pushPinnedMemoryCopyAsync(TgtPtr, HstPtr, Size);
-    }
-
-    void *PinnedHstPtr = nullptr;
-
-    // For large transfers use synchronous behavior.
-    if (Size >= OMPX_MaxAsyncCopyBytes) {
-      if (AsyncInfoWrapper.hasQueue())
-        if (auto Err = synchronize(AsyncInfoWrapper))
-          return Err;
-
-      hsa_status_t Status;
-      Status = hsa_amd_memory_lock(const_cast<void *>(HstPtr), Size, nullptr, 0,
-                                   &PinnedHstPtr);
-      if (auto Err =
-              Plugin::check(Status, "Error in hsa_amd_memory_lock: %s\n"))
-        return Err;
-
-      AMDGPUSignalTy Signal;
-      if (auto Err = Signal.init())
-        return Err;
-
-      Status = hsa_amd_memory_async_copy(TgtPtr, Agent, PinnedHstPtr, Agent,
-                                         Size, 0, nullptr, Signal.get());
-      if (auto Err =
-              Plugin::check(Status, "Error in hsa_amd_memory_async_copy: %s"))
-        return Err;
-
-      if (auto Err = Signal.wait())
-        return Err;
-
-      if (auto Err = Signal.deinit())
-        return Err;
-
-      Status = hsa_amd_memory_unlock(const_cast<void *>(HstPtr));
-      return Plugin::check(Status, "Error in hsa_amd_memory_unlock: %s\n");
-    }
-
-    // Otherwise, use two-step copy with an intermediate pinned host buffer.
-    AMDGPUMemoryManagerTy &PinnedMemoryManager =
-        HostDevice.getPinnedMemoryManager();
-    if (auto Err = PinnedMemoryManager.allocate(Size, &PinnedHstPtr))
-      return Err;
-
-    AMDGPUStreamTy &Stream = getStream(AsyncInfoWrapper);
-    return Stream.pushMemoryCopyH2DAsync(TgtPtr, HstPtr, PinnedHstPtr, Size,
-                                         PinnedMemoryManager);
-  }
-
-  /// Retrieve data from the device (device to host transfer).
-  Error dataRetrieveImpl(void *HstPtr, const void *TgtPtr, int64_t Size,
-                         AsyncInfoWrapperTy &AsyncInfoWrapper) override {
-    if (isHostPinnedMemory(HstPtr)) {
-      // Use one-step asynchronous operation when host memory is already pinned.
-      AMDGPUStreamTy &Stream = getStream(AsyncInfoWrapper);
-      return Stream.pushPinnedMemoryCopyAsync(HstPtr, TgtPtr, Size);
-    }
-
-    void *PinnedHstPtr = nullptr;
-
-    // For large transfers use synchronous behavior.
-    if (Size >= OMPX_MaxAsyncCopyBytes) {
-      if (AsyncInfoWrapper.hasQueue())
-        if (auto Err = synchronize(AsyncInfoWrapper))
-          return Err;
-
-      hsa_status_t Status;
-      Status = hsa_amd_memory_lock(const_cast<void *>(HstPtr), Size, nullptr, 0,
-                                   &PinnedHstPtr);
-      if (auto Err =
-              Plugin::check(Status, "Error in hsa_amd_memory_lock: %s\n"))
-        return Err;
-
-      AMDGPUSignalTy Signal;
-      if (auto Err = Signal.init())
-        return Err;
-
-      Status = hsa_amd_memory_async_copy(PinnedHstPtr, Agent, TgtPtr, Agent,
-                                         Size, 0, nullptr, Signal.get());
-      if (auto Err =
-              Plugin::check(Status, "Error in hsa_amd_memory_async_copy: %s"))
-        return Err;
-
-      if (auto Err = Signal.wait())
-        return Err;
-
-      if (auto Err = Signal.deinit())
-        return Err;
-
-      Status = hsa_amd_memory_unlock(const_cast<void *>(HstPtr));
-      return Plugin::check(Status, "Error in hsa_amd_memory_unlock: %s\n");
-    }
-
-    // Otherwise, use two-step copy with an intermediate pinned host buffer.
-    AMDGPUMemoryManagerTy &PinnedMemoryManager =
-        HostDevice.getPinnedMemoryManager();
-    if (auto Err = PinnedMemoryManager.allocate(Size, &PinnedHstPtr))
-      return Err;
-
-    AMDGPUStreamTy &Stream = getStream(AsyncInfoWrapper);
-    return Stream.pushMemoryCopyD2HAsync(HstPtr, TgtPtr, PinnedHstPtr, Size,
-                                         PinnedMemoryManager);
-  }
-
-  /// Exchange data between two devices within the plugin. This function is not
-  /// supported in this plugin.
-  Error dataExchangeImpl(const void *SrcPtr, GenericDeviceTy &DstGenericDevice,
-                         void *DstPtr, int64_t Size,
-                         AsyncInfoWrapperTy &AsyncInfoWrapper) override {
-    // This function should never be called because the function
-    // AMDGPUPluginTy::isDataExchangable() returns false.
-    return Plugin::error("dataExchangeImpl not supported");
-  }
-
-  /// Initialize the async info for interoperability purposes.
-  Error initAsyncInfoImpl(AsyncInfoWrapperTy &AsyncInfoWrapper) override {
-    // TODO: Implement this function.
-    return Plugin::success();
-  }
-
-  /// Initialize the device info for interoperability purposes.
-  Error initDeviceInfoImpl(__tgt_device_info *DeviceInfo) override {
-    DeviceInfo->Context = nullptr;
-
-    if (!DeviceInfo->Device)
-      DeviceInfo->Device = reinterpret_cast<void *>(Agent.handle);
-
-    return Plugin::success();
-  }
-
-  /// Create an event.
-  Error createEventImpl(void **EventPtrStorage) override {
-    AMDGPUEventTy **Event = reinterpret_cast<AMDGPUEventTy **>(EventPtrStorage);
-    *Event = AMDGPUEventManager.getResource();
-    return Plugin::success();
-  }
-
-  /// Destroy a previously created event.
-  Error destroyEventImpl(void *EventPtr) override {
-    AMDGPUEventTy *Event = reinterpret_cast<AMDGPUEventTy *>(EventPtr);
-    AMDGPUEventManager.returnResource(Event);
-    return Plugin::success();
-  }
-
-  /// Record the event.
-  Error recordEventImpl(void *EventPtr,
-                        AsyncInfoWrapperTy &AsyncInfoWrapper) override {
-    AMDGPUEventTy *Event = reinterpret_cast<AMDGPUEventTy *>(EventPtr);
-    assert(Event && "Invalid event");
-
-    AMDGPUStreamTy &Stream = getStream(AsyncInfoWrapper);
-
-    return Event->record(Stream);
-  }
-
-  /// Make the stream wait on the event.
-  Error waitEventImpl(void *EventPtr,
-                      AsyncInfoWrapperTy &AsyncInfoWrapper) override {
-    AMDGPUEventTy *Event = reinterpret_cast<AMDGPUEventTy *>(EventPtr);
-
-    AMDGPUStreamTy &Stream = getStream(AsyncInfoWrapper);
-
-    return Event->wait(Stream);
-  }
-
-  /// Synchronize the current thread with the event.
-  Error syncEventImpl(void *EventPtr) override {
-    return Plugin::error("Synchronize event not implemented");
-  }
-
-  /// Print information about the device.
-  Error printInfoImpl() override {
-    // TODO: Implement the basic info.
-    return Plugin::success();
-  }
-
-  /// Getters and setters for stack and heap sizes.
-  Error getDeviceStackSize(uint64_t &Value) override {
-    Value = 0;
-    return Plugin::success();
-  }
-  Error setDeviceStackSize(uint64_t Value) override {
-    return Plugin::success();
-  }
-  Error getDeviceHeapSize(uint64_t &Value) override {
-    Value = 0;
-    return Plugin::success();
-  }
-  Error setDeviceHeapSize(uint64_t Value) override { return Plugin::success(); }
-
-  /// AMDGPU-specific function to get device attributes.
-  template <typename Ty> Error getDeviceAttr(uint32_t Kind, Ty &Value) {
-    hsa_status_t Status =
-        hsa_agent_get_info(Agent, (hsa_agent_info_t)Kind, &Value);
-    return Plugin::check(Status, "Error in hsa_agent_get_info: %s");
-  }
-
-  /// Get the device agent.
-  hsa_agent_t getAgent() const override { return Agent; }
-
-  /// Get the signal manager.
-  AMDGPUSignalManagerTy &getSignalManager() { return AMDGPUSignalManager; }
-
-  /// Retrieve and construct all memory pools of the device agent.
-  Error retrieveAllMemoryPools() override {
-    // Iterate through the available pools of the device agent.
-    return utils::iterateAgentMemoryPools(
-        Agent, [&](hsa_amd_memory_pool_t HSAMemoryPool) {
-          AMDGPUMemoryPoolTy *MemoryPool =
-              Plugin::get().allocate<AMDGPUMemoryPoolTy>();
-          new (MemoryPool) AMDGPUMemoryPoolTy(HSAMemoryPool);
-          AllMemoryPools.push_back(MemoryPool);
-          return HSA_STATUS_SUCCESS;
-        });
-  }
-
-  /// Get the next queue in a round-robin fashion.
-  AMDGPUQueueTy &getNextQueue() {
-    static std::atomic<uint32_t> NextQueue(0);
-
-    uint32_t Current = NextQueue.fetch_add(1, std::memory_order_relaxed);
-    return Queues[Current % Queues.size()];
-  }
-
-  /// Check whether a buffer is a host pinned buffer.
-  bool isHostPinnedMemory(const void *Ptr) const {
-    bool Found = false;
-    HostAllocationsMutex.lock_shared();
-    if (!HostAllocations.empty()) {
-      auto It = HostAllocations.lower_bound((const void *)Ptr);
-      if (It != HostAllocations.end() && It->first == Ptr) {
-        Found = true;
-      } else if (It != HostAllocations.begin()) {
-        --It;
-        Found = ((const char *)It->first + It->second > (const char *)Ptr);
-      }
-    }
-    HostAllocationsMutex.unlock_shared();
-    return Found;
-  }
-
-private:
-  using AMDGPUStreamRef = AMDGPUResourceRef<AMDGPUStreamTy>;
-  using AMDGPUEventRef = AMDGPUResourceRef<AMDGPUEventTy>;
-
-  using AMDGPUStreamManagerTy = GenericDeviceResourceManagerTy<AMDGPUStreamRef>;
-  using AMDGPUEventManagerTy = GenericDeviceResourceManagerTy<AMDGPUEventRef>;
-
-  /// Envar for controlling the number of HSA queues per device. High number of
-  /// queues may degrade performance.
-  UInt32Envar OMPX_NumQueues;
-
-  /// Envar for controlling the size of each HSA queue. The size is the number
-  /// of HSA packets a queue is expected to hold. It is also the number of HSA
-  /// packets that can be pushed into each queue without waiting the driver to
-  /// process them.
-  UInt32Envar OMPX_QueueSize;
-
-  /// Envar specifying the maximum size in bytes where the memory copies are
-  /// asynchronous operations. Up to this transfer size, the memory copies are
-  /// asychronous operations pushed to the corresponding stream. For larger
-  /// transfers, they are synchronous transfers.
-  UInt32Envar OMPX_MaxAsyncCopyBytes;
-
-  /// Envar controlling the initial number of HSA signals per device. There is
-  /// one manager of signals per device managing several pre-allocated signals.
-  /// These signals are mainly used by AMDGPU streams. If needed, more signals
-  /// will be created.
-  UInt32Envar OMPX_InitialNumSignals;
-
-  /// Stream manager for AMDGPU streams.
-  AMDGPUStreamManagerTy AMDGPUStreamManager;
-
-  /// Event manager for AMDGPU events.
-  AMDGPUEventManagerTy AMDGPUEventManager;
-
-  /// Signal manager for AMDGPU signals.
-  AMDGPUSignalManagerTy AMDGPUSignalManager;
-
-  /// The agent handler corresponding to the device.
-  hsa_agent_t Agent;
-
-  /// Reference to the host device.
-  AMDHostDeviceTy &HostDevice;
-
-  /// List of device packet queues.
-  std::vector<AMDGPUQueueTy> Queues;
-
-  /// Map of host pinned allocations. We track these pinned allocations so that
-  /// memory transfers involving these allocations do not need a two-step copy
-  /// with an intermediate pinned buffer.
-  std::map<const void *, size_t> HostAllocations;
-  mutable std::shared_mutex HostAllocationsMutex;
-};
-
-Error AMDGPUDeviceImageTy::loadExecutable(const AMDGPUDeviceTy &Device) {
-  hsa_status_t Status;
-  Status = hsa_code_object_deserialize(getStart(), getSize(), "", &CodeObject);
-  if (auto Err =
-          Plugin::check(Status, "Error in hsa_code_object_deserialize: %s"))
-    return Err;
-
-  Status = hsa_executable_create_alt(
-      HSA_PROFILE_FULL, HSA_DEFAULT_FLOAT_ROUNDING_MODE_ZERO, "", &Executable);
-  if (auto Err =
-          Plugin::check(Status, "Error in hsa_executable_create_alt: %s"))
-    return Err;
-
-  Status = hsa_executable_load_code_object(Executable, Device.getAgent(),
-                                           CodeObject, "");
-  if (auto Err =
-          Plugin::check(Status, "Error in hsa_executable_load_code_object: %s"))
-    return Err;
-
-  Status = hsa_executable_freeze(Executable, "");
-  if (auto Err = Plugin::check(Status, "Error in hsa_executable_freeze: %s"))
-    return Err;
-
-  uint32_t Result;
-  Status = hsa_executable_validate(Executable, &Result);
-  if (auto Err = Plugin::check(Status, "Error in hsa_executable_validate: %s"))
-    return Err;
-
-  if (Result)
-    return Plugin::error("Loaded HSA executable does not validate");
-
-  return Plugin::success();
-}
-
-Expected<hsa_executable_symbol_t>
-AMDGPUDeviceImageTy::findDeviceSymbol(GenericDeviceTy &Device,
-                                      StringRef SymbolName) const {
-
-  AMDGPUDeviceTy &AMDGPUDevice = static_cast<AMDGPUDeviceTy &>(Device);
-  hsa_agent_t Agent = AMDGPUDevice.getAgent();
-
-  hsa_executable_symbol_t Symbol;
-  hsa_status_t Status = hsa_executable_get_symbol_by_name(
-      Executable, SymbolName.data(), &Agent, &Symbol);
-  if (auto Err = Plugin::check(
-          Status, "Error in hsa_executable_get_symbol_by_name(%s): %s",
-          SymbolName.data()))
-    return std::move(Err);
-
-  return Symbol;
-}
-
-template <typename ResourceTy>
-Error AMDGPUResourceRef<ResourceTy>::create(GenericDeviceTy &Device) {
-  if (Resource)
-    return Plugin::error("Creating an existing resource");
-
-  AMDGPUDeviceTy &AMDGPUDevice = static_cast<AMDGPUDeviceTy &>(Device);
-
-  Resource = new ResourceTy(AMDGPUDevice);
-
-  return Resource->init();
-}
-
-AMDGPUStreamTy::AMDGPUStreamTy(AMDGPUDeviceTy &Device)
-    : Agent(Device.getAgent()), Queue(Device.getNextQueue()),
-      SignalManager(Device.getSignalManager()),
-      // Initialize the std::deque with some empty positions.
-      Slots(32), NextSlot(0), SyncCycle(0) {}
-
-/// Class implementing the AMDGPU-specific functionalities of the global
-/// handler.
-struct AMDGPUGlobalHandlerTy final : public GenericGlobalHandlerTy {
-  /// Get the metadata of a global from the device. The name and size of the
-  /// global is read from DeviceGlobal and the address of the global is written
-  /// to DeviceGlobal.
-  Error getGlobalMetadataFromDevice(GenericDeviceTy &Device,
-                                    DeviceImageTy &Image,
-                                    GlobalTy &DeviceGlobal) override {
-    AMDGPUDeviceImageTy &AMDImage = static_cast<AMDGPUDeviceImageTy &>(Image);
-
-    // Find the symbol on the device executable.
-    auto SymbolOrErr =
-        AMDImage.findDeviceSymbol(Device, DeviceGlobal.getName());
-    if (!SymbolOrErr)
-      return SymbolOrErr.takeError();
-
-    hsa_executable_symbol_t Symbol = *SymbolOrErr;
-    hsa_symbol_kind_t SymbolType;
-    hsa_status_t Status;
-    uint64_t SymbolAddr;
-    uint32_t SymbolSize;
-
-    // Retrieve the type, address and size of the symbol.
-    std::pair<hsa_executable_symbol_info_t, void *> RequiredInfos[] = {
-        {HSA_EXECUTABLE_SYMBOL_INFO_TYPE, &SymbolType},
-        {HSA_EXECUTABLE_SYMBOL_INFO_VARIABLE_ADDRESS, &SymbolAddr},
-        {HSA_EXECUTABLE_SYMBOL_INFO_VARIABLE_SIZE, &SymbolSize}};
-
-    for (auto &Info : RequiredInfos) {
-      Status = hsa_executable_symbol_get_info(Symbol, Info.first, Info.second);
-      if (auto Err = Plugin::check(
-              Status, "Error in hsa_executable_symbol_get_info: %s"))
-        return Err;
-    }
-
-    // Check the size of the symbol.
-    if (SymbolSize != DeviceGlobal.getSize())
-      return Plugin::error(
-          "Failed to load global '%s' due to size mismatch (%zu != %zu)",
-          DeviceGlobal.getName().data(), SymbolSize,
-          (size_t)DeviceGlobal.getSize());
-
-    // Store the symbol address on the device global metadata.
-    DeviceGlobal.setPtr(reinterpret_cast<void *>(SymbolAddr));
-
-    return Plugin::success();
-  }
-
-private:
-  /// Extract the global's information from the ELF image, section, and symbol.
-  Error getGlobalMetadataFromELF(const DeviceImageTy &Image,
-                                 const ELF64LE::Sym &Symbol,
-                                 const ELF64LE::Shdr &Section,
-                                 GlobalTy &ImageGlobal) override {
-    // The global's address in AMDGPU is computed as the image begin + the ELF
-    // symbol value. Notice we do not add the ELF section offset.
-    ImageGlobal.setPtr((char *)Image.getStart() + Symbol.st_value);
-
-    // Set the global's size.
-    ImageGlobal.setSize(Symbol.st_size);
-
-    return Plugin::success();
-  }
-};
-
-/// Class implementing the AMDGPU-specific functionalities of the plugin.
-struct AMDGPUPluginTy final : public GenericPluginTy {
-  /// Create an AMDGPU plugin and initialize the AMDGPU driver.
-  AMDGPUPluginTy() : GenericPluginTy(), HostDevice(nullptr) {}
-
-  /// This class should not be copied.
-  AMDGPUPluginTy(const AMDGPUPluginTy &) = delete;
-  AMDGPUPluginTy(AMDGPUPluginTy &&) = delete;
-
-  /// Initialize the plugin and return the number of devices.
-  Expected<int32_t> initImpl() override {
-    hsa_status_t Status = hsa_init();
-    if (Status != HSA_STATUS_SUCCESS) {
-      // Cannot call hsa_success_string.
-      DP("Failed initialize AMDGPU's HSA library\n");
-      return 0;
-    }
-
-    // Register event handler to detect memory errors on the devices.
-    Status = hsa_amd_register_system_event_handler(eventHandler, nullptr);
-    if (auto Err = Plugin::check(
-            Status, "Error in hsa_amd_register_system_event_handler: %s"))
-      return std::move(Err);
-
-    // List of host (CPU) agents.
-    llvm::SmallVector<hsa_agent_t> HostAgents;
-
-    // Count the number of available agents.
-    auto Err = utils::iterateAgents([&](hsa_agent_t Agent) {
-      // Get the device type of the agent.
-      hsa_device_type_t DeviceType;
-      hsa_status_t Status =
-          hsa_agent_get_info(Agent, HSA_AGENT_INFO_DEVICE, &DeviceType);
-      if (Status != HSA_STATUS_SUCCESS)
-        return Status;
-
-      // Classify the agents into kernel (GPU) and host (CPU) kernels.
-      if (DeviceType == HSA_DEVICE_TYPE_GPU) {
-        // Ensure that the GPU agent supports kernel dispatch packets.
-        hsa_agent_feature_t features;
-        Status = hsa_agent_get_info(Agent, HSA_AGENT_INFO_FEATURE, &features);
-        if (features & HSA_AGENT_FEATURE_KERNEL_DISPATCH)
-          KernelAgents.push_back(Agent);
-      } else if (DeviceType == HSA_DEVICE_TYPE_CPU) {
-        HostAgents.push_back(Agent);
-      }
-      return HSA_STATUS_SUCCESS;
-    });
-
-    if (Err)
-      return std::move(Err);
-
-    int32_t NumDevices = KernelAgents.size();
-    if (NumDevices == 0) {
-      // Do not initialize if there are no devices.
-      DP("There are no devices supporting AMDGPU.\n");
-      return 0;
-    }
-
-    // There are kernel agents but there is no host agent. That should be
-    // treated as an error.
-    if (HostAgents.empty())
-      return Plugin::error("No AMDGPU host agents");
-
-    // Initialize the host device using host agents.
-    HostDevice = allocate<AMDHostDeviceTy>();
-    new (HostDevice) AMDHostDeviceTy(HostAgents);
-
-    // Setup the memory pools of available for the host.
-    if (auto Err = HostDevice->init())
-      return std::move(Err);
-
-    return NumDevices;
-  }
-
-  /// Deinitialize the plugin.
-  Error deinitImpl() override {
-    if (auto Err = HostDevice->deinit())
-      return Err;
-
-    // Finalize the HSA runtime.
-    hsa_status_t Status = hsa_shut_down();
-    return Plugin::check(Status, "Error in hsa_shut_down: %s");
-  }
-
-  /// Get the ELF code for recognizing the compatible image binary.
-  uint16_t getMagicElfBits() const override { return ELF::EM_AMDGPU; }
-
-  /// Check whether the image is compatible with an AMDGPU device.
-  Expected<bool> isImageCompatible(__tgt_image_info *Info) const override {
-    for (hsa_agent_t Agent : KernelAgents) {
-      std::string Target;
-      auto Err = utils::iterateAgentISAs(Agent, [&](hsa_isa_t ISA) {
-        uint32_t Length;
-        hsa_status_t Status;
-        Status = hsa_isa_get_info_alt(ISA, HSA_ISA_INFO_NAME_LENGTH, &Length);
-        if (Status != HSA_STATUS_SUCCESS)
-          return Status;
-
-        // TODO: This is not allowed by the standard.
-        char ISAName[Length];
-        Status = hsa_isa_get_info_alt(ISA, HSA_ISA_INFO_NAME, ISAName);
-        if (Status != HSA_STATUS_SUCCESS)
-          return Status;
-
-        llvm::StringRef TripleTarget(ISAName);
-        if (TripleTarget.consume_front("amdgcn-amd-amdhsa"))
-          Target = TripleTarget.ltrim('-').str();
-        return HSA_STATUS_SUCCESS;
-      });
-      if (Err)
-        return std::move(Err);
-
-      if (!utils::isImageCompatibleWithEnv(Info, Target))
-        return false;
-    }
-    return true;
-  }
-
-  /// This plugin does not support exchanging data between two devices.
-  bool isDataExchangable(int32_t SrcDeviceId, int32_t DstDeviceId) override {
-    return false;
-  }
-
-  /// Get the host device instance.
-  AMDHostDeviceTy &getHostDevice() {
-    assert(HostDevice && "Host device not initialized");
-    return *HostDevice;
-  }
-
-  /// Get the kernel agent with the corresponding agent id.
-  hsa_agent_t getKernelAgent(int32_t AgentId) const {
-    assert((uint32_t)AgentId < KernelAgents.size() && "Invalid agent id");
-    return KernelAgents[AgentId];
-  }
-
-  /// Get the list of the available kernel agents.
-  const llvm::SmallVector<hsa_agent_t> &getKernelAgents() const {
-    return KernelAgents;
-  }
-
-private:
-  /// Event handler that will be called by ROCr if an event is detected.
-  static hsa_status_t eventHandler(const hsa_amd_event_t *Event, void *) {
-    if (Event->event_type != HSA_AMD_GPU_MEMORY_FAULT_EVENT)
-      return HSA_STATUS_SUCCESS;
-
-    std::string Reasons;
-    uint32_t ReasonsMask = Event->memory_fault.fault_reason_mask;
-    if (ReasonsMask & HSA_AMD_MEMORY_FAULT_PAGE_NOT_PRESENT)
-      Reasons += "HSA_AMD_MEMORY_FAULT_PAGE_NOT_PRESENT\n";
-    if (ReasonsMask & HSA_AMD_MEMORY_FAULT_READ_ONLY)
-      Reasons += " HSA_AMD_MEMORY_FAULT_READ_ONLY\n";
-    if (ReasonsMask & HSA_AMD_MEMORY_FAULT_NX)
-      Reasons += " HSA_AMD_MEMORY_FAULT_NX\n";
-    if (ReasonsMask & HSA_AMD_MEMORY_FAULT_HOST_ONLY)
-      Reasons += " HSA_AMD_MEMORY_FAULT_HOST_ONLY\n";
-    if (ReasonsMask & HSA_AMD_MEMORY_FAULT_DRAMECC)
-      Reasons += " HSA_AMD_MEMORY_FAULT_DRAMECC\n";
-    if (ReasonsMask & HSA_AMD_MEMORY_FAULT_IMPRECISE)
-      Reasons += " HSA_AMD_MEMORY_FAULT_IMPRECISE\n";
-    if (ReasonsMask & HSA_AMD_MEMORY_FAULT_SRAMECC)
-      Reasons += " HSA_AMD_MEMORY_FAULT_SRAMECC\n";
-    if (ReasonsMask & HSA_AMD_MEMORY_FAULT_HANG)
-      Reasons += " HSA_AMD_MEMORY_FAULT_HANG\n";
-
-    // Abort the execution since we do not recover from this error.
-    FATAL_MESSAGE(1,
-                  "Found HSA_AMD_GPU_MEMORY_FAULT_EVENT in agent %" PRIu64
-                  " at virtual address %p and reasons:\n %s",
-                  Event->memory_fault.agent.handle,
-                  (void *)Event->memory_fault.virtual_address, Reasons.data());
-
-    return HSA_STATUS_ERROR;
-  }
-
-  /// Arrays of the available GPU and CPU agents. These arrays of handles should
-  /// not be here but in the AMDGPUDeviceTy structures directly. However, the
-  /// HSA standard does not provide API functions to retirve agents directly,
-  /// only iterating functions. We cache the agents here for convenience.
-  llvm::SmallVector<hsa_agent_t> KernelAgents;
-
-  /// The device representing all HSA host agents.
-  AMDHostDeviceTy *HostDevice;
-};
-
-Error AMDGPUKernelTy::launchImpl(GenericDeviceTy &GenericDevice,
-                                 uint32_t NumThreads, uint64_t NumBlocks,
-                                 uint32_t DynamicMemorySize,
-                                 int32_t NumKernelArgs, void *KernelArgs,
-                                 AsyncInfoWrapperTy &AsyncInfoWrapper) const {
-  const uint32_t KernelArgsSize = NumKernelArgs * sizeof(void *);
-
-  if (ArgsSize < KernelArgsSize)
-    return Plugin::error("Mismatch of kernel arguments size");
-
-  // The args size reported by HSA may or may not contain the implicit args.
-  // For now, assume that HSA does not consider the implicit arguments when
-  // reporting the arguments of a kernel. In the worst case, we can waste
-  // 56 bytes per allocation.
-  uint32_t AllArgsSize = KernelArgsSize + ImplicitArgsSize;
-
-  AMDHostDeviceTy &HostDevice = Plugin::get<AMDGPUPluginTy>().getHostDevice();
-  AMDGPUMemoryManagerTy &ArgsMemoryManager = HostDevice.getArgsMemoryManager();
-
-  void *AllArgs = nullptr;
-  if (auto Err = ArgsMemoryManager.allocate(AllArgsSize, &AllArgs))
-    return Err;
-
-  // Initialize implicit arguments.
-  utils::AMDGPUImplicitArgsTy *ImplArgs =
-      reinterpret_cast<utils::AMDGPUImplicitArgsTy *>(
-          static_cast<char *>(AllArgs) + KernelArgsSize);
-
-  // Initialize the implicit arguments to zero.
-  std::memset(ImplArgs, 0, ImplicitArgsSize);
-
-  // Copy the explicit arguments.
-  for (int32_t ArgId = 0; ArgId < NumKernelArgs; ++ArgId) {
-    void *Dst = (char *)AllArgs + sizeof(void *) * ArgId;
-    void *Src = *((void **)KernelArgs + ArgId);
-    std::memcpy(Dst, Src, sizeof(void *));
-  }
-
-  AMDGPUDeviceTy &AMDGPUDevice = static_cast<AMDGPUDeviceTy &>(GenericDevice);
-  AMDGPUStreamTy &Stream = AMDGPUDevice.getStream(AsyncInfoWrapper);
-
-  // Push the kernel launch into the stream.
-  return Stream.pushKernelLaunch(*this, AllArgs, NumThreads, NumBlocks,
-                                 ArgsMemoryManager);
-}
-
-GenericPluginTy *Plugin::createPlugin() { return new AMDGPUPluginTy(); }
-
-GenericDeviceTy *Plugin::createDevice(int32_t DeviceId, int32_t NumDevices) {
-  AMDGPUPluginTy &Plugin = get<AMDGPUPluginTy &>();
-  return new AMDGPUDeviceTy(DeviceId, NumDevices, Plugin.getHostDevice(),
-                            Plugin.getKernelAgent(DeviceId));
-}
-
-GenericGlobalHandlerTy *Plugin::createGlobalHandler() {
-  return new AMDGPUGlobalHandlerTy();
-}
-
-template <typename... ArgsTy>
-Error Plugin::check(int32_t Code, const char *ErrFmt, ArgsTy... Args) {
-  hsa_status_t ResultCode = static_cast<hsa_status_t>(Code);
-  if (ResultCode == HSA_STATUS_SUCCESS || ResultCode == HSA_STATUS_INFO_BREAK)
-    return Error::success();
-
-  const char *Desc = "Unknown error";
-  hsa_status_t Ret = hsa_status_string(ResultCode, &Desc);
-  if (Ret != HSA_STATUS_SUCCESS)
-    REPORT("Unrecognized " GETNAME(TARGET_NAME) " error code %d\n", Code);
-
-  return createStringError<ArgsTy..., const char *>(inconvertibleErrorCode(),
-                                                    ErrFmt, Args..., Desc);
-}
-
-void *AMDGPUMemoryManagerTy::allocate(size_t Size, void *HstPtr,
-                                      TargetAllocTy Kind) {
-  // Allocate memory from the pool.
-  void *Ptr = nullptr;
-  if (auto Err = MemoryPool->allocate(Size, &Ptr)) {
-    consumeError(std::move(Err));
-    return nullptr;
-  }
-  assert(Ptr && "Invalid pointer");
-
-  auto &KernelAgents = Plugin::get<AMDGPUPluginTy>().getKernelAgents();
-
-  // Allow all kernel agents to access the allocation.
-  if (auto Err = MemoryPool->enableAccess(Ptr, Size, KernelAgents)) {
-    REPORT("%s\n", toString(std::move(Err)).data());
-    return nullptr;
-  }
-  return Ptr;
-}
-
-void *AMDGPUDeviceTy::allocate(size_t Size, void *, TargetAllocTy Kind) {
-  if (Size == 0)
-    return nullptr;
-
-  // Find the correct memory pool.
-  AMDGPUMemoryPoolTy *MemoryPool = nullptr;
-  switch (Kind) {
-  case TARGET_ALLOC_DEFAULT:
-  case TARGET_ALLOC_DEVICE:
-    MemoryPool = CoarseGrainedMemoryPools[0];
-    break;
-  case TARGET_ALLOC_HOST:
-    MemoryPool = &HostDevice.getHostMemoryPool();
-    break;
-  case TARGET_ALLOC_SHARED:
-    // TODO: Not supported yet. We could look at fine-grained host memory
-    // pools that are accessible by this device. The allocation should be made
-    // explicitly accessible if it is not yet.
-    break;
-  }
-
-  if (!MemoryPool) {
-    REPORT("No memory pool for the specified allocation kind\n");
-    return nullptr;
-  }
-
-  // Allocate from the corresponding memory pool.
-  void *Alloc = nullptr;
-  if (Error Err = MemoryPool->allocate(Size, &Alloc)) {
-    REPORT("%s\n", toString(std::move(Err)).data());
-    return nullptr;
-  }
-
-  if (Kind == TARGET_ALLOC_HOST && Alloc) {
-    auto &KernelAgents = Plugin::get<AMDGPUPluginTy>().getKernelAgents();
-
-    // Enable all kernel agents to access the host pinned buffer.
-    if (auto Err = MemoryPool->enableAccess(Alloc, Size, KernelAgents)) {
-      REPORT("%s\n", toString(std::move(Err)).data());
-    }
-
-    // Keep track of the host pinned allocations for optimizations in transfers.
-    std::lock_guard<std::shared_mutex> Lock(HostAllocationsMutex);
-    HostAllocations.insert({Alloc, Size});
-  }
-
-  return Alloc;
-}
-
-} // namespace plugin
-} // namespace target
-} // namespace omp
-} // namespace llvm

diff  --git a/openmp/libomptarget/plugins/amdgpu/dynamic_hsa/hsa.h b/openmp/libomptarget/plugins/amdgpu/dynamic_hsa/hsa.h
index b57590820a55d..8627860aef089 100644
--- a/openmp/libomptarget/plugins/amdgpu/dynamic_hsa/hsa.h
+++ b/openmp/libomptarget/plugins/amdgpu/dynamic_hsa/hsa.h
@@ -63,7 +63,6 @@ typedef enum {
 typedef enum {
   HSA_AGENT_INFO_NAME = 0,
   HSA_AGENT_INFO_VENDOR_NAME = 1,
-  HSA_AGENT_INFO_FEATURE = 2,
   HSA_AGENT_INFO_PROFILE = 4,
   HSA_AGENT_INFO_WAVEFRONT_SIZE = 6,
   HSA_AGENT_INFO_WORKGROUP_MAX_DIM = 7,
@@ -84,11 +83,6 @@ typedef enum {
   HSA_SYSTEM_INFO_VERSION_MINOR = 1,
 } hsa_system_info_t;
 
-typedef enum {
-  HSA_AGENT_FEATURE_KERNEL_DISPATCH = 1,
-  HSA_AGENT_FEATURE_AGENT_DISPATCH = 2,
-} hsa_agent_feature_t;
-
 typedef struct hsa_region_s {
   uint64_t handle;
 } hsa_region_t;
@@ -129,22 +123,12 @@ hsa_status_t hsa_signal_create(hsa_signal_value_t initial_value,
                                const hsa_agent_t *consumers,
                                hsa_signal_t *signal);
 
-hsa_status_t hsa_amd_signal_create(hsa_signal_value_t initial_value,
-                                   uint32_t num_consumers,
-                                   const hsa_agent_t *consumers,
-                                   uint64_t attributes, hsa_signal_t *signal);
-
 hsa_status_t hsa_signal_destroy(hsa_signal_t signal);
 
 void hsa_signal_store_relaxed(hsa_signal_t signal, hsa_signal_value_t value);
 
 void hsa_signal_store_screlease(hsa_signal_t signal, hsa_signal_value_t value);
 
-hsa_signal_value_t hsa_signal_load_scacquire(hsa_signal_t signal);
-
-void hsa_signal_subtract_screlease(hsa_signal_t signal,
-                                   hsa_signal_value_t value);
-
 typedef enum {
   HSA_SIGNAL_CONDITION_EQ = 0,
   HSA_SIGNAL_CONDITION_NE = 1,
@@ -166,11 +150,6 @@ typedef enum {
   HSA_QUEUE_TYPE_SINGLE = 1,
 } hsa_queue_type_t;
 
-typedef enum {
-  HSA_QUEUE_FEATURE_KERNEL_DISPATCH = 1,
-  HSA_QUEUE_FEATURE_AGENT_DISPATCH = 2
-} hsa_queue_feature_t;
-
 typedef uint32_t hsa_queue_type32_t;
 
 typedef struct hsa_queue_s {
@@ -208,7 +187,6 @@ uint64_t hsa_queue_add_write_index_relaxed(const hsa_queue_t *queue,
 
 typedef enum {
   HSA_PACKET_TYPE_KERNEL_DISPATCH = 2,
-  HSA_PACKET_TYPE_BARRIER_AND = 3,
 } hsa_packet_type_t;
 
 typedef enum { HSA_FENCE_SCOPE_SYSTEM = 2 } hsa_fence_scope_t;
@@ -253,15 +231,6 @@ typedef struct hsa_kernel_dispatch_packet_s {
   hsa_signal_t completion_signal;
 } hsa_kernel_dispatch_packet_t;
 
-typedef struct hsa_barrier_and_packet_s {
-  uint16_t header;
-  uint16_t reserved0;
-  uint32_t reserved1;
-  hsa_signal_t dep_signal[5];
-  uint64_t reserved2;
-  hsa_signal_t completion_signal;
-} hsa_barrier_and_packet_t;
-
 typedef enum { HSA_PROFILE_BASE = 0, HSA_PROFILE_FULL = 1 } hsa_profile_t;
 
 typedef enum {
@@ -299,12 +268,6 @@ typedef enum {
   HSA_SYMBOL_KIND_INDIRECT_FUNCTION = 2
 } hsa_symbol_kind_t;
 
-typedef enum {
-  HSA_DEFAULT_FLOAT_ROUNDING_MODE_DEFAULT = 0,
-  HSA_DEFAULT_FLOAT_ROUNDING_MODE_ZERO = 1,
-  HSA_DEFAULT_FLOAT_ROUNDING_MODE_NEAR = 2,
-} hsa_default_float_rounding_mode_t;
-
 hsa_status_t hsa_memory_copy(void *dst, const void *src, size_t size);
 
 hsa_status_t hsa_executable_create(hsa_profile_t profile,
@@ -312,19 +275,11 @@ hsa_status_t hsa_executable_create(hsa_profile_t profile,
                                    const char *options,
                                    hsa_executable_t *executable);
 
-hsa_status_t hsa_executable_create_alt(
-    hsa_profile_t profile,
-    hsa_default_float_rounding_mode_t default_float_rounding_mode,
-    const char *options, hsa_executable_t *executable);
-
 hsa_status_t hsa_executable_destroy(hsa_executable_t executable);
 
 hsa_status_t hsa_executable_freeze(hsa_executable_t executable,
                                    const char *options);
 
-hsa_status_t hsa_executable_validate(hsa_executable_t executable,
-                                     uint32_t *result);
-
 hsa_status_t
 hsa_executable_symbol_get_info(hsa_executable_symbol_t executable_symbol,
                                hsa_executable_symbol_info_t attribute,
@@ -336,11 +291,6 @@ hsa_status_t hsa_executable_iterate_symbols(
                              hsa_executable_symbol_t symbol, void *data),
     void *data);
 
-hsa_status_t hsa_executable_get_symbol_by_name(hsa_executable_t executable,
-                                               const char *symbol_name,
-                                               const hsa_agent_t *agent,
-                                               hsa_executable_symbol_t *symbol);
-
 hsa_status_t hsa_code_object_deserialize(void *serialized_code_object,
                                          size_t serialized_code_object_size,
                                          const char *options,
@@ -351,16 +301,6 @@ hsa_status_t hsa_executable_load_code_object(hsa_executable_t executable,
                                              hsa_code_object_t code_object,
                                              const char *options);
 
-hsa_status_t hsa_code_object_destroy(hsa_code_object_t code_object);
-
-typedef bool (*hsa_amd_signal_handler)(hsa_signal_value_t value, void *arg);
-
-hsa_status_t hsa_amd_signal_async_handler(hsa_signal_t signal,
-                                          hsa_signal_condition_t cond,
-                                          hsa_signal_value_t value,
-                                          hsa_amd_signal_handler handler,
-                                          void *arg);
-
 #ifdef __cplusplus
 }
 #endif


        


More information about the Openmp-commits mailing list