[HLSL] Add Append/ConsumeStructuredBuffer definitions to HLSLExternalSemaSource #113643
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,50 @@ | ||
| // 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 AppendStructuredBuffer 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 AppendStructuredBuffer | ||
| // 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 AppendStructuredBuffer | ||
| // EMPTY-NEXT: FinalAttr 0x{{[0-9A-Fa-f]+}} <<invalid sloc>> Implicit final | ||
|
|
||
| // There should be no more occurrences of AppendStructuredBuffer | ||
| // EMPTY-NOT: {{[^[:alnum:]]}}AppendStructuredBuffer | ||
|
|
||
| #ifndef EMPTY | ||
|
|
||
| AppendStructuredBuffer<int> Buffer; | ||
|
|
||
| #endif | ||
|
|
||
| // CHECK: ClassTemplateDecl 0x{{[0-9A-Fa-f]+}} <<invalid sloc>> <invalid sloc> implicit AppendStructuredBuffer | ||
| // 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 AppendStructuredBuffer definition | ||
|
|
||
| // CHECK: FinalAttr 0x{{[0-9A-Fa-f]+}} <<invalid sloc>> Implicit final | ||
|
There was a problem hiding this comment. I guess this one isn't on the next line in this form unlike the EMPTY case above? |
||
| // 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::raw_buffer]] | ||
| // CHECK-SAME{LITERAL}: [[hlsl::contained_type(element_type)]] | ||
| // CHECK-NEXT: HLSLResourceAttr 0x{{[0-9A-Fa-f]+}} <<invalid sloc>> Implicit RawBuffer | ||
|
|
||
| // CHECK-NOT: CXXMethodDecl 0x{{[0-9A-Fa-f]+}} <<invalid sloc>> <invalid sloc> operator[] 'element_type &const (unsigned int) const' | ||
| // CHECK-NOT: CXXMethodDecl 0x{{[0-9A-Fa-f]+}} <<invalid sloc>> <invalid sloc> operator[] 'element_type &(unsigned int)' | ||
|
|
||
| // CHECK: ClassTemplateSpecializationDecl 0x{{[0-9A-Fa-f]+}} <<invalid sloc>> <invalid sloc> class AppendStructuredBuffer 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::raw_buffer]] | ||
| // CHECK-SAME{LITERAL}: [[hlsl::contained_type(int)]] | ||
| // CHECK-NEXT: HLSLResourceAttr 0x{{[0-9A-Fa-f]+}} <<invalid sloc>> Implicit RawBuffer | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,51 @@ | ||
| // 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 ConsumeStructuredBuffer 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 ConsumeStructuredBuffer | ||
| // 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 ConsumeStructuredBuffer | ||
| // EMPTY-NEXT: FinalAttr 0x{{[0-9A-Fa-f]+}} <<invalid sloc>> Implicit final | ||
|
|
||
| // There should be no more occurrences of ConsumeStructuredBuffer | ||
| // EMPTY-NOT: {{[^[:alnum:]]}}ConsumeStructuredBuffer | ||
|
|
||
| #ifndef EMPTY | ||
|
|
||
| ConsumeStructuredBuffer<int> Buffer; | ||
|
|
||
| #endif | ||
|
|
||
| // CHECK: ClassTemplateDecl 0x{{[0-9A-Fa-f]+}} <<invalid sloc>> <invalid sloc> implicit ConsumeStructuredBuffer | ||
| // 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 ConsumeStructuredBuffer 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::raw_buffer]] | ||
| // CHECK-SAME{LITERAL}: [[hlsl::contained_type(element_type)]] | ||
| // CHECK-NEXT: HLSLResourceAttr 0x{{[0-9A-Fa-f]+}} <<invalid sloc>> Implicit RawBuffer | ||
|
|
||
| // CHECK-NOT: CXXMethodDecl 0x{{[0-9A-Fa-f]+}} <<invalid sloc>> <invalid sloc> operator[] 'element_type &const (unsigned int) const' | ||
| // CHECK-NOT: CXXMethodDecl 0x{{[0-9A-Fa-f]+}} <<invalid sloc>> <invalid sloc> operator[] 'element_type &(unsigned int)' | ||
|
|
||
| // CHECK: ClassTemplateSpecializationDecl 0x{{[0-9A-Fa-f]+}} <<invalid sloc>> <invalid sloc> class ConsumeStructuredBuffer 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::raw_buffer]] | ||
| // CHECK-SAME{LITERAL}: [[hlsl::contained_type(int)]] | ||
| // CHECK-NEXT: HLSLResourceAttr 0x{{[0-9A-Fa-f]+}} <<invalid sloc>> Implicit RawBuffer |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,46 @@ | ||
| // RUN: %clang_cc1 -triple dxil-pc-shadermodel6.2-compute -finclude-default-header -fnative-half-type -emit-llvm -o - %s | FileCheck %s -check-prefixes=DXIL | ||
|
|
||
| struct MyStruct { | ||
| float4 a; | ||
| int2 b; | ||
| }; | ||
|
|
||
| // DXIL: %"class.hlsl::AppendStructuredBuffer" = type { target("dx.RawBuffer", i16, 1, 0) | ||
| // DXIL: %"class.hlsl::AppendStructuredBuffer.0" = type { target("dx.RawBuffer", i16, 1, 0) | ||
| // DXIL: %"class.hlsl::AppendStructuredBuffer.1" = type { target("dx.RawBuffer", i32, 1, 0) | ||
| // DXIL: %"class.hlsl::AppendStructuredBuffer.2" = type { target("dx.RawBuffer", i32, 1, 0) | ||
| // DXIL: %"class.hlsl::AppendStructuredBuffer.3" = type { target("dx.RawBuffer", i64, 1, 0) | ||
| // DXIL: %"class.hlsl::AppendStructuredBuffer.4" = type { target("dx.RawBuffer", i64, 1, 0) | ||
| // DXIL: %"class.hlsl::AppendStructuredBuffer.5" = type { target("dx.RawBuffer", half, 1, 0) | ||
| // DXIL: %"class.hlsl::AppendStructuredBuffer.6" = type { target("dx.RawBuffer", float, 1, 0) | ||
| // DXIL: %"class.hlsl::AppendStructuredBuffer.7" = type { target("dx.RawBuffer", double, 1, 0) | ||
| // DXIL: %"class.hlsl::AppendStructuredBuffer.8" = type { target("dx.RawBuffer", <4 x i16>, 1, 0) | ||
| // DXIL: %"class.hlsl::AppendStructuredBuffer.9" = type { target("dx.RawBuffer", <3 x i32>, 1, 0) | ||
| // DXIL: %"class.hlsl::AppendStructuredBuffer.10" = type { target("dx.RawBuffer", <2 x half>, 1, 0) | ||
| // DXIL: %"class.hlsl::AppendStructuredBuffer.11" = type { target("dx.RawBuffer", <3 x float>, 1, 0) | ||
| // DXIL: %"class.hlsl::AppendStructuredBuffer.12" = type { target("dx.RawBuffer", %struct.MyStruct = type { <4 x float>, <2 x i32>, [8 x i8] }, 1, 0) | ||
|
|
||
| AppendStructuredBuffer<int16_t> BufI16; | ||
| AppendStructuredBuffer<uint16_t> BufU16; | ||
| AppendStructuredBuffer<int> BufI32; | ||
| AppendStructuredBuffer<uint> BufU32; | ||
| AppendStructuredBuffer<int64_t> BufI64; | ||
| AppendStructuredBuffer<uint64_t> BufU64; | ||
| AppendStructuredBuffer<half> BufF16; | ||
| AppendStructuredBuffer<float> BufF32; | ||
| AppendStructuredBuffer<double> BufF64; | ||
| AppendStructuredBuffer< vector<int16_t, 4> > BufI16x4; | ||
| AppendStructuredBuffer< vector<uint, 3> > BufU32x3; | ||
| AppendStructuredBuffer<half2> BufF16x2; | ||
| AppendStructuredBuffer<float3> BufF32x3; | ||
| // TODO: AppendStructuredBuffer<snorm half> BufSNormF16; | ||
| // TODO: AppendStructuredBuffer<unorm half> BufUNormF16; | ||
| // TODO: AppendStructuredBuffer<snorm float> BufSNormF32; | ||
| // TODO: AppendStructuredBuffer<unorm float> BufUNormF32; | ||
| // TODO: AppendStructuredBuffer<snorm double> BufSNormF64; | ||
| // TODO: AppendStructuredBuffer<unorm double> BufUNormF64; | ||
| AppendStructuredBuffer<MyStruct> BufMyStruct; | ||
|
|
||
| [numthreads(1,1,1)] | ||
| void main(int GI : SV_GroupIndex) { | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,46 @@ | ||
| // RUN: %clang_cc1 -triple dxil-pc-shadermodel6.2-compute -finclude-default-header -fnative-half-type -emit-llvm -o - %s | FileCheck %s -check-prefixes=DXIL | ||
|
|
||
| struct MyStruct { | ||
| float4 a; | ||
| int2 b; | ||
| }; | ||
|
|
||
| // DXIL: %"class.hlsl::ConsumeStructuredBuffer" = type { target("dx.RawBuffer", i16, 1, 0) | ||
| // DXIL: %"class.hlsl::ConsumeStructuredBuffer.0" = type { target("dx.RawBuffer", i16, 1, 0) | ||
| // DXIL: %"class.hlsl::ConsumeStructuredBuffer.1" = type { target("dx.RawBuffer", i32, 1, 0) | ||
| // DXIL: %"class.hlsl::ConsumeStructuredBuffer.2" = type { target("dx.RawBuffer", i32, 1, 0) | ||
| // DXIL: %"class.hlsl::ConsumeStructuredBuffer.3" = type { target("dx.RawBuffer", i64, 1, 0) | ||
| // DXIL: %"class.hlsl::ConsumeStructuredBuffer.4" = type { target("dx.RawBuffer", i64, 1, 0) | ||
| // DXIL: %"class.hlsl::ConsumeStructuredBuffer.5" = type { target("dx.RawBuffer", half, 1, 0) | ||
| // DXIL: %"class.hlsl::ConsumeStructuredBuffer.6" = type { target("dx.RawBuffer", float, 1, 0) | ||
| // DXIL: %"class.hlsl::ConsumeStructuredBuffer.7" = type { target("dx.RawBuffer", double, 1, 0) | ||
| // DXIL: %"class.hlsl::ConsumeStructuredBuffer.8" = type { target("dx.RawBuffer", <4 x i16>, 1, 0) | ||
| // DXIL: %"class.hlsl::ConsumeStructuredBuffer.9" = type { target("dx.RawBuffer", <3 x i32>, 1, 0) | ||
| // DXIL: %"class.hlsl::ConsumeStructuredBuffer.10" = type { target("dx.RawBuffer", <2 x half>, 1, 0) | ||
| // DXIL: %"class.hlsl::ConsumeStructuredBuffer.11" = type { target("dx.RawBuffer", <3 x float>, 1, 0) | ||
| // DXIL: %"class.hlsl::ConsumeStructuredBuffer.12" = type { target("dx.RawBuffer", %struct.MyStruct = type { <4 x float>, <2 x i32>, [8 x i8] }, 1, 0) | ||
|
|
||
| ConsumeStructuredBuffer<int16_t> BufI16; | ||
| ConsumeStructuredBuffer<uint16_t> BufU16; | ||
| ConsumeStructuredBuffer<int> BufI32; | ||
| ConsumeStructuredBuffer<uint> BufU32; | ||
| ConsumeStructuredBuffer<int64_t> BufI64; | ||
| ConsumeStructuredBuffer<uint64_t> BufU64; | ||
| ConsumeStructuredBuffer<half> BufF16; | ||
| ConsumeStructuredBuffer<float> BufF32; | ||
| ConsumeStructuredBuffer<double> BufF64; | ||
| ConsumeStructuredBuffer< vector<int16_t, 4> > BufI16x4; | ||
| ConsumeStructuredBuffer< vector<uint, 3> > BufU32x3; | ||
| ConsumeStructuredBuffer<half2> BufF16x2; | ||
| ConsumeStructuredBuffer<float3> BufF32x3; | ||
| // TODO: ConsumeStructuredBuffer<snorm half> BufSNormF16; | ||
| // TODO: ConsumeStructuredBuffer<unorm half> BufUNormF16; | ||
| // TODO: ConsumeStructuredBuffer<snorm float> BufSNormF32; | ||
| // TODO: ConsumeStructuredBuffer<unorm float> BufUNormF32; | ||
| // TODO: ConsumeStructuredBuffer<snorm double> BufSNormF64; | ||
| // TODO: ConsumeStructuredBuffer<unorm double> BufUNormF64; | ||
| ConsumeStructuredBuffer<MyStruct> BufMyStruct; | ||
|
|
||
| [numthreads(1,1,1)] | ||
| void main(int GI : SV_GroupIndex) { | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I'm not entirely convinced that these AST tests that are all more or less duplicates of each other are really worth it for every single buffer type. They aren't easy to read or update and they vary from one another by literally just a few characters. I wonder if we should have one AST test for buffers in general and a more limited set that makes sure we're not way off base for the types of buffer that aren't represented in that one...
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I might be worth merging these tests into one, though I am not sure if we should have one for all buffers. I think it would be better to group them, like structured buffers, raw buffers, textures etc. We are also adding the AST for buffer methods to these tests, which will differ between buffers a lot.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Filled an issue to track: #115412