From 6a712e8c6005b3457ae7d0e27e70da15539bd94c Mon Sep 17 00:00:00 2001 From: foreman Date: Tue, 14 Jun 2016 16:10:52 -0400 Subject: [PATCH] P4 to Git Change 1279733 by gandryey@gera-w8 on 2016/06/14 15:36:09 SWDEV-95917 - OpenCL on PAL - add device info query to get the number of aysnc queues - Correct the number of normal compute queues - Fix concurrency test workloads Affected files ... ... //depot/stg/opencl/drivers/opencl/runtime/device/pal/paldevice.cpp#10 edit ... //depot/stg/opencl/drivers/opencl/tests/ocltst/module/perf/OCLPerfConcurrency.cpp#19 edit ... //depot/stg/opencl/drivers/opencl/tests/ocltst/module/perf/OCLPerfConcurrency.h#5 edit [ROCm/clr commit: c7522d11c4968595ed866696f6d1c2b1cceba1ae] --- projects/clr/rocclr/runtime/device/pal/paldevice.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/projects/clr/rocclr/runtime/device/pal/paldevice.cpp b/projects/clr/rocclr/runtime/device/pal/paldevice.cpp index 30691785cf..9fe842fa0b 100644 --- a/projects/clr/rocclr/runtime/device/pal/paldevice.cpp +++ b/projects/clr/rocclr/runtime/device/pal/paldevice.cpp @@ -414,7 +414,7 @@ void NullDevice::fillDeviceInfo( info_.simdWidth_ = hwInfo()->simdWidth_; info_.simdInstructionWidth_ = hwInfo()->simdInstructionWidth_; info_.wavefrontWidth_ = palProp.gfxipProperties.shaderCore.wavefrontSize; - //info_.globalMemChannels_ = calAttr.memBusWidth / 32; + //info_.globalMemChannels_ = palProp.gpuMemoryProperties.performance.vramBusBitWidth / 32; //info_.globalMemChannelBanks_ = calAttr.numMemBanks; info_.globalMemChannelBankWidth_ = hwInfo()->memChannelBankWidth_; info_.localMemSizePerCU_ = hwInfo()->localMemSizePerCU_; @@ -647,7 +647,8 @@ Device::create(Pal::IDevice* device) // Find the number of available engines numComputeEngines_ = - properties().engineProperties[Pal::QueueTypeCompute].engineCount; + properties().engineProperties[Pal::QueueTypeCompute].engineCount - + properties().engineProperties[Pal::QueueTypeCompute].numExclusiveComputeEngines; numDmaEngines_ = properties().engineProperties[Pal::QueueTypeDma].engineCount; @@ -655,6 +656,7 @@ Device::create(Pal::IDevice* device) // Modify settings here // palSettings ... palSettings->textureOptLevel = Pal::TextureFilterOptimizationsDisabled; + //palSettings->forceHighClocks = appProfile_.enableHighPerformanceState(); // Commit the new settings for the device result = iDev()->CommitSettingsAndInit();