Re-implemented the method to return the sysem's XNACK status. Instead of using ROCt, the envvar HSA_XNACK and ther kernel parameter noretry is used. Removed dependencies on ROCt

Change-Id: I768d4566df664ff7fe45a8ed932d5905b6ae9b09

Author: ThorBl

openmp/libomptarget/plugins-nextgen/amdgpu/CMakeLists.txt

@@ -19,20 +19,6 @@ if (NOT LIBOMPTARGET_BUILD_AMDGPU_PLUGIN)
   return()
 endif()
 
-# libhsakmt.a
-find_library(HSAKMT_LIB libhsakmt.a REQURIED HINTS ${CMAKE_INSTALL_PREFIX} PATHS /opt/rocm)
-get_filename_component(HSAKMT_LIB_PATH ${HSAKMT_LIB} DIRECTORY)
-link_directories (${HSAKMT_LIB_PATH})
-
-# lib_amdgpu
-pkg_check_modules(drm_amdgpu REQUIRED IMPORTED_TARGET libdrm_amdgpu)
-
-# lib_drm
-pkg_check_modules(drm REQUIRED IMPORTED_TARGET libdrm)
-
-# libnuma
-find_library(numa libnuma.so REQUIRED HINTS /usr/lib/x86_64-linux-gnu/)
-
 # 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)
 
@@ -117,7 +103,7 @@ add_dependencies(omptarget.rtl.amdgpu.nextgen amdgcn_hostexec_services)
 if (LIBOMP_HAVE_VERSION_SCRIPT_FLAG)
   target_link_libraries(
     omptarget.rtl.amdgpu.nextgen
-    PRIVATE hsakmt
+#    PRIVATE hsakmt
     PRIVATE drm_amdgpu
     PRIVATE drm
     PRIVATE numa

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

@@ -29,7 +29,7 @@
 #include "UtilitiesRTL.h"
 #include "omptarget.h"
 
-#include "hsakmt/hsakmt.h"
+#include "hsakmt/hsakmt.h"    
 
 #include "print_tracing.h"
 
@@ -3491,7 +3491,6 @@ struct AMDGPUPluginTy final : public GenericPluginTy {
     NoMapChecks = BoolEnvar("OMPX_DISABLE_MAPS", true);
     DisableUsmMaps = BoolEnvar("OMPX_DISABLE_USM_MAPS", false);
     HsaXnack = BoolEnvar("HSA_XNACK", false);
-    IsHsaXnackDefined = HsaXnack.isPresent();
   }
 
   void setUpEnv() override final {
@@ -3647,12 +3646,7 @@ struct AMDGPUPluginTy final : public GenericPluginTy {
   }
 
   bool IsXnackEnabled() const {
-    // -1 instructs the runtime to query the XNACK status without modifying it.
-    int32_t enable = -1;
-    KMT_EXPECT_SUCCESS(hsaKmtOpenKFD());
-    KMT_EXPECT_SUCCESS(hsaKmtGetXNACKMode(&enable));
-    KMT_EXPECT_SUCCESS(hsaKmtCloseKFD());
-    return (enable > 0);
+    return ((HsaXnack.get()) || (utils::IsXnackEnabledViaKernelParam()));
   }
 
   bool checkForDeviceByGFXName(const llvm::StringRef GfxLookUpName) {
@@ -3705,7 +3699,6 @@ struct AMDGPUPluginTy final : public GenericPluginTy {
   BoolEnvar NoMapChecks;
   BoolEnvar DisableUsmMaps;
   BoolEnvar HsaXnack;
-  bool IsHsaXnackDefined{false};
 
   // Set by OMPX_APU_MAPS environment variable.
   // If set, maps cause no copy operations. USM is used instead. Allocated

openmp/libomptarget/plugins-nextgen/amdgpu/utils/UtilitiesRTL.h

@@ -199,6 +199,34 @@ extractXnackModeFromBinary(__tgt_device_image *TgtImage) {
   return XNACK_MINUS;
 }
 
+bool IsXnackEnabledViaKernelParam() {
+
+  ErrorOr<std::unique_ptr<MemoryBuffer>> FileOrError =
+      MemoryBuffer::getFileAsStream("/proc/cmdline");
+
+  if (std::error_code ErrorCode = FileOrError.getError()) {
+    FAILURE_MESSAGE("Cannot open /proc/cmdline : %s\n",
+                    ErrorCode.message().c_str());
+    return false;
+  }
+
+  StringRef FileContent = (FileOrError.get())->getBuffer();
+
+  StringRef RefString("amdgpu.noretry=");
+  int SizeOfRefString = RefString.size();
+
+  size_t Pos = FileContent.find_insensitive(RefString);
+  // Is noretry defined?
+  if (Pos != StringRef::npos) {
+    bool NoRetryValue = FileContent[Pos + SizeOfRefString] - '0';
+    // is noretry set to 0
+    if (!NoRetryValue)
+      return true;
+  }
+
+  return false;
+}
+
 void checkImageCompatibilityWithSystemXnackMode(__tgt_device_image *TgtImage,
                                                 bool IsXnackEnabled) {
   XnackBuildMode ImageXnackMode = utils::extractXnackModeFromBinary(TgtImage);