P4 to Git Change 1395358 by gandryey@gera-w8 on 2017/04/06 18:05:03

SWDEV-118182 - OpenCL runtime picks up wrong DLL if AMD APP SDK is installed
	- Add driver store path to the dll name

Affected files ...

... //depot/stg/opencl/drivers/opencl/runtime/device/gpu/gpudevice.cpp#565 edit

rocclr/runtime/device/gpu/gpudevice.cpp

@@ -183,6 +183,7 @@ NullDevice::create(CALtarget target)
     if (NULL == compiler_) {
 #if !defined(ATI_OS_LINUX)
         char CompilerLibrary[220] = "";
+        strcpy_s(CompilerLibrary, calAttr.driverStore);
         strcat_s(CompilerLibrary, "amdocl12cl" LP64_SWITCH("", "64") ".dll");
 #endif
         const char *library = getenv("COMPILER_LIBRARY");
@@ -977,6 +978,7 @@ Device::create(CALuint ordinal, CALuint numOfDevices)
     if (NULL == compiler_) {
 #if !defined(ATI_OS_LINUX)
         char CompilerLibrary[220] = "";
+        strcpy_s(CompilerLibrary, getAttribs().driverStore);
         strcat_s(CompilerLibrary, "amdocl12cl" LP64_SWITCH("", "64") ".dll");
 #endif