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_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]
+
