encounter/dawn-cmake
1
0
Fork 0
mirror of https://github.com/encounter/dawn-cmake.git synced 2025-05-15 11:51:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

test: Update expected test output

Browse Source 
This new test was added around the same time as the entry point IO
rework, so the (now incorrect) test output made it past the bots.

Change-Id: I89fc4041b9cd00cd363ba61d07371554263eca96
Reviewed-on: https://dawn-review.googlesource.com/c/tint/+/61460
Auto-Submit: James Price <jrprice@google.com>
Reviewed-by: Ryan Harrison <rharrison@chromium.org>
Kokoro: Kokoro <noreply+kokoro@google.com>
Commit-Queue: James Price <jrprice@google.com>
This commit is contained in:
James Price 2021-08-10 16:16:55 +00:00 committed by Tint LUCI CQ
parent 32e905f4cb
commit 34f7eedf74
3 changed files with 107 additions and 95 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
test/bug/tint/1088.spvasm.expected.hlsl
View File

@ -7,7 +7,7 @@ static float2 uv = float2(0.0f, 0.0f);
static float3 normal = float3(0.0f, 0.0f, 0.0f); static float3 normal = float3(0.0f, 0.0f, 0.0f);
static float4 gl_Position = float4(0.0f, 0.0f, 0.0f, 0.0f); static float4 gl_Position = float4(0.0f, 0.0f, 0.0f, 0.0f);
float4x4 tint_symbol_5(uint4 buffer[17], uint offset) { float4x4 tint_symbol_4(uint4 buffer[17], uint offset) {
const uint scalar_offset = ((offset + 0u)) / 4; const uint scalar_offset = ((offset + 0u)) / 4;
const uint scalar_offset_1 = ((offset + 16u)) / 4; const uint scalar_offset_1 = ((offset + 16u)) / 4;
const uint scalar_offset_2 = ((offset + 32u)) / 4; const uint scalar_offset_2 = ((offset + 32u)) / 4;
@ -31,7 +31,7 @@ void main_1() {
const float x_55 = p.y; const float x_55 = p.y;
const float x_57 = asfloat(x_14[4].x); const float x_57 = asfloat(x_14[4].x);
p.y = (x_55 + sin((x_57 + 4.0f))); p.y = (x_55 + sin((x_57 + 4.0f)));
const float4x4 x_69 = tint_symbol_5(x_14, 0u); const float4x4 x_69 = tint_symbol_4(x_14, 0u);
const float3 x_70 = p; const float3 x_70 = p;
gl_Position = mul(float4(x_70.x, x_70.y, x_70.z, 1.0f), x_69); gl_Position = mul(float4(x_70.x, x_70.y, x_70.z, 1.0f), x_69);
vUV = uv; vUV = uv;
@ -54,15 +54,19 @@ struct tint_symbol_2 {
float4 gl_Position : SV_Position; float4 gl_Position : SV_Position;
}; };
tint_symbol_2 main(tint_symbol_1 tint_symbol) { main_out main_inner(float3 position_param, float2 uv_param, float3 normal_param) {
const float3 position_param = tint_symbol.position_param;
const float2 uv_param = tint_symbol.uv_param;
const float3 normal_param = tint_symbol.normal_param;
position = position_param; position = position_param;
uv = uv_param; uv = uv_param;
normal = normal_param; normal = normal_param;
main_1(); main_1();
const main_out tint_symbol_3 = {gl_Position, vUV}; const main_out tint_symbol_6 = {gl_Position, vUV};
const tint_symbol_2 tint_symbol_7 = {tint_symbol_3.vUV_1, tint_symbol_3.gl_Position}; return tint_symbol_6;
return tint_symbol_7; }
tint_symbol_2 main(tint_symbol_1 tint_symbol) {
const main_out inner_result = main_inner(tint_symbol.position_param, tint_symbol.uv_param, tint_symbol.normal_param);
tint_symbol_2 wrapper_result = (tint_symbol_2)0;
wrapper_result.gl_Position = inner_result.gl_Position;
wrapper_result.vUV_1 = inner_result.vUV_1;
return wrapper_result;
} }

52
test/bug/tint/1088.spvasm.expected.msl
View File

@ -32,16 +32,16 @@ struct tint_symbol_3 {
float4 gl_Position [[position]]; float4 gl_Position [[position]];
}; };
void main_1(constant LeftOver& x_14, thread float3* const tint_symbol_6, thread float4* const tint_symbol_7, thread float2* const tint_symbol_8, thread float2* const tint_symbol_9) { void main_1(constant LeftOver& x_14, thread float3* const tint_symbol_5, thread float4* const tint_symbol_6, thread float2* const tint_symbol_7, thread float2* const tint_symbol_8) {
float4 q = 0.0f; float4 q = 0.0f;
float3 p = 0.0f; float3 p = 0.0f;
float3 const x_13 = *(tint_symbol_6); float3 const x_13 = *(tint_symbol_5);
q = float4(x_13.x, x_13.y, x_13.z, 1.0f); q = float4(x_13.x, x_13.y, x_13.z, 1.0f);
float4 const x_21 = q; float4 const x_21 = q;
p = float3(x_21.x, x_21.y, x_21.z); p = float3(x_21.x, x_21.y, x_21.z);
float const x_27 = p.x; float const x_27 = p.x;
float const x_41 = x_14.test.arr[0].el; float const x_41 = x_14.test.arr[0].el;
float const x_45 = (*(tint_symbol_6)).y; float const x_45 = (*(tint_symbol_5)).y;
float const x_49 = x_14.time; float const x_49 = x_14.time;
p.x = (x_27 + sin(((x_41 * x_45) + x_49))); p.x = (x_27 + sin(((x_41 * x_45) + x_49)));
float const x_55 = p.y; float const x_55 = p.y;
@ -49,29 +49,33 @@ void main_1(constant LeftOver& x_14, thread float3* const tint_symbol_6, thread
p.y = (x_55 + sin((x_57 + 4.0f))); p.y = (x_55 + sin((x_57 + 4.0f)));
float4x4 const x_69 = x_14.worldViewProjection; float4x4 const x_69 = x_14.worldViewProjection;
float3 const x_70 = p; float3 const x_70 = p;
*(tint_symbol_7) = (x_69 * float4(x_70.x, x_70.y, x_70.z, 1.0f)); *(tint_symbol_6) = (x_69 * float4(x_70.x, x_70.y, x_70.z, 1.0f));
float2 const x_83 = *(tint_symbol_8); float2 const x_83 = *(tint_symbol_7);
*(tint_symbol_9) = x_83; *(tint_symbol_8) = x_83;
float const x_87 = (*(tint_symbol_7)).y; float const x_87 = (*(tint_symbol_6)).y;
(*(tint_symbol_7)).y = (x_87 * -1.0f); (*(tint_symbol_6)).y = (x_87 * -1.0f);
return; return;
} }
vertex tint_symbol_3 tint_symbol(tint_symbol_2 tint_symbol_1 [[stage_in]], constant LeftOver& x_14 [[buffer(2)]]) { main_out tint_symbol_inner(constant LeftOver& x_14, float3 position_param, float2 uv_param, float3 normal_param, thread float3* const tint_symbol_9, thread float2* const tint_symbol_10, thread float3* const tint_symbol_11, thread float4* const tint_symbol_12, thread float2* const tint_symbol_13) {
thread float3 tint_symbol_10 = 0.0f; *(tint_symbol_9) = position_param;
thread float2 tint_symbol_11 = 0.0f; *(tint_symbol_10) = uv_param;
thread float3 tint_symbol_12 = 0.0f; *(tint_symbol_11) = normal_param;
thread float4 tint_symbol_13 = 0.0f; main_1(x_14, tint_symbol_9, tint_symbol_12, tint_symbol_10, tint_symbol_13);
thread float2 tint_symbol_14 = 0.0f; main_out const tint_symbol_4 = {.gl_Position=*(tint_symbol_12), .vUV_1=*(tint_symbol_13)};
float3 const position_param = tint_symbol_1.position_param; return tint_symbol_4;
float2 const uv_param = tint_symbol_1.uv_param; }
float3 const normal_param = tint_symbol_1.normal_param;
tint_symbol_10 = position_param; vertex tint_symbol_3 tint_symbol(tint_symbol_2 tint_symbol_1 [[stage_in]], constant LeftOver& x_14 [[buffer(2)]]) {
tint_symbol_11 = uv_param; thread float3 tint_symbol_14 = 0.0f;
tint_symbol_12 = normal_param; thread float2 tint_symbol_15 = 0.0f;
main_1(x_14, &(tint_symbol_10), &(tint_symbol_13), &(tint_symbol_11), &(tint_symbol_14)); thread float3 tint_symbol_16 = 0.0f;
main_out const tint_symbol_4 = {.gl_Position=tint_symbol_13, .vUV_1=tint_symbol_14}; thread float4 tint_symbol_17 = 0.0f;
tint_symbol_3 const tint_symbol_5 = {.vUV_1=tint_symbol_4.vUV_1, .gl_Position=tint_symbol_4.gl_Position}; thread float2 tint_symbol_18 = 0.0f;
return tint_symbol_5; main_out const inner_result = tint_symbol_inner(x_14, tint_symbol_1.position_param, tint_symbol_1.uv_param, tint_symbol_1.normal_param, &(tint_symbol_14), &(tint_symbol_15), &(tint_symbol_16), &(tint_symbol_17), &(tint_symbol_18));
tint_symbol_3 wrapper_result = {};
wrapper_result.gl_Position = inner_result.gl_Position;
wrapper_result.vUV_1 = inner_result.vUV_1;
return wrapper_result;
} }

128
test/bug/tint/1088.spvasm.expected.spvasm
View File

@ -1,13 +1,18 @@
; SPIR-V ; SPIR-V
; Version: 1.3 ; Version: 1.3
; Generator: Google Tint Compiler; 0 ; Generator: Google Tint Compiler; 0
; Bound: 119 ; Bound: 121
; Schema: 0 ; Schema: 0
OpCapability Shader OpCapability Shader
%74 = OpExtInstImport "GLSL.std.450" %74 = OpExtInstImport "GLSL.std.450"
OpMemoryModel Logical GLSL450 OpMemoryModel Logical GLSL450
OpEntryPoint Vertex %main "main" %tint_pointsize %tint_symbol %tint_symbol_1 %tint_symbol_2 %tint_symbol_4 %tint_symbol_5 OpEntryPoint Vertex %main "main" %position_param_1 %uv_param_1 %normal_param_1 %gl_Position_1 %vUV_1_1 %vertex_point_size
OpName %tint_pointsize "tint_pointsize" OpName %position_param_1 "position_param_1"
OpName %uv_param_1 "uv_param_1"
OpName %normal_param_1 "normal_param_1"
OpName %gl_Position_1 "gl_Position_1"
OpName %vUV_1_1 "vUV_1_1"
OpName %vertex_point_size "vertex_point_size"
OpName %position "position" OpName %position "position"
OpName %LeftOver "LeftOver" OpName %LeftOver "LeftOver"
OpMemberName %LeftOver 0 "worldViewProjection" OpMemberName %LeftOver 0 "worldViewProjection"
@ -19,21 +24,23 @@
OpName %uv "uv" OpName %uv "uv"
OpName %normal "normal" OpName %normal "normal"
OpName %gl_Position "gl_Position" OpName %gl_Position "gl_Position"
OpName %tint_symbol "tint_symbol"
OpName %tint_symbol_1 "tint_symbol_1"
OpName %tint_symbol_2 "tint_symbol_2"
OpName %tint_symbol_4 "tint_symbol_4"
OpName %tint_symbol_5 "tint_symbol_5"
OpName %main_1 "main_1" OpName %main_1 "main_1"
OpName %q "q" OpName %q "q"
OpName %p "p" OpName %p "p"
OpName %main_out "main_out" OpName %main_out "main_out"
OpMemberName %main_out 0 "gl_Position" OpMemberName %main_out 0 "gl_Position"
OpMemberName %main_out 1 "vUV_1" OpMemberName %main_out 1 "vUV_1"
OpName %tint_symbol_6 "tint_symbol_6" OpName %main_inner "main_inner"
OpName %tint_symbol_3 "tint_symbol_3" OpName %position_param "position_param"
OpName %uv_param "uv_param"
OpName %normal_param "normal_param"
OpName %main "main" OpName %main "main"
OpDecorate %tint_pointsize BuiltIn PointSize OpDecorate %position_param_1 Location 0
OpDecorate %uv_param_1 Location 2
OpDecorate %normal_param_1 Location 1
OpDecorate %gl_Position_1 BuiltIn Position
OpDecorate %vUV_1_1 Location 0
OpDecorate %vertex_point_size BuiltIn PointSize
OpDecorate %LeftOver Block OpDecorate %LeftOver Block
OpMemberDecorate %LeftOver 0 Offset 0 OpMemberDecorate %LeftOver 0 Offset 0
OpMemberDecorate %LeftOver 0 ColMajor OpMemberDecorate %LeftOver 0 ColMajor
@ -48,22 +55,29 @@
OpDecorate %x_14 NonWritable OpDecorate %x_14 NonWritable
OpDecorate %x_14 DescriptorSet 2 OpDecorate %x_14 DescriptorSet 2
OpDecorate %x_14 Binding 2 OpDecorate %x_14 Binding 2
OpDecorate %tint_symbol Location 0
OpDecorate %tint_symbol_1 Location 2
OpDecorate %tint_symbol_2 Location 1
OpDecorate %tint_symbol_4 BuiltIn Position
OpDecorate %tint_symbol_5 Location 0
OpMemberDecorate %main_out 0 Offset 0 OpMemberDecorate %main_out 0 Offset 0
OpMemberDecorate %main_out 1 Offset 16 OpMemberDecorate %main_out 1 Offset 16
%float = OpTypeFloat 32 %float = OpTypeFloat 32
%_ptr_Output_float = OpTypePointer Output %float
%4 = OpConstantNull %float
%tint_pointsize = OpVariable %_ptr_Output_float Output %4
%v3float = OpTypeVector %float 3 %v3float = OpTypeVector %float 3
%_ptr_Private_v3float = OpTypePointer Private %v3float %_ptr_Input_v3float = OpTypePointer Input %v3float
%8 = OpConstantNull %v3float %position_param_1 = OpVariable %_ptr_Input_v3float Input
%position = OpVariable %_ptr_Private_v3float Private %8 %v2float = OpTypeVector %float 2
%_ptr_Input_v2float = OpTypePointer Input %v2float
%uv_param_1 = OpVariable %_ptr_Input_v2float Input
%normal_param_1 = OpVariable %_ptr_Input_v3float Input
%v4float = OpTypeVector %float 4 %v4float = OpTypeVector %float 4
%_ptr_Output_v4float = OpTypePointer Output %v4float
%12 = OpConstantNull %v4float
%gl_Position_1 = OpVariable %_ptr_Output_v4float Output %12
%_ptr_Output_v2float = OpTypePointer Output %v2float
%15 = OpConstantNull %v2float
%vUV_1_1 = OpVariable %_ptr_Output_v2float Output %15
%_ptr_Output_float = OpTypePointer Output %float
%18 = OpConstantNull %float
%vertex_point_size = OpVariable %_ptr_Output_float Output %18
%_ptr_Private_v3float = OpTypePointer Private %v3float
%21 = OpConstantNull %v3float
%position = OpVariable %_ptr_Private_v3float Private %21
%mat4v4float = OpTypeMatrix %v4float 4 %mat4v4float = OpTypeMatrix %v4float 4
%uint = OpTypeInt 32 0 %uint = OpTypeInt 32 0
%uint_2 = OpConstant %uint 2 %uint_2 = OpConstant %uint 2
@ -73,24 +87,12 @@
%LeftOver = OpTypeStruct %mat4v4float %float %_arr_mat4v4float_uint_2 %_arr_float_uint_4 %LeftOver = OpTypeStruct %mat4v4float %float %_arr_mat4v4float_uint_2 %_arr_float_uint_4
%_ptr_Uniform_LeftOver = OpTypePointer Uniform %LeftOver %_ptr_Uniform_LeftOver = OpTypePointer Uniform %LeftOver
%x_14 = OpVariable %_ptr_Uniform_LeftOver Uniform %x_14 = OpVariable %_ptr_Uniform_LeftOver Uniform
%v2float = OpTypeVector %float 2
%_ptr_Private_v2float = OpTypePointer Private %v2float %_ptr_Private_v2float = OpTypePointer Private %v2float
%22 = OpConstantNull %v2float %vUV = OpVariable %_ptr_Private_v2float Private %15
%vUV = OpVariable %_ptr_Private_v2float Private %22 %uv = OpVariable %_ptr_Private_v2float Private %15
%uv = OpVariable %_ptr_Private_v2float Private %22 %normal = OpVariable %_ptr_Private_v3float Private %21
%normal = OpVariable %_ptr_Private_v3float Private %8
%_ptr_Private_v4float = OpTypePointer Private %v4float %_ptr_Private_v4float = OpTypePointer Private %v4float
%27 = OpConstantNull %v4float %gl_Position = OpVariable %_ptr_Private_v4float Private %12
%gl_Position = OpVariable %_ptr_Private_v4float Private %27
%_ptr_Input_v3float = OpTypePointer Input %v3float
%tint_symbol = OpVariable %_ptr_Input_v3float Input
%_ptr_Input_v2float = OpTypePointer Input %v2float
%tint_symbol_1 = OpVariable %_ptr_Input_v2float Input
%tint_symbol_2 = OpVariable %_ptr_Input_v3float Input
%_ptr_Output_v4float = OpTypePointer Output %v4float
%tint_symbol_4 = OpVariable %_ptr_Output_v4float Output %27
%_ptr_Output_v2float = OpTypePointer Output %v2float
%tint_symbol_5 = OpVariable %_ptr_Output_v2float Output %22
%void = OpTypeVoid %void = OpTypeVoid
%37 = OpTypeFunction %void %37 = OpTypeFunction %void
%_ptr_Function_v4float = OpTypePointer Function %v4float %_ptr_Function_v4float = OpTypePointer Function %v4float
@ -108,11 +110,11 @@
%_ptr_Uniform_mat4v4float = OpTypePointer Uniform %mat4v4float %_ptr_Uniform_mat4v4float = OpTypePointer Uniform %mat4v4float
%float_n1 = OpConstant %float -1 %float_n1 = OpConstant %float -1
%main_out = OpTypeStruct %v4float %v2float %main_out = OpTypeStruct %v4float %v2float
%102 = OpTypeFunction %void %main_out %102 = OpTypeFunction %main_out %v3float %v2float %v3float
%main_1 = OpFunction %void None %37 %main_1 = OpFunction %void None %37
%40 = OpLabel %40 = OpLabel
%q = OpVariable %_ptr_Function_v4float Function %27 %q = OpVariable %_ptr_Function_v4float Function %12
%p = OpVariable %_ptr_Function_v3float Function %8 %p = OpVariable %_ptr_Function_v3float Function %21
%45 = OpLoad %v3float %position %45 = OpLoad %v3float %position
%46 = OpCompositeExtract %float %45 0 %46 = OpCompositeExtract %float %45 0
%47 = OpCompositeExtract %float %45 1 %47 = OpCompositeExtract %float %45 1
@ -166,28 +168,30 @@
OpStore %99 %101 OpStore %99 %101
OpReturn OpReturn
OpFunctionEnd OpFunctionEnd
%tint_symbol_6 = OpFunction %void None %102 %main_inner = OpFunction %main_out None %102
%tint_symbol_3 = OpFunctionParameter %main_out %position_param = OpFunctionParameter %v3float
%106 = OpLabel %uv_param = OpFunctionParameter %v2float
%107 = OpCompositeExtract %v4float %tint_symbol_3 0 %normal_param = OpFunctionParameter %v3float
OpStore %tint_symbol_4 %107 %108 = OpLabel
%108 = OpCompositeExtract %v2float %tint_symbol_3 1 OpStore %position %position_param
OpStore %tint_symbol_5 %108 OpStore %uv %uv_param
OpReturn OpStore %normal %normal_param
%109 = OpFunctionCall %void %main_1
%110 = OpLoad %v4float %gl_Position
%111 = OpLoad %v2float %vUV
%112 = OpCompositeConstruct %main_out %110 %111
OpReturnValue %112
OpFunctionEnd OpFunctionEnd
%main = OpFunction %void None %37 %main = OpFunction %void None %37
%110 = OpLabel %114 = OpLabel
OpStore %tint_pointsize %float_1 %116 = OpLoad %v3float %position_param_1
%111 = OpLoad %v3float %tint_symbol %117 = OpLoad %v2float %uv_param_1
OpStore %position %111 %118 = OpLoad %v3float %normal_param_1
%112 = OpLoad %v2float %tint_symbol_1 %115 = OpFunctionCall %main_out %main_inner %116 %117 %118
OpStore %uv %112 %119 = OpCompositeExtract %v4float %115 0
%113 = OpLoad %v3float %tint_symbol_2 OpStore %gl_Position_1 %119
OpStore %normal %113 %120 = OpCompositeExtract %v2float %115 1
%114 = OpFunctionCall %void %main_1 OpStore %vUV_1_1 %120
%116 = OpLoad %v4float %gl_Position OpStore %vertex_point_size %float_1
%117 = OpLoad %v2float %vUV
%118 = OpCompositeConstruct %main_out %116 %117
%115 = OpFunctionCall %void %tint_symbol_6 %118
OpReturn OpReturn
OpFunctionEnd OpFunctionEnd