From c02dacedb2c7f61f6d3cf1c4d2c5d5e4e665c512 Mon Sep 17 00:00:00 2001 From: foreman Date: Wed, 10 Sep 2014 15:30:51 -0400 Subject: [PATCH] P4 to Git Change 1075485 by marsenau@marsenau_ma on 2014/09/10 15:00:38 ECR #304775 - Remove _ in hsail_64 triple enum name. It isn't consistent with itself, or most other targets. The string form is already "hsail64", but the target name is sometimes "hsail-64". Does not remove the - in "hsail-64" for the target name since users could be depending on that, although that should also be fixed. Affected files ... ... //depot/stg/opencl/drivers/opencl/compiler/lib/backends/common/codegen.cpp#57 edit ... //depot/stg/opencl/drivers/opencl/compiler/lib/backends/common/linker.cpp#110 edit ... //depot/stg/opencl/drivers/opencl/compiler/llvm/include/llvm/ADT/Triple.h#36 edit ... //depot/stg/opencl/drivers/opencl/compiler/llvm/include/llvm/AMDLLVMContextHook.h#22 edit ... //depot/stg/opencl/drivers/opencl/compiler/llvm/lib/MC/MCObjectFileInfo.cpp#14 edit ... //depot/stg/opencl/drivers/opencl/compiler/llvm/lib/Support/Triple.cpp#47 edit ... //depot/stg/opencl/drivers/opencl/compiler/llvm/lib/Target/HSAIL/TargetInfo/HSAILTargetInfo.cpp#4 edit ... //depot/stg/opencl/drivers/opencl/compiler/llvm/lib/Transforms/SPIR/AMDSPIRLoader.cpp#82 edit ... //depot/stg/opencl/drivers/opencl/compiler/llvm/lib/Transforms/Scalar/AMDLowerAtomics.cpp#13 edit ... //depot/stg/opencl/drivers/opencl/compiler/llvm/lib/Transforms/Utils/AMDUtils.cpp#2 edit --- rocclr/compiler/lib/backends/common/codegen.cpp | 2 +- rocclr/compiler/lib/backends/common/linker.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/rocclr/compiler/lib/backends/common/codegen.cpp b/rocclr/compiler/lib/backends/common/codegen.cpp index 57a639c65a..675fd86d67 100644 --- a/rocclr/compiler/lib/backends/common/codegen.cpp +++ b/rocclr/compiler/lib/backends/common/codegen.cpp @@ -102,7 +102,7 @@ llvmCodeGen( Triple::ArchType arch = TheTriple.getArch(); bool isGPU = (arch == Triple::amdil || arch == Triple::amdil64 || - arch == Triple::hsail || arch == Triple::hsail_64); + arch == Triple::hsail || arch == Triple::hsail64); if (isGPU) { TheTriple.setOS(Triple::UnknownOS); diff --git a/rocclr/compiler/lib/backends/common/linker.cpp b/rocclr/compiler/lib/backends/common/linker.cpp index 894af82335..1c57d2a906 100644 --- a/rocclr/compiler/lib/backends/common/linker.cpp +++ b/rocclr/compiler/lib/backends/common/linker.cpp @@ -747,7 +747,7 @@ checkAndFixAclBinaryTarget(llvm::Module* module, aclBinary* elf, triple.getArch() == llvm::Triple::spir)) return true; if (elf->target.arch_id == aclHSAIL64 && - (triple.getArch() == llvm::Triple::hsail_64 || + (triple.getArch() == llvm::Triple::hsail64 || triple.getArch() == llvm::Triple::spir64)) return true; if (elf->target.arch_id == aclHSAIL &&