From ab59c1e7fa551f3984ca19af19cae901dc3e2de5 Mon Sep 17 00:00:00 2001
From: German <German.Andryeyev@amd.com>
Date: Tue, 9 Jan 2024 17:50:46 -0500
Subject: [PATCH] SWDEV-301667 - Fix HSAIL compilation path for Blit

Recently some unused compiler options for HSAIL path were removed,
 but it affected blit kernels compilation. Hence, remove those options.
Also delete assert for device to device copy in SDMA path for now.

Change-Id: Ib5d7f063af2ab4a3fc5d73d426e39c391b1011ac


[ROCm/clr commit: eaa61fc74040a8104119fa4309f4f5245cbc8f8f]
---
 projects/clr/rocclr/device/device.cpp          | 2 +-
 projects/clr/rocclr/device/pal/palresource.cpp | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/projects/clr/rocclr/device/device.cpp b/projects/clr/rocclr/device/device.cpp
index 0249f31d6d..ac91003104 100644
--- a/projects/clr/rocclr/device/device.cpp
+++ b/projects/clr/rocclr/device/device.cpp
@@ -446,7 +446,7 @@ bool Device::BlitProgram::create(amd::Device* device, const std::string& extraKe
   // Build all kernels
   std::string opt = "-cl-internal-kernel ";
   if (!device->settings().useLightning_) {
-    opt += "-Wf,--force_disable_spir -fno-lib-no-inline -fno-sc-keep-calls ";
+    opt += "-Wf,--force_disable_spir ";
   }
 
   if (!extraOptions.empty()) {
diff --git a/projects/clr/rocclr/device/pal/palresource.cpp b/projects/clr/rocclr/device/pal/palresource.cpp
index d4b1141475..9315d18730 100644
--- a/projects/clr/rocclr/device/pal/palresource.cpp
+++ b/projects/clr/rocclr/device/pal/palresource.cpp
@@ -1474,7 +1474,6 @@ bool Resource::partialMemCopyTo(VirtualGPU& gpu, const amd::Coord3D& srcOrigin,
   GpuEvent event;
   EngineType activeEngineID = gpu.engineID_;
   static const bool waitOnBusyEngine = true;
-  assert(!(desc().cardMemory_ && dstResource.desc().cardMemory_) && "Unsupported configuraiton!");
   uint64_t gpuMemoryOffset = 0;
   uint64_t gpuMemoryRowPitch = 0;
   uint64_t imageOffsetx = 0;