P4 to Git Change 1195730 by smekhano@stas-rampitec-hsa on 2015/09/29 20:53:01

SWDEV-77584 - HSA HLC: fixed reflection metadata generation on HSAIL OCL 1.2 path
	We are producing 6 extra arguments, but metadata was produced only for 3.
	Removed KE_OCL12_NUM_ARGS define to avoid confusion.

	Testing: smoke, precheckin
	Reviewed by Yaxun Liu

Affected files ...

... //depot/stg/opencl/drivers/opencl/compiler/llvm/include/llvm/AMDOpenCLKernenv.h#4 edit
... //depot/stg/opencl/drivers/opencl/compiler/llvm/lib/Transforms/Scalar/AMDInsertOpenCLKernenv.cpp#10 edit


[ROCm/clr commit: 981fc6a6f9]

projects/clr/opencl/api/opencl/amdocl/cl_program.cpp

@@ -220,7 +220,7 @@ RUNTIME_ENTRY_RET(cl_program, clCreateProgramWithILKHR, (
     const std::vector<amd::Device*>& devices = as_amd(context)->devices();
     std::vector<amd::Device*>::const_iterator it;
     for (it = devices.begin(); it != devices.end(); ++it) {
-        if (program->addDeviceProgram(**it, il, length, 200) ==
+        if (program->addDeviceProgram(**it, il, length, true) ==
             CL_OUT_OF_HOST_MEMORY) {
             *not_null(errcode_ret) = CL_OUT_OF_HOST_MEMORY;
             program->release();