diff --git a/projects/clr/rocclr/compiler/lib/backends/common/codegen.cpp b/projects/clr/rocclr/compiler/lib/backends/common/codegen.cpp index 8fe5a76ac6..4abd48a133 100644 --- a/projects/clr/rocclr/compiler/lib/backends/common/codegen.cpp +++ b/projects/clr/rocclr/compiler/lib/backends/common/codegen.cpp @@ -451,7 +451,7 @@ llvmCodeGen( #ifdef WITH_TARGET_HSAIL if (MArch == "hsail" && OptionsObj->oVariables->GPU64BitIsa) { - MArch = std::string("hsail-64"); + MArch = std::string("hsail64"); } #endif diff --git a/projects/clr/rocclr/compiler/lib/backends/common/frontend.cpp b/projects/clr/rocclr/compiler/lib/backends/common/frontend.cpp index 1e10b72962..3a21f1bd72 100644 --- a/projects/clr/rocclr/compiler/lib/backends/common/frontend.cpp +++ b/projects/clr/rocclr/compiler/lib/backends/common/frontend.cpp @@ -119,7 +119,7 @@ amdcl::OCLFrontend::getFrontendCommand(aclBinary *elf, systemPath << "--march=hsail -D__HSAIL__ -D__" << HSAILTargetMapping[chipName].chip_name << "__=1 "; break; case aclHSAIL64: - systemPath << "--march=hsail-64 -D__HSAIL__ -D__" << HSAIL64TargetMapping[chipName].chip_name << "__=1 "; + systemPath << "--march=hsail64 -D__HSAIL__ -D__" << HSAIL64TargetMapping[chipName].chip_name << "__=1 "; break; }; // AMDIL and non CPU HSAIL targets get the GPU define, everything @@ -142,7 +142,7 @@ amdcl::OCLFrontend::getFrontendCommand(aclBinary *elf, #ifdef WITH_TARGET_HSAIL if ((Is64bitMachine() && isHSAILTarget(elf->target)) || (Opts->oVariables->GPU64BitIsa && (elf->target.arch_id == aclHSAIL))) - systemPath << " --march=hsail-64 "; + systemPath << " --march=hsail64 "; #endif #ifdef DEBUG diff --git a/projects/clr/rocclr/compiler/lib/utils/v0_8/target_mappings.h b/projects/clr/rocclr/compiler/lib/utils/v0_8/target_mappings.h index 27ea13de3e..41fcb7cb7b 100644 --- a/projects/clr/rocclr/compiler/lib/utils/v0_8/target_mappings.h +++ b/projects/clr/rocclr/compiler/lib/utils/v0_8/target_mappings.h @@ -230,7 +230,7 @@ inline const char* getArchitecture(aclDevType arch_id) case aclX64: return "x86-64"; case aclHSAIL64: - return "hsail-64"; + return "hsail64"; case aclAMDIL64: return "amdil64"; default: diff --git a/projects/clr/rocclr/runtime/device/gpu/gpucompiler.cpp b/projects/clr/rocclr/runtime/device/gpu/gpucompiler.cpp index d70118eb26..f51cad05cc 100644 --- a/projects/clr/rocclr/runtime/device/gpu/gpucompiler.cpp +++ b/projects/clr/rocclr/runtime/device/gpu/gpucompiler.cpp @@ -346,7 +346,7 @@ HSAILProgram::compileImpl( std::string arch = "hsail"; if (dev().settings().use64BitPtr_) { - arch += "-64"; + arch += "64"; } target = aclGetTargetInfo(arch.c_str(), dev().info().name_, &errorCode); diff --git a/projects/clr/rocclr/runtime/device/gpu/gpuprogram.cpp b/projects/clr/rocclr/runtime/device/gpu/gpuprogram.cpp index 37fc985f45..69be513500 100644 --- a/projects/clr/rocclr/runtime/device/gpu/gpuprogram.cpp +++ b/projects/clr/rocclr/runtime/device/gpu/gpuprogram.cpp @@ -2335,7 +2335,7 @@ HSAILProgram::info(const char * str) { acl_error err; std::string arch = "hsail"; if (dev().settings().use64BitPtr_) { - arch = "hsail-64"; + arch = "hsail64"; } info_ = aclGetTargetInfo(arch.c_str(), ( str && str[0] == '\0' ? dev().hwInfo()->targetName_ : str ), &err);