P4 to Git Change 1205907 by jatang@jatang-opencl-hsa-stg1 on 2015/10/30 09:46:25

SWDEV-56468 - Support wave limiter in HSAIL path - Resubmit 1200206.

Affected files ...

... //depot/stg/opencl/drivers/opencl/runtime/device/gpu/gpukernel.cpp#306 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/gpu/gpukernel.hpp#123 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/gpu/gpuvirtual.cpp#388 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/gpu/gpuwavelimiter.cpp#12 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/gpu/gpuwavelimiter.hpp#8 edit

rocclr/runtime/device/gpu/gpuvirtual.cpp

@@ -1791,7 +1791,7 @@ VirtualGPU::submitKernelInternalHSA(
         // Run AQL dispatch in HW
         eventBegin(MainEngine);
         cs()->AqlDispatch(aqlPkt, vmMems(), cal_.memCount_, scratch, scratchOffset,
-            hsaKernel.cpuAqlCode(), hsaQueueMem_->vmAddress(), pKernelInfo, 0);
+            hsaKernel.cpuAqlCode(), hsaQueueMem_->vmAddress(), pKernelInfo, hsaKernel.getWavesPerSH(this));
         eventEnd(MainEngine, gpuEvent);
 
         if (dbgManager && (NULL != dbgManager->postDispatchCallBackFunc())) {