tint/writer/msl: Inline constant expressions

This is required to handle materialized values, and for constant
expressions.

Bug: tint:1504
Change-Id: Ic3ac62317241fa6f7009360128f222aeb56f62e4
Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/92083
Reviewed-by: Corentin Wallez <cwallez@chromium.org>
Commit-Queue: Ben Clayton <bclayton@google.com>

test/tint/expressions/binary/add/mat3x3-mat3x3/f32.wgsl.expected.msl

@@ -4,7 +4,7 @@ using namespace metal;
 kernel void f() {
   float3x3 const a = float3x3(float3(1.0f, 2.0f, 3.0f), float3(4.0f, 5.0f, 6.0f), float3(7.0f, 8.0f, 9.0f));
   float3x3 const b = float3x3(float3(-1.0f, -2.0f, -3.0f), float3(-4.0f, -5.0f, -6.0f), float3(-7.0f, -8.0f, -9.0f));
-  float3x3 const r = (a + b);
+  float3x3 const r = (float3x3(float3(1.0f, 2.0f, 3.0f), float3(4.0f, 5.0f, 6.0f), float3(7.0f, 8.0f, 9.0f)) + float3x3(float3(-1.0f, -2.0f, -3.0f), float3(-4.0f, -5.0f, -6.0f), float3(-7.0f, -8.0f, -9.0f)));
   return;
 }
 

test/tint/expressions/binary/add/scalar-scalar/f32.wgsl.expected.msl

@@ -4,7 +4,7 @@ using namespace metal;
 kernel void f() {
   float const a = 1.0f;
   float const b = 2.0f;
-  float const r = (a + b);
+  float const r = (1.0f + 2.0f);
   return;
 }
 

test/tint/expressions/binary/add/scalar-scalar/i32.wgsl.expected.msl

@@ -4,7 +4,7 @@ using namespace metal;
 kernel void f() {
   int const a = 1;
   int const b = 2;
-  int const r = as_type<int>((as_type<uint>(a) + as_type<uint>(b)));
+  int const r = as_type<int>((as_type<uint>(1) + as_type<uint>(2)));
   return;
 }
 

test/tint/expressions/binary/add/scalar-scalar/u32.wgsl.expected.msl

@@ -4,7 +4,7 @@ using namespace metal;
 kernel void f() {
   uint const a = 1u;
   uint const b = 2u;
-  uint const r = (a + b);
+  uint const r = (1u + 2u);
   return;
 }
 

test/tint/expressions/binary/add/scalar-vec3/f32.wgsl.expected.msl

@@ -4,7 +4,7 @@ using namespace metal;
 kernel void f() {
   float const a = 4.0f;
   float3 const b = float3(1.0f, 2.0f, 3.0f);
-  float3 const r = (a + b);
+  float3 const r = (4.0f + float3(1.0f, 2.0f, 3.0f));
   return;
 }
 

test/tint/expressions/binary/add/scalar-vec3/i32.wgsl.expected.msl

@@ -4,7 +4,7 @@ using namespace metal;
 kernel void f() {
   int const a = 4;
   int3 const b = int3(1, 2, 3);
-  int3 const r = as_type<int3>((as_type<uint>(a) + as_type<uint3>(b)));
+  int3 const r = as_type<int3>((as_type<uint>(4) + as_type<uint3>(int3(1, 2, 3))));
   return;
 }
 

test/tint/expressions/binary/add/scalar-vec3/u32.wgsl.expected.msl

@@ -4,7 +4,7 @@ using namespace metal;
 kernel void f() {
   uint const a = 4u;
   uint3 const b = uint3(1u, 2u, 3u);
-  uint3 const r = (a + b);
+  uint3 const r = (4u + uint3(1u, 2u, 3u));
   return;
 }
 

test/tint/expressions/binary/add/vec3-scalar/f32.wgsl.expected.msl

@@ -4,7 +4,7 @@ using namespace metal;
 kernel void f() {
   float3 const a = float3(1.0f, 2.0f, 3.0f);
   float const b = 4.0f;
-  float3 const r = (a + b);
+  float3 const r = (float3(1.0f, 2.0f, 3.0f) + 4.0f);
   return;
 }
 

test/tint/expressions/binary/add/vec3-scalar/i32.wgsl.expected.msl

@@ -4,7 +4,7 @@ using namespace metal;
 kernel void f() {
   int3 const a = int3(1, 2, 3);
   int const b = 4;
-  int3 const r = as_type<int3>((as_type<uint3>(a) + as_type<uint>(b)));
+  int3 const r = as_type<int3>((as_type<uint3>(int3(1, 2, 3)) + as_type<uint>(4)));
   return;
 }
 

test/tint/expressions/binary/add/vec3-scalar/u32.wgsl.expected.msl

@@ -4,7 +4,7 @@ using namespace metal;
 kernel void f() {
   uint3 const a = uint3(1u, 2u, 3u);
   uint const b = 4u;
-  uint3 const r = (a + b);
+  uint3 const r = (uint3(1u, 2u, 3u) + 4u);
   return;
 }
 

test/tint/expressions/binary/add/vec3-vec3/f32.wgsl.expected.msl

@@ -4,7 +4,7 @@ using namespace metal;
 kernel void f() {
   float3 const a = float3(1.0f, 2.0f, 3.0f);
   float3 const b = float3(4.0f, 5.0f, 6.0f);
-  float3 const r = (a + b);
+  float3 const r = (float3(1.0f, 2.0f, 3.0f) + float3(4.0f, 5.0f, 6.0f));
   return;
 }
 

test/tint/expressions/binary/add/vec3-vec3/i32.wgsl.expected.msl

@@ -4,7 +4,7 @@ using namespace metal;
 kernel void f() {
   int3 const a = int3(1, 2, 3);
   int3 const b = int3(4, 5, 6);
-  int3 const r = as_type<int3>((as_type<uint3>(a) + as_type<uint3>(b)));
+  int3 const r = as_type<int3>((as_type<uint3>(int3(1, 2, 3)) + as_type<uint3>(int3(4, 5, 6))));
   return;
 }
 

test/tint/expressions/binary/add/vec3-vec3/u32.wgsl.expected.msl

@@ -4,7 +4,7 @@ using namespace metal;
 kernel void f() {
   uint3 const a = uint3(1u, 2u, 3u);
   uint3 const b = uint3(4u, 5u, 6u);
-  uint3 const r = (a + b);
+  uint3 const r = (uint3(1u, 2u, 3u) + uint3(4u, 5u, 6u));
   return;
 }
 

test/tint/expressions/binary/bit-and/scalar-scalar/bool.wgsl.expected.msl

@@ -4,7 +4,7 @@ using namespace metal;
 kernel void f() {
   bool const a = true;
   bool const b = false;
-  bool const r = bool(a & b);
+  bool const r = bool(true & false);
   return;
 }
 

test/tint/expressions/binary/bit-and/scalar-scalar/i32.wgsl.expected.msl

@@ -4,7 +4,7 @@ using namespace metal;
 kernel void f() {
   int const a = 1;
   int const b = 2;
-  int const r = (a & b);
+  int const r = (1 & 2);
   return;
 }
 

test/tint/expressions/binary/bit-and/scalar-scalar/u32.wgsl.expected.msl

@@ -4,7 +4,7 @@ using namespace metal;
 kernel void f() {
   uint const a = 1u;
   uint const b = 2u;
-  uint const r = (a & b);
+  uint const r = (1u & 2u);
   return;
 }
 

test/tint/expressions/binary/bit-and/vec3-vec3/bool.wgsl.expected.msl

@@ -4,7 +4,7 @@ using namespace metal;
 kernel void f() {
   bool3 const a = bool3(true, true, false);
   bool3 const b = bool3(true, false, true);
-  bool3 const r = (a & b);
+  bool3 const r = (bool3(true, true, false) & bool3(true, false, true));
   return;
 }
 

test/tint/expressions/binary/bit-and/vec3-vec3/i32.wgsl.expected.msl

@@ -4,7 +4,7 @@ using namespace metal;
 kernel void f() {
   int3 const a = int3(1, 2, 3);
   int3 const b = int3(4, 5, 6);
-  int3 const r = (a & b);
+  int3 const r = (int3(1, 2, 3) & int3(4, 5, 6));
   return;
 }
 

test/tint/expressions/binary/bit-and/vec3-vec3/u32.wgsl.expected.msl

@@ -4,7 +4,7 @@ using namespace metal;
 kernel void f() {
   uint3 const a = uint3(1u, 2u, 3u);
   uint3 const b = uint3(4u, 5u, 6u);
-  uint3 const r = (a & b);
+  uint3 const r = (uint3(1u, 2u, 3u) & uint3(4u, 5u, 6u));
   return;
 }
 

test/tint/expressions/binary/bit-or/scalar-scalar/i32.wgsl.expected.msl

@@ -4,7 +4,7 @@ using namespace metal;
 kernel void f() {
   int const a = 1;
   int const b = 2;
-  int const r = (a | b);
+  int const r = (1 | 2);
   return;
 }
 

test/tint/expressions/binary/bit-or/scalar-scalar/u32.wgsl.expected.msl

@@ -4,7 +4,7 @@ using namespace metal;
 kernel void f() {
   uint const a = 1u;
   uint const b = 2u;
-  uint const r = (a | b);
+  uint const r = (1u | 2u);
   return;
 }
 

test/tint/expressions/binary/bit-or/vec3-vec3/i32.wgsl.expected.msl

@@ -4,7 +4,7 @@ using namespace metal;
 kernel void f() {
   int3 const a = int3(1, 2, 3);
   int3 const b = int3(4, 5, 6);
-  int3 const r = (a | b);
+  int3 const r = (int3(1, 2, 3) | int3(4, 5, 6));
   return;
 }
 

test/tint/expressions/binary/bit-or/vec3-vec3/u32.wgsl.expected.msl

@@ -4,7 +4,7 @@ using namespace metal;
 kernel void f() {
   uint3 const a = uint3(1u, 2u, 3u);
   uint3 const b = uint3(4u, 5u, 6u);
-  uint3 const r = (a | b);
+  uint3 const r = (uint3(1u, 2u, 3u) | uint3(4u, 5u, 6u));
   return;
 }
 

test/tint/expressions/binary/bit-xor/scalar-scalar/i32.wgsl.expected.msl

@@ -4,7 +4,7 @@ using namespace metal;
 kernel void f() {
   int const a = 1;
   int const b = 2;
-  int const r = (a ^ b);
+  int const r = (1 ^ 2);
   return;
 }
 

test/tint/expressions/binary/bit-xor/scalar-scalar/u32.wgsl.expected.msl

@@ -4,7 +4,7 @@ using namespace metal;
 kernel void f() {
   uint const a = 1u;
   uint const b = 2u;
-  uint const r = (a ^ b);
+  uint const r = (1u ^ 2u);
   return;
 }
 

test/tint/expressions/binary/bit-xor/vec3-vec3/i32.wgsl.expected.msl

@@ -4,7 +4,7 @@ using namespace metal;
 kernel void f() {
   int3 const a = int3(1, 2, 3);
   int3 const b = int3(4, 5, 6);
-  int3 const r = (a ^ b);
+  int3 const r = (int3(1, 2, 3) ^ int3(4, 5, 6));
   return;
 }
 

test/tint/expressions/binary/bit-xor/vec3-vec3/u32.wgsl.expected.msl

@@ -4,7 +4,7 @@ using namespace metal;
 kernel void f() {
   uint3 const a = uint3(1u, 2u, 3u);
   uint3 const b = uint3(4u, 5u, 6u);
-  uint3 const r = (a ^ b);
+  uint3 const r = (uint3(1u, 2u, 3u) ^ uint3(4u, 5u, 6u));
   return;
 }
 

test/tint/expressions/binary/div/scalar-scalar/f32.wgsl.expected.msl

@@ -4,7 +4,7 @@ using namespace metal;
 kernel void f() {
   float const a = 1.0f;
   float const b = 2.0f;
-  float const r = (a / b);
+  float const r = (1.0f / 2.0f);
   return;
 }
 

test/tint/expressions/binary/div/scalar-scalar/i32.wgsl.expected.msl

@@ -4,7 +4,7 @@ using namespace metal;
 kernel void f() {
   int const a = 1;
   int const b = 2;
-  int const r = (a / b);
+  int const r = (1 / 2);
   return;
 }
 

test/tint/expressions/binary/div/scalar-scalar/u32.wgsl.expected.msl

@@ -4,7 +4,7 @@ using namespace metal;
 kernel void f() {
   uint const a = 1u;
   uint const b = 2u;
-  uint const r = (a / b);
+  uint const r = (1u / 2u);
   return;
 }
 

test/tint/expressions/binary/div/scalar-vec3/f32.wgsl.expected.msl

@@ -4,7 +4,7 @@ using namespace metal;
 kernel void f() {
   float const a = 4.0f;
   float3 const b = float3(1.0f, 2.0f, 3.0f);
-  float3 const r = (a / b);
+  float3 const r = (4.0f / float3(1.0f, 2.0f, 3.0f));
   return;
 }
 

test/tint/expressions/binary/div/scalar-vec3/i32.wgsl.expected.msl

@@ -4,7 +4,7 @@ using namespace metal;
 kernel void f() {
   int const a = 4;
   int3 const b = int3(1, 2, 3);
-  int3 const r = (a / b);
+  int3 const r = (4 / int3(1, 2, 3));
   return;
 }
 

test/tint/expressions/binary/div/scalar-vec3/u32.wgsl.expected.msl

@@ -4,7 +4,7 @@ using namespace metal;
 kernel void f() {
   uint const a = 4u;
   uint3 const b = uint3(1u, 2u, 3u);
-  uint3 const r = (a / b);
+  uint3 const r = (4u / uint3(1u, 2u, 3u));
   return;
 }
 

test/tint/expressions/binary/div/vec3-scalar/f32.wgsl.expected.msl

@@ -4,7 +4,7 @@ using namespace metal;
 kernel void f() {
   float3 const a = float3(1.0f, 2.0f, 3.0f);
   float const b = 4.0f;
-  float3 const r = (a / b);
+  float3 const r = (float3(1.0f, 2.0f, 3.0f) / 4.0f);
   return;
 }
 

test/tint/expressions/binary/div/vec3-scalar/i32.wgsl.expected.msl

@@ -4,7 +4,7 @@ using namespace metal;
 kernel void f() {
   int3 const a = int3(1, 2, 3);
   int const b = 4;
-  int3 const r = (a / b);
+  int3 const r = (int3(1, 2, 3) / 4);
   return;
 }
 

test/tint/expressions/binary/div/vec3-scalar/u32.wgsl.expected.msl

@@ -4,7 +4,7 @@ using namespace metal;
 kernel void f() {
   uint3 const a = uint3(1u, 2u, 3u);
   uint const b = 4u;
-  uint3 const r = (a / b);
+  uint3 const r = (uint3(1u, 2u, 3u) / 4u);
   return;
 }
 

test/tint/expressions/binary/div/vec3-vec3/f32.wgsl.expected.msl

@@ -4,7 +4,7 @@ using namespace metal;
 kernel void f() {
   float3 const a = float3(1.0f, 2.0f, 3.0f);
   float3 const b = float3(4.0f, 5.0f, 6.0f);
-  float3 const r = (a / b);
+  float3 const r = (float3(1.0f, 2.0f, 3.0f) / float3(4.0f, 5.0f, 6.0f));
   return;
 }
 

test/tint/expressions/binary/div/vec3-vec3/i32.wgsl.expected.msl

@@ -4,7 +4,7 @@ using namespace metal;
 kernel void f() {
   int3 const a = int3(1, 2, 3);
   int3 const b = int3(4, 5, 6);
-  int3 const r = (a / b);
+  int3 const r = (int3(1, 2, 3) / int3(4, 5, 6));
   return;
 }
 

test/tint/expressions/binary/div/vec3-vec3/u32.wgsl.expected.msl

@@ -4,7 +4,7 @@ using namespace metal;
 kernel void f() {
   uint3 const a = uint3(1u, 2u, 3u);
   uint3 const b = uint3(4u, 5u, 6u);
-  uint3 const r = (a / b);
+  uint3 const r = (uint3(1u, 2u, 3u) / uint3(4u, 5u, 6u));
   return;
 }
 

test/tint/expressions/binary/div_by_zero/by_constant/scalar-scalar/f32.wgsl.expected.msl

@@ -4,7 +4,7 @@ using namespace metal;
 kernel void f() {
   float const a = 1.0f;
   float const b = 0.0f;
-  float const r = (a / b);
+  float const r = (1.0f / 0.0f);
   return;
 }
 

test/tint/expressions/binary/div_by_zero/by_constant/scalar-scalar/i32.wgsl.expected.msl

@@ -4,7 +4,7 @@ using namespace metal;
 kernel void f() {
   int const a = 1;
   int const b = 0;
-  int const r = (a / b);
+  int const r = (1 / 0);
   return;
 }
 

test/tint/expressions/binary/div_by_zero/by_constant/scalar-scalar/u32.wgsl.expected.msl

@@ -4,7 +4,7 @@ using namespace metal;
 kernel void f() {
   uint const a = 1u;
   uint const b = 0u;
-  uint const r = (a / b);
+  uint const r = (1u / 0u);
   return;
 }
 

test/tint/expressions/binary/div_by_zero/by_constant/scalar-vec3/f32.wgsl.expected.msl

@@ -4,7 +4,7 @@ using namespace metal;
 kernel void f() {
   float const a = 4.0f;
   float3 const b = float3(0.0f, 2.0f, 0.0f);
-  float3 const r = (a / b);
+  float3 const r = (4.0f / float3(0.0f, 2.0f, 0.0f));
   return;
 }
 

test/tint/expressions/binary/div_by_zero/by_constant/scalar-vec3/i32.wgsl.expected.msl

@@ -4,7 +4,7 @@ using namespace metal;
 kernel void f() {
   int const a = 4;
   int3 const b = int3(0, 2, 0);
-  int3 const r = (a / b);
+  int3 const r = (4 / int3(0, 2, 0));
   return;
 }
 

test/tint/expressions/binary/div_by_zero/by_constant/scalar-vec3/u32.wgsl.expected.msl

@@ -4,7 +4,7 @@ using namespace metal;
 kernel void f() {
   uint const a = 4u;
   uint3 const b = uint3(0u, 2u, 0u);
-  uint3 const r = (a / b);
+  uint3 const r = (4u / uint3(0u, 2u, 0u));
   return;
 }
 

test/tint/expressions/binary/div_by_zero/by_constant/vec3-scalar/f32.wgsl.expected.msl

@@ -4,7 +4,7 @@ using namespace metal;
 kernel void f() {
   float3 const a = float3(1.0f, 2.0f, 3.0f);
   float const b = 0.0f;
-  float3 const r = (a / b);
+  float3 const r = (float3(1.0f, 2.0f, 3.0f) / 0.0f);
   return;
 }
 

test/tint/expressions/binary/div_by_zero/by_constant/vec3-scalar/i32.wgsl.expected.msl

@@ -4,7 +4,7 @@ using namespace metal;
 kernel void f() {
   int3 const a = int3(1, 2, 3);
   int const b = 0;
-  int3 const r = (a / b);
+  int3 const r = (int3(1, 2, 3) / 0);
   return;
 }
 

test/tint/expressions/binary/div_by_zero/by_constant/vec3-scalar/u32.wgsl.expected.msl

@@ -4,7 +4,7 @@ using namespace metal;
 kernel void f() {
   uint3 const a = uint3(1u, 2u, 3u);
   uint const b = 0u;
-  uint3 const r = (a / b);
+  uint3 const r = (uint3(1u, 2u, 3u) / 0u);
   return;
 }
 

test/tint/expressions/binary/div_by_zero/by_constant/vec3-vec3/f32.wgsl.expected.msl

@@ -4,7 +4,7 @@ using namespace metal;
 kernel void f() {
   float3 const a = float3(1.0f, 2.0f, 3.0f);
   float3 const b = float3(0.0f, 5.0f, 0.0f);
-  float3 const r = (a / b);
+  float3 const r = (float3(1.0f, 2.0f, 3.0f) / float3(0.0f, 5.0f, 0.0f));
   return;
 }
 

test/tint/expressions/binary/div_by_zero/by_constant/vec3-vec3/i32.wgsl.expected.msl

@@ -4,7 +4,7 @@ using namespace metal;
 kernel void f() {
   int3 const a = int3(1, 2, 3);
   int3 const b = int3(0, 5, 0);
-  int3 const r = (a / b);
+  int3 const r = (int3(1, 2, 3) / int3(0, 5, 0));
   return;
 }
 

test/tint/expressions/binary/div_by_zero/by_constant/vec3-vec3/u32.wgsl.expected.msl

@@ -4,7 +4,7 @@ using namespace metal;
 kernel void f() {
   uint3 const a = uint3(1u, 2u, 3u);
   uint3 const b = uint3(0u, 5u, 0u);
-  uint3 const r = (a / b);
+  uint3 const r = (uint3(1u, 2u, 3u) / uint3(0u, 5u, 0u));
   return;
 }
 

test/tint/expressions/binary/left-shift/scalar-scalar/i32.wgsl.expected.msl

@@ -4,7 +4,7 @@ using namespace metal;
 kernel void f() {
   int const a = 1;
   uint const b = 2u;
-  int const r = as_type<int>((as_type<uint>(a) << b));
+  int const r = as_type<int>((as_type<uint>(1) << 2u));
   return;
 }
 

test/tint/expressions/binary/left-shift/scalar-scalar/u32.wgsl.expected.msl

@@ -4,7 +4,7 @@ using namespace metal;
 kernel void f() {
   uint const a = 1u;
   uint const b = 2u;
-  uint const r = (a << b);
+  uint const r = (1u << 2u);
   return;
 }
 

test/tint/expressions/binary/left-shift/vector-vector/i32.wgsl.expected.msl

@@ -4,7 +4,7 @@ using namespace metal;
 kernel void f() {
   int3 const a = int3(1, 2, 3);
   uint3 const b = uint3(4u, 5u, 6u);
-  int3 const r = as_type<int3>((as_type<uint3>(a) << b));
+  int3 const r = as_type<int3>((as_type<uint3>(int3(1, 2, 3)) << uint3(4u, 5u, 6u)));
   return;
 }
 

test/tint/expressions/binary/left-shift/vector-vector/u32.wgsl.expected.msl

@@ -4,7 +4,7 @@ using namespace metal;
 kernel void f() {
   uint3 const a = uint3(1u, 2u, 3u);
   uint3 const b = uint3(4u, 5u, 6u);
-  uint3 const r = (a << b);
+  uint3 const r = (uint3(1u, 2u, 3u) << uint3(4u, 5u, 6u));
   return;
 }
 

test/tint/expressions/binary/mod/scalar-scalar/f32.wgsl.expected.msl

@@ -4,7 +4,7 @@ using namespace metal;
 kernel void f() {
   float const a = 1.0f;
   float const b = 2.0f;
-  float const r = fmod(a, b);
+  float const r = fmod(1.0f, 2.0f);
   return;
 }
 

test/tint/expressions/binary/mod/scalar-scalar/i32.wgsl.expected.msl

@@ -4,7 +4,7 @@ using namespace metal;
 kernel void f() {
   int const a = 1;
   int const b = 2;
-  int const r = (a % b);
+  int const r = (1 % 2);
   return;
 }
 

test/tint/expressions/binary/mod/scalar-scalar/u32.wgsl.expected.msl

@@ -4,7 +4,7 @@ using namespace metal;
 kernel void f() {
   uint const a = 1u;
   uint const b = 2u;
-  uint const r = (a % b);
+  uint const r = (1u % 2u);
   return;
 }
 

test/tint/expressions/binary/mod/scalar-vec3/f32.wgsl.expected.msl

@@ -4,7 +4,7 @@ using namespace metal;
 kernel void f() {
   float const a = 4.0f;
   float3 const b = float3(1.0f, 2.0f, 3.0f);
-  float3 const r = fmod(a, b);
+  float3 const r = fmod(4.0f, float3(1.0f, 2.0f, 3.0f));
   return;
 }
 

test/tint/expressions/binary/mod/scalar-vec3/i32.wgsl.expected.msl

@@ -4,7 +4,7 @@ using namespace metal;
 kernel void f() {
   int const a = 4;
   int3 const b = int3(1, 2, 3);
-  int3 const r = (a % b);
+  int3 const r = (4 % int3(1, 2, 3));
   return;
 }
 

test/tint/expressions/binary/mod/scalar-vec3/u32.wgsl.expected.msl

@@ -4,7 +4,7 @@ using namespace metal;
 kernel void f() {
   uint const a = 4u;
   uint3 const b = uint3(1u, 2u, 3u);
-  uint3 const r = (a % b);
+  uint3 const r = (4u % uint3(1u, 2u, 3u));
   return;
 }
 

test/tint/expressions/binary/mod/vec3-scalar/f32.wgsl.expected.msl

@@ -4,7 +4,7 @@ using namespace metal;
 kernel void f() {
   float3 const a = float3(1.0f, 2.0f, 3.0f);
   float const b = 4.0f;
-  float3 const r = fmod(a, b);
+  float3 const r = fmod(float3(1.0f, 2.0f, 3.0f), 4.0f);
   return;
 }
 

test/tint/expressions/binary/mod/vec3-scalar/i32.wgsl.expected.msl

@@ -4,7 +4,7 @@ using namespace metal;
 kernel void f() {
   int3 const a = int3(1, 2, 3);
   int const b = 4;
-  int3 const r = (a % b);
+  int3 const r = (int3(1, 2, 3) % 4);
   return;
 }
 

test/tint/expressions/binary/mod/vec3-scalar/u32.wgsl.expected.msl

@@ -4,7 +4,7 @@ using namespace metal;
 kernel void f() {
   uint3 const a = uint3(1u, 2u, 3u);
   uint const b = 4u;
-  uint3 const r = (a % b);
+  uint3 const r = (uint3(1u, 2u, 3u) % 4u);
   return;
 }
 

test/tint/expressions/binary/mod/vec3-vec3/f32.wgsl.expected.msl

@@ -4,7 +4,7 @@ using namespace metal;
 kernel void f() {
   float3 const a = float3(1.0f, 2.0f, 3.0f);
   float3 const b = float3(4.0f, 5.0f, 6.0f);
-  float3 const r = fmod(a, b);
+  float3 const r = fmod(float3(1.0f, 2.0f, 3.0f), float3(4.0f, 5.0f, 6.0f));
   return;
 }
 

test/tint/expressions/binary/mod/vec3-vec3/i32.wgsl.expected.msl

@@ -4,7 +4,7 @@ using namespace metal;
 kernel void f() {
   int3 const a = int3(1, 2, 3);
   int3 const b = int3(4, 5, 6);
-  int3 const r = (a % b);
+  int3 const r = (int3(1, 2, 3) % int3(4, 5, 6));
   return;
 }
 

test/tint/expressions/binary/mod/vec3-vec3/u32.wgsl.expected.msl

@@ -4,7 +4,7 @@ using namespace metal;
 kernel void f() {
   uint3 const a = uint3(1u, 2u, 3u);
   uint3 const b = uint3(4u, 5u, 6u);
-  uint3 const r = (a % b);
+  uint3 const r = (uint3(1u, 2u, 3u) % uint3(4u, 5u, 6u));
   return;
 }
 

test/tint/expressions/binary/mod_by_zero/by_constant/scalar-scalar/f32.wgsl.expected.msl

@@ -4,7 +4,7 @@ using namespace metal;
 kernel void f() {
   float const a = 1.0f;
   float const b = 0.0f;
-  float const r = fmod(a, b);
+  float const r = fmod(1.0f, 0.0f);
   return;
 }
 

test/tint/expressions/binary/mod_by_zero/by_constant/scalar-scalar/i32.wgsl.expected.msl

@@ -4,7 +4,7 @@ using namespace metal;
 kernel void f() {
   int const a = 1;
   int const b = 0;
-  int const r = (a % b);
+  int const r = (1 % 0);
   return;
 }
 

test/tint/expressions/binary/mod_by_zero/by_constant/scalar-scalar/u32.wgsl.expected.msl

@@ -4,7 +4,7 @@ using namespace metal;
 kernel void f() {
   uint const a = 1u;
   uint const b = 0u;
-  uint const r = (a % b);
+  uint const r = (1u % 0u);
   return;
 }
 

test/tint/expressions/binary/mod_by_zero/by_constant/scalar-vec3/i32.wgsl.expected.msl

@@ -4,7 +4,7 @@ using namespace metal;
 kernel void f() {
   int const a = 4;
   int3 const b = int3(0, 2, 0);
-  int3 const r = (a % b);
+  int3 const r = (4 % int3(0, 2, 0));
   return;
 }
 

test/tint/expressions/binary/mod_by_zero/by_constant/scalar-vec3/u32.wgsl.expected.msl

@@ -4,7 +4,7 @@ using namespace metal;
 kernel void f() {
   uint const a = 4u;
   uint3 const b = uint3(0u, 2u, 0u);
-  uint3 const r = (a % b);
+  uint3 const r = (4u % uint3(0u, 2u, 0u));
   return;
 }
 

test/tint/expressions/binary/mod_by_zero/by_constant/vec3-scalar/i32.wgsl.expected.msl

@@ -4,7 +4,7 @@ using namespace metal;
 kernel void f() {
   int3 const a = int3(1, 2, 3);
   int const b = 0;
-  int3 const r = (a % b);
+  int3 const r = (int3(1, 2, 3) % 0);
   return;
 }
 

test/tint/expressions/binary/mod_by_zero/by_constant/vec3-scalar/u32.wgsl.expected.msl

@@ -4,7 +4,7 @@ using namespace metal;
 kernel void f() {
   uint3 const a = uint3(1u, 2u, 3u);
   uint const b = 0u;
-  uint3 const r = (a % b);
+  uint3 const r = (uint3(1u, 2u, 3u) % 0u);
   return;
 }
 

test/tint/expressions/binary/mod_by_zero/by_constant/vec3-vec3/f32.wgsl.expected.msl

@@ -4,7 +4,7 @@ using namespace metal;
 kernel void f() {
   float3 const a = float3(1.0f, 2.0f, 3.0f);
   float3 const b = float3(0.0f, 5.0f, 0.0f);
-  float3 const r = fmod(a, b);
+  float3 const r = fmod(float3(1.0f, 2.0f, 3.0f), float3(0.0f, 5.0f, 0.0f));
   return;
 }
 

test/tint/expressions/binary/mod_by_zero/by_constant/vec3-vec3/i32.wgsl.expected.msl

@@ -4,7 +4,7 @@ using namespace metal;
 kernel void f() {
   int3 const a = int3(1, 2, 3);
   int3 const b = int3(0, 5, 0);
-  int3 const r = (a % b);
+  int3 const r = (int3(1, 2, 3) % int3(0, 5, 0));
   return;
 }
 

test/tint/expressions/binary/mod_by_zero/by_constant/vec3-vec3/u32.wgsl.expected.msl

@@ -4,7 +4,7 @@ using namespace metal;
 kernel void f() {
   uint3 const a = uint3(1u, 2u, 3u);
   uint3 const b = uint3(0u, 5u, 0u);
-  uint3 const r = (a % b);
+  uint3 const r = (uint3(1u, 2u, 3u) % uint3(0u, 5u, 0u));
   return;
 }
 

test/tint/expressions/binary/mul/mat2x4-mat4x2/f32.wgsl.expected.msl

@@ -4,7 +4,7 @@ using namespace metal;
 kernel void f() {
   float2x4 const a = float2x4(float4(1.0f, 2.0f, 3.0f, 4.0f), float4(5.0f, 6.0f, 7.0f, 8.0f));
   float4x2 const b = float4x2(float2(-1.0f, -2.0f), float2(-3.0f, -4.0f), float2(-5.0f, -6.0f), float2(-7.0f, -8.0f));
-  float4x4 const r = (a * b);
+  float4x4 const r = (float2x4(float4(1.0f, 2.0f, 3.0f, 4.0f), float4(5.0f, 6.0f, 7.0f, 8.0f)) * float4x2(float2(-1.0f, -2.0f), float2(-3.0f, -4.0f), float2(-5.0f, -6.0f), float2(-7.0f, -8.0f)));
   return;
 }
 

test/tint/expressions/binary/mul/mat3x3-mat3x3/f32.wgsl.expected.msl

@@ -4,7 +4,7 @@ using namespace metal;
 kernel void f() {
   float3x3 const a = float3x3(float3(1.0f, 2.0f, 3.0f), float3(4.0f, 5.0f, 6.0f), float3(7.0f, 8.0f, 9.0f));
   float3x3 const b = float3x3(float3(-1.0f, -2.0f, -3.0f), float3(-4.0f, -5.0f, -6.0f), float3(-7.0f, -8.0f, -9.0f));
-  float3x3 const r = (a * b);
+  float3x3 const r = (float3x3(float3(1.0f, 2.0f, 3.0f), float3(4.0f, 5.0f, 6.0f), float3(7.0f, 8.0f, 9.0f)) * float3x3(float3(-1.0f, -2.0f, -3.0f), float3(-4.0f, -5.0f, -6.0f), float3(-7.0f, -8.0f, -9.0f)));
   return;
 }
 

test/tint/expressions/binary/mul/mat4x2-mat2x4/f32.wgsl.expected.msl

@@ -4,7 +4,7 @@ using namespace metal;
 kernel void f() {
   float4x2 const a = float4x2(float2(-1.0f, -2.0f), float2(-3.0f, -4.0f), float2(-5.0f, -6.0f), float2(-7.0f, -8.0f));
   float2x4 const b = float2x4(float4(1.0f, 2.0f, 3.0f, 4.0f), float4(5.0f, 6.0f, 7.0f, 8.0f));
-  float2x2 const r = (a * b);
+  float2x2 const r = (float4x2(float2(-1.0f, -2.0f), float2(-3.0f, -4.0f), float2(-5.0f, -6.0f), float2(-7.0f, -8.0f)) * float2x4(float4(1.0f, 2.0f, 3.0f, 4.0f), float4(5.0f, 6.0f, 7.0f, 8.0f)));
   return;
 }
 

test/tint/expressions/binary/mul/scalar-scalar/f32.wgsl.expected.msl

@@ -4,7 +4,7 @@ using namespace metal;
 kernel void f() {
   float const a = 1.0f;
   float const b = 2.0f;
-  float const r = (a * b);
+  float const r = (1.0f * 2.0f);
   return;
 }
 

test/tint/expressions/binary/mul/scalar-scalar/i32.wgsl.expected.msl

@@ -4,7 +4,7 @@ using namespace metal;
 kernel void f() {
   int const a = 1;
   int const b = 2;
-  int const r = as_type<int>((as_type<uint>(a) * as_type<uint>(b)));
+  int const r = as_type<int>((as_type<uint>(1) * as_type<uint>(2)));
   return;
 }
 

test/tint/expressions/binary/mul/scalar-scalar/u32.wgsl.expected.msl

@@ -4,7 +4,7 @@ using namespace metal;
 kernel void f() {
   uint const a = 1u;
   uint const b = 2u;
-  uint const r = (a * b);
+  uint const r = (1u * 2u);
   return;
 }
 

test/tint/expressions/binary/mul/scalar-vec3/f32.wgsl.expected.msl

@@ -4,7 +4,7 @@ using namespace metal;
 kernel void f() {
   float const a = 4.0f;
   float3 const b = float3(1.0f, 2.0f, 3.0f);
-  float3 const r = (a * b);
+  float3 const r = (4.0f * float3(1.0f, 2.0f, 3.0f));
   return;
 }
 

test/tint/expressions/binary/mul/scalar-vec3/i32.wgsl.expected.msl

@@ -4,7 +4,7 @@ using namespace metal;
 kernel void f() {
   int const a = 4;
   int3 const b = int3(1, 2, 3);
-  int3 const r = as_type<int3>((as_type<uint>(a) * as_type<uint3>(b)));
+  int3 const r = as_type<int3>((as_type<uint>(4) * as_type<uint3>(int3(1, 2, 3))));
   return;
 }
 

test/tint/expressions/binary/mul/scalar-vec3/u32.wgsl.expected.msl

@@ -4,7 +4,7 @@ using namespace metal;
 kernel void f() {
   uint const a = 4u;
   uint3 const b = uint3(1u, 2u, 3u);
-  uint3 const r = (a * b);
+  uint3 const r = (4u * uint3(1u, 2u, 3u));
   return;
 }
 

test/tint/expressions/binary/mul/vec3-scalar/f32.wgsl.expected.msl

@@ -4,7 +4,7 @@ using namespace metal;
 kernel void f() {
   float3 const a = float3(1.0f, 2.0f, 3.0f);
   float const b = 4.0f;
-  float3 const r = (a * b);
+  float3 const r = (float3(1.0f, 2.0f, 3.0f) * 4.0f);
   return;
 }
 

test/tint/expressions/binary/mul/vec3-scalar/i32.wgsl.expected.msl

@@ -4,7 +4,7 @@ using namespace metal;
 kernel void f() {
   int3 const a = int3(1, 2, 3);
   int const b = 4;
-  int3 const r = as_type<int3>((as_type<uint3>(a) * as_type<uint>(b)));
+  int3 const r = as_type<int3>((as_type<uint3>(int3(1, 2, 3)) * as_type<uint>(4)));
   return;
 }
 

test/tint/expressions/binary/mul/vec3-scalar/u32.wgsl.expected.msl

@@ -4,7 +4,7 @@ using namespace metal;
 kernel void f() {
   uint3 const a = uint3(1u, 2u, 3u);
   uint const b = 4u;
-  uint3 const r = (a * b);
+  uint3 const r = (uint3(1u, 2u, 3u) * 4u);
   return;
 }
 

test/tint/expressions/binary/mul/vec3-vec3/f32.wgsl.expected.msl

@@ -4,7 +4,7 @@ using namespace metal;
 kernel void f() {
   float3 const a = float3(1.0f, 2.0f, 3.0f);
   float3 const b = float3(4.0f, 5.0f, 6.0f);
-  float3 const r = (a * b);
+  float3 const r = (float3(1.0f, 2.0f, 3.0f) * float3(4.0f, 5.0f, 6.0f));
   return;
 }
 

test/tint/expressions/binary/mul/vec3-vec3/i32.wgsl.expected.msl

@@ -4,7 +4,7 @@ using namespace metal;
 kernel void f() {
   int3 const a = int3(1, 2, 3);
   int3 const b = int3(4, 5, 6);
-  int3 const r = as_type<int3>((as_type<uint3>(a) * as_type<uint3>(b)));
+  int3 const r = as_type<int3>((as_type<uint3>(int3(1, 2, 3)) * as_type<uint3>(int3(4, 5, 6))));
   return;
 }
 

test/tint/expressions/binary/mul/vec3-vec3/u32.wgsl.expected.msl

@@ -4,7 +4,7 @@ using namespace metal;
 kernel void f() {
   uint3 const a = uint3(1u, 2u, 3u);
   uint3 const b = uint3(4u, 5u, 6u);
-  uint3 const r = (a * b);
+  uint3 const r = (uint3(1u, 2u, 3u) * uint3(4u, 5u, 6u));
   return;
 }
 

test/tint/expressions/binary/right-shift/scalar-scalar/i32.wgsl.expected.msl

@@ -4,7 +4,7 @@ using namespace metal;
 kernel void f() {
   int const a = 1;
   uint const b = 2u;
-  int const r = (a >> b);
+  int const r = (1 >> 2u);
   return;
 }
 

test/tint/expressions/binary/right-shift/scalar-scalar/u32.wgsl.expected.msl

@@ -4,7 +4,7 @@ using namespace metal;
 kernel void f() {
   uint const a = 1u;
   uint const b = 2u;
-  uint const r = (a >> b);
+  uint const r = (1u >> 2u);
   return;
 }
 

test/tint/expressions/binary/right-shift/vector-vector/i32.wgsl.expected.msl

@@ -4,7 +4,7 @@ using namespace metal;
 kernel void f() {
   int3 const a = int3(1, 2, 3);
   uint3 const b = uint3(4u, 5u, 6u);
-  int3 const r = (a >> b);
+  int3 const r = (int3(1, 2, 3) >> uint3(4u, 5u, 6u));
   return;
 }
 

test/tint/expressions/binary/right-shift/vector-vector/u32.wgsl.expected.msl

@@ -4,7 +4,7 @@ using namespace metal;
 kernel void f() {
   uint3 const a = uint3(1u, 2u, 3u);
   uint3 const b = uint3(4u, 5u, 6u);
-  uint3 const r = (a >> b);
+  uint3 const r = (uint3(1u, 2u, 3u) >> uint3(4u, 5u, 6u));
   return;
 }
 

test/tint/expressions/binary/sub/mat3x3-mat3x3/f32.wgsl.expected.msl

@@ -4,7 +4,7 @@ using namespace metal;
 kernel void f() {
   float3x3 const a = float3x3(float3(1.0f, 2.0f, 3.0f), float3(4.0f, 5.0f, 6.0f), float3(7.0f, 8.0f, 9.0f));
   float3x3 const b = float3x3(float3(-1.0f, -2.0f, -3.0f), float3(-4.0f, -5.0f, -6.0f), float3(-7.0f, -8.0f, -9.0f));
-  float3x3 const r = (a - b);
+  float3x3 const r = (float3x3(float3(1.0f, 2.0f, 3.0f), float3(4.0f, 5.0f, 6.0f), float3(7.0f, 8.0f, 9.0f)) - float3x3(float3(-1.0f, -2.0f, -3.0f), float3(-4.0f, -5.0f, -6.0f), float3(-7.0f, -8.0f, -9.0f)));
   return;
 }
 

test/tint/expressions/binary/sub/scalar-scalar/f32.wgsl.expected.msl

@@ -4,7 +4,7 @@ using namespace metal;
 kernel void f() {
   float const a = 1.0f;
   float const b = 2.0f;
-  float const r = (a - b);
+  float const r = (1.0f - 2.0f);
   return;
 }
 

test/tint/expressions/binary/sub/scalar-scalar/i32.wgsl.expected.msl

@@ -4,7 +4,7 @@ using namespace metal;
 kernel void f() {
   int const a = 1;
   int const b = 2;
-  int const r = as_type<int>((as_type<uint>(a) - as_type<uint>(b)));
+  int const r = as_type<int>((as_type<uint>(1) - as_type<uint>(2)));
   return;
 }
 

test/tint/expressions/binary/sub/scalar-scalar/u32.wgsl.expected.msl

@@ -4,7 +4,7 @@ using namespace metal;
 kernel void f() {
   uint const a = 1u;
   uint const b = 2u;
-  uint const r = (a - b);
+  uint const r = (1u - 2u);
   return;
 }