P4 to Git Change 1599472 by gandryey@gera-w8 on 2018/08/29 12:25:34

SWDEV-79445 - OCL generic changes and code clean-up
	- Move FindLocalWorkSize() logic to the abstraction layer
	- Replace the ROCr path with the common FindLocalWorkSize() functionality

Affected files ...

... //depot/stg/opencl/drivers/opencl/runtime/device/device.cpp#227 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/device.hpp#314 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/devkernel.cpp#3 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/devkernel.hpp#3 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/gpu/gpukernel.cpp#330 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/gpu/gpukernel.hpp#132 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palkernel.cpp#63 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palkernel.hpp#22 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/rocm/rockernel.cpp#42 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/rocm/rocsettings.cpp#36 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/rocm/rocsettings.hpp#16 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/rocm/rocvirtual.cpp#67 edit

rocclr/runtime/device/device.cpp

@@ -585,6 +585,37 @@ Settings::Settings() {
                          //!< concurrent Virtual GPUs for default
 }
 
+void Memory::saveMapInfo(const void* mapAddress, const amd::Coord3D origin,
+  const amd::Coord3D region, uint mapFlags, bool entire,
+  amd::Image* baseMip) {
+  // Map/Unmap must be serialized.
+  amd::ScopedLock lock(owner()->lockMemoryOps());
+
+  WriteMapInfo info = {};
+  WriteMapInfo* pInfo = &info;
+  auto it = writeMapInfo_.find(mapAddress);
+  if (it != writeMapInfo_.end()) {
+    LogWarning("Double map of the same or overlapped region!");
+    pInfo = &it->second;
+  }
+
+  if (mapFlags & (CL_MAP_WRITE | CL_MAP_WRITE_INVALIDATE_REGION)) {
+    pInfo->origin_ = origin;
+    pInfo->region_ = region;
+    pInfo->entire_ = entire;
+    pInfo->unmapWrite_ = true;
+  }
+  if (mapFlags & CL_MAP_READ) {
+    pInfo->unmapRead_ = true;
+  }
+  pInfo->baseMip_ = baseMip;
+
+  // Insert into the map if it's the first region
+  if (++pInfo->count_ == 1) {
+    writeMapInfo_.insert({ mapAddress, info });
+  }
+}
+
 Program::Program(amd::Device& device)
     : device_(device),
       type_(TYPE_NONE),