From ac06dab5508f9bd4758fef6dcd105d3e73b474c5 Mon Sep 17 00:00:00 2001
From: Jason Tang <jason.tang@amd.com>
Date: Wed, 10 Feb 2021 18:45:19 -0500
Subject: [PATCH] SWDEV-265304 - Disable GFX8 in LinuxPro ROCr build

Change-Id: Ia26bb025a133a4acb255a539a45668975019cc6e


[ROCm/clr commit: c65be06c4cb4f6dcb3800d31289d4a570595ba35]
---
 projects/clr/rocclr/CMakeLists.txt            | 6 ++++++
 projects/clr/rocclr/device/rocm/rocdevice.cpp | 8 ++++++++
 projects/clr/rocclr/platform/activity.cpp     | 5 +++++
 3 files changed, 19 insertions(+)

diff --git a/projects/clr/rocclr/CMakeLists.txt b/projects/clr/rocclr/CMakeLists.txt
index ab6fc66d4c..2c3466e8b8 100644
--- a/projects/clr/rocclr/CMakeLists.txt
+++ b/projects/clr/rocclr/CMakeLists.txt
@@ -120,6 +120,12 @@ if(DEV_LOG_ENABLE MATCHES "yes")
   add_definitions(-DDEV_LOG_ENABLE)
 endif()
 
+option(BUILD_LINUXPRO "Build LinuxPro" OFF)
+if (BUILD_LINUXPRO)
+  message(STATUS "Building LinuxPro")
+  add_definitions(-DROCCLR_DISABLE_PREVEGA)
+endif()
+
 option(BUILD_PAL "Build PAL backend" OFF)
 if (BUILD_PAL)
   add_subdirectory(device/pal)
diff --git a/projects/clr/rocclr/device/rocm/rocdevice.cpp b/projects/clr/rocclr/device/rocm/rocdevice.cpp
index 89c118c225..d726bf6304 100644
--- a/projects/clr/rocclr/device/rocm/rocdevice.cpp
+++ b/projects/clr/rocclr/device/rocm/rocdevice.cpp
@@ -630,6 +630,14 @@ bool Device::create() {
     return false;
   }
 
+#if ROCCLR_DISABLE_PREVEGA
+  if (isa->versionMajor() < 9) {
+    LogPrintfError("Disabled HSA device %s (PCI ID %x) for ISA %s", agent_name, pciDeviceId_,
+                   isa_name.data());
+    return false;
+  }
+#endif
+
   if (HSA_STATUS_SUCCESS !=
       hsa_agent_get_info(_bkendDevice, HSA_AGENT_INFO_PROFILE, &agent_profile_)) {
     LogPrintfError("Unable to get profile for HSA device %s (PCI ID %x)", agent_name, pciDeviceId_);
diff --git a/projects/clr/rocclr/platform/activity.cpp b/projects/clr/rocclr/platform/activity.cpp
index ebdc8ae1e9..34a9f6b235 100644
--- a/projects/clr/rocclr/platform/activity.cpp
+++ b/projects/clr/rocclr/platform/activity.cpp
@@ -54,6 +54,11 @@ const char* getOclCommandKindString(uint32_t op) {
     CASE_STRING(CL_COMMAND_BARRIER, Barrier)
     CASE_STRING(CL_COMMAND_MIGRATE_MEM_OBJECTS, MigrateMemObjects)
     CASE_STRING(CL_COMMAND_FILL_IMAGE, FillImage)
+    CASE_STRING(CL_COMMAND_SVM_FREE, SvmFree)
+    CASE_STRING(CL_COMMAND_SVM_MEMCPY, SvmMemcpy)
+    CASE_STRING(CL_COMMAND_SVM_MEMFILL, SvmMemFill)
+    CASE_STRING(CL_COMMAND_SVM_MAP, SvmMap)
+    CASE_STRING(CL_COMMAND_SVM_UNMAP, SvmUnmap)
     default: case_string = "Unknown command type";
   };
   return case_string;