writer/hlsl: Simplify emission logic, clean up output
And fix issues where global variables would not be emitted unless they were transitively referenced by an entry point.
This change requires crbug.com/tint/697 to be fixed before landing.
Change-Id: I712bd9d369e08c9a3cdfb0f114c3609584f91f28
Reviewed-on: https://dawn-review.googlesource.com/c/tint/+/54241
Kokoro: Kokoro <noreply+kokoro@google.com>
Reviewed-by: James Price <jrprice@google.com>
diff --git a/test/array/assign_to_function_var.wgsl.expected.hlsl b/test/array/assign_to_function_var.wgsl.expected.hlsl
index 7d6165e..dde8c7d 100644
--- a/test/array/assign_to_function_var.wgsl.expected.hlsl
+++ b/test/array/assign_to_function_var.wgsl.expected.hlsl
@@ -1 +1,61 @@
-SKIP: crbug.com/tint/845
+SKIP: FAILED
+
+
+
+Validation Failure:
+[numthreads(1, 1, 1)]
+void unused_entry_point() {
+ return;
+}
+
+struct S {
+ int arr[4];
+};
+
+int[4] tint_symbol_2(RWByteAddressBuffer buffer, uint offset) {
+ const int tint_symbol_3[4] = {asint(buffer.Load((offset + 0u))), asint(buffer.Load((offset + 16u))), asint(buffer.Load((offset + 32u))), asint(buffer.Load((offset + 48u)))};
+ return tint_symbol_3;
+}
+
+static int src_private[4];
+groupshared int src_workgroup[4];
+ConstantBuffer<S> src_uniform : register(b0, space0);
+RWByteAddressBuffer src_storage : register(u1, space0);
+
+int[4] ret_arr() {
+ const int tint_symbol_4[4] = {0, 0, 0, 0};
+ return tint_symbol_4;
+}
+S ret_struct_arr() {
+ const S tint_symbol_5 = {{0, 0, 0, 0}};
+ return tint_symbol_5;
+}
+void foo(int src_param[4]) {
+ int src_function[4] = {0, 0, 0, 0};
+ int tint_symbol[4] = {0, 0, 0, 0};
+ const int tint_symbol_6[4] = {1, 2, 3, 3};
+ tint_symbol = tint_symbol_6;
+ tint_symbol = src_param;
+ tint_symbol = ret_arr();
+ const int src_let[4] = {0, 0, 0, 0};
+ tint_symbol = src_let;
+ tint_symbol = src_function;
+ tint_symbol = src_private;
+ tint_symbol = src_workgroup;
+ tint_symbol = ret_struct_arr().arr;
+ tint_symbol = src_uniform.arr;
+ tint_symbol = tint_symbol_2(src_storage, 0u);
+ int dst_nested[4][3][2] = {{{0, 0}, {0, 0}, {0, 0}}, {{0, 0}, {0, 0}, {0, 0}}, {{0, 0}, {0, 0}, {0, 0}}, {{0, 0}, {0, 0}, {0, 0}}};
+ int src_nested[4][3][2] = {{{0, 0}, {0, 0}, {0, 0}}, {{0, 0}, {0, 0}, {0, 0}}, {{0, 0}, {0, 0}, {0, 0}}, {{0, 0}, {0, 0}, {0, 0}}};
+ dst_nested = src_nested;
+}
+
+tint_bTL3Zd:10:62: error: brackets are not allowed here; to declare an array, place the brackets after the name
+int[4] tint_symbol_2(RWByteAddressBuffer buffer, uint offset) {
+ ~~~ ^
+ [4]
+tint_bTL3Zd:20:17: error: brackets are not allowed here; to declare an array, place the brackets after the name
+int[4] ret_arr() {
+ ~~~ ^
+ [4]
+
diff --git a/test/array/assign_to_private_var.wgsl.expected.hlsl b/test/array/assign_to_private_var.wgsl.expected.hlsl
index 7d6165e..fc6abcf 100644
--- a/test/array/assign_to_private_var.wgsl.expected.hlsl
+++ b/test/array/assign_to_private_var.wgsl.expected.hlsl
@@ -1 +1,61 @@
-SKIP: crbug.com/tint/845
+SKIP: FAILED
+
+
+
+Validation Failure:
+[numthreads(1, 1, 1)]
+void unused_entry_point() {
+ return;
+}
+
+struct S {
+ int arr[4];
+};
+
+int[4] tint_symbol_2(RWByteAddressBuffer buffer, uint offset) {
+ const int tint_symbol_3[4] = {asint(buffer.Load((offset + 0u))), asint(buffer.Load((offset + 16u))), asint(buffer.Load((offset + 32u))), asint(buffer.Load((offset + 48u)))};
+ return tint_symbol_3;
+}
+
+static int src_private[4];
+groupshared int src_workgroup[4];
+ConstantBuffer<S> src_uniform : register(b0, space0);
+RWByteAddressBuffer src_storage : register(u1, space0);
+static int tint_symbol[4];
+static int dst_nested[4][3][2];
+
+int[4] ret_arr() {
+ const int tint_symbol_4[4] = {0, 0, 0, 0};
+ return tint_symbol_4;
+}
+S ret_struct_arr() {
+ const S tint_symbol_5 = {{0, 0, 0, 0}};
+ return tint_symbol_5;
+}
+void foo(int src_param[4]) {
+ int src_function[4] = {0, 0, 0, 0};
+ const int tint_symbol_6[4] = {1, 2, 3, 3};
+ tint_symbol = tint_symbol_6;
+ tint_symbol = src_param;
+ tint_symbol = ret_arr();
+ const int src_let[4] = {0, 0, 0, 0};
+ tint_symbol = src_let;
+ tint_symbol = src_function;
+ tint_symbol = src_private;
+ tint_symbol = src_workgroup;
+ tint_symbol = ret_struct_arr().arr;
+ tint_symbol = src_uniform.arr;
+ tint_symbol = tint_symbol_2(src_storage, 0u);
+ int src_nested[4][3][2] = {{{0, 0}, {0, 0}, {0, 0}}, {{0, 0}, {0, 0}, {0, 0}}, {{0, 0}, {0, 0}, {0, 0}}, {{0, 0}, {0, 0}, {0, 0}}};
+ dst_nested = src_nested;
+}
+
+tint_Sca05u:10:62: error: brackets are not allowed here; to declare an array, place the brackets after the name
+int[4] tint_symbol_2(RWByteAddressBuffer buffer, uint offset) {
+ ~~~ ^
+ [4]
+tint_Sca05u:22:17: error: brackets are not allowed here; to declare an array, place the brackets after the name
+int[4] ret_arr() {
+ ~~~ ^
+ [4]
+
diff --git a/test/array/assign_to_storage_var.wgsl.expected.hlsl b/test/array/assign_to_storage_var.wgsl.expected.hlsl
index 7d6165e..826856e 100644
--- a/test/array/assign_to_storage_var.wgsl.expected.hlsl
+++ b/test/array/assign_to_storage_var.wgsl.expected.hlsl
@@ -1 +1,83 @@
-SKIP: crbug.com/tint/845
+SKIP: FAILED
+
+
+
+Validation Failure:
+[numthreads(1, 1, 1)]
+void unused_entry_point() {
+ return;
+}
+
+struct S {
+ int arr[4];
+};
+
+int[4] tint_symbol_2(RWByteAddressBuffer buffer, uint offset) {
+ const int tint_symbol_9[4] = {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, int value[4]) {
+ buffer.Store((offset + 0u), asuint(value[0u]));
+ buffer.Store((offset + 16u), asuint(value[1u]));
+ buffer.Store((offset + 32u), asuint(value[2u]));
+ buffer.Store((offset + 48u), asuint(value[3u]));
+}
+
+void tint_symbol_6(RWByteAddressBuffer buffer, uint offset, int value[2]) {
+ buffer.Store((offset + 0u), asuint(value[0u]));
+ buffer.Store((offset + 4u), asuint(value[1u]));
+}
+void tint_symbol_7(RWByteAddressBuffer buffer, uint offset, int value[3][2]) {
+ tint_symbol_6(buffer, (offset + 0u), value[0u]);
+ tint_symbol_6(buffer, (offset + 8u), value[1u]);
+ tint_symbol_6(buffer, (offset + 16u), value[2u]);
+}
+void tint_symbol_8(RWByteAddressBuffer buffer, uint offset, int value[4][3][2]) {
+ tint_symbol_7(buffer, (offset + 0u), value[0u]);
+ tint_symbol_7(buffer, (offset + 24u), value[1u]);
+ tint_symbol_7(buffer, (offset + 48u), value[2u]);
+ tint_symbol_7(buffer, (offset + 72u), value[3u]);
+}
+
+static int src_private[4];
+groupshared int src_workgroup[4];
+ConstantBuffer<S> src_uniform : register(b0, space0);
+RWByteAddressBuffer src_storage : register(u1, space0);
+RWByteAddressBuffer tint_symbol : register(u2, space0);
+RWByteAddressBuffer dst_nested : register(u3, space0);
+
+int[4] ret_arr() {
+ const int tint_symbol_10[4] = {0, 0, 0, 0};
+ return tint_symbol_10;
+}
+S ret_struct_arr() {
+ const S tint_symbol_11 = {{0, 0, 0, 0}};
+ return tint_symbol_11;
+}
+void foo(int src_param[4]) {
+ int src_function[4] = {0, 0, 0, 0};
+ const int tint_symbol_12[4] = {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 int src_let[4] = {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);
+ tint_symbol_4(tint_symbol, 0u, src_workgroup);
+ tint_symbol_4(tint_symbol, 0u, ret_struct_arr().arr);
+ tint_symbol_4(tint_symbol, 0u, src_uniform.arr);
+ tint_symbol_4(tint_symbol, 0u, tint_symbol_2(src_storage, 0u));
+ int src_nested[4][3][2] = {{{0, 0}, {0, 0}, {0, 0}}, {{0, 0}, {0, 0}, {0, 0}}, {{0, 0}, {0, 0}, {0, 0}}, {{0, 0}, {0, 0}, {0, 0}}};
+ tint_symbol_8(dst_nested, 0u, src_nested);
+}
+
+tint_4gsbi1:10:62: error: brackets are not allowed here; to declare an array, place the brackets after the name
+int[4] tint_symbol_2(RWByteAddressBuffer buffer, uint offset) {
+ ~~~ ^
+ [4]
+tint_4gsbi1:44:17: error: brackets are not allowed here; to declare an array, place the brackets after the name
+int[4] ret_arr() {
+ ~~~ ^
+ [4]
+
diff --git a/test/array/assign_to_subexpr.wgsl.expected.hlsl b/test/array/assign_to_subexpr.wgsl.expected.hlsl
index 4d2b005..ff919f6 100644
--- a/test/array/assign_to_subexpr.wgsl.expected.hlsl
+++ b/test/array/assign_to_subexpr.wgsl.expected.hlsl
@@ -1,3 +1,8 @@
+[numthreads(1, 1, 1)]
+void unused_entry_point() {
+ return;
+}
+
struct S {
int arr[4];
};
@@ -13,9 +18,3 @@
dst_struct.arr = src;
dst_array[0] = src;
}
-
-[numthreads(1, 1, 1)]
-void unused_entry_point() {
- return;
-}
-
diff --git a/test/array/assign_to_workgroup_var.wgsl.expected.hlsl b/test/array/assign_to_workgroup_var.wgsl.expected.hlsl
index 7d6165e..9f61247 100644
--- a/test/array/assign_to_workgroup_var.wgsl.expected.hlsl
+++ b/test/array/assign_to_workgroup_var.wgsl.expected.hlsl
@@ -1 +1,61 @@
-SKIP: crbug.com/tint/845
+SKIP: FAILED
+
+
+
+Validation Failure:
+[numthreads(1, 1, 1)]
+void unused_entry_point() {
+ return;
+}
+
+struct S {
+ int arr[4];
+};
+
+int[4] tint_symbol_2(RWByteAddressBuffer buffer, uint offset) {
+ const int tint_symbol_3[4] = {asint(buffer.Load((offset + 0u))), asint(buffer.Load((offset + 16u))), asint(buffer.Load((offset + 32u))), asint(buffer.Load((offset + 48u)))};
+ return tint_symbol_3;
+}
+
+static int src_private[4];
+groupshared int src_workgroup[4];
+ConstantBuffer<S> src_uniform : register(b0, space0);
+RWByteAddressBuffer src_storage : register(u1, space0);
+groupshared int tint_symbol[4];
+groupshared int dst_nested[4][3][2];
+
+int[4] ret_arr() {
+ const int tint_symbol_4[4] = {0, 0, 0, 0};
+ return tint_symbol_4;
+}
+S ret_struct_arr() {
+ const S tint_symbol_5 = {{0, 0, 0, 0}};
+ return tint_symbol_5;
+}
+void foo(int src_param[4]) {
+ int src_function[4] = {0, 0, 0, 0};
+ const int tint_symbol_6[4] = {1, 2, 3, 3};
+ tint_symbol = tint_symbol_6;
+ tint_symbol = src_param;
+ tint_symbol = ret_arr();
+ const int src_let[4] = {0, 0, 0, 0};
+ tint_symbol = src_let;
+ tint_symbol = src_function;
+ tint_symbol = src_private;
+ tint_symbol = src_workgroup;
+ tint_symbol = ret_struct_arr().arr;
+ tint_symbol = src_uniform.arr;
+ tint_symbol = tint_symbol_2(src_storage, 0u);
+ int src_nested[4][3][2] = {{{0, 0}, {0, 0}, {0, 0}}, {{0, 0}, {0, 0}, {0, 0}}, {{0, 0}, {0, 0}, {0, 0}}, {{0, 0}, {0, 0}, {0, 0}}};
+ dst_nested = src_nested;
+}
+
+tint_atjMoG:10:62: error: brackets are not allowed here; to declare an array, place the brackets after the name
+int[4] tint_symbol_2(RWByteAddressBuffer buffer, uint offset) {
+ ~~~ ^
+ [4]
+tint_atjMoG:22:17: error: brackets are not allowed here; to declare an array, place the brackets after the name
+int[4] ret_arr() {
+ ~~~ ^
+ [4]
+
diff --git a/test/array/function_parameter.wgsl.expected.hlsl b/test/array/function_parameter.wgsl.expected.hlsl
index 028cce9..3ad8519 100644
--- a/test/array/function_parameter.wgsl.expected.hlsl
+++ b/test/array/function_parameter.wgsl.expected.hlsl
@@ -20,4 +20,3 @@
const float v3 = f3(a3);
return;
}
-
diff --git a/test/array/function_return_type.wgsl.expected.hlsl b/test/array/function_return_type.wgsl.expected.hlsl
index 7d6165e..779a2f3 100644
--- a/test/array/function_return_type.wgsl.expected.hlsl
+++ b/test/array/function_return_type.wgsl.expected.hlsl
@@ -1 +1,38 @@
-SKIP: crbug.com/tint/845
+SKIP: FAILED
+
+
+
+Validation Failure:
+float[4] f1() {
+ const float tint_symbol[4] = {0.0f, 0.0f, 0.0f, 0.0f};
+ return tint_symbol;
+}
+float[3][4] f2() {
+ const float tint_symbol_1[3][4] = {f1(), f1(), f1()};
+ return tint_symbol_1;
+}
+float[2][3][4] f3() {
+ const float tint_symbol_2[2][3][4] = {f2(), f2()};
+ return tint_symbol_2;
+}
+[numthreads(1, 1, 1)]
+void main() {
+ const float a1[4] = f1();
+ const float a2[3][4] = f2();
+ const float a3[2][3][4] = f3();
+ return;
+}
+
+tint_gQgfKR:1:14: error: brackets are not allowed here; to declare an array, place the brackets after the name
+float[4] f1() {
+ ~~~ ^
+ [4]
+tint_gQgfKR:5:17: error: brackets are not allowed here; to declare an array, place the brackets after the name
+float[3][4] f2() {
+ ~~~~~~ ^
+ [3][4]
+tint_gQgfKR:9:20: error: brackets are not allowed here; to declare an array, place the brackets after the name
+float[2][3][4] f3() {
+ ~~~~~~~~~ ^
+ [2][3][4]
+
diff --git a/test/array/type_constructor.wgsl.expected.hlsl b/test/array/type_constructor.wgsl.expected.hlsl
index a9bfe1e..3a9ad86 100644
--- a/test/array/type_constructor.wgsl.expected.hlsl
+++ b/test/array/type_constructor.wgsl.expected.hlsl
@@ -35,4 +35,3 @@
const int subexpr_nested_nonempty_with_expr[4] = tint_symbol_19[1];
return;
}
-
