test/tint: Update SKIP "expectations"

Change-Id: I131522625051426e93624fbe4f4763071f26ad72
Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/122202
Reviewed-by: Dan Sinclair <dsinclair@chromium.org>
Commit-Queue: Ben Clayton <bclayton@chromium.org>
Kokoro: Kokoro <noreply+kokoro@google.com>

test/tint/buffer/uniform/std140/array/mat2x3_f16/dynamic_index_via_ptr.wgsl.expected.fxc.hlsl

@@ -10,26 +10,26 @@ int i() {
   return counter;
 }
 
-matrix<float16_t, 2, 3> tint_symbol_1(uint4 buffer[4], uint offset) {
+matrix<float16_t, 2, 3> a_load_1(uint offset) {
   const uint scalar_offset = ((offset + 0u)) / 4;
-  uint4 ubo_load_1 = buffer[scalar_offset / 4];
+  uint4 ubo_load_1 = a[scalar_offset / 4];
   uint2 ubo_load = ((scalar_offset & 2) ? ubo_load_1.zw : ubo_load_1.xy);
   vector<float16_t, 2> ubo_load_xz = vector<float16_t, 2>(f16tof32(ubo_load & 0xFFFF));
   float16_t ubo_load_y = f16tof32(ubo_load[0] >> 16);
   const uint scalar_offset_1 = ((offset + 8u)) / 4;
-  uint4 ubo_load_3 = buffer[scalar_offset_1 / 4];
+  uint4 ubo_load_3 = a[scalar_offset_1 / 4];
   uint2 ubo_load_2 = ((scalar_offset_1 & 2) ? ubo_load_3.zw : ubo_load_3.xy);
   vector<float16_t, 2> ubo_load_2_xz = vector<float16_t, 2>(f16tof32(ubo_load_2 & 0xFFFF));
   float16_t ubo_load_2_y = f16tof32(ubo_load_2[0] >> 16);
   return matrix<float16_t, 2, 3>(vector<float16_t, 3>(ubo_load_xz[0], ubo_load_y, ubo_load_xz[1]), vector<float16_t, 3>(ubo_load_2_xz[0], ubo_load_2_y, ubo_load_2_xz[1]));
 }
 
-typedef matrix<float16_t, 2, 3> tint_symbol_ret[4];
-tint_symbol_ret tint_symbol(uint4 buffer[4], uint offset) {
+typedef matrix<float16_t, 2, 3> a_load_ret[4];
+a_load_ret a_load(uint offset) {
   matrix<float16_t, 2, 3> arr[4] = (matrix<float16_t, 2, 3>[4])0;
   {
     for(uint i_1 = 0u; (i_1 < 4u); i_1 = (i_1 + 1u)) {
-      arr[i_1] = tint_symbol_1(buffer, (offset + (i_1 * 16u)));
+      arr[i_1] = a_load_1((offset + (i_1 * 16u)));
     }
   }
   return arr;
@@ -39,8 +39,8 @@ tint_symbol_ret tint_symbol(uint4 buffer[4], uint offset) {
 void f() {
   const int p_a_i_save = i();
   const int p_a_i_i_save = i();
-  const matrix<float16_t, 2, 3> l_a[4] = tint_symbol(a, 0u);
-  const matrix<float16_t, 2, 3> l_a_i = tint_symbol_1(a, (16u * uint(p_a_i_save)));
+  const matrix<float16_t, 2, 3> l_a[4] = a_load(0u);
+  const matrix<float16_t, 2, 3> l_a_i = a_load_1((16u * uint(p_a_i_save)));
   const uint scalar_offset_2 = (((16u * uint(p_a_i_save)) + (8u * uint(p_a_i_i_save)))) / 4;
   uint4 ubo_load_5 = a[scalar_offset_2 / 4];
   uint2 ubo_load_4 = ((scalar_offset_2 & 2) ? ubo_load_5.zw : ubo_load_5.xy);
@@ -49,6 +49,3 @@ void f() {
   const vector<float16_t, 3> l_a_i_i = vector<float16_t, 3>(ubo_load_4_xz[0], ubo_load_4_y, ubo_load_4_xz[1]);
   return;
 }
-FXC validation failure:
-D:\Projects\RampUp\dawn\test\tint\buffer\Shader@0x000001F4D5AC4540(11,8-16): error X3000: syntax error: unexpected token 'float16_t'
-

test/tint/buffer/uniform/std140/array/mat2x3_f16/static_index_via_ptr.wgsl.expected.fxc.hlsl

@@ -4,26 +4,26 @@ cbuffer cbuffer_a : register(b0, space0) {
   uint4 a[4];
 };
 
-matrix<float16_t, 2, 3> tint_symbol_1(uint4 buffer[4], uint offset) {
+matrix<float16_t, 2, 3> a_load_1(uint offset) {
   const uint scalar_offset = ((offset + 0u)) / 4;
-  uint4 ubo_load_1 = buffer[scalar_offset / 4];
+  uint4 ubo_load_1 = a[scalar_offset / 4];
   uint2 ubo_load = ((scalar_offset & 2) ? ubo_load_1.zw : ubo_load_1.xy);
   vector<float16_t, 2> ubo_load_xz = vector<float16_t, 2>(f16tof32(ubo_load & 0xFFFF));
   float16_t ubo_load_y = f16tof32(ubo_load[0] >> 16);
   const uint scalar_offset_1 = ((offset + 8u)) / 4;
-  uint4 ubo_load_3 = buffer[scalar_offset_1 / 4];
+  uint4 ubo_load_3 = a[scalar_offset_1 / 4];
   uint2 ubo_load_2 = ((scalar_offset_1 & 2) ? ubo_load_3.zw : ubo_load_3.xy);
   vector<float16_t, 2> ubo_load_2_xz = vector<float16_t, 2>(f16tof32(ubo_load_2 & 0xFFFF));
   float16_t ubo_load_2_y = f16tof32(ubo_load_2[0] >> 16);
   return matrix<float16_t, 2, 3>(vector<float16_t, 3>(ubo_load_xz[0], ubo_load_y, ubo_load_xz[1]), vector<float16_t, 3>(ubo_load_2_xz[0], ubo_load_2_y, ubo_load_2_xz[1]));
 }
 
-typedef matrix<float16_t, 2, 3> tint_symbol_ret[4];
-tint_symbol_ret tint_symbol(uint4 buffer[4], uint offset) {
+typedef matrix<float16_t, 2, 3> a_load_ret[4];
+a_load_ret a_load(uint offset) {
   matrix<float16_t, 2, 3> arr[4] = (matrix<float16_t, 2, 3>[4])0;
   {
     for(uint i = 0u; (i < 4u); i = (i + 1u)) {
-      arr[i] = tint_symbol_1(buffer, (offset + (i * 16u)));
+      arr[i] = a_load_1((offset + (i * 16u)));
     }
   }
   return arr;
@@ -31,14 +31,11 @@ tint_symbol_ret tint_symbol(uint4 buffer[4], uint offset) {
 
 [numthreads(1, 1, 1)]
 void f() {
-  const matrix<float16_t, 2, 3> l_a[4] = tint_symbol(a, 0u);
-  const matrix<float16_t, 2, 3> l_a_i = tint_symbol_1(a, 32u);
+  const matrix<float16_t, 2, 3> l_a[4] = a_load(0u);
+  const matrix<float16_t, 2, 3> l_a_i = a_load_1(32u);
   uint2 ubo_load_4 = a[2].zw;
   vector<float16_t, 2> ubo_load_4_xz = vector<float16_t, 2>(f16tof32(ubo_load_4 & 0xFFFF));
   float16_t ubo_load_4_y = f16tof32(ubo_load_4[0] >> 16);
   const vector<float16_t, 3> l_a_i_i = vector<float16_t, 3>(ubo_load_4_xz[0], ubo_load_4_y, ubo_load_4_xz[1]);
   return;
 }
-FXC validation failure:
-D:\Projects\RampUp\dawn\test\tint\buffer\Shader@0x0000016DBC7DD4E0(5,8-16): error X3000: syntax error: unexpected token 'float16_t'
-

test/tint/buffer/uniform/std140/array/mat2x3_f16/to_builtin.wgsl.expected.fxc.hlsl

@@ -4,14 +4,14 @@ cbuffer cbuffer_u : register(b0, space0) {
   uint4 u[4];
 };
 
-matrix<float16_t, 2, 3> tint_symbol(uint4 buffer[4], uint offset) {
+matrix<float16_t, 2, 3> u_load(uint offset) {
   const uint scalar_offset = ((offset + 0u)) / 4;
-  uint4 ubo_load_1 = buffer[scalar_offset / 4];
+  uint4 ubo_load_1 = u[scalar_offset / 4];
   uint2 ubo_load = ((scalar_offset & 2) ? ubo_load_1.zw : ubo_load_1.xy);
   vector<float16_t, 2> ubo_load_xz = vector<float16_t, 2>(f16tof32(ubo_load & 0xFFFF));
   float16_t ubo_load_y = f16tof32(ubo_load[0] >> 16);
   const uint scalar_offset_1 = ((offset + 8u)) / 4;
-  uint4 ubo_load_3 = buffer[scalar_offset_1 / 4];
+  uint4 ubo_load_3 = u[scalar_offset_1 / 4];
   uint2 ubo_load_2 = ((scalar_offset_1 & 2) ? ubo_load_3.zw : ubo_load_3.xy);
   vector<float16_t, 2> ubo_load_2_xz = vector<float16_t, 2>(f16tof32(ubo_load_2 & 0xFFFF));
   float16_t ubo_load_2_y = f16tof32(ubo_load_2[0] >> 16);
@@ -20,7 +20,7 @@ matrix<float16_t, 2, 3> tint_symbol(uint4 buffer[4], uint offset) {
 
 [numthreads(1, 1, 1)]
 void f() {
-  const matrix<float16_t, 3, 2> t = transpose(tint_symbol(u, 32u));
+  const matrix<float16_t, 3, 2> t = transpose(u_load(32u));
   uint2 ubo_load_4 = u[0].zw;
   vector<float16_t, 2> ubo_load_4_xz = vector<float16_t, 2>(f16tof32(ubo_load_4 & 0xFFFF));
   float16_t ubo_load_4_y = f16tof32(ubo_load_4[0] >> 16);
@@ -31,6 +31,3 @@ void f() {
   const float16_t a = abs(vector<float16_t, 3>(ubo_load_5_xz[0], ubo_load_5_y, ubo_load_5_xz[1]).zxy.x);
   return;
 }
-FXC validation failure:
-D:\Projects\RampUp\dawn\test\tint\buffer\Shader@0x000001B4475A47D0(5,8-16): error X3000: syntax error: unexpected token 'float16_t'
-

test/tint/buffer/uniform/std140/array/mat2x3_f16/to_fn.wgsl.expected.fxc.hlsl

@@ -16,26 +16,26 @@ void c(vector<float16_t, 3> v) {
 void d(float16_t f_1) {
 }
 
-matrix<float16_t, 2, 3> tint_symbol_1(uint4 buffer[4], uint offset) {
+matrix<float16_t, 2, 3> u_load_1(uint offset) {
   const uint scalar_offset = ((offset + 0u)) / 4;
-  uint4 ubo_load_1 = buffer[scalar_offset / 4];
+  uint4 ubo_load_1 = u[scalar_offset / 4];
   uint2 ubo_load = ((scalar_offset & 2) ? ubo_load_1.zw : ubo_load_1.xy);
   vector<float16_t, 2> ubo_load_xz = vector<float16_t, 2>(f16tof32(ubo_load & 0xFFFF));
   float16_t ubo_load_y = f16tof32(ubo_load[0] >> 16);
   const uint scalar_offset_1 = ((offset + 8u)) / 4;
-  uint4 ubo_load_3 = buffer[scalar_offset_1 / 4];
+  uint4 ubo_load_3 = u[scalar_offset_1 / 4];
   uint2 ubo_load_2 = ((scalar_offset_1 & 2) ? ubo_load_3.zw : ubo_load_3.xy);
   vector<float16_t, 2> ubo_load_2_xz = vector<float16_t, 2>(f16tof32(ubo_load_2 & 0xFFFF));
   float16_t ubo_load_2_y = f16tof32(ubo_load_2[0] >> 16);
   return matrix<float16_t, 2, 3>(vector<float16_t, 3>(ubo_load_xz[0], ubo_load_y, ubo_load_xz[1]), vector<float16_t, 3>(ubo_load_2_xz[0], ubo_load_2_y, ubo_load_2_xz[1]));
 }
 
-typedef matrix<float16_t, 2, 3> tint_symbol_ret[4];
-tint_symbol_ret tint_symbol(uint4 buffer[4], uint offset) {
+typedef matrix<float16_t, 2, 3> u_load_ret[4];
+u_load_ret u_load(uint offset) {
   matrix<float16_t, 2, 3> arr[4] = (matrix<float16_t, 2, 3>[4])0;
   {
     for(uint i = 0u; (i < 4u); i = (i + 1u)) {
-      arr[i] = tint_symbol_1(buffer, (offset + (i * 16u)));
+      arr[i] = u_load_1((offset + (i * 16u)));
     }
   }
   return arr;
@@ -43,8 +43,8 @@ tint_symbol_ret tint_symbol(uint4 buffer[4], uint offset) {
 
 [numthreads(1, 1, 1)]
 void f() {
-  a(tint_symbol(u, 0u));
-  b(tint_symbol_1(u, 16u));
+  a(u_load(0u));
+  b(u_load_1(16u));
   uint2 ubo_load_4 = u[1].xy;
   vector<float16_t, 2> ubo_load_4_xz = vector<float16_t, 2>(f16tof32(ubo_load_4 & 0xFFFF));
   float16_t ubo_load_4_y = f16tof32(ubo_load_4[0] >> 16);
@@ -55,9 +55,3 @@ void f() {
   d(vector<float16_t, 3>(ubo_load_5_xz[0], ubo_load_5_y, ubo_load_5_xz[1]).zxy.x);
   return;
 }
-FXC validation failure:
-D:\Projects\RampUp\dawn\test\tint\buffer\Shader@0x000002290980B6C0(5,15-23): error X3000: syntax error: unexpected token 'float16_t'
-D:\Projects\RampUp\dawn\test\tint\buffer\Shader@0x000002290980B6C0(8,15-23): error X3000: syntax error: unexpected token 'float16_t'
-D:\Projects\RampUp\dawn\test\tint\buffer\Shader@0x000002290980B6C0(11,15-23): error X3000: syntax error: unexpected token 'float16_t'
-D:\Projects\RampUp\dawn\test\tint\buffer\Shader@0x000002290980B6C0(14,8-16): error X3000: unrecognized identifier 'float16_t'
-

test/tint/buffer/uniform/std140/array/mat2x3_f16/to_private.wgsl.expected.fxc.hlsl

@@ -5,26 +5,26 @@ cbuffer cbuffer_u : register(b0, space0) {
 };
 static matrix<float16_t, 2, 3> p[4] = (matrix<float16_t, 2, 3>[4])0;
 
-matrix<float16_t, 2, 3> tint_symbol_1(uint4 buffer[4], uint offset) {
+matrix<float16_t, 2, 3> u_load_1(uint offset) {
   const uint scalar_offset = ((offset + 0u)) / 4;
-  uint4 ubo_load_1 = buffer[scalar_offset / 4];
+  uint4 ubo_load_1 = u[scalar_offset / 4];
   uint2 ubo_load = ((scalar_offset & 2) ? ubo_load_1.zw : ubo_load_1.xy);
   vector<float16_t, 2> ubo_load_xz = vector<float16_t, 2>(f16tof32(ubo_load & 0xFFFF));
   float16_t ubo_load_y = f16tof32(ubo_load[0] >> 16);
   const uint scalar_offset_1 = ((offset + 8u)) / 4;
-  uint4 ubo_load_3 = buffer[scalar_offset_1 / 4];
+  uint4 ubo_load_3 = u[scalar_offset_1 / 4];
   uint2 ubo_load_2 = ((scalar_offset_1 & 2) ? ubo_load_3.zw : ubo_load_3.xy);
   vector<float16_t, 2> ubo_load_2_xz = vector<float16_t, 2>(f16tof32(ubo_load_2 & 0xFFFF));
   float16_t ubo_load_2_y = f16tof32(ubo_load_2[0] >> 16);
   return matrix<float16_t, 2, 3>(vector<float16_t, 3>(ubo_load_xz[0], ubo_load_y, ubo_load_xz[1]), vector<float16_t, 3>(ubo_load_2_xz[0], ubo_load_2_y, ubo_load_2_xz[1]));
 }
 
-typedef matrix<float16_t, 2, 3> tint_symbol_ret[4];
-tint_symbol_ret tint_symbol(uint4 buffer[4], uint offset) {
+typedef matrix<float16_t, 2, 3> u_load_ret[4];
+u_load_ret u_load(uint offset) {
   matrix<float16_t, 2, 3> arr[4] = (matrix<float16_t, 2, 3>[4])0;
   {
     for(uint i = 0u; (i < 4u); i = (i + 1u)) {
-      arr[i] = tint_symbol_1(buffer, (offset + (i * 16u)));
+      arr[i] = u_load_1((offset + (i * 16u)));
     }
   }
   return arr;
@@ -32,8 +32,8 @@ tint_symbol_ret tint_symbol(uint4 buffer[4], uint offset) {
 
 [numthreads(1, 1, 1)]
 void f() {
-  p = tint_symbol(u, 0u);
-  p[1] = tint_symbol_1(u, 32u);
+  p = u_load(0u);
+  p[1] = u_load_1(32u);
   uint2 ubo_load_4 = u[0].zw;
   vector<float16_t, 2> ubo_load_4_xz = vector<float16_t, 2>(f16tof32(ubo_load_4 & 0xFFFF));
   float16_t ubo_load_4_y = f16tof32(ubo_load_4[0] >> 16);
@@ -41,6 +41,3 @@ void f() {
   p[1][0].x = float16_t(f16tof32(((u[0].z) & 0xFFFF)));
   return;
 }
-FXC validation failure:
-D:\Projects\RampUp\dawn\test\tint\buffer\Shader@0x000001C62197B570(4,15-23): error X3000: syntax error: unexpected token 'float16_t'
-

test/tint/buffer/uniform/std140/array/mat2x3_f16/to_storage.wgsl.expected.fxc.hlsl

@@ -5,40 +5,40 @@ cbuffer cbuffer_u : register(b0, space0) {
 };
 RWByteAddressBuffer s : register(u1, space0);
 
-void tint_symbol_1(RWByteAddressBuffer buffer, uint offset, matrix<float16_t, 2, 3> value) {
-  buffer.Store<vector<float16_t, 3> >((offset + 0u), value[0u]);
-  buffer.Store<vector<float16_t, 3> >((offset + 8u), value[1u]);
+void s_store_1(uint offset, matrix<float16_t, 2, 3> value) {
+  s.Store<vector<float16_t, 3> >((offset + 0u), value[0u]);
+  s.Store<vector<float16_t, 3> >((offset + 8u), value[1u]);
 }
 
-void tint_symbol(RWByteAddressBuffer buffer, uint offset, matrix<float16_t, 2, 3> value[4]) {
-  matrix<float16_t, 2, 3> array[4] = value;
+void s_store(uint offset, matrix<float16_t, 2, 3> value[4]) {
+  matrix<float16_t, 2, 3> array_1[4] = value;
   {
     for(uint i = 0u; (i < 4u); i = (i + 1u)) {
-      tint_symbol_1(buffer, (offset + (i * 16u)), array[i]);
+      s_store_1((offset + (i * 16u)), array_1[i]);
     }
   }
 }
 
-matrix<float16_t, 2, 3> tint_symbol_4(uint4 buffer[4], uint offset) {
+matrix<float16_t, 2, 3> u_load_1(uint offset) {
   const uint scalar_offset = ((offset + 0u)) / 4;
-  uint4 ubo_load_1 = buffer[scalar_offset / 4];
+  uint4 ubo_load_1 = u[scalar_offset / 4];
   uint2 ubo_load = ((scalar_offset & 2) ? ubo_load_1.zw : ubo_load_1.xy);
   vector<float16_t, 2> ubo_load_xz = vector<float16_t, 2>(f16tof32(ubo_load & 0xFFFF));
   float16_t ubo_load_y = f16tof32(ubo_load[0] >> 16);
   const uint scalar_offset_1 = ((offset + 8u)) / 4;
-  uint4 ubo_load_3 = buffer[scalar_offset_1 / 4];
+  uint4 ubo_load_3 = u[scalar_offset_1 / 4];
   uint2 ubo_load_2 = ((scalar_offset_1 & 2) ? ubo_load_3.zw : ubo_load_3.xy);
   vector<float16_t, 2> ubo_load_2_xz = vector<float16_t, 2>(f16tof32(ubo_load_2 & 0xFFFF));
   float16_t ubo_load_2_y = f16tof32(ubo_load_2[0] >> 16);
   return matrix<float16_t, 2, 3>(vector<float16_t, 3>(ubo_load_xz[0], ubo_load_y, ubo_load_xz[1]), vector<float16_t, 3>(ubo_load_2_xz[0], ubo_load_2_y, ubo_load_2_xz[1]));
 }
 
-typedef matrix<float16_t, 2, 3> tint_symbol_3_ret[4];
-tint_symbol_3_ret tint_symbol_3(uint4 buffer[4], uint offset) {
+typedef matrix<float16_t, 2, 3> u_load_ret[4];
+u_load_ret u_load(uint offset) {
   matrix<float16_t, 2, 3> arr[4] = (matrix<float16_t, 2, 3>[4])0;
   {
     for(uint i_1 = 0u; (i_1 < 4u); i_1 = (i_1 + 1u)) {
-      arr[i_1] = tint_symbol_4(buffer, (offset + (i_1 * 16u)));
+      arr[i_1] = u_load_1((offset + (i_1 * 16u)));
     }
   }
   return arr;
@@ -46,8 +46,8 @@ tint_symbol_3_ret tint_symbol_3(uint4 buffer[4], uint offset) {
 
 [numthreads(1, 1, 1)]
 void f() {
-  tint_symbol(s, 0u, tint_symbol_3(u, 0u));
-  tint_symbol_1(s, 16u, tint_symbol_4(u, 32u));
+  s_store(0u, u_load(0u));
+  s_store_1(16u, u_load_1(32u));
   uint2 ubo_load_4 = u[0].zw;
   vector<float16_t, 2> ubo_load_4_xz = vector<float16_t, 2>(f16tof32(ubo_load_4 & 0xFFFF));
   float16_t ubo_load_4_y = f16tof32(ubo_load_4[0] >> 16);
@@ -55,7 +55,3 @@ void f() {
   s.Store<float16_t>(16u, float16_t(f16tof32(((u[0].z) & 0xFFFF))));
   return;
 }
-FXC validation failure:
-D:\Projects\RampUp\dawn\test\tint\buffer\Shader@0x000001AB590A03F0(6,68-76): error X3000: syntax error: unexpected token 'float16_t'
-D:\Projects\RampUp\dawn\test\tint\buffer\Shader@0x000001AB590A03F0(7,3-14): error X3018: invalid subscript 'Store'
-

test/tint/buffer/uniform/std140/array/mat2x3_f16/to_workgroup.wgsl.expected.fxc.hlsl

@@ -9,26 +9,26 @@ struct tint_symbol_1 {
   uint local_invocation_index : SV_GroupIndex;
 };
 
-matrix<float16_t, 2, 3> tint_symbol_3(uint4 buffer[4], uint offset) {
+matrix<float16_t, 2, 3> u_load_1(uint offset) {
   const uint scalar_offset = ((offset + 0u)) / 4;
-  uint4 ubo_load_1 = buffer[scalar_offset / 4];
+  uint4 ubo_load_1 = u[scalar_offset / 4];
   uint2 ubo_load = ((scalar_offset & 2) ? ubo_load_1.zw : ubo_load_1.xy);
   vector<float16_t, 2> ubo_load_xz = vector<float16_t, 2>(f16tof32(ubo_load & 0xFFFF));
   float16_t ubo_load_y = f16tof32(ubo_load[0] >> 16);
   const uint scalar_offset_1 = ((offset + 8u)) / 4;
-  uint4 ubo_load_3 = buffer[scalar_offset_1 / 4];
+  uint4 ubo_load_3 = u[scalar_offset_1 / 4];
   uint2 ubo_load_2 = ((scalar_offset_1 & 2) ? ubo_load_3.zw : ubo_load_3.xy);
   vector<float16_t, 2> ubo_load_2_xz = vector<float16_t, 2>(f16tof32(ubo_load_2 & 0xFFFF));
   float16_t ubo_load_2_y = f16tof32(ubo_load_2[0] >> 16);
   return matrix<float16_t, 2, 3>(vector<float16_t, 3>(ubo_load_xz[0], ubo_load_y, ubo_load_xz[1]), vector<float16_t, 3>(ubo_load_2_xz[0], ubo_load_2_y, ubo_load_2_xz[1]));
 }
 
-typedef matrix<float16_t, 2, 3> tint_symbol_2_ret[4];
-tint_symbol_2_ret tint_symbol_2(uint4 buffer[4], uint offset) {
+typedef matrix<float16_t, 2, 3> u_load_ret[4];
+u_load_ret u_load(uint offset) {
   matrix<float16_t, 2, 3> arr[4] = (matrix<float16_t, 2, 3>[4])0;
   {
     for(uint i_1 = 0u; (i_1 < 4u); i_1 = (i_1 + 1u)) {
-      arr[i_1] = tint_symbol_3(buffer, (offset + (i_1 * 16u)));
+      arr[i_1] = u_load_1((offset + (i_1 * 16u)));
     }
   }
   return arr;
@@ -42,8 +42,8 @@ void f_inner(uint local_invocation_index) {
     }
   }
   GroupMemoryBarrierWithGroupSync();
-  w = tint_symbol_2(u, 0u);
-  w[1] = tint_symbol_3(u, 32u);
+  w = u_load(0u);
+  w[1] = u_load_1(32u);
   uint2 ubo_load_4 = u[0].zw;
   vector<float16_t, 2> ubo_load_4_xz = vector<float16_t, 2>(f16tof32(ubo_load_4 & 0xFFFF));
   float16_t ubo_load_4_y = f16tof32(ubo_load_4[0] >> 16);
@@ -56,6 +56,3 @@ void f(tint_symbol_1 tint_symbol) {
   f_inner(tint_symbol.local_invocation_index);
   return;
 }
-FXC validation failure:
-D:\Projects\RampUp\dawn\test\tint\buffer\Shader@0x0000019397EFCDD0(4,20-28): error X3000: syntax error: unexpected token 'float16_t'
-

test/tint/buffer/uniform/std140/array/mat2x4_f16/dynamic_index_via_ptr.wgsl.expected.fxc.hlsl

@@ -10,26 +10,26 @@ int i() {
   return counter;
 }
 
-matrix<float16_t, 2, 4> tint_symbol_1(uint4 buffer[4], uint offset) {
+matrix<float16_t, 2, 4> a_load_1(uint offset) {
   const uint scalar_offset = ((offset + 0u)) / 4;
-  uint4 ubo_load_1 = buffer[scalar_offset / 4];
+  uint4 ubo_load_1 = a[scalar_offset / 4];
   uint2 ubo_load = ((scalar_offset & 2) ? ubo_load_1.zw : ubo_load_1.xy);
   vector<float16_t, 2> ubo_load_xz = vector<float16_t, 2>(f16tof32(ubo_load & 0xFFFF));
   vector<float16_t, 2> ubo_load_yw = vector<float16_t, 2>(f16tof32(ubo_load >> 16));
   const uint scalar_offset_1 = ((offset + 8u)) / 4;
-  uint4 ubo_load_3 = buffer[scalar_offset_1 / 4];
+  uint4 ubo_load_3 = a[scalar_offset_1 / 4];
   uint2 ubo_load_2 = ((scalar_offset_1 & 2) ? ubo_load_3.zw : ubo_load_3.xy);
   vector<float16_t, 2> ubo_load_2_xz = vector<float16_t, 2>(f16tof32(ubo_load_2 & 0xFFFF));
   vector<float16_t, 2> ubo_load_2_yw = vector<float16_t, 2>(f16tof32(ubo_load_2 >> 16));
   return matrix<float16_t, 2, 4>(vector<float16_t, 4>(ubo_load_xz[0], ubo_load_yw[0], ubo_load_xz[1], ubo_load_yw[1]), vector<float16_t, 4>(ubo_load_2_xz[0], ubo_load_2_yw[0], ubo_load_2_xz[1], ubo_load_2_yw[1]));
 }
 
-typedef matrix<float16_t, 2, 4> tint_symbol_ret[4];
-tint_symbol_ret tint_symbol(uint4 buffer[4], uint offset) {
+typedef matrix<float16_t, 2, 4> a_load_ret[4];
+a_load_ret a_load(uint offset) {
   matrix<float16_t, 2, 4> arr[4] = (matrix<float16_t, 2, 4>[4])0;
   {
     for(uint i_1 = 0u; (i_1 < 4u); i_1 = (i_1 + 1u)) {
-      arr[i_1] = tint_symbol_1(buffer, (offset + (i_1 * 16u)));
+      arr[i_1] = a_load_1((offset + (i_1 * 16u)));
     }
   }
   return arr;
@@ -39,8 +39,8 @@ tint_symbol_ret tint_symbol(uint4 buffer[4], uint offset) {
 void f() {
   const int p_a_i_save = i();
   const int p_a_i_i_save = i();
-  const matrix<float16_t, 2, 4> l_a[4] = tint_symbol(a, 0u);
-  const matrix<float16_t, 2, 4> l_a_i = tint_symbol_1(a, (16u * uint(p_a_i_save)));
+  const matrix<float16_t, 2, 4> l_a[4] = a_load(0u);
+  const matrix<float16_t, 2, 4> l_a_i = a_load_1((16u * uint(p_a_i_save)));
   const uint scalar_offset_2 = (((16u * uint(p_a_i_save)) + (8u * uint(p_a_i_i_save)))) / 4;
   uint4 ubo_load_5 = a[scalar_offset_2 / 4];
   uint2 ubo_load_4 = ((scalar_offset_2 & 2) ? ubo_load_5.zw : ubo_load_5.xy);
@@ -49,6 +49,3 @@ void f() {
   const vector<float16_t, 4> l_a_i_i = vector<float16_t, 4>(ubo_load_4_xz[0], ubo_load_4_yw[0], ubo_load_4_xz[1], ubo_load_4_yw[1]);
   return;
 }
-FXC validation failure:
-D:\Projects\RampUp\dawn\test\tint\buffer\Shader@0x0000015AD15A89A0(11,8-16): error X3000: syntax error: unexpected token 'float16_t'
-

test/tint/buffer/uniform/std140/array/mat2x4_f16/static_index_via_ptr.wgsl.expected.fxc.hlsl

@@ -4,26 +4,26 @@ cbuffer cbuffer_a : register(b0, space0) {
   uint4 a[4];
 };
 
-matrix<float16_t, 2, 4> tint_symbol_1(uint4 buffer[4], uint offset) {
+matrix<float16_t, 2, 4> a_load_1(uint offset) {
   const uint scalar_offset = ((offset + 0u)) / 4;
-  uint4 ubo_load_1 = buffer[scalar_offset / 4];
+  uint4 ubo_load_1 = a[scalar_offset / 4];
   uint2 ubo_load = ((scalar_offset & 2) ? ubo_load_1.zw : ubo_load_1.xy);
   vector<float16_t, 2> ubo_load_xz = vector<float16_t, 2>(f16tof32(ubo_load & 0xFFFF));
   vector<float16_t, 2> ubo_load_yw = vector<float16_t, 2>(f16tof32(ubo_load >> 16));
   const uint scalar_offset_1 = ((offset + 8u)) / 4;
-  uint4 ubo_load_3 = buffer[scalar_offset_1 / 4];
+  uint4 ubo_load_3 = a[scalar_offset_1 / 4];
   uint2 ubo_load_2 = ((scalar_offset_1 & 2) ? ubo_load_3.zw : ubo_load_3.xy);
   vector<float16_t, 2> ubo_load_2_xz = vector<float16_t, 2>(f16tof32(ubo_load_2 & 0xFFFF));
   vector<float16_t, 2> ubo_load_2_yw = vector<float16_t, 2>(f16tof32(ubo_load_2 >> 16));
   return matrix<float16_t, 2, 4>(vector<float16_t, 4>(ubo_load_xz[0], ubo_load_yw[0], ubo_load_xz[1], ubo_load_yw[1]), vector<float16_t, 4>(ubo_load_2_xz[0], ubo_load_2_yw[0], ubo_load_2_xz[1], ubo_load_2_yw[1]));
 }
 
-typedef matrix<float16_t, 2, 4> tint_symbol_ret[4];
-tint_symbol_ret tint_symbol(uint4 buffer[4], uint offset) {
+typedef matrix<float16_t, 2, 4> a_load_ret[4];
+a_load_ret a_load(uint offset) {
   matrix<float16_t, 2, 4> arr[4] = (matrix<float16_t, 2, 4>[4])0;
   {
     for(uint i = 0u; (i < 4u); i = (i + 1u)) {
-      arr[i] = tint_symbol_1(buffer, (offset + (i * 16u)));
+      arr[i] = a_load_1((offset + (i * 16u)));
     }
   }
   return arr;
@@ -31,14 +31,11 @@ tint_symbol_ret tint_symbol(uint4 buffer[4], uint offset) {
 
 [numthreads(1, 1, 1)]
 void f() {
-  const matrix<float16_t, 2, 4> l_a[4] = tint_symbol(a, 0u);
-  const matrix<float16_t, 2, 4> l_a_i = tint_symbol_1(a, 32u);
+  const matrix<float16_t, 2, 4> l_a[4] = a_load(0u);
+  const matrix<float16_t, 2, 4> l_a_i = a_load_1(32u);
   uint2 ubo_load_4 = a[2].zw;
   vector<float16_t, 2> ubo_load_4_xz = vector<float16_t, 2>(f16tof32(ubo_load_4 & 0xFFFF));
   vector<float16_t, 2> ubo_load_4_yw = vector<float16_t, 2>(f16tof32(ubo_load_4 >> 16));
   const vector<float16_t, 4> l_a_i_i = vector<float16_t, 4>(ubo_load_4_xz[0], ubo_load_4_yw[0], ubo_load_4_xz[1], ubo_load_4_yw[1]);
   return;
 }
-FXC validation failure:
-D:\Projects\RampUp\dawn\test\tint\buffer\Shader@0x00000192D71EE4C0(5,8-16): error X3000: syntax error: unexpected token 'float16_t'
-

test/tint/buffer/uniform/std140/array/mat2x4_f16/to_builtin.wgsl.expected.fxc.hlsl

@@ -4,14 +4,14 @@ cbuffer cbuffer_u : register(b0, space0) {
   uint4 u[4];
 };
 
-matrix<float16_t, 2, 4> tint_symbol(uint4 buffer[4], uint offset) {
+matrix<float16_t, 2, 4> u_load(uint offset) {
   const uint scalar_offset = ((offset + 0u)) / 4;
-  uint4 ubo_load_1 = buffer[scalar_offset / 4];
+  uint4 ubo_load_1 = u[scalar_offset / 4];
   uint2 ubo_load = ((scalar_offset & 2) ? ubo_load_1.zw : ubo_load_1.xy);
   vector<float16_t, 2> ubo_load_xz = vector<float16_t, 2>(f16tof32(ubo_load & 0xFFFF));
   vector<float16_t, 2> ubo_load_yw = vector<float16_t, 2>(f16tof32(ubo_load >> 16));
   const uint scalar_offset_1 = ((offset + 8u)) / 4;
-  uint4 ubo_load_3 = buffer[scalar_offset_1 / 4];
+  uint4 ubo_load_3 = u[scalar_offset_1 / 4];
   uint2 ubo_load_2 = ((scalar_offset_1 & 2) ? ubo_load_3.zw : ubo_load_3.xy);
   vector<float16_t, 2> ubo_load_2_xz = vector<float16_t, 2>(f16tof32(ubo_load_2 & 0xFFFF));
   vector<float16_t, 2> ubo_load_2_yw = vector<float16_t, 2>(f16tof32(ubo_load_2 >> 16));
@@ -20,7 +20,7 @@ matrix<float16_t, 2, 4> tint_symbol(uint4 buffer[4], uint offset) {
 
 [numthreads(1, 1, 1)]
 void f() {
-  const matrix<float16_t, 4, 2> t = transpose(tint_symbol(u, 32u));
+  const matrix<float16_t, 4, 2> t = transpose(u_load(32u));
   uint2 ubo_load_4 = u[0].zw;
   vector<float16_t, 2> ubo_load_4_xz = vector<float16_t, 2>(f16tof32(ubo_load_4 & 0xFFFF));
   vector<float16_t, 2> ubo_load_4_yw = vector<float16_t, 2>(f16tof32(ubo_load_4 >> 16));
@@ -31,6 +31,3 @@ void f() {
   const float16_t a = abs(vector<float16_t, 4>(ubo_load_5_xz[0], ubo_load_5_yw[0], ubo_load_5_xz[1], ubo_load_5_yw[1]).ywxz.x);
   return;
 }
-FXC validation failure:
-D:\Projects\RampUp\dawn\test\tint\buffer\Shader@0x00000268E1507730(5,8-16): error X3000: syntax error: unexpected token 'float16_t'
-

test/tint/buffer/uniform/std140/array/mat2x4_f16/to_fn.wgsl.expected.fxc.hlsl

@@ -16,26 +16,26 @@ void c(vector<float16_t, 4> v) {
 void d(float16_t f_1) {
 }
 
-matrix<float16_t, 2, 4> tint_symbol_1(uint4 buffer[4], uint offset) {
+matrix<float16_t, 2, 4> u_load_1(uint offset) {
   const uint scalar_offset = ((offset + 0u)) / 4;
-  uint4 ubo_load_1 = buffer[scalar_offset / 4];
+  uint4 ubo_load_1 = u[scalar_offset / 4];
   uint2 ubo_load = ((scalar_offset & 2) ? ubo_load_1.zw : ubo_load_1.xy);
   vector<float16_t, 2> ubo_load_xz = vector<float16_t, 2>(f16tof32(ubo_load & 0xFFFF));
   vector<float16_t, 2> ubo_load_yw = vector<float16_t, 2>(f16tof32(ubo_load >> 16));
   const uint scalar_offset_1 = ((offset + 8u)) / 4;
-  uint4 ubo_load_3 = buffer[scalar_offset_1 / 4];
+  uint4 ubo_load_3 = u[scalar_offset_1 / 4];
   uint2 ubo_load_2 = ((scalar_offset_1 & 2) ? ubo_load_3.zw : ubo_load_3.xy);
   vector<float16_t, 2> ubo_load_2_xz = vector<float16_t, 2>(f16tof32(ubo_load_2 & 0xFFFF));
   vector<float16_t, 2> ubo_load_2_yw = vector<float16_t, 2>(f16tof32(ubo_load_2 >> 16));
   return matrix<float16_t, 2, 4>(vector<float16_t, 4>(ubo_load_xz[0], ubo_load_yw[0], ubo_load_xz[1], ubo_load_yw[1]), vector<float16_t, 4>(ubo_load_2_xz[0], ubo_load_2_yw[0], ubo_load_2_xz[1], ubo_load_2_yw[1]));
 }
 
-typedef matrix<float16_t, 2, 4> tint_symbol_ret[4];
-tint_symbol_ret tint_symbol(uint4 buffer[4], uint offset) {
+typedef matrix<float16_t, 2, 4> u_load_ret[4];
+u_load_ret u_load(uint offset) {
   matrix<float16_t, 2, 4> arr[4] = (matrix<float16_t, 2, 4>[4])0;
   {
     for(uint i = 0u; (i < 4u); i = (i + 1u)) {
-      arr[i] = tint_symbol_1(buffer, (offset + (i * 16u)));
+      arr[i] = u_load_1((offset + (i * 16u)));
     }
   }
   return arr;
@@ -43,8 +43,8 @@ tint_symbol_ret tint_symbol(uint4 buffer[4], uint offset) {
 
 [numthreads(1, 1, 1)]
 void f() {
-  a(tint_symbol(u, 0u));
-  b(tint_symbol_1(u, 16u));
+  a(u_load(0u));
+  b(u_load_1(16u));
   uint2 ubo_load_4 = u[1].xy;
   vector<float16_t, 2> ubo_load_4_xz = vector<float16_t, 2>(f16tof32(ubo_load_4 & 0xFFFF));
   vector<float16_t, 2> ubo_load_4_yw = vector<float16_t, 2>(f16tof32(ubo_load_4 >> 16));
@@ -55,9 +55,3 @@ void f() {
   d(vector<float16_t, 4>(ubo_load_5_xz[0], ubo_load_5_yw[0], ubo_load_5_xz[1], ubo_load_5_yw[1]).ywxz.x);
   return;
 }
-FXC validation failure:
-D:\Projects\RampUp\dawn\test\tint\buffer\Shader@0x000001E7EB824620(5,15-23): error X3000: syntax error: unexpected token 'float16_t'
-D:\Projects\RampUp\dawn\test\tint\buffer\Shader@0x000001E7EB824620(8,15-23): error X3000: syntax error: unexpected token 'float16_t'
-D:\Projects\RampUp\dawn\test\tint\buffer\Shader@0x000001E7EB824620(11,15-23): error X3000: syntax error: unexpected token 'float16_t'
-D:\Projects\RampUp\dawn\test\tint\buffer\Shader@0x000001E7EB824620(14,8-16): error X3000: unrecognized identifier 'float16_t'
-

test/tint/buffer/uniform/std140/array/mat2x4_f16/to_private.wgsl.expected.fxc.hlsl

@@ -5,26 +5,26 @@ cbuffer cbuffer_u : register(b0, space0) {
 };
 static matrix<float16_t, 2, 4> p[4] = (matrix<float16_t, 2, 4>[4])0;
 
-matrix<float16_t, 2, 4> tint_symbol_1(uint4 buffer[4], uint offset) {
+matrix<float16_t, 2, 4> u_load_1(uint offset) {
   const uint scalar_offset = ((offset + 0u)) / 4;
-  uint4 ubo_load_1 = buffer[scalar_offset / 4];
+  uint4 ubo_load_1 = u[scalar_offset / 4];
   uint2 ubo_load = ((scalar_offset & 2) ? ubo_load_1.zw : ubo_load_1.xy);
   vector<float16_t, 2> ubo_load_xz = vector<float16_t, 2>(f16tof32(ubo_load & 0xFFFF));
   vector<float16_t, 2> ubo_load_yw = vector<float16_t, 2>(f16tof32(ubo_load >> 16));
   const uint scalar_offset_1 = ((offset + 8u)) / 4;
-  uint4 ubo_load_3 = buffer[scalar_offset_1 / 4];
+  uint4 ubo_load_3 = u[scalar_offset_1 / 4];
   uint2 ubo_load_2 = ((scalar_offset_1 & 2) ? ubo_load_3.zw : ubo_load_3.xy);
   vector<float16_t, 2> ubo_load_2_xz = vector<float16_t, 2>(f16tof32(ubo_load_2 & 0xFFFF));
   vector<float16_t, 2> ubo_load_2_yw = vector<float16_t, 2>(f16tof32(ubo_load_2 >> 16));
   return matrix<float16_t, 2, 4>(vector<float16_t, 4>(ubo_load_xz[0], ubo_load_yw[0], ubo_load_xz[1], ubo_load_yw[1]), vector<float16_t, 4>(ubo_load_2_xz[0], ubo_load_2_yw[0], ubo_load_2_xz[1], ubo_load_2_yw[1]));
 }
 
-typedef matrix<float16_t, 2, 4> tint_symbol_ret[4];
-tint_symbol_ret tint_symbol(uint4 buffer[4], uint offset) {
+typedef matrix<float16_t, 2, 4> u_load_ret[4];
+u_load_ret u_load(uint offset) {
   matrix<float16_t, 2, 4> arr[4] = (matrix<float16_t, 2, 4>[4])0;
   {
     for(uint i = 0u; (i < 4u); i = (i + 1u)) {
-      arr[i] = tint_symbol_1(buffer, (offset + (i * 16u)));
+      arr[i] = u_load_1((offset + (i * 16u)));
     }
   }
   return arr;
@@ -32,8 +32,8 @@ tint_symbol_ret tint_symbol(uint4 buffer[4], uint offset) {
 
 [numthreads(1, 1, 1)]
 void f() {
-  p = tint_symbol(u, 0u);
-  p[1] = tint_symbol_1(u, 32u);
+  p = u_load(0u);
+  p[1] = u_load_1(32u);
   uint2 ubo_load_4 = u[0].zw;
   vector<float16_t, 2> ubo_load_4_xz = vector<float16_t, 2>(f16tof32(ubo_load_4 & 0xFFFF));
   vector<float16_t, 2> ubo_load_4_yw = vector<float16_t, 2>(f16tof32(ubo_load_4 >> 16));
@@ -41,6 +41,3 @@ void f() {
   p[1][0].x = float16_t(f16tof32(((u[0].z) & 0xFFFF)));
   return;
 }
-FXC validation failure:
-D:\Projects\RampUp\dawn\test\tint\buffer\Shader@0x0000022CF2B4B400(4,15-23): error X3000: syntax error: unexpected token 'float16_t'
-

test/tint/buffer/uniform/std140/array/mat2x4_f16/to_storage.wgsl.expected.fxc.hlsl

@@ -5,40 +5,40 @@ cbuffer cbuffer_u : register(b0, space0) {
 };
 RWByteAddressBuffer s : register(u1, space0);
 
-void tint_symbol_1(RWByteAddressBuffer buffer, uint offset, matrix<float16_t, 2, 4> value) {
-  buffer.Store<vector<float16_t, 4> >((offset + 0u), value[0u]);
-  buffer.Store<vector<float16_t, 4> >((offset + 8u), value[1u]);
+void s_store_1(uint offset, matrix<float16_t, 2, 4> value) {
+  s.Store<vector<float16_t, 4> >((offset + 0u), value[0u]);
+  s.Store<vector<float16_t, 4> >((offset + 8u), value[1u]);
 }
 
-void tint_symbol(RWByteAddressBuffer buffer, uint offset, matrix<float16_t, 2, 4> value[4]) {
-  matrix<float16_t, 2, 4> array[4] = value;
+void s_store(uint offset, matrix<float16_t, 2, 4> value[4]) {
+  matrix<float16_t, 2, 4> array_1[4] = value;
   {
     for(uint i = 0u; (i < 4u); i = (i + 1u)) {
-      tint_symbol_1(buffer, (offset + (i * 16u)), array[i]);
+      s_store_1((offset + (i * 16u)), array_1[i]);
     }
   }
 }
 
-matrix<float16_t, 2, 4> tint_symbol_4(uint4 buffer[4], uint offset) {
+matrix<float16_t, 2, 4> u_load_1(uint offset) {
   const uint scalar_offset = ((offset + 0u)) / 4;
-  uint4 ubo_load_1 = buffer[scalar_offset / 4];
+  uint4 ubo_load_1 = u[scalar_offset / 4];
   uint2 ubo_load = ((scalar_offset & 2) ? ubo_load_1.zw : ubo_load_1.xy);
   vector<float16_t, 2> ubo_load_xz = vector<float16_t, 2>(f16tof32(ubo_load & 0xFFFF));
   vector<float16_t, 2> ubo_load_yw = vector<float16_t, 2>(f16tof32(ubo_load >> 16));
   const uint scalar_offset_1 = ((offset + 8u)) / 4;
-  uint4 ubo_load_3 = buffer[scalar_offset_1 / 4];
+  uint4 ubo_load_3 = u[scalar_offset_1 / 4];
   uint2 ubo_load_2 = ((scalar_offset_1 & 2) ? ubo_load_3.zw : ubo_load_3.xy);
   vector<float16_t, 2> ubo_load_2_xz = vector<float16_t, 2>(f16tof32(ubo_load_2 & 0xFFFF));
   vector<float16_t, 2> ubo_load_2_yw = vector<float16_t, 2>(f16tof32(ubo_load_2 >> 16));
   return matrix<float16_t, 2, 4>(vector<float16_t, 4>(ubo_load_xz[0], ubo_load_yw[0], ubo_load_xz[1], ubo_load_yw[1]), vector<float16_t, 4>(ubo_load_2_xz[0], ubo_load_2_yw[0], ubo_load_2_xz[1], ubo_load_2_yw[1]));
 }
 
-typedef matrix<float16_t, 2, 4> tint_symbol_3_ret[4];
-tint_symbol_3_ret tint_symbol_3(uint4 buffer[4], uint offset) {
+typedef matrix<float16_t, 2, 4> u_load_ret[4];
+u_load_ret u_load(uint offset) {
   matrix<float16_t, 2, 4> arr[4] = (matrix<float16_t, 2, 4>[4])0;
   {
     for(uint i_1 = 0u; (i_1 < 4u); i_1 = (i_1 + 1u)) {
-      arr[i_1] = tint_symbol_4(buffer, (offset + (i_1 * 16u)));
+      arr[i_1] = u_load_1((offset + (i_1 * 16u)));
     }
   }
   return arr;
@@ -46,8 +46,8 @@ tint_symbol_3_ret tint_symbol_3(uint4 buffer[4], uint offset) {
 
 [numthreads(1, 1, 1)]
 void f() {
-  tint_symbol(s, 0u, tint_symbol_3(u, 0u));
-  tint_symbol_1(s, 16u, tint_symbol_4(u, 32u));
+  s_store(0u, u_load(0u));
+  s_store_1(16u, u_load_1(32u));
   uint2 ubo_load_4 = u[0].zw;
   vector<float16_t, 2> ubo_load_4_xz = vector<float16_t, 2>(f16tof32(ubo_load_4 & 0xFFFF));
   vector<float16_t, 2> ubo_load_4_yw = vector<float16_t, 2>(f16tof32(ubo_load_4 >> 16));
@@ -55,7 +55,3 @@ void f() {
   s.Store<float16_t>(16u, float16_t(f16tof32(((u[0].z) & 0xFFFF))));
   return;
 }
-FXC validation failure:
-D:\Projects\RampUp\dawn\test\tint\buffer\Shader@0x0000028AE9A12030(6,68-76): error X3000: syntax error: unexpected token 'float16_t'
-D:\Projects\RampUp\dawn\test\tint\buffer\Shader@0x0000028AE9A12030(7,3-14): error X3018: invalid subscript 'Store'
-

test/tint/buffer/uniform/std140/array/mat2x4_f16/to_workgroup.wgsl.expected.fxc.hlsl

@@ -9,26 +9,26 @@ struct tint_symbol_1 {
   uint local_invocation_index : SV_GroupIndex;
 };
 
-matrix<float16_t, 2, 4> tint_symbol_3(uint4 buffer[4], uint offset) {
+matrix<float16_t, 2, 4> u_load_1(uint offset) {
   const uint scalar_offset = ((offset + 0u)) / 4;
-  uint4 ubo_load_1 = buffer[scalar_offset / 4];
+  uint4 ubo_load_1 = u[scalar_offset / 4];
   uint2 ubo_load = ((scalar_offset & 2) ? ubo_load_1.zw : ubo_load_1.xy);
   vector<float16_t, 2> ubo_load_xz = vector<float16_t, 2>(f16tof32(ubo_load & 0xFFFF));
   vector<float16_t, 2> ubo_load_yw = vector<float16_t, 2>(f16tof32(ubo_load >> 16));
   const uint scalar_offset_1 = ((offset + 8u)) / 4;
-  uint4 ubo_load_3 = buffer[scalar_offset_1 / 4];
+  uint4 ubo_load_3 = u[scalar_offset_1 / 4];
   uint2 ubo_load_2 = ((scalar_offset_1 & 2) ? ubo_load_3.zw : ubo_load_3.xy);
   vector<float16_t, 2> ubo_load_2_xz = vector<float16_t, 2>(f16tof32(ubo_load_2 & 0xFFFF));
   vector<float16_t, 2> ubo_load_2_yw = vector<float16_t, 2>(f16tof32(ubo_load_2 >> 16));
   return matrix<float16_t, 2, 4>(vector<float16_t, 4>(ubo_load_xz[0], ubo_load_yw[0], ubo_load_xz[1], ubo_load_yw[1]), vector<float16_t, 4>(ubo_load_2_xz[0], ubo_load_2_yw[0], ubo_load_2_xz[1], ubo_load_2_yw[1]));
 }
 
-typedef matrix<float16_t, 2, 4> tint_symbol_2_ret[4];
-tint_symbol_2_ret tint_symbol_2(uint4 buffer[4], uint offset) {
+typedef matrix<float16_t, 2, 4> u_load_ret[4];
+u_load_ret u_load(uint offset) {
   matrix<float16_t, 2, 4> arr[4] = (matrix<float16_t, 2, 4>[4])0;
   {
     for(uint i_1 = 0u; (i_1 < 4u); i_1 = (i_1 + 1u)) {
-      arr[i_1] = tint_symbol_3(buffer, (offset + (i_1 * 16u)));
+      arr[i_1] = u_load_1((offset + (i_1 * 16u)));
     }
   }
   return arr;
@@ -42,8 +42,8 @@ void f_inner(uint local_invocation_index) {
     }
   }
   GroupMemoryBarrierWithGroupSync();
-  w = tint_symbol_2(u, 0u);
-  w[1] = tint_symbol_3(u, 32u);
+  w = u_load(0u);
+  w[1] = u_load_1(32u);
   uint2 ubo_load_4 = u[0].zw;
   vector<float16_t, 2> ubo_load_4_xz = vector<float16_t, 2>(f16tof32(ubo_load_4 & 0xFFFF));
   vector<float16_t, 2> ubo_load_4_yw = vector<float16_t, 2>(f16tof32(ubo_load_4 >> 16));
@@ -56,6 +56,3 @@ void f(tint_symbol_1 tint_symbol) {
   f_inner(tint_symbol.local_invocation_index);
   return;
 }
-FXC validation failure:
-D:\Projects\RampUp\dawn\test\tint\buffer\Shader@0x000001E5C5F5C8E0(4,20-28): error X3000: syntax error: unexpected token 'float16_t'
-

test/tint/buffer/uniform/std140/array/mat4x2_f16/dynamic_index_via_ptr.wgsl.expected.fxc.hlsl

@@ -10,24 +10,24 @@ int i() {
   return counter;
 }
 
-matrix<float16_t, 4, 2> tint_symbol_1(uint4 buffer[4], uint offset) {
+matrix<float16_t, 4, 2> a_load_1(uint offset) {
   const uint scalar_offset = ((offset + 0u)) / 4;
-  uint ubo_load = buffer[scalar_offset / 4][scalar_offset % 4];
+  uint ubo_load = a[scalar_offset / 4][scalar_offset % 4];
   const uint scalar_offset_1 = ((offset + 4u)) / 4;
-  uint ubo_load_1 = buffer[scalar_offset_1 / 4][scalar_offset_1 % 4];
+  uint ubo_load_1 = a[scalar_offset_1 / 4][scalar_offset_1 % 4];
   const uint scalar_offset_2 = ((offset + 8u)) / 4;
-  uint ubo_load_2 = buffer[scalar_offset_2 / 4][scalar_offset_2 % 4];
+  uint ubo_load_2 = a[scalar_offset_2 / 4][scalar_offset_2 % 4];
   const uint scalar_offset_3 = ((offset + 12u)) / 4;
-  uint ubo_load_3 = buffer[scalar_offset_3 / 4][scalar_offset_3 % 4];
+  uint ubo_load_3 = a[scalar_offset_3 / 4][scalar_offset_3 % 4];
   return matrix<float16_t, 4, 2>(vector<float16_t, 2>(float16_t(f16tof32(ubo_load & 0xFFFF)), float16_t(f16tof32(ubo_load >> 16))), vector<float16_t, 2>(float16_t(f16tof32(ubo_load_1 & 0xFFFF)), float16_t(f16tof32(ubo_load_1 >> 16))), vector<float16_t, 2>(float16_t(f16tof32(ubo_load_2 & 0xFFFF)), float16_t(f16tof32(ubo_load_2 >> 16))), vector<float16_t, 2>(float16_t(f16tof32(ubo_load_3 & 0xFFFF)), float16_t(f16tof32(ubo_load_3 >> 16))));
 }
 
-typedef matrix<float16_t, 4, 2> tint_symbol_ret[4];
-tint_symbol_ret tint_symbol(uint4 buffer[4], uint offset) {
+typedef matrix<float16_t, 4, 2> a_load_ret[4];
+a_load_ret a_load(uint offset) {
   matrix<float16_t, 4, 2> arr[4] = (matrix<float16_t, 4, 2>[4])0;
   {
     for(uint i_1 = 0u; (i_1 < 4u); i_1 = (i_1 + 1u)) {
-      arr[i_1] = tint_symbol_1(buffer, (offset + (i_1 * 16u)));
+      arr[i_1] = a_load_1((offset + (i_1 * 16u)));
     }
   }
   return arr;
@@ -37,13 +37,10 @@ tint_symbol_ret tint_symbol(uint4 buffer[4], uint offset) {
 void f() {
   const int p_a_i_save = i();
   const int p_a_i_i_save = i();
-  const matrix<float16_t, 4, 2> l_a[4] = tint_symbol(a, 0u);
-  const matrix<float16_t, 4, 2> l_a_i = tint_symbol_1(a, (16u * uint(p_a_i_save)));
+  const matrix<float16_t, 4, 2> l_a[4] = a_load(0u);
+  const matrix<float16_t, 4, 2> l_a_i = a_load_1((16u * uint(p_a_i_save)));
   const uint scalar_offset_4 = (((16u * uint(p_a_i_save)) + (4u * uint(p_a_i_i_save)))) / 4;
   uint ubo_load_4 = a[scalar_offset_4 / 4][scalar_offset_4 % 4];
   const vector<float16_t, 2> l_a_i_i = vector<float16_t, 2>(float16_t(f16tof32(ubo_load_4 & 0xFFFF)), float16_t(f16tof32(ubo_load_4 >> 16)));
   return;
 }
-FXC validation failure:
-D:\Projects\RampUp\dawn\test\tint\buffer\Shader@0x00000252EDBAA7F0(11,8-16): error X3000: syntax error: unexpected token 'float16_t'
-

test/tint/buffer/uniform/std140/array/mat4x2_f16/static_index_via_ptr.wgsl.expected.fxc.hlsl

@@ -4,24 +4,24 @@ cbuffer cbuffer_a : register(b0, space0) {
   uint4 a[4];
 };
 
-matrix<float16_t, 4, 2> tint_symbol_1(uint4 buffer[4], uint offset) {
+matrix<float16_t, 4, 2> a_load_1(uint offset) {
   const uint scalar_offset = ((offset + 0u)) / 4;
-  uint ubo_load = buffer[scalar_offset / 4][scalar_offset % 4];
+  uint ubo_load = a[scalar_offset / 4][scalar_offset % 4];
   const uint scalar_offset_1 = ((offset + 4u)) / 4;
-  uint ubo_load_1 = buffer[scalar_offset_1 / 4][scalar_offset_1 % 4];
+  uint ubo_load_1 = a[scalar_offset_1 / 4][scalar_offset_1 % 4];
   const uint scalar_offset_2 = ((offset + 8u)) / 4;
-  uint ubo_load_2 = buffer[scalar_offset_2 / 4][scalar_offset_2 % 4];
+  uint ubo_load_2 = a[scalar_offset_2 / 4][scalar_offset_2 % 4];
   const uint scalar_offset_3 = ((offset + 12u)) / 4;
-  uint ubo_load_3 = buffer[scalar_offset_3 / 4][scalar_offset_3 % 4];
+  uint ubo_load_3 = a[scalar_offset_3 / 4][scalar_offset_3 % 4];
   return matrix<float16_t, 4, 2>(vector<float16_t, 2>(float16_t(f16tof32(ubo_load & 0xFFFF)), float16_t(f16tof32(ubo_load >> 16))), vector<float16_t, 2>(float16_t(f16tof32(ubo_load_1 & 0xFFFF)), float16_t(f16tof32(ubo_load_1 >> 16))), vector<float16_t, 2>(float16_t(f16tof32(ubo_load_2 & 0xFFFF)), float16_t(f16tof32(ubo_load_2 >> 16))), vector<float16_t, 2>(float16_t(f16tof32(ubo_load_3 & 0xFFFF)), float16_t(f16tof32(ubo_load_3 >> 16))));
 }
 
-typedef matrix<float16_t, 4, 2> tint_symbol_ret[4];
-tint_symbol_ret tint_symbol(uint4 buffer[4], uint offset) {
+typedef matrix<float16_t, 4, 2> a_load_ret[4];
+a_load_ret a_load(uint offset) {
   matrix<float16_t, 4, 2> arr[4] = (matrix<float16_t, 4, 2>[4])0;
   {
     for(uint i = 0u; (i < 4u); i = (i + 1u)) {
-      arr[i] = tint_symbol_1(buffer, (offset + (i * 16u)));
+      arr[i] = a_load_1((offset + (i * 16u)));
     }
   }
   return arr;
@@ -29,12 +29,9 @@ tint_symbol_ret tint_symbol(uint4 buffer[4], uint offset) {
 
 [numthreads(1, 1, 1)]
 void f() {
-  const matrix<float16_t, 4, 2> l_a[4] = tint_symbol(a, 0u);
-  const matrix<float16_t, 4, 2> l_a_i = tint_symbol_1(a, 32u);
+  const matrix<float16_t, 4, 2> l_a[4] = a_load(0u);
+  const matrix<float16_t, 4, 2> l_a_i = a_load_1(32u);
   uint ubo_load_4 = a[2].y;
   const vector<float16_t, 2> l_a_i_i = vector<float16_t, 2>(float16_t(f16tof32(ubo_load_4 & 0xFFFF)), float16_t(f16tof32(ubo_load_4 >> 16)));
   return;
 }
-FXC validation failure:
-D:\Projects\RampUp\dawn\test\tint\buffer\Shader@0x0000014EAAC1C520(5,8-16): error X3000: syntax error: unexpected token 'float16_t'
-

test/tint/buffer/uniform/std140/array/mat4x2_f16/to_builtin.wgsl.expected.fxc.hlsl

@@ -4,27 +4,24 @@ cbuffer cbuffer_u : register(b0, space0) {
   uint4 u[4];
 };
 
-matrix<float16_t, 4, 2> tint_symbol(uint4 buffer[4], uint offset) {
+matrix<float16_t, 4, 2> u_load(uint offset) {
   const uint scalar_offset = ((offset + 0u)) / 4;
-  uint ubo_load = buffer[scalar_offset / 4][scalar_offset % 4];
+  uint ubo_load = u[scalar_offset / 4][scalar_offset % 4];
   const uint scalar_offset_1 = ((offset + 4u)) / 4;
-  uint ubo_load_1 = buffer[scalar_offset_1 / 4][scalar_offset_1 % 4];
+  uint ubo_load_1 = u[scalar_offset_1 / 4][scalar_offset_1 % 4];
   const uint scalar_offset_2 = ((offset + 8u)) / 4;
-  uint ubo_load_2 = buffer[scalar_offset_2 / 4][scalar_offset_2 % 4];
+  uint ubo_load_2 = u[scalar_offset_2 / 4][scalar_offset_2 % 4];
   const uint scalar_offset_3 = ((offset + 12u)) / 4;
-  uint ubo_load_3 = buffer[scalar_offset_3 / 4][scalar_offset_3 % 4];
+  uint ubo_load_3 = u[scalar_offset_3 / 4][scalar_offset_3 % 4];
   return matrix<float16_t, 4, 2>(vector<float16_t, 2>(float16_t(f16tof32(ubo_load & 0xFFFF)), float16_t(f16tof32(ubo_load >> 16))), vector<float16_t, 2>(float16_t(f16tof32(ubo_load_1 & 0xFFFF)), float16_t(f16tof32(ubo_load_1 >> 16))), vector<float16_t, 2>(float16_t(f16tof32(ubo_load_2 & 0xFFFF)), float16_t(f16tof32(ubo_load_2 >> 16))), vector<float16_t, 2>(float16_t(f16tof32(ubo_load_3 & 0xFFFF)), float16_t(f16tof32(ubo_load_3 >> 16))));
 }
 
 [numthreads(1, 1, 1)]
 void f() {
-  const matrix<float16_t, 2, 4> t = transpose(tint_symbol(u, 32u));
+  const matrix<float16_t, 2, 4> t = transpose(u_load(32u));
   uint ubo_load_4 = u[0].y;
   const float16_t l = length(vector<float16_t, 2>(float16_t(f16tof32(ubo_load_4 & 0xFFFF)), float16_t(f16tof32(ubo_load_4 >> 16))).yx);
   uint ubo_load_5 = u[0].y;
   const float16_t a = abs(vector<float16_t, 2>(float16_t(f16tof32(ubo_load_5 & 0xFFFF)), float16_t(f16tof32(ubo_load_5 >> 16))).yx.x);
   return;
 }
-FXC validation failure:
-D:\Projects\RampUp\dawn\test\tint\buffer\Shader@0x0000025103259540(5,8-16): error X3000: syntax error: unexpected token 'float16_t'
-

test/tint/buffer/uniform/std140/array/mat4x2_f16/to_fn.wgsl.expected.fxc.hlsl

@@ -16,24 +16,24 @@ void c(vector<float16_t, 2> v) {
 void d(float16_t f_1) {
 }
 
-matrix<float16_t, 4, 2> tint_symbol_1(uint4 buffer[4], uint offset) {
+matrix<float16_t, 4, 2> u_load_1(uint offset) {
   const uint scalar_offset = ((offset + 0u)) / 4;
-  uint ubo_load = buffer[scalar_offset / 4][scalar_offset % 4];
+  uint ubo_load = u[scalar_offset / 4][scalar_offset % 4];
   const uint scalar_offset_1 = ((offset + 4u)) / 4;
-  uint ubo_load_1 = buffer[scalar_offset_1 / 4][scalar_offset_1 % 4];
+  uint ubo_load_1 = u[scalar_offset_1 / 4][scalar_offset_1 % 4];
   const uint scalar_offset_2 = ((offset + 8u)) / 4;
-  uint ubo_load_2 = buffer[scalar_offset_2 / 4][scalar_offset_2 % 4];
+  uint ubo_load_2 = u[scalar_offset_2 / 4][scalar_offset_2 % 4];
   const uint scalar_offset_3 = ((offset + 12u)) / 4;
-  uint ubo_load_3 = buffer[scalar_offset_3 / 4][scalar_offset_3 % 4];
+  uint ubo_load_3 = u[scalar_offset_3 / 4][scalar_offset_3 % 4];
   return matrix<float16_t, 4, 2>(vector<float16_t, 2>(float16_t(f16tof32(ubo_load & 0xFFFF)), float16_t(f16tof32(ubo_load >> 16))), vector<float16_t, 2>(float16_t(f16tof32(ubo_load_1 & 0xFFFF)), float16_t(f16tof32(ubo_load_1 >> 16))), vector<float16_t, 2>(float16_t(f16tof32(ubo_load_2 & 0xFFFF)), float16_t(f16tof32(ubo_load_2 >> 16))), vector<float16_t, 2>(float16_t(f16tof32(ubo_load_3 & 0xFFFF)), float16_t(f16tof32(ubo_load_3 >> 16))));
 }
 
-typedef matrix<float16_t, 4, 2> tint_symbol_ret[4];
-tint_symbol_ret tint_symbol(uint4 buffer[4], uint offset) {
+typedef matrix<float16_t, 4, 2> u_load_ret[4];
+u_load_ret u_load(uint offset) {
   matrix<float16_t, 4, 2> arr[4] = (matrix<float16_t, 4, 2>[4])0;
   {
     for(uint i = 0u; (i < 4u); i = (i + 1u)) {
-      arr[i] = tint_symbol_1(buffer, (offset + (i * 16u)));
+      arr[i] = u_load_1((offset + (i * 16u)));
     }
   }
   return arr;
@@ -41,17 +41,11 @@ tint_symbol_ret tint_symbol(uint4 buffer[4], uint offset) {
 
 [numthreads(1, 1, 1)]
 void f() {
-  a(tint_symbol(u, 0u));
-  b(tint_symbol_1(u, 16u));
+  a(u_load(0u));
+  b(u_load_1(16u));
   uint ubo_load_4 = u[1].x;
   c(vector<float16_t, 2>(float16_t(f16tof32(ubo_load_4 & 0xFFFF)), float16_t(f16tof32(ubo_load_4 >> 16))).yx);
   uint ubo_load_5 = u[1].x;
   d(vector<float16_t, 2>(float16_t(f16tof32(ubo_load_5 & 0xFFFF)), float16_t(f16tof32(ubo_load_5 >> 16))).yx.x);
   return;
 }
-FXC validation failure:
-D:\Projects\RampUp\dawn\test\tint\buffer\Shader@0x0000029B724CE850(5,15-23): error X3000: syntax error: unexpected token 'float16_t'
-D:\Projects\RampUp\dawn\test\tint\buffer\Shader@0x0000029B724CE850(8,15-23): error X3000: syntax error: unexpected token 'float16_t'
-D:\Projects\RampUp\dawn\test\tint\buffer\Shader@0x0000029B724CE850(11,15-23): error X3000: syntax error: unexpected token 'float16_t'
-D:\Projects\RampUp\dawn\test\tint\buffer\Shader@0x0000029B724CE850(14,8-16): error X3000: unrecognized identifier 'float16_t'
-

test/tint/buffer/uniform/std140/array/mat4x2_f16/to_private.wgsl.expected.fxc.hlsl

@@ -5,24 +5,24 @@ cbuffer cbuffer_u : register(b0, space0) {
 };
 static matrix<float16_t, 4, 2> p[4] = (matrix<float16_t, 4, 2>[4])0;
 
-matrix<float16_t, 4, 2> tint_symbol_1(uint4 buffer[4], uint offset) {
+matrix<float16_t, 4, 2> u_load_1(uint offset) {
   const uint scalar_offset = ((offset + 0u)) / 4;
-  uint ubo_load = buffer[scalar_offset / 4][scalar_offset % 4];
+  uint ubo_load = u[scalar_offset / 4][scalar_offset % 4];
   const uint scalar_offset_1 = ((offset + 4u)) / 4;
-  uint ubo_load_1 = buffer[scalar_offset_1 / 4][scalar_offset_1 % 4];
+  uint ubo_load_1 = u[scalar_offset_1 / 4][scalar_offset_1 % 4];
   const uint scalar_offset_2 = ((offset + 8u)) / 4;
-  uint ubo_load_2 = buffer[scalar_offset_2 / 4][scalar_offset_2 % 4];
+  uint ubo_load_2 = u[scalar_offset_2 / 4][scalar_offset_2 % 4];
   const uint scalar_offset_3 = ((offset + 12u)) / 4;
-  uint ubo_load_3 = buffer[scalar_offset_3 / 4][scalar_offset_3 % 4];
+  uint ubo_load_3 = u[scalar_offset_3 / 4][scalar_offset_3 % 4];
   return matrix<float16_t, 4, 2>(vector<float16_t, 2>(float16_t(f16tof32(ubo_load & 0xFFFF)), float16_t(f16tof32(ubo_load >> 16))), vector<float16_t, 2>(float16_t(f16tof32(ubo_load_1 & 0xFFFF)), float16_t(f16tof32(ubo_load_1 >> 16))), vector<float16_t, 2>(float16_t(f16tof32(ubo_load_2 & 0xFFFF)), float16_t(f16tof32(ubo_load_2 >> 16))), vector<float16_t, 2>(float16_t(f16tof32(ubo_load_3 & 0xFFFF)), float16_t(f16tof32(ubo_load_3 >> 16))));
 }
 
-typedef matrix<float16_t, 4, 2> tint_symbol_ret[4];
-tint_symbol_ret tint_symbol(uint4 buffer[4], uint offset) {
+typedef matrix<float16_t, 4, 2> u_load_ret[4];
+u_load_ret u_load(uint offset) {
   matrix<float16_t, 4, 2> arr[4] = (matrix<float16_t, 4, 2>[4])0;
   {
     for(uint i = 0u; (i < 4u); i = (i + 1u)) {
-      arr[i] = tint_symbol_1(buffer, (offset + (i * 16u)));
+      arr[i] = u_load_1((offset + (i * 16u)));
     }
   }
   return arr;
@@ -30,13 +30,10 @@ tint_symbol_ret tint_symbol(uint4 buffer[4], uint offset) {
 
 [numthreads(1, 1, 1)]
 void f() {
-  p = tint_symbol(u, 0u);
-  p[1] = tint_symbol_1(u, 32u);
+  p = u_load(0u);
+  p[1] = u_load_1(32u);
   uint ubo_load_4 = u[0].y;
   p[1][0] = vector<float16_t, 2>(float16_t(f16tof32(ubo_load_4 & 0xFFFF)), float16_t(f16tof32(ubo_load_4 >> 16))).yx;
   p[1][0].x = float16_t(f16tof32(((u[0].y) & 0xFFFF)));
   return;
 }
-FXC validation failure:
-D:\Projects\RampUp\dawn\test\tint\buffer\Shader@0x0000015CB4D295E0(4,15-23): error X3000: syntax error: unexpected token 'float16_t'
-

test/tint/buffer/uniform/std140/array/mat4x2_f16/to_storage.wgsl.expected.fxc.hlsl

@@ -5,40 +5,40 @@ cbuffer cbuffer_u : register(b0, space0) {
 };
 RWByteAddressBuffer s : register(u1, space0);
 
-void tint_symbol_1(RWByteAddressBuffer buffer, uint offset, matrix<float16_t, 4, 2> value) {
-  buffer.Store<vector<float16_t, 2> >((offset + 0u), value[0u]);
-  buffer.Store<vector<float16_t, 2> >((offset + 4u), value[1u]);
-  buffer.Store<vector<float16_t, 2> >((offset + 8u), value[2u]);
-  buffer.Store<vector<float16_t, 2> >((offset + 12u), value[3u]);
+void s_store_1(uint offset, matrix<float16_t, 4, 2> value) {
+  s.Store<vector<float16_t, 2> >((offset + 0u), value[0u]);
+  s.Store<vector<float16_t, 2> >((offset + 4u), value[1u]);
+  s.Store<vector<float16_t, 2> >((offset + 8u), value[2u]);
+  s.Store<vector<float16_t, 2> >((offset + 12u), value[3u]);
 }
 
-void tint_symbol(RWByteAddressBuffer buffer, uint offset, matrix<float16_t, 4, 2> value[4]) {
-  matrix<float16_t, 4, 2> array[4] = value;
+void s_store(uint offset, matrix<float16_t, 4, 2> value[4]) {
+  matrix<float16_t, 4, 2> array_1[4] = value;
   {
     for(uint i = 0u; (i < 4u); i = (i + 1u)) {
-      tint_symbol_1(buffer, (offset + (i * 16u)), array[i]);
+      s_store_1((offset + (i * 16u)), array_1[i]);
     }
   }
 }
 
-matrix<float16_t, 4, 2> tint_symbol_4(uint4 buffer[4], uint offset) {
+matrix<float16_t, 4, 2> u_load_1(uint offset) {
   const uint scalar_offset = ((offset + 0u)) / 4;
-  uint ubo_load = buffer[scalar_offset / 4][scalar_offset % 4];
+  uint ubo_load = u[scalar_offset / 4][scalar_offset % 4];
   const uint scalar_offset_1 = ((offset + 4u)) / 4;
-  uint ubo_load_1 = buffer[scalar_offset_1 / 4][scalar_offset_1 % 4];
+  uint ubo_load_1 = u[scalar_offset_1 / 4][scalar_offset_1 % 4];
   const uint scalar_offset_2 = ((offset + 8u)) / 4;
-  uint ubo_load_2 = buffer[scalar_offset_2 / 4][scalar_offset_2 % 4];
+  uint ubo_load_2 = u[scalar_offset_2 / 4][scalar_offset_2 % 4];
   const uint scalar_offset_3 = ((offset + 12u)) / 4;
-  uint ubo_load_3 = buffer[scalar_offset_3 / 4][scalar_offset_3 % 4];
+  uint ubo_load_3 = u[scalar_offset_3 / 4][scalar_offset_3 % 4];
   return matrix<float16_t, 4, 2>(vector<float16_t, 2>(float16_t(f16tof32(ubo_load & 0xFFFF)), float16_t(f16tof32(ubo_load >> 16))), vector<float16_t, 2>(float16_t(f16tof32(ubo_load_1 & 0xFFFF)), float16_t(f16tof32(ubo_load_1 >> 16))), vector<float16_t, 2>(float16_t(f16tof32(ubo_load_2 & 0xFFFF)), float16_t(f16tof32(ubo_load_2 >> 16))), vector<float16_t, 2>(float16_t(f16tof32(ubo_load_3 & 0xFFFF)), float16_t(f16tof32(ubo_load_3 >> 16))));
 }
 
-typedef matrix<float16_t, 4, 2> tint_symbol_3_ret[4];
-tint_symbol_3_ret tint_symbol_3(uint4 buffer[4], uint offset) {
+typedef matrix<float16_t, 4, 2> u_load_ret[4];
+u_load_ret u_load(uint offset) {
   matrix<float16_t, 4, 2> arr[4] = (matrix<float16_t, 4, 2>[4])0;
   {
     for(uint i_1 = 0u; (i_1 < 4u); i_1 = (i_1 + 1u)) {
-      arr[i_1] = tint_symbol_4(buffer, (offset + (i_1 * 16u)));
+      arr[i_1] = u_load_1((offset + (i_1 * 16u)));
     }
   }
   return arr;
@@ -46,14 +46,10 @@ tint_symbol_3_ret tint_symbol_3(uint4 buffer[4], uint offset) {
 
 [numthreads(1, 1, 1)]
 void f() {
-  tint_symbol(s, 0u, tint_symbol_3(u, 0u));
-  tint_symbol_1(s, 16u, tint_symbol_4(u, 32u));
+  s_store(0u, u_load(0u));
+  s_store_1(16u, u_load_1(32u));
   uint ubo_load_4 = u[0].y;
   s.Store<vector<float16_t, 2> >(16u, vector<float16_t, 2>(float16_t(f16tof32(ubo_load_4 & 0xFFFF)), float16_t(f16tof32(ubo_load_4 >> 16))).yx);
   s.Store<float16_t>(16u, float16_t(f16tof32(((u[0].y) & 0xFFFF))));
   return;
 }
-FXC validation failure:
-D:\Projects\RampUp\dawn\test\tint\buffer\Shader@0x000001F88B180520(6,68-76): error X3000: syntax error: unexpected token 'float16_t'
-D:\Projects\RampUp\dawn\test\tint\buffer\Shader@0x000001F88B180520(7,3-14): error X3018: invalid subscript 'Store'
-

test/tint/buffer/uniform/std140/array/mat4x2_f16/to_workgroup.wgsl.expected.fxc.hlsl

@@ -9,24 +9,24 @@ struct tint_symbol_1 {
   uint local_invocation_index : SV_GroupIndex;
 };
 
-matrix<float16_t, 4, 2> tint_symbol_3(uint4 buffer[4], uint offset) {
+matrix<float16_t, 4, 2> u_load_1(uint offset) {
   const uint scalar_offset = ((offset + 0u)) / 4;
-  uint ubo_load = buffer[scalar_offset / 4][scalar_offset % 4];
+  uint ubo_load = u[scalar_offset / 4][scalar_offset % 4];
   const uint scalar_offset_1 = ((offset + 4u)) / 4;
-  uint ubo_load_1 = buffer[scalar_offset_1 / 4][scalar_offset_1 % 4];
+  uint ubo_load_1 = u[scalar_offset_1 / 4][scalar_offset_1 % 4];
   const uint scalar_offset_2 = ((offset + 8u)) / 4;
-  uint ubo_load_2 = buffer[scalar_offset_2 / 4][scalar_offset_2 % 4];
+  uint ubo_load_2 = u[scalar_offset_2 / 4][scalar_offset_2 % 4];
   const uint scalar_offset_3 = ((offset + 12u)) / 4;
-  uint ubo_load_3 = buffer[scalar_offset_3 / 4][scalar_offset_3 % 4];
+  uint ubo_load_3 = u[scalar_offset_3 / 4][scalar_offset_3 % 4];
   return matrix<float16_t, 4, 2>(vector<float16_t, 2>(float16_t(f16tof32(ubo_load & 0xFFFF)), float16_t(f16tof32(ubo_load >> 16))), vector<float16_t, 2>(float16_t(f16tof32(ubo_load_1 & 0xFFFF)), float16_t(f16tof32(ubo_load_1 >> 16))), vector<float16_t, 2>(float16_t(f16tof32(ubo_load_2 & 0xFFFF)), float16_t(f16tof32(ubo_load_2 >> 16))), vector<float16_t, 2>(float16_t(f16tof32(ubo_load_3 & 0xFFFF)), float16_t(f16tof32(ubo_load_3 >> 16))));
 }
 
-typedef matrix<float16_t, 4, 2> tint_symbol_2_ret[4];
-tint_symbol_2_ret tint_symbol_2(uint4 buffer[4], uint offset) {
+typedef matrix<float16_t, 4, 2> u_load_ret[4];
+u_load_ret u_load(uint offset) {
   matrix<float16_t, 4, 2> arr[4] = (matrix<float16_t, 4, 2>[4])0;
   {
     for(uint i_1 = 0u; (i_1 < 4u); i_1 = (i_1 + 1u)) {
-      arr[i_1] = tint_symbol_3(buffer, (offset + (i_1 * 16u)));
+      arr[i_1] = u_load_1((offset + (i_1 * 16u)));
     }
   }
   return arr;
@@ -40,8 +40,8 @@ void f_inner(uint local_invocation_index) {
     }
   }
   GroupMemoryBarrierWithGroupSync();
-  w = tint_symbol_2(u, 0u);
-  w[1] = tint_symbol_3(u, 32u);
+  w = u_load(0u);
+  w[1] = u_load_1(32u);
   uint ubo_load_4 = u[0].y;
   w[1][0] = vector<float16_t, 2>(float16_t(f16tof32(ubo_load_4 & 0xFFFF)), float16_t(f16tof32(ubo_load_4 >> 16))).yx;
   w[1][0].x = float16_t(f16tof32(((u[0].y) & 0xFFFF)));
@@ -52,6 +52,3 @@ void f(tint_symbol_1 tint_symbol) {
   f_inner(tint_symbol.local_invocation_index);
   return;
 }
-FXC validation failure:
-D:\Projects\RampUp\dawn\test\tint\buffer\Shader@0x0000020D4DFDDE90(4,20-28): error X3000: syntax error: unexpected token 'float16_t'
-

test/tint/buffer/uniform/std140/array/mat4x3_f16/dynamic_index_via_ptr.wgsl.expected.fxc.hlsl

@@ -10,36 +10,36 @@ int i() {
   return counter;
 }
 
-matrix<float16_t, 4, 3> tint_symbol_1(uint4 buffer[8], uint offset) {
+matrix<float16_t, 4, 3> a_load_1(uint offset) {
   const uint scalar_offset = ((offset + 0u)) / 4;
-  uint4 ubo_load_1 = buffer[scalar_offset / 4];
+  uint4 ubo_load_1 = a[scalar_offset / 4];
   uint2 ubo_load = ((scalar_offset & 2) ? ubo_load_1.zw : ubo_load_1.xy);
   vector<float16_t, 2> ubo_load_xz = vector<float16_t, 2>(f16tof32(ubo_load & 0xFFFF));
   float16_t ubo_load_y = f16tof32(ubo_load[0] >> 16);
   const uint scalar_offset_1 = ((offset + 8u)) / 4;
-  uint4 ubo_load_3 = buffer[scalar_offset_1 / 4];
+  uint4 ubo_load_3 = a[scalar_offset_1 / 4];
   uint2 ubo_load_2 = ((scalar_offset_1 & 2) ? ubo_load_3.zw : ubo_load_3.xy);
   vector<float16_t, 2> ubo_load_2_xz = vector<float16_t, 2>(f16tof32(ubo_load_2 & 0xFFFF));
   float16_t ubo_load_2_y = f16tof32(ubo_load_2[0] >> 16);
   const uint scalar_offset_2 = ((offset + 16u)) / 4;
-  uint4 ubo_load_5 = buffer[scalar_offset_2 / 4];
+  uint4 ubo_load_5 = a[scalar_offset_2 / 4];
   uint2 ubo_load_4 = ((scalar_offset_2 & 2) ? ubo_load_5.zw : ubo_load_5.xy);
   vector<float16_t, 2> ubo_load_4_xz = vector<float16_t, 2>(f16tof32(ubo_load_4 & 0xFFFF));
   float16_t ubo_load_4_y = f16tof32(ubo_load_4[0] >> 16);
   const uint scalar_offset_3 = ((offset + 24u)) / 4;
-  uint4 ubo_load_7 = buffer[scalar_offset_3 / 4];
+  uint4 ubo_load_7 = a[scalar_offset_3 / 4];
   uint2 ubo_load_6 = ((scalar_offset_3 & 2) ? ubo_load_7.zw : ubo_load_7.xy);
   vector<float16_t, 2> ubo_load_6_xz = vector<float16_t, 2>(f16tof32(ubo_load_6 & 0xFFFF));
   float16_t ubo_load_6_y = f16tof32(ubo_load_6[0] >> 16);
   return matrix<float16_t, 4, 3>(vector<float16_t, 3>(ubo_load_xz[0], ubo_load_y, ubo_load_xz[1]), vector<float16_t, 3>(ubo_load_2_xz[0], ubo_load_2_y, ubo_load_2_xz[1]), vector<float16_t, 3>(ubo_load_4_xz[0], ubo_load_4_y, ubo_load_4_xz[1]), vector<float16_t, 3>(ubo_load_6_xz[0], ubo_load_6_y, ubo_load_6_xz[1]));
 }
 
-typedef matrix<float16_t, 4, 3> tint_symbol_ret[4];
-tint_symbol_ret tint_symbol(uint4 buffer[8], uint offset) {
+typedef matrix<float16_t, 4, 3> a_load_ret[4];
+a_load_ret a_load(uint offset) {
   matrix<float16_t, 4, 3> arr[4] = (matrix<float16_t, 4, 3>[4])0;
   {
     for(uint i_1 = 0u; (i_1 < 4u); i_1 = (i_1 + 1u)) {
-      arr[i_1] = tint_symbol_1(buffer, (offset + (i_1 * 32u)));
+      arr[i_1] = a_load_1((offset + (i_1 * 32u)));
     }
   }
   return arr;
@@ -49,8 +49,8 @@ tint_symbol_ret tint_symbol(uint4 buffer[8], uint offset) {
 void f() {
   const int p_a_i_save = i();
   const int p_a_i_i_save = i();
-  const matrix<float16_t, 4, 3> l_a[4] = tint_symbol(a, 0u);
-  const matrix<float16_t, 4, 3> l_a_i = tint_symbol_1(a, (32u * uint(p_a_i_save)));
+  const matrix<float16_t, 4, 3> l_a[4] = a_load(0u);
+  const matrix<float16_t, 4, 3> l_a_i = a_load_1((32u * uint(p_a_i_save)));
   const uint scalar_offset_4 = (((32u * uint(p_a_i_save)) + (8u * uint(p_a_i_i_save)))) / 4;
   uint4 ubo_load_9 = a[scalar_offset_4 / 4];
   uint2 ubo_load_8 = ((scalar_offset_4 & 2) ? ubo_load_9.zw : ubo_load_9.xy);
@@ -59,6 +59,3 @@ void f() {
   const vector<float16_t, 3> l_a_i_i = vector<float16_t, 3>(ubo_load_8_xz[0], ubo_load_8_y, ubo_load_8_xz[1]);
   return;
 }
-FXC validation failure:
-D:\Projects\RampUp\dawn\test\tint\buffer\Shader@0x00000180EC89DCE0(11,8-16): error X3000: syntax error: unexpected token 'float16_t'
-

test/tint/buffer/uniform/std140/array/mat4x3_f16/static_index_via_ptr.wgsl.expected.fxc.hlsl

@@ -4,36 +4,36 @@ cbuffer cbuffer_a : register(b0, space0) {
   uint4 a[8];
 };
 
-matrix<float16_t, 4, 3> tint_symbol_1(uint4 buffer[8], uint offset) {
+matrix<float16_t, 4, 3> a_load_1(uint offset) {
   const uint scalar_offset = ((offset + 0u)) / 4;
-  uint4 ubo_load_1 = buffer[scalar_offset / 4];
+  uint4 ubo_load_1 = a[scalar_offset / 4];
   uint2 ubo_load = ((scalar_offset & 2) ? ubo_load_1.zw : ubo_load_1.xy);
   vector<float16_t, 2> ubo_load_xz = vector<float16_t, 2>(f16tof32(ubo_load & 0xFFFF));
   float16_t ubo_load_y = f16tof32(ubo_load[0] >> 16);
   const uint scalar_offset_1 = ((offset + 8u)) / 4;
-  uint4 ubo_load_3 = buffer[scalar_offset_1 / 4];
+  uint4 ubo_load_3 = a[scalar_offset_1 / 4];
   uint2 ubo_load_2 = ((scalar_offset_1 & 2) ? ubo_load_3.zw : ubo_load_3.xy);
   vector<float16_t, 2> ubo_load_2_xz = vector<float16_t, 2>(f16tof32(ubo_load_2 & 0xFFFF));
   float16_t ubo_load_2_y = f16tof32(ubo_load_2[0] >> 16);
   const uint scalar_offset_2 = ((offset + 16u)) / 4;
-  uint4 ubo_load_5 = buffer[scalar_offset_2 / 4];
+  uint4 ubo_load_5 = a[scalar_offset_2 / 4];
   uint2 ubo_load_4 = ((scalar_offset_2 & 2) ? ubo_load_5.zw : ubo_load_5.xy);
   vector<float16_t, 2> ubo_load_4_xz = vector<float16_t, 2>(f16tof32(ubo_load_4 & 0xFFFF));
   float16_t ubo_load_4_y = f16tof32(ubo_load_4[0] >> 16);
   const uint scalar_offset_3 = ((offset + 24u)) / 4;
-  uint4 ubo_load_7 = buffer[scalar_offset_3 / 4];
+  uint4 ubo_load_7 = a[scalar_offset_3 / 4];
   uint2 ubo_load_6 = ((scalar_offset_3 & 2) ? ubo_load_7.zw : ubo_load_7.xy);
   vector<float16_t, 2> ubo_load_6_xz = vector<float16_t, 2>(f16tof32(ubo_load_6 & 0xFFFF));
   float16_t ubo_load_6_y = f16tof32(ubo_load_6[0] >> 16);
   return matrix<float16_t, 4, 3>(vector<float16_t, 3>(ubo_load_xz[0], ubo_load_y, ubo_load_xz[1]), vector<float16_t, 3>(ubo_load_2_xz[0], ubo_load_2_y, ubo_load_2_xz[1]), vector<float16_t, 3>(ubo_load_4_xz[0], ubo_load_4_y, ubo_load_4_xz[1]), vector<float16_t, 3>(ubo_load_6_xz[0], ubo_load_6_y, ubo_load_6_xz[1]));
 }
 
-typedef matrix<float16_t, 4, 3> tint_symbol_ret[4];
-tint_symbol_ret tint_symbol(uint4 buffer[8], uint offset) {
+typedef matrix<float16_t, 4, 3> a_load_ret[4];
+a_load_ret a_load(uint offset) {
   matrix<float16_t, 4, 3> arr[4] = (matrix<float16_t, 4, 3>[4])0;
   {
     for(uint i = 0u; (i < 4u); i = (i + 1u)) {
-      arr[i] = tint_symbol_1(buffer, (offset + (i * 32u)));
+      arr[i] = a_load_1((offset + (i * 32u)));
     }
   }
   return arr;
@@ -41,14 +41,11 @@ tint_symbol_ret tint_symbol(uint4 buffer[8], uint offset) {
 
 [numthreads(1, 1, 1)]
 void f() {
-  const matrix<float16_t, 4, 3> l_a[4] = tint_symbol(a, 0u);
-  const matrix<float16_t, 4, 3> l_a_i = tint_symbol_1(a, 64u);
+  const matrix<float16_t, 4, 3> l_a[4] = a_load(0u);
+  const matrix<float16_t, 4, 3> l_a_i = a_load_1(64u);
   uint2 ubo_load_8 = a[4].zw;
   vector<float16_t, 2> ubo_load_8_xz = vector<float16_t, 2>(f16tof32(ubo_load_8 & 0xFFFF));
   float16_t ubo_load_8_y = f16tof32(ubo_load_8[0] >> 16);
   const vector<float16_t, 3> l_a_i_i = vector<float16_t, 3>(ubo_load_8_xz[0], ubo_load_8_y, ubo_load_8_xz[1]);
   return;
 }
-FXC validation failure:
-D:\Projects\RampUp\dawn\test\tint\buffer\Shader@0x0000021B182DE800(5,8-16): error X3000: syntax error: unexpected token 'float16_t'
-

test/tint/buffer/uniform/std140/array/mat4x3_f16/to_builtin.wgsl.expected.fxc.hlsl

@@ -4,24 +4,24 @@ cbuffer cbuffer_u : register(b0, space0) {
   uint4 u[8];
 };
 
-matrix<float16_t, 4, 3> tint_symbol(uint4 buffer[8], uint offset) {
+matrix<float16_t, 4, 3> u_load(uint offset) {
   const uint scalar_offset = ((offset + 0u)) / 4;
-  uint4 ubo_load_1 = buffer[scalar_offset / 4];
+  uint4 ubo_load_1 = u[scalar_offset / 4];
   uint2 ubo_load = ((scalar_offset & 2) ? ubo_load_1.zw : ubo_load_1.xy);
   vector<float16_t, 2> ubo_load_xz = vector<float16_t, 2>(f16tof32(ubo_load & 0xFFFF));
   float16_t ubo_load_y = f16tof32(ubo_load[0] >> 16);
   const uint scalar_offset_1 = ((offset + 8u)) / 4;
-  uint4 ubo_load_3 = buffer[scalar_offset_1 / 4];
+  uint4 ubo_load_3 = u[scalar_offset_1 / 4];
   uint2 ubo_load_2 = ((scalar_offset_1 & 2) ? ubo_load_3.zw : ubo_load_3.xy);
   vector<float16_t, 2> ubo_load_2_xz = vector<float16_t, 2>(f16tof32(ubo_load_2 & 0xFFFF));
   float16_t ubo_load_2_y = f16tof32(ubo_load_2[0] >> 16);
   const uint scalar_offset_2 = ((offset + 16u)) / 4;
-  uint4 ubo_load_5 = buffer[scalar_offset_2 / 4];
+  uint4 ubo_load_5 = u[scalar_offset_2 / 4];
   uint2 ubo_load_4 = ((scalar_offset_2 & 2) ? ubo_load_5.zw : ubo_load_5.xy);
   vector<float16_t, 2> ubo_load_4_xz = vector<float16_t, 2>(f16tof32(ubo_load_4 & 0xFFFF));
   float16_t ubo_load_4_y = f16tof32(ubo_load_4[0] >> 16);
   const uint scalar_offset_3 = ((offset + 24u)) / 4;
-  uint4 ubo_load_7 = buffer[scalar_offset_3 / 4];
+  uint4 ubo_load_7 = u[scalar_offset_3 / 4];
   uint2 ubo_load_6 = ((scalar_offset_3 & 2) ? ubo_load_7.zw : ubo_load_7.xy);
   vector<float16_t, 2> ubo_load_6_xz = vector<float16_t, 2>(f16tof32(ubo_load_6 & 0xFFFF));
   float16_t ubo_load_6_y = f16tof32(ubo_load_6[0] >> 16);
@@ -30,7 +30,7 @@ matrix<float16_t, 4, 3> tint_symbol(uint4 buffer[8], uint offset) {
 
 [numthreads(1, 1, 1)]
 void f() {
-  const matrix<float16_t, 3, 4> t = transpose(tint_symbol(u, 64u));
+  const matrix<float16_t, 3, 4> t = transpose(u_load(64u));
   uint2 ubo_load_8 = u[0].zw;
   vector<float16_t, 2> ubo_load_8_xz = vector<float16_t, 2>(f16tof32(ubo_load_8 & 0xFFFF));
   float16_t ubo_load_8_y = f16tof32(ubo_load_8[0] >> 16);
@@ -41,6 +41,3 @@ void f() {
   const float16_t a = abs(vector<float16_t, 3>(ubo_load_9_xz[0], ubo_load_9_y, ubo_load_9_xz[1]).zxy.x);
   return;
 }
-FXC validation failure:
-D:\Projects\RampUp\dawn\test\tint\buffer\Shader@0x000002C9B1C5A400(5,8-16): error X3000: syntax error: unexpected token 'float16_t'
-

test/tint/buffer/uniform/std140/array/mat4x3_f16/to_fn.wgsl.expected.fxc.hlsl

@@ -16,36 +16,36 @@ void c(vector<float16_t, 3> v) {
 void d(float16_t f_1) {
 }
 
-matrix<float16_t, 4, 3> tint_symbol_1(uint4 buffer[8], uint offset) {
+matrix<float16_t, 4, 3> u_load_1(uint offset) {
   const uint scalar_offset = ((offset + 0u)) / 4;
-  uint4 ubo_load_1 = buffer[scalar_offset / 4];
+  uint4 ubo_load_1 = u[scalar_offset / 4];
   uint2 ubo_load = ((scalar_offset & 2) ? ubo_load_1.zw : ubo_load_1.xy);
   vector<float16_t, 2> ubo_load_xz = vector<float16_t, 2>(f16tof32(ubo_load & 0xFFFF));
   float16_t ubo_load_y = f16tof32(ubo_load[0] >> 16);
   const uint scalar_offset_1 = ((offset + 8u)) / 4;
-  uint4 ubo_load_3 = buffer[scalar_offset_1 / 4];
+  uint4 ubo_load_3 = u[scalar_offset_1 / 4];
   uint2 ubo_load_2 = ((scalar_offset_1 & 2) ? ubo_load_3.zw : ubo_load_3.xy);
   vector<float16_t, 2> ubo_load_2_xz = vector<float16_t, 2>(f16tof32(ubo_load_2 & 0xFFFF));
   float16_t ubo_load_2_y = f16tof32(ubo_load_2[0] >> 16);
   const uint scalar_offset_2 = ((offset + 16u)) / 4;
-  uint4 ubo_load_5 = buffer[scalar_offset_2 / 4];
+  uint4 ubo_load_5 = u[scalar_offset_2 / 4];
   uint2 ubo_load_4 = ((scalar_offset_2 & 2) ? ubo_load_5.zw : ubo_load_5.xy);
   vector<float16_t, 2> ubo_load_4_xz = vector<float16_t, 2>(f16tof32(ubo_load_4 & 0xFFFF));
   float16_t ubo_load_4_y = f16tof32(ubo_load_4[0] >> 16);
   const uint scalar_offset_3 = ((offset + 24u)) / 4;
-  uint4 ubo_load_7 = buffer[scalar_offset_3 / 4];
+  uint4 ubo_load_7 = u[scalar_offset_3 / 4];
   uint2 ubo_load_6 = ((scalar_offset_3 & 2) ? ubo_load_7.zw : ubo_load_7.xy);
   vector<float16_t, 2> ubo_load_6_xz = vector<float16_t, 2>(f16tof32(ubo_load_6 & 0xFFFF));
   float16_t ubo_load_6_y = f16tof32(ubo_load_6[0] >> 16);
   return matrix<float16_t, 4, 3>(vector<float16_t, 3>(ubo_load_xz[0], ubo_load_y, ubo_load_xz[1]), vector<float16_t, 3>(ubo_load_2_xz[0], ubo_load_2_y, ubo_load_2_xz[1]), vector<float16_t, 3>(ubo_load_4_xz[0], ubo_load_4_y, ubo_load_4_xz[1]), vector<float16_t, 3>(ubo_load_6_xz[0], ubo_load_6_y, ubo_load_6_xz[1]));
 }
 
-typedef matrix<float16_t, 4, 3> tint_symbol_ret[4];
-tint_symbol_ret tint_symbol(uint4 buffer[8], uint offset) {
+typedef matrix<float16_t, 4, 3> u_load_ret[4];
+u_load_ret u_load(uint offset) {
   matrix<float16_t, 4, 3> arr[4] = (matrix<float16_t, 4, 3>[4])0;
   {
     for(uint i = 0u; (i < 4u); i = (i + 1u)) {
-      arr[i] = tint_symbol_1(buffer, (offset + (i * 32u)));
+      arr[i] = u_load_1((offset + (i * 32u)));
     }
   }
   return arr;
@@ -53,8 +53,8 @@ tint_symbol_ret tint_symbol(uint4 buffer[8], uint offset) {
 
 [numthreads(1, 1, 1)]
 void f() {
-  a(tint_symbol(u, 0u));
-  b(tint_symbol_1(u, 32u));
+  a(u_load(0u));
+  b(u_load_1(32u));
   uint2 ubo_load_8 = u[2].xy;
   vector<float16_t, 2> ubo_load_8_xz = vector<float16_t, 2>(f16tof32(ubo_load_8 & 0xFFFF));
   float16_t ubo_load_8_y = f16tof32(ubo_load_8[0] >> 16);
@@ -65,9 +65,3 @@ void f() {
   d(vector<float16_t, 3>(ubo_load_9_xz[0], ubo_load_9_y, ubo_load_9_xz[1]).zxy.x);
   return;
 }
-FXC validation failure:
-D:\Projects\RampUp\dawn\test\tint\buffer\Shader@0x00000296784C0E70(5,15-23): error X3000: syntax error: unexpected token 'float16_t'
-D:\Projects\RampUp\dawn\test\tint\buffer\Shader@0x00000296784C0E70(8,15-23): error X3000: syntax error: unexpected token 'float16_t'
-D:\Projects\RampUp\dawn\test\tint\buffer\Shader@0x00000296784C0E70(11,15-23): error X3000: syntax error: unexpected token 'float16_t'
-D:\Projects\RampUp\dawn\test\tint\buffer\Shader@0x00000296784C0E70(14,8-16): error X3000: unrecognized identifier 'float16_t'
-

test/tint/buffer/uniform/std140/array/mat4x3_f16/to_private.wgsl.expected.fxc.hlsl

@@ -5,36 +5,36 @@ cbuffer cbuffer_u : register(b0, space0) {
 };
 static matrix<float16_t, 4, 3> p[4] = (matrix<float16_t, 4, 3>[4])0;
 
-matrix<float16_t, 4, 3> tint_symbol_1(uint4 buffer[8], uint offset) {
+matrix<float16_t, 4, 3> u_load_1(uint offset) {
   const uint scalar_offset = ((offset + 0u)) / 4;
-  uint4 ubo_load_1 = buffer[scalar_offset / 4];
+  uint4 ubo_load_1 = u[scalar_offset / 4];
   uint2 ubo_load = ((scalar_offset & 2) ? ubo_load_1.zw : ubo_load_1.xy);
   vector<float16_t, 2> ubo_load_xz = vector<float16_t, 2>(f16tof32(ubo_load & 0xFFFF));
   float16_t ubo_load_y = f16tof32(ubo_load[0] >> 16);
   const uint scalar_offset_1 = ((offset + 8u)) / 4;
-  uint4 ubo_load_3 = buffer[scalar_offset_1 / 4];
+  uint4 ubo_load_3 = u[scalar_offset_1 / 4];
   uint2 ubo_load_2 = ((scalar_offset_1 & 2) ? ubo_load_3.zw : ubo_load_3.xy);
   vector<float16_t, 2> ubo_load_2_xz = vector<float16_t, 2>(f16tof32(ubo_load_2 & 0xFFFF));
   float16_t ubo_load_2_y = f16tof32(ubo_load_2[0] >> 16);
   const uint scalar_offset_2 = ((offset + 16u)) / 4;
-  uint4 ubo_load_5 = buffer[scalar_offset_2 / 4];
+  uint4 ubo_load_5 = u[scalar_offset_2 / 4];
   uint2 ubo_load_4 = ((scalar_offset_2 & 2) ? ubo_load_5.zw : ubo_load_5.xy);
   vector<float16_t, 2> ubo_load_4_xz = vector<float16_t, 2>(f16tof32(ubo_load_4 & 0xFFFF));
   float16_t ubo_load_4_y = f16tof32(ubo_load_4[0] >> 16);
   const uint scalar_offset_3 = ((offset + 24u)) / 4;
-  uint4 ubo_load_7 = buffer[scalar_offset_3 / 4];
+  uint4 ubo_load_7 = u[scalar_offset_3 / 4];
   uint2 ubo_load_6 = ((scalar_offset_3 & 2) ? ubo_load_7.zw : ubo_load_7.xy);
   vector<float16_t, 2> ubo_load_6_xz = vector<float16_t, 2>(f16tof32(ubo_load_6 & 0xFFFF));
   float16_t ubo_load_6_y = f16tof32(ubo_load_6[0] >> 16);
   return matrix<float16_t, 4, 3>(vector<float16_t, 3>(ubo_load_xz[0], ubo_load_y, ubo_load_xz[1]), vector<float16_t, 3>(ubo_load_2_xz[0], ubo_load_2_y, ubo_load_2_xz[1]), vector<float16_t, 3>(ubo_load_4_xz[0], ubo_load_4_y, ubo_load_4_xz[1]), vector<float16_t, 3>(ubo_load_6_xz[0], ubo_load_6_y, ubo_load_6_xz[1]));
 }
 
-typedef matrix<float16_t, 4, 3> tint_symbol_ret[4];
-tint_symbol_ret tint_symbol(uint4 buffer[8], uint offset) {
+typedef matrix<float16_t, 4, 3> u_load_ret[4];
+u_load_ret u_load(uint offset) {
   matrix<float16_t, 4, 3> arr[4] = (matrix<float16_t, 4, 3>[4])0;
   {
     for(uint i = 0u; (i < 4u); i = (i + 1u)) {
-      arr[i] = tint_symbol_1(buffer, (offset + (i * 32u)));
+      arr[i] = u_load_1((offset + (i * 32u)));
     }
   }
   return arr;
@@ -42,8 +42,8 @@ tint_symbol_ret tint_symbol(uint4 buffer[8], uint offset) {
 
 [numthreads(1, 1, 1)]
 void f() {
-  p = tint_symbol(u, 0u);
-  p[1] = tint_symbol_1(u, 64u);
+  p = u_load(0u);
+  p[1] = u_load_1(64u);
   uint2 ubo_load_8 = u[0].zw;
   vector<float16_t, 2> ubo_load_8_xz = vector<float16_t, 2>(f16tof32(ubo_load_8 & 0xFFFF));
   float16_t ubo_load_8_y = f16tof32(ubo_load_8[0] >> 16);
@@ -51,6 +51,3 @@ void f() {
   p[1][0].x = float16_t(f16tof32(((u[0].z) & 0xFFFF)));
   return;
 }
-FXC validation failure:
-D:\Projects\RampUp\dawn\test\tint\buffer\Shader@0x00000222F970C590(4,15-23): error X3000: syntax error: unexpected token 'float16_t'
-

test/tint/buffer/uniform/std140/array/mat4x3_f16/to_storage.wgsl.expected.fxc.hlsl

@@ -5,52 +5,52 @@ cbuffer cbuffer_u : register(b0, space0) {
 };
 RWByteAddressBuffer s : register(u1, space0);
 
-void tint_symbol_1(RWByteAddressBuffer buffer, uint offset, matrix<float16_t, 4, 3> value) {
-  buffer.Store<vector<float16_t, 3> >((offset + 0u), value[0u]);
-  buffer.Store<vector<float16_t, 3> >((offset + 8u), value[1u]);
-  buffer.Store<vector<float16_t, 3> >((offset + 16u), value[2u]);
-  buffer.Store<vector<float16_t, 3> >((offset + 24u), value[3u]);
+void s_store_1(uint offset, matrix<float16_t, 4, 3> value) {
+  s.Store<vector<float16_t, 3> >((offset + 0u), value[0u]);
+  s.Store<vector<float16_t, 3> >((offset + 8u), value[1u]);
+  s.Store<vector<float16_t, 3> >((offset + 16u), value[2u]);
+  s.Store<vector<float16_t, 3> >((offset + 24u), value[3u]);
 }
 
-void tint_symbol(RWByteAddressBuffer buffer, uint offset, matrix<float16_t, 4, 3> value[4]) {
-  matrix<float16_t, 4, 3> array[4] = value;
+void s_store(uint offset, matrix<float16_t, 4, 3> value[4]) {
+  matrix<float16_t, 4, 3> array_1[4] = value;
   {
     for(uint i = 0u; (i < 4u); i = (i + 1u)) {
-      tint_symbol_1(buffer, (offset + (i * 32u)), array[i]);
+      s_store_1((offset + (i * 32u)), array_1[i]);
     }
   }
 }
 
-matrix<float16_t, 4, 3> tint_symbol_4(uint4 buffer[8], uint offset) {
+matrix<float16_t, 4, 3> u_load_1(uint offset) {
   const uint scalar_offset = ((offset + 0u)) / 4;
-  uint4 ubo_load_1 = buffer[scalar_offset / 4];
+  uint4 ubo_load_1 = u[scalar_offset / 4];
   uint2 ubo_load = ((scalar_offset & 2) ? ubo_load_1.zw : ubo_load_1.xy);
   vector<float16_t, 2> ubo_load_xz = vector<float16_t, 2>(f16tof32(ubo_load & 0xFFFF));
   float16_t ubo_load_y = f16tof32(ubo_load[0] >> 16);
   const uint scalar_offset_1 = ((offset + 8u)) / 4;
-  uint4 ubo_load_3 = buffer[scalar_offset_1 / 4];
+  uint4 ubo_load_3 = u[scalar_offset_1 / 4];
   uint2 ubo_load_2 = ((scalar_offset_1 & 2) ? ubo_load_3.zw : ubo_load_3.xy);
   vector<float16_t, 2> ubo_load_2_xz = vector<float16_t, 2>(f16tof32(ubo_load_2 & 0xFFFF));
   float16_t ubo_load_2_y = f16tof32(ubo_load_2[0] >> 16);
   const uint scalar_offset_2 = ((offset + 16u)) / 4;
-  uint4 ubo_load_5 = buffer[scalar_offset_2 / 4];
+  uint4 ubo_load_5 = u[scalar_offset_2 / 4];
   uint2 ubo_load_4 = ((scalar_offset_2 & 2) ? ubo_load_5.zw : ubo_load_5.xy);
   vector<float16_t, 2> ubo_load_4_xz = vector<float16_t, 2>(f16tof32(ubo_load_4 & 0xFFFF));
   float16_t ubo_load_4_y = f16tof32(ubo_load_4[0] >> 16);
   const uint scalar_offset_3 = ((offset + 24u)) / 4;
-  uint4 ubo_load_7 = buffer[scalar_offset_3 / 4];
+  uint4 ubo_load_7 = u[scalar_offset_3 / 4];
   uint2 ubo_load_6 = ((scalar_offset_3 & 2) ? ubo_load_7.zw : ubo_load_7.xy);
   vector<float16_t, 2> ubo_load_6_xz = vector<float16_t, 2>(f16tof32(ubo_load_6 & 0xFFFF));
   float16_t ubo_load_6_y = f16tof32(ubo_load_6[0] >> 16);
   return matrix<float16_t, 4, 3>(vector<float16_t, 3>(ubo_load_xz[0], ubo_load_y, ubo_load_xz[1]), vector<float16_t, 3>(ubo_load_2_xz[0], ubo_load_2_y, ubo_load_2_xz[1]), vector<float16_t, 3>(ubo_load_4_xz[0], ubo_load_4_y, ubo_load_4_xz[1]), vector<float16_t, 3>(ubo_load_6_xz[0], ubo_load_6_y, ubo_load_6_xz[1]));
 }
 
-typedef matrix<float16_t, 4, 3> tint_symbol_3_ret[4];
-tint_symbol_3_ret tint_symbol_3(uint4 buffer[8], uint offset) {
+typedef matrix<float16_t, 4, 3> u_load_ret[4];
+u_load_ret u_load(uint offset) {
   matrix<float16_t, 4, 3> arr[4] = (matrix<float16_t, 4, 3>[4])0;
   {
     for(uint i_1 = 0u; (i_1 < 4u); i_1 = (i_1 + 1u)) {
-      arr[i_1] = tint_symbol_4(buffer, (offset + (i_1 * 32u)));
+      arr[i_1] = u_load_1((offset + (i_1 * 32u)));
     }
   }
   return arr;
@@ -58,8 +58,8 @@ tint_symbol_3_ret tint_symbol_3(uint4 buffer[8], uint offset) {
 
 [numthreads(1, 1, 1)]
 void f() {
-  tint_symbol(s, 0u, tint_symbol_3(u, 0u));
-  tint_symbol_1(s, 32u, tint_symbol_4(u, 64u));
+  s_store(0u, u_load(0u));
+  s_store_1(32u, u_load_1(64u));
   uint2 ubo_load_8 = u[0].zw;
   vector<float16_t, 2> ubo_load_8_xz = vector<float16_t, 2>(f16tof32(ubo_load_8 & 0xFFFF));
   float16_t ubo_load_8_y = f16tof32(ubo_load_8[0] >> 16);
@@ -67,7 +67,3 @@ void f() {
   s.Store<float16_t>(32u, float16_t(f16tof32(((u[0].z) & 0xFFFF))));
   return;
 }
-FXC validation failure:
-D:\Projects\RampUp\dawn\test\tint\buffer\Shader@0x0000021F13DB33D0(6,68-76): error X3000: syntax error: unexpected token 'float16_t'
-D:\Projects\RampUp\dawn\test\tint\buffer\Shader@0x0000021F13DB33D0(7,3-14): error X3018: invalid subscript 'Store'
-

test/tint/buffer/uniform/std140/array/mat4x3_f16/to_workgroup.wgsl.expected.fxc.hlsl

@@ -9,36 +9,36 @@ struct tint_symbol_1 {
   uint local_invocation_index : SV_GroupIndex;
 };
 
-matrix<float16_t, 4, 3> tint_symbol_3(uint4 buffer[8], uint offset) {
+matrix<float16_t, 4, 3> u_load_1(uint offset) {
   const uint scalar_offset = ((offset + 0u)) / 4;
-  uint4 ubo_load_1 = buffer[scalar_offset / 4];
+  uint4 ubo_load_1 = u[scalar_offset / 4];
   uint2 ubo_load = ((scalar_offset & 2) ? ubo_load_1.zw : ubo_load_1.xy);
   vector<float16_t, 2> ubo_load_xz = vector<float16_t, 2>(f16tof32(ubo_load & 0xFFFF));
   float16_t ubo_load_y = f16tof32(ubo_load[0] >> 16);
   const uint scalar_offset_1 = ((offset + 8u)) / 4;
-  uint4 ubo_load_3 = buffer[scalar_offset_1 / 4];
+  uint4 ubo_load_3 = u[scalar_offset_1 / 4];
   uint2 ubo_load_2 = ((scalar_offset_1 & 2) ? ubo_load_3.zw : ubo_load_3.xy);
   vector<float16_t, 2> ubo_load_2_xz = vector<float16_t, 2>(f16tof32(ubo_load_2 & 0xFFFF));
   float16_t ubo_load_2_y = f16tof32(ubo_load_2[0] >> 16);
   const uint scalar_offset_2 = ((offset + 16u)) / 4;
-  uint4 ubo_load_5 = buffer[scalar_offset_2 / 4];
+  uint4 ubo_load_5 = u[scalar_offset_2 / 4];
   uint2 ubo_load_4 = ((scalar_offset_2 & 2) ? ubo_load_5.zw : ubo_load_5.xy);
   vector<float16_t, 2> ubo_load_4_xz = vector<float16_t, 2>(f16tof32(ubo_load_4 & 0xFFFF));
   float16_t ubo_load_4_y = f16tof32(ubo_load_4[0] >> 16);
   const uint scalar_offset_3 = ((offset + 24u)) / 4;
-  uint4 ubo_load_7 = buffer[scalar_offset_3 / 4];
+  uint4 ubo_load_7 = u[scalar_offset_3 / 4];
   uint2 ubo_load_6 = ((scalar_offset_3 & 2) ? ubo_load_7.zw : ubo_load_7.xy);
   vector<float16_t, 2> ubo_load_6_xz = vector<float16_t, 2>(f16tof32(ubo_load_6 & 0xFFFF));
   float16_t ubo_load_6_y = f16tof32(ubo_load_6[0] >> 16);
   return matrix<float16_t, 4, 3>(vector<float16_t, 3>(ubo_load_xz[0], ubo_load_y, ubo_load_xz[1]), vector<float16_t, 3>(ubo_load_2_xz[0], ubo_load_2_y, ubo_load_2_xz[1]), vector<float16_t, 3>(ubo_load_4_xz[0], ubo_load_4_y, ubo_load_4_xz[1]), vector<float16_t, 3>(ubo_load_6_xz[0], ubo_load_6_y, ubo_load_6_xz[1]));
 }
 
-typedef matrix<float16_t, 4, 3> tint_symbol_2_ret[4];
-tint_symbol_2_ret tint_symbol_2(uint4 buffer[8], uint offset) {
+typedef matrix<float16_t, 4, 3> u_load_ret[4];
+u_load_ret u_load(uint offset) {
   matrix<float16_t, 4, 3> arr[4] = (matrix<float16_t, 4, 3>[4])0;
   {
     for(uint i_1 = 0u; (i_1 < 4u); i_1 = (i_1 + 1u)) {
-      arr[i_1] = tint_symbol_3(buffer, (offset + (i_1 * 32u)));
+      arr[i_1] = u_load_1((offset + (i_1 * 32u)));
     }
   }
   return arr;
@@ -52,8 +52,8 @@ void f_inner(uint local_invocation_index) {
     }
   }
   GroupMemoryBarrierWithGroupSync();
-  w = tint_symbol_2(u, 0u);
-  w[1] = tint_symbol_3(u, 64u);
+  w = u_load(0u);
+  w[1] = u_load_1(64u);
   uint2 ubo_load_8 = u[0].zw;
   vector<float16_t, 2> ubo_load_8_xz = vector<float16_t, 2>(f16tof32(ubo_load_8 & 0xFFFF));
   float16_t ubo_load_8_y = f16tof32(ubo_load_8[0] >> 16);
@@ -66,6 +66,3 @@ void f(tint_symbol_1 tint_symbol) {
   f_inner(tint_symbol.local_invocation_index);
   return;
 }
-FXC validation failure:
-D:\Projects\RampUp\dawn\test\tint\buffer\Shader@0x000001D6F2EDF360(4,20-28): error X3000: syntax error: unexpected token 'float16_t'
-

test/tint/buffer/uniform/std140/array/mat4x4_f16/dynamic_index_via_ptr.wgsl.expected.fxc.hlsl

@@ -10,36 +10,36 @@ int i() {
   return counter;
 }
 
-matrix<float16_t, 4, 4> tint_symbol_1(uint4 buffer[8], uint offset) {
+matrix<float16_t, 4, 4> a_load_1(uint offset) {
   const uint scalar_offset = ((offset + 0u)) / 4;
-  uint4 ubo_load_1 = buffer[scalar_offset / 4];
+  uint4 ubo_load_1 = a[scalar_offset / 4];
   uint2 ubo_load = ((scalar_offset & 2) ? ubo_load_1.zw : ubo_load_1.xy);
   vector<float16_t, 2> ubo_load_xz = vector<float16_t, 2>(f16tof32(ubo_load & 0xFFFF));
   vector<float16_t, 2> ubo_load_yw = vector<float16_t, 2>(f16tof32(ubo_load >> 16));
   const uint scalar_offset_1 = ((offset + 8u)) / 4;
-  uint4 ubo_load_3 = buffer[scalar_offset_1 / 4];
+  uint4 ubo_load_3 = a[scalar_offset_1 / 4];
   uint2 ubo_load_2 = ((scalar_offset_1 & 2) ? ubo_load_3.zw : ubo_load_3.xy);
   vector<float16_t, 2> ubo_load_2_xz = vector<float16_t, 2>(f16tof32(ubo_load_2 & 0xFFFF));
   vector<float16_t, 2> ubo_load_2_yw = vector<float16_t, 2>(f16tof32(ubo_load_2 >> 16));
   const uint scalar_offset_2 = ((offset + 16u)) / 4;
-  uint4 ubo_load_5 = buffer[scalar_offset_2 / 4];
+  uint4 ubo_load_5 = a[scalar_offset_2 / 4];
   uint2 ubo_load_4 = ((scalar_offset_2 & 2) ? ubo_load_5.zw : ubo_load_5.xy);
   vector<float16_t, 2> ubo_load_4_xz = vector<float16_t, 2>(f16tof32(ubo_load_4 & 0xFFFF));
   vector<float16_t, 2> ubo_load_4_yw = vector<float16_t, 2>(f16tof32(ubo_load_4 >> 16));
   const uint scalar_offset_3 = ((offset + 24u)) / 4;
-  uint4 ubo_load_7 = buffer[scalar_offset_3 / 4];
+  uint4 ubo_load_7 = a[scalar_offset_3 / 4];
   uint2 ubo_load_6 = ((scalar_offset_3 & 2) ? ubo_load_7.zw : ubo_load_7.xy);
   vector<float16_t, 2> ubo_load_6_xz = vector<float16_t, 2>(f16tof32(ubo_load_6 & 0xFFFF));
   vector<float16_t, 2> ubo_load_6_yw = vector<float16_t, 2>(f16tof32(ubo_load_6 >> 16));
   return matrix<float16_t, 4, 4>(vector<float16_t, 4>(ubo_load_xz[0], ubo_load_yw[0], ubo_load_xz[1], ubo_load_yw[1]), vector<float16_t, 4>(ubo_load_2_xz[0], ubo_load_2_yw[0], ubo_load_2_xz[1], ubo_load_2_yw[1]), vector<float16_t, 4>(ubo_load_4_xz[0], ubo_load_4_yw[0], ubo_load_4_xz[1], ubo_load_4_yw[1]), vector<float16_t, 4>(ubo_load_6_xz[0], ubo_load_6_yw[0], ubo_load_6_xz[1], ubo_load_6_yw[1]));
 }
 
-typedef matrix<float16_t, 4, 4> tint_symbol_ret[4];
-tint_symbol_ret tint_symbol(uint4 buffer[8], uint offset) {
+typedef matrix<float16_t, 4, 4> a_load_ret[4];
+a_load_ret a_load(uint offset) {
   matrix<float16_t, 4, 4> arr[4] = (matrix<float16_t, 4, 4>[4])0;
   {
     for(uint i_1 = 0u; (i_1 < 4u); i_1 = (i_1 + 1u)) {
-      arr[i_1] = tint_symbol_1(buffer, (offset + (i_1 * 32u)));
+      arr[i_1] = a_load_1((offset + (i_1 * 32u)));
     }
   }
   return arr;
@@ -49,8 +49,8 @@ tint_symbol_ret tint_symbol(uint4 buffer[8], uint offset) {
 void f() {
   const int p_a_i_save = i();
   const int p_a_i_i_save = i();
-  const matrix<float16_t, 4, 4> l_a[4] = tint_symbol(a, 0u);
-  const matrix<float16_t, 4, 4> l_a_i = tint_symbol_1(a, (32u * uint(p_a_i_save)));
+  const matrix<float16_t, 4, 4> l_a[4] = a_load(0u);
+  const matrix<float16_t, 4, 4> l_a_i = a_load_1((32u * uint(p_a_i_save)));
   const uint scalar_offset_4 = (((32u * uint(p_a_i_save)) + (8u * uint(p_a_i_i_save)))) / 4;
   uint4 ubo_load_9 = a[scalar_offset_4 / 4];
   uint2 ubo_load_8 = ((scalar_offset_4 & 2) ? ubo_load_9.zw : ubo_load_9.xy);
@@ -59,6 +59,3 @@ void f() {
   const vector<float16_t, 4> l_a_i_i = vector<float16_t, 4>(ubo_load_8_xz[0], ubo_load_8_yw[0], ubo_load_8_xz[1], ubo_load_8_yw[1]);
   return;
 }
-FXC validation failure:
-D:\Projects\RampUp\dawn\test\tint\buffer\Shader@0x000001F4B0E9BB50(11,8-16): error X3000: syntax error: unexpected token 'float16_t'
-

test/tint/buffer/uniform/std140/array/mat4x4_f16/static_index_via_ptr.wgsl.expected.fxc.hlsl

@@ -4,36 +4,36 @@ cbuffer cbuffer_a : register(b0, space0) {
   uint4 a[8];
 };
 
-matrix<float16_t, 4, 4> tint_symbol_1(uint4 buffer[8], uint offset) {
+matrix<float16_t, 4, 4> a_load_1(uint offset) {
   const uint scalar_offset = ((offset + 0u)) / 4;
-  uint4 ubo_load_1 = buffer[scalar_offset / 4];
+  uint4 ubo_load_1 = a[scalar_offset / 4];
   uint2 ubo_load = ((scalar_offset & 2) ? ubo_load_1.zw : ubo_load_1.xy);
   vector<float16_t, 2> ubo_load_xz = vector<float16_t, 2>(f16tof32(ubo_load & 0xFFFF));
   vector<float16_t, 2> ubo_load_yw = vector<float16_t, 2>(f16tof32(ubo_load >> 16));
   const uint scalar_offset_1 = ((offset + 8u)) / 4;
-  uint4 ubo_load_3 = buffer[scalar_offset_1 / 4];
+  uint4 ubo_load_3 = a[scalar_offset_1 / 4];
   uint2 ubo_load_2 = ((scalar_offset_1 & 2) ? ubo_load_3.zw : ubo_load_3.xy);
   vector<float16_t, 2> ubo_load_2_xz = vector<float16_t, 2>(f16tof32(ubo_load_2 & 0xFFFF));
   vector<float16_t, 2> ubo_load_2_yw = vector<float16_t, 2>(f16tof32(ubo_load_2 >> 16));
   const uint scalar_offset_2 = ((offset + 16u)) / 4;
-  uint4 ubo_load_5 = buffer[scalar_offset_2 / 4];
+  uint4 ubo_load_5 = a[scalar_offset_2 / 4];
   uint2 ubo_load_4 = ((scalar_offset_2 & 2) ? ubo_load_5.zw : ubo_load_5.xy);
   vector<float16_t, 2> ubo_load_4_xz = vector<float16_t, 2>(f16tof32(ubo_load_4 & 0xFFFF));
   vector<float16_t, 2> ubo_load_4_yw = vector<float16_t, 2>(f16tof32(ubo_load_4 >> 16));
   const uint scalar_offset_3 = ((offset + 24u)) / 4;
-  uint4 ubo_load_7 = buffer[scalar_offset_3 / 4];
+  uint4 ubo_load_7 = a[scalar_offset_3 / 4];
   uint2 ubo_load_6 = ((scalar_offset_3 & 2) ? ubo_load_7.zw : ubo_load_7.xy);
   vector<float16_t, 2> ubo_load_6_xz = vector<float16_t, 2>(f16tof32(ubo_load_6 & 0xFFFF));
   vector<float16_t, 2> ubo_load_6_yw = vector<float16_t, 2>(f16tof32(ubo_load_6 >> 16));
   return matrix<float16_t, 4, 4>(vector<float16_t, 4>(ubo_load_xz[0], ubo_load_yw[0], ubo_load_xz[1], ubo_load_yw[1]), vector<float16_t, 4>(ubo_load_2_xz[0], ubo_load_2_yw[0], ubo_load_2_xz[1], ubo_load_2_yw[1]), vector<float16_t, 4>(ubo_load_4_xz[0], ubo_load_4_yw[0], ubo_load_4_xz[1], ubo_load_4_yw[1]), vector<float16_t, 4>(ubo_load_6_xz[0], ubo_load_6_yw[0], ubo_load_6_xz[1], ubo_load_6_yw[1]));
 }
 
-typedef matrix<float16_t, 4, 4> tint_symbol_ret[4];
-tint_symbol_ret tint_symbol(uint4 buffer[8], uint offset) {
+typedef matrix<float16_t, 4, 4> a_load_ret[4];
+a_load_ret a_load(uint offset) {
   matrix<float16_t, 4, 4> arr[4] = (matrix<float16_t, 4, 4>[4])0;
   {
     for(uint i = 0u; (i < 4u); i = (i + 1u)) {
-      arr[i] = tint_symbol_1(buffer, (offset + (i * 32u)));
+      arr[i] = a_load_1((offset + (i * 32u)));
     }
   }
   return arr;
@@ -41,14 +41,11 @@ tint_symbol_ret tint_symbol(uint4 buffer[8], uint offset) {
 
 [numthreads(1, 1, 1)]
 void f() {
-  const matrix<float16_t, 4, 4> l_a[4] = tint_symbol(a, 0u);
-  const matrix<float16_t, 4, 4> l_a_i = tint_symbol_1(a, 64u);
+  const matrix<float16_t, 4, 4> l_a[4] = a_load(0u);
+  const matrix<float16_t, 4, 4> l_a_i = a_load_1(64u);
   uint2 ubo_load_8 = a[4].zw;
   vector<float16_t, 2> ubo_load_8_xz = vector<float16_t, 2>(f16tof32(ubo_load_8 & 0xFFFF));
   vector<float16_t, 2> ubo_load_8_yw = vector<float16_t, 2>(f16tof32(ubo_load_8 >> 16));
   const vector<float16_t, 4> l_a_i_i = vector<float16_t, 4>(ubo_load_8_xz[0], ubo_load_8_yw[0], ubo_load_8_xz[1], ubo_load_8_yw[1]);
   return;
 }
-FXC validation failure:
-D:\Projects\RampUp\dawn\test\tint\buffer\Shader@0x000001586950D8A0(5,8-16): error X3000: syntax error: unexpected token 'float16_t'
-

test/tint/buffer/uniform/std140/array/mat4x4_f16/to_builtin.wgsl.expected.fxc.hlsl

@@ -4,24 +4,24 @@ cbuffer cbuffer_u : register(b0, space0) {
   uint4 u[8];
 };
 
-matrix<float16_t, 4, 4> tint_symbol(uint4 buffer[8], uint offset) {
+matrix<float16_t, 4, 4> u_load(uint offset) {
   const uint scalar_offset = ((offset + 0u)) / 4;
-  uint4 ubo_load_1 = buffer[scalar_offset / 4];
+  uint4 ubo_load_1 = u[scalar_offset / 4];
   uint2 ubo_load = ((scalar_offset & 2) ? ubo_load_1.zw : ubo_load_1.xy);
   vector<float16_t, 2> ubo_load_xz = vector<float16_t, 2>(f16tof32(ubo_load & 0xFFFF));
   vector<float16_t, 2> ubo_load_yw = vector<float16_t, 2>(f16tof32(ubo_load >> 16));
   const uint scalar_offset_1 = ((offset + 8u)) / 4;
-  uint4 ubo_load_3 = buffer[scalar_offset_1 / 4];
+  uint4 ubo_load_3 = u[scalar_offset_1 / 4];
   uint2 ubo_load_2 = ((scalar_offset_1 & 2) ? ubo_load_3.zw : ubo_load_3.xy);
   vector<float16_t, 2> ubo_load_2_xz = vector<float16_t, 2>(f16tof32(ubo_load_2 & 0xFFFF));
   vector<float16_t, 2> ubo_load_2_yw = vector<float16_t, 2>(f16tof32(ubo_load_2 >> 16));
   const uint scalar_offset_2 = ((offset + 16u)) / 4;
-  uint4 ubo_load_5 = buffer[scalar_offset_2 / 4];
+  uint4 ubo_load_5 = u[scalar_offset_2 / 4];
   uint2 ubo_load_4 = ((scalar_offset_2 & 2) ? ubo_load_5.zw : ubo_load_5.xy);
   vector<float16_t, 2> ubo_load_4_xz = vector<float16_t, 2>(f16tof32(ubo_load_4 & 0xFFFF));
   vector<float16_t, 2> ubo_load_4_yw = vector<float16_t, 2>(f16tof32(ubo_load_4 >> 16));
   const uint scalar_offset_3 = ((offset + 24u)) / 4;
-  uint4 ubo_load_7 = buffer[scalar_offset_3 / 4];
+  uint4 ubo_load_7 = u[scalar_offset_3 / 4];
   uint2 ubo_load_6 = ((scalar_offset_3 & 2) ? ubo_load_7.zw : ubo_load_7.xy);
   vector<float16_t, 2> ubo_load_6_xz = vector<float16_t, 2>(f16tof32(ubo_load_6 & 0xFFFF));
   vector<float16_t, 2> ubo_load_6_yw = vector<float16_t, 2>(f16tof32(ubo_load_6 >> 16));
@@ -30,7 +30,7 @@ matrix<float16_t, 4, 4> tint_symbol(uint4 buffer[8], uint offset) {
 
 [numthreads(1, 1, 1)]
 void f() {
-  const matrix<float16_t, 4, 4> t = transpose(tint_symbol(u, 64u));
+  const matrix<float16_t, 4, 4> t = transpose(u_load(64u));
   uint2 ubo_load_8 = u[0].zw;
   vector<float16_t, 2> ubo_load_8_xz = vector<float16_t, 2>(f16tof32(ubo_load_8 & 0xFFFF));
   vector<float16_t, 2> ubo_load_8_yw = vector<float16_t, 2>(f16tof32(ubo_load_8 >> 16));
@@ -41,6 +41,3 @@ void f() {
   const float16_t a = abs(vector<float16_t, 4>(ubo_load_9_xz[0], ubo_load_9_yw[0], ubo_load_9_xz[1], ubo_load_9_yw[1]).ywxz.x);
   return;
 }
-FXC validation failure:
-D:\Projects\RampUp\dawn\test\tint\buffer\Shader@0x000002574E068B20(5,8-16): error X3000: syntax error: unexpected token 'float16_t'
-

test/tint/buffer/uniform/std140/array/mat4x4_f16/to_fn.wgsl.expected.fxc.hlsl

@@ -16,36 +16,36 @@ void c(vector<float16_t, 4> v) {
 void d(float16_t f_1) {
 }
 
-matrix<float16_t, 4, 4> tint_symbol_1(uint4 buffer[8], uint offset) {
+matrix<float16_t, 4, 4> u_load_1(uint offset) {
   const uint scalar_offset = ((offset + 0u)) / 4;
-  uint4 ubo_load_1 = buffer[scalar_offset / 4];
+  uint4 ubo_load_1 = u[scalar_offset / 4];
   uint2 ubo_load = ((scalar_offset & 2) ? ubo_load_1.zw : ubo_load_1.xy);
   vector<float16_t, 2> ubo_load_xz = vector<float16_t, 2>(f16tof32(ubo_load & 0xFFFF));
   vector<float16_t, 2> ubo_load_yw = vector<float16_t, 2>(f16tof32(ubo_load >> 16));
   const uint scalar_offset_1 = ((offset + 8u)) / 4;
-  uint4 ubo_load_3 = buffer[scalar_offset_1 / 4];
+  uint4 ubo_load_3 = u[scalar_offset_1 / 4];
   uint2 ubo_load_2 = ((scalar_offset_1 & 2) ? ubo_load_3.zw : ubo_load_3.xy);
   vector<float16_t, 2> ubo_load_2_xz = vector<float16_t, 2>(f16tof32(ubo_load_2 & 0xFFFF));
   vector<float16_t, 2> ubo_load_2_yw = vector<float16_t, 2>(f16tof32(ubo_load_2 >> 16));
   const uint scalar_offset_2 = ((offset + 16u)) / 4;
-  uint4 ubo_load_5 = buffer[scalar_offset_2 / 4];
+  uint4 ubo_load_5 = u[scalar_offset_2 / 4];
   uint2 ubo_load_4 = ((scalar_offset_2 & 2) ? ubo_load_5.zw : ubo_load_5.xy);
   vector<float16_t, 2> ubo_load_4_xz = vector<float16_t, 2>(f16tof32(ubo_load_4 & 0xFFFF));
   vector<float16_t, 2> ubo_load_4_yw = vector<float16_t, 2>(f16tof32(ubo_load_4 >> 16));
   const uint scalar_offset_3 = ((offset + 24u)) / 4;
-  uint4 ubo_load_7 = buffer[scalar_offset_3 / 4];
+  uint4 ubo_load_7 = u[scalar_offset_3 / 4];
   uint2 ubo_load_6 = ((scalar_offset_3 & 2) ? ubo_load_7.zw : ubo_load_7.xy);
   vector<float16_t, 2> ubo_load_6_xz = vector<float16_t, 2>(f16tof32(ubo_load_6 & 0xFFFF));
   vector<float16_t, 2> ubo_load_6_yw = vector<float16_t, 2>(f16tof32(ubo_load_6 >> 16));
   return matrix<float16_t, 4, 4>(vector<float16_t, 4>(ubo_load_xz[0], ubo_load_yw[0], ubo_load_xz[1], ubo_load_yw[1]), vector<float16_t, 4>(ubo_load_2_xz[0], ubo_load_2_yw[0], ubo_load_2_xz[1], ubo_load_2_yw[1]), vector<float16_t, 4>(ubo_load_4_xz[0], ubo_load_4_yw[0], ubo_load_4_xz[1], ubo_load_4_yw[1]), vector<float16_t, 4>(ubo_load_6_xz[0], ubo_load_6_yw[0], ubo_load_6_xz[1], ubo_load_6_yw[1]));
 }
 
-typedef matrix<float16_t, 4, 4> tint_symbol_ret[4];
-tint_symbol_ret tint_symbol(uint4 buffer[8], uint offset) {
+typedef matrix<float16_t, 4, 4> u_load_ret[4];
+u_load_ret u_load(uint offset) {
   matrix<float16_t, 4, 4> arr[4] = (matrix<float16_t, 4, 4>[4])0;
   {
     for(uint i = 0u; (i < 4u); i = (i + 1u)) {
-      arr[i] = tint_symbol_1(buffer, (offset + (i * 32u)));
+      arr[i] = u_load_1((offset + (i * 32u)));
     }
   }
   return arr;
@@ -53,8 +53,8 @@ tint_symbol_ret tint_symbol(uint4 buffer[8], uint offset) {
 
 [numthreads(1, 1, 1)]
 void f() {
-  a(tint_symbol(u, 0u));
-  b(tint_symbol_1(u, 32u));
+  a(u_load(0u));
+  b(u_load_1(32u));
   uint2 ubo_load_8 = u[2].xy;
   vector<float16_t, 2> ubo_load_8_xz = vector<float16_t, 2>(f16tof32(ubo_load_8 & 0xFFFF));
   vector<float16_t, 2> ubo_load_8_yw = vector<float16_t, 2>(f16tof32(ubo_load_8 >> 16));
@@ -65,9 +65,3 @@ void f() {
   d(vector<float16_t, 4>(ubo_load_9_xz[0], ubo_load_9_yw[0], ubo_load_9_xz[1], ubo_load_9_yw[1]).ywxz.x);
   return;
 }
-FXC validation failure:
-D:\Projects\RampUp\dawn\test\tint\buffer\Shader@0x000001FAC4F2FC00(5,15-23): error X3000: syntax error: unexpected token 'float16_t'
-D:\Projects\RampUp\dawn\test\tint\buffer\Shader@0x000001FAC4F2FC00(8,15-23): error X3000: syntax error: unexpected token 'float16_t'
-D:\Projects\RampUp\dawn\test\tint\buffer\Shader@0x000001FAC4F2FC00(11,15-23): error X3000: syntax error: unexpected token 'float16_t'
-D:\Projects\RampUp\dawn\test\tint\buffer\Shader@0x000001FAC4F2FC00(14,8-16): error X3000: unrecognized identifier 'float16_t'
-

test/tint/buffer/uniform/std140/array/mat4x4_f16/to_private.wgsl.expected.fxc.hlsl

@@ -5,36 +5,36 @@ cbuffer cbuffer_u : register(b0, space0) {
 };
 static matrix<float16_t, 4, 4> p[4] = (matrix<float16_t, 4, 4>[4])0;
 
-matrix<float16_t, 4, 4> tint_symbol_1(uint4 buffer[8], uint offset) {
+matrix<float16_t, 4, 4> u_load_1(uint offset) {
   const uint scalar_offset = ((offset + 0u)) / 4;
-  uint4 ubo_load_1 = buffer[scalar_offset / 4];
+  uint4 ubo_load_1 = u[scalar_offset / 4];
   uint2 ubo_load = ((scalar_offset & 2) ? ubo_load_1.zw : ubo_load_1.xy);
   vector<float16_t, 2> ubo_load_xz = vector<float16_t, 2>(f16tof32(ubo_load & 0xFFFF));
   vector<float16_t, 2> ubo_load_yw = vector<float16_t, 2>(f16tof32(ubo_load >> 16));
   const uint scalar_offset_1 = ((offset + 8u)) / 4;
-  uint4 ubo_load_3 = buffer[scalar_offset_1 / 4];
+  uint4 ubo_load_3 = u[scalar_offset_1 / 4];
   uint2 ubo_load_2 = ((scalar_offset_1 & 2) ? ubo_load_3.zw : ubo_load_3.xy);
   vector<float16_t, 2> ubo_load_2_xz = vector<float16_t, 2>(f16tof32(ubo_load_2 & 0xFFFF));
   vector<float16_t, 2> ubo_load_2_yw = vector<float16_t, 2>(f16tof32(ubo_load_2 >> 16));
   const uint scalar_offset_2 = ((offset + 16u)) / 4;
-  uint4 ubo_load_5 = buffer[scalar_offset_2 / 4];
+  uint4 ubo_load_5 = u[scalar_offset_2 / 4];
   uint2 ubo_load_4 = ((scalar_offset_2 & 2) ? ubo_load_5.zw : ubo_load_5.xy);
   vector<float16_t, 2> ubo_load_4_xz = vector<float16_t, 2>(f16tof32(ubo_load_4 & 0xFFFF));
   vector<float16_t, 2> ubo_load_4_yw = vector<float16_t, 2>(f16tof32(ubo_load_4 >> 16));
   const uint scalar_offset_3 = ((offset + 24u)) / 4;
-  uint4 ubo_load_7 = buffer[scalar_offset_3 / 4];
+  uint4 ubo_load_7 = u[scalar_offset_3 / 4];
   uint2 ubo_load_6 = ((scalar_offset_3 & 2) ? ubo_load_7.zw : ubo_load_7.xy);
   vector<float16_t, 2> ubo_load_6_xz = vector<float16_t, 2>(f16tof32(ubo_load_6 & 0xFFFF));
   vector<float16_t, 2> ubo_load_6_yw = vector<float16_t, 2>(f16tof32(ubo_load_6 >> 16));
   return matrix<float16_t, 4, 4>(vector<float16_t, 4>(ubo_load_xz[0], ubo_load_yw[0], ubo_load_xz[1], ubo_load_yw[1]), vector<float16_t, 4>(ubo_load_2_xz[0], ubo_load_2_yw[0], ubo_load_2_xz[1], ubo_load_2_yw[1]), vector<float16_t, 4>(ubo_load_4_xz[0], ubo_load_4_yw[0], ubo_load_4_xz[1], ubo_load_4_yw[1]), vector<float16_t, 4>(ubo_load_6_xz[0], ubo_load_6_yw[0], ubo_load_6_xz[1], ubo_load_6_yw[1]));
 }
 
-typedef matrix<float16_t, 4, 4> tint_symbol_ret[4];
-tint_symbol_ret tint_symbol(uint4 buffer[8], uint offset) {
+typedef matrix<float16_t, 4, 4> u_load_ret[4];
+u_load_ret u_load(uint offset) {
   matrix<float16_t, 4, 4> arr[4] = (matrix<float16_t, 4, 4>[4])0;
   {
     for(uint i = 0u; (i < 4u); i = (i + 1u)) {
-      arr[i] = tint_symbol_1(buffer, (offset + (i * 32u)));
+      arr[i] = u_load_1((offset + (i * 32u)));
     }
   }
   return arr;
@@ -42,8 +42,8 @@ tint_symbol_ret tint_symbol(uint4 buffer[8], uint offset) {
 
 [numthreads(1, 1, 1)]
 void f() {
-  p = tint_symbol(u, 0u);
-  p[1] = tint_symbol_1(u, 64u);
+  p = u_load(0u);
+  p[1] = u_load_1(64u);
   uint2 ubo_load_8 = u[0].zw;
   vector<float16_t, 2> ubo_load_8_xz = vector<float16_t, 2>(f16tof32(ubo_load_8 & 0xFFFF));
   vector<float16_t, 2> ubo_load_8_yw = vector<float16_t, 2>(f16tof32(ubo_load_8 >> 16));
@@ -51,6 +51,3 @@ void f() {
   p[1][0].x = float16_t(f16tof32(((u[0].z) & 0xFFFF)));
   return;
 }
-FXC validation failure:
-D:\Projects\RampUp\dawn\test\tint\buffer\Shader@0x00000219133D8C70(4,15-23): error X3000: syntax error: unexpected token 'float16_t'
-

test/tint/buffer/uniform/std140/array/mat4x4_f16/to_storage.wgsl.expected.fxc.hlsl

@@ -5,52 +5,52 @@ cbuffer cbuffer_u : register(b0, space0) {
 };
 RWByteAddressBuffer s : register(u1, space0);
 
-void tint_symbol_1(RWByteAddressBuffer buffer, uint offset, matrix<float16_t, 4, 4> value) {
-  buffer.Store<vector<float16_t, 4> >((offset + 0u), value[0u]);
-  buffer.Store<vector<float16_t, 4> >((offset + 8u), value[1u]);
-  buffer.Store<vector<float16_t, 4> >((offset + 16u), value[2u]);
-  buffer.Store<vector<float16_t, 4> >((offset + 24u), value[3u]);
+void s_store_1(uint offset, matrix<float16_t, 4, 4> value) {
+  s.Store<vector<float16_t, 4> >((offset + 0u), value[0u]);
+  s.Store<vector<float16_t, 4> >((offset + 8u), value[1u]);
+  s.Store<vector<float16_t, 4> >((offset + 16u), value[2u]);
+  s.Store<vector<float16_t, 4> >((offset + 24u), value[3u]);
 }
 
-void tint_symbol(RWByteAddressBuffer buffer, uint offset, matrix<float16_t, 4, 4> value[4]) {
-  matrix<float16_t, 4, 4> array[4] = value;
+void s_store(uint offset, matrix<float16_t, 4, 4> value[4]) {
+  matrix<float16_t, 4, 4> array_1[4] = value;
   {
     for(uint i = 0u; (i < 4u); i = (i + 1u)) {
-      tint_symbol_1(buffer, (offset + (i * 32u)), array[i]);
+      s_store_1((offset + (i * 32u)), array_1[i]);
     }
   }
 }
 
-matrix<float16_t, 4, 4> tint_symbol_4(uint4 buffer[8], uint offset) {
+matrix<float16_t, 4, 4> u_load_1(uint offset) {
   const uint scalar_offset = ((offset + 0u)) / 4;
-  uint4 ubo_load_1 = buffer[scalar_offset / 4];
+  uint4 ubo_load_1 = u[scalar_offset / 4];
   uint2 ubo_load = ((scalar_offset & 2) ? ubo_load_1.zw : ubo_load_1.xy);
   vector<float16_t, 2> ubo_load_xz = vector<float16_t, 2>(f16tof32(ubo_load & 0xFFFF));
   vector<float16_t, 2> ubo_load_yw = vector<float16_t, 2>(f16tof32(ubo_load >> 16));
   const uint scalar_offset_1 = ((offset + 8u)) / 4;
-  uint4 ubo_load_3 = buffer[scalar_offset_1 / 4];
+  uint4 ubo_load_3 = u[scalar_offset_1 / 4];
   uint2 ubo_load_2 = ((scalar_offset_1 & 2) ? ubo_load_3.zw : ubo_load_3.xy);
   vector<float16_t, 2> ubo_load_2_xz = vector<float16_t, 2>(f16tof32(ubo_load_2 & 0xFFFF));
   vector<float16_t, 2> ubo_load_2_yw = vector<float16_t, 2>(f16tof32(ubo_load_2 >> 16));
   const uint scalar_offset_2 = ((offset + 16u)) / 4;
-  uint4 ubo_load_5 = buffer[scalar_offset_2 / 4];
+  uint4 ubo_load_5 = u[scalar_offset_2 / 4];
   uint2 ubo_load_4 = ((scalar_offset_2 & 2) ? ubo_load_5.zw : ubo_load_5.xy);
   vector<float16_t, 2> ubo_load_4_xz = vector<float16_t, 2>(f16tof32(ubo_load_4 & 0xFFFF));
   vector<float16_t, 2> ubo_load_4_yw = vector<float16_t, 2>(f16tof32(ubo_load_4 >> 16));
   const uint scalar_offset_3 = ((offset + 24u)) / 4;
-  uint4 ubo_load_7 = buffer[scalar_offset_3 / 4];
+  uint4 ubo_load_7 = u[scalar_offset_3 / 4];
   uint2 ubo_load_6 = ((scalar_offset_3 & 2) ? ubo_load_7.zw : ubo_load_7.xy);
   vector<float16_t, 2> ubo_load_6_xz = vector<float16_t, 2>(f16tof32(ubo_load_6 & 0xFFFF));
   vector<float16_t, 2> ubo_load_6_yw = vector<float16_t, 2>(f16tof32(ubo_load_6 >> 16));
   return matrix<float16_t, 4, 4>(vector<float16_t, 4>(ubo_load_xz[0], ubo_load_yw[0], ubo_load_xz[1], ubo_load_yw[1]), vector<float16_t, 4>(ubo_load_2_xz[0], ubo_load_2_yw[0], ubo_load_2_xz[1], ubo_load_2_yw[1]), vector<float16_t, 4>(ubo_load_4_xz[0], ubo_load_4_yw[0], ubo_load_4_xz[1], ubo_load_4_yw[1]), vector<float16_t, 4>(ubo_load_6_xz[0], ubo_load_6_yw[0], ubo_load_6_xz[1], ubo_load_6_yw[1]));
 }
 
-typedef matrix<float16_t, 4, 4> tint_symbol_3_ret[4];
-tint_symbol_3_ret tint_symbol_3(uint4 buffer[8], uint offset) {
+typedef matrix<float16_t, 4, 4> u_load_ret[4];
+u_load_ret u_load(uint offset) {
   matrix<float16_t, 4, 4> arr[4] = (matrix<float16_t, 4, 4>[4])0;
   {
     for(uint i_1 = 0u; (i_1 < 4u); i_1 = (i_1 + 1u)) {
-      arr[i_1] = tint_symbol_4(buffer, (offset + (i_1 * 32u)));
+      arr[i_1] = u_load_1((offset + (i_1 * 32u)));
     }
   }
   return arr;
@@ -58,8 +58,8 @@ tint_symbol_3_ret tint_symbol_3(uint4 buffer[8], uint offset) {
 
 [numthreads(1, 1, 1)]
 void f() {
-  tint_symbol(s, 0u, tint_symbol_3(u, 0u));
-  tint_symbol_1(s, 32u, tint_symbol_4(u, 64u));
+  s_store(0u, u_load(0u));
+  s_store_1(32u, u_load_1(64u));
   uint2 ubo_load_8 = u[0].zw;
   vector<float16_t, 2> ubo_load_8_xz = vector<float16_t, 2>(f16tof32(ubo_load_8 & 0xFFFF));
   vector<float16_t, 2> ubo_load_8_yw = vector<float16_t, 2>(f16tof32(ubo_load_8 >> 16));
@@ -67,7 +67,3 @@ void f() {
   s.Store<float16_t>(32u, float16_t(f16tof32(((u[0].z) & 0xFFFF))));
   return;
 }
-FXC validation failure:
-D:\Projects\RampUp\dawn\test\tint\buffer\Shader@0x000002420B3F4EF0(6,68-76): error X3000: syntax error: unexpected token 'float16_t'
-D:\Projects\RampUp\dawn\test\tint\buffer\Shader@0x000002420B3F4EF0(7,3-14): error X3018: invalid subscript 'Store'
-

test/tint/buffer/uniform/std140/array/mat4x4_f16/to_workgroup.wgsl.expected.fxc.hlsl

@@ -9,36 +9,36 @@ struct tint_symbol_1 {
   uint local_invocation_index : SV_GroupIndex;
 };
 
-matrix<float16_t, 4, 4> tint_symbol_3(uint4 buffer[8], uint offset) {
+matrix<float16_t, 4, 4> u_load_1(uint offset) {
   const uint scalar_offset = ((offset + 0u)) / 4;
-  uint4 ubo_load_1 = buffer[scalar_offset / 4];
+  uint4 ubo_load_1 = u[scalar_offset / 4];
   uint2 ubo_load = ((scalar_offset & 2) ? ubo_load_1.zw : ubo_load_1.xy);
   vector<float16_t, 2> ubo_load_xz = vector<float16_t, 2>(f16tof32(ubo_load & 0xFFFF));
   vector<float16_t, 2> ubo_load_yw = vector<float16_t, 2>(f16tof32(ubo_load >> 16));
   const uint scalar_offset_1 = ((offset + 8u)) / 4;
-  uint4 ubo_load_3 = buffer[scalar_offset_1 / 4];
+  uint4 ubo_load_3 = u[scalar_offset_1 / 4];
   uint2 ubo_load_2 = ((scalar_offset_1 & 2) ? ubo_load_3.zw : ubo_load_3.xy);
   vector<float16_t, 2> ubo_load_2_xz = vector<float16_t, 2>(f16tof32(ubo_load_2 & 0xFFFF));
   vector<float16_t, 2> ubo_load_2_yw = vector<float16_t, 2>(f16tof32(ubo_load_2 >> 16));
   const uint scalar_offset_2 = ((offset + 16u)) / 4;
-  uint4 ubo_load_5 = buffer[scalar_offset_2 / 4];
+  uint4 ubo_load_5 = u[scalar_offset_2 / 4];
   uint2 ubo_load_4 = ((scalar_offset_2 & 2) ? ubo_load_5.zw : ubo_load_5.xy);
   vector<float16_t, 2> ubo_load_4_xz = vector<float16_t, 2>(f16tof32(ubo_load_4 & 0xFFFF));
   vector<float16_t, 2> ubo_load_4_yw = vector<float16_t, 2>(f16tof32(ubo_load_4 >> 16));
   const uint scalar_offset_3 = ((offset + 24u)) / 4;
-  uint4 ubo_load_7 = buffer[scalar_offset_3 / 4];
+  uint4 ubo_load_7 = u[scalar_offset_3 / 4];
   uint2 ubo_load_6 = ((scalar_offset_3 & 2) ? ubo_load_7.zw : ubo_load_7.xy);
   vector<float16_t, 2> ubo_load_6_xz = vector<float16_t, 2>(f16tof32(ubo_load_6 & 0xFFFF));
   vector<float16_t, 2> ubo_load_6_yw = vector<float16_t, 2>(f16tof32(ubo_load_6 >> 16));
   return matrix<float16_t, 4, 4>(vector<float16_t, 4>(ubo_load_xz[0], ubo_load_yw[0], ubo_load_xz[1], ubo_load_yw[1]), vector<float16_t, 4>(ubo_load_2_xz[0], ubo_load_2_yw[0], ubo_load_2_xz[1], ubo_load_2_yw[1]), vector<float16_t, 4>(ubo_load_4_xz[0], ubo_load_4_yw[0], ubo_load_4_xz[1], ubo_load_4_yw[1]), vector<float16_t, 4>(ubo_load_6_xz[0], ubo_load_6_yw[0], ubo_load_6_xz[1], ubo_load_6_yw[1]));
 }
 
-typedef matrix<float16_t, 4, 4> tint_symbol_2_ret[4];
-tint_symbol_2_ret tint_symbol_2(uint4 buffer[8], uint offset) {
+typedef matrix<float16_t, 4, 4> u_load_ret[4];
+u_load_ret u_load(uint offset) {
   matrix<float16_t, 4, 4> arr[4] = (matrix<float16_t, 4, 4>[4])0;
   {
     for(uint i_1 = 0u; (i_1 < 4u); i_1 = (i_1 + 1u)) {
-      arr[i_1] = tint_symbol_3(buffer, (offset + (i_1 * 32u)));
+      arr[i_1] = u_load_1((offset + (i_1 * 32u)));
     }
   }
   return arr;
@@ -52,8 +52,8 @@ void f_inner(uint local_invocation_index) {
     }
   }
   GroupMemoryBarrierWithGroupSync();
-  w = tint_symbol_2(u, 0u);
-  w[1] = tint_symbol_3(u, 64u);
+  w = u_load(0u);
+  w[1] = u_load_1(64u);
   uint2 ubo_load_8 = u[0].zw;
   vector<float16_t, 2> ubo_load_8_xz = vector<float16_t, 2>(f16tof32(ubo_load_8 & 0xFFFF));
   vector<float16_t, 2> ubo_load_8_yw = vector<float16_t, 2>(f16tof32(ubo_load_8 >> 16));
@@ -66,6 +66,3 @@ void f(tint_symbol_1 tint_symbol) {
   f_inner(tint_symbol.local_invocation_index);
   return;
 }
-FXC validation failure:
-D:\Projects\RampUp\dawn\test\tint\buffer\Shader@0x000002B4C90BEEA0(4,20-28): error X3000: syntax error: unexpected token 'float16_t'
-

test/tint/buffer/uniform/std140/struct/mat2x2_f16/dynamic_index_via_ptr.wgsl.expected.fxc.hlsl

@@ -17,41 +17,41 @@ int i() {
   return counter;
 }
 
-matrix<float16_t, 2, 2> tint_symbol_8(uint4 buffer[64], uint offset) {
+matrix<float16_t, 2, 2> a_load_4(uint offset) {
   const uint scalar_offset = ((offset + 0u)) / 4;
-  uint ubo_load = buffer[scalar_offset / 4][scalar_offset % 4];
+  uint ubo_load = a[scalar_offset / 4][scalar_offset % 4];
   const uint scalar_offset_1 = ((offset + 4u)) / 4;
-  uint ubo_load_1 = buffer[scalar_offset_1 / 4][scalar_offset_1 % 4];
+  uint ubo_load_1 = a[scalar_offset_1 / 4][scalar_offset_1 % 4];
   return matrix<float16_t, 2, 2>(vector<float16_t, 2>(float16_t(f16tof32(ubo_load & 0xFFFF)), float16_t(f16tof32(ubo_load >> 16))), vector<float16_t, 2>(float16_t(f16tof32(ubo_load_1 & 0xFFFF)), float16_t(f16tof32(ubo_load_1 >> 16))));
 }
 
-Inner tint_symbol_7(uint4 buffer[64], uint offset) {
-  const Inner tint_symbol_11 = {tint_symbol_8(buffer, (offset + 0u))};
-  return tint_symbol_11;
+Inner a_load_3(uint offset) {
+  const Inner tint_symbol_4 = {a_load_4((offset + 0u))};
+  return tint_symbol_4;
 }
 
-typedef Inner tint_symbol_6_ret[4];
-tint_symbol_6_ret tint_symbol_6(uint4 buffer[64], uint offset) {
+typedef Inner a_load_2_ret[4];
+a_load_2_ret a_load_2(uint offset) {
   Inner arr[4] = (Inner[4])0;
   {
     for(uint i_1 = 0u; (i_1 < 4u); i_1 = (i_1 + 1u)) {
-      arr[i_1] = tint_symbol_7(buffer, (offset + (i_1 * 64u)));
+      arr[i_1] = a_load_3((offset + (i_1 * 64u)));
     }
   }
   return arr;
 }
 
-Outer tint_symbol_5(uint4 buffer[64], uint offset) {
-  const Outer tint_symbol_12 = {tint_symbol_6(buffer, (offset + 0u))};
-  return tint_symbol_12;
+Outer a_load_1(uint offset) {
+  const Outer tint_symbol_5 = {a_load_2((offset + 0u))};
+  return tint_symbol_5;
 }
 
-typedef Outer tint_symbol_4_ret[4];
-tint_symbol_4_ret tint_symbol_4(uint4 buffer[64], uint offset) {
+typedef Outer a_load_ret[4];
+a_load_ret a_load(uint offset) {
   Outer arr_1[4] = (Outer[4])0;
   {
     for(uint i_2 = 0u; (i_2 < 4u); i_2 = (i_2 + 1u)) {
-      arr_1[i_2] = tint_symbol_5(buffer, (offset + (i_2 * 256u)));
+      arr_1[i_2] = a_load_1((offset + (i_2 * 256u)));
     }
   }
   return arr_1;
@@ -62,11 +62,11 @@ void f() {
   const int p_a_i_save = i();
   const int p_a_i_a_i_save = i();
   const int p_a_i_a_i_m_i_save = i();
-  const Outer l_a[4] = tint_symbol_4(a, 0u);
-  const Outer l_a_i = tint_symbol_5(a, (256u * uint(p_a_i_save)));
-  const Inner l_a_i_a[4] = tint_symbol_6(a, (256u * uint(p_a_i_save)));
-  const Inner l_a_i_a_i = tint_symbol_7(a, ((256u * uint(p_a_i_save)) + (64u * uint(p_a_i_a_i_save))));
-  const matrix<float16_t, 2, 2> l_a_i_a_i_m = tint_symbol_8(a, ((256u * uint(p_a_i_save)) + (64u * uint(p_a_i_a_i_save))));
+  const Outer l_a[4] = a_load(0u);
+  const Outer l_a_i = a_load_1((256u * uint(p_a_i_save)));
+  const Inner l_a_i_a[4] = a_load_2((256u * uint(p_a_i_save)));
+  const Inner l_a_i_a_i = a_load_3(((256u * uint(p_a_i_save)) + (64u * uint(p_a_i_a_i_save))));
+  const matrix<float16_t, 2, 2> l_a_i_a_i_m = a_load_4(((256u * uint(p_a_i_save)) + (64u * uint(p_a_i_a_i_save))));
   const uint scalar_offset_2 = ((((256u * uint(p_a_i_save)) + (64u * uint(p_a_i_a_i_save))) + (4u * uint(p_a_i_a_i_m_i_save)))) / 4;
   uint ubo_load_2 = a[scalar_offset_2 / 4][scalar_offset_2 % 4];
   const vector<float16_t, 2> l_a_i_a_i_m_i = vector<float16_t, 2>(float16_t(f16tof32(ubo_load_2 & 0xFFFF)), float16_t(f16tof32(ubo_load_2 >> 16)));
@@ -79,6 +79,3 @@ void f() {
   const float16_t l_a_i_a_i_m_i_i = float16_t(f16tof32(((a[scalar_offset_index / 4][scalar_offset_index % 4] >> (scalar_offset_bytes % 4 == 0 ? 0 : 16)) & 0xFFFF)));
   return;
 }
-FXC validation failure:
-D:\Projects\RampUp\dawn\test\tint\buffer\Shader@0x00000270DFBEAD70(2,10-18): error X3000: syntax error: unexpected token 'float16_t'
-

test/tint/buffer/uniform/std140/struct/mat2x2_f16/static_index_via_ptr.wgsl.expected.fxc.hlsl

@@ -11,41 +11,41 @@ cbuffer cbuffer_a : register(b0, space0) {
   uint4 a[64];
 };
 
-matrix<float16_t, 2, 2> tint_symbol_4(uint4 buffer[64], uint offset) {
+matrix<float16_t, 2, 2> a_load_4(uint offset) {
   const uint scalar_offset = ((offset + 0u)) / 4;
-  uint ubo_load = buffer[scalar_offset / 4][scalar_offset % 4];
+  uint ubo_load = a[scalar_offset / 4][scalar_offset % 4];
   const uint scalar_offset_1 = ((offset + 4u)) / 4;
-  uint ubo_load_1 = buffer[scalar_offset_1 / 4][scalar_offset_1 % 4];
+  uint ubo_load_1 = a[scalar_offset_1 / 4][scalar_offset_1 % 4];
   return matrix<float16_t, 2, 2>(vector<float16_t, 2>(float16_t(f16tof32(ubo_load & 0xFFFF)), float16_t(f16tof32(ubo_load >> 16))), vector<float16_t, 2>(float16_t(f16tof32(ubo_load_1 & 0xFFFF)), float16_t(f16tof32(ubo_load_1 >> 16))));
 }
 
-Inner tint_symbol_3(uint4 buffer[64], uint offset) {
-  const Inner tint_symbol_7 = {tint_symbol_4(buffer, (offset + 0u))};
-  return tint_symbol_7;
+Inner a_load_3(uint offset) {
+  const Inner tint_symbol = {a_load_4((offset + 0u))};
+  return tint_symbol;
 }
 
-typedef Inner tint_symbol_2_ret[4];
-tint_symbol_2_ret tint_symbol_2(uint4 buffer[64], uint offset) {
+typedef Inner a_load_2_ret[4];
+a_load_2_ret a_load_2(uint offset) {
   Inner arr[4] = (Inner[4])0;
   {
     for(uint i = 0u; (i < 4u); i = (i + 1u)) {
-      arr[i] = tint_symbol_3(buffer, (offset + (i * 64u)));
+      arr[i] = a_load_3((offset + (i * 64u)));
     }
   }
   return arr;
 }
 
-Outer tint_symbol_1(uint4 buffer[64], uint offset) {
-  const Outer tint_symbol_8 = {tint_symbol_2(buffer, (offset + 0u))};
-  return tint_symbol_8;
+Outer a_load_1(uint offset) {
+  const Outer tint_symbol_1 = {a_load_2((offset + 0u))};
+  return tint_symbol_1;
 }
 
-typedef Outer tint_symbol_ret[4];
-tint_symbol_ret tint_symbol(uint4 buffer[64], uint offset) {
+typedef Outer a_load_ret[4];
+a_load_ret a_load(uint offset) {
   Outer arr_1[4] = (Outer[4])0;
   {
     for(uint i_1 = 0u; (i_1 < 4u); i_1 = (i_1 + 1u)) {
-      arr_1[i_1] = tint_symbol_1(buffer, (offset + (i_1 * 256u)));
+      arr_1[i_1] = a_load_1((offset + (i_1 * 256u)));
     }
   }
   return arr_1;
@@ -53,16 +53,13 @@ tint_symbol_ret tint_symbol(uint4 buffer[64], uint offset) {
 
 [numthreads(1, 1, 1)]
 void f() {
-  const Outer l_a[4] = tint_symbol(a, 0u);
-  const Outer l_a_3 = tint_symbol_1(a, 768u);
-  const Inner l_a_3_a[4] = tint_symbol_2(a, 768u);
-  const Inner l_a_3_a_2 = tint_symbol_3(a, 896u);
-  const matrix<float16_t, 2, 2> l_a_3_a_2_m = tint_symbol_4(a, 896u);
+  const Outer l_a[4] = a_load(0u);
+  const Outer l_a_3 = a_load_1(768u);
+  const Inner l_a_3_a[4] = a_load_2(768u);
+  const Inner l_a_3_a_2 = a_load_3(896u);
+  const matrix<float16_t, 2, 2> l_a_3_a_2_m = a_load_4(896u);
   uint ubo_load_2 = a[56].y;
   const vector<float16_t, 2> l_a_3_a_2_m_1 = vector<float16_t, 2>(float16_t(f16tof32(ubo_load_2 & 0xFFFF)), float16_t(f16tof32(ubo_load_2 >> 16)));
   const float16_t l_a_3_a_2_m_1_0 = float16_t(f16tof32(((a[56].y) & 0xFFFF)));
   return;
 }
-FXC validation failure:
-D:\Projects\RampUp\dawn\test\tint\buffer\Shader@0x0000025C8106DF60(2,10-18): error X3000: syntax error: unexpected token 'float16_t'
-

test/tint/buffer/uniform/std140/struct/mat2x2_f16/to_builtin.wgsl.expected.fxc.hlsl

@@ -4,23 +4,20 @@ cbuffer cbuffer_u : register(b0, space0) {
   uint4 u[32];
 };
 
-matrix<float16_t, 2, 2> tint_symbol(uint4 buffer[32], uint offset) {
+matrix<float16_t, 2, 2> u_load(uint offset) {
   const uint scalar_offset = ((offset + 0u)) / 4;
-  uint ubo_load = buffer[scalar_offset / 4][scalar_offset % 4];
+  uint ubo_load = u[scalar_offset / 4][scalar_offset % 4];
   const uint scalar_offset_1 = ((offset + 4u)) / 4;
-  uint ubo_load_1 = buffer[scalar_offset_1 / 4][scalar_offset_1 % 4];
+  uint ubo_load_1 = u[scalar_offset_1 / 4][scalar_offset_1 % 4];
   return matrix<float16_t, 2, 2>(vector<float16_t, 2>(float16_t(f16tof32(ubo_load & 0xFFFF)), float16_t(f16tof32(ubo_load >> 16))), vector<float16_t, 2>(float16_t(f16tof32(ubo_load_1 & 0xFFFF)), float16_t(f16tof32(ubo_load_1 >> 16))));
 }
 
 [numthreads(1, 1, 1)]
 void f() {
-  const matrix<float16_t, 2, 2> t = transpose(tint_symbol(u, 260u));
+  const matrix<float16_t, 2, 2> t = transpose(u_load(260u));
   uint ubo_load_2 = u[0].z;
   const float16_t l = length(vector<float16_t, 2>(float16_t(f16tof32(ubo_load_2 & 0xFFFF)), float16_t(f16tof32(ubo_load_2 >> 16))).yx);
   uint ubo_load_3 = u[0].z;
   const float16_t a = abs(vector<float16_t, 2>(float16_t(f16tof32(ubo_load_3 & 0xFFFF)), float16_t(f16tof32(ubo_load_3 >> 16))).yx.x);
   return;
 }
-FXC validation failure:
-D:\Projects\RampUp\dawn\test\tint\buffer\Shader@0x000002973821CED0(5,8-16): error X3000: syntax error: unexpected token 'float16_t'
-

test/tint/buffer/uniform/std140/struct/mat2x2_f16/to_fn.wgsl.expected.fxc.hlsl

@@ -25,27 +25,27 @@ void d(vector<float16_t, 2> v) {
 void e(float16_t f_1) {
 }
 
-matrix<float16_t, 2, 2> tint_symbol_3(uint4 buffer[32], uint offset) {
+matrix<float16_t, 2, 2> u_load_3(uint offset) {
   const uint scalar_offset = ((offset + 0u)) / 4;
-  uint ubo_load = buffer[scalar_offset / 4][scalar_offset % 4];
+  uint ubo_load = u[scalar_offset / 4][scalar_offset % 4];
   const uint scalar_offset_1 = ((offset + 4u)) / 4;
-  uint ubo_load_1 = buffer[scalar_offset_1 / 4][scalar_offset_1 % 4];
+  uint ubo_load_1 = u[scalar_offset_1 / 4][scalar_offset_1 % 4];
   return matrix<float16_t, 2, 2>(vector<float16_t, 2>(float16_t(f16tof32(ubo_load & 0xFFFF)), float16_t(f16tof32(ubo_load >> 16))), vector<float16_t, 2>(float16_t(f16tof32(ubo_load_1 & 0xFFFF)), float16_t(f16tof32(ubo_load_1 >> 16))));
 }
 
-S tint_symbol_1(uint4 buffer[32], uint offset) {
+S u_load_1(uint offset) {
   const uint scalar_offset_2 = ((offset + 0u)) / 4;
   const uint scalar_offset_3 = ((offset + 64u)) / 4;
-  const S tint_symbol_5 = {asint(buffer[scalar_offset_2 / 4][scalar_offset_2 % 4]), tint_symbol_3(buffer, (offset + 4u)), asint(buffer[scalar_offset_3 / 4][scalar_offset_3 % 4])};
-  return tint_symbol_5;
+  const S tint_symbol = {asint(u[scalar_offset_2 / 4][scalar_offset_2 % 4]), u_load_3((offset + 4u)), asint(u[scalar_offset_3 / 4][scalar_offset_3 % 4])};
+  return tint_symbol;
 }
 
-typedef S tint_symbol_ret[4];
-tint_symbol_ret tint_symbol(uint4 buffer[32], uint offset) {
+typedef S u_load_ret[4];
+u_load_ret u_load(uint offset) {
   S arr[4] = (S[4])0;
   {
     for(uint i = 0u; (i < 4u); i = (i + 1u)) {
-      arr[i] = tint_symbol_1(buffer, (offset + (i * 128u)));
+      arr[i] = u_load_1((offset + (i * 128u)));
     }
   }
   return arr;
@@ -53,15 +53,12 @@ tint_symbol_ret tint_symbol(uint4 buffer[32], uint offset) {
 
 [numthreads(1, 1, 1)]
 void f() {
-  a(tint_symbol(u, 0u));
-  b(tint_symbol_1(u, 256u));
-  c(tint_symbol_3(u, 260u));
+  a(u_load(0u));
+  b(u_load_1(256u));
+  c(u_load_3(260u));
   uint ubo_load_2 = u[0].z;
   d(vector<float16_t, 2>(float16_t(f16tof32(ubo_load_2 & 0xFFFF)), float16_t(f16tof32(ubo_load_2 >> 16))).yx);
   uint ubo_load_3 = u[0].z;
   e(vector<float16_t, 2>(float16_t(f16tof32(ubo_load_3 & 0xFFFF)), float16_t(f16tof32(ubo_load_3 >> 16))).yx.x);
   return;
 }
-FXC validation failure:
-D:\Projects\RampUp\dawn\test\tint\buffer\Shader@0x0000029EA87296E0(3,10-18): error X3000: syntax error: unexpected token 'float16_t'
-

test/tint/buffer/uniform/std140/struct/mat2x2_f16/to_private.wgsl.expected.fxc.hlsl

@@ -11,27 +11,27 @@ cbuffer cbuffer_u : register(b0, space0) {
 };
 static S p[4] = (S[4])0;
 
-matrix<float16_t, 2, 2> tint_symbol_3(uint4 buffer[32], uint offset) {
+matrix<float16_t, 2, 2> u_load_3(uint offset) {
   const uint scalar_offset = ((offset + 0u)) / 4;
-  uint ubo_load = buffer[scalar_offset / 4][scalar_offset % 4];
+  uint ubo_load = u[scalar_offset / 4][scalar_offset % 4];
   const uint scalar_offset_1 = ((offset + 4u)) / 4;
-  uint ubo_load_1 = buffer[scalar_offset_1 / 4][scalar_offset_1 % 4];
+  uint ubo_load_1 = u[scalar_offset_1 / 4][scalar_offset_1 % 4];
   return matrix<float16_t, 2, 2>(vector<float16_t, 2>(float16_t(f16tof32(ubo_load & 0xFFFF)), float16_t(f16tof32(ubo_load >> 16))), vector<float16_t, 2>(float16_t(f16tof32(ubo_load_1 & 0xFFFF)), float16_t(f16tof32(ubo_load_1 >> 16))));
 }
 
-S tint_symbol_1(uint4 buffer[32], uint offset) {
+S u_load_1(uint offset) {
   const uint scalar_offset_2 = ((offset + 0u)) / 4;
   const uint scalar_offset_3 = ((offset + 64u)) / 4;
-  const S tint_symbol_5 = {asint(buffer[scalar_offset_2 / 4][scalar_offset_2 % 4]), tint_symbol_3(buffer, (offset + 4u)), asint(buffer[scalar_offset_3 / 4][scalar_offset_3 % 4])};
-  return tint_symbol_5;
+  const S tint_symbol = {asint(u[scalar_offset_2 / 4][scalar_offset_2 % 4]), u_load_3((offset + 4u)), asint(u[scalar_offset_3 / 4][scalar_offset_3 % 4])};
+  return tint_symbol;
 }
 
-typedef S tint_symbol_ret[4];
-tint_symbol_ret tint_symbol(uint4 buffer[32], uint offset) {
+typedef S u_load_ret[4];
+u_load_ret u_load(uint offset) {
   S arr[4] = (S[4])0;
   {
     for(uint i = 0u; (i < 4u); i = (i + 1u)) {
-      arr[i] = tint_symbol_1(buffer, (offset + (i * 128u)));
+      arr[i] = u_load_1((offset + (i * 128u)));
     }
   }
   return arr;
@@ -39,13 +39,10 @@ tint_symbol_ret tint_symbol(uint4 buffer[32], uint offset) {
 
 [numthreads(1, 1, 1)]
 void f() {
-  p = tint_symbol(u, 0u);
-  p[1] = tint_symbol_1(u, 256u);
-  p[3].m = tint_symbol_3(u, 260u);
+  p = u_load(0u);
+  p[1] = u_load_1(256u);
+  p[3].m = u_load_3(260u);
   uint ubo_load_2 = u[0].z;
   p[1].m[0] = vector<float16_t, 2>(float16_t(f16tof32(ubo_load_2 & 0xFFFF)), float16_t(f16tof32(ubo_load_2 >> 16))).yx;
   return;
 }
-FXC validation failure:
-D:\Projects\RampUp\dawn\test\tint\buffer\Shader@0x00000172713CA4A0(3,10-18): error X3000: syntax error: unexpected token 'float16_t'
-

test/tint/buffer/uniform/std140/struct/mat2x2_f16/to_storage.wgsl.expected.fxc.hlsl

@@ -11,47 +11,47 @@ cbuffer cbuffer_u : register(b0, space0) {
 };
 RWByteAddressBuffer s : register(u1, space0);
 
-void tint_symbol_3(RWByteAddressBuffer buffer, uint offset, matrix<float16_t, 2, 2> value) {
-  buffer.Store<vector<float16_t, 2> >((offset + 0u), value[0u]);
-  buffer.Store<vector<float16_t, 2> >((offset + 4u), value[1u]);
+void s_store_3(uint offset, matrix<float16_t, 2, 2> value) {
+  s.Store<vector<float16_t, 2> >((offset + 0u), value[0u]);
+  s.Store<vector<float16_t, 2> >((offset + 4u), value[1u]);
 }
 
-void tint_symbol_1(RWByteAddressBuffer buffer, uint offset, S value) {
-  buffer.Store((offset + 0u), asuint(value.before));
-  tint_symbol_3(buffer, (offset + 4u), value.m);
-  buffer.Store((offset + 64u), asuint(value.after));
+void s_store_1(uint offset, S value) {
+  s.Store((offset + 0u), asuint(value.before));
+  s_store_3((offset + 4u), value.m);
+  s.Store((offset + 64u), asuint(value.after));
 }
 
-void tint_symbol(RWByteAddressBuffer buffer, uint offset, S value[4]) {
-  S array[4] = value;
+void s_store(uint offset, S value[4]) {
+  S array_1[4] = value;
   {
     for(uint i = 0u; (i < 4u); i = (i + 1u)) {
-      tint_symbol_1(buffer, (offset + (i * 128u)), array[i]);
+      s_store_1((offset + (i * 128u)), array_1[i]);
     }
   }
 }
 
-matrix<float16_t, 2, 2> tint_symbol_8(uint4 buffer[32], uint offset) {
+matrix<float16_t, 2, 2> u_load_3(uint offset) {
   const uint scalar_offset = ((offset + 0u)) / 4;
-  uint ubo_load = buffer[scalar_offset / 4][scalar_offset % 4];
+  uint ubo_load = u[scalar_offset / 4][scalar_offset % 4];
   const uint scalar_offset_1 = ((offset + 4u)) / 4;
-  uint ubo_load_1 = buffer[scalar_offset_1 / 4][scalar_offset_1 % 4];
+  uint ubo_load_1 = u[scalar_offset_1 / 4][scalar_offset_1 % 4];
   return matrix<float16_t, 2, 2>(vector<float16_t, 2>(float16_t(f16tof32(ubo_load & 0xFFFF)), float16_t(f16tof32(ubo_load >> 16))), vector<float16_t, 2>(float16_t(f16tof32(ubo_load_1 & 0xFFFF)), float16_t(f16tof32(ubo_load_1 >> 16))));
 }
 
-S tint_symbol_6(uint4 buffer[32], uint offset) {
+S u_load_1(uint offset) {
   const uint scalar_offset_2 = ((offset + 0u)) / 4;
   const uint scalar_offset_3 = ((offset + 64u)) / 4;
-  const S tint_symbol_10 = {asint(buffer[scalar_offset_2 / 4][scalar_offset_2 % 4]), tint_symbol_8(buffer, (offset + 4u)), asint(buffer[scalar_offset_3 / 4][scalar_offset_3 % 4])};
-  return tint_symbol_10;
+  const S tint_symbol = {asint(u[scalar_offset_2 / 4][scalar_offset_2 % 4]), u_load_3((offset + 4u)), asint(u[scalar_offset_3 / 4][scalar_offset_3 % 4])};
+  return tint_symbol;
 }
 
-typedef S tint_symbol_5_ret[4];
-tint_symbol_5_ret tint_symbol_5(uint4 buffer[32], uint offset) {
+typedef S u_load_ret[4];
+u_load_ret u_load(uint offset) {
   S arr[4] = (S[4])0;
   {
     for(uint i_1 = 0u; (i_1 < 4u); i_1 = (i_1 + 1u)) {
-      arr[i_1] = tint_symbol_6(buffer, (offset + (i_1 * 128u)));
+      arr[i_1] = u_load_1((offset + (i_1 * 128u)));
     }
   }
   return arr;
@@ -59,13 +59,10 @@ tint_symbol_5_ret tint_symbol_5(uint4 buffer[32], uint offset) {
 
 [numthreads(1, 1, 1)]
 void f() {
-  tint_symbol(s, 0u, tint_symbol_5(u, 0u));
-  tint_symbol_1(s, 128u, tint_symbol_6(u, 256u));
-  tint_symbol_3(s, 388u, tint_symbol_8(u, 260u));
+  s_store(0u, u_load(0u));
+  s_store_1(128u, u_load_1(256u));
+  s_store_3(388u, u_load_3(260u));
   uint ubo_load_2 = u[0].z;
   s.Store<vector<float16_t, 2> >(132u, vector<float16_t, 2>(float16_t(f16tof32(ubo_load_2 & 0xFFFF)), float16_t(f16tof32(ubo_load_2 >> 16))).yx);
   return;
 }
-FXC validation failure:
-D:\Projects\RampUp\dawn\test\tint\buffer\Shader@0x000001A0472DA2E0(3,10-18): error X3000: syntax error: unexpected token 'float16_t'
-

test/tint/buffer/uniform/std140/struct/mat2x2_f16/to_workgroup.wgsl.expected.fxc.hlsl

@@ -15,27 +15,27 @@ struct tint_symbol_1 {
   uint local_invocation_index : SV_GroupIndex;
 };
 
-matrix<float16_t, 2, 2> tint_symbol_5(uint4 buffer[32], uint offset) {
+matrix<float16_t, 2, 2> u_load_3(uint offset) {
   const uint scalar_offset = ((offset + 0u)) / 4;
-  uint ubo_load = buffer[scalar_offset / 4][scalar_offset % 4];
+  uint ubo_load = u[scalar_offset / 4][scalar_offset % 4];
   const uint scalar_offset_1 = ((offset + 4u)) / 4;
-  uint ubo_load_1 = buffer[scalar_offset_1 / 4][scalar_offset_1 % 4];
+  uint ubo_load_1 = u[scalar_offset_1 / 4][scalar_offset_1 % 4];
   return matrix<float16_t, 2, 2>(vector<float16_t, 2>(float16_t(f16tof32(ubo_load & 0xFFFF)), float16_t(f16tof32(ubo_load >> 16))), vector<float16_t, 2>(float16_t(f16tof32(ubo_load_1 & 0xFFFF)), float16_t(f16tof32(ubo_load_1 >> 16))));
 }
 
-S tint_symbol_3(uint4 buffer[32], uint offset) {
+S u_load_1(uint offset) {
   const uint scalar_offset_2 = ((offset + 0u)) / 4;
   const uint scalar_offset_3 = ((offset + 64u)) / 4;
-  const S tint_symbol_8 = {asint(buffer[scalar_offset_2 / 4][scalar_offset_2 % 4]), tint_symbol_5(buffer, (offset + 4u)), asint(buffer[scalar_offset_3 / 4][scalar_offset_3 % 4])};
-  return tint_symbol_8;
+  const S tint_symbol_3 = {asint(u[scalar_offset_2 / 4][scalar_offset_2 % 4]), u_load_3((offset + 4u)), asint(u[scalar_offset_3 / 4][scalar_offset_3 % 4])};
+  return tint_symbol_3;
 }
 
-typedef S tint_symbol_2_ret[4];
-tint_symbol_2_ret tint_symbol_2(uint4 buffer[32], uint offset) {
+typedef S u_load_ret[4];
+u_load_ret u_load(uint offset) {
   S arr[4] = (S[4])0;
   {
     for(uint i_1 = 0u; (i_1 < 4u); i_1 = (i_1 + 1u)) {
-      arr[i_1] = tint_symbol_3(buffer, (offset + (i_1 * 128u)));
+      arr[i_1] = u_load_1((offset + (i_1 * 128u)));
     }
   }
   return arr;
@@ -45,14 +45,14 @@ void f_inner(uint local_invocation_index) {
   {
     for(uint idx = local_invocation_index; (idx < 4u); idx = (idx + 1u)) {
       const uint i = idx;
-      const S tint_symbol_7 = (S)0;
-      w[i] = tint_symbol_7;
+      const S tint_symbol_2 = (S)0;
+      w[i] = tint_symbol_2;
     }
   }
   GroupMemoryBarrierWithGroupSync();
-  w = tint_symbol_2(u, 0u);
-  w[1] = tint_symbol_3(u, 256u);
-  w[3].m = tint_symbol_5(u, 260u);
+  w = u_load(0u);
+  w[1] = u_load_1(256u);
+  w[3].m = u_load_3(260u);
   uint ubo_load_2 = u[0].z;
   w[1].m[0] = vector<float16_t, 2>(float16_t(f16tof32(ubo_load_2 & 0xFFFF)), float16_t(f16tof32(ubo_load_2 >> 16))).yx;
 }
@@ -62,6 +62,3 @@ void f(tint_symbol_1 tint_symbol) {
   f_inner(tint_symbol.local_invocation_index);
   return;
 }
-FXC validation failure:
-D:\Projects\RampUp\dawn\test\tint\buffer\Shader@0x000001CABCCF0160(3,10-18): error X3000: syntax error: unexpected token 'float16_t'
-

test/tint/buffer/uniform/std140/struct/mat2x3_f16/dynamic_index_via_ptr.wgsl.expected.fxc.hlsl

@@ -17,47 +17,47 @@ int i() {
   return counter;
 }
 
-matrix<float16_t, 2, 3> tint_symbol_8(uint4 buffer[64], uint offset) {
+matrix<float16_t, 2, 3> a_load_4(uint offset) {
   const uint scalar_offset = ((offset + 0u)) / 4;
-  uint4 ubo_load_1 = buffer[scalar_offset / 4];
+  uint4 ubo_load_1 = a[scalar_offset / 4];
   uint2 ubo_load = ((scalar_offset & 2) ? ubo_load_1.zw : ubo_load_1.xy);
   vector<float16_t, 2> ubo_load_xz = vector<float16_t, 2>(f16tof32(ubo_load & 0xFFFF));
   float16_t ubo_load_y = f16tof32(ubo_load[0] >> 16);
   const uint scalar_offset_1 = ((offset + 8u)) / 4;
-  uint4 ubo_load_3 = buffer[scalar_offset_1 / 4];
+  uint4 ubo_load_3 = a[scalar_offset_1 / 4];
   uint2 ubo_load_2 = ((scalar_offset_1 & 2) ? ubo_load_3.zw : ubo_load_3.xy);
   vector<float16_t, 2> ubo_load_2_xz = vector<float16_t, 2>(f16tof32(ubo_load_2 & 0xFFFF));
   float16_t ubo_load_2_y = f16tof32(ubo_load_2[0] >> 16);
   return matrix<float16_t, 2, 3>(vector<float16_t, 3>(ubo_load_xz[0], ubo_load_y, ubo_load_xz[1]), vector<float16_t, 3>(ubo_load_2_xz[0], ubo_load_2_y, ubo_load_2_xz[1]));
 }
 
-Inner tint_symbol_7(uint4 buffer[64], uint offset) {
-  const Inner tint_symbol_11 = {tint_symbol_8(buffer, (offset + 0u))};
-  return tint_symbol_11;
+Inner a_load_3(uint offset) {
+  const Inner tint_symbol_4 = {a_load_4((offset + 0u))};
+  return tint_symbol_4;
 }
 
-typedef Inner tint_symbol_6_ret[4];
-tint_symbol_6_ret tint_symbol_6(uint4 buffer[64], uint offset) {
+typedef Inner a_load_2_ret[4];
+a_load_2_ret a_load_2(uint offset) {
   Inner arr[4] = (Inner[4])0;
   {
     for(uint i_1 = 0u; (i_1 < 4u); i_1 = (i_1 + 1u)) {
-      arr[i_1] = tint_symbol_7(buffer, (offset + (i_1 * 64u)));
+      arr[i_1] = a_load_3((offset + (i_1 * 64u)));
     }
   }
   return arr;
 }
 
-Outer tint_symbol_5(uint4 buffer[64], uint offset) {
-  const Outer tint_symbol_12 = {tint_symbol_6(buffer, (offset + 0u))};
-  return tint_symbol_12;
+Outer a_load_1(uint offset) {
+  const Outer tint_symbol_5 = {a_load_2((offset + 0u))};
+  return tint_symbol_5;
 }
 
-typedef Outer tint_symbol_4_ret[4];
-tint_symbol_4_ret tint_symbol_4(uint4 buffer[64], uint offset) {
+typedef Outer a_load_ret[4];
+a_load_ret a_load(uint offset) {
   Outer arr_1[4] = (Outer[4])0;
   {
     for(uint i_2 = 0u; (i_2 < 4u); i_2 = (i_2 + 1u)) {
-      arr_1[i_2] = tint_symbol_5(buffer, (offset + (i_2 * 256u)));
+      arr_1[i_2] = a_load_1((offset + (i_2 * 256u)));
     }
   }
   return arr_1;
@@ -68,11 +68,11 @@ void f() {
   const int p_a_i_save = i();
   const int p_a_i_a_i_save = i();
   const int p_a_i_a_i_m_i_save = i();
-  const Outer l_a[4] = tint_symbol_4(a, 0u);
-  const Outer l_a_i = tint_symbol_5(a, (256u * uint(p_a_i_save)));
-  const Inner l_a_i_a[4] = tint_symbol_6(a, (256u * uint(p_a_i_save)));
-  const Inner l_a_i_a_i = tint_symbol_7(a, ((256u * uint(p_a_i_save)) + (64u * uint(p_a_i_a_i_save))));
-  const matrix<float16_t, 2, 3> l_a_i_a_i_m = tint_symbol_8(a, ((256u * uint(p_a_i_save)) + (64u * uint(p_a_i_a_i_save))));
+  const Outer l_a[4] = a_load(0u);
+  const Outer l_a_i = a_load_1((256u * uint(p_a_i_save)));
+  const Inner l_a_i_a[4] = a_load_2((256u * uint(p_a_i_save)));
+  const Inner l_a_i_a_i = a_load_3(((256u * uint(p_a_i_save)) + (64u * uint(p_a_i_a_i_save))));
+  const matrix<float16_t, 2, 3> l_a_i_a_i_m = a_load_4(((256u * uint(p_a_i_save)) + (64u * uint(p_a_i_a_i_save))));
   const uint scalar_offset_2 = ((((256u * uint(p_a_i_save)) + (64u * uint(p_a_i_a_i_save))) + (8u * uint(p_a_i_a_i_m_i_save)))) / 4;
   uint4 ubo_load_5 = a[scalar_offset_2 / 4];
   uint2 ubo_load_4 = ((scalar_offset_2 & 2) ? ubo_load_5.zw : ubo_load_5.xy);
@@ -88,6 +88,3 @@ void f() {
   const float16_t l_a_i_a_i_m_i_i = float16_t(f16tof32(((a[scalar_offset_index / 4][scalar_offset_index % 4] >> (scalar_offset_bytes % 4 == 0 ? 0 : 16)) & 0xFFFF)));
   return;
 }
-FXC validation failure:
-D:\Projects\RampUp\dawn\test\tint\buffer\Shader@0x0000021B8B701620(2,10-18): error X3000: syntax error: unexpected token 'float16_t'
-

test/tint/buffer/uniform/std140/struct/mat2x3_f16/static_index_via_ptr.wgsl.expected.fxc.hlsl

@@ -11,47 +11,47 @@ cbuffer cbuffer_a : register(b0, space0) {
   uint4 a[64];
 };
 
-matrix<float16_t, 2, 3> tint_symbol_4(uint4 buffer[64], uint offset) {
+matrix<float16_t, 2, 3> a_load_4(uint offset) {
   const uint scalar_offset = ((offset + 0u)) / 4;
-  uint4 ubo_load_1 = buffer[scalar_offset / 4];
+  uint4 ubo_load_1 = a[scalar_offset / 4];
   uint2 ubo_load = ((scalar_offset & 2) ? ubo_load_1.zw : ubo_load_1.xy);
   vector<float16_t, 2> ubo_load_xz = vector<float16_t, 2>(f16tof32(ubo_load & 0xFFFF));
   float16_t ubo_load_y = f16tof32(ubo_load[0] >> 16);
   const uint scalar_offset_1 = ((offset + 8u)) / 4;
-  uint4 ubo_load_3 = buffer[scalar_offset_1 / 4];
+  uint4 ubo_load_3 = a[scalar_offset_1 / 4];
   uint2 ubo_load_2 = ((scalar_offset_1 & 2) ? ubo_load_3.zw : ubo_load_3.xy);
   vector<float16_t, 2> ubo_load_2_xz = vector<float16_t, 2>(f16tof32(ubo_load_2 & 0xFFFF));
   float16_t ubo_load_2_y = f16tof32(ubo_load_2[0] >> 16);
   return matrix<float16_t, 2, 3>(vector<float16_t, 3>(ubo_load_xz[0], ubo_load_y, ubo_load_xz[1]), vector<float16_t, 3>(ubo_load_2_xz[0], ubo_load_2_y, ubo_load_2_xz[1]));
 }
 
-Inner tint_symbol_3(uint4 buffer[64], uint offset) {
-  const Inner tint_symbol_7 = {tint_symbol_4(buffer, (offset + 0u))};
-  return tint_symbol_7;
+Inner a_load_3(uint offset) {
+  const Inner tint_symbol = {a_load_4((offset + 0u))};
+  return tint_symbol;
 }
 
-typedef Inner tint_symbol_2_ret[4];
-tint_symbol_2_ret tint_symbol_2(uint4 buffer[64], uint offset) {
+typedef Inner a_load_2_ret[4];
+a_load_2_ret a_load_2(uint offset) {
   Inner arr[4] = (Inner[4])0;
   {
     for(uint i = 0u; (i < 4u); i = (i + 1u)) {
-      arr[i] = tint_symbol_3(buffer, (offset + (i * 64u)));
+      arr[i] = a_load_3((offset + (i * 64u)));
     }
   }
   return arr;
 }
 
-Outer tint_symbol_1(uint4 buffer[64], uint offset) {
-  const Outer tint_symbol_8 = {tint_symbol_2(buffer, (offset + 0u))};
-  return tint_symbol_8;
+Outer a_load_1(uint offset) {
+  const Outer tint_symbol_1 = {a_load_2((offset + 0u))};
+  return tint_symbol_1;
 }
 
-typedef Outer tint_symbol_ret[4];
-tint_symbol_ret tint_symbol(uint4 buffer[64], uint offset) {
+typedef Outer a_load_ret[4];
+a_load_ret a_load(uint offset) {
   Outer arr_1[4] = (Outer[4])0;
   {
     for(uint i_1 = 0u; (i_1 < 4u); i_1 = (i_1 + 1u)) {
-      arr_1[i_1] = tint_symbol_1(buffer, (offset + (i_1 * 256u)));
+      arr_1[i_1] = a_load_1((offset + (i_1 * 256u)));
     }
   }
   return arr_1;
@@ -59,11 +59,11 @@ tint_symbol_ret tint_symbol(uint4 buffer[64], uint offset) {
 
 [numthreads(1, 1, 1)]
 void f() {
-  const Outer l_a[4] = tint_symbol(a, 0u);
-  const Outer l_a_3 = tint_symbol_1(a, 768u);
-  const Inner l_a_3_a[4] = tint_symbol_2(a, 768u);
-  const Inner l_a_3_a_2 = tint_symbol_3(a, 896u);
-  const matrix<float16_t, 2, 3> l_a_3_a_2_m = tint_symbol_4(a, 896u);
+  const Outer l_a[4] = a_load(0u);
+  const Outer l_a_3 = a_load_1(768u);
+  const Inner l_a_3_a[4] = a_load_2(768u);
+  const Inner l_a_3_a_2 = a_load_3(896u);
+  const matrix<float16_t, 2, 3> l_a_3_a_2_m = a_load_4(896u);
   uint2 ubo_load_4 = a[56].zw;
   vector<float16_t, 2> ubo_load_4_xz = vector<float16_t, 2>(f16tof32(ubo_load_4 & 0xFFFF));
   float16_t ubo_load_4_y = f16tof32(ubo_load_4[0] >> 16);
@@ -71,6 +71,3 @@ void f() {
   const float16_t l_a_3_a_2_m_1_0 = float16_t(f16tof32(((a[56].z) & 0xFFFF)));
   return;
 }
-FXC validation failure:
-D:\Projects\RampUp\dawn\test\tint\buffer\Shader@0x0000016A3B044D10(2,10-18): error X3000: syntax error: unexpected token 'float16_t'
-

test/tint/buffer/uniform/std140/struct/mat2x3_f16/to_builtin.wgsl.expected.fxc.hlsl

@@ -4,14 +4,14 @@ cbuffer cbuffer_u : register(b0, space0) {
   uint4 u[32];
 };
 
-matrix<float16_t, 2, 3> tint_symbol(uint4 buffer[32], uint offset) {
+matrix<float16_t, 2, 3> u_load(uint offset) {
   const uint scalar_offset = ((offset + 0u)) / 4;
-  uint4 ubo_load_1 = buffer[scalar_offset / 4];
+  uint4 ubo_load_1 = u[scalar_offset / 4];
   uint2 ubo_load = ((scalar_offset & 2) ? ubo_load_1.zw : ubo_load_1.xy);
   vector<float16_t, 2> ubo_load_xz = vector<float16_t, 2>(f16tof32(ubo_load & 0xFFFF));
   float16_t ubo_load_y = f16tof32(ubo_load[0] >> 16);
   const uint scalar_offset_1 = ((offset + 8u)) / 4;
-  uint4 ubo_load_3 = buffer[scalar_offset_1 / 4];
+  uint4 ubo_load_3 = u[scalar_offset_1 / 4];
   uint2 ubo_load_2 = ((scalar_offset_1 & 2) ? ubo_load_3.zw : ubo_load_3.xy);
   vector<float16_t, 2> ubo_load_2_xz = vector<float16_t, 2>(f16tof32(ubo_load_2 & 0xFFFF));
   float16_t ubo_load_2_y = f16tof32(ubo_load_2[0] >> 16);
@@ -20,7 +20,7 @@ matrix<float16_t, 2, 3> tint_symbol(uint4 buffer[32], uint offset) {
 
 [numthreads(1, 1, 1)]
 void f() {
-  const matrix<float16_t, 3, 2> t = transpose(tint_symbol(u, 264u));
+  const matrix<float16_t, 3, 2> t = transpose(u_load(264u));
   uint2 ubo_load_4 = u[1].xy;
   vector<float16_t, 2> ubo_load_4_xz = vector<float16_t, 2>(f16tof32(ubo_load_4 & 0xFFFF));
   float16_t ubo_load_4_y = f16tof32(ubo_load_4[0] >> 16);
@@ -31,6 +31,3 @@ void f() {
   const float16_t a = abs(vector<float16_t, 3>(ubo_load_5_xz[0], ubo_load_5_y, ubo_load_5_xz[1]).zxy.x);
   return;
 }
-FXC validation failure:
-D:\Projects\RampUp\dawn\test\tint\buffer\Shader@0x000002BEEDB9DED0(5,8-16): error X3000: syntax error: unexpected token 'float16_t'
-

test/tint/buffer/uniform/std140/struct/mat2x3_f16/to_fn.wgsl.expected.fxc.hlsl

@@ -25,33 +25,33 @@ void d(vector<float16_t, 3> v) {
 void e(float16_t f_1) {
 }
 
-matrix<float16_t, 2, 3> tint_symbol_3(uint4 buffer[32], uint offset) {
+matrix<float16_t, 2, 3> u_load_3(uint offset) {
   const uint scalar_offset = ((offset + 0u)) / 4;
-  uint4 ubo_load_1 = buffer[scalar_offset / 4];
+  uint4 ubo_load_1 = u[scalar_offset / 4];
   uint2 ubo_load = ((scalar_offset & 2) ? ubo_load_1.zw : ubo_load_1.xy);
   vector<float16_t, 2> ubo_load_xz = vector<float16_t, 2>(f16tof32(ubo_load & 0xFFFF));
   float16_t ubo_load_y = f16tof32(ubo_load[0] >> 16);
   const uint scalar_offset_1 = ((offset + 8u)) / 4;
-  uint4 ubo_load_3 = buffer[scalar_offset_1 / 4];
+  uint4 ubo_load_3 = u[scalar_offset_1 / 4];
   uint2 ubo_load_2 = ((scalar_offset_1 & 2) ? ubo_load_3.zw : ubo_load_3.xy);
   vector<float16_t, 2> ubo_load_2_xz = vector<float16_t, 2>(f16tof32(ubo_load_2 & 0xFFFF));
   float16_t ubo_load_2_y = f16tof32(ubo_load_2[0] >> 16);
   return matrix<float16_t, 2, 3>(vector<float16_t, 3>(ubo_load_xz[0], ubo_load_y, ubo_load_xz[1]), vector<float16_t, 3>(ubo_load_2_xz[0], ubo_load_2_y, ubo_load_2_xz[1]));
 }
 
-S tint_symbol_1(uint4 buffer[32], uint offset) {
+S u_load_1(uint offset) {
   const uint scalar_offset_2 = ((offset + 0u)) / 4;
   const uint scalar_offset_3 = ((offset + 64u)) / 4;
-  const S tint_symbol_5 = {asint(buffer[scalar_offset_2 / 4][scalar_offset_2 % 4]), tint_symbol_3(buffer, (offset + 8u)), asint(buffer[scalar_offset_3 / 4][scalar_offset_3 % 4])};
-  return tint_symbol_5;
+  const S tint_symbol = {asint(u[scalar_offset_2 / 4][scalar_offset_2 % 4]), u_load_3((offset + 8u)), asint(u[scalar_offset_3 / 4][scalar_offset_3 % 4])};
+  return tint_symbol;
 }
 
-typedef S tint_symbol_ret[4];
-tint_symbol_ret tint_symbol(uint4 buffer[32], uint offset) {
+typedef S u_load_ret[4];
+u_load_ret u_load(uint offset) {
   S arr[4] = (S[4])0;
   {
     for(uint i = 0u; (i < 4u); i = (i + 1u)) {
-      arr[i] = tint_symbol_1(buffer, (offset + (i * 128u)));
+      arr[i] = u_load_1((offset + (i * 128u)));
     }
   }
   return arr;
@@ -59,9 +59,9 @@ tint_symbol_ret tint_symbol(uint4 buffer[32], uint offset) {
 
 [numthreads(1, 1, 1)]
 void f() {
-  a(tint_symbol(u, 0u));
-  b(tint_symbol_1(u, 256u));
-  c(tint_symbol_3(u, 264u));
+  a(u_load(0u));
+  b(u_load_1(256u));
+  c(u_load_3(264u));
   uint2 ubo_load_4 = u[1].xy;
   vector<float16_t, 2> ubo_load_4_xz = vector<float16_t, 2>(f16tof32(ubo_load_4 & 0xFFFF));
   float16_t ubo_load_4_y = f16tof32(ubo_load_4[0] >> 16);
@@ -72,6 +72,3 @@ void f() {
   e(vector<float16_t, 3>(ubo_load_5_xz[0], ubo_load_5_y, ubo_load_5_xz[1]).zxy.x);
   return;
 }
-FXC validation failure:
-D:\Projects\RampUp\dawn\test\tint\buffer\Shader@0x000002273DEDC980(3,10-18): error X3000: syntax error: unexpected token 'float16_t'
-

test/tint/buffer/uniform/std140/struct/mat2x3_f16/to_private.wgsl.expected.fxc.hlsl

@@ -11,33 +11,33 @@ cbuffer cbuffer_u : register(b0, space0) {
 };
 static S p[4] = (S[4])0;
 
-matrix<float16_t, 2, 3> tint_symbol_3(uint4 buffer[32], uint offset) {
+matrix<float16_t, 2, 3> u_load_3(uint offset) {
   const uint scalar_offset = ((offset + 0u)) / 4;
-  uint4 ubo_load_1 = buffer[scalar_offset / 4];
+  uint4 ubo_load_1 = u[scalar_offset / 4];
   uint2 ubo_load = ((scalar_offset & 2) ? ubo_load_1.zw : ubo_load_1.xy);
   vector<float16_t, 2> ubo_load_xz = vector<float16_t, 2>(f16tof32(ubo_load & 0xFFFF));
   float16_t ubo_load_y = f16tof32(ubo_load[0] >> 16);
   const uint scalar_offset_1 = ((offset + 8u)) / 4;
-  uint4 ubo_load_3 = buffer[scalar_offset_1 / 4];
+  uint4 ubo_load_3 = u[scalar_offset_1 / 4];
   uint2 ubo_load_2 = ((scalar_offset_1 & 2) ? ubo_load_3.zw : ubo_load_3.xy);
   vector<float16_t, 2> ubo_load_2_xz = vector<float16_t, 2>(f16tof32(ubo_load_2 & 0xFFFF));
   float16_t ubo_load_2_y = f16tof32(ubo_load_2[0] >> 16);
   return matrix<float16_t, 2, 3>(vector<float16_t, 3>(ubo_load_xz[0], ubo_load_y, ubo_load_xz[1]), vector<float16_t, 3>(ubo_load_2_xz[0], ubo_load_2_y, ubo_load_2_xz[1]));
 }
 
-S tint_symbol_1(uint4 buffer[32], uint offset) {
+S u_load_1(uint offset) {
   const uint scalar_offset_2 = ((offset + 0u)) / 4;
   const uint scalar_offset_3 = ((offset + 64u)) / 4;
-  const S tint_symbol_5 = {asint(buffer[scalar_offset_2 / 4][scalar_offset_2 % 4]), tint_symbol_3(buffer, (offset + 8u)), asint(buffer[scalar_offset_3 / 4][scalar_offset_3 % 4])};
-  return tint_symbol_5;
+  const S tint_symbol = {asint(u[scalar_offset_2 / 4][scalar_offset_2 % 4]), u_load_3((offset + 8u)), asint(u[scalar_offset_3 / 4][scalar_offset_3 % 4])};
+  return tint_symbol;
 }
 
-typedef S tint_symbol_ret[4];
-tint_symbol_ret tint_symbol(uint4 buffer[32], uint offset) {
+typedef S u_load_ret[4];
+u_load_ret u_load(uint offset) {
   S arr[4] = (S[4])0;
   {
     for(uint i = 0u; (i < 4u); i = (i + 1u)) {
-      arr[i] = tint_symbol_1(buffer, (offset + (i * 128u)));
+      arr[i] = u_load_1((offset + (i * 128u)));
     }
   }
   return arr;
@@ -45,15 +45,12 @@ tint_symbol_ret tint_symbol(uint4 buffer[32], uint offset) {
 
 [numthreads(1, 1, 1)]
 void f() {
-  p = tint_symbol(u, 0u);
-  p[1] = tint_symbol_1(u, 256u);
-  p[3].m = tint_symbol_3(u, 264u);
+  p = u_load(0u);
+  p[1] = u_load_1(256u);
+  p[3].m = u_load_3(264u);
   uint2 ubo_load_4 = u[1].xy;
   vector<float16_t, 2> ubo_load_4_xz = vector<float16_t, 2>(f16tof32(ubo_load_4 & 0xFFFF));
   float16_t ubo_load_4_y = f16tof32(ubo_load_4[0] >> 16);
   p[1].m[0] = vector<float16_t, 3>(ubo_load_4_xz[0], ubo_load_4_y, ubo_load_4_xz[1]).zxy;
   return;
 }
-FXC validation failure:
-D:\Projects\RampUp\dawn\test\tint\buffer\Shader@0x00000296576AF9E0(3,10-18): error X3000: syntax error: unexpected token 'float16_t'
-

test/tint/buffer/uniform/std140/struct/mat2x3_f16/to_storage.wgsl.expected.fxc.hlsl

@@ -11,53 +11,53 @@ cbuffer cbuffer_u : register(b0, space0) {
 };
 RWByteAddressBuffer s : register(u1, space0);
 
-void tint_symbol_3(RWByteAddressBuffer buffer, uint offset, matrix<float16_t, 2, 3> value) {
-  buffer.Store<vector<float16_t, 3> >((offset + 0u), value[0u]);
-  buffer.Store<vector<float16_t, 3> >((offset + 8u), value[1u]);
+void s_store_3(uint offset, matrix<float16_t, 2, 3> value) {
+  s.Store<vector<float16_t, 3> >((offset + 0u), value[0u]);
+  s.Store<vector<float16_t, 3> >((offset + 8u), value[1u]);
 }
 
-void tint_symbol_1(RWByteAddressBuffer buffer, uint offset, S value) {
-  buffer.Store((offset + 0u), asuint(value.before));
-  tint_symbol_3(buffer, (offset + 8u), value.m);
-  buffer.Store((offset + 64u), asuint(value.after));
+void s_store_1(uint offset, S value) {
+  s.Store((offset + 0u), asuint(value.before));
+  s_store_3((offset + 8u), value.m);
+  s.Store((offset + 64u), asuint(value.after));
 }
 
-void tint_symbol(RWByteAddressBuffer buffer, uint offset, S value[4]) {
-  S array[4] = value;
+void s_store(uint offset, S value[4]) {
+  S array_1[4] = value;
   {
     for(uint i = 0u; (i < 4u); i = (i + 1u)) {
-      tint_symbol_1(buffer, (offset + (i * 128u)), array[i]);
+      s_store_1((offset + (i * 128u)), array_1[i]);
     }
   }
 }
 
-matrix<float16_t, 2, 3> tint_symbol_8(uint4 buffer[32], uint offset) {
+matrix<float16_t, 2, 3> u_load_3(uint offset) {
   const uint scalar_offset = ((offset + 0u)) / 4;
-  uint4 ubo_load_1 = buffer[scalar_offset / 4];
+  uint4 ubo_load_1 = u[scalar_offset / 4];
   uint2 ubo_load = ((scalar_offset & 2) ? ubo_load_1.zw : ubo_load_1.xy);
   vector<float16_t, 2> ubo_load_xz = vector<float16_t, 2>(f16tof32(ubo_load & 0xFFFF));
   float16_t ubo_load_y = f16tof32(ubo_load[0] >> 16);
   const uint scalar_offset_1 = ((offset + 8u)) / 4;
-  uint4 ubo_load_3 = buffer[scalar_offset_1 / 4];
+  uint4 ubo_load_3 = u[scalar_offset_1 / 4];
   uint2 ubo_load_2 = ((scalar_offset_1 & 2) ? ubo_load_3.zw : ubo_load_3.xy);
   vector<float16_t, 2> ubo_load_2_xz = vector<float16_t, 2>(f16tof32(ubo_load_2 & 0xFFFF));
   float16_t ubo_load_2_y = f16tof32(ubo_load_2[0] >> 16);
   return matrix<float16_t, 2, 3>(vector<float16_t, 3>(ubo_load_xz[0], ubo_load_y, ubo_load_xz[1]), vector<float16_t, 3>(ubo_load_2_xz[0], ubo_load_2_y, ubo_load_2_xz[1]));
 }
 
-S tint_symbol_6(uint4 buffer[32], uint offset) {
+S u_load_1(uint offset) {
   const uint scalar_offset_2 = ((offset + 0u)) / 4;
   const uint scalar_offset_3 = ((offset + 64u)) / 4;
-  const S tint_symbol_10 = {asint(buffer[scalar_offset_2 / 4][scalar_offset_2 % 4]), tint_symbol_8(buffer, (offset + 8u)), asint(buffer[scalar_offset_3 / 4][scalar_offset_3 % 4])};
-  return tint_symbol_10;
+  const S tint_symbol = {asint(u[scalar_offset_2 / 4][scalar_offset_2 % 4]), u_load_3((offset + 8u)), asint(u[scalar_offset_3 / 4][scalar_offset_3 % 4])};
+  return tint_symbol;
 }
 
-typedef S tint_symbol_5_ret[4];
-tint_symbol_5_ret tint_symbol_5(uint4 buffer[32], uint offset) {
+typedef S u_load_ret[4];
+u_load_ret u_load(uint offset) {
   S arr[4] = (S[4])0;
   {
     for(uint i_1 = 0u; (i_1 < 4u); i_1 = (i_1 + 1u)) {
-      arr[i_1] = tint_symbol_6(buffer, (offset + (i_1 * 128u)));
+      arr[i_1] = u_load_1((offset + (i_1 * 128u)));
     }
   }
   return arr;
@@ -65,15 +65,12 @@ tint_symbol_5_ret tint_symbol_5(uint4 buffer[32], uint offset) {
 
 [numthreads(1, 1, 1)]
 void f() {
-  tint_symbol(s, 0u, tint_symbol_5(u, 0u));
-  tint_symbol_1(s, 128u, tint_symbol_6(u, 256u));
-  tint_symbol_3(s, 392u, tint_symbol_8(u, 264u));
+  s_store(0u, u_load(0u));
+  s_store_1(128u, u_load_1(256u));
+  s_store_3(392u, u_load_3(264u));
   uint2 ubo_load_4 = u[1].xy;
   vector<float16_t, 2> ubo_load_4_xz = vector<float16_t, 2>(f16tof32(ubo_load_4 & 0xFFFF));
   float16_t ubo_load_4_y = f16tof32(ubo_load_4[0] >> 16);
   s.Store<vector<float16_t, 3> >(136u, vector<float16_t, 3>(ubo_load_4_xz[0], ubo_load_4_y, ubo_load_4_xz[1]).zxy);
   return;
 }
-FXC validation failure:
-D:\Projects\RampUp\dawn\test\tint\buffer\Shader@0x000001EAD8916A10(3,10-18): error X3000: syntax error: unexpected token 'float16_t'
-

test/tint/buffer/uniform/std140/struct/mat2x3_f16/to_workgroup.wgsl.expected.fxc.hlsl

@@ -15,33 +15,33 @@ struct tint_symbol_1 {
   uint local_invocation_index : SV_GroupIndex;
 };
 
-matrix<float16_t, 2, 3> tint_symbol_5(uint4 buffer[32], uint offset) {
+matrix<float16_t, 2, 3> u_load_3(uint offset) {
   const uint scalar_offset = ((offset + 0u)) / 4;
-  uint4 ubo_load_1 = buffer[scalar_offset / 4];
+  uint4 ubo_load_1 = u[scalar_offset / 4];
   uint2 ubo_load = ((scalar_offset & 2) ? ubo_load_1.zw : ubo_load_1.xy);
   vector<float16_t, 2> ubo_load_xz = vector<float16_t, 2>(f16tof32(ubo_load & 0xFFFF));
   float16_t ubo_load_y = f16tof32(ubo_load[0] >> 16);
   const uint scalar_offset_1 = ((offset + 8u)) / 4;
-  uint4 ubo_load_3 = buffer[scalar_offset_1 / 4];
+  uint4 ubo_load_3 = u[scalar_offset_1 / 4];
   uint2 ubo_load_2 = ((scalar_offset_1 & 2) ? ubo_load_3.zw : ubo_load_3.xy);
   vector<float16_t, 2> ubo_load_2_xz = vector<float16_t, 2>(f16tof32(ubo_load_2 & 0xFFFF));
   float16_t ubo_load_2_y = f16tof32(ubo_load_2[0] >> 16);
   return matrix<float16_t, 2, 3>(vector<float16_t, 3>(ubo_load_xz[0], ubo_load_y, ubo_load_xz[1]), vector<float16_t, 3>(ubo_load_2_xz[0], ubo_load_2_y, ubo_load_2_xz[1]));
 }
 
-S tint_symbol_3(uint4 buffer[32], uint offset) {
+S u_load_1(uint offset) {
   const uint scalar_offset_2 = ((offset + 0u)) / 4;
   const uint scalar_offset_3 = ((offset + 64u)) / 4;
-  const S tint_symbol_8 = {asint(buffer[scalar_offset_2 / 4][scalar_offset_2 % 4]), tint_symbol_5(buffer, (offset + 8u)), asint(buffer[scalar_offset_3 / 4][scalar_offset_3 % 4])};
-  return tint_symbol_8;
+  const S tint_symbol_3 = {asint(u[scalar_offset_2 / 4][scalar_offset_2 % 4]), u_load_3((offset + 8u)), asint(u[scalar_offset_3 / 4][scalar_offset_3 % 4])};
+  return tint_symbol_3;
 }
 
-typedef S tint_symbol_2_ret[4];
-tint_symbol_2_ret tint_symbol_2(uint4 buffer[32], uint offset) {
+typedef S u_load_ret[4];
+u_load_ret u_load(uint offset) {
   S arr[4] = (S[4])0;
   {
     for(uint i_1 = 0u; (i_1 < 4u); i_1 = (i_1 + 1u)) {
-      arr[i_1] = tint_symbol_3(buffer, (offset + (i_1 * 128u)));
+      arr[i_1] = u_load_1((offset + (i_1 * 128u)));
     }
   }
   return arr;
@@ -51,14 +51,14 @@ void f_inner(uint local_invocation_index) {
   {
     for(uint idx = local_invocation_index; (idx < 4u); idx = (idx + 1u)) {
       const uint i = idx;
-      const S tint_symbol_7 = (S)0;
-      w[i] = tint_symbol_7;
+      const S tint_symbol_2 = (S)0;
+      w[i] = tint_symbol_2;
     }
   }
   GroupMemoryBarrierWithGroupSync();
-  w = tint_symbol_2(u, 0u);
-  w[1] = tint_symbol_3(u, 256u);
-  w[3].m = tint_symbol_5(u, 264u);
+  w = u_load(0u);
+  w[1] = u_load_1(256u);
+  w[3].m = u_load_3(264u);
   uint2 ubo_load_4 = u[1].xy;
   vector<float16_t, 2> ubo_load_4_xz = vector<float16_t, 2>(f16tof32(ubo_load_4 & 0xFFFF));
   float16_t ubo_load_4_y = f16tof32(ubo_load_4[0] >> 16);
@@ -70,6 +70,3 @@ void f(tint_symbol_1 tint_symbol) {
   f_inner(tint_symbol.local_invocation_index);
   return;
 }
-FXC validation failure:
-D:\Projects\RampUp\dawn\test\tint\buffer\Shader@0x000001CE6EDD85C0(3,10-18): error X3000: syntax error: unexpected token 'float16_t'
-

test/tint/buffer/uniform/std140/struct/mat2x4_f16/dynamic_index_via_ptr.wgsl.expected.fxc.hlsl

@@ -17,47 +17,47 @@ int i() {
   return counter;
 }
 
-matrix<float16_t, 2, 4> tint_symbol_8(uint4 buffer[64], uint offset) {
+matrix<float16_t, 2, 4> a_load_4(uint offset) {
   const uint scalar_offset = ((offset + 0u)) / 4;
-  uint4 ubo_load_1 = buffer[scalar_offset / 4];
+  uint4 ubo_load_1 = a[scalar_offset / 4];
   uint2 ubo_load = ((scalar_offset & 2) ? ubo_load_1.zw : ubo_load_1.xy);
   vector<float16_t, 2> ubo_load_xz = vector<float16_t, 2>(f16tof32(ubo_load & 0xFFFF));
   vector<float16_t, 2> ubo_load_yw = vector<float16_t, 2>(f16tof32(ubo_load >> 16));
   const uint scalar_offset_1 = ((offset + 8u)) / 4;
-  uint4 ubo_load_3 = buffer[scalar_offset_1 / 4];
+  uint4 ubo_load_3 = a[scalar_offset_1 / 4];
   uint2 ubo_load_2 = ((scalar_offset_1 & 2) ? ubo_load_3.zw : ubo_load_3.xy);
   vector<float16_t, 2> ubo_load_2_xz = vector<float16_t, 2>(f16tof32(ubo_load_2 & 0xFFFF));
   vector<float16_t, 2> ubo_load_2_yw = vector<float16_t, 2>(f16tof32(ubo_load_2 >> 16));
   return matrix<float16_t, 2, 4>(vector<float16_t, 4>(ubo_load_xz[0], ubo_load_yw[0], ubo_load_xz[1], ubo_load_yw[1]), vector<float16_t, 4>(ubo_load_2_xz[0], ubo_load_2_yw[0], ubo_load_2_xz[1], ubo_load_2_yw[1]));
 }
 
-Inner tint_symbol_7(uint4 buffer[64], uint offset) {
-  const Inner tint_symbol_11 = {tint_symbol_8(buffer, (offset + 0u))};
-  return tint_symbol_11;
+Inner a_load_3(uint offset) {
+  const Inner tint_symbol_4 = {a_load_4((offset + 0u))};
+  return tint_symbol_4;
 }
 
-typedef Inner tint_symbol_6_ret[4];
-tint_symbol_6_ret tint_symbol_6(uint4 buffer[64], uint offset) {
+typedef Inner a_load_2_ret[4];
+a_load_2_ret a_load_2(uint offset) {
   Inner arr[4] = (Inner[4])0;
   {
     for(uint i_1 = 0u; (i_1 < 4u); i_1 = (i_1 + 1u)) {
-      arr[i_1] = tint_symbol_7(buffer, (offset + (i_1 * 64u)));
+      arr[i_1] = a_load_3((offset + (i_1 * 64u)));
     }
   }
   return arr;
 }
 
-Outer tint_symbol_5(uint4 buffer[64], uint offset) {
-  const Outer tint_symbol_12 = {tint_symbol_6(buffer, (offset + 0u))};
-  return tint_symbol_12;
+Outer a_load_1(uint offset) {
+  const Outer tint_symbol_5 = {a_load_2((offset + 0u))};
+  return tint_symbol_5;
 }
 
-typedef Outer tint_symbol_4_ret[4];
-tint_symbol_4_ret tint_symbol_4(uint4 buffer[64], uint offset) {
+typedef Outer a_load_ret[4];
+a_load_ret a_load(uint offset) {
   Outer arr_1[4] = (Outer[4])0;
   {
     for(uint i_2 = 0u; (i_2 < 4u); i_2 = (i_2 + 1u)) {
-      arr_1[i_2] = tint_symbol_5(buffer, (offset + (i_2 * 256u)));
+      arr_1[i_2] = a_load_1((offset + (i_2 * 256u)));
     }
   }
   return arr_1;
@@ -68,11 +68,11 @@ void f() {
   const int p_a_i_save = i();
   const int p_a_i_a_i_save = i();
   const int p_a_i_a_i_m_i_save = i();
-  const Outer l_a[4] = tint_symbol_4(a, 0u);
-  const Outer l_a_i = tint_symbol_5(a, (256u * uint(p_a_i_save)));
-  const Inner l_a_i_a[4] = tint_symbol_6(a, (256u * uint(p_a_i_save)));
-  const Inner l_a_i_a_i = tint_symbol_7(a, ((256u * uint(p_a_i_save)) + (64u * uint(p_a_i_a_i_save))));
-  const matrix<float16_t, 2, 4> l_a_i_a_i_m = tint_symbol_8(a, ((256u * uint(p_a_i_save)) + (64u * uint(p_a_i_a_i_save))));
+  const Outer l_a[4] = a_load(0u);
+  const Outer l_a_i = a_load_1((256u * uint(p_a_i_save)));
+  const Inner l_a_i_a[4] = a_load_2((256u * uint(p_a_i_save)));
+  const Inner l_a_i_a_i = a_load_3(((256u * uint(p_a_i_save)) + (64u * uint(p_a_i_a_i_save))));
+  const matrix<float16_t, 2, 4> l_a_i_a_i_m = a_load_4(((256u * uint(p_a_i_save)) + (64u * uint(p_a_i_a_i_save))));
   const uint scalar_offset_2 = ((((256u * uint(p_a_i_save)) + (64u * uint(p_a_i_a_i_save))) + (8u * uint(p_a_i_a_i_m_i_save)))) / 4;
   uint4 ubo_load_5 = a[scalar_offset_2 / 4];
   uint2 ubo_load_4 = ((scalar_offset_2 & 2) ? ubo_load_5.zw : ubo_load_5.xy);
@@ -88,6 +88,3 @@ void f() {
   const float16_t l_a_i_a_i_m_i_i = float16_t(f16tof32(((a[scalar_offset_index / 4][scalar_offset_index % 4] >> (scalar_offset_bytes % 4 == 0 ? 0 : 16)) & 0xFFFF)));
   return;
 }
-FXC validation failure:
-D:\Projects\RampUp\dawn\test\tint\buffer\Shader@0x000001DE39EE1520(2,10-18): error X3000: syntax error: unexpected token 'float16_t'
-

test/tint/buffer/uniform/std140/struct/mat2x4_f16/static_index_via_ptr.wgsl.expected.fxc.hlsl

@@ -11,47 +11,47 @@ cbuffer cbuffer_a : register(b0, space0) {
   uint4 a[64];
 };
 
-matrix<float16_t, 2, 4> tint_symbol_4(uint4 buffer[64], uint offset) {
+matrix<float16_t, 2, 4> a_load_4(uint offset) {
   const uint scalar_offset = ((offset + 0u)) / 4;
-  uint4 ubo_load_1 = buffer[scalar_offset / 4];
+  uint4 ubo_load_1 = a[scalar_offset / 4];
   uint2 ubo_load = ((scalar_offset & 2) ? ubo_load_1.zw : ubo_load_1.xy);
   vector<float16_t, 2> ubo_load_xz = vector<float16_t, 2>(f16tof32(ubo_load & 0xFFFF));
   vector<float16_t, 2> ubo_load_yw = vector<float16_t, 2>(f16tof32(ubo_load >> 16));
   const uint scalar_offset_1 = ((offset + 8u)) / 4;
-  uint4 ubo_load_3 = buffer[scalar_offset_1 / 4];
+  uint4 ubo_load_3 = a[scalar_offset_1 / 4];
   uint2 ubo_load_2 = ((scalar_offset_1 & 2) ? ubo_load_3.zw : ubo_load_3.xy);
   vector<float16_t, 2> ubo_load_2_xz = vector<float16_t, 2>(f16tof32(ubo_load_2 & 0xFFFF));
   vector<float16_t, 2> ubo_load_2_yw = vector<float16_t, 2>(f16tof32(ubo_load_2 >> 16));
   return matrix<float16_t, 2, 4>(vector<float16_t, 4>(ubo_load_xz[0], ubo_load_yw[0], ubo_load_xz[1], ubo_load_yw[1]), vector<float16_t, 4>(ubo_load_2_xz[0], ubo_load_2_yw[0], ubo_load_2_xz[1], ubo_load_2_yw[1]));
 }
 
-Inner tint_symbol_3(uint4 buffer[64], uint offset) {
-  const Inner tint_symbol_7 = {tint_symbol_4(buffer, (offset + 0u))};
-  return tint_symbol_7;
+Inner a_load_3(uint offset) {
+  const Inner tint_symbol = {a_load_4((offset + 0u))};
+  return tint_symbol;
 }
 
-typedef Inner tint_symbol_2_ret[4];
-tint_symbol_2_ret tint_symbol_2(uint4 buffer[64], uint offset) {
+typedef Inner a_load_2_ret[4];
+a_load_2_ret a_load_2(uint offset) {
   Inner arr[4] = (Inner[4])0;
   {
     for(uint i = 0u; (i < 4u); i = (i + 1u)) {
-      arr[i] = tint_symbol_3(buffer, (offset + (i * 64u)));
+      arr[i] = a_load_3((offset + (i * 64u)));
     }
   }
   return arr;
 }
 
-Outer tint_symbol_1(uint4 buffer[64], uint offset) {
-  const Outer tint_symbol_8 = {tint_symbol_2(buffer, (offset + 0u))};
-  return tint_symbol_8;
+Outer a_load_1(uint offset) {
+  const Outer tint_symbol_1 = {a_load_2((offset + 0u))};
+  return tint_symbol_1;
 }
 
-typedef Outer tint_symbol_ret[4];
-tint_symbol_ret tint_symbol(uint4 buffer[64], uint offset) {
+typedef Outer a_load_ret[4];
+a_load_ret a_load(uint offset) {
   Outer arr_1[4] = (Outer[4])0;
   {
     for(uint i_1 = 0u; (i_1 < 4u); i_1 = (i_1 + 1u)) {
-      arr_1[i_1] = tint_symbol_1(buffer, (offset + (i_1 * 256u)));
+      arr_1[i_1] = a_load_1((offset + (i_1 * 256u)));
     }
   }
   return arr_1;
@@ -59,11 +59,11 @@ tint_symbol_ret tint_symbol(uint4 buffer[64], uint offset) {
 
 [numthreads(1, 1, 1)]
 void f() {
-  const Outer l_a[4] = tint_symbol(a, 0u);
-  const Outer l_a_3 = tint_symbol_1(a, 768u);
-  const Inner l_a_3_a[4] = tint_symbol_2(a, 768u);
-  const Inner l_a_3_a_2 = tint_symbol_3(a, 896u);
-  const matrix<float16_t, 2, 4> l_a_3_a_2_m = tint_symbol_4(a, 896u);
+  const Outer l_a[4] = a_load(0u);
+  const Outer l_a_3 = a_load_1(768u);
+  const Inner l_a_3_a[4] = a_load_2(768u);
+  const Inner l_a_3_a_2 = a_load_3(896u);
+  const matrix<float16_t, 2, 4> l_a_3_a_2_m = a_load_4(896u);
   uint2 ubo_load_4 = a[56].zw;
   vector<float16_t, 2> ubo_load_4_xz = vector<float16_t, 2>(f16tof32(ubo_load_4 & 0xFFFF));
   vector<float16_t, 2> ubo_load_4_yw = vector<float16_t, 2>(f16tof32(ubo_load_4 >> 16));
@@ -71,6 +71,3 @@ void f() {
   const float16_t l_a_3_a_2_m_1_0 = float16_t(f16tof32(((a[56].z) & 0xFFFF)));
   return;
 }
-FXC validation failure:
-D:\Projects\RampUp\dawn\test\tint\buffer\Shader@0x000001CF0BABD660(2,10-18): error X3000: syntax error: unexpected token 'float16_t'
-

test/tint/buffer/uniform/std140/struct/mat2x4_f16/to_builtin.wgsl.expected.fxc.hlsl

@@ -4,14 +4,14 @@ cbuffer cbuffer_u : register(b0, space0) {
   uint4 u[32];
 };
 
-matrix<float16_t, 2, 4> tint_symbol(uint4 buffer[32], uint offset) {
+matrix<float16_t, 2, 4> u_load(uint offset) {
   const uint scalar_offset = ((offset + 0u)) / 4;
-  uint4 ubo_load_1 = buffer[scalar_offset / 4];
+  uint4 ubo_load_1 = u[scalar_offset / 4];
   uint2 ubo_load = ((scalar_offset & 2) ? ubo_load_1.zw : ubo_load_1.xy);
   vector<float16_t, 2> ubo_load_xz = vector<float16_t, 2>(f16tof32(ubo_load & 0xFFFF));
   vector<float16_t, 2> ubo_load_yw = vector<float16_t, 2>(f16tof32(ubo_load >> 16));
   const uint scalar_offset_1 = ((offset + 8u)) / 4;
-  uint4 ubo_load_3 = buffer[scalar_offset_1 / 4];
+  uint4 ubo_load_3 = u[scalar_offset_1 / 4];
   uint2 ubo_load_2 = ((scalar_offset_1 & 2) ? ubo_load_3.zw : ubo_load_3.xy);
   vector<float16_t, 2> ubo_load_2_xz = vector<float16_t, 2>(f16tof32(ubo_load_2 & 0xFFFF));
   vector<float16_t, 2> ubo_load_2_yw = vector<float16_t, 2>(f16tof32(ubo_load_2 >> 16));
@@ -20,7 +20,7 @@ matrix<float16_t, 2, 4> tint_symbol(uint4 buffer[32], uint offset) {
 
 [numthreads(1, 1, 1)]
 void f() {
-  const matrix<float16_t, 4, 2> t = transpose(tint_symbol(u, 264u));
+  const matrix<float16_t, 4, 2> t = transpose(u_load(264u));
   uint2 ubo_load_4 = u[1].xy;
   vector<float16_t, 2> ubo_load_4_xz = vector<float16_t, 2>(f16tof32(ubo_load_4 & 0xFFFF));
   vector<float16_t, 2> ubo_load_4_yw = vector<float16_t, 2>(f16tof32(ubo_load_4 >> 16));
@@ -31,6 +31,3 @@ void f() {
   const float16_t a = abs(vector<float16_t, 4>(ubo_load_5_xz[0], ubo_load_5_yw[0], ubo_load_5_xz[1], ubo_load_5_yw[1]).ywxz.x);
   return;
 }
-FXC validation failure:
-D:\Projects\RampUp\dawn\test\tint\buffer\Shader@0x000002535B2A2420(5,8-16): error X3000: syntax error: unexpected token 'float16_t'
-

test/tint/buffer/uniform/std140/struct/mat2x4_f16/to_fn.wgsl.expected.fxc.hlsl

@@ -25,33 +25,33 @@ void d(vector<float16_t, 4> v) {
 void e(float16_t f_1) {
 }
 
-matrix<float16_t, 2, 4> tint_symbol_3(uint4 buffer[32], uint offset) {
+matrix<float16_t, 2, 4> u_load_3(uint offset) {
   const uint scalar_offset = ((offset + 0u)) / 4;
-  uint4 ubo_load_1 = buffer[scalar_offset / 4];
+  uint4 ubo_load_1 = u[scalar_offset / 4];
   uint2 ubo_load = ((scalar_offset & 2) ? ubo_load_1.zw : ubo_load_1.xy);
   vector<float16_t, 2> ubo_load_xz = vector<float16_t, 2>(f16tof32(ubo_load & 0xFFFF));
   vector<float16_t, 2> ubo_load_yw = vector<float16_t, 2>(f16tof32(ubo_load >> 16));
   const uint scalar_offset_1 = ((offset + 8u)) / 4;
-  uint4 ubo_load_3 = buffer[scalar_offset_1 / 4];
+  uint4 ubo_load_3 = u[scalar_offset_1 / 4];
   uint2 ubo_load_2 = ((scalar_offset_1 & 2) ? ubo_load_3.zw : ubo_load_3.xy);
   vector<float16_t, 2> ubo_load_2_xz = vector<float16_t, 2>(f16tof32(ubo_load_2 & 0xFFFF));
   vector<float16_t, 2> ubo_load_2_yw = vector<float16_t, 2>(f16tof32(ubo_load_2 >> 16));
   return matrix<float16_t, 2, 4>(vector<float16_t, 4>(ubo_load_xz[0], ubo_load_yw[0], ubo_load_xz[1], ubo_load_yw[1]), vector<float16_t, 4>(ubo_load_2_xz[0], ubo_load_2_yw[0], ubo_load_2_xz[1], ubo_load_2_yw[1]));
 }
 
-S tint_symbol_1(uint4 buffer[32], uint offset) {
+S u_load_1(uint offset) {
   const uint scalar_offset_2 = ((offset + 0u)) / 4;
   const uint scalar_offset_3 = ((offset + 64u)) / 4;
-  const S tint_symbol_5 = {asint(buffer[scalar_offset_2 / 4][scalar_offset_2 % 4]), tint_symbol_3(buffer, (offset + 8u)), asint(buffer[scalar_offset_3 / 4][scalar_offset_3 % 4])};
-  return tint_symbol_5;
+  const S tint_symbol = {asint(u[scalar_offset_2 / 4][scalar_offset_2 % 4]), u_load_3((offset + 8u)), asint(u[scalar_offset_3 / 4][scalar_offset_3 % 4])};
+  return tint_symbol;
 }
 
-typedef S tint_symbol_ret[4];
-tint_symbol_ret tint_symbol(uint4 buffer[32], uint offset) {
+typedef S u_load_ret[4];
+u_load_ret u_load(uint offset) {
   S arr[4] = (S[4])0;
   {
     for(uint i = 0u; (i < 4u); i = (i + 1u)) {
-      arr[i] = tint_symbol_1(buffer, (offset + (i * 128u)));
+      arr[i] = u_load_1((offset + (i * 128u)));
     }
   }
   return arr;
@@ -59,9 +59,9 @@ tint_symbol_ret tint_symbol(uint4 buffer[32], uint offset) {
 
 [numthreads(1, 1, 1)]
 void f() {
-  a(tint_symbol(u, 0u));
-  b(tint_symbol_1(u, 256u));
-  c(tint_symbol_3(u, 264u));
+  a(u_load(0u));
+  b(u_load_1(256u));
+  c(u_load_3(264u));
   uint2 ubo_load_4 = u[1].xy;
   vector<float16_t, 2> ubo_load_4_xz = vector<float16_t, 2>(f16tof32(ubo_load_4 & 0xFFFF));
   vector<float16_t, 2> ubo_load_4_yw = vector<float16_t, 2>(f16tof32(ubo_load_4 >> 16));
@@ -72,6 +72,3 @@ void f() {
   e(vector<float16_t, 4>(ubo_load_5_xz[0], ubo_load_5_yw[0], ubo_load_5_xz[1], ubo_load_5_yw[1]).ywxz.x);
   return;
 }
-FXC validation failure:
-D:\Projects\RampUp\dawn\test\tint\buffer\Shader@0x000001B118E73590(3,10-18): error X3000: syntax error: unexpected token 'float16_t'
-

test/tint/buffer/uniform/std140/struct/mat2x4_f16/to_private.wgsl.expected.fxc.hlsl

@@ -11,33 +11,33 @@ cbuffer cbuffer_u : register(b0, space0) {
 };
 static S p[4] = (S[4])0;
 
-matrix<float16_t, 2, 4> tint_symbol_3(uint4 buffer[32], uint offset) {
+matrix<float16_t, 2, 4> u_load_3(uint offset) {
   const uint scalar_offset = ((offset + 0u)) / 4;
-  uint4 ubo_load_1 = buffer[scalar_offset / 4];
+  uint4 ubo_load_1 = u[scalar_offset / 4];
   uint2 ubo_load = ((scalar_offset & 2) ? ubo_load_1.zw : ubo_load_1.xy);
   vector<float16_t, 2> ubo_load_xz = vector<float16_t, 2>(f16tof32(ubo_load & 0xFFFF));
   vector<float16_t, 2> ubo_load_yw = vector<float16_t, 2>(f16tof32(ubo_load >> 16));
   const uint scalar_offset_1 = ((offset + 8u)) / 4;
-  uint4 ubo_load_3 = buffer[scalar_offset_1 / 4];
+  uint4 ubo_load_3 = u[scalar_offset_1 / 4];
   uint2 ubo_load_2 = ((scalar_offset_1 & 2) ? ubo_load_3.zw : ubo_load_3.xy);
   vector<float16_t, 2> ubo_load_2_xz = vector<float16_t, 2>(f16tof32(ubo_load_2 & 0xFFFF));
   vector<float16_t, 2> ubo_load_2_yw = vector<float16_t, 2>(f16tof32(ubo_load_2 >> 16));
   return matrix<float16_t, 2, 4>(vector<float16_t, 4>(ubo_load_xz[0], ubo_load_yw[0], ubo_load_xz[1], ubo_load_yw[1]), vector<float16_t, 4>(ubo_load_2_xz[0], ubo_load_2_yw[0], ubo_load_2_xz[1], ubo_load_2_yw[1]));
 }
 
-S tint_symbol_1(uint4 buffer[32], uint offset) {
+S u_load_1(uint offset) {
   const uint scalar_offset_2 = ((offset + 0u)) / 4;
   const uint scalar_offset_3 = ((offset + 64u)) / 4;
-  const S tint_symbol_5 = {asint(buffer[scalar_offset_2 / 4][scalar_offset_2 % 4]), tint_symbol_3(buffer, (offset + 8u)), asint(buffer[scalar_offset_3 / 4][scalar_offset_3 % 4])};
-  return tint_symbol_5;
+  const S tint_symbol = {asint(u[scalar_offset_2 / 4][scalar_offset_2 % 4]), u_load_3((offset + 8u)), asint(u[scalar_offset_3 / 4][scalar_offset_3 % 4])};
+  return tint_symbol;
 }
 
-typedef S tint_symbol_ret[4];
-tint_symbol_ret tint_symbol(uint4 buffer[32], uint offset) {
+typedef S u_load_ret[4];
+u_load_ret u_load(uint offset) {
   S arr[4] = (S[4])0;
   {
     for(uint i = 0u; (i < 4u); i = (i + 1u)) {
-      arr[i] = tint_symbol_1(buffer, (offset + (i * 128u)));
+      arr[i] = u_load_1((offset + (i * 128u)));
     }
   }
   return arr;
@@ -45,15 +45,12 @@ tint_symbol_ret tint_symbol(uint4 buffer[32], uint offset) {
 
 [numthreads(1, 1, 1)]
 void f() {
-  p = tint_symbol(u, 0u);
-  p[1] = tint_symbol_1(u, 256u);
-  p[3].m = tint_symbol_3(u, 264u);
+  p = u_load(0u);
+  p[1] = u_load_1(256u);
+  p[3].m = u_load_3(264u);
   uint2 ubo_load_4 = u[1].xy;
   vector<float16_t, 2> ubo_load_4_xz = vector<float16_t, 2>(f16tof32(ubo_load_4 & 0xFFFF));
   vector<float16_t, 2> ubo_load_4_yw = vector<float16_t, 2>(f16tof32(ubo_load_4 >> 16));
   p[1].m[0] = vector<float16_t, 4>(ubo_load_4_xz[0], ubo_load_4_yw[0], ubo_load_4_xz[1], ubo_load_4_yw[1]).ywxz;
   return;
 }
-FXC validation failure:
-D:\Projects\RampUp\dawn\test\tint\buffer\Shader@0x0000012E5540B3A0(3,10-18): error X3000: syntax error: unexpected token 'float16_t'
-

test/tint/buffer/uniform/std140/struct/mat2x4_f16/to_storage.wgsl.expected.fxc.hlsl

@@ -11,53 +11,53 @@ cbuffer cbuffer_u : register(b0, space0) {
 };
 RWByteAddressBuffer s : register(u1, space0);
 
-void tint_symbol_3(RWByteAddressBuffer buffer, uint offset, matrix<float16_t, 2, 4> value) {
-  buffer.Store<vector<float16_t, 4> >((offset + 0u), value[0u]);
-  buffer.Store<vector<float16_t, 4> >((offset + 8u), value[1u]);
+void s_store_3(uint offset, matrix<float16_t, 2, 4> value) {
+  s.Store<vector<float16_t, 4> >((offset + 0u), value[0u]);
+  s.Store<vector<float16_t, 4> >((offset + 8u), value[1u]);
 }
 
-void tint_symbol_1(RWByteAddressBuffer buffer, uint offset, S value) {
-  buffer.Store((offset + 0u), asuint(value.before));
-  tint_symbol_3(buffer, (offset + 8u), value.m);
-  buffer.Store((offset + 64u), asuint(value.after));
+void s_store_1(uint offset, S value) {
+  s.Store((offset + 0u), asuint(value.before));
+  s_store_3((offset + 8u), value.m);
+  s.Store((offset + 64u), asuint(value.after));
 }
 
-void tint_symbol(RWByteAddressBuffer buffer, uint offset, S value[4]) {
-  S array[4] = value;
+void s_store(uint offset, S value[4]) {
+  S array_1[4] = value;
   {
     for(uint i = 0u; (i < 4u); i = (i + 1u)) {
-      tint_symbol_1(buffer, (offset + (i * 128u)), array[i]);
+      s_store_1((offset + (i * 128u)), array_1[i]);
     }
   }
 }
 
-matrix<float16_t, 2, 4> tint_symbol_8(uint4 buffer[32], uint offset) {
+matrix<float16_t, 2, 4> u_load_3(uint offset) {
   const uint scalar_offset = ((offset + 0u)) / 4;
-  uint4 ubo_load_1 = buffer[scalar_offset / 4];
+  uint4 ubo_load_1 = u[scalar_offset / 4];
   uint2 ubo_load = ((scalar_offset & 2) ? ubo_load_1.zw : ubo_load_1.xy);
   vector<float16_t, 2> ubo_load_xz = vector<float16_t, 2>(f16tof32(ubo_load & 0xFFFF));
   vector<float16_t, 2> ubo_load_yw = vector<float16_t, 2>(f16tof32(ubo_load >> 16));
   const uint scalar_offset_1 = ((offset + 8u)) / 4;
-  uint4 ubo_load_3 = buffer[scalar_offset_1 / 4];
+  uint4 ubo_load_3 = u[scalar_offset_1 / 4];
   uint2 ubo_load_2 = ((scalar_offset_1 & 2) ? ubo_load_3.zw : ubo_load_3.xy);
   vector<float16_t, 2> ubo_load_2_xz = vector<float16_t, 2>(f16tof32(ubo_load_2 & 0xFFFF));
   vector<float16_t, 2> ubo_load_2_yw = vector<float16_t, 2>(f16tof32(ubo_load_2 >> 16));
   return matrix<float16_t, 2, 4>(vector<float16_t, 4>(ubo_load_xz[0], ubo_load_yw[0], ubo_load_xz[1], ubo_load_yw[1]), vector<float16_t, 4>(ubo_load_2_xz[0], ubo_load_2_yw[0], ubo_load_2_xz[1], ubo_load_2_yw[1]));
 }
 
-S tint_symbol_6(uint4 buffer[32], uint offset) {
+S u_load_1(uint offset) {
   const uint scalar_offset_2 = ((offset + 0u)) / 4;
   const uint scalar_offset_3 = ((offset + 64u)) / 4;
-  const S tint_symbol_10 = {asint(buffer[scalar_offset_2 / 4][scalar_offset_2 % 4]), tint_symbol_8(buffer, (offset + 8u)), asint(buffer[scalar_offset_3 / 4][scalar_offset_3 % 4])};
-  return tint_symbol_10;
+  const S tint_symbol = {asint(u[scalar_offset_2 / 4][scalar_offset_2 % 4]), u_load_3((offset + 8u)), asint(u[scalar_offset_3 / 4][scalar_offset_3 % 4])};
+  return tint_symbol;
 }
 
-typedef S tint_symbol_5_ret[4];
-tint_symbol_5_ret tint_symbol_5(uint4 buffer[32], uint offset) {
+typedef S u_load_ret[4];
+u_load_ret u_load(uint offset) {
   S arr[4] = (S[4])0;
   {
     for(uint i_1 = 0u; (i_1 < 4u); i_1 = (i_1 + 1u)) {
-      arr[i_1] = tint_symbol_6(buffer, (offset + (i_1 * 128u)));
+      arr[i_1] = u_load_1((offset + (i_1 * 128u)));
     }
   }
   return arr;
@@ -65,15 +65,12 @@ tint_symbol_5_ret tint_symbol_5(uint4 buffer[32], uint offset) {
 
 [numthreads(1, 1, 1)]
 void f() {
-  tint_symbol(s, 0u, tint_symbol_5(u, 0u));
-  tint_symbol_1(s, 128u, tint_symbol_6(u, 256u));
-  tint_symbol_3(s, 392u, tint_symbol_8(u, 264u));
+  s_store(0u, u_load(0u));
+  s_store_1(128u, u_load_1(256u));
+  s_store_3(392u, u_load_3(264u));
   uint2 ubo_load_4 = u[1].xy;
   vector<float16_t, 2> ubo_load_4_xz = vector<float16_t, 2>(f16tof32(ubo_load_4 & 0xFFFF));
   vector<float16_t, 2> ubo_load_4_yw = vector<float16_t, 2>(f16tof32(ubo_load_4 >> 16));
   s.Store<vector<float16_t, 4> >(136u, vector<float16_t, 4>(ubo_load_4_xz[0], ubo_load_4_yw[0], ubo_load_4_xz[1], ubo_load_4_yw[1]).ywxz);
   return;
 }
-FXC validation failure:
-D:\Projects\RampUp\dawn\test\tint\buffer\Shader@0x00000270F5E70100(3,10-18): error X3000: syntax error: unexpected token 'float16_t'
-

test/tint/buffer/uniform/std140/struct/mat2x4_f16/to_workgroup.wgsl.expected.fxc.hlsl

@@ -15,33 +15,33 @@ struct tint_symbol_1 {
   uint local_invocation_index : SV_GroupIndex;
 };
 
-matrix<float16_t, 2, 4> tint_symbol_5(uint4 buffer[32], uint offset) {
+matrix<float16_t, 2, 4> u_load_3(uint offset) {
   const uint scalar_offset = ((offset + 0u)) / 4;
-  uint4 ubo_load_1 = buffer[scalar_offset / 4];
+  uint4 ubo_load_1 = u[scalar_offset / 4];
   uint2 ubo_load = ((scalar_offset & 2) ? ubo_load_1.zw : ubo_load_1.xy);
   vector<float16_t, 2> ubo_load_xz = vector<float16_t, 2>(f16tof32(ubo_load & 0xFFFF));
   vector<float16_t, 2> ubo_load_yw = vector<float16_t, 2>(f16tof32(ubo_load >> 16));
   const uint scalar_offset_1 = ((offset + 8u)) / 4;
-  uint4 ubo_load_3 = buffer[scalar_offset_1 / 4];
+  uint4 ubo_load_3 = u[scalar_offset_1 / 4];
   uint2 ubo_load_2 = ((scalar_offset_1 & 2) ? ubo_load_3.zw : ubo_load_3.xy);
   vector<float16_t, 2> ubo_load_2_xz = vector<float16_t, 2>(f16tof32(ubo_load_2 & 0xFFFF));
   vector<float16_t, 2> ubo_load_2_yw = vector<float16_t, 2>(f16tof32(ubo_load_2 >> 16));
   return matrix<float16_t, 2, 4>(vector<float16_t, 4>(ubo_load_xz[0], ubo_load_yw[0], ubo_load_xz[1], ubo_load_yw[1]), vector<float16_t, 4>(ubo_load_2_xz[0], ubo_load_2_yw[0], ubo_load_2_xz[1], ubo_load_2_yw[1]));
 }
 
-S tint_symbol_3(uint4 buffer[32], uint offset) {
+S u_load_1(uint offset) {
   const uint scalar_offset_2 = ((offset + 0u)) / 4;
   const uint scalar_offset_3 = ((offset + 64u)) / 4;
-  const S tint_symbol_8 = {asint(buffer[scalar_offset_2 / 4][scalar_offset_2 % 4]), tint_symbol_5(buffer, (offset + 8u)), asint(buffer[scalar_offset_3 / 4][scalar_offset_3 % 4])};
-  return tint_symbol_8;
+  const S tint_symbol_3 = {asint(u[scalar_offset_2 / 4][scalar_offset_2 % 4]), u_load_3((offset + 8u)), asint(u[scalar_offset_3 / 4][scalar_offset_3 % 4])};
+  return tint_symbol_3;
 }
 
-typedef S tint_symbol_2_ret[4];
-tint_symbol_2_ret tint_symbol_2(uint4 buffer[32], uint offset) {
+typedef S u_load_ret[4];
+u_load_ret u_load(uint offset) {
   S arr[4] = (S[4])0;
   {
     for(uint i_1 = 0u; (i_1 < 4u); i_1 = (i_1 + 1u)) {
-      arr[i_1] = tint_symbol_3(buffer, (offset + (i_1 * 128u)));
+      arr[i_1] = u_load_1((offset + (i_1 * 128u)));
     }
   }
   return arr;
@@ -51,14 +51,14 @@ void f_inner(uint local_invocation_index) {
   {
     for(uint idx = local_invocation_index; (idx < 4u); idx = (idx + 1u)) {
       const uint i = idx;
-      const S tint_symbol_7 = (S)0;
-      w[i] = tint_symbol_7;
+      const S tint_symbol_2 = (S)0;
+      w[i] = tint_symbol_2;
     }
   }
   GroupMemoryBarrierWithGroupSync();
-  w = tint_symbol_2(u, 0u);
-  w[1] = tint_symbol_3(u, 256u);
-  w[3].m = tint_symbol_5(u, 264u);
+  w = u_load(0u);
+  w[1] = u_load_1(256u);
+  w[3].m = u_load_3(264u);
   uint2 ubo_load_4 = u[1].xy;
   vector<float16_t, 2> ubo_load_4_xz = vector<float16_t, 2>(f16tof32(ubo_load_4 & 0xFFFF));
   vector<float16_t, 2> ubo_load_4_yw = vector<float16_t, 2>(f16tof32(ubo_load_4 >> 16));
@@ -70,6 +70,3 @@ void f(tint_symbol_1 tint_symbol) {
   f_inner(tint_symbol.local_invocation_index);
   return;
 }
-FXC validation failure:
-D:\Projects\RampUp\dawn\test\tint\buffer\Shader@0x000001B747E825C0(3,10-18): error X3000: syntax error: unexpected token 'float16_t'
-

test/tint/buffer/uniform/std140/struct/mat3x2_f16/dynamic_index_via_ptr.wgsl.expected.fxc.hlsl

@@ -17,43 +17,43 @@ int i() {
   return counter;
 }
 
-matrix<float16_t, 3, 2> tint_symbol_8(uint4 buffer[64], uint offset) {
+matrix<float16_t, 3, 2> a_load_4(uint offset) {
   const uint scalar_offset = ((offset + 0u)) / 4;
-  uint ubo_load = buffer[scalar_offset / 4][scalar_offset % 4];
+  uint ubo_load = a[scalar_offset / 4][scalar_offset % 4];
   const uint scalar_offset_1 = ((offset + 4u)) / 4;
-  uint ubo_load_1 = buffer[scalar_offset_1 / 4][scalar_offset_1 % 4];
+  uint ubo_load_1 = a[scalar_offset_1 / 4][scalar_offset_1 % 4];
   const uint scalar_offset_2 = ((offset + 8u)) / 4;
-  uint ubo_load_2 = buffer[scalar_offset_2 / 4][scalar_offset_2 % 4];
+  uint ubo_load_2 = a[scalar_offset_2 / 4][scalar_offset_2 % 4];
   return matrix<float16_t, 3, 2>(vector<float16_t, 2>(float16_t(f16tof32(ubo_load & 0xFFFF)), float16_t(f16tof32(ubo_load >> 16))), vector<float16_t, 2>(float16_t(f16tof32(ubo_load_1 & 0xFFFF)), float16_t(f16tof32(ubo_load_1 >> 16))), vector<float16_t, 2>(float16_t(f16tof32(ubo_load_2 & 0xFFFF)), float16_t(f16tof32(ubo_load_2 >> 16))));
 }
 
-Inner tint_symbol_7(uint4 buffer[64], uint offset) {
-  const Inner tint_symbol_11 = {tint_symbol_8(buffer, (offset + 0u))};
-  return tint_symbol_11;
+Inner a_load_3(uint offset) {
+  const Inner tint_symbol_4 = {a_load_4((offset + 0u))};
+  return tint_symbol_4;
 }
 
-typedef Inner tint_symbol_6_ret[4];
-tint_symbol_6_ret tint_symbol_6(uint4 buffer[64], uint offset) {
+typedef Inner a_load_2_ret[4];
+a_load_2_ret a_load_2(uint offset) {
   Inner arr[4] = (Inner[4])0;
   {
     for(uint i_1 = 0u; (i_1 < 4u); i_1 = (i_1 + 1u)) {
-      arr[i_1] = tint_symbol_7(buffer, (offset + (i_1 * 64u)));
+      arr[i_1] = a_load_3((offset + (i_1 * 64u)));
     }
   }
   return arr;
 }
 
-Outer tint_symbol_5(uint4 buffer[64], uint offset) {
-  const Outer tint_symbol_12 = {tint_symbol_6(buffer, (offset + 0u))};
-  return tint_symbol_12;
+Outer a_load_1(uint offset) {
+  const Outer tint_symbol_5 = {a_load_2((offset + 0u))};
+  return tint_symbol_5;
 }
 
-typedef Outer tint_symbol_4_ret[4];
-tint_symbol_4_ret tint_symbol_4(uint4 buffer[64], uint offset) {
+typedef Outer a_load_ret[4];
+a_load_ret a_load(uint offset) {
   Outer arr_1[4] = (Outer[4])0;
   {
     for(uint i_2 = 0u; (i_2 < 4u); i_2 = (i_2 + 1u)) {
-      arr_1[i_2] = tint_symbol_5(buffer, (offset + (i_2 * 256u)));
+      arr_1[i_2] = a_load_1((offset + (i_2 * 256u)));
     }
   }
   return arr_1;
@@ -64,11 +64,11 @@ void f() {
   const int p_a_i_save = i();
   const int p_a_i_a_i_save = i();
   const int p_a_i_a_i_m_i_save = i();
-  const Outer l_a[4] = tint_symbol_4(a, 0u);
-  const Outer l_a_i = tint_symbol_5(a, (256u * uint(p_a_i_save)));
-  const Inner l_a_i_a[4] = tint_symbol_6(a, (256u * uint(p_a_i_save)));
-  const Inner l_a_i_a_i = tint_symbol_7(a, ((256u * uint(p_a_i_save)) + (64u * uint(p_a_i_a_i_save))));
-  const matrix<float16_t, 3, 2> l_a_i_a_i_m = tint_symbol_8(a, ((256u * uint(p_a_i_save)) + (64u * uint(p_a_i_a_i_save))));
+  const Outer l_a[4] = a_load(0u);
+  const Outer l_a_i = a_load_1((256u * uint(p_a_i_save)));
+  const Inner l_a_i_a[4] = a_load_2((256u * uint(p_a_i_save)));
+  const Inner l_a_i_a_i = a_load_3(((256u * uint(p_a_i_save)) + (64u * uint(p_a_i_a_i_save))));
+  const matrix<float16_t, 3, 2> l_a_i_a_i_m = a_load_4(((256u * uint(p_a_i_save)) + (64u * uint(p_a_i_a_i_save))));
   const uint scalar_offset_3 = ((((256u * uint(p_a_i_save)) + (64u * uint(p_a_i_a_i_save))) + (4u * uint(p_a_i_a_i_m_i_save)))) / 4;
   uint ubo_load_3 = a[scalar_offset_3 / 4][scalar_offset_3 % 4];
   const vector<float16_t, 2> l_a_i_a_i_m_i = vector<float16_t, 2>(float16_t(f16tof32(ubo_load_3 & 0xFFFF)), float16_t(f16tof32(ubo_load_3 >> 16)));
@@ -81,6 +81,3 @@ void f() {
   const float16_t l_a_i_a_i_m_i_i = float16_t(f16tof32(((a[scalar_offset_index / 4][scalar_offset_index % 4] >> (scalar_offset_bytes % 4 == 0 ? 0 : 16)) & 0xFFFF)));
   return;
 }
-FXC validation failure:
-D:\Projects\RampUp\dawn\test\tint\buffer\Shader@0x000002078397D2F0(2,10-18): error X3000: syntax error: unexpected token 'float16_t'
-

test/tint/buffer/uniform/std140/struct/mat3x2_f16/static_index_via_ptr.wgsl.expected.fxc.hlsl

@@ -11,43 +11,43 @@ cbuffer cbuffer_a : register(b0, space0) {
   uint4 a[64];
 };
 
-matrix<float16_t, 3, 2> tint_symbol_4(uint4 buffer[64], uint offset) {
+matrix<float16_t, 3, 2> a_load_4(uint offset) {
   const uint scalar_offset = ((offset + 0u)) / 4;
-  uint ubo_load = buffer[scalar_offset / 4][scalar_offset % 4];
+  uint ubo_load = a[scalar_offset / 4][scalar_offset % 4];
   const uint scalar_offset_1 = ((offset + 4u)) / 4;
-  uint ubo_load_1 = buffer[scalar_offset_1 / 4][scalar_offset_1 % 4];
+  uint ubo_load_1 = a[scalar_offset_1 / 4][scalar_offset_1 % 4];
   const uint scalar_offset_2 = ((offset + 8u)) / 4;
-  uint ubo_load_2 = buffer[scalar_offset_2 / 4][scalar_offset_2 % 4];
+  uint ubo_load_2 = a[scalar_offset_2 / 4][scalar_offset_2 % 4];
   return matrix<float16_t, 3, 2>(vector<float16_t, 2>(float16_t(f16tof32(ubo_load & 0xFFFF)), float16_t(f16tof32(ubo_load >> 16))), vector<float16_t, 2>(float16_t(f16tof32(ubo_load_1 & 0xFFFF)), float16_t(f16tof32(ubo_load_1 >> 16))), vector<float16_t, 2>(float16_t(f16tof32(ubo_load_2 & 0xFFFF)), float16_t(f16tof32(ubo_load_2 >> 16))));
 }
 
-Inner tint_symbol_3(uint4 buffer[64], uint offset) {
-  const Inner tint_symbol_7 = {tint_symbol_4(buffer, (offset + 0u))};
-  return tint_symbol_7;
+Inner a_load_3(uint offset) {
+  const Inner tint_symbol = {a_load_4((offset + 0u))};
+  return tint_symbol;
 }
 
-typedef Inner tint_symbol_2_ret[4];
-tint_symbol_2_ret tint_symbol_2(uint4 buffer[64], uint offset) {
+typedef Inner a_load_2_ret[4];
+a_load_2_ret a_load_2(uint offset) {
   Inner arr[4] = (Inner[4])0;
   {
     for(uint i = 0u; (i < 4u); i = (i + 1u)) {
-      arr[i] = tint_symbol_3(buffer, (offset + (i * 64u)));
+      arr[i] = a_load_3((offset + (i * 64u)));
     }
   }
   return arr;
 }
 
-Outer tint_symbol_1(uint4 buffer[64], uint offset) {
-  const Outer tint_symbol_8 = {tint_symbol_2(buffer, (offset + 0u))};
-  return tint_symbol_8;
+Outer a_load_1(uint offset) {
+  const Outer tint_symbol_1 = {a_load_2((offset + 0u))};
+  return tint_symbol_1;
 }
 
-typedef Outer tint_symbol_ret[4];
-tint_symbol_ret tint_symbol(uint4 buffer[64], uint offset) {
+typedef Outer a_load_ret[4];
+a_load_ret a_load(uint offset) {
   Outer arr_1[4] = (Outer[4])0;
   {
     for(uint i_1 = 0u; (i_1 < 4u); i_1 = (i_1 + 1u)) {
-      arr_1[i_1] = tint_symbol_1(buffer, (offset + (i_1 * 256u)));
+      arr_1[i_1] = a_load_1((offset + (i_1 * 256u)));
     }
   }
   return arr_1;
@@ -55,16 +55,13 @@ tint_symbol_ret tint_symbol(uint4 buffer[64], uint offset) {
 
 [numthreads(1, 1, 1)]
 void f() {
-  const Outer l_a[4] = tint_symbol(a, 0u);
-  const Outer l_a_3 = tint_symbol_1(a, 768u);
-  const Inner l_a_3_a[4] = tint_symbol_2(a, 768u);
-  const Inner l_a_3_a_2 = tint_symbol_3(a, 896u);
-  const matrix<float16_t, 3, 2> l_a_3_a_2_m = tint_symbol_4(a, 896u);
+  const Outer l_a[4] = a_load(0u);
+  const Outer l_a_3 = a_load_1(768u);
+  const Inner l_a_3_a[4] = a_load_2(768u);
+  const Inner l_a_3_a_2 = a_load_3(896u);
+  const matrix<float16_t, 3, 2> l_a_3_a_2_m = a_load_4(896u);
   uint ubo_load_3 = a[56].y;
   const vector<float16_t, 2> l_a_3_a_2_m_1 = vector<float16_t, 2>(float16_t(f16tof32(ubo_load_3 & 0xFFFF)), float16_t(f16tof32(ubo_load_3 >> 16)));
   const float16_t l_a_3_a_2_m_1_0 = float16_t(f16tof32(((a[56].y) & 0xFFFF)));
   return;
 }
-FXC validation failure:
-D:\Projects\RampUp\dawn\test\tint\buffer\Shader@0x00000229471C1EC0(2,10-18): error X3000: syntax error: unexpected token 'float16_t'
-

test/tint/buffer/uniform/std140/struct/mat3x2_f16/to_builtin.wgsl.expected.fxc.hlsl

@@ -4,25 +4,22 @@ cbuffer cbuffer_u : register(b0, space0) {
   uint4 u[32];
 };
 
-matrix<float16_t, 3, 2> tint_symbol(uint4 buffer[32], uint offset) {
+matrix<float16_t, 3, 2> u_load(uint offset) {
   const uint scalar_offset = ((offset + 0u)) / 4;
-  uint ubo_load = buffer[scalar_offset / 4][scalar_offset % 4];
+  uint ubo_load = u[scalar_offset / 4][scalar_offset % 4];
   const uint scalar_offset_1 = ((offset + 4u)) / 4;
-  uint ubo_load_1 = buffer[scalar_offset_1 / 4][scalar_offset_1 % 4];
+  uint ubo_load_1 = u[scalar_offset_1 / 4][scalar_offset_1 % 4];
   const uint scalar_offset_2 = ((offset + 8u)) / 4;
-  uint ubo_load_2 = buffer[scalar_offset_2 / 4][scalar_offset_2 % 4];
+  uint ubo_load_2 = u[scalar_offset_2 / 4][scalar_offset_2 % 4];
   return matrix<float16_t, 3, 2>(vector<float16_t, 2>(float16_t(f16tof32(ubo_load & 0xFFFF)), float16_t(f16tof32(ubo_load >> 16))), vector<float16_t, 2>(float16_t(f16tof32(ubo_load_1 & 0xFFFF)), float16_t(f16tof32(ubo_load_1 >> 16))), vector<float16_t, 2>(float16_t(f16tof32(ubo_load_2 & 0xFFFF)), float16_t(f16tof32(ubo_load_2 >> 16))));
 }
 
 [numthreads(1, 1, 1)]
 void f() {
-  const matrix<float16_t, 2, 3> t = transpose(tint_symbol(u, 260u));
+  const matrix<float16_t, 2, 3> t = transpose(u_load(260u));
   uint ubo_load_3 = u[0].z;
   const float16_t l = length(vector<float16_t, 2>(float16_t(f16tof32(ubo_load_3 & 0xFFFF)), float16_t(f16tof32(ubo_load_3 >> 16))).yx);
   uint ubo_load_4 = u[0].z;
   const float16_t a = abs(vector<float16_t, 2>(float16_t(f16tof32(ubo_load_4 & 0xFFFF)), float16_t(f16tof32(ubo_load_4 >> 16))).yx.x);
   return;
 }
-FXC validation failure:
-D:\Projects\RampUp\dawn\test\tint\buffer\Shader@0x000001CB6BBFDD80(5,8-16): error X3000: syntax error: unexpected token 'float16_t'
-

test/tint/buffer/uniform/std140/struct/mat3x2_f16/to_fn.wgsl.expected.fxc.hlsl

@@ -25,29 +25,29 @@ void d(vector<float16_t, 2> v) {
 void e(float16_t f_1) {
 }
 
-matrix<float16_t, 3, 2> tint_symbol_3(uint4 buffer[32], uint offset) {
+matrix<float16_t, 3, 2> u_load_3(uint offset) {
   const uint scalar_offset = ((offset + 0u)) / 4;
-  uint ubo_load = buffer[scalar_offset / 4][scalar_offset % 4];
+  uint ubo_load = u[scalar_offset / 4][scalar_offset % 4];
   const uint scalar_offset_1 = ((offset + 4u)) / 4;
-  uint ubo_load_1 = buffer[scalar_offset_1 / 4][scalar_offset_1 % 4];
+  uint ubo_load_1 = u[scalar_offset_1 / 4][scalar_offset_1 % 4];
   const uint scalar_offset_2 = ((offset + 8u)) / 4;
-  uint ubo_load_2 = buffer[scalar_offset_2 / 4][scalar_offset_2 % 4];
+  uint ubo_load_2 = u[scalar_offset_2 / 4][scalar_offset_2 % 4];
   return matrix<float16_t, 3, 2>(vector<float16_t, 2>(float16_t(f16tof32(ubo_load & 0xFFFF)), float16_t(f16tof32(ubo_load >> 16))), vector<float16_t, 2>(float16_t(f16tof32(ubo_load_1 & 0xFFFF)), float16_t(f16tof32(ubo_load_1 >> 16))), vector<float16_t, 2>(float16_t(f16tof32(ubo_load_2 & 0xFFFF)), float16_t(f16tof32(ubo_load_2 >> 16))));
 }
 
-S tint_symbol_1(uint4 buffer[32], uint offset) {
+S u_load_1(uint offset) {
   const uint scalar_offset_3 = ((offset + 0u)) / 4;
   const uint scalar_offset_4 = ((offset + 64u)) / 4;
-  const S tint_symbol_5 = {asint(buffer[scalar_offset_3 / 4][scalar_offset_3 % 4]), tint_symbol_3(buffer, (offset + 4u)), asint(buffer[scalar_offset_4 / 4][scalar_offset_4 % 4])};
-  return tint_symbol_5;
+  const S tint_symbol = {asint(u[scalar_offset_3 / 4][scalar_offset_3 % 4]), u_load_3((offset + 4u)), asint(u[scalar_offset_4 / 4][scalar_offset_4 % 4])};
+  return tint_symbol;
 }
 
-typedef S tint_symbol_ret[4];
-tint_symbol_ret tint_symbol(uint4 buffer[32], uint offset) {
+typedef S u_load_ret[4];
+u_load_ret u_load(uint offset) {
   S arr[4] = (S[4])0;
   {
     for(uint i = 0u; (i < 4u); i = (i + 1u)) {
-      arr[i] = tint_symbol_1(buffer, (offset + (i * 128u)));
+      arr[i] = u_load_1((offset + (i * 128u)));
     }
   }
   return arr;
@@ -55,15 +55,12 @@ tint_symbol_ret tint_symbol(uint4 buffer[32], uint offset) {
 
 [numthreads(1, 1, 1)]
 void f() {
-  a(tint_symbol(u, 0u));
-  b(tint_symbol_1(u, 256u));
-  c(tint_symbol_3(u, 260u));
+  a(u_load(0u));
+  b(u_load_1(256u));
+  c(u_load_3(260u));
   uint ubo_load_3 = u[0].z;
   d(vector<float16_t, 2>(float16_t(f16tof32(ubo_load_3 & 0xFFFF)), float16_t(f16tof32(ubo_load_3 >> 16))).yx);
   uint ubo_load_4 = u[0].z;
   e(vector<float16_t, 2>(float16_t(f16tof32(ubo_load_4 & 0xFFFF)), float16_t(f16tof32(ubo_load_4 >> 16))).yx.x);
   return;
 }
-FXC validation failure:
-D:\Projects\RampUp\dawn\test\tint\buffer\Shader@0x0000017A6DD8FA30(3,10-18): error X3000: syntax error: unexpected token 'float16_t'
-

test/tint/buffer/uniform/std140/struct/mat3x2_f16/to_private.wgsl.expected.fxc.hlsl

@@ -11,29 +11,29 @@ cbuffer cbuffer_u : register(b0, space0) {
 };
 static S p[4] = (S[4])0;
 
-matrix<float16_t, 3, 2> tint_symbol_3(uint4 buffer[32], uint offset) {
+matrix<float16_t, 3, 2> u_load_3(uint offset) {
   const uint scalar_offset = ((offset + 0u)) / 4;
-  uint ubo_load = buffer[scalar_offset / 4][scalar_offset % 4];
+  uint ubo_load = u[scalar_offset / 4][scalar_offset % 4];
   const uint scalar_offset_1 = ((offset + 4u)) / 4;
-  uint ubo_load_1 = buffer[scalar_offset_1 / 4][scalar_offset_1 % 4];
+  uint ubo_load_1 = u[scalar_offset_1 / 4][scalar_offset_1 % 4];
   const uint scalar_offset_2 = ((offset + 8u)) / 4;
-  uint ubo_load_2 = buffer[scalar_offset_2 / 4][scalar_offset_2 % 4];
+  uint ubo_load_2 = u[scalar_offset_2 / 4][scalar_offset_2 % 4];
   return matrix<float16_t, 3, 2>(vector<float16_t, 2>(float16_t(f16tof32(ubo_load & 0xFFFF)), float16_t(f16tof32(ubo_load >> 16))), vector<float16_t, 2>(float16_t(f16tof32(ubo_load_1 & 0xFFFF)), float16_t(f16tof32(ubo_load_1 >> 16))), vector<float16_t, 2>(float16_t(f16tof32(ubo_load_2 & 0xFFFF)), float16_t(f16tof32(ubo_load_2 >> 16))));
 }
 
-S tint_symbol_1(uint4 buffer[32], uint offset) {
+S u_load_1(uint offset) {
   const uint scalar_offset_3 = ((offset + 0u)) / 4;
   const uint scalar_offset_4 = ((offset + 64u)) / 4;
-  const S tint_symbol_5 = {asint(buffer[scalar_offset_3 / 4][scalar_offset_3 % 4]), tint_symbol_3(buffer, (offset + 4u)), asint(buffer[scalar_offset_4 / 4][scalar_offset_4 % 4])};
-  return tint_symbol_5;
+  const S tint_symbol = {asint(u[scalar_offset_3 / 4][scalar_offset_3 % 4]), u_load_3((offset + 4u)), asint(u[scalar_offset_4 / 4][scalar_offset_4 % 4])};
+  return tint_symbol;
 }
 
-typedef S tint_symbol_ret[4];
-tint_symbol_ret tint_symbol(uint4 buffer[32], uint offset) {
+typedef S u_load_ret[4];
+u_load_ret u_load(uint offset) {
   S arr[4] = (S[4])0;
   {
     for(uint i = 0u; (i < 4u); i = (i + 1u)) {
-      arr[i] = tint_symbol_1(buffer, (offset + (i * 128u)));
+      arr[i] = u_load_1((offset + (i * 128u)));
     }
   }
   return arr;
@@ -41,13 +41,10 @@ tint_symbol_ret tint_symbol(uint4 buffer[32], uint offset) {
 
 [numthreads(1, 1, 1)]
 void f() {
-  p = tint_symbol(u, 0u);
-  p[1] = tint_symbol_1(u, 256u);
-  p[3].m = tint_symbol_3(u, 260u);
+  p = u_load(0u);
+  p[1] = u_load_1(256u);
+  p[3].m = u_load_3(260u);
   uint ubo_load_3 = u[0].z;
   p[1].m[0] = vector<float16_t, 2>(float16_t(f16tof32(ubo_load_3 & 0xFFFF)), float16_t(f16tof32(ubo_load_3 >> 16))).yx;
   return;
 }
-FXC validation failure:
-D:\Projects\RampUp\dawn\test\tint\buffer\Shader@0x0000022E1691F8F0(3,10-18): error X3000: syntax error: unexpected token 'float16_t'
-

test/tint/buffer/uniform/std140/struct/mat3x2_f16/to_storage.wgsl.expected.fxc.hlsl

@@ -11,50 +11,50 @@ cbuffer cbuffer_u : register(b0, space0) {
 };
 RWByteAddressBuffer s : register(u1, space0);
 
-void tint_symbol_3(RWByteAddressBuffer buffer, uint offset, matrix<float16_t, 3, 2> value) {
-  buffer.Store<vector<float16_t, 2> >((offset + 0u), value[0u]);
-  buffer.Store<vector<float16_t, 2> >((offset + 4u), value[1u]);
-  buffer.Store<vector<float16_t, 2> >((offset + 8u), value[2u]);
+void s_store_3(uint offset, matrix<float16_t, 3, 2> value) {
+  s.Store<vector<float16_t, 2> >((offset + 0u), value[0u]);
+  s.Store<vector<float16_t, 2> >((offset + 4u), value[1u]);
+  s.Store<vector<float16_t, 2> >((offset + 8u), value[2u]);
 }
 
-void tint_symbol_1(RWByteAddressBuffer buffer, uint offset, S value) {
-  buffer.Store((offset + 0u), asuint(value.before));
-  tint_symbol_3(buffer, (offset + 4u), value.m);
-  buffer.Store((offset + 64u), asuint(value.after));
+void s_store_1(uint offset, S value) {
+  s.Store((offset + 0u), asuint(value.before));
+  s_store_3((offset + 4u), value.m);
+  s.Store((offset + 64u), asuint(value.after));
 }
 
-void tint_symbol(RWByteAddressBuffer buffer, uint offset, S value[4]) {
-  S array[4] = value;
+void s_store(uint offset, S value[4]) {
+  S array_1[4] = value;
   {
     for(uint i = 0u; (i < 4u); i = (i + 1u)) {
-      tint_symbol_1(buffer, (offset + (i * 128u)), array[i]);
+      s_store_1((offset + (i * 128u)), array_1[i]);
     }
   }
 }
 
-matrix<float16_t, 3, 2> tint_symbol_8(uint4 buffer[32], uint offset) {
+matrix<float16_t, 3, 2> u_load_3(uint offset) {
   const uint scalar_offset = ((offset + 0u)) / 4;
-  uint ubo_load = buffer[scalar_offset / 4][scalar_offset % 4];
+  uint ubo_load = u[scalar_offset / 4][scalar_offset % 4];
   const uint scalar_offset_1 = ((offset + 4u)) / 4;
-  uint ubo_load_1 = buffer[scalar_offset_1 / 4][scalar_offset_1 % 4];
+  uint ubo_load_1 = u[scalar_offset_1 / 4][scalar_offset_1 % 4];
   const uint scalar_offset_2 = ((offset + 8u)) / 4;
-  uint ubo_load_2 = buffer[scalar_offset_2 / 4][scalar_offset_2 % 4];
+  uint ubo_load_2 = u[scalar_offset_2 / 4][scalar_offset_2 % 4];
   return matrix<float16_t, 3, 2>(vector<float16_t, 2>(float16_t(f16tof32(ubo_load & 0xFFFF)), float16_t(f16tof32(ubo_load >> 16))), vector<float16_t, 2>(float16_t(f16tof32(ubo_load_1 & 0xFFFF)), float16_t(f16tof32(ubo_load_1 >> 16))), vector<float16_t, 2>(float16_t(f16tof32(ubo_load_2 & 0xFFFF)), float16_t(f16tof32(ubo_load_2 >> 16))));
 }
 
-S tint_symbol_6(uint4 buffer[32], uint offset) {
+S u_load_1(uint offset) {
   const uint scalar_offset_3 = ((offset + 0u)) / 4;
   const uint scalar_offset_4 = ((offset + 64u)) / 4;
-  const S tint_symbol_10 = {asint(buffer[scalar_offset_3 / 4][scalar_offset_3 % 4]), tint_symbol_8(buffer, (offset + 4u)), asint(buffer[scalar_offset_4 / 4][scalar_offset_4 % 4])};
-  return tint_symbol_10;
+  const S tint_symbol = {asint(u[scalar_offset_3 / 4][scalar_offset_3 % 4]), u_load_3((offset + 4u)), asint(u[scalar_offset_4 / 4][scalar_offset_4 % 4])};
+  return tint_symbol;
 }
 
-typedef S tint_symbol_5_ret[4];
-tint_symbol_5_ret tint_symbol_5(uint4 buffer[32], uint offset) {
+typedef S u_load_ret[4];
+u_load_ret u_load(uint offset) {
   S arr[4] = (S[4])0;
   {
     for(uint i_1 = 0u; (i_1 < 4u); i_1 = (i_1 + 1u)) {
-      arr[i_1] = tint_symbol_6(buffer, (offset + (i_1 * 128u)));
+      arr[i_1] = u_load_1((offset + (i_1 * 128u)));
     }
   }
   return arr;
@@ -62,13 +62,10 @@ tint_symbol_5_ret tint_symbol_5(uint4 buffer[32], uint offset) {
 
 [numthreads(1, 1, 1)]
 void f() {
-  tint_symbol(s, 0u, tint_symbol_5(u, 0u));
-  tint_symbol_1(s, 128u, tint_symbol_6(u, 256u));
-  tint_symbol_3(s, 388u, tint_symbol_8(u, 260u));
+  s_store(0u, u_load(0u));
+  s_store_1(128u, u_load_1(256u));
+  s_store_3(388u, u_load_3(260u));
   uint ubo_load_3 = u[0].z;
   s.Store<vector<float16_t, 2> >(132u, vector<float16_t, 2>(float16_t(f16tof32(ubo_load_3 & 0xFFFF)), float16_t(f16tof32(ubo_load_3 >> 16))).yx);
   return;
 }
-FXC validation failure:
-D:\Projects\RampUp\dawn\test\tint\buffer\Shader@0x000001BBE330BB00(3,10-18): error X3000: syntax error: unexpected token 'float16_t'
-

test/tint/buffer/uniform/std140/struct/mat3x2_f16/to_workgroup.wgsl.expected.fxc.hlsl

@@ -15,29 +15,29 @@ struct tint_symbol_1 {
   uint local_invocation_index : SV_GroupIndex;
 };
 
-matrix<float16_t, 3, 2> tint_symbol_5(uint4 buffer[32], uint offset) {
+matrix<float16_t, 3, 2> u_load_3(uint offset) {
   const uint scalar_offset = ((offset + 0u)) / 4;
-  uint ubo_load = buffer[scalar_offset / 4][scalar_offset % 4];
+  uint ubo_load = u[scalar_offset / 4][scalar_offset % 4];
   const uint scalar_offset_1 = ((offset + 4u)) / 4;
-  uint ubo_load_1 = buffer[scalar_offset_1 / 4][scalar_offset_1 % 4];
+  uint ubo_load_1 = u[scalar_offset_1 / 4][scalar_offset_1 % 4];
   const uint scalar_offset_2 = ((offset + 8u)) / 4;
-  uint ubo_load_2 = buffer[scalar_offset_2 / 4][scalar_offset_2 % 4];
+  uint ubo_load_2 = u[scalar_offset_2 / 4][scalar_offset_2 % 4];
   return matrix<float16_t, 3, 2>(vector<float16_t, 2>(float16_t(f16tof32(ubo_load & 0xFFFF)), float16_t(f16tof32(ubo_load >> 16))), vector<float16_t, 2>(float16_t(f16tof32(ubo_load_1 & 0xFFFF)), float16_t(f16tof32(ubo_load_1 >> 16))), vector<float16_t, 2>(float16_t(f16tof32(ubo_load_2 & 0xFFFF)), float16_t(f16tof32(ubo_load_2 >> 16))));
 }
 
-S tint_symbol_3(uint4 buffer[32], uint offset) {
+S u_load_1(uint offset) {
   const uint scalar_offset_3 = ((offset + 0u)) / 4;
   const uint scalar_offset_4 = ((offset + 64u)) / 4;
-  const S tint_symbol_8 = {asint(buffer[scalar_offset_3 / 4][scalar_offset_3 % 4]), tint_symbol_5(buffer, (offset + 4u)), asint(buffer[scalar_offset_4 / 4][scalar_offset_4 % 4])};
-  return tint_symbol_8;
+  const S tint_symbol_3 = {asint(u[scalar_offset_3 / 4][scalar_offset_3 % 4]), u_load_3((offset + 4u)), asint(u[scalar_offset_4 / 4][scalar_offset_4 % 4])};
+  return tint_symbol_3;
 }
 
-typedef S tint_symbol_2_ret[4];
-tint_symbol_2_ret tint_symbol_2(uint4 buffer[32], uint offset) {
+typedef S u_load_ret[4];
+u_load_ret u_load(uint offset) {
   S arr[4] = (S[4])0;
   {
     for(uint i_1 = 0u; (i_1 < 4u); i_1 = (i_1 + 1u)) {
-      arr[i_1] = tint_symbol_3(buffer, (offset + (i_1 * 128u)));
+      arr[i_1] = u_load_1((offset + (i_1 * 128u)));
     }
   }
   return arr;
@@ -47,14 +47,14 @@ void f_inner(uint local_invocation_index) {
   {
     for(uint idx = local_invocation_index; (idx < 4u); idx = (idx + 1u)) {
       const uint i = idx;
-      const S tint_symbol_7 = (S)0;
-      w[i] = tint_symbol_7;
+      const S tint_symbol_2 = (S)0;
+      w[i] = tint_symbol_2;
     }
   }
   GroupMemoryBarrierWithGroupSync();
-  w = tint_symbol_2(u, 0u);
-  w[1] = tint_symbol_3(u, 256u);
-  w[3].m = tint_symbol_5(u, 260u);
+  w = u_load(0u);
+  w[1] = u_load_1(256u);
+  w[3].m = u_load_3(260u);
   uint ubo_load_3 = u[0].z;
   w[1].m[0] = vector<float16_t, 2>(float16_t(f16tof32(ubo_load_3 & 0xFFFF)), float16_t(f16tof32(ubo_load_3 >> 16))).yx;
 }
@@ -64,6 +64,3 @@ void f(tint_symbol_1 tint_symbol) {
   f_inner(tint_symbol.local_invocation_index);
   return;
 }
-FXC validation failure:
-D:\Projects\RampUp\dawn\test\tint\buffer\Shader@0x00000194753403B0(3,10-18): error X3000: syntax error: unexpected token 'float16_t'
-

test/tint/buffer/uniform/std140/struct/mat3x3_f16/dynamic_index_via_ptr.wgsl.expected.fxc.hlsl

@@ -17,52 +17,52 @@ int i() {
   return counter;
 }
 
-matrix<float16_t, 3, 3> tint_symbol_8(uint4 buffer[64], uint offset) {
+matrix<float16_t, 3, 3> a_load_4(uint offset) {
   const uint scalar_offset = ((offset + 0u)) / 4;
-  uint4 ubo_load_1 = buffer[scalar_offset / 4];
+  uint4 ubo_load_1 = a[scalar_offset / 4];
   uint2 ubo_load = ((scalar_offset & 2) ? ubo_load_1.zw : ubo_load_1.xy);
   vector<float16_t, 2> ubo_load_xz = vector<float16_t, 2>(f16tof32(ubo_load & 0xFFFF));
   float16_t ubo_load_y = f16tof32(ubo_load[0] >> 16);
   const uint scalar_offset_1 = ((offset + 8u)) / 4;
-  uint4 ubo_load_3 = buffer[scalar_offset_1 / 4];
+  uint4 ubo_load_3 = a[scalar_offset_1 / 4];
   uint2 ubo_load_2 = ((scalar_offset_1 & 2) ? ubo_load_3.zw : ubo_load_3.xy);
   vector<float16_t, 2> ubo_load_2_xz = vector<float16_t, 2>(f16tof32(ubo_load_2 & 0xFFFF));
   float16_t ubo_load_2_y = f16tof32(ubo_load_2[0] >> 16);
   const uint scalar_offset_2 = ((offset + 16u)) / 4;
-  uint4 ubo_load_5 = buffer[scalar_offset_2 / 4];
+  uint4 ubo_load_5 = a[scalar_offset_2 / 4];
   uint2 ubo_load_4 = ((scalar_offset_2 & 2) ? ubo_load_5.zw : ubo_load_5.xy);
   vector<float16_t, 2> ubo_load_4_xz = vector<float16_t, 2>(f16tof32(ubo_load_4 & 0xFFFF));
   float16_t ubo_load_4_y = f16tof32(ubo_load_4[0] >> 16);
   return matrix<float16_t, 3, 3>(vector<float16_t, 3>(ubo_load_xz[0], ubo_load_y, ubo_load_xz[1]), vector<float16_t, 3>(ubo_load_2_xz[0], ubo_load_2_y, ubo_load_2_xz[1]), vector<float16_t, 3>(ubo_load_4_xz[0], ubo_load_4_y, ubo_load_4_xz[1]));
 }
 
-Inner tint_symbol_7(uint4 buffer[64], uint offset) {
-  const Inner tint_symbol_11 = {tint_symbol_8(buffer, (offset + 0u))};
-  return tint_symbol_11;
+Inner a_load_3(uint offset) {
+  const Inner tint_symbol_4 = {a_load_4((offset + 0u))};
+  return tint_symbol_4;
 }
 
-typedef Inner tint_symbol_6_ret[4];
-tint_symbol_6_ret tint_symbol_6(uint4 buffer[64], uint offset) {
+typedef Inner a_load_2_ret[4];
+a_load_2_ret a_load_2(uint offset) {
   Inner arr[4] = (Inner[4])0;
   {
     for(uint i_1 = 0u; (i_1 < 4u); i_1 = (i_1 + 1u)) {
-      arr[i_1] = tint_symbol_7(buffer, (offset + (i_1 * 64u)));
+      arr[i_1] = a_load_3((offset + (i_1 * 64u)));
     }
   }
   return arr;
 }
 
-Outer tint_symbol_5(uint4 buffer[64], uint offset) {
-  const Outer tint_symbol_12 = {tint_symbol_6(buffer, (offset + 0u))};
-  return tint_symbol_12;
+Outer a_load_1(uint offset) {
+  const Outer tint_symbol_5 = {a_load_2((offset + 0u))};
+  return tint_symbol_5;
 }
 
-typedef Outer tint_symbol_4_ret[4];
-tint_symbol_4_ret tint_symbol_4(uint4 buffer[64], uint offset) {
+typedef Outer a_load_ret[4];
+a_load_ret a_load(uint offset) {
   Outer arr_1[4] = (Outer[4])0;
   {
     for(uint i_2 = 0u; (i_2 < 4u); i_2 = (i_2 + 1u)) {
-      arr_1[i_2] = tint_symbol_5(buffer, (offset + (i_2 * 256u)));
+      arr_1[i_2] = a_load_1((offset + (i_2 * 256u)));
     }
   }
   return arr_1;
@@ -73,11 +73,11 @@ void f() {
   const int p_a_i_save = i();
   const int p_a_i_a_i_save = i();
   const int p_a_i_a_i_m_i_save = i();
-  const Outer l_a[4] = tint_symbol_4(a, 0u);
-  const Outer l_a_i = tint_symbol_5(a, (256u * uint(p_a_i_save)));
-  const Inner l_a_i_a[4] = tint_symbol_6(a, (256u * uint(p_a_i_save)));
-  const Inner l_a_i_a_i = tint_symbol_7(a, ((256u * uint(p_a_i_save)) + (64u * uint(p_a_i_a_i_save))));
-  const matrix<float16_t, 3, 3> l_a_i_a_i_m = tint_symbol_8(a, ((256u * uint(p_a_i_save)) + (64u * uint(p_a_i_a_i_save))));
+  const Outer l_a[4] = a_load(0u);
+  const Outer l_a_i = a_load_1((256u * uint(p_a_i_save)));
+  const Inner l_a_i_a[4] = a_load_2((256u * uint(p_a_i_save)));
+  const Inner l_a_i_a_i = a_load_3(((256u * uint(p_a_i_save)) + (64u * uint(p_a_i_a_i_save))));
+  const matrix<float16_t, 3, 3> l_a_i_a_i_m = a_load_4(((256u * uint(p_a_i_save)) + (64u * uint(p_a_i_a_i_save))));
   const uint scalar_offset_3 = ((((256u * uint(p_a_i_save)) + (64u * uint(p_a_i_a_i_save))) + (8u * uint(p_a_i_a_i_m_i_save)))) / 4;
   uint4 ubo_load_7 = a[scalar_offset_3 / 4];
   uint2 ubo_load_6 = ((scalar_offset_3 & 2) ? ubo_load_7.zw : ubo_load_7.xy);
@@ -93,6 +93,3 @@ void f() {
   const float16_t l_a_i_a_i_m_i_i = float16_t(f16tof32(((a[scalar_offset_index / 4][scalar_offset_index % 4] >> (scalar_offset_bytes % 4 == 0 ? 0 : 16)) & 0xFFFF)));
   return;
 }
-FXC validation failure:
-D:\Projects\RampUp\dawn\test\tint\buffer\Shader@0x000001CC9AE84850(2,10-18): error X3000: syntax error: unexpected token 'float16_t'
-

test/tint/buffer/uniform/std140/struct/mat3x3_f16/static_index_via_ptr.wgsl.expected.fxc.hlsl

@@ -11,52 +11,52 @@ cbuffer cbuffer_a : register(b0, space0) {
   uint4 a[64];
 };
 
-matrix<float16_t, 3, 3> tint_symbol_4(uint4 buffer[64], uint offset) {
+matrix<float16_t, 3, 3> a_load_4(uint offset) {
   const uint scalar_offset = ((offset + 0u)) / 4;
-  uint4 ubo_load_1 = buffer[scalar_offset / 4];
+  uint4 ubo_load_1 = a[scalar_offset / 4];
   uint2 ubo_load = ((scalar_offset & 2) ? ubo_load_1.zw : ubo_load_1.xy);
   vector<float16_t, 2> ubo_load_xz = vector<float16_t, 2>(f16tof32(ubo_load & 0xFFFF));
   float16_t ubo_load_y = f16tof32(ubo_load[0] >> 16);
   const uint scalar_offset_1 = ((offset + 8u)) / 4;
-  uint4 ubo_load_3 = buffer[scalar_offset_1 / 4];
+  uint4 ubo_load_3 = a[scalar_offset_1 / 4];
   uint2 ubo_load_2 = ((scalar_offset_1 & 2) ? ubo_load_3.zw : ubo_load_3.xy);
   vector<float16_t, 2> ubo_load_2_xz = vector<float16_t, 2>(f16tof32(ubo_load_2 & 0xFFFF));
   float16_t ubo_load_2_y = f16tof32(ubo_load_2[0] >> 16);
   const uint scalar_offset_2 = ((offset + 16u)) / 4;
-  uint4 ubo_load_5 = buffer[scalar_offset_2 / 4];
+  uint4 ubo_load_5 = a[scalar_offset_2 / 4];
   uint2 ubo_load_4 = ((scalar_offset_2 & 2) ? ubo_load_5.zw : ubo_load_5.xy);
   vector<float16_t, 2> ubo_load_4_xz = vector<float16_t, 2>(f16tof32(ubo_load_4 & 0xFFFF));
   float16_t ubo_load_4_y = f16tof32(ubo_load_4[0] >> 16);
   return matrix<float16_t, 3, 3>(vector<float16_t, 3>(ubo_load_xz[0], ubo_load_y, ubo_load_xz[1]), vector<float16_t, 3>(ubo_load_2_xz[0], ubo_load_2_y, ubo_load_2_xz[1]), vector<float16_t, 3>(ubo_load_4_xz[0], ubo_load_4_y, ubo_load_4_xz[1]));
 }
 
-Inner tint_symbol_3(uint4 buffer[64], uint offset) {
-  const Inner tint_symbol_7 = {tint_symbol_4(buffer, (offset + 0u))};
-  return tint_symbol_7;
+Inner a_load_3(uint offset) {
+  const Inner tint_symbol = {a_load_4((offset + 0u))};
+  return tint_symbol;
 }
 
-typedef Inner tint_symbol_2_ret[4];
-tint_symbol_2_ret tint_symbol_2(uint4 buffer[64], uint offset) {
+typedef Inner a_load_2_ret[4];
+a_load_2_ret a_load_2(uint offset) {
   Inner arr[4] = (Inner[4])0;
   {
     for(uint i = 0u; (i < 4u); i = (i + 1u)) {
-      arr[i] = tint_symbol_3(buffer, (offset + (i * 64u)));
+      arr[i] = a_load_3((offset + (i * 64u)));
     }
   }
   return arr;
 }
 
-Outer tint_symbol_1(uint4 buffer[64], uint offset) {
-  const Outer tint_symbol_8 = {tint_symbol_2(buffer, (offset + 0u))};
-  return tint_symbol_8;
+Outer a_load_1(uint offset) {
+  const Outer tint_symbol_1 = {a_load_2((offset + 0u))};
+  return tint_symbol_1;
 }
 
-typedef Outer tint_symbol_ret[4];
-tint_symbol_ret tint_symbol(uint4 buffer[64], uint offset) {
+typedef Outer a_load_ret[4];
+a_load_ret a_load(uint offset) {
   Outer arr_1[4] = (Outer[4])0;
   {
     for(uint i_1 = 0u; (i_1 < 4u); i_1 = (i_1 + 1u)) {
-      arr_1[i_1] = tint_symbol_1(buffer, (offset + (i_1 * 256u)));
+      arr_1[i_1] = a_load_1((offset + (i_1 * 256u)));
     }
   }
   return arr_1;
@@ -64,11 +64,11 @@ tint_symbol_ret tint_symbol(uint4 buffer[64], uint offset) {
 
 [numthreads(1, 1, 1)]
 void f() {
-  const Outer l_a[4] = tint_symbol(a, 0u);
-  const Outer l_a_3 = tint_symbol_1(a, 768u);
-  const Inner l_a_3_a[4] = tint_symbol_2(a, 768u);
-  const Inner l_a_3_a_2 = tint_symbol_3(a, 896u);
-  const matrix<float16_t, 3, 3> l_a_3_a_2_m = tint_symbol_4(a, 896u);
+  const Outer l_a[4] = a_load(0u);
+  const Outer l_a_3 = a_load_1(768u);
+  const Inner l_a_3_a[4] = a_load_2(768u);
+  const Inner l_a_3_a_2 = a_load_3(896u);
+  const matrix<float16_t, 3, 3> l_a_3_a_2_m = a_load_4(896u);
   uint2 ubo_load_6 = a[56].zw;
   vector<float16_t, 2> ubo_load_6_xz = vector<float16_t, 2>(f16tof32(ubo_load_6 & 0xFFFF));
   float16_t ubo_load_6_y = f16tof32(ubo_load_6[0] >> 16);
@@ -76,6 +76,3 @@ void f() {
   const float16_t l_a_3_a_2_m_1_0 = float16_t(f16tof32(((a[56].z) & 0xFFFF)));
   return;
 }
-FXC validation failure:
-D:\Projects\RampUp\dawn\test\tint\buffer\Shader@0x0000021CC01A0970(2,10-18): error X3000: syntax error: unexpected token 'float16_t'
-

test/tint/buffer/uniform/std140/struct/mat3x3_f16/to_builtin.wgsl.expected.fxc.hlsl

@@ -4,19 +4,19 @@ cbuffer cbuffer_u : register(b0, space0) {
   uint4 u[32];
 };
 
-matrix<float16_t, 3, 3> tint_symbol(uint4 buffer[32], uint offset) {
+matrix<float16_t, 3, 3> u_load(uint offset) {
   const uint scalar_offset = ((offset + 0u)) / 4;
-  uint4 ubo_load_1 = buffer[scalar_offset / 4];
+  uint4 ubo_load_1 = u[scalar_offset / 4];
   uint2 ubo_load = ((scalar_offset & 2) ? ubo_load_1.zw : ubo_load_1.xy);
   vector<float16_t, 2> ubo_load_xz = vector<float16_t, 2>(f16tof32(ubo_load & 0xFFFF));
   float16_t ubo_load_y = f16tof32(ubo_load[0] >> 16);
   const uint scalar_offset_1 = ((offset + 8u)) / 4;
-  uint4 ubo_load_3 = buffer[scalar_offset_1 / 4];
+  uint4 ubo_load_3 = u[scalar_offset_1 / 4];
   uint2 ubo_load_2 = ((scalar_offset_1 & 2) ? ubo_load_3.zw : ubo_load_3.xy);
   vector<float16_t, 2> ubo_load_2_xz = vector<float16_t, 2>(f16tof32(ubo_load_2 & 0xFFFF));
   float16_t ubo_load_2_y = f16tof32(ubo_load_2[0] >> 16);
   const uint scalar_offset_2 = ((offset + 16u)) / 4;
-  uint4 ubo_load_5 = buffer[scalar_offset_2 / 4];
+  uint4 ubo_load_5 = u[scalar_offset_2 / 4];
   uint2 ubo_load_4 = ((scalar_offset_2 & 2) ? ubo_load_5.zw : ubo_load_5.xy);
   vector<float16_t, 2> ubo_load_4_xz = vector<float16_t, 2>(f16tof32(ubo_load_4 & 0xFFFF));
   float16_t ubo_load_4_y = f16tof32(ubo_load_4[0] >> 16);
@@ -25,7 +25,7 @@ matrix<float16_t, 3, 3> tint_symbol(uint4 buffer[32], uint offset) {
 
 [numthreads(1, 1, 1)]
 void f() {
-  const matrix<float16_t, 3, 3> t = transpose(tint_symbol(u, 264u));
+  const matrix<float16_t, 3, 3> t = transpose(u_load(264u));
   uint2 ubo_load_6 = u[1].xy;
   vector<float16_t, 2> ubo_load_6_xz = vector<float16_t, 2>(f16tof32(ubo_load_6 & 0xFFFF));
   float16_t ubo_load_6_y = f16tof32(ubo_load_6[0] >> 16);
@@ -36,6 +36,3 @@ void f() {
   const float16_t a = abs(vector<float16_t, 3>(ubo_load_7_xz[0], ubo_load_7_y, ubo_load_7_xz[1]).zxy.x);
   return;
 }
-FXC validation failure:
-D:\Projects\RampUp\dawn\test\tint\buffer\Shader@0x000001BFA9E0F690(5,8-16): error X3000: syntax error: unexpected token 'float16_t'
-

test/tint/buffer/uniform/std140/struct/mat3x3_f16/to_fn.wgsl.expected.fxc.hlsl

@@ -25,38 +25,38 @@ void d(vector<float16_t, 3> v) {
 void e(float16_t f_1) {
 }
 
-matrix<float16_t, 3, 3> tint_symbol_3(uint4 buffer[32], uint offset) {
+matrix<float16_t, 3, 3> u_load_3(uint offset) {
   const uint scalar_offset = ((offset + 0u)) / 4;
-  uint4 ubo_load_1 = buffer[scalar_offset / 4];
+  uint4 ubo_load_1 = u[scalar_offset / 4];
   uint2 ubo_load = ((scalar_offset & 2) ? ubo_load_1.zw : ubo_load_1.xy);
   vector<float16_t, 2> ubo_load_xz = vector<float16_t, 2>(f16tof32(ubo_load & 0xFFFF));
   float16_t ubo_load_y = f16tof32(ubo_load[0] >> 16);
   const uint scalar_offset_1 = ((offset + 8u)) / 4;
-  uint4 ubo_load_3 = buffer[scalar_offset_1 / 4];
+  uint4 ubo_load_3 = u[scalar_offset_1 / 4];
   uint2 ubo_load_2 = ((scalar_offset_1 & 2) ? ubo_load_3.zw : ubo_load_3.xy);
   vector<float16_t, 2> ubo_load_2_xz = vector<float16_t, 2>(f16tof32(ubo_load_2 & 0xFFFF));
   float16_t ubo_load_2_y = f16tof32(ubo_load_2[0] >> 16);
   const uint scalar_offset_2 = ((offset + 16u)) / 4;
-  uint4 ubo_load_5 = buffer[scalar_offset_2 / 4];
+  uint4 ubo_load_5 = u[scalar_offset_2 / 4];
   uint2 ubo_load_4 = ((scalar_offset_2 & 2) ? ubo_load_5.zw : ubo_load_5.xy);
   vector<float16_t, 2> ubo_load_4_xz = vector<float16_t, 2>(f16tof32(ubo_load_4 & 0xFFFF));
   float16_t ubo_load_4_y = f16tof32(ubo_load_4[0] >> 16);
   return matrix<float16_t, 3, 3>(vector<float16_t, 3>(ubo_load_xz[0], ubo_load_y, ubo_load_xz[1]), vector<float16_t, 3>(ubo_load_2_xz[0], ubo_load_2_y, ubo_load_2_xz[1]), vector<float16_t, 3>(ubo_load_4_xz[0], ubo_load_4_y, ubo_load_4_xz[1]));
 }
 
-S tint_symbol_1(uint4 buffer[32], uint offset) {
+S u_load_1(uint offset) {
   const uint scalar_offset_3 = ((offset + 0u)) / 4;
   const uint scalar_offset_4 = ((offset + 64u)) / 4;
-  const S tint_symbol_5 = {asint(buffer[scalar_offset_3 / 4][scalar_offset_3 % 4]), tint_symbol_3(buffer, (offset + 8u)), asint(buffer[scalar_offset_4 / 4][scalar_offset_4 % 4])};
-  return tint_symbol_5;
+  const S tint_symbol = {asint(u[scalar_offset_3 / 4][scalar_offset_3 % 4]), u_load_3((offset + 8u)), asint(u[scalar_offset_4 / 4][scalar_offset_4 % 4])};
+  return tint_symbol;
 }
 
-typedef S tint_symbol_ret[4];
-tint_symbol_ret tint_symbol(uint4 buffer[32], uint offset) {
+typedef S u_load_ret[4];
+u_load_ret u_load(uint offset) {
   S arr[4] = (S[4])0;
   {
     for(uint i = 0u; (i < 4u); i = (i + 1u)) {
-      arr[i] = tint_symbol_1(buffer, (offset + (i * 128u)));
+      arr[i] = u_load_1((offset + (i * 128u)));
     }
   }
   return arr;
@@ -64,9 +64,9 @@ tint_symbol_ret tint_symbol(uint4 buffer[32], uint offset) {
 
 [numthreads(1, 1, 1)]
 void f() {
-  a(tint_symbol(u, 0u));
-  b(tint_symbol_1(u, 256u));
-  c(tint_symbol_3(u, 264u));
+  a(u_load(0u));
+  b(u_load_1(256u));
+  c(u_load_3(264u));
   uint2 ubo_load_6 = u[1].xy;
   vector<float16_t, 2> ubo_load_6_xz = vector<float16_t, 2>(f16tof32(ubo_load_6 & 0xFFFF));
   float16_t ubo_load_6_y = f16tof32(ubo_load_6[0] >> 16);
@@ -77,6 +77,3 @@ void f() {
   e(vector<float16_t, 3>(ubo_load_7_xz[0], ubo_load_7_y, ubo_load_7_xz[1]).zxy.x);
   return;
 }
-FXC validation failure:
-D:\Projects\RampUp\dawn\test\tint\buffer\Shader@0x000001A1CC720100(3,10-18): error X3000: syntax error: unexpected token 'float16_t'
-

test/tint/buffer/uniform/std140/struct/mat3x3_f16/to_private.wgsl.expected.fxc.hlsl

@@ -11,38 +11,38 @@ cbuffer cbuffer_u : register(b0, space0) {
 };
 static S p[4] = (S[4])0;
 
-matrix<float16_t, 3, 3> tint_symbol_3(uint4 buffer[32], uint offset) {
+matrix<float16_t, 3, 3> u_load_3(uint offset) {
   const uint scalar_offset = ((offset + 0u)) / 4;
-  uint4 ubo_load_1 = buffer[scalar_offset / 4];
+  uint4 ubo_load_1 = u[scalar_offset / 4];
   uint2 ubo_load = ((scalar_offset & 2) ? ubo_load_1.zw : ubo_load_1.xy);
   vector<float16_t, 2> ubo_load_xz = vector<float16_t, 2>(f16tof32(ubo_load & 0xFFFF));
   float16_t ubo_load_y = f16tof32(ubo_load[0] >> 16);
   const uint scalar_offset_1 = ((offset + 8u)) / 4;
-  uint4 ubo_load_3 = buffer[scalar_offset_1 / 4];
+  uint4 ubo_load_3 = u[scalar_offset_1 / 4];
   uint2 ubo_load_2 = ((scalar_offset_1 & 2) ? ubo_load_3.zw : ubo_load_3.xy);
   vector<float16_t, 2> ubo_load_2_xz = vector<float16_t, 2>(f16tof32(ubo_load_2 & 0xFFFF));
   float16_t ubo_load_2_y = f16tof32(ubo_load_2[0] >> 16);
   const uint scalar_offset_2 = ((offset + 16u)) / 4;
-  uint4 ubo_load_5 = buffer[scalar_offset_2 / 4];
+  uint4 ubo_load_5 = u[scalar_offset_2 / 4];
   uint2 ubo_load_4 = ((scalar_offset_2 & 2) ? ubo_load_5.zw : ubo_load_5.xy);
   vector<float16_t, 2> ubo_load_4_xz = vector<float16_t, 2>(f16tof32(ubo_load_4 & 0xFFFF));
   float16_t ubo_load_4_y = f16tof32(ubo_load_4[0] >> 16);
   return matrix<float16_t, 3, 3>(vector<float16_t, 3>(ubo_load_xz[0], ubo_load_y, ubo_load_xz[1]), vector<float16_t, 3>(ubo_load_2_xz[0], ubo_load_2_y, ubo_load_2_xz[1]), vector<float16_t, 3>(ubo_load_4_xz[0], ubo_load_4_y, ubo_load_4_xz[1]));
 }
 
-S tint_symbol_1(uint4 buffer[32], uint offset) {
+S u_load_1(uint offset) {
   const uint scalar_offset_3 = ((offset + 0u)) / 4;
   const uint scalar_offset_4 = ((offset + 64u)) / 4;
-  const S tint_symbol_5 = {asint(buffer[scalar_offset_3 / 4][scalar_offset_3 % 4]), tint_symbol_3(buffer, (offset + 8u)), asint(buffer[scalar_offset_4 / 4][scalar_offset_4 % 4])};
-  return tint_symbol_5;
+  const S tint_symbol = {asint(u[scalar_offset_3 / 4][scalar_offset_3 % 4]), u_load_3((offset + 8u)), asint(u[scalar_offset_4 / 4][scalar_offset_4 % 4])};
+  return tint_symbol;
 }
 
-typedef S tint_symbol_ret[4];
-tint_symbol_ret tint_symbol(uint4 buffer[32], uint offset) {
+typedef S u_load_ret[4];
+u_load_ret u_load(uint offset) {
   S arr[4] = (S[4])0;
   {
     for(uint i = 0u; (i < 4u); i = (i + 1u)) {
-      arr[i] = tint_symbol_1(buffer, (offset + (i * 128u)));
+      arr[i] = u_load_1((offset + (i * 128u)));
     }
   }
   return arr;
@@ -50,15 +50,12 @@ tint_symbol_ret tint_symbol(uint4 buffer[32], uint offset) {
 
 [numthreads(1, 1, 1)]
 void f() {
-  p = tint_symbol(u, 0u);
-  p[1] = tint_symbol_1(u, 256u);
-  p[3].m = tint_symbol_3(u, 264u);
+  p = u_load(0u);
+  p[1] = u_load_1(256u);
+  p[3].m = u_load_3(264u);
   uint2 ubo_load_6 = u[1].xy;
   vector<float16_t, 2> ubo_load_6_xz = vector<float16_t, 2>(f16tof32(ubo_load_6 & 0xFFFF));
   float16_t ubo_load_6_y = f16tof32(ubo_load_6[0] >> 16);
   p[1].m[0] = vector<float16_t, 3>(ubo_load_6_xz[0], ubo_load_6_y, ubo_load_6_xz[1]).zxy;
   return;
 }
-FXC validation failure:
-D:\Projects\RampUp\dawn\test\tint\buffer\Shader@0x0000025A3E276990(3,10-18): error X3000: syntax error: unexpected token 'float16_t'
-

test/tint/buffer/uniform/std140/struct/mat3x3_f16/to_storage.wgsl.expected.fxc.hlsl

@@ -11,59 +11,59 @@ cbuffer cbuffer_u : register(b0, space0) {
 };
 RWByteAddressBuffer s : register(u1, space0);
 
-void tint_symbol_3(RWByteAddressBuffer buffer, uint offset, matrix<float16_t, 3, 3> value) {
-  buffer.Store<vector<float16_t, 3> >((offset + 0u), value[0u]);
-  buffer.Store<vector<float16_t, 3> >((offset + 8u), value[1u]);
-  buffer.Store<vector<float16_t, 3> >((offset + 16u), value[2u]);
+void s_store_3(uint offset, matrix<float16_t, 3, 3> value) {
+  s.Store<vector<float16_t, 3> >((offset + 0u), value[0u]);
+  s.Store<vector<float16_t, 3> >((offset + 8u), value[1u]);
+  s.Store<vector<float16_t, 3> >((offset + 16u), value[2u]);
 }
 
-void tint_symbol_1(RWByteAddressBuffer buffer, uint offset, S value) {
-  buffer.Store((offset + 0u), asuint(value.before));
-  tint_symbol_3(buffer, (offset + 8u), value.m);
-  buffer.Store((offset + 64u), asuint(value.after));
+void s_store_1(uint offset, S value) {
+  s.Store((offset + 0u), asuint(value.before));
+  s_store_3((offset + 8u), value.m);
+  s.Store((offset + 64u), asuint(value.after));
 }
 
-void tint_symbol(RWByteAddressBuffer buffer, uint offset, S value[4]) {
-  S array[4] = value;
+void s_store(uint offset, S value[4]) {
+  S array_1[4] = value;
   {
     for(uint i = 0u; (i < 4u); i = (i + 1u)) {
-      tint_symbol_1(buffer, (offset + (i * 128u)), array[i]);
+      s_store_1((offset + (i * 128u)), array_1[i]);
     }
   }
 }
 
-matrix<float16_t, 3, 3> tint_symbol_8(uint4 buffer[32], uint offset) {
+matrix<float16_t, 3, 3> u_load_3(uint offset) {
   const uint scalar_offset = ((offset + 0u)) / 4;
-  uint4 ubo_load_1 = buffer[scalar_offset / 4];
+  uint4 ubo_load_1 = u[scalar_offset / 4];
   uint2 ubo_load = ((scalar_offset & 2) ? ubo_load_1.zw : ubo_load_1.xy);
   vector<float16_t, 2> ubo_load_xz = vector<float16_t, 2>(f16tof32(ubo_load & 0xFFFF));
   float16_t ubo_load_y = f16tof32(ubo_load[0] >> 16);
   const uint scalar_offset_1 = ((offset + 8u)) / 4;
-  uint4 ubo_load_3 = buffer[scalar_offset_1 / 4];
+  uint4 ubo_load_3 = u[scalar_offset_1 / 4];
   uint2 ubo_load_2 = ((scalar_offset_1 & 2) ? ubo_load_3.zw : ubo_load_3.xy);
   vector<float16_t, 2> ubo_load_2_xz = vector<float16_t, 2>(f16tof32(ubo_load_2 & 0xFFFF));
   float16_t ubo_load_2_y = f16tof32(ubo_load_2[0] >> 16);
   const uint scalar_offset_2 = ((offset + 16u)) / 4;
-  uint4 ubo_load_5 = buffer[scalar_offset_2 / 4];
+  uint4 ubo_load_5 = u[scalar_offset_2 / 4];
   uint2 ubo_load_4 = ((scalar_offset_2 & 2) ? ubo_load_5.zw : ubo_load_5.xy);
   vector<float16_t, 2> ubo_load_4_xz = vector<float16_t, 2>(f16tof32(ubo_load_4 & 0xFFFF));
   float16_t ubo_load_4_y = f16tof32(ubo_load_4[0] >> 16);
   return matrix<float16_t, 3, 3>(vector<float16_t, 3>(ubo_load_xz[0], ubo_load_y, ubo_load_xz[1]), vector<float16_t, 3>(ubo_load_2_xz[0], ubo_load_2_y, ubo_load_2_xz[1]), vector<float16_t, 3>(ubo_load_4_xz[0], ubo_load_4_y, ubo_load_4_xz[1]));
 }
 
-S tint_symbol_6(uint4 buffer[32], uint offset) {
+S u_load_1(uint offset) {
   const uint scalar_offset_3 = ((offset + 0u)) / 4;
   const uint scalar_offset_4 = ((offset + 64u)) / 4;
-  const S tint_symbol_10 = {asint(buffer[scalar_offset_3 / 4][scalar_offset_3 % 4]), tint_symbol_8(buffer, (offset + 8u)), asint(buffer[scalar_offset_4 / 4][scalar_offset_4 % 4])};
-  return tint_symbol_10;
+  const S tint_symbol = {asint(u[scalar_offset_3 / 4][scalar_offset_3 % 4]), u_load_3((offset + 8u)), asint(u[scalar_offset_4 / 4][scalar_offset_4 % 4])};
+  return tint_symbol;
 }
 
-typedef S tint_symbol_5_ret[4];
-tint_symbol_5_ret tint_symbol_5(uint4 buffer[32], uint offset) {
+typedef S u_load_ret[4];
+u_load_ret u_load(uint offset) {
   S arr[4] = (S[4])0;
   {
     for(uint i_1 = 0u; (i_1 < 4u); i_1 = (i_1 + 1u)) {
-      arr[i_1] = tint_symbol_6(buffer, (offset + (i_1 * 128u)));
+      arr[i_1] = u_load_1((offset + (i_1 * 128u)));
     }
   }
   return arr;
@@ -71,15 +71,12 @@ tint_symbol_5_ret tint_symbol_5(uint4 buffer[32], uint offset) {
 
 [numthreads(1, 1, 1)]
 void f() {
-  tint_symbol(s, 0u, tint_symbol_5(u, 0u));
-  tint_symbol_1(s, 128u, tint_symbol_6(u, 256u));
-  tint_symbol_3(s, 392u, tint_symbol_8(u, 264u));
+  s_store(0u, u_load(0u));
+  s_store_1(128u, u_load_1(256u));
+  s_store_3(392u, u_load_3(264u));
   uint2 ubo_load_6 = u[1].xy;
   vector<float16_t, 2> ubo_load_6_xz = vector<float16_t, 2>(f16tof32(ubo_load_6 & 0xFFFF));
   float16_t ubo_load_6_y = f16tof32(ubo_load_6[0] >> 16);
   s.Store<vector<float16_t, 3> >(136u, vector<float16_t, 3>(ubo_load_6_xz[0], ubo_load_6_y, ubo_load_6_xz[1]).zxy);
   return;
 }
-FXC validation failure:
-D:\Projects\RampUp\dawn\test\tint\buffer\Shader@0x000001D5F9C4A510(3,10-18): error X3000: syntax error: unexpected token 'float16_t'
-

test/tint/buffer/uniform/std140/struct/mat3x3_f16/to_workgroup.wgsl.expected.fxc.hlsl

@@ -15,38 +15,38 @@ struct tint_symbol_1 {
   uint local_invocation_index : SV_GroupIndex;
 };
 
-matrix<float16_t, 3, 3> tint_symbol_5(uint4 buffer[32], uint offset) {
+matrix<float16_t, 3, 3> u_load_3(uint offset) {
   const uint scalar_offset = ((offset + 0u)) / 4;
-  uint4 ubo_load_1 = buffer[scalar_offset / 4];
+  uint4 ubo_load_1 = u[scalar_offset / 4];
   uint2 ubo_load = ((scalar_offset & 2) ? ubo_load_1.zw : ubo_load_1.xy);
   vector<float16_t, 2> ubo_load_xz = vector<float16_t, 2>(f16tof32(ubo_load & 0xFFFF));
   float16_t ubo_load_y = f16tof32(ubo_load[0] >> 16);
   const uint scalar_offset_1 = ((offset + 8u)) / 4;
-  uint4 ubo_load_3 = buffer[scalar_offset_1 / 4];
+  uint4 ubo_load_3 = u[scalar_offset_1 / 4];
   uint2 ubo_load_2 = ((scalar_offset_1 & 2) ? ubo_load_3.zw : ubo_load_3.xy);
   vector<float16_t, 2> ubo_load_2_xz = vector<float16_t, 2>(f16tof32(ubo_load_2 & 0xFFFF));
   float16_t ubo_load_2_y = f16tof32(ubo_load_2[0] >> 16);
   const uint scalar_offset_2 = ((offset + 16u)) / 4;
-  uint4 ubo_load_5 = buffer[scalar_offset_2 / 4];
+  uint4 ubo_load_5 = u[scalar_offset_2 / 4];
   uint2 ubo_load_4 = ((scalar_offset_2 & 2) ? ubo_load_5.zw : ubo_load_5.xy);
   vector<float16_t, 2> ubo_load_4_xz = vector<float16_t, 2>(f16tof32(ubo_load_4 & 0xFFFF));
   float16_t ubo_load_4_y = f16tof32(ubo_load_4[0] >> 16);
   return matrix<float16_t, 3, 3>(vector<float16_t, 3>(ubo_load_xz[0], ubo_load_y, ubo_load_xz[1]), vector<float16_t, 3>(ubo_load_2_xz[0], ubo_load_2_y, ubo_load_2_xz[1]), vector<float16_t, 3>(ubo_load_4_xz[0], ubo_load_4_y, ubo_load_4_xz[1]));
 }
 
-S tint_symbol_3(uint4 buffer[32], uint offset) {
+S u_load_1(uint offset) {
   const uint scalar_offset_3 = ((offset + 0u)) / 4;
   const uint scalar_offset_4 = ((offset + 64u)) / 4;
-  const S tint_symbol_8 = {asint(buffer[scalar_offset_3 / 4][scalar_offset_3 % 4]), tint_symbol_5(buffer, (offset + 8u)), asint(buffer[scalar_offset_4 / 4][scalar_offset_4 % 4])};
-  return tint_symbol_8;
+  const S tint_symbol_3 = {asint(u[scalar_offset_3 / 4][scalar_offset_3 % 4]), u_load_3((offset + 8u)), asint(u[scalar_offset_4 / 4][scalar_offset_4 % 4])};
+  return tint_symbol_3;
 }
 
-typedef S tint_symbol_2_ret[4];
-tint_symbol_2_ret tint_symbol_2(uint4 buffer[32], uint offset) {
+typedef S u_load_ret[4];
+u_load_ret u_load(uint offset) {
   S arr[4] = (S[4])0;
   {
     for(uint i_1 = 0u; (i_1 < 4u); i_1 = (i_1 + 1u)) {
-      arr[i_1] = tint_symbol_3(buffer, (offset + (i_1 * 128u)));
+      arr[i_1] = u_load_1((offset + (i_1 * 128u)));
     }
   }
   return arr;
@@ -56,14 +56,14 @@ void f_inner(uint local_invocation_index) {
   {
     for(uint idx = local_invocation_index; (idx < 4u); idx = (idx + 1u)) {
       const uint i = idx;
-      const S tint_symbol_7 = (S)0;
-      w[i] = tint_symbol_7;
+      const S tint_symbol_2 = (S)0;
+      w[i] = tint_symbol_2;
     }
   }
   GroupMemoryBarrierWithGroupSync();
-  w = tint_symbol_2(u, 0u);
-  w[1] = tint_symbol_3(u, 256u);
-  w[3].m = tint_symbol_5(u, 264u);
+  w = u_load(0u);
+  w[1] = u_load_1(256u);
+  w[3].m = u_load_3(264u);
   uint2 ubo_load_6 = u[1].xy;
   vector<float16_t, 2> ubo_load_6_xz = vector<float16_t, 2>(f16tof32(ubo_load_6 & 0xFFFF));
   float16_t ubo_load_6_y = f16tof32(ubo_load_6[0] >> 16);
@@ -75,6 +75,3 @@ void f(tint_symbol_1 tint_symbol) {
   f_inner(tint_symbol.local_invocation_index);
   return;
 }
-FXC validation failure:
-D:\Projects\RampUp\dawn\test\tint\buffer\Shader@0x0000021282D17B60(3,10-18): error X3000: syntax error: unexpected token 'float16_t'
-

test/tint/buffer/uniform/std140/struct/mat3x4_f16/dynamic_index_via_ptr.wgsl.expected.fxc.hlsl

@@ -17,52 +17,52 @@ int i() {
   return counter;
 }
 
-matrix<float16_t, 3, 4> tint_symbol_8(uint4 buffer[64], uint offset) {
+matrix<float16_t, 3, 4> a_load_4(uint offset) {
   const uint scalar_offset = ((offset + 0u)) / 4;
-  uint4 ubo_load_1 = buffer[scalar_offset / 4];
+  uint4 ubo_load_1 = a[scalar_offset / 4];
   uint2 ubo_load = ((scalar_offset & 2) ? ubo_load_1.zw : ubo_load_1.xy);
   vector<float16_t, 2> ubo_load_xz = vector<float16_t, 2>(f16tof32(ubo_load & 0xFFFF));
   vector<float16_t, 2> ubo_load_yw = vector<float16_t, 2>(f16tof32(ubo_load >> 16));
   const uint scalar_offset_1 = ((offset + 8u)) / 4;
-  uint4 ubo_load_3 = buffer[scalar_offset_1 / 4];
+  uint4 ubo_load_3 = a[scalar_offset_1 / 4];
   uint2 ubo_load_2 = ((scalar_offset_1 & 2) ? ubo_load_3.zw : ubo_load_3.xy);
   vector<float16_t, 2> ubo_load_2_xz = vector<float16_t, 2>(f16tof32(ubo_load_2 & 0xFFFF));
   vector<float16_t, 2> ubo_load_2_yw = vector<float16_t, 2>(f16tof32(ubo_load_2 >> 16));
   const uint scalar_offset_2 = ((offset + 16u)) / 4;
-  uint4 ubo_load_5 = buffer[scalar_offset_2 / 4];
+  uint4 ubo_load_5 = a[scalar_offset_2 / 4];
   uint2 ubo_load_4 = ((scalar_offset_2 & 2) ? ubo_load_5.zw : ubo_load_5.xy);
   vector<float16_t, 2> ubo_load_4_xz = vector<float16_t, 2>(f16tof32(ubo_load_4 & 0xFFFF));
   vector<float16_t, 2> ubo_load_4_yw = vector<float16_t, 2>(f16tof32(ubo_load_4 >> 16));
   return matrix<float16_t, 3, 4>(vector<float16_t, 4>(ubo_load_xz[0], ubo_load_yw[0], ubo_load_xz[1], ubo_load_yw[1]), vector<float16_t, 4>(ubo_load_2_xz[0], ubo_load_2_yw[0], ubo_load_2_xz[1], ubo_load_2_yw[1]), vector<float16_t, 4>(ubo_load_4_xz[0], ubo_load_4_yw[0], ubo_load_4_xz[1], ubo_load_4_yw[1]));
 }
 
-Inner tint_symbol_7(uint4 buffer[64], uint offset) {
-  const Inner tint_symbol_11 = {tint_symbol_8(buffer, (offset + 0u))};
-  return tint_symbol_11;
+Inner a_load_3(uint offset) {
+  const Inner tint_symbol_4 = {a_load_4((offset + 0u))};
+  return tint_symbol_4;
 }
 
-typedef Inner tint_symbol_6_ret[4];
-tint_symbol_6_ret tint_symbol_6(uint4 buffer[64], uint offset) {
+typedef Inner a_load_2_ret[4];
+a_load_2_ret a_load_2(uint offset) {
   Inner arr[4] = (Inner[4])0;
   {
     for(uint i_1 = 0u; (i_1 < 4u); i_1 = (i_1 + 1u)) {
-      arr[i_1] = tint_symbol_7(buffer, (offset + (i_1 * 64u)));
+      arr[i_1] = a_load_3((offset + (i_1 * 64u)));
     }
   }
   return arr;
 }
 
-Outer tint_symbol_5(uint4 buffer[64], uint offset) {
-  const Outer tint_symbol_12 = {tint_symbol_6(buffer, (offset + 0u))};
-  return tint_symbol_12;
+Outer a_load_1(uint offset) {
+  const Outer tint_symbol_5 = {a_load_2((offset + 0u))};
+  return tint_symbol_5;
 }
 
-typedef Outer tint_symbol_4_ret[4];
-tint_symbol_4_ret tint_symbol_4(uint4 buffer[64], uint offset) {
+typedef Outer a_load_ret[4];
+a_load_ret a_load(uint offset) {
   Outer arr_1[4] = (Outer[4])0;
   {
     for(uint i_2 = 0u; (i_2 < 4u); i_2 = (i_2 + 1u)) {
-      arr_1[i_2] = tint_symbol_5(buffer, (offset + (i_2 * 256u)));
+      arr_1[i_2] = a_load_1((offset + (i_2 * 256u)));
     }
   }
   return arr_1;
@@ -73,11 +73,11 @@ void f() {
   const int p_a_i_save = i();
   const int p_a_i_a_i_save = i();
   const int p_a_i_a_i_m_i_save = i();
-  const Outer l_a[4] = tint_symbol_4(a, 0u);
-  const Outer l_a_i = tint_symbol_5(a, (256u * uint(p_a_i_save)));
-  const Inner l_a_i_a[4] = tint_symbol_6(a, (256u * uint(p_a_i_save)));
-  const Inner l_a_i_a_i = tint_symbol_7(a, ((256u * uint(p_a_i_save)) + (64u * uint(p_a_i_a_i_save))));
-  const matrix<float16_t, 3, 4> l_a_i_a_i_m = tint_symbol_8(a, ((256u * uint(p_a_i_save)) + (64u * uint(p_a_i_a_i_save))));
+  const Outer l_a[4] = a_load(0u);
+  const Outer l_a_i = a_load_1((256u * uint(p_a_i_save)));
+  const Inner l_a_i_a[4] = a_load_2((256u * uint(p_a_i_save)));
+  const Inner l_a_i_a_i = a_load_3(((256u * uint(p_a_i_save)) + (64u * uint(p_a_i_a_i_save))));
+  const matrix<float16_t, 3, 4> l_a_i_a_i_m = a_load_4(((256u * uint(p_a_i_save)) + (64u * uint(p_a_i_a_i_save))));
   const uint scalar_offset_3 = ((((256u * uint(p_a_i_save)) + (64u * uint(p_a_i_a_i_save))) + (8u * uint(p_a_i_a_i_m_i_save)))) / 4;
   uint4 ubo_load_7 = a[scalar_offset_3 / 4];
   uint2 ubo_load_6 = ((scalar_offset_3 & 2) ? ubo_load_7.zw : ubo_load_7.xy);
@@ -93,6 +93,3 @@ void f() {
   const float16_t l_a_i_a_i_m_i_i = float16_t(f16tof32(((a[scalar_offset_index / 4][scalar_offset_index % 4] >> (scalar_offset_bytes % 4 == 0 ? 0 : 16)) & 0xFFFF)));
   return;
 }
-FXC validation failure:
-D:\Projects\RampUp\dawn\test\tint\buffer\Shader@0x000001C15A92C5C0(2,10-18): error X3000: syntax error: unexpected token 'float16_t'
-

test/tint/buffer/uniform/std140/struct/mat3x4_f16/static_index_via_ptr.wgsl.expected.fxc.hlsl

@@ -11,52 +11,52 @@ cbuffer cbuffer_a : register(b0, space0) {
   uint4 a[64];
 };
 
-matrix<float16_t, 3, 4> tint_symbol_4(uint4 buffer[64], uint offset) {
+matrix<float16_t, 3, 4> a_load_4(uint offset) {
   const uint scalar_offset = ((offset + 0u)) / 4;
-  uint4 ubo_load_1 = buffer[scalar_offset / 4];
+  uint4 ubo_load_1 = a[scalar_offset / 4];
   uint2 ubo_load = ((scalar_offset & 2) ? ubo_load_1.zw : ubo_load_1.xy);
   vector<float16_t, 2> ubo_load_xz = vector<float16_t, 2>(f16tof32(ubo_load & 0xFFFF));
   vector<float16_t, 2> ubo_load_yw = vector<float16_t, 2>(f16tof32(ubo_load >> 16));
   const uint scalar_offset_1 = ((offset + 8u)) / 4;
-  uint4 ubo_load_3 = buffer[scalar_offset_1 / 4];
+  uint4 ubo_load_3 = a[scalar_offset_1 / 4];
   uint2 ubo_load_2 = ((scalar_offset_1 & 2) ? ubo_load_3.zw : ubo_load_3.xy);
   vector<float16_t, 2> ubo_load_2_xz = vector<float16_t, 2>(f16tof32(ubo_load_2 & 0xFFFF));
   vector<float16_t, 2> ubo_load_2_yw = vector<float16_t, 2>(f16tof32(ubo_load_2 >> 16));
   const uint scalar_offset_2 = ((offset + 16u)) / 4;
-  uint4 ubo_load_5 = buffer[scalar_offset_2 / 4];
+  uint4 ubo_load_5 = a[scalar_offset_2 / 4];
   uint2 ubo_load_4 = ((scalar_offset_2 & 2) ? ubo_load_5.zw : ubo_load_5.xy);
   vector<float16_t, 2> ubo_load_4_xz = vector<float16_t, 2>(f16tof32(ubo_load_4 & 0xFFFF));
   vector<float16_t, 2> ubo_load_4_yw = vector<float16_t, 2>(f16tof32(ubo_load_4 >> 16));
   return matrix<float16_t, 3, 4>(vector<float16_t, 4>(ubo_load_xz[0], ubo_load_yw[0], ubo_load_xz[1], ubo_load_yw[1]), vector<float16_t, 4>(ubo_load_2_xz[0], ubo_load_2_yw[0], ubo_load_2_xz[1], ubo_load_2_yw[1]), vector<float16_t, 4>(ubo_load_4_xz[0], ubo_load_4_yw[0], ubo_load_4_xz[1], ubo_load_4_yw[1]));
 }
 
-Inner tint_symbol_3(uint4 buffer[64], uint offset) {
-  const Inner tint_symbol_7 = {tint_symbol_4(buffer, (offset + 0u))};
-  return tint_symbol_7;
+Inner a_load_3(uint offset) {
+  const Inner tint_symbol = {a_load_4((offset + 0u))};
+  return tint_symbol;
 }
 
-typedef Inner tint_symbol_2_ret[4];
-tint_symbol_2_ret tint_symbol_2(uint4 buffer[64], uint offset) {
+typedef Inner a_load_2_ret[4];
+a_load_2_ret a_load_2(uint offset) {
   Inner arr[4] = (Inner[4])0;
   {
     for(uint i = 0u; (i < 4u); i = (i + 1u)) {
-      arr[i] = tint_symbol_3(buffer, (offset + (i * 64u)));
+      arr[i] = a_load_3((offset + (i * 64u)));
     }
   }
   return arr;
 }
 
-Outer tint_symbol_1(uint4 buffer[64], uint offset) {
-  const Outer tint_symbol_8 = {tint_symbol_2(buffer, (offset + 0u))};
-  return tint_symbol_8;
+Outer a_load_1(uint offset) {
+  const Outer tint_symbol_1 = {a_load_2((offset + 0u))};
+  return tint_symbol_1;
 }
 
-typedef Outer tint_symbol_ret[4];
-tint_symbol_ret tint_symbol(uint4 buffer[64], uint offset) {
+typedef Outer a_load_ret[4];
+a_load_ret a_load(uint offset) {
   Outer arr_1[4] = (Outer[4])0;
   {
     for(uint i_1 = 0u; (i_1 < 4u); i_1 = (i_1 + 1u)) {
-      arr_1[i_1] = tint_symbol_1(buffer, (offset + (i_1 * 256u)));
+      arr_1[i_1] = a_load_1((offset + (i_1 * 256u)));
     }
   }
   return arr_1;
@@ -64,11 +64,11 @@ tint_symbol_ret tint_symbol(uint4 buffer[64], uint offset) {
 
 [numthreads(1, 1, 1)]
 void f() {
-  const Outer l_a[4] = tint_symbol(a, 0u);
-  const Outer l_a_3 = tint_symbol_1(a, 768u);
-  const Inner l_a_3_a[4] = tint_symbol_2(a, 768u);
-  const Inner l_a_3_a_2 = tint_symbol_3(a, 896u);
-  const matrix<float16_t, 3, 4> l_a_3_a_2_m = tint_symbol_4(a, 896u);
+  const Outer l_a[4] = a_load(0u);
+  const Outer l_a_3 = a_load_1(768u);
+  const Inner l_a_3_a[4] = a_load_2(768u);
+  const Inner l_a_3_a_2 = a_load_3(896u);
+  const matrix<float16_t, 3, 4> l_a_3_a_2_m = a_load_4(896u);
   uint2 ubo_load_6 = a[56].zw;
   vector<float16_t, 2> ubo_load_6_xz = vector<float16_t, 2>(f16tof32(ubo_load_6 & 0xFFFF));
   vector<float16_t, 2> ubo_load_6_yw = vector<float16_t, 2>(f16tof32(ubo_load_6 >> 16));
@@ -76,6 +76,3 @@ void f() {
   const float16_t l_a_3_a_2_m_1_0 = float16_t(f16tof32(((a[56].z) & 0xFFFF)));
   return;
 }
-FXC validation failure:
-D:\Projects\RampUp\dawn\test\tint\buffer\Shader@0x000002CC6184FF70(2,10-18): error X3000: syntax error: unexpected token 'float16_t'
-

test/tint/buffer/uniform/std140/struct/mat3x4_f16/to_builtin.wgsl.expected.fxc.hlsl

@@ -4,19 +4,19 @@ cbuffer cbuffer_u : register(b0, space0) {
   uint4 u[32];
 };
 
-matrix<float16_t, 3, 4> tint_symbol(uint4 buffer[32], uint offset) {
+matrix<float16_t, 3, 4> u_load(uint offset) {
   const uint scalar_offset = ((offset + 0u)) / 4;
-  uint4 ubo_load_1 = buffer[scalar_offset / 4];
+  uint4 ubo_load_1 = u[scalar_offset / 4];
   uint2 ubo_load = ((scalar_offset & 2) ? ubo_load_1.zw : ubo_load_1.xy);
   vector<float16_t, 2> ubo_load_xz = vector<float16_t, 2>(f16tof32(ubo_load & 0xFFFF));
   vector<float16_t, 2> ubo_load_yw = vector<float16_t, 2>(f16tof32(ubo_load >> 16));
   const uint scalar_offset_1 = ((offset + 8u)) / 4;
-  uint4 ubo_load_3 = buffer[scalar_offset_1 / 4];
+  uint4 ubo_load_3 = u[scalar_offset_1 / 4];
   uint2 ubo_load_2 = ((scalar_offset_1 & 2) ? ubo_load_3.zw : ubo_load_3.xy);
   vector<float16_t, 2> ubo_load_2_xz = vector<float16_t, 2>(f16tof32(ubo_load_2 & 0xFFFF));
   vector<float16_t, 2> ubo_load_2_yw = vector<float16_t, 2>(f16tof32(ubo_load_2 >> 16));
   const uint scalar_offset_2 = ((offset + 16u)) / 4;
-  uint4 ubo_load_5 = buffer[scalar_offset_2 / 4];
+  uint4 ubo_load_5 = u[scalar_offset_2 / 4];
   uint2 ubo_load_4 = ((scalar_offset_2 & 2) ? ubo_load_5.zw : ubo_load_5.xy);
   vector<float16_t, 2> ubo_load_4_xz = vector<float16_t, 2>(f16tof32(ubo_load_4 & 0xFFFF));
   vector<float16_t, 2> ubo_load_4_yw = vector<float16_t, 2>(f16tof32(ubo_load_4 >> 16));
@@ -25,7 +25,7 @@ matrix<float16_t, 3, 4> tint_symbol(uint4 buffer[32], uint offset) {
 
 [numthreads(1, 1, 1)]
 void f() {
-  const matrix<float16_t, 4, 3> t = transpose(tint_symbol(u, 264u));
+  const matrix<float16_t, 4, 3> t = transpose(u_load(264u));
   uint2 ubo_load_6 = u[1].xy;
   vector<float16_t, 2> ubo_load_6_xz = vector<float16_t, 2>(f16tof32(ubo_load_6 & 0xFFFF));
   vector<float16_t, 2> ubo_load_6_yw = vector<float16_t, 2>(f16tof32(ubo_load_6 >> 16));
@@ -36,6 +36,3 @@ void f() {
   const float16_t a = abs(vector<float16_t, 4>(ubo_load_7_xz[0], ubo_load_7_yw[0], ubo_load_7_xz[1], ubo_load_7_yw[1]).ywxz.x);
   return;
 }
-FXC validation failure:
-D:\Projects\RampUp\dawn\test\tint\buffer\Shader@0x000002683960F9A0(5,8-16): error X3000: syntax error: unexpected token 'float16_t'
-

test/tint/buffer/uniform/std140/struct/mat3x4_f16/to_fn.wgsl.expected.fxc.hlsl

@@ -25,38 +25,38 @@ void d(vector<float16_t, 4> v) {
 void e(float16_t f_1) {
 }
 
-matrix<float16_t, 3, 4> tint_symbol_3(uint4 buffer[32], uint offset) {
+matrix<float16_t, 3, 4> u_load_3(uint offset) {
   const uint scalar_offset = ((offset + 0u)) / 4;
-  uint4 ubo_load_1 = buffer[scalar_offset / 4];
+  uint4 ubo_load_1 = u[scalar_offset / 4];
   uint2 ubo_load = ((scalar_offset & 2) ? ubo_load_1.zw : ubo_load_1.xy);
   vector<float16_t, 2> ubo_load_xz = vector<float16_t, 2>(f16tof32(ubo_load & 0xFFFF));
   vector<float16_t, 2> ubo_load_yw = vector<float16_t, 2>(f16tof32(ubo_load >> 16));
   const uint scalar_offset_1 = ((offset + 8u)) / 4;
-  uint4 ubo_load_3 = buffer[scalar_offset_1 / 4];
+  uint4 ubo_load_3 = u[scalar_offset_1 / 4];
   uint2 ubo_load_2 = ((scalar_offset_1 & 2) ? ubo_load_3.zw : ubo_load_3.xy);
   vector<float16_t, 2> ubo_load_2_xz = vector<float16_t, 2>(f16tof32(ubo_load_2 & 0xFFFF));
   vector<float16_t, 2> ubo_load_2_yw = vector<float16_t, 2>(f16tof32(ubo_load_2 >> 16));
   const uint scalar_offset_2 = ((offset + 16u)) / 4;
-  uint4 ubo_load_5 = buffer[scalar_offset_2 / 4];
+  uint4 ubo_load_5 = u[scalar_offset_2 / 4];
   uint2 ubo_load_4 = ((scalar_offset_2 & 2) ? ubo_load_5.zw : ubo_load_5.xy);
   vector<float16_t, 2> ubo_load_4_xz = vector<float16_t, 2>(f16tof32(ubo_load_4 & 0xFFFF));
   vector<float16_t, 2> ubo_load_4_yw = vector<float16_t, 2>(f16tof32(ubo_load_4 >> 16));
   return matrix<float16_t, 3, 4>(vector<float16_t, 4>(ubo_load_xz[0], ubo_load_yw[0], ubo_load_xz[1], ubo_load_yw[1]), vector<float16_t, 4>(ubo_load_2_xz[0], ubo_load_2_yw[0], ubo_load_2_xz[1], ubo_load_2_yw[1]), vector<float16_t, 4>(ubo_load_4_xz[0], ubo_load_4_yw[0], ubo_load_4_xz[1], ubo_load_4_yw[1]));
 }
 
-S tint_symbol_1(uint4 buffer[32], uint offset) {
+S u_load_1(uint offset) {
   const uint scalar_offset_3 = ((offset + 0u)) / 4;
   const uint scalar_offset_4 = ((offset + 64u)) / 4;
-  const S tint_symbol_5 = {asint(buffer[scalar_offset_3 / 4][scalar_offset_3 % 4]), tint_symbol_3(buffer, (offset + 8u)), asint(buffer[scalar_offset_4 / 4][scalar_offset_4 % 4])};
-  return tint_symbol_5;
+  const S tint_symbol = {asint(u[scalar_offset_3 / 4][scalar_offset_3 % 4]), u_load_3((offset + 8u)), asint(u[scalar_offset_4 / 4][scalar_offset_4 % 4])};
+  return tint_symbol;
 }
 
-typedef S tint_symbol_ret[4];
-tint_symbol_ret tint_symbol(uint4 buffer[32], uint offset) {
+typedef S u_load_ret[4];
+u_load_ret u_load(uint offset) {
   S arr[4] = (S[4])0;
   {
     for(uint i = 0u; (i < 4u); i = (i + 1u)) {
-      arr[i] = tint_symbol_1(buffer, (offset + (i * 128u)));
+      arr[i] = u_load_1((offset + (i * 128u)));
     }
   }
   return arr;
@@ -64,9 +64,9 @@ tint_symbol_ret tint_symbol(uint4 buffer[32], uint offset) {
 
 [numthreads(1, 1, 1)]
 void f() {
-  a(tint_symbol(u, 0u));
-  b(tint_symbol_1(u, 256u));
-  c(tint_symbol_3(u, 264u));
+  a(u_load(0u));
+  b(u_load_1(256u));
+  c(u_load_3(264u));
   uint2 ubo_load_6 = u[1].xy;
   vector<float16_t, 2> ubo_load_6_xz = vector<float16_t, 2>(f16tof32(ubo_load_6 & 0xFFFF));
   vector<float16_t, 2> ubo_load_6_yw = vector<float16_t, 2>(f16tof32(ubo_load_6 >> 16));
@@ -77,6 +77,3 @@ void f() {
   e(vector<float16_t, 4>(ubo_load_7_xz[0], ubo_load_7_yw[0], ubo_load_7_xz[1], ubo_load_7_yw[1]).ywxz.x);
   return;
 }
-FXC validation failure:
-D:\Projects\RampUp\dawn\test\tint\buffer\Shader@0x00000278FC792580(3,10-18): error X3000: syntax error: unexpected token 'float16_t'
-

test/tint/buffer/uniform/std140/struct/mat3x4_f16/to_private.wgsl.expected.fxc.hlsl

@@ -11,38 +11,38 @@ cbuffer cbuffer_u : register(b0, space0) {
 };
 static S p[4] = (S[4])0;
 
-matrix<float16_t, 3, 4> tint_symbol_3(uint4 buffer[32], uint offset) {
+matrix<float16_t, 3, 4> u_load_3(uint offset) {
   const uint scalar_offset = ((offset + 0u)) / 4;
-  uint4 ubo_load_1 = buffer[scalar_offset / 4];
+  uint4 ubo_load_1 = u[scalar_offset / 4];
   uint2 ubo_load = ((scalar_offset & 2) ? ubo_load_1.zw : ubo_load_1.xy);
   vector<float16_t, 2> ubo_load_xz = vector<float16_t, 2>(f16tof32(ubo_load & 0xFFFF));
   vector<float16_t, 2> ubo_load_yw = vector<float16_t, 2>(f16tof32(ubo_load >> 16));
   const uint scalar_offset_1 = ((offset + 8u)) / 4;
-  uint4 ubo_load_3 = buffer[scalar_offset_1 / 4];
+  uint4 ubo_load_3 = u[scalar_offset_1 / 4];
   uint2 ubo_load_2 = ((scalar_offset_1 & 2) ? ubo_load_3.zw : ubo_load_3.xy);
   vector<float16_t, 2> ubo_load_2_xz = vector<float16_t, 2>(f16tof32(ubo_load_2 & 0xFFFF));
   vector<float16_t, 2> ubo_load_2_yw = vector<float16_t, 2>(f16tof32(ubo_load_2 >> 16));
   const uint scalar_offset_2 = ((offset + 16u)) / 4;
-  uint4 ubo_load_5 = buffer[scalar_offset_2 / 4];
+  uint4 ubo_load_5 = u[scalar_offset_2 / 4];
   uint2 ubo_load_4 = ((scalar_offset_2 & 2) ? ubo_load_5.zw : ubo_load_5.xy);
   vector<float16_t, 2> ubo_load_4_xz = vector<float16_t, 2>(f16tof32(ubo_load_4 & 0xFFFF));
   vector<float16_t, 2> ubo_load_4_yw = vector<float16_t, 2>(f16tof32(ubo_load_4 >> 16));
   return matrix<float16_t, 3, 4>(vector<float16_t, 4>(ubo_load_xz[0], ubo_load_yw[0], ubo_load_xz[1], ubo_load_yw[1]), vector<float16_t, 4>(ubo_load_2_xz[0], ubo_load_2_yw[0], ubo_load_2_xz[1], ubo_load_2_yw[1]), vector<float16_t, 4>(ubo_load_4_xz[0], ubo_load_4_yw[0], ubo_load_4_xz[1], ubo_load_4_yw[1]));
 }
 
-S tint_symbol_1(uint4 buffer[32], uint offset) {
+S u_load_1(uint offset) {
   const uint scalar_offset_3 = ((offset + 0u)) / 4;
   const uint scalar_offset_4 = ((offset + 64u)) / 4;
-  const S tint_symbol_5 = {asint(buffer[scalar_offset_3 / 4][scalar_offset_3 % 4]), tint_symbol_3(buffer, (offset + 8u)), asint(buffer[scalar_offset_4 / 4][scalar_offset_4 % 4])};
-  return tint_symbol_5;
+  const S tint_symbol = {asint(u[scalar_offset_3 / 4][scalar_offset_3 % 4]), u_load_3((offset + 8u)), asint(u[scalar_offset_4 / 4][scalar_offset_4 % 4])};
+  return tint_symbol;
 }
 
-typedef S tint_symbol_ret[4];
-tint_symbol_ret tint_symbol(uint4 buffer[32], uint offset) {
+typedef S u_load_ret[4];
+u_load_ret u_load(uint offset) {
   S arr[4] = (S[4])0;
   {
     for(uint i = 0u; (i < 4u); i = (i + 1u)) {
-      arr[i] = tint_symbol_1(buffer, (offset + (i * 128u)));
+      arr[i] = u_load_1((offset + (i * 128u)));
     }
   }
   return arr;
@@ -50,15 +50,12 @@ tint_symbol_ret tint_symbol(uint4 buffer[32], uint offset) {
 
 [numthreads(1, 1, 1)]
 void f() {
-  p = tint_symbol(u, 0u);
-  p[1] = tint_symbol_1(u, 256u);
-  p[3].m = tint_symbol_3(u, 264u);
+  p = u_load(0u);
+  p[1] = u_load_1(256u);
+  p[3].m = u_load_3(264u);
   uint2 ubo_load_6 = u[1].xy;
   vector<float16_t, 2> ubo_load_6_xz = vector<float16_t, 2>(f16tof32(ubo_load_6 & 0xFFFF));
   vector<float16_t, 2> ubo_load_6_yw = vector<float16_t, 2>(f16tof32(ubo_load_6 >> 16));
   p[1].m[0] = vector<float16_t, 4>(ubo_load_6_xz[0], ubo_load_6_yw[0], ubo_load_6_xz[1], ubo_load_6_yw[1]).ywxz;
   return;
 }
-FXC validation failure:
-D:\Projects\RampUp\dawn\test\tint\buffer\Shader@0x000002605021E560(3,10-18): error X3000: syntax error: unexpected token 'float16_t'
-

test/tint/buffer/uniform/std140/struct/mat3x4_f16/to_storage.wgsl.expected.fxc.hlsl

@@ -11,59 +11,59 @@ cbuffer cbuffer_u : register(b0, space0) {
 };
 RWByteAddressBuffer s : register(u1, space0);
 
-void tint_symbol_3(RWByteAddressBuffer buffer, uint offset, matrix<float16_t, 3, 4> value) {
-  buffer.Store<vector<float16_t, 4> >((offset + 0u), value[0u]);
-  buffer.Store<vector<float16_t, 4> >((offset + 8u), value[1u]);
-  buffer.Store<vector<float16_t, 4> >((offset + 16u), value[2u]);
+void s_store_3(uint offset, matrix<float16_t, 3, 4> value) {
+  s.Store<vector<float16_t, 4> >((offset + 0u), value[0u]);
+  s.Store<vector<float16_t, 4> >((offset + 8u), value[1u]);
+  s.Store<vector<float16_t, 4> >((offset + 16u), value[2u]);
 }
 
-void tint_symbol_1(RWByteAddressBuffer buffer, uint offset, S value) {
-  buffer.Store((offset + 0u), asuint(value.before));
-  tint_symbol_3(buffer, (offset + 8u), value.m);
-  buffer.Store((offset + 64u), asuint(value.after));
+void s_store_1(uint offset, S value) {
+  s.Store((offset + 0u), asuint(value.before));
+  s_store_3((offset + 8u), value.m);
+  s.Store((offset + 64u), asuint(value.after));
 }
 
-void tint_symbol(RWByteAddressBuffer buffer, uint offset, S value[4]) {
-  S array[4] = value;
+void s_store(uint offset, S value[4]) {
+  S array_1[4] = value;
   {
     for(uint i = 0u; (i < 4u); i = (i + 1u)) {
-      tint_symbol_1(buffer, (offset + (i * 128u)), array[i]);
+      s_store_1((offset + (i * 128u)), array_1[i]);
     }
   }
 }
 
-matrix<float16_t, 3, 4> tint_symbol_8(uint4 buffer[32], uint offset) {
+matrix<float16_t, 3, 4> u_load_3(uint offset) {
   const uint scalar_offset = ((offset + 0u)) / 4;
-  uint4 ubo_load_1 = buffer[scalar_offset / 4];
+  uint4 ubo_load_1 = u[scalar_offset / 4];
   uint2 ubo_load = ((scalar_offset & 2) ? ubo_load_1.zw : ubo_load_1.xy);
   vector<float16_t, 2> ubo_load_xz = vector<float16_t, 2>(f16tof32(ubo_load & 0xFFFF));
   vector<float16_t, 2> ubo_load_yw = vector<float16_t, 2>(f16tof32(ubo_load >> 16));
   const uint scalar_offset_1 = ((offset + 8u)) / 4;
-  uint4 ubo_load_3 = buffer[scalar_offset_1 / 4];
+  uint4 ubo_load_3 = u[scalar_offset_1 / 4];
   uint2 ubo_load_2 = ((scalar_offset_1 & 2) ? ubo_load_3.zw : ubo_load_3.xy);
   vector<float16_t, 2> ubo_load_2_xz = vector<float16_t, 2>(f16tof32(ubo_load_2 & 0xFFFF));
   vector<float16_t, 2> ubo_load_2_yw = vector<float16_t, 2>(f16tof32(ubo_load_2 >> 16));
   const uint scalar_offset_2 = ((offset + 16u)) / 4;
-  uint4 ubo_load_5 = buffer[scalar_offset_2 / 4];
+  uint4 ubo_load_5 = u[scalar_offset_2 / 4];
   uint2 ubo_load_4 = ((scalar_offset_2 & 2) ? ubo_load_5.zw : ubo_load_5.xy);
   vector<float16_t, 2> ubo_load_4_xz = vector<float16_t, 2>(f16tof32(ubo_load_4 & 0xFFFF));
   vector<float16_t, 2> ubo_load_4_yw = vector<float16_t, 2>(f16tof32(ubo_load_4 >> 16));
   return matrix<float16_t, 3, 4>(vector<float16_t, 4>(ubo_load_xz[0], ubo_load_yw[0], ubo_load_xz[1], ubo_load_yw[1]), vector<float16_t, 4>(ubo_load_2_xz[0], ubo_load_2_yw[0], ubo_load_2_xz[1], ubo_load_2_yw[1]), vector<float16_t, 4>(ubo_load_4_xz[0], ubo_load_4_yw[0], ubo_load_4_xz[1], ubo_load_4_yw[1]));
 }
 
-S tint_symbol_6(uint4 buffer[32], uint offset) {
+S u_load_1(uint offset) {
   const uint scalar_offset_3 = ((offset + 0u)) / 4;
   const uint scalar_offset_4 = ((offset + 64u)) / 4;
-  const S tint_symbol_10 = {asint(buffer[scalar_offset_3 / 4][scalar_offset_3 % 4]), tint_symbol_8(buffer, (offset + 8u)), asint(buffer[scalar_offset_4 / 4][scalar_offset_4 % 4])};
-  return tint_symbol_10;
+  const S tint_symbol = {asint(u[scalar_offset_3 / 4][scalar_offset_3 % 4]), u_load_3((offset + 8u)), asint(u[scalar_offset_4 / 4][scalar_offset_4 % 4])};
+  return tint_symbol;
 }
 
-typedef S tint_symbol_5_ret[4];
-tint_symbol_5_ret tint_symbol_5(uint4 buffer[32], uint offset) {
+typedef S u_load_ret[4];
+u_load_ret u_load(uint offset) {
   S arr[4] = (S[4])0;
   {
     for(uint i_1 = 0u; (i_1 < 4u); i_1 = (i_1 + 1u)) {
-      arr[i_1] = tint_symbol_6(buffer, (offset + (i_1 * 128u)));
+      arr[i_1] = u_load_1((offset + (i_1 * 128u)));
     }
   }
   return arr;
@@ -71,15 +71,12 @@ tint_symbol_5_ret tint_symbol_5(uint4 buffer[32], uint offset) {
 
 [numthreads(1, 1, 1)]
 void f() {
-  tint_symbol(s, 0u, tint_symbol_5(u, 0u));
-  tint_symbol_1(s, 128u, tint_symbol_6(u, 256u));
-  tint_symbol_3(s, 392u, tint_symbol_8(u, 264u));
+  s_store(0u, u_load(0u));
+  s_store_1(128u, u_load_1(256u));
+  s_store_3(392u, u_load_3(264u));
   uint2 ubo_load_6 = u[1].xy;
   vector<float16_t, 2> ubo_load_6_xz = vector<float16_t, 2>(f16tof32(ubo_load_6 & 0xFFFF));
   vector<float16_t, 2> ubo_load_6_yw = vector<float16_t, 2>(f16tof32(ubo_load_6 >> 16));
   s.Store<vector<float16_t, 4> >(136u, vector<float16_t, 4>(ubo_load_6_xz[0], ubo_load_6_yw[0], ubo_load_6_xz[1], ubo_load_6_yw[1]).ywxz);
   return;
 }
-FXC validation failure:
-D:\Projects\RampUp\dawn\test\tint\buffer\Shader@0x000001FE54B10170(3,10-18): error X3000: syntax error: unexpected token 'float16_t'
-

test/tint/buffer/uniform/std140/struct/mat3x4_f16/to_workgroup.wgsl.expected.fxc.hlsl

@@ -15,38 +15,38 @@ struct tint_symbol_1 {
   uint local_invocation_index : SV_GroupIndex;
 };
 
-matrix<float16_t, 3, 4> tint_symbol_5(uint4 buffer[32], uint offset) {
+matrix<float16_t, 3, 4> u_load_3(uint offset) {
   const uint scalar_offset = ((offset + 0u)) / 4;
-  uint4 ubo_load_1 = buffer[scalar_offset / 4];
+  uint4 ubo_load_1 = u[scalar_offset / 4];
   uint2 ubo_load = ((scalar_offset & 2) ? ubo_load_1.zw : ubo_load_1.xy);
   vector<float16_t, 2> ubo_load_xz = vector<float16_t, 2>(f16tof32(ubo_load & 0xFFFF));
   vector<float16_t, 2> ubo_load_yw = vector<float16_t, 2>(f16tof32(ubo_load >> 16));
   const uint scalar_offset_1 = ((offset + 8u)) / 4;
-  uint4 ubo_load_3 = buffer[scalar_offset_1 / 4];
+  uint4 ubo_load_3 = u[scalar_offset_1 / 4];
   uint2 ubo_load_2 = ((scalar_offset_1 & 2) ? ubo_load_3.zw : ubo_load_3.xy);
   vector<float16_t, 2> ubo_load_2_xz = vector<float16_t, 2>(f16tof32(ubo_load_2 & 0xFFFF));
   vector<float16_t, 2> ubo_load_2_yw = vector<float16_t, 2>(f16tof32(ubo_load_2 >> 16));
   const uint scalar_offset_2 = ((offset + 16u)) / 4;
-  uint4 ubo_load_5 = buffer[scalar_offset_2 / 4];
+  uint4 ubo_load_5 = u[scalar_offset_2 / 4];
   uint2 ubo_load_4 = ((scalar_offset_2 & 2) ? ubo_load_5.zw : ubo_load_5.xy);
   vector<float16_t, 2> ubo_load_4_xz = vector<float16_t, 2>(f16tof32(ubo_load_4 & 0xFFFF));
   vector<float16_t, 2> ubo_load_4_yw = vector<float16_t, 2>(f16tof32(ubo_load_4 >> 16));
   return matrix<float16_t, 3, 4>(vector<float16_t, 4>(ubo_load_xz[0], ubo_load_yw[0], ubo_load_xz[1], ubo_load_yw[1]), vector<float16_t, 4>(ubo_load_2_xz[0], ubo_load_2_yw[0], ubo_load_2_xz[1], ubo_load_2_yw[1]), vector<float16_t, 4>(ubo_load_4_xz[0], ubo_load_4_yw[0], ubo_load_4_xz[1], ubo_load_4_yw[1]));
 }
 
-S tint_symbol_3(uint4 buffer[32], uint offset) {
+S u_load_1(uint offset) {
   const uint scalar_offset_3 = ((offset + 0u)) / 4;
   const uint scalar_offset_4 = ((offset + 64u)) / 4;
-  const S tint_symbol_8 = {asint(buffer[scalar_offset_3 / 4][scalar_offset_3 % 4]), tint_symbol_5(buffer, (offset + 8u)), asint(buffer[scalar_offset_4 / 4][scalar_offset_4 % 4])};
-  return tint_symbol_8;
+  const S tint_symbol_3 = {asint(u[scalar_offset_3 / 4][scalar_offset_3 % 4]), u_load_3((offset + 8u)), asint(u[scalar_offset_4 / 4][scalar_offset_4 % 4])};
+  return tint_symbol_3;
 }
 
-typedef S tint_symbol_2_ret[4];
-tint_symbol_2_ret tint_symbol_2(uint4 buffer[32], uint offset) {
+typedef S u_load_ret[4];
+u_load_ret u_load(uint offset) {
   S arr[4] = (S[4])0;
   {
     for(uint i_1 = 0u; (i_1 < 4u); i_1 = (i_1 + 1u)) {
-      arr[i_1] = tint_symbol_3(buffer, (offset + (i_1 * 128u)));
+      arr[i_1] = u_load_1((offset + (i_1 * 128u)));
     }
   }
   return arr;
@@ -56,14 +56,14 @@ void f_inner(uint local_invocation_index) {
   {
     for(uint idx = local_invocation_index; (idx < 4u); idx = (idx + 1u)) {
       const uint i = idx;
-      const S tint_symbol_7 = (S)0;
-      w[i] = tint_symbol_7;
+      const S tint_symbol_2 = (S)0;
+      w[i] = tint_symbol_2;
     }
   }
   GroupMemoryBarrierWithGroupSync();
-  w = tint_symbol_2(u, 0u);
-  w[1] = tint_symbol_3(u, 256u);
-  w[3].m = tint_symbol_5(u, 264u);
+  w = u_load(0u);
+  w[1] = u_load_1(256u);
+  w[3].m = u_load_3(264u);
   uint2 ubo_load_6 = u[1].xy;
   vector<float16_t, 2> ubo_load_6_xz = vector<float16_t, 2>(f16tof32(ubo_load_6 & 0xFFFF));
   vector<float16_t, 2> ubo_load_6_yw = vector<float16_t, 2>(f16tof32(ubo_load_6 >> 16));
@@ -75,6 +75,3 @@ void f(tint_symbol_1 tint_symbol) {
   f_inner(tint_symbol.local_invocation_index);
   return;
 }
-FXC validation failure:
-D:\Projects\RampUp\dawn\test\tint\buffer\Shader@0x000001FEBFD6AE90(3,10-18): error X3000: syntax error: unexpected token 'float16_t'
-

test/tint/buffer/uniform/std140/struct/mat4x2_f16/dynamic_index_via_ptr.wgsl.expected.fxc.hlsl

@@ -17,45 +17,45 @@ int i() {
   return counter;
 }
 
-matrix<float16_t, 4, 2> tint_symbol_8(uint4 buffer[64], uint offset) {
+matrix<float16_t, 4, 2> a_load_4(uint offset) {
   const uint scalar_offset = ((offset + 0u)) / 4;
-  uint ubo_load = buffer[scalar_offset / 4][scalar_offset % 4];
+  uint ubo_load = a[scalar_offset / 4][scalar_offset % 4];
   const uint scalar_offset_1 = ((offset + 4u)) / 4;
-  uint ubo_load_1 = buffer[scalar_offset_1 / 4][scalar_offset_1 % 4];
+  uint ubo_load_1 = a[scalar_offset_1 / 4][scalar_offset_1 % 4];
   const uint scalar_offset_2 = ((offset + 8u)) / 4;
-  uint ubo_load_2 = buffer[scalar_offset_2 / 4][scalar_offset_2 % 4];
+  uint ubo_load_2 = a[scalar_offset_2 / 4][scalar_offset_2 % 4];
   const uint scalar_offset_3 = ((offset + 12u)) / 4;
-  uint ubo_load_3 = buffer[scalar_offset_3 / 4][scalar_offset_3 % 4];
+  uint ubo_load_3 = a[scalar_offset_3 / 4][scalar_offset_3 % 4];
   return matrix<float16_t, 4, 2>(vector<float16_t, 2>(float16_t(f16tof32(ubo_load & 0xFFFF)), float16_t(f16tof32(ubo_load >> 16))), vector<float16_t, 2>(float16_t(f16tof32(ubo_load_1 & 0xFFFF)), float16_t(f16tof32(ubo_load_1 >> 16))), vector<float16_t, 2>(float16_t(f16tof32(ubo_load_2 & 0xFFFF)), float16_t(f16tof32(ubo_load_2 >> 16))), vector<float16_t, 2>(float16_t(f16tof32(ubo_load_3 & 0xFFFF)), float16_t(f16tof32(ubo_load_3 >> 16))));
 }
 
-Inner tint_symbol_7(uint4 buffer[64], uint offset) {
-  const Inner tint_symbol_11 = {tint_symbol_8(buffer, (offset + 0u))};
-  return tint_symbol_11;
+Inner a_load_3(uint offset) {
+  const Inner tint_symbol_4 = {a_load_4((offset + 0u))};
+  return tint_symbol_4;
 }
 
-typedef Inner tint_symbol_6_ret[4];
-tint_symbol_6_ret tint_symbol_6(uint4 buffer[64], uint offset) {
+typedef Inner a_load_2_ret[4];
+a_load_2_ret a_load_2(uint offset) {
   Inner arr[4] = (Inner[4])0;
   {
     for(uint i_1 = 0u; (i_1 < 4u); i_1 = (i_1 + 1u)) {
-      arr[i_1] = tint_symbol_7(buffer, (offset + (i_1 * 64u)));
+      arr[i_1] = a_load_3((offset + (i_1 * 64u)));
     }
   }
   return arr;
 }
 
-Outer tint_symbol_5(uint4 buffer[64], uint offset) {
-  const Outer tint_symbol_12 = {tint_symbol_6(buffer, (offset + 0u))};
-  return tint_symbol_12;
+Outer a_load_1(uint offset) {
+  const Outer tint_symbol_5 = {a_load_2((offset + 0u))};
+  return tint_symbol_5;
 }
 
-typedef Outer tint_symbol_4_ret[4];
-tint_symbol_4_ret tint_symbol_4(uint4 buffer[64], uint offset) {
+typedef Outer a_load_ret[4];
+a_load_ret a_load(uint offset) {
   Outer arr_1[4] = (Outer[4])0;
   {
     for(uint i_2 = 0u; (i_2 < 4u); i_2 = (i_2 + 1u)) {
-      arr_1[i_2] = tint_symbol_5(buffer, (offset + (i_2 * 256u)));
+      arr_1[i_2] = a_load_1((offset + (i_2 * 256u)));
     }
   }
   return arr_1;
@@ -66,11 +66,11 @@ void f() {
   const int p_a_i_save = i();
   const int p_a_i_a_i_save = i();
   const int p_a_i_a_i_m_i_save = i();
-  const Outer l_a[4] = tint_symbol_4(a, 0u);
-  const Outer l_a_i = tint_symbol_5(a, (256u * uint(p_a_i_save)));
-  const Inner l_a_i_a[4] = tint_symbol_6(a, (256u * uint(p_a_i_save)));
-  const Inner l_a_i_a_i = tint_symbol_7(a, ((256u * uint(p_a_i_save)) + (64u * uint(p_a_i_a_i_save))));
-  const matrix<float16_t, 4, 2> l_a_i_a_i_m = tint_symbol_8(a, ((256u * uint(p_a_i_save)) + (64u * uint(p_a_i_a_i_save))));
+  const Outer l_a[4] = a_load(0u);
+  const Outer l_a_i = a_load_1((256u * uint(p_a_i_save)));
+  const Inner l_a_i_a[4] = a_load_2((256u * uint(p_a_i_save)));
+  const Inner l_a_i_a_i = a_load_3(((256u * uint(p_a_i_save)) + (64u * uint(p_a_i_a_i_save))));
+  const matrix<float16_t, 4, 2> l_a_i_a_i_m = a_load_4(((256u * uint(p_a_i_save)) + (64u * uint(p_a_i_a_i_save))));
   const uint scalar_offset_4 = ((((256u * uint(p_a_i_save)) + (64u * uint(p_a_i_a_i_save))) + (4u * uint(p_a_i_a_i_m_i_save)))) / 4;
   uint ubo_load_4 = a[scalar_offset_4 / 4][scalar_offset_4 % 4];
   const vector<float16_t, 2> l_a_i_a_i_m_i = vector<float16_t, 2>(float16_t(f16tof32(ubo_load_4 & 0xFFFF)), float16_t(f16tof32(ubo_load_4 >> 16)));
@@ -83,6 +83,3 @@ void f() {
   const float16_t l_a_i_a_i_m_i_i = float16_t(f16tof32(((a[scalar_offset_index / 4][scalar_offset_index % 4] >> (scalar_offset_bytes % 4 == 0 ? 0 : 16)) & 0xFFFF)));
   return;
 }
-FXC validation failure:
-D:\Projects\RampUp\dawn\test\tint\buffer\Shader@0x00000216C74B2530(2,10-18): error X3000: syntax error: unexpected token 'float16_t'
-

test/tint/buffer/uniform/std140/struct/mat4x2_f16/static_index_via_ptr.wgsl.expected.fxc.hlsl

@@ -11,45 +11,45 @@ cbuffer cbuffer_a : register(b0, space0) {
   uint4 a[64];
 };
 
-matrix<float16_t, 4, 2> tint_symbol_4(uint4 buffer[64], uint offset) {
+matrix<float16_t, 4, 2> a_load_4(uint offset) {
   const uint scalar_offset = ((offset + 0u)) / 4;
-  uint ubo_load = buffer[scalar_offset / 4][scalar_offset % 4];
+  uint ubo_load = a[scalar_offset / 4][scalar_offset % 4];
   const uint scalar_offset_1 = ((offset + 4u)) / 4;
-  uint ubo_load_1 = buffer[scalar_offset_1 / 4][scalar_offset_1 % 4];
+  uint ubo_load_1 = a[scalar_offset_1 / 4][scalar_offset_1 % 4];
   const uint scalar_offset_2 = ((offset + 8u)) / 4;
-  uint ubo_load_2 = buffer[scalar_offset_2 / 4][scalar_offset_2 % 4];
+  uint ubo_load_2 = a[scalar_offset_2 / 4][scalar_offset_2 % 4];
   const uint scalar_offset_3 = ((offset + 12u)) / 4;
-  uint ubo_load_3 = buffer[scalar_offset_3 / 4][scalar_offset_3 % 4];
+  uint ubo_load_3 = a[scalar_offset_3 / 4][scalar_offset_3 % 4];
   return matrix<float16_t, 4, 2>(vector<float16_t, 2>(float16_t(f16tof32(ubo_load & 0xFFFF)), float16_t(f16tof32(ubo_load >> 16))), vector<float16_t, 2>(float16_t(f16tof32(ubo_load_1 & 0xFFFF)), float16_t(f16tof32(ubo_load_1 >> 16))), vector<float16_t, 2>(float16_t(f16tof32(ubo_load_2 & 0xFFFF)), float16_t(f16tof32(ubo_load_2 >> 16))), vector<float16_t, 2>(float16_t(f16tof32(ubo_load_3 & 0xFFFF)), float16_t(f16tof32(ubo_load_3 >> 16))));
 }
 
-Inner tint_symbol_3(uint4 buffer[64], uint offset) {
-  const Inner tint_symbol_7 = {tint_symbol_4(buffer, (offset + 0u))};
-  return tint_symbol_7;
+Inner a_load_3(uint offset) {
+  const Inner tint_symbol = {a_load_4((offset + 0u))};
+  return tint_symbol;
 }
 
-typedef Inner tint_symbol_2_ret[4];
-tint_symbol_2_ret tint_symbol_2(uint4 buffer[64], uint offset) {
+typedef Inner a_load_2_ret[4];
+a_load_2_ret a_load_2(uint offset) {
   Inner arr[4] = (Inner[4])0;
   {
     for(uint i = 0u; (i < 4u); i = (i + 1u)) {
-      arr[i] = tint_symbol_3(buffer, (offset + (i * 64u)));
+      arr[i] = a_load_3((offset + (i * 64u)));
     }
   }
   return arr;
 }
 
-Outer tint_symbol_1(uint4 buffer[64], uint offset) {
-  const Outer tint_symbol_8 = {tint_symbol_2(buffer, (offset + 0u))};
-  return tint_symbol_8;
+Outer a_load_1(uint offset) {
+  const Outer tint_symbol_1 = {a_load_2((offset + 0u))};
+  return tint_symbol_1;
 }
 
-typedef Outer tint_symbol_ret[4];
-tint_symbol_ret tint_symbol(uint4 buffer[64], uint offset) {
+typedef Outer a_load_ret[4];
+a_load_ret a_load(uint offset) {
   Outer arr_1[4] = (Outer[4])0;
   {
     for(uint i_1 = 0u; (i_1 < 4u); i_1 = (i_1 + 1u)) {
-      arr_1[i_1] = tint_symbol_1(buffer, (offset + (i_1 * 256u)));
+      arr_1[i_1] = a_load_1((offset + (i_1 * 256u)));
     }
   }
   return arr_1;
@@ -57,16 +57,13 @@ tint_symbol_ret tint_symbol(uint4 buffer[64], uint offset) {
 
 [numthreads(1, 1, 1)]
 void f() {
-  const Outer l_a[4] = tint_symbol(a, 0u);
-  const Outer l_a_3 = tint_symbol_1(a, 768u);
-  const Inner l_a_3_a[4] = tint_symbol_2(a, 768u);
-  const Inner l_a_3_a_2 = tint_symbol_3(a, 896u);
-  const matrix<float16_t, 4, 2> l_a_3_a_2_m = tint_symbol_4(a, 896u);
+  const Outer l_a[4] = a_load(0u);
+  const Outer l_a_3 = a_load_1(768u);
+  const Inner l_a_3_a[4] = a_load_2(768u);
+  const Inner l_a_3_a_2 = a_load_3(896u);
+  const matrix<float16_t, 4, 2> l_a_3_a_2_m = a_load_4(896u);
   uint ubo_load_4 = a[56].y;
   const vector<float16_t, 2> l_a_3_a_2_m_1 = vector<float16_t, 2>(float16_t(f16tof32(ubo_load_4 & 0xFFFF)), float16_t(f16tof32(ubo_load_4 >> 16)));
   const float16_t l_a_3_a_2_m_1_0 = float16_t(f16tof32(((a[56].y) & 0xFFFF)));
   return;
 }
-FXC validation failure:
-D:\Projects\RampUp\dawn\test\tint\buffer\Shader@0x0000026E60B9E9C0(2,10-18): error X3000: syntax error: unexpected token 'float16_t'
-

test/tint/buffer/uniform/std140/struct/mat4x2_f16/to_builtin.wgsl.expected.fxc.hlsl

@@ -4,27 +4,24 @@ cbuffer cbuffer_u : register(b0, space0) {
   uint4 u[32];
 };
 
-matrix<float16_t, 4, 2> tint_symbol(uint4 buffer[32], uint offset) {
+matrix<float16_t, 4, 2> u_load(uint offset) {
   const uint scalar_offset = ((offset + 0u)) / 4;
-  uint ubo_load = buffer[scalar_offset / 4][scalar_offset % 4];
+  uint ubo_load = u[scalar_offset / 4][scalar_offset % 4];
   const uint scalar_offset_1 = ((offset + 4u)) / 4;
-  uint ubo_load_1 = buffer[scalar_offset_1 / 4][scalar_offset_1 % 4];
+  uint ubo_load_1 = u[scalar_offset_1 / 4][scalar_offset_1 % 4];
   const uint scalar_offset_2 = ((offset + 8u)) / 4;
-  uint ubo_load_2 = buffer[scalar_offset_2 / 4][scalar_offset_2 % 4];
+  uint ubo_load_2 = u[scalar_offset_2 / 4][scalar_offset_2 % 4];
   const uint scalar_offset_3 = ((offset + 12u)) / 4;
-  uint ubo_load_3 = buffer[scalar_offset_3 / 4][scalar_offset_3 % 4];
+  uint ubo_load_3 = u[scalar_offset_3 / 4][scalar_offset_3 % 4];
   return matrix<float16_t, 4, 2>(vector<float16_t, 2>(float16_t(f16tof32(ubo_load & 0xFFFF)), float16_t(f16tof32(ubo_load >> 16))), vector<float16_t, 2>(float16_t(f16tof32(ubo_load_1 & 0xFFFF)), float16_t(f16tof32(ubo_load_1 >> 16))), vector<float16_t, 2>(float16_t(f16tof32(ubo_load_2 & 0xFFFF)), float16_t(f16tof32(ubo_load_2 >> 16))), vector<float16_t, 2>(float16_t(f16tof32(ubo_load_3 & 0xFFFF)), float16_t(f16tof32(ubo_load_3 >> 16))));
 }
 
 [numthreads(1, 1, 1)]
 void f() {
-  const matrix<float16_t, 2, 4> t = transpose(tint_symbol(u, 260u));
+  const matrix<float16_t, 2, 4> t = transpose(u_load(260u));
   uint ubo_load_4 = u[0].z;
   const float16_t l = length(vector<float16_t, 2>(float16_t(f16tof32(ubo_load_4 & 0xFFFF)), float16_t(f16tof32(ubo_load_4 >> 16))).yx);
   uint ubo_load_5 = u[0].z;
   const float16_t a = abs(vector<float16_t, 2>(float16_t(f16tof32(ubo_load_5 & 0xFFFF)), float16_t(f16tof32(ubo_load_5 >> 16))).yx.x);
   return;
 }
-FXC validation failure:
-D:\Projects\RampUp\dawn\test\tint\buffer\Shader@0x000001CC7C77CFC0(5,8-16): error X3000: syntax error: unexpected token 'float16_t'
-

test/tint/buffer/uniform/std140/struct/mat4x2_f16/to_fn.wgsl.expected.fxc.hlsl

@@ -25,31 +25,31 @@ void d(vector<float16_t, 2> v) {
 void e(float16_t f_1) {
 }
 
-matrix<float16_t, 4, 2> tint_symbol_3(uint4 buffer[32], uint offset) {
+matrix<float16_t, 4, 2> u_load_3(uint offset) {
   const uint scalar_offset = ((offset + 0u)) / 4;
-  uint ubo_load = buffer[scalar_offset / 4][scalar_offset % 4];
+  uint ubo_load = u[scalar_offset / 4][scalar_offset % 4];
   const uint scalar_offset_1 = ((offset + 4u)) / 4;
-  uint ubo_load_1 = buffer[scalar_offset_1 / 4][scalar_offset_1 % 4];
+  uint ubo_load_1 = u[scalar_offset_1 / 4][scalar_offset_1 % 4];
   const uint scalar_offset_2 = ((offset + 8u)) / 4;
-  uint ubo_load_2 = buffer[scalar_offset_2 / 4][scalar_offset_2 % 4];
+  uint ubo_load_2 = u[scalar_offset_2 / 4][scalar_offset_2 % 4];
   const uint scalar_offset_3 = ((offset + 12u)) / 4;
-  uint ubo_load_3 = buffer[scalar_offset_3 / 4][scalar_offset_3 % 4];
+  uint ubo_load_3 = u[scalar_offset_3 / 4][scalar_offset_3 % 4];
   return matrix<float16_t, 4, 2>(vector<float16_t, 2>(float16_t(f16tof32(ubo_load & 0xFFFF)), float16_t(f16tof32(ubo_load >> 16))), vector<float16_t, 2>(float16_t(f16tof32(ubo_load_1 & 0xFFFF)), float16_t(f16tof32(ubo_load_1 >> 16))), vector<float16_t, 2>(float16_t(f16tof32(ubo_load_2 & 0xFFFF)), float16_t(f16tof32(ubo_load_2 >> 16))), vector<float16_t, 2>(float16_t(f16tof32(ubo_load_3 & 0xFFFF)), float16_t(f16tof32(ubo_load_3 >> 16))));
 }
 
-S tint_symbol_1(uint4 buffer[32], uint offset) {
+S u_load_1(uint offset) {
   const uint scalar_offset_4 = ((offset + 0u)) / 4;
   const uint scalar_offset_5 = ((offset + 64u)) / 4;
-  const S tint_symbol_5 = {asint(buffer[scalar_offset_4 / 4][scalar_offset_4 % 4]), tint_symbol_3(buffer, (offset + 4u)), asint(buffer[scalar_offset_5 / 4][scalar_offset_5 % 4])};
-  return tint_symbol_5;
+  const S tint_symbol = {asint(u[scalar_offset_4 / 4][scalar_offset_4 % 4]), u_load_3((offset + 4u)), asint(u[scalar_offset_5 / 4][scalar_offset_5 % 4])};
+  return tint_symbol;
 }
 
-typedef S tint_symbol_ret[4];
-tint_symbol_ret tint_symbol(uint4 buffer[32], uint offset) {
+typedef S u_load_ret[4];
+u_load_ret u_load(uint offset) {
   S arr[4] = (S[4])0;
   {
     for(uint i = 0u; (i < 4u); i = (i + 1u)) {
-      arr[i] = tint_symbol_1(buffer, (offset + (i * 128u)));
+      arr[i] = u_load_1((offset + (i * 128u)));
     }
   }
   return arr;
@@ -57,15 +57,12 @@ tint_symbol_ret tint_symbol(uint4 buffer[32], uint offset) {
 
 [numthreads(1, 1, 1)]
 void f() {
-  a(tint_symbol(u, 0u));
-  b(tint_symbol_1(u, 256u));
-  c(tint_symbol_3(u, 260u));
+  a(u_load(0u));
+  b(u_load_1(256u));
+  c(u_load_3(260u));
   uint ubo_load_4 = u[0].z;
   d(vector<float16_t, 2>(float16_t(f16tof32(ubo_load_4 & 0xFFFF)), float16_t(f16tof32(ubo_load_4 >> 16))).yx);
   uint ubo_load_5 = u[0].z;
   e(vector<float16_t, 2>(float16_t(f16tof32(ubo_load_5 & 0xFFFF)), float16_t(f16tof32(ubo_load_5 >> 16))).yx.x);
   return;
 }
-FXC validation failure:
-D:\Projects\RampUp\dawn\test\tint\buffer\Shader@0x000001CA88A4FDA0(3,10-18): error X3000: syntax error: unexpected token 'float16_t'
-

test/tint/buffer/uniform/std140/struct/mat4x2_f16/to_private.wgsl.expected.fxc.hlsl

@@ -11,31 +11,31 @@ cbuffer cbuffer_u : register(b0, space0) {
 };
 static S p[4] = (S[4])0;
 
-matrix<float16_t, 4, 2> tint_symbol_3(uint4 buffer[32], uint offset) {
+matrix<float16_t, 4, 2> u_load_3(uint offset) {
   const uint scalar_offset = ((offset + 0u)) / 4;
-  uint ubo_load = buffer[scalar_offset / 4][scalar_offset % 4];
+  uint ubo_load = u[scalar_offset / 4][scalar_offset % 4];
   const uint scalar_offset_1 = ((offset + 4u)) / 4;
-  uint ubo_load_1 = buffer[scalar_offset_1 / 4][scalar_offset_1 % 4];
+  uint ubo_load_1 = u[scalar_offset_1 / 4][scalar_offset_1 % 4];
   const uint scalar_offset_2 = ((offset + 8u)) / 4;
-  uint ubo_load_2 = buffer[scalar_offset_2 / 4][scalar_offset_2 % 4];
+  uint ubo_load_2 = u[scalar_offset_2 / 4][scalar_offset_2 % 4];
   const uint scalar_offset_3 = ((offset + 12u)) / 4;
-  uint ubo_load_3 = buffer[scalar_offset_3 / 4][scalar_offset_3 % 4];
+  uint ubo_load_3 = u[scalar_offset_3 / 4][scalar_offset_3 % 4];
   return matrix<float16_t, 4, 2>(vector<float16_t, 2>(float16_t(f16tof32(ubo_load & 0xFFFF)), float16_t(f16tof32(ubo_load >> 16))), vector<float16_t, 2>(float16_t(f16tof32(ubo_load_1 & 0xFFFF)), float16_t(f16tof32(ubo_load_1 >> 16))), vector<float16_t, 2>(float16_t(f16tof32(ubo_load_2 & 0xFFFF)), float16_t(f16tof32(ubo_load_2 >> 16))), vector<float16_t, 2>(float16_t(f16tof32(ubo_load_3 & 0xFFFF)), float16_t(f16tof32(ubo_load_3 >> 16))));
 }
 
-S tint_symbol_1(uint4 buffer[32], uint offset) {
+S u_load_1(uint offset) {
   const uint scalar_offset_4 = ((offset + 0u)) / 4;
   const uint scalar_offset_5 = ((offset + 64u)) / 4;
-  const S tint_symbol_5 = {asint(buffer[scalar_offset_4 / 4][scalar_offset_4 % 4]), tint_symbol_3(buffer, (offset + 4u)), asint(buffer[scalar_offset_5 / 4][scalar_offset_5 % 4])};
-  return tint_symbol_5;
+  const S tint_symbol = {asint(u[scalar_offset_4 / 4][scalar_offset_4 % 4]), u_load_3((offset + 4u)), asint(u[scalar_offset_5 / 4][scalar_offset_5 % 4])};
+  return tint_symbol;
 }
 
-typedef S tint_symbol_ret[4];
-tint_symbol_ret tint_symbol(uint4 buffer[32], uint offset) {
+typedef S u_load_ret[4];
+u_load_ret u_load(uint offset) {
   S arr[4] = (S[4])0;
   {
     for(uint i = 0u; (i < 4u); i = (i + 1u)) {
-      arr[i] = tint_symbol_1(buffer, (offset + (i * 128u)));
+      arr[i] = u_load_1((offset + (i * 128u)));
     }
   }
   return arr;
@@ -43,13 +43,10 @@ tint_symbol_ret tint_symbol(uint4 buffer[32], uint offset) {
 
 [numthreads(1, 1, 1)]
 void f() {
-  p = tint_symbol(u, 0u);
-  p[1] = tint_symbol_1(u, 256u);
-  p[3].m = tint_symbol_3(u, 260u);
+  p = u_load(0u);
+  p[1] = u_load_1(256u);
+  p[3].m = u_load_3(260u);
   uint ubo_load_4 = u[0].z;
   p[1].m[0] = vector<float16_t, 2>(float16_t(f16tof32(ubo_load_4 & 0xFFFF)), float16_t(f16tof32(ubo_load_4 >> 16))).yx;
   return;
 }
-FXC validation failure:
-D:\Projects\RampUp\dawn\test\tint\buffer\Shader@0x000002074AC3FD30(3,10-18): error X3000: syntax error: unexpected token 'float16_t'
-

test/tint/buffer/uniform/std140/struct/mat4x2_f16/to_storage.wgsl.expected.fxc.hlsl

@@ -11,53 +11,53 @@ cbuffer cbuffer_u : register(b0, space0) {
 };
 RWByteAddressBuffer s : register(u1, space0);
 
-void tint_symbol_3(RWByteAddressBuffer buffer, uint offset, matrix<float16_t, 4, 2> value) {
-  buffer.Store<vector<float16_t, 2> >((offset + 0u), value[0u]);
-  buffer.Store<vector<float16_t, 2> >((offset + 4u), value[1u]);
-  buffer.Store<vector<float16_t, 2> >((offset + 8u), value[2u]);
-  buffer.Store<vector<float16_t, 2> >((offset + 12u), value[3u]);
+void s_store_3(uint offset, matrix<float16_t, 4, 2> value) {
+  s.Store<vector<float16_t, 2> >((offset + 0u), value[0u]);
+  s.Store<vector<float16_t, 2> >((offset + 4u), value[1u]);
+  s.Store<vector<float16_t, 2> >((offset + 8u), value[2u]);
+  s.Store<vector<float16_t, 2> >((offset + 12u), value[3u]);
 }
 
-void tint_symbol_1(RWByteAddressBuffer buffer, uint offset, S value) {
-  buffer.Store((offset + 0u), asuint(value.before));
-  tint_symbol_3(buffer, (offset + 4u), value.m);
-  buffer.Store((offset + 64u), asuint(value.after));
+void s_store_1(uint offset, S value) {
+  s.Store((offset + 0u), asuint(value.before));
+  s_store_3((offset + 4u), value.m);
+  s.Store((offset + 64u), asuint(value.after));
 }
 
-void tint_symbol(RWByteAddressBuffer buffer, uint offset, S value[4]) {
-  S array[4] = value;
+void s_store(uint offset, S value[4]) {
+  S array_1[4] = value;
   {
     for(uint i = 0u; (i < 4u); i = (i + 1u)) {
-      tint_symbol_1(buffer, (offset + (i * 128u)), array[i]);
+      s_store_1((offset + (i * 128u)), array_1[i]);
     }
   }
 }
 
-matrix<float16_t, 4, 2> tint_symbol_8(uint4 buffer[32], uint offset) {
+matrix<float16_t, 4, 2> u_load_3(uint offset) {
   const uint scalar_offset = ((offset + 0u)) / 4;
-  uint ubo_load = buffer[scalar_offset / 4][scalar_offset % 4];
+  uint ubo_load = u[scalar_offset / 4][scalar_offset % 4];
   const uint scalar_offset_1 = ((offset + 4u)) / 4;
-  uint ubo_load_1 = buffer[scalar_offset_1 / 4][scalar_offset_1 % 4];
+  uint ubo_load_1 = u[scalar_offset_1 / 4][scalar_offset_1 % 4];
   const uint scalar_offset_2 = ((offset + 8u)) / 4;
-  uint ubo_load_2 = buffer[scalar_offset_2 / 4][scalar_offset_2 % 4];
+  uint ubo_load_2 = u[scalar_offset_2 / 4][scalar_offset_2 % 4];
   const uint scalar_offset_3 = ((offset + 12u)) / 4;
-  uint ubo_load_3 = buffer[scalar_offset_3 / 4][scalar_offset_3 % 4];
+  uint ubo_load_3 = u[scalar_offset_3 / 4][scalar_offset_3 % 4];
   return matrix<float16_t, 4, 2>(vector<float16_t, 2>(float16_t(f16tof32(ubo_load & 0xFFFF)), float16_t(f16tof32(ubo_load >> 16))), vector<float16_t, 2>(float16_t(f16tof32(ubo_load_1 & 0xFFFF)), float16_t(f16tof32(ubo_load_1 >> 16))), vector<float16_t, 2>(float16_t(f16tof32(ubo_load_2 & 0xFFFF)), float16_t(f16tof32(ubo_load_2 >> 16))), vector<float16_t, 2>(float16_t(f16tof32(ubo_load_3 & 0xFFFF)), float16_t(f16tof32(ubo_load_3 >> 16))));
 }
 
-S tint_symbol_6(uint4 buffer[32], uint offset) {
+S u_load_1(uint offset) {
   const uint scalar_offset_4 = ((offset + 0u)) / 4;
   const uint scalar_offset_5 = ((offset + 64u)) / 4;
-  const S tint_symbol_10 = {asint(buffer[scalar_offset_4 / 4][scalar_offset_4 % 4]), tint_symbol_8(buffer, (offset + 4u)), asint(buffer[scalar_offset_5 / 4][scalar_offset_5 % 4])};
-  return tint_symbol_10;
+  const S tint_symbol = {asint(u[scalar_offset_4 / 4][scalar_offset_4 % 4]), u_load_3((offset + 4u)), asint(u[scalar_offset_5 / 4][scalar_offset_5 % 4])};
+  return tint_symbol;
 }
 
-typedef S tint_symbol_5_ret[4];
-tint_symbol_5_ret tint_symbol_5(uint4 buffer[32], uint offset) {
+typedef S u_load_ret[4];
+u_load_ret u_load(uint offset) {
   S arr[4] = (S[4])0;
   {
     for(uint i_1 = 0u; (i_1 < 4u); i_1 = (i_1 + 1u)) {
-      arr[i_1] = tint_symbol_6(buffer, (offset + (i_1 * 128u)));
+      arr[i_1] = u_load_1((offset + (i_1 * 128u)));
     }
   }
   return arr;
@@ -65,13 +65,10 @@ tint_symbol_5_ret tint_symbol_5(uint4 buffer[32], uint offset) {
 
 [numthreads(1, 1, 1)]
 void f() {
-  tint_symbol(s, 0u, tint_symbol_5(u, 0u));
-  tint_symbol_1(s, 128u, tint_symbol_6(u, 256u));
-  tint_symbol_3(s, 388u, tint_symbol_8(u, 260u));
+  s_store(0u, u_load(0u));
+  s_store_1(128u, u_load_1(256u));
+  s_store_3(388u, u_load_3(260u));
   uint ubo_load_4 = u[0].z;
   s.Store<vector<float16_t, 2> >(132u, vector<float16_t, 2>(float16_t(f16tof32(ubo_load_4 & 0xFFFF)), float16_t(f16tof32(ubo_load_4 >> 16))).yx);
   return;
 }
-FXC validation failure:
-D:\Projects\RampUp\dawn\test\tint\buffer\Shader@0x00000185CE589540(3,10-18): error X3000: syntax error: unexpected token 'float16_t'
-

test/tint/buffer/uniform/std140/struct/mat4x2_f16/to_workgroup.wgsl.expected.fxc.hlsl

@@ -15,31 +15,31 @@ struct tint_symbol_1 {
   uint local_invocation_index : SV_GroupIndex;
 };
 
-matrix<float16_t, 4, 2> tint_symbol_5(uint4 buffer[32], uint offset) {
+matrix<float16_t, 4, 2> u_load_3(uint offset) {
   const uint scalar_offset = ((offset + 0u)) / 4;
-  uint ubo_load = buffer[scalar_offset / 4][scalar_offset % 4];
+  uint ubo_load = u[scalar_offset / 4][scalar_offset % 4];
   const uint scalar_offset_1 = ((offset + 4u)) / 4;
-  uint ubo_load_1 = buffer[scalar_offset_1 / 4][scalar_offset_1 % 4];
+  uint ubo_load_1 = u[scalar_offset_1 / 4][scalar_offset_1 % 4];
   const uint scalar_offset_2 = ((offset + 8u)) / 4;
-  uint ubo_load_2 = buffer[scalar_offset_2 / 4][scalar_offset_2 % 4];
+  uint ubo_load_2 = u[scalar_offset_2 / 4][scalar_offset_2 % 4];
   const uint scalar_offset_3 = ((offset + 12u)) / 4;
-  uint ubo_load_3 = buffer[scalar_offset_3 / 4][scalar_offset_3 % 4];
+  uint ubo_load_3 = u[scalar_offset_3 / 4][scalar_offset_3 % 4];
   return matrix<float16_t, 4, 2>(vector<float16_t, 2>(float16_t(f16tof32(ubo_load & 0xFFFF)), float16_t(f16tof32(ubo_load >> 16))), vector<float16_t, 2>(float16_t(f16tof32(ubo_load_1 & 0xFFFF)), float16_t(f16tof32(ubo_load_1 >> 16))), vector<float16_t, 2>(float16_t(f16tof32(ubo_load_2 & 0xFFFF)), float16_t(f16tof32(ubo_load_2 >> 16))), vector<float16_t, 2>(float16_t(f16tof32(ubo_load_3 & 0xFFFF)), float16_t(f16tof32(ubo_load_3 >> 16))));
 }
 
-S tint_symbol_3(uint4 buffer[32], uint offset) {
+S u_load_1(uint offset) {
   const uint scalar_offset_4 = ((offset + 0u)) / 4;
   const uint scalar_offset_5 = ((offset + 64u)) / 4;
-  const S tint_symbol_8 = {asint(buffer[scalar_offset_4 / 4][scalar_offset_4 % 4]), tint_symbol_5(buffer, (offset + 4u)), asint(buffer[scalar_offset_5 / 4][scalar_offset_5 % 4])};
-  return tint_symbol_8;
+  const S tint_symbol_3 = {asint(u[scalar_offset_4 / 4][scalar_offset_4 % 4]), u_load_3((offset + 4u)), asint(u[scalar_offset_5 / 4][scalar_offset_5 % 4])};
+  return tint_symbol_3;
 }
 
-typedef S tint_symbol_2_ret[4];
-tint_symbol_2_ret tint_symbol_2(uint4 buffer[32], uint offset) {
+typedef S u_load_ret[4];
+u_load_ret u_load(uint offset) {
   S arr[4] = (S[4])0;
   {
     for(uint i_1 = 0u; (i_1 < 4u); i_1 = (i_1 + 1u)) {
-      arr[i_1] = tint_symbol_3(buffer, (offset + (i_1 * 128u)));
+      arr[i_1] = u_load_1((offset + (i_1 * 128u)));
     }
   }
   return arr;
@@ -49,14 +49,14 @@ void f_inner(uint local_invocation_index) {
   {
     for(uint idx = local_invocation_index; (idx < 4u); idx = (idx + 1u)) {
       const uint i = idx;
-      const S tint_symbol_7 = (S)0;
-      w[i] = tint_symbol_7;
+      const S tint_symbol_2 = (S)0;
+      w[i] = tint_symbol_2;
     }
   }
   GroupMemoryBarrierWithGroupSync();
-  w = tint_symbol_2(u, 0u);
-  w[1] = tint_symbol_3(u, 256u);
-  w[3].m = tint_symbol_5(u, 260u);
+  w = u_load(0u);
+  w[1] = u_load_1(256u);
+  w[3].m = u_load_3(260u);
   uint ubo_load_4 = u[0].z;
   w[1].m[0] = vector<float16_t, 2>(float16_t(f16tof32(ubo_load_4 & 0xFFFF)), float16_t(f16tof32(ubo_load_4 >> 16))).yx;
 }
@@ -66,6 +66,3 @@ void f(tint_symbol_1 tint_symbol) {
   f_inner(tint_symbol.local_invocation_index);
   return;
 }
-FXC validation failure:
-D:\Projects\RampUp\dawn\test\tint\buffer\Shader@0x000001B8BDB52100(3,10-18): error X3000: syntax error: unexpected token 'float16_t'
-

test/tint/buffer/uniform/std140/struct/mat4x3_f16/dynamic_index_via_ptr.wgsl.expected.fxc.hlsl

@@ -17,57 +17,57 @@ int i() {
   return counter;
 }
 
-matrix<float16_t, 4, 3> tint_symbol_8(uint4 buffer[64], uint offset) {
+matrix<float16_t, 4, 3> a_load_4(uint offset) {
   const uint scalar_offset = ((offset + 0u)) / 4;
-  uint4 ubo_load_1 = buffer[scalar_offset / 4];
+  uint4 ubo_load_1 = a[scalar_offset / 4];
   uint2 ubo_load = ((scalar_offset & 2) ? ubo_load_1.zw : ubo_load_1.xy);
   vector<float16_t, 2> ubo_load_xz = vector<float16_t, 2>(f16tof32(ubo_load & 0xFFFF));
   float16_t ubo_load_y = f16tof32(ubo_load[0] >> 16);
   const uint scalar_offset_1 = ((offset + 8u)) / 4;
-  uint4 ubo_load_3 = buffer[scalar_offset_1 / 4];
+  uint4 ubo_load_3 = a[scalar_offset_1 / 4];
   uint2 ubo_load_2 = ((scalar_offset_1 & 2) ? ubo_load_3.zw : ubo_load_3.xy);
   vector<float16_t, 2> ubo_load_2_xz = vector<float16_t, 2>(f16tof32(ubo_load_2 & 0xFFFF));
   float16_t ubo_load_2_y = f16tof32(ubo_load_2[0] >> 16);
   const uint scalar_offset_2 = ((offset + 16u)) / 4;
-  uint4 ubo_load_5 = buffer[scalar_offset_2 / 4];
+  uint4 ubo_load_5 = a[scalar_offset_2 / 4];
   uint2 ubo_load_4 = ((scalar_offset_2 & 2) ? ubo_load_5.zw : ubo_load_5.xy);
   vector<float16_t, 2> ubo_load_4_xz = vector<float16_t, 2>(f16tof32(ubo_load_4 & 0xFFFF));
   float16_t ubo_load_4_y = f16tof32(ubo_load_4[0] >> 16);
   const uint scalar_offset_3 = ((offset + 24u)) / 4;
-  uint4 ubo_load_7 = buffer[scalar_offset_3 / 4];
+  uint4 ubo_load_7 = a[scalar_offset_3 / 4];
   uint2 ubo_load_6 = ((scalar_offset_3 & 2) ? ubo_load_7.zw : ubo_load_7.xy);
   vector<float16_t, 2> ubo_load_6_xz = vector<float16_t, 2>(f16tof32(ubo_load_6 & 0xFFFF));
   float16_t ubo_load_6_y = f16tof32(ubo_load_6[0] >> 16);
   return matrix<float16_t, 4, 3>(vector<float16_t, 3>(ubo_load_xz[0], ubo_load_y, ubo_load_xz[1]), vector<float16_t, 3>(ubo_load_2_xz[0], ubo_load_2_y, ubo_load_2_xz[1]), vector<float16_t, 3>(ubo_load_4_xz[0], ubo_load_4_y, ubo_load_4_xz[1]), vector<float16_t, 3>(ubo_load_6_xz[0], ubo_load_6_y, ubo_load_6_xz[1]));
 }
 
-Inner tint_symbol_7(uint4 buffer[64], uint offset) {
-  const Inner tint_symbol_11 = {tint_symbol_8(buffer, (offset + 0u))};
-  return tint_symbol_11;
+Inner a_load_3(uint offset) {
+  const Inner tint_symbol_4 = {a_load_4((offset + 0u))};
+  return tint_symbol_4;
 }
 
-typedef Inner tint_symbol_6_ret[4];
-tint_symbol_6_ret tint_symbol_6(uint4 buffer[64], uint offset) {
+typedef Inner a_load_2_ret[4];
+a_load_2_ret a_load_2(uint offset) {
   Inner arr[4] = (Inner[4])0;
   {
     for(uint i_1 = 0u; (i_1 < 4u); i_1 = (i_1 + 1u)) {
-      arr[i_1] = tint_symbol_7(buffer, (offset + (i_1 * 64u)));
+      arr[i_1] = a_load_3((offset + (i_1 * 64u)));
     }
   }
   return arr;
 }
 
-Outer tint_symbol_5(uint4 buffer[64], uint offset) {
-  const Outer tint_symbol_12 = {tint_symbol_6(buffer, (offset + 0u))};
-  return tint_symbol_12;
+Outer a_load_1(uint offset) {
+  const Outer tint_symbol_5 = {a_load_2((offset + 0u))};
+  return tint_symbol_5;
 }
 
-typedef Outer tint_symbol_4_ret[4];
-tint_symbol_4_ret tint_symbol_4(uint4 buffer[64], uint offset) {
+typedef Outer a_load_ret[4];
+a_load_ret a_load(uint offset) {
   Outer arr_1[4] = (Outer[4])0;
   {
     for(uint i_2 = 0u; (i_2 < 4u); i_2 = (i_2 + 1u)) {
-      arr_1[i_2] = tint_symbol_5(buffer, (offset + (i_2 * 256u)));
+      arr_1[i_2] = a_load_1((offset + (i_2 * 256u)));
     }
   }
   return arr_1;
@@ -78,11 +78,11 @@ void f() {
   const int p_a_i_save = i();
   const int p_a_i_a_i_save = i();
   const int p_a_i_a_i_m_i_save = i();
-  const Outer l_a[4] = tint_symbol_4(a, 0u);
-  const Outer l_a_i = tint_symbol_5(a, (256u * uint(p_a_i_save)));
-  const Inner l_a_i_a[4] = tint_symbol_6(a, (256u * uint(p_a_i_save)));
-  const Inner l_a_i_a_i = tint_symbol_7(a, ((256u * uint(p_a_i_save)) + (64u * uint(p_a_i_a_i_save))));
-  const matrix<float16_t, 4, 3> l_a_i_a_i_m = tint_symbol_8(a, ((256u * uint(p_a_i_save)) + (64u * uint(p_a_i_a_i_save))));
+  const Outer l_a[4] = a_load(0u);
+  const Outer l_a_i = a_load_1((256u * uint(p_a_i_save)));
+  const Inner l_a_i_a[4] = a_load_2((256u * uint(p_a_i_save)));
+  const Inner l_a_i_a_i = a_load_3(((256u * uint(p_a_i_save)) + (64u * uint(p_a_i_a_i_save))));
+  const matrix<float16_t, 4, 3> l_a_i_a_i_m = a_load_4(((256u * uint(p_a_i_save)) + (64u * uint(p_a_i_a_i_save))));
   const uint scalar_offset_4 = ((((256u * uint(p_a_i_save)) + (64u * uint(p_a_i_a_i_save))) + (8u * uint(p_a_i_a_i_m_i_save)))) / 4;
   uint4 ubo_load_9 = a[scalar_offset_4 / 4];
   uint2 ubo_load_8 = ((scalar_offset_4 & 2) ? ubo_load_9.zw : ubo_load_9.xy);
@@ -98,6 +98,3 @@ void f() {
   const float16_t l_a_i_a_i_m_i_i = float16_t(f16tof32(((a[scalar_offset_index / 4][scalar_offset_index % 4] >> (scalar_offset_bytes % 4 == 0 ? 0 : 16)) & 0xFFFF)));
   return;
 }
-FXC validation failure:
-D:\Projects\RampUp\dawn\test\tint\buffer\Shader@0x00000236CB5C19B0(2,10-18): error X3000: syntax error: unexpected token 'float16_t'
-

test/tint/buffer/uniform/std140/struct/mat4x3_f16/static_index_via_ptr.wgsl.expected.fxc.hlsl

@@ -11,57 +11,57 @@ cbuffer cbuffer_a : register(b0, space0) {
   uint4 a[64];
 };
 
-matrix<float16_t, 4, 3> tint_symbol_4(uint4 buffer[64], uint offset) {
+matrix<float16_t, 4, 3> a_load_4(uint offset) {
   const uint scalar_offset = ((offset + 0u)) / 4;
-  uint4 ubo_load_1 = buffer[scalar_offset / 4];
+  uint4 ubo_load_1 = a[scalar_offset / 4];
   uint2 ubo_load = ((scalar_offset & 2) ? ubo_load_1.zw : ubo_load_1.xy);
   vector<float16_t, 2> ubo_load_xz = vector<float16_t, 2>(f16tof32(ubo_load & 0xFFFF));
   float16_t ubo_load_y = f16tof32(ubo_load[0] >> 16);
   const uint scalar_offset_1 = ((offset + 8u)) / 4;
-  uint4 ubo_load_3 = buffer[scalar_offset_1 / 4];
+  uint4 ubo_load_3 = a[scalar_offset_1 / 4];
   uint2 ubo_load_2 = ((scalar_offset_1 & 2) ? ubo_load_3.zw : ubo_load_3.xy);
   vector<float16_t, 2> ubo_load_2_xz = vector<float16_t, 2>(f16tof32(ubo_load_2 & 0xFFFF));
   float16_t ubo_load_2_y = f16tof32(ubo_load_2[0] >> 16);
   const uint scalar_offset_2 = ((offset + 16u)) / 4;
-  uint4 ubo_load_5 = buffer[scalar_offset_2 / 4];
+  uint4 ubo_load_5 = a[scalar_offset_2 / 4];
   uint2 ubo_load_4 = ((scalar_offset_2 & 2) ? ubo_load_5.zw : ubo_load_5.xy);
   vector<float16_t, 2> ubo_load_4_xz = vector<float16_t, 2>(f16tof32(ubo_load_4 & 0xFFFF));
   float16_t ubo_load_4_y = f16tof32(ubo_load_4[0] >> 16);
   const uint scalar_offset_3 = ((offset + 24u)) / 4;
-  uint4 ubo_load_7 = buffer[scalar_offset_3 / 4];
+  uint4 ubo_load_7 = a[scalar_offset_3 / 4];
   uint2 ubo_load_6 = ((scalar_offset_3 & 2) ? ubo_load_7.zw : ubo_load_7.xy);
   vector<float16_t, 2> ubo_load_6_xz = vector<float16_t, 2>(f16tof32(ubo_load_6 & 0xFFFF));
   float16_t ubo_load_6_y = f16tof32(ubo_load_6[0] >> 16);
   return matrix<float16_t, 4, 3>(vector<float16_t, 3>(ubo_load_xz[0], ubo_load_y, ubo_load_xz[1]), vector<float16_t, 3>(ubo_load_2_xz[0], ubo_load_2_y, ubo_load_2_xz[1]), vector<float16_t, 3>(ubo_load_4_xz[0], ubo_load_4_y, ubo_load_4_xz[1]), vector<float16_t, 3>(ubo_load_6_xz[0], ubo_load_6_y, ubo_load_6_xz[1]));
 }
 
-Inner tint_symbol_3(uint4 buffer[64], uint offset) {
-  const Inner tint_symbol_7 = {tint_symbol_4(buffer, (offset + 0u))};
-  return tint_symbol_7;
+Inner a_load_3(uint offset) {
+  const Inner tint_symbol = {a_load_4((offset + 0u))};
+  return tint_symbol;
 }
 
-typedef Inner tint_symbol_2_ret[4];
-tint_symbol_2_ret tint_symbol_2(uint4 buffer[64], uint offset) {
+typedef Inner a_load_2_ret[4];
+a_load_2_ret a_load_2(uint offset) {
   Inner arr[4] = (Inner[4])0;
   {
     for(uint i = 0u; (i < 4u); i = (i + 1u)) {
-      arr[i] = tint_symbol_3(buffer, (offset + (i * 64u)));
+      arr[i] = a_load_3((offset + (i * 64u)));
     }
   }
   return arr;
 }
 
-Outer tint_symbol_1(uint4 buffer[64], uint offset) {
-  const Outer tint_symbol_8 = {tint_symbol_2(buffer, (offset + 0u))};
-  return tint_symbol_8;
+Outer a_load_1(uint offset) {
+  const Outer tint_symbol_1 = {a_load_2((offset + 0u))};
+  return tint_symbol_1;
 }
 
-typedef Outer tint_symbol_ret[4];
-tint_symbol_ret tint_symbol(uint4 buffer[64], uint offset) {
+typedef Outer a_load_ret[4];
+a_load_ret a_load(uint offset) {
   Outer arr_1[4] = (Outer[4])0;
   {
     for(uint i_1 = 0u; (i_1 < 4u); i_1 = (i_1 + 1u)) {
-      arr_1[i_1] = tint_symbol_1(buffer, (offset + (i_1 * 256u)));
+      arr_1[i_1] = a_load_1((offset + (i_1 * 256u)));
     }
   }
   return arr_1;
@@ -69,11 +69,11 @@ tint_symbol_ret tint_symbol(uint4 buffer[64], uint offset) {
 
 [numthreads(1, 1, 1)]
 void f() {
-  const Outer l_a[4] = tint_symbol(a, 0u);
-  const Outer l_a_3 = tint_symbol_1(a, 768u);
-  const Inner l_a_3_a[4] = tint_symbol_2(a, 768u);
-  const Inner l_a_3_a_2 = tint_symbol_3(a, 896u);
-  const matrix<float16_t, 4, 3> l_a_3_a_2_m = tint_symbol_4(a, 896u);
+  const Outer l_a[4] = a_load(0u);
+  const Outer l_a_3 = a_load_1(768u);
+  const Inner l_a_3_a[4] = a_load_2(768u);
+  const Inner l_a_3_a_2 = a_load_3(896u);
+  const matrix<float16_t, 4, 3> l_a_3_a_2_m = a_load_4(896u);
   uint2 ubo_load_8 = a[56].zw;
   vector<float16_t, 2> ubo_load_8_xz = vector<float16_t, 2>(f16tof32(ubo_load_8 & 0xFFFF));
   float16_t ubo_load_8_y = f16tof32(ubo_load_8[0] >> 16);
@@ -81,6 +81,3 @@ void f() {
   const float16_t l_a_3_a_2_m_1_0 = float16_t(f16tof32(((a[56].z) & 0xFFFF)));
   return;
 }
-FXC validation failure:
-D:\Projects\RampUp\dawn\test\tint\buffer\Shader@0x000001CF48DE1160(2,10-18): error X3000: syntax error: unexpected token 'float16_t'
-

test/tint/buffer/uniform/std140/struct/mat4x3_f16/to_builtin.wgsl.expected.fxc.hlsl

@@ -4,24 +4,24 @@ cbuffer cbuffer_u : register(b0, space0) {
   uint4 u[32];
 };
 
-matrix<float16_t, 4, 3> tint_symbol(uint4 buffer[32], uint offset) {
+matrix<float16_t, 4, 3> u_load(uint offset) {
   const uint scalar_offset = ((offset + 0u)) / 4;
-  uint4 ubo_load_1 = buffer[scalar_offset / 4];
+  uint4 ubo_load_1 = u[scalar_offset / 4];
   uint2 ubo_load = ((scalar_offset & 2) ? ubo_load_1.zw : ubo_load_1.xy);
   vector<float16_t, 2> ubo_load_xz = vector<float16_t, 2>(f16tof32(ubo_load & 0xFFFF));
   float16_t ubo_load_y = f16tof32(ubo_load[0] >> 16);
   const uint scalar_offset_1 = ((offset + 8u)) / 4;
-  uint4 ubo_load_3 = buffer[scalar_offset_1 / 4];
+  uint4 ubo_load_3 = u[scalar_offset_1 / 4];
   uint2 ubo_load_2 = ((scalar_offset_1 & 2) ? ubo_load_3.zw : ubo_load_3.xy);
   vector<float16_t, 2> ubo_load_2_xz = vector<float16_t, 2>(f16tof32(ubo_load_2 & 0xFFFF));
   float16_t ubo_load_2_y = f16tof32(ubo_load_2[0] >> 16);
   const uint scalar_offset_2 = ((offset + 16u)) / 4;
-  uint4 ubo_load_5 = buffer[scalar_offset_2 / 4];
+  uint4 ubo_load_5 = u[scalar_offset_2 / 4];
   uint2 ubo_load_4 = ((scalar_offset_2 & 2) ? ubo_load_5.zw : ubo_load_5.xy);
   vector<float16_t, 2> ubo_load_4_xz = vector<float16_t, 2>(f16tof32(ubo_load_4 & 0xFFFF));
   float16_t ubo_load_4_y = f16tof32(ubo_load_4[0] >> 16);
   const uint scalar_offset_3 = ((offset + 24u)) / 4;
-  uint4 ubo_load_7 = buffer[scalar_offset_3 / 4];
+  uint4 ubo_load_7 = u[scalar_offset_3 / 4];
   uint2 ubo_load_6 = ((scalar_offset_3 & 2) ? ubo_load_7.zw : ubo_load_7.xy);
   vector<float16_t, 2> ubo_load_6_xz = vector<float16_t, 2>(f16tof32(ubo_load_6 & 0xFFFF));
   float16_t ubo_load_6_y = f16tof32(ubo_load_6[0] >> 16);
@@ -30,7 +30,7 @@ matrix<float16_t, 4, 3> tint_symbol(uint4 buffer[32], uint offset) {
 
 [numthreads(1, 1, 1)]
 void f() {
-  const matrix<float16_t, 3, 4> t = transpose(tint_symbol(u, 264u));
+  const matrix<float16_t, 3, 4> t = transpose(u_load(264u));
   uint2 ubo_load_8 = u[1].xy;
   vector<float16_t, 2> ubo_load_8_xz = vector<float16_t, 2>(f16tof32(ubo_load_8 & 0xFFFF));
   float16_t ubo_load_8_y = f16tof32(ubo_load_8[0] >> 16);
@@ -41,6 +41,3 @@ void f() {
   const float16_t a = abs(vector<float16_t, 3>(ubo_load_9_xz[0], ubo_load_9_y, ubo_load_9_xz[1]).zxy.x);
   return;
 }
-FXC validation failure:
-D:\Projects\RampUp\dawn\test\tint\buffer\Shader@0x0000023590C3D7E0(5,8-16): error X3000: syntax error: unexpected token 'float16_t'
-

test/tint/buffer/uniform/std140/struct/mat4x3_f16/to_fn.wgsl.expected.fxc.hlsl

@@ -25,43 +25,43 @@ void d(vector<float16_t, 3> v) {
 void e(float16_t f_1) {
 }
 
-matrix<float16_t, 4, 3> tint_symbol_3(uint4 buffer[32], uint offset) {
+matrix<float16_t, 4, 3> u_load_3(uint offset) {
   const uint scalar_offset = ((offset + 0u)) / 4;
-  uint4 ubo_load_1 = buffer[scalar_offset / 4];
+  uint4 ubo_load_1 = u[scalar_offset / 4];
   uint2 ubo_load = ((scalar_offset & 2) ? ubo_load_1.zw : ubo_load_1.xy);
   vector<float16_t, 2> ubo_load_xz = vector<float16_t, 2>(f16tof32(ubo_load & 0xFFFF));
   float16_t ubo_load_y = f16tof32(ubo_load[0] >> 16);
   const uint scalar_offset_1 = ((offset + 8u)) / 4;
-  uint4 ubo_load_3 = buffer[scalar_offset_1 / 4];
+  uint4 ubo_load_3 = u[scalar_offset_1 / 4];
   uint2 ubo_load_2 = ((scalar_offset_1 & 2) ? ubo_load_3.zw : ubo_load_3.xy);
   vector<float16_t, 2> ubo_load_2_xz = vector<float16_t, 2>(f16tof32(ubo_load_2 & 0xFFFF));
   float16_t ubo_load_2_y = f16tof32(ubo_load_2[0] >> 16);
   const uint scalar_offset_2 = ((offset + 16u)) / 4;
-  uint4 ubo_load_5 = buffer[scalar_offset_2 / 4];
+  uint4 ubo_load_5 = u[scalar_offset_2 / 4];
   uint2 ubo_load_4 = ((scalar_offset_2 & 2) ? ubo_load_5.zw : ubo_load_5.xy);
   vector<float16_t, 2> ubo_load_4_xz = vector<float16_t, 2>(f16tof32(ubo_load_4 & 0xFFFF));
   float16_t ubo_load_4_y = f16tof32(ubo_load_4[0] >> 16);
   const uint scalar_offset_3 = ((offset + 24u)) / 4;
-  uint4 ubo_load_7 = buffer[scalar_offset_3 / 4];
+  uint4 ubo_load_7 = u[scalar_offset_3 / 4];
   uint2 ubo_load_6 = ((scalar_offset_3 & 2) ? ubo_load_7.zw : ubo_load_7.xy);
   vector<float16_t, 2> ubo_load_6_xz = vector<float16_t, 2>(f16tof32(ubo_load_6 & 0xFFFF));
   float16_t ubo_load_6_y = f16tof32(ubo_load_6[0] >> 16);
   return matrix<float16_t, 4, 3>(vector<float16_t, 3>(ubo_load_xz[0], ubo_load_y, ubo_load_xz[1]), vector<float16_t, 3>(ubo_load_2_xz[0], ubo_load_2_y, ubo_load_2_xz[1]), vector<float16_t, 3>(ubo_load_4_xz[0], ubo_load_4_y, ubo_load_4_xz[1]), vector<float16_t, 3>(ubo_load_6_xz[0], ubo_load_6_y, ubo_load_6_xz[1]));
 }
 
-S tint_symbol_1(uint4 buffer[32], uint offset) {
+S u_load_1(uint offset) {
   const uint scalar_offset_4 = ((offset + 0u)) / 4;
   const uint scalar_offset_5 = ((offset + 64u)) / 4;
-  const S tint_symbol_5 = {asint(buffer[scalar_offset_4 / 4][scalar_offset_4 % 4]), tint_symbol_3(buffer, (offset + 8u)), asint(buffer[scalar_offset_5 / 4][scalar_offset_5 % 4])};
-  return tint_symbol_5;
+  const S tint_symbol = {asint(u[scalar_offset_4 / 4][scalar_offset_4 % 4]), u_load_3((offset + 8u)), asint(u[scalar_offset_5 / 4][scalar_offset_5 % 4])};
+  return tint_symbol;
 }
 
-typedef S tint_symbol_ret[4];
-tint_symbol_ret tint_symbol(uint4 buffer[32], uint offset) {
+typedef S u_load_ret[4];
+u_load_ret u_load(uint offset) {
   S arr[4] = (S[4])0;
   {
     for(uint i = 0u; (i < 4u); i = (i + 1u)) {
-      arr[i] = tint_symbol_1(buffer, (offset + (i * 128u)));
+      arr[i] = u_load_1((offset + (i * 128u)));
     }
   }
   return arr;
@@ -69,9 +69,9 @@ tint_symbol_ret tint_symbol(uint4 buffer[32], uint offset) {
 
 [numthreads(1, 1, 1)]
 void f() {
-  a(tint_symbol(u, 0u));
-  b(tint_symbol_1(u, 256u));
-  c(tint_symbol_3(u, 264u));
+  a(u_load(0u));
+  b(u_load_1(256u));
+  c(u_load_3(264u));
   uint2 ubo_load_8 = u[1].xy;
   vector<float16_t, 2> ubo_load_8_xz = vector<float16_t, 2>(f16tof32(ubo_load_8 & 0xFFFF));
   float16_t ubo_load_8_y = f16tof32(ubo_load_8[0] >> 16);
@@ -82,6 +82,3 @@ void f() {
   e(vector<float16_t, 3>(ubo_load_9_xz[0], ubo_load_9_y, ubo_load_9_xz[1]).zxy.x);
   return;
 }
-FXC validation failure:
-D:\Projects\RampUp\dawn\test\tint\buffer\Shader@0x000001FF77F70B40(3,10-18): error X3000: syntax error: unexpected token 'float16_t'
-

test/tint/buffer/uniform/std140/struct/mat4x3_f16/to_private.wgsl.expected.fxc.hlsl

@@ -11,43 +11,43 @@ cbuffer cbuffer_u : register(b0, space0) {
 };
 static S p[4] = (S[4])0;
 
-matrix<float16_t, 4, 3> tint_symbol_3(uint4 buffer[32], uint offset) {
+matrix<float16_t, 4, 3> u_load_3(uint offset) {
   const uint scalar_offset = ((offset + 0u)) / 4;
-  uint4 ubo_load_1 = buffer[scalar_offset / 4];
+  uint4 ubo_load_1 = u[scalar_offset / 4];
   uint2 ubo_load = ((scalar_offset & 2) ? ubo_load_1.zw : ubo_load_1.xy);
   vector<float16_t, 2> ubo_load_xz = vector<float16_t, 2>(f16tof32(ubo_load & 0xFFFF));
   float16_t ubo_load_y = f16tof32(ubo_load[0] >> 16);
   const uint scalar_offset_1 = ((offset + 8u)) / 4;
-  uint4 ubo_load_3 = buffer[scalar_offset_1 / 4];
+  uint4 ubo_load_3 = u[scalar_offset_1 / 4];
   uint2 ubo_load_2 = ((scalar_offset_1 & 2) ? ubo_load_3.zw : ubo_load_3.xy);
   vector<float16_t, 2> ubo_load_2_xz = vector<float16_t, 2>(f16tof32(ubo_load_2 & 0xFFFF));
   float16_t ubo_load_2_y = f16tof32(ubo_load_2[0] >> 16);
   const uint scalar_offset_2 = ((offset + 16u)) / 4;
-  uint4 ubo_load_5 = buffer[scalar_offset_2 / 4];
+  uint4 ubo_load_5 = u[scalar_offset_2 / 4];
   uint2 ubo_load_4 = ((scalar_offset_2 & 2) ? ubo_load_5.zw : ubo_load_5.xy);
   vector<float16_t, 2> ubo_load_4_xz = vector<float16_t, 2>(f16tof32(ubo_load_4 & 0xFFFF));
   float16_t ubo_load_4_y = f16tof32(ubo_load_4[0] >> 16);
   const uint scalar_offset_3 = ((offset + 24u)) / 4;
-  uint4 ubo_load_7 = buffer[scalar_offset_3 / 4];
+  uint4 ubo_load_7 = u[scalar_offset_3 / 4];
   uint2 ubo_load_6 = ((scalar_offset_3 & 2) ? ubo_load_7.zw : ubo_load_7.xy);
   vector<float16_t, 2> ubo_load_6_xz = vector<float16_t, 2>(f16tof32(ubo_load_6 & 0xFFFF));
   float16_t ubo_load_6_y = f16tof32(ubo_load_6[0] >> 16);
   return matrix<float16_t, 4, 3>(vector<float16_t, 3>(ubo_load_xz[0], ubo_load_y, ubo_load_xz[1]), vector<float16_t, 3>(ubo_load_2_xz[0], ubo_load_2_y, ubo_load_2_xz[1]), vector<float16_t, 3>(ubo_load_4_xz[0], ubo_load_4_y, ubo_load_4_xz[1]), vector<float16_t, 3>(ubo_load_6_xz[0], ubo_load_6_y, ubo_load_6_xz[1]));
 }
 
-S tint_symbol_1(uint4 buffer[32], uint offset) {
+S u_load_1(uint offset) {
   const uint scalar_offset_4 = ((offset + 0u)) / 4;
   const uint scalar_offset_5 = ((offset + 64u)) / 4;
-  const S tint_symbol_5 = {asint(buffer[scalar_offset_4 / 4][scalar_offset_4 % 4]), tint_symbol_3(buffer, (offset + 8u)), asint(buffer[scalar_offset_5 / 4][scalar_offset_5 % 4])};
-  return tint_symbol_5;
+  const S tint_symbol = {asint(u[scalar_offset_4 / 4][scalar_offset_4 % 4]), u_load_3((offset + 8u)), asint(u[scalar_offset_5 / 4][scalar_offset_5 % 4])};
+  return tint_symbol;
 }
 
-typedef S tint_symbol_ret[4];
-tint_symbol_ret tint_symbol(uint4 buffer[32], uint offset) {
+typedef S u_load_ret[4];
+u_load_ret u_load(uint offset) {
   S arr[4] = (S[4])0;
   {
     for(uint i = 0u; (i < 4u); i = (i + 1u)) {
-      arr[i] = tint_symbol_1(buffer, (offset + (i * 128u)));
+      arr[i] = u_load_1((offset + (i * 128u)));
     }
   }
   return arr;
@@ -55,15 +55,12 @@ tint_symbol_ret tint_symbol(uint4 buffer[32], uint offset) {
 
 [numthreads(1, 1, 1)]
 void f() {
-  p = tint_symbol(u, 0u);
-  p[1] = tint_symbol_1(u, 256u);
-  p[3].m = tint_symbol_3(u, 264u);
+  p = u_load(0u);
+  p[1] = u_load_1(256u);
+  p[3].m = u_load_3(264u);
   uint2 ubo_load_8 = u[1].xy;
   vector<float16_t, 2> ubo_load_8_xz = vector<float16_t, 2>(f16tof32(ubo_load_8 & 0xFFFF));
   float16_t ubo_load_8_y = f16tof32(ubo_load_8[0] >> 16);
   p[1].m[0] = vector<float16_t, 3>(ubo_load_8_xz[0], ubo_load_8_y, ubo_load_8_xz[1]).zxy;
   return;
 }
-FXC validation failure:
-D:\Projects\RampUp\dawn\test\tint\buffer\Shader@0x0000019CC8F77C00(3,10-18): error X3000: syntax error: unexpected token 'float16_t'
-

test/tint/buffer/uniform/std140/struct/mat4x3_f16/to_storage.wgsl.expected.fxc.hlsl

@@ -11,65 +11,65 @@ cbuffer cbuffer_u : register(b0, space0) {
 };
 RWByteAddressBuffer s : register(u1, space0);
 
-void tint_symbol_3(RWByteAddressBuffer buffer, uint offset, matrix<float16_t, 4, 3> value) {
-  buffer.Store<vector<float16_t, 3> >((offset + 0u), value[0u]);
-  buffer.Store<vector<float16_t, 3> >((offset + 8u), value[1u]);
-  buffer.Store<vector<float16_t, 3> >((offset + 16u), value[2u]);
-  buffer.Store<vector<float16_t, 3> >((offset + 24u), value[3u]);
+void s_store_3(uint offset, matrix<float16_t, 4, 3> value) {
+  s.Store<vector<float16_t, 3> >((offset + 0u), value[0u]);
+  s.Store<vector<float16_t, 3> >((offset + 8u), value[1u]);
+  s.Store<vector<float16_t, 3> >((offset + 16u), value[2u]);
+  s.Store<vector<float16_t, 3> >((offset + 24u), value[3u]);
 }
 
-void tint_symbol_1(RWByteAddressBuffer buffer, uint offset, S value) {
-  buffer.Store((offset + 0u), asuint(value.before));
-  tint_symbol_3(buffer, (offset + 8u), value.m);
-  buffer.Store((offset + 64u), asuint(value.after));
+void s_store_1(uint offset, S value) {
+  s.Store((offset + 0u), asuint(value.before));
+  s_store_3((offset + 8u), value.m);
+  s.Store((offset + 64u), asuint(value.after));
 }
 
-void tint_symbol(RWByteAddressBuffer buffer, uint offset, S value[4]) {
-  S array[4] = value;
+void s_store(uint offset, S value[4]) {
+  S array_1[4] = value;
   {
     for(uint i = 0u; (i < 4u); i = (i + 1u)) {
-      tint_symbol_1(buffer, (offset + (i * 128u)), array[i]);
+      s_store_1((offset + (i * 128u)), array_1[i]);
     }
   }
 }
 
-matrix<float16_t, 4, 3> tint_symbol_8(uint4 buffer[32], uint offset) {
+matrix<float16_t, 4, 3> u_load_3(uint offset) {
   const uint scalar_offset = ((offset + 0u)) / 4;
-  uint4 ubo_load_1 = buffer[scalar_offset / 4];
+  uint4 ubo_load_1 = u[scalar_offset / 4];
   uint2 ubo_load = ((scalar_offset & 2) ? ubo_load_1.zw : ubo_load_1.xy);
   vector<float16_t, 2> ubo_load_xz = vector<float16_t, 2>(f16tof32(ubo_load & 0xFFFF));
   float16_t ubo_load_y = f16tof32(ubo_load[0] >> 16);
   const uint scalar_offset_1 = ((offset + 8u)) / 4;
-  uint4 ubo_load_3 = buffer[scalar_offset_1 / 4];
+  uint4 ubo_load_3 = u[scalar_offset_1 / 4];
   uint2 ubo_load_2 = ((scalar_offset_1 & 2) ? ubo_load_3.zw : ubo_load_3.xy);
   vector<float16_t, 2> ubo_load_2_xz = vector<float16_t, 2>(f16tof32(ubo_load_2 & 0xFFFF));
   float16_t ubo_load_2_y = f16tof32(ubo_load_2[0] >> 16);
   const uint scalar_offset_2 = ((offset + 16u)) / 4;
-  uint4 ubo_load_5 = buffer[scalar_offset_2 / 4];
+  uint4 ubo_load_5 = u[scalar_offset_2 / 4];
   uint2 ubo_load_4 = ((scalar_offset_2 & 2) ? ubo_load_5.zw : ubo_load_5.xy);
   vector<float16_t, 2> ubo_load_4_xz = vector<float16_t, 2>(f16tof32(ubo_load_4 & 0xFFFF));
   float16_t ubo_load_4_y = f16tof32(ubo_load_4[0] >> 16);
   const uint scalar_offset_3 = ((offset + 24u)) / 4;
-  uint4 ubo_load_7 = buffer[scalar_offset_3 / 4];
+  uint4 ubo_load_7 = u[scalar_offset_3 / 4];
   uint2 ubo_load_6 = ((scalar_offset_3 & 2) ? ubo_load_7.zw : ubo_load_7.xy);
   vector<float16_t, 2> ubo_load_6_xz = vector<float16_t, 2>(f16tof32(ubo_load_6 & 0xFFFF));
   float16_t ubo_load_6_y = f16tof32(ubo_load_6[0] >> 16);
   return matrix<float16_t, 4, 3>(vector<float16_t, 3>(ubo_load_xz[0], ubo_load_y, ubo_load_xz[1]), vector<float16_t, 3>(ubo_load_2_xz[0], ubo_load_2_y, ubo_load_2_xz[1]), vector<float16_t, 3>(ubo_load_4_xz[0], ubo_load_4_y, ubo_load_4_xz[1]), vector<float16_t, 3>(ubo_load_6_xz[0], ubo_load_6_y, ubo_load_6_xz[1]));
 }
 
-S tint_symbol_6(uint4 buffer[32], uint offset) {
+S u_load_1(uint offset) {
   const uint scalar_offset_4 = ((offset + 0u)) / 4;
   const uint scalar_offset_5 = ((offset + 64u)) / 4;
-  const S tint_symbol_10 = {asint(buffer[scalar_offset_4 / 4][scalar_offset_4 % 4]), tint_symbol_8(buffer, (offset + 8u)), asint(buffer[scalar_offset_5 / 4][scalar_offset_5 % 4])};
-  return tint_symbol_10;
+  const S tint_symbol = {asint(u[scalar_offset_4 / 4][scalar_offset_4 % 4]), u_load_3((offset + 8u)), asint(u[scalar_offset_5 / 4][scalar_offset_5 % 4])};
+  return tint_symbol;
 }
 
-typedef S tint_symbol_5_ret[4];
-tint_symbol_5_ret tint_symbol_5(uint4 buffer[32], uint offset) {
+typedef S u_load_ret[4];
+u_load_ret u_load(uint offset) {
   S arr[4] = (S[4])0;
   {
     for(uint i_1 = 0u; (i_1 < 4u); i_1 = (i_1 + 1u)) {
-      arr[i_1] = tint_symbol_6(buffer, (offset + (i_1 * 128u)));
+      arr[i_1] = u_load_1((offset + (i_1 * 128u)));
     }
   }
   return arr;
@@ -77,15 +77,12 @@ tint_symbol_5_ret tint_symbol_5(uint4 buffer[32], uint offset) {
 
 [numthreads(1, 1, 1)]
 void f() {
-  tint_symbol(s, 0u, tint_symbol_5(u, 0u));
-  tint_symbol_1(s, 128u, tint_symbol_6(u, 256u));
-  tint_symbol_3(s, 392u, tint_symbol_8(u, 264u));
+  s_store(0u, u_load(0u));
+  s_store_1(128u, u_load_1(256u));
+  s_store_3(392u, u_load_3(264u));
   uint2 ubo_load_8 = u[1].xy;
   vector<float16_t, 2> ubo_load_8_xz = vector<float16_t, 2>(f16tof32(ubo_load_8 & 0xFFFF));
   float16_t ubo_load_8_y = f16tof32(ubo_load_8[0] >> 16);
   s.Store<vector<float16_t, 3> >(136u, vector<float16_t, 3>(ubo_load_8_xz[0], ubo_load_8_y, ubo_load_8_xz[1]).zxy);
   return;
 }
-FXC validation failure:
-D:\Projects\RampUp\dawn\test\tint\buffer\Shader@0x00000168827ABEC0(3,10-18): error X3000: syntax error: unexpected token 'float16_t'
-

test/tint/buffer/uniform/std140/struct/mat4x3_f16/to_workgroup.wgsl.expected.fxc.hlsl

@@ -15,43 +15,43 @@ struct tint_symbol_1 {
   uint local_invocation_index : SV_GroupIndex;
 };
 
-matrix<float16_t, 4, 3> tint_symbol_5(uint4 buffer[32], uint offset) {
+matrix<float16_t, 4, 3> u_load_3(uint offset) {
   const uint scalar_offset = ((offset + 0u)) / 4;
-  uint4 ubo_load_1 = buffer[scalar_offset / 4];
+  uint4 ubo_load_1 = u[scalar_offset / 4];
   uint2 ubo_load = ((scalar_offset & 2) ? ubo_load_1.zw : ubo_load_1.xy);
   vector<float16_t, 2> ubo_load_xz = vector<float16_t, 2>(f16tof32(ubo_load & 0xFFFF));
   float16_t ubo_load_y = f16tof32(ubo_load[0] >> 16);
   const uint scalar_offset_1 = ((offset + 8u)) / 4;
-  uint4 ubo_load_3 = buffer[scalar_offset_1 / 4];
+  uint4 ubo_load_3 = u[scalar_offset_1 / 4];
   uint2 ubo_load_2 = ((scalar_offset_1 & 2) ? ubo_load_3.zw : ubo_load_3.xy);
   vector<float16_t, 2> ubo_load_2_xz = vector<float16_t, 2>(f16tof32(ubo_load_2 & 0xFFFF));
   float16_t ubo_load_2_y = f16tof32(ubo_load_2[0] >> 16);
   const uint scalar_offset_2 = ((offset + 16u)) / 4;
-  uint4 ubo_load_5 = buffer[scalar_offset_2 / 4];
+  uint4 ubo_load_5 = u[scalar_offset_2 / 4];
   uint2 ubo_load_4 = ((scalar_offset_2 & 2) ? ubo_load_5.zw : ubo_load_5.xy);
   vector<float16_t, 2> ubo_load_4_xz = vector<float16_t, 2>(f16tof32(ubo_load_4 & 0xFFFF));
   float16_t ubo_load_4_y = f16tof32(ubo_load_4[0] >> 16);
   const uint scalar_offset_3 = ((offset + 24u)) / 4;
-  uint4 ubo_load_7 = buffer[scalar_offset_3 / 4];
+  uint4 ubo_load_7 = u[scalar_offset_3 / 4];
   uint2 ubo_load_6 = ((scalar_offset_3 & 2) ? ubo_load_7.zw : ubo_load_7.xy);
   vector<float16_t, 2> ubo_load_6_xz = vector<float16_t, 2>(f16tof32(ubo_load_6 & 0xFFFF));
   float16_t ubo_load_6_y = f16tof32(ubo_load_6[0] >> 16);
   return matrix<float16_t, 4, 3>(vector<float16_t, 3>(ubo_load_xz[0], ubo_load_y, ubo_load_xz[1]), vector<float16_t, 3>(ubo_load_2_xz[0], ubo_load_2_y, ubo_load_2_xz[1]), vector<float16_t, 3>(ubo_load_4_xz[0], ubo_load_4_y, ubo_load_4_xz[1]), vector<float16_t, 3>(ubo_load_6_xz[0], ubo_load_6_y, ubo_load_6_xz[1]));
 }
 
-S tint_symbol_3(uint4 buffer[32], uint offset) {
+S u_load_1(uint offset) {
   const uint scalar_offset_4 = ((offset + 0u)) / 4;
   const uint scalar_offset_5 = ((offset + 64u)) / 4;
-  const S tint_symbol_8 = {asint(buffer[scalar_offset_4 / 4][scalar_offset_4 % 4]), tint_symbol_5(buffer, (offset + 8u)), asint(buffer[scalar_offset_5 / 4][scalar_offset_5 % 4])};
-  return tint_symbol_8;
+  const S tint_symbol_3 = {asint(u[scalar_offset_4 / 4][scalar_offset_4 % 4]), u_load_3((offset + 8u)), asint(u[scalar_offset_5 / 4][scalar_offset_5 % 4])};
+  return tint_symbol_3;
 }
 
-typedef S tint_symbol_2_ret[4];
-tint_symbol_2_ret tint_symbol_2(uint4 buffer[32], uint offset) {
+typedef S u_load_ret[4];
+u_load_ret u_load(uint offset) {
   S arr[4] = (S[4])0;
   {
     for(uint i_1 = 0u; (i_1 < 4u); i_1 = (i_1 + 1u)) {
-      arr[i_1] = tint_symbol_3(buffer, (offset + (i_1 * 128u)));
+      arr[i_1] = u_load_1((offset + (i_1 * 128u)));
     }
   }
   return arr;
@@ -61,14 +61,14 @@ void f_inner(uint local_invocation_index) {
   {
     for(uint idx = local_invocation_index; (idx < 4u); idx = (idx + 1u)) {
       const uint i = idx;
-      const S tint_symbol_7 = (S)0;
-      w[i] = tint_symbol_7;
+      const S tint_symbol_2 = (S)0;
+      w[i] = tint_symbol_2;
     }
   }
   GroupMemoryBarrierWithGroupSync();
-  w = tint_symbol_2(u, 0u);
-  w[1] = tint_symbol_3(u, 256u);
-  w[3].m = tint_symbol_5(u, 264u);
+  w = u_load(0u);
+  w[1] = u_load_1(256u);
+  w[3].m = u_load_3(264u);
   uint2 ubo_load_8 = u[1].xy;
   vector<float16_t, 2> ubo_load_8_xz = vector<float16_t, 2>(f16tof32(ubo_load_8 & 0xFFFF));
   float16_t ubo_load_8_y = f16tof32(ubo_load_8[0] >> 16);
@@ -80,6 +80,3 @@ void f(tint_symbol_1 tint_symbol) {
   f_inner(tint_symbol.local_invocation_index);
   return;
 }
-FXC validation failure:
-D:\Projects\RampUp\dawn\test\tint\buffer\Shader@0x000002136A44CFC0(3,10-18): error X3000: syntax error: unexpected token 'float16_t'
-

test/tint/buffer/uniform/std140/struct/mat4x4_f16/dynamic_index_via_ptr.wgsl.expected.fxc.hlsl

@@ -17,57 +17,57 @@ int i() {
   return counter;
 }
 
-matrix<float16_t, 4, 4> tint_symbol_8(uint4 buffer[64], uint offset) {
+matrix<float16_t, 4, 4> a_load_4(uint offset) {
   const uint scalar_offset = ((offset + 0u)) / 4;
-  uint4 ubo_load_1 = buffer[scalar_offset / 4];
+  uint4 ubo_load_1 = a[scalar_offset / 4];
   uint2 ubo_load = ((scalar_offset & 2) ? ubo_load_1.zw : ubo_load_1.xy);
   vector<float16_t, 2> ubo_load_xz = vector<float16_t, 2>(f16tof32(ubo_load & 0xFFFF));
   vector<float16_t, 2> ubo_load_yw = vector<float16_t, 2>(f16tof32(ubo_load >> 16));
   const uint scalar_offset_1 = ((offset + 8u)) / 4;
-  uint4 ubo_load_3 = buffer[scalar_offset_1 / 4];
+  uint4 ubo_load_3 = a[scalar_offset_1 / 4];
   uint2 ubo_load_2 = ((scalar_offset_1 & 2) ? ubo_load_3.zw : ubo_load_3.xy);
   vector<float16_t, 2> ubo_load_2_xz = vector<float16_t, 2>(f16tof32(ubo_load_2 & 0xFFFF));
   vector<float16_t, 2> ubo_load_2_yw = vector<float16_t, 2>(f16tof32(ubo_load_2 >> 16));
   const uint scalar_offset_2 = ((offset + 16u)) / 4;
-  uint4 ubo_load_5 = buffer[scalar_offset_2 / 4];
+  uint4 ubo_load_5 = a[scalar_offset_2 / 4];
   uint2 ubo_load_4 = ((scalar_offset_2 & 2) ? ubo_load_5.zw : ubo_load_5.xy);
   vector<float16_t, 2> ubo_load_4_xz = vector<float16_t, 2>(f16tof32(ubo_load_4 & 0xFFFF));
   vector<float16_t, 2> ubo_load_4_yw = vector<float16_t, 2>(f16tof32(ubo_load_4 >> 16));
   const uint scalar_offset_3 = ((offset + 24u)) / 4;
-  uint4 ubo_load_7 = buffer[scalar_offset_3 / 4];
+  uint4 ubo_load_7 = a[scalar_offset_3 / 4];
   uint2 ubo_load_6 = ((scalar_offset_3 & 2) ? ubo_load_7.zw : ubo_load_7.xy);
   vector<float16_t, 2> ubo_load_6_xz = vector<float16_t, 2>(f16tof32(ubo_load_6 & 0xFFFF));
   vector<float16_t, 2> ubo_load_6_yw = vector<float16_t, 2>(f16tof32(ubo_load_6 >> 16));
   return matrix<float16_t, 4, 4>(vector<float16_t, 4>(ubo_load_xz[0], ubo_load_yw[0], ubo_load_xz[1], ubo_load_yw[1]), vector<float16_t, 4>(ubo_load_2_xz[0], ubo_load_2_yw[0], ubo_load_2_xz[1], ubo_load_2_yw[1]), vector<float16_t, 4>(ubo_load_4_xz[0], ubo_load_4_yw[0], ubo_load_4_xz[1], ubo_load_4_yw[1]), vector<float16_t, 4>(ubo_load_6_xz[0], ubo_load_6_yw[0], ubo_load_6_xz[1], ubo_load_6_yw[1]));
 }
 
-Inner tint_symbol_7(uint4 buffer[64], uint offset) {
-  const Inner tint_symbol_11 = {tint_symbol_8(buffer, (offset + 0u))};
-  return tint_symbol_11;
+Inner a_load_3(uint offset) {
+  const Inner tint_symbol_4 = {a_load_4((offset + 0u))};
+  return tint_symbol_4;
 }
 
-typedef Inner tint_symbol_6_ret[4];
-tint_symbol_6_ret tint_symbol_6(uint4 buffer[64], uint offset) {
+typedef Inner a_load_2_ret[4];
+a_load_2_ret a_load_2(uint offset) {
   Inner arr[4] = (Inner[4])0;
   {
     for(uint i_1 = 0u; (i_1 < 4u); i_1 = (i_1 + 1u)) {
-      arr[i_1] = tint_symbol_7(buffer, (offset + (i_1 * 64u)));
+      arr[i_1] = a_load_3((offset + (i_1 * 64u)));
     }
   }
   return arr;
 }
 
-Outer tint_symbol_5(uint4 buffer[64], uint offset) {
-  const Outer tint_symbol_12 = {tint_symbol_6(buffer, (offset + 0u))};
-  return tint_symbol_12;
+Outer a_load_1(uint offset) {
+  const Outer tint_symbol_5 = {a_load_2((offset + 0u))};
+  return tint_symbol_5;
 }
 
-typedef Outer tint_symbol_4_ret[4];
-tint_symbol_4_ret tint_symbol_4(uint4 buffer[64], uint offset) {
+typedef Outer a_load_ret[4];
+a_load_ret a_load(uint offset) {
   Outer arr_1[4] = (Outer[4])0;
   {
     for(uint i_2 = 0u; (i_2 < 4u); i_2 = (i_2 + 1u)) {
-      arr_1[i_2] = tint_symbol_5(buffer, (offset + (i_2 * 256u)));
+      arr_1[i_2] = a_load_1((offset + (i_2 * 256u)));
     }
   }
   return arr_1;
@@ -78,11 +78,11 @@ void f() {
   const int p_a_i_save = i();
   const int p_a_i_a_i_save = i();
   const int p_a_i_a_i_m_i_save = i();
-  const Outer l_a[4] = tint_symbol_4(a, 0u);
-  const Outer l_a_i = tint_symbol_5(a, (256u * uint(p_a_i_save)));
-  const Inner l_a_i_a[4] = tint_symbol_6(a, (256u * uint(p_a_i_save)));
-  const Inner l_a_i_a_i = tint_symbol_7(a, ((256u * uint(p_a_i_save)) + (64u * uint(p_a_i_a_i_save))));
-  const matrix<float16_t, 4, 4> l_a_i_a_i_m = tint_symbol_8(a, ((256u * uint(p_a_i_save)) + (64u * uint(p_a_i_a_i_save))));
+  const Outer l_a[4] = a_load(0u);
+  const Outer l_a_i = a_load_1((256u * uint(p_a_i_save)));
+  const Inner l_a_i_a[4] = a_load_2((256u * uint(p_a_i_save)));
+  const Inner l_a_i_a_i = a_load_3(((256u * uint(p_a_i_save)) + (64u * uint(p_a_i_a_i_save))));
+  const matrix<float16_t, 4, 4> l_a_i_a_i_m = a_load_4(((256u * uint(p_a_i_save)) + (64u * uint(p_a_i_a_i_save))));
   const uint scalar_offset_4 = ((((256u * uint(p_a_i_save)) + (64u * uint(p_a_i_a_i_save))) + (8u * uint(p_a_i_a_i_m_i_save)))) / 4;
   uint4 ubo_load_9 = a[scalar_offset_4 / 4];
   uint2 ubo_load_8 = ((scalar_offset_4 & 2) ? ubo_load_9.zw : ubo_load_9.xy);
@@ -98,6 +98,3 @@ void f() {
   const float16_t l_a_i_a_i_m_i_i = float16_t(f16tof32(((a[scalar_offset_index / 4][scalar_offset_index % 4] >> (scalar_offset_bytes % 4 == 0 ? 0 : 16)) & 0xFFFF)));
   return;
 }
-FXC validation failure:
-D:\Projects\RampUp\dawn\test\tint\buffer\Shader@0x0000022FAD9FCD80(2,10-18): error X3000: syntax error: unexpected token 'float16_t'
-

test/tint/buffer/uniform/std140/struct/mat4x4_f16/static_index_via_ptr.wgsl.expected.fxc.hlsl

@@ -11,57 +11,57 @@ cbuffer cbuffer_a : register(b0, space0) {
   uint4 a[64];
 };
 
-matrix<float16_t, 4, 4> tint_symbol_4(uint4 buffer[64], uint offset) {
+matrix<float16_t, 4, 4> a_load_4(uint offset) {
   const uint scalar_offset = ((offset + 0u)) / 4;
-  uint4 ubo_load_1 = buffer[scalar_offset / 4];
+  uint4 ubo_load_1 = a[scalar_offset / 4];
   uint2 ubo_load = ((scalar_offset & 2) ? ubo_load_1.zw : ubo_load_1.xy);
   vector<float16_t, 2> ubo_load_xz = vector<float16_t, 2>(f16tof32(ubo_load & 0xFFFF));
   vector<float16_t, 2> ubo_load_yw = vector<float16_t, 2>(f16tof32(ubo_load >> 16));
   const uint scalar_offset_1 = ((offset + 8u)) / 4;
-  uint4 ubo_load_3 = buffer[scalar_offset_1 / 4];
+  uint4 ubo_load_3 = a[scalar_offset_1 / 4];
   uint2 ubo_load_2 = ((scalar_offset_1 & 2) ? ubo_load_3.zw : ubo_load_3.xy);
   vector<float16_t, 2> ubo_load_2_xz = vector<float16_t, 2>(f16tof32(ubo_load_2 & 0xFFFF));
   vector<float16_t, 2> ubo_load_2_yw = vector<float16_t, 2>(f16tof32(ubo_load_2 >> 16));
   const uint scalar_offset_2 = ((offset + 16u)) / 4;
-  uint4 ubo_load_5 = buffer[scalar_offset_2 / 4];
+  uint4 ubo_load_5 = a[scalar_offset_2 / 4];
   uint2 ubo_load_4 = ((scalar_offset_2 & 2) ? ubo_load_5.zw : ubo_load_5.xy);
   vector<float16_t, 2> ubo_load_4_xz = vector<float16_t, 2>(f16tof32(ubo_load_4 & 0xFFFF));
   vector<float16_t, 2> ubo_load_4_yw = vector<float16_t, 2>(f16tof32(ubo_load_4 >> 16));
   const uint scalar_offset_3 = ((offset + 24u)) / 4;
-  uint4 ubo_load_7 = buffer[scalar_offset_3 / 4];
+  uint4 ubo_load_7 = a[scalar_offset_3 / 4];
   uint2 ubo_load_6 = ((scalar_offset_3 & 2) ? ubo_load_7.zw : ubo_load_7.xy);
   vector<float16_t, 2> ubo_load_6_xz = vector<float16_t, 2>(f16tof32(ubo_load_6 & 0xFFFF));
   vector<float16_t, 2> ubo_load_6_yw = vector<float16_t, 2>(f16tof32(ubo_load_6 >> 16));
   return matrix<float16_t, 4, 4>(vector<float16_t, 4>(ubo_load_xz[0], ubo_load_yw[0], ubo_load_xz[1], ubo_load_yw[1]), vector<float16_t, 4>(ubo_load_2_xz[0], ubo_load_2_yw[0], ubo_load_2_xz[1], ubo_load_2_yw[1]), vector<float16_t, 4>(ubo_load_4_xz[0], ubo_load_4_yw[0], ubo_load_4_xz[1], ubo_load_4_yw[1]), vector<float16_t, 4>(ubo_load_6_xz[0], ubo_load_6_yw[0], ubo_load_6_xz[1], ubo_load_6_yw[1]));
 }
 
-Inner tint_symbol_3(uint4 buffer[64], uint offset) {
-  const Inner tint_symbol_7 = {tint_symbol_4(buffer, (offset + 0u))};
-  return tint_symbol_7;
+Inner a_load_3(uint offset) {
+  const Inner tint_symbol = {a_load_4((offset + 0u))};
+  return tint_symbol;
 }
 
-typedef Inner tint_symbol_2_ret[4];
-tint_symbol_2_ret tint_symbol_2(uint4 buffer[64], uint offset) {
+typedef Inner a_load_2_ret[4];
+a_load_2_ret a_load_2(uint offset) {
   Inner arr[4] = (Inner[4])0;
   {
     for(uint i = 0u; (i < 4u); i = (i + 1u)) {
-      arr[i] = tint_symbol_3(buffer, (offset + (i * 64u)));
+      arr[i] = a_load_3((offset + (i * 64u)));
     }
   }
   return arr;
 }
 
-Outer tint_symbol_1(uint4 buffer[64], uint offset) {
-  const Outer tint_symbol_8 = {tint_symbol_2(buffer, (offset + 0u))};
-  return tint_symbol_8;
+Outer a_load_1(uint offset) {
+  const Outer tint_symbol_1 = {a_load_2((offset + 0u))};
+  return tint_symbol_1;
 }
 
-typedef Outer tint_symbol_ret[4];
-tint_symbol_ret tint_symbol(uint4 buffer[64], uint offset) {
+typedef Outer a_load_ret[4];
+a_load_ret a_load(uint offset) {
   Outer arr_1[4] = (Outer[4])0;
   {
     for(uint i_1 = 0u; (i_1 < 4u); i_1 = (i_1 + 1u)) {
-      arr_1[i_1] = tint_symbol_1(buffer, (offset + (i_1 * 256u)));
+      arr_1[i_1] = a_load_1((offset + (i_1 * 256u)));
     }
   }
   return arr_1;
@@ -69,11 +69,11 @@ tint_symbol_ret tint_symbol(uint4 buffer[64], uint offset) {
 
 [numthreads(1, 1, 1)]
 void f() {
-  const Outer l_a[4] = tint_symbol(a, 0u);
-  const Outer l_a_3 = tint_symbol_1(a, 768u);
-  const Inner l_a_3_a[4] = tint_symbol_2(a, 768u);
-  const Inner l_a_3_a_2 = tint_symbol_3(a, 896u);
-  const matrix<float16_t, 4, 4> l_a_3_a_2_m = tint_symbol_4(a, 896u);
+  const Outer l_a[4] = a_load(0u);
+  const Outer l_a_3 = a_load_1(768u);
+  const Inner l_a_3_a[4] = a_load_2(768u);
+  const Inner l_a_3_a_2 = a_load_3(896u);
+  const matrix<float16_t, 4, 4> l_a_3_a_2_m = a_load_4(896u);
   uint2 ubo_load_8 = a[56].zw;
   vector<float16_t, 2> ubo_load_8_xz = vector<float16_t, 2>(f16tof32(ubo_load_8 & 0xFFFF));
   vector<float16_t, 2> ubo_load_8_yw = vector<float16_t, 2>(f16tof32(ubo_load_8 >> 16));
@@ -81,6 +81,3 @@ void f() {
   const float16_t l_a_3_a_2_m_1_0 = float16_t(f16tof32(((a[56].z) & 0xFFFF)));
   return;
 }
-FXC validation failure:
-D:\Projects\RampUp\dawn\test\tint\buffer\Shader@0x0000015C09593480(2,10-18): error X3000: syntax error: unexpected token 'float16_t'
-

test/tint/buffer/uniform/std140/struct/mat4x4_f16/to_builtin.wgsl.expected.fxc.hlsl

@@ -4,24 +4,24 @@ cbuffer cbuffer_u : register(b0, space0) {
   uint4 u[32];
 };
 
-matrix<float16_t, 4, 4> tint_symbol(uint4 buffer[32], uint offset) {
+matrix<float16_t, 4, 4> u_load(uint offset) {
   const uint scalar_offset = ((offset + 0u)) / 4;
-  uint4 ubo_load_1 = buffer[scalar_offset / 4];
+  uint4 ubo_load_1 = u[scalar_offset / 4];
   uint2 ubo_load = ((scalar_offset & 2) ? ubo_load_1.zw : ubo_load_1.xy);
   vector<float16_t, 2> ubo_load_xz = vector<float16_t, 2>(f16tof32(ubo_load & 0xFFFF));
   vector<float16_t, 2> ubo_load_yw = vector<float16_t, 2>(f16tof32(ubo_load >> 16));
   const uint scalar_offset_1 = ((offset + 8u)) / 4;
-  uint4 ubo_load_3 = buffer[scalar_offset_1 / 4];
+  uint4 ubo_load_3 = u[scalar_offset_1 / 4];
   uint2 ubo_load_2 = ((scalar_offset_1 & 2) ? ubo_load_3.zw : ubo_load_3.xy);
   vector<float16_t, 2> ubo_load_2_xz = vector<float16_t, 2>(f16tof32(ubo_load_2 & 0xFFFF));
   vector<float16_t, 2> ubo_load_2_yw = vector<float16_t, 2>(f16tof32(ubo_load_2 >> 16));
   const uint scalar_offset_2 = ((offset + 16u)) / 4;
-  uint4 ubo_load_5 = buffer[scalar_offset_2 / 4];
+  uint4 ubo_load_5 = u[scalar_offset_2 / 4];
   uint2 ubo_load_4 = ((scalar_offset_2 & 2) ? ubo_load_5.zw : ubo_load_5.xy);
   vector<float16_t, 2> ubo_load_4_xz = vector<float16_t, 2>(f16tof32(ubo_load_4 & 0xFFFF));
   vector<float16_t, 2> ubo_load_4_yw = vector<float16_t, 2>(f16tof32(ubo_load_4 >> 16));
   const uint scalar_offset_3 = ((offset + 24u)) / 4;
-  uint4 ubo_load_7 = buffer[scalar_offset_3 / 4];
+  uint4 ubo_load_7 = u[scalar_offset_3 / 4];
   uint2 ubo_load_6 = ((scalar_offset_3 & 2) ? ubo_load_7.zw : ubo_load_7.xy);
   vector<float16_t, 2> ubo_load_6_xz = vector<float16_t, 2>(f16tof32(ubo_load_6 & 0xFFFF));
   vector<float16_t, 2> ubo_load_6_yw = vector<float16_t, 2>(f16tof32(ubo_load_6 >> 16));
@@ -30,7 +30,7 @@ matrix<float16_t, 4, 4> tint_symbol(uint4 buffer[32], uint offset) {
 
 [numthreads(1, 1, 1)]
 void f() {
-  const matrix<float16_t, 4, 4> t = transpose(tint_symbol(u, 264u));
+  const matrix<float16_t, 4, 4> t = transpose(u_load(264u));
   uint2 ubo_load_8 = u[1].xy;
   vector<float16_t, 2> ubo_load_8_xz = vector<float16_t, 2>(f16tof32(ubo_load_8 & 0xFFFF));
   vector<float16_t, 2> ubo_load_8_yw = vector<float16_t, 2>(f16tof32(ubo_load_8 >> 16));
@@ -41,6 +41,3 @@ void f() {
   const float16_t a = abs(vector<float16_t, 4>(ubo_load_9_xz[0], ubo_load_9_yw[0], ubo_load_9_xz[1], ubo_load_9_yw[1]).ywxz.x);
   return;
 }
-FXC validation failure:
-D:\Projects\RampUp\dawn\test\tint\buffer\Shader@0x0000025F14CDF3D0(5,8-16): error X3000: syntax error: unexpected token 'float16_t'
-

test/tint/buffer/uniform/std140/struct/mat4x4_f16/to_fn.wgsl.expected.fxc.hlsl

@@ -25,43 +25,43 @@ void d(vector<float16_t, 4> v) {
 void e(float16_t f_1) {
 }
 
-matrix<float16_t, 4, 4> tint_symbol_3(uint4 buffer[32], uint offset) {
+matrix<float16_t, 4, 4> u_load_3(uint offset) {
   const uint scalar_offset = ((offset + 0u)) / 4;
-  uint4 ubo_load_1 = buffer[scalar_offset / 4];
+  uint4 ubo_load_1 = u[scalar_offset / 4];
   uint2 ubo_load = ((scalar_offset & 2) ? ubo_load_1.zw : ubo_load_1.xy);
   vector<float16_t, 2> ubo_load_xz = vector<float16_t, 2>(f16tof32(ubo_load & 0xFFFF));
   vector<float16_t, 2> ubo_load_yw = vector<float16_t, 2>(f16tof32(ubo_load >> 16));
   const uint scalar_offset_1 = ((offset + 8u)) / 4;
-  uint4 ubo_load_3 = buffer[scalar_offset_1 / 4];
+  uint4 ubo_load_3 = u[scalar_offset_1 / 4];
   uint2 ubo_load_2 = ((scalar_offset_1 & 2) ? ubo_load_3.zw : ubo_load_3.xy);
   vector<float16_t, 2> ubo_load_2_xz = vector<float16_t, 2>(f16tof32(ubo_load_2 & 0xFFFF));
   vector<float16_t, 2> ubo_load_2_yw = vector<float16_t, 2>(f16tof32(ubo_load_2 >> 16));
   const uint scalar_offset_2 = ((offset + 16u)) / 4;
-  uint4 ubo_load_5 = buffer[scalar_offset_2 / 4];
+  uint4 ubo_load_5 = u[scalar_offset_2 / 4];
   uint2 ubo_load_4 = ((scalar_offset_2 & 2) ? ubo_load_5.zw : ubo_load_5.xy);
   vector<float16_t, 2> ubo_load_4_xz = vector<float16_t, 2>(f16tof32(ubo_load_4 & 0xFFFF));
   vector<float16_t, 2> ubo_load_4_yw = vector<float16_t, 2>(f16tof32(ubo_load_4 >> 16));
   const uint scalar_offset_3 = ((offset + 24u)) / 4;
-  uint4 ubo_load_7 = buffer[scalar_offset_3 / 4];
+  uint4 ubo_load_7 = u[scalar_offset_3 / 4];
   uint2 ubo_load_6 = ((scalar_offset_3 & 2) ? ubo_load_7.zw : ubo_load_7.xy);
   vector<float16_t, 2> ubo_load_6_xz = vector<float16_t, 2>(f16tof32(ubo_load_6 & 0xFFFF));
   vector<float16_t, 2> ubo_load_6_yw = vector<float16_t, 2>(f16tof32(ubo_load_6 >> 16));
   return matrix<float16_t, 4, 4>(vector<float16_t, 4>(ubo_load_xz[0], ubo_load_yw[0], ubo_load_xz[1], ubo_load_yw[1]), vector<float16_t, 4>(ubo_load_2_xz[0], ubo_load_2_yw[0], ubo_load_2_xz[1], ubo_load_2_yw[1]), vector<float16_t, 4>(ubo_load_4_xz[0], ubo_load_4_yw[0], ubo_load_4_xz[1], ubo_load_4_yw[1]), vector<float16_t, 4>(ubo_load_6_xz[0], ubo_load_6_yw[0], ubo_load_6_xz[1], ubo_load_6_yw[1]));
 }
 
-S tint_symbol_1(uint4 buffer[32], uint offset) {
+S u_load_1(uint offset) {
   const uint scalar_offset_4 = ((offset + 0u)) / 4;
   const uint scalar_offset_5 = ((offset + 64u)) / 4;
-  const S tint_symbol_5 = {asint(buffer[scalar_offset_4 / 4][scalar_offset_4 % 4]), tint_symbol_3(buffer, (offset + 8u)), asint(buffer[scalar_offset_5 / 4][scalar_offset_5 % 4])};
-  return tint_symbol_5;
+  const S tint_symbol = {asint(u[scalar_offset_4 / 4][scalar_offset_4 % 4]), u_load_3((offset + 8u)), asint(u[scalar_offset_5 / 4][scalar_offset_5 % 4])};
+  return tint_symbol;
 }
 
-typedef S tint_symbol_ret[4];
-tint_symbol_ret tint_symbol(uint4 buffer[32], uint offset) {
+typedef S u_load_ret[4];
+u_load_ret u_load(uint offset) {
   S arr[4] = (S[4])0;
   {
     for(uint i = 0u; (i < 4u); i = (i + 1u)) {
-      arr[i] = tint_symbol_1(buffer, (offset + (i * 128u)));
+      arr[i] = u_load_1((offset + (i * 128u)));
     }
   }
   return arr;
@@ -69,9 +69,9 @@ tint_symbol_ret tint_symbol(uint4 buffer[32], uint offset) {
 
 [numthreads(1, 1, 1)]
 void f() {
-  a(tint_symbol(u, 0u));
-  b(tint_symbol_1(u, 256u));
-  c(tint_symbol_3(u, 264u));
+  a(u_load(0u));
+  b(u_load_1(256u));
+  c(u_load_3(264u));
   uint2 ubo_load_8 = u[1].xy;
   vector<float16_t, 2> ubo_load_8_xz = vector<float16_t, 2>(f16tof32(ubo_load_8 & 0xFFFF));
   vector<float16_t, 2> ubo_load_8_yw = vector<float16_t, 2>(f16tof32(ubo_load_8 >> 16));
@@ -82,6 +82,3 @@ void f() {
   e(vector<float16_t, 4>(ubo_load_9_xz[0], ubo_load_9_yw[0], ubo_load_9_xz[1], ubo_load_9_yw[1]).ywxz.x);
   return;
 }
-FXC validation failure:
-D:\Projects\RampUp\dawn\test\tint\buffer\Shader@0x00000151DEE459C0(3,10-18): error X3000: syntax error: unexpected token 'float16_t'
-

test/tint/buffer/uniform/std140/struct/mat4x4_f16/to_private.wgsl.expected.fxc.hlsl

@@ -11,43 +11,43 @@ cbuffer cbuffer_u : register(b0, space0) {
 };
 static S p[4] = (S[4])0;
 
-matrix<float16_t, 4, 4> tint_symbol_3(uint4 buffer[32], uint offset) {
+matrix<float16_t, 4, 4> u_load_3(uint offset) {
   const uint scalar_offset = ((offset + 0u)) / 4;
-  uint4 ubo_load_1 = buffer[scalar_offset / 4];
+  uint4 ubo_load_1 = u[scalar_offset / 4];
   uint2 ubo_load = ((scalar_offset & 2) ? ubo_load_1.zw : ubo_load_1.xy);
   vector<float16_t, 2> ubo_load_xz = vector<float16_t, 2>(f16tof32(ubo_load & 0xFFFF));
   vector<float16_t, 2> ubo_load_yw = vector<float16_t, 2>(f16tof32(ubo_load >> 16));
   const uint scalar_offset_1 = ((offset + 8u)) / 4;
-  uint4 ubo_load_3 = buffer[scalar_offset_1 / 4];
+  uint4 ubo_load_3 = u[scalar_offset_1 / 4];
   uint2 ubo_load_2 = ((scalar_offset_1 & 2) ? ubo_load_3.zw : ubo_load_3.xy);
   vector<float16_t, 2> ubo_load_2_xz = vector<float16_t, 2>(f16tof32(ubo_load_2 & 0xFFFF));
   vector<float16_t, 2> ubo_load_2_yw = vector<float16_t, 2>(f16tof32(ubo_load_2 >> 16));
   const uint scalar_offset_2 = ((offset + 16u)) / 4;
-  uint4 ubo_load_5 = buffer[scalar_offset_2 / 4];
+  uint4 ubo_load_5 = u[scalar_offset_2 / 4];
   uint2 ubo_load_4 = ((scalar_offset_2 & 2) ? ubo_load_5.zw : ubo_load_5.xy);
   vector<float16_t, 2> ubo_load_4_xz = vector<float16_t, 2>(f16tof32(ubo_load_4 & 0xFFFF));
   vector<float16_t, 2> ubo_load_4_yw = vector<float16_t, 2>(f16tof32(ubo_load_4 >> 16));
   const uint scalar_offset_3 = ((offset + 24u)) / 4;
-  uint4 ubo_load_7 = buffer[scalar_offset_3 / 4];
+  uint4 ubo_load_7 = u[scalar_offset_3 / 4];
   uint2 ubo_load_6 = ((scalar_offset_3 & 2) ? ubo_load_7.zw : ubo_load_7.xy);
   vector<float16_t, 2> ubo_load_6_xz = vector<float16_t, 2>(f16tof32(ubo_load_6 & 0xFFFF));
   vector<float16_t, 2> ubo_load_6_yw = vector<float16_t, 2>(f16tof32(ubo_load_6 >> 16));
   return matrix<float16_t, 4, 4>(vector<float16_t, 4>(ubo_load_xz[0], ubo_load_yw[0], ubo_load_xz[1], ubo_load_yw[1]), vector<float16_t, 4>(ubo_load_2_xz[0], ubo_load_2_yw[0], ubo_load_2_xz[1], ubo_load_2_yw[1]), vector<float16_t, 4>(ubo_load_4_xz[0], ubo_load_4_yw[0], ubo_load_4_xz[1], ubo_load_4_yw[1]), vector<float16_t, 4>(ubo_load_6_xz[0], ubo_load_6_yw[0], ubo_load_6_xz[1], ubo_load_6_yw[1]));
 }
 
-S tint_symbol_1(uint4 buffer[32], uint offset) {
+S u_load_1(uint offset) {
   const uint scalar_offset_4 = ((offset + 0u)) / 4;
   const uint scalar_offset_5 = ((offset + 64u)) / 4;
-  const S tint_symbol_5 = {asint(buffer[scalar_offset_4 / 4][scalar_offset_4 % 4]), tint_symbol_3(buffer, (offset + 8u)), asint(buffer[scalar_offset_5 / 4][scalar_offset_5 % 4])};
-  return tint_symbol_5;
+  const S tint_symbol = {asint(u[scalar_offset_4 / 4][scalar_offset_4 % 4]), u_load_3((offset + 8u)), asint(u[scalar_offset_5 / 4][scalar_offset_5 % 4])};
+  return tint_symbol;
 }
 
-typedef S tint_symbol_ret[4];
-tint_symbol_ret tint_symbol(uint4 buffer[32], uint offset) {
+typedef S u_load_ret[4];
+u_load_ret u_load(uint offset) {
   S arr[4] = (S[4])0;
   {
     for(uint i = 0u; (i < 4u); i = (i + 1u)) {
-      arr[i] = tint_symbol_1(buffer, (offset + (i * 128u)));
+      arr[i] = u_load_1((offset + (i * 128u)));
     }
   }
   return arr;
@@ -55,15 +55,12 @@ tint_symbol_ret tint_symbol(uint4 buffer[32], uint offset) {
 
 [numthreads(1, 1, 1)]
 void f() {
-  p = tint_symbol(u, 0u);
-  p[1] = tint_symbol_1(u, 256u);
-  p[3].m = tint_symbol_3(u, 264u);
+  p = u_load(0u);
+  p[1] = u_load_1(256u);
+  p[3].m = u_load_3(264u);
   uint2 ubo_load_8 = u[1].xy;
   vector<float16_t, 2> ubo_load_8_xz = vector<float16_t, 2>(f16tof32(ubo_load_8 & 0xFFFF));
   vector<float16_t, 2> ubo_load_8_yw = vector<float16_t, 2>(f16tof32(ubo_load_8 >> 16));
   p[1].m[0] = vector<float16_t, 4>(ubo_load_8_xz[0], ubo_load_8_yw[0], ubo_load_8_xz[1], ubo_load_8_yw[1]).ywxz;
   return;
 }
-FXC validation failure:
-D:\Projects\RampUp\dawn\test\tint\buffer\Shader@0x000001D8880F79A0(3,10-18): error X3000: syntax error: unexpected token 'float16_t'
-

test/tint/buffer/uniform/std140/struct/mat4x4_f16/to_storage.wgsl.expected.fxc.hlsl

@@ -11,65 +11,65 @@ cbuffer cbuffer_u : register(b0, space0) {
 };
 RWByteAddressBuffer s : register(u1, space0);
 
-void tint_symbol_3(RWByteAddressBuffer buffer, uint offset, matrix<float16_t, 4, 4> value) {
-  buffer.Store<vector<float16_t, 4> >((offset + 0u), value[0u]);
-  buffer.Store<vector<float16_t, 4> >((offset + 8u), value[1u]);
-  buffer.Store<vector<float16_t, 4> >((offset + 16u), value[2u]);
-  buffer.Store<vector<float16_t, 4> >((offset + 24u), value[3u]);
+void s_store_3(uint offset, matrix<float16_t, 4, 4> value) {
+  s.Store<vector<float16_t, 4> >((offset + 0u), value[0u]);
+  s.Store<vector<float16_t, 4> >((offset + 8u), value[1u]);
+  s.Store<vector<float16_t, 4> >((offset + 16u), value[2u]);
+  s.Store<vector<float16_t, 4> >((offset + 24u), value[3u]);
 }
 
-void tint_symbol_1(RWByteAddressBuffer buffer, uint offset, S value) {
-  buffer.Store((offset + 0u), asuint(value.before));
-  tint_symbol_3(buffer, (offset + 8u), value.m);
-  buffer.Store((offset + 64u), asuint(value.after));
+void s_store_1(uint offset, S value) {
+  s.Store((offset + 0u), asuint(value.before));
+  s_store_3((offset + 8u), value.m);
+  s.Store((offset + 64u), asuint(value.after));
 }
 
-void tint_symbol(RWByteAddressBuffer buffer, uint offset, S value[4]) {
-  S array[4] = value;
+void s_store(uint offset, S value[4]) {
+  S array_1[4] = value;
   {
     for(uint i = 0u; (i < 4u); i = (i + 1u)) {
-      tint_symbol_1(buffer, (offset + (i * 128u)), array[i]);
+      s_store_1((offset + (i * 128u)), array_1[i]);
     }
   }
 }
 
-matrix<float16_t, 4, 4> tint_symbol_8(uint4 buffer[32], uint offset) {
+matrix<float16_t, 4, 4> u_load_3(uint offset) {
   const uint scalar_offset = ((offset + 0u)) / 4;
-  uint4 ubo_load_1 = buffer[scalar_offset / 4];
+  uint4 ubo_load_1 = u[scalar_offset / 4];
   uint2 ubo_load = ((scalar_offset & 2) ? ubo_load_1.zw : ubo_load_1.xy);
   vector<float16_t, 2> ubo_load_xz = vector<float16_t, 2>(f16tof32(ubo_load & 0xFFFF));
   vector<float16_t, 2> ubo_load_yw = vector<float16_t, 2>(f16tof32(ubo_load >> 16));
   const uint scalar_offset_1 = ((offset + 8u)) / 4;
-  uint4 ubo_load_3 = buffer[scalar_offset_1 / 4];
+  uint4 ubo_load_3 = u[scalar_offset_1 / 4];
   uint2 ubo_load_2 = ((scalar_offset_1 & 2) ? ubo_load_3.zw : ubo_load_3.xy);
   vector<float16_t, 2> ubo_load_2_xz = vector<float16_t, 2>(f16tof32(ubo_load_2 & 0xFFFF));
   vector<float16_t, 2> ubo_load_2_yw = vector<float16_t, 2>(f16tof32(ubo_load_2 >> 16));
   const uint scalar_offset_2 = ((offset + 16u)) / 4;
-  uint4 ubo_load_5 = buffer[scalar_offset_2 / 4];
+  uint4 ubo_load_5 = u[scalar_offset_2 / 4];
   uint2 ubo_load_4 = ((scalar_offset_2 & 2) ? ubo_load_5.zw : ubo_load_5.xy);
   vector<float16_t, 2> ubo_load_4_xz = vector<float16_t, 2>(f16tof32(ubo_load_4 & 0xFFFF));
   vector<float16_t, 2> ubo_load_4_yw = vector<float16_t, 2>(f16tof32(ubo_load_4 >> 16));
   const uint scalar_offset_3 = ((offset + 24u)) / 4;
-  uint4 ubo_load_7 = buffer[scalar_offset_3 / 4];
+  uint4 ubo_load_7 = u[scalar_offset_3 / 4];
   uint2 ubo_load_6 = ((scalar_offset_3 & 2) ? ubo_load_7.zw : ubo_load_7.xy);
   vector<float16_t, 2> ubo_load_6_xz = vector<float16_t, 2>(f16tof32(ubo_load_6 & 0xFFFF));
   vector<float16_t, 2> ubo_load_6_yw = vector<float16_t, 2>(f16tof32(ubo_load_6 >> 16));
   return matrix<float16_t, 4, 4>(vector<float16_t, 4>(ubo_load_xz[0], ubo_load_yw[0], ubo_load_xz[1], ubo_load_yw[1]), vector<float16_t, 4>(ubo_load_2_xz[0], ubo_load_2_yw[0], ubo_load_2_xz[1], ubo_load_2_yw[1]), vector<float16_t, 4>(ubo_load_4_xz[0], ubo_load_4_yw[0], ubo_load_4_xz[1], ubo_load_4_yw[1]), vector<float16_t, 4>(ubo_load_6_xz[0], ubo_load_6_yw[0], ubo_load_6_xz[1], ubo_load_6_yw[1]));
 }
 
-S tint_symbol_6(uint4 buffer[32], uint offset) {
+S u_load_1(uint offset) {
   const uint scalar_offset_4 = ((offset + 0u)) / 4;
   const uint scalar_offset_5 = ((offset + 64u)) / 4;
-  const S tint_symbol_10 = {asint(buffer[scalar_offset_4 / 4][scalar_offset_4 % 4]), tint_symbol_8(buffer, (offset + 8u)), asint(buffer[scalar_offset_5 / 4][scalar_offset_5 % 4])};
-  return tint_symbol_10;
+  const S tint_symbol = {asint(u[scalar_offset_4 / 4][scalar_offset_4 % 4]), u_load_3((offset + 8u)), asint(u[scalar_offset_5 / 4][scalar_offset_5 % 4])};
+  return tint_symbol;
 }
 
-typedef S tint_symbol_5_ret[4];
-tint_symbol_5_ret tint_symbol_5(uint4 buffer[32], uint offset) {
+typedef S u_load_ret[4];
+u_load_ret u_load(uint offset) {
   S arr[4] = (S[4])0;
   {
     for(uint i_1 = 0u; (i_1 < 4u); i_1 = (i_1 + 1u)) {
-      arr[i_1] = tint_symbol_6(buffer, (offset + (i_1 * 128u)));
+      arr[i_1] = u_load_1((offset + (i_1 * 128u)));
     }
   }
   return arr;
@@ -77,15 +77,12 @@ tint_symbol_5_ret tint_symbol_5(uint4 buffer[32], uint offset) {
 
 [numthreads(1, 1, 1)]
 void f() {
-  tint_symbol(s, 0u, tint_symbol_5(u, 0u));
-  tint_symbol_1(s, 128u, tint_symbol_6(u, 256u));
-  tint_symbol_3(s, 392u, tint_symbol_8(u, 264u));
+  s_store(0u, u_load(0u));
+  s_store_1(128u, u_load_1(256u));
+  s_store_3(392u, u_load_3(264u));
   uint2 ubo_load_8 = u[1].xy;
   vector<float16_t, 2> ubo_load_8_xz = vector<float16_t, 2>(f16tof32(ubo_load_8 & 0xFFFF));
   vector<float16_t, 2> ubo_load_8_yw = vector<float16_t, 2>(f16tof32(ubo_load_8 >> 16));
   s.Store<vector<float16_t, 4> >(136u, vector<float16_t, 4>(ubo_load_8_xz[0], ubo_load_8_yw[0], ubo_load_8_xz[1], ubo_load_8_yw[1]).ywxz);
   return;
 }
-FXC validation failure:
-D:\Projects\RampUp\dawn\test\tint\buffer\Shader@0x0000013BAAFBAEB0(3,10-18): error X3000: syntax error: unexpected token 'float16_t'
-

test/tint/buffer/uniform/std140/struct/mat4x4_f16/to_workgroup.wgsl.expected.fxc.hlsl

@@ -15,43 +15,43 @@ struct tint_symbol_1 {
   uint local_invocation_index : SV_GroupIndex;
 };
 
-matrix<float16_t, 4, 4> tint_symbol_5(uint4 buffer[32], uint offset) {
+matrix<float16_t, 4, 4> u_load_3(uint offset) {
   const uint scalar_offset = ((offset + 0u)) / 4;
-  uint4 ubo_load_1 = buffer[scalar_offset / 4];
+  uint4 ubo_load_1 = u[scalar_offset / 4];
   uint2 ubo_load = ((scalar_offset & 2) ? ubo_load_1.zw : ubo_load_1.xy);
   vector<float16_t, 2> ubo_load_xz = vector<float16_t, 2>(f16tof32(ubo_load & 0xFFFF));
   vector<float16_t, 2> ubo_load_yw = vector<float16_t, 2>(f16tof32(ubo_load >> 16));
   const uint scalar_offset_1 = ((offset + 8u)) / 4;
-  uint4 ubo_load_3 = buffer[scalar_offset_1 / 4];
+  uint4 ubo_load_3 = u[scalar_offset_1 / 4];
   uint2 ubo_load_2 = ((scalar_offset_1 & 2) ? ubo_load_3.zw : ubo_load_3.xy);
   vector<float16_t, 2> ubo_load_2_xz = vector<float16_t, 2>(f16tof32(ubo_load_2 & 0xFFFF));
   vector<float16_t, 2> ubo_load_2_yw = vector<float16_t, 2>(f16tof32(ubo_load_2 >> 16));
   const uint scalar_offset_2 = ((offset + 16u)) / 4;
-  uint4 ubo_load_5 = buffer[scalar_offset_2 / 4];
+  uint4 ubo_load_5 = u[scalar_offset_2 / 4];
   uint2 ubo_load_4 = ((scalar_offset_2 & 2) ? ubo_load_5.zw : ubo_load_5.xy);
   vector<float16_t, 2> ubo_load_4_xz = vector<float16_t, 2>(f16tof32(ubo_load_4 & 0xFFFF));
   vector<float16_t, 2> ubo_load_4_yw = vector<float16_t, 2>(f16tof32(ubo_load_4 >> 16));
   const uint scalar_offset_3 = ((offset + 24u)) / 4;
-  uint4 ubo_load_7 = buffer[scalar_offset_3 / 4];
+  uint4 ubo_load_7 = u[scalar_offset_3 / 4];
   uint2 ubo_load_6 = ((scalar_offset_3 & 2) ? ubo_load_7.zw : ubo_load_7.xy);
   vector<float16_t, 2> ubo_load_6_xz = vector<float16_t, 2>(f16tof32(ubo_load_6 & 0xFFFF));
   vector<float16_t, 2> ubo_load_6_yw = vector<float16_t, 2>(f16tof32(ubo_load_6 >> 16));
   return matrix<float16_t, 4, 4>(vector<float16_t, 4>(ubo_load_xz[0], ubo_load_yw[0], ubo_load_xz[1], ubo_load_yw[1]), vector<float16_t, 4>(ubo_load_2_xz[0], ubo_load_2_yw[0], ubo_load_2_xz[1], ubo_load_2_yw[1]), vector<float16_t, 4>(ubo_load_4_xz[0], ubo_load_4_yw[0], ubo_load_4_xz[1], ubo_load_4_yw[1]), vector<float16_t, 4>(ubo_load_6_xz[0], ubo_load_6_yw[0], ubo_load_6_xz[1], ubo_load_6_yw[1]));
 }
 
-S tint_symbol_3(uint4 buffer[32], uint offset) {
+S u_load_1(uint offset) {
   const uint scalar_offset_4 = ((offset + 0u)) / 4;
   const uint scalar_offset_5 = ((offset + 64u)) / 4;
-  const S tint_symbol_8 = {asint(buffer[scalar_offset_4 / 4][scalar_offset_4 % 4]), tint_symbol_5(buffer, (offset + 8u)), asint(buffer[scalar_offset_5 / 4][scalar_offset_5 % 4])};
-  return tint_symbol_8;
+  const S tint_symbol_3 = {asint(u[scalar_offset_4 / 4][scalar_offset_4 % 4]), u_load_3((offset + 8u)), asint(u[scalar_offset_5 / 4][scalar_offset_5 % 4])};
+  return tint_symbol_3;
 }
 
-typedef S tint_symbol_2_ret[4];
-tint_symbol_2_ret tint_symbol_2(uint4 buffer[32], uint offset) {
+typedef S u_load_ret[4];
+u_load_ret u_load(uint offset) {
   S arr[4] = (S[4])0;
   {
     for(uint i_1 = 0u; (i_1 < 4u); i_1 = (i_1 + 1u)) {
-      arr[i_1] = tint_symbol_3(buffer, (offset + (i_1 * 128u)));
+      arr[i_1] = u_load_1((offset + (i_1 * 128u)));
     }
   }
   return arr;
@@ -61,14 +61,14 @@ void f_inner(uint local_invocation_index) {
   {
     for(uint idx = local_invocation_index; (idx < 4u); idx = (idx + 1u)) {
       const uint i = idx;
-      const S tint_symbol_7 = (S)0;
-      w[i] = tint_symbol_7;
+      const S tint_symbol_2 = (S)0;
+      w[i] = tint_symbol_2;
     }
   }
   GroupMemoryBarrierWithGroupSync();
-  w = tint_symbol_2(u, 0u);
-  w[1] = tint_symbol_3(u, 256u);
-  w[3].m = tint_symbol_5(u, 264u);
+  w = u_load(0u);
+  w[1] = u_load_1(256u);
+  w[3].m = u_load_3(264u);
   uint2 ubo_load_8 = u[1].xy;
   vector<float16_t, 2> ubo_load_8_xz = vector<float16_t, 2>(f16tof32(ubo_load_8 & 0xFFFF));
   vector<float16_t, 2> ubo_load_8_yw = vector<float16_t, 2>(f16tof32(ubo_load_8 >> 16));
@@ -80,6 +80,3 @@ void f(tint_symbol_1 tint_symbol) {
   f_inner(tint_symbol.local_invocation_index);
   return;
 }
-FXC validation failure:
-D:\Projects\RampUp\dawn\test\tint\buffer\Shader@0x000001355D73AE70(3,10-18): error X3000: syntax error: unexpected token 'float16_t'
-

test/tint/buffer/uniform/std140/unnested/mat2x2_f16/dynamic_index_via_ptr.wgsl.expected.fxc.hlsl

@@ -10,23 +10,20 @@ int i() {
   return counter;
 }
 
-matrix<float16_t, 2, 2> tint_symbol(uint4 buffer[1], uint offset) {
+matrix<float16_t, 2, 2> m_load(uint offset) {
   const uint scalar_offset = ((offset + 0u)) / 4;
-  uint ubo_load = buffer[scalar_offset / 4][scalar_offset % 4];
+  uint ubo_load = m[scalar_offset / 4][scalar_offset % 4];
   const uint scalar_offset_1 = ((offset + 4u)) / 4;
-  uint ubo_load_1 = buffer[scalar_offset_1 / 4][scalar_offset_1 % 4];
+  uint ubo_load_1 = m[scalar_offset_1 / 4][scalar_offset_1 % 4];
   return matrix<float16_t, 2, 2>(vector<float16_t, 2>(float16_t(f16tof32(ubo_load & 0xFFFF)), float16_t(f16tof32(ubo_load >> 16))), vector<float16_t, 2>(float16_t(f16tof32(ubo_load_1 & 0xFFFF)), float16_t(f16tof32(ubo_load_1 >> 16))));
 }
 
 [numthreads(1, 1, 1)]
 void f() {
   const int p_m_i_save = i();
-  const matrix<float16_t, 2, 2> l_m = tint_symbol(m, 0u);
+  const matrix<float16_t, 2, 2> l_m = m_load(0u);
   const uint scalar_offset_2 = ((4u * uint(p_m_i_save))) / 4;
   uint ubo_load_2 = m[scalar_offset_2 / 4][scalar_offset_2 % 4];
   const vector<float16_t, 2> l_m_i = vector<float16_t, 2>(float16_t(f16tof32(ubo_load_2 & 0xFFFF)), float16_t(f16tof32(ubo_load_2 >> 16)));
   return;
 }
-FXC validation failure:
-D:\Projects\RampUp\dawn\test\tint\buffer\Shader@0x0000021290B9AF00(11,8-16): error X3000: syntax error: unexpected token 'float16_t'
-

test/tint/buffer/uniform/std140/unnested/mat2x2_f16/static_index_via_ptr.wgsl.expected.fxc.hlsl

@@ -10,21 +10,18 @@ int i() {
   return counter;
 }
 
-matrix<float16_t, 2, 2> tint_symbol(uint4 buffer[1], uint offset) {
+matrix<float16_t, 2, 2> m_load(uint offset) {
   const uint scalar_offset = ((offset + 0u)) / 4;
-  uint ubo_load = buffer[scalar_offset / 4][scalar_offset % 4];
+  uint ubo_load = m[scalar_offset / 4][scalar_offset % 4];
   const uint scalar_offset_1 = ((offset + 4u)) / 4;
-  uint ubo_load_1 = buffer[scalar_offset_1 / 4][scalar_offset_1 % 4];
+  uint ubo_load_1 = m[scalar_offset_1 / 4][scalar_offset_1 % 4];
   return matrix<float16_t, 2, 2>(vector<float16_t, 2>(float16_t(f16tof32(ubo_load & 0xFFFF)), float16_t(f16tof32(ubo_load >> 16))), vector<float16_t, 2>(float16_t(f16tof32(ubo_load_1 & 0xFFFF)), float16_t(f16tof32(ubo_load_1 >> 16))));
 }
 
 [numthreads(1, 1, 1)]
 void f() {
-  const matrix<float16_t, 2, 2> l_m = tint_symbol(m, 0u);
+  const matrix<float16_t, 2, 2> l_m = m_load(0u);
   uint ubo_load_2 = m[0].y;
   const vector<float16_t, 2> l_m_1 = vector<float16_t, 2>(float16_t(f16tof32(ubo_load_2 & 0xFFFF)), float16_t(f16tof32(ubo_load_2 >> 16)));
   return;
 }
-FXC validation failure:
-D:\Projects\RampUp\dawn\test\tint\buffer\Shader@0x000001899F313180(11,8-16): error X3000: syntax error: unexpected token 'float16_t'
-