Skip to content

Commit 2e607a5

Browse files
author
git apple-llvm automerger
committed
Merge commit 'fe0948c9a5d4' from llvm.org/main into next
2 parents 27d677f + fe0948c commit 2e607a5

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
@@ -5043,6 +5043,14 @@ def HLSLSV_GroupIndex: HLSLAnnotationAttr {
50435043
let Documentation = [HLSLSV_GroupIndexDocs];
50445044
}
50455045

5046+
def HLSLVkBinding : InheritableAttr {
5047+
let Spellings = [CXX11<"vk", "binding">];
5048+
let Subjects = SubjectList<[HLSLBufferObj, ExternalGlobalVar], ErrorDiag>;
5049+
let Args = [IntArgument<"Binding">, IntArgument<"Set", 1>];
5050+
let LangOpts = [HLSL];
5051+
let Documentation = [HLSLVkBindingDocs];
5052+
}
5053+
50465054
def HLSLResourceBinding: InheritableAttr {
50475055
let Spellings = [HLSLAnnotation<"register">];
50485056
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
@@ -8841,6 +8841,32 @@ def ReadOnlyPlacementDocs : Documentation {
88418841
}];
88428842
}
88438843

8844+
def HLSLVkBindingDocs : Documentation {
8845+
let Category = DocCatVariable;
8846+
let Content = [{
8847+
The ``[[vk::binding]]`` attribute allows you to explicitly specify the descriptor
8848+
set and binding for a resource when targeting SPIR-V. This is particularly
8849+
useful when you need different bindings for SPIR-V and DXIL, as the ``register``
8850+
attribute can be used for DXIL-specific bindings.
8851+
8852+
The attribute takes two integer arguments: the binding and the descriptor set.
8853+
The descriptor set is optional and defaults to 0 if not provided.
8854+
8855+
.. code-block:: c++
8856+
8857+
// A structured buffer with binding 23 in descriptor set 102.
8858+
[[vk::binding(23, 102)]] StructuredBuffer<float> Buf;
8859+
8860+
// A structured buffer with binding 14 in descriptor set 0.
8861+
[[vk::binding(14)]] StructuredBuffer<float> Buf2;
8862+
8863+
// A cbuffer with binding 1 in descriptor set 2.
8864+
[[vk::binding(1, 2)]] cbuffer MyCBuffer {
8865+
float4x4 worldViewProj;
8866+
};
8867+
}];
8868+
}
8869+
88448870
def WebAssemblyFuncrefDocs : Documentation {
88458871
let Category = DocCatType;
88468872
let Content = [{

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5292,7 +5292,7 @@ class Parser : public CodeCompletionHandler {
52925292
void ParseHLSLAnnotations(ParsedAttributes &Attrs,
52935293
SourceLocation *EndLoc = nullptr,
52945294
bool CouldBeBitField = false);
5295-
Decl *ParseHLSLBuffer(SourceLocation &DeclEnd);
5295+
Decl *ParseHLSLBuffer(SourceLocation &DeclEnd, ParsedAttributes &Attrs);
52965296

52975297
///@}
52985298

‎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
@@ -1979,7 +1979,7 @@ Parser::DeclGroupPtrTy Parser::ParseDeclaration(DeclaratorContext Context,
19791979

19801980
case tok::kw_cbuffer:
19811981
case tok::kw_tbuffer:
1982-
SingleDecl = ParseHLSLBuffer(DeclEnd);
1982+
SingleDecl = ParseHLSLBuffer(DeclEnd, DeclAttrs);
19831983
break;
19841984
case tok::kw_namespace:
19851985
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
@@ -9038,6 +9038,9 @@ ProcessDeclAttribute(Sema &S, Scope *scope, Decl *D, const ParsedAttr &AL,
90389038
case ParsedAttr::AT_HLSLVkConstantId:
90399039
S.HLSL().handleVkConstantIdAttr(D, AL);
90409040
break;
9041+
case ParsedAttr::AT_HLSLVkBinding:
9042+
S.HLSL().handleVkBindingAttr(D, AL);
9043+
break;
90419044
case ParsedAttr::AT_HLSLSV_GroupThreadID:
90429045
S.HLSL().handleSV_GroupThreadIDAttr(D, AL);
90439046
break;

‎clang/lib/Sema/SemaHLSL.cpp

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

600+
HLSLVkBindingAttr *VkBinding = Dcl->getAttr<HLSLVkBindingAttr>();
600601
HLSLResourceBindingAttr *RBA = Dcl->getAttr<HLSLResourceBindingAttr>();
601-
if (!RBA || !RBA->hasRegisterSlot()) {
602+
if (!VkBinding && (!RBA || !RBA->hasRegisterSlot())) {
602603
SemaRef.Diag(Dcl->getLocation(), diag::warn_hlsl_implicit_binding);
603604
// Use HLSLResourceBindingAttr to transfer implicit binding order_ID
604605
// to codegen. If it does not exist, create an implicit attribute.
@@ -1496,6 +1497,23 @@ void SemaHLSL::handleVkConstantIdAttr(Decl *D, const ParsedAttr &AL) {
14961497
D->addAttr(NewAttr);
14971498
}
14981499

1500+
void SemaHLSL::handleVkBindingAttr(Decl *D, const ParsedAttr &AL) {
1501+
// The vk::binding attribute only applies to SPIR-V.
1502+
if (!getASTContext().getTargetInfo().getTriple().isSPIRV())
1503+
return;
1504+
1505+
uint32_t Binding = 0;
1506+
if (!SemaRef.checkUInt32Argument(AL, AL.getArgAsExpr(0), Binding))
1507+
return;
1508+
uint32_t Set = 0;
1509+
if (AL.getNumArgs() > 1 &&
1510+
!SemaRef.checkUInt32Argument(AL, AL.getArgAsExpr(1), Set))
1511+
return;
1512+
1513+
D->addAttr(::new (getASTContext())
1514+
HLSLVkBindingAttr(getASTContext(), AL, Binding, Set));
1515+
}
1516+
14991517
bool SemaHLSL::diagnoseInputIDType(QualType T, const ParsedAttr &AL) {
15001518
const auto *VT = T->getAs<VectorType>();
15011519

@@ -3660,8 +3678,12 @@ static bool initVarDeclWithCtor(Sema &S, VarDecl *VD,
36603678
bool SemaHLSL::initGlobalResourceDecl(VarDecl *VD) {
36613679
std::optional<uint32_t> RegisterSlot;
36623680
uint32_t SpaceNo = 0;
3681+
HLSLVkBindingAttr *VkBinding = VD->getAttr<HLSLVkBindingAttr>();
36633682
HLSLResourceBindingAttr *RBA = VD->getAttr<HLSLResourceBindingAttr>();
3664-
if (RBA) {
3683+
if (VkBinding) {
3684+
RegisterSlot = VkBinding->getBinding();
3685+
SpaceNo = VkBinding->getSet();
3686+
} else if (RBA) {
36653687
if (RBA->hasRegisterSlot())
36663688
RegisterSlot = RBA->getSlotNumber();
36673689
SpaceNo = RBA->getSpaceNumber();
@@ -3764,6 +3786,9 @@ void SemaHLSL::processExplicitBindingsOnDecl(VarDecl *VD) {
37643786

37653787
bool HasBinding = false;
37663788
for (Attr *A : VD->attrs()) {
3789+
if (isa<HLSLVkBindingAttr>(A))
3790+
HasBinding = true;
3791+
37673792
HLSLResourceBindingAttr *RBA = dyn_cast<HLSLResourceBindingAttr>(A);
37683793
if (!RBA || !RBA->hasRegisterSlot())
37693794
continue;

0 commit comments

Comments
 (0)