Revert "Revert "Merge branch 'amd-master-next' into amd-npi-next""

This reverts commit 9142674ef0.

Reason for revert: <INSERT REASONING HERE>

Change-Id: I92ceb171e31026ed1864704cef2fc1497b883ef9

hipamd/rocclr/hip_module.cpp

@@ -537,7 +537,7 @@ hipError_t ihipLaunchCooperativeKernelMultiDevice(hipLaunchParams* launchParamsL
     if (result != hipSuccess) {
       break;
     }
-    prevGridSize += launch.gridDim.x * launch.gridDim.y * launch.gridDim.z;
+    prevGridSize += globalWorkSizeX * globalWorkSizeY * globalWorkSizeZ;
   }
 
   // Sync the execution streams on all devices