https://github.com/hekota updated
https://github.com/llvm/llvm-project/pull/113648
>From b8a47223444e72f2a6759178de15f6d1a13dff99 Mon Sep 17 00:00:00 2001
From: Helena Kotas <heko...@microsoft.com>
Date: Thu, 24 Oct 2024 21:22:32 -0700
Subject: [PATCH 1/6] [HLSL] Add RasterizerOrderedStructuredBuffer definition
to HLSLExternalSemaSource
Adds RasterizerOrderedStructuredBuffer definition to HLSLExternalSemaSource.
Adds separate tests for the AST shape and element types. Adds
constructor/handle.fromBinding and subscript test cases to shared test file for
structured buffers.
Additional methods will be added later.
Fixes #112776
---
clang/lib/Sema/HLSLExternalSemaSource.cpp | 12 ++++
...RasterizerOrderedStructuredBuffer-AST.hlsl | 66 +++++++++++++++++
...erOrderedStructuredBuffer-elementtype.hlsl | 70 +++++++++++++++++++
.../StructuredBuffers-constructors.hlsl | 9 +++
.../StructuredBuffers-subscripts.hlsl | 6 +-
5 files changed, 161 insertions(+), 2 deletions(-)
create mode 100644
clang/test/AST/HLSL/RasterizerOrderedStructuredBuffer-AST.hlsl
create mode 100644
clang/test/CodeGenHLSL/builtins/RasterizerOrderedStructuredBuffer-elementtype.hlsl
diff --git a/clang/lib/Sema/HLSLExternalSemaSource.cpp
b/clang/lib/Sema/HLSLExternalSemaSource.cpp
index ce8564429b3802..f3a0ff5dd852be 100644
--- a/clang/lib/Sema/HLSLExternalSemaSource.cpp
+++ b/clang/lib/Sema/HLSLExternalSemaSource.cpp
@@ -530,6 +530,18 @@ void
HLSLExternalSemaSource::defineHLSLTypesWithForwardDeclarations() {
.addArraySubscriptOperators()
.completeDefinition();
});
+
+ Decl = BuiltinTypeDeclBuilder(*SemaPtr, HLSLNamespace,
+ "RasterizerOrderedStructuredBuffer")
+ .addSimpleTemplateParams(*SemaPtr, {"element_type"})
+ .Record;
+ onCompletion(Decl, [this](CXXRecordDecl *Decl) {
+ setupBufferType(Decl, *SemaPtr, ResourceClass::UAV,
+ ResourceKind::TypedBuffer, /*IsROV=*/true,
+ /*RawBuffer=*/true)
+ .addArraySubscriptOperators()
+ .completeDefinition();
+ });
}
void HLSLExternalSemaSource::onCompletion(CXXRecordDecl *Record,
diff --git a/clang/test/AST/HLSL/RasterizerOrderedStructuredBuffer-AST.hlsl
b/clang/test/AST/HLSL/RasterizerOrderedStructuredBuffer-AST.hlsl
new file mode 100644
index 00000000000000..f334e1bb6db3fc
--- /dev/null
+++ b/clang/test/AST/HLSL/RasterizerOrderedStructuredBuffer-AST.hlsl
@@ -0,0 +1,66 @@
+// RUN: %clang_cc1 -triple dxil-pc-shadermodel6.0-library -x hlsl -ast-dump
-DEMPTY %s | FileCheck -check-prefix=EMPTY %s
+// RUN: %clang_cc1 -triple dxil-pc-shadermodel6.0-library -x hlsl -ast-dump %s
| FileCheck %s
+
+
+// This test tests two different AST generations. The "EMPTY" test mode
verifies
+// the AST generated by forward declaration of the HLSL types which happens on
+// initializing the HLSL external AST with an AST Context.
+
+// The non-empty mode has a use that requires the
RasterizerOrderedStructuredBuffer type be complete,
+// which results in the AST being populated by the external AST source. That
+// case covers the full implementation of the template declaration and the
+// instantiated specialization.
+
+// EMPTY: ClassTemplateDecl 0x{{[0-9A-Fa-f]+}} <<invalid sloc>> <invalid sloc>
implicit RasterizerOrderedStructuredBuffer
+// EMPTY-NEXT: TemplateTypeParmDecl 0x{{[0-9A-Fa-f]+}} <<invalid sloc>>
<invalid sloc> class depth 0 index 0 element_type
+// EMPTY-NEXT: CXXRecordDecl 0x{{[0-9A-Fa-f]+}} <<invalid sloc>> <invalid
sloc> implicit <undeserialized declarations> class
RasterizerOrderedStructuredBuffer
+// EMPTY-NEXT: FinalAttr 0x{{[0-9A-Fa-f]+}} <<invalid sloc>> Implicit final
+
+// There should be no more occurrences of RasterizerOrderedStructuredBuffer
+// EMPTY-NOT: {{[^[:alnum:]]}}RasterizerOrderedStructuredBuffer
+
+#ifndef EMPTY
+
+RasterizerOrderedStructuredBuffer<int> Buffer;
+
+#endif
+
+// CHECK: ClassTemplateDecl 0x{{[0-9A-Fa-f]+}} <<invalid sloc>> <invalid sloc>
implicit RasterizerOrderedStructuredBuffer
+// CHECK-NEXT: TemplateTypeParmDecl 0x{{[0-9A-Fa-f]+}} <<invalid sloc>>
<invalid sloc> class depth 0 index 0 element_type
+// CHECK-NEXT: CXXRecordDecl 0x{{[0-9A-Fa-f]+}} <<invalid sloc>> <invalid
sloc> implicit class RasterizerOrderedStructuredBuffer definition
+
+// CHECK: FinalAttr 0x{{[0-9A-Fa-f]+}} <<invalid sloc>> Implicit final
+// CHECK-NEXT: FieldDecl 0x{{[0-9A-Fa-f]+}} <<invalid sloc>> <invalid sloc>
implicit h '__hlsl_resource_t
+// CHECK-SAME{LITERAL}: [[hlsl::resource_class(UAV)]]
+// CHECK-SAME{LITERAL}: [[hlsl::is_rov]]
+// CHECK-SAME{LITERAL}: [[hlsl::raw_buffer]]
+// CHECK-SAME{LITERAL}: [[hlsl::contained_type(element_type)]]
+// CHECK-NEXT: HLSLResourceAttr 0x{{[0-9A-Fa-f]+}} <<invalid sloc>> Implicit
TypedBuffer
+
+// CHECK: CXXMethodDecl 0x{{[0-9A-Fa-f]+}} <<invalid sloc>> <invalid sloc>
operator[] 'element_type &const (unsigned int) const'
+// CHECK-NEXT: ParmVarDecl 0x{{[0-9A-Fa-f]+}} <<invalid sloc>> <invalid sloc>
Idx 'unsigned int'
+// CHECK-NEXT: CompoundStmt 0x{{[0-9A-Fa-f]+}} <<invalid sloc>>
+// CHECK-NEXT: ReturnStmt 0x{{[0-9A-Fa-f]+}} <<invalid sloc>>
+// CHECK-NEXT: MemberExpr 0x{{[0-9A-Fa-f]+}} <<invalid sloc>> 'element_type'
lvalue .e 0x{{[0-9A-Fa-f]+}}
+// CHECK-NEXT: CXXThisExpr 0x{{[0-9A-Fa-f]+}} <<invalid sloc>> 'const
RasterizerOrderedStructuredBuffer<element_type>' lvalue implicit this
+// CHECK-NEXT: AlwaysInlineAttr 0x{{[0-9A-Fa-f]+}} <<invalid sloc>> Implicit
always_inline
+
+// CHECK-NEXT: CXXMethodDecl 0x{{[0-9A-Fa-f]+}} <<invalid sloc>> <invalid
sloc> operator[] 'element_type &(unsigned int)'
+// CHECK-NEXT: ParmVarDecl 0x{{[0-9A-Fa-f]+}} <<invalid sloc>> <invalid sloc>
Idx 'unsigned int'
+// CHECK-NEXT: CompoundStmt 0x{{[0-9A-Fa-f]+}} <<invalid sloc>>
+// CHECK-NEXT: ReturnStmt 0x{{[0-9A-Fa-f]+}} <<invalid sloc>>
+// CHECK-NEXT: MemberExpr 0x{{[0-9A-Fa-f]+}} <<invalid sloc>> 'element_type'
lvalue .e 0x{{[0-9A-Fa-f]+}}
+// CHECK-NEXT: CXXThisExpr 0x{{[0-9A-Fa-f]+}} <<invalid sloc>>
'RasterizerOrderedStructuredBuffer<element_type>' lvalue implicit this
+// CHECK-NEXT: AlwaysInlineAttr 0x{{[0-9A-Fa-f]+}} <<invalid sloc>> Implicit
always_inline
+
+// CHECK: ClassTemplateSpecializationDecl 0x{{[0-9A-Fa-f]+}} <<invalid sloc>>
<invalid sloc> class RasterizerOrderedStructuredBuffer definition
+
+// CHECK: TemplateArgument type 'int'
+// CHECK-NEXT: BuiltinType 0x{{[0-9A-Fa-f]+}} 'int'
+// CHECK-NEXT: FinalAttr 0x{{[0-9A-Fa-f]+}} <<invalid sloc>> Implicit final
+// CHECK-NEXT: FieldDecl 0x{{[0-9A-Fa-f]+}} <<invalid sloc>> <invalid sloc>
implicit h '__hlsl_resource_t
+// CHECK-SAME{LITERAL}: [[hlsl::resource_class(UAV)]]
+// CHECK-SAME{LITERAL}: [[hlsl::is_rov]]
+// CHECK-SAME{LITERAL}: [[hlsl::raw_buffer]]
+// CHECK-SAME{LITERAL}: [[hlsl::contained_type(int)]]
+// CHECK-NEXT: HLSLResourceAttr 0x{{[0-9A-Fa-f]+}} <<invalid sloc>> Implicit
TypedBuffer
diff --git
a/clang/test/CodeGenHLSL/builtins/RasterizerOrderedStructuredBuffer-elementtype.hlsl
b/clang/test/CodeGenHLSL/builtins/RasterizerOrderedStructuredBuffer-elementtype.hlsl
new file mode 100644
index 00000000000000..2dd9d2a6086364
--- /dev/null
+++
b/clang/test/CodeGenHLSL/builtins/RasterizerOrderedStructuredBuffer-elementtype.hlsl
@@ -0,0 +1,70 @@
+// RUN: %clang_cc1 -triple dxil-pc-shadermodel6.2-compute
-finclude-default-header -fnative-half-type -emit-llvm -o - %s | FileCheck %s
+
+// NOTE: The number in type name and whether the struct is packed or not will
mostly
+// likely change once subscript operators are properly implemented
(llvm/llvm-project#95956)
+// and theinterim field of the contained type is removed.
+
+// CHECK: %"class.hlsl::RasterizerOrderedStructuredBuffer" = type <{
target("dx.RawBuffer", i16, 1, 1)
+// CHECK: %"class.hlsl::RasterizerOrderedStructuredBuffer.0" = type <{
target("dx.RawBuffer", i16, 1, 1)
+// CHECK: %"class.hlsl::RasterizerOrderedStructuredBuffer.2" = type {
target("dx.RawBuffer", i32, 1, 1)
+// CHECK: %"class.hlsl::RasterizerOrderedStructuredBuffer.3" = type {
target("dx.RawBuffer", i32, 1, 1)
+// CHECK: %"class.hlsl::RasterizerOrderedStructuredBuffer.4" = type {
target("dx.RawBuffer", i64, 1, 1)
+// CHECK: %"class.hlsl::RasterizerOrderedStructuredBuffer.5" = type {
target("dx.RawBuffer", i64, 1, 1)
+// CHECK: %"class.hlsl::RasterizerOrderedStructuredBuffer.6" = type <{
target("dx.RawBuffer", half, 1, 1)
+// CHECK: %"class.hlsl::RasterizerOrderedStructuredBuffer.8" = type {
target("dx.RawBuffer", float, 1, 1)
+// CHECK: %"class.hlsl::RasterizerOrderedStructuredBuffer.9" = type {
target("dx.RawBuffer", double, 1, 1)
+// CHECK: %"class.hlsl::RasterizerOrderedStructuredBuffer.10" = type {
target("dx.RawBuffer", <4 x i16>, 1, 1)
+// CHECK: %"class.hlsl::RasterizerOrderedStructuredBuffer.11" = type {
target("dx.RawBuffer", <3 x i32>, 1, 1)
+// CHECK: %"class.hlsl::RasterizerOrderedStructuredBuffer.12" = type {
target("dx.RawBuffer", <2 x half>, 1, 1)
+// CHECK: %"class.hlsl::RasterizerOrderedStructuredBuffer.13" = type {
target("dx.RawBuffer", <3 x float>, 1, 1)
+
+RasterizerOrderedStructuredBuffer<int16_t> BufI16;
+RasterizerOrderedStructuredBuffer<uint16_t> BufU16;
+RasterizerOrderedStructuredBuffer<int> BufI32;
+RasterizerOrderedStructuredBuffer<uint> BufU32;
+RasterizerOrderedStructuredBuffer<int64_t> BufI64;
+RasterizerOrderedStructuredBuffer<uint64_t> BufU64;
+RasterizerOrderedStructuredBuffer<half> BufF16;
+RasterizerOrderedStructuredBuffer<float> BufF32;
+RasterizerOrderedStructuredBuffer<double> BufF64;
+RasterizerOrderedStructuredBuffer< vector<int16_t, 4> > BufI16x4;
+RasterizerOrderedStructuredBuffer< vector<uint, 3> > BufU32x3;
+RasterizerOrderedStructuredBuffer<half2> BufF16x2;
+RasterizerOrderedStructuredBuffer<float3> BufF32x3;
+// TODO: RasterizerOrderedStructuredBuffer<snorm half> BufSNormF16;
+// TODO: RasterizerOrderedStructuredBuffer<unorm half> BufUNormF16;
+// TODO: RasterizerOrderedStructuredBuffer<snorm float> BufSNormF32;
+// TODO: RasterizerOrderedStructuredBuffer<unorm float> BufUNormF32;
+// TODO: RasterizerOrderedStructuredBuffer<snorm double> BufSNormF64;
+// TODO: RasterizerOrderedStructuredBuffer<unorm double> BufUNormF64;
+
+[numthreads(1,1,1)]
+void main(int GI : SV_GroupIndex) {
+ BufI16[GI] = 0;
+ BufU16[GI] = 0;
+ BufI32[GI] = 0;
+ BufU32[GI] = 0;
+ BufI64[GI] = 0;
+ BufU64[GI] = 0;
+ BufF16[GI] = 0;
+ BufF32[GI] = 0;
+ BufF64[GI] = 0;
+ BufI16x4[GI] = 0;
+ BufU32x3[GI] = 0;
+ BufF16x2[GI] = 0;
+ BufF32x3[GI] = 0;
+}
+
+// CHECK: !{{[0-9]+}} = !{ptr @BufI16, i32 10, i32 2,
+// CHECK: !{{[0-9]+}} = !{ptr @BufU16, i32 10, i32 3,
+// CHECK: !{{[0-9]+}} = !{ptr @BufI32, i32 10, i32 4,
+// CHECK: !{{[0-9]+}} = !{ptr @BufU32, i32 10, i32 5,
+// CHECK: !{{[0-9]+}} = !{ptr @BufI64, i32 10, i32 6,
+// CHECK: !{{[0-9]+}} = !{ptr @BufU64, i32 10, i32 7,
+// CHECK: !{{[0-9]+}} = !{ptr @BufF16, i32 10, i32 8,
+// CHECK: !{{[0-9]+}} = !{ptr @BufF32, i32 10, i32 9,
+// CHECK: !{{[0-9]+}} = !{ptr @BufF64, i32 10, i32 10,
+// CHECK: !{{[0-9]+}} = !{ptr @BufI16x4, i32 10, i32 2,
+// CHECK: !{{[0-9]+}} = !{ptr @BufU32x3, i32 10, i32 5,
+// CHECK: !{{[0-9]+}} = !{ptr @BufF16x2, i32 10, i32 8,
+// CHECK: !{{[0-9]+}} = !{ptr @BufF32x3, i32 10, i32 9,
diff --git
a/clang/test/CodeGenHLSL/builtins/StructuredBuffers-constructors.hlsl
b/clang/test/CodeGenHLSL/builtins/StructuredBuffers-constructors.hlsl
index 4f2f8d079074da..8d3d6abb37f02a 100644
--- a/clang/test/CodeGenHLSL/builtins/StructuredBuffers-constructors.hlsl
+++ b/clang/test/CodeGenHLSL/builtins/StructuredBuffers-constructors.hlsl
@@ -5,17 +5,22 @@
StructuredBuffer<float> Buf : register(t10);
RWStructuredBuffer<float> Buf2 : register(u5, space1);
+RasterizerOrderedStructuredBuffer<float> Buf5 : register(u1, space2);
// CHECK: %"class.hlsl::StructuredBuffer" = type { target("dx.RawBuffer",
float, 0, 0), float }
// CHECK: %"class.hlsl::RWStructuredBuffer" = type { target("dx.RawBuffer",
float, 1, 0), float }
+// CHECK: %"class.hlsl::RasterizerOrderedStructuredBuffer" = type {
target("dx.RawBuffer", float, 1, 1), float }
// CHECK: @Buf = global %"class.hlsl::StructuredBuffer" zeroinitializer, align
4
// CHECK: @Buf2 = global %"class.hlsl::RWStructuredBuffer" zeroinitializer,
align 4
+// CHECK: @Buf5 = global %"class.hlsl::RasterizerOrderedStructuredBuffer"
zeroinitializer, align 4
// CHECK: define linkonce_odr void @_ZN4hlsl16StructuredBufferIfEC2Ev(ptr
noundef nonnull align 4 dereferenceable(8) %this)
// CHECK-NEXT: entry:
// CHECK: define linkonce_odr void @_ZN4hlsl18RWStructuredBufferIfEC2Ev(ptr
noundef nonnull align 4 dereferenceable(8) %this)
// CHECK-NEXT: entry:
+// CHECK: define linkonce_odr void
@_ZN4hlsl33RasterizerOrderedStructuredBufferIfEC2Ev(ptr noundef nonnull align 4
dereferenceable(8) %this)
+// CHECK-NEXT: entry:
// CHECK: define internal void
@_GLOBAL__sub_I_StructuredBuffers_constructors.hlsl()
// CHECK: entry:
@@ -27,7 +32,11 @@ RWStructuredBuffer<float> Buf2 : register(u5, space1);
// CHECK-DXIL-NEXT: store target("dx.RawBuffer", float, 0, 0) %Buf_h, ptr
@Buf, align 4
// CHECK-DXIL-NEXT: %Buf2_h = call target("dx.RawBuffer", float, 1, 0)
@llvm.dx.handle.fromBinding.tdx.RawBuffer_f32_1_0t(i32 1, i32 5, i32 1, i32 0,
i1 false)
// CHECK-DXIL-NEXT: store target("dx.RawBuffer", float, 1, 0) %Buf2_h, ptr
@Buf2, align 4
+// CHECK-DXIL-NEXT: %Buf5_h = call target("dx.RawBuffer", float, 1, 1)
@llvm.dx.handle.fromBinding.tdx.RawBuffer_f32_1_1t(i32 2, i32 1, i32 1, i32 0,
i1 false)
+// CHECK-DXIL-NEXT: store target("dx.RawBuffer", float, 1, 1) %Buf5_h, ptr
@Buf5, align 4
// CHECK-SPIRV-NEXT: %Buf_h = call target("dx.RawBuffer", float, 0, 0)
@llvm.spv.handle.fromBinding.tdx.RawBuffer_f32_0_0t(i32 0, i32 10, i32 1, i32
0, i1 false)
// CHECK-SPIRV-NEXT: store target("dx.RawBuffer", float, 0, 0) %Buf_h, ptr
@Buf", align 4
// CHECK-SPIRV-NEXT: %Buf2_h = call target("dx.RawBuffer", float, 1, 0)
@llvm.spv.handle.fromBinding.tdx.RawBuffer_f32_1_0t(i32 1, i32 5, i32 1, i32 0,
i1 false)
// CHECK-SPIRV-NEXT: store target("dx.RawBuffer", float, 1, 0) %Buf2_h, ptr
@Buf2", align 4
+// CHECK-SPIRV-NEXT: %Buf5_h = call target("dx.RawBuffer", float, 1, 1)
@llvm.spv.handle.fromBinding.tdx.RawBuffer_f32_1_1t(i32 2, i32 1, i32 1, i32 0,
i1 false)
+// CHECK-SPIRV-NEXT: store target("dx.RawBuffer", float, 1, 1) %Buf5_h, ptr
@Buf5, align 4
diff --git a/clang/test/CodeGenHLSL/builtins/StructuredBuffers-subscripts.hlsl
b/clang/test/CodeGenHLSL/builtins/StructuredBuffers-subscripts.hlsl
index b73b743c9b3f15..37ac9f32caf31e 100644
--- a/clang/test/CodeGenHLSL/builtins/StructuredBuffers-subscripts.hlsl
+++ b/clang/test/CodeGenHLSL/builtins/StructuredBuffers-subscripts.hlsl
@@ -1,11 +1,13 @@
// RUN: %clang_cc1 -triple dxil-pc-shadermodel6.0-compute -emit-llvm -o - -O0
%s | FileCheck %s
StructuredBuffer<int> In;
-RWStructuredBuffer<int> Out;
+RWStructuredBuffer<int> Out1;
+RasterizerOrderedStructuredBuffer<int> Out2;
[numthreads(1,1,1)]
void main(unsigned GI : SV_GroupIndex) {
- Out[GI] = In[GI];
+ Out1[GI] = In[GI];
+ Out2[GI] = In[GI];
}
// Even at -O0 the subscript operators get inlined. The -O0 IR is a bit messy
>From 5d628eea4bc7ad14ec41d9519a6e67e1f8df61e4 Mon Sep 17 00:00:00 2001
From: Helena Kotas <heko...@microsoft.com>
Date: Tue, 29 Oct 2024 20:38:47 -0700
Subject: [PATCH 2/6] Add test case with user defined struct
---
.../RasterizerOrderedStructuredBuffer-elementtype.hlsl | 8 ++++++++
1 file changed, 8 insertions(+)
diff --git
a/clang/test/CodeGenHLSL/builtins/RasterizerOrderedStructuredBuffer-elementtype.hlsl
b/clang/test/CodeGenHLSL/builtins/RasterizerOrderedStructuredBuffer-elementtype.hlsl
index 2dd9d2a6086364..0d2532270a86f3 100644
---
a/clang/test/CodeGenHLSL/builtins/RasterizerOrderedStructuredBuffer-elementtype.hlsl
+++
b/clang/test/CodeGenHLSL/builtins/RasterizerOrderedStructuredBuffer-elementtype.hlsl
@@ -4,6 +4,11 @@
// likely change once subscript operators are properly implemented
(llvm/llvm-project#95956)
// and theinterim field of the contained type is removed.
+struct MyStruct {
+ float4 a;
+ int2 b;
+};
+
// CHECK: %"class.hlsl::RasterizerOrderedStructuredBuffer" = type <{
target("dx.RawBuffer", i16, 1, 1)
// CHECK: %"class.hlsl::RasterizerOrderedStructuredBuffer.0" = type <{
target("dx.RawBuffer", i16, 1, 1)
// CHECK: %"class.hlsl::RasterizerOrderedStructuredBuffer.2" = type {
target("dx.RawBuffer", i32, 1, 1)
@@ -17,6 +22,7 @@
// CHECK: %"class.hlsl::RasterizerOrderedStructuredBuffer.11" = type {
target("dx.RawBuffer", <3 x i32>, 1, 1)
// CHECK: %"class.hlsl::RasterizerOrderedStructuredBuffer.12" = type {
target("dx.RawBuffer", <2 x half>, 1, 1)
// CHECK: %"class.hlsl::RasterizerOrderedStructuredBuffer.13" = type {
target("dx.RawBuffer", <3 x float>, 1, 1)
+// CHECK: %"class.hlsl::RasterizerOrderedStructuredBuffer.14" = type {
target("dx.RawBuffer", %struct.MyStruct = type { <4 x float>, <2 x i32>, [8 x
i8] }, 1, 1)
RasterizerOrderedStructuredBuffer<int16_t> BufI16;
RasterizerOrderedStructuredBuffer<uint16_t> BufU16;
@@ -37,6 +43,7 @@ RasterizerOrderedStructuredBuffer<float3> BufF32x3;
// TODO: RasterizerOrderedStructuredBuffer<unorm float> BufUNormF32;
// TODO: RasterizerOrderedStructuredBuffer<snorm double> BufSNormF64;
// TODO: RasterizerOrderedStructuredBuffer<unorm double> BufUNormF64;
+RasterizerOrderedStructuredBuffer<MyStruct> BufMyStruct;
[numthreads(1,1,1)]
void main(int GI : SV_GroupIndex) {
@@ -53,6 +60,7 @@ void main(int GI : SV_GroupIndex) {
BufU32x3[GI] = 0;
BufF16x2[GI] = 0;
BufF32x3[GI] = 0;
+ BufMyStruct[GI] = {{0,0,0,0},{0,0}};
}
// CHECK: !{{[0-9]+}} = !{ptr @BufI16, i32 10, i32 2,
>From 0e28136c7ab58030813ca64838ce53787050af16 Mon Sep 17 00:00:00 2001
From: Helena Kotas <heko...@microsoft.com>
Date: Wed, 30 Oct 2024 17:31:57 -0700
Subject: [PATCH 3/6] Update tests after merge
---
...terizerOrderedStructuredBuffer-elementtype.hlsl | 14 --------------
1 file changed, 14 deletions(-)
diff --git
a/clang/test/CodeGenHLSL/builtins/RasterizerOrderedStructuredBuffer-elementtype.hlsl
b/clang/test/CodeGenHLSL/builtins/RasterizerOrderedStructuredBuffer-elementtype.hlsl
index 0d2532270a86f3..6cf4dc441783bd 100644
---
a/clang/test/CodeGenHLSL/builtins/RasterizerOrderedStructuredBuffer-elementtype.hlsl
+++
b/clang/test/CodeGenHLSL/builtins/RasterizerOrderedStructuredBuffer-elementtype.hlsl
@@ -62,17 +62,3 @@ void main(int GI : SV_GroupIndex) {
BufF32x3[GI] = 0;
BufMyStruct[GI] = {{0,0,0,0},{0,0}};
}
-
-// CHECK: !{{[0-9]+}} = !{ptr @BufI16, i32 10, i32 2,
-// CHECK: !{{[0-9]+}} = !{ptr @BufU16, i32 10, i32 3,
-// CHECK: !{{[0-9]+}} = !{ptr @BufI32, i32 10, i32 4,
-// CHECK: !{{[0-9]+}} = !{ptr @BufU32, i32 10, i32 5,
-// CHECK: !{{[0-9]+}} = !{ptr @BufI64, i32 10, i32 6,
-// CHECK: !{{[0-9]+}} = !{ptr @BufU64, i32 10, i32 7,
-// CHECK: !{{[0-9]+}} = !{ptr @BufF16, i32 10, i32 8,
-// CHECK: !{{[0-9]+}} = !{ptr @BufF32, i32 10, i32 9,
-// CHECK: !{{[0-9]+}} = !{ptr @BufF64, i32 10, i32 10,
-// CHECK: !{{[0-9]+}} = !{ptr @BufI16x4, i32 10, i32 2,
-// CHECK: !{{[0-9]+}} = !{ptr @BufU32x3, i32 10, i32 5,
-// CHECK: !{{[0-9]+}} = !{ptr @BufF16x2, i32 10, i32 8,
-// CHECK: !{{[0-9]+}} = !{ptr @BufF32x3, i32 10, i32 9,
>From 7206dfc8e97adf600fd58f85cc2e09492abfa040 Mon Sep 17 00:00:00 2001
From: Helena Kotas <heko...@microsoft.com>
Date: Mon, 4 Nov 2024 13:36:35 -0800
Subject: [PATCH 4/6] Change test prefix to DXIL to allow easier addition of
SPIRV case
---
...erOrderedStructuredBuffer-elementtype.hlsl | 30 +++++++++----------
1 file changed, 15 insertions(+), 15 deletions(-)
diff --git
a/clang/test/CodeGenHLSL/builtins/RasterizerOrderedStructuredBuffer-elementtype.hlsl
b/clang/test/CodeGenHLSL/builtins/RasterizerOrderedStructuredBuffer-elementtype.hlsl
index 6cf4dc441783bd..441250092745bb 100644
---
a/clang/test/CodeGenHLSL/builtins/RasterizerOrderedStructuredBuffer-elementtype.hlsl
+++
b/clang/test/CodeGenHLSL/builtins/RasterizerOrderedStructuredBuffer-elementtype.hlsl
@@ -1,4 +1,4 @@
-// RUN: %clang_cc1 -triple dxil-pc-shadermodel6.2-compute
-finclude-default-header -fnative-half-type -emit-llvm -o - %s | FileCheck %s
+// RUN: %clang_cc1 -triple dxil-pc-shadermodel6.2-compute
-finclude-default-header -fnative-half-type -emit-llvm -o - %s | Filecheck %s
-check-prefixes=DXIL
// NOTE: The number in type name and whether the struct is packed or not will
mostly
// likely change once subscript operators are properly implemented
(llvm/llvm-project#95956)
@@ -9,20 +9,20 @@ struct MyStruct {
int2 b;
};
-// CHECK: %"class.hlsl::RasterizerOrderedStructuredBuffer" = type <{
target("dx.RawBuffer", i16, 1, 1)
-// CHECK: %"class.hlsl::RasterizerOrderedStructuredBuffer.0" = type <{
target("dx.RawBuffer", i16, 1, 1)
-// CHECK: %"class.hlsl::RasterizerOrderedStructuredBuffer.2" = type {
target("dx.RawBuffer", i32, 1, 1)
-// CHECK: %"class.hlsl::RasterizerOrderedStructuredBuffer.3" = type {
target("dx.RawBuffer", i32, 1, 1)
-// CHECK: %"class.hlsl::RasterizerOrderedStructuredBuffer.4" = type {
target("dx.RawBuffer", i64, 1, 1)
-// CHECK: %"class.hlsl::RasterizerOrderedStructuredBuffer.5" = type {
target("dx.RawBuffer", i64, 1, 1)
-// CHECK: %"class.hlsl::RasterizerOrderedStructuredBuffer.6" = type <{
target("dx.RawBuffer", half, 1, 1)
-// CHECK: %"class.hlsl::RasterizerOrderedStructuredBuffer.8" = type {
target("dx.RawBuffer", float, 1, 1)
-// CHECK: %"class.hlsl::RasterizerOrderedStructuredBuffer.9" = type {
target("dx.RawBuffer", double, 1, 1)
-// CHECK: %"class.hlsl::RasterizerOrderedStructuredBuffer.10" = type {
target("dx.RawBuffer", <4 x i16>, 1, 1)
-// CHECK: %"class.hlsl::RasterizerOrderedStructuredBuffer.11" = type {
target("dx.RawBuffer", <3 x i32>, 1, 1)
-// CHECK: %"class.hlsl::RasterizerOrderedStructuredBuffer.12" = type {
target("dx.RawBuffer", <2 x half>, 1, 1)
-// CHECK: %"class.hlsl::RasterizerOrderedStructuredBuffer.13" = type {
target("dx.RawBuffer", <3 x float>, 1, 1)
-// CHECK: %"class.hlsl::RasterizerOrderedStructuredBuffer.14" = type {
target("dx.RawBuffer", %struct.MyStruct = type { <4 x float>, <2 x i32>, [8 x
i8] }, 1, 1)
+// DXIL: %"class.hlsl::RasterizerOrderedStructuredBuffer" = type <{
target("dx.RawBuffer", i16, 1, 1)
+// DXIL: %"class.hlsl::RasterizerOrderedStructuredBuffer.0" = type <{
target("dx.RawBuffer", i16, 1, 1)
+// DXIL: %"class.hlsl::RasterizerOrderedStructuredBuffer.2" = type {
target("dx.RawBuffer", i32, 1, 1)
+// DXIL: %"class.hlsl::RasterizerOrderedStructuredBuffer.3" = type {
target("dx.RawBuffer", i32, 1, 1)
+// DXIL: %"class.hlsl::RasterizerOrderedStructuredBuffer.4" = type {
target("dx.RawBuffer", i64, 1, 1)
+// DXIL: %"class.hlsl::RasterizerOrderedStructuredBuffer.5" = type {
target("dx.RawBuffer", i64, 1, 1)
+// DXIL: %"class.hlsl::RasterizerOrderedStructuredBuffer.6" = type <{
target("dx.RawBuffer", half, 1, 1)
+// DXIL: %"class.hlsl::RasterizerOrderedStructuredBuffer.8" = type {
target("dx.RawBuffer", float, 1, 1)
+// DXIL: %"class.hlsl::RasterizerOrderedStructuredBuffer.9" = type {
target("dx.RawBuffer", double, 1, 1)
+// DXIL: %"class.hlsl::RasterizerOrderedStructuredBuffer.10" = type {
target("dx.RawBuffer", <4 x i16>, 1, 1)
+// DXIL: %"class.hlsl::RasterizerOrderedStructuredBuffer.11" = type {
target("dx.RawBuffer", <3 x i32>, 1, 1)
+// DXIL: %"class.hlsl::RasterizerOrderedStructuredBuffer.12" = type {
target("dx.RawBuffer", <2 x half>, 1, 1)
+// DXIL: %"class.hlsl::RasterizerOrderedStructuredBuffer.13" = type {
target("dx.RawBuffer", <3 x float>, 1, 1)
+// DXIL: %"class.hlsl::RasterizerOrderedStructuredBuffer.14" = type {
target("dx.RawBuffer", %struct.MyStruct = type { <4 x float>, <2 x i32>, [8 x
i8] }, 1, 1)
RasterizerOrderedStructuredBuffer<int16_t> BufI16;
RasterizerOrderedStructuredBuffer<uint16_t> BufU16;
>From 9b4a9c49fec2a3c4fc2b8ed96fe349f1bd36452b Mon Sep 17 00:00:00 2001
From: Helena Kotas <heko...@microsoft.com>
Date: Tue, 5 Nov 2024 10:51:05 -0800
Subject: [PATCH 5/6] fix FileCheck name
---
clang/include/clang/Frontend/CompilerInstance.h | 2 +-
.../builtins/RasterizerOrderedStructuredBuffer-elementtype.hlsl | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/clang/include/clang/Frontend/CompilerInstance.h
b/clang/include/clang/Frontend/CompilerInstance.h
index 3464654284f199..9dedbd4dcfcbcf 100644
--- a/clang/include/clang/Frontend/CompilerInstance.h
+++ b/clang/include/clang/Frontend/CompilerInstance.h
@@ -559,7 +559,7 @@ class CompilerInstance : public ModuleLoader {
bool hasSema() const { return (bool)TheSema; }
Sema &getSema() const {
- assert(TheSema && "Compiler instance has no Sema object!");
+ // assert(TheSema && "Compiler instance has no Sema object!");
return *TheSema;
}
diff --git
a/clang/test/CodeGenHLSL/builtins/RasterizerOrderedStructuredBuffer-elementtype.hlsl
b/clang/test/CodeGenHLSL/builtins/RasterizerOrderedStructuredBuffer-elementtype.hlsl
index 441250092745bb..1de3a4e3961af8 100644
---
a/clang/test/CodeGenHLSL/builtins/RasterizerOrderedStructuredBuffer-elementtype.hlsl
+++
b/clang/test/CodeGenHLSL/builtins/RasterizerOrderedStructuredBuffer-elementtype.hlsl
@@ -1,4 +1,4 @@
-// RUN: %clang_cc1 -triple dxil-pc-shadermodel6.2-compute
-finclude-default-header -fnative-half-type -emit-llvm -o - %s | Filecheck %s
-check-prefixes=DXIL
+// RUN: %clang_cc1 -triple dxil-pc-shadermodel6.2-compute
-finclude-default-header -fnative-half-type -emit-llvm -o - %s | FileCheck %s
-check-prefixes=DXIL
// NOTE: The number in type name and whether the struct is packed or not will
mostly
// likely change once subscript operators are properly implemented
(llvm/llvm-project#95956)
>From f72b448ecb289c33791f1cab92213230379b5cc2 Mon Sep 17 00:00:00 2001
From: Helena Kotas <heko...@microsoft.com>
Date: Tue, 5 Nov 2024 11:13:37 -0800
Subject: [PATCH 6/6] remove change that should not be there
---
clang/include/clang/Frontend/CompilerInstance.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/clang/include/clang/Frontend/CompilerInstance.h
b/clang/include/clang/Frontend/CompilerInstance.h
index 9dedbd4dcfcbcf..3464654284f199 100644
--- a/clang/include/clang/Frontend/CompilerInstance.h
+++ b/clang/include/clang/Frontend/CompilerInstance.h
@@ -559,7 +559,7 @@ class CompilerInstance : public ModuleLoader {
bool hasSema() const { return (bool)TheSema; }
Sema &getSema() const {
- // assert(TheSema && "Compiler instance has no Sema object!");
+ assert(TheSema && "Compiler instance has no Sema object!");
return *TheSema;
}
_______________________________________________
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
