P4 to Git Change 1588181 by gandryey@gera-w8 on 2018/08/01 11:39:16

SWDEV-155434 - Add SQTT instrumentation tokens for OpenCL dispatches for RGP support
	- Switch to the workgroup size report for the dispatch info.

Affected files ...

... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palvirtual.cpp#118 edit

rocclr/runtime/device/pal/palvirtual.cpp

@@ -2139,7 +2139,10 @@ bool VirtualGPU::submitKernelInternal(const amd::NDRangeContainer& sizes, const
   // If RGP capturing is enabled, then start SQTT trace
   if (rgpCaptureEna()) {
     dev().rgpCaptureMgr()->PreDispatch(this, hsaKernel,
-      newGlobalSize[0], newGlobalSize[1], newGlobalSize[2]);
+      // Report global size in workgroups, since that's the RGP trace semantics
+      newGlobalSize[0] / sizes.local[0],
+      newGlobalSize[1] / sizes.local[1],
+      newGlobalSize[2] / sizes.local[2]);
   }
 
   bool printfEnabled = (hsaKernel.printfInfo().size() > 0) ? true : false;