https://github.com/Keenuts updated https://github.com/llvm/llvm-project/pull/138530
From 8971ce70badbf1a7bdbe04f4ba94b03b56adacf5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nathan=20Gau=C3=ABr?= <brio...@google.com> Date: Wed, 30 Apr 2025 11:06:55 +0200 Subject: [PATCH 1/2] [HLSL] Implement vk::ext_builtin_input attribute This variable attribute is used in HLSL to add Vulkan specific builtins in a shader. The attribute is documented here: https://github.com/microsoft/hlsl-specs/blob/17727e88fd1cb09013cb3a144110826af05f4dd5/proposals/0011-inline-spirv.md Those variable, even if marked as `static` are externally initialized by the pipeline/driver/GPU. This is handled by moving them to a specific address space `hlsl_input`, also added by this commit. The design for input variables in Clang can be found here: https://github.com/llvm/wg-hlsl/blob/355771361ef69259fef39a65caef8bff9cb4046d/proposals/0019-spirv-input-builtin.md Related to #136920 --- clang/include/clang/Basic/AddressSpaces.h | 1 + clang/include/clang/Basic/Attr.td | 13 +++++++++++ clang/include/clang/Basic/AttrDocs.td | 22 +++++++++++++++++++ .../include/clang/Basic/AttributeCommonInfo.h | 2 +- clang/include/clang/Sema/SemaHLSL.h | 2 ++ clang/lib/AST/Type.cpp | 1 + clang/lib/AST/TypePrinter.cpp | 2 ++ clang/lib/Basic/Attributes.cpp | 1 + clang/lib/Basic/TargetInfo.cpp | 2 ++ clang/lib/Basic/Targets/AArch64.h | 1 + clang/lib/Basic/Targets/AMDGPU.cpp | 2 ++ clang/lib/Basic/Targets/DirectX.h | 1 + clang/lib/Basic/Targets/NVPTX.h | 1 + clang/lib/Basic/Targets/SPIR.h | 2 ++ clang/lib/Basic/Targets/SystemZ.h | 1 + clang/lib/Basic/Targets/TCE.h | 1 + clang/lib/Basic/Targets/WebAssembly.h | 1 + clang/lib/Basic/Targets/X86.h | 1 + clang/lib/CodeGen/CGHLSLRuntime.cpp | 11 ++++++++++ clang/lib/CodeGen/CGHLSLRuntime.h | 1 + clang/lib/CodeGen/CodeGenModule.cpp | 17 ++++++++++++++ clang/lib/Sema/SemaDecl.cpp | 6 +++++ clang/lib/Sema/SemaDeclAttr.cpp | 3 +++ clang/lib/Sema/SemaHLSL.cpp | 14 ++++++++++++ clang/test/CodeGenHLSL/vk-input-builtin.hlsl | 14 ++++++++++++ .../SemaTemplate/address_space-dependent.cpp | 4 ++-- 26 files changed, 124 insertions(+), 3 deletions(-) create mode 100644 clang/test/CodeGenHLSL/vk-input-builtin.hlsl diff --git a/clang/include/clang/Basic/AddressSpaces.h b/clang/include/clang/Basic/AddressSpaces.h index 519d959bb636c..48e4a1c61fe02 100644 --- a/clang/include/clang/Basic/AddressSpaces.h +++ b/clang/include/clang/Basic/AddressSpaces.h @@ -61,6 +61,7 @@ enum class LangAS : unsigned { hlsl_constant, hlsl_private, hlsl_device, + hlsl_input, // Wasm specific address spaces. wasm_funcref, diff --git a/clang/include/clang/Basic/Attr.td b/clang/include/clang/Basic/Attr.td index a734eb6658c3d..241d7c8d8f99c 100644 --- a/clang/include/clang/Basic/Attr.td +++ b/clang/include/clang/Basic/Attr.td @@ -140,6 +140,11 @@ def SharedVar : SubsetSubject<Var, [{S->hasGlobalStorage() && !S->getTLSKind()}], "global variables">; +def HLSLInputBuiltin : SubsetSubject<Var, [{S->hasGlobalStorage() && + S->getStorageClass()==StorageClass::SC_Static && + S->getType().isConstQualified()}], + "input builtin">; + def GlobalVar : SubsetSubject<Var, [{S->hasGlobalStorage()}], "global variables">; @@ -4892,6 +4897,14 @@ def HLSLWaveSize: InheritableAttr { let Documentation = [WaveSizeDocs]; } +def HLSLVkExtBuiltinInput : InheritableAttr { + let Spellings = [CXX11<"vk", "ext_builtin_input">]; + let Args = [IntArgument<"BuiltIn">]; + let Subjects = SubjectList<[HLSLInputBuiltin], ErrorDiag>; + let LangOpts = [HLSL]; + let Documentation = [HLSLVkExtBuiltinInputDocs]; +} + def RandomizeLayout : InheritableAttr { let Spellings = [GCC<"randomize_layout">]; let Subjects = SubjectList<[Record]>; diff --git a/clang/include/clang/Basic/AttrDocs.td b/clang/include/clang/Basic/AttrDocs.td index cbb397cb31dfb..9fc5ee24bf02f 100644 --- a/clang/include/clang/Basic/AttrDocs.td +++ b/clang/include/clang/Basic/AttrDocs.td @@ -8497,6 +8497,28 @@ and copied back to the argument after the callee returns. }]; } +def HLSLVkExtBuiltinInputDocs : Documentation { + let Category = DocCatVariable; + let Content = [{ +Vulkan shaders have `Input` builtins. Those variables are externally +initialized by the driver/pipeline, but each copy is private to the current +lane. + +Those builtins can be declared using the `[[vk::ext_builtin_input]]` attribute +like follows: + +.. code-block:: c++ + [[vk::ext_builtin_input(/* WorkgroupId */ 26)]] + static const uint3 groupid; + +This variable will be lowered into a module-level variable, with the `Input` +storage class, and the `BuiltIn 26` decoration. + +The full documentation for this inline SPIR-V attribute can be found here: +https://github.com/microsoft/hlsl-specs/blob/main/proposals/0011-inline-spirv.md + }]; +} + def AnnotateTypeDocs : Documentation { let Category = DocCatType; let Heading = "annotate_type"; diff --git a/clang/include/clang/Basic/AttributeCommonInfo.h b/clang/include/clang/Basic/AttributeCommonInfo.h index 4af5a8fd1852c..dda37eadee277 100644 --- a/clang/include/clang/Basic/AttributeCommonInfo.h +++ b/clang/include/clang/Basic/AttributeCommonInfo.h @@ -67,7 +67,7 @@ class AttributeCommonInfo { IgnoredAttribute, UnknownAttribute, }; - enum class Scope { NONE, CLANG, GNU, MSVC, OMP, HLSL, GSL, RISCV }; + enum class Scope { NONE, CLANG, GNU, MSVC, OMP, HLSL, VK, GSL, RISCV }; enum class AttrArgsInfo { None, Optional, diff --git a/clang/include/clang/Sema/SemaHLSL.h b/clang/include/clang/Sema/SemaHLSL.h index 5d260acf92abb..5d9f7e59b1349 100644 --- a/clang/include/clang/Sema/SemaHLSL.h +++ b/clang/include/clang/Sema/SemaHLSL.h @@ -130,6 +130,8 @@ class SemaHLSL : public SemaBase { void handleParamModifierAttr(Decl *D, const ParsedAttr &AL); bool handleResourceTypeAttr(QualType T, const ParsedAttr &AL); + void handleVkExtBuiltinInputAttr(Decl *D, const ParsedAttr &AL); + bool CheckBuiltinFunctionCall(unsigned BuiltinID, CallExpr *TheCall); QualType ProcessResourceTypeAttributes(QualType Wrapped); HLSLAttributedResourceLocInfo diff --git a/clang/lib/AST/Type.cpp b/clang/lib/AST/Type.cpp index 59369fba2e772..d59b4e1225716 100644 --- a/clang/lib/AST/Type.cpp +++ b/clang/lib/AST/Type.cpp @@ -100,6 +100,7 @@ bool Qualifiers::isTargetAddressSpaceSupersetOf(LangAS A, LangAS B, // address spaces to default to work around this problem. (A == LangAS::Default && B == LangAS::hlsl_private) || (A == LangAS::Default && B == LangAS::hlsl_device) || + (A == LangAS::Default && B == LangAS::hlsl_input) || // Conversions from target specific address spaces may be legal // depending on the target information. Ctx.getTargetInfo().isAddressSpaceSupersetOf(A, B); diff --git a/clang/lib/AST/TypePrinter.cpp b/clang/lib/AST/TypePrinter.cpp index cba1a2d98d660..6423ee49c11f4 100644 --- a/clang/lib/AST/TypePrinter.cpp +++ b/clang/lib/AST/TypePrinter.cpp @@ -2619,6 +2619,8 @@ std::string Qualifiers::getAddrSpaceAsString(LangAS AS) { return "hlsl_private"; case LangAS::hlsl_device: return "hlsl_device"; + case LangAS::hlsl_input: + return "hlsl_input"; case LangAS::wasm_funcref: return "__funcref"; default: diff --git a/clang/lib/Basic/Attributes.cpp b/clang/lib/Basic/Attributes.cpp index 6a070a99c8d96..67256142ad29c 100644 --- a/clang/lib/Basic/Attributes.cpp +++ b/clang/lib/Basic/Attributes.cpp @@ -189,6 +189,7 @@ getScopeFromNormalizedScopeName(StringRef ScopeName) { .Case("gnu", AttributeCommonInfo::Scope::GNU) .Case("gsl", AttributeCommonInfo::Scope::GSL) .Case("hlsl", AttributeCommonInfo::Scope::HLSL) + .Case("vk", AttributeCommonInfo::Scope::VK) .Case("msvc", AttributeCommonInfo::Scope::MSVC) .Case("omp", AttributeCommonInfo::Scope::OMP) .Case("riscv", AttributeCommonInfo::Scope::RISCV); diff --git a/clang/lib/Basic/TargetInfo.cpp b/clang/lib/Basic/TargetInfo.cpp index ab13c32f6943e..a6744c6c8931b 100644 --- a/clang/lib/Basic/TargetInfo.cpp +++ b/clang/lib/Basic/TargetInfo.cpp @@ -49,6 +49,8 @@ static const LangASMap FakeAddrSpaceMap = { 13, // hlsl_groupshared 14, // hlsl_constant 15, // hlsl_private + 16, // hlsl_device + 17, // hlsl_input 20, // wasm_funcref }; diff --git a/clang/lib/Basic/Targets/AArch64.h b/clang/lib/Basic/Targets/AArch64.h index 2fab88cfca901..0c2135fb3862c 100644 --- a/clang/lib/Basic/Targets/AArch64.h +++ b/clang/lib/Basic/Targets/AArch64.h @@ -47,6 +47,7 @@ static const unsigned ARM64AddrSpaceMap[] = { 0, // hlsl_constant 0, // hlsl_private 0, // hlsl_device + 0, // hlsl_input // Wasm address space values for this target are dummy values, // as it is only enabled for Wasm targets. 20, // wasm_funcref diff --git a/clang/lib/Basic/Targets/AMDGPU.cpp b/clang/lib/Basic/Targets/AMDGPU.cpp index c368200f3f739..13b76911bee47 100644 --- a/clang/lib/Basic/Targets/AMDGPU.cpp +++ b/clang/lib/Basic/Targets/AMDGPU.cpp @@ -64,6 +64,7 @@ const LangASMap AMDGPUTargetInfo::AMDGPUDefIsGenMap = { // will break loudly. llvm::AMDGPUAS::PRIVATE_ADDRESS, // hlsl_private llvm::AMDGPUAS::GLOBAL_ADDRESS, // hlsl_device + llvm::AMDGPUAS::PRIVATE_ADDRESS, // hlsl_input }; const LangASMap AMDGPUTargetInfo::AMDGPUDefIsPrivMap = { @@ -91,6 +92,7 @@ const LangASMap AMDGPUTargetInfo::AMDGPUDefIsPrivMap = { llvm::AMDGPUAS::CONSTANT_ADDRESS, // hlsl_constant llvm::AMDGPUAS::PRIVATE_ADDRESS, // hlsl_private llvm::AMDGPUAS::GLOBAL_ADDRESS, // hlsl_device + llvm::AMDGPUAS::PRIVATE_ADDRESS, // hlsl_input }; } // namespace targets } // namespace clang diff --git a/clang/lib/Basic/Targets/DirectX.h b/clang/lib/Basic/Targets/DirectX.h index 566acd6bb3cf3..1729a014c2dec 100644 --- a/clang/lib/Basic/Targets/DirectX.h +++ b/clang/lib/Basic/Targets/DirectX.h @@ -45,6 +45,7 @@ static const unsigned DirectXAddrSpaceMap[] = { 2, // hlsl_constant 0, // hlsl_private 0, // hlsl_device + 0, // hlsl_input // Wasm address space values for this target are dummy values, // as it is only enabled for Wasm targets. 20, // wasm_funcref diff --git a/clang/lib/Basic/Targets/NVPTX.h b/clang/lib/Basic/Targets/NVPTX.h index dc1ecc30980b7..6a54195b30452 100644 --- a/clang/lib/Basic/Targets/NVPTX.h +++ b/clang/lib/Basic/Targets/NVPTX.h @@ -49,6 +49,7 @@ static const unsigned NVPTXAddrSpaceMap[] = { 0, // hlsl_constant 0, // hlsl_private 0, // hlsl_device + 0, // hlsl_input // Wasm address space values for this target are dummy values, // as it is only enabled for Wasm targets. 20, // wasm_funcref diff --git a/clang/lib/Basic/Targets/SPIR.h b/clang/lib/Basic/Targets/SPIR.h index bf249e271a870..7c91840d1defa 100644 --- a/clang/lib/Basic/Targets/SPIR.h +++ b/clang/lib/Basic/Targets/SPIR.h @@ -50,6 +50,7 @@ static const unsigned SPIRDefIsPrivMap[] = { 2, // hlsl_constant 10, // hlsl_private 11, // hlsl_device + 12, // hlsl_input // Wasm address space values for this target are dummy values, // as it is only enabled for Wasm targets. 20, // wasm_funcref @@ -85,6 +86,7 @@ static const unsigned SPIRDefIsGenMap[] = { 0, // hlsl_constant 10, // hlsl_private 11, // hlsl_device + 12, // hlsl_input // Wasm address space values for this target are dummy values, // as it is only enabled for Wasm targets. 20, // wasm_funcref diff --git a/clang/lib/Basic/Targets/SystemZ.h b/clang/lib/Basic/Targets/SystemZ.h index 1f69530c4757f..6431be0b505ce 100644 --- a/clang/lib/Basic/Targets/SystemZ.h +++ b/clang/lib/Basic/Targets/SystemZ.h @@ -45,6 +45,7 @@ static const unsigned ZOSAddressMap[] = { 0, // hlsl_constant 0, // hlsl_private 0, // hlsl_device + 0, // hlsl_input 0 // wasm_funcref }; diff --git a/clang/lib/Basic/Targets/TCE.h b/clang/lib/Basic/Targets/TCE.h index f6e582120447f..005cab9819472 100644 --- a/clang/lib/Basic/Targets/TCE.h +++ b/clang/lib/Basic/Targets/TCE.h @@ -54,6 +54,7 @@ static const unsigned TCEOpenCLAddrSpaceMap[] = { 0, // hlsl_constant 0, // hlsl_private 0, // hlsl_device + 0, // hlsl_input // Wasm address space values for this target are dummy values, // as it is only enabled for Wasm targets. 20, // wasm_funcref diff --git a/clang/lib/Basic/Targets/WebAssembly.h b/clang/lib/Basic/Targets/WebAssembly.h index 04f0cb5df4601..d5aee5c0bd0eb 100644 --- a/clang/lib/Basic/Targets/WebAssembly.h +++ b/clang/lib/Basic/Targets/WebAssembly.h @@ -45,6 +45,7 @@ static const unsigned WebAssemblyAddrSpaceMap[] = { 0, // hlsl_constant 0, // hlsl_private 0, // hlsl_device + 0, // hlsl_input 20, // wasm_funcref }; diff --git a/clang/lib/Basic/Targets/X86.h b/clang/lib/Basic/Targets/X86.h index 194f3faef1be3..3d828b5f2b171 100644 --- a/clang/lib/Basic/Targets/X86.h +++ b/clang/lib/Basic/Targets/X86.h @@ -49,6 +49,7 @@ static const unsigned X86AddrSpaceMap[] = { 0, // hlsl_constant 0, // hlsl_private 0, // hlsl_device + 0, // hlsl_input // Wasm address space values for this target are dummy values, // as it is only enabled for Wasm targets. 20, // wasm_funcref diff --git a/clang/lib/CodeGen/CGHLSLRuntime.cpp b/clang/lib/CodeGen/CGHLSLRuntime.cpp index f6608faaa7309..99e7b7f412559 100644 --- a/clang/lib/CodeGen/CGHLSLRuntime.cpp +++ b/clang/lib/CodeGen/CGHLSLRuntime.cpp @@ -554,6 +554,17 @@ static void initializeBufferFromBinding(CodeGenModule &CGM, Args); } +void CGHLSLRuntime::handleGlobalVarDefinition(const VarDecl *VD, + llvm::GlobalVariable *GV) { + if (auto Attr = VD->getAttr<HLSLVkExtBuiltinInputAttr>()) { + LLVMContext &Ctx = GV->getContext(); + IRBuilder<> B(GV->getContext()); + MDNode *Val = MDNode::get( + Ctx, {ConstantAsMetadata::get(B.getInt32(Attr->getBuiltIn()))}); + GV->addMetadata("spv.builtin", *Val); + } +} + llvm::Instruction *CGHLSLRuntime::getConvergenceToken(BasicBlock &BB) { if (!CGM.shouldEmitConvergenceTokens()) return nullptr; diff --git a/clang/lib/CodeGen/CGHLSLRuntime.h b/clang/lib/CodeGen/CGHLSLRuntime.h index 4d6db3f5d9f3e..68151c0f0ea24 100644 --- a/clang/lib/CodeGen/CGHLSLRuntime.h +++ b/clang/lib/CodeGen/CGHLSLRuntime.h @@ -150,6 +150,7 @@ class CGHLSLRuntime { void emitEntryFunction(const FunctionDecl *FD, llvm::Function *Fn); void setHLSLFunctionAttributes(const FunctionDecl *FD, llvm::Function *Fn); + void handleGlobalVarDefinition(const VarDecl *VD, llvm::GlobalVariable *Var); llvm::Instruction *getConvergenceToken(llvm::BasicBlock &BB); diff --git a/clang/lib/CodeGen/CodeGenModule.cpp b/clang/lib/CodeGen/CodeGenModule.cpp index b36e078a51f97..68367c34fa514 100644 --- a/clang/lib/CodeGen/CodeGenModule.cpp +++ b/clang/lib/CodeGen/CodeGenModule.cpp @@ -5636,6 +5636,8 @@ void CodeGenModule::EmitGlobalVarDefinition(const VarDecl *D, Init = llvm::UndefValue::get(getTypes().ConvertTypeForMem(ASTTy)); else if (D->hasAttr<LoaderUninitializedAttr>()) Init = llvm::UndefValue::get(getTypes().ConvertTypeForMem(ASTTy)); + else if (GetGlobalVarAddressSpace(D) == LangAS::hlsl_input) + Init = llvm::UndefValue::get(getTypes().ConvertTypeForMem(ASTTy)); else if (!InitExpr) { // This is a tentative definition; tentative definitions are // implicitly initialized with { 0 }. @@ -5759,9 +5761,18 @@ void CodeGenModule::EmitGlobalVarDefinition(const VarDecl *D, getCUDARuntime().internalizeDeviceSideVar(D, Linkage); } getCUDARuntime().handleVarRegistration(D, *GV); + } else if (LangOpts.HLSL && + GetGlobalVarAddressSpace(D) == LangAS::hlsl_input) { + // HLSL Input variables are considered to be set by the driver/pipeline, but + // only visible to a single thread/wave. + GV->setExternallyInitialized(true); } GV->setInitializer(Init); + + if (LangOpts.HLSL) + getHLSLRuntime().handleGlobalVarDefinition(D, GV); + if (emitter) emitter->finalize(GV); @@ -5804,6 +5815,12 @@ void CodeGenModule::EmitGlobalVarDefinition(const VarDecl *D, !D->hasAttr<ConstInitAttr>()) Linkage = llvm::GlobalValue::InternalLinkage; + // HLSL variables in the input address space maps like memory-mapped + // variables. Even if they are 'static', they are externally initialized and + // read/write by the hardware/driver/pipeline. + if (LangOpts.HLSL && GetGlobalVarAddressSpace(D) == LangAS::hlsl_input) + Linkage = llvm::GlobalValue::ExternalLinkage; + GV->setLinkage(Linkage); if (D->hasAttr<DLLImportAttr>()) GV->setDLLStorageClass(llvm::GlobalVariable::DLLImportStorageClass); diff --git a/clang/lib/Sema/SemaDecl.cpp b/clang/lib/Sema/SemaDecl.cpp index 63937ddc3e386..7f3d2a7206977 100644 --- a/clang/lib/Sema/SemaDecl.cpp +++ b/clang/lib/Sema/SemaDecl.cpp @@ -14412,6 +14412,12 @@ void Sema::ActOnUninitializedDecl(Decl *RealDecl) { if (getLangOpts().HLSL && HLSL().ActOnUninitializedVarDecl(Var)) return; + // HLSL input variables are expected to be externally initialized, even + // when marked `static`. + if (getLangOpts().HLSL && + Var->getType().getAddressSpace() == LangAS::hlsl_input) + return; + // C++03 [dcl.init]p9: // If no initializer is specified for an object, and the // object is of (possibly cv-qualified) non-POD class type (or diff --git a/clang/lib/Sema/SemaDeclAttr.cpp b/clang/lib/Sema/SemaDeclAttr.cpp index bfb3ee9dcbd16..6094b41d89a4d 100644 --- a/clang/lib/Sema/SemaDeclAttr.cpp +++ b/clang/lib/Sema/SemaDeclAttr.cpp @@ -7483,6 +7483,9 @@ ProcessDeclAttribute(Sema &S, Scope *scope, Decl *D, const ParsedAttr &AL, case ParsedAttr::AT_HLSLWaveSize: S.HLSL().handleWaveSizeAttr(D, AL); break; + case ParsedAttr::AT_HLSLVkExtBuiltinInput: + S.HLSL().handleVkExtBuiltinInputAttr(D, AL); + break; case ParsedAttr::AT_HLSLSV_GroupThreadID: S.HLSL().handleSV_GroupThreadIDAttr(D, AL); break; diff --git a/clang/lib/Sema/SemaHLSL.cpp b/clang/lib/Sema/SemaHLSL.cpp index 70aacaa2aadbe..55ac07f7f866a 100644 --- a/clang/lib/Sema/SemaHLSL.cpp +++ b/clang/lib/Sema/SemaHLSL.cpp @@ -1069,6 +1069,12 @@ void SemaHLSL::handleWaveSizeAttr(Decl *D, const ParsedAttr &AL) { D->addAttr(NewAttr); } +void SemaHLSL::handleVkExtBuiltinInputAttr(Decl *D, const ParsedAttr &AL) { + IntegerLiteral *IL = cast<IntegerLiteral>(AL.getArgAsExpr(0)); + D->addAttr(::new (getASTContext()) HLSLVkExtBuiltinInputAttr( + getASTContext(), AL, IL->getValue().getZExtValue())); +} + bool SemaHLSL::diagnoseInputIDType(QualType T, const ParsedAttr &AL) { const auto *VT = T->getAs<VectorType>(); @@ -3190,6 +3196,14 @@ void SemaHLSL::deduceAddressSpace(VarDecl *Decl) { return; QualType Type = Decl->getType(); + + if (Decl->hasAttr<HLSLVkExtBuiltinInputAttr>()) { + LangAS ImplAS = LangAS::hlsl_input; + Type = SemaRef.getASTContext().getAddrSpaceQualType(Type, ImplAS); + Decl->setType(Type); + return; + } + if (Type->isSamplerT() || Type->isVoidType()) return; diff --git a/clang/test/CodeGenHLSL/vk-input-builtin.hlsl b/clang/test/CodeGenHLSL/vk-input-builtin.hlsl new file mode 100644 index 0000000000000..108aaaf9d78b9 --- /dev/null +++ b/clang/test/CodeGenHLSL/vk-input-builtin.hlsl @@ -0,0 +1,14 @@ +// RUN: %clang_cc1 -finclude-default-header -x hlsl -triple \ +// RUN: spirv-unknown-vulkan1.3-compute %s -emit-llvm -O3 -o - | FileCheck %s + +[[vk::ext_builtin_input(/* WorkgroupId */ 26)]] +static const uint3 groupid; +// CHECK: @_ZL7groupid = local_unnamed_addr addrspace(12) externally_initialized constant <3 x i32> undef, align 16, !spv.builtin [[META0:![0-9]+]] + +RWStructuredBuffer<int> output : register(u1, space0); + +[numthreads(1, 1, 1)] +void main() { + output[0] = groupid; +} +// CHECK: [[META0]] = !{i32 26} diff --git a/clang/test/SemaTemplate/address_space-dependent.cpp b/clang/test/SemaTemplate/address_space-dependent.cpp index 4eabcfa0fcf21..e17bf60e6a200 100644 --- a/clang/test/SemaTemplate/address_space-dependent.cpp +++ b/clang/test/SemaTemplate/address_space-dependent.cpp @@ -43,7 +43,7 @@ void neg() { template <long int I> void tooBig() { - __attribute__((address_space(I))) int *bounds; // expected-error {{address space is larger than the maximum supported (8388583)}} + __attribute__((address_space(I))) int *bounds; // expected-error {{address space is larger than the maximum supported (8388582)}} } template <long int I> @@ -101,7 +101,7 @@ int main() { car<1, 2, 3>(); // expected-note {{in instantiation of function template specialization 'car<1, 2, 3>' requested here}} HasASTemplateFields<1> HASTF; neg<-1>(); // expected-note {{in instantiation of function template specialization 'neg<-1>' requested here}} - correct<0x7FFFE7>(); + correct<0x7FFFE6>(); tooBig<8388650>(); // expected-note {{in instantiation of function template specialization 'tooBig<8388650L>' requested here}} __attribute__((address_space(1))) char *x; From 2ffe6425fc9eea0c86253f69938f6c22d3b2e5a3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nathan=20Gau=C3=ABr?= <brio...@google.com> Date: Mon, 5 May 2025 15:44:59 +0200 Subject: [PATCH 2/2] fix address space mapping for SPIR --- clang/lib/Basic/Targets/SPIR.h | 4 ++-- clang/test/CodeGenHLSL/vk-input-builtin.hlsl | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/clang/lib/Basic/Targets/SPIR.h b/clang/lib/Basic/Targets/SPIR.h index 7c91840d1defa..7d73c8504c5b9 100644 --- a/clang/lib/Basic/Targets/SPIR.h +++ b/clang/lib/Basic/Targets/SPIR.h @@ -50,7 +50,7 @@ static const unsigned SPIRDefIsPrivMap[] = { 2, // hlsl_constant 10, // hlsl_private 11, // hlsl_device - 12, // hlsl_input + 7, // hlsl_input // Wasm address space values for this target are dummy values, // as it is only enabled for Wasm targets. 20, // wasm_funcref @@ -86,7 +86,7 @@ static const unsigned SPIRDefIsGenMap[] = { 0, // hlsl_constant 10, // hlsl_private 11, // hlsl_device - 12, // hlsl_input + 7, // hlsl_input // Wasm address space values for this target are dummy values, // as it is only enabled for Wasm targets. 20, // wasm_funcref diff --git a/clang/test/CodeGenHLSL/vk-input-builtin.hlsl b/clang/test/CodeGenHLSL/vk-input-builtin.hlsl index 108aaaf9d78b9..2e8a854956100 100644 --- a/clang/test/CodeGenHLSL/vk-input-builtin.hlsl +++ b/clang/test/CodeGenHLSL/vk-input-builtin.hlsl @@ -3,7 +3,7 @@ [[vk::ext_builtin_input(/* WorkgroupId */ 26)]] static const uint3 groupid; -// CHECK: @_ZL7groupid = local_unnamed_addr addrspace(12) externally_initialized constant <3 x i32> undef, align 16, !spv.builtin [[META0:![0-9]+]] +// CHECK: @_ZL7groupid = local_unnamed_addr addrspace(7) externally_initialized constant <3 x i32> undef, align 16, !spv.builtin [[META0:![0-9]+]] RWStructuredBuffer<int> output : register(u1, space0); _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
