From 1c7ab5d312df4fb27ccac3b26b0a863f2e778b5d Mon Sep 17 00:00:00 2001 From: foreman Date: Fri, 13 Feb 2015 17:49:06 -0500 Subject: [PATCH] P4 to Git Change 1122235 by xcui@merged_opencl_jxcwin on 2015/02/13 17:28:52 EPR #413091 - move commit svm host memory into allocmaptarget and added hostmemref as the backing store for multiple gpu cases Affected files ... ... //depot/stg/opencl/drivers/opencl/api/opencl/amdocl/cl_memobj.cpp#73 edit ... //depot/stg/opencl/drivers/opencl/api/opencl/amdocl/cl_svm.cpp#11 edit ... //depot/stg/opencl/drivers/opencl/runtime/device/gpu/gpukernel.cpp#280 edit ... //depot/stg/opencl/drivers/opencl/runtime/device/gpu/gpumemory.cpp#118 edit ... //depot/stg/opencl/drivers/opencl/runtime/platform/memory.cpp#115 edit --- opencl/api/opencl/amdocl/cl_memobj.cpp | 5 ----- opencl/api/opencl/amdocl/cl_svm.cpp | 1 - 2 files changed, 6 deletions(-) diff --git a/opencl/api/opencl/amdocl/cl_memobj.cpp b/opencl/api/opencl/amdocl/cl_memobj.cpp index 0a03c66320..f281c73fe7 100644 --- a/opencl/api/opencl/amdocl/cl_memobj.cpp +++ b/opencl/api/opencl/amdocl/cl_memobj.cpp @@ -3221,11 +3221,6 @@ RUNTIME_ENTRY_RET(void *, clEnqueueMapBuffer, ( *not_null(errcode_ret) = CL_MEM_OBJECT_ALLOCATION_FAILURE; return NULL; } - // Make sure the svm host memory is commited if the buffer is SVM buffer - void* svmPtr = srcBuffer->getSvmPtr(); - if (NULL != svmPtr) { - srcBuffer->commitSvmMemory(); - } if (srcBuffer->getMemFlags() & CL_MEM_USE_PERSISTENT_MEM_AMD) { // [Windows VidMM restriction] diff --git a/opencl/api/opencl/amdocl/cl_svm.cpp b/opencl/api/opencl/amdocl/cl_svm.cpp index 20fe587d3f..fa8f673f47 100644 --- a/opencl/api/opencl/amdocl/cl_svm.cpp +++ b/opencl/api/opencl/amdocl/cl_svm.cpp @@ -756,7 +756,6 @@ RUNTIME_ENTRY(cl_int, clEnqueueSVMMap, ( return CL_INVALID_CONTEXT; } - svmMem->commitSvmMemory(); offset = static_cast
(svm_ptr) - static_cast
(svmMem->getSvmPtr()); if (offset < 0 || offset + size > svmMem->getSize()) { LogWarning("wrong svm address ");