P4 to Git Change 1127589 by lmoriche@lmoriche_opencl_dev on 2015/03/04 18:08:48

ECR #304775 - Split the legacy compiler library (OpenCL C/C++ 1.x->EDG->LLVM32->AMDIL/x86) and trunk compiler library (OpenCL C 2.x->CLANG->LLVM TOT->HSAIL/x86). The legacy compiler library (amdocl12cl.dll) will be dynamically loaded when building OpenCL 1.x programs, the trunk compiler library will be embedded in the OpenCL runtime.

Affected files ...

... //depot/stg/opencl/drivers/opencl/api/opencl/amdocl/build/Makefile.api#100 edit
... //depot/stg/opencl/drivers/opencl/compiler/Makefile#52 edit
... //depot/stg/opencl/drivers/opencl/compiler/clc/build/Makefile#5 edit
... //depot/stg/opencl/drivers/opencl/compiler/clc/build/Makefile.clc#18 edit
... //depot/stg/opencl/drivers/opencl/compiler/clc/src/build/Makefile#5 edit
... //depot/stg/opencl/drivers/opencl/compiler/clc/src/build/Makefile.clc#15 edit
... //depot/stg/opencl/drivers/opencl/compiler/edg/build/Makefile#4 edit
... //depot/stg/opencl/drivers/opencl/compiler/edg/build/Makefile.edg#9 edit
... //depot/stg/opencl/drivers/opencl/compiler/lib/Makefile#31 edit
... //depot/stg/opencl/drivers/opencl/compiler/lib/api/v0_8/acl.cpp#25 edit
... //depot/stg/opencl/drivers/opencl/compiler/lib/api/v0_8/aclLoaders.cpp#10 edit
... //depot/stg/opencl/drivers/opencl/compiler/lib/backends/common/build/Makefile.common#27 edit
... //depot/stg/opencl/drivers/opencl/compiler/lib/backends/common/v0_8/if_acl.cpp#61 edit
... //depot/stg/opencl/drivers/opencl/compiler/lib/backends/gpu/Makefile#45 edit
... //depot/stg/opencl/drivers/opencl/compiler/lib/backends/gpu/build/Makefile.gpu#27 edit
... //depot/stg/opencl/drivers/opencl/compiler/lib/backends/gpu/metadata.cpp#6 edit
... //depot/stg/opencl/drivers/opencl/compiler/lib/build/Makefile.complib#77 edit
... //depot/stg/opencl/drivers/opencl/compiler/lib/complibdefs#39 edit
... //depot/stg/opencl/drivers/opencl/compiler/lib/jit/src/Disassembler.cpp#3 edit
... //depot/stg/opencl/drivers/opencl/compiler/lib/jit/src/build/Makefile.src#3 edit
... //depot/stg/opencl/drivers/opencl/compiler/lib/utils/v0_8/libUtils.h#15 edit
... //depot/stg/opencl/drivers/opencl/compiler/llvm/lib/Target/AMDIL/AMDIL.h#110 delete
... //depot/stg/opencl/drivers/opencl/compiler/llvm/lib/Target/AMDIL/AMDIL.td#20 delete
... //depot/stg/opencl/drivers/opencl/compiler/llvm/lib/Target/AMDIL/AMDILAlgorithms.tpp#19 delete
... //depot/stg/opencl/drivers/opencl/compiler/llvm/lib/Target/AMDIL/AMDILAsmBackend.cpp#31 delete
... //depot/stg/opencl/drivers/opencl/compiler/llvm/lib/Target/AMDIL/AMDILAsmBackend.h#24 delete
... //depot/stg/opencl/drivers/opencl/compiler/llvm/lib/Target/AMDIL/AMDILAsmPrinter.cpp#60 delete
... //depot/stg/opencl/drivers/opencl/compiler/llvm/lib/Target/AMDIL/AMDILAsmPrinter.h#7 delete
... //depot/stg/opencl/drivers/opencl/compiler/llvm/lib/Target/AMDIL/AMDILBarrierDetect.cpp#75 delete
... //depot/stg/opencl/drivers/opencl/compiler/llvm/lib/Target/AMDIL/AMDILBase.td#69 delete
... //depot/stg/opencl/drivers/opencl/compiler/llvm/lib/Target/AMDIL/AMDILCFGStructurizer.cpp#193 delete
... //depot/stg/opencl/drivers/opencl/compiler/llvm/lib/Target/AMDIL/AMDILCIIOExpansion.cpp#6 delete
... //depot/stg/opencl/drivers/opencl/compiler/llvm/lib/Target/AMDIL/AMDILCIIOExpansion.h#3 delete
... //depot/stg/opencl/drivers/opencl/compiler/llvm/lib/Target/AMDIL/AMDILCIPointerManager.cpp#3 delete
... //depot/stg/opencl/drivers/opencl/compiler/llvm/lib/Target/AMDIL/AMDILCIPointerManager.h#2 delete
... //depot/stg/opencl/drivers/opencl/compiler/llvm/lib/Target/AMDIL/AMDILCallingConv.td#31 delete
... //depot/stg/opencl/drivers/opencl/compiler/llvm/lib/Target/AMDIL/AMDILCompilerErrors.cpp#7 delete
... //depot/stg/opencl/drivers/opencl/compiler/llvm/lib/Target/AMDIL/AMDILCompilerErrors.h#27 delete
... //depot/stg/opencl/drivers/opencl/compiler/llvm/lib/Target/AMDIL/AMDILCompilerWarnings.cpp#6 delete
... //depot/stg/opencl/drivers/opencl/compiler/llvm/lib/Target/AMDIL/AMDILCompilerWarnings.h#19 delete
... //depot/stg/opencl/drivers/opencl/compiler/llvm/lib/Target/AMDIL/AMDILConversions.td#30 delete
... //depot/stg/opencl/drivers/opencl/compiler/llvm/lib/Target/AMDIL/AMDILCreateKernelStub.cpp#3 delete
... //depot/stg/opencl/drivers/opencl/compiler/llvm/lib/Target/AMDIL/AMDILDeviceInfo.h#10 delete
... //depot/stg/opencl/drivers/opencl/compiler/llvm/lib/Target/AMDIL/AMDILEBBPass.cpp#7 delete
... //depot/stg/opencl/drivers/opencl/compiler/llvm/lib/Target/AMDIL/AMDILEGIOExpansion.cpp#101 delete
... //depot/stg/opencl/drivers/opencl/compiler/llvm/lib/Target/AMDIL/AMDILEnumeratedTypes.td#55 delete
... //depot/stg/opencl/drivers/opencl/compiler/llvm/lib/Target/AMDIL/AMDILFixupKinds.h#11 delete
... //depot/stg/opencl/drivers/opencl/compiler/llvm/lib/Target/AMDIL/AMDILFormats.td#77 delete
... //depot/stg/opencl/drivers/opencl/compiler/llvm/lib/Target/AMDIL/AMDILFrameLowering.cpp#20 delete
... //depot/stg/opencl/drivers/opencl/compiler/llvm/lib/Target/AMDIL/AMDILFrameLowering.h#21 delete
... //depot/stg/opencl/drivers/opencl/compiler/llvm/lib/Target/AMDIL/AMDILIOExpansion.cpp#100 delete
... //depot/stg/opencl/drivers/opencl/compiler/llvm/lib/Target/AMDIL/AMDILIOExpansion.h#51 delete
... //depot/stg/opencl/drivers/opencl/compiler/llvm/lib/Target/AMDIL/AMDILISelDAGToDAG.cpp#96 delete
... //depot/stg/opencl/drivers/opencl/compiler/llvm/lib/Target/AMDIL/AMDILISelLowering.cpp#407 delete
... //depot/stg/opencl/drivers/opencl/compiler/llvm/lib/Target/AMDIL/AMDILISelLowering.h#78 delete
... //depot/stg/opencl/drivers/opencl/compiler/llvm/lib/Target/AMDIL/AMDILInliner.cpp#59 delete
... //depot/stg/opencl/drivers/opencl/compiler/llvm/lib/Target/AMDIL/AMDILInstPrinter.cpp#25 delete
... //depot/stg/opencl/drivers/opencl/compiler/llvm/lib/Target/AMDIL/AMDILInstPrinter.h#16 delete
... //depot/stg/opencl/drivers/opencl/compiler/llvm/lib/Target/AMDIL/AMDILInstrInfo.cpp#118 delete
... //depot/stg/opencl/drivers/opencl/compiler/llvm/lib/Target/AMDIL/AMDILInstrInfo.h#37 delete
... //depot/stg/opencl/drivers/opencl/compiler/llvm/lib/Target/AMDIL/AMDILInstrInfo.td#73 delete
... //depot/stg/opencl/drivers/opencl/compiler/llvm/lib/Target/AMDIL/AMDILInstrPatterns.td#60 delete
... //depot/stg/opencl/drivers/opencl/compiler/llvm/lib/Target/AMDIL/AMDILInstructions.td#190 delete
... //depot/stg/opencl/drivers/opencl/compiler/llvm/lib/Target/AMDIL/AMDILIntrinsicInfo.cpp#37 delete
... //depot/stg/opencl/drivers/opencl/compiler/llvm/lib/Target/AMDIL/AMDILIntrinsicInfo.h#16 delete
... //depot/stg/opencl/drivers/opencl/compiler/llvm/lib/Target/AMDIL/AMDILIntrinsics.td#103 delete
... //depot/stg/opencl/drivers/opencl/compiler/llvm/lib/Target/AMDIL/AMDILKernel.h#22 delete
... //depot/stg/opencl/drivers/opencl/compiler/llvm/lib/Target/AMDIL/AMDILKernelManager.cpp#454 delete
... //depot/stg/opencl/drivers/opencl/compiler/llvm/lib/Target/AMDIL/AMDILKernelManager.h#52 delete
... //depot/stg/opencl/drivers/opencl/compiler/llvm/lib/Target/AMDIL/AMDILLLVMApple.h#14 delete
... //depot/stg/opencl/drivers/opencl/compiler/llvm/lib/Target/AMDIL/AMDILLLVMPC.h#18 delete
... //depot/stg/opencl/drivers/opencl/compiler/llvm/lib/Target/AMDIL/AMDILLiteralManager.cpp#34 delete
... //depot/stg/opencl/drivers/opencl/compiler/llvm/lib/Target/AMDIL/AMDILMCAsmInfo.cpp#62 delete
... //depot/stg/opencl/drivers/opencl/compiler/llvm/lib/Target/AMDIL/AMDILMCAsmInfo.h#20 delete
... //depot/stg/opencl/drivers/opencl/compiler/llvm/lib/Target/AMDIL/AMDILMCCodeEmitter.cpp#22 delete
... //depot/stg/opencl/drivers/opencl/compiler/llvm/lib/Target/AMDIL/AMDILMachineDCE.cpp#7 delete
... //depot/stg/opencl/drivers/opencl/compiler/llvm/lib/Target/AMDIL/AMDILMachineDCE.h#7 delete
... //depot/stg/opencl/drivers/opencl/compiler/llvm/lib/Target/AMDIL/AMDILMachineEBB.cpp#9 delete
... //depot/stg/opencl/drivers/opencl/compiler/llvm/lib/Target/AMDIL/AMDILMachineEBB.h#7 delete
... //depot/stg/opencl/drivers/opencl/compiler/llvm/lib/Target/AMDIL/AMDILMachineFunctionInfo.cpp#76 delete
... //depot/stg/opencl/drivers/opencl/compiler/llvm/lib/Target/AMDIL/AMDILMachineFunctionInfo.h#50 delete
... //depot/stg/opencl/drivers/opencl/compiler/llvm/lib/Target/AMDIL/AMDILMachinePeephole.cpp#57 delete
... //depot/stg/opencl/drivers/opencl/compiler/llvm/lib/Target/AMDIL/AMDILMachineValue.cpp#6 delete
... //depot/stg/opencl/drivers/opencl/compiler/llvm/lib/Target/AMDIL/AMDILMachineValue.h#7 delete
... //depot/stg/opencl/drivers/opencl/compiler/llvm/lib/Target/AMDIL/AMDILMem32.td#32 delete
... //depot/stg/opencl/drivers/opencl/compiler/llvm/lib/Target/AMDIL/AMDILMem64.td#32 delete
... //depot/stg/opencl/drivers/opencl/compiler/llvm/lib/Target/AMDIL/AMDILModuleInfo.cpp#59 delete
... //depot/stg/opencl/drivers/opencl/compiler/llvm/lib/Target/AMDIL/AMDILModuleInfo.h#35 delete
... //depot/stg/opencl/drivers/opencl/compiler/llvm/lib/Target/AMDIL/AMDILMultiClass.td#90 delete
... //depot/stg/opencl/drivers/opencl/compiler/llvm/lib/Target/AMDIL/AMDILNodes.td#47 delete
... //depot/stg/opencl/drivers/opencl/compiler/llvm/lib/Target/AMDIL/AMDILOperands.td#30 delete
... //depot/stg/opencl/drivers/opencl/compiler/llvm/lib/Target/AMDIL/AMDILPatterns.td#41 delete
... //depot/stg/opencl/drivers/opencl/compiler/llvm/lib/Target/AMDIL/AMDILPeepholeOptimizer.cpp#166 delete
... //depot/stg/opencl/drivers/opencl/compiler/llvm/lib/Target/AMDIL/AMDILPointerManager.cpp#230 delete
... //depot/stg/opencl/drivers/opencl/compiler/llvm/lib/Target/AMDIL/AMDILPointerManager.h#32 delete
... //depot/stg/opencl/drivers/opencl/compiler/llvm/lib/Target/AMDIL/AMDILPointerManagerImpl.h#31 delete
... //depot/stg/opencl/drivers/opencl/compiler/llvm/lib/Target/AMDIL/AMDILPrintfConvert.cpp#93 delete
... //depot/stg/opencl/drivers/opencl/compiler/llvm/lib/Target/AMDIL/AMDILProfiles.td#36 delete
... //depot/stg/opencl/drivers/opencl/compiler/llvm/lib/Target/AMDIL/AMDILRegisterInfo.cpp#88 delete
... //depot/stg/opencl/drivers/opencl/compiler/llvm/lib/Target/AMDIL/AMDILRegisterInfo.h#35 delete
... //depot/stg/opencl/drivers/opencl/compiler/llvm/lib/Target/AMDIL/AMDILRegisterInfo.td#72 delete
... //depot/stg/opencl/drivers/opencl/compiler/llvm/lib/Target/AMDIL/AMDILRegisterUseValidate.cpp#3 delete
... //depot/stg/opencl/drivers/opencl/compiler/llvm/lib/Target/AMDIL/AMDILRegisterUsesINScalar.td#3 delete
... //depot/stg/opencl/drivers/opencl/compiler/llvm/lib/Target/AMDIL/AMDILRegisterUsesINV2.td#3 delete
... //depot/stg/opencl/drivers/opencl/compiler/llvm/lib/Target/AMDIL/AMDILRegisterUsesINV4.td#3 delete
... //depot/stg/opencl/drivers/opencl/compiler/llvm/lib/Target/AMDIL/AMDILRegisterUsesScalar.td#13 delete
... //depot/stg/opencl/drivers/opencl/compiler/llvm/lib/Target/AMDIL/AMDILRegisterUsesV2.td#13 delete
... //depot/stg/opencl/drivers/opencl/compiler/llvm/lib/Target/AMDIL/AMDILRegisterUsesV4.td#13 delete
... //depot/stg/opencl/drivers/opencl/compiler/llvm/lib/Target/AMDIL/AMDILRenumberRegister.cpp#8 delete
... //depot/stg/opencl/drivers/opencl/compiler/llvm/lib/Target/AMDIL/AMDILSIIOExpansion.cpp#53 delete
... //depot/stg/opencl/drivers/opencl/compiler/llvm/lib/Target/AMDIL/AMDILSIIOExpansion.h#19 delete
... //depot/stg/opencl/drivers/opencl/compiler/llvm/lib/Target/AMDIL/AMDILSIPointerManager.cpp#37 delete
... //depot/stg/opencl/drivers/opencl/compiler/llvm/lib/Target/AMDIL/AMDILSIPointerManager.h#16 delete
... //depot/stg/opencl/drivers/opencl/compiler/llvm/lib/Target/AMDIL/AMDILSubtarget.cpp#208 delete
... //depot/stg/opencl/drivers/opencl/compiler/llvm/lib/Target/AMDIL/AMDILSubtarget.h#39 delete
... //depot/stg/opencl/drivers/opencl/compiler/llvm/lib/Target/AMDIL/AMDILSwizzleEncoder.cpp#68 delete
... //depot/stg/opencl/drivers/opencl/compiler/llvm/lib/Target/AMDIL/AMDILSwizzleEncoder.h#27 delete
... //depot/stg/opencl/drivers/opencl/compiler/llvm/lib/Target/AMDIL/AMDILTargetMachine.cpp#165 delete
... //depot/stg/opencl/drivers/opencl/compiler/llvm/lib/Target/AMDIL/AMDILTargetMachine.h#26 delete
... //depot/stg/opencl/drivers/opencl/compiler/llvm/lib/Target/AMDIL/AMDILTokenDesc.td#14 delete
... //depot/stg/opencl/drivers/opencl/compiler/llvm/lib/Target/AMDIL/AMDILUtilityFunctions.cpp#128 delete
... //depot/stg/opencl/drivers/opencl/compiler/llvm/lib/Target/AMDIL/AMDILUtilityFunctions.h#71 delete
... //depot/stg/opencl/drivers/opencl/compiler/llvm/lib/Target/AMDIL/AMDILVersion.td#6 delete
... //depot/stg/opencl/drivers/opencl/compiler/llvm/lib/Target/AMDIL/AddrSpaces.txt#8 delete
... //depot/stg/opencl/drivers/opencl/compiler/llvm/lib/Target/AMDIL/Android.mk#2 delete
... //depot/stg/opencl/drivers/opencl/compiler/llvm/lib/Target/AMDIL/Apple/AMDIL.td#11 delete
... //depot/stg/opencl/drivers/opencl/compiler/llvm/lib/Target/AMDIL/Apple/AMDILVersion.td#12 delete
... //depot/stg/opencl/drivers/opencl/compiler/llvm/lib/Target/AMDIL/CMakeLists.txt#15 delete
... //depot/stg/opencl/drivers/opencl/compiler/llvm/lib/Target/AMDIL/Doxyfile#6 delete
... //depot/stg/opencl/drivers/opencl/compiler/llvm/lib/Target/AMDIL/GPUMetadataAbi.pdf#8 delete
... //depot/stg/opencl/drivers/opencl/compiler/llvm/lib/Target/AMDIL/Internal/AMDILInternal.h#8 delete
... //depot/stg/opencl/drivers/opencl/compiler/llvm/lib/Target/AMDIL/Internal/AMDILInternalDeviceFlags.h#13 delete
... //depot/stg/opencl/drivers/opencl/compiler/llvm/lib/Target/AMDIL/Internal/AMDILKVDevice.h#7 delete
... //depot/stg/opencl/drivers/opencl/compiler/llvm/lib/Target/AMDIL/Internal/AMDILVIInstrInfo.td#2 delete
... //depot/stg/opencl/drivers/opencl/compiler/llvm/lib/Target/AMDIL/Internal/AMDILVIInstructions.td#12 delete
... //depot/stg/opencl/drivers/opencl/compiler/llvm/lib/Target/AMDIL/Internal/AMDILVIIntrinsics.td#5 delete
... //depot/stg/opencl/drivers/opencl/compiler/llvm/lib/Target/AMDIL/Internal/CMakeLists.txt#6 delete
... //depot/stg/opencl/drivers/opencl/compiler/llvm/lib/Target/AMDIL/Internal/InternalProcessors.td#22 delete
... //depot/stg/opencl/drivers/opencl/compiler/llvm/lib/Target/AMDIL/Internal/LLVMBuild.txt#6 delete
... //depot/stg/opencl/drivers/opencl/compiler/llvm/lib/Target/AMDIL/LICENSE.TXT#5 delete
... //depot/stg/opencl/drivers/opencl/compiler/llvm/lib/Target/AMDIL/LLVMBuild.txt#6 delete
... //depot/stg/opencl/drivers/opencl/compiler/llvm/lib/Target/AMDIL/MCTargetDesc/AMDILELFObjectWriter.cpp#6 delete
... //depot/stg/opencl/drivers/opencl/compiler/llvm/lib/Target/AMDIL/MCTargetDesc/AMDILELFObjectWriter.h#6 delete
... //depot/stg/opencl/drivers/opencl/compiler/llvm/lib/Target/AMDIL/MCTargetDesc/CMakeLists.txt#6 delete
... //depot/stg/opencl/drivers/opencl/compiler/llvm/lib/Target/AMDIL/MCTargetDesc/LLVMBuild.txt#6 delete
... //depot/stg/opencl/drivers/opencl/compiler/llvm/lib/Target/AMDIL/Processors.td#9 delete
... //depot/stg/opencl/drivers/opencl/compiler/llvm/lib/Target/AMDIL/TD-Class-Flow-new.xmi#6 delete
... //depot/stg/opencl/drivers/opencl/compiler/llvm/lib/Target/AMDIL/TD-Class-Flow.xmi#6 delete
... //depot/stg/opencl/drivers/opencl/compiler/llvm/lib/Target/AMDIL/TargetInfo/AMDILTargetInfo.cpp#25 delete
... //depot/stg/opencl/drivers/opencl/compiler/llvm/lib/Target/AMDIL/TargetInfo/CMakeLists.txt#10 delete
... //depot/stg/opencl/drivers/opencl/compiler/llvm/lib/Target/AMDIL/TargetInfo/LLVMBuild.txt#6 delete
... //depot/stg/opencl/drivers/opencl/compiler/llvm/lib/Target/AMDIL/build/Makefile.amdil#26 edit
... //depot/stg/opencl/drivers/opencl/compiler/llvm/lib/Target/AMDIL/generateRegisters.pl#8 delete
... //depot/stg/opencl/drivers/opencl/compiler/llvm/lib/Target/AMDIL/notes#5 delete
... //depot/stg/opencl/drivers/opencl/compiler/llvm/lib/Target/Makefile#23 edit
... //depot/stg/opencl/drivers/opencl/compiler/llvm/llvmdefs#37 edit
... //depot/stg/opencl/drivers/opencl/compiler/llvm/llvmlibs#36 edit
... //depot/stg/opencl/drivers/opencl/compiler/llvm32/lib/Analysis/AMDExportKernelNature.cpp#2 edit
... //depot/stg/opencl/drivers/opencl/compiler/llvm32/lib/Linker/AMDFixupKernelModule.cpp#2 edit
... //depot/stg/opencl/drivers/opencl/compiler/llvm32/lib/Linker/clpVectorExpansion.cpp#2 edit
... //depot/stg/opencl/drivers/opencl/library/build/Makefile#5 edit
... //depot/stg/opencl/drivers/opencl/library/build/Makefile.library#42 edit
... //depot/stg/opencl/drivers/opencl/library/gpu/7xx/build/Makefile.7xx#15 edit
... //depot/stg/opencl/drivers/opencl/library/gpu/CI/build/Makefile.CI#4 edit
... //depot/stg/opencl/drivers/opencl/library/gpu/SI/build/Makefile.SI#8 edit
... //depot/stg/opencl/drivers/opencl/library/gpu/common/build/Makefile.common#27 edit
... //depot/stg/opencl/drivers/opencl/library/gpu/common/src/subgroup/subany.cl#3 delete
... //depot/stg/opencl/drivers/opencl/library/gpu/common/src/subgroup/subbar.cl#3 delete
... //depot/stg/opencl/drivers/opencl/library/gpu/common/src/subgroup/subbcast.cl#4 delete
... //depot/stg/opencl/drivers/opencl/library/gpu/common/src/subgroup/subget.cl#4 delete
... //depot/stg/opencl/drivers/opencl/library/gpu/common/src/subgroup/subreduce.cl#3 delete
... //depot/stg/opencl/drivers/opencl/library/gpu/common/src/subgroup/subscan.cl#3 delete
... //depot/stg/opencl/drivers/opencl/library/gpu/gen/build/Makefile.gen#8 edit
... //depot/stg/opencl/drivers/opencl/library/x86/Makefile#7 edit
... //depot/stg/opencl/drivers/opencl/library/x86/avx/build/Makefile.avx#20 edit
... //depot/stg/opencl/drivers/opencl/library/x86/common/build/Makefile.common#36 edit
... //depot/stg/opencl/drivers/opencl/library/x86/common/src/amdrt/build/Makefile.amdrt#22 edit
... //depot/stg/opencl/drivers/opencl/library/x86/fma4/build/Makefile.fma4#13 edit
... //depot/stg/opencl/drivers/opencl/library/x86/gen/build/Makefile.gen#21 edit
... //depot/stg/opencl/drivers/opencl/opencldefs#153 edit
... //depot/stg/opencl/drivers/opencl/openclrules#84 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/cpu/cpudevice.cpp#270 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/gpu/build/Makefile.gpu#59 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/gpu/gpudevice.cpp#498 edit
... //depot/stg/opencl/drivers/opencl/tests/ocltst/module/binary/build/Makefile.binary#16 edit
... //depot/stg/opencl/drivers/opencl/tests/ocltst/module/compiler/OCLStructOperations.cpp#14 edit
... //depot/stg/opencl/drivers/opencl/tests/ocltst/module/complib/build/Makefile.complib#33 edit
... //depot/stg/opencl/drivers/opencl/tests/ocltst/module/spir/build/Makefile.spir#8 edit
... //depot/stg/opencl/drivers/opencl/tests/ocltst/testdefs#26 edit

rocclr/compiler/lib/backends/common/v0_8/if_acl.cpp

@@ -154,11 +154,11 @@ LOADER_FUNCS_ERROR(AMDILOpt, amdcl::GPUOptimizer);
 
 #if defined(WITH_TARGET_HSAIL)
 LOADER_FUNCS(HSAILAsm, amdcl::HSAIL);
-LOADER_FUNCS(HSAILFE, amdcl::OCLFrontend);
+LOADER_FUNCS(HSAILFE, amdcl::ClangOCLFrontend);
 LOADER_FUNCS(HSAILOpt, amdcl::GPUOptimizer);
 #else
 LOADER_FUNCS_ERROR(HSAILAsm, amdcl::HSAIL);
-LOADER_FUNCS_ERROR(HSAILFE, amdcl::OCLFrontend);
+LOADER_FUNCS_ERROR(HSAILFE, amdcl::ClangOCLFrontend);
 LOADER_FUNCS_ERROR(HSAILOpt, amdcl::GPUOptimizer);
 #endif
 
@@ -170,8 +170,11 @@ LOADER_FUNCS_ERROR(X86Asm, amdcl::X86);
 LOADER_FUNCS_ERROR(X86Opt, amdcl::CPUOptimizer);
 #endif
 
+#if defined(LEGACY_COMPLIB)
 LOADER_FUNCS(OCL, amdcl::OCLFrontend);
-LOADER_FUNCS(OCLClang, amdcl::ClangOCLFrontend);
+#else
+LOADER_FUNCS(OCL, amdcl::ClangOCLFrontend);
+#endif
 LOADER_FUNCS(Link, amdcl::OCLLinker);
 LOADER_FUNCS(Codegen, amdcl::CLCodeGen);
 LOADER_FUNCS(SPIR, amdcl::SPIR);

rocclr/compiler/lib/complibdefs

@@ -6,6 +6,9 @@ ifeq ($(BUILD_HSA_TARGET),yes)
 override BUILD_CPU_DEVICE = no
 override BUILD_GPU_DEVICE = no
 endif
+ifneq ($(BUILD_LEGACY_COMPLIB),yes)
+override BUILD_GPU_DEVICE = no
+endif
 endif
 
 ifneq ($(BUILD_GPU_DEVICE),no)
@@ -84,4 +87,4 @@ endif
 
 ifeq ($(OPENCL_USE_ONE_SC),1)
     GCPPFLAGS += $(DEFSWITCH) OPENCL_USE_ONE_SC
-endif
+endif

rocclr/compiler/lib/utils/v0_8/libUtils.h

@@ -178,7 +178,7 @@ inline bool isHSAILTarget(const aclTargetInfo& target)
 
 enum scId {
   SC_AMDIL = 0,
-  SC_HSAIL = 1,
+  SC_HSAIL = 0,
   SC_LAST,
 };
 

rocclr/runtime/device/cpu/cpudevice.cpp

@@ -61,7 +61,8 @@ Device::init()
     const char *library = getenv("COMPILER_LIBRARY");
     aclCompilerOptions opts = {
         sizeof(aclCompilerOptions_0_8),
-        library,
+        library ? library : LINUX_ONLY("lib") "amdocl12cl" \
+            LP64_SWITCH(LINUX_SWITCH("32",""),"64") LINUX_SWITCH(".so",".dll"),
         NULL,
         NULL,
         NULL,
@@ -71,7 +72,12 @@ Device::init()
         &::malloc,
         &::free
     };
-    compiler_ = aclCompilerInit(NULL, NULL);
+    acl_error   error;
+    compiler_ = aclCompilerInit(&opts, &error);
+    if (error != ACL_SUCCESS) {
+         LogError("Error initializing the compiler");
+         return false;
+    }
 
     device::Info info;
     ::memset(&info, '\0', sizeof(info));

rocclr/runtime/device/gpu/gpudevice.cpp

@@ -1237,7 +1237,8 @@ Device::init()
     const char *library = getenv("COMPILER_LIBRARY");
     aclCompilerOptions opts = {
         sizeof(aclCompilerOptions_0_8),
-        library,
+        library ? library : LINUX_ONLY("lib") "amdocl12cl" \
+            LP64_SWITCH(LINUX_SWITCH("32",""),"64") LINUX_SWITCH(".so",".dll"),
         NULL,
         NULL,
         NULL,