[OpenMP] Add additional fields to device environment

[jhuber6]

Summary

This patch adds fields for the device number and number of devices into
the device environment struct and debugging values.

[jdoerfert]

Can you also double check that this works actually. print the device id and number of devices? Assuming it does, LG

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

906

The slight problem is that DeviceId here is not the OpenMP device ID, IIRC.
The plugins have a local view and we'd need the "global" view.
But for now this is good enough as we don't really deal with mutli-plugin
situations yet. Add a TODO though.

[jhuber6]

Adding TODO, printing the values seems to work. I only have a single device so
the number and ID is 1 and 0 respectively. Both the debugging numbers work.

openmp/libomptarget/DeviceRTL/include/Configuration.h

 namespace config {
 
 enum DebugLevel : int32_t { Assertion };
 
 /// Return the number of devices in the system, same number as returned on the
 /// host by omp_get_num_devices.
 uint32_t getNumDevices();
 
+/// Return the number of devices in the system, same number as returned on the
+/// host by omp_get_num_devices.
+uint32_t getDeviceNum();
+
 /// Return the user choosen debug level.
-int32_t getDebugLevel();
+uint32_t getDebugLevel();
 
 bool isDebugMode(DebugLevel Level);
 
 } // namespace config
 } // namespace _OMP
 
 #endif

openmp/libomptarget/DeviceRTL/src/Configuration.cpp

 
 #include "Configuration.h"
 #include "State.h"
 #include "Types.h"
 
 using namespace _OMP;
 
 struct DeviceEnvironmentTy {
-  int32_t DebugLevel;
+  uint32_t DebugLevel;
+  uint32_t NumDevices;
+  uint32_t DeviceNum;
 };
 
 #pragma omp declare target
 
+extern uint32_t __omp_rtl_debug_kind;
+
 // TOOD: We want to change the name as soon as the old runtime is gone.
 DeviceEnvironmentTy CONSTANT(omptarget_device_environment)
     __attribute__((used));
 
-int32_t config::getDebugLevel() {
-  // TODO: Implement libomptarget initialization of DeviceEnvironmentTy
-  return 0;
+uint32_t config::getDebugLevel() {
+  return __omp_rtl_debug_kind & omptarget_device_environment.DebugLevel;
 }
 
 uint32_t config::getNumDevices() {
-  // TODO: Implement libomptarget initialization of DeviceEnvironmentTy
-  return 1;
+  return omptarget_device_environment.NumDevices;
+}
+
+uint32_t config::getDeviceNum() {
+  return omptarget_device_environment.DeviceNum;
 }
 
 bool config::isDebugMode(config::DebugLevel Level) {
   return config::getDebugLevel() > Level;
 }
 
 #pragma omp end declare target

openmp/libomptarget/deviceRTLs/common/device_environment.h

 
 #ifndef _OMPTARGET_DEVICE_ENVIRONMENT_H_
 #define _OMPTARGET_DEVICE_ENVIRONMENT_H_
 
 #include "target_impl.h"
 
 struct omptarget_device_environmentTy {
   int32_t debug_level;
+  uint32_t num_devices;
+  uint32_t device_num;
 };
 
 extern omptarget_device_environmentTy omptarget_device_environment;
 
 #endif

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

KernelTy(CUfunction _Func, int8_t _ExecutionMode)
       : Func(_Func), ExecutionMode(_ExecutionMode) {}
 };
 
 /// Device environment data
 /// Manually sync with the deviceRTL side for now, move to a dedicated header
 /// file later.
 struct omptarget_device_environmentTy {
   int32_t debug_level;
+  uint32_t num_devices;
+  uint32_t device_num;
 };
 
 namespace {
 bool checkResult(CUresult Err, const char *ErrMsg) {
   if (Err == CUDA_SUCCESS)
     return true;
 
   REPORT("%s", ErrMsg);
for (const __tgt_offload_entry *E = HostBegin; E != HostEnd; ++E) {
 
       __tgt_offload_entry Entry = *E;
       Entry.addr = &KernelsList.back();
       addOffloadEntry(DeviceId, Entry);
     }
 
     // send device environment data to the device
     {
-      omptarget_device_environmentTy DeviceEnv{0};
+      // TODO: The device ID used here is not the real device ID used by OpenMP.
+      omptarget_device_environmentTy DeviceEnv{
+          0, static_cast<uint32_t>(NumberOfDevices),
+          static_cast<uint32_t>(DeviceId)};
 
 #ifdef OMPTARGET_DEBUG
       if (const char *EnvStr = getenv("LIBOMPTARGET_DEVICE_RTL_DEBUG"))
         DeviceEnv.debug_level = std::stoi(EnvStr);
 #endif
 
       const char *DeviceEnvName = "omptarget_device_environment";
       CUdeviceptr DeviceEnvPtr;