address review

Author: adurang

offload/plugins-nextgen/level_zero/include/AsyncQueue.h

@@ -24,7 +24,7 @@ namespace plugin {
 
 /// Abstract queue that supports asynchronous command submission
 struct AsyncQueueTy {
-  /// List of events attahced to submitted commands
+  /// List of events attached to submitted commands
   llvm::SmallVector<ze_event_handle_t> WaitEvents;
   /// Pending staging buffer to host copies
   llvm::SmallVector<std::tuple<void *, void *, size_t>> H2MList;

offload/plugins-nextgen/level_zero/include/L0Defs.h

@@ -30,9 +30,7 @@ enum class AllocOptionTy : int32_t {
 /// Host runtime routines being used
 extern "C" {
 LIBOMP_DECL(int, omp_get_max_teams(void));
-LIBOMP_DECL(int, omp_get_thread_limit(void));
 LIBOMP_DECL(int, omp_get_teams_thread_limit(void));
-LIBOMP_DECL(double, omp_get_wtime(void));
 } // extern "C"
 
 #ifndef EXTRACT_BITS
@@ -69,7 +67,7 @@ static Error Plugin::check(int32_t Code, const char *ErrFmt, ArgsTy... Args) {
 }
 
 #define L0_UNIMPLEMENTED_ERR                                                   \
-  return Plugin::error(ErrorCode::UNIMPLEMENTED, "%s not implemented yet\n",   \
+  return Plugin::error(ErrorCode::UNIMPLEMENTED, "%s not implemented yet",     \
                        __func__);
 
 } // namespace llvm::omp::target::plugin

offload/plugins-nextgen/level_zero/include/L0Options.h

@@ -128,6 +128,10 @@ struct L0OptionsTy {
   /// devices and whether immediate command list is fully enabled.
   CommandModeTy CommandMode = CommandModeTy::Async;
 
+  // Controlso if we need to reduce available HW threads. We need this adjustment
+  // on XeHPG when Level Zero debug is enabled (ZET_ENABLE_PROGRAM_DEBUGGING=1).
+  bool ZeDebugEnabled = false;
+
   bool Init = false; // have the options already been processed
 
   // Allocator for long-lived allocations (e.g. spec constants)

offload/plugins-nextgen/level_zero/src/L0Kernel.cpp

@@ -61,7 +61,7 @@ static std::tuple<int32_t, int32_t> readTeamsThreadLimit() {
   int32_t ThreadLimit;
   ThreadLimit = omp_get_teams_thread_limit();
   DP("omp_get_teams_thread_limit() returned %" PRId32 "\n", ThreadLimit);
-  // omp_get_thread_limit() would return INT_MAX by default.
+  // omp_get_teams_thread_limit() would return INT_MAX by default.
   // NOTE: Windows.h defines max() macro, so we have to guard
   //       the call with parentheses.
   ThreadLimit =
@@ -406,21 +406,12 @@ int32_t L0KernelTy::getGroupsShape(L0DeviceTy &Device, int32_t NumTeams,
   const auto DeviceId = Device.getDeviceId();
   const auto &KernelPR = getProperties();
 
-  // Detect if we need to reduce available HW threads. We need this adjustment
-  // on XeHPG when L0 debug is enabled (ZET_ENABLE_PROGRAM_DEBUGGING=1).
-  static std::once_flag OnceFlag;
-  static bool ZeDebugEnabled = false;
-  std::call_once(OnceFlag, []() {
-    const char *EnvVal = std::getenv("ZET_ENABLE_PROGRAM_DEBUGGING");
-    if (EnvVal && std::atoi(EnvVal) == 1)
-      ZeDebugEnabled = true;
-  });
-
   // Read the most recent global thread limit and max teams.
   auto [NumTeamsICV, ThreadLimitICV] = readTeamsThreadLimit();
 
   bool IsXeHPG = Device.isDeviceArch(DeviceArchTy::DeviceArch_XeHPG);
-  bool HalfNumThreads = ZeDebugEnabled && IsXeHPG;
+  bool HalfNumThreads =
+      LevelZeroPluginTy::getOptions().ZeDebugEnabled && IsXeHPG;
   uint32_t KernelWidth = KernelPR.Width;
   uint32_t SIMDWidth = KernelPR.SIMDWidth;
   INFO(OMP_INFOTYPE_PLUGIN_KERNEL, DeviceId,

offload/plugins-nextgen/level_zero/src/L0Options.cpp

@@ -172,6 +172,9 @@ void L0OptionsTy::processEnvironmentVars() {
       INVALID_OPTION(LIBOMPTARGET_LEVEL_ZERO_COMMAND_MODE,
                      CommandModeVar.get().c_str());
   }
+
+  // Detect if we need to enable compatibility with Level Zero debug mode.
+  ZeDebugEnabled = BoolEnvar("ZET_ENABLE_PROGRAM_DEBUGGING", false);
 }
 
 } // namespace llvm::omp::target::plugin