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

Add transform/PadArrayElements

Browse Source 
Replaces arrays with an explicit stride with an array to a structure holding the element padded with a `[[size]]` decoration.

Note that the HLSL writer is still not correctly emitting structure fields with a `[[size]]`, which will be fixed in a follow up change.

Bug: tint:182
Bug: tint:895
Fixed: tint:180
Fixed: tint:649
Change-Id: Ic135dfc89309ac805507e9f39392577c7f82d154
Reviewed-on: https://dawn-review.googlesource.com/c/tint/+/54582
Kokoro: Kokoro <noreply+kokoro@google.com>
Reviewed-by: David Neto <dneto@google.com>
Reviewed-by: James Price <jrprice@google.com>
This commit is contained in:
Ben Clayton
2021-06-16 09:50:11 +00:00
committed by Ben Clayton
parent 92b1991271
commit 31936f375f
19 changed files with 711 additions and 86 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
test/array/assign_to_function_var.wgsl.expected.hlsl
View File

@@ -3,15 +3,18 @@ void unused_entry_point() {
return;
}
struct tint_padded_array_element {
int el;
};
struct tint_array_wrapper {
int arr[4];
tint_padded_array_element arr[4];
};
struct S {
tint_array_wrapper arr;
};
tint_array_wrapper tint_symbol_2(RWByteAddressBuffer buffer, uint offset) {
const tint_array_wrapper tint_symbol_3 = {{asint(buffer.Load((offset + 0u))), asint(buffer.Load((offset + 16u))), asint(buffer.Load((offset + 32u))), asint(buffer.Load((offset + 48u)))}};
const tint_array_wrapper tint_symbol_3 = {{{asint(buffer.Load((offset + 0u)))}, {asint(buffer.Load((offset + 16u)))}, {asint(buffer.Load((offset + 32u)))}, {asint(buffer.Load((offset + 48u)))}}};
return tint_symbol_3;
}
@@ -21,12 +24,12 @@ ConstantBuffer<S> src_uniform : register(b0, space0);
RWByteAddressBuffer src_storage : register(u1, space0);
tint_array_wrapper ret_arr() {
const tint_array_wrapper tint_symbol_4 = {{0, 0, 0, 0}};
const tint_array_wrapper tint_symbol_4 = {{{0}, {0}, {0}, {0}}};
return tint_symbol_4;
}
S ret_struct_arr() {
const S tint_symbol_5 = {{{0, 0, 0, 0}}};
const S tint_symbol_5 = {{{{0}, {0}, {0}, {0}}}};
return tint_symbol_5;
}
@@ -41,13 +44,13 @@ struct tint_array_wrapper_1 {
};
void foo(tint_array_wrapper src_param) {
tint_array_wrapper src_function = {{0, 0, 0, 0}};
tint_array_wrapper tint_symbol = {{0, 0, 0, 0}};
const tint_array_wrapper tint_symbol_6 = {{1, 2, 3, 3}};
tint_array_wrapper src_function = {{{0}, {0}, {0}, {0}}};
tint_array_wrapper tint_symbol = {{{0}, {0}, {0}, {0}}};
const tint_array_wrapper tint_symbol_6 = {{{1}, {2}, {3}, {3}}};
tint_symbol = tint_symbol_6;
tint_symbol = src_param;
tint_symbol = ret_arr();
const tint_array_wrapper src_let = {{0, 0, 0, 0}};
const tint_array_wrapper src_let = {{{0}, {0}, {0}, {0}}};
tint_symbol = src_let;
tint_symbol = src_function;
tint_symbol = src_private;

17
test/array/assign_to_private_var.wgsl.expected.hlsl
View File

@@ -3,15 +3,18 @@ void unused_entry_point() {
return;
}
struct tint_padded_array_element {
int el;
};
struct tint_array_wrapper {
int arr[4];
tint_padded_array_element arr[4];
};
struct S {
tint_array_wrapper arr;
};
tint_array_wrapper tint_symbol_2(RWByteAddressBuffer buffer, uint offset) {
const tint_array_wrapper tint_symbol_3 = {{asint(buffer.Load((offset + 0u))), asint(buffer.Load((offset + 16u))), asint(buffer.Load((offset + 32u))), asint(buffer.Load((offset + 48u)))}};
const tint_array_wrapper tint_symbol_3 = {{{asint(buffer.Load((offset + 0u)))}, {asint(buffer.Load((offset + 16u)))}, {asint(buffer.Load((offset + 32u)))}, {asint(buffer.Load((offset + 48u)))}}};
return tint_symbol_3;
}
@@ -34,22 +37,22 @@ struct tint_array_wrapper_1 {
static tint_array_wrapper_1 dst_nested;
tint_array_wrapper ret_arr() {
const tint_array_wrapper tint_symbol_4 = {{0, 0, 0, 0}};
const tint_array_wrapper tint_symbol_4 = {{{0}, {0}, {0}, {0}}};
return tint_symbol_4;
}
S ret_struct_arr() {
const S tint_symbol_5 = {{{0, 0, 0, 0}}};
const S tint_symbol_5 = {{{{0}, {0}, {0}, {0}}}};
return tint_symbol_5;
}
void foo(tint_array_wrapper src_param) {
tint_array_wrapper src_function = {{0, 0, 0, 0}};
const tint_array_wrapper tint_symbol_6 = {{1, 2, 3, 3}};
tint_array_wrapper src_function = {{{0}, {0}, {0}, {0}}};
const tint_array_wrapper tint_symbol_6 = {{{1}, {2}, {3}, {3}}};
tint_symbol = tint_symbol_6;
tint_symbol = src_param;
tint_symbol = ret_arr();
const tint_array_wrapper src_let = {{0, 0, 0, 0}};
const tint_array_wrapper src_let = {{{0}, {0}, {0}, {0}}};
tint_symbol = src_let;
tint_symbol = src_function;
tint_symbol = src_private;

25
test/array/assign_to_storage_var.wgsl.expected.hlsl
View File

@@ -3,23 +3,26 @@ void unused_entry_point() {
return;
}
struct tint_padded_array_element {
int el;
};
struct tint_array_wrapper {
int arr[4];
tint_padded_array_element arr[4];
};
struct S {
tint_array_wrapper arr;
};
tint_array_wrapper tint_symbol_2(RWByteAddressBuffer buffer, uint offset) {
const tint_array_wrapper tint_symbol_9 = {{asint(buffer.Load((offset + 0u))), asint(buffer.Load((offset + 16u))), asint(buffer.Load((offset + 32u))), asint(buffer.Load((offset + 48u)))}};
const tint_array_wrapper tint_symbol_9 = {{{asint(buffer.Load((offset + 0u)))}, {asint(buffer.Load((offset + 16u)))}, {asint(buffer.Load((offset + 32u)))}, {asint(buffer.Load((offset + 48u)))}}};
return tint_symbol_9;
}
void tint_symbol_4(RWByteAddressBuffer buffer, uint offset, tint_array_wrapper value) {
buffer.Store((offset + 0u), asuint(value.arr[0u]));
buffer.Store((offset + 16u), asuint(value.arr[1u]));
buffer.Store((offset + 32u), asuint(value.arr[2u]));
buffer.Store((offset + 48u), asuint(value.arr[3u]));
buffer.Store((offset + 0u), asuint(value.arr[0u].el));
buffer.Store((offset + 16u), asuint(value.arr[1u].el));
buffer.Store((offset + 32u), asuint(value.arr[2u].el));
buffer.Store((offset + 48u), asuint(value.arr[3u].el));
}
struct tint_array_wrapper_3 {
@@ -58,22 +61,22 @@ RWByteAddressBuffer tint_symbol : register(u2, space0);
RWByteAddressBuffer dst_nested : register(u3, space0);
tint_array_wrapper ret_arr() {
const tint_array_wrapper tint_symbol_10 = {{0, 0, 0, 0}};
const tint_array_wrapper tint_symbol_10 = {{{0}, {0}, {0}, {0}}};
return tint_symbol_10;
}
S ret_struct_arr() {
const S tint_symbol_11 = {{{0, 0, 0, 0}}};
const S tint_symbol_11 = {{{{0}, {0}, {0}, {0}}}};
return tint_symbol_11;
}
void foo(tint_array_wrapper src_param) {
tint_array_wrapper src_function = {{0, 0, 0, 0}};
const tint_array_wrapper tint_symbol_12 = {{1, 2, 3, 3}};
tint_array_wrapper src_function = {{{0}, {0}, {0}, {0}}};
const tint_array_wrapper tint_symbol_12 = {{{1}, {2}, {3}, {3}}};
tint_symbol_4(tint_symbol, 0u, tint_symbol_12);
tint_symbol_4(tint_symbol, 0u, src_param);
tint_symbol_4(tint_symbol, 0u, ret_arr());
const tint_array_wrapper src_let = {{0, 0, 0, 0}};
const tint_array_wrapper src_let = {{{0}, {0}, {0}, {0}}};
tint_symbol_4(tint_symbol, 0u, src_let);
tint_symbol_4(tint_symbol, 0u, src_function);
tint_symbol_4(tint_symbol, 0u, src_private);

17
test/array/assign_to_workgroup_var.wgsl.expected.hlsl
View File

@@ -3,15 +3,18 @@ void unused_entry_point() {
return;
}
struct tint_padded_array_element {
int el;
};
struct tint_array_wrapper {
int arr[4];
tint_padded_array_element arr[4];
};
struct S {
tint_array_wrapper arr;
};
tint_array_wrapper tint_symbol_2(RWByteAddressBuffer buffer, uint offset) {
const tint_array_wrapper tint_symbol_3 = {{asint(buffer.Load((offset + 0u))), asint(buffer.Load((offset + 16u))), asint(buffer.Load((offset + 32u))), asint(buffer.Load((offset + 48u)))}};
const tint_array_wrapper tint_symbol_3 = {{{asint(buffer.Load((offset + 0u)))}, {asint(buffer.Load((offset + 16u)))}, {asint(buffer.Load((offset + 32u)))}, {asint(buffer.Load((offset + 48u)))}}};
return tint_symbol_3;
}
@@ -34,22 +37,22 @@ struct tint_array_wrapper_1 {
groupshared tint_array_wrapper_1 dst_nested;
tint_array_wrapper ret_arr() {
const tint_array_wrapper tint_symbol_4 = {{0, 0, 0, 0}};
const tint_array_wrapper tint_symbol_4 = {{{0}, {0}, {0}, {0}}};
return tint_symbol_4;
}
S ret_struct_arr() {
const S tint_symbol_5 = {{{0, 0, 0, 0}}};
const S tint_symbol_5 = {{{{0}, {0}, {0}, {0}}}};
return tint_symbol_5;
}
void foo(tint_array_wrapper src_param) {
tint_array_wrapper src_function = {{0, 0, 0, 0}};
const tint_array_wrapper tint_symbol_6 = {{1, 2, 3, 3}};
tint_array_wrapper src_function = {{{0}, {0}, {0}, {0}}};
const tint_array_wrapper tint_symbol_6 = {{{1}, {2}, {3}, {3}}};
tint_symbol = tint_symbol_6;
tint_symbol = src_param;
tint_symbol = ret_arr();
const tint_array_wrapper src_let = {{0, 0, 0, 0}};
const tint_array_wrapper src_let = {{{0}, {0}, {0}, {0}}};
tint_symbol = src_let;
tint_symbol = src_function;
tint_symbol = src_private;