P4 to Git Change 1119795 by xcui@merged_opencl_jxcwin on 2015/02/06 20:33:37

EPR #413091 - Back out changelist 1119692

Affected files ...

... //depot/stg/opencl/drivers/opencl/api/opencl/amdocl/cl_svm.cpp#10 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/gpu/gpumemory.cpp#117 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/gpu/gpuresource.cpp#206 edit

rocclr/runtime/device/gpu/gpumemory.cpp

@@ -923,22 +923,6 @@ Memory::allocMapTarget(
     size_t  offset = origin[0];
 
     incIndMapCount();
-    void *initHostPtr = NULL;
-    bool    failed = false;
-
-    if (!owner()->getSvmPtr()) {
-        initHostPtr = owner()->getHostMem();
-        static const bool forceAllocHostMem = true;
-        if (NULL == initHostPtr) {
-            if (!owner()->allocHostMemory(NULL, forceAllocHostMem)) {
-                failed = true;
-            }
-        }
-    }
-    else {
-        owner()->commitSvmMemory();
-        initHostPtr = owner()->getSvmPtr();
-    }
 
     // If host memory exists, use it
     if ((owner()->getHostMem() != NULL) && isDirectMap()) {
@@ -970,7 +954,7 @@ Memory::allocMapTarget(
             amd::Memory*   memory = NULL;
             // Search for a possible indirect resource
             //For SVM implementation, we cannot use cached map. if svm space, use the svm host pointer
-
+            void *initHostPtr = owner()->getSvmPtr();
             cl_mem_flags flag = 0;
             bool canBeCached = true;
             if (NULL != initHostPtr) {