From bb6fa26029526cfb51931ba052b907f3cce0eb59 Mon Sep 17 00:00:00 2001 From: foreman Date: Tue, 30 Sep 2014 14:06:47 -0400 Subject: [PATCH] P4 to Git Change 1082819 by mbareghe@mbareghe_staging_win30 on 2014/09/30 13:59:08 ECR #304775 - clp re-implementation - refactoring and generalization of clpVectorExpansion to work on both AMDIL and CPU path, HSAIL path not included yet. Affected files ... ... //depot/stg/opencl/drivers/opencl/compiler/clc/clpSrc/build/Makefile.clp#5 edit ... //depot/stg/opencl/drivers/opencl/compiler/clc/clpSrc/clpVectorExpansion.cpp#27 edit ... //depot/stg/opencl/drivers/opencl/compiler/lib/backends/common/linker.cpp#113 edit ... //depot/stg/opencl/drivers/opencl/library/common/src/commonConversions.cl#16 edit ... //depot/stg/opencl/drivers/opencl/library/x86/gen/build/Makefile.gen#16 edit --- rocclr/compiler/lib/backends/common/linker.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rocclr/compiler/lib/backends/common/linker.cpp b/rocclr/compiler/lib/backends/common/linker.cpp index 1c57d2a906..f2fa6471fd 100644 --- a/rocclr/compiler/lib/backends/common/linker.cpp +++ b/rocclr/compiler/lib/backends/common/linker.cpp @@ -98,7 +98,7 @@ static const char* OptionMaskFName = "__option_mask"; extern llvm::Module* -clpVectorExpansion(llvm::Module *srcModules[], std::string &errorMsg); +clpVectorExpansion(llvm::Module *srcModules[], std::string &errorMsg, bool IsGPUTarget); namespace amd { namespace { @@ -938,7 +938,7 @@ amdcl::OCLLinker::link(llvm::Module* input, std::vector &libs) clp_inputs[0] = LLVMBinary(); clp_inputs[1] = NULL; std::string clp_errmsg; - llvm::Module *OnFlyLib = clpVectorExpansion (clp_inputs, clp_errmsg); + llvm::Module *OnFlyLib = clpVectorExpansion (clp_inputs, clp_errmsg, IsGPUTarget); if (clp_errmsg.empty() == false) { delete LLVMBinary(); for (unsigned int i = 0; i < LibMs.size(); ++ i) {