P4 to Git Change 1104627 by gandryey@gera-dev-w7 on 2014/12/11 12:01:30

EPR #411058 - [CQE OCL][Lnx][QR][CZ]MultiDevice_Context fails in 2.0 conformance wimpyfull due to CL# 1101352
	- The detection of different map types is overcomplicated with possibility of multiple maps and multithreading environment. Thus keep USWC indirect map optimization based on the allocation flags.

Affected files ...

... //depot/stg/opencl/drivers/opencl/runtime/device/gpu/gpumemory.cpp#114 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/gpu/gpumemory.hpp#46 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/gpu/gpuvirtual.cpp#342 edit


[ROCm/clr commit: 593d1e3b8d]

projects/clr/rocclr/runtime/device/gpu/gpumemory.cpp

@@ -922,8 +922,7 @@ Memory::allocMapTarget(
     incIndMapCount();
 
     // If host memory exists, use it
-    if ((owner()->getHostMem() != NULL) &&
-        isDirectMap(mapFlags)) {
+    if ((owner()->getHostMem() != NULL) && isDirectMap()) {
         mapAddress = reinterpret_cast<address>(owner()->getHostMem());
     }
     // If resource is a persistent allocation, we can use it directly
@@ -1248,8 +1247,7 @@ Image::allocMapTarget(
     incIndMapCount();
 
     // If host memory exists, use it
-    if ((owner()->getHostMem() != NULL) &&
-        isDirectMap(mapFlags)) {
+    if ((owner()->getHostMem() != NULL) && isDirectMap()) {
         useRemoteResource = false;
         mapAddress = reinterpret_cast<address>(owner()->getHostMem());
         amd::Image* amdImage = owner()->asImage();