test/tint/expressions/type_ctor: Use 'var' instead of 'let'

Module-scope 'let' is getting replaced by 'const'. For all backends,
'const' will be inlined into the place of usage, making most of these
tests produce no output (if replaced with 'const'). Instead switch to
emitting with 'var'.

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

test/tint/expressions/type_ctor/mat2x2/explicit/identity/f32.wgsl

@@ -1,5 +1,5 @@
-let m = mat2x2(mat2x2<f32>(0.0f, 1.0f,
-                           2.0f, 3.0f));
+var<private> m = mat2x2(mat2x2<f32>(0.0f, 1.0f,
+                                    2.0f, 3.0f));
 
 fn f() -> mat2x2<f32> {
     let m_1 = mat2x2(m);

test/tint/expressions/type_ctor/mat2x2/explicit/identity/f32.wgsl.expected.glsl

@@ -4,9 +4,9 @@ layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
 void unused_entry_point() {
   return;
 }
-const mat2 m = mat2(vec2(0.0f, 1.0f), vec2(2.0f, 3.0f));
+mat2 m = mat2(vec2(0.0f, 1.0f), vec2(2.0f, 3.0f));
 mat2 f() {
-  mat2 m_1 = mat2(vec2(0.0f, 1.0f), vec2(2.0f, 3.0f));
+  mat2 m_1 = mat2(m);
   return m_1;
 }
 

test/tint/expressions/type_ctor/mat2x2/explicit/identity/f32.wgsl.expected.hlsl

@@ -3,9 +3,9 @@ void unused_entry_point() {
   return;
 }
 
-static const float2x2 m = float2x2(float2(0.0f, 1.0f), float2(2.0f, 3.0f));
+static float2x2 m = float2x2(float2(0.0f, 1.0f), float2(2.0f, 3.0f));
 
 float2x2 f() {
-  const float2x2 m_1 = float2x2(float2(0.0f, 1.0f), float2(2.0f, 3.0f));
+  const float2x2 m_1 = float2x2(m);
   return m_1;
 }

test/tint/expressions/type_ctor/mat2x2/explicit/identity/f32.wgsl.expected.msl

@@ -1,10 +1,9 @@
 #include <metal_stdlib>
 
 using namespace metal;
-constant float2x2 m = float2x2(float2(0.0f, 1.0f), float2(2.0f, 3.0f));
-
 float2x2 f() {
-  float2x2 const m_1 = float2x2(float2(0.0f, 1.0f), float2(2.0f, 3.0f));
+  thread float2x2 tint_symbol = float2x2(float2(0.0f, 1.0f), float2(2.0f, 3.0f));
+  float2x2 const m_1 = float2x2(tint_symbol);
   return m_1;
 }
 

test/tint/expressions/type_ctor/mat2x2/explicit/identity/f32.wgsl.expected.spvasm

@@ -1,7 +1,7 @@
 ; SPIR-V
 ; Version: 1.3
 ; Generator: Google Tint Compiler; 0
-; Bound: 18
+; Bound: 22
 ; Schema: 0
                OpCapability Shader
                OpMemoryModel Logical GLSL450
@@ -19,15 +19,18 @@
     %float_2 = OpConstant %float 2
     %float_3 = OpConstant %float 3
           %9 = OpConstantComposite %v2float %float_2 %float_3
-          %m = OpConstantComposite %mat2v2float %6 %9
+         %10 = OpConstantComposite %mat2v2float %6 %9
+%_ptr_Private_mat2v2float = OpTypePointer Private %mat2v2float
+          %m = OpVariable %_ptr_Private_mat2v2float Private %10
        %void = OpTypeVoid
-         %11 = OpTypeFunction %void
-         %15 = OpTypeFunction %mat2v2float
-%unused_entry_point = OpFunction %void None %11
-         %14 = OpLabel
+         %13 = OpTypeFunction %void
+         %17 = OpTypeFunction %mat2v2float
+%unused_entry_point = OpFunction %void None %13
+         %16 = OpLabel
                OpReturn
                OpFunctionEnd
-          %f = OpFunction %mat2v2float None %15
-         %17 = OpLabel
-               OpReturnValue %m
+          %f = OpFunction %mat2v2float None %17
+         %19 = OpLabel
+         %21 = OpLoad %mat2v2float %m
+               OpReturnValue %21
                OpFunctionEnd

test/tint/expressions/type_ctor/mat2x2/explicit/identity/f32.wgsl.expected.wgsl

@@ -1,4 +1,4 @@
-let m = mat2x2(mat2x2<f32>(0.0f, 1.0f, 2.0f, 3.0f));
+var<private> m = mat2x2(mat2x2<f32>(0.0f, 1.0f, 2.0f, 3.0f));
 
 fn f() -> mat2x2<f32> {
   let m_1 = mat2x2(m);

test/tint/expressions/type_ctor/mat2x2/explicit/scalars/f32.wgsl

@@ -1,2 +1,2 @@
-let m = mat2x2<f32>(0.0f, 1.0f,
-                    2.0f, 3.0f);
+var<private> m = mat2x2<f32>(0.0f, 1.0f,
+                             2.0f, 3.0f);

test/tint/expressions/type_ctor/mat2x2/explicit/scalars/f32.wgsl.expected.glsl

@@ -4,4 +4,4 @@ layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
 void unused_entry_point() {
   return;
 }
-const mat2 m = mat2(vec2(0.0f, 1.0f), vec2(2.0f, 3.0f));
+mat2 m = mat2(vec2(0.0f, 1.0f), vec2(2.0f, 3.0f));

test/tint/expressions/type_ctor/mat2x2/explicit/scalars/f32.wgsl.expected.hlsl

@@ -3,4 +3,4 @@ void unused_entry_point() {
   return;
 }
 
-static const float2x2 m = float2x2(float2(0.0f, 1.0f), float2(2.0f, 3.0f));
+static float2x2 m = float2x2(float2(0.0f, 1.0f), float2(2.0f, 3.0f));

test/tint/expressions/type_ctor/mat2x2/explicit/scalars/f32.wgsl.expected.msl

@@ -1,5 +1,3 @@
 #include <metal_stdlib>
 
 using namespace metal;
-constant float2x2 m = float2x2(float2(0.0f, 1.0f), float2(2.0f, 3.0f));
-

test/tint/expressions/type_ctor/mat2x2/explicit/scalars/f32.wgsl.expected.spvasm

@@ -1,7 +1,7 @@
 ; SPIR-V
 ; Version: 1.3
 ; Generator: Google Tint Compiler; 0
-; Bound: 15
+; Bound: 17
 ; Schema: 0
                OpCapability Shader
                OpMemoryModel Logical GLSL450
@@ -18,10 +18,12 @@
     %float_2 = OpConstant %float 2
     %float_3 = OpConstant %float 3
           %9 = OpConstantComposite %v2float %float_2 %float_3
-          %m = OpConstantComposite %mat2v2float %6 %9
+         %10 = OpConstantComposite %mat2v2float %6 %9
+%_ptr_Private_mat2v2float = OpTypePointer Private %mat2v2float
+          %m = OpVariable %_ptr_Private_mat2v2float Private %10
        %void = OpTypeVoid
-         %11 = OpTypeFunction %void
-%unused_entry_point = OpFunction %void None %11
-         %14 = OpLabel
+         %13 = OpTypeFunction %void
+%unused_entry_point = OpFunction %void None %13
+         %16 = OpLabel
                OpReturn
                OpFunctionEnd

test/tint/expressions/type_ctor/mat2x2/explicit/scalars/f32.wgsl.expected.wgsl

@@ -1 +1 @@
-let m = mat2x2<f32>(0.0f, 1.0f, 2.0f, 3.0f);
+var<private> m = mat2x2<f32>(0.0f, 1.0f, 2.0f, 3.0f);

test/tint/expressions/type_ctor/mat2x2/explicit/vectors/f32.wgsl

@@ -1,2 +1,2 @@
-let m = mat2x2<f32>(vec2<f32>(0.0f, 1.0f),
-                    vec2<f32>(2.0f, 3.0f));
+var<private> m = mat2x2<f32>(vec2<f32>(0.0f, 1.0f),
+                             vec2<f32>(2.0f, 3.0f));

test/tint/expressions/type_ctor/mat2x2/explicit/vectors/f32.wgsl.expected.glsl

@@ -4,4 +4,4 @@ layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
 void unused_entry_point() {
   return;
 }
-const mat2 m = mat2(vec2(0.0f, 1.0f), vec2(2.0f, 3.0f));
+mat2 m = mat2(vec2(0.0f, 1.0f), vec2(2.0f, 3.0f));

test/tint/expressions/type_ctor/mat2x2/explicit/vectors/f32.wgsl.expected.hlsl

@@ -3,4 +3,4 @@ void unused_entry_point() {
   return;
 }
 
-static const float2x2 m = float2x2(float2(0.0f, 1.0f), float2(2.0f, 3.0f));
+static float2x2 m = float2x2(float2(0.0f, 1.0f), float2(2.0f, 3.0f));

test/tint/expressions/type_ctor/mat2x2/explicit/vectors/f32.wgsl.expected.msl

@@ -1,5 +1,3 @@
 #include <metal_stdlib>
 
 using namespace metal;
-constant float2x2 m = float2x2(float2(0.0f, 1.0f), float2(2.0f, 3.0f));
-

test/tint/expressions/type_ctor/mat2x2/explicit/vectors/f32.wgsl.expected.spvasm

@@ -1,7 +1,7 @@
 ; SPIR-V
 ; Version: 1.3
 ; Generator: Google Tint Compiler; 0
-; Bound: 15
+; Bound: 17
 ; Schema: 0
                OpCapability Shader
                OpMemoryModel Logical GLSL450
@@ -18,10 +18,12 @@
     %float_2 = OpConstant %float 2
     %float_3 = OpConstant %float 3
           %9 = OpConstantComposite %v2float %float_2 %float_3
-          %m = OpConstantComposite %mat2v2float %6 %9
+         %10 = OpConstantComposite %mat2v2float %6 %9
+%_ptr_Private_mat2v2float = OpTypePointer Private %mat2v2float
+          %m = OpVariable %_ptr_Private_mat2v2float Private %10
        %void = OpTypeVoid
-         %11 = OpTypeFunction %void
-%unused_entry_point = OpFunction %void None %11
-         %14 = OpLabel
+         %13 = OpTypeFunction %void
+%unused_entry_point = OpFunction %void None %13
+         %16 = OpLabel
                OpReturn
                OpFunctionEnd

test/tint/expressions/type_ctor/mat2x2/explicit/vectors/f32.wgsl.expected.wgsl

@@ -1 +1 @@
-let m = mat2x2<f32>(vec2<f32>(0.0f, 1.0f), vec2<f32>(2.0f, 3.0f));
+var<private> m = mat2x2<f32>(vec2<f32>(0.0f, 1.0f), vec2<f32>(2.0f, 3.0f));

test/tint/expressions/type_ctor/mat2x2/inferred/identity/f32.wgsl

@@ -1,5 +1,5 @@
-let m = mat2x2(mat2x2(0.0f, 1.0f,
-                      2.0f, 3.0f));
+var<private> m = mat2x2(mat2x2(0.0f, 1.0f,
+                               2.0f, 3.0f));
 
 fn f() -> mat2x2<f32> {
     let m_1 = mat2x2(m);

test/tint/expressions/type_ctor/mat2x2/inferred/identity/f32.wgsl.expected.glsl

@@ -4,9 +4,9 @@ layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
 void unused_entry_point() {
   return;
 }
-const mat2 m = mat2(vec2(0.0f, 1.0f), vec2(2.0f, 3.0f));
+mat2 m = mat2(vec2(0.0f, 1.0f), vec2(2.0f, 3.0f));
 mat2 f() {
-  mat2 m_1 = mat2(vec2(0.0f, 1.0f), vec2(2.0f, 3.0f));
+  mat2 m_1 = mat2(m);
   return m_1;
 }
 

test/tint/expressions/type_ctor/mat2x2/inferred/identity/f32.wgsl.expected.hlsl

@@ -3,9 +3,9 @@ void unused_entry_point() {
   return;
 }
 
-static const float2x2 m = float2x2(float2(0.0f, 1.0f), float2(2.0f, 3.0f));
+static float2x2 m = float2x2(float2(0.0f, 1.0f), float2(2.0f, 3.0f));
 
 float2x2 f() {
-  const float2x2 m_1 = float2x2(float2(0.0f, 1.0f), float2(2.0f, 3.0f));
+  const float2x2 m_1 = float2x2(m);
   return m_1;
 }

test/tint/expressions/type_ctor/mat2x2/inferred/identity/f32.wgsl.expected.msl

@@ -1,10 +1,9 @@
 #include <metal_stdlib>
 
 using namespace metal;
-constant float2x2 m = float2x2(float2(0.0f, 1.0f), float2(2.0f, 3.0f));
-
 float2x2 f() {
-  float2x2 const m_1 = float2x2(float2(0.0f, 1.0f), float2(2.0f, 3.0f));
+  thread float2x2 tint_symbol = float2x2(float2(0.0f, 1.0f), float2(2.0f, 3.0f));
+  float2x2 const m_1 = float2x2(tint_symbol);
   return m_1;
 }
 

test/tint/expressions/type_ctor/mat2x2/inferred/identity/f32.wgsl.expected.spvasm

@@ -1,7 +1,7 @@
 ; SPIR-V
 ; Version: 1.3
 ; Generator: Google Tint Compiler; 0
-; Bound: 18
+; Bound: 22
 ; Schema: 0
                OpCapability Shader
                OpMemoryModel Logical GLSL450
@@ -19,15 +19,18 @@
     %float_2 = OpConstant %float 2
     %float_3 = OpConstant %float 3
           %9 = OpConstantComposite %v2float %float_2 %float_3
-          %m = OpConstantComposite %mat2v2float %6 %9
+         %10 = OpConstantComposite %mat2v2float %6 %9
+%_ptr_Private_mat2v2float = OpTypePointer Private %mat2v2float
+          %m = OpVariable %_ptr_Private_mat2v2float Private %10
        %void = OpTypeVoid
-         %11 = OpTypeFunction %void
-         %15 = OpTypeFunction %mat2v2float
-%unused_entry_point = OpFunction %void None %11
-         %14 = OpLabel
+         %13 = OpTypeFunction %void
+         %17 = OpTypeFunction %mat2v2float
+%unused_entry_point = OpFunction %void None %13
+         %16 = OpLabel
                OpReturn
                OpFunctionEnd
-          %f = OpFunction %mat2v2float None %15
-         %17 = OpLabel
-               OpReturnValue %m
+          %f = OpFunction %mat2v2float None %17
+         %19 = OpLabel
+         %21 = OpLoad %mat2v2float %m
+               OpReturnValue %21
                OpFunctionEnd

test/tint/expressions/type_ctor/mat2x2/inferred/identity/f32.wgsl.expected.wgsl

@@ -1,4 +1,4 @@
-let m = mat2x2(mat2x2(0.0f, 1.0f, 2.0f, 3.0f));
+var<private> m = mat2x2(mat2x2(0.0f, 1.0f, 2.0f, 3.0f));
 
 fn f() -> mat2x2<f32> {
   let m_1 = mat2x2(m);

test/tint/expressions/type_ctor/mat2x2/inferred/scalars/abstract-float.wgsl

@@ -1,2 +1,2 @@
-let m = mat2x2(0.0, 1.0,
-               2.0, 3.0);
+var<private> m = mat2x2(0.0, 1.0,
+                        2.0, 3.0);

test/tint/expressions/type_ctor/mat2x2/inferred/scalars/abstract-float.wgsl.expected.glsl

@@ -4,4 +4,4 @@ layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
 void unused_entry_point() {
   return;
 }
-const mat2 m = mat2(vec2(0.0f, 1.0f), vec2(2.0f, 3.0f));
+mat2 m = mat2(vec2(0.0f, 1.0f), vec2(2.0f, 3.0f));

test/tint/expressions/type_ctor/mat2x2/inferred/scalars/abstract-float.wgsl.expected.hlsl

@@ -3,4 +3,4 @@ void unused_entry_point() {
   return;
 }
 
-static const float2x2 m = float2x2(float2(0.0f, 1.0f), float2(2.0f, 3.0f));
+static float2x2 m = float2x2(float2(0.0f, 1.0f), float2(2.0f, 3.0f));

test/tint/expressions/type_ctor/mat2x2/inferred/scalars/abstract-float.wgsl.expected.msl

@@ -1,5 +1,3 @@
 #include <metal_stdlib>
 
 using namespace metal;
-constant float2x2 m = float2x2(float2(0.0f, 1.0f), float2(2.0f, 3.0f));
-

test/tint/expressions/type_ctor/mat2x2/inferred/scalars/abstract-float.wgsl.expected.spvasm

@@ -1,7 +1,7 @@
 ; SPIR-V
 ; Version: 1.3
 ; Generator: Google Tint Compiler; 0
-; Bound: 15
+; Bound: 17
 ; Schema: 0
                OpCapability Shader
                OpMemoryModel Logical GLSL450
@@ -18,10 +18,12 @@
     %float_2 = OpConstant %float 2
     %float_3 = OpConstant %float 3
           %9 = OpConstantComposite %v2float %float_2 %float_3
-          %m = OpConstantComposite %mat2v2float %6 %9
+         %10 = OpConstantComposite %mat2v2float %6 %9
+%_ptr_Private_mat2v2float = OpTypePointer Private %mat2v2float
+          %m = OpVariable %_ptr_Private_mat2v2float Private %10
        %void = OpTypeVoid
-         %11 = OpTypeFunction %void
-%unused_entry_point = OpFunction %void None %11
-         %14 = OpLabel
+         %13 = OpTypeFunction %void
+%unused_entry_point = OpFunction %void None %13
+         %16 = OpLabel
                OpReturn
                OpFunctionEnd

test/tint/expressions/type_ctor/mat2x2/inferred/scalars/abstract-float.wgsl.expected.wgsl

@@ -1 +1 @@
-let m = mat2x2(0.0, 1.0, 2.0, 3.0);
+var<private> m = mat2x2(0.0, 1.0, 2.0, 3.0);

test/tint/expressions/type_ctor/mat2x2/inferred/scalars/f32.wgsl

@@ -1,2 +1,2 @@
-let m = mat2x2(0.0f, 1.0f,
-               2.0f, 3.0f);
+var<private> m = mat2x2(0.0f, 1.0f,
+                        2.0f, 3.0f);

test/tint/expressions/type_ctor/mat2x2/inferred/scalars/f32.wgsl.expected.glsl

@@ -4,4 +4,4 @@ layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
 void unused_entry_point() {
   return;
 }
-const mat2 m = mat2(vec2(0.0f, 1.0f), vec2(2.0f, 3.0f));
+mat2 m = mat2(vec2(0.0f, 1.0f), vec2(2.0f, 3.0f));

test/tint/expressions/type_ctor/mat2x2/inferred/scalars/f32.wgsl.expected.hlsl

@@ -3,4 +3,4 @@ void unused_entry_point() {
   return;
 }
 
-static const float2x2 m = float2x2(float2(0.0f, 1.0f), float2(2.0f, 3.0f));
+static float2x2 m = float2x2(float2(0.0f, 1.0f), float2(2.0f, 3.0f));

test/tint/expressions/type_ctor/mat2x2/inferred/scalars/f32.wgsl.expected.msl

@@ -1,5 +1,3 @@
 #include <metal_stdlib>
 
 using namespace metal;
-constant float2x2 m = float2x2(float2(0.0f, 1.0f), float2(2.0f, 3.0f));
-

test/tint/expressions/type_ctor/mat2x2/inferred/scalars/f32.wgsl.expected.spvasm

@@ -1,7 +1,7 @@
 ; SPIR-V
 ; Version: 1.3
 ; Generator: Google Tint Compiler; 0
-; Bound: 15
+; Bound: 17
 ; Schema: 0
                OpCapability Shader
                OpMemoryModel Logical GLSL450
@@ -18,10 +18,12 @@
     %float_2 = OpConstant %float 2
     %float_3 = OpConstant %float 3
           %9 = OpConstantComposite %v2float %float_2 %float_3
-          %m = OpConstantComposite %mat2v2float %6 %9
+         %10 = OpConstantComposite %mat2v2float %6 %9
+%_ptr_Private_mat2v2float = OpTypePointer Private %mat2v2float
+          %m = OpVariable %_ptr_Private_mat2v2float Private %10
        %void = OpTypeVoid
-         %11 = OpTypeFunction %void
-%unused_entry_point = OpFunction %void None %11
-         %14 = OpLabel
+         %13 = OpTypeFunction %void
+%unused_entry_point = OpFunction %void None %13
+         %16 = OpLabel
                OpReturn
                OpFunctionEnd

test/tint/expressions/type_ctor/mat2x2/inferred/scalars/f32.wgsl.expected.wgsl

@@ -1 +1 @@
-let m = mat2x2(0.0f, 1.0f, 2.0f, 3.0f);
+var<private> m = mat2x2(0.0f, 1.0f, 2.0f, 3.0f);

test/tint/expressions/type_ctor/mat2x2/inferred/vectors/abstract-float.wgsl

@@ -1,2 +1,2 @@
-let m = mat2x2(vec2(0.0, 1.0),
-               vec2(2.0, 3.0));
+var<private> m = mat2x2(vec2(0.0, 1.0),
+                        vec2(2.0, 3.0));

test/tint/expressions/type_ctor/mat2x2/inferred/vectors/abstract-float.wgsl.expected.glsl

@@ -4,4 +4,4 @@ layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
 void unused_entry_point() {
   return;
 }
-const mat2 m = mat2(vec2(0.0f, 1.0f), vec2(2.0f, 3.0f));
+mat2 m = mat2(vec2(0.0f, 1.0f), vec2(2.0f, 3.0f));

test/tint/expressions/type_ctor/mat2x2/inferred/vectors/abstract-float.wgsl.expected.hlsl

@@ -3,4 +3,4 @@ void unused_entry_point() {
   return;
 }
 
-static const float2x2 m = float2x2(float2(0.0f, 1.0f), float2(2.0f, 3.0f));
+static float2x2 m = float2x2(float2(0.0f, 1.0f), float2(2.0f, 3.0f));

test/tint/expressions/type_ctor/mat2x2/inferred/vectors/abstract-float.wgsl.expected.msl

@@ -1,5 +1,3 @@
 #include <metal_stdlib>
 
 using namespace metal;
-constant float2x2 m = float2x2(float2(0.0f, 1.0f), float2(2.0f, 3.0f));
-

test/tint/expressions/type_ctor/mat2x2/inferred/vectors/abstract-float.wgsl.expected.spvasm

@@ -1,7 +1,7 @@
 ; SPIR-V
 ; Version: 1.3
 ; Generator: Google Tint Compiler; 0
-; Bound: 15
+; Bound: 17
 ; Schema: 0
                OpCapability Shader
                OpMemoryModel Logical GLSL450
@@ -18,10 +18,12 @@
     %float_2 = OpConstant %float 2
     %float_3 = OpConstant %float 3
           %9 = OpConstantComposite %v2float %float_2 %float_3
-          %m = OpConstantComposite %mat2v2float %6 %9
+         %10 = OpConstantComposite %mat2v2float %6 %9
+%_ptr_Private_mat2v2float = OpTypePointer Private %mat2v2float
+          %m = OpVariable %_ptr_Private_mat2v2float Private %10
        %void = OpTypeVoid
-         %11 = OpTypeFunction %void
-%unused_entry_point = OpFunction %void None %11
-         %14 = OpLabel
+         %13 = OpTypeFunction %void
+%unused_entry_point = OpFunction %void None %13
+         %16 = OpLabel
                OpReturn
                OpFunctionEnd

test/tint/expressions/type_ctor/mat2x2/inferred/vectors/abstract-float.wgsl.expected.wgsl

@@ -1 +1 @@
-let m = mat2x2(vec2(0.0, 1.0), vec2(2.0, 3.0));
+var<private> m = mat2x2(vec2(0.0, 1.0), vec2(2.0, 3.0));

test/tint/expressions/type_ctor/mat2x2/inferred/vectors/f32.wgsl

@@ -1,2 +1,2 @@
-let m = mat2x2(vec2<f32>(0.0, 1.0),
-               vec2<f32>(2.0, 3.0));
+var<private> m = mat2x2(vec2<f32>(0.0, 1.0),
+                        vec2<f32>(2.0, 3.0));

test/tint/expressions/type_ctor/mat2x2/inferred/vectors/f32.wgsl.expected.glsl

@@ -4,4 +4,4 @@ layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
 void unused_entry_point() {
   return;
 }
-const mat2 m = mat2(vec2(0.0f, 1.0f), vec2(2.0f, 3.0f));
+mat2 m = mat2(vec2(0.0f, 1.0f), vec2(2.0f, 3.0f));

test/tint/expressions/type_ctor/mat2x2/inferred/vectors/f32.wgsl.expected.hlsl

@@ -3,4 +3,4 @@ void unused_entry_point() {
   return;
 }
 
-static const float2x2 m = float2x2(float2(0.0f, 1.0f), float2(2.0f, 3.0f));
+static float2x2 m = float2x2(float2(0.0f, 1.0f), float2(2.0f, 3.0f));

test/tint/expressions/type_ctor/mat2x2/inferred/vectors/f32.wgsl.expected.msl

@@ -1,5 +1,3 @@
 #include <metal_stdlib>
 
 using namespace metal;
-constant float2x2 m = float2x2(float2(0.0f, 1.0f), float2(2.0f, 3.0f));
-

test/tint/expressions/type_ctor/mat2x2/inferred/vectors/f32.wgsl.expected.spvasm

@@ -1,7 +1,7 @@
 ; SPIR-V
 ; Version: 1.3
 ; Generator: Google Tint Compiler; 0
-; Bound: 15
+; Bound: 17
 ; Schema: 0
                OpCapability Shader
                OpMemoryModel Logical GLSL450
@@ -18,10 +18,12 @@
     %float_2 = OpConstant %float 2
     %float_3 = OpConstant %float 3
           %9 = OpConstantComposite %v2float %float_2 %float_3
-          %m = OpConstantComposite %mat2v2float %6 %9
+         %10 = OpConstantComposite %mat2v2float %6 %9
+%_ptr_Private_mat2v2float = OpTypePointer Private %mat2v2float
+          %m = OpVariable %_ptr_Private_mat2v2float Private %10
        %void = OpTypeVoid
-         %11 = OpTypeFunction %void
-%unused_entry_point = OpFunction %void None %11
-         %14 = OpLabel
+         %13 = OpTypeFunction %void
+%unused_entry_point = OpFunction %void None %13
+         %16 = OpLabel
                OpReturn
                OpFunctionEnd

test/tint/expressions/type_ctor/mat2x2/inferred/vectors/f32.wgsl.expected.wgsl

@@ -1 +1 @@
-let m = mat2x2(vec2<f32>(0.0, 1.0), vec2<f32>(2.0, 3.0));
+var<private> m = mat2x2(vec2<f32>(0.0, 1.0), vec2<f32>(2.0, 3.0));

test/tint/expressions/type_ctor/mat2x2/zero/f32.wgsl

@@ -1 +1 @@
-let m = mat2x2<f32>();
+var<private> m = mat2x2<f32>();

test/tint/expressions/type_ctor/mat2x2/zero/f32.wgsl.expected.glsl

@@ -4,4 +4,4 @@ layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
 void unused_entry_point() {
   return;
 }
-const mat2 m = mat2(vec2(0.0f), vec2(0.0f));
+mat2 m = mat2(vec2(0.0f), vec2(0.0f));

test/tint/expressions/type_ctor/mat2x2/zero/f32.wgsl.expected.hlsl

@@ -3,4 +3,4 @@ void unused_entry_point() {
   return;
 }
 
-static const float2x2 m = float2x2((0.0f).xx, (0.0f).xx);
+static float2x2 m = float2x2((0.0f).xx, (0.0f).xx);

test/tint/expressions/type_ctor/mat2x2/zero/f32.wgsl.expected.msl

@@ -1,5 +1,3 @@
 #include <metal_stdlib>
 
 using namespace metal;
-constant float2x2 m = float2x2(float2(0.0f), float2(0.0f));
-

test/tint/expressions/type_ctor/mat2x2/zero/f32.wgsl.expected.spvasm

@@ -1,7 +1,7 @@
 ; SPIR-V
 ; Version: 1.3
 ; Generator: Google Tint Compiler; 0
-; Bound: 9
+; Bound: 11
 ; Schema: 0
                OpCapability Shader
                OpMemoryModel Logical GLSL450
@@ -12,10 +12,12 @@
       %float = OpTypeFloat 32
     %v2float = OpTypeVector %float 2
 %mat2v2float = OpTypeMatrix %v2float 2
-          %m = OpConstantNull %mat2v2float
+          %4 = OpConstantNull %mat2v2float
+%_ptr_Private_mat2v2float = OpTypePointer Private %mat2v2float
+          %m = OpVariable %_ptr_Private_mat2v2float Private %4
        %void = OpTypeVoid
-          %5 = OpTypeFunction %void
-%unused_entry_point = OpFunction %void None %5
-          %8 = OpLabel
+          %7 = OpTypeFunction %void
+%unused_entry_point = OpFunction %void None %7
+         %10 = OpLabel
                OpReturn
                OpFunctionEnd

test/tint/expressions/type_ctor/mat2x2/zero/f32.wgsl.expected.wgsl

@@ -1 +1 @@
-let m = mat2x2<f32>();
+var<private> m = mat2x2<f32>();

test/tint/expressions/type_ctor/mat2x3/explicit/identity/f32.wgsl

@@ -1,5 +1,5 @@
-let m = mat2x3(mat2x3<f32>(0.0f, 1.0f, 2.0f,
-                           3.0f, 4.0f, 5.0f));
+var<private> m = mat2x3(mat2x3<f32>(0.0f, 1.0f, 2.0f,
+                                    3.0f, 4.0f, 5.0f));
 
 fn f() -> mat2x3<f32> {
     let m_1 = mat2x3(m);

test/tint/expressions/type_ctor/mat2x3/explicit/identity/f32.wgsl.expected.glsl

@@ -4,9 +4,9 @@ layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
 void unused_entry_point() {
   return;
 }
-const mat2x3 m = mat2x3(vec3(0.0f, 1.0f, 2.0f), vec3(3.0f, 4.0f, 5.0f));
+mat2x3 m = mat2x3(vec3(0.0f, 1.0f, 2.0f), vec3(3.0f, 4.0f, 5.0f));
 mat2x3 f() {
-  mat2x3 m_1 = mat2x3(vec3(0.0f, 1.0f, 2.0f), vec3(3.0f, 4.0f, 5.0f));
+  mat2x3 m_1 = mat2x3(m);
   return m_1;
 }
 

test/tint/expressions/type_ctor/mat2x3/explicit/identity/f32.wgsl.expected.hlsl

@@ -3,9 +3,9 @@ void unused_entry_point() {
   return;
 }
 
-static const float2x3 m = float2x3(float3(0.0f, 1.0f, 2.0f), float3(3.0f, 4.0f, 5.0f));
+static float2x3 m = float2x3(float3(0.0f, 1.0f, 2.0f), float3(3.0f, 4.0f, 5.0f));
 
 float2x3 f() {
-  const float2x3 m_1 = float2x3(float3(0.0f, 1.0f, 2.0f), float3(3.0f, 4.0f, 5.0f));
+  const float2x3 m_1 = float2x3(m);
   return m_1;
 }

test/tint/expressions/type_ctor/mat2x3/explicit/identity/f32.wgsl.expected.msl

@@ -1,10 +1,9 @@
 #include <metal_stdlib>
 
 using namespace metal;
-constant float2x3 m = float2x3(float3(0.0f, 1.0f, 2.0f), float3(3.0f, 4.0f, 5.0f));
-
 float2x3 f() {
-  float2x3 const m_1 = float2x3(float3(0.0f, 1.0f, 2.0f), float3(3.0f, 4.0f, 5.0f));
+  thread float2x3 tint_symbol = float2x3(float3(0.0f, 1.0f, 2.0f), float3(3.0f, 4.0f, 5.0f));
+  float2x3 const m_1 = float2x3(tint_symbol);
   return m_1;
 }
 

test/tint/expressions/type_ctor/mat2x3/explicit/identity/f32.wgsl.expected.spvasm

@@ -1,7 +1,7 @@
 ; SPIR-V
 ; Version: 1.3
 ; Generator: Google Tint Compiler; 0
-; Bound: 20
+; Bound: 24
 ; Schema: 0
                OpCapability Shader
                OpMemoryModel Logical GLSL450
@@ -21,15 +21,18 @@
     %float_4 = OpConstant %float 4
     %float_5 = OpConstant %float 5
          %11 = OpConstantComposite %v3float %float_3 %float_4 %float_5
-          %m = OpConstantComposite %mat2v3float %7 %11
+         %12 = OpConstantComposite %mat2v3float %7 %11
+%_ptr_Private_mat2v3float = OpTypePointer Private %mat2v3float
+          %m = OpVariable %_ptr_Private_mat2v3float Private %12
        %void = OpTypeVoid
-         %13 = OpTypeFunction %void
-         %17 = OpTypeFunction %mat2v3float
-%unused_entry_point = OpFunction %void None %13
-         %16 = OpLabel
+         %15 = OpTypeFunction %void
+         %19 = OpTypeFunction %mat2v3float
+%unused_entry_point = OpFunction %void None %15
+         %18 = OpLabel
                OpReturn
                OpFunctionEnd
-          %f = OpFunction %mat2v3float None %17
-         %19 = OpLabel
-               OpReturnValue %m
+          %f = OpFunction %mat2v3float None %19
+         %21 = OpLabel
+         %23 = OpLoad %mat2v3float %m
+               OpReturnValue %23
                OpFunctionEnd

test/tint/expressions/type_ctor/mat2x3/explicit/identity/f32.wgsl.expected.wgsl

@@ -1,4 +1,4 @@
-let m = mat2x3(mat2x3<f32>(0.0f, 1.0f, 2.0f, 3.0f, 4.0f, 5.0f));
+var<private> m = mat2x3(mat2x3<f32>(0.0f, 1.0f, 2.0f, 3.0f, 4.0f, 5.0f));
 
 fn f() -> mat2x3<f32> {
   let m_1 = mat2x3(m);

test/tint/expressions/type_ctor/mat2x3/explicit/scalars/f32.wgsl

@@ -1,2 +1,2 @@
-let m = mat2x3<f32>(0.0f, 1.0f, 2.0f,
-                    3.0f, 4.0f, 5.0f);
+var<private> m = mat2x3<f32>(0.0f, 1.0f, 2.0f,
+                             3.0f, 4.0f, 5.0f);

test/tint/expressions/type_ctor/mat2x3/explicit/scalars/f32.wgsl.expected.glsl

@@ -4,4 +4,4 @@ layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
 void unused_entry_point() {
   return;
 }
-const mat2x3 m = mat2x3(vec3(0.0f, 1.0f, 2.0f), vec3(3.0f, 4.0f, 5.0f));
+mat2x3 m = mat2x3(vec3(0.0f, 1.0f, 2.0f), vec3(3.0f, 4.0f, 5.0f));

test/tint/expressions/type_ctor/mat2x3/explicit/scalars/f32.wgsl.expected.hlsl

@@ -3,4 +3,4 @@ void unused_entry_point() {
   return;
 }
 
-static const float2x3 m = float2x3(float3(0.0f, 1.0f, 2.0f), float3(3.0f, 4.0f, 5.0f));
+static float2x3 m = float2x3(float3(0.0f, 1.0f, 2.0f), float3(3.0f, 4.0f, 5.0f));

test/tint/expressions/type_ctor/mat2x3/explicit/scalars/f32.wgsl.expected.msl

@@ -1,5 +1,3 @@
 #include <metal_stdlib>
 
 using namespace metal;
-constant float2x3 m = float2x3(float3(0.0f, 1.0f, 2.0f), float3(3.0f, 4.0f, 5.0f));
-

test/tint/expressions/type_ctor/mat2x3/explicit/scalars/f32.wgsl.expected.spvasm

@@ -1,7 +1,7 @@
 ; SPIR-V
 ; Version: 1.3
 ; Generator: Google Tint Compiler; 0
-; Bound: 17
+; Bound: 19
 ; Schema: 0
                OpCapability Shader
                OpMemoryModel Logical GLSL450
@@ -20,10 +20,12 @@
     %float_4 = OpConstant %float 4
     %float_5 = OpConstant %float 5
          %11 = OpConstantComposite %v3float %float_3 %float_4 %float_5
-          %m = OpConstantComposite %mat2v3float %7 %11
+         %12 = OpConstantComposite %mat2v3float %7 %11
+%_ptr_Private_mat2v3float = OpTypePointer Private %mat2v3float
+          %m = OpVariable %_ptr_Private_mat2v3float Private %12
        %void = OpTypeVoid
-         %13 = OpTypeFunction %void
-%unused_entry_point = OpFunction %void None %13
-         %16 = OpLabel
+         %15 = OpTypeFunction %void
+%unused_entry_point = OpFunction %void None %15
+         %18 = OpLabel
                OpReturn
                OpFunctionEnd

test/tint/expressions/type_ctor/mat2x3/explicit/scalars/f32.wgsl.expected.wgsl

@@ -1 +1 @@
-let m = mat2x3<f32>(0.0f, 1.0f, 2.0f, 3.0f, 4.0f, 5.0f);
+var<private> m = mat2x3<f32>(0.0f, 1.0f, 2.0f, 3.0f, 4.0f, 5.0f);

test/tint/expressions/type_ctor/mat2x3/explicit/vectors/f32.wgsl

@@ -1,2 +1,2 @@
-let m = mat2x3<f32>(vec3<f32>(0.0f, 1.0f, 2.0f),
-                    vec3<f32>(3.0f, 4.0f, 5.0f));
+var<private> m = mat2x3<f32>(vec3<f32>(0.0f, 1.0f, 2.0f),
+                             vec3<f32>(3.0f, 4.0f, 5.0f));

test/tint/expressions/type_ctor/mat2x3/explicit/vectors/f32.wgsl.expected.glsl

@@ -4,4 +4,4 @@ layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
 void unused_entry_point() {
   return;
 }
-const mat2x3 m = mat2x3(vec3(0.0f, 1.0f, 2.0f), vec3(3.0f, 4.0f, 5.0f));
+mat2x3 m = mat2x3(vec3(0.0f, 1.0f, 2.0f), vec3(3.0f, 4.0f, 5.0f));

test/tint/expressions/type_ctor/mat2x3/explicit/vectors/f32.wgsl.expected.hlsl

@@ -3,4 +3,4 @@ void unused_entry_point() {
   return;
 }
 
-static const float2x3 m = float2x3(float3(0.0f, 1.0f, 2.0f), float3(3.0f, 4.0f, 5.0f));
+static float2x3 m = float2x3(float3(0.0f, 1.0f, 2.0f), float3(3.0f, 4.0f, 5.0f));

test/tint/expressions/type_ctor/mat2x3/explicit/vectors/f32.wgsl.expected.msl

@@ -1,5 +1,3 @@
 #include <metal_stdlib>
 
 using namespace metal;
-constant float2x3 m = float2x3(float3(0.0f, 1.0f, 2.0f), float3(3.0f, 4.0f, 5.0f));
-

test/tint/expressions/type_ctor/mat2x3/explicit/vectors/f32.wgsl.expected.spvasm

@@ -1,7 +1,7 @@
 ; SPIR-V
 ; Version: 1.3
 ; Generator: Google Tint Compiler; 0
-; Bound: 17
+; Bound: 19
 ; Schema: 0
                OpCapability Shader
                OpMemoryModel Logical GLSL450
@@ -20,10 +20,12 @@
     %float_4 = OpConstant %float 4
     %float_5 = OpConstant %float 5
          %11 = OpConstantComposite %v3float %float_3 %float_4 %float_5
-          %m = OpConstantComposite %mat2v3float %7 %11
+         %12 = OpConstantComposite %mat2v3float %7 %11
+%_ptr_Private_mat2v3float = OpTypePointer Private %mat2v3float
+          %m = OpVariable %_ptr_Private_mat2v3float Private %12
        %void = OpTypeVoid
-         %13 = OpTypeFunction %void
-%unused_entry_point = OpFunction %void None %13
-         %16 = OpLabel
+         %15 = OpTypeFunction %void
+%unused_entry_point = OpFunction %void None %15
+         %18 = OpLabel
                OpReturn
                OpFunctionEnd

test/tint/expressions/type_ctor/mat2x3/explicit/vectors/f32.wgsl.expected.wgsl

@@ -1 +1 @@
-let m = mat2x3<f32>(vec3<f32>(0.0f, 1.0f, 2.0f), vec3<f32>(3.0f, 4.0f, 5.0f));
+var<private> m = mat2x3<f32>(vec3<f32>(0.0f, 1.0f, 2.0f), vec3<f32>(3.0f, 4.0f, 5.0f));

test/tint/expressions/type_ctor/mat2x3/inferred/identity/f32.wgsl

@@ -1,5 +1,5 @@
-let m = mat2x3(mat2x3(0.0f, 1.0f, 2.0f,
-                      3.0f, 4.0f, 5.0f));
+var<private> m = mat2x3(mat2x3(0.0f, 1.0f, 2.0f,
+                               3.0f, 4.0f, 5.0f));
 
 fn f() -> mat2x3<f32> {
     let m_1 = mat2x3(m);

test/tint/expressions/type_ctor/mat2x3/inferred/identity/f32.wgsl.expected.glsl

@@ -4,9 +4,9 @@ layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
 void unused_entry_point() {
   return;
 }
-const mat2x3 m = mat2x3(vec3(0.0f, 1.0f, 2.0f), vec3(3.0f, 4.0f, 5.0f));
+mat2x3 m = mat2x3(vec3(0.0f, 1.0f, 2.0f), vec3(3.0f, 4.0f, 5.0f));
 mat2x3 f() {
-  mat2x3 m_1 = mat2x3(vec3(0.0f, 1.0f, 2.0f), vec3(3.0f, 4.0f, 5.0f));
+  mat2x3 m_1 = mat2x3(m);
   return m_1;
 }
 

test/tint/expressions/type_ctor/mat2x3/inferred/identity/f32.wgsl.expected.hlsl

@@ -3,9 +3,9 @@ void unused_entry_point() {
   return;
 }
 
-static const float2x3 m = float2x3(float3(0.0f, 1.0f, 2.0f), float3(3.0f, 4.0f, 5.0f));
+static float2x3 m = float2x3(float3(0.0f, 1.0f, 2.0f), float3(3.0f, 4.0f, 5.0f));
 
 float2x3 f() {
-  const float2x3 m_1 = float2x3(float3(0.0f, 1.0f, 2.0f), float3(3.0f, 4.0f, 5.0f));
+  const float2x3 m_1 = float2x3(m);
   return m_1;
 }

test/tint/expressions/type_ctor/mat2x3/inferred/identity/f32.wgsl.expected.msl

@@ -1,10 +1,9 @@
 #include <metal_stdlib>
 
 using namespace metal;
-constant float2x3 m = float2x3(float3(0.0f, 1.0f, 2.0f), float3(3.0f, 4.0f, 5.0f));
-
 float2x3 f() {
-  float2x3 const m_1 = float2x3(float3(0.0f, 1.0f, 2.0f), float3(3.0f, 4.0f, 5.0f));
+  thread float2x3 tint_symbol = float2x3(float3(0.0f, 1.0f, 2.0f), float3(3.0f, 4.0f, 5.0f));
+  float2x3 const m_1 = float2x3(tint_symbol);
   return m_1;
 }
 

test/tint/expressions/type_ctor/mat2x3/inferred/identity/f32.wgsl.expected.spvasm

@@ -1,7 +1,7 @@
 ; SPIR-V
 ; Version: 1.3
 ; Generator: Google Tint Compiler; 0
-; Bound: 20
+; Bound: 24
 ; Schema: 0
                OpCapability Shader
                OpMemoryModel Logical GLSL450
@@ -21,15 +21,18 @@
     %float_4 = OpConstant %float 4
     %float_5 = OpConstant %float 5
          %11 = OpConstantComposite %v3float %float_3 %float_4 %float_5
-          %m = OpConstantComposite %mat2v3float %7 %11
+         %12 = OpConstantComposite %mat2v3float %7 %11
+%_ptr_Private_mat2v3float = OpTypePointer Private %mat2v3float
+          %m = OpVariable %_ptr_Private_mat2v3float Private %12
        %void = OpTypeVoid
-         %13 = OpTypeFunction %void
-         %17 = OpTypeFunction %mat2v3float
-%unused_entry_point = OpFunction %void None %13
-         %16 = OpLabel
+         %15 = OpTypeFunction %void
+         %19 = OpTypeFunction %mat2v3float
+%unused_entry_point = OpFunction %void None %15
+         %18 = OpLabel
                OpReturn
                OpFunctionEnd
-          %f = OpFunction %mat2v3float None %17
-         %19 = OpLabel
-               OpReturnValue %m
+          %f = OpFunction %mat2v3float None %19
+         %21 = OpLabel
+         %23 = OpLoad %mat2v3float %m
+               OpReturnValue %23
                OpFunctionEnd

test/tint/expressions/type_ctor/mat2x3/inferred/identity/f32.wgsl.expected.wgsl

@@ -1,4 +1,4 @@
-let m = mat2x3(mat2x3(0.0f, 1.0f, 2.0f, 3.0f, 4.0f, 5.0f));
+var<private> m = mat2x3(mat2x3(0.0f, 1.0f, 2.0f, 3.0f, 4.0f, 5.0f));
 
 fn f() -> mat2x3<f32> {
   let m_1 = mat2x3(m);

test/tint/expressions/type_ctor/mat2x3/inferred/scalars/abstract-float.wgsl

@@ -1,2 +1,2 @@
-let m = mat2x3(0.0, 1.0, 2.0,
-               3.0, 4.0, 5.0);
+var<private> m = mat2x3(0.0, 1.0, 2.0,
+                        3.0, 4.0, 5.0);

test/tint/expressions/type_ctor/mat2x3/inferred/scalars/abstract-float.wgsl.expected.glsl

@@ -4,4 +4,4 @@ layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
 void unused_entry_point() {
   return;
 }
-const mat2x3 m = mat2x3(vec3(0.0f, 1.0f, 2.0f), vec3(3.0f, 4.0f, 5.0f));
+mat2x3 m = mat2x3(vec3(0.0f, 1.0f, 2.0f), vec3(3.0f, 4.0f, 5.0f));

test/tint/expressions/type_ctor/mat2x3/inferred/scalars/abstract-float.wgsl.expected.hlsl

@@ -3,4 +3,4 @@ void unused_entry_point() {
   return;
 }
 
-static const float2x3 m = float2x3(float3(0.0f, 1.0f, 2.0f), float3(3.0f, 4.0f, 5.0f));
+static float2x3 m = float2x3(float3(0.0f, 1.0f, 2.0f), float3(3.0f, 4.0f, 5.0f));

test/tint/expressions/type_ctor/mat2x3/inferred/scalars/abstract-float.wgsl.expected.msl

@@ -1,5 +1,3 @@
 #include <metal_stdlib>
 
 using namespace metal;
-constant float2x3 m = float2x3(float3(0.0f, 1.0f, 2.0f), float3(3.0f, 4.0f, 5.0f));
-

test/tint/expressions/type_ctor/mat2x3/inferred/scalars/abstract-float.wgsl.expected.spvasm

@@ -1,7 +1,7 @@
 ; SPIR-V
 ; Version: 1.3
 ; Generator: Google Tint Compiler; 0
-; Bound: 17
+; Bound: 19
 ; Schema: 0
                OpCapability Shader
                OpMemoryModel Logical GLSL450
@@ -20,10 +20,12 @@
     %float_4 = OpConstant %float 4
     %float_5 = OpConstant %float 5
          %11 = OpConstantComposite %v3float %float_3 %float_4 %float_5
-          %m = OpConstantComposite %mat2v3float %7 %11
+         %12 = OpConstantComposite %mat2v3float %7 %11
+%_ptr_Private_mat2v3float = OpTypePointer Private %mat2v3float
+          %m = OpVariable %_ptr_Private_mat2v3float Private %12
        %void = OpTypeVoid
-         %13 = OpTypeFunction %void
-%unused_entry_point = OpFunction %void None %13
-         %16 = OpLabel
+         %15 = OpTypeFunction %void
+%unused_entry_point = OpFunction %void None %15
+         %18 = OpLabel
                OpReturn
                OpFunctionEnd

test/tint/expressions/type_ctor/mat2x3/inferred/scalars/abstract-float.wgsl.expected.wgsl

@@ -1 +1 @@
-let m = mat2x3(0.0, 1.0, 2.0, 3.0, 4.0, 5.0);
+var<private> m = mat2x3(0.0, 1.0, 2.0, 3.0, 4.0, 5.0);

test/tint/expressions/type_ctor/mat2x3/inferred/scalars/f32.wgsl

@@ -1,2 +1,2 @@
-let m = mat2x3(0.0f, 1.0f, 2.0f,
-               3.0f, 4.0f, 5.0f);
+var<private> m = mat2x3(0.0f, 1.0f, 2.0f,
+                        3.0f, 4.0f, 5.0f);

test/tint/expressions/type_ctor/mat2x3/inferred/scalars/f32.wgsl.expected.glsl

@@ -4,4 +4,4 @@ layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
 void unused_entry_point() {
   return;
 }
-const mat2x3 m = mat2x3(vec3(0.0f, 1.0f, 2.0f), vec3(3.0f, 4.0f, 5.0f));
+mat2x3 m = mat2x3(vec3(0.0f, 1.0f, 2.0f), vec3(3.0f, 4.0f, 5.0f));

test/tint/expressions/type_ctor/mat2x3/inferred/scalars/f32.wgsl.expected.hlsl

@@ -3,4 +3,4 @@ void unused_entry_point() {
   return;
 }
 
-static const float2x3 m = float2x3(float3(0.0f, 1.0f, 2.0f), float3(3.0f, 4.0f, 5.0f));
+static float2x3 m = float2x3(float3(0.0f, 1.0f, 2.0f), float3(3.0f, 4.0f, 5.0f));

test/tint/expressions/type_ctor/mat2x3/inferred/scalars/f32.wgsl.expected.msl

@@ -1,5 +1,3 @@
 #include <metal_stdlib>
 
 using namespace metal;
-constant float2x3 m = float2x3(float3(0.0f, 1.0f, 2.0f), float3(3.0f, 4.0f, 5.0f));
-

test/tint/expressions/type_ctor/mat2x3/inferred/scalars/f32.wgsl.expected.spvasm

@@ -1,7 +1,7 @@
 ; SPIR-V
 ; Version: 1.3
 ; Generator: Google Tint Compiler; 0
-; Bound: 17
+; Bound: 19
 ; Schema: 0
                OpCapability Shader
                OpMemoryModel Logical GLSL450
@@ -20,10 +20,12 @@
     %float_4 = OpConstant %float 4
     %float_5 = OpConstant %float 5
          %11 = OpConstantComposite %v3float %float_3 %float_4 %float_5
-          %m = OpConstantComposite %mat2v3float %7 %11
+         %12 = OpConstantComposite %mat2v3float %7 %11
+%_ptr_Private_mat2v3float = OpTypePointer Private %mat2v3float
+          %m = OpVariable %_ptr_Private_mat2v3float Private %12
        %void = OpTypeVoid
-         %13 = OpTypeFunction %void
-%unused_entry_point = OpFunction %void None %13
-         %16 = OpLabel
+         %15 = OpTypeFunction %void
+%unused_entry_point = OpFunction %void None %15
+         %18 = OpLabel
                OpReturn
                OpFunctionEnd

test/tint/expressions/type_ctor/mat2x3/inferred/scalars/f32.wgsl.expected.wgsl

@@ -1 +1 @@
-let m = mat2x3(0.0f, 1.0f, 2.0f, 3.0f, 4.0f, 5.0f);
+var<private> m = mat2x3(0.0f, 1.0f, 2.0f, 3.0f, 4.0f, 5.0f);

test/tint/expressions/type_ctor/mat2x3/inferred/vectors/abstract-float.wgsl

@@ -1,2 +1,2 @@
-let m = mat2x3(vec3(0.0, 1.0, 2.0),
-               vec3(3.0, 4.0, 5.0));
+var<private> m = mat2x3(vec3(0.0, 1.0, 2.0),
+                        vec3(3.0, 4.0, 5.0));

test/tint/expressions/type_ctor/mat2x3/inferred/vectors/abstract-float.wgsl.expected.glsl

@@ -4,4 +4,4 @@ layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
 void unused_entry_point() {
   return;
 }
-const mat2x3 m = mat2x3(vec3(0.0f, 1.0f, 2.0f), vec3(3.0f, 4.0f, 5.0f));
+mat2x3 m = mat2x3(vec3(0.0f, 1.0f, 2.0f), vec3(3.0f, 4.0f, 5.0f));

test/tint/expressions/type_ctor/mat2x3/inferred/vectors/abstract-float.wgsl.expected.hlsl

@@ -3,4 +3,4 @@ void unused_entry_point() {
   return;
 }
 
-static const float2x3 m = float2x3(float3(0.0f, 1.0f, 2.0f), float3(3.0f, 4.0f, 5.0f));
+static float2x3 m = float2x3(float3(0.0f, 1.0f, 2.0f), float3(3.0f, 4.0f, 5.0f));

test/tint/expressions/type_ctor/mat2x3/inferred/vectors/abstract-float.wgsl.expected.msl

@@ -1,5 +1,3 @@
 #include <metal_stdlib>
 
 using namespace metal;
-constant float2x3 m = float2x3(float3(0.0f, 1.0f, 2.0f), float3(3.0f, 4.0f, 5.0f));
-

test/tint/expressions/type_ctor/mat2x3/inferred/vectors/abstract-float.wgsl.expected.spvasm

@@ -1,7 +1,7 @@
 ; SPIR-V
 ; Version: 1.3
 ; Generator: Google Tint Compiler; 0
-; Bound: 17
+; Bound: 19
 ; Schema: 0
                OpCapability Shader
                OpMemoryModel Logical GLSL450
@@ -20,10 +20,12 @@
     %float_4 = OpConstant %float 4
     %float_5 = OpConstant %float 5
          %11 = OpConstantComposite %v3float %float_3 %float_4 %float_5
-          %m = OpConstantComposite %mat2v3float %7 %11
+         %12 = OpConstantComposite %mat2v3float %7 %11
+%_ptr_Private_mat2v3float = OpTypePointer Private %mat2v3float
+          %m = OpVariable %_ptr_Private_mat2v3float Private %12
        %void = OpTypeVoid
-         %13 = OpTypeFunction %void
-%unused_entry_point = OpFunction %void None %13
-         %16 = OpLabel
+         %15 = OpTypeFunction %void
+%unused_entry_point = OpFunction %void None %15
+         %18 = OpLabel
                OpReturn
                OpFunctionEnd

test/tint/expressions/type_ctor/mat2x3/inferred/vectors/abstract-float.wgsl.expected.wgsl

@@ -1 +1 @@
-let m = mat2x3(vec3(0.0, 1.0, 2.0), vec3(3.0, 4.0, 5.0));
+var<private> m = mat2x3(vec3(0.0, 1.0, 2.0), vec3(3.0, 4.0, 5.0));

test/tint/expressions/type_ctor/mat2x3/inferred/vectors/f32.wgsl

@@ -1,2 +1,2 @@
-let m = mat2x3(vec3<f32>(0.0f, 1.0f, 2.0f),
-               vec3<f32>(3.0f, 4.0f, 5.0f));
+var<private> m = mat2x3(vec3<f32>(0.0f, 1.0f, 2.0f),
+                        vec3<f32>(3.0f, 4.0f, 5.0f));

test/tint/expressions/type_ctor/mat2x3/inferred/vectors/f32.wgsl.expected.glsl

@@ -4,4 +4,4 @@ layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
 void unused_entry_point() {
   return;
 }
-const mat2x3 m = mat2x3(vec3(0.0f, 1.0f, 2.0f), vec3(3.0f, 4.0f, 5.0f));
+mat2x3 m = mat2x3(vec3(0.0f, 1.0f, 2.0f), vec3(3.0f, 4.0f, 5.0f));

test/tint/expressions/type_ctor/mat2x3/inferred/vectors/f32.wgsl.expected.hlsl

@@ -3,4 +3,4 @@ void unused_entry_point() {
   return;
 }
 
-static const float2x3 m = float2x3(float3(0.0f, 1.0f, 2.0f), float3(3.0f, 4.0f, 5.0f));
+static float2x3 m = float2x3(float3(0.0f, 1.0f, 2.0f), float3(3.0f, 4.0f, 5.0f));

test/tint/expressions/type_ctor/mat2x3/inferred/vectors/f32.wgsl.expected.msl

@@ -1,5 +1,3 @@
 #include <metal_stdlib>
 
 using namespace metal;
-constant float2x3 m = float2x3(float3(0.0f, 1.0f, 2.0f), float3(3.0f, 4.0f, 5.0f));
-