P4 to Git Change 1077873 by mbareghe@mbareghe_staging_win30 on 2014/09/17 13:47:49

ECR #304775 - clp re-implementation - refactoring and generalization of clpVectorExpansion to work on both edg and clang

Affected files ...

... //depot/stg/opencl/drivers/opencl/compiler/clc/clpSrc/build/Makefile.clp#3 edit
... //depot/stg/opencl/drivers/opencl/compiler/clc/clpSrc/clpVectorExpansion.cpp#25 edit
... //depot/stg/opencl/drivers/opencl/compiler/lib/backends/common/linker.cpp#111 edit
... //depot/stg/opencl/drivers/opencl/library/common/src/commonConversions.cl#14 edit
... //depot/stg/opencl/drivers/opencl/library/hsa/hsail/build/Makefile.hsail#33 edit
... //depot/stg/opencl/drivers/opencl/library/x86/gen/build/Makefile.gen#14 edit


[ROCm/clr commit: 4099ccc281]

projects/clr/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 IsGPU);
 namespace amd {
 
 namespace {
@@ -938,7 +938,7 @@ amdcl::OCLLinker::link(llvm::Module* input, std::vector<llvm::Module*> &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) {