P4 to Git Change 1561216 by gandryey@gera-w8 on 2018/05/29 18:05:31

SWDEV-79445 - OCL generic changes and code clean-up
	- Remove parent_ field from the device object, since it was used for subdevices only.

Affected files ...

... //depot/stg/opencl/drivers/opencl/api/opencl/amdocl/cl_device.cpp#72 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/device.cpp#219 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/device.hpp#304 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/gpu/gpudevice.cpp#590 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/pal/paldevice.cpp#91 edit
... //depot/stg/opencl/drivers/opencl/runtime/platform/context.cpp#52 edit
... //depot/stg/opencl/drivers/opencl/runtime/platform/program.cpp#94 edit
... //depot/stg/opencl/drivers/opencl/runtime/platform/program.hpp#45 edit

rocclr/runtime/platform/context.cpp

@@ -315,9 +315,8 @@ void Context::svmFree(void* ptr) const {
 }
 
 bool Context::containsDevice(const Device* device) const {
-
   for (const auto& it : devices_) {
-    if (device == it || it->isAncestor(device)) {
+    if (device == it) {
       return true;
     }
   }

rocclr/runtime/platform/program.cpp

@@ -62,7 +62,7 @@ cl_int Program::addDeviceProgram(Device& device, const void* image, size_t lengt
     return CL_INVALID_VALUE;
   }
 
-  Device& rootDev = device.rootDevice();
+  Device& rootDev = device;
 
   // if the rootDev is already associated with a program
   if (devicePrograms_[&rootDev] != NULL) {
@@ -150,7 +150,7 @@ cl_int Program::addDeviceProgram(Device& device, const void* image, size_t lengt
 }
 
 device::Program* Program::getDeviceProgram(const Device& device) const {
-  const auto it = devicePrograms_.find(&device.rootDevice());
+  const auto it = devicePrograms_.find(&device);
   if (it == devicePrograms_.cend()) {
     return NULL;
   }
@@ -613,20 +613,11 @@ bool Symbol::setDeviceKernel(const Device& device, const device::Kernel* func) {
 }
 
 const device::Kernel* Symbol::getDeviceKernel(const Device& device) const {
-  const devicekernels_t* devKernels = &deviceKernels_;
-  const auto itEnd = devKernels->cend();
-  auto it = devKernels->find(&device);
-  if (it != itEnd) {
+  auto it = deviceKernels_.find(&device);
+  if (it != deviceKernels_.cend()) {
     return it->second;
   }
-
-  for (it = devKernels->cbegin(); it != itEnd; ++it) {
-    if (it->first->isAncestor(&device)) {
-      return it->second;
-    }
-  }
-
-  return NULL;
+  return nullptr;
 }
 
 }  // namespace amd

rocclr/runtime/platform/program.hpp

@@ -149,7 +149,7 @@ class Program : public RuntimeObject {
   const Symbol* findSymbol(const char* name) const;
 
   //! Return the binary image.
-  const binary_t& binary(const Device& device) { return binary_[&device.rootDevice()]; }
+  const binary_t& binary(const Device& device) { return binary_[&device]; }
 
   //! Return the program kernel names
   const std::string& kernelNames() const { return kernelNames_; }