diff options
Diffstat (limited to 'llvm/test/ObjectYAML')
15 files changed, 244 insertions, 78 deletions
diff --git a/llvm/test/ObjectYAML/DXContainer/RootSignature-Descriptor1.0.yaml b/llvm/test/ObjectYAML/DXContainer/RootSignature-Descriptor1.0.yaml index 889eccf74001..70dc35287ba9 100644 --- a/llvm/test/ObjectYAML/DXContainer/RootSignature-Descriptor1.0.yaml +++ b/llvm/test/ObjectYAML/DXContainer/RootSignature-Descriptor1.0.yaml @@ -17,7 +17,7 @@ Parts: NumRootParameters: 1 RootParametersOffset: 24 NumStaticSamplers: 0 - StaticSamplersOffset: 60 + StaticSamplersOffset: 44 Parameters: - ParameterType: 2 # SRV ShaderVisibility: 3 # Domain @@ -34,7 +34,7 @@ Parts: # CHECK-NEXT: NumRootParameters: 1 # CHECK-NEXT: RootParametersOffset: 24 # CHECK-NEXT: NumStaticSamplers: 0 -# CHECK-NEXT: StaticSamplersOffset: 60 +# CHECK-NEXT: StaticSamplersOffset: 44 # CHECK-NEXT: Parameters: # CHECK-NEXT: - ParameterType: 2 # CHECK-NEXT: ShaderVisibility: 3 diff --git a/llvm/test/ObjectYAML/DXContainer/RootSignature-Descriptor1.1.yaml b/llvm/test/ObjectYAML/DXContainer/RootSignature-Descriptor1.1.yaml index 64e01c6836e3..33a74dbf6a3f 100644 --- a/llvm/test/ObjectYAML/DXContainer/RootSignature-Descriptor1.1.yaml +++ b/llvm/test/ObjectYAML/DXContainer/RootSignature-Descriptor1.1.yaml @@ -17,7 +17,7 @@ Parts: NumRootParameters: 1 RootParametersOffset: 24 NumStaticSamplers: 0 - StaticSamplersOffset: 60 + StaticSamplersOffset: 48 Parameters: - ParameterType: 2 # SRV ShaderVisibility: 3 # Domain @@ -35,7 +35,7 @@ Parts: # CHECK-NEXT: NumRootParameters: 1 # CHECK-NEXT: RootParametersOffset: 24 # CHECK-NEXT: NumStaticSamplers: 0 -# CHECK-NEXT: StaticSamplersOffset: 60 +# CHECK-NEXT: StaticSamplersOffset: 48 # CHECK-NEXT: Parameters: # CHECK-NEXT: - ParameterType: 2 # CHECK-NEXT: ShaderVisibility: 3 diff --git a/llvm/test/ObjectYAML/DXContainer/RootSignature-DescriptorTable1.0.yaml b/llvm/test/ObjectYAML/DXContainer/RootSignature-DescriptorTable1.0.yaml index 0441bb7a256b..b04549fde88f 100644 --- a/llvm/test/ObjectYAML/DXContainer/RootSignature-DescriptorTable1.0.yaml +++ b/llvm/test/ObjectYAML/DXContainer/RootSignature-DescriptorTable1.0.yaml @@ -18,7 +18,7 @@ Parts: NumRootParameters: 1 RootParametersOffset: 24 NumStaticSamplers: 0 - StaticSamplersOffset: 60 + StaticSamplersOffset: 64 Parameters: - ParameterType: 0 # SRV ShaderVisibility: 3 # Domain @@ -40,7 +40,7 @@ Parts: # CHECK-NEXT: NumRootParameters: 1 # CHECK-NEXT: RootParametersOffset: 24 # CHECK-NEXT: NumStaticSamplers: 0 -# CHECK-NEXT: StaticSamplersOffset: 60 +# CHECK-NEXT: StaticSamplersOffset: 64 # CHECK-NEXT: Parameters: # CHECK-NEXT: - ParameterType: 0 # CHECK-NEXT: ShaderVisibility: 3 diff --git a/llvm/test/ObjectYAML/DXContainer/RootSignature-DescriptorTable1.1.yaml b/llvm/test/ObjectYAML/DXContainer/RootSignature-DescriptorTable1.1.yaml index d06be5e18141..d8f399010053 100644 --- a/llvm/test/ObjectYAML/DXContainer/RootSignature-DescriptorTable1.1.yaml +++ b/llvm/test/ObjectYAML/DXContainer/RootSignature-DescriptorTable1.1.yaml @@ -18,7 +18,7 @@ Parts: NumRootParameters: 1 RootParametersOffset: 24 NumStaticSamplers: 0 - StaticSamplersOffset: 60 + StaticSamplersOffset: 68 Parameters: - ParameterType: 0 # SRV ShaderVisibility: 3 # Domain @@ -41,7 +41,7 @@ Parts: # CHECK-NEXT: NumRootParameters: 1 # CHECK-NEXT: RootParametersOffset: 24 # CHECK-NEXT: NumStaticSamplers: 0 -# CHECK-NEXT: StaticSamplersOffset: 60 +# CHECK-NEXT: StaticSamplersOffset: 68 # CHECK-NEXT: Parameters: # CHECK-NEXT: - ParameterType: 0 # CHECK-NEXT: ShaderVisibility: 3 diff --git a/llvm/test/ObjectYAML/DXContainer/RootSignature-Flags.yaml b/llvm/test/ObjectYAML/DXContainer/RootSignature-Flags.yaml index 74816d403183..c5855a249c31 100644 --- a/llvm/test/ObjectYAML/DXContainer/RootSignature-Flags.yaml +++ b/llvm/test/ObjectYAML/DXContainer/RootSignature-Flags.yaml @@ -17,7 +17,7 @@ Parts: NumRootParameters: 0 RootParametersOffset: 24 NumStaticSamplers: 0 - StaticSamplersOffset: 60 + StaticSamplersOffset: 24 Parameters: [] AllowInputAssemblerInputLayout: true DenyGeometryShaderRootAccess: true @@ -29,7 +29,7 @@ Parts: # CHECK-NEXT: NumRootParameters: 0 # CHECK-NEXT: RootParametersOffset: 24 # CHECK-NEXT: NumStaticSamplers: 0 -# CHECK-NEXT: StaticSamplersOffset: 60 +# CHECK-NEXT: StaticSamplersOffset: 24 # CHECK-NEXT: Parameters: [] # CHECK-NEXT: AllowInputAssemblerInputLayout: true # CHECK-NEXT: DenyGeometryShaderRootAccess: true diff --git a/llvm/test/ObjectYAML/DXContainer/RootSignature-Invalid-RootParameterOffset.yaml b/llvm/test/ObjectYAML/DXContainer/RootSignature-Invalid-RootParameterOffset.yaml new file mode 100644 index 000000000000..22606761fe5b --- /dev/null +++ b/llvm/test/ObjectYAML/DXContainer/RootSignature-Invalid-RootParameterOffset.yaml @@ -0,0 +1,23 @@ +# RUN: not yaml2obj %s 2>&1 | FileCheck %s + +# CHECK: error: Specified RootParametersOffset does not match required value: 24. + +--- !dxcontainer +Header: + Hash: [ 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, + 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 ] + Version: + Major: 1 + Minor: 0 + PartCount: 1 + PartOffsets: [ 60 ] +Parts: + - Name: RTS0 + Size: 24 + RootSignature: + Version: 2 + NumRootParameters: 0 + RootParametersOffset: 36 + NumStaticSamplers: 0 + StaticSamplersOffset: 24 + Parameters: [] diff --git a/llvm/test/ObjectYAML/DXContainer/RootSignature-Invalid-StaticSamplersOffset.yaml b/llvm/test/ObjectYAML/DXContainer/RootSignature-Invalid-StaticSamplersOffset.yaml new file mode 100644 index 000000000000..e805526ea7c5 --- /dev/null +++ b/llvm/test/ObjectYAML/DXContainer/RootSignature-Invalid-StaticSamplersOffset.yaml @@ -0,0 +1,29 @@ +# RUN: not yaml2obj %s 2>&1 | FileCheck %s + +# CHECK: error: Specified StaticSamplersOffset does not match computed value: 48. + +--- !dxcontainer +Header: + Hash: [ 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, + 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 ] + Version: + Major: 1 + Minor: 0 + PartCount: 1 + PartOffsets: [ 60 ] +Parts: + - Name: RTS0 + Size: 24 + RootSignature: + Version: 2 + NumRootParameters: 0 + RootParametersOffset: 24 + NumStaticSamplers: 0 + StaticSamplersOffset: 0 + Parameters: + - ParameterType: 2 + ShaderVisibility: 3 + Descriptor: + ShaderRegister: 31 + RegisterSpace: 32 + DATA_STATIC_WHILE_SET_AT_EXECUTE: true diff --git a/llvm/test/ObjectYAML/DXContainer/RootSignature-InvalidType.yaml b/llvm/test/ObjectYAML/DXContainer/RootSignature-InvalidType.yaml deleted file mode 100644 index 091e70789d95..000000000000 --- a/llvm/test/ObjectYAML/DXContainer/RootSignature-InvalidType.yaml +++ /dev/null @@ -1,29 +0,0 @@ -# RUN: yaml2obj %s -o %t -# RUN: not obj2yaml 2>&1 %t | FileCheck %s -DFILE=%t - -# CHECK: Error reading file: [[FILE]]: Invalid value for parameter type - - ---- !dxcontainer -Header: - Hash: [ 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, - 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 ] - Version: - Major: 1 - Minor: 0 - PartCount: 1 - PartOffsets: [ 60 ] -Parts: - - Name: RTS0 - Size: 80 - RootSignature: - Version: 2 - NumRootParameters: 2 - RootParametersOffset: 24 - NumStaticSamplers: 0 - StaticSamplersOffset: 64 - Parameters: - - ParameterType: 255 # INVALID - ShaderVisibility: 2 # Hull - AllowInputAssemblerInputLayout: true - DenyGeometryShaderRootAccess: true diff --git a/llvm/test/ObjectYAML/DXContainer/RootSignature-InvalidVisibility.yaml b/llvm/test/ObjectYAML/DXContainer/RootSignature-InvalidVisibility.yaml deleted file mode 100644 index 1acaf6e4e08a..000000000000 --- a/llvm/test/ObjectYAML/DXContainer/RootSignature-InvalidVisibility.yaml +++ /dev/null @@ -1,33 +0,0 @@ -# RUN: yaml2obj %s -o %t -# RUN: not obj2yaml 2>&1 %t | FileCheck %s -DFILE=%t - -# CHECK: Error reading file: [[FILE]]: Invalid value for shader visibility - - ---- !dxcontainer -Header: - Hash: [ 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, - 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 ] - Version: - Major: 1 - Minor: 0 - PartCount: 1 - PartOffsets: [ 60 ] -Parts: - - Name: RTS0 - Size: 80 - RootSignature: - Version: 2 - NumRootParameters: 2 - RootParametersOffset: 24 - NumStaticSamplers: 0 - StaticSamplersOffset: 64 - Parameters: - - ParameterType: 1 # Constants32Bit - ShaderVisibility: 255 # INVALID - Constants: - Num32BitValues: 21 - ShaderRegister: 22 - RegisterSpace: 23 - AllowInputAssemblerInputLayout: true - DenyGeometryShaderRootAccess: true diff --git a/llvm/test/ObjectYAML/DXContainer/RootSignature-MultipleParameters.yaml b/llvm/test/ObjectYAML/DXContainer/RootSignature-MultipleParameters.yaml index 947fc096a920..26d56536b9e4 100644 --- a/llvm/test/ObjectYAML/DXContainer/RootSignature-MultipleParameters.yaml +++ b/llvm/test/ObjectYAML/DXContainer/RootSignature-MultipleParameters.yaml @@ -17,7 +17,7 @@ Parts: NumRootParameters: 3 RootParametersOffset: 24 NumStaticSamplers: 0 - StaticSamplersOffset: 60 + StaticSamplersOffset: 140 Parameters: - ParameterType: 1 # Constants32Bit ShaderVisibility: 2 # Hull @@ -58,7 +58,7 @@ Parts: # CHECK-NEXT: NumRootParameters: 4 # CHECK-NEXT: RootParametersOffset: 24 # CHECK-NEXT: NumStaticSamplers: 0 -# CHECK-NEXT: StaticSamplersOffset: 60 +# CHECK-NEXT: StaticSamplersOffset: 140 # CHECK-NEXT: Parameters: # CHECK-NEXT: - ParameterType: 1 # CHECK-NEXT: ShaderVisibility: 2 diff --git a/llvm/test/ObjectYAML/DXContainer/RootSignature-OptionalOffsets.yaml b/llvm/test/ObjectYAML/DXContainer/RootSignature-OptionalOffsets.yaml new file mode 100644 index 000000000000..88d7c632968b --- /dev/null +++ b/llvm/test/ObjectYAML/DXContainer/RootSignature-OptionalOffsets.yaml @@ -0,0 +1,56 @@ +# RUN: yaml2obj %s | obj2yaml | FileCheck %s + +## This test checks that we correctly compute the RootParametersOffset and +## StaticSamplersOffset when they are not explicitly provided + +## StaticSamplerOffset +## = 24 (root signature header) +## + 12 (header) + 12 (root constants) +## + 12 (header) + 12 (v1.1 root descriptor) +## + 12 (header) + 8 (root descriptor table) +## + 24 (v1.1 descriptor range) +## = 116 + +# CHECK: RootParametersOffset: 24 +# CHECK: StaticSamplersOffset: 116 + +--- !dxcontainer +Header: + Hash: [ 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, + 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 ] + Version: + Major: 1 + Minor: 0 + PartCount: 1 + PartOffsets: [ 60 ] +Parts: + - Name: RTS0 + Size: 116 + RootSignature: + Version: 2 + NumRootParameters: 3 + NumStaticSamplers: 0 + Parameters: + - ParameterType: 1 # RootConstants + ShaderVisibility: 0 + Constants: + Num32BitValues: 16 + ShaderRegister: 15 + RegisterSpace: 14 + - ParameterType: 2 # SRV + ShaderVisibility: 0 + Descriptor: + ShaderRegister: 31 + RegisterSpace: 32 + DATA_STATIC_WHILE_SET_AT_EXECUTE: true + - ParameterType: 0 # Descriptor Table + ShaderVisibility: 0 + Table: + NumRanges: 1 + Ranges: + - RangeType: 0 # CBV + NumDescriptors: -1 + BaseShaderRegister: 42 + RegisterSpace: 43 + OffsetInDescriptorsFromTableStart: 41 + DESCRIPTORS_STATIC_KEEPING_BUFFER_BOUNDS_CHECKS: true diff --git a/llvm/test/ObjectYAML/DXContainer/RootSignature-StaticSamplerOffset1.0.yaml b/llvm/test/ObjectYAML/DXContainer/RootSignature-StaticSamplerOffset1.0.yaml new file mode 100644 index 000000000000..347d8f3be171 --- /dev/null +++ b/llvm/test/ObjectYAML/DXContainer/RootSignature-StaticSamplerOffset1.0.yaml @@ -0,0 +1,60 @@ +# RUN: yaml2obj %s | obj2yaml | FileCheck %s + +## This test checks that we correctly compute the StaticSamplersOffset for each +## of the root parameter types (version 1.0 variants) + +## StaticSamplerOffset +## = 24 (root signature header) +## + 12 (header) + 12 (root constants) +## + 12 (header) + 8 (v1.1 root descriptor) +## + 12 (header) + 8 (root descriptor table) +## + 20 (v1.1 descriptor range) +## + 0 (root flags) +## = 108 + +# CHECK: StaticSamplersOffset: 108 + +--- !dxcontainer +Header: + Hash: [ 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, + 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 ] + Version: + Major: 1 + Minor: 0 + PartCount: 1 + PartOffsets: [ 60 ] +Parts: + - Name: RTS0 + Size: 108 + RootSignature: + Version: 1 + NumRootParameters: 3 + RootParametersOffset: 24 + NumStaticSamplers: 0 + StaticSamplersOffset: 108 + Parameters: + - ParameterType: 1 # RootConstants + ShaderVisibility: 0 + Constants: + Num32BitValues: 16 + ShaderRegister: 15 + RegisterSpace: 14 + - ParameterType: 2 # SRV + ShaderVisibility: 0 + Descriptor: + ShaderRegister: 31 + RegisterSpace: 32 + DATA_STATIC_WHILE_SET_AT_EXECUTE: true + - ParameterType: 0 # Descriptor Table + ShaderVisibility: 0 + Table: + NumRanges: 1 + Ranges: + - RangeType: 0 # CBV + NumDescriptors: -1 + BaseShaderRegister: 42 + RegisterSpace: 43 + OffsetInDescriptorsFromTableStart: 41 + DESCRIPTORS_STATIC_KEEPING_BUFFER_BOUNDS_CHECKS: true + AllowInputAssemblerInputLayout: true + DenyGeometryShaderRootAccess: true diff --git a/llvm/test/ObjectYAML/DXContainer/RootSignature-StaticSamplerOffset1.1.yaml b/llvm/test/ObjectYAML/DXContainer/RootSignature-StaticSamplerOffset1.1.yaml new file mode 100644 index 000000000000..8e03e1a8b29b --- /dev/null +++ b/llvm/test/ObjectYAML/DXContainer/RootSignature-StaticSamplerOffset1.1.yaml @@ -0,0 +1,60 @@ +# RUN: yaml2obj %s | obj2yaml | FileCheck %s + +## This test checks that we correctly compute the StaticSamplersOffset for each +## of the root parameter types (version 1.1 variants) + +## StaticSamplerOffset +## = 24 (root signature header) +## + 12 (header) + 12 (root constants) +## + 12 (header) + 12 (v1.1 root descriptor) +## + 12 (header) + 8 (root descriptor table) +## + 24 (v1.1 descriptor range) +## + 0 (root flags) +## = 116 + +# CHECK: StaticSamplersOffset: 116 + +--- !dxcontainer +Header: + Hash: [ 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, + 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 ] + Version: + Major: 1 + Minor: 0 + PartCount: 1 + PartOffsets: [ 60 ] +Parts: + - Name: RTS0 + Size: 116 + RootSignature: + Version: 2 + NumRootParameters: 3 + RootParametersOffset: 24 + NumStaticSamplers: 0 + StaticSamplersOffset: 116 + Parameters: + - ParameterType: 1 # RootConstants + ShaderVisibility: 0 + Constants: + Num32BitValues: 16 + ShaderRegister: 15 + RegisterSpace: 14 + - ParameterType: 2 # SRV + ShaderVisibility: 0 + Descriptor: + ShaderRegister: 31 + RegisterSpace: 32 + DATA_STATIC_WHILE_SET_AT_EXECUTE: true + - ParameterType: 0 # Descriptor Table + ShaderVisibility: 0 + Table: + NumRanges: 1 + Ranges: + - RangeType: 0 # CBV + NumDescriptors: -1 + BaseShaderRegister: 42 + RegisterSpace: 43 + OffsetInDescriptorsFromTableStart: 41 + DESCRIPTORS_STATIC_KEEPING_BUFFER_BOUNDS_CHECKS: true + AllowInputAssemblerInputLayout: true + DenyGeometryShaderRootAccess: true diff --git a/llvm/test/ObjectYAML/DXContainer/RootSignature-StaticSamplers-Defaults.yaml b/llvm/test/ObjectYAML/DXContainer/RootSignature-StaticSamplers-Defaults.yaml index 2189753be0b7..5df7da87aafd 100644 --- a/llvm/test/ObjectYAML/DXContainer/RootSignature-StaticSamplers-Defaults.yaml +++ b/llvm/test/ObjectYAML/DXContainer/RootSignature-StaticSamplers-Defaults.yaml @@ -15,7 +15,7 @@ Parts: RootSignature: Version: 2 NumRootParameters: 0 - RootParametersOffset: 0 + RootParametersOffset: 24 NumStaticSamplers: 1 StaticSamplersOffset: 24 Parameters: [] @@ -31,7 +31,7 @@ Parts: #CHECK-NEXT: RootSignature: #CHECK-NEXT: Version: 2 #CHECK-NEXT: NumRootParameters: 0 -#CHECK-NEXT: RootParametersOffset: 0 +#CHECK-NEXT: RootParametersOffset: 24 #CHECK-NEXT: NumStaticSamplers: 1 #CHECK-NEXT: StaticSamplersOffset: 24 #CHECK-NEXT: Parameters: [] diff --git a/llvm/test/ObjectYAML/DXContainer/RootSignature-StaticSamplers.yaml b/llvm/test/ObjectYAML/DXContainer/RootSignature-StaticSamplers.yaml index 8f8083e09125..82d9a4ffdb4f 100644 --- a/llvm/test/ObjectYAML/DXContainer/RootSignature-StaticSamplers.yaml +++ b/llvm/test/ObjectYAML/DXContainer/RootSignature-StaticSamplers.yaml @@ -15,7 +15,7 @@ Parts: RootSignature: Version: 2 NumRootParameters: 0 - RootParametersOffset: 0 + RootParametersOffset: 24 NumStaticSamplers: 1 StaticSamplersOffset: 24 Parameters: [] @@ -41,7 +41,7 @@ Parts: #CHECK-NEXT: RootSignature: #CHECK-NEXT: Version: 2 #CHECK-NEXT: NumRootParameters: 0 -#CHECK-NEXT: RootParametersOffset: 0 +#CHECK-NEXT: RootParametersOffset: 24 #CHECK-NEXT: NumStaticSamplers: 1 #CHECK-NEXT: StaticSamplersOffset: 24 #CHECK-NEXT: Parameters: [] |