https://github.com/joaosaffran updated
https://github.com/llvm/llvm-project/pull/119041
>From 999f15be166d25521dfca4f95c1c909152f382e0 Mon Sep 17 00:00:00 2001
From: Joao Saffran <jdereze...@microsoft.com>
Date: Fri, 6 Dec 2024 01:27:24 +0000
Subject: [PATCH 1/8] Apply DXC fix and add tests
---
clang/test/CodeGenHLSL/debug/rwbuffer_debug_info.hlsl | 8 ++++++++
1 file changed, 8 insertions(+)
create mode 100644 clang/test/CodeGenHLSL/debug/rwbuffer_debug_info.hlsl
diff --git a/clang/test/CodeGenHLSL/debug/rwbuffer_debug_info.hlsl
b/clang/test/CodeGenHLSL/debug/rwbuffer_debug_info.hlsl
new file mode 100644
index 00000000000000..b3fce914828b47
--- /dev/null
+++ b/clang/test/CodeGenHLSL/debug/rwbuffer_debug_info.hlsl
@@ -0,0 +1,8 @@
+// RUN: %clang --driver-mode=dxc -Zi -Fc out.s -T cs_6_3 %s
+
+RWBuffer<float4> Out : register(u7, space4);
+
+[numthreads(8,1,1)]
+void main(uint GI : SV_GroupIndex) {
+ Out[GI] = 0;
+}
>From 6c26251d9cc0349afd836e9a933444a9bf943008 Mon Sep 17 00:00:00 2001
From: Joao Saffran <jdereze...@microsoft.com>
Date: Fri, 6 Dec 2024 23:17:11 +0000
Subject: [PATCH 2/8] first attempt
---
clang/lib/CodeGen/CGDebugInfo.cpp | 9 ++++++++-
clang/lib/CodeGen/CGDebugInfo.h | 2 ++
2 files changed, 10 insertions(+), 1 deletion(-)
diff --git a/clang/lib/CodeGen/CGDebugInfo.cpp
b/clang/lib/CodeGen/CGDebugInfo.cpp
index f29ddece5dbc95..0cc7cb6bf64a42 100644
--- a/clang/lib/CodeGen/CGDebugInfo.cpp
+++ b/clang/lib/CodeGen/CGDebugInfo.cpp
@@ -3492,6 +3492,11 @@ llvm::DIType *CGDebugInfo::CreateType(const PipeType
*Ty, llvm::DIFile *U) {
return getOrCreateType(Ty->getElementType(), U);
}
+llvm::DIType *CGDebugInfo::CreateType(const HLSLAttributedResourceType *Ty,
+ llvm::DIFile *U) {
+ return getOrCreateType(Ty->getWrappedType(), U);
+}
+
llvm::DIType *CGDebugInfo::CreateEnumType(const EnumType *Ty) {
const EnumDecl *ED = Ty->getDecl();
@@ -3834,12 +3839,14 @@ llvm::DIType *CGDebugInfo::CreateTypeNode(QualType Ty,
llvm::DIFile *Unit) {
case Type::TemplateSpecialization:
return CreateType(cast<TemplateSpecializationType>(Ty), Unit);
+ case Type::HLSLAttributedResource: {
+ return CreateType(cast<HLSLAttributedResourceType>(Ty), Unit);
+ }
case Type::CountAttributed:
case Type::Auto:
case Type::Attributed:
case Type::BTFTagAttributed:
- case Type::HLSLAttributedResource:
case Type::Adjusted:
case Type::Decayed:
case Type::DeducedTemplateSpecialization:
diff --git a/clang/lib/CodeGen/CGDebugInfo.h b/clang/lib/CodeGen/CGDebugInfo.h
index 3fd0237a1c61dd..38f73eca561b7e 100644
--- a/clang/lib/CodeGen/CGDebugInfo.h
+++ b/clang/lib/CodeGen/CGDebugInfo.h
@@ -196,6 +196,8 @@ class CGDebugInfo {
llvm::DIType *CreateType(const PointerType *Ty, llvm::DIFile *F);
llvm::DIType *CreateType(const BlockPointerType *Ty, llvm::DIFile *F);
llvm::DIType *CreateType(const FunctionType *Ty, llvm::DIFile *F);
+ llvm::DIType *CreateType(const HLSLAttributedResourceType *Ty,
+ llvm::DIFile *F);
/// Get structure or union type.
llvm::DIType *CreateType(const RecordType *Tyg);
>From 3a198591b39dbf5c2df7455d892cb47544a48e15 Mon Sep 17 00:00:00 2001
From: Joao Saffran <jdereze...@microsoft.com>
Date: Fri, 6 Dec 2024 23:24:54 +0000
Subject: [PATCH 3/8] clean
---
clang/lib/Sema/HLSLExternalSemaSource.cpp | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/clang/lib/Sema/HLSLExternalSemaSource.cpp
b/clang/lib/Sema/HLSLExternalSemaSource.cpp
index f3362fb619afc1..5a0cd8e793753c 100644
--- a/clang/lib/Sema/HLSLExternalSemaSource.cpp
+++ b/clang/lib/Sema/HLSLExternalSemaSource.cpp
@@ -931,7 +931,7 @@ void
HLSLExternalSemaSource::defineHLSLTypesWithForwardDeclarations() {
constructTypedBufferConceptDecl(*SemaPtr, HLSLNamespace);
Decl = BuiltinTypeDeclBuilder(*SemaPtr, HLSLNamespace, "RWBuffer")
.addSimpleTemplateParams({"element_type"}, TypedBufferConcept)
- .finalizeForwardDeclaration();
+ .Record;
onCompletion(Decl, [this](CXXRecordDecl *Decl) {
setupBufferType(Decl, *SemaPtr, ResourceClass::UAV,
@@ -945,7 +945,7 @@ void
HLSLExternalSemaSource::defineHLSLTypesWithForwardDeclarations() {
Decl =
BuiltinTypeDeclBuilder(*SemaPtr, HLSLNamespace,
"RasterizerOrderedBuffer")
.addSimpleTemplateParams({"element_type"})
- .finalizeForwardDeclaration();
+ .Record;
onCompletion(Decl, [this](CXXRecordDecl *Decl) {
setupBufferType(Decl, *SemaPtr, ResourceClass::UAV,
ResourceKind::TypedBuffer, /*IsROV=*/true,
@@ -957,7 +957,7 @@ void
HLSLExternalSemaSource::defineHLSLTypesWithForwardDeclarations() {
Decl = BuiltinTypeDeclBuilder(*SemaPtr, HLSLNamespace, "StructuredBuffer")
.addSimpleTemplateParams({"element_type"})
- .finalizeForwardDeclaration();
+ .Record;
onCompletion(Decl, [this](CXXRecordDecl *Decl) {
setupBufferType(Decl, *SemaPtr, ResourceClass::SRV,
ResourceKind::RawBuffer,
/*IsROV=*/false, /*RawBuffer=*/true)
@@ -967,7 +967,7 @@ void
HLSLExternalSemaSource::defineHLSLTypesWithForwardDeclarations() {
Decl = BuiltinTypeDeclBuilder(*SemaPtr, HLSLNamespace, "RWStructuredBuffer")
.addSimpleTemplateParams({"element_type"})
- .finalizeForwardDeclaration();
+ .Record;
onCompletion(Decl, [this](CXXRecordDecl *Decl) {
setupBufferType(Decl, *SemaPtr, ResourceClass::UAV,
ResourceKind::RawBuffer,
/*IsROV=*/false, /*RawBuffer=*/true)
@@ -980,7 +980,7 @@ void
HLSLExternalSemaSource::defineHLSLTypesWithForwardDeclarations() {
Decl =
BuiltinTypeDeclBuilder(*SemaPtr, HLSLNamespace, "AppendStructuredBuffer")
.addSimpleTemplateParams({"element_type"})
- .finalizeForwardDeclaration();
+ .Record;
onCompletion(Decl, [this](CXXRecordDecl *Decl) {
setupBufferType(Decl, *SemaPtr, ResourceClass::UAV,
ResourceKind::RawBuffer,
/*IsROV=*/false, /*RawBuffer=*/true)
@@ -991,7 +991,7 @@ void
HLSLExternalSemaSource::defineHLSLTypesWithForwardDeclarations() {
Decl =
BuiltinTypeDeclBuilder(*SemaPtr, HLSLNamespace,
"ConsumeStructuredBuffer")
.addSimpleTemplateParams({"element_type"})
- .finalizeForwardDeclaration();
+ .Record;
onCompletion(Decl, [this](CXXRecordDecl *Decl) {
setupBufferType(Decl, *SemaPtr, ResourceClass::UAV,
ResourceKind::RawBuffer,
/*IsROV=*/false, /*RawBuffer=*/true)
@@ -1002,7 +1002,7 @@ void
HLSLExternalSemaSource::defineHLSLTypesWithForwardDeclarations() {
Decl = BuiltinTypeDeclBuilder(*SemaPtr, HLSLNamespace,
"RasterizerOrderedStructuredBuffer")
.addSimpleTemplateParams({"element_type"})
- .finalizeForwardDeclaration();
+ .Record;
onCompletion(Decl, [this](CXXRecordDecl *Decl) {
setupBufferType(Decl, *SemaPtr, ResourceClass::UAV,
ResourceKind::RawBuffer,
/*IsROV=*/true, /*RawBuffer=*/true)
>From b0b2deb6eab2dd7fa2de5a9278cc4c6375eafa48 Mon Sep 17 00:00:00 2001
From: Joao Saffran <jdereze...@microsoft.com>
Date: Mon, 9 Dec 2024 19:35:30 +0000
Subject: [PATCH 4/8] disabling optimizations
---
clang/test/CodeGenHLSL/debug/rwbuffer_debug_info.hlsl | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/clang/test/CodeGenHLSL/debug/rwbuffer_debug_info.hlsl
b/clang/test/CodeGenHLSL/debug/rwbuffer_debug_info.hlsl
index b3fce914828b47..c2017f4327da88 100644
--- a/clang/test/CodeGenHLSL/debug/rwbuffer_debug_info.hlsl
+++ b/clang/test/CodeGenHLSL/debug/rwbuffer_debug_info.hlsl
@@ -1,4 +1,4 @@
-// RUN: %clang --driver-mode=dxc -Zi -Fc out.s -T cs_6_3 %s
+// RUN: %clang --driver-mode=dxc -Zi -Fc out.s -T cs_6_3 -O0 %s
RWBuffer<float4> Out : register(u7, space4);
>From 3b53161da2d0dedad6d4273edfe067632bf2904c Mon Sep 17 00:00:00 2001
From: Joao Saffran <jdereze...@microsoft.com>
Date: Mon, 9 Dec 2024 20:30:52 +0000
Subject: [PATCH 5/8] adding file check
---
clang/test/CodeGenHLSL/debug/rwbuffer_debug_info.hlsl | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/clang/test/CodeGenHLSL/debug/rwbuffer_debug_info.hlsl
b/clang/test/CodeGenHLSL/debug/rwbuffer_debug_info.hlsl
index c2017f4327da88..705be1af08be23 100644
--- a/clang/test/CodeGenHLSL/debug/rwbuffer_debug_info.hlsl
+++ b/clang/test/CodeGenHLSL/debug/rwbuffer_debug_info.hlsl
@@ -1,4 +1,7 @@
-// RUN: %clang --driver-mode=dxc -Zi -Fc out.s -T cs_6_3 -O0 %s
+// RUN: %clang --driver-mode=dxc -Zi -Fc - -T cs_6_3 -O0 %s | FileCheck %s
+
+// CHECK: #dbg_declare(ptr [[ThisReg:%this\..*]], [[ThisMd:![0-9]+]],
+// CHECK-DAG: [[ThisMd]] = !DILocalVariable(name: "this", arg: 1, scope:
!{{[0-9]+}}, type: ![[type:[0-9]+]], flags: DIFlagArtificial |
DIFlagObjectPointer)
RWBuffer<float4> Out : register(u7, space4);
>From a5ecad5aff1de265a2825563e9ca5c9e621aaed1 Mon Sep 17 00:00:00 2001
From: Joao Saffran <jdereze...@microsoft.com>
Date: Mon, 9 Dec 2024 22:37:06 +0000
Subject: [PATCH 6/8] change shader model version
---
clang/test/CodeGenHLSL/debug/rwbuffer_debug_info.hlsl | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/clang/test/CodeGenHLSL/debug/rwbuffer_debug_info.hlsl
b/clang/test/CodeGenHLSL/debug/rwbuffer_debug_info.hlsl
index 705be1af08be23..a43e4df686fbc1 100644
--- a/clang/test/CodeGenHLSL/debug/rwbuffer_debug_info.hlsl
+++ b/clang/test/CodeGenHLSL/debug/rwbuffer_debug_info.hlsl
@@ -1,4 +1,4 @@
-// RUN: %clang --driver-mode=dxc -Zi -Fc - -T cs_6_3 -O0 %s | FileCheck %s
+// RUN: %clang --driver-mode=dxc -Zi -Fc - -T cs_6_6 -O0 %s | FileCheck %s
// CHECK: #dbg_declare(ptr [[ThisReg:%this\..*]], [[ThisMd:![0-9]+]],
// CHECK-DAG: [[ThisMd]] = !DILocalVariable(name: "this", arg: 1, scope:
!{{[0-9]+}}, type: ![[type:[0-9]+]], flags: DIFlagArtificial |
DIFlagObjectPointer)
>From 4cc9fecf7704dc6a089bd93dae0f34d3ce00aa65 Mon Sep 17 00:00:00 2001
From: joaosaffran <joao.saff...@microsoft.com>
Date: Tue, 17 Dec 2024 22:31:45 +0000
Subject: [PATCH 7/8] addressing comments
---
clang/lib/CodeGen/CGDebugInfo.cpp | 3 +--
clang/lib/Sema/HLSLExternalSemaSource.cpp | 14 +++++++-------
2 files changed, 8 insertions(+), 9 deletions(-)
diff --git a/clang/lib/CodeGen/CGDebugInfo.cpp
b/clang/lib/CodeGen/CGDebugInfo.cpp
index 0cc7cb6bf64a42..560d4ce293365e 100644
--- a/clang/lib/CodeGen/CGDebugInfo.cpp
+++ b/clang/lib/CodeGen/CGDebugInfo.cpp
@@ -3839,9 +3839,8 @@ llvm::DIType *CGDebugInfo::CreateTypeNode(QualType Ty,
llvm::DIFile *Unit) {
case Type::TemplateSpecialization:
return CreateType(cast<TemplateSpecializationType>(Ty), Unit);
- case Type::HLSLAttributedResource: {
+ case Type::HLSLAttributedResource:
return CreateType(cast<HLSLAttributedResourceType>(Ty), Unit);
- }
case Type::CountAttributed:
case Type::Auto:
diff --git a/clang/lib/Sema/HLSLExternalSemaSource.cpp
b/clang/lib/Sema/HLSLExternalSemaSource.cpp
index 5a0cd8e793753c..f3362fb619afc1 100644
--- a/clang/lib/Sema/HLSLExternalSemaSource.cpp
+++ b/clang/lib/Sema/HLSLExternalSemaSource.cpp
@@ -931,7 +931,7 @@ void
HLSLExternalSemaSource::defineHLSLTypesWithForwardDeclarations() {
constructTypedBufferConceptDecl(*SemaPtr, HLSLNamespace);
Decl = BuiltinTypeDeclBuilder(*SemaPtr, HLSLNamespace, "RWBuffer")
.addSimpleTemplateParams({"element_type"}, TypedBufferConcept)
- .Record;
+ .finalizeForwardDeclaration();
onCompletion(Decl, [this](CXXRecordDecl *Decl) {
setupBufferType(Decl, *SemaPtr, ResourceClass::UAV,
@@ -945,7 +945,7 @@ void
HLSLExternalSemaSource::defineHLSLTypesWithForwardDeclarations() {
Decl =
BuiltinTypeDeclBuilder(*SemaPtr, HLSLNamespace,
"RasterizerOrderedBuffer")
.addSimpleTemplateParams({"element_type"})
- .Record;
+ .finalizeForwardDeclaration();
onCompletion(Decl, [this](CXXRecordDecl *Decl) {
setupBufferType(Decl, *SemaPtr, ResourceClass::UAV,
ResourceKind::TypedBuffer, /*IsROV=*/true,
@@ -957,7 +957,7 @@ void
HLSLExternalSemaSource::defineHLSLTypesWithForwardDeclarations() {
Decl = BuiltinTypeDeclBuilder(*SemaPtr, HLSLNamespace, "StructuredBuffer")
.addSimpleTemplateParams({"element_type"})
- .Record;
+ .finalizeForwardDeclaration();
onCompletion(Decl, [this](CXXRecordDecl *Decl) {
setupBufferType(Decl, *SemaPtr, ResourceClass::SRV,
ResourceKind::RawBuffer,
/*IsROV=*/false, /*RawBuffer=*/true)
@@ -967,7 +967,7 @@ void
HLSLExternalSemaSource::defineHLSLTypesWithForwardDeclarations() {
Decl = BuiltinTypeDeclBuilder(*SemaPtr, HLSLNamespace, "RWStructuredBuffer")
.addSimpleTemplateParams({"element_type"})
- .Record;
+ .finalizeForwardDeclaration();
onCompletion(Decl, [this](CXXRecordDecl *Decl) {
setupBufferType(Decl, *SemaPtr, ResourceClass::UAV,
ResourceKind::RawBuffer,
/*IsROV=*/false, /*RawBuffer=*/true)
@@ -980,7 +980,7 @@ void
HLSLExternalSemaSource::defineHLSLTypesWithForwardDeclarations() {
Decl =
BuiltinTypeDeclBuilder(*SemaPtr, HLSLNamespace, "AppendStructuredBuffer")
.addSimpleTemplateParams({"element_type"})
- .Record;
+ .finalizeForwardDeclaration();
onCompletion(Decl, [this](CXXRecordDecl *Decl) {
setupBufferType(Decl, *SemaPtr, ResourceClass::UAV,
ResourceKind::RawBuffer,
/*IsROV=*/false, /*RawBuffer=*/true)
@@ -991,7 +991,7 @@ void
HLSLExternalSemaSource::defineHLSLTypesWithForwardDeclarations() {
Decl =
BuiltinTypeDeclBuilder(*SemaPtr, HLSLNamespace,
"ConsumeStructuredBuffer")
.addSimpleTemplateParams({"element_type"})
- .Record;
+ .finalizeForwardDeclaration();
onCompletion(Decl, [this](CXXRecordDecl *Decl) {
setupBufferType(Decl, *SemaPtr, ResourceClass::UAV,
ResourceKind::RawBuffer,
/*IsROV=*/false, /*RawBuffer=*/true)
@@ -1002,7 +1002,7 @@ void
HLSLExternalSemaSource::defineHLSLTypesWithForwardDeclarations() {
Decl = BuiltinTypeDeclBuilder(*SemaPtr, HLSLNamespace,
"RasterizerOrderedStructuredBuffer")
.addSimpleTemplateParams({"element_type"})
- .Record;
+ .finalizeForwardDeclaration();
onCompletion(Decl, [this](CXXRecordDecl *Decl) {
setupBufferType(Decl, *SemaPtr, ResourceClass::UAV,
ResourceKind::RawBuffer,
/*IsROV=*/true, /*RawBuffer=*/true)
>From ec65972966d62ce6835af0a5997911bb080609b0 Mon Sep 17 00:00:00 2001
From: joaosaffran <joao.saff...@microsoft.com>
Date: Sun, 22 Dec 2024 03:41:32 +0000
Subject: [PATCH 8/8] fix test
---
.../test/CodeGenHLSL/debug/rwbuffer_debug_info.hlsl | 13 ++++++++-----
1 file changed, 8 insertions(+), 5 deletions(-)
diff --git a/clang/test/CodeGenHLSL/debug/rwbuffer_debug_info.hlsl
b/clang/test/CodeGenHLSL/debug/rwbuffer_debug_info.hlsl
index a43e4df686fbc1..db0388e41eae98 100644
--- a/clang/test/CodeGenHLSL/debug/rwbuffer_debug_info.hlsl
+++ b/clang/test/CodeGenHLSL/debug/rwbuffer_debug_info.hlsl
@@ -1,11 +1,14 @@
-// RUN: %clang --driver-mode=dxc -Zi -Fc - -T cs_6_6 -O0 %s | FileCheck %s
+// RUN: %clang_cc1 -triple dxil-pc-shadermodel6.6-compute -x hlsl -emit-llvm
-disable-llvm-passes -o - -hlsl-entry main %s -debug-info-kind=standalone
-dwarf-version=4 | FileCheck %s
-// CHECK: #dbg_declare(ptr [[ThisReg:%this\..*]], [[ThisMd:![0-9]+]],
-// CHECK-DAG: [[ThisMd]] = !DILocalVariable(name: "this", arg: 1, scope:
!{{[0-9]+}}, type: ![[type:[0-9]+]], flags: DIFlagArtificial |
DIFlagObjectPointer)
-RWBuffer<float4> Out : register(u7, space4);
+// CHECK: [[DWTag:![0-9]+]] = distinct !DICompositeType(tag:
DW_TAG_class_type, name: "RWBuffer<float>",
+// CHECK: [[RWBuffer:![0-9]+]] = distinct !DISubprogram(name: "RWBuffer",
+// CHECK-SAME: scope: [[DWTag]]
+// CHECK: [[FirstThis:![0-9]+]] = !DILocalVariable(name: "this", arg: 1,
scope: [[RWBuffer]], type: [[thisType:![0-9]+]]
+// CHECK: [[thisType]] = !DIDerivedType(tag: DW_TAG_reference_type, baseType:
[[DWTag]], size: 32)
+RWBuffer<float> Out : register(u7, space4);
[numthreads(8,1,1)]
-void main(uint GI : SV_GroupIndex) {
+void main(int GI : SV_GroupIndex) {
Out[GI] = 0;
}
_______________________________________________
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
