encounter/dawn-cmake
1
0
Fork 0
mirror of https://github.com/encounter/dawn-cmake.git synced 2025-12-13 07:06:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

transform/shader_io: Generate a wrapper function

Browse Source 
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>
This commit is contained in:
James Price
2021-08-04 22:15:28 +00:00
committed by Tint LUCI CQ
parent 3e92e9f8ba
commit a5d73ce965
3866 changed files with 49323 additions and 26508 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
test/vk-gl-cts/graphicsfuzz/increment-value-in-nested-for-loop/0.spvasm.expected.msl
View File

@@ -7,11 +7,11 @@ struct buf0 {
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_6, thread float4* const tint_symbol_5, thread float4* const tint_symbol_6) {
void main_1(constant buf0& x_6, thread float4* const tint_symbol_3, thread float4* const tint_symbol_4) {
while (true) {
bool x_45 = false;
int x_48 = 0;
@@ -51,7 +51,7 @@ void main_1(constant buf0& x_6, thread float4* const tint_symbol_5, thread float
x_48 = x_48_phi;
int const x_50 = x_50_phi;
int const x_52 = x_52_phi;
float const x_55 = (*(tint_symbol_5)).y;
float const x_55 = (*(tint_symbol_3)).y;
x_111_phi = x_48;
x_112_phi = x_45;
if ((x_52 < select(100, 10, (x_55 > -1.0f)))) {
@@ -80,7 +80,7 @@ void main_1(constant buf0& x_6, thread float4* const tint_symbol_5, thread float
int x_86_phi = 0;
int x_97_phi = 0;
bool x_98_phi = false;
float const x_77 = (*(tint_symbol_5)).x;
float const x_77 = (*(tint_symbol_3)).x;
x_78 = (x_77 < -1.0f);
if (!((x_40 < 0.0f))) {
if (x_78) {
@@ -134,7 +134,7 @@ void main_1(constant buf0& x_6, thread float4* const tint_symbol_5, thread float
}
{
float const x_105 = float(x_52);
*(tint_symbol_6) = float4(x_105, x_105, x_105, x_105);
*(tint_symbol_4) = float4(x_105, x_105, x_105, x_105);
}
}
x_51_phi = x_66;
@@ -196,7 +196,7 @@ void main_1(constant buf0& x_6, thread float4* const tint_symbol_5, thread float
int x_143_phi = 0;
int x_154_phi = 0;
bool x_155_phi = false;
float const x_134 = (*(tint_symbol_5)).x;
float const x_134 = (*(tint_symbol_3)).x;
x_135 = (x_134 < -1.0f);
if (!((x_40 < 0.0f))) {
if (x_135) {
@@ -256,22 +256,28 @@ void main_1(constant buf0& x_6, thread float4* const tint_symbol_5, thread float
}
int const x_161 = x_161_phi;
if ((x_161 == 4)) {
*(tint_symbol_6) = float4(1.0f, 0.0f, 0.0f, 1.0f);
*(tint_symbol_4) = float4(1.0f, 0.0f, 0.0f, 1.0f);
} else {
*(tint_symbol_6) = float4(0.0f, 0.0f, 0.0f, 0.0f);
*(tint_symbol_4) = float4(0.0f, 0.0f, 0.0f, 0.0f);
}
break;
}
return;
}
fragment tint_symbol_2 tint_symbol(float4 gl_FragCoord_param [[position]], constant buf0& x_6 [[buffer(0)]]) {
thread float4 tint_symbol_7 = 0.0f;
thread float4 tint_symbol_8 = 0.0f;
tint_symbol_7 = gl_FragCoord_param;
main_1(x_6, &(tint_symbol_7), &(tint_symbol_8));
main_out const tint_symbol_3 = {.x_GLF_color_1=tint_symbol_8};
tint_symbol_2 const tint_symbol_4 = {.x_GLF_color_1=tint_symbol_3.x_GLF_color_1};
return tint_symbol_4;
main_out tint_symbol_inner(constant buf0& x_6, float4 gl_FragCoord_param, thread float4* const tint_symbol_5, thread float4* const tint_symbol_6) {
*(tint_symbol_5) = gl_FragCoord_param;
main_1(x_6, tint_symbol_5, tint_symbol_6);
main_out const tint_symbol_2 = {.x_GLF_color_1=*(tint_symbol_6)};
return tint_symbol_2;
}
fragment tint_symbol_1 tint_symbol(float4 gl_FragCoord_param [[position]], constant buf0& x_6 [[buffer(0)]]) {
thread float4 tint_symbol_7 = 0.0f;
thread float4 tint_symbol_8 = 0.0f;
main_out const inner_result = tint_symbol_inner(x_6, gl_FragCoord_param, &(tint_symbol_7), &(tint_symbol_8));
tint_symbol_1 wrapper_result = {};
wrapper_result.x_GLF_color_1 = inner_result.x_GLF_color_1;
return wrapper_result;
}

38
test/vk-gl-cts/graphicsfuzz/increment-value-in-nested-for-loop/0.wgsl.expected.msl
View File

@@ -7,11 +7,11 @@ struct buf0 {
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_6, thread float4* const tint_symbol_5, thread float4* const tint_symbol_6) {
void main_1(constant buf0& x_6, thread float4* const tint_symbol_3, thread float4* const tint_symbol_4) {
while (true) {
bool x_45 = false;
int x_48 = 0;
@@ -51,7 +51,7 @@ void main_1(constant buf0& x_6, thread float4* const tint_symbol_5, thread float
x_48 = x_48_phi;
int const x_50 = x_50_phi;
int const x_52 = x_52_phi;
float const x_55 = (*(tint_symbol_5)).y;
float const x_55 = (*(tint_symbol_3)).y;
x_111_phi = x_48;
x_112_phi = x_45;
if ((x_52 < select(100, 10, (x_55 > -1.0f)))) {
@@ -80,7 +80,7 @@ void main_1(constant buf0& x_6, thread float4* const tint_symbol_5, thread float
int x_86_phi = 0;
int x_97_phi = 0;
bool x_98_phi = false;
float const x_77 = (*(tint_symbol_5)).x;
float const x_77 = (*(tint_symbol_3)).x;
x_78 = (x_77 < -1.0f);
if (!((x_40 < 0.0f))) {
if (x_78) {
@@ -134,7 +134,7 @@ void main_1(constant buf0& x_6, thread float4* const tint_symbol_5, thread float
}
{
float const x_105 = float(x_52);
*(tint_symbol_6) = float4(x_105, x_105, x_105, x_105);
*(tint_symbol_4) = float4(x_105, x_105, x_105, x_105);
}
}
x_51_phi = x_66;
@@ -196,7 +196,7 @@ void main_1(constant buf0& x_6, thread float4* const tint_symbol_5, thread float
int x_143_phi = 0;
int x_154_phi = 0;
bool x_155_phi = false;
float const x_134 = (*(tint_symbol_5)).x;
float const x_134 = (*(tint_symbol_3)).x;
x_135 = (x_134 < -1.0f);
if (!((x_40 < 0.0f))) {
if (x_135) {
@@ -256,22 +256,28 @@ void main_1(constant buf0& x_6, thread float4* const tint_symbol_5, thread float
}
int const x_161 = x_161_phi;
if ((x_161 == 4)) {
*(tint_symbol_6) = float4(1.0f, 0.0f, 0.0f, 1.0f);
*(tint_symbol_4) = float4(1.0f, 0.0f, 0.0f, 1.0f);
} else {
*(tint_symbol_6) = float4(0.0f, 0.0f, 0.0f, 0.0f);
*(tint_symbol_4) = float4(0.0f, 0.0f, 0.0f, 0.0f);
}
break;
}
return;
}
fragment tint_symbol_2 tint_symbol(float4 gl_FragCoord_param [[position]], constant buf0& x_6 [[buffer(0)]]) {
thread float4 tint_symbol_7 = 0.0f;
thread float4 tint_symbol_8 = 0.0f;
tint_symbol_7 = gl_FragCoord_param;
main_1(x_6, &(tint_symbol_7), &(tint_symbol_8));
main_out const tint_symbol_3 = {.x_GLF_color_1=tint_symbol_8};
tint_symbol_2 const tint_symbol_4 = {.x_GLF_color_1=tint_symbol_3.x_GLF_color_1};
return tint_symbol_4;
main_out tint_symbol_inner(constant buf0& x_6, float4 gl_FragCoord_param, thread float4* const tint_symbol_5, thread float4* const tint_symbol_6) {
*(tint_symbol_5) = gl_FragCoord_param;
main_1(x_6, tint_symbol_5, tint_symbol_6);
main_out const tint_symbol_2 = {.x_GLF_color_1=*(tint_symbol_6)};
return tint_symbol_2;
}
fragment tint_symbol_1 tint_symbol(float4 gl_FragCoord_param [[position]], constant buf0& x_6 [[buffer(0)]]) {
thread float4 tint_symbol_7 = 0.0f;
thread float4 tint_symbol_8 = 0.0f;
main_out const inner_result = tint_symbol_inner(x_6, gl_FragCoord_param, &(tint_symbol_7), &(tint_symbol_8));
tint_symbol_1 wrapper_result = {};
wrapper_result.x_GLF_color_1 = inner_result.x_GLF_color_1;
return wrapper_result;
}