[clang] f354d54 - [CIR] Take function addresses in the program address space (#233755)
via cfe-commits
cfe-commits at lists.llvm.org
Thu Nov 5 00:27:37 PST 2026
Author: Arseniy Obolenskiy
Date: 2026-11-05T09:27:32+01:00
New Revision: f354d540281c73a883a53e6181336043caf117fc
URL: https://github.com/llvm/llvm-project/commit/f354d540281c73a883a53e6181336043caf117fc
DIFF: https://github.com/llvm/llvm-project/commit/f354d540281c73a883a53e6181336043caf117fc.diff
LOG: [CIR] Take function addresses in the program address space (#233755)
Added:
Modified:
clang/lib/CIR/CodeGen/CIRGenExpr.cpp
clang/lib/CIR/CodeGen/CIRGenModule.cpp
clang/lib/CIR/Dialect/IR/CIRDialect.cpp
clang/test/CIR/CodeGen/no-proto-then-def.c
clang/test/CIR/CodeGenHIP/spirv-constant-addrspace.hip
Removed:
################################################################################
diff --git a/clang/lib/CIR/CodeGen/CIRGenExpr.cpp b/clang/lib/CIR/CodeGen/CIRGenExpr.cpp
index 0720508203563d..0675268bea0477 100644
--- a/clang/lib/CIR/CodeGen/CIRGenExpr.cpp
+++ b/clang/lib/CIR/CodeGen/CIRGenExpr.cpp
@@ -1046,7 +1046,9 @@ static LValue emitFunctionDeclLValue(CIRGenFunction &cgf, const Expr *e,
assert(!cir::MissingFeatures::sanitizers());
mlir::Type fnTy = funcOp.getFunctionType();
- mlir::Type ptrTy = cir::PointerType::get(fnTy);
+ mlir::ptr::MemorySpaceAttrInterface fnAddrSpace =
+ cgf.cgm.getTypes().getPointerAddressSpace(fd->getType());
+ mlir::Type ptrTy = cir::PointerType::get(fnTy, fnAddrSpace);
mlir::Value addr;
// On the HIP host, a reference to a __global__ kernel must resolve to the
@@ -1070,7 +1072,7 @@ static LValue emitFunctionDeclLValue(CIRGenFunction &cgf, const Expr *e,
if (funcOp.getFunctionType() != cgf.convertType(fd->getType())) {
fnTy = cgf.convertType(fd->getType());
- ptrTy = cir::PointerType::get(fnTy);
+ ptrTy = cir::PointerType::get(fnTy, fnAddrSpace);
addr = cir::CastOp::create(cgf.getBuilder(), addr.getLoc(), ptrTy,
cir::CastKind::bitcast, addr);
diff --git a/clang/lib/CIR/CodeGen/CIRGenModule.cpp b/clang/lib/CIR/CodeGen/CIRGenModule.cpp
index 6383228fb98e87..4102da145b7c02 100644
--- a/clang/lib/CIR/CodeGen/CIRGenModule.cpp
+++ b/clang/lib/CIR/CodeGen/CIRGenModule.cpp
@@ -2234,7 +2234,9 @@ void CIRGenModule::replaceUsesOfNonProtoTypeWithRealFunction(
// canonicalizer.
mlir::Value res = getGlobalOp.getAddr();
const mlir::Type oldResTy = res.getType();
- const auto newPtrTy = cir::PointerType::get(newFn.getFunctionType());
+ const auto newPtrTy = cir::PointerType::get(
+ newFn.getFunctionType(),
+ mlir::cast<cir::PointerType>(oldResTy).getAddrSpace());
if (oldResTy != newPtrTy) {
res.setType(newPtrTy);
builder.setInsertionPointAfter(getGlobalOp.getOperation());
diff --git a/clang/lib/CIR/Dialect/IR/CIRDialect.cpp b/clang/lib/CIR/Dialect/IR/CIRDialect.cpp
index 7ebcedff6db775..f38161648b3fcd 100644
--- a/clang/lib/CIR/Dialect/IR/CIRDialect.cpp
+++ b/clang/lib/CIR/Dialect/IR/CIRDialect.cpp
@@ -13,6 +13,7 @@
#include "clang/CIR/Dialect/IR/CIRDialect.h"
#include "clang/CIR/Dialect/IR/CIRAttrs.h"
+#include "clang/CIR/Dialect/IR/CIRDataLayout.h"
#include "clang/CIR/Dialect/IR/CIROpsEnums.h"
#include "clang/CIR/Dialect/IR/CIRTypes.h"
@@ -2744,7 +2745,15 @@ cir::GetGlobalOp::verifySymbolUses(SymbolTableCollection &symbolTable) {
<< resultType.getPointee() << "' does not match type " << symTy
<< " of the global @" << getName();
- if (symAddrSpaceAttr != resultType.getAddrSpace()) {
+ // A function address may also be taken in the program address space.
+ auto targetAS =
+ dyn_cast_if_present<TargetAddressSpaceAttr>(resultType.getAddrSpace());
+ bool isProgramAS =
+ isa<FuncOp>(op) && targetAS &&
+ targetAS.getValue() ==
+ CIRDataLayout(getOperation()->getParentOfType<ModuleOp>())
+ .getProgramAddressSpace();
+ if (!isProgramAS && symAddrSpaceAttr != resultType.getAddrSpace()) {
return emitOpError()
<< "result type address space does not match the address "
"space of the global @"
diff --git a/clang/test/CIR/CodeGen/no-proto-then-def.c b/clang/test/CIR/CodeGen/no-proto-then-def.c
index c142c4f0a16f5a..4eb3c8f753569e 100644
--- a/clang/test/CIR/CodeGen/no-proto-then-def.c
+++ b/clang/test/CIR/CodeGen/no-proto-then-def.c
@@ -4,6 +4,8 @@
// RUN: FileCheck --input-file=%t-cir.ll %s -check-prefix=LLVM
// RUN: %clang_cc1 -triple x86_64-unknown-linux-gnu -emit-llvm -Wno-deprecated-non-prototype %s -o %t.ll
// RUN: FileCheck --input-file=%t.ll %s -check-prefix=LLVM
+// RUN: %clang_cc1 -triple spirv64-amd-amdhsa -fclangir -emit-cir -Wno-deprecated-non-prototype %s -o %t-spirv.cir
+// RUN: FileCheck --input-file=%t-spirv.cir %s -check-prefix=SPIRV
extern int default_proc();
@@ -22,6 +24,11 @@ int default_proc(int a) { return a; }
// CIR: cir.get_global @default_proc : !cir.ptr<!cir.func<(!s32i) -> !s32i>>
// CIR: cir.cast bitcast %{{.*}} : !cir.ptr<!cir.func<(!s32i) -> !s32i>> -> !cir.ptr<!cir.func<(...) -> !s32i>>
+// The retyped address keeps the program address space.
+// SPIRV: cir.func{{.*}}@test_proc_ptr
+// SPIRV: cir.get_global @default_proc : !cir.ptr<!cir.func<(!s32i) -> !s32i>, target_address_space(4)>
+// SPIRV: cir.cast bitcast %{{.*}} : !cir.ptr<!cir.func<(!s32i) -> !s32i>, target_address_space(4)> -> !cir.ptr<!cir.func<(...) -> !s32i>, target_address_space(4)>
+
// LLVM: define{{.*}} @test_proc_ptr
// LLVM: store ptr @default_proc, ptr
// LLVM: define{{.*}} @default_proc
diff --git a/clang/test/CIR/CodeGenHIP/spirv-constant-addrspace.hip b/clang/test/CIR/CodeGenHIP/spirv-constant-addrspace.hip
index 9249928a429e1f..fdf8d95fec734e 100644
--- a/clang/test/CIR/CodeGenHIP/spirv-constant-addrspace.hip
+++ b/clang/test/CIR/CodeGenHIP/spirv-constant-addrspace.hip
@@ -63,6 +63,15 @@ __device__ int get_shared() {
// LLVM-LABEL: define{{.*}} i32 @_Z6get_ocPU3AS2i(ptr addrspace(2)
__device__ int get_oc(__attribute__((opencl_constant)) int *p) { return *p; }
+// Function addresses are in the program address space 4.
+// CIR-LABEL: cir.func{{.*}} @_Z7take_fnv
+// CIR: cir.get_global @_Z6fn_refv : !cir.ptr<!cir.func<()>, target_address_space(4)>
+// LLVM-LABEL: define{{.*}} void @_Z7take_fnv
+// LLVM: call{{.*}} @_Z6use_fnPFvvE(ptr addrspace(4) noundef @_Z6fn_refv)
+__device__ void fn_ref();
+__device__ void use_fn(void (*)());
+__device__ void take_fn() { use_fn(fn_ref); }
+
// Function aliases point into the program address space 4.
extern "C" __device__ int alias_target() { return 1; }
[[gnu::alias("alias_target")]] __device__ int alias();
More information about the cfe-commits
mailing list