P4 to Git Change 1185396 by rayxiao@alit_opencl_rayxiao on 2015/08/27 17:58:08

ECR #340775 - Revert runtime changes to linkImpl for enabling OpenCL1.2 on non-legacy path.

Affected files ...

... //depot/stg/opencl/drivers/opencl/runtime/device/gpu/gpuprogram.cpp#205 edit


[ROCm/clr commit: f8e4a0ac7c]

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

@@ -1830,17 +1830,20 @@ HSAILProgram::linkImpl(
     for (size_t i = 1; i < binaries_to_link.size(); i++) {
         aclBinaryFini(binaries_to_link[i]);
     }
-    if (createLibrary || options->oVariables->EnableDebug) {
-        // Save the binary in the interface class
-        size_t size = 0;
-        void *mem = NULL;
-        aclWriteToMem(binaryElf_, &mem, &size);
-        setBinary(static_cast<char*>(mem), size);
-        if (createLibrary)
-            setType(TYPE_LIBRARY);
-        buildLog_ += aclGetCompilerLog(dev().hsaCompiler());
-        return true;
-    }
+    // Uncomment when CL1.2 support on HSAIL is enabled,
+    // Otherwise ocltst's OCLSeparateCompile will fail
+    // on the non-legacy path with CL1.2
+    // if (createLibrary || options->oVariables->EnableDebug) {
+    //     // Save the binary in the interface class
+    //     size_t size = 0;
+    //     void *mem = NULL;
+    //     aclWriteToMem(binaryElf_, &mem, &size);
+    //     setBinary(static_cast<char*>(mem), size);
+    //     if (createLibrary)
+    //         setType(TYPE_LIBRARY);
+    //     buildLog_ += aclGetCompilerLog(dev().hsaCompiler());
+    //     return true;
+    // }
     // Now call linkImpl with the new options
     return linkImpl(options);
 }