From 3b75ae4ff0da4b0ec287619c7ea0eaff53c4607b Mon Sep 17 00:00:00 2001 From: foreman Date: Fri, 14 Dec 2018 10:44:43 -0500 Subject: [PATCH] P4 to Git Change 1720436 by asalmanp@asalmanp-ocl-stg on 2018/12/14 10:27:28 SWDEV-132899 - [OCL][GFX10] correctly set the wavefrontWidth_ for gfx10. PAL reprots 64 for wavefrontSize so set it to 32 if the below conditions are met: 1- if we are in HSAIL path and GPU_FORCE_WAVE_SIZE_32 is set 2- or if we are in LC path andAsic is Navi10Plus ReviewRequestURL = http://ocltc.amd.com/reviews/r/16329/ Affected files ... ... //depot/stg/opencl/drivers/opencl/runtime/device/pal/paldevice.cpp#120 edit --- rocclr/runtime/device/pal/paldevice.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/rocclr/runtime/device/pal/paldevice.cpp b/rocclr/runtime/device/pal/paldevice.cpp index 72822a94a9..2b997d0ae5 100644 --- a/rocclr/runtime/device/pal/paldevice.cpp +++ b/rocclr/runtime/device/pal/paldevice.cpp @@ -611,7 +611,9 @@ void NullDevice::fillDeviceInfo(const Pal::DeviceProperties& palProp, info_.cuPerShaderArray_ = palProp.gfxipProperties.shaderCore.numCusPerShaderArray; info_.simdWidth_ = hwInfo()->simdWidth_; info_.simdInstructionWidth_ = hwInfo()->simdInstructionWidth_; - info_.wavefrontWidth_ = palProp.gfxipProperties.shaderCore.wavefrontSize; + info_.wavefrontWidth_ = ((settings().gfx10Hsail_ && GPU_FORCE_WAVE_SIZE_32) || + (settings().useLightning_ && ipLevel_ >= Pal::GfxIpLevel::GfxIp10_1)) ? + 32 :palProp.gfxipProperties.shaderCore.wavefrontSize; info_.availableSGPRs_ = palProp.gfxipProperties.shaderCore.numAvailableSgprs; info_.globalMemChannelBanks_ = 4;