encounter/dawn-cmake
1
0
Fork 0
mirror of https://github.com/encounter/dawn-cmake.git synced 2025-12-12 06:45:16 +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

22
test/vk-gl-cts/graphicsfuzz/cov-nir-array-access/0-opt.spvasm.expected.hlsl
View File

@@ -27,8 +27,8 @@ void main_1() {
const int x_80 = asint(x_6[2].x);
const int x_82 = asint(x_6[2].x);
const int x_84 = asint(x_6[2].x);
const int tint_symbol_3[17] = {x_52, x_54, x_56, x_58, x_60, x_62, x_64, x_66, x_68, x_70, x_72, x_74, x_76, x_78, x_80, x_82, x_84};
A = tint_symbol_3;
const int tint_symbol_2[17] = {x_52, x_54, x_56, x_58, x_60, x_62, x_64, x_66, x_68, x_70, x_72, x_74, x_76, x_78, x_80, x_82, x_84};
A = tint_symbol_2;
const int x_87 = asint(x_6[3].x);
const int x_89 = asint(x_6[4].x);
const int x_91 = asint(x_6[5].x);
@@ -46,8 +46,8 @@ void main_1() {
const int x_115 = asint(x_6[17].x);
const int x_117 = asint(x_6[18].x);
const int x_119 = asint(x_6[1].x);
const int tint_symbol_4[17] = {x_87, x_89, x_91, x_93, x_95, x_97, x_99, x_101, x_103, x_105, x_107, x_109, x_111, x_113, x_115, x_117, x_119};
ref = tint_symbol_4;
const int tint_symbol_3[17] = {x_87, x_89, x_91, x_93, x_95, x_97, x_99, x_101, x_103, x_105, x_107, x_109, x_111, x_113, x_115, x_117, x_119};
ref = tint_symbol_3;
const int x_122 = asint(x_6[2].x);
a = x_122;
const int x_124 = asint(x_6[2].x);
@@ -112,9 +112,15 @@ struct tint_symbol {
float4 x_GLF_color_1 : SV_Target0;
};
tint_symbol main() {
main_out main_inner() {
main_1();
const main_out tint_symbol_1 = {x_GLF_color};
const tint_symbol tint_symbol_5 = {tint_symbol_1.x_GLF_color_1};
return tint_symbol_5;
const main_out tint_symbol_4 = {x_GLF_color};
return tint_symbol_4;
}
tint_symbol main() {
const main_out inner_result = main_inner();
tint_symbol wrapper_result = (tint_symbol)0;
wrapper_result.x_GLF_color_1 = inner_result.x_GLF_color_1;
return wrapper_result;
}

32
test/vk-gl-cts/graphicsfuzz/cov-nir-array-access/0-opt.spvasm.expected.msl
View File

@@ -21,7 +21,7 @@ struct tint_symbol_1 {
float4 x_GLF_color_1 [[color(0)]];
};
void main_1(constant buf0& x_6, thread float4* const tint_symbol_6) {
void main_1(constant buf0& x_6, thread float4* const tint_symbol_5) {
tint_array_wrapper_1 A = {};
tint_array_wrapper_1 ref = {};
int a = 0;
@@ -45,8 +45,8 @@ void main_1(constant buf0& x_6, thread float4* const tint_symbol_6) {
int const x_80 = x_6.x_GLF_uniform_int_values.arr[2].el;
int const x_82 = x_6.x_GLF_uniform_int_values.arr[2].el;
int const x_84 = x_6.x_GLF_uniform_int_values.arr[2].el;
tint_array_wrapper_1 const tint_symbol_3 = {.arr={x_52, x_54, x_56, x_58, x_60, x_62, x_64, x_66, x_68, x_70, x_72, x_74, x_76, x_78, x_80, x_82, x_84}};
A = tint_symbol_3;
tint_array_wrapper_1 const tint_symbol_2 = {.arr={x_52, x_54, x_56, x_58, x_60, x_62, x_64, x_66, x_68, x_70, x_72, x_74, x_76, x_78, x_80, x_82, x_84}};
A = tint_symbol_2;
int const x_87 = x_6.x_GLF_uniform_int_values.arr[3].el;
int const x_89 = x_6.x_GLF_uniform_int_values.arr[4].el;
int const x_91 = x_6.x_GLF_uniform_int_values.arr[5].el;
@@ -64,8 +64,8 @@ void main_1(constant buf0& x_6, thread float4* const tint_symbol_6) {
int const x_115 = x_6.x_GLF_uniform_int_values.arr[17].el;
int const x_117 = x_6.x_GLF_uniform_int_values.arr[18].el;
int const x_119 = x_6.x_GLF_uniform_int_values.arr[1].el;
tint_array_wrapper_1 const tint_symbol_4 = {.arr={x_87, x_89, x_91, x_93, x_95, x_97, x_99, x_101, x_103, x_105, x_107, x_109, x_111, x_113, x_115, x_117, x_119}};
ref = tint_symbol_4;
tint_array_wrapper_1 const tint_symbol_3 = {.arr={x_87, x_89, x_91, x_93, x_95, x_97, x_99, x_101, x_103, x_105, x_107, x_109, x_111, x_113, x_115, x_117, x_119}};
ref = tint_symbol_3;
int const x_122 = x_6.x_GLF_uniform_int_values.arr[2].el;
a = x_122;
int const x_124 = x_6.x_GLF_uniform_int_values.arr[2].el;
@@ -116,23 +116,29 @@ void main_1(constant buf0& x_6, thread float4* const tint_symbol_6) {
}
int const x_174 = x_6.x_GLF_uniform_int_values.arr[2].el;
float const x_175 = float(x_174);
*(tint_symbol_6) = float4(x_175, x_175, x_175, x_175);
*(tint_symbol_5) = float4(x_175, x_175, x_175, x_175);
bool const x_177 = ok;
if (x_177) {
int const x_181 = x_6.x_GLF_uniform_int_values.arr[3].el;
int const x_184 = x_6.x_GLF_uniform_int_values.arr[2].el;
int const x_187 = x_6.x_GLF_uniform_int_values.arr[2].el;
int const x_190 = x_6.x_GLF_uniform_int_values.arr[3].el;
*(tint_symbol_6) = float4(float(x_181), float(x_184), float(x_187), float(x_190));
*(tint_symbol_5) = float4(float(x_181), float(x_184), float(x_187), float(x_190));
}
return;
}
fragment tint_symbol_1 tint_symbol(constant buf0& x_6 [[buffer(0)]]) {
thread float4 tint_symbol_7 = 0.0f;
main_1(x_6, &(tint_symbol_7));
main_out const tint_symbol_2 = {.x_GLF_color_1=tint_symbol_7};
tint_symbol_1 const tint_symbol_5 = {.x_GLF_color_1=tint_symbol_2.x_GLF_color_1};
return tint_symbol_5;
main_out tint_symbol_inner(constant buf0& x_6, thread float4* const tint_symbol_6) {
main_1(x_6, tint_symbol_6);
main_out const tint_symbol_4 = {.x_GLF_color_1=*(tint_symbol_6)};
return tint_symbol_4;
}
fragment tint_symbol_1 tint_symbol(constant buf0& x_6 [[buffer(0)]]) {
thread float4 tint_symbol_7 = 0.0f;
main_out const inner_result = tint_symbol_inner(x_6, &(tint_symbol_7));
tint_symbol_1 wrapper_result = {};
wrapper_result.x_GLF_color_1 = inner_result.x_GLF_color_1;
return wrapper_result;
}

22
test/vk-gl-cts/graphicsfuzz/cov-nir-array-access/0-opt.wgsl.expected.hlsl
View File

@@ -27,8 +27,8 @@ void main_1() {
const int x_80 = asint(x_6[2].x);
const int x_82 = asint(x_6[2].x);
const int x_84 = asint(x_6[2].x);
const int tint_symbol_3[17] = {x_52, x_54, x_56, x_58, x_60, x_62, x_64, x_66, x_68, x_70, x_72, x_74, x_76, x_78, x_80, x_82, x_84};
A = tint_symbol_3;
const int tint_symbol_2[17] = {x_52, x_54, x_56, x_58, x_60, x_62, x_64, x_66, x_68, x_70, x_72, x_74, x_76, x_78, x_80, x_82, x_84};
A = tint_symbol_2;
const int x_87 = asint(x_6[3].x);
const int x_89 = asint(x_6[4].x);
const int x_91 = asint(x_6[5].x);
@@ -46,8 +46,8 @@ void main_1() {
const int x_115 = asint(x_6[17].x);
const int x_117 = asint(x_6[18].x);
const int x_119 = asint(x_6[1].x);
const int tint_symbol_4[17] = {x_87, x_89, x_91, x_93, x_95, x_97, x_99, x_101, x_103, x_105, x_107, x_109, x_111, x_113, x_115, x_117, x_119};
ref = tint_symbol_4;
const int tint_symbol_3[17] = {x_87, x_89, x_91, x_93, x_95, x_97, x_99, x_101, x_103, x_105, x_107, x_109, x_111, x_113, x_115, x_117, x_119};
ref = tint_symbol_3;
const int x_122 = asint(x_6[2].x);
a = x_122;
const int x_124 = asint(x_6[2].x);
@@ -112,9 +112,15 @@ struct tint_symbol {
float4 x_GLF_color_1 : SV_Target0;
};
tint_symbol main() {
main_out main_inner() {
main_1();
const main_out tint_symbol_1 = {x_GLF_color};
const tint_symbol tint_symbol_5 = {tint_symbol_1.x_GLF_color_1};
return tint_symbol_5;
const main_out tint_symbol_4 = {x_GLF_color};
return tint_symbol_4;
}
tint_symbol main() {
const main_out inner_result = main_inner();
tint_symbol wrapper_result = (tint_symbol)0;
wrapper_result.x_GLF_color_1 = inner_result.x_GLF_color_1;
return wrapper_result;
}

32
test/vk-gl-cts/graphicsfuzz/cov-nir-array-access/0-opt.wgsl.expected.msl
View File

@@ -21,7 +21,7 @@ struct tint_symbol_1 {
float4 x_GLF_color_1 [[color(0)]];
};
void main_1(constant buf0& x_6, thread float4* const tint_symbol_6) {
void main_1(constant buf0& x_6, thread float4* const tint_symbol_5) {
tint_array_wrapper_1 A = {};
tint_array_wrapper_1 ref = {};
int a = 0;
@@ -45,8 +45,8 @@ void main_1(constant buf0& x_6, thread float4* const tint_symbol_6) {
int const x_80 = x_6.x_GLF_uniform_int_values.arr[2].el;
int const x_82 = x_6.x_GLF_uniform_int_values.arr[2].el;
int const x_84 = x_6.x_GLF_uniform_int_values.arr[2].el;
tint_array_wrapper_1 const tint_symbol_3 = {.arr={x_52, x_54, x_56, x_58, x_60, x_62, x_64, x_66, x_68, x_70, x_72, x_74, x_76, x_78, x_80, x_82, x_84}};
A = tint_symbol_3;
tint_array_wrapper_1 const tint_symbol_2 = {.arr={x_52, x_54, x_56, x_58, x_60, x_62, x_64, x_66, x_68, x_70, x_72, x_74, x_76, x_78, x_80, x_82, x_84}};
A = tint_symbol_2;
int const x_87 = x_6.x_GLF_uniform_int_values.arr[3].el;
int const x_89 = x_6.x_GLF_uniform_int_values.arr[4].el;
int const x_91 = x_6.x_GLF_uniform_int_values.arr[5].el;
@@ -64,8 +64,8 @@ void main_1(constant buf0& x_6, thread float4* const tint_symbol_6) {
int const x_115 = x_6.x_GLF_uniform_int_values.arr[17].el;
int const x_117 = x_6.x_GLF_uniform_int_values.arr[18].el;
int const x_119 = x_6.x_GLF_uniform_int_values.arr[1].el;
tint_array_wrapper_1 const tint_symbol_4 = {.arr={x_87, x_89, x_91, x_93, x_95, x_97, x_99, x_101, x_103, x_105, x_107, x_109, x_111, x_113, x_115, x_117, x_119}};
ref = tint_symbol_4;
tint_array_wrapper_1 const tint_symbol_3 = {.arr={x_87, x_89, x_91, x_93, x_95, x_97, x_99, x_101, x_103, x_105, x_107, x_109, x_111, x_113, x_115, x_117, x_119}};
ref = tint_symbol_3;
int const x_122 = x_6.x_GLF_uniform_int_values.arr[2].el;
a = x_122;
int const x_124 = x_6.x_GLF_uniform_int_values.arr[2].el;
@@ -116,23 +116,29 @@ void main_1(constant buf0& x_6, thread float4* const tint_symbol_6) {
}
int const x_174 = x_6.x_GLF_uniform_int_values.arr[2].el;
float const x_175 = float(x_174);
*(tint_symbol_6) = float4(x_175, x_175, x_175, x_175);
*(tint_symbol_5) = float4(x_175, x_175, x_175, x_175);
bool const x_177 = ok;
if (x_177) {
int const x_181 = x_6.x_GLF_uniform_int_values.arr[3].el;
int const x_184 = x_6.x_GLF_uniform_int_values.arr[2].el;
int const x_187 = x_6.x_GLF_uniform_int_values.arr[2].el;
int const x_190 = x_6.x_GLF_uniform_int_values.arr[3].el;
*(tint_symbol_6) = float4(float(x_181), float(x_184), float(x_187), float(x_190));
*(tint_symbol_5) = float4(float(x_181), float(x_184), float(x_187), float(x_190));
}
return;
}
fragment tint_symbol_1 tint_symbol(constant buf0& x_6 [[buffer(0)]]) {
thread float4 tint_symbol_7 = 0.0f;
main_1(x_6, &(tint_symbol_7));
main_out const tint_symbol_2 = {.x_GLF_color_1=tint_symbol_7};
tint_symbol_1 const tint_symbol_5 = {.x_GLF_color_1=tint_symbol_2.x_GLF_color_1};
return tint_symbol_5;
main_out tint_symbol_inner(constant buf0& x_6, thread float4* const tint_symbol_6) {
main_1(x_6, tint_symbol_6);
main_out const tint_symbol_4 = {.x_GLF_color_1=*(tint_symbol_6)};
return tint_symbol_4;
}
fragment tint_symbol_1 tint_symbol(constant buf0& x_6 [[buffer(0)]]) {
thread float4 tint_symbol_7 = 0.0f;
main_out const inner_result = tint_symbol_inner(x_6, &(tint_symbol_7));
tint_symbol_1 wrapper_result = {};
wrapper_result.x_GLF_color_1 = inner_result.x_GLF_color_1;
return wrapper_result;
}