Skip to content

Commit 4f1b91b

Browse files
s-perrons-perron
committed
[HLSL][SPIRV] Add vk::binding attribute
The vk::binding attribute allows users to explicitly set the set and binding for a resource in SPIR-V without chaning the "register" attribute, which will be used when targeting DXIL. Fixes #136894
1 parent a6532c2 commit 4f1b91b

File tree

12 files changed

+220
-10
lines changed

12 files changed

+220
-10
lines changed

‎clang/include/clang/Basic/Attr.td

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4894,6 +4894,14 @@ def HLSLSV_GroupIndex: HLSLAnnotationAttr {
48944894
let Documentation = [HLSLSV_GroupIndexDocs];
48954895
}
48964896

4897+
def HLSLVkBinding : InheritableAttr {
4898+
let Spellings = [CXX11<"vk", "binding">];
4899+
let Subjects = SubjectList<[HLSLBufferObj, ExternalGlobalVar], ErrorDiag>;
4900+
let Args = [IntArgument<"Binding">, IntArgument<"Set", 1>];
4901+
let LangOpts = [HLSL];
4902+
let Documentation = [HLSLVkBindingDocs];
4903+
}
4904+
48974905
def HLSLResourceBinding: InheritableAttr {
48984906
let Spellings = [HLSLAnnotation<"register">];
48994907
let Subjects = SubjectList<[HLSLBufferObj, ExternalGlobalVar], ErrorDiag>;

‎clang/include/clang/Basic/AttrDocs.td

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8778,6 +8778,32 @@ def ReadOnlyPlacementDocs : Documentation {
87788778
}];
87798779
}
87808780

8781+
def HLSLVkBindingDocs : Documentation {
8782+
let Category = DocCatVariable;
8783+
let Content = [{
8784+
The ``[[vk::binding]]`` attribute allows you to explicitly specify the descriptor
8785+
set and binding for a resource when targeting SPIR-V. This is particularly
8786+
useful when you need different bindings for SPIR-V and DXIL, as the ``register``
8787+
attribute can be used for DXIL-specific bindings.
8788+
8789+
The attribute takes two integer arguments: the binding and the descriptor set.
8790+
The descriptor set is optional and defaults to 0 if not provided.
8791+
8792+
.. code-block:: c++
8793+
8794+
// A structured buffer with binding 23 in descriptor set 102.
8795+
[[vk::binding(23, 102)]] StructuredBuffer<float> Buf;
8796+
8797+
// A structured buffer with binding 14 in descriptor set 0.
8798+
[[vk::binding(14)]] StructuredBuffer<float> Buf2;
8799+
8800+
// A cbuffer with binding 1 in descriptor set 2.
8801+
[[vk::binding(1, 2)]] cbuffer MyCBuffer {
8802+
float4x4 worldViewProj;
8803+
};
8804+
}];
8805+
}
8806+
87818807
def WebAssemblyFuncrefDocs : Documentation {
87828808
let Category = DocCatType;
87838809
let Content = [{

‎clang/include/clang/Parse/Parser.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5191,7 +5191,7 @@ class Parser : public CodeCompletionHandler {
51915191
void ParseHLSLAnnotations(ParsedAttributes &Attrs,
51925192
SourceLocation *EndLoc = nullptr,
51935193
bool CouldBeBitField = false);
5194-
Decl *ParseHLSLBuffer(SourceLocation &DeclEnd);
5194+
Decl *ParseHLSLBuffer(SourceLocation &DeclEnd, ParsedAttributes &Attrs);
51955195

51965196
///@}
51975197

‎clang/include/clang/Sema/SemaHLSL.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -161,6 +161,7 @@ class SemaHLSL : public SemaBase {
161161
void handleNumThreadsAttr(Decl *D, const ParsedAttr &AL);
162162
void handleWaveSizeAttr(Decl *D, const ParsedAttr &AL);
163163
void handleVkConstantIdAttr(Decl *D, const ParsedAttr &AL);
164+
void handleVkBindingAttr(Decl *D, const ParsedAttr &AL);
164165
void handleSV_DispatchThreadIDAttr(Decl *D, const ParsedAttr &AL);
165166
void handleSV_GroupThreadIDAttr(Decl *D, const ParsedAttr &AL);
166167
void handleSV_GroupIDAttr(Decl *D, const ParsedAttr &AL);

‎clang/lib/CodeGen/CGHLSLRuntime.cpp

Lines changed: 33 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -273,10 +273,14 @@ void CGHLSLRuntime::addBuffer(const HLSLBufferDecl *BufDecl) {
273273
emitBufferGlobalsAndMetadata(BufDecl, BufGV);
274274

275275
// Initialize cbuffer from binding (implicit or explicit)
276-
HLSLResourceBindingAttr *RBA = BufDecl->getAttr<HLSLResourceBindingAttr>();
277-
assert(RBA &&
278-
"cbuffer/tbuffer should always have resource binding attribute");
279-
initializeBufferFromBinding(BufDecl, BufGV, RBA);
276+
if (HLSLVkBindingAttr *VkBinding = BufDecl->getAttr<HLSLVkBindingAttr>()) {
277+
initializeBufferFromBinding(BufDecl, BufGV, VkBinding);
278+
} else {
279+
HLSLResourceBindingAttr *RBA = BufDecl->getAttr<HLSLResourceBindingAttr>();
280+
assert(RBA &&
281+
"cbuffer/tbuffer should always have resource binding attribute");
282+
initializeBufferFromBinding(BufDecl, BufGV, RBA);
283+
}
280284
}
281285

282286
llvm::TargetExtType *
@@ -593,6 +597,31 @@ static void initializeBuffer(CodeGenModule &CGM, llvm::GlobalVariable *GV,
593597
CGM.AddCXXGlobalInit(InitResFunc);
594598
}
595599

600+
static Value *buildNameForResource(llvm::StringRef BaseName,
601+
CodeGenModule &CGM) {
602+
std::string Str(BaseName);
603+
std::string GlobalName(Str + ".str");
604+
return CGM.GetAddrOfConstantCString(Str, GlobalName.c_str()).getPointer();
605+
}
606+
607+
void CGHLSLRuntime::initializeBufferFromBinding(const HLSLBufferDecl *BufDecl,
608+
llvm::GlobalVariable *GV,
609+
HLSLVkBindingAttr *VkBinding) {
610+
assert(VkBinding && "expect a nonnull binding attribute");
611+
llvm::Type *Int1Ty = llvm::Type::getInt1Ty(CGM.getLLVMContext());
612+
auto *NonUniform = llvm::ConstantInt::get(Int1Ty, false);
613+
auto *Index = llvm::ConstantInt::get(CGM.IntTy, 0);
614+
auto *RangeSize = llvm::ConstantInt::get(CGM.IntTy, 1);
615+
auto *Set = llvm::ConstantInt::get(CGM.IntTy, VkBinding->getSet());
616+
auto *Binding = llvm::ConstantInt::get(CGM.IntTy, VkBinding->getBinding());
617+
Value *Name = buildNameForResource(BufDecl->getName(), CGM);
618+
llvm::Intrinsic::ID IntrinsicID =
619+
CGM.getHLSLRuntime().getCreateHandleFromBindingIntrinsic();
620+
621+
SmallVector<Value *> Args{Set, Binding, RangeSize, Index, NonUniform, Name};
622+
initializeBuffer(CGM, GV, IntrinsicID, Args);
623+
}
624+
596625
void CGHLSLRuntime::initializeBufferFromBinding(const HLSLBufferDecl *BufDecl,
597626
llvm::GlobalVariable *GV,
598627
HLSLResourceBindingAttr *RBA) {

‎clang/lib/CodeGen/CGHLSLRuntime.h

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,7 @@ class VarDecl;
6262
class ParmVarDecl;
6363
class InitListExpr;
6464
class HLSLBufferDecl;
65+
class HLSLVkBindingAttr;
6566
class HLSLResourceBindingAttr;
6667
class Type;
6768
class RecordType;
@@ -166,6 +167,9 @@ class CGHLSLRuntime {
166167
private:
167168
void emitBufferGlobalsAndMetadata(const HLSLBufferDecl *BufDecl,
168169
llvm::GlobalVariable *BufGV);
170+
void initializeBufferFromBinding(const HLSLBufferDecl *BufDecl,
171+
llvm::GlobalVariable *GV,
172+
HLSLVkBindingAttr *VkBinding);
169173
void initializeBufferFromBinding(const HLSLBufferDecl *BufDecl,
170174
llvm::GlobalVariable *GV,
171175
HLSLResourceBindingAttr *RBA);

‎clang/lib/Parse/ParseDecl.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1901,7 +1901,7 @@ Parser::DeclGroupPtrTy Parser::ParseDeclaration(DeclaratorContext Context,
19011901

19021902
case tok::kw_cbuffer:
19031903
case tok::kw_tbuffer:
1904-
SingleDecl = ParseHLSLBuffer(DeclEnd);
1904+
SingleDecl = ParseHLSLBuffer(DeclEnd, DeclAttrs);
19051905
break;
19061906
case tok::kw_namespace:
19071907
ProhibitAttributes(DeclAttrs);

‎clang/lib/Parse/ParseHLSL.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,8 @@ static bool validateDeclsInsideHLSLBuffer(Parser::DeclGroupPtrTy DG,
4848
return IsValid;
4949
}
5050

51-
Decl *Parser::ParseHLSLBuffer(SourceLocation &DeclEnd) {
51+
Decl *Parser::ParseHLSLBuffer(SourceLocation &DeclEnd,
52+
ParsedAttributes &Attrs) {
5253
assert((Tok.is(tok::kw_cbuffer) || Tok.is(tok::kw_tbuffer)) &&
5354
"Not a cbuffer or tbuffer!");
5455
bool IsCBuffer = Tok.is(tok::kw_cbuffer);
@@ -62,7 +63,6 @@ Decl *Parser::ParseHLSLBuffer(SourceLocation &DeclEnd) {
6263
IdentifierInfo *Identifier = Tok.getIdentifierInfo();
6364
SourceLocation IdentifierLoc = ConsumeToken();
6465

65-
ParsedAttributes Attrs(AttrFactory);
6666
MaybeParseHLSLAnnotations(Attrs, nullptr);
6767

6868
ParseScope BufferScope(this, Scope::DeclScope);

‎clang/lib/Sema/SemaDeclAttr.cpp

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7441,6 +7441,9 @@ ProcessDeclAttribute(Sema &S, Scope *scope, Decl *D, const ParsedAttr &AL,
74417441
case ParsedAttr::AT_HLSLVkConstantId:
74427442
S.HLSL().handleVkConstantIdAttr(D, AL);
74437443
break;
7444+
case ParsedAttr::AT_HLSLVkBinding:
7445+
S.HLSL().handleVkBindingAttr(D, AL);
7446+
break;
74447447
case ParsedAttr::AT_HLSLSV_GroupThreadID:
74457448
S.HLSL().handleSV_GroupThreadIDAttr(D, AL);
74467449
break;

‎clang/lib/Sema/SemaHLSL.cpp

Lines changed: 27 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -596,8 +596,9 @@ void SemaHLSL::ActOnFinishBuffer(Decl *Dcl, SourceLocation RBrace) {
596596
// create buffer layout struct
597597
createHostLayoutStructForBuffer(SemaRef, BufDecl);
598598

599+
HLSLVkBindingAttr *VkBinding = Dcl->getAttr<HLSLVkBindingAttr>();
599600
HLSLResourceBindingAttr *RBA = Dcl->getAttr<HLSLResourceBindingAttr>();
600-
if (!RBA || !RBA->hasRegisterSlot()) {
601+
if (!VkBinding && (!RBA || !RBA->hasRegisterSlot())) {
601602
SemaRef.Diag(Dcl->getLocation(), diag::warn_hlsl_implicit_binding);
602603
// Use HLSLResourceBindingAttr to transfer implicit binding order_ID
603604
// to codegen. If it does not exist, create an implicit attribute.
@@ -1479,6 +1480,23 @@ void SemaHLSL::handleVkConstantIdAttr(Decl *D, const ParsedAttr &AL) {
14791480
D->addAttr(NewAttr);
14801481
}
14811482

1483+
void SemaHLSL::handleVkBindingAttr(Decl *D, const ParsedAttr &AL) {
1484+
// The vk::binding attribute only applies to SPIR-V.
1485+
if (!getASTContext().getTargetInfo().getTriple().isSPIRV())
1486+
return;
1487+
1488+
uint32_t Binding = 0;
1489+
if (!SemaRef.checkUInt32Argument(AL, AL.getArgAsExpr(0), Binding))
1490+
return;
1491+
uint32_t Set = 0;
1492+
if (AL.getNumArgs() > 1 &&
1493+
!SemaRef.checkUInt32Argument(AL, AL.getArgAsExpr(1), Set))
1494+
return;
1495+
1496+
D->addAttr(::new (getASTContext())
1497+
HLSLVkBindingAttr(getASTContext(), AL, Binding, Set));
1498+
}
1499+
14821500
bool SemaHLSL::diagnoseInputIDType(QualType T, const ParsedAttr &AL) {
14831501
const auto *VT = T->getAs<VectorType>();
14841502

@@ -3643,8 +3661,12 @@ static bool initVarDeclWithCtor(Sema &S, VarDecl *VD,
36433661
bool SemaHLSL::initGlobalResourceDecl(VarDecl *VD) {
36443662
std::optional<uint32_t> RegisterSlot;
36453663
uint32_t SpaceNo = 0;
3664+
HLSLVkBindingAttr *VkBinding = VD->getAttr<HLSLVkBindingAttr>();
36463665
HLSLResourceBindingAttr *RBA = VD->getAttr<HLSLResourceBindingAttr>();
3647-
if (RBA) {
3666+
if (VkBinding) {
3667+
RegisterSlot = VkBinding->getBinding();
3668+
SpaceNo = VkBinding->getSet();
3669+
} else if (RBA) {
36483670
if (RBA->hasRegisterSlot())
36493671
RegisterSlot = RBA->getSlotNumber();
36503672
SpaceNo = RBA->getSpaceNumber();
@@ -3747,6 +3769,9 @@ void SemaHLSL::processExplicitBindingsOnDecl(VarDecl *VD) {
37473769

37483770
bool HasBinding = false;
37493771
for (Attr *A : VD->attrs()) {
3772+
if (isa<HLSLVkBindingAttr>(A))
3773+
HasBinding = true;
3774+
37503775
HLSLResourceBindingAttr *RBA = dyn_cast<HLSLResourceBindingAttr>(A);
37513776
if (!RBA || !RBA->hasRegisterSlot())
37523777
continue;

0 commit comments

Comments
 (0)