SWDEV-556684 - Remove HSAIL support (#1183)

projects/clr/rocclr/device/rocm/rocdevice.cpp

@@ -125,8 +125,7 @@ bool NullDevice::create(const amd::Isa& isa) {
   info_.oclcVersion_ = "OpenCL C " OPENCL_C_VERSION_STR " ";
   info_.spirVersions_ = "";
   std::stringstream ss;
-  ss << AMD_BUILD_STRING " (HSA," << (settings().useLightning_ ? "LC" : "HSAIL");
-  ss << ") [Offline]";
+  ss << AMD_BUILD_STRING " (HSA,LC) [Offline]";
   ::strncpy(info_.driverVersion_, ss.str().c_str(), sizeof(info_.driverVersion_) - 1);
   info_.version_ = "OpenCL " OPENCL_VERSION_STR " ";
   return true;
@@ -704,12 +703,7 @@ bool Device::create() {
 
 // ================================================================================================
 device::Program* NullDevice::createProgram(amd::Program& owner, amd::option::Options* options) {
-  device::Program* program;
-  if (settings().useLightning_) {
-    program = new LightningProgram(*this, owner);
-  } else {
-    program = new HSAILProgram(*this, owner);
-  }
+  device::Program* program = new roc::Program(*this, owner);
 
   if (program == nullptr) {
     LogError("Memory allocation has failed!");
@@ -722,19 +716,15 @@ bool Device::createBlitProgram() {
   bool result = true;
   std::string extraKernel;
 
-#if defined(USE_COMGR_LIBRARY)
-  if (settings().useLightning_) {
-    if (amd::IS_HIP) {
-      if (settings().gwsInitSupported_) {
-        extraKernel = device::HipExtraSourceCode;
-      } else {
-        extraKernel = device::HipExtraSourceCodeNoGWS;
-      }
+  if (amd::IS_HIP) {
+    if (settings().gwsInitSupported_) {
+      extraKernel = device::HipExtraSourceCode;
     } else {
-      extraKernel = SchedulerSourceCode;
+      extraKernel = device::HipExtraSourceCodeNoGWS;
     }
+  } else {
+    extraKernel = SchedulerSourceCode;
   }
-#endif  // USE_COMGR_LIBRARY
 
   blitProgram_ = new BlitProgram(context_);
   // Create blit programs
@@ -749,12 +739,7 @@ bool Device::createBlitProgram() {
 }
 
 device::Program* Device::createProgram(amd::Program& owner, amd::option::Options* options) {
-  device::Program* program;
-  if (settings().useLightning_) {
-    program = new LightningProgram(*this, owner);
-  } else {
-    program = new HSAILProgram(*this, owner);
-  }
+  device::Program* program = new roc::Program(*this, owner);
 
   if (program == nullptr) {
     LogError("Memory allocation has failed!");
@@ -1305,9 +1290,7 @@ bool Device::populateOCLDeviceConstants() {
     return false;
   }
   std::stringstream ss;
-  ss << AMD_BUILD_STRING " (HSA" << major << "." << minor << ","
-     << (settings().useLightning_ ? "LC" : "HSAIL");
-  ss << ")";
+  ss << AMD_BUILD_STRING " (HSA" << major << "." << minor << ",LC)";
 
   ::strncpy(info_.driverVersion_, ss.str().c_str(), sizeof(info_.driverVersion_) - 1);
 
@@ -1480,10 +1463,6 @@ bool Device::populateOCLDeviceConstants() {
       if (info_.iommuv2_ || isa().versionMajor() >= 8) {
         info_.svmCapabilities_ |= CL_DEVICE_SVM_ATOMICS;
       }
-    } else if (!settings().useLightning_) {
-      if (info_.iommuv2_ || (isa().versionMajor() == 8)) {
-        info_.svmCapabilities_ |= CL_DEVICE_SVM_ATOMICS;
-      }
     }
   }