transform/shader_io: Generate a wrapper function

This is a major reworking of this transform. The old transform code
was getting unwieldy, with part of the complication coming from the
handling of multiple return statements. By generating a wrapper
function instead, we can avoid a lot of this complexity.

The original entry point function is stripped of all shader IO
attributes (as well as `stage` and `workgroup_size`), but the body is
left unmodified. A new entry point wrapper function is introduced
which calls the original function, packing/unpacking the shader inputs
as necessary, and propagates the result to the corresponding shader
outputs.

The new code has been refactored to use a state object with the
different parts of the transform split into separate functions, which
makes it much more manageable.

Fixed: tint:1076
Bug: tint:920
Change-Id: I3490a0ea7a3509a4e198ce730e476516649d8d96
Reviewed-on: https://dawn-review.googlesource.com/c/tint/+/60521
Auto-Submit: James Price <jrprice@google.com>
Kokoro: Kokoro <noreply+kokoro@google.com>
Commit-Queue: James Price <jrprice@google.com>
Reviewed-by: Ben Clayton <bclayton@google.com>

test/vk-gl-cts/graphicsfuzz/cov-array-accesses-clamp/0-opt.spvasm.expected.hlsl

@@ -15,8 +15,8 @@ void main_1() {
   const int x_40 = asint(x_7[1].x);
   const int x_42 = asint(x_7[1].x);
   const int x_44 = asint(x_7[1].x);
-  const int tint_symbol_6[3] = {x_40, x_42, x_44};
-  arr = tint_symbol_6;
+  const int tint_symbol_5[3] = {x_40, x_42, x_44};
+  arr = tint_symbol_5;
   const uint scalar_offset = ((16u * uint(0))) / 4;
   const int x_47 = asint(x_7[scalar_offset / 4][scalar_offset % 4]);
   const int x_49 = arr[x_47];
@@ -58,11 +58,16 @@ struct tint_symbol_2 {
   float4 x_GLF_color_1 : SV_Target0;
 };
 
-tint_symbol_2 main(tint_symbol_1 tint_symbol) {
-  const float4 gl_FragCoord_param = tint_symbol.gl_FragCoord_param;
+main_out main_inner(float4 gl_FragCoord_param) {
   gl_FragCoord = gl_FragCoord_param;
   main_1();
-  const main_out tint_symbol_3 = {x_GLF_color};
-  const tint_symbol_2 tint_symbol_7 = {tint_symbol_3.x_GLF_color_1};
-  return tint_symbol_7;
+  const main_out tint_symbol_6 = {x_GLF_color};
+  return tint_symbol_6;
+}
+
+tint_symbol_2 main(tint_symbol_1 tint_symbol) {
+  const main_out inner_result = main_inner(tint_symbol.gl_FragCoord_param);
+  tint_symbol_2 wrapper_result = (tint_symbol_2)0;
+  wrapper_result.x_GLF_color_1 = inner_result.x_GLF_color_1;
+  return wrapper_result;
 }

test/vk-gl-cts/graphicsfuzz/cov-array-accesses-clamp/0-opt.spvasm.expected.msl

@@ -27,11 +27,11 @@ struct tint_array_wrapper_2 {
 struct main_out {
   float4 x_GLF_color_1;
 };
-struct tint_symbol_2 {
+struct tint_symbol_1 {
   float4 x_GLF_color_1 [[color(0)]];
 };
 
-void main_1(constant buf0& x_7, constant buf1& x_11, thread float4* const tint_symbol_6, thread float4* const tint_symbol_7) {
+void main_1(constant buf0& x_7, constant buf1& x_11, thread float4* const tint_symbol_4, thread float4* const tint_symbol_5) {
   tint_array_wrapper_2 arr = {};
   int a = 0;
   int b = 0;
@@ -39,14 +39,14 @@ void main_1(constant buf0& x_7, constant buf1& x_11, thread float4* const tint_s
   int const x_40 = x_7.x_GLF_uniform_int_values.arr[1].el;
   int const x_42 = x_7.x_GLF_uniform_int_values.arr[1].el;
   int const x_44 = x_7.x_GLF_uniform_int_values.arr[1].el;
-  tint_array_wrapper_2 const tint_symbol_4 = {.arr={x_40, x_42, x_44}};
-  arr = tint_symbol_4;
+  tint_array_wrapper_2 const tint_symbol_2 = {.arr={x_40, x_42, x_44}};
+  arr = tint_symbol_2;
   int const x_47 = x_7.x_GLF_uniform_int_values.arr[0].el;
   int const x_49 = arr.arr[x_47];
   a = x_49;
   int const x_50 = a;
   b = as_type<int>((as_type<uint>(x_50) - as_type<uint>(1)));
-  float const x_53 = (*(tint_symbol_6)).x;
+  float const x_53 = (*(tint_symbol_4)).x;
   float const x_55 = x_11.x_GLF_uniform_float_values.arr[0].el;
   if ((x_53 < x_55)) {
     int const x_59 = b;
@@ -67,17 +67,23 @@ void main_1(constant buf0& x_7, constant buf1& x_11, thread float4* const tint_s
   int const x_84 = arr.arr[x_82];
   int const x_87 = x_7.x_GLF_uniform_int_values.arr[2].el;
   int const x_89 = arr.arr[x_87];
-  *(tint_symbol_7) = float4(float(x_74), float(x_79), float(x_84), float(x_89));
+  *(tint_symbol_5) = float4(float(x_74), float(x_79), float(x_84), float(x_89));
   return;
 }
 
-fragment tint_symbol_2 tint_symbol(float4 gl_FragCoord_param [[position]], constant buf0& x_7 [[buffer(0)]], constant buf1& x_11 [[buffer(1)]]) {
-  thread float4 tint_symbol_8 = 0.0f;
-  thread float4 tint_symbol_9 = 0.0f;
-  tint_symbol_8 = gl_FragCoord_param;
-  main_1(x_7, x_11, &(tint_symbol_8), &(tint_symbol_9));
-  main_out const tint_symbol_3 = {.x_GLF_color_1=tint_symbol_9};
-  tint_symbol_2 const tint_symbol_5 = {.x_GLF_color_1=tint_symbol_3.x_GLF_color_1};
-  return tint_symbol_5;
+main_out tint_symbol_inner(constant buf0& x_7, constant buf1& x_11, float4 gl_FragCoord_param, thread float4* const tint_symbol_6, thread float4* const tint_symbol_7) {
+  *(tint_symbol_6) = gl_FragCoord_param;
+  main_1(x_7, x_11, tint_symbol_6, tint_symbol_7);
+  main_out const tint_symbol_3 = {.x_GLF_color_1=*(tint_symbol_7)};
+  return tint_symbol_3;
+}
+
+fragment tint_symbol_1 tint_symbol(float4 gl_FragCoord_param [[position]], constant buf0& x_7 [[buffer(0)]], constant buf1& x_11 [[buffer(1)]]) {
+  thread float4 tint_symbol_8 = 0.0f;
+  thread float4 tint_symbol_9 = 0.0f;
+  main_out const inner_result = tint_symbol_inner(x_7, x_11, gl_FragCoord_param, &(tint_symbol_8), &(tint_symbol_9));
+  tint_symbol_1 wrapper_result = {};
+  wrapper_result.x_GLF_color_1 = inner_result.x_GLF_color_1;
+  return wrapper_result;
 }
 

test/vk-gl-cts/graphicsfuzz/cov-array-accesses-clamp/0-opt.wgsl.expected.hlsl

@@ -15,8 +15,8 @@ void main_1() {
   const int x_40 = asint(x_7[1].x);
   const int x_42 = asint(x_7[1].x);
   const int x_44 = asint(x_7[1].x);
-  const int tint_symbol_6[3] = {x_40, x_42, x_44};
-  arr = tint_symbol_6;
+  const int tint_symbol_5[3] = {x_40, x_42, x_44};
+  arr = tint_symbol_5;
   const uint scalar_offset = ((16u * uint(0))) / 4;
   const int x_47 = asint(x_7[scalar_offset / 4][scalar_offset % 4]);
   const int x_49 = arr[x_47];
@@ -58,11 +58,16 @@ struct tint_symbol_2 {
   float4 x_GLF_color_1 : SV_Target0;
 };
 
-tint_symbol_2 main(tint_symbol_1 tint_symbol) {
-  const float4 gl_FragCoord_param = tint_symbol.gl_FragCoord_param;
+main_out main_inner(float4 gl_FragCoord_param) {
   gl_FragCoord = gl_FragCoord_param;
   main_1();
-  const main_out tint_symbol_3 = {x_GLF_color};
-  const tint_symbol_2 tint_symbol_7 = {tint_symbol_3.x_GLF_color_1};
-  return tint_symbol_7;
+  const main_out tint_symbol_6 = {x_GLF_color};
+  return tint_symbol_6;
+}
+
+tint_symbol_2 main(tint_symbol_1 tint_symbol) {
+  const main_out inner_result = main_inner(tint_symbol.gl_FragCoord_param);
+  tint_symbol_2 wrapper_result = (tint_symbol_2)0;
+  wrapper_result.x_GLF_color_1 = inner_result.x_GLF_color_1;
+  return wrapper_result;
 }

test/vk-gl-cts/graphicsfuzz/cov-array-accesses-clamp/0-opt.wgsl.expected.msl

@@ -27,11 +27,11 @@ struct tint_array_wrapper_2 {
 struct main_out {
   float4 x_GLF_color_1;
 };
-struct tint_symbol_2 {
+struct tint_symbol_1 {
   float4 x_GLF_color_1 [[color(0)]];
 };
 
-void main_1(constant buf0& x_7, constant buf1& x_11, thread float4* const tint_symbol_6, thread float4* const tint_symbol_7) {
+void main_1(constant buf0& x_7, constant buf1& x_11, thread float4* const tint_symbol_4, thread float4* const tint_symbol_5) {
   tint_array_wrapper_2 arr = {};
   int a = 0;
   int b = 0;
@@ -39,14 +39,14 @@ void main_1(constant buf0& x_7, constant buf1& x_11, thread float4* const tint_s
   int const x_40 = x_7.x_GLF_uniform_int_values.arr[1].el;
   int const x_42 = x_7.x_GLF_uniform_int_values.arr[1].el;
   int const x_44 = x_7.x_GLF_uniform_int_values.arr[1].el;
-  tint_array_wrapper_2 const tint_symbol_4 = {.arr={x_40, x_42, x_44}};
-  arr = tint_symbol_4;
+  tint_array_wrapper_2 const tint_symbol_2 = {.arr={x_40, x_42, x_44}};
+  arr = tint_symbol_2;
   int const x_47 = x_7.x_GLF_uniform_int_values.arr[0].el;
   int const x_49 = arr.arr[x_47];
   a = x_49;
   int const x_50 = a;
   b = as_type<int>((as_type<uint>(x_50) - as_type<uint>(1)));
-  float const x_53 = (*(tint_symbol_6)).x;
+  float const x_53 = (*(tint_symbol_4)).x;
   float const x_55 = x_11.x_GLF_uniform_float_values.arr[0].el;
   if ((x_53 < x_55)) {
     int const x_59 = b;
@@ -67,17 +67,23 @@ void main_1(constant buf0& x_7, constant buf1& x_11, thread float4* const tint_s
   int const x_84 = arr.arr[x_82];
   int const x_87 = x_7.x_GLF_uniform_int_values.arr[2].el;
   int const x_89 = arr.arr[x_87];
-  *(tint_symbol_7) = float4(float(x_74), float(x_79), float(x_84), float(x_89));
+  *(tint_symbol_5) = float4(float(x_74), float(x_79), float(x_84), float(x_89));
   return;
 }
 
-fragment tint_symbol_2 tint_symbol(float4 gl_FragCoord_param [[position]], constant buf0& x_7 [[buffer(0)]], constant buf1& x_11 [[buffer(1)]]) {
-  thread float4 tint_symbol_8 = 0.0f;
-  thread float4 tint_symbol_9 = 0.0f;
-  tint_symbol_8 = gl_FragCoord_param;
-  main_1(x_7, x_11, &(tint_symbol_8), &(tint_symbol_9));
-  main_out const tint_symbol_3 = {.x_GLF_color_1=tint_symbol_9};
-  tint_symbol_2 const tint_symbol_5 = {.x_GLF_color_1=tint_symbol_3.x_GLF_color_1};
-  return tint_symbol_5;
+main_out tint_symbol_inner(constant buf0& x_7, constant buf1& x_11, float4 gl_FragCoord_param, thread float4* const tint_symbol_6, thread float4* const tint_symbol_7) {
+  *(tint_symbol_6) = gl_FragCoord_param;
+  main_1(x_7, x_11, tint_symbol_6, tint_symbol_7);
+  main_out const tint_symbol_3 = {.x_GLF_color_1=*(tint_symbol_7)};
+  return tint_symbol_3;
+}
+
+fragment tint_symbol_1 tint_symbol(float4 gl_FragCoord_param [[position]], constant buf0& x_7 [[buffer(0)]], constant buf1& x_11 [[buffer(1)]]) {
+  thread float4 tint_symbol_8 = 0.0f;
+  thread float4 tint_symbol_9 = 0.0f;
+  main_out const inner_result = tint_symbol_inner(x_7, x_11, gl_FragCoord_param, &(tint_symbol_8), &(tint_symbol_9));
+  tint_symbol_1 wrapper_result = {};
+  wrapper_result.x_GLF_color_1 = inner_result.x_GLF_color_1;
+  return wrapper_result;
 }