From 0fc8ceaa7314759159d321cb0b005e1ec91bfd52 Mon Sep 17 00:00:00 2001 From: foreman Date: Fri, 14 Nov 2014 11:30:20 -0500 Subject: [PATCH] P4 to Git Change 1097122 by gandryey@gera-dev-w7 on 2014/11/14 11:06:31 ECR #304775 - Rename GPU_MAX_ALLOC_PERCENT to GPU_SINGLE_ALLOC_PERCENT Affected files ... ... //depot/stg/opencl/drivers/opencl/runtime/device/gpu/gpudevice.cpp#482 edit ... //depot/stg/opencl/drivers/opencl/runtime/utils/flags.hpp#219 edit --- rocclr/runtime/device/gpu/gpudevice.cpp | 4 ++-- rocclr/runtime/utils/flags.hpp | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/rocclr/runtime/device/gpu/gpudevice.cpp b/rocclr/runtime/device/gpu/gpudevice.cpp index 91369c631a..9bed8fadd8 100644 --- a/rocclr/runtime/device/gpu/gpudevice.cpp +++ b/rocclr/runtime/device/gpu/gpudevice.cpp @@ -542,7 +542,7 @@ void Device::fillDeviceInfo( } #endif info_.maxMemAllocSize_ = cl_ulong(info_.maxMemAllocSize_ * - std::min(GPU_MAX_ALLOC_PERCENT, 100u) / 100u); + std::min(GPU_SINGLE_ALLOC_PERCENT, 100u) / 100u); //! \note Force max single allocation size. //! 4GB limit for the blit kernels and 64 bit optimizations. @@ -554,7 +554,7 @@ void Device::fillDeviceInfo( info_.globalMemSize_ = (std::min(maxHeapSize, 100u) * calAttr.localRAM / 100u) * Mi; - uint maxAllocSize = flagIsDefault(GPU_MAX_ALLOC_PERCENT) ? 25 : GPU_MAX_ALLOC_PERCENT; + uint maxAllocSize = flagIsDefault(GPU_SINGLE_ALLOC_PERCENT) ? 25 : GPU_SINGLE_ALLOC_PERCENT; info_.maxMemAllocSize_ = cl_ulong(info_.globalMemSize_ * std::min(maxAllocSize, 100u) / 100u); } diff --git a/rocclr/runtime/utils/flags.hpp b/rocclr/runtime/utils/flags.hpp index a32e4132aa..93676d48a2 100644 --- a/rocclr/runtime/utils/flags.hpp +++ b/rocclr/runtime/utils/flags.hpp @@ -116,7 +116,7 @@ release(bool, GPU_IMAGE_DMA, true, \ "Enable DRM DMA for image transfers") \ release(uint, CPU_MAX_ALLOC_PERCENT, 25, \ "Maximum size of a single allocation in MiB") \ -release(uint, GPU_MAX_ALLOC_PERCENT, 75, \ +release(uint, GPU_SINGLE_ALLOC_PERCENT, 75, \ "Maximum size of a single allocation as percentage of total") \ release(uint, GPU_NUM_COMPUTE_RINGS, 2, \ "GPU number of compute rings. 0 - disabled, 1 , 2,.. - the number of compute rings") \