Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[DirectX] Update CBuffer to refer to a dx.Layout type #128697

Merged
merged 4 commits into from
Feb 25, 2025
Merged

[DirectX] Update CBuffer to refer to a dx.Layout type #128697

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e065b67
[DirectX] Update CBuffer to refer to a `dx.Layout` type
bogner Feb 25, 2025
952a33a
clean up whitespace
bogner Feb 25, 2025
c1922d2
Update llvm/lib/Analysis/DXILResource.cpp
bogner Feb 25, 2025
9a5741c
Update llvm/include/llvm/Analysis/DXILResource.h
bogner Feb 25, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 21 additions & 1 deletion llvm/include/llvm/Analysis/DXILResource.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -166,7 +166,6 @@ class CBufferExtType : public TargetExtType {
CBufferExtType &operator=(const CBufferExtType &) = delete;

Type *getResourceType() const { return getTypeParameter(0); }
uint32_t getCBufferSize() const { return getIntParameter(0); }

static bool classof(const TargetExtType *T) {
return T->getName() == "dx.CBuffer";
Expand Down Expand Up @@ -197,6 +196,27 @@ class SamplerExtType : public TargetExtType {
}
};

/// The dx.Layout target extension type
///
/// `target("dx.Layout", <Type>, <size>, [offsets...])`
class LayoutExtType : public TargetExtType {
public:
LayoutExtType() = delete;
LayoutExtType(const LayoutExtType &) = delete;
LayoutExtType &operator=(const LayoutExtType &) = delete;

Type *getWrappedType() const { return getTypeParameter(0); }
uint32_t getSize() const { return getIntParameter(0); }
uint32_t getOffsetOfElement(int I) const { return getIntParameter(I + 1); }

static bool classof(const TargetExtType *T) {
return T->getName() == "dx.Layout";
}
static bool classof(const Type *T) {
return isa<TargetExtType>(T) && classof(cast<TargetExtType>(T));
}
};

//===----------------------------------------------------------------------===//

class ResourceTypeInfo {
Expand Down
9 changes: 8 additions & 1 deletion llvm/lib/Analysis/DXILResource.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -382,7 +382,14 @@ ResourceTypeInfo::UAVInfo ResourceTypeInfo::getUAV() const {

uint32_t ResourceTypeInfo::getCBufferSize(const DataLayout &DL) const {
assert(isCBuffer() && "Not a CBuffer");
return cast<CBufferExtType>(HandleTy)->getCBufferSize();

Type *ElTy = cast<CBufferExtType>(HandleTy)->getResourceType();

if (auto *LayoutTy = dyn_cast<LayoutExtType>(ElTy))
return LayoutTy->getSize();

// TODO: What should we do with unannotated arrays?
return DL.getTypeAllocSize(ElTy);
}

dxil::SamplerType ResourceTypeInfo::getSamplerType() const {
Expand Down
26 changes: 26 additions & 0 deletions llvm/test/Analysis/DXILResource/buffer-frombinding.ll
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,6 +106,30 @@ define void @test_typedbuffer() {
; CHECK: Element Type: f32
; CHECK: Element Count: 4

%cb0 = call target("dx.CBuffer", {float})
@llvm.dx.resource.handlefrombinding(i32 1, i32 0, i32 1, i32 0, i1 false)
; CHECK: Binding [[CB0:[0-9]+]]:
; CHECK: Binding:
; CHECK: Record ID: 0
; CHECK: Space: 1
; CHECK: Lower Bound: 0
; CHECK: Size: 1
; CHECK: Class: CBuffer
; CHECK: Kind: CBuffer
; CHECK: CBuffer size: 4

%cb1 = call target("dx.CBuffer", target("dx.Layout", {float}, 4, 0))
@llvm.dx.resource.handlefrombinding(i32 1, i32 8, i32 1, i32 0, i1 false)
; CHECK: Binding [[CB1:[0-9]+]]:
; CHECK: Binding:
; CHECK: Record ID: 1
; CHECK: Space: 1
; CHECK: Lower Bound: 8
; CHECK: Size: 1
; CHECK: Class: CBuffer
; CHECK: Kind: CBuffer
; CHECK: CBuffer size: 4

; CHECK-NOT: Binding {{[0-9]+}}:

ret void
Expand All @@ -118,5 +142,7 @@ define void @test_typedbuffer() {
; CHECK-DAG: Call bound to [[UAV1]]: %uav1 =
; CHECK-DAG: Call bound to [[UAV2]]: %uav2_1 =
; CHECK-DAG: Call bound to [[UAV2]]: %uav2_2 =
; CHECK-DAG: Call bound to [[CB0]]: %cb0 =
; CHECK-DAG: Call bound to [[CB1]]: %cb1 =

attributes #0 = { nocallback nofree nosync nounwind willreturn memory(none) }