[HIP] Emit the CUID value in the module with the new driver

[jhuber6]

Summary:
This is a weird point of divergence that was not updated when the new driver
switched to using the CUID method, which is also apparently critical
for SPIR-V compilation not failing? Somehow if we don't emit this global
than the llvm.compiler.used global uses AS(0) which makes SPIR-V
unhappy, but with this global it's AS(4) which makes it happy. Either
way, this should be fixed.

[llvmbot]

@llvm/pr-subscribers-clang-codegen

@llvm/pr-subscribers-clang

Author: Joseph Huber (jhuber6)

Changes

Summary:
This is a weird point of divergence, which is also apparently critical
for SPIR-V compilation not failing? Somehow if we don't emit this global
than the llvm.compiler.used global uses AS(0) which makes SPIR-V
unhappy, but with this global it's AS(4) which makes it happy. Either
way, this should be fixed.

---

Full diff: https://github.com/llvm/llvm-project/pull/144570.diff

1 Files Affected:

• (modified) clang/lib/CodeGen/CodeGenModule.cpp (+1-1)

diff --git a/clang/lib/CodeGen/CodeGenModule.cpp b/clang/lib/CodeGen/CodeGenModule.cpp
index c036902b0b130..0f075b747eacf 100644
--- a/clang/lib/CodeGen/CodeGenModule.cpp
+++ b/clang/lib/CodeGen/CodeGenModule.cpp
@@ -969,7 +969,7 @@ void CodeGenModule::Release() {
         llvm::ConstantArray::get(ATy, UsedArray), "__clang_gpu_used_external");
     addCompilerUsedGlobal(GV);
   }
-  if (LangOpts.HIP && !getLangOpts().OffloadingNewDriver) {
+  if (LangOpts.HIP) {
     // Emit a unique ID so that host and device binaries from the same
     // compilation unit can be associated.
     auto *GV = new llvm::GlobalVariable(

[arsenm]

llvm.compiler.used global uses AS(0) which makes SPIR-V unhappy, but with this global it's AS(4) which makes it happy. Either way, this should be fixed.

llvm.used and llvm.compiler.used should universally use addrspace(0) and SPIRV should be fixed to not break on this

[jhuber6]

llvm.compiler.used global uses AS(0) which makes SPIR-V unhappy, but with this global it's AS(4) which makes it happy. Either way, this should be fixed.

llvm.used and llvm.compiler.used should universally use addrspace(0) and SPIRV should be fixed to not break on this

Definitely, but this should probably land anyway since it's divergent for no reason.

[shiltian]

No test is needed?

[AlexVlx]

LGTM, thanks.