P4 to Git Change 1775995 by gandryey@gera-w8 on 2019/04/29 13:46:53

SWDEV-79445 - OCL generic changes and code clean-up
	- Enable P2P extension for PAL path, currently it's staging copy only
	- Fix P2P staging copy

Affected files ...

... //depot/stg/opencl/drivers/opencl/api/hip/hip_memory.cpp#55 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/device.cpp#243 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/device.hpp#336 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/pal/paldevice.cpp#130 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palsettings.cpp#77 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palvirtual.cpp#131 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palvirtual.hpp#59 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/rocm/rocdevice.cpp#124 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/rocm/rocdevice.hpp#36 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/rocm/rocvirtual.cpp#74 edit
... //depot/stg/opencl/drivers/opencl/runtime/platform/command.cpp#92 edit

rocclr/runtime/platform/command.cpp

@@ -552,6 +552,16 @@ bool CopyMemoryP2PCommand::validateMemory() {
     LogPrintfError("Can't allocate memory size - 0x%08X bytes!", memory2_->getSize());
     return false;
   }
+  if (devices[0]->P2PStage() != nullptr) {
+    amd::ScopedLock lock(devices[0]->P2PStageOps());
+    // Make sure runtime allocates memory on every device
+    for (uint d = 0; d < devices[0]->GlbCtx().devices().size(); ++d) {
+      device::Memory* mem = devices[0]->P2PStage()->getDeviceMemory(*devices[0]->GlbCtx().devices()[d]);
+      if (nullptr == mem) {
+        return false;
+      }
+    }
+  }
   return true;
 }