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

12
test/intrinsics/gen/arrayLength/1588cd.wgsl.expected.hlsl
View File

@@ -11,10 +11,16 @@ struct tint_symbol {
float4 value : SV_Position;
};
tint_symbol vertex_main() {
float4 vertex_main_inner() {
arrayLength_1588cd();
const tint_symbol tint_symbol_4 = {float4(0.0f, 0.0f, 0.0f, 0.0f)};
return tint_symbol_4;
return float4(0.0f, 0.0f, 0.0f, 0.0f);
}
tint_symbol vertex_main() {
const float4 inner_result = vertex_main_inner();
tint_symbol wrapper_result = (tint_symbol)0;
wrapper_result.value = inner_result;
return wrapper_result;
}
void fragment_main() {

28
test/intrinsics/gen/arrayLength/1588cd.wgsl.expected.msl
View File

@@ -1,7 +1,7 @@
#include <metal_stdlib>
using namespace metal;
struct tint_symbol_2 {
struct tint_symbol_1 {
/* 0x0000 */ uint4 buffer_size[1];
};
struct SB_RO {
@@ -11,23 +11,29 @@ struct tint_symbol {
float4 value [[position]];
};
void arrayLength_1588cd(constant tint_symbol_2& tint_symbol_3) {
uint res = ((tint_symbol_3.buffer_size[0u][1u] - 0u) / 4u);
void arrayLength_1588cd(constant tint_symbol_1& tint_symbol_2) {
uint res = ((tint_symbol_2.buffer_size[0u][1u] - 0u) / 4u);
}
vertex tint_symbol vertex_main(constant tint_symbol_2& tint_symbol_3 [[buffer(30)]]) {
arrayLength_1588cd(tint_symbol_3);
tint_symbol const tint_symbol_1 = {.value=float4()};
return tint_symbol_1;
float4 vertex_main_inner(constant tint_symbol_1& tint_symbol_2) {
arrayLength_1588cd(tint_symbol_2);
return float4();
}
fragment void fragment_main(constant tint_symbol_2& tint_symbol_3 [[buffer(30)]]) {
arrayLength_1588cd(tint_symbol_3);
vertex tint_symbol vertex_main(constant tint_symbol_1& tint_symbol_2 [[buffer(30)]]) {
float4 const inner_result = vertex_main_inner(tint_symbol_2);
tint_symbol wrapper_result = {};
wrapper_result.value = inner_result;
return wrapper_result;
}
fragment void fragment_main(constant tint_symbol_1& tint_symbol_2 [[buffer(30)]]) {
arrayLength_1588cd(tint_symbol_2);
return;
}
kernel void compute_main(constant tint_symbol_2& tint_symbol_3 [[buffer(30)]]) {
arrayLength_1588cd(tint_symbol_3);
kernel void compute_main(constant tint_symbol_1& tint_symbol_2 [[buffer(30)]]) {
arrayLength_1588cd(tint_symbol_2);
return;
}

12
test/intrinsics/gen/arrayLength/61b1c7.wgsl.expected.hlsl
View File

@@ -11,10 +11,16 @@ struct tint_symbol {
float4 value : SV_Position;
};
tint_symbol vertex_main() {
float4 vertex_main_inner() {
arrayLength_61b1c7();
const tint_symbol tint_symbol_4 = {float4(0.0f, 0.0f, 0.0f, 0.0f)};
return tint_symbol_4;
return float4(0.0f, 0.0f, 0.0f, 0.0f);
}
tint_symbol vertex_main() {
const float4 inner_result = vertex_main_inner();
tint_symbol wrapper_result = (tint_symbol)0;
wrapper_result.value = inner_result;
return wrapper_result;
}
void fragment_main() {

28
test/intrinsics/gen/arrayLength/61b1c7.wgsl.expected.msl
View File

@@ -1,7 +1,7 @@
#include <metal_stdlib>
using namespace metal;
struct tint_symbol_2 {
struct tint_symbol_1 {
/* 0x0000 */ uint4 buffer_size[1];
};
struct SB_RW {
@@ -11,23 +11,29 @@ struct tint_symbol {
float4 value [[position]];
};
void arrayLength_61b1c7(constant tint_symbol_2& tint_symbol_3) {
uint res = ((tint_symbol_3.buffer_size[0u][0u] - 0u) / 4u);
void arrayLength_61b1c7(constant tint_symbol_1& tint_symbol_2) {
uint res = ((tint_symbol_2.buffer_size[0u][0u] - 0u) / 4u);
}
vertex tint_symbol vertex_main(constant tint_symbol_2& tint_symbol_3 [[buffer(30)]]) {
arrayLength_61b1c7(tint_symbol_3);
tint_symbol const tint_symbol_1 = {.value=float4()};
return tint_symbol_1;
float4 vertex_main_inner(constant tint_symbol_1& tint_symbol_2) {
arrayLength_61b1c7(tint_symbol_2);
return float4();
}
fragment void fragment_main(constant tint_symbol_2& tint_symbol_3 [[buffer(30)]]) {
arrayLength_61b1c7(tint_symbol_3);
vertex tint_symbol vertex_main(constant tint_symbol_1& tint_symbol_2 [[buffer(30)]]) {
float4 const inner_result = vertex_main_inner(tint_symbol_2);
tint_symbol wrapper_result = {};
wrapper_result.value = inner_result;
return wrapper_result;
}
fragment void fragment_main(constant tint_symbol_1& tint_symbol_2 [[buffer(30)]]) {
arrayLength_61b1c7(tint_symbol_2);
return;
}
kernel void compute_main(constant tint_symbol_2& tint_symbol_3 [[buffer(30)]]) {
arrayLength_61b1c7(tint_symbol_3);
kernel void compute_main(constant tint_symbol_1& tint_symbol_2 [[buffer(30)]]) {
arrayLength_61b1c7(tint_symbol_2);
return;
}

12
test/intrinsics/gen/arrayLength/a0f5ca.wgsl.expected.hlsl
View File

@@ -11,10 +11,16 @@ struct tint_symbol {
float4 value : SV_Position;
};
tint_symbol vertex_main() {
float4 vertex_main_inner() {
arrayLength_a0f5ca();
const tint_symbol tint_symbol_4 = {float4(0.0f, 0.0f, 0.0f, 0.0f)};
return tint_symbol_4;
return float4(0.0f, 0.0f, 0.0f, 0.0f);
}
tint_symbol vertex_main() {
const float4 inner_result = vertex_main_inner();
tint_symbol wrapper_result = (tint_symbol)0;
wrapper_result.value = inner_result;
return wrapper_result;
}
void fragment_main() {

28
test/intrinsics/gen/arrayLength/a0f5ca.wgsl.expected.msl
View File

@@ -1,7 +1,7 @@
#include <metal_stdlib>
using namespace metal;
struct tint_symbol_2 {
struct tint_symbol_1 {
/* 0x0000 */ uint4 buffer_size[1];
};
struct SB_RO {
@@ -11,23 +11,29 @@ struct tint_symbol {
float4 value [[position]];
};
void arrayLength_a0f5ca(constant tint_symbol_2& tint_symbol_3) {
uint res = ((tint_symbol_3.buffer_size[0u][1u] - 0u) / 4u);
void arrayLength_a0f5ca(constant tint_symbol_1& tint_symbol_2) {
uint res = ((tint_symbol_2.buffer_size[0u][1u] - 0u) / 4u);
}
vertex tint_symbol vertex_main(constant tint_symbol_2& tint_symbol_3 [[buffer(30)]]) {
arrayLength_a0f5ca(tint_symbol_3);
tint_symbol const tint_symbol_1 = {.value=float4()};
return tint_symbol_1;
float4 vertex_main_inner(constant tint_symbol_1& tint_symbol_2) {
arrayLength_a0f5ca(tint_symbol_2);
return float4();
}
fragment void fragment_main(constant tint_symbol_2& tint_symbol_3 [[buffer(30)]]) {
arrayLength_a0f5ca(tint_symbol_3);
vertex tint_symbol vertex_main(constant tint_symbol_1& tint_symbol_2 [[buffer(30)]]) {
float4 const inner_result = vertex_main_inner(tint_symbol_2);
tint_symbol wrapper_result = {};
wrapper_result.value = inner_result;
return wrapper_result;
}
fragment void fragment_main(constant tint_symbol_1& tint_symbol_2 [[buffer(30)]]) {
arrayLength_a0f5ca(tint_symbol_2);
return;
}
kernel void compute_main(constant tint_symbol_2& tint_symbol_3 [[buffer(30)]]) {
arrayLength_a0f5ca(tint_symbol_3);
kernel void compute_main(constant tint_symbol_1& tint_symbol_2 [[buffer(30)]]) {
arrayLength_a0f5ca(tint_symbol_2);
return;
}

12
test/intrinsics/gen/arrayLength/cdd123.wgsl.expected.hlsl
View File

@@ -11,10 +11,16 @@ struct tint_symbol {
float4 value : SV_Position;
};
tint_symbol vertex_main() {
float4 vertex_main_inner() {
arrayLength_cdd123();
const tint_symbol tint_symbol_4 = {float4(0.0f, 0.0f, 0.0f, 0.0f)};
return tint_symbol_4;
return float4(0.0f, 0.0f, 0.0f, 0.0f);
}
tint_symbol vertex_main() {
const float4 inner_result = vertex_main_inner();
tint_symbol wrapper_result = (tint_symbol)0;
wrapper_result.value = inner_result;
return wrapper_result;
}
void fragment_main() {

28
test/intrinsics/gen/arrayLength/cdd123.wgsl.expected.msl
View File

@@ -1,7 +1,7 @@
#include <metal_stdlib>
using namespace metal;
struct tint_symbol_2 {
struct tint_symbol_1 {
/* 0x0000 */ uint4 buffer_size[1];
};
struct SB_RW {
@@ -11,23 +11,29 @@ struct tint_symbol {
float4 value [[position]];
};
void arrayLength_cdd123(constant tint_symbol_2& tint_symbol_3) {
uint res = ((tint_symbol_3.buffer_size[0u][0u] - 0u) / 4u);
void arrayLength_cdd123(constant tint_symbol_1& tint_symbol_2) {
uint res = ((tint_symbol_2.buffer_size[0u][0u] - 0u) / 4u);
}
vertex tint_symbol vertex_main(constant tint_symbol_2& tint_symbol_3 [[buffer(30)]]) {
arrayLength_cdd123(tint_symbol_3);
tint_symbol const tint_symbol_1 = {.value=float4()};
return tint_symbol_1;
float4 vertex_main_inner(constant tint_symbol_1& tint_symbol_2) {
arrayLength_cdd123(tint_symbol_2);
return float4();
}
fragment void fragment_main(constant tint_symbol_2& tint_symbol_3 [[buffer(30)]]) {
arrayLength_cdd123(tint_symbol_3);
vertex tint_symbol vertex_main(constant tint_symbol_1& tint_symbol_2 [[buffer(30)]]) {
float4 const inner_result = vertex_main_inner(tint_symbol_2);
tint_symbol wrapper_result = {};
wrapper_result.value = inner_result;
return wrapper_result;
}
fragment void fragment_main(constant tint_symbol_1& tint_symbol_2 [[buffer(30)]]) {
arrayLength_cdd123(tint_symbol_2);
return;
}
kernel void compute_main(constant tint_symbol_2& tint_symbol_3 [[buffer(30)]]) {
arrayLength_cdd123(tint_symbol_3);
kernel void compute_main(constant tint_symbol_1& tint_symbol_2 [[buffer(30)]]) {
arrayLength_cdd123(tint_symbol_2);
return;
}

12
test/intrinsics/gen/arrayLength/cfca0a.wgsl.expected.hlsl
View File

@@ -11,10 +11,16 @@ struct tint_symbol {
float4 value : SV_Position;
};
tint_symbol vertex_main() {
float4 vertex_main_inner() {
arrayLength_cfca0a();
const tint_symbol tint_symbol_4 = {float4(0.0f, 0.0f, 0.0f, 0.0f)};
return tint_symbol_4;
return float4(0.0f, 0.0f, 0.0f, 0.0f);
}
tint_symbol vertex_main() {
const float4 inner_result = vertex_main_inner();
tint_symbol wrapper_result = (tint_symbol)0;
wrapper_result.value = inner_result;
return wrapper_result;
}
void fragment_main() {

28
test/intrinsics/gen/arrayLength/cfca0a.wgsl.expected.msl
View File

@@ -1,7 +1,7 @@
#include <metal_stdlib>
using namespace metal;
struct tint_symbol_2 {
struct tint_symbol_1 {
/* 0x0000 */ uint4 buffer_size[1];
};
struct SB_RO {
@@ -11,23 +11,29 @@ struct tint_symbol {
float4 value [[position]];
};
void arrayLength_cfca0a(constant tint_symbol_2& tint_symbol_3) {
uint res = ((tint_symbol_3.buffer_size[0u][1u] - 0u) / 4u);
void arrayLength_cfca0a(constant tint_symbol_1& tint_symbol_2) {
uint res = ((tint_symbol_2.buffer_size[0u][1u] - 0u) / 4u);
}
vertex tint_symbol vertex_main(constant tint_symbol_2& tint_symbol_3 [[buffer(30)]]) {
arrayLength_cfca0a(tint_symbol_3);
tint_symbol const tint_symbol_1 = {.value=float4()};
return tint_symbol_1;
float4 vertex_main_inner(constant tint_symbol_1& tint_symbol_2) {
arrayLength_cfca0a(tint_symbol_2);
return float4();
}
fragment void fragment_main(constant tint_symbol_2& tint_symbol_3 [[buffer(30)]]) {
arrayLength_cfca0a(tint_symbol_3);
vertex tint_symbol vertex_main(constant tint_symbol_1& tint_symbol_2 [[buffer(30)]]) {
float4 const inner_result = vertex_main_inner(tint_symbol_2);
tint_symbol wrapper_result = {};
wrapper_result.value = inner_result;
return wrapper_result;
}
fragment void fragment_main(constant tint_symbol_1& tint_symbol_2 [[buffer(30)]]) {
arrayLength_cfca0a(tint_symbol_2);
return;
}
kernel void compute_main(constant tint_symbol_2& tint_symbol_3 [[buffer(30)]]) {
arrayLength_cfca0a(tint_symbol_3);
kernel void compute_main(constant tint_symbol_1& tint_symbol_2 [[buffer(30)]]) {
arrayLength_cfca0a(tint_symbol_2);
return;
}

12
test/intrinsics/gen/arrayLength/eb510f.wgsl.expected.hlsl
View File

@@ -11,10 +11,16 @@ struct tint_symbol {
float4 value : SV_Position;
};
tint_symbol vertex_main() {
float4 vertex_main_inner() {
arrayLength_eb510f();
const tint_symbol tint_symbol_4 = {float4(0.0f, 0.0f, 0.0f, 0.0f)};
return tint_symbol_4;
return float4(0.0f, 0.0f, 0.0f, 0.0f);
}
tint_symbol vertex_main() {
const float4 inner_result = vertex_main_inner();
tint_symbol wrapper_result = (tint_symbol)0;
wrapper_result.value = inner_result;
return wrapper_result;
}
void fragment_main() {

28
test/intrinsics/gen/arrayLength/eb510f.wgsl.expected.msl
View File

@@ -1,7 +1,7 @@
#include <metal_stdlib>
using namespace metal;
struct tint_symbol_2 {
struct tint_symbol_1 {
/* 0x0000 */ uint4 buffer_size[1];
};
struct SB_RW {
@@ -11,23 +11,29 @@ struct tint_symbol {
float4 value [[position]];
};
void arrayLength_eb510f(constant tint_symbol_2& tint_symbol_3) {
uint res = ((tint_symbol_3.buffer_size[0u][0u] - 0u) / 4u);
void arrayLength_eb510f(constant tint_symbol_1& tint_symbol_2) {
uint res = ((tint_symbol_2.buffer_size[0u][0u] - 0u) / 4u);
}
vertex tint_symbol vertex_main(constant tint_symbol_2& tint_symbol_3 [[buffer(30)]]) {
arrayLength_eb510f(tint_symbol_3);
tint_symbol const tint_symbol_1 = {.value=float4()};
return tint_symbol_1;
float4 vertex_main_inner(constant tint_symbol_1& tint_symbol_2) {
arrayLength_eb510f(tint_symbol_2);
return float4();
}
fragment void fragment_main(constant tint_symbol_2& tint_symbol_3 [[buffer(30)]]) {
arrayLength_eb510f(tint_symbol_3);
vertex tint_symbol vertex_main(constant tint_symbol_1& tint_symbol_2 [[buffer(30)]]) {
float4 const inner_result = vertex_main_inner(tint_symbol_2);
tint_symbol wrapper_result = {};
wrapper_result.value = inner_result;
return wrapper_result;
}
fragment void fragment_main(constant tint_symbol_1& tint_symbol_2 [[buffer(30)]]) {
arrayLength_eb510f(tint_symbol_2);
return;
}
kernel void compute_main(constant tint_symbol_2& tint_symbol_3 [[buffer(30)]]) {
arrayLength_eb510f(tint_symbol_3);
kernel void compute_main(constant tint_symbol_1& tint_symbol_2 [[buffer(30)]]) {
arrayLength_eb510f(tint_symbol_2);
return;
}