Skip to content

Commit e00e9a3

Browse files
hekotahekota
authored
[HLSL] Add HLSLAttributedResourceType (#106181)
Introducing `HLSLAttributedResourceType` - a new type that is similar to `AttributedType` but with additional data specific to HLSL resources. `AttributeType` currently only stores an attribute kind and no additional data from the type attribute parameters. This does not really work for HLSL resources since its type attributes contain non-boolean values that need to be retained as well. For example: ``` template <typename T> class RWBuffer { __hlsl_resource_t [[hlsl::resource_class(uav)]] [[hlsl::is_rov]] handle; }; ``` The data `HLSLAttributedResourceType` needs to eventually store are: - resource class (SRV, UAV, CBuffer, Sampler) - texture dimension(1-3) - flags is_rov, is_array, is_feedback and is_multisample - contained type All of these values except contained type will be stored in `HLSLAttributedResourceType::Attributes` struct and accessed individually via the fields. There is also `Data` alias that covers all of these values as a `unsigned` which is used for hashing and the AST type serialization. During type attribute processing all HLSL type attributes will be validated and collected by SemaHLSL (by `SemaHLSL::handleResourceTypeAttr`) and in the end combined into a single `HLSLAttributedResourceType` instance (in `SemaHLSL::ProcessResourceTypeAttributes`). `SemaHLSL` will also need to short-term store the `TypeLoc` information for the new type that will be grabbed by `TypeSpecLocFiller` soon after the type is created. Part 1/2 of #104861
1 parent e004566 commit e00e9a3

26 files changed

+274
-2
lines changed

‎clang/include/clang-c/Index.h‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2980,8 +2980,9 @@ enum CXTypeKind {
29802980
CXType_Atomic = 177,
29812981
CXType_BTFTagAttributed = 178,
29822982

2983-
// HLSL Intangible Types
2984-
CXType_HLSLResource = 179
2983+
// HLSL Types
2984+
CXType_HLSLResource = 179,
2985+
CXType_HLSLAttributedResource = 180
29852986
};
29862987

29872988
/**

‎clang/include/clang/AST/ASTContext.h‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -254,6 +254,7 @@ class ASTContext : public RefCountedBase<ASTContext> {
254254
mutable llvm::ContextualFoldingSet<DependentBitIntType, ASTContext &>
255255
DependentBitIntTypes;
256256
llvm::FoldingSet<BTFTagAttributedType> BTFTagAttributedTypes;
257+
llvm::FoldingSet<HLSLAttributedResourceType> HLSLAttributedResourceTypes;
257258

258259
mutable llvm::FoldingSet<CountAttributedType> CountAttributedTypes;
259260

@@ -1671,6 +1672,10 @@ class ASTContext : public RefCountedBase<ASTContext> {
16711672
QualType getBTFTagAttributedType(const BTFTypeTagAttr *BTFAttr,
16721673
QualType Wrapped);
16731674

1675+
QualType getHLSLAttributedResourceType(
1676+
QualType Wrapped, QualType Contained,
1677+
const HLSLAttributedResourceType::Attributes &Attrs);
1678+
16741679
QualType
16751680
getSubstTemplateTypeParmType(QualType Replacement, Decl *AssociatedDecl,
16761681
unsigned Index,

‎clang/include/clang/AST/ASTNodeTraverser.h‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -439,6 +439,11 @@ class ASTNodeTraverser
439439
void VisitBTFTagAttributedType(const BTFTagAttributedType *T) {
440440
Visit(T->getWrappedType());
441441
}
442+
void VisitHLSLAttributedResourceType(const HLSLAttributedResourceType *T) {
443+
QualType Contained = T->getContainedType();
444+
if (!Contained.isNull())
445+
Visit(Contained);
446+
}
442447
void VisitSubstTemplateTypeParmType(const SubstTemplateTypeParmType *) {}
443448
void
444449
VisitSubstTemplateTypeParmPackType(const SubstTemplateTypeParmPackType *T) {

‎clang/include/clang/AST/RecursiveASTVisitor.h‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1146,6 +1146,9 @@ DEF_TRAVERSE_TYPE(CountAttributedType, {
11461146
DEF_TRAVERSE_TYPE(BTFTagAttributedType,
11471147
{ TRY_TO(TraverseType(T->getWrappedType())); })
11481148

1149+
DEF_TRAVERSE_TYPE(HLSLAttributedResourceType,
1150+
{ TRY_TO(TraverseType(T->getWrappedType())); })
1151+
11491152
DEF_TRAVERSE_TYPE(ParenType, { TRY_TO(TraverseType(T->getInnerType())); })
11501153

11511154
DEF_TRAVERSE_TYPE(MacroQualifiedType,
@@ -1445,6 +1448,9 @@ DEF_TRAVERSE_TYPELOC(CountAttributedType,
14451448
DEF_TRAVERSE_TYPELOC(BTFTagAttributedType,
14461449
{ TRY_TO(TraverseTypeLoc(TL.getWrappedLoc())); })
14471450

1451+
DEF_TRAVERSE_TYPELOC(HLSLAttributedResourceType,
1452+
{ TRY_TO(TraverseTypeLoc(TL.getWrappedLoc())); })
1453+
14481454
DEF_TRAVERSE_TYPELOC(ElaboratedType, {
14491455
if (TL.getQualifierLoc()) {
14501456
TRY_TO(TraverseNestedNameSpecifierLoc(TL.getQualifierLoc()));

‎clang/include/clang/AST/Type.h‎

Lines changed: 51 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@
4444
#include "llvm/ADT/iterator_range.h"
4545
#include "llvm/Support/Casting.h"
4646
#include "llvm/Support/Compiler.h"
47+
#include "llvm/Support/DXILABI.h"
4748
#include "llvm/Support/ErrorHandling.h"
4849
#include "llvm/Support/PointerLikeTypeTraits.h"
4950
#include "llvm/Support/TrailingObjects.h"
@@ -6156,6 +6157,54 @@ class BTFTagAttributedType : public Type, public llvm::FoldingSetNode {
61566157
}
61576158
};
61586159

6160+
class HLSLAttributedResourceType : public Type, public llvm::FoldingSetNode {
6161+
public:
6162+
struct Attributes {
6163+
// Data gathered from HLSL resource attributes
6164+
llvm::dxil::ResourceClass ResourceClass;
6165+
uint8_t IsROV : 1;
6166+
Attributes(llvm::dxil::ResourceClass ResourceClass, bool IsROV)
6167+
: ResourceClass(ResourceClass), IsROV(IsROV) {}
6168+
Attributes() : ResourceClass(llvm::dxil::ResourceClass::UAV), IsROV(0) {}
6169+
};
6170+
6171+
private:
6172+
friend class ASTContext; // ASTContext creates these
6173+
6174+
QualType WrappedType;
6175+
QualType ContainedType;
6176+
const Attributes Attrs;
6177+
6178+
HLSLAttributedResourceType(QualType Canon, QualType Wrapped,
6179+
QualType Contained, const Attributes &Attrs)
6180+
: Type(HLSLAttributedResource, Canon, Wrapped->getDependence()),
6181+
WrappedType(Wrapped), ContainedType(Contained), Attrs(Attrs) {}
6182+
6183+
public:
6184+
QualType getWrappedType() const { return WrappedType; }
6185+
QualType getContainedType() const { return ContainedType; }
6186+
const Attributes &getAttrs() const { return Attrs; }
6187+
6188+
bool isSugared() const { return true; }
6189+
QualType desugar() const { return getWrappedType(); }
6190+
6191+
void Profile(llvm::FoldingSetNodeID &ID) {
6192+
Profile(ID, WrappedType, ContainedType, Attrs);
6193+
}
6194+
6195+
static void Profile(llvm::FoldingSetNodeID &ID, QualType Wrapped,
6196+
QualType Contained, const Attributes &Attrs) {
6197+
ID.AddPointer(Wrapped.getAsOpaquePtr());
6198+
ID.AddPointer(Contained.getAsOpaquePtr());
6199+
ID.AddInteger(static_cast<uint32_t>(Attrs.ResourceClass));
6200+
ID.AddBoolean(Attrs.IsROV);
6201+
}
6202+
6203+
static bool classof(const Type *T) {
6204+
return T->getTypeClass() == HLSLAttributedResource;
6205+
}
6206+
};
6207+
61596208
class TemplateTypeParmType : public Type, public llvm::FoldingSetNode {
61606209
friend class ASTContext; // ASTContext creates these
61616210

@@ -8579,6 +8628,8 @@ template <typename T> const T *Type::getAsAdjusted() const {
85798628
Ty = A->getModifiedType().getTypePtr();
85808629
else if (const auto *A = dyn_cast<BTFTagAttributedType>(Ty))
85818630
Ty = A->getWrappedType().getTypePtr();
8631+
else if (const auto *A = dyn_cast<HLSLAttributedResourceType>(Ty))
8632+
Ty = A->getWrappedType().getTypePtr();
85828633
else if (const auto *E = dyn_cast<ElaboratedType>(Ty))
85838634
Ty = E->desugar().getTypePtr();
85848635
else if (const auto *P = dyn_cast<ParenType>(Ty))

‎clang/include/clang/AST/TypeLoc.h‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -940,6 +940,25 @@ class BTFTagAttributedTypeLoc
940940
QualType getInnerType() const { return getTypePtr()->getWrappedType(); }
941941
};
942942

943+
struct HLSLAttributedResourceLocInfo {
944+
SourceRange Range;
945+
};
946+
947+
/// Type source information for HLSL attributed resource type.
948+
class HLSLAttributedResourceTypeLoc
949+
: public ConcreteTypeLoc<UnqualTypeLoc, HLSLAttributedResourceTypeLoc,
950+
HLSLAttributedResourceType,
951+
HLSLAttributedResourceLocInfo> {
952+
public:
953+
TypeLoc getWrappedLoc() const { return getInnerTypeLoc(); }
954+
void setSourceRange(const SourceRange &R) { getLocalData()->Range = R; }
955+
SourceRange getLocalSourceRange() const { return getLocalData()->Range; }
956+
void initializeLocal(ASTContext &Context, SourceLocation loc) {
957+
setSourceRange(SourceRange());
958+
}
959+
QualType getInnerType() const { return getTypePtr()->getWrappedType(); }
960+
};
961+
943962
struct ObjCObjectTypeLocInfo {
944963
SourceLocation TypeArgsLAngleLoc;
945964
SourceLocation TypeArgsRAngleLoc;
@@ -2690,6 +2709,8 @@ inline T TypeLoc::getAsAdjusted() const {
26902709
Cur = ATL.getModifiedLoc();
26912710
else if (auto ATL = Cur.getAs<BTFTagAttributedTypeLoc>())
26922711
Cur = ATL.getWrappedLoc();
2712+
else if (auto ATL = Cur.getAs<HLSLAttributedResourceTypeLoc>())
2713+
Cur = ATL.getWrappedLoc();
26932714
else if (auto ETL = Cur.getAs<ElaboratedTypeLoc>())
26942715
Cur = ETL.getNamedTypeLoc();
26952716
else if (auto ATL = Cur.getAs<AdjustedTypeLoc>())

‎clang/include/clang/AST/TypeProperties.td‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -687,6 +687,25 @@ let Class = BTFTagAttributedType in {
687687
}]>;
688688
}
689689

690+
let Class = HLSLAttributedResourceType in {
691+
def : Property<"resClass", UInt32> {
692+
let Read = [{ static_cast<uint32_t>(node->getAttrs().ResourceClass) }];
693+
}
694+
def : Property<"isROV", Bool> {
695+
let Read = [{ node->getAttrs().IsROV }];
696+
}
697+
def : Property<"wrappedTy", QualType> {
698+
let Read = [{ node->getWrappedType() }];
699+
}
700+
def : Property<"containedTy", QualType> {
701+
let Read = [{ node->getContainedType() }];
702+
}
703+
def : Creator<[{
704+
HLSLAttributedResourceType::Attributes attrs(static_cast<llvm::dxil::ResourceClass>(resClass), isROV);
705+
return ctx.getHLSLAttributedResourceType(wrappedTy, containedTy, attrs);
706+
}]>;
707+
}
708+
690709
let Class = DependentAddressSpaceType in {
691710
def : Property<"pointeeType", QualType> {
692711
let Read = [{ node->getPointeeType() }];

‎clang/include/clang/Basic/TypeNodes.td‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -93,6 +93,7 @@ def EnumType : TypeNode<TagType>, LeafType;
9393
def ElaboratedType : TypeNode<Type>, NeverCanonical;
9494
def AttributedType : TypeNode<Type>, NeverCanonical;
9595
def BTFTagAttributedType : TypeNode<Type>, NeverCanonical;
96+
def HLSLAttributedResourceType : TypeNode<Type>, NeverCanonical;
9697
def TemplateTypeParmType : TypeNode<Type>, AlwaysDependent, LeafType;
9798
def SubstTemplateTypeParmType : TypeNode<Type>, NeverCanonical;
9899
def SubstTemplateTypeParmPackType : TypeNode<Type>, AlwaysDependent;

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,8 +59,11 @@ class SemaHLSL : public SemaBase {
5959
void handleResourceClassAttr(Decl *D, const ParsedAttr &AL);
6060
void handleResourceBindingAttr(Decl *D, const ParsedAttr &AL);
6161
void handleParamModifierAttr(Decl *D, const ParsedAttr &AL);
62+
bool handleResourceTypeAttr(const ParsedAttr &AL);
6263

6364
bool CheckBuiltinFunctionCall(unsigned BuiltinID, CallExpr *TheCall);
65+
QualType ProcessResourceTypeAttributes(QualType Wrapped);
66+
SourceLocation TakeLocForHLSLAttribute(const HLSLAttributedResourceType *RT);
6467

6568
// HLSL Type trait implementations
6669
bool IsScalarizedLayoutCompatible(QualType T1, QualType T2) const;

‎clang/include/clang/Serialization/TypeBitCodes.def‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -67,5 +67,6 @@ TYPE_BIT_CODE(BTFTagAttributed, BTFTAG_ATTRIBUTED, 55)
6767
TYPE_BIT_CODE(PackIndexing, PACK_INDEXING, 56)
6868
TYPE_BIT_CODE(CountAttributed, COUNT_ATTRIBUTED, 57)
6969
TYPE_BIT_CODE(ArrayParameter, ARRAY_PARAMETER, 58)
70+
TYPE_BIT_CODE(HLSLAttributedResource, HLSLRESOURCE_ATTRIBUTED, 59)
7071

7172
#undef TYPE_BIT_CODE

0 commit comments

Comments
 (0)