P4 to Git Change 1057020 by skudchad@skudchad_opencl_win_2 on 2014/07/18 20:31:56

ECR #304775 - Change to OpenCL 2.0 in library properties. Some cleanup for OPENCL_MAINLINE

Affected files ...

... //depot/stg/opencl/drivers/opencl/api/opencl/amdocl/amdocl.rc#4 edit
... //depot/stg/opencl/drivers/opencl/compiler/lib/api/v0_8/acl.cpp#19 edit
... //depot/stg/opencl/drivers/opencl/compiler/lib/backends/common/v0_8/if_acl.cpp#41 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/gpu/gpudevice.cpp#447 edit

rocclr/compiler/lib/backends/common/v0_8/if_acl.cpp

@@ -171,6 +171,7 @@ LOADER_FUNCS_ERROR(X86Opt, amdcl::CPUOptimizer);
 #endif
 
 LOADER_FUNCS(OCL, amdcl::OCLFrontend);
+LOADER_FUNCS(OCLClang, amdcl::ClangOCLFrontend);
 LOADER_FUNCS(Link, amdcl::OCLLinker);
 LOADER_FUNCS(Codegen, amdcl::CLCodeGen);
 LOADER_FUNCS(SPIR, amdcl::SPIR);

rocclr/runtime/device/gpu/gpudevice.cpp

@@ -180,8 +180,8 @@ NullDevice::create(CALtarget target)
     ::strcpy(info_.vendor_, "Advanced Micro Devices, Inc.");
     ::snprintf(info_.driverVersion_, sizeof(info_.driverVersion_) - 1,
         AMD_BUILD_STRING);
-    info_.version_ = "OpenCL 1.2 " AMD_PLATFORM_INFO;
-    info_.oclcVersion_ = "OpenCL C 1.2 ";
+    info_.version_ = "OpenCL 2.0 " AMD_PLATFORM_INFO;
+    info_.oclcVersion_ = "OpenCL C 2.0 ";
 
     return true;
 }