P4 to Git Change 1164882 by smekhano@stas-nova-hsa on 2015/06/24 18:29:06

ECR #333753 - HSA HLC: Rename AMDPrelinkOpt to AMDPrelink
	This is not only handling optimization, it also contains mandatory AMDLowerToPreciseBuiltins pass.
	Also removed HSAIL only AMDLowerToPreciseBuiltins pass invocation on legacy path

	Testing: precheckin
	Reviewed by Brian Sumner and Evgeny Mankov

Affected files ...

... //depot/stg/opencl/drivers/opencl/compiler/lib/backends/common/linker.cpp#126 edit
... //depot/stg/opencl/drivers/opencl/compiler/llvm/include/llvm/AMDPrelink.h#1 move/add
... //depot/stg/opencl/drivers/opencl/compiler/llvm/include/llvm/AMDPrelinkOpt.h#5 move/delete
... //depot/stg/opencl/drivers/opencl/compiler/llvm/lib/Linker/AMDPrelink.cpp#1 move/add
... //depot/stg/opencl/drivers/opencl/compiler/llvm/lib/Linker/AMDPrelinkOpt.cpp#7 move/delete
... //depot/stg/opencl/drivers/opencl/compiler/llvm/lib/Linker/Android.mk#6 edit
... //depot/stg/opencl/drivers/opencl/compiler/llvm/lib/Linker/CMakeLists.txt#11 edit
... //depot/stg/opencl/drivers/opencl/compiler/llvm/tools/llvm-link/llvm-link.cpp#54 edit
... //depot/stg/opencl/drivers/opencl/compiler/llvm32/include/llvm/AMDPrelink.h#1 move/add
... //depot/stg/opencl/drivers/opencl/compiler/llvm32/include/llvm/AMDPrelinkOpt.h#3 move/delete
... //depot/stg/opencl/drivers/opencl/compiler/llvm32/lib/Linker/AMDPrelink.cpp#1 move/add
... //depot/stg/opencl/drivers/opencl/compiler/llvm32/lib/Linker/AMDPrelinkOpt.cpp#3 move/delete
... //depot/stg/opencl/drivers/opencl/compiler/llvm32/lib/Linker/Android.mk#2 edit
... //depot/stg/opencl/drivers/opencl/compiler/llvm32/tools/llvm-link/llvm-link.cpp#4 edit


[ROCm/clr commit: 829daa3d18]
This commit is contained in:
foreman
2015-06-24 18:39:38 -04:00
parent 3049eb9b36
commit 1c5327800e
@@ -43,7 +43,7 @@
#include "llvm/AMDFixupKernelModule.h"
#include "llvm/AMDResolveLinker.h"
#include "llvm/AMDPrelinkOpt.h"
#include "llvm/AMDPrelink.h"
#include "llvm/ADT/Triple.h"
#include "llvm/ADT/StringMap.h"
#include "llvm/Analysis/AMDLocalArrayUsage.h"
@@ -650,7 +650,7 @@ amdcl::OCLLinker::link(llvm::Module* input, std::vector<llvm::Module*> &libs)
LLVMBinary()->getContext().setAMDLLVMContextHook(&hookup_);
std::string clp_errmsg;
llvm::Module *OnFlyLib = AMDPrelinkOpt(LLVMBinary(), clp_errmsg);
llvm::Module *OnFlyLib = AMDPrelink(LLVMBinary(), clp_errmsg);
if (!clp_errmsg.empty()) {
delete LLVMBinary();