P4 to Git Change 1368253 by gandryey@gera-w8 on 2017/02/01 18:29:08

SWDEV-112352 - [ROCm CQE][OCLonLC][QR][G] Aborted/Segmentation fault is observed with "sub_buffers_read_write_dual_devices" of Buffers, due to CL#1364923
	- Keep system memory for multiple devices in case of possible initialization on the second device

Affected files ...

... //depot/stg/opencl/drivers/opencl/runtime/device/rocm/rocdevice.cpp#41 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/rocm/rocmemory.cpp#9 edit

rocclr/runtime/device/rocm/rocdevice.cpp

@@ -1417,7 +1417,9 @@ Device::createMemory(amd::Memory &owner) const
                                       amd::Coord3D(0, 0, 0), imageView->getRegion(),
                                       0,
                                       0, true);
-        if (owner.getMemFlags() & CL_MEM_COPY_HOST_PTR) {
+        // Release host memory for single device, since runtime copied data
+        if ((owner.getMemFlags() & CL_MEM_COPY_HOST_PTR) &&
+            (owner.getContext().devices().size() == 1)) {
             owner.setHostMem(nullptr);
         }