P4 to Git Change 1462147 by asalmanp@asalmanp-ocl-stg on 2017/09/22 10:49:57

SWDEV-132899 - [OCL][GFX10] Add support for GFX10

	Adjusting WaveFrontSize for Null Devices based on the gfxip (the WaveFrontSize is 32 for gfxip10)

	ReviewBoardURL = http://ocltc.amd.com/reviews/r/13486/

Affected files ...

... //depot/stg/opencl/drivers/opencl/runtime/device/pal/paldevice.cpp#63 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palkernel.cpp#37 edit


[ROCm/clr commit: cb4585939d]

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

@@ -406,7 +406,7 @@ bool HSAILKernel::aqlCreateHWInfo(amd::hsa::loader::Symbol* sym) {
     workGroupInfo_.availableVGPRs_ =
         dev().properties().gfxipProperties.shaderCore.numAvailableVgprs;
     workGroupInfo_.preferredSizeMultiple_ = workGroupInfo_.wavefrontPerSIMD_ =
-        dev().properties().gfxipProperties.shaderCore.wavefrontSize;
+        dev().info().wavefrontWidth_;
   } else {
     workGroupInfo_.availableLDSSize_ = 64 * Ki;
     workGroupInfo_.availableSGPRs_ = 104;
@@ -652,8 +652,7 @@ bool HSAILKernel::init(amd::hsa::loader::Symbol* sym, bool finalize) {
   }
 
   // Copy wavefront size
-  workGroupInfo_.wavefrontSize_ =
-      prog().isNull() ? 64 : dev().properties().gfxipProperties.shaderCore.wavefrontSize;
+  workGroupInfo_.wavefrontSize_ = dev().info().wavefrontWidth_;
   // Find total workgroup size
   if (workGroupInfo_.compileSize_[0] != 0) {
     workGroupInfo_.size_ = workGroupInfo_.compileSize_[0] * workGroupInfo_.compileSize_[1] *
@@ -1533,8 +1532,7 @@ bool LightningKernel::init(amd::hsa::loader::Symbol* symbol) {
   }
 
   // Copy wavefront size
-  workGroupInfo_.wavefrontSize_ =
-      prog().isNull() ? 64 : dev().properties().gfxipProperties.shaderCore.wavefrontSize;
+  workGroupInfo_.wavefrontSize_ = dev().info().wavefrontWidth_;
   // Find total workgroup size
   if (workGroupInfo_.compileSize_[0] != 0) {
     workGroupInfo_.size_ = workGroupInfo_.compileSize_[0] * workGroupInfo_.compileSize_[1] *