P4 to Git Change 1059564 by gandryey@gera-dev-w7 on 2014/07/25 18:14:33

ECR #304775 - Device enqueuing
	- Run the scheduler in the host queue by default.
	- GPU_USE_DEVICE_QUEUE=1 can force execution in the device queue

Affected files ...

... //depot/stg/opencl/drivers/opencl/runtime/device/gpu/gpudevice.cpp#451 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/gpu/gpudevice.hpp#128 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/gpu/gpukernel.cpp#260 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/gpu/gpusched.hpp#10 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/gpu/gpuschedcl.cpp#23 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/gpu/gpusettings.cpp#273 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/gpu/gpusettings.hpp#86 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/gpu/gpuvirtual.cpp#327 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/gpu/gpuvirtual.hpp#119 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/gpu/gslbe/src/rt/GSLContext.cpp#62 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/gpu/gslbe/src/rt/GSLContext.h#36 edit
... //depot/stg/opencl/drivers/opencl/runtime/utils/flags.hpp#208 edit

rocclr/runtime/device/gpu/gpukernel.cpp

@@ -3975,7 +3975,17 @@ HSAILKernel::loadArguments(
             const amd::DeviceQueue* queue =
                 *reinterpret_cast<amd::DeviceQueue* const*>(paramaddr);
             VirtualGPU* gpuQueue = static_cast<VirtualGPU*>(queue->vDev());
-            uint64_t vmQueue = gpuQueue->vQueue()->vmAddress();
+            uint64_t vmQueue;
+            if (dev().settings().useDeviceQueue_) {
+                vmQueue = gpuQueue->vQueue()->vmAddress();
+            }
+            else {
+                if (!gpu.createVirtualQueue(queue->size())) {
+                    LogError( "Virtual queue creaiton failed!");
+                    return false;
+                }
+                vmQueue = gpu.vQueue()->vmAddress();
+            }
             WriteAqlArg(&aqlArgBuf, &vmQueue, sizeof(void*));
             break;
         }