P4 to Git Change 1184040 by rayxiao@alit_opencl_rayxiao on 2015/08/24 18:04:18

ECR #304775 - Back out changelist 1183997

Affected files ...

... //depot/stg/opencl/drivers/opencl/compiler/lib/linker/lib/AMDFixupKernelModule.cpp#3 edit
... //depot/stg/opencl/drivers/opencl/compiler/lib/linker/tools/opencl-link/opencl-link.cpp#3 edit
... //depot/stg/opencl/drivers/opencl/compiler/llvm/include/llvm/InitializePasses.h#83 edit
... //depot/stg/opencl/drivers/opencl/compiler/llvm/include/llvm/Transforms/Scalar.h#88 edit
... //depot/stg/opencl/drivers/opencl/compiler/llvm/lib/Transforms/Scalar/AMDInsertOpenCLKernenv.cpp#7 edit
... //depot/stg/opencl/drivers/opencl/compiler/llvm/lib/Transforms/Scalar/AMDOCL12Adapter.cpp#2 delete
... //depot/stg/opencl/drivers/opencl/compiler/llvm/lib/Transforms/Scalar/AMDPrintfRuntimeBinding.cpp#12 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/gpu/gpuprogram.cpp#202 edit
... //depot/stg/opencl/drivers/opencl/tests/ocltst/module/compiler/GlobalConstPtr/simpleCopy.cpp#4 edit
... //depot/stg/opencl/drivers/opencl/tests/ocltst/module/compiler/OCLBinaryOperations.cpp#7 edit
... //depot/stg/opencl/drivers/opencl/tests/ocltst/module/compiler/OCLSeparateCompile.cpp#12 edit
... //depot/stg/opencl/drivers/opencl/tests/ocltst/module/compiler/oclcompiler.exclude.hsail12#2 delete
... //depot/stg/opencl/drivers/opencl/tests/ocltst/module/runtime/oclruntime.exclude.hsail12#2 delete


[ROCm/clr commit: f55e475afb]

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

@@ -1817,11 +1817,6 @@ HSAILProgram::linkImpl(
         errorCode = aclLink(dev().hsaCompiler(),
             binaries_to_link[0], binaries_to_link.size() - 1,
             &binaries_to_link[1], ACL_TYPE_LLVMIR_BINARY, "-create-library", NULL);
-        if (errorCode != ACL_SUCCESS) {
-            buildLog_ +="Error while linking : \
-                        aclLink failed" ;
-            return false;
-        }
     }
     // Store the newly linked aclBinary for this program.
     binaryElf_ = binaries_to_link[0];
@@ -1829,17 +1824,7 @@ 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;
-    }
+
     // Now call linkImpl with the new options
     return linkImpl(options);
 }