[libomptarget][amdgpu][nfc] Refactor #includes

[JonChesterfield]

Summary

Create a hsa_api.h header that includes the ROCr headers in use
Drop some unused headers and _cplusplus macros

[JonChesterfield]

• drop unused hsa_ext_finalize.h

[jdoerfert]

LG, one nit.

openmp/libomptarget/plugins/amdgpu/impl/hsa_api.h

2

Licence headers please.

[JonChesterfield]

• file header

[JonChesterfield]

openmp/libomptarget/plugins/amdgpu/impl/hsa_api.h

2

It looks like a lot of the other files are marked up as MIT/ATMI. They don't have much in common with ATMI any more but I should check with the authors before changing the other files.

openmp/libomptarget/plugins/amdgpu/impl/atmi.cpp

 /*===--------------------------------------------------------------------------
  *              ATMI (Asynchronous Task and Memory Interface)
  *
  * This file is distributed under the MIT License. See LICENSE.txt for details.
  *===------------------------------------------------------------------------*/
 #include "atmi_runtime.h"
+#include "hsa_api.h"
 #include "internal.h"
 #include "rt.h"
-#include <hsa.h>
-#include <hsa_ext_amd.h>
 #include <memory>
 
 /*
  * Data
  */
 
 static hsa_status_t invoke_hsa_copy(hsa_signal_t sig, void *dest,
                                     const void *src, size_t size,

openmp/libomptarget/plugins/amdgpu/impl/atmi_interop_hsa.h

 /*===--------------------------------------------------------------------------
  *              ATMI (Asynchronous Task and Memory Interface)
  *
  * This file is distributed under the MIT License. See LICENSE.txt for details.
  *===------------------------------------------------------------------------*/
 #ifndef INCLUDE_ATMI_INTEROP_HSA_H_
 #define INCLUDE_ATMI_INTEROP_HSA_H_
 
 #include "atmi_runtime.h"
-#include "hsa.h"
-#include "hsa_ext_amd.h"
+#include "hsa_api.h"
 #include "internal.h"
 
 #include <map>
 #include <string>
 
-#ifdef __cplusplus
 extern "C" {
-#endif
+
 /** \defgroup interop_hsa_functions ATMI-HSA Interop
  *  @{
  */
 
 /**
  * @brief Get the device address and size of an HSA global symbol
  *
  * @detail Use this function to query the device address and size of an HSA

  */
 hsa_status_t atmi_interop_hsa_get_kernel_info(
     const std::map<std::string, atl_kernel_info_t> &KernelInfoTable,
     int DeviceId, const char *kernel_name, hsa_executable_symbol_info_t info,
     uint32_t *value);
 
 /** @} */
 
-#ifdef __cplusplus
 }
-#endif
 
 #endif // INCLUDE_ATMI_INTEROP_HSA_H_

openmp/libomptarget/plugins/amdgpu/impl/atmi_runtime.h

 /*===--------------------------------------------------------------------------
  *              ATMI (Asynchronous Task and Memory Interface)
  *
  * This file is distributed under the MIT License. See LICENSE.txt for details.
  *===------------------------------------------------------------------------*/
 #ifndef INCLUDE_ATMI_RUNTIME_H_
 #define INCLUDE_ATMI_RUNTIME_H_
 
 #include "atmi.h"
-#include "hsa.h"
-#include <inttypes.h>
-#include <stdlib.h>
-#ifndef __cplusplus
-#include <stdbool.h>
-#endif
+#include "hsa_api.h"
 
-#ifdef __cplusplus
 extern "C" {
-#endif
 
 /** \defgroup module_functions ATMI Module
  * @{
  */
 
 /**
  * @brief Register the ATMI code module from memory on to a specific place
  * (device).
hsa_status_t atmi_memcpy_h2d(hsa_signal_t signal, void *deviceDest,
                              hsa_agent_t agent);
 
 hsa_status_t atmi_memcpy_d2h(hsa_signal_t sig, void *hostDest,
                              const void *deviceSrc, size_t size,
                              hsa_agent_t agent);
 
 /** @} */
 
-#ifdef __cplusplus
 }
-#endif
 
 #endif // INCLUDE_ATMI_RUNTIME_H_

openmp/libomptarget/plugins/amdgpu/impl/data.cpp

 /*===--------------------------------------------------------------------------
  *              ATMI (Asynchronous Task and Memory Interface)
  *
  * This file is distributed under the MIT License. See LICENSE.txt for details.
  *===------------------------------------------------------------------------*/
 #include "atmi_runtime.h"
+#include "hsa_api.h"
 #include "internal.h"
 #include "machine.h"
 #include "rt.h"
 #include <cassert>
-#include <hsa.h>
-#include <hsa_ext_amd.h>
 #include <stdio.h>
 #include <string.h>
-#include <thread>
 #include <vector>
 
 using core::TaskImpl;
 extern ATLMachine g_atl_machine;
 
 namespace core {
 
 namespace {

openmp/libomptarget/plugins/amdgpu/impl/hsa_api.h

+//===------- hsa_api.h --------------------------------------- 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
+//
+//===----------------------------------------------------------------------===//
+#ifndef AMDGPU_HSA_API_H_INCLUDED
+#define AMDGPU_HSA_API_H_INCLUDED
+
+#include "hsa.h"
+#include "hsa_ext_amd.h"
+
+#endif

openmp/libomptarget/plugins/amdgpu/impl/internal.h

 /*===--------------------------------------------------------------------------
  *              ATMI (Asynchronous Task and Memory Interface)
  *
  * This file is distributed under the MIT License. See LICENSE.txt for details.
  *===------------------------------------------------------------------------*/
 #ifndef SRC_RUNTIME_INCLUDE_INTERNAL_H_
 #define SRC_RUNTIME_INCLUDE_INTERNAL_H_
 #include <inttypes.h>
 #include <pthread.h>
 #include <stddef.h>
 #include <stdint.h>
 #include <stdio.h>
 #include <stdlib.h>
 
-#include <atomic>
 #include <cstring>
-#include <deque>
 #include <map>
 #include <queue>
 #include <string>
 #include <utility>
 #include <vector>
 
-#include "hsa.h"
-#include "hsa_ext_amd.h"
-#include "hsa_ext_finalize.h"
+#include "hsa_api.h"
 
 #include "atmi.h"
 #include "atmi_runtime.h"
 #include "rt.h"
 
 #define MAX_NUM_KERNELS (1024 * 16)
 
 typedef struct atmi_implicit_args_s {
   unsigned long offset_x;
   unsigned long offset_y;
   unsigned long offset_z;
   unsigned long hostcall_ptr;
   char num_gpu_queues;
   unsigned long gpu_queue_ptr;
   char num_cpu_queues;
   unsigned long cpu_worker_signals;
   unsigned long cpu_queue_ptr;
   unsigned long kernarg_template_ptr;
 } atmi_implicit_args_t;
 
-#ifdef __cplusplus
 extern "C" {
-#endif
 
 #ifdef DEBUG
 #define DEBUG_PRINT(fmt, ...)                                                  \
   if (core::Runtime::getInstance().getDebugMode()) {                           \
     fprintf(stderr, "[%s:%d] " fmt, __FILE__, __LINE__, ##__VA_ARGS__);        \
   }
 #else
 #define DEBUG_PRINT(...)                                                       \
   do {                                                                         \
   } while (false)
 #endif
 
 #ifndef HSA_RUNTIME_INC_HSA_H_
 typedef struct hsa_signal_s {
   uint64_t handle;
 } hsa_signal_t;
 #endif
 
-#ifdef __cplusplus
 }
-#endif
 
 /* ---------------------------------------------------------------------------------
  * Simulated CPU Data Structures and API
  * ---------------------------------------------------------------------------------
  */
 
 #define ATMI_WAIT_STATE HSA_WAIT_STATE_BLOCKED
 

openmp/libomptarget/plugins/amdgpu/impl/machine.h

 /*===--------------------------------------------------------------------------
  *              ATMI (Asynchronous Task and Memory Interface)
  *
  * This file is distributed under the MIT License. See LICENSE.txt for details.
  *===------------------------------------------------------------------------*/
 #ifndef SRC_RUNTIME_INCLUDE_MACHINE_H_
 #define SRC_RUNTIME_INCLUDE_MACHINE_H_
 #include "atmi.h"
+#include "hsa_api.h"
 #include "internal.h"
-#include <hsa.h>
-#include <hsa_ext_amd.h>
 #include <vector>
 
 class ATLMemory;
 
 class ATLProcessor {
 public:
   explicit ATLProcessor(hsa_agent_t agent,
                         atmi_devtype_t type = ATMI_DEVTYPE_ALL)

openmp/libomptarget/plugins/amdgpu/impl/machine.cpp

 /*===--------------------------------------------------------------------------
  *              ATMI (Asynchronous Task and Memory Interface)
  *
  * This file is distributed under the MIT License. See LICENSE.txt for details.
  *===------------------------------------------------------------------------*/
 #include "machine.h"
 #include "atmi_runtime.h"
+#include "hsa_api.h"
 #include "internal.h"
 #include <cassert>
-#include <hsa.h>
-#include <hsa_ext_amd.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <vector>
 
 extern ATLMachine g_atl_machine;
 
 void ATLProcessor::addMemory(const ATLMemory &mem) {
   for (auto &mem_obj : memories_) {

openmp/libomptarget/plugins/amdgpu/impl/rt.h

 /*===--------------------------------------------------------------------------
  *              ATMI (Asynchronous Task and Memory Interface)
  *
  * This file is distributed under the MIT License. See LICENSE.txt for details.
  *===------------------------------------------------------------------------*/
 #ifndef SRC_RUNTIME_INCLUDE_RT_H_
 #define SRC_RUNTIME_INCLUDE_RT_H_
 
 #include "atmi_runtime.h"
-#include "hsa.h"
+#include "hsa_api.h"
 #include <string>
 
 namespace core {
 
 #define DEFAULT_MAX_QUEUE_SIZE 4096
 #define DEFAULT_DEBUG_MODE 0
 class Environment {
 public:

openmp/libomptarget/plugins/amdgpu/src/rtl.cpp

 #include <fstream>
 #include <functional>
 #include <iostream>
 #include <libelf.h>
 #include <list>
 #include <memory>
 #include <mutex>
 #include <shared_mutex>
-#include <thread>
 #include <unordered_map>
 #include <vector>
 
 // Header from ATMI interface
 #include "atmi_interop_hsa.h"
 #include "atmi_runtime.h"
 
 #include "internal.h"