P4 to Git Change 1704468 by zukhan@zukhan-lc-win10 on 2018/11/08 13:59:26

SWDEV-164783 - [ROCm QA][G][QR] Wimpyfull ->Buffer->sub_buffers_read_write_dual_devices test is failing
	- Problem looks to be due to a change made in rocmemory.cpp in allocMapTarget() function.
	- The issue was that Vlad modified the host memory that was being returned by using 'mapMemory_' vs 'owner()' as a pointer to use 'getHostMem()'.
	- Added the old logic back in while also maintaining Vlads logic, and the test is now passing.

Affected files ...

... //depot/stg/opencl/drivers/opencl/runtime/device/rocm/rocmemory.cpp#40 edit


[ROCm/clr commit: 33f1e46cc3]

projects/clr/rocclr/runtime/device/rocm/rocmemory.cpp

@@ -121,10 +121,13 @@ void* Memory::allocMapTarget(const amd::Coord3D& origin, const amd::Coord3D& reg
   }
 
   void* mappedMemory = nullptr;
+  void* hostMem = owner()->getHostMem();
 
   if (owner()->getSvmPtr() != nullptr) {
     owner()->commitSvmMemory();
     mappedMemory = owner()->getSvmPtr();
+  } else if (hostMem != nullptr) {    // Otherwise, check for host memory.
+    return (reinterpret_cast<address>(hostMem) + origin[0]);
   } else {
     mappedMemory = reinterpret_cast<address>(mapMemory_->getHostMem()) + origin[0];
   }