P4 to Git Change 1593708 by vsytchen@vsytchen-win10 on 2018/08/14 18:51:20

SWDEV-145570 - [HIP] use IS_HIP variable to determine SVM size

	ReviewBoardURL = http://ocltc.amd.com/reviews/r/15632/diff/

Affected files ...

... //depot/stg/opencl/drivers/opencl/runtime/device/pal/paldevice.cpp#103 edit
... //depot/stg/opencl/drivers/opencl/runtime/utils/flags.hpp#295 edit

rocclr/runtime/device/pal/paldevice.cpp

@@ -1169,11 +1169,6 @@ bool Device::init() {
 #endif
   info.pSettingsPath = "OCL";
   info.maxSvmSize = static_cast<Pal::gpusize>(OCL_SET_SVM_SIZE * Mi);
-#if defined(BUILD_HIP)
-  if (flagIsDefault(OCL_SET_SVM_SIZE)) {
-    info.maxSvmSize = static_cast<Pal::gpusize>(16384 * Mi);
-  }
-#endif
 
   // PAL init
   if (Pal::Result::Success != Pal::CreatePlatform(info, platformObj_, &platform_)) {

rocclr/runtime/utils/flags.hpp

@@ -157,7 +157,7 @@ release(bool, DISABLE_DEFERRED_ALLOC, false,                                  \
         "Disables deferred memory allocation on device")                      \
 release(int, AMD_GPU_FORCE_SINGLE_FP_DENORM, -1,                              \
         "Force denorm for single precision: -1 - don't force, 0 - disable, 1 - enable") \
-release(uint, OCL_SET_SVM_SIZE, 4096,                                         \
+release(uint, OCL_SET_SVM_SIZE, IF(IS_HIP, 16384, 4096),                      \
         "set SVM space size for discrete GPU")                                \
 debug(uint, OCL_SYSMEM_REQUIREMENT, 2,                                        \
         "Use flag to change the minimum requirement of system memory not to downgrade")        \