From bc8a28c57775877c98dfc2644fc26a562bce4d74 Mon Sep 17 00:00:00 2001 From: foreman Date: Wed, 7 Oct 2015 19:24:44 -0400 Subject: [PATCH] P4 to Git Change 1197728 by xcui@merged_opencl_jxcwin on 2015/10/07 18:15:58 SWDEV-59579 - using existing function to simplify the code. Affected files ... ... //depot/stg/opencl/drivers/opencl/runtime/device/gpu/gpukernel.cpp#301 edit ... //depot/stg/opencl/drivers/opencl/runtime/device/gpu/gpuvirtual.cpp#385 edit --- rocclr/runtime/device/gpu/gpukernel.cpp | 2 +- rocclr/runtime/device/gpu/gpuvirtual.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/rocclr/runtime/device/gpu/gpukernel.cpp b/rocclr/runtime/device/gpu/gpukernel.cpp index bca6be5280..b970cedada 100644 --- a/rocclr/runtime/device/gpu/gpukernel.cpp +++ b/rocclr/runtime/device/gpu/gpukernel.cpp @@ -3756,7 +3756,7 @@ HSAILKernel::loadArguments( } // If finegrainsystem is present then the pointer can be malloced by the app and // passed to kernel directly. If so copy the pointer location to aqlArgBuf - else if ((dev().info().svmCapabilities_ & CL_DEVICE_SVM_FINE_GRAIN_SYSTEM) == 0) { + else if (dev().isFineGrainedSystem()) { return NULL; } break; diff --git a/rocclr/runtime/device/gpu/gpuvirtual.cpp b/rocclr/runtime/device/gpu/gpuvirtual.cpp index ea1915f271..42105e2004 100644 --- a/rocclr/runtime/device/gpu/gpuvirtual.cpp +++ b/rocclr/runtime/device/gpu/gpuvirtual.cpp @@ -3197,7 +3197,7 @@ VirtualGPU::processMemObjectsHSA( // so we can avoid checks of the aliased objects memoryDependency().newKernel(); - bool deviceSupportFGS = 0 != (dev().info().svmCapabilities_ & CL_DEVICE_SVM_FINE_GRAIN_SYSTEM); + bool deviceSupportFGS = 0 != dev().isFineGrainedSystem(); bool supportFineGrainedSystem = deviceSupportFGS; FGSStatus status = kernelParams.getSvmSystemPointersSupport(); switch (status) {