P4 to Git Change 1478682 by wchau@wchau_OCL_boltzmann on 2017/11/03 16:13:20

SWDEV-135791 - Set kernel max work group size from metadata

Affected files ...

... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palkernel.cpp#39 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/rocm/rockernel.cpp#29 edit


[ROCm/clr commit: ebc3b138a7]

projects/clr/rocclr/runtime/device/pal/palkernel.cpp

@@ -1533,12 +1533,10 @@ bool LightningKernel::init(amd::hsa::loader::Symbol* symbol) {
 
   // Copy wavefront size
   workGroupInfo_.wavefrontSize_ = dev().info().wavefrontWidth_;
-  // Find total workgroup size
-  if (workGroupInfo_.compileSize_[0] != 0) {
-    workGroupInfo_.size_ = workGroupInfo_.compileSize_[0] * workGroupInfo_.compileSize_[1] *
-        workGroupInfo_.compileSize_[2];
-  } else {
-    workGroupInfo_.size_ = dev().info().preferredWorkGroupSize_;
+
+  workGroupInfo_.size_ = kernelMD->mCodeProps.mMaxFlatWorkGroupSize;
+  if (workGroupInfo_.size_ == 0) {
+    return false;
   }
 
   initPrintf(programMD->mPrintf);

projects/clr/rocclr/runtime/device/rocm/rockernel.cpp

@@ -716,11 +716,9 @@ bool Kernel::init_LC() {
 
   workGroupInfo_.wavefrontSize_ = wavefront_size;
 
-  if (workGroupInfo_.compileSize_[0] != 0) {
-    workGroupInfo_.size_ = workGroupInfo_.compileSize_[0] * workGroupInfo_.compileSize_[1] *
-        workGroupInfo_.compileSize_[2];
-  } else {
-    workGroupInfo_.size_ = program_->dev().info().preferredWorkGroupSize_;
+  workGroupInfo_.size_ = kernelMD->mCodeProps.mMaxFlatWorkGroupSize;
+  if (workGroupInfo_.size_ == 0) {
+    return false;
   }
 
   initPrintf_LC(programMD->mPrintf);