P4 to Git Change 2034784 by gandryey@gera-hip-lnx on 2019/11/21 16:31:24

SWDEV-79445 - OCL generic changes and code clean-up
	- Enable WGP mode in ROCr GFX10 by default
	- Read GPU_ENABLE_WAVE32_MODE environment variable to control wave32/64 on ROCr

Affected files ...

... //depot/stg/opencl/drivers/opencl/runtime/device/rocm/rocdevice.cpp#142 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/rocm/rocsettings.cpp#46 edit


[ROCm/clr commit: d033b0eee9]

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

@@ -126,8 +126,14 @@ bool Settings::create(bool fullProfile, int gfxipVersion) {
   }
 
   if (gfxipVersion >= 1000) {
-    lcWavefrontSize64_ = false;
+     enableWave32Mode_ = true;
+     enableWgpMode_ = GPU_ENABLE_WGP_MODE;
   }
+  if (!flagIsDefault(GPU_ENABLE_WAVE32_MODE)) {
+    enableWave32Mode_ = GPU_ENABLE_WAVE32_MODE;
+  }
+
+  lcWavefrontSize64_ = !enableWave32Mode_;
 
   // Override current device settings
   override();