diff --git a/src/writer/glsl/generator_impl.cc b/src/writer/glsl/generator_impl.cc
index 7192a8b377..4f4a4777ba 100644
--- a/src/writer/glsl/generator_impl.cc
+++ b/src/writer/glsl/generator_impl.cc
@@ -36,6 +36,7 @@
 #include "src/sem/depth_texture_type.h"
 #include "src/sem/function.h"
 #include "src/sem/member_accessor_expression.h"
+#include "src/sem/module.h"
 #include "src/sem/multisampled_texture_type.h"
 #include "src/sem/sampled_texture_type.h"
 #include "src/sem/statement.h"
@@ -147,7 +148,8 @@ bool GeneratorImpl::Generate() {
 
   line();
 
-  for (auto* decl : builder_.AST().GlobalDeclarations()) {
+  auto* mod = builder_.Sem().Module();
+  for (auto* decl : mod->DependencyOrderedDeclarations()) {
     if (decl->Is<ast::Alias>()) {
       continue;  // Ignore aliases.
     }
diff --git a/src/writer/hlsl/generator_impl.cc b/src/writer/hlsl/generator_impl.cc
index 88615922e1..96cc8b0c67 100644
--- a/src/writer/hlsl/generator_impl.cc
+++ b/src/writer/hlsl/generator_impl.cc
@@ -37,6 +37,7 @@
 #include "src/sem/depth_texture_type.h"
 #include "src/sem/function.h"
 #include "src/sem/member_accessor_expression.h"
+#include "src/sem/module.h"
 #include "src/sem/multisampled_texture_type.h"
 #include "src/sem/sampled_texture_type.h"
 #include "src/sem/statement.h"
@@ -223,7 +224,8 @@ bool GeneratorImpl::Generate() {
   const TypeInfo* last_kind = nullptr;
   size_t last_padding_line = 0;
 
-  for (auto* decl : builder_.AST().GlobalDeclarations()) {
+  auto* mod = builder_.Sem().Module();
+  for (auto* decl : mod->DependencyOrderedDeclarations()) {
     if (decl->Is<ast::Alias>()) {
       continue;  // Ignore aliases.
     }
diff --git a/src/writer/msl/generator_impl.cc b/src/writer/msl/generator_impl.cc
index 5c2ce6d328..920df33c1a 100644
--- a/src/writer/msl/generator_impl.cc
+++ b/src/writer/msl/generator_impl.cc
@@ -45,6 +45,7 @@
 #include "src/sem/i32_type.h"
 #include "src/sem/matrix_type.h"
 #include "src/sem/member_accessor_expression.h"
+#include "src/sem/module.h"
 #include "src/sem/multisampled_texture_type.h"
 #include "src/sem/pointer_type.h"
 #include "src/sem/reference_type.h"
@@ -207,44 +208,46 @@ bool GeneratorImpl::Generate() {
 
   auto helpers_insertion_point = current_buffer_->lines.size();
 
-  for (auto* const type_decl : program_->AST().TypeDecls()) {
-    if (!type_decl->Is<ast::Alias>()) {
-      if (!EmitTypeDecl(TypeOf(type_decl))) {
-        return false;
-      }
+  auto* mod = builder_.Sem().Module();
+  for (auto* decl : mod->DependencyOrderedDeclarations()) {
+    bool ok = Switch(
+        decl,  //
+        [&](const ast::Struct* str) {
+          TINT_DEFER(line());
+          return EmitTypeDecl(TypeOf(str));
+        },
+        [&](const ast::Alias*) {
+          return true;  // folded away by the writer
+        },
+        [&](const ast::Variable* var) {
+          if (var->is_const) {
+            TINT_DEFER(line());
+            return EmitProgramConstVariable(var);
+          }
+          // These are pushed into the entry point by sanitizer transforms.
+          TINT_ICE(Writer, diagnostics_)
+              << "module-scope variables should have been handled by the MSL "
+                 "sanitizer";
+          return false;
+        },
+        [&](const ast::Function* func) {
+          TINT_DEFER(line());
+          if (func->IsEntryPoint()) {
+            return EmitEntryPointFunction(func);
+          }
+          return EmitFunction(func);
+        },
+        [&](Default) {
+          // These are pushed into the entry point by sanitizer transforms.
+          TINT_ICE(Writer, diagnostics_)
+              << "unhandled type: " << decl->TypeInfo().name;
+          return false;
+        });
+    if (!ok) {
+      return false;
     }
   }
 
-  if (!program_->AST().TypeDecls().empty()) {
-    line();
-  }
-
-  for (auto* var : program_->AST().GlobalVariables()) {
-    if (var->is_const) {
-      if (!EmitProgramConstVariable(var)) {
-        return false;
-      }
-    } else {
-      // These are pushed into the entry point by sanitizer transforms.
-      TINT_ICE(Writer, diagnostics_) << "module-scope variables should have "
-                                        "been handled by the MSL sanitizer";
-      break;
-    }
-  }
-
-  for (auto* func : program_->AST().Functions()) {
-    if (!func->IsEntryPoint()) {
-      if (!EmitFunction(func)) {
-        return false;
-      }
-    } else {
-      if (!EmitEntryPointFunction(func)) {
-        return false;
-      }
-    }
-    line();
-  }
-
   if (!invariant_define_name_.empty()) {
     // 'invariant' attribute requires MSL 2.1 or higher.
     // WGSL can ignore the invariant attribute on pre MSL 2.1 devices.
@@ -1555,11 +1558,12 @@ bool GeneratorImpl::EmitLiteral(std::ostream& out,
         return true;
       },
       [&](const ast::SintLiteralExpression* l) {
-        // MSL (and C++) parse `-2147483648` as a `long` because it parses unary
-        // minus and `2147483648` as separate tokens, and the latter doesn't
-        // fit into an (32-bit) `int`. WGSL, OTOH, parses this as an `i32`. To
-        // avoid issues with `long` to `int` casts, emit `(2147483647 - 1)`
-        // instead, which ensures the expression type is `int`.
+        // MSL (and C++) parse `-2147483648` as a `long` because it parses
+        // unary minus and `2147483648` as separate tokens, and the latter
+        // doesn't fit into an (32-bit) `int`. WGSL, OTOH, parses this as an
+        // `i32`. To avoid issues with `long` to `int` casts, emit
+        // `(2147483647 - 1)` instead, which ensures the expression type is
+        // `int`.
         const auto int_min = std::numeric_limits<int32_t>::min();
         if (l->ValueAsI32() == int_min) {
           out << "(" << int_min + 1 << " - 1)";
@@ -1741,8 +1745,8 @@ std::string GeneratorImpl::interpolation_to_attribute(
 bool GeneratorImpl::EmitEntryPointFunction(const ast::Function* func) {
   auto func_name = program_->Symbols().NameFor(func->symbol);
 
-  // Returns the binding index of a variable, requiring that the group attribute
-  // have a value of zero.
+  // Returns the binding index of a variable, requiring that the group
+  // attribute have a value of zero.
   const uint32_t kInvalidBindingIndex = std::numeric_limits<uint32_t>::max();
   auto get_binding_index = [&](const ast::Variable* var) -> uint32_t {
     auto bp = var->BindingPoint();
@@ -1923,14 +1927,14 @@ bool GeneratorImpl::EmitForLoop(const ast::ForLoopStatement* stmt) {
     }
   }
 
-  // If the for-loop has a multi-statement conditional and / or continuing, then
-  // we cannot emit this as a regular for-loop in MSL. Instead we need to
+  // If the for-loop has a multi-statement conditional and / or continuing,
+  // then we cannot emit this as a regular for-loop in MSL. Instead we need to
   // generate a `while(true)` loop.
   bool emit_as_loop = cond_pre.lines.size() > 0 || cont_buf.lines.size() > 1;
 
-  // If the for-loop has multi-statement initializer, or is going to be emitted
-  // as a `while(true)` loop, then declare the initializer statement(s) before
-  // the loop in a new block.
+  // If the for-loop has multi-statement initializer, or is going to be
+  // emitted as a `while(true)` loop, then declare the initializer
+  // statement(s) before the loop in a new block.
   bool nest_in_block =
       init_buf.lines.size() > 1 || (stmt->initializer && emit_as_loop);
   if (nest_in_block) {
diff --git a/src/writer/msl/generator_impl_function_test.cc b/src/writer/msl/generator_impl_function_test.cc
index c9a2f0d59e..ccfd3ecda6 100644
--- a/src/writer/msl/generator_impl_function_test.cc
+++ b/src/writer/msl/generator_impl_function_test.cc
@@ -107,6 +107,7 @@ using namespace metal;
 struct tint_symbol_1 {
   float foo [[user(locn0)]];
 };
+
 struct tint_symbol_2 {
   float value [[color(1)]];
 };
@@ -207,15 +208,12 @@ struct Interface {
   float col2;
   float4 pos;
 };
+
 struct tint_symbol {
   float col1 [[user(locn1)]];
   float col2 [[user(locn2)]];
   float4 pos [[position]];
 };
-struct tint_symbol_2 {
-  float col1 [[user(locn1)]];
-  float col2 [[user(locn2)]];
-};
 
 Interface vert_main_inner() {
   Interface const tint_symbol_3 = {.col1=0.5f, .col2=0.25f, .pos=float4()};
@@ -231,6 +229,11 @@ vertex tint_symbol vert_main() {
   return wrapper_result;
 }
 
+struct tint_symbol_2 {
+  float col1 [[user(locn1)]];
+  float col2 [[user(locn2)]];
+};
+
 void frag_main_inner(Interface colors) {
   float const r = colors.col1;
   float const g = colors.col2;
@@ -285,18 +288,16 @@ using namespace metal;
 struct VertexOutput {
   float4 pos;
 };
-struct tint_symbol {
-  float4 pos [[position]];
-};
-struct tint_symbol_1 {
-  float4 pos [[position]];
-};
 
 VertexOutput foo(float x) {
   VertexOutput const tint_symbol_2 = {.pos=float4(x, x, x, 1.0f)};
   return tint_symbol_2;
 }
 
+struct tint_symbol {
+  float4 pos [[position]];
+};
+
 VertexOutput vert_main1_inner() {
   return foo(0.5f);
 }
@@ -308,6 +309,10 @@ vertex tint_symbol vert_main1() {
   return wrapper_result;
 }
 
+struct tint_symbol_1 {
+  float4 pos [[position]];
+};
+
 VertexOutput vert_main2_inner() {
   return foo(0.25f);
 }
diff --git a/src/writer/msl/generator_impl_sanitizer_test.cc b/src/writer/msl/generator_impl_sanitizer_test.cc
index fe434589c6..ea11591b61 100644
--- a/src/writer/msl/generator_impl_sanitizer_test.cc
+++ b/src/writer/msl/generator_impl_sanitizer_test.cc
@@ -57,6 +57,7 @@ using namespace metal;
 struct tint_symbol {
   /* 0x0000 */ uint4 buffer_size[1];
 };
+
 struct my_struct {
   float a[1];
 };
@@ -103,6 +104,7 @@ using namespace metal;
 struct tint_symbol {
   /* 0x0000 */ uint4 buffer_size[1];
 };
+
 struct my_struct {
   float z;
   float a[1];
@@ -152,6 +154,7 @@ using namespace metal;
 struct tint_symbol {
   /* 0x0000 */ uint4 buffer_size[1];
 };
+
 struct my_struct {
   float a[1];
 };
@@ -208,6 +211,7 @@ using namespace metal;
 struct tint_symbol {
   /* 0x0000 */ uint4 buffer_size[2];
 };
+
 struct my_struct {
   float a[1];
 };
diff --git a/src/writer/msl/generator_impl_test.cc b/src/writer/msl/generator_impl_test.cc
index 14ba0e90b5..6e066bba73 100644
--- a/src/writer/msl/generator_impl_test.cc
+++ b/src/writer/msl/generator_impl_test.cc
@@ -190,6 +190,7 @@ using namespace metal;
 struct tint_array_wrapper {
   float2x2 arr[4];
 };
+
 struct tint_symbol_3 {
   tint_array_wrapper m;
 };
@@ -240,9 +241,11 @@ struct S1 {
   float2x2 m1;
   float4x4 m2;
 };
+
 struct S2 {
   S1 s;
 };
+
 struct tint_symbol_4 {
   S2 s;
 };
@@ -316,11 +319,13 @@ struct tint_symbol_7 {
   float2x3 m2;
   float2x4 m3;
 };
+
 struct tint_symbol_15 {
   float3x2 m4;
   float3x3 m5;
   float3x4 m6;
 };
+
 struct tint_symbol_23 {
   float4x2 m7;
   float4x3 m8;
diff --git a/src/writer/spirv/builder.cc b/src/writer/spirv/builder.cc
index 932ae8c093..8dcb271bf2 100644
--- a/src/writer/spirv/builder.cc
+++ b/src/writer/spirv/builder.cc
@@ -31,6 +31,7 @@
 #include "src/sem/depth_texture_type.h"
 #include "src/sem/function.h"
 #include "src/sem/member_accessor_expression.h"
+#include "src/sem/module.h"
 #include "src/sem/multisampled_texture_type.h"
 #include "src/sem/reference_type.h"
 #include "src/sem/sampled_texture_type.h"
@@ -308,9 +309,12 @@ bool Builder::Build() {
     }
   }
 
-  for (auto* func : builder_.AST().Functions()) {
-    if (!GenerateFunction(func)) {
-      return false;
+  auto* mod = builder_.Sem().Module();
+  for (auto* decl : mod->DependencyOrderedDeclarations()) {
+    if (auto* func = decl->As<ast::Function>()) {
+      if (!GenerateFunction(func)) {
+        return false;
+      }
     }
   }
 
diff --git a/test/array/assign_to_function_var.wgsl.expected.msl b/test/array/assign_to_function_var.wgsl.expected.msl
index 7abc32da9c..9d127332ad 100644
--- a/test/array/assign_to_function_var.wgsl.expected.msl
+++ b/test/array/assign_to_function_var.wgsl.expected.msl
@@ -4,18 +4,10 @@ using namespace metal;
 struct tint_array_wrapper {
   /* 0x0000 */ int4 arr[4];
 };
+
 struct S {
   /* 0x0000 */ tint_array_wrapper arr;
 };
-struct tint_array_wrapper_3 {
-  int arr[2];
-};
-struct tint_array_wrapper_2 {
-  tint_array_wrapper_3 arr[3];
-};
-struct tint_array_wrapper_1 {
-  tint_array_wrapper_2 arr[4];
-};
 
 tint_array_wrapper ret_arr() {
   tint_array_wrapper const tint_symbol = {.arr={}};
@@ -27,6 +19,18 @@ S ret_struct_arr() {
   return tint_symbol_1;
 }
 
+struct tint_array_wrapper_3 {
+  int arr[2];
+};
+
+struct tint_array_wrapper_2 {
+  tint_array_wrapper_3 arr[3];
+};
+
+struct tint_array_wrapper_1 {
+  tint_array_wrapper_2 arr[4];
+};
+
 void foo(tint_array_wrapper src_param, thread tint_array_wrapper* const tint_symbol_3, threadgroup tint_array_wrapper* const tint_symbol_4, const constant S* const tint_symbol_5, device S* const tint_symbol_6) {
   tint_array_wrapper src_function = {};
   tint_array_wrapper dst = {};
diff --git a/test/array/assign_to_private_var.wgsl.expected.msl b/test/array/assign_to_private_var.wgsl.expected.msl
index 7d8a3ab764..d5127b1922 100644
--- a/test/array/assign_to_private_var.wgsl.expected.msl
+++ b/test/array/assign_to_private_var.wgsl.expected.msl
@@ -4,15 +4,19 @@ using namespace metal;
 struct tint_array_wrapper {
   /* 0x0000 */ int4 arr[4];
 };
+
 struct S {
   /* 0x0000 */ tint_array_wrapper arr;
 };
+
 struct tint_array_wrapper_3 {
   int arr[2];
 };
+
 struct tint_array_wrapper_2 {
   tint_array_wrapper_3 arr[3];
 };
+
 struct tint_array_wrapper_1 {
   tint_array_wrapper_2 arr[4];
 };
diff --git a/test/array/assign_to_storage_var.wgsl.expected.msl b/test/array/assign_to_storage_var.wgsl.expected.msl
index c1a31f9a2d..b4ba58a652 100644
--- a/test/array/assign_to_storage_var.wgsl.expected.msl
+++ b/test/array/assign_to_storage_var.wgsl.expected.msl
@@ -4,18 +4,23 @@ using namespace metal;
 struct tint_array_wrapper {
   /* 0x0000 */ int4 arr[4];
 };
+
 struct S {
   /* 0x0000 */ tint_array_wrapper arr;
 };
+
 struct tint_array_wrapper_3 {
   /* 0x0000 */ int arr[2];
 };
+
 struct tint_array_wrapper_2 {
   /* 0x0000 */ tint_array_wrapper_3 arr[3];
 };
+
 struct tint_array_wrapper_1 {
   /* 0x0000 */ tint_array_wrapper_2 arr[4];
 };
+
 struct S_nested {
   /* 0x0000 */ tint_array_wrapper_1 arr;
 };
diff --git a/test/array/assign_to_subexpr.wgsl.expected.msl b/test/array/assign_to_subexpr.wgsl.expected.msl
index 9b4779214c..735dc308ac 100644
--- a/test/array/assign_to_subexpr.wgsl.expected.msl
+++ b/test/array/assign_to_subexpr.wgsl.expected.msl
@@ -4,9 +4,11 @@ using namespace metal;
 struct tint_array_wrapper {
   int arr[4];
 };
+
 struct S {
   tint_array_wrapper arr;
 };
+
 struct tint_array_wrapper_1 {
   tint_array_wrapper arr[2];
 };
diff --git a/test/array/assign_to_workgroup_var.wgsl.expected.msl b/test/array/assign_to_workgroup_var.wgsl.expected.msl
index 2c45f26f6e..32b829038d 100644
--- a/test/array/assign_to_workgroup_var.wgsl.expected.msl
+++ b/test/array/assign_to_workgroup_var.wgsl.expected.msl
@@ -4,15 +4,19 @@ using namespace metal;
 struct tint_array_wrapper {
   /* 0x0000 */ int4 arr[4];
 };
+
 struct S {
   /* 0x0000 */ tint_array_wrapper arr;
 };
+
 struct tint_array_wrapper_3 {
   int arr[2];
 };
+
 struct tint_array_wrapper_2 {
   tint_array_wrapper_3 arr[3];
 };
+
 struct tint_array_wrapper_1 {
   tint_array_wrapper_2 arr[4];
 };
diff --git a/test/array/function_parameter.wgsl.expected.msl b/test/array/function_parameter.wgsl.expected.msl
index 8cf6c26cd3..277889edbe 100644
--- a/test/array/function_parameter.wgsl.expected.msl
+++ b/test/array/function_parameter.wgsl.expected.msl
@@ -4,21 +4,23 @@ using namespace metal;
 struct tint_array_wrapper {
   float arr[4];
 };
-struct tint_array_wrapper_1 {
-  tint_array_wrapper arr[3];
-};
-struct tint_array_wrapper_2 {
-  tint_array_wrapper_1 arr[2];
-};
 
 float f1(tint_array_wrapper a) {
   return a.arr[3];
 }
 
+struct tint_array_wrapper_1 {
+  tint_array_wrapper arr[3];
+};
+
 float f2(tint_array_wrapper_1 a) {
   return a.arr[2].arr[3];
 }
 
+struct tint_array_wrapper_2 {
+  tint_array_wrapper_1 arr[2];
+};
+
 float f3(tint_array_wrapper_2 a) {
   return a.arr[1].arr[2].arr[3];
 }
diff --git a/test/array/function_return_type.wgsl.expected.msl b/test/array/function_return_type.wgsl.expected.msl
index dbc3b0d9b4..b56fe6ccb6 100644
--- a/test/array/function_return_type.wgsl.expected.msl
+++ b/test/array/function_return_type.wgsl.expected.msl
@@ -4,23 +4,25 @@ using namespace metal;
 struct tint_array_wrapper {
   float arr[4];
 };
-struct tint_array_wrapper_1 {
-  tint_array_wrapper arr[3];
-};
-struct tint_array_wrapper_2 {
-  tint_array_wrapper_1 arr[2];
-};
 
 tint_array_wrapper f1() {
   tint_array_wrapper const tint_symbol_1 = {.arr={}};
   return tint_symbol_1;
 }
 
+struct tint_array_wrapper_1 {
+  tint_array_wrapper arr[3];
+};
+
 tint_array_wrapper_1 f2() {
   tint_array_wrapper_1 const tint_symbol_2 = {.arr={f1(), f1(), f1()}};
   return tint_symbol_2;
 }
 
+struct tint_array_wrapper_2 {
+  tint_array_wrapper_1 arr[2];
+};
+
 tint_array_wrapper_2 f3() {
   tint_array_wrapper_2 const tint_symbol_3 = {.arr={f2(), f2()}};
   return tint_symbol_3;
diff --git a/test/array/size.wgsl.expected.msl b/test/array/size.wgsl.expected.msl
index 512a9b03d7..0150ece50b 100644
--- a/test/array/size.wgsl.expected.msl
+++ b/test/array/size.wgsl.expected.msl
@@ -1,12 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
+constant int slen = 4;
+
+constant uint ulen = 4u;
+
 struct tint_array_wrapper {
   float arr[4];
 };
 
-constant int slen = 4;
-constant uint ulen = 4u;
 fragment void tint_symbol() {
   tint_array_wrapper signed_literal = {};
   tint_array_wrapper unsigned_literal = {};
diff --git a/test/array/strides.spvasm.expected.msl b/test/array/strides.spvasm.expected.msl
index 62f817c85b..8db28bd2d5 100644
--- a/test/array/strides.spvasm.expected.msl
+++ b/test/array/strides.spvasm.expected.msl
@@ -5,19 +5,24 @@ struct strided_arr {
   /* 0x0000 */ float el;
   /* 0x0004 */ int8_t tint_pad[4];
 };
+
 struct tint_array_wrapper {
   /* 0x0000 */ strided_arr arr[2];
 };
+
 struct tint_array_wrapper_1 {
   /* 0x0000 */ tint_array_wrapper arr[3];
 };
+
 struct strided_arr_1 {
   /* 0x0000 */ tint_array_wrapper_1 el;
   /* 0x0030 */ int8_t tint_pad_1[80];
 };
+
 struct tint_array_wrapper_2 {
   /* 0x0000 */ strided_arr_1 arr[4];
 };
+
 struct S {
   /* 0x0000 */ tint_array_wrapper_2 a;
 };
diff --git a/test/array/type_constructor.wgsl.expected.msl b/test/array/type_constructor.wgsl.expected.msl
index c7c48ac154..bd40591acd 100644
--- a/test/array/type_constructor.wgsl.expected.msl
+++ b/test/array/type_constructor.wgsl.expected.msl
@@ -4,12 +4,15 @@ using namespace metal;
 struct tint_array_wrapper {
   int arr[4];
 };
+
 struct tint_array_wrapper_2 {
   tint_array_wrapper arr[3];
 };
+
 struct tint_array_wrapper_1 {
   tint_array_wrapper_2 arr[2];
 };
+
 struct tint_array_wrapper_3 {
   tint_array_wrapper arr[2];
 };
diff --git a/test/buffer/storage/dynamic_index/read.wgsl.expected.msl b/test/buffer/storage/dynamic_index/read.wgsl.expected.msl
index a9e25378bd..530148b9c2 100644
--- a/test/buffer/storage/dynamic_index/read.wgsl.expected.msl
+++ b/test/buffer/storage/dynamic_index/read.wgsl.expected.msl
@@ -15,6 +15,7 @@ inline vec<T, N> operator*(packed_vec<T, M> lhs, matrix<T, N, M> rhs) {
 struct tint_array_wrapper {
   /* 0x0000 */ int4 arr[4];
 };
+
 struct Inner {
   /* 0x0000 */ packed_int3 a;
   /* 0x000c */ int b;
@@ -27,6 +28,7 @@ struct Inner {
   /* 0x0068 */ int8_t tint_pad[8];
   /* 0x0070 */ tint_array_wrapper i;
 };
+
 struct S {
   /* 0x0000 */ Inner arr[1];
 };
diff --git a/test/buffer/storage/dynamic_index/write.wgsl.expected.msl b/test/buffer/storage/dynamic_index/write.wgsl.expected.msl
index ad1753bd62..d2debe94f0 100644
--- a/test/buffer/storage/dynamic_index/write.wgsl.expected.msl
+++ b/test/buffer/storage/dynamic_index/write.wgsl.expected.msl
@@ -15,6 +15,7 @@ inline vec<T, N> operator*(packed_vec<T, M> lhs, matrix<T, N, M> rhs) {
 struct tint_array_wrapper {
   /* 0x0000 */ int4 arr[4];
 };
+
 struct Inner {
   /* 0x0000 */ packed_int3 a;
   /* 0x000c */ int b;
@@ -27,6 +28,7 @@ struct Inner {
   /* 0x0068 */ int8_t tint_pad[8];
   /* 0x0070 */ tint_array_wrapper i;
 };
+
 struct S {
   /* 0x0000 */ Inner arr[1];
 };
diff --git a/test/buffer/storage/static_index/read.wgsl.expected.msl b/test/buffer/storage/static_index/read.wgsl.expected.msl
index efc8a38d2d..8a4f444509 100644
--- a/test/buffer/storage/static_index/read.wgsl.expected.msl
+++ b/test/buffer/storage/static_index/read.wgsl.expected.msl
@@ -15,9 +15,11 @@ inline vec<T, N> operator*(packed_vec<T, M> lhs, matrix<T, N, M> rhs) {
 struct Inner {
   /* 0x0000 */ int x;
 };
+
 struct tint_array_wrapper {
   /* 0x0000 */ Inner arr[4];
 };
+
 struct S {
   /* 0x0000 */ packed_int3 a;
   /* 0x000c */ int b;
diff --git a/test/buffer/storage/static_index/write.wgsl.expected.msl b/test/buffer/storage/static_index/write.wgsl.expected.msl
index a3396820ef..95b3ff2a9a 100644
--- a/test/buffer/storage/static_index/write.wgsl.expected.msl
+++ b/test/buffer/storage/static_index/write.wgsl.expected.msl
@@ -15,9 +15,11 @@ inline vec<T, N> operator*(packed_vec<T, M> lhs, matrix<T, N, M> rhs) {
 struct Inner {
   /* 0x0000 */ int x;
 };
+
 struct tint_array_wrapper {
   /* 0x0000 */ Inner arr[4];
 };
+
 struct S {
   /* 0x0000 */ packed_int3 a;
   /* 0x000c */ int b;
diff --git a/test/buffer/storage/types/runtime_array.wgsl.expected.msl b/test/buffer/storage/types/runtime_array.wgsl.expected.msl
index 573d6cee1a..47fcb21c59 100644
--- a/test/buffer/storage/types/runtime_array.wgsl.expected.msl
+++ b/test/buffer/storage/types/runtime_array.wgsl.expected.msl
@@ -4,9 +4,11 @@ using namespace metal;
 struct S {
   /* 0x0000 */ float f;
 };
+
 struct tint_symbol_2 {
   /* 0x0000 */ S arr[1];
 };
+
 struct tint_symbol_4 {
   /* 0x0000 */ S arr[1];
 };
diff --git a/test/buffer/storage/types/struct.wgsl.expected.msl b/test/buffer/storage/types/struct.wgsl.expected.msl
index d5c7427870..7f042b2a9a 100644
--- a/test/buffer/storage/types/struct.wgsl.expected.msl
+++ b/test/buffer/storage/types/struct.wgsl.expected.msl
@@ -4,6 +4,7 @@ using namespace metal;
 struct Inner {
   /* 0x0000 */ float f;
 };
+
 struct S {
   /* 0x0000 */ Inner inner;
 };
diff --git a/test/buffer/uniform/dynamic_index/read.wgsl.expected.msl b/test/buffer/uniform/dynamic_index/read.wgsl.expected.msl
index fb6344f9c2..d781b86e19 100644
--- a/test/buffer/uniform/dynamic_index/read.wgsl.expected.msl
+++ b/test/buffer/uniform/dynamic_index/read.wgsl.expected.msl
@@ -15,6 +15,7 @@ inline vec<T, N> operator*(packed_vec<T, M> lhs, matrix<T, N, M> rhs) {
 struct tint_array_wrapper {
   /* 0x0000 */ int4 arr[4];
 };
+
 struct Inner {
   /* 0x0000 */ packed_int3 a;
   /* 0x000c */ int b;
@@ -29,9 +30,11 @@ struct Inner {
   /* 0x0078 */ int8_t tint_pad[8];
   /* 0x0080 */ tint_array_wrapper k;
 };
+
 struct tint_array_wrapper_1 {
   /* 0x0000 */ Inner arr[8];
 };
+
 struct S {
   /* 0x0000 */ tint_array_wrapper_1 arr;
 };
diff --git a/test/buffer/uniform/static_index/read.wgsl.expected.msl b/test/buffer/uniform/static_index/read.wgsl.expected.msl
index 46934da129..26abf26e28 100644
--- a/test/buffer/uniform/static_index/read.wgsl.expected.msl
+++ b/test/buffer/uniform/static_index/read.wgsl.expected.msl
@@ -16,9 +16,11 @@ struct Inner {
   /* 0x0000 */ int x;
   /* 0x0004 */ int8_t tint_pad[12];
 };
+
 struct tint_array_wrapper {
   /* 0x0000 */ Inner arr[4];
 };
+
 struct S {
   /* 0x0000 */ packed_int3 a;
   /* 0x000c */ int b;
diff --git a/test/buffer/uniform/types/struct.wgsl.expected.msl b/test/buffer/uniform/types/struct.wgsl.expected.msl
index 4e2f5c9797..41e3ae31de 100644
--- a/test/buffer/uniform/types/struct.wgsl.expected.msl
+++ b/test/buffer/uniform/types/struct.wgsl.expected.msl
@@ -4,6 +4,7 @@ using namespace metal;
 struct Inner {
   /* 0x0000 */ float f;
 };
+
 struct S {
   /* 0x0000 */ Inner inner;
 };
diff --git a/test/bug/chromium/1221120.wgsl.expected.msl b/test/bug/chromium/1221120.wgsl.expected.msl
index 99330d4c67..0c40f2b81d 100644
--- a/test/bug/chromium/1221120.wgsl.expected.msl
+++ b/test/bug/chromium/1221120.wgsl.expected.msl
@@ -2,3 +2,4 @@
 
 using namespace metal;
 constant int H = 1;
+
diff --git a/test/bug/chromium/1251009.wgsl.expected.msl b/test/bug/chromium/1251009.wgsl.expected.msl
index b958532bc0..495192a98c 100644
--- a/test/bug/chromium/1251009.wgsl.expected.msl
+++ b/test/bug/chromium/1251009.wgsl.expected.msl
@@ -5,16 +5,19 @@ struct VertexInputs0 {
   uint vertex_index;
   int loc0;
 };
+
 struct VertexInputs1 {
   uint loc1;
   float4 loc3;
 };
+
 struct tint_symbol_2 {
   int loc0 [[attribute(0)]];
   uint loc1 [[attribute(1)]];
   uint loc1_1 [[attribute(2)]];
   float4 loc3 [[attribute(3)]];
 };
+
 struct tint_symbol_3 {
   float4 value [[position]];
 };
diff --git a/test/bug/chromium/1273230.wgsl.expected.msl b/test/bug/chromium/1273230.wgsl.expected.msl
index a6f5aabf40..0d8e7e63f8 100644
--- a/test/bug/chromium/1273230.wgsl.expected.msl
+++ b/test/bug/chromium/1273230.wgsl.expected.msl
@@ -32,6 +32,14 @@ inline vec<T, N> operator*(packed_vec<T, M> lhs, matrix<T, N, M> rhs) {
   return vec<T, M>(lhs) * rhs;
 }
 
+void marg8uintin() {
+  isnormal(4.0f);
+  isnormal(float4());
+  isnormal(0.0f);
+  isnormal(4.0f);
+  isnormal(2.0f);
+}
+
 struct Uniforms {
   /* 0x0000 */ uint numTriangles;
   /* 0x0004 */ uint gridSize;
@@ -42,6 +50,7 @@ struct Uniforms {
   /* 0x0020 */ packed_float3 bbMax;
   /* 0x002c */ int8_t tint_pad_1[4];
 };
+
 struct Dbg {
   /* 0x0000 */ atomic_uint offsetCounter;
   /* 0x0004 */ uint pad0;
@@ -56,30 +65,27 @@ struct Dbg {
   /* 0x0028 */ float value_f32_2;
   /* 0x002c */ float value_f32_3;
 };
+
 struct F32s {
   /* 0x0000 */ float values[1];
 };
+
 struct U32s {
   /* 0x0000 */ uint values[1];
 };
+
 struct I32s {
   int values[1];
 };
+
 struct AU32s {
   /* 0x0000 */ atomic_uint values[1];
 };
+
 struct AI32s {
   /* 0x0000 */ atomic_int values[1];
 };
 
-void marg8uintin() {
-  isnormal(4.0f);
-  isnormal(float4());
-  isnormal(0.0f);
-  isnormal(4.0f);
-  isnormal(2.0f);
-}
-
 float3 toVoxelPos(float3 position, const constant Uniforms* const tint_symbol) {
   float3 bbMin = float3((*(tint_symbol)).bbMin[0], (*(tint_symbol)).bbMin[1], (*(tint_symbol)).bbMin[2]);
   float3 bbMax = float3((*(tint_symbol)).bbMax[0], (*(tint_symbol)).bbMax[1], (*(tint_symbol)).bbMax[2]);
diff --git a/test/bug/chromium/1273451.wgsl.expected.msl b/test/bug/chromium/1273451.wgsl.expected.msl
index 5d5fcf6da9..5510459868 100644
--- a/test/bug/chromium/1273451.wgsl.expected.msl
+++ b/test/bug/chromium/1273451.wgsl.expected.msl
@@ -4,6 +4,7 @@ using namespace metal;
 struct A {
   int a;
 };
+
 struct B {
   int b;
 };
diff --git a/test/bug/chromium/1290107.wgsl.expected.msl b/test/bug/chromium/1290107.wgsl.expected.msl
index 425519536e..5b9d426d79 100644
--- a/test/bug/chromium/1290107.wgsl.expected.msl
+++ b/test/bug/chromium/1290107.wgsl.expected.msl
@@ -4,6 +4,7 @@ using namespace metal;
 struct tint_symbol_1 {
   /* 0x0000 */ uint4 buffer_size[1];
 };
+
 struct S {
   float f;
 };
diff --git a/test/bug/dawn/947.wgsl.expected.msl b/test/bug/dawn/947.wgsl.expected.msl
index c33e0f5a77..22bfdd3b78 100644
--- a/test/bug/dawn/947.wgsl.expected.msl
+++ b/test/bug/dawn/947.wgsl.expected.msl
@@ -5,23 +5,20 @@ struct Uniforms {
   /* 0x0000 */ float2 u_scale;
   /* 0x0008 */ float2 u_offset;
 };
+
 struct VertexOutputs {
   float2 texcoords;
   float4 position;
 };
+
 struct tint_symbol {
   float2 texcoords [[user(locn0)]];
   float4 position [[position]];
 };
+
 struct tint_array_wrapper {
   float2 arr[3];
 };
-struct tint_symbol_2 {
-  float2 texcoord [[user(locn0)]];
-};
-struct tint_symbol_3 {
-  float4 value [[color(0)]];
-};
 
 VertexOutputs vs_main_inner(uint VertexIndex, const constant Uniforms* const tint_symbol_4) {
   tint_array_wrapper texcoord = {.arr={float2(-0.5f, 0.0f), float2(1.5f, 0.0f), float2(0.5f, 2.0f)}};
@@ -44,6 +41,14 @@ vertex tint_symbol vs_main(const constant Uniforms* tint_symbol_5 [[buffer(0)]],
   return wrapper_result;
 }
 
+struct tint_symbol_2 {
+  float2 texcoord [[user(locn0)]];
+};
+
+struct tint_symbol_3 {
+  float4 value [[color(0)]];
+};
+
 float4 fs_main_inner(float2 texcoord, texture2d<float, access::sample> tint_symbol_6, sampler tint_symbol_7) {
   float2 clampedTexcoord = clamp(texcoord, float2(0.0f, 0.0f), float2(1.0f, 1.0f));
   if (!(all((clampedTexcoord == texcoord)))) {
diff --git a/test/bug/fxc/dyn_array_idx/read/function.wgsl.expected.msl b/test/bug/fxc/dyn_array_idx/read/function.wgsl.expected.msl
index 706ba1b979..271eaa17d7 100644
--- a/test/bug/fxc/dyn_array_idx/read/function.wgsl.expected.msl
+++ b/test/bug/fxc/dyn_array_idx/read/function.wgsl.expected.msl
@@ -4,12 +4,15 @@ using namespace metal;
 struct UBO {
   /* 0x0000 */ int dynamic_idx;
 };
+
 struct tint_array_wrapper {
   int arr[64];
 };
+
 struct S {
   tint_array_wrapper data;
 };
+
 struct Result {
   /* 0x0000 */ int out;
 };
diff --git a/test/bug/fxc/dyn_array_idx/read/private.wgsl.expected.msl b/test/bug/fxc/dyn_array_idx/read/private.wgsl.expected.msl
index bf3dbcc93c..00b6f03656 100644
--- a/test/bug/fxc/dyn_array_idx/read/private.wgsl.expected.msl
+++ b/test/bug/fxc/dyn_array_idx/read/private.wgsl.expected.msl
@@ -4,12 +4,15 @@ using namespace metal;
 struct UBO {
   /* 0x0000 */ int dynamic_idx;
 };
+
 struct tint_array_wrapper {
   int arr[64];
 };
+
 struct S {
   tint_array_wrapper data;
 };
+
 struct Result {
   /* 0x0000 */ int out;
 };
diff --git a/test/bug/fxc/dyn_array_idx/read/storage.wgsl.expected.msl b/test/bug/fxc/dyn_array_idx/read/storage.wgsl.expected.msl
index d4ccc83f0f..92fb6e6aff 100644
--- a/test/bug/fxc/dyn_array_idx/read/storage.wgsl.expected.msl
+++ b/test/bug/fxc/dyn_array_idx/read/storage.wgsl.expected.msl
@@ -4,12 +4,15 @@ using namespace metal;
 struct UBO {
   /* 0x0000 */ int dynamic_idx;
 };
+
 struct Result {
   /* 0x0000 */ int out;
 };
+
 struct tint_array_wrapper {
   /* 0x0000 */ int arr[4];
 };
+
 struct SSBO {
   /* 0x0000 */ tint_array_wrapper data;
 };
diff --git a/test/bug/fxc/dyn_array_idx/read/uniform.wgsl.expected.msl b/test/bug/fxc/dyn_array_idx/read/uniform.wgsl.expected.msl
index 37217139db..48d71bef81 100644
--- a/test/bug/fxc/dyn_array_idx/read/uniform.wgsl.expected.msl
+++ b/test/bug/fxc/dyn_array_idx/read/uniform.wgsl.expected.msl
@@ -4,11 +4,13 @@ using namespace metal;
 struct tint_array_wrapper {
   /* 0x0000 */ int4 arr[4];
 };
+
 struct UBO {
   /* 0x0000 */ tint_array_wrapper data;
   /* 0x0040 */ int dynamic_idx;
   /* 0x0044 */ int8_t tint_pad[12];
 };
+
 struct Result {
   /* 0x0000 */ int out;
 };
diff --git a/test/bug/fxc/dyn_array_idx/read/workgroup.wgsl.expected.msl b/test/bug/fxc/dyn_array_idx/read/workgroup.wgsl.expected.msl
index b0fe81b8cb..b4746d6aab 100644
--- a/test/bug/fxc/dyn_array_idx/read/workgroup.wgsl.expected.msl
+++ b/test/bug/fxc/dyn_array_idx/read/workgroup.wgsl.expected.msl
@@ -4,12 +4,15 @@ using namespace metal;
 struct UBO {
   /* 0x0000 */ int dynamic_idx;
 };
+
 struct tint_array_wrapper {
   int arr[64];
 };
+
 struct S {
   tint_array_wrapper data;
 };
+
 struct Result {
   /* 0x0000 */ int out;
 };
diff --git a/test/bug/fxc/dyn_array_idx/write/function.wgsl.expected.msl b/test/bug/fxc/dyn_array_idx/write/function.wgsl.expected.msl
index 4f216ae824..c4e1dfff9d 100644
--- a/test/bug/fxc/dyn_array_idx/write/function.wgsl.expected.msl
+++ b/test/bug/fxc/dyn_array_idx/write/function.wgsl.expected.msl
@@ -4,12 +4,15 @@ using namespace metal;
 struct UBO {
   /* 0x0000 */ int dynamic_idx;
 };
+
 struct tint_array_wrapper {
   int arr[64];
 };
+
 struct S {
   tint_array_wrapper data;
 };
+
 struct Result {
   /* 0x0000 */ int out;
 };
diff --git a/test/bug/fxc/dyn_array_idx/write/function_via_param.wgsl.expected.msl b/test/bug/fxc/dyn_array_idx/write/function_via_param.wgsl.expected.msl
index 91709e31ca..b9efff8ceb 100644
--- a/test/bug/fxc/dyn_array_idx/write/function_via_param.wgsl.expected.msl
+++ b/test/bug/fxc/dyn_array_idx/write/function_via_param.wgsl.expected.msl
@@ -4,12 +4,15 @@ using namespace metal;
 struct UBO {
   /* 0x0000 */ int dynamic_idx;
 };
+
 struct tint_array_wrapper {
   int arr[64];
 };
+
 struct S {
   tint_array_wrapper data;
 };
+
 struct Result {
   /* 0x0000 */ int out;
 };
diff --git a/test/bug/fxc/dyn_array_idx/write/private.wgsl.expected.msl b/test/bug/fxc/dyn_array_idx/write/private.wgsl.expected.msl
index 8e7cc1ca85..2a59ee45bf 100644
--- a/test/bug/fxc/dyn_array_idx/write/private.wgsl.expected.msl
+++ b/test/bug/fxc/dyn_array_idx/write/private.wgsl.expected.msl
@@ -4,12 +4,15 @@ using namespace metal;
 struct UBO {
   /* 0x0000 */ int dynamic_idx;
 };
+
 struct tint_array_wrapper {
   int arr[64];
 };
+
 struct S {
   tint_array_wrapper data;
 };
+
 struct Result {
   /* 0x0000 */ int out;
 };
diff --git a/test/bug/fxc/dyn_array_idx/write/private_via_param.wgsl.expected.msl b/test/bug/fxc/dyn_array_idx/write/private_via_param.wgsl.expected.msl
index e9712d1b36..a27679e997 100644
--- a/test/bug/fxc/dyn_array_idx/write/private_via_param.wgsl.expected.msl
+++ b/test/bug/fxc/dyn_array_idx/write/private_via_param.wgsl.expected.msl
@@ -4,12 +4,15 @@ using namespace metal;
 struct UBO {
   /* 0x0000 */ int dynamic_idx;
 };
+
 struct tint_array_wrapper {
   int arr[64];
 };
+
 struct S {
   tint_array_wrapper data;
 };
+
 struct Result {
   /* 0x0000 */ int out;
 };
diff --git a/test/bug/fxc/dyn_array_idx/write/storage.wgsl.expected.msl b/test/bug/fxc/dyn_array_idx/write/storage.wgsl.expected.msl
index bcae6be3ab..ca1afb53b6 100644
--- a/test/bug/fxc/dyn_array_idx/write/storage.wgsl.expected.msl
+++ b/test/bug/fxc/dyn_array_idx/write/storage.wgsl.expected.msl
@@ -4,12 +4,15 @@ using namespace metal;
 struct UBO {
   /* 0x0000 */ int dynamic_idx;
 };
+
 struct Result {
   /* 0x0000 */ int out;
 };
+
 struct tint_array_wrapper {
   /* 0x0000 */ int arr[4];
 };
+
 struct SSBO {
   /* 0x0000 */ tint_array_wrapper data;
 };
diff --git a/test/bug/fxc/dyn_array_idx/write/workgroup.wgsl.expected.msl b/test/bug/fxc/dyn_array_idx/write/workgroup.wgsl.expected.msl
index 42f5aaf608..1f436cd970 100644
--- a/test/bug/fxc/dyn_array_idx/write/workgroup.wgsl.expected.msl
+++ b/test/bug/fxc/dyn_array_idx/write/workgroup.wgsl.expected.msl
@@ -4,12 +4,15 @@ using namespace metal;
 struct UBO {
   /* 0x0000 */ int dynamic_idx;
 };
+
 struct tint_array_wrapper {
   int arr[64];
 };
+
 struct S {
   tint_array_wrapper data;
 };
+
 struct Result {
   /* 0x0000 */ int out;
 };
diff --git a/test/bug/fxc/gradient_in_varying_loop/1112.wgsl.expected.msl b/test/bug/fxc/gradient_in_varying_loop/1112.wgsl.expected.msl
index 7ac38ae396..3b00074e21 100644
--- a/test/bug/fxc/gradient_in_varying_loop/1112.wgsl.expected.msl
+++ b/test/bug/fxc/gradient_in_varying_loop/1112.wgsl.expected.msl
@@ -4,6 +4,7 @@ using namespace metal;
 struct tint_symbol_2 {
   float2 vUV [[user(locn0)]];
 };
+
 struct tint_symbol_3 {
   float4 value [[color(0)]];
 };
diff --git a/test/bug/fxc/indexed_assign_to_array_in_struct/1206.wgsl.expected.msl b/test/bug/fxc/indexed_assign_to_array_in_struct/1206.wgsl.expected.msl
index 96ff937ff4..de2ff47c0b 100644
--- a/test/bug/fxc/indexed_assign_to_array_in_struct/1206.wgsl.expected.msl
+++ b/test/bug/fxc/indexed_assign_to_array_in_struct/1206.wgsl.expected.msl
@@ -15,9 +15,11 @@ inline vec<T, N> operator*(packed_vec<T, M> lhs, matrix<T, N, M> rhs) {
 struct Simulation {
   /* 0x0000 */ uint i;
 };
+
 struct tint_array_wrapper {
   /* 0x0000 */ float3 arr[8];
 };
+
 struct Particle {
   /* 0x0000 */ tint_array_wrapper position;
   /* 0x0080 */ float lifetime;
@@ -26,6 +28,7 @@ struct Particle {
   /* 0x00a0 */ packed_float3 velocity;
   /* 0x00ac */ int8_t tint_pad_1[4];
 };
+
 struct Particles {
   /* 0x0000 */ Particle p[1];
 };
diff --git a/test/bug/tint/1046.wgsl.expected.msl b/test/bug/tint/1046.wgsl.expected.msl
index 076418882f..feb5d4d52e 100644
--- a/test/bug/tint/1046.wgsl.expected.msl
+++ b/test/bug/tint/1046.wgsl.expected.msl
@@ -4,9 +4,11 @@ using namespace metal;
 struct PointLight {
   float4 position;
 };
+
 struct PointLights {
   PointLight values[1];
 };
+
 struct Uniforms {
   /* 0x0000 */ float4x4 worldView;
   /* 0x0040 */ float4x4 proj;
@@ -15,6 +17,7 @@ struct Uniforms {
   /* 0x0088 */ int8_t tint_pad[8];
   /* 0x0090 */ float4 color;
 };
+
 struct FragmentInput {
   float4 position;
   float4 view_position;
@@ -22,18 +25,10 @@ struct FragmentInput {
   float2 uv;
   float4 color;
 };
+
 struct FragmentOutput {
   float4 color;
 };
-struct tint_symbol_3 {
-  float4 view_position [[user(locn0)]];
-  float4 normal [[user(locn1)]];
-  float2 uv [[user(locn2)]];
-  float4 color [[user(locn3)]];
-};
-struct tint_symbol_4 {
-  float4 color [[color(0)]];
-};
 
 float4 getColor(FragmentInput tint_symbol, const constant Uniforms* const tint_symbol_6, texture2d<float, access::sample> tint_symbol_7, sampler tint_symbol_8) {
   float4 color = 0.0f;
@@ -56,6 +51,17 @@ float4 getColor(FragmentInput tint_symbol, const constant Uniforms* const tint_s
   return color;
 }
 
+struct tint_symbol_3 {
+  float4 view_position [[user(locn0)]];
+  float4 normal [[user(locn1)]];
+  float2 uv [[user(locn2)]];
+  float4 color [[user(locn3)]];
+};
+
+struct tint_symbol_4 {
+  float4 color [[color(0)]];
+};
+
 FragmentOutput tint_symbol_1_inner(FragmentInput tint_symbol) {
   FragmentOutput output = {};
   output.color = float4(1.0f, 0.0f, 0.0f, 1.0f);
diff --git a/test/bug/tint/1076.wgsl.expected.msl b/test/bug/tint/1076.wgsl.expected.msl
index e1870331a0..926bbcbdb0 100644
--- a/test/bug/tint/1076.wgsl.expected.msl
+++ b/test/bug/tint/1076.wgsl.expected.msl
@@ -5,10 +5,12 @@ struct FragIn {
   float a;
   uint mask;
 };
+
 struct tint_symbol_2 {
   float a [[user(locn0)]];
   float b [[user(locn1)]];
 };
+
 struct tint_symbol_3 {
   float a [[color(0)]];
   uint mask [[sample_mask]];
diff --git a/test/bug/tint/1081.wgsl.expected.msl b/test/bug/tint/1081.wgsl.expected.msl
index 3dd960160d..34ebe0c692 100644
--- a/test/bug/tint/1081.wgsl.expected.msl
+++ b/test/bug/tint/1081.wgsl.expected.msl
@@ -1,13 +1,6 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol_2 {
-  int3 x [[user(locn1)]] [[flat]];
-};
-struct tint_symbol_3 {
-  int value [[color(2)]];
-};
-
 int f(int x) {
   if ((x == 10)) {
     discard_fragment();
@@ -15,6 +8,14 @@ int f(int x) {
   return x;
 }
 
+struct tint_symbol_2 {
+  int3 x [[user(locn1)]] [[flat]];
+};
+
+struct tint_symbol_3 {
+  int value [[color(2)]];
+};
+
 int tint_symbol_inner(int3 x) {
   int y = x[0];
   while (true) {
diff --git a/test/bug/tint/1088.spvasm.expected.msl b/test/bug/tint/1088.spvasm.expected.msl
index 1f074d5da4..b2533c6284 100644
--- a/test/bug/tint/1088.spvasm.expected.msl
+++ b/test/bug/tint/1088.spvasm.expected.msl
@@ -4,13 +4,16 @@ using namespace metal;
 struct tint_array_wrapper {
   /* 0x0000 */ float4x4 arr[2];
 };
+
 struct strided_arr {
   /* 0x0000 */ float el;
   /* 0x0004 */ int8_t tint_pad[12];
 };
+
 struct tint_array_wrapper_1 {
   /* 0x0000 */ strided_arr arr[4];
 };
+
 struct LeftOver {
   /* 0x0000 */ float4x4 worldViewProjection;
   /* 0x0040 */ float time;
@@ -18,19 +21,6 @@ struct LeftOver {
   /* 0x0050 */ tint_array_wrapper test2;
   /* 0x00d0 */ tint_array_wrapper_1 test;
 };
-struct main_out {
-  float4 gl_Position;
-  float2 vUV_1;
-};
-struct tint_symbol_2 {
-  float3 position_param [[attribute(0)]];
-  float3 normal_param [[attribute(1)]];
-  float2 uv_param [[attribute(2)]];
-};
-struct tint_symbol_3 {
-  float2 vUV_1 [[user(locn0)]];
-  float4 gl_Position [[position]];
-};
 
 void main_1(thread float3* const tint_symbol_5, const constant LeftOver* const tint_symbol_6, thread float4* const tint_symbol_7, thread float2* const tint_symbol_8, thread float2* const tint_symbol_9) {
   float4 q = 0.0f;
@@ -57,6 +47,22 @@ void main_1(thread float3* const tint_symbol_5, const constant LeftOver* const t
   return;
 }
 
+struct main_out {
+  float4 gl_Position;
+  float2 vUV_1;
+};
+
+struct tint_symbol_2 {
+  float3 position_param [[attribute(0)]];
+  float3 normal_param [[attribute(1)]];
+  float2 uv_param [[attribute(2)]];
+};
+
+struct tint_symbol_3 {
+  float2 vUV_1 [[user(locn0)]];
+  float4 gl_Position [[position]];
+};
+
 main_out tint_symbol_inner(float3 position_param, float2 uv_param, float3 normal_param, thread float3* const tint_symbol_10, thread float2* const tint_symbol_11, thread float3* const tint_symbol_12, const constant LeftOver* const tint_symbol_13, thread float4* const tint_symbol_14, thread float2* const tint_symbol_15) {
   *(tint_symbol_10) = position_param;
   *(tint_symbol_11) = uv_param;
diff --git a/test/bug/tint/1113.wgsl.expected.msl b/test/bug/tint/1113.wgsl.expected.msl
index 21d92decd8..1cbf979812 100644
--- a/test/bug/tint/1113.wgsl.expected.msl
+++ b/test/bug/tint/1113.wgsl.expected.msl
@@ -22,6 +22,7 @@ struct Uniforms {
   /* 0x0020 */ packed_float3 bbMax;
   /* 0x002c */ int8_t tint_pad_1[4];
 };
+
 struct Dbg {
   /* 0x0000 */ atomic_uint offsetCounter;
   /* 0x0004 */ uint pad0;
@@ -36,18 +37,23 @@ struct Dbg {
   /* 0x0028 */ float value_f32_2;
   /* 0x002c */ float value_f32_3;
 };
+
 struct F32s {
   /* 0x0000 */ float values[1];
 };
+
 struct U32s {
   /* 0x0000 */ uint values[1];
 };
+
 struct I32s {
   int values[1];
 };
+
 struct AU32s {
   /* 0x0000 */ atomic_uint values[1];
 };
+
 struct AI32s {
   /* 0x0000 */ atomic_int values[1];
 };
diff --git a/test/bug/tint/1121.wgsl.expected.msl b/test/bug/tint/1121.wgsl.expected.msl
index 64977239e7..8ac140b799 100644
--- a/test/bug/tint/1121.wgsl.expected.msl
+++ b/test/bug/tint/1121.wgsl.expected.msl
@@ -17,22 +17,28 @@ struct LightData {
   /* 0x0010 */ packed_float3 color;
   /* 0x001c */ float radius;
 };
+
 struct LightsBuffer {
   /* 0x0000 */ LightData lights[1];
 };
+
 struct tint_array_wrapper {
   /* 0x0000 */ uint arr[64];
 };
+
 struct TileLightIdData {
   /* 0x0000 */ atomic_uint count;
   /* 0x0004 */ tint_array_wrapper lightId;
 };
+
 struct tint_array_wrapper_1 {
   /* 0x0000 */ TileLightIdData arr[4];
 };
+
 struct Tiles {
   /* 0x0000 */ tint_array_wrapper_1 data;
 };
+
 struct Config {
   /* 0x0000 */ uint numLights;
   /* 0x0004 */ uint numTiles;
@@ -41,6 +47,7 @@ struct Config {
   /* 0x0010 */ uint numTileLightSlot;
   /* 0x0014 */ uint tileSize;
 };
+
 struct Uniforms {
   /* 0x0000 */ float4 min;
   /* 0x0010 */ float4 max;
@@ -48,6 +55,7 @@ struct Uniforms {
   /* 0x0060 */ float4x4 projectionMatrix;
   /* 0x00a0 */ float4 fullScreenSize;
 };
+
 struct tint_array_wrapper_2 {
   float4 arr[6];
 };
diff --git a/test/bug/tint/1321.wgsl.expected.msl b/test/bug/tint/1321.wgsl.expected.msl
index fc7979136f..8f72f2a1d5 100644
--- a/test/bug/tint/1321.wgsl.expected.msl
+++ b/test/bug/tint/1321.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_array_wrapper {
-  float arr[4];
-};
-
 int foo() {
   return 1;
 }
 
+struct tint_array_wrapper {
+  float arr[4];
+};
+
 fragment void tint_symbol() {
   tint_array_wrapper arr = {.arr={}};
   int const a_save = foo();
diff --git a/test/bug/tint/221.wgsl.expected.msl b/test/bug/tint/221.wgsl.expected.msl
index 28da8545ae..880fc07c00 100644
--- a/test/bug/tint/221.wgsl.expected.msl
+++ b/test/bug/tint/221.wgsl.expected.msl
@@ -4,6 +4,7 @@ using namespace metal;
 struct tint_array_wrapper {
   /* 0x0000 */ uint arr[50];
 };
+
 struct Buf {
   /* 0x0000 */ uint count;
   /* 0x0004 */ tint_array_wrapper data;
diff --git a/test/bug/tint/294.wgsl.expected.msl b/test/bug/tint/294.wgsl.expected.msl
index 0a1427c3d5..09c1cf563a 100644
--- a/test/bug/tint/294.wgsl.expected.msl
+++ b/test/bug/tint/294.wgsl.expected.msl
@@ -5,6 +5,7 @@ struct Light {
   float3 position;
   float3 colour;
 };
+
 struct Lights {
   Light light[1];
 };
diff --git a/test/bug/tint/403.wgsl.expected.msl b/test/bug/tint/403.wgsl.expected.msl
index 6f50135ef9..caff5f35ff 100644
--- a/test/bug/tint/403.wgsl.expected.msl
+++ b/test/bug/tint/403.wgsl.expected.msl
@@ -4,12 +4,15 @@ using namespace metal;
 struct vertexUniformBuffer1 {
   /* 0x0000 */ float2x2 transform1;
 };
+
 struct vertexUniformBuffer2 {
   /* 0x0000 */ float2x2 transform2;
 };
+
 struct tint_symbol_1 {
   float4 value [[position]];
 };
+
 struct tint_array_wrapper {
   float2 arr[3];
 };
diff --git a/test/bug/tint/534.wgsl.expected.msl b/test/bug/tint/534.wgsl.expected.msl
index 3789fa4209..a2b235fdad 100644
--- a/test/bug/tint/534.wgsl.expected.msl
+++ b/test/bug/tint/534.wgsl.expected.msl
@@ -7,6 +7,7 @@ struct Uniforms {
   /* 0x0008 */ uint isRGB10A2Unorm;
   /* 0x000c */ uint channelCount;
 };
+
 struct OutputBuf {
   /* 0x0000 */ uint result[1];
 };
diff --git a/test/bug/tint/744.wgsl.expected.msl b/test/bug/tint/744.wgsl.expected.msl
index 6a70809725..c4dc5b4193 100644
--- a/test/bug/tint/744.wgsl.expected.msl
+++ b/test/bug/tint/744.wgsl.expected.msl
@@ -6,6 +6,7 @@ struct Uniforms {
   /* 0x0008 */ uint2 bShape;
   /* 0x0010 */ uint2 outShape;
 };
+
 struct Matrix {
   /* 0x0000 */ uint numbers[1];
 };
diff --git a/test/bug/tint/749.spvasm.expected.msl b/test/bug/tint/749.spvasm.expected.msl
index c0772d18f2..1349abdcd2 100644
--- a/test/bug/tint/749.spvasm.expected.msl
+++ b/test/bug/tint/749.spvasm.expected.msl
@@ -4,18 +4,14 @@ using namespace metal;
 struct tint_array_wrapper {
   int arr[10];
 };
+
 struct QuicksortObject {
   tint_array_wrapper numbers;
 };
+
 struct buf0 {
   /* 0x0000 */ float2 resolution;
 };
-struct main_out {
-  float4 x_GLF_color_1;
-};
-struct tint_symbol_1 {
-  float4 x_GLF_color_1 [[color(0)]];
-};
 
 void swap_i1_i1_(thread int* const i, thread int* const j, thread QuicksortObject* const tint_symbol_81) {
   int temp = 0;
@@ -1547,6 +1543,14 @@ void main_1(thread QuicksortObject* const tint_symbol_84, thread float4* const t
   return;
 }
 
+struct main_out {
+  float4 x_GLF_color_1;
+};
+
+struct tint_symbol_1 {
+  float4 x_GLF_color_1 [[color(0)]];
+};
+
 main_out tint_symbol_inner(float4 gl_FragCoord_param, thread float4* const tint_symbol_88, thread QuicksortObject* const tint_symbol_89, const constant buf0* const tint_symbol_90, thread float4* const tint_symbol_91) {
   *(tint_symbol_88) = gl_FragCoord_param;
   main_1(tint_symbol_89, tint_symbol_88, tint_symbol_90, tint_symbol_91);
diff --git a/test/bug/tint/757.wgsl.expected.msl b/test/bug/tint/757.wgsl.expected.msl
index b06bf8d5fa..35bf540fb3 100644
--- a/test/bug/tint/757.wgsl.expected.msl
+++ b/test/bug/tint/757.wgsl.expected.msl
@@ -4,6 +4,7 @@ using namespace metal;
 struct Constants {
   int level;
 };
+
 struct Result {
   /* 0x0000 */ float values[1];
 };
diff --git a/test/bug/tint/824.wgsl.expected.msl b/test/bug/tint/824.wgsl.expected.msl
index 2f4f000688..d5f6cb326a 100644
--- a/test/bug/tint/824.wgsl.expected.msl
+++ b/test/bug/tint/824.wgsl.expected.msl
@@ -5,13 +5,16 @@ struct Output {
   float4 Position;
   float4 color;
 };
+
 struct tint_symbol_1 {
   float4 color [[user(locn0)]];
   float4 Position [[position]];
 };
+
 struct tint_array_wrapper {
   float2 arr[4];
 };
+
 struct tint_array_wrapper_1 {
   float4 arr[4];
 };
diff --git a/test/bug/tint/827.wgsl.expected.msl b/test/bug/tint/827.wgsl.expected.msl
index d1447922c0..191dd2bb5d 100644
--- a/test/bug/tint/827.wgsl.expected.msl
+++ b/test/bug/tint/827.wgsl.expected.msl
@@ -6,6 +6,7 @@ struct Result {
 };
 
 constant uint width = 128u;
+
 void tint_symbol_inner(uint3 GlobalInvocationId, device Result* const tint_symbol_1, depth2d<float, access::sample> tint_symbol_2) {
   (*(tint_symbol_1)).values[((GlobalInvocationId[1] * width) + GlobalInvocationId[0])] = tint_symbol_2.read(uint2(int2(int(GlobalInvocationId[0]), int(GlobalInvocationId[1]))), 0);
 }
diff --git a/test/bug/tint/870.spvasm.expected.msl b/test/bug/tint/870.spvasm.expected.msl
index 1f0eed87fd..05b9e33b89 100644
--- a/test/bug/tint/870.spvasm.expected.msl
+++ b/test/bug/tint/870.spvasm.expected.msl
@@ -4,12 +4,14 @@ using namespace metal;
 struct tint_array_wrapper {
   /* 0x0000 */ int arr[6];
 };
+
 struct sspp962805860buildInformationS {
   /* 0x0000 */ float4 footprint;
   /* 0x0010 */ float4 offset;
   /* 0x0020 */ int essence;
   /* 0x0024 */ tint_array_wrapper orientation;
 };
+
 struct x_B4_BuildInformation {
   /* 0x0000 */ sspp962805860buildInformationS passthru;
 };
diff --git a/test/bug/tint/913.wgsl.expected.msl b/test/bug/tint/913.wgsl.expected.msl
index e4875e89f0..a4903fc76d 100644
--- a/test/bug/tint/913.wgsl.expected.msl
+++ b/test/bug/tint/913.wgsl.expected.msl
@@ -8,6 +8,7 @@ struct Uniforms {
   /* 0x0010 */ uint2 dstCopyOrigin;
   /* 0x0018 */ uint2 copySize;
 };
+
 struct OutputBuf {
   /* 0x0000 */ uint result[1];
 };
diff --git a/test/bug/tint/914.wgsl.expected.msl b/test/bug/tint/914.wgsl.expected.msl
index a6830e2935..15901678fb 100644
--- a/test/bug/tint/914.wgsl.expected.msl
+++ b/test/bug/tint/914.wgsl.expected.msl
@@ -6,27 +6,11 @@ struct Uniforms {
   /* 0x0004 */ uint dimInner;
   /* 0x0008 */ uint dimBOuter;
 };
+
 struct Matrix {
   /* 0x0000 */ float numbers[1];
 };
-struct tint_array_wrapper_1 {
-  float arr[64];
-};
-struct tint_array_wrapper {
-  tint_array_wrapper_1 arr[64];
-};
-struct tint_array_wrapper_2 {
-  float arr[16];
-};
-struct tint_array_wrapper_3 {
-  float arr[4];
-};
 
-constant uint RowPerThread = 4u;
-constant uint ColPerThread = 4u;
-constant uint TileAOuter = 64u;
-constant uint TileBOuter = 64u;
-constant uint TileInner = 64u;
 float mm_readA(uint row, uint col, const constant Uniforms* const tint_symbol_1, const device Matrix* const tint_symbol_2) {
   if (((row < (*(tint_symbol_1)).dimAOuter) && (col < (*(tint_symbol_1)).dimInner))) {
     float const result = (*(tint_symbol_2)).numbers[((row * (*(tint_symbol_1)).dimInner) + col)];
@@ -50,6 +34,32 @@ void mm_write(uint row, uint col, float value, const constant Uniforms* const ti
   }
 }
 
+constant uint RowPerThread = 4u;
+
+constant uint ColPerThread = 4u;
+
+constant uint TileAOuter = 64u;
+
+constant uint TileBOuter = 64u;
+
+constant uint TileInner = 64u;
+
+struct tint_array_wrapper_1 {
+  float arr[64];
+};
+
+struct tint_array_wrapper {
+  tint_array_wrapper_1 arr[64];
+};
+
+struct tint_array_wrapper_2 {
+  float arr[16];
+};
+
+struct tint_array_wrapper_3 {
+  float arr[4];
+};
+
 void tint_symbol_inner(uint3 local_id, uint3 global_id, uint local_invocation_index, threadgroup tint_array_wrapper* const tint_symbol_7, threadgroup tint_array_wrapper* const tint_symbol_8, const constant Uniforms* const tint_symbol_9, const device Matrix* const tint_symbol_10, const device Matrix* const tint_symbol_11, device Matrix* const tint_symbol_12) {
   for(uint idx = local_invocation_index; (idx < 4096u); idx = (idx + 256u)) {
     uint const i = (idx / 64u);
diff --git a/test/bug/tint/922.wgsl.expected.msl b/test/bug/tint/922.wgsl.expected.msl
index 992c58775a..584f9e45a0 100644
--- a/test/bug/tint/922.wgsl.expected.msl
+++ b/test/bug/tint/922.wgsl.expected.msl
@@ -7,48 +7,44 @@ struct Mat4x4_ {
   /* 0x0020 */ float4 mz;
   /* 0x0030 */ float4 mw;
 };
+
 struct Mat4x3_ {
   /* 0x0000 */ float4 mx;
   /* 0x0010 */ float4 my;
   /* 0x0020 */ float4 mz;
 };
+
 struct Mat4x2_ {
   /* 0x0000 */ float4 mx;
   /* 0x0010 */ float4 my;
 };
+
 struct ub_SceneParams {
   /* 0x0000 */ Mat4x4_ u_Projection;
 };
+
 struct tint_array_wrapper {
   /* 0x0000 */ Mat4x2_ arr[1];
 };
+
 struct ub_MaterialParams {
   /* 0x0000 */ tint_array_wrapper u_TexMtx;
   /* 0x0020 */ float4 u_Misc0_;
 };
+
 struct tint_array_wrapper_1 {
   /* 0x0000 */ Mat4x3_ arr[32];
 };
+
 struct ub_PacketParams {
   /* 0x0000 */ tint_array_wrapper_1 u_PosMtx;
 };
+
 struct VertexOutput {
   float4 v_Color;
   float2 v_TexCoord;
   float4 member;
 };
-struct tint_symbol_2 {
-  float3 a_Position [[attribute(0)]];
-  float2 a_UV [[attribute(1)]];
-  float4 a_Color [[attribute(2)]];
-  float3 a_Normal [[attribute(3)]];
-  float a_PosMtxIdx [[attribute(4)]];
-};
-struct tint_symbol_3 {
-  float4 v_Color [[user(locn0)]];
-  float2 v_TexCoord [[user(locn1)]];
-  float4 member [[position]];
-};
 
 float3 Mat4x3GetCol0_(Mat4x3_ m) {
   Mat4x3_ m1 = {};
@@ -269,6 +265,20 @@ void main1(thread float* const tint_symbol_5, const constant ub_PacketParams* co
   }
 }
 
+struct tint_symbol_2 {
+  float3 a_Position [[attribute(0)]];
+  float2 a_UV [[attribute(1)]];
+  float4 a_Color [[attribute(2)]];
+  float3 a_Normal [[attribute(3)]];
+  float a_PosMtxIdx [[attribute(4)]];
+};
+
+struct tint_symbol_3 {
+  float4 v_Color [[user(locn0)]];
+  float2 v_TexCoord [[user(locn1)]];
+  float4 member [[position]];
+};
+
 VertexOutput tint_symbol_inner(float3 a_Position, float2 a_UV, float4 a_Color, float3 a_Normal, float a_PosMtxIdx, thread float3* const tint_symbol_16, thread float2* const tint_symbol_17, thread float4* const tint_symbol_18, thread float3* const tint_symbol_19, thread float* const tint_symbol_20, const constant ub_PacketParams* const tint_symbol_21, const constant ub_SceneParams* const tint_symbol_22, thread float4* const tint_symbol_23, thread float4* const tint_symbol_24, const constant ub_MaterialParams* const tint_symbol_25, thread float2* const tint_symbol_26) {
   *(tint_symbol_16) = a_Position;
   *(tint_symbol_17) = a_UV;
diff --git a/test/bug/tint/942.wgsl.expected.msl b/test/bug/tint/942.wgsl.expected.msl
index 519443a9cc..3127a423b6 100644
--- a/test/bug/tint/942.wgsl.expected.msl
+++ b/test/bug/tint/942.wgsl.expected.msl
@@ -5,12 +5,15 @@ struct Params {
   /* 0x0000 */ uint filterDim;
   /* 0x0004 */ uint blockDim;
 };
+
 struct Flip {
   /* 0x0000 */ uint value;
 };
+
 struct tint_array_wrapper_1 {
   float3 arr[256];
 };
+
 struct tint_array_wrapper {
   tint_array_wrapper_1 arr[4];
 };
diff --git a/test/bug/tint/943.spvasm.expected.msl b/test/bug/tint/943.spvasm.expected.msl
index 99ab48cb36..648486be44 100644
--- a/test/bug/tint/943.spvasm.expected.msl
+++ b/test/bug/tint/943.spvasm.expected.msl
@@ -12,30 +12,34 @@ struct Uniforms {
   /* 0x003c */ int8_t tint_pad_3[4];
   /* 0x0040 */ int2 outShapeStrides;
 };
+
 struct ssbOut {
   /* 0x0000 */ float result[1];
 };
+
 struct ssbA {
   /* 0x0000 */ float A[1];
 };
+
 struct ssbB {
   /* 0x0000 */ float B[1];
 };
+
 struct tint_array_wrapper_1 {
   float arr[64];
 };
+
 struct tint_array_wrapper {
   tint_array_wrapper_1 arr[64];
 };
+
 struct tint_array_wrapper_3 {
   float arr[1];
 };
+
 struct tint_array_wrapper_2 {
   tint_array_wrapper_3 arr[64];
 };
-struct tint_array_wrapper_4 {
-  tint_array_wrapper_3 arr[1];
-};
 
 bool coordsInBounds_vi2_vi2_(thread int2* const coord, thread int2* const shape) {
   bool x_87 = false;
@@ -168,6 +172,10 @@ void mm_write_i1_i1_f1_(thread int* const row_2, thread int* const col_2, thread
   return;
 }
 
+struct tint_array_wrapper_4 {
+  tint_array_wrapper_3 arr[1];
+};
+
 void mm_matMul_i1_i1_i1_(thread int* const dimAOuter, thread int* const dimInner, thread int* const dimBOuter, thread uint3* const tint_symbol_19, thread uint3* const tint_symbol_20, const constant Uniforms* const tint_symbol_21, thread int* const tint_symbol_22, thread int* const tint_symbol_23, thread int* const tint_symbol_24, const device ssbA* const tint_symbol_25, threadgroup tint_array_wrapper* const tint_symbol_26, thread int* const tint_symbol_27, const device ssbB* const tint_symbol_28, threadgroup tint_array_wrapper_2* const tint_symbol_29, device ssbOut* const tint_symbol_30) {
   int tileRow = 0;
   int tileCol = 0;
diff --git a/test/bug/tint/948.wgsl.expected.msl b/test/bug/tint/948.wgsl.expected.msl
index d4659c508a..25febafed1 100644
--- a/test/bug/tint/948.wgsl.expected.msl
+++ b/test/bug/tint/948.wgsl.expected.msl
@@ -25,20 +25,6 @@ struct LeftOver {
   /* 0x0070 */ packed_float3 colorMul;
   /* 0x007c */ int8_t tint_pad_1[4];
 };
-struct main_out {
-  float4 glFragColor_1;
-};
-struct tint_symbol_2 {
-  float3 vPosition_param [[user(locn0)]];
-  float2 vUV_param [[user(locn1)]];
-  float2 tUV_param [[user(locn2)]];
-  float2 stageUnits_1_param [[user(locn3)]];
-  float2 levelUnits_param [[user(locn4)]];
-  float2 tileID_1_param [[user(locn5)]];
-};
-struct tint_symbol_3 {
-  float4 glFragColor_1 [[color(0)]];
-};
 
 float4x4 getFrameData_f1_(thread float* const frameID, const constant LeftOver* const tint_symbol_5, texture2d<float, access::sample> tint_symbol_6, sampler tint_symbol_7) {
   float fX = 0.0f;
@@ -204,6 +190,23 @@ void main_1(thread float2* const tint_symbol_8, const constant LeftOver* const t
   return;
 }
 
+struct main_out {
+  float4 glFragColor_1;
+};
+
+struct tint_symbol_2 {
+  float3 vPosition_param [[user(locn0)]];
+  float2 vUV_param [[user(locn1)]];
+  float2 tUV_param [[user(locn2)]];
+  float2 stageUnits_1_param [[user(locn3)]];
+  float2 levelUnits_param [[user(locn4)]];
+  float2 tileID_1_param [[user(locn5)]];
+};
+
+struct tint_symbol_3 {
+  float4 glFragColor_1 [[color(0)]];
+};
+
 main_out tint_symbol_inner(float2 tUV_param, float2 tileID_1_param, float2 levelUnits_param, float2 stageUnits_1_param, float3 vPosition_param, float2 vUV_param, thread float2* const tint_symbol_21, thread float2* const tint_symbol_22, thread float2* const tint_symbol_23, thread float2* const tint_symbol_24, thread float3* const tint_symbol_25, thread float2* const tint_symbol_26, const constant LeftOver* const tint_symbol_27, texture2d<float, access::sample> tint_symbol_28, sampler tint_symbol_29, texture2d<float, access::sample> tint_symbol_30, texture2d<float, access::sample> tint_symbol_31, sampler tint_symbol_32, thread float* const tint_symbol_33, texture2d<float, access::sample> tint_symbol_34, sampler tint_symbol_35, texture2d<float, access::sample> tint_symbol_36, sampler tint_symbol_37, thread float4* const tint_symbol_38) {
   *(tint_symbol_21) = tUV_param;
   *(tint_symbol_22) = tileID_1_param;
diff --git a/test/bug/tint/949.wgsl.expected.msl b/test/bug/tint/949.wgsl.expected.msl
index 3f023d0f52..fb89decc8d 100644
--- a/test/bug/tint/949.wgsl.expected.msl
+++ b/test/bug/tint/949.wgsl.expected.msl
@@ -16,6 +16,7 @@ struct lightingInfo {
   float3 diffuse;
   float3 specular;
 };
+
 struct LeftOver {
   /* 0x0000 */ float4x4 u_World;
   /* 0x0040 */ float4x4 u_ViewProjection;
@@ -28,6 +29,7 @@ struct LeftOver {
   /* 0x00a4 */ uint padding_1;
   /* 0x00a8 */ float2 tangentSpaceParameter0;
 };
+
 struct Light0 {
   /* 0x0000 */ float4 vLightData;
   /* 0x0010 */ float4 vLightDiffuse;
@@ -38,18 +40,6 @@ struct Light0 {
   /* 0x0050 */ float2 depthValues;
   /* 0x0058 */ int8_t tint_pad_1[8];
 };
-struct main_out {
-  float4 glFragColor_1;
-};
-struct tint_symbol_2 {
-  float4 v_output1_param [[user(locn0)]];
-  float2 vMainuv_param [[user(locn1)]];
-  float4 v_output2_param [[user(locn2)]];
-  float2 v_uv_param [[user(locn3)]];
-};
-struct tint_symbol_3 {
-  float4 glFragColor_1 [[color(0)]];
-};
 
 float3x3 cotangent_frame_vf3_vf3_vf2_vf2_(thread float3* const normal_1, thread float3* const p, thread float2* const uv, thread float2* const tangentSpaceParams) {
   float3 dp1 = 0.0f;
@@ -425,6 +415,21 @@ void main_1(thread float* const tint_symbol_5, thread float3* const tint_symbol_
   return;
 }
 
+struct main_out {
+  float4 glFragColor_1;
+};
+
+struct tint_symbol_2 {
+  float4 v_output1_param [[user(locn0)]];
+  float2 vMainuv_param [[user(locn1)]];
+  float4 v_output2_param [[user(locn2)]];
+  float2 v_uv_param [[user(locn3)]];
+};
+
+struct tint_symbol_3 {
+  float4 glFragColor_1 [[color(0)]];
+};
+
 main_out tint_symbol_inner(float2 vMainuv_param, float4 v_output1_param, bool gl_FrontFacing_param, float2 v_uv_param, float4 v_output2_param, thread float2* const tint_symbol_19, thread float4* const tint_symbol_20, thread bool* const tint_symbol_21, thread float2* const tint_symbol_22, thread float4* const tint_symbol_23, thread float* const tint_symbol_24, thread float3* const tint_symbol_25, texture2d<float, access::sample> tint_symbol_26, sampler tint_symbol_27, const constant LeftOver* const tint_symbol_28, texture2d<float, access::sample> tint_symbol_29, sampler tint_symbol_30, const constant Light0* const tint_symbol_31, thread float4* const tint_symbol_32) {
   *(tint_symbol_19) = vMainuv_param;
   *(tint_symbol_20) = v_output1_param;
diff --git a/test/bug/tint/951.spvasm.expected.msl b/test/bug/tint/951.spvasm.expected.msl
index 9234ca57ee..80a05a7eed 100644
--- a/test/bug/tint/951.spvasm.expected.msl
+++ b/test/bug/tint/951.spvasm.expected.msl
@@ -4,9 +4,11 @@ using namespace metal;
 struct ssbOut {
   /* 0x0000 */ float result[1];
 };
+
 struct ssbA {
   /* 0x0000 */ float A[1];
 };
+
 struct Uniforms {
   /* 0x0000 */ float tint_symbol;
   /* 0x0004 */ int aShape;
diff --git a/test/bug/tint/977.spvasm.expected.msl b/test/bug/tint/977.spvasm.expected.msl
index 22e9078374..16062d0ddf 100644
--- a/test/bug/tint/977.spvasm.expected.msl
+++ b/test/bug/tint/977.spvasm.expected.msl
@@ -4,12 +4,15 @@ using namespace metal;
 struct ResultMatrix {
   /* 0x0000 */ float numbers[1];
 };
+
 struct FirstMatrix {
   float numbers[1];
 };
+
 struct SecondMatrix {
   float numbers[1];
 };
+
 struct Uniforms {
   float tint_symbol;
   int sizeA;
diff --git a/test/bug/tint/978.wgsl.expected.msl b/test/bug/tint/978.wgsl.expected.msl
index 737a2bde13..1db5531817 100644
--- a/test/bug/tint/978.wgsl.expected.msl
+++ b/test/bug/tint/978.wgsl.expected.msl
@@ -4,12 +4,15 @@ using namespace metal;
 struct FragmentInput {
   float2 vUv;
 };
+
 struct FragmentOutput {
   float4 color;
 };
+
 struct tint_symbol_2 {
   float2 vUv [[user(locn2)]];
 };
+
 struct tint_symbol_3 {
   float4 color [[color(0)]];
 };
diff --git a/test/bug/tint/980.wgsl.expected.msl b/test/bug/tint/980.wgsl.expected.msl
index 6261f546c0..e00119baab 100644
--- a/test/bug/tint/980.wgsl.expected.msl
+++ b/test/bug/tint/980.wgsl.expected.msl
@@ -12,17 +12,17 @@ inline vec<T, N> operator*(packed_vec<T, M> lhs, matrix<T, N, M> rhs) {
   return vec<T, M>(lhs) * rhs;
 }
 
-struct S {
-  /* 0x0000 */ packed_float3 v;
-  /* 0x000c */ uint i;
-};
-
 float3 Bad(uint index, float3 rd) {
   float3 normal = float3(0.0f);
   normal[index] = -(sign(rd[index]));
   return normalize(normal);
 }
 
+struct S {
+  /* 0x0000 */ packed_float3 v;
+  /* 0x000c */ uint i;
+};
+
 void tint_symbol_inner(uint idx, device S* const tint_symbol_1) {
   (*(tint_symbol_1)).v = Bad((*(tint_symbol_1)).i, (*(tint_symbol_1)).v);
 }
diff --git a/test/bug/tint/993.wgsl.expected.msl b/test/bug/tint/993.wgsl.expected.msl
index c09cfed152..f7e9d1c32a 100644
--- a/test/bug/tint/993.wgsl.expected.msl
+++ b/test/bug/tint/993.wgsl.expected.msl
@@ -4,12 +4,15 @@ using namespace metal;
 struct Constants {
   /* 0x0000 */ uint zero;
 };
+
 struct Result {
   /* 0x0000 */ uint value;
 };
+
 struct tint_array_wrapper {
   /* 0x0000 */ atomic_int arr[3];
 };
+
 struct TestData {
   /* 0x0000 */ tint_array_wrapper data;
 };
diff --git a/test/bug/tint/998.wgsl.expected.msl b/test/bug/tint/998.wgsl.expected.msl
index 3cbf5511bc..740838e1c7 100644
--- a/test/bug/tint/998.wgsl.expected.msl
+++ b/test/bug/tint/998.wgsl.expected.msl
@@ -4,12 +4,15 @@ using namespace metal;
 struct Constants {
   /* 0x0000 */ uint zero;
 };
+
 struct Result {
   uint value;
 };
+
 struct tint_array_wrapper {
   uint arr[3];
 };
+
 struct S {
   tint_array_wrapper data;
 };
diff --git a/test/builtins/arrayLength/complex_via_let.wgsl.expected.msl b/test/builtins/arrayLength/complex_via_let.wgsl.expected.msl
index 28a8285d92..537a45373b 100644
--- a/test/builtins/arrayLength/complex_via_let.wgsl.expected.msl
+++ b/test/builtins/arrayLength/complex_via_let.wgsl.expected.msl
@@ -4,6 +4,7 @@ using namespace metal;
 struct tint_symbol_1 {
   /* 0x0000 */ uint4 buffer_size[1];
 };
+
 struct S {
   int a[1];
 };
diff --git a/test/builtins/arrayLength/deprecated.wgsl.expected.msl b/test/builtins/arrayLength/deprecated.wgsl.expected.msl
index 90f1512384..bf8e5b0422 100644
--- a/test/builtins/arrayLength/deprecated.wgsl.expected.msl
+++ b/test/builtins/arrayLength/deprecated.wgsl.expected.msl
@@ -4,6 +4,7 @@ using namespace metal;
 struct tint_symbol_1 {
   /* 0x0000 */ uint4 buffer_size[1];
 };
+
 struct S {
   int a[1];
 };
diff --git a/test/builtins/arrayLength/simple.wgsl.expected.msl b/test/builtins/arrayLength/simple.wgsl.expected.msl
index 28a8285d92..537a45373b 100644
--- a/test/builtins/arrayLength/simple.wgsl.expected.msl
+++ b/test/builtins/arrayLength/simple.wgsl.expected.msl
@@ -4,6 +4,7 @@ using namespace metal;
 struct tint_symbol_1 {
   /* 0x0000 */ uint4 buffer_size[1];
 };
+
 struct S {
   int a[1];
 };
diff --git a/test/builtins/arrayLength/via_let.wgsl.expected.msl b/test/builtins/arrayLength/via_let.wgsl.expected.msl
index 28a8285d92..537a45373b 100644
--- a/test/builtins/arrayLength/via_let.wgsl.expected.msl
+++ b/test/builtins/arrayLength/via_let.wgsl.expected.msl
@@ -4,6 +4,7 @@ using namespace metal;
 struct tint_symbol_1 {
   /* 0x0000 */ uint4 buffer_size[1];
 };
+
 struct S {
   int a[1];
 };
diff --git a/test/builtins/arrayLength/via_let_complex.wgsl.expected.msl b/test/builtins/arrayLength/via_let_complex.wgsl.expected.msl
index 28a8285d92..537a45373b 100644
--- a/test/builtins/arrayLength/via_let_complex.wgsl.expected.msl
+++ b/test/builtins/arrayLength/via_let_complex.wgsl.expected.msl
@@ -4,6 +4,7 @@ using namespace metal;
 struct tint_symbol_1 {
   /* 0x0000 */ uint4 buffer_size[1];
 };
+
 struct S {
   int a[1];
 };
diff --git a/test/builtins/gen/abs/002533.wgsl.expected.msl b/test/builtins/gen/abs/002533.wgsl.expected.msl
index bc614c33ae..e7c6e0cd7f 100644
--- a/test/builtins/gen/abs/002533.wgsl.expected.msl
+++ b/test/builtins/gen/abs/002533.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void abs_002533() {
   float4 res = fabs(float4());
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner() {
   abs_002533();
   return float4();
diff --git a/test/builtins/gen/abs/005174.wgsl.expected.msl b/test/builtins/gen/abs/005174.wgsl.expected.msl
index b37f02e829..7606da6715 100644
--- a/test/builtins/gen/abs/005174.wgsl.expected.msl
+++ b/test/builtins/gen/abs/005174.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void abs_005174() {
   float3 res = fabs(float3());
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner() {
   abs_005174();
   return float4();
diff --git a/test/builtins/gen/abs/1ce782.wgsl.expected.msl b/test/builtins/gen/abs/1ce782.wgsl.expected.msl
index 5d5f0d2a1a..73296533db 100644
--- a/test/builtins/gen/abs/1ce782.wgsl.expected.msl
+++ b/test/builtins/gen/abs/1ce782.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void abs_1ce782() {
   uint4 res = abs(uint4());
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner() {
   abs_1ce782();
   return float4();
diff --git a/test/builtins/gen/abs/1e9d53.wgsl.expected.msl b/test/builtins/gen/abs/1e9d53.wgsl.expected.msl
index f5c7392dba..7951049b1c 100644
--- a/test/builtins/gen/abs/1e9d53.wgsl.expected.msl
+++ b/test/builtins/gen/abs/1e9d53.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void abs_1e9d53() {
   float2 res = fabs(float2());
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner() {
   abs_1e9d53();
   return float4();
diff --git a/test/builtins/gen/abs/467cd1.wgsl.expected.msl b/test/builtins/gen/abs/467cd1.wgsl.expected.msl
index be63d7eaab..421b221d2f 100644
--- a/test/builtins/gen/abs/467cd1.wgsl.expected.msl
+++ b/test/builtins/gen/abs/467cd1.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void abs_467cd1() {
   uint res = abs(1u);
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner() {
   abs_467cd1();
   return float4();
diff --git a/test/builtins/gen/abs/4ad288.wgsl.expected.msl b/test/builtins/gen/abs/4ad288.wgsl.expected.msl
index f9d5155be5..dcea6480d9 100644
--- a/test/builtins/gen/abs/4ad288.wgsl.expected.msl
+++ b/test/builtins/gen/abs/4ad288.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void abs_4ad288() {
   int res = abs(1);
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner() {
   abs_4ad288();
   return float4();
diff --git a/test/builtins/gen/abs/5ad50a.wgsl.expected.msl b/test/builtins/gen/abs/5ad50a.wgsl.expected.msl
index 4cdc43b63b..b3da1a3dcb 100644
--- a/test/builtins/gen/abs/5ad50a.wgsl.expected.msl
+++ b/test/builtins/gen/abs/5ad50a.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void abs_5ad50a() {
   int3 res = abs(int3());
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner() {
   abs_5ad50a();
   return float4();
diff --git a/test/builtins/gen/abs/7326de.wgsl.expected.msl b/test/builtins/gen/abs/7326de.wgsl.expected.msl
index a7f8a4b3bd..146626d5ac 100644
--- a/test/builtins/gen/abs/7326de.wgsl.expected.msl
+++ b/test/builtins/gen/abs/7326de.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void abs_7326de() {
   uint3 res = abs(uint3());
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner() {
   abs_7326de();
   return float4();
diff --git a/test/builtins/gen/abs/7f28e6.wgsl.expected.msl b/test/builtins/gen/abs/7f28e6.wgsl.expected.msl
index c4db275a96..97422d7325 100644
--- a/test/builtins/gen/abs/7f28e6.wgsl.expected.msl
+++ b/test/builtins/gen/abs/7f28e6.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void abs_7f28e6() {
   uint2 res = abs(uint2());
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner() {
   abs_7f28e6();
   return float4();
diff --git a/test/builtins/gen/abs/7faa9e.wgsl.expected.msl b/test/builtins/gen/abs/7faa9e.wgsl.expected.msl
index 074c9c0734..278f9dbbc6 100644
--- a/test/builtins/gen/abs/7faa9e.wgsl.expected.msl
+++ b/test/builtins/gen/abs/7faa9e.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void abs_7faa9e() {
   int2 res = abs(int2());
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner() {
   abs_7faa9e();
   return float4();
diff --git a/test/builtins/gen/abs/9c80a6.wgsl.expected.msl b/test/builtins/gen/abs/9c80a6.wgsl.expected.msl
index 0cc64f1e1c..11b838e837 100644
--- a/test/builtins/gen/abs/9c80a6.wgsl.expected.msl
+++ b/test/builtins/gen/abs/9c80a6.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void abs_9c80a6() {
   int4 res = abs(int4());
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner() {
   abs_9c80a6();
   return float4();
diff --git a/test/builtins/gen/abs/b96037.wgsl.expected.msl b/test/builtins/gen/abs/b96037.wgsl.expected.msl
index 617a92f522..92263420a3 100644
--- a/test/builtins/gen/abs/b96037.wgsl.expected.msl
+++ b/test/builtins/gen/abs/b96037.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void abs_b96037() {
   float res = fabs(1.0f);
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner() {
   abs_b96037();
   return float4();
diff --git a/test/builtins/gen/acos/489247.wgsl.expected.msl b/test/builtins/gen/acos/489247.wgsl.expected.msl
index 1994fcbb03..b80a9c8515 100644
--- a/test/builtins/gen/acos/489247.wgsl.expected.msl
+++ b/test/builtins/gen/acos/489247.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void acos_489247() {
   float res = acos(1.0f);
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner() {
   acos_489247();
   return float4();
diff --git a/test/builtins/gen/acos/8e2acf.wgsl.expected.msl b/test/builtins/gen/acos/8e2acf.wgsl.expected.msl
index 34390f020d..8595fceae2 100644
--- a/test/builtins/gen/acos/8e2acf.wgsl.expected.msl
+++ b/test/builtins/gen/acos/8e2acf.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void acos_8e2acf() {
   float4 res = acos(float4());
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner() {
   acos_8e2acf();
   return float4();
diff --git a/test/builtins/gen/acos/a610c4.wgsl.expected.msl b/test/builtins/gen/acos/a610c4.wgsl.expected.msl
index 48340112be..435d150f23 100644
--- a/test/builtins/gen/acos/a610c4.wgsl.expected.msl
+++ b/test/builtins/gen/acos/a610c4.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void acos_a610c4() {
   float3 res = acos(float3());
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner() {
   acos_a610c4();
   return float4();
diff --git a/test/builtins/gen/acos/dfc915.wgsl.expected.msl b/test/builtins/gen/acos/dfc915.wgsl.expected.msl
index d6c52cf027..7668f36c1e 100644
--- a/test/builtins/gen/acos/dfc915.wgsl.expected.msl
+++ b/test/builtins/gen/acos/dfc915.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void acos_dfc915() {
   float2 res = acos(float2());
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner() {
   acos_dfc915();
   return float4();
diff --git a/test/builtins/gen/all/353d6a.wgsl.expected.msl b/test/builtins/gen/all/353d6a.wgsl.expected.msl
index 6b65ee4be8..74aff96a63 100644
--- a/test/builtins/gen/all/353d6a.wgsl.expected.msl
+++ b/test/builtins/gen/all/353d6a.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void all_353d6a() {
   bool res = all(bool());
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner() {
   all_353d6a();
   return float4();
diff --git a/test/builtins/gen/all/986c7b.wgsl.expected.msl b/test/builtins/gen/all/986c7b.wgsl.expected.msl
index 5adaeb6b3d..041e28037c 100644
--- a/test/builtins/gen/all/986c7b.wgsl.expected.msl
+++ b/test/builtins/gen/all/986c7b.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void all_986c7b() {
   bool res = all(bool4());
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner() {
   all_986c7b();
   return float4();
diff --git a/test/builtins/gen/all/bd2dba.wgsl.expected.msl b/test/builtins/gen/all/bd2dba.wgsl.expected.msl
index 938d92d1fa..d6d45cff04 100644
--- a/test/builtins/gen/all/bd2dba.wgsl.expected.msl
+++ b/test/builtins/gen/all/bd2dba.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void all_bd2dba() {
   bool res = all(bool3());
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner() {
   all_bd2dba();
   return float4();
diff --git a/test/builtins/gen/all/f46790.wgsl.expected.msl b/test/builtins/gen/all/f46790.wgsl.expected.msl
index ffe5e06f1f..60c3c44d7b 100644
--- a/test/builtins/gen/all/f46790.wgsl.expected.msl
+++ b/test/builtins/gen/all/f46790.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void all_f46790() {
   bool res = all(bool2());
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner() {
   all_f46790();
   return float4();
diff --git a/test/builtins/gen/any/083428.wgsl.expected.msl b/test/builtins/gen/any/083428.wgsl.expected.msl
index 1b403a3b27..a11e292676 100644
--- a/test/builtins/gen/any/083428.wgsl.expected.msl
+++ b/test/builtins/gen/any/083428.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void any_083428() {
   bool res = any(bool4());
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner() {
   any_083428();
   return float4();
diff --git a/test/builtins/gen/any/0e3e58.wgsl.expected.msl b/test/builtins/gen/any/0e3e58.wgsl.expected.msl
index 8f7da073d3..1bf7505bd3 100644
--- a/test/builtins/gen/any/0e3e58.wgsl.expected.msl
+++ b/test/builtins/gen/any/0e3e58.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void any_0e3e58() {
   bool res = any(bool2());
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner() {
   any_0e3e58();
   return float4();
diff --git a/test/builtins/gen/any/2ab91a.wgsl.expected.msl b/test/builtins/gen/any/2ab91a.wgsl.expected.msl
index 7fb52cfcb2..15e82831fd 100644
--- a/test/builtins/gen/any/2ab91a.wgsl.expected.msl
+++ b/test/builtins/gen/any/2ab91a.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void any_2ab91a() {
   bool res = any(bool());
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner() {
   any_2ab91a();
   return float4();
diff --git a/test/builtins/gen/any/e755c1.wgsl.expected.msl b/test/builtins/gen/any/e755c1.wgsl.expected.msl
index 2dbc5d4dda..fc6214bccb 100644
--- a/test/builtins/gen/any/e755c1.wgsl.expected.msl
+++ b/test/builtins/gen/any/e755c1.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void any_e755c1() {
   bool res = any(bool3());
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner() {
   any_e755c1();
   return float4();
diff --git a/test/builtins/gen/arrayLength/1588cd.wgsl.expected.msl b/test/builtins/gen/arrayLength/1588cd.wgsl.expected.msl
index 8835e97b64..1793477027 100644
--- a/test/builtins/gen/arrayLength/1588cd.wgsl.expected.msl
+++ b/test/builtins/gen/arrayLength/1588cd.wgsl.expected.msl
@@ -4,17 +4,19 @@ using namespace metal;
 struct tint_symbol_1 {
   /* 0x0000 */ uint4 buffer_size[1];
 };
+
 struct SB_RO {
   int arg_0[1];
 };
-struct tint_symbol {
-  float4 value [[position]];
-};
 
 void arrayLength_1588cd(const constant tint_symbol_1* const tint_symbol_3) {
   uint res = (((*(tint_symbol_3)).buffer_size[0u][0u] - 0u) / 4u);
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner(const constant tint_symbol_1* const tint_symbol_4) {
   arrayLength_1588cd(tint_symbol_4);
   return float4();
diff --git a/test/builtins/gen/arrayLength/61b1c7.wgsl.expected.msl b/test/builtins/gen/arrayLength/61b1c7.wgsl.expected.msl
index 4fd3c1c679..cebf66b06a 100644
--- a/test/builtins/gen/arrayLength/61b1c7.wgsl.expected.msl
+++ b/test/builtins/gen/arrayLength/61b1c7.wgsl.expected.msl
@@ -4,17 +4,19 @@ using namespace metal;
 struct tint_symbol_1 {
   /* 0x0000 */ uint4 buffer_size[1];
 };
+
 struct SB_RW {
   int arg_0[1];
 };
-struct tint_symbol {
-  float4 value [[position]];
-};
 
 void arrayLength_61b1c7(const constant tint_symbol_1* const tint_symbol_3) {
   uint res = (((*(tint_symbol_3)).buffer_size[0u][0u] - 0u) / 4u);
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner(const constant tint_symbol_1* const tint_symbol_4) {
   arrayLength_61b1c7(tint_symbol_4);
   return float4();
diff --git a/test/builtins/gen/arrayLength/a0f5ca.wgsl.expected.msl b/test/builtins/gen/arrayLength/a0f5ca.wgsl.expected.msl
index 14f2e56842..a04fc9c82c 100644
--- a/test/builtins/gen/arrayLength/a0f5ca.wgsl.expected.msl
+++ b/test/builtins/gen/arrayLength/a0f5ca.wgsl.expected.msl
@@ -4,17 +4,19 @@ using namespace metal;
 struct tint_symbol_1 {
   /* 0x0000 */ uint4 buffer_size[1];
 };
+
 struct SB_RO {
   float arg_0[1];
 };
-struct tint_symbol {
-  float4 value [[position]];
-};
 
 void arrayLength_a0f5ca(const constant tint_symbol_1* const tint_symbol_3) {
   uint res = (((*(tint_symbol_3)).buffer_size[0u][0u] - 0u) / 4u);
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner(const constant tint_symbol_1* const tint_symbol_4) {
   arrayLength_a0f5ca(tint_symbol_4);
   return float4();
diff --git a/test/builtins/gen/arrayLength/cdd123.wgsl.expected.msl b/test/builtins/gen/arrayLength/cdd123.wgsl.expected.msl
index dca2023889..3ba8276df0 100644
--- a/test/builtins/gen/arrayLength/cdd123.wgsl.expected.msl
+++ b/test/builtins/gen/arrayLength/cdd123.wgsl.expected.msl
@@ -4,17 +4,19 @@ using namespace metal;
 struct tint_symbol_1 {
   /* 0x0000 */ uint4 buffer_size[1];
 };
+
 struct SB_RW {
   float arg_0[1];
 };
-struct tint_symbol {
-  float4 value [[position]];
-};
 
 void arrayLength_cdd123(const constant tint_symbol_1* const tint_symbol_3) {
   uint res = (((*(tint_symbol_3)).buffer_size[0u][0u] - 0u) / 4u);
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner(const constant tint_symbol_1* const tint_symbol_4) {
   arrayLength_cdd123(tint_symbol_4);
   return float4();
diff --git a/test/builtins/gen/arrayLength/cfca0a.wgsl.expected.msl b/test/builtins/gen/arrayLength/cfca0a.wgsl.expected.msl
index 279dd8cfa9..5dd7ad6153 100644
--- a/test/builtins/gen/arrayLength/cfca0a.wgsl.expected.msl
+++ b/test/builtins/gen/arrayLength/cfca0a.wgsl.expected.msl
@@ -4,17 +4,19 @@ using namespace metal;
 struct tint_symbol_1 {
   /* 0x0000 */ uint4 buffer_size[1];
 };
+
 struct SB_RO {
   uint arg_0[1];
 };
-struct tint_symbol {
-  float4 value [[position]];
-};
 
 void arrayLength_cfca0a(const constant tint_symbol_1* const tint_symbol_3) {
   uint res = (((*(tint_symbol_3)).buffer_size[0u][0u] - 0u) / 4u);
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner(const constant tint_symbol_1* const tint_symbol_4) {
   arrayLength_cfca0a(tint_symbol_4);
   return float4();
diff --git a/test/builtins/gen/arrayLength/eb510f.wgsl.expected.msl b/test/builtins/gen/arrayLength/eb510f.wgsl.expected.msl
index 3570449b3e..c66c4264e4 100644
--- a/test/builtins/gen/arrayLength/eb510f.wgsl.expected.msl
+++ b/test/builtins/gen/arrayLength/eb510f.wgsl.expected.msl
@@ -4,17 +4,19 @@ using namespace metal;
 struct tint_symbol_1 {
   /* 0x0000 */ uint4 buffer_size[1];
 };
+
 struct SB_RW {
   uint arg_0[1];
 };
-struct tint_symbol {
-  float4 value [[position]];
-};
 
 void arrayLength_eb510f(const constant tint_symbol_1* const tint_symbol_3) {
   uint res = (((*(tint_symbol_3)).buffer_size[0u][0u] - 0u) / 4u);
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner(const constant tint_symbol_1* const tint_symbol_4) {
   arrayLength_eb510f(tint_symbol_4);
   return float4();
diff --git a/test/builtins/gen/asin/064953.wgsl.expected.msl b/test/builtins/gen/asin/064953.wgsl.expected.msl
index da1729fb13..efee548e4c 100644
--- a/test/builtins/gen/asin/064953.wgsl.expected.msl
+++ b/test/builtins/gen/asin/064953.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void asin_064953() {
   float4 res = asin(float4());
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner() {
   asin_064953();
   return float4();
diff --git a/test/builtins/gen/asin/7b6a44.wgsl.expected.msl b/test/builtins/gen/asin/7b6a44.wgsl.expected.msl
index dae258d00f..35238bb088 100644
--- a/test/builtins/gen/asin/7b6a44.wgsl.expected.msl
+++ b/test/builtins/gen/asin/7b6a44.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void asin_7b6a44() {
   float2 res = asin(float2());
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner() {
   asin_7b6a44();
   return float4();
diff --git a/test/builtins/gen/asin/8cd9c9.wgsl.expected.msl b/test/builtins/gen/asin/8cd9c9.wgsl.expected.msl
index 5541c543bd..bd995202c8 100644
--- a/test/builtins/gen/asin/8cd9c9.wgsl.expected.msl
+++ b/test/builtins/gen/asin/8cd9c9.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void asin_8cd9c9() {
   float3 res = asin(float3());
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner() {
   asin_8cd9c9();
   return float4();
diff --git a/test/builtins/gen/asin/c0c272.wgsl.expected.msl b/test/builtins/gen/asin/c0c272.wgsl.expected.msl
index 41db384e23..4ada72f62a 100644
--- a/test/builtins/gen/asin/c0c272.wgsl.expected.msl
+++ b/test/builtins/gen/asin/c0c272.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void asin_c0c272() {
   float res = asin(1.0f);
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner() {
   asin_c0c272();
   return float4();
diff --git a/test/builtins/gen/atan/02979a.wgsl.expected.msl b/test/builtins/gen/atan/02979a.wgsl.expected.msl
index 35ebc9f843..bfe58be704 100644
--- a/test/builtins/gen/atan/02979a.wgsl.expected.msl
+++ b/test/builtins/gen/atan/02979a.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void atan_02979a() {
   float res = atan(1.0f);
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner() {
   atan_02979a();
   return float4();
diff --git a/test/builtins/gen/atan/331e6d.wgsl.expected.msl b/test/builtins/gen/atan/331e6d.wgsl.expected.msl
index 8bedb23cef..3c7f449c9f 100644
--- a/test/builtins/gen/atan/331e6d.wgsl.expected.msl
+++ b/test/builtins/gen/atan/331e6d.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void atan_331e6d() {
   float3 res = atan(float3());
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner() {
   atan_331e6d();
   return float4();
diff --git a/test/builtins/gen/atan/a8b696.wgsl.expected.msl b/test/builtins/gen/atan/a8b696.wgsl.expected.msl
index 141ad98193..a82a8f92e9 100644
--- a/test/builtins/gen/atan/a8b696.wgsl.expected.msl
+++ b/test/builtins/gen/atan/a8b696.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void atan_a8b696() {
   float4 res = atan(float4());
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner() {
   atan_a8b696();
   return float4();
diff --git a/test/builtins/gen/atan/ad96e4.wgsl.expected.msl b/test/builtins/gen/atan/ad96e4.wgsl.expected.msl
index 2f9c4bfeb4..f5a21518b5 100644
--- a/test/builtins/gen/atan/ad96e4.wgsl.expected.msl
+++ b/test/builtins/gen/atan/ad96e4.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void atan_ad96e4() {
   float2 res = atan(float2());
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner() {
   atan_ad96e4();
   return float4();
diff --git a/test/builtins/gen/atan2/57fb13.wgsl.expected.msl b/test/builtins/gen/atan2/57fb13.wgsl.expected.msl
index 828d5201a9..f05e3c56b6 100644
--- a/test/builtins/gen/atan2/57fb13.wgsl.expected.msl
+++ b/test/builtins/gen/atan2/57fb13.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void atan2_57fb13() {
   float2 res = atan2(float2(), float2());
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner() {
   atan2_57fb13();
   return float4();
diff --git a/test/builtins/gen/atan2/96057c.wgsl.expected.msl b/test/builtins/gen/atan2/96057c.wgsl.expected.msl
index 8157ae8556..659a6225e1 100644
--- a/test/builtins/gen/atan2/96057c.wgsl.expected.msl
+++ b/test/builtins/gen/atan2/96057c.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void atan2_96057c() {
   float res = atan2(1.0f, 1.0f);
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner() {
   atan2_96057c();
   return float4();
diff --git a/test/builtins/gen/atan2/a70d0d.wgsl.expected.msl b/test/builtins/gen/atan2/a70d0d.wgsl.expected.msl
index 2e20b03cbd..3281d2997f 100644
--- a/test/builtins/gen/atan2/a70d0d.wgsl.expected.msl
+++ b/test/builtins/gen/atan2/a70d0d.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void atan2_a70d0d() {
   float3 res = atan2(float3(), float3());
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner() {
   atan2_a70d0d();
   return float4();
diff --git a/test/builtins/gen/atan2/ae713e.wgsl.expected.msl b/test/builtins/gen/atan2/ae713e.wgsl.expected.msl
index 05e4eae737..58e28ab259 100644
--- a/test/builtins/gen/atan2/ae713e.wgsl.expected.msl
+++ b/test/builtins/gen/atan2/ae713e.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void atan2_ae713e() {
   float4 res = atan2(float4(), float4());
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner() {
   atan2_ae713e();
   return float4();
diff --git a/test/builtins/gen/ceil/34064b.wgsl.expected.msl b/test/builtins/gen/ceil/34064b.wgsl.expected.msl
index b523ac6196..a8886eb293 100644
--- a/test/builtins/gen/ceil/34064b.wgsl.expected.msl
+++ b/test/builtins/gen/ceil/34064b.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void ceil_34064b() {
   float3 res = ceil(float3());
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner() {
   ceil_34064b();
   return float4();
diff --git a/test/builtins/gen/ceil/678655.wgsl.expected.msl b/test/builtins/gen/ceil/678655.wgsl.expected.msl
index 12da11cbb5..6a52e99a31 100644
--- a/test/builtins/gen/ceil/678655.wgsl.expected.msl
+++ b/test/builtins/gen/ceil/678655.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void ceil_678655() {
   float res = ceil(1.0f);
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner() {
   ceil_678655();
   return float4();
diff --git a/test/builtins/gen/ceil/96f597.wgsl.expected.msl b/test/builtins/gen/ceil/96f597.wgsl.expected.msl
index 3e28a93410..ec019842f8 100644
--- a/test/builtins/gen/ceil/96f597.wgsl.expected.msl
+++ b/test/builtins/gen/ceil/96f597.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void ceil_96f597() {
   float2 res = ceil(float2());
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner() {
   ceil_96f597();
   return float4();
diff --git a/test/builtins/gen/ceil/b74c16.wgsl.expected.msl b/test/builtins/gen/ceil/b74c16.wgsl.expected.msl
index edcbb411b5..8aefc080f3 100644
--- a/test/builtins/gen/ceil/b74c16.wgsl.expected.msl
+++ b/test/builtins/gen/ceil/b74c16.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void ceil_b74c16() {
   float4 res = ceil(float4());
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner() {
   ceil_b74c16();
   return float4();
diff --git a/test/builtins/gen/clamp/0acf8f.wgsl.expected.msl b/test/builtins/gen/clamp/0acf8f.wgsl.expected.msl
index a0f7e2adb0..916d8fdce9 100644
--- a/test/builtins/gen/clamp/0acf8f.wgsl.expected.msl
+++ b/test/builtins/gen/clamp/0acf8f.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void clamp_0acf8f() {
   float2 res = clamp(float2(), float2(), float2());
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner() {
   clamp_0acf8f();
   return float4();
diff --git a/test/builtins/gen/clamp/1a32e3.wgsl.expected.msl b/test/builtins/gen/clamp/1a32e3.wgsl.expected.msl
index d1bc9c0b32..44f759a007 100644
--- a/test/builtins/gen/clamp/1a32e3.wgsl.expected.msl
+++ b/test/builtins/gen/clamp/1a32e3.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void clamp_1a32e3() {
   int4 res = clamp(int4(), int4(), int4());
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner() {
   clamp_1a32e3();
   return float4();
diff --git a/test/builtins/gen/clamp/2bd567.wgsl.expected.msl b/test/builtins/gen/clamp/2bd567.wgsl.expected.msl
index fff5d22997..dfcc293e4b 100644
--- a/test/builtins/gen/clamp/2bd567.wgsl.expected.msl
+++ b/test/builtins/gen/clamp/2bd567.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void clamp_2bd567() {
   float res = clamp(1.0f, 1.0f, 1.0f);
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner() {
   clamp_2bd567();
   return float4();
diff --git a/test/builtins/gen/clamp/2bde41.wgsl.expected.msl b/test/builtins/gen/clamp/2bde41.wgsl.expected.msl
index a020143d20..dac7c95dc9 100644
--- a/test/builtins/gen/clamp/2bde41.wgsl.expected.msl
+++ b/test/builtins/gen/clamp/2bde41.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void clamp_2bde41() {
   float4 res = clamp(float4(), float4(), float4());
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner() {
   clamp_2bde41();
   return float4();
diff --git a/test/builtins/gen/clamp/548fc7.wgsl.expected.msl b/test/builtins/gen/clamp/548fc7.wgsl.expected.msl
index eb8e97add4..0ca98d3866 100644
--- a/test/builtins/gen/clamp/548fc7.wgsl.expected.msl
+++ b/test/builtins/gen/clamp/548fc7.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void clamp_548fc7() {
   uint3 res = clamp(uint3(), uint3(), uint3());
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner() {
   clamp_548fc7();
   return float4();
diff --git a/test/builtins/gen/clamp/5f0819.wgsl.expected.msl b/test/builtins/gen/clamp/5f0819.wgsl.expected.msl
index 32d3883f8e..b2da28a4fb 100644
--- a/test/builtins/gen/clamp/5f0819.wgsl.expected.msl
+++ b/test/builtins/gen/clamp/5f0819.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void clamp_5f0819() {
   int3 res = clamp(int3(), int3(), int3());
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner() {
   clamp_5f0819();
   return float4();
diff --git a/test/builtins/gen/clamp/6c1749.wgsl.expected.msl b/test/builtins/gen/clamp/6c1749.wgsl.expected.msl
index 79d1efd1a6..39c36afb36 100644
--- a/test/builtins/gen/clamp/6c1749.wgsl.expected.msl
+++ b/test/builtins/gen/clamp/6c1749.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void clamp_6c1749() {
   int2 res = clamp(int2(), int2(), int2());
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner() {
   clamp_6c1749();
   return float4();
diff --git a/test/builtins/gen/clamp/7706d7.wgsl.expected.msl b/test/builtins/gen/clamp/7706d7.wgsl.expected.msl
index 9b132062d2..840b4ad5c0 100644
--- a/test/builtins/gen/clamp/7706d7.wgsl.expected.msl
+++ b/test/builtins/gen/clamp/7706d7.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void clamp_7706d7() {
   uint2 res = clamp(uint2(), uint2(), uint2());
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner() {
   clamp_7706d7();
   return float4();
diff --git a/test/builtins/gen/clamp/867397.wgsl.expected.msl b/test/builtins/gen/clamp/867397.wgsl.expected.msl
index fc1a990e3a..66e86469da 100644
--- a/test/builtins/gen/clamp/867397.wgsl.expected.msl
+++ b/test/builtins/gen/clamp/867397.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void clamp_867397() {
   float3 res = clamp(float3(), float3(), float3());
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner() {
   clamp_867397();
   return float4();
diff --git a/test/builtins/gen/clamp/a2de25.wgsl.expected.msl b/test/builtins/gen/clamp/a2de25.wgsl.expected.msl
index faf58bf638..8e4fdfb3d9 100644
--- a/test/builtins/gen/clamp/a2de25.wgsl.expected.msl
+++ b/test/builtins/gen/clamp/a2de25.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void clamp_a2de25() {
   uint res = clamp(1u, 1u, 1u);
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner() {
   clamp_a2de25();
   return float4();
diff --git a/test/builtins/gen/clamp/b07c65.wgsl.expected.msl b/test/builtins/gen/clamp/b07c65.wgsl.expected.msl
index c8634036fd..cfe6f26816 100644
--- a/test/builtins/gen/clamp/b07c65.wgsl.expected.msl
+++ b/test/builtins/gen/clamp/b07c65.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void clamp_b07c65() {
   int res = clamp(1, 1, 1);
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner() {
   clamp_b07c65();
   return float4();
diff --git a/test/builtins/gen/clamp/bd43ce.wgsl.expected.msl b/test/builtins/gen/clamp/bd43ce.wgsl.expected.msl
index 73773c7881..45be006ead 100644
--- a/test/builtins/gen/clamp/bd43ce.wgsl.expected.msl
+++ b/test/builtins/gen/clamp/bd43ce.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void clamp_bd43ce() {
   uint4 res = clamp(uint4(), uint4(), uint4());
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner() {
   clamp_bd43ce();
   return float4();
diff --git a/test/builtins/gen/cos/16dc15.wgsl.expected.msl b/test/builtins/gen/cos/16dc15.wgsl.expected.msl
index e78ce75ce0..757514ed81 100644
--- a/test/builtins/gen/cos/16dc15.wgsl.expected.msl
+++ b/test/builtins/gen/cos/16dc15.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void cos_16dc15() {
   float3 res = cos(float3());
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner() {
   cos_16dc15();
   return float4();
diff --git a/test/builtins/gen/cos/29d66d.wgsl.expected.msl b/test/builtins/gen/cos/29d66d.wgsl.expected.msl
index c760b40925..c77bb9ee8b 100644
--- a/test/builtins/gen/cos/29d66d.wgsl.expected.msl
+++ b/test/builtins/gen/cos/29d66d.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void cos_29d66d() {
   float4 res = cos(float4());
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner() {
   cos_29d66d();
   return float4();
diff --git a/test/builtins/gen/cos/c3b486.wgsl.expected.msl b/test/builtins/gen/cos/c3b486.wgsl.expected.msl
index 9b68bf517f..9118d2961c 100644
--- a/test/builtins/gen/cos/c3b486.wgsl.expected.msl
+++ b/test/builtins/gen/cos/c3b486.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void cos_c3b486() {
   float2 res = cos(float2());
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner() {
   cos_c3b486();
   return float4();
diff --git a/test/builtins/gen/cos/c5c28e.wgsl.expected.msl b/test/builtins/gen/cos/c5c28e.wgsl.expected.msl
index 85e85dff03..fb0fdd7a26 100644
--- a/test/builtins/gen/cos/c5c28e.wgsl.expected.msl
+++ b/test/builtins/gen/cos/c5c28e.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void cos_c5c28e() {
   float res = cos(1.0f);
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner() {
   cos_c5c28e();
   return float4();
diff --git a/test/builtins/gen/cosh/377652.wgsl.expected.msl b/test/builtins/gen/cosh/377652.wgsl.expected.msl
index cd51d354b6..0edfd485f3 100644
--- a/test/builtins/gen/cosh/377652.wgsl.expected.msl
+++ b/test/builtins/gen/cosh/377652.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void cosh_377652() {
   float3 res = cosh(float3());
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner() {
   cosh_377652();
   return float4();
diff --git a/test/builtins/gen/cosh/c13756.wgsl.expected.msl b/test/builtins/gen/cosh/c13756.wgsl.expected.msl
index f4cb6c9311..84f27d0074 100644
--- a/test/builtins/gen/cosh/c13756.wgsl.expected.msl
+++ b/test/builtins/gen/cosh/c13756.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void cosh_c13756() {
   float2 res = cosh(float2());
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner() {
   cosh_c13756();
   return float4();
diff --git a/test/builtins/gen/cosh/da92dd.wgsl.expected.msl b/test/builtins/gen/cosh/da92dd.wgsl.expected.msl
index a59cebb914..21bc8291d5 100644
--- a/test/builtins/gen/cosh/da92dd.wgsl.expected.msl
+++ b/test/builtins/gen/cosh/da92dd.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void cosh_da92dd() {
   float res = cosh(1.0f);
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner() {
   cosh_da92dd();
   return float4();
diff --git a/test/builtins/gen/cosh/e0c1de.wgsl.expected.msl b/test/builtins/gen/cosh/e0c1de.wgsl.expected.msl
index d46471552b..1bf2ee4ced 100644
--- a/test/builtins/gen/cosh/e0c1de.wgsl.expected.msl
+++ b/test/builtins/gen/cosh/e0c1de.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void cosh_e0c1de() {
   float4 res = cosh(float4());
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner() {
   cosh_e0c1de();
   return float4();
diff --git a/test/builtins/gen/countOneBits/0d0e46.wgsl.expected.msl b/test/builtins/gen/countOneBits/0d0e46.wgsl.expected.msl
index d4a4bbe98b..448eec5cdb 100644
--- a/test/builtins/gen/countOneBits/0d0e46.wgsl.expected.msl
+++ b/test/builtins/gen/countOneBits/0d0e46.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void countOneBits_0d0e46() {
   uint4 res = popcount(uint4());
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner() {
   countOneBits_0d0e46();
   return float4();
diff --git a/test/builtins/gen/countOneBits/0f7980.wgsl.expected.msl b/test/builtins/gen/countOneBits/0f7980.wgsl.expected.msl
index baa7886ddc..196fe6abe1 100644
--- a/test/builtins/gen/countOneBits/0f7980.wgsl.expected.msl
+++ b/test/builtins/gen/countOneBits/0f7980.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void countOneBits_0f7980() {
   int4 res = popcount(int4());
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner() {
   countOneBits_0f7980();
   return float4();
diff --git a/test/builtins/gen/countOneBits/65d2ae.wgsl.expected.msl b/test/builtins/gen/countOneBits/65d2ae.wgsl.expected.msl
index b8fec94ce2..a8ac3e8686 100644
--- a/test/builtins/gen/countOneBits/65d2ae.wgsl.expected.msl
+++ b/test/builtins/gen/countOneBits/65d2ae.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void countOneBits_65d2ae() {
   int3 res = popcount(int3());
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner() {
   countOneBits_65d2ae();
   return float4();
diff --git a/test/builtins/gen/countOneBits/690cfc.wgsl.expected.msl b/test/builtins/gen/countOneBits/690cfc.wgsl.expected.msl
index abc54b77f9..00274407f3 100644
--- a/test/builtins/gen/countOneBits/690cfc.wgsl.expected.msl
+++ b/test/builtins/gen/countOneBits/690cfc.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void countOneBits_690cfc() {
   uint3 res = popcount(uint3());
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner() {
   countOneBits_690cfc();
   return float4();
diff --git a/test/builtins/gen/countOneBits/94fd81.wgsl.expected.msl b/test/builtins/gen/countOneBits/94fd81.wgsl.expected.msl
index 3659c4ae17..e1f624821c 100644
--- a/test/builtins/gen/countOneBits/94fd81.wgsl.expected.msl
+++ b/test/builtins/gen/countOneBits/94fd81.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void countOneBits_94fd81() {
   uint2 res = popcount(uint2());
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner() {
   countOneBits_94fd81();
   return float4();
diff --git a/test/builtins/gen/countOneBits/ae44f9.wgsl.expected.msl b/test/builtins/gen/countOneBits/ae44f9.wgsl.expected.msl
index 3ad8bd0c3f..5a33d66585 100644
--- a/test/builtins/gen/countOneBits/ae44f9.wgsl.expected.msl
+++ b/test/builtins/gen/countOneBits/ae44f9.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void countOneBits_ae44f9() {
   uint res = popcount(1u);
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner() {
   countOneBits_ae44f9();
   return float4();
diff --git a/test/builtins/gen/countOneBits/af90e2.wgsl.expected.msl b/test/builtins/gen/countOneBits/af90e2.wgsl.expected.msl
index 2d033090e7..f68cf94c5a 100644
--- a/test/builtins/gen/countOneBits/af90e2.wgsl.expected.msl
+++ b/test/builtins/gen/countOneBits/af90e2.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void countOneBits_af90e2() {
   int2 res = popcount(int2());
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner() {
   countOneBits_af90e2();
   return float4();
diff --git a/test/builtins/gen/countOneBits/fd88b2.wgsl.expected.msl b/test/builtins/gen/countOneBits/fd88b2.wgsl.expected.msl
index 765afb78fa..998da7ae27 100644
--- a/test/builtins/gen/countOneBits/fd88b2.wgsl.expected.msl
+++ b/test/builtins/gen/countOneBits/fd88b2.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void countOneBits_fd88b2() {
   int res = popcount(1);
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner() {
   countOneBits_fd88b2();
   return float4();
diff --git a/test/builtins/gen/cross/041cb0.wgsl.expected.msl b/test/builtins/gen/cross/041cb0.wgsl.expected.msl
index 67ab3df911..86e2546252 100644
--- a/test/builtins/gen/cross/041cb0.wgsl.expected.msl
+++ b/test/builtins/gen/cross/041cb0.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void cross_041cb0() {
   float3 res = cross(float3(), float3());
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner() {
   cross_041cb0();
   return float4();
diff --git a/test/builtins/gen/degrees/0d170c.wgsl.expected.msl b/test/builtins/gen/degrees/0d170c.wgsl.expected.msl
index 4ca1936335..2773179bd4 100644
--- a/test/builtins/gen/degrees/0d170c.wgsl.expected.msl
+++ b/test/builtins/gen/degrees/0d170c.wgsl.expected.msl
@@ -6,14 +6,14 @@ float4 tint_degrees(float4 param_0) {
   return param_0 * 57.295779513082322865;
 }
 
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void degrees_0d170c() {
   float4 res = tint_degrees(float4());
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner() {
   degrees_0d170c();
   return float4();
diff --git a/test/builtins/gen/degrees/1ad5df.wgsl.expected.msl b/test/builtins/gen/degrees/1ad5df.wgsl.expected.msl
index 6b7e1c659d..5305c0fb6f 100644
--- a/test/builtins/gen/degrees/1ad5df.wgsl.expected.msl
+++ b/test/builtins/gen/degrees/1ad5df.wgsl.expected.msl
@@ -6,14 +6,14 @@ float2 tint_degrees(float2 param_0) {
   return param_0 * 57.295779513082322865;
 }
 
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void degrees_1ad5df() {
   float2 res = tint_degrees(float2());
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner() {
   degrees_1ad5df();
   return float4();
diff --git a/test/builtins/gen/degrees/2af623.wgsl.expected.msl b/test/builtins/gen/degrees/2af623.wgsl.expected.msl
index b7eafd96d2..46d0565e39 100644
--- a/test/builtins/gen/degrees/2af623.wgsl.expected.msl
+++ b/test/builtins/gen/degrees/2af623.wgsl.expected.msl
@@ -6,14 +6,14 @@ float3 tint_degrees(float3 param_0) {
   return param_0 * 57.295779513082322865;
 }
 
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void degrees_2af623() {
   float3 res = tint_degrees(float3());
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner() {
   degrees_2af623();
   return float4();
diff --git a/test/builtins/gen/degrees/51f705.wgsl.expected.msl b/test/builtins/gen/degrees/51f705.wgsl.expected.msl
index 42fdae825b..2b6395dd67 100644
--- a/test/builtins/gen/degrees/51f705.wgsl.expected.msl
+++ b/test/builtins/gen/degrees/51f705.wgsl.expected.msl
@@ -6,14 +6,14 @@ float tint_degrees(float param_0) {
   return param_0 * 57.295779513082322865;
 }
 
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void degrees_51f705() {
   float res = tint_degrees(1.0f);
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner() {
   degrees_51f705();
   return float4();
diff --git a/test/builtins/gen/determinant/2b62ba.wgsl.expected.msl b/test/builtins/gen/determinant/2b62ba.wgsl.expected.msl
index 291d9164b2..6953c6b38d 100644
--- a/test/builtins/gen/determinant/2b62ba.wgsl.expected.msl
+++ b/test/builtins/gen/determinant/2b62ba.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void determinant_2b62ba() {
   float res = determinant(float3x3());
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner() {
   determinant_2b62ba();
   return float4();
diff --git a/test/builtins/gen/determinant/a0a87c.wgsl.expected.msl b/test/builtins/gen/determinant/a0a87c.wgsl.expected.msl
index e3ef160e94..44820746f6 100644
--- a/test/builtins/gen/determinant/a0a87c.wgsl.expected.msl
+++ b/test/builtins/gen/determinant/a0a87c.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void determinant_a0a87c() {
   float res = determinant(float4x4());
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner() {
   determinant_a0a87c();
   return float4();
diff --git a/test/builtins/gen/determinant/e19305.wgsl.expected.msl b/test/builtins/gen/determinant/e19305.wgsl.expected.msl
index 48c7ad011b..ce236ae97e 100644
--- a/test/builtins/gen/determinant/e19305.wgsl.expected.msl
+++ b/test/builtins/gen/determinant/e19305.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void determinant_e19305() {
   float res = determinant(float2x2());
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner() {
   determinant_e19305();
   return float4();
diff --git a/test/builtins/gen/distance/0657d4.wgsl.expected.msl b/test/builtins/gen/distance/0657d4.wgsl.expected.msl
index 1880b735ca..834ac1342f 100644
--- a/test/builtins/gen/distance/0657d4.wgsl.expected.msl
+++ b/test/builtins/gen/distance/0657d4.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void distance_0657d4() {
   float res = distance(float3(), float3());
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner() {
   distance_0657d4();
   return float4();
diff --git a/test/builtins/gen/distance/9646ea.wgsl.expected.msl b/test/builtins/gen/distance/9646ea.wgsl.expected.msl
index 649f037843..687568459b 100644
--- a/test/builtins/gen/distance/9646ea.wgsl.expected.msl
+++ b/test/builtins/gen/distance/9646ea.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void distance_9646ea() {
   float res = distance(float4(), float4());
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner() {
   distance_9646ea();
   return float4();
diff --git a/test/builtins/gen/distance/aa4055.wgsl.expected.msl b/test/builtins/gen/distance/aa4055.wgsl.expected.msl
index 6a449ac20f..b2d798b7b4 100644
--- a/test/builtins/gen/distance/aa4055.wgsl.expected.msl
+++ b/test/builtins/gen/distance/aa4055.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void distance_aa4055() {
   float res = distance(float2(), float2());
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner() {
   distance_aa4055();
   return float4();
diff --git a/test/builtins/gen/distance/cfed73.wgsl.expected.msl b/test/builtins/gen/distance/cfed73.wgsl.expected.msl
index 26491703d6..698ebb1b70 100644
--- a/test/builtins/gen/distance/cfed73.wgsl.expected.msl
+++ b/test/builtins/gen/distance/cfed73.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void distance_cfed73() {
   float res = fabs(1.0f - 1.0f);
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner() {
   distance_cfed73();
   return float4();
diff --git a/test/builtins/gen/dot/0c577b.wgsl.expected.msl b/test/builtins/gen/dot/0c577b.wgsl.expected.msl
index e1f5adb382..19de798eca 100644
--- a/test/builtins/gen/dot/0c577b.wgsl.expected.msl
+++ b/test/builtins/gen/dot/0c577b.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void dot_0c577b() {
   float res = dot(float4(), float4());
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner() {
   dot_0c577b();
   return float4();
diff --git a/test/builtins/gen/dot/7548a0.wgsl.expected.msl b/test/builtins/gen/dot/7548a0.wgsl.expected.msl
index fb3daab456..d0d876dcf8 100644
--- a/test/builtins/gen/dot/7548a0.wgsl.expected.msl
+++ b/test/builtins/gen/dot/7548a0.wgsl.expected.msl
@@ -6,14 +6,14 @@ template<typename T>
 T tint_dot3(vec<T,3> a, vec<T,3> b) {
   return a[0]*b[0] + a[1]*b[1] + a[2]*b[2];
 }
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void dot_7548a0() {
   uint res = tint_dot3(uint3(), uint3());
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner() {
   dot_7548a0();
   return float4();
diff --git a/test/builtins/gen/dot/883f0e.wgsl.expected.msl b/test/builtins/gen/dot/883f0e.wgsl.expected.msl
index 1dfda906f7..00dbb28578 100644
--- a/test/builtins/gen/dot/883f0e.wgsl.expected.msl
+++ b/test/builtins/gen/dot/883f0e.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void dot_883f0e() {
   float res = dot(float2(), float2());
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner() {
   dot_883f0e();
   return float4();
diff --git a/test/builtins/gen/dot/97c7ee.wgsl.expected.msl b/test/builtins/gen/dot/97c7ee.wgsl.expected.msl
index d288445557..ed799a17bf 100644
--- a/test/builtins/gen/dot/97c7ee.wgsl.expected.msl
+++ b/test/builtins/gen/dot/97c7ee.wgsl.expected.msl
@@ -6,14 +6,14 @@ template<typename T>
 T tint_dot2(vec<T,2> a, vec<T,2> b) {
   return a[0]*b[0] + a[1]*b[1];
 }
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void dot_97c7ee() {
   uint res = tint_dot2(uint2(), uint2());
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner() {
   dot_97c7ee();
   return float4();
diff --git a/test/builtins/gen/dot/ba4246.wgsl.expected.msl b/test/builtins/gen/dot/ba4246.wgsl.expected.msl
index 517643ec47..9124e9475a 100644
--- a/test/builtins/gen/dot/ba4246.wgsl.expected.msl
+++ b/test/builtins/gen/dot/ba4246.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void dot_ba4246() {
   float res = dot(float3(), float3());
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner() {
   dot_ba4246();
   return float4();
diff --git a/test/builtins/gen/dot/e994c7.wgsl.expected.msl b/test/builtins/gen/dot/e994c7.wgsl.expected.msl
index 70fa0e3846..e2d1a32ffb 100644
--- a/test/builtins/gen/dot/e994c7.wgsl.expected.msl
+++ b/test/builtins/gen/dot/e994c7.wgsl.expected.msl
@@ -6,14 +6,14 @@ template<typename T>
 T tint_dot4(vec<T,4> a, vec<T,4> b) {
   return a[0]*b[0] + a[1]*b[1] + a[2]*b[2] + a[3]*b[3];
 }
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void dot_e994c7() {
   uint res = tint_dot4(uint4(), uint4());
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner() {
   dot_e994c7();
   return float4();
diff --git a/test/builtins/gen/dot/ef6b1d.wgsl.expected.msl b/test/builtins/gen/dot/ef6b1d.wgsl.expected.msl
index f7a85b8a6a..47600314d4 100644
--- a/test/builtins/gen/dot/ef6b1d.wgsl.expected.msl
+++ b/test/builtins/gen/dot/ef6b1d.wgsl.expected.msl
@@ -6,14 +6,14 @@ template<typename T>
 T tint_dot4(vec<T,4> a, vec<T,4> b) {
   return a[0]*b[0] + a[1]*b[1] + a[2]*b[2] + a[3]*b[3];
 }
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void dot_ef6b1d() {
   int res = tint_dot4(int4(), int4());
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner() {
   dot_ef6b1d();
   return float4();
diff --git a/test/builtins/gen/dot/f1312c.wgsl.expected.msl b/test/builtins/gen/dot/f1312c.wgsl.expected.msl
index aab9ef1bf4..ecf8b2d83e 100644
--- a/test/builtins/gen/dot/f1312c.wgsl.expected.msl
+++ b/test/builtins/gen/dot/f1312c.wgsl.expected.msl
@@ -6,14 +6,14 @@ template<typename T>
 T tint_dot3(vec<T,3> a, vec<T,3> b) {
   return a[0]*b[0] + a[1]*b[1] + a[2]*b[2];
 }
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void dot_f1312c() {
   int res = tint_dot3(int3(), int3());
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner() {
   dot_f1312c();
   return float4();
diff --git a/test/builtins/gen/dot/fc5f7c.wgsl.expected.msl b/test/builtins/gen/dot/fc5f7c.wgsl.expected.msl
index 138e8223d6..199ff06af1 100644
--- a/test/builtins/gen/dot/fc5f7c.wgsl.expected.msl
+++ b/test/builtins/gen/dot/fc5f7c.wgsl.expected.msl
@@ -6,14 +6,14 @@ template<typename T>
 T tint_dot2(vec<T,2> a, vec<T,2> b) {
   return a[0]*b[0] + a[1]*b[1];
 }
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void dot_fc5f7c() {
   int res = tint_dot2(int2(), int2());
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner() {
   dot_fc5f7c();
   return float4();
diff --git a/test/builtins/gen/exp/0f70eb.wgsl.expected.msl b/test/builtins/gen/exp/0f70eb.wgsl.expected.msl
index 83ba5fa484..e9b3fdfd40 100644
--- a/test/builtins/gen/exp/0f70eb.wgsl.expected.msl
+++ b/test/builtins/gen/exp/0f70eb.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void exp_0f70eb() {
   float4 res = exp(float4());
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner() {
   exp_0f70eb();
   return float4();
diff --git a/test/builtins/gen/exp/1951e7.wgsl.expected.msl b/test/builtins/gen/exp/1951e7.wgsl.expected.msl
index 0f03e9f2f8..b350d6861b 100644
--- a/test/builtins/gen/exp/1951e7.wgsl.expected.msl
+++ b/test/builtins/gen/exp/1951e7.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void exp_1951e7() {
   float2 res = exp(float2());
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner() {
   exp_1951e7();
   return float4();
diff --git a/test/builtins/gen/exp/771fd2.wgsl.expected.msl b/test/builtins/gen/exp/771fd2.wgsl.expected.msl
index 8464078de3..86d93082ce 100644
--- a/test/builtins/gen/exp/771fd2.wgsl.expected.msl
+++ b/test/builtins/gen/exp/771fd2.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void exp_771fd2() {
   float res = exp(1.0f);
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner() {
   exp_771fd2();
   return float4();
diff --git a/test/builtins/gen/exp/d98450.wgsl.expected.msl b/test/builtins/gen/exp/d98450.wgsl.expected.msl
index 32c830b35e..7af25631f0 100644
--- a/test/builtins/gen/exp/d98450.wgsl.expected.msl
+++ b/test/builtins/gen/exp/d98450.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void exp_d98450() {
   float3 res = exp(float3());
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner() {
   exp_d98450();
   return float4();
diff --git a/test/builtins/gen/exp2/1f8680.wgsl.expected.msl b/test/builtins/gen/exp2/1f8680.wgsl.expected.msl
index cde78da606..4d07e6ba53 100644
--- a/test/builtins/gen/exp2/1f8680.wgsl.expected.msl
+++ b/test/builtins/gen/exp2/1f8680.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void exp2_1f8680() {
   float3 res = exp2(float3());
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner() {
   exp2_1f8680();
   return float4();
diff --git a/test/builtins/gen/exp2/a9d0a7.wgsl.expected.msl b/test/builtins/gen/exp2/a9d0a7.wgsl.expected.msl
index 6202c97a5b..98447ae6d7 100644
--- a/test/builtins/gen/exp2/a9d0a7.wgsl.expected.msl
+++ b/test/builtins/gen/exp2/a9d0a7.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void exp2_a9d0a7() {
   float4 res = exp2(float4());
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner() {
   exp2_a9d0a7();
   return float4();
diff --git a/test/builtins/gen/exp2/d6777c.wgsl.expected.msl b/test/builtins/gen/exp2/d6777c.wgsl.expected.msl
index 62f0d939b0..a94325e47d 100644
--- a/test/builtins/gen/exp2/d6777c.wgsl.expected.msl
+++ b/test/builtins/gen/exp2/d6777c.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void exp2_d6777c() {
   float2 res = exp2(float2());
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner() {
   exp2_d6777c();
   return float4();
diff --git a/test/builtins/gen/exp2/dea523.wgsl.expected.msl b/test/builtins/gen/exp2/dea523.wgsl.expected.msl
index cb5f8b79be..d331243ec2 100644
--- a/test/builtins/gen/exp2/dea523.wgsl.expected.msl
+++ b/test/builtins/gen/exp2/dea523.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void exp2_dea523() {
   float res = exp2(1.0f);
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner() {
   exp2_dea523();
   return float4();
diff --git a/test/builtins/gen/faceForward/5afbd5.wgsl.expected.msl b/test/builtins/gen/faceForward/5afbd5.wgsl.expected.msl
index 00496ffde5..c539bc7a6b 100644
--- a/test/builtins/gen/faceForward/5afbd5.wgsl.expected.msl
+++ b/test/builtins/gen/faceForward/5afbd5.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void faceForward_5afbd5() {
   float3 res = faceforward(float3(), float3(), float3());
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner() {
   faceForward_5afbd5();
   return float4();
diff --git a/test/builtins/gen/faceForward/b316e5.wgsl.expected.msl b/test/builtins/gen/faceForward/b316e5.wgsl.expected.msl
index fc6ee22622..2e32470d7a 100644
--- a/test/builtins/gen/faceForward/b316e5.wgsl.expected.msl
+++ b/test/builtins/gen/faceForward/b316e5.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void faceForward_b316e5() {
   float4 res = faceforward(float4(), float4(), float4());
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner() {
   faceForward_b316e5();
   return float4();
diff --git a/test/builtins/gen/faceForward/e6908b.wgsl.expected.msl b/test/builtins/gen/faceForward/e6908b.wgsl.expected.msl
index d5a67820e1..a335ef7df9 100644
--- a/test/builtins/gen/faceForward/e6908b.wgsl.expected.msl
+++ b/test/builtins/gen/faceForward/e6908b.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void faceForward_e6908b() {
   float2 res = faceforward(float2(), float2(), float2());
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner() {
   faceForward_e6908b();
   return float4();
diff --git a/test/builtins/gen/floor/3bccc4.wgsl.expected.msl b/test/builtins/gen/floor/3bccc4.wgsl.expected.msl
index e75d603741..74bffe2f0a 100644
--- a/test/builtins/gen/floor/3bccc4.wgsl.expected.msl
+++ b/test/builtins/gen/floor/3bccc4.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void floor_3bccc4() {
   float4 res = floor(float4());
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner() {
   floor_3bccc4();
   return float4();
diff --git a/test/builtins/gen/floor/5fc9ac.wgsl.expected.msl b/test/builtins/gen/floor/5fc9ac.wgsl.expected.msl
index 8cdbf02388..6f7234b28a 100644
--- a/test/builtins/gen/floor/5fc9ac.wgsl.expected.msl
+++ b/test/builtins/gen/floor/5fc9ac.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void floor_5fc9ac() {
   float2 res = floor(float2());
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner() {
   floor_5fc9ac();
   return float4();
diff --git a/test/builtins/gen/floor/60d7ea.wgsl.expected.msl b/test/builtins/gen/floor/60d7ea.wgsl.expected.msl
index c03feae395..fbca5d9f19 100644
--- a/test/builtins/gen/floor/60d7ea.wgsl.expected.msl
+++ b/test/builtins/gen/floor/60d7ea.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void floor_60d7ea() {
   float3 res = floor(float3());
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner() {
   floor_60d7ea();
   return float4();
diff --git a/test/builtins/gen/floor/66f154.wgsl.expected.msl b/test/builtins/gen/floor/66f154.wgsl.expected.msl
index 943538f73a..1988089e2c 100644
--- a/test/builtins/gen/floor/66f154.wgsl.expected.msl
+++ b/test/builtins/gen/floor/66f154.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void floor_66f154() {
   float res = floor(1.0f);
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner() {
   floor_66f154();
   return float4();
diff --git a/test/builtins/gen/fma/26a7a9.wgsl.expected.msl b/test/builtins/gen/fma/26a7a9.wgsl.expected.msl
index 6d9c885ff7..b87b6fe09b 100644
--- a/test/builtins/gen/fma/26a7a9.wgsl.expected.msl
+++ b/test/builtins/gen/fma/26a7a9.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void fma_26a7a9() {
   float2 res = fma(float2(), float2(), float2());
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner() {
   fma_26a7a9();
   return float4();
diff --git a/test/builtins/gen/fma/6a3283.wgsl.expected.msl b/test/builtins/gen/fma/6a3283.wgsl.expected.msl
index 070e615b27..a75b54f709 100644
--- a/test/builtins/gen/fma/6a3283.wgsl.expected.msl
+++ b/test/builtins/gen/fma/6a3283.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void fma_6a3283() {
   float4 res = fma(float4(), float4(), float4());
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner() {
   fma_6a3283();
   return float4();
diff --git a/test/builtins/gen/fma/c10ba3.wgsl.expected.msl b/test/builtins/gen/fma/c10ba3.wgsl.expected.msl
index 4a296c66ca..886ff735da 100644
--- a/test/builtins/gen/fma/c10ba3.wgsl.expected.msl
+++ b/test/builtins/gen/fma/c10ba3.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void fma_c10ba3() {
   float res = fma(1.0f, 1.0f, 1.0f);
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner() {
   fma_c10ba3();
   return float4();
diff --git a/test/builtins/gen/fma/e17c5c.wgsl.expected.msl b/test/builtins/gen/fma/e17c5c.wgsl.expected.msl
index 61d7cd46da..8c680e11c1 100644
--- a/test/builtins/gen/fma/e17c5c.wgsl.expected.msl
+++ b/test/builtins/gen/fma/e17c5c.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void fma_e17c5c() {
   float3 res = fma(float3(), float3(), float3());
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner() {
   fma_e17c5c();
   return float4();
diff --git a/test/builtins/gen/fract/8bc1e9.wgsl.expected.msl b/test/builtins/gen/fract/8bc1e9.wgsl.expected.msl
index c82b9ed021..0d01c219fa 100644
--- a/test/builtins/gen/fract/8bc1e9.wgsl.expected.msl
+++ b/test/builtins/gen/fract/8bc1e9.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void fract_8bc1e9() {
   float4 res = fract(float4());
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner() {
   fract_8bc1e9();
   return float4();
diff --git a/test/builtins/gen/fract/943cb1.wgsl.expected.msl b/test/builtins/gen/fract/943cb1.wgsl.expected.msl
index ec6e76ae61..f288f7905f 100644
--- a/test/builtins/gen/fract/943cb1.wgsl.expected.msl
+++ b/test/builtins/gen/fract/943cb1.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void fract_943cb1() {
   float2 res = fract(float2());
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner() {
   fract_943cb1();
   return float4();
diff --git a/test/builtins/gen/fract/a49758.wgsl.expected.msl b/test/builtins/gen/fract/a49758.wgsl.expected.msl
index a57d717241..0d14e6ad63 100644
--- a/test/builtins/gen/fract/a49758.wgsl.expected.msl
+++ b/test/builtins/gen/fract/a49758.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void fract_a49758() {
   float3 res = fract(float3());
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner() {
   fract_a49758();
   return float4();
diff --git a/test/builtins/gen/fract/fa5c71.wgsl.expected.msl b/test/builtins/gen/fract/fa5c71.wgsl.expected.msl
index 4997b0a1e5..0660148b39 100644
--- a/test/builtins/gen/fract/fa5c71.wgsl.expected.msl
+++ b/test/builtins/gen/fract/fa5c71.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void fract_fa5c71() {
   float res = fract(1.0f);
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner() {
   fract_fa5c71();
   return float4();
diff --git a/test/builtins/gen/frexp/368997.wgsl.expected.msl b/test/builtins/gen/frexp/368997.wgsl.expected.msl
index db9020820a..852c7f398a 100644
--- a/test/builtins/gen/frexp/368997.wgsl.expected.msl
+++ b/test/builtins/gen/frexp/368997.wgsl.expected.msl
@@ -12,14 +12,14 @@ frexp_result_vec3 tint_frexp(float3 param_0) {
   return {sig, exp};
 }
 
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void frexp_368997() {
   frexp_result_vec3 res = tint_frexp(float3());
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner() {
   frexp_368997();
   return float4();
diff --git a/test/builtins/gen/frexp/3c4f48.wgsl.expected.msl b/test/builtins/gen/frexp/3c4f48.wgsl.expected.msl
index 0879df593b..11314ca39f 100644
--- a/test/builtins/gen/frexp/3c4f48.wgsl.expected.msl
+++ b/test/builtins/gen/frexp/3c4f48.wgsl.expected.msl
@@ -12,14 +12,14 @@ frexp_result_vec4 tint_frexp(float4 param_0) {
   return {sig, exp};
 }
 
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void frexp_3c4f48() {
   frexp_result_vec4 res = tint_frexp(float4());
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner() {
   frexp_3c4f48();
   return float4();
diff --git a/test/builtins/gen/frexp/4bdfc7.wgsl.expected.msl b/test/builtins/gen/frexp/4bdfc7.wgsl.expected.msl
index bfdbe7fbce..f207cc6b6c 100644
--- a/test/builtins/gen/frexp/4bdfc7.wgsl.expected.msl
+++ b/test/builtins/gen/frexp/4bdfc7.wgsl.expected.msl
@@ -12,14 +12,14 @@ frexp_result_vec2 tint_frexp(float2 param_0) {
   return {sig, exp};
 }
 
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void frexp_4bdfc7() {
   frexp_result_vec2 res = tint_frexp(float2());
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner() {
   frexp_4bdfc7();
   return float4();
diff --git a/test/builtins/gen/frexp/eabd40.wgsl.expected.msl b/test/builtins/gen/frexp/eabd40.wgsl.expected.msl
index 96428fb718..2b5431ac21 100644
--- a/test/builtins/gen/frexp/eabd40.wgsl.expected.msl
+++ b/test/builtins/gen/frexp/eabd40.wgsl.expected.msl
@@ -12,14 +12,14 @@ frexp_result tint_frexp(float param_0) {
   return {sig, exp};
 }
 
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void frexp_eabd40() {
   frexp_result res = tint_frexp(1.0f);
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner() {
   frexp_eabd40();
   return float4();
diff --git a/test/builtins/gen/inverseSqrt/84407e.wgsl.expected.msl b/test/builtins/gen/inverseSqrt/84407e.wgsl.expected.msl
index a164dc909b..a24f6b2ce9 100644
--- a/test/builtins/gen/inverseSqrt/84407e.wgsl.expected.msl
+++ b/test/builtins/gen/inverseSqrt/84407e.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void inverseSqrt_84407e() {
   float res = rsqrt(1.0f);
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner() {
   inverseSqrt_84407e();
   return float4();
diff --git a/test/builtins/gen/inverseSqrt/8f2bd2.wgsl.expected.msl b/test/builtins/gen/inverseSqrt/8f2bd2.wgsl.expected.msl
index c214ab5972..1bbeb3a2c4 100644
--- a/test/builtins/gen/inverseSqrt/8f2bd2.wgsl.expected.msl
+++ b/test/builtins/gen/inverseSqrt/8f2bd2.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void inverseSqrt_8f2bd2() {
   float2 res = rsqrt(float2());
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner() {
   inverseSqrt_8f2bd2();
   return float4();
diff --git a/test/builtins/gen/inverseSqrt/b197b1.wgsl.expected.msl b/test/builtins/gen/inverseSqrt/b197b1.wgsl.expected.msl
index 2c10c65aa4..5d49c09bcb 100644
--- a/test/builtins/gen/inverseSqrt/b197b1.wgsl.expected.msl
+++ b/test/builtins/gen/inverseSqrt/b197b1.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void inverseSqrt_b197b1() {
   float3 res = rsqrt(float3());
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner() {
   inverseSqrt_b197b1();
   return float4();
diff --git a/test/builtins/gen/inverseSqrt/c22347.wgsl.expected.msl b/test/builtins/gen/inverseSqrt/c22347.wgsl.expected.msl
index e2ce89e4c8..340215277e 100644
--- a/test/builtins/gen/inverseSqrt/c22347.wgsl.expected.msl
+++ b/test/builtins/gen/inverseSqrt/c22347.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void inverseSqrt_c22347() {
   float4 res = rsqrt(float4());
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner() {
   inverseSqrt_c22347();
   return float4();
diff --git a/test/builtins/gen/isFinite/34d32b.wgsl.expected.msl b/test/builtins/gen/isFinite/34d32b.wgsl.expected.msl
index d482cc2756..d0ef43d9a2 100644
--- a/test/builtins/gen/isFinite/34d32b.wgsl.expected.msl
+++ b/test/builtins/gen/isFinite/34d32b.wgsl.expected.msl
@@ -5,14 +5,14 @@ builtins/gen/isFinite/34d32b.wgsl:28:25 warning: use of deprecated builtin
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void isFinite_34d32b() {
   bool2 res = isfinite(float2());
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner() {
   isFinite_34d32b();
   return float4();
diff --git a/test/builtins/gen/isFinite/426f9f.wgsl.expected.msl b/test/builtins/gen/isFinite/426f9f.wgsl.expected.msl
index eff348c83a..90997f8268 100644
--- a/test/builtins/gen/isFinite/426f9f.wgsl.expected.msl
+++ b/test/builtins/gen/isFinite/426f9f.wgsl.expected.msl
@@ -5,14 +5,14 @@ builtins/gen/isFinite/426f9f.wgsl:28:19 warning: use of deprecated builtin
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void isFinite_426f9f() {
   bool res = isfinite(1.0f);
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner() {
   isFinite_426f9f();
   return float4();
diff --git a/test/builtins/gen/isFinite/8a23ad.wgsl.expected.msl b/test/builtins/gen/isFinite/8a23ad.wgsl.expected.msl
index e95e8b4101..8a45c71658 100644
--- a/test/builtins/gen/isFinite/8a23ad.wgsl.expected.msl
+++ b/test/builtins/gen/isFinite/8a23ad.wgsl.expected.msl
@@ -5,14 +5,14 @@ builtins/gen/isFinite/8a23ad.wgsl:28:25 warning: use of deprecated builtin
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void isFinite_8a23ad() {
   bool3 res = isfinite(float3());
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner() {
   isFinite_8a23ad();
   return float4();
diff --git a/test/builtins/gen/isFinite/f31987.wgsl.expected.msl b/test/builtins/gen/isFinite/f31987.wgsl.expected.msl
index 4a0ac00639..8a1511aee2 100644
--- a/test/builtins/gen/isFinite/f31987.wgsl.expected.msl
+++ b/test/builtins/gen/isFinite/f31987.wgsl.expected.msl
@@ -5,14 +5,14 @@ builtins/gen/isFinite/f31987.wgsl:28:25 warning: use of deprecated builtin
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void isFinite_f31987() {
   bool4 res = isfinite(float4());
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner() {
   isFinite_f31987();
   return float4();
diff --git a/test/builtins/gen/isInf/666f2a.wgsl.expected.msl b/test/builtins/gen/isInf/666f2a.wgsl.expected.msl
index 4b65427870..e9cc7a0956 100644
--- a/test/builtins/gen/isInf/666f2a.wgsl.expected.msl
+++ b/test/builtins/gen/isInf/666f2a.wgsl.expected.msl
@@ -5,14 +5,14 @@ builtins/gen/isInf/666f2a.wgsl:28:25 warning: use of deprecated builtin
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void isInf_666f2a() {
   bool3 res = isinf(float3());
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner() {
   isInf_666f2a();
   return float4();
diff --git a/test/builtins/gen/isInf/7bd98f.wgsl.expected.msl b/test/builtins/gen/isInf/7bd98f.wgsl.expected.msl
index d5894d20ed..a79b870d59 100644
--- a/test/builtins/gen/isInf/7bd98f.wgsl.expected.msl
+++ b/test/builtins/gen/isInf/7bd98f.wgsl.expected.msl
@@ -5,14 +5,14 @@ builtins/gen/isInf/7bd98f.wgsl:28:19 warning: use of deprecated builtin
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void isInf_7bd98f() {
   bool res = isinf(1.0f);
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner() {
   isInf_7bd98f();
   return float4();
diff --git a/test/builtins/gen/isInf/7e81b5.wgsl.expected.msl b/test/builtins/gen/isInf/7e81b5.wgsl.expected.msl
index e41bafae5f..f553fa9199 100644
--- a/test/builtins/gen/isInf/7e81b5.wgsl.expected.msl
+++ b/test/builtins/gen/isInf/7e81b5.wgsl.expected.msl
@@ -5,14 +5,14 @@ builtins/gen/isInf/7e81b5.wgsl:28:25 warning: use of deprecated builtin
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void isInf_7e81b5() {
   bool4 res = isinf(float4());
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner() {
   isInf_7e81b5();
   return float4();
diff --git a/test/builtins/gen/isInf/a46d6f.wgsl.expected.msl b/test/builtins/gen/isInf/a46d6f.wgsl.expected.msl
index 50474b5375..0910502fc5 100644
--- a/test/builtins/gen/isInf/a46d6f.wgsl.expected.msl
+++ b/test/builtins/gen/isInf/a46d6f.wgsl.expected.msl
@@ -5,14 +5,14 @@ builtins/gen/isInf/a46d6f.wgsl:28:25 warning: use of deprecated builtin
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void isInf_a46d6f() {
   bool2 res = isinf(float2());
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner() {
   isInf_a46d6f();
   return float4();
diff --git a/test/builtins/gen/isNan/1280ab.wgsl.expected.msl b/test/builtins/gen/isNan/1280ab.wgsl.expected.msl
index ea4a1241e8..7df4b32d8c 100644
--- a/test/builtins/gen/isNan/1280ab.wgsl.expected.msl
+++ b/test/builtins/gen/isNan/1280ab.wgsl.expected.msl
@@ -5,14 +5,14 @@ builtins/gen/isNan/1280ab.wgsl:28:25 warning: use of deprecated builtin
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void isNan_1280ab() {
   bool3 res = isnan(float3());
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner() {
   isNan_1280ab();
   return float4();
diff --git a/test/builtins/gen/isNan/4d280d.wgsl.expected.msl b/test/builtins/gen/isNan/4d280d.wgsl.expected.msl
index 3aeb8717a0..f66e036274 100644
--- a/test/builtins/gen/isNan/4d280d.wgsl.expected.msl
+++ b/test/builtins/gen/isNan/4d280d.wgsl.expected.msl
@@ -5,14 +5,14 @@ builtins/gen/isNan/4d280d.wgsl:28:25 warning: use of deprecated builtin
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void isNan_4d280d() {
   bool4 res = isnan(float4());
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner() {
   isNan_4d280d();
   return float4();
diff --git a/test/builtins/gen/isNan/67ecd3.wgsl.expected.msl b/test/builtins/gen/isNan/67ecd3.wgsl.expected.msl
index b992e745a3..c8581311df 100644
--- a/test/builtins/gen/isNan/67ecd3.wgsl.expected.msl
+++ b/test/builtins/gen/isNan/67ecd3.wgsl.expected.msl
@@ -5,14 +5,14 @@ builtins/gen/isNan/67ecd3.wgsl:28:25 warning: use of deprecated builtin
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void isNan_67ecd3() {
   bool2 res = isnan(float2());
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner() {
   isNan_67ecd3();
   return float4();
diff --git a/test/builtins/gen/isNan/e4978e.wgsl.expected.msl b/test/builtins/gen/isNan/e4978e.wgsl.expected.msl
index 8ebb00d700..c27efc670e 100644
--- a/test/builtins/gen/isNan/e4978e.wgsl.expected.msl
+++ b/test/builtins/gen/isNan/e4978e.wgsl.expected.msl
@@ -5,14 +5,14 @@ builtins/gen/isNan/e4978e.wgsl:28:19 warning: use of deprecated builtin
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void isNan_e4978e() {
   bool res = isnan(1.0f);
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner() {
   isNan_e4978e();
   return float4();
diff --git a/test/builtins/gen/isNormal/863dcd.wgsl.expected.msl b/test/builtins/gen/isNormal/863dcd.wgsl.expected.msl
index 5844ab9ede..0096320ea6 100644
--- a/test/builtins/gen/isNormal/863dcd.wgsl.expected.msl
+++ b/test/builtins/gen/isNormal/863dcd.wgsl.expected.msl
@@ -5,14 +5,14 @@ builtins/gen/isNormal/863dcd.wgsl:28:25 warning: use of deprecated builtin
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void isNormal_863dcd() {
   bool4 res = isnormal(float4());
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner() {
   isNormal_863dcd();
   return float4();
diff --git a/test/builtins/gen/isNormal/b00ab1.wgsl.expected.msl b/test/builtins/gen/isNormal/b00ab1.wgsl.expected.msl
index 1203fa9438..0a98a921d9 100644
--- a/test/builtins/gen/isNormal/b00ab1.wgsl.expected.msl
+++ b/test/builtins/gen/isNormal/b00ab1.wgsl.expected.msl
@@ -5,14 +5,14 @@ builtins/gen/isNormal/b00ab1.wgsl:28:25 warning: use of deprecated builtin
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void isNormal_b00ab1() {
   bool2 res = isnormal(float2());
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner() {
   isNormal_b00ab1();
   return float4();
diff --git a/test/builtins/gen/isNormal/c286b7.wgsl.expected.msl b/test/builtins/gen/isNormal/c286b7.wgsl.expected.msl
index e34416152a..64d4c29583 100644
--- a/test/builtins/gen/isNormal/c286b7.wgsl.expected.msl
+++ b/test/builtins/gen/isNormal/c286b7.wgsl.expected.msl
@@ -5,14 +5,14 @@ builtins/gen/isNormal/c286b7.wgsl:28:25 warning: use of deprecated builtin
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void isNormal_c286b7() {
   bool3 res = isnormal(float3());
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner() {
   isNormal_c286b7();
   return float4();
diff --git a/test/builtins/gen/isNormal/c6e880.wgsl.expected.msl b/test/builtins/gen/isNormal/c6e880.wgsl.expected.msl
index 94dd83f300..ed1ec2c024 100644
--- a/test/builtins/gen/isNormal/c6e880.wgsl.expected.msl
+++ b/test/builtins/gen/isNormal/c6e880.wgsl.expected.msl
@@ -5,14 +5,14 @@ builtins/gen/isNormal/c6e880.wgsl:28:19 warning: use of deprecated builtin
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void isNormal_c6e880() {
   bool res = isnormal(1.0f);
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner() {
   isNormal_c6e880();
   return float4();
diff --git a/test/builtins/gen/ldexp/a31cdc.wgsl.expected.msl b/test/builtins/gen/ldexp/a31cdc.wgsl.expected.msl
index 35112640b7..da7d8a9c38 100644
--- a/test/builtins/gen/ldexp/a31cdc.wgsl.expected.msl
+++ b/test/builtins/gen/ldexp/a31cdc.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void ldexp_a31cdc() {
   float3 res = ldexp(float3(), int3());
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner() {
   ldexp_a31cdc();
   return float4();
diff --git a/test/builtins/gen/ldexp/abd718.wgsl.expected.msl b/test/builtins/gen/ldexp/abd718.wgsl.expected.msl
index 965657d6f4..b46988bf8a 100644
--- a/test/builtins/gen/ldexp/abd718.wgsl.expected.msl
+++ b/test/builtins/gen/ldexp/abd718.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void ldexp_abd718() {
   float2 res = ldexp(float2(), int2());
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner() {
   ldexp_abd718();
   return float4();
diff --git a/test/builtins/gen/ldexp/cc9cde.wgsl.expected.msl b/test/builtins/gen/ldexp/cc9cde.wgsl.expected.msl
index d36b5b4ee2..4d7d64abcf 100644
--- a/test/builtins/gen/ldexp/cc9cde.wgsl.expected.msl
+++ b/test/builtins/gen/ldexp/cc9cde.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void ldexp_cc9cde() {
   float4 res = ldexp(float4(), int4());
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner() {
   ldexp_cc9cde();
   return float4();
diff --git a/test/builtins/gen/ldexp/db8b49.wgsl.expected.msl b/test/builtins/gen/ldexp/db8b49.wgsl.expected.msl
index 0449b75aa3..e0e7607665 100644
--- a/test/builtins/gen/ldexp/db8b49.wgsl.expected.msl
+++ b/test/builtins/gen/ldexp/db8b49.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void ldexp_db8b49() {
   float res = ldexp(1.0f, 1);
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner() {
   ldexp_db8b49();
   return float4();
diff --git a/test/builtins/gen/length/056071.wgsl.expected.msl b/test/builtins/gen/length/056071.wgsl.expected.msl
index 963de37da1..689f9dfa06 100644
--- a/test/builtins/gen/length/056071.wgsl.expected.msl
+++ b/test/builtins/gen/length/056071.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void length_056071() {
   float res = length(float3());
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner() {
   length_056071();
   return float4();
diff --git a/test/builtins/gen/length/602a17.wgsl.expected.msl b/test/builtins/gen/length/602a17.wgsl.expected.msl
index 4555bbce4f..ad3b7df824 100644
--- a/test/builtins/gen/length/602a17.wgsl.expected.msl
+++ b/test/builtins/gen/length/602a17.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void length_602a17() {
   float res = fabs(1.0f);
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner() {
   length_602a17();
   return float4();
diff --git a/test/builtins/gen/length/afde8b.wgsl.expected.msl b/test/builtins/gen/length/afde8b.wgsl.expected.msl
index 46a073cf0e..4e2db8db78 100644
--- a/test/builtins/gen/length/afde8b.wgsl.expected.msl
+++ b/test/builtins/gen/length/afde8b.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void length_afde8b() {
   float res = length(float2());
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner() {
   length_afde8b();
   return float4();
diff --git a/test/builtins/gen/length/becebf.wgsl.expected.msl b/test/builtins/gen/length/becebf.wgsl.expected.msl
index 1ffc1d27fe..080f45e256 100644
--- a/test/builtins/gen/length/becebf.wgsl.expected.msl
+++ b/test/builtins/gen/length/becebf.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void length_becebf() {
   float res = length(float4());
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner() {
   length_becebf();
   return float4();
diff --git a/test/builtins/gen/log/3da25a.wgsl.expected.msl b/test/builtins/gen/log/3da25a.wgsl.expected.msl
index fcb512d68e..d87aca8e36 100644
--- a/test/builtins/gen/log/3da25a.wgsl.expected.msl
+++ b/test/builtins/gen/log/3da25a.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void log_3da25a() {
   float4 res = log(float4());
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner() {
   log_3da25a();
   return float4();
diff --git a/test/builtins/gen/log/7114a6.wgsl.expected.msl b/test/builtins/gen/log/7114a6.wgsl.expected.msl
index 82dd4d7e53..5ec0b4da3c 100644
--- a/test/builtins/gen/log/7114a6.wgsl.expected.msl
+++ b/test/builtins/gen/log/7114a6.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void log_7114a6() {
   float res = log(1.0f);
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner() {
   log_7114a6();
   return float4();
diff --git a/test/builtins/gen/log/b2ce28.wgsl.expected.msl b/test/builtins/gen/log/b2ce28.wgsl.expected.msl
index 63978b8bef..a99ad96cce 100644
--- a/test/builtins/gen/log/b2ce28.wgsl.expected.msl
+++ b/test/builtins/gen/log/b2ce28.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void log_b2ce28() {
   float2 res = log(float2());
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner() {
   log_b2ce28();
   return float4();
diff --git a/test/builtins/gen/log/f4c570.wgsl.expected.msl b/test/builtins/gen/log/f4c570.wgsl.expected.msl
index c54fe04b07..2b95150d04 100644
--- a/test/builtins/gen/log/f4c570.wgsl.expected.msl
+++ b/test/builtins/gen/log/f4c570.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void log_f4c570() {
   float3 res = log(float3());
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner() {
   log_f4c570();
   return float4();
diff --git a/test/builtins/gen/log2/4036ed.wgsl.expected.msl b/test/builtins/gen/log2/4036ed.wgsl.expected.msl
index 4cafdcaeca..a0e25293c2 100644
--- a/test/builtins/gen/log2/4036ed.wgsl.expected.msl
+++ b/test/builtins/gen/log2/4036ed.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void log2_4036ed() {
   float res = log2(1.0f);
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner() {
   log2_4036ed();
   return float4();
diff --git a/test/builtins/gen/log2/902988.wgsl.expected.msl b/test/builtins/gen/log2/902988.wgsl.expected.msl
index a45104b2e9..e3aa073569 100644
--- a/test/builtins/gen/log2/902988.wgsl.expected.msl
+++ b/test/builtins/gen/log2/902988.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void log2_902988() {
   float4 res = log2(float4());
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner() {
   log2_902988();
   return float4();
diff --git a/test/builtins/gen/log2/adb233.wgsl.expected.msl b/test/builtins/gen/log2/adb233.wgsl.expected.msl
index f591c83e52..44c818c43e 100644
--- a/test/builtins/gen/log2/adb233.wgsl.expected.msl
+++ b/test/builtins/gen/log2/adb233.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void log2_adb233() {
   float3 res = log2(float3());
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner() {
   log2_adb233();
   return float4();
diff --git a/test/builtins/gen/log2/aea659.wgsl.expected.msl b/test/builtins/gen/log2/aea659.wgsl.expected.msl
index 8cc3dda71b..52b6a1a03a 100644
--- a/test/builtins/gen/log2/aea659.wgsl.expected.msl
+++ b/test/builtins/gen/log2/aea659.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void log2_aea659() {
   float2 res = log2(float2());
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner() {
   log2_aea659();
   return float4();
diff --git a/test/builtins/gen/max/0c0aae.wgsl.expected.msl b/test/builtins/gen/max/0c0aae.wgsl.expected.msl
index 400ec277c9..5f95e211f1 100644
--- a/test/builtins/gen/max/0c0aae.wgsl.expected.msl
+++ b/test/builtins/gen/max/0c0aae.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void max_0c0aae() {
   uint res = max(1u, 1u);
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner() {
   max_0c0aae();
   return float4();
diff --git a/test/builtins/gen/max/25eafe.wgsl.expected.msl b/test/builtins/gen/max/25eafe.wgsl.expected.msl
index 170590711a..31bd611868 100644
--- a/test/builtins/gen/max/25eafe.wgsl.expected.msl
+++ b/test/builtins/gen/max/25eafe.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void max_25eafe() {
   int3 res = max(int3(), int3());
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner() {
   max_25eafe();
   return float4();
diff --git a/test/builtins/gen/max/320815.wgsl.expected.msl b/test/builtins/gen/max/320815.wgsl.expected.msl
index 0f5ffdd1c3..a135a3c845 100644
--- a/test/builtins/gen/max/320815.wgsl.expected.msl
+++ b/test/builtins/gen/max/320815.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void max_320815() {
   uint2 res = max(uint2(), uint2());
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner() {
   max_320815();
   return float4();
diff --git a/test/builtins/gen/max/44a39d.wgsl.expected.msl b/test/builtins/gen/max/44a39d.wgsl.expected.msl
index 8d18edf461..11575ec42d 100644
--- a/test/builtins/gen/max/44a39d.wgsl.expected.msl
+++ b/test/builtins/gen/max/44a39d.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void max_44a39d() {
   float res = fmax(1.0f, 1.0f);
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner() {
   max_44a39d();
   return float4();
diff --git a/test/builtins/gen/max/453e04.wgsl.expected.msl b/test/builtins/gen/max/453e04.wgsl.expected.msl
index 6891927b40..86de3a08fe 100644
--- a/test/builtins/gen/max/453e04.wgsl.expected.msl
+++ b/test/builtins/gen/max/453e04.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void max_453e04() {
   uint4 res = max(uint4(), uint4());
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner() {
   max_453e04();
   return float4();
diff --git a/test/builtins/gen/max/462050.wgsl.expected.msl b/test/builtins/gen/max/462050.wgsl.expected.msl
index 71ab5707f6..825b974e5b 100644
--- a/test/builtins/gen/max/462050.wgsl.expected.msl
+++ b/test/builtins/gen/max/462050.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void max_462050() {
   float2 res = fmax(float2(), float2());
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner() {
   max_462050();
   return float4();
diff --git a/test/builtins/gen/max/4883ac.wgsl.expected.msl b/test/builtins/gen/max/4883ac.wgsl.expected.msl
index 802c27b1e2..199fa39682 100644
--- a/test/builtins/gen/max/4883ac.wgsl.expected.msl
+++ b/test/builtins/gen/max/4883ac.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void max_4883ac() {
   float3 res = fmax(float3(), float3());
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner() {
   max_4883ac();
   return float4();
diff --git a/test/builtins/gen/max/85e6bc.wgsl.expected.msl b/test/builtins/gen/max/85e6bc.wgsl.expected.msl
index 85b4a754b8..48d92f69a3 100644
--- a/test/builtins/gen/max/85e6bc.wgsl.expected.msl
+++ b/test/builtins/gen/max/85e6bc.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void max_85e6bc() {
   int4 res = max(int4(), int4());
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner() {
   max_85e6bc();
   return float4();
diff --git a/test/builtins/gen/max/a93419.wgsl.expected.msl b/test/builtins/gen/max/a93419.wgsl.expected.msl
index ba628fd40a..c5d8364e92 100644
--- a/test/builtins/gen/max/a93419.wgsl.expected.msl
+++ b/test/builtins/gen/max/a93419.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void max_a93419() {
   float4 res = fmax(float4(), float4());
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner() {
   max_a93419();
   return float4();
diff --git a/test/builtins/gen/max/b1b73a.wgsl.expected.msl b/test/builtins/gen/max/b1b73a.wgsl.expected.msl
index c721edb3d6..410e0f5b1d 100644
--- a/test/builtins/gen/max/b1b73a.wgsl.expected.msl
+++ b/test/builtins/gen/max/b1b73a.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void max_b1b73a() {
   uint3 res = max(uint3(), uint3());
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner() {
   max_b1b73a();
   return float4();
diff --git a/test/builtins/gen/max/ce7c30.wgsl.expected.msl b/test/builtins/gen/max/ce7c30.wgsl.expected.msl
index 76113dc40c..50b1952118 100644
--- a/test/builtins/gen/max/ce7c30.wgsl.expected.msl
+++ b/test/builtins/gen/max/ce7c30.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void max_ce7c30() {
   int res = max(1, 1);
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner() {
   max_ce7c30();
   return float4();
diff --git a/test/builtins/gen/max/e8192f.wgsl.expected.msl b/test/builtins/gen/max/e8192f.wgsl.expected.msl
index 8c22faea2e..7c7f9ac091 100644
--- a/test/builtins/gen/max/e8192f.wgsl.expected.msl
+++ b/test/builtins/gen/max/e8192f.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void max_e8192f() {
   int2 res = max(int2(), int2());
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner() {
   max_e8192f();
   return float4();
diff --git a/test/builtins/gen/min/03c7e3.wgsl.expected.msl b/test/builtins/gen/min/03c7e3.wgsl.expected.msl
index 8c76659aaf..f01b97e7fb 100644
--- a/test/builtins/gen/min/03c7e3.wgsl.expected.msl
+++ b/test/builtins/gen/min/03c7e3.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void min_03c7e3() {
   int2 res = min(int2(), int2());
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner() {
   min_03c7e3();
   return float4();
diff --git a/test/builtins/gen/min/0dc614.wgsl.expected.msl b/test/builtins/gen/min/0dc614.wgsl.expected.msl
index a38f38640d..f5f7920d3c 100644
--- a/test/builtins/gen/min/0dc614.wgsl.expected.msl
+++ b/test/builtins/gen/min/0dc614.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void min_0dc614() {
   uint4 res = min(uint4(), uint4());
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner() {
   min_0dc614();
   return float4();
diff --git a/test/builtins/gen/min/3941e1.wgsl.expected.msl b/test/builtins/gen/min/3941e1.wgsl.expected.msl
index 07dbf3c8a6..ec36ed869a 100644
--- a/test/builtins/gen/min/3941e1.wgsl.expected.msl
+++ b/test/builtins/gen/min/3941e1.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void min_3941e1() {
   int4 res = min(int4(), int4());
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner() {
   min_3941e1();
   return float4();
diff --git a/test/builtins/gen/min/46c5d3.wgsl.expected.msl b/test/builtins/gen/min/46c5d3.wgsl.expected.msl
index 736c305495..3c8a19e0a8 100644
--- a/test/builtins/gen/min/46c5d3.wgsl.expected.msl
+++ b/test/builtins/gen/min/46c5d3.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void min_46c5d3() {
   uint res = min(1u, 1u);
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner() {
   min_46c5d3();
   return float4();
diff --git a/test/builtins/gen/min/82b28f.wgsl.expected.msl b/test/builtins/gen/min/82b28f.wgsl.expected.msl
index b0aac8c84f..65bbe6b140 100644
--- a/test/builtins/gen/min/82b28f.wgsl.expected.msl
+++ b/test/builtins/gen/min/82b28f.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void min_82b28f() {
   uint2 res = min(uint2(), uint2());
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner() {
   min_82b28f();
   return float4();
diff --git a/test/builtins/gen/min/93cfc4.wgsl.expected.msl b/test/builtins/gen/min/93cfc4.wgsl.expected.msl
index e6bf1c4ba9..bf29c67104 100644
--- a/test/builtins/gen/min/93cfc4.wgsl.expected.msl
+++ b/test/builtins/gen/min/93cfc4.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void min_93cfc4() {
   float3 res = fmin(float3(), float3());
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner() {
   min_93cfc4();
   return float4();
diff --git a/test/builtins/gen/min/a45171.wgsl.expected.msl b/test/builtins/gen/min/a45171.wgsl.expected.msl
index b6a8f9edfe..1a4e902370 100644
--- a/test/builtins/gen/min/a45171.wgsl.expected.msl
+++ b/test/builtins/gen/min/a45171.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void min_a45171() {
   int3 res = min(int3(), int3());
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner() {
   min_a45171();
   return float4();
diff --git a/test/builtins/gen/min/aa28ad.wgsl.expected.msl b/test/builtins/gen/min/aa28ad.wgsl.expected.msl
index c393a5163d..8a5d68dea2 100644
--- a/test/builtins/gen/min/aa28ad.wgsl.expected.msl
+++ b/test/builtins/gen/min/aa28ad.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void min_aa28ad() {
   float2 res = fmin(float2(), float2());
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner() {
   min_aa28ad();
   return float4();
diff --git a/test/builtins/gen/min/af326d.wgsl.expected.msl b/test/builtins/gen/min/af326d.wgsl.expected.msl
index 60010dada2..a374198a94 100644
--- a/test/builtins/gen/min/af326d.wgsl.expected.msl
+++ b/test/builtins/gen/min/af326d.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void min_af326d() {
   float res = fmin(1.0f, 1.0f);
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner() {
   min_af326d();
   return float4();
diff --git a/test/builtins/gen/min/c70bb7.wgsl.expected.msl b/test/builtins/gen/min/c70bb7.wgsl.expected.msl
index 6fb97f0d94..75707f7a44 100644
--- a/test/builtins/gen/min/c70bb7.wgsl.expected.msl
+++ b/test/builtins/gen/min/c70bb7.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void min_c70bb7() {
   uint3 res = min(uint3(), uint3());
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner() {
   min_c70bb7();
   return float4();
diff --git a/test/builtins/gen/min/c73147.wgsl.expected.msl b/test/builtins/gen/min/c73147.wgsl.expected.msl
index 9873e62159..94a8da2f08 100644
--- a/test/builtins/gen/min/c73147.wgsl.expected.msl
+++ b/test/builtins/gen/min/c73147.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void min_c73147() {
   int res = min(1, 1);
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner() {
   min_c73147();
   return float4();
diff --git a/test/builtins/gen/min/c76fa6.wgsl.expected.msl b/test/builtins/gen/min/c76fa6.wgsl.expected.msl
index a1dedfac82..7af41b68e6 100644
--- a/test/builtins/gen/min/c76fa6.wgsl.expected.msl
+++ b/test/builtins/gen/min/c76fa6.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void min_c76fa6() {
   float4 res = fmin(float4(), float4());
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner() {
   min_c76fa6();
   return float4();
diff --git a/test/builtins/gen/mix/0c8c33.wgsl.expected.msl b/test/builtins/gen/mix/0c8c33.wgsl.expected.msl
index dbeda2b1cf..8f33abfbb1 100644
--- a/test/builtins/gen/mix/0c8c33.wgsl.expected.msl
+++ b/test/builtins/gen/mix/0c8c33.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void mix_0c8c33() {
   float3 res = mix(float3(), float3(), float3());
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner() {
   mix_0c8c33();
   return float4();
diff --git a/test/builtins/gen/mix/1faeb1.wgsl.expected.msl b/test/builtins/gen/mix/1faeb1.wgsl.expected.msl
index b42db51976..89175cf9ff 100644
--- a/test/builtins/gen/mix/1faeb1.wgsl.expected.msl
+++ b/test/builtins/gen/mix/1faeb1.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void mix_1faeb1() {
   float4 res = mix(float4(), float4(), 1.0f);
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner() {
   mix_1faeb1();
   return float4();
diff --git a/test/builtins/gen/mix/2fadab.wgsl.expected.msl b/test/builtins/gen/mix/2fadab.wgsl.expected.msl
index 8ad84f4797..e6ce43a894 100644
--- a/test/builtins/gen/mix/2fadab.wgsl.expected.msl
+++ b/test/builtins/gen/mix/2fadab.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void mix_2fadab() {
   float2 res = mix(float2(), float2(), 1.0f);
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner() {
   mix_2fadab();
   return float4();
diff --git a/test/builtins/gen/mix/315264.wgsl.expected.msl b/test/builtins/gen/mix/315264.wgsl.expected.msl
index 65c7fa3d3f..a9110a3e42 100644
--- a/test/builtins/gen/mix/315264.wgsl.expected.msl
+++ b/test/builtins/gen/mix/315264.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void mix_315264() {
   float3 res = mix(float3(), float3(), 1.0f);
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner() {
   mix_315264();
   return float4();
diff --git a/test/builtins/gen/mix/4f0b5e.wgsl.expected.msl b/test/builtins/gen/mix/4f0b5e.wgsl.expected.msl
index b2a1c58021..1f7906dd44 100644
--- a/test/builtins/gen/mix/4f0b5e.wgsl.expected.msl
+++ b/test/builtins/gen/mix/4f0b5e.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void mix_4f0b5e() {
   float res = mix(1.0f, 1.0f, 1.0f);
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner() {
   mix_4f0b5e();
   return float4();
diff --git a/test/builtins/gen/mix/6f8adc.wgsl.expected.msl b/test/builtins/gen/mix/6f8adc.wgsl.expected.msl
index fcd8a42ed0..699f297ed7 100644
--- a/test/builtins/gen/mix/6f8adc.wgsl.expected.msl
+++ b/test/builtins/gen/mix/6f8adc.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void mix_6f8adc() {
   float2 res = mix(float2(), float2(), float2());
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner() {
   mix_6f8adc();
   return float4();
diff --git a/test/builtins/gen/mix/c37ede.wgsl.expected.msl b/test/builtins/gen/mix/c37ede.wgsl.expected.msl
index 837f4f7937..abe0dc7d29 100644
--- a/test/builtins/gen/mix/c37ede.wgsl.expected.msl
+++ b/test/builtins/gen/mix/c37ede.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void mix_c37ede() {
   float4 res = mix(float4(), float4(), float4());
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner() {
   mix_c37ede();
   return float4();
diff --git a/test/builtins/gen/modf/180fed.wgsl.expected.msl b/test/builtins/gen/modf/180fed.wgsl.expected.msl
index e05741fff1..d1f6d8bf6a 100644
--- a/test/builtins/gen/modf/180fed.wgsl.expected.msl
+++ b/test/builtins/gen/modf/180fed.wgsl.expected.msl
@@ -12,14 +12,14 @@ modf_result tint_modf(float param_0) {
   return {fract, whole};
 }
 
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void modf_180fed() {
   modf_result res = tint_modf(1.0f);
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner() {
   modf_180fed();
   return float4();
diff --git a/test/builtins/gen/modf/9b75f7.wgsl.expected.msl b/test/builtins/gen/modf/9b75f7.wgsl.expected.msl
index 460f07d64d..fcf035d315 100644
--- a/test/builtins/gen/modf/9b75f7.wgsl.expected.msl
+++ b/test/builtins/gen/modf/9b75f7.wgsl.expected.msl
@@ -12,14 +12,14 @@ modf_result_vec3 tint_modf(float3 param_0) {
   return {fract, whole};
 }
 
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void modf_9b75f7() {
   modf_result_vec3 res = tint_modf(float3());
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner() {
   modf_9b75f7();
   return float4();
diff --git a/test/builtins/gen/modf/ec2dbc.wgsl.expected.msl b/test/builtins/gen/modf/ec2dbc.wgsl.expected.msl
index be55de89c7..a62a85c5fc 100644
--- a/test/builtins/gen/modf/ec2dbc.wgsl.expected.msl
+++ b/test/builtins/gen/modf/ec2dbc.wgsl.expected.msl
@@ -12,14 +12,14 @@ modf_result_vec4 tint_modf(float4 param_0) {
   return {fract, whole};
 }
 
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void modf_ec2dbc() {
   modf_result_vec4 res = tint_modf(float4());
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner() {
   modf_ec2dbc();
   return float4();
diff --git a/test/builtins/gen/modf/f5f20d.wgsl.expected.msl b/test/builtins/gen/modf/f5f20d.wgsl.expected.msl
index 2f7272b127..f02e88b4d4 100644
--- a/test/builtins/gen/modf/f5f20d.wgsl.expected.msl
+++ b/test/builtins/gen/modf/f5f20d.wgsl.expected.msl
@@ -12,14 +12,14 @@ modf_result_vec2 tint_modf(float2 param_0) {
   return {fract, whole};
 }
 
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void modf_f5f20d() {
   modf_result_vec2 res = tint_modf(float2());
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner() {
   modf_f5f20d();
   return float4();
diff --git a/test/builtins/gen/normalize/64d8c0.wgsl.expected.msl b/test/builtins/gen/normalize/64d8c0.wgsl.expected.msl
index 5b15b59a1d..844c52a795 100644
--- a/test/builtins/gen/normalize/64d8c0.wgsl.expected.msl
+++ b/test/builtins/gen/normalize/64d8c0.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void normalize_64d8c0() {
   float3 res = normalize(float3());
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner() {
   normalize_64d8c0();
   return float4();
diff --git a/test/builtins/gen/normalize/9a0aab.wgsl.expected.msl b/test/builtins/gen/normalize/9a0aab.wgsl.expected.msl
index a8d81cb12d..7dd5c0a8da 100644
--- a/test/builtins/gen/normalize/9a0aab.wgsl.expected.msl
+++ b/test/builtins/gen/normalize/9a0aab.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void normalize_9a0aab() {
   float4 res = normalize(float4());
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner() {
   normalize_9a0aab();
   return float4();
diff --git a/test/builtins/gen/normalize/fc2ef1.wgsl.expected.msl b/test/builtins/gen/normalize/fc2ef1.wgsl.expected.msl
index 7d98555bee..1464466ca2 100644
--- a/test/builtins/gen/normalize/fc2ef1.wgsl.expected.msl
+++ b/test/builtins/gen/normalize/fc2ef1.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void normalize_fc2ef1() {
   float2 res = normalize(float2());
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner() {
   normalize_fc2ef1();
   return float4();
diff --git a/test/builtins/gen/pack2x16float/0e97b3.wgsl.expected.msl b/test/builtins/gen/pack2x16float/0e97b3.wgsl.expected.msl
index 62fedd23f0..026b652428 100644
--- a/test/builtins/gen/pack2x16float/0e97b3.wgsl.expected.msl
+++ b/test/builtins/gen/pack2x16float/0e97b3.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void pack2x16float_0e97b3() {
   uint res = as_type<uint>(half2(float2()));
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner() {
   pack2x16float_0e97b3();
   return float4();
diff --git a/test/builtins/gen/pack2x16snorm/6c169b.wgsl.expected.msl b/test/builtins/gen/pack2x16snorm/6c169b.wgsl.expected.msl
index 02f839bee6..21fed1a521 100644
--- a/test/builtins/gen/pack2x16snorm/6c169b.wgsl.expected.msl
+++ b/test/builtins/gen/pack2x16snorm/6c169b.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void pack2x16snorm_6c169b() {
   uint res = pack_float_to_snorm2x16(float2());
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner() {
   pack2x16snorm_6c169b();
   return float4();
diff --git a/test/builtins/gen/pack2x16unorm/0f08e4.wgsl.expected.msl b/test/builtins/gen/pack2x16unorm/0f08e4.wgsl.expected.msl
index d1928ccf58..f095a39852 100644
--- a/test/builtins/gen/pack2x16unorm/0f08e4.wgsl.expected.msl
+++ b/test/builtins/gen/pack2x16unorm/0f08e4.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void pack2x16unorm_0f08e4() {
   uint res = pack_float_to_unorm2x16(float2());
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner() {
   pack2x16unorm_0f08e4();
   return float4();
diff --git a/test/builtins/gen/pack4x8snorm/4d22e7.wgsl.expected.msl b/test/builtins/gen/pack4x8snorm/4d22e7.wgsl.expected.msl
index 97b19e0b7c..a38de4d286 100644
--- a/test/builtins/gen/pack4x8snorm/4d22e7.wgsl.expected.msl
+++ b/test/builtins/gen/pack4x8snorm/4d22e7.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void pack4x8snorm_4d22e7() {
   uint res = pack_float_to_snorm4x8(float4());
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner() {
   pack4x8snorm_4d22e7();
   return float4();
diff --git a/test/builtins/gen/pack4x8unorm/95c456.wgsl.expected.msl b/test/builtins/gen/pack4x8unorm/95c456.wgsl.expected.msl
index 88ccdaf8cc..55732e1f8d 100644
--- a/test/builtins/gen/pack4x8unorm/95c456.wgsl.expected.msl
+++ b/test/builtins/gen/pack4x8unorm/95c456.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void pack4x8unorm_95c456() {
   uint res = pack_float_to_unorm4x8(float4());
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner() {
   pack4x8unorm_95c456();
   return float4();
diff --git a/test/builtins/gen/pow/04a908.wgsl.expected.msl b/test/builtins/gen/pow/04a908.wgsl.expected.msl
index 2f9b2a7da2..e1f2e81684 100644
--- a/test/builtins/gen/pow/04a908.wgsl.expected.msl
+++ b/test/builtins/gen/pow/04a908.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void pow_04a908() {
   float4 res = pow(float4(), float4());
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner() {
   pow_04a908();
   return float4();
diff --git a/test/builtins/gen/pow/46e029.wgsl.expected.msl b/test/builtins/gen/pow/46e029.wgsl.expected.msl
index 5192fec6e7..c2d8df388b 100644
--- a/test/builtins/gen/pow/46e029.wgsl.expected.msl
+++ b/test/builtins/gen/pow/46e029.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void pow_46e029() {
   float res = pow(1.0f, 1.0f);
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner() {
   pow_46e029();
   return float4();
diff --git a/test/builtins/gen/pow/4a46c9.wgsl.expected.msl b/test/builtins/gen/pow/4a46c9.wgsl.expected.msl
index 5e68719762..69a27253c5 100644
--- a/test/builtins/gen/pow/4a46c9.wgsl.expected.msl
+++ b/test/builtins/gen/pow/4a46c9.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void pow_4a46c9() {
   float3 res = pow(float3(), float3());
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner() {
   pow_4a46c9();
   return float4();
diff --git a/test/builtins/gen/pow/e60ea5.wgsl.expected.msl b/test/builtins/gen/pow/e60ea5.wgsl.expected.msl
index bc4e9a248b..4326466f97 100644
--- a/test/builtins/gen/pow/e60ea5.wgsl.expected.msl
+++ b/test/builtins/gen/pow/e60ea5.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void pow_e60ea5() {
   float2 res = pow(float2(), float2());
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner() {
   pow_e60ea5();
   return float4();
diff --git a/test/builtins/gen/radians/09b7fc.wgsl.expected.msl b/test/builtins/gen/radians/09b7fc.wgsl.expected.msl
index e021142085..00e73d18f5 100644
--- a/test/builtins/gen/radians/09b7fc.wgsl.expected.msl
+++ b/test/builtins/gen/radians/09b7fc.wgsl.expected.msl
@@ -6,14 +6,14 @@ float4 tint_radians(float4 param_0) {
   return param_0 * 0.017453292519943295474;
 }
 
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void radians_09b7fc() {
   float4 res = tint_radians(float4());
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner() {
   radians_09b7fc();
   return float4();
diff --git a/test/builtins/gen/radians/61687a.wgsl.expected.msl b/test/builtins/gen/radians/61687a.wgsl.expected.msl
index b930d5a412..7a7e7e4f7a 100644
--- a/test/builtins/gen/radians/61687a.wgsl.expected.msl
+++ b/test/builtins/gen/radians/61687a.wgsl.expected.msl
@@ -6,14 +6,14 @@ float2 tint_radians(float2 param_0) {
   return param_0 * 0.017453292519943295474;
 }
 
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void radians_61687a() {
   float2 res = tint_radians(float2());
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner() {
   radians_61687a();
   return float4();
diff --git a/test/builtins/gen/radians/6b0ff2.wgsl.expected.msl b/test/builtins/gen/radians/6b0ff2.wgsl.expected.msl
index 2dabd61719..e99ae97e94 100644
--- a/test/builtins/gen/radians/6b0ff2.wgsl.expected.msl
+++ b/test/builtins/gen/radians/6b0ff2.wgsl.expected.msl
@@ -6,14 +6,14 @@ float tint_radians(float param_0) {
   return param_0 * 0.017453292519943295474;
 }
 
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void radians_6b0ff2() {
   float res = tint_radians(1.0f);
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner() {
   radians_6b0ff2();
   return float4();
diff --git a/test/builtins/gen/radians/f96258.wgsl.expected.msl b/test/builtins/gen/radians/f96258.wgsl.expected.msl
index f0f343df34..1667cdb901 100644
--- a/test/builtins/gen/radians/f96258.wgsl.expected.msl
+++ b/test/builtins/gen/radians/f96258.wgsl.expected.msl
@@ -6,14 +6,14 @@ float3 tint_radians(float3 param_0) {
   return param_0 * 0.017453292519943295474;
 }
 
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void radians_f96258() {
   float3 res = tint_radians(float3());
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner() {
   radians_f96258();
   return float4();
diff --git a/test/builtins/gen/reflect/05357e.wgsl.expected.msl b/test/builtins/gen/reflect/05357e.wgsl.expected.msl
index 0b22eec61d..83ddfd9a4a 100644
--- a/test/builtins/gen/reflect/05357e.wgsl.expected.msl
+++ b/test/builtins/gen/reflect/05357e.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void reflect_05357e() {
   float4 res = reflect(float4(), float4());
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner() {
   reflect_05357e();
   return float4();
diff --git a/test/builtins/gen/reflect/b61e10.wgsl.expected.msl b/test/builtins/gen/reflect/b61e10.wgsl.expected.msl
index 5d92438cf7..8f70c6d5f0 100644
--- a/test/builtins/gen/reflect/b61e10.wgsl.expected.msl
+++ b/test/builtins/gen/reflect/b61e10.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void reflect_b61e10() {
   float2 res = reflect(float2(), float2());
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner() {
   reflect_b61e10();
   return float4();
diff --git a/test/builtins/gen/reflect/f47fdb.wgsl.expected.msl b/test/builtins/gen/reflect/f47fdb.wgsl.expected.msl
index 93d48de30f..c3d161418b 100644
--- a/test/builtins/gen/reflect/f47fdb.wgsl.expected.msl
+++ b/test/builtins/gen/reflect/f47fdb.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void reflect_f47fdb() {
   float3 res = reflect(float3(), float3());
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner() {
   reflect_f47fdb();
   return float4();
diff --git a/test/builtins/gen/refract/7e02e6.wgsl.expected.msl b/test/builtins/gen/refract/7e02e6.wgsl.expected.msl
index 9a66026e1c..9fedc200aa 100644
--- a/test/builtins/gen/refract/7e02e6.wgsl.expected.msl
+++ b/test/builtins/gen/refract/7e02e6.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void refract_7e02e6() {
   float4 res = refract(float4(), float4(), 1.0f);
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner() {
   refract_7e02e6();
   return float4();
diff --git a/test/builtins/gen/refract/cbc1d2.wgsl.expected.msl b/test/builtins/gen/refract/cbc1d2.wgsl.expected.msl
index 3ee38ac311..ceb3738cba 100644
--- a/test/builtins/gen/refract/cbc1d2.wgsl.expected.msl
+++ b/test/builtins/gen/refract/cbc1d2.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void refract_cbc1d2() {
   float3 res = refract(float3(), float3(), 1.0f);
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner() {
   refract_cbc1d2();
   return float4();
diff --git a/test/builtins/gen/refract/cd905f.wgsl.expected.msl b/test/builtins/gen/refract/cd905f.wgsl.expected.msl
index 2a3e898873..878c80c078 100644
--- a/test/builtins/gen/refract/cd905f.wgsl.expected.msl
+++ b/test/builtins/gen/refract/cd905f.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void refract_cd905f() {
   float2 res = refract(float2(), float2(), 1.0f);
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner() {
   refract_cd905f();
   return float4();
diff --git a/test/builtins/gen/reverseBits/222177.wgsl.expected.msl b/test/builtins/gen/reverseBits/222177.wgsl.expected.msl
index a5df325c4e..410b12017f 100644
--- a/test/builtins/gen/reverseBits/222177.wgsl.expected.msl
+++ b/test/builtins/gen/reverseBits/222177.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void reverseBits_222177() {
   int2 res = reverse_bits(int2());
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner() {
   reverseBits_222177();
   return float4();
diff --git a/test/builtins/gen/reverseBits/35fea9.wgsl.expected.msl b/test/builtins/gen/reverseBits/35fea9.wgsl.expected.msl
index ae0cd42199..7cca1fe44d 100644
--- a/test/builtins/gen/reverseBits/35fea9.wgsl.expected.msl
+++ b/test/builtins/gen/reverseBits/35fea9.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void reverseBits_35fea9() {
   uint4 res = reverse_bits(uint4());
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner() {
   reverseBits_35fea9();
   return float4();
diff --git a/test/builtins/gen/reverseBits/4dbd6f.wgsl.expected.msl b/test/builtins/gen/reverseBits/4dbd6f.wgsl.expected.msl
index 6025abd758..918b5e0390 100644
--- a/test/builtins/gen/reverseBits/4dbd6f.wgsl.expected.msl
+++ b/test/builtins/gen/reverseBits/4dbd6f.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void reverseBits_4dbd6f() {
   int4 res = reverse_bits(int4());
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner() {
   reverseBits_4dbd6f();
   return float4();
diff --git a/test/builtins/gen/reverseBits/7c4269.wgsl.expected.msl b/test/builtins/gen/reverseBits/7c4269.wgsl.expected.msl
index 2fc2f847bb..0d2865498a 100644
--- a/test/builtins/gen/reverseBits/7c4269.wgsl.expected.msl
+++ b/test/builtins/gen/reverseBits/7c4269.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void reverseBits_7c4269() {
   int res = reverse_bits(1);
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner() {
   reverseBits_7c4269();
   return float4();
diff --git a/test/builtins/gen/reverseBits/a6ccd4.wgsl.expected.msl b/test/builtins/gen/reverseBits/a6ccd4.wgsl.expected.msl
index dd61298267..5c7819ea91 100644
--- a/test/builtins/gen/reverseBits/a6ccd4.wgsl.expected.msl
+++ b/test/builtins/gen/reverseBits/a6ccd4.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void reverseBits_a6ccd4() {
   uint3 res = reverse_bits(uint3());
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner() {
   reverseBits_a6ccd4();
   return float4();
diff --git a/test/builtins/gen/reverseBits/c21bc1.wgsl.expected.msl b/test/builtins/gen/reverseBits/c21bc1.wgsl.expected.msl
index dd74edb907..b960eec3a0 100644
--- a/test/builtins/gen/reverseBits/c21bc1.wgsl.expected.msl
+++ b/test/builtins/gen/reverseBits/c21bc1.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void reverseBits_c21bc1() {
   int3 res = reverse_bits(int3());
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner() {
   reverseBits_c21bc1();
   return float4();
diff --git a/test/builtins/gen/reverseBits/e1f4c1.wgsl.expected.msl b/test/builtins/gen/reverseBits/e1f4c1.wgsl.expected.msl
index caf2e6571f..fc9ebd295f 100644
--- a/test/builtins/gen/reverseBits/e1f4c1.wgsl.expected.msl
+++ b/test/builtins/gen/reverseBits/e1f4c1.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void reverseBits_e1f4c1() {
   uint2 res = reverse_bits(uint2());
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner() {
   reverseBits_e1f4c1();
   return float4();
diff --git a/test/builtins/gen/reverseBits/e31adf.wgsl.expected.msl b/test/builtins/gen/reverseBits/e31adf.wgsl.expected.msl
index e80be35d02..fb3d3f2a1f 100644
--- a/test/builtins/gen/reverseBits/e31adf.wgsl.expected.msl
+++ b/test/builtins/gen/reverseBits/e31adf.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void reverseBits_e31adf() {
   uint res = reverse_bits(1u);
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner() {
   reverseBits_e31adf();
   return float4();
diff --git a/test/builtins/gen/round/106c0b.wgsl.expected.msl b/test/builtins/gen/round/106c0b.wgsl.expected.msl
index 7acb365f96..be166bff69 100644
--- a/test/builtins/gen/round/106c0b.wgsl.expected.msl
+++ b/test/builtins/gen/round/106c0b.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void round_106c0b() {
   float4 res = rint(float4());
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner() {
   round_106c0b();
   return float4();
diff --git a/test/builtins/gen/round/1c7897.wgsl.expected.msl b/test/builtins/gen/round/1c7897.wgsl.expected.msl
index 305f9fef4f..85dda287ed 100644
--- a/test/builtins/gen/round/1c7897.wgsl.expected.msl
+++ b/test/builtins/gen/round/1c7897.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void round_1c7897() {
   float3 res = rint(float3());
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner() {
   round_1c7897();
   return float4();
diff --git a/test/builtins/gen/round/52c84d.wgsl.expected.msl b/test/builtins/gen/round/52c84d.wgsl.expected.msl
index 3f932059be..87e2b215f8 100644
--- a/test/builtins/gen/round/52c84d.wgsl.expected.msl
+++ b/test/builtins/gen/round/52c84d.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void round_52c84d() {
   float2 res = rint(float2());
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner() {
   round_52c84d();
   return float4();
diff --git a/test/builtins/gen/round/9edc38.wgsl.expected.msl b/test/builtins/gen/round/9edc38.wgsl.expected.msl
index 229b70827d..a3f14ae5ba 100644
--- a/test/builtins/gen/round/9edc38.wgsl.expected.msl
+++ b/test/builtins/gen/round/9edc38.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void round_9edc38() {
   float res = rint(1.0f);
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner() {
   round_9edc38();
   return float4();
diff --git a/test/builtins/gen/select/00b848.wgsl.expected.msl b/test/builtins/gen/select/00b848.wgsl.expected.msl
index 03f191d4be..79cd7058dd 100644
--- a/test/builtins/gen/select/00b848.wgsl.expected.msl
+++ b/test/builtins/gen/select/00b848.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void select_00b848() {
   int2 res = select(int2(), int2(), bool2());
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner() {
   select_00b848();
   return float4();
diff --git a/test/builtins/gen/select/01e2cd.wgsl.expected.msl b/test/builtins/gen/select/01e2cd.wgsl.expected.msl
index 2cef21af43..f7618aec63 100644
--- a/test/builtins/gen/select/01e2cd.wgsl.expected.msl
+++ b/test/builtins/gen/select/01e2cd.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void select_01e2cd() {
   int3 res = select(int3(), int3(), bool3());
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner() {
   select_01e2cd();
   return float4();
diff --git a/test/builtins/gen/select/087ea4.wgsl.expected.msl b/test/builtins/gen/select/087ea4.wgsl.expected.msl
index 05ab4d258d..4838d99ab8 100644
--- a/test/builtins/gen/select/087ea4.wgsl.expected.msl
+++ b/test/builtins/gen/select/087ea4.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void select_087ea4() {
   uint4 res = select(uint4(), uint4(), bool());
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner() {
   select_087ea4();
   return float4();
diff --git a/test/builtins/gen/select/1e960b.wgsl.expected.msl b/test/builtins/gen/select/1e960b.wgsl.expected.msl
index 08587c9cb8..87b11508d2 100644
--- a/test/builtins/gen/select/1e960b.wgsl.expected.msl
+++ b/test/builtins/gen/select/1e960b.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void select_1e960b() {
   uint2 res = select(uint2(), uint2(), bool2());
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner() {
   select_1e960b();
   return float4();
diff --git a/test/builtins/gen/select/266aff.wgsl.expected.msl b/test/builtins/gen/select/266aff.wgsl.expected.msl
index b822f689d1..56688e6b0e 100644
--- a/test/builtins/gen/select/266aff.wgsl.expected.msl
+++ b/test/builtins/gen/select/266aff.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void select_266aff() {
   float2 res = select(float2(), float2(), bool2());
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner() {
   select_266aff();
   return float4();
diff --git a/test/builtins/gen/select/28a27e.wgsl.expected.msl b/test/builtins/gen/select/28a27e.wgsl.expected.msl
index 6571af47eb..2e21e18b98 100644
--- a/test/builtins/gen/select/28a27e.wgsl.expected.msl
+++ b/test/builtins/gen/select/28a27e.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void select_28a27e() {
   uint3 res = select(uint3(), uint3(), bool3());
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner() {
   select_28a27e();
   return float4();
diff --git a/test/builtins/gen/select/3c25ce.wgsl.expected.msl b/test/builtins/gen/select/3c25ce.wgsl.expected.msl
index a0aea42fa3..8a73c3639b 100644
--- a/test/builtins/gen/select/3c25ce.wgsl.expected.msl
+++ b/test/builtins/gen/select/3c25ce.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void select_3c25ce() {
   bool3 res = select(bool3(), bool3(), bool());
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner() {
   select_3c25ce();
   return float4();
diff --git a/test/builtins/gen/select/416e14.wgsl.expected.msl b/test/builtins/gen/select/416e14.wgsl.expected.msl
index 798efaa4a6..1e57158875 100644
--- a/test/builtins/gen/select/416e14.wgsl.expected.msl
+++ b/test/builtins/gen/select/416e14.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void select_416e14() {
   float res = select(1.0f, 1.0f, bool());
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner() {
   select_416e14();
   return float4();
diff --git a/test/builtins/gen/select/51b047.wgsl.expected.msl b/test/builtins/gen/select/51b047.wgsl.expected.msl
index e6309d0d66..42e6e3af88 100644
--- a/test/builtins/gen/select/51b047.wgsl.expected.msl
+++ b/test/builtins/gen/select/51b047.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void select_51b047() {
   uint2 res = select(uint2(), uint2(), bool());
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner() {
   select_51b047();
   return float4();
diff --git a/test/builtins/gen/select/713567.wgsl.expected.msl b/test/builtins/gen/select/713567.wgsl.expected.msl
index 3130a7e34f..6767e85a83 100644
--- a/test/builtins/gen/select/713567.wgsl.expected.msl
+++ b/test/builtins/gen/select/713567.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void select_713567() {
   float4 res = select(float4(), float4(), bool());
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner() {
   select_713567();
   return float4();
diff --git a/test/builtins/gen/select/78be5f.wgsl.expected.msl b/test/builtins/gen/select/78be5f.wgsl.expected.msl
index 1cce498c8f..8c39ad3b71 100644
--- a/test/builtins/gen/select/78be5f.wgsl.expected.msl
+++ b/test/builtins/gen/select/78be5f.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void select_78be5f() {
   float3 res = select(float3(), float3(), bool());
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner() {
   select_78be5f();
   return float4();
diff --git a/test/builtins/gen/select/80a9a9.wgsl.expected.msl b/test/builtins/gen/select/80a9a9.wgsl.expected.msl
index dcc8d5d455..37b2e99851 100644
--- a/test/builtins/gen/select/80a9a9.wgsl.expected.msl
+++ b/test/builtins/gen/select/80a9a9.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void select_80a9a9() {
   bool3 res = select(bool3(), bool3(), bool3());
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner() {
   select_80a9a9();
   return float4();
diff --git a/test/builtins/gen/select/8fa62c.wgsl.expected.msl b/test/builtins/gen/select/8fa62c.wgsl.expected.msl
index f9d0f6facd..4c9e887dc1 100644
--- a/test/builtins/gen/select/8fa62c.wgsl.expected.msl
+++ b/test/builtins/gen/select/8fa62c.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void select_8fa62c() {
   int3 res = select(int3(), int3(), bool());
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner() {
   select_8fa62c();
   return float4();
diff --git a/test/builtins/gen/select/99f883.wgsl.expected.msl b/test/builtins/gen/select/99f883.wgsl.expected.msl
index 5e9591aa19..4234994b3d 100644
--- a/test/builtins/gen/select/99f883.wgsl.expected.msl
+++ b/test/builtins/gen/select/99f883.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void select_99f883() {
   uint res = select(1u, 1u, bool());
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner() {
   select_99f883();
   return float4();
diff --git a/test/builtins/gen/select/a2860e.wgsl.expected.msl b/test/builtins/gen/select/a2860e.wgsl.expected.msl
index 2d2e3225e1..c3b3db641a 100644
--- a/test/builtins/gen/select/a2860e.wgsl.expected.msl
+++ b/test/builtins/gen/select/a2860e.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void select_a2860e() {
   int4 res = select(int4(), int4(), bool4());
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner() {
   select_a2860e();
   return float4();
diff --git a/test/builtins/gen/select/ab069f.wgsl.expected.msl b/test/builtins/gen/select/ab069f.wgsl.expected.msl
index c94793795b..dd19206f24 100644
--- a/test/builtins/gen/select/ab069f.wgsl.expected.msl
+++ b/test/builtins/gen/select/ab069f.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void select_ab069f() {
   int4 res = select(int4(), int4(), bool());
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner() {
   select_ab069f();
   return float4();
diff --git a/test/builtins/gen/select/b04721.wgsl.expected.msl b/test/builtins/gen/select/b04721.wgsl.expected.msl
index 7a21e91aa5..2b88455ccc 100644
--- a/test/builtins/gen/select/b04721.wgsl.expected.msl
+++ b/test/builtins/gen/select/b04721.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void select_b04721() {
   uint3 res = select(uint3(), uint3(), bool());
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner() {
   select_b04721();
   return float4();
diff --git a/test/builtins/gen/select/bb447f.wgsl.expected.msl b/test/builtins/gen/select/bb447f.wgsl.expected.msl
index d242cd57d0..d1517c9e9a 100644
--- a/test/builtins/gen/select/bb447f.wgsl.expected.msl
+++ b/test/builtins/gen/select/bb447f.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void select_bb447f() {
   int2 res = select(int2(), int2(), bool());
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner() {
   select_bb447f();
   return float4();
diff --git a/test/builtins/gen/select/bb8aae.wgsl.expected.msl b/test/builtins/gen/select/bb8aae.wgsl.expected.msl
index 41a021b060..67c11796dd 100644
--- a/test/builtins/gen/select/bb8aae.wgsl.expected.msl
+++ b/test/builtins/gen/select/bb8aae.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void select_bb8aae() {
   float4 res = select(float4(), float4(), bool4());
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner() {
   select_bb8aae();
   return float4();
diff --git a/test/builtins/gen/select/bf3d29.wgsl.expected.msl b/test/builtins/gen/select/bf3d29.wgsl.expected.msl
index ba58d5b301..af8a59e521 100644
--- a/test/builtins/gen/select/bf3d29.wgsl.expected.msl
+++ b/test/builtins/gen/select/bf3d29.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void select_bf3d29() {
   float2 res = select(float2(), float2(), bool());
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner() {
   select_bf3d29();
   return float4();
diff --git a/test/builtins/gen/select/c31f9e.wgsl.expected.msl b/test/builtins/gen/select/c31f9e.wgsl.expected.msl
index bd1d3b9f1b..8e2a3b42e2 100644
--- a/test/builtins/gen/select/c31f9e.wgsl.expected.msl
+++ b/test/builtins/gen/select/c31f9e.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void select_c31f9e() {
   bool res = select(bool(), bool(), bool());
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner() {
   select_c31f9e();
   return float4();
diff --git a/test/builtins/gen/select/c41bd1.wgsl.expected.msl b/test/builtins/gen/select/c41bd1.wgsl.expected.msl
index 0f8e67b877..a344539080 100644
--- a/test/builtins/gen/select/c41bd1.wgsl.expected.msl
+++ b/test/builtins/gen/select/c41bd1.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void select_c41bd1() {
   bool4 res = select(bool4(), bool4(), bool());
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner() {
   select_c41bd1();
   return float4();
diff --git a/test/builtins/gen/select/c4a4ef.wgsl.expected.msl b/test/builtins/gen/select/c4a4ef.wgsl.expected.msl
index a963df9dbf..69830334c2 100644
--- a/test/builtins/gen/select/c4a4ef.wgsl.expected.msl
+++ b/test/builtins/gen/select/c4a4ef.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void select_c4a4ef() {
   uint4 res = select(uint4(), uint4(), bool4());
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner() {
   select_c4a4ef();
   return float4();
diff --git a/test/builtins/gen/select/cb9301.wgsl.expected.msl b/test/builtins/gen/select/cb9301.wgsl.expected.msl
index 4e4d9bd847..3854184a2f 100644
--- a/test/builtins/gen/select/cb9301.wgsl.expected.msl
+++ b/test/builtins/gen/select/cb9301.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void select_cb9301() {
   bool2 res = select(bool2(), bool2(), bool2());
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner() {
   select_cb9301();
   return float4();
diff --git a/test/builtins/gen/select/e3e028.wgsl.expected.msl b/test/builtins/gen/select/e3e028.wgsl.expected.msl
index 56f88a6f08..6ea09b4777 100644
--- a/test/builtins/gen/select/e3e028.wgsl.expected.msl
+++ b/test/builtins/gen/select/e3e028.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void select_e3e028() {
   bool4 res = select(bool4(), bool4(), bool4());
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner() {
   select_e3e028();
   return float4();
diff --git a/test/builtins/gen/select/ebfea2.wgsl.expected.msl b/test/builtins/gen/select/ebfea2.wgsl.expected.msl
index df91f64029..ad19ed3f8d 100644
--- a/test/builtins/gen/select/ebfea2.wgsl.expected.msl
+++ b/test/builtins/gen/select/ebfea2.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void select_ebfea2() {
   float3 res = select(float3(), float3(), bool3());
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner() {
   select_ebfea2();
   return float4();
diff --git a/test/builtins/gen/select/ed8a15.wgsl.expected.msl b/test/builtins/gen/select/ed8a15.wgsl.expected.msl
index 75aa87d0b8..86b86d5262 100644
--- a/test/builtins/gen/select/ed8a15.wgsl.expected.msl
+++ b/test/builtins/gen/select/ed8a15.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void select_ed8a15() {
   int res = select(1, 1, bool());
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner() {
   select_ed8a15();
   return float4();
diff --git a/test/builtins/gen/select/fb7e53.wgsl.expected.msl b/test/builtins/gen/select/fb7e53.wgsl.expected.msl
index ced4250158..7bd77e5ef3 100644
--- a/test/builtins/gen/select/fb7e53.wgsl.expected.msl
+++ b/test/builtins/gen/select/fb7e53.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void select_fb7e53() {
   bool2 res = select(bool2(), bool2(), bool());
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner() {
   select_fb7e53();
   return float4();
diff --git a/test/builtins/gen/sign/159665.wgsl.expected.msl b/test/builtins/gen/sign/159665.wgsl.expected.msl
index 4c75814e0c..2ab6b4f438 100644
--- a/test/builtins/gen/sign/159665.wgsl.expected.msl
+++ b/test/builtins/gen/sign/159665.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void sign_159665() {
   float3 res = sign(float3());
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner() {
   sign_159665();
   return float4();
diff --git a/test/builtins/gen/sign/b8f634.wgsl.expected.msl b/test/builtins/gen/sign/b8f634.wgsl.expected.msl
index b5b2a47f00..70a13b58eb 100644
--- a/test/builtins/gen/sign/b8f634.wgsl.expected.msl
+++ b/test/builtins/gen/sign/b8f634.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void sign_b8f634() {
   float4 res = sign(float4());
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner() {
   sign_b8f634();
   return float4();
diff --git a/test/builtins/gen/sign/d065d8.wgsl.expected.msl b/test/builtins/gen/sign/d065d8.wgsl.expected.msl
index f445351da8..2fd18968f8 100644
--- a/test/builtins/gen/sign/d065d8.wgsl.expected.msl
+++ b/test/builtins/gen/sign/d065d8.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void sign_d065d8() {
   float2 res = sign(float2());
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner() {
   sign_d065d8();
   return float4();
diff --git a/test/builtins/gen/sign/dd790e.wgsl.expected.msl b/test/builtins/gen/sign/dd790e.wgsl.expected.msl
index a3bb007860..655bb10e42 100644
--- a/test/builtins/gen/sign/dd790e.wgsl.expected.msl
+++ b/test/builtins/gen/sign/dd790e.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void sign_dd790e() {
   float res = sign(1.0f);
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner() {
   sign_dd790e();
   return float4();
diff --git a/test/builtins/gen/sin/01f241.wgsl.expected.msl b/test/builtins/gen/sin/01f241.wgsl.expected.msl
index 7f4629a5cd..af988a628c 100644
--- a/test/builtins/gen/sin/01f241.wgsl.expected.msl
+++ b/test/builtins/gen/sin/01f241.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void sin_01f241() {
   float3 res = sin(float3());
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner() {
   sin_01f241();
   return float4();
diff --git a/test/builtins/gen/sin/4e3979.wgsl.expected.msl b/test/builtins/gen/sin/4e3979.wgsl.expected.msl
index 5677bfe7db..90f5a93970 100644
--- a/test/builtins/gen/sin/4e3979.wgsl.expected.msl
+++ b/test/builtins/gen/sin/4e3979.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void sin_4e3979() {
   float4 res = sin(float4());
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner() {
   sin_4e3979();
   return float4();
diff --git a/test/builtins/gen/sin/b78c91.wgsl.expected.msl b/test/builtins/gen/sin/b78c91.wgsl.expected.msl
index 2a253a781f..b54d4fb8dd 100644
--- a/test/builtins/gen/sin/b78c91.wgsl.expected.msl
+++ b/test/builtins/gen/sin/b78c91.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void sin_b78c91() {
   float res = sin(1.0f);
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner() {
   sin_b78c91();
   return float4();
diff --git a/test/builtins/gen/sin/fc8bc4.wgsl.expected.msl b/test/builtins/gen/sin/fc8bc4.wgsl.expected.msl
index d0767a654e..78417e907b 100644
--- a/test/builtins/gen/sin/fc8bc4.wgsl.expected.msl
+++ b/test/builtins/gen/sin/fc8bc4.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void sin_fc8bc4() {
   float2 res = sin(float2());
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner() {
   sin_fc8bc4();
   return float4();
diff --git a/test/builtins/gen/sinh/445e33.wgsl.expected.msl b/test/builtins/gen/sinh/445e33.wgsl.expected.msl
index ee93c86d6a..3361ddda53 100644
--- a/test/builtins/gen/sinh/445e33.wgsl.expected.msl
+++ b/test/builtins/gen/sinh/445e33.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void sinh_445e33() {
   float4 res = sinh(float4());
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner() {
   sinh_445e33();
   return float4();
diff --git a/test/builtins/gen/sinh/7bb598.wgsl.expected.msl b/test/builtins/gen/sinh/7bb598.wgsl.expected.msl
index 5fa463b147..52830a8c4d 100644
--- a/test/builtins/gen/sinh/7bb598.wgsl.expected.msl
+++ b/test/builtins/gen/sinh/7bb598.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void sinh_7bb598() {
   float res = sinh(1.0f);
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner() {
   sinh_7bb598();
   return float4();
diff --git a/test/builtins/gen/sinh/b9860e.wgsl.expected.msl b/test/builtins/gen/sinh/b9860e.wgsl.expected.msl
index 5a9085d9a0..ca6289a0e9 100644
--- a/test/builtins/gen/sinh/b9860e.wgsl.expected.msl
+++ b/test/builtins/gen/sinh/b9860e.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void sinh_b9860e() {
   float2 res = sinh(float2());
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner() {
   sinh_b9860e();
   return float4();
diff --git a/test/builtins/gen/sinh/c9a5eb.wgsl.expected.msl b/test/builtins/gen/sinh/c9a5eb.wgsl.expected.msl
index 9526f425f5..c9d2bb5b81 100644
--- a/test/builtins/gen/sinh/c9a5eb.wgsl.expected.msl
+++ b/test/builtins/gen/sinh/c9a5eb.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void sinh_c9a5eb() {
   float3 res = sinh(float3());
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner() {
   sinh_c9a5eb();
   return float4();
diff --git a/test/builtins/gen/smoothStep/5f615b.wgsl.expected.msl b/test/builtins/gen/smoothStep/5f615b.wgsl.expected.msl
index cad5dfe417..152ed83a2f 100644
--- a/test/builtins/gen/smoothStep/5f615b.wgsl.expected.msl
+++ b/test/builtins/gen/smoothStep/5f615b.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void smoothStep_5f615b() {
   float4 res = smoothstep(float4(), float4(), float4());
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner() {
   smoothStep_5f615b();
   return float4();
diff --git a/test/builtins/gen/smoothStep/658be3.wgsl.expected.msl b/test/builtins/gen/smoothStep/658be3.wgsl.expected.msl
index 7401ef0875..8ab1665fa1 100644
--- a/test/builtins/gen/smoothStep/658be3.wgsl.expected.msl
+++ b/test/builtins/gen/smoothStep/658be3.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void smoothStep_658be3() {
   float3 res = smoothstep(float3(), float3(), float3());
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner() {
   smoothStep_658be3();
   return float4();
diff --git a/test/builtins/gen/smoothStep/c11eef.wgsl.expected.msl b/test/builtins/gen/smoothStep/c11eef.wgsl.expected.msl
index 314e298d5d..7ccef35b56 100644
--- a/test/builtins/gen/smoothStep/c11eef.wgsl.expected.msl
+++ b/test/builtins/gen/smoothStep/c11eef.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void smoothStep_c11eef() {
   float2 res = smoothstep(float2(), float2(), float2());
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner() {
   smoothStep_c11eef();
   return float4();
diff --git a/test/builtins/gen/smoothStep/cb0bfb.wgsl.expected.msl b/test/builtins/gen/smoothStep/cb0bfb.wgsl.expected.msl
index 12a37fbd66..0207382bad 100644
--- a/test/builtins/gen/smoothStep/cb0bfb.wgsl.expected.msl
+++ b/test/builtins/gen/smoothStep/cb0bfb.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void smoothStep_cb0bfb() {
   float res = smoothstep(1.0f, 1.0f, 1.0f);
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner() {
   smoothStep_cb0bfb();
   return float4();
diff --git a/test/builtins/gen/sqrt/20c74e.wgsl.expected.msl b/test/builtins/gen/sqrt/20c74e.wgsl.expected.msl
index 81184ee340..3a8c9e7c6a 100644
--- a/test/builtins/gen/sqrt/20c74e.wgsl.expected.msl
+++ b/test/builtins/gen/sqrt/20c74e.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void sqrt_20c74e() {
   float res = sqrt(1.0f);
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner() {
   sqrt_20c74e();
   return float4();
diff --git a/test/builtins/gen/sqrt/8c7024.wgsl.expected.msl b/test/builtins/gen/sqrt/8c7024.wgsl.expected.msl
index 3636dcc072..ae85d89233 100644
--- a/test/builtins/gen/sqrt/8c7024.wgsl.expected.msl
+++ b/test/builtins/gen/sqrt/8c7024.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void sqrt_8c7024() {
   float2 res = sqrt(float2());
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner() {
   sqrt_8c7024();
   return float4();
diff --git a/test/builtins/gen/sqrt/aa0d7a.wgsl.expected.msl b/test/builtins/gen/sqrt/aa0d7a.wgsl.expected.msl
index 44625967d0..08b1222327 100644
--- a/test/builtins/gen/sqrt/aa0d7a.wgsl.expected.msl
+++ b/test/builtins/gen/sqrt/aa0d7a.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void sqrt_aa0d7a() {
   float4 res = sqrt(float4());
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner() {
   sqrt_aa0d7a();
   return float4();
diff --git a/test/builtins/gen/sqrt/f8c59a.wgsl.expected.msl b/test/builtins/gen/sqrt/f8c59a.wgsl.expected.msl
index b61342ce9d..d93e68d0e7 100644
--- a/test/builtins/gen/sqrt/f8c59a.wgsl.expected.msl
+++ b/test/builtins/gen/sqrt/f8c59a.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void sqrt_f8c59a() {
   float3 res = sqrt(float3());
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner() {
   sqrt_f8c59a();
   return float4();
diff --git a/test/builtins/gen/step/0b073b.wgsl.expected.msl b/test/builtins/gen/step/0b073b.wgsl.expected.msl
index 83bba3bee0..60774de513 100644
--- a/test/builtins/gen/step/0b073b.wgsl.expected.msl
+++ b/test/builtins/gen/step/0b073b.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void step_0b073b() {
   float res = step(1.0f, 1.0f);
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner() {
   step_0b073b();
   return float4();
diff --git a/test/builtins/gen/step/19accd.wgsl.expected.msl b/test/builtins/gen/step/19accd.wgsl.expected.msl
index fac1cc2329..44dd9ebe5c 100644
--- a/test/builtins/gen/step/19accd.wgsl.expected.msl
+++ b/test/builtins/gen/step/19accd.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void step_19accd() {
   float2 res = step(float2(), float2());
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner() {
   step_19accd();
   return float4();
diff --git a/test/builtins/gen/step/334303.wgsl.expected.msl b/test/builtins/gen/step/334303.wgsl.expected.msl
index e6d7c41ea9..2df2377cf0 100644
--- a/test/builtins/gen/step/334303.wgsl.expected.msl
+++ b/test/builtins/gen/step/334303.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void step_334303() {
   float3 res = step(float3(), float3());
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner() {
   step_334303();
   return float4();
diff --git a/test/builtins/gen/step/e2b337.wgsl.expected.msl b/test/builtins/gen/step/e2b337.wgsl.expected.msl
index 84639338a7..7babb88532 100644
--- a/test/builtins/gen/step/e2b337.wgsl.expected.msl
+++ b/test/builtins/gen/step/e2b337.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void step_e2b337() {
   float4 res = step(float4(), float4());
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner() {
   step_e2b337();
   return float4();
diff --git a/test/builtins/gen/tan/244e2a.wgsl.expected.msl b/test/builtins/gen/tan/244e2a.wgsl.expected.msl
index 962c601d93..64ec9bcf1f 100644
--- a/test/builtins/gen/tan/244e2a.wgsl.expected.msl
+++ b/test/builtins/gen/tan/244e2a.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void tan_244e2a() {
   float4 res = tan(float4());
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner() {
   tan_244e2a();
   return float4();
diff --git a/test/builtins/gen/tan/2f030e.wgsl.expected.msl b/test/builtins/gen/tan/2f030e.wgsl.expected.msl
index 7a69f2c9e9..63bec4593f 100644
--- a/test/builtins/gen/tan/2f030e.wgsl.expected.msl
+++ b/test/builtins/gen/tan/2f030e.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void tan_2f030e() {
   float res = tan(1.0f);
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner() {
   tan_2f030e();
   return float4();
diff --git a/test/builtins/gen/tan/7ea104.wgsl.expected.msl b/test/builtins/gen/tan/7ea104.wgsl.expected.msl
index 45a9ab3351..3be2db34ac 100644
--- a/test/builtins/gen/tan/7ea104.wgsl.expected.msl
+++ b/test/builtins/gen/tan/7ea104.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void tan_7ea104() {
   float3 res = tan(float3());
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner() {
   tan_7ea104();
   return float4();
diff --git a/test/builtins/gen/tan/8ce3e9.wgsl.expected.msl b/test/builtins/gen/tan/8ce3e9.wgsl.expected.msl
index bdb9257c3d..92e515caa9 100644
--- a/test/builtins/gen/tan/8ce3e9.wgsl.expected.msl
+++ b/test/builtins/gen/tan/8ce3e9.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void tan_8ce3e9() {
   float2 res = tan(float2());
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner() {
   tan_8ce3e9();
   return float4();
diff --git a/test/builtins/gen/tanh/5663c5.wgsl.expected.msl b/test/builtins/gen/tanh/5663c5.wgsl.expected.msl
index 664ac5b801..4272f820a6 100644
--- a/test/builtins/gen/tanh/5663c5.wgsl.expected.msl
+++ b/test/builtins/gen/tanh/5663c5.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void tanh_5663c5() {
   float4 res = tanh(float4());
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner() {
   tanh_5663c5();
   return float4();
diff --git a/test/builtins/gen/tanh/5724b3.wgsl.expected.msl b/test/builtins/gen/tanh/5724b3.wgsl.expected.msl
index 9c87d676db..bee133bf8f 100644
--- a/test/builtins/gen/tanh/5724b3.wgsl.expected.msl
+++ b/test/builtins/gen/tanh/5724b3.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void tanh_5724b3() {
   float2 res = tanh(float2());
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner() {
   tanh_5724b3();
   return float4();
diff --git a/test/builtins/gen/tanh/9f9fb9.wgsl.expected.msl b/test/builtins/gen/tanh/9f9fb9.wgsl.expected.msl
index 7a3fb852b4..47a61a0adf 100644
--- a/test/builtins/gen/tanh/9f9fb9.wgsl.expected.msl
+++ b/test/builtins/gen/tanh/9f9fb9.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void tanh_9f9fb9() {
   float3 res = tanh(float3());
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner() {
   tanh_9f9fb9();
   return float4();
diff --git a/test/builtins/gen/tanh/c15fdb.wgsl.expected.msl b/test/builtins/gen/tanh/c15fdb.wgsl.expected.msl
index 9b20d17b32..b9400e8ea4 100644
--- a/test/builtins/gen/tanh/c15fdb.wgsl.expected.msl
+++ b/test/builtins/gen/tanh/c15fdb.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void tanh_c15fdb() {
   float res = tanh(1.0f);
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner() {
   tanh_c15fdb();
   return float4();
diff --git a/test/builtins/gen/textureDimensions/002b2a.wgsl.expected.msl b/test/builtins/gen/textureDimensions/002b2a.wgsl.expected.msl
index 97cec1c72d..7e980a0945 100644
--- a/test/builtins/gen/textureDimensions/002b2a.wgsl.expected.msl
+++ b/test/builtins/gen/textureDimensions/002b2a.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void textureDimensions_002b2a(texture1d<float, access::sample> tint_symbol_1) {
   int res = int(tint_symbol_1.get_width(0));
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner(texture1d<float, access::sample> tint_symbol_2) {
   textureDimensions_002b2a(tint_symbol_2);
   return float4();
diff --git a/test/builtins/gen/textureDimensions/012b82.wgsl.expected.msl b/test/builtins/gen/textureDimensions/012b82.wgsl.expected.msl
index 5a6992cf98..2eedc2fca9 100644
--- a/test/builtins/gen/textureDimensions/012b82.wgsl.expected.msl
+++ b/test/builtins/gen/textureDimensions/012b82.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void textureDimensions_012b82(texture2d_array<int, access::write> tint_symbol_1) {
   int2 res = int2(tint_symbol_1.get_width(), tint_symbol_1.get_height());
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner(texture2d_array<int, access::write> tint_symbol_2) {
   textureDimensions_012b82(tint_symbol_2);
   return float4();
diff --git a/test/builtins/gen/textureDimensions/08753d.wgsl.expected.msl b/test/builtins/gen/textureDimensions/08753d.wgsl.expected.msl
index 92557a7961..b17a320d5b 100644
--- a/test/builtins/gen/textureDimensions/08753d.wgsl.expected.msl
+++ b/test/builtins/gen/textureDimensions/08753d.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void textureDimensions_08753d(texture1d<int, access::write> tint_symbol_1) {
   int res = int(tint_symbol_1.get_width(0));
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner(texture1d<int, access::write> tint_symbol_2) {
   textureDimensions_08753d(tint_symbol_2);
   return float4();
diff --git a/test/builtins/gen/textureDimensions/0c4772.wgsl.expected.msl b/test/builtins/gen/textureDimensions/0c4772.wgsl.expected.msl
index 640ff5110c..f44d72ecc6 100644
--- a/test/builtins/gen/textureDimensions/0c4772.wgsl.expected.msl
+++ b/test/builtins/gen/textureDimensions/0c4772.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void textureDimensions_0c4772(texture3d<float, access::write> tint_symbol_1) {
   int3 res = int3(tint_symbol_1.get_width(), tint_symbol_1.get_height(), tint_symbol_1.get_depth());
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner(texture3d<float, access::write> tint_symbol_2) {
   textureDimensions_0c4772(tint_symbol_2);
   return float4();
diff --git a/test/builtins/gen/textureDimensions/0cce40.wgsl.expected.msl b/test/builtins/gen/textureDimensions/0cce40.wgsl.expected.msl
index 6718be01fb..c2d4cceed6 100644
--- a/test/builtins/gen/textureDimensions/0cce40.wgsl.expected.msl
+++ b/test/builtins/gen/textureDimensions/0cce40.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void textureDimensions_0cce40(texture1d<int, access::write> tint_symbol_1) {
   int res = int(tint_symbol_1.get_width(0));
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner(texture1d<int, access::write> tint_symbol_2) {
   textureDimensions_0cce40(tint_symbol_2);
   return float4();
diff --git a/test/builtins/gen/textureDimensions/0cf2ff.wgsl.expected.msl b/test/builtins/gen/textureDimensions/0cf2ff.wgsl.expected.msl
index 676d1ed45a..f1bd381b91 100644
--- a/test/builtins/gen/textureDimensions/0cf2ff.wgsl.expected.msl
+++ b/test/builtins/gen/textureDimensions/0cf2ff.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void textureDimensions_0cf2ff(texture2d<uint, access::write> tint_symbol_1) {
   int2 res = int2(tint_symbol_1.get_width(), tint_symbol_1.get_height());
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner(texture2d<uint, access::write> tint_symbol_2) {
   textureDimensions_0cf2ff(tint_symbol_2);
   return float4();
diff --git a/test/builtins/gen/textureDimensions/0d8b7e.wgsl.expected.msl b/test/builtins/gen/textureDimensions/0d8b7e.wgsl.expected.msl
index 365e34ef86..3470bd7e14 100644
--- a/test/builtins/gen/textureDimensions/0d8b7e.wgsl.expected.msl
+++ b/test/builtins/gen/textureDimensions/0d8b7e.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void textureDimensions_0d8b7e(texture2d_array<uint, access::write> tint_symbol_1) {
   int2 res = int2(tint_symbol_1.get_width(), tint_symbol_1.get_height());
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner(texture2d_array<uint, access::write> tint_symbol_2) {
   textureDimensions_0d8b7e(tint_symbol_2);
   return float4();
diff --git a/test/builtins/gen/textureDimensions/0e32ee.wgsl.expected.msl b/test/builtins/gen/textureDimensions/0e32ee.wgsl.expected.msl
index ab2c649bd5..1b58235cbf 100644
--- a/test/builtins/gen/textureDimensions/0e32ee.wgsl.expected.msl
+++ b/test/builtins/gen/textureDimensions/0e32ee.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void textureDimensions_0e32ee(texture3d<uint, access::write> tint_symbol_1) {
   int3 res = int3(tint_symbol_1.get_width(), tint_symbol_1.get_height(), tint_symbol_1.get_depth());
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner(texture3d<uint, access::write> tint_symbol_2) {
   textureDimensions_0e32ee(tint_symbol_2);
   return float4();
diff --git a/test/builtins/gen/textureDimensions/0f3c50.wgsl.expected.msl b/test/builtins/gen/textureDimensions/0f3c50.wgsl.expected.msl
index 20a7f399a5..86e7f0d8a6 100644
--- a/test/builtins/gen/textureDimensions/0f3c50.wgsl.expected.msl
+++ b/test/builtins/gen/textureDimensions/0f3c50.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void textureDimensions_0f3c50(texture2d_array<int, access::sample> tint_symbol_1) {
   int2 res = int2(tint_symbol_1.get_width(), tint_symbol_1.get_height());
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner(texture2d_array<int, access::sample> tint_symbol_2) {
   textureDimensions_0f3c50(tint_symbol_2);
   return float4();
diff --git a/test/builtins/gen/textureDimensions/1191a5.wgsl.expected.msl b/test/builtins/gen/textureDimensions/1191a5.wgsl.expected.msl
index f6268f210c..931111f502 100644
--- a/test/builtins/gen/textureDimensions/1191a5.wgsl.expected.msl
+++ b/test/builtins/gen/textureDimensions/1191a5.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void textureDimensions_1191a5(texture2d<uint, access::sample> tint_symbol_1) {
   int2 res = int2(tint_symbol_1.get_width(), tint_symbol_1.get_height());
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner(texture2d<uint, access::sample> tint_symbol_2) {
   textureDimensions_1191a5(tint_symbol_2);
   return float4();
diff --git a/test/builtins/gen/textureDimensions/12c9bb.wgsl.expected.msl b/test/builtins/gen/textureDimensions/12c9bb.wgsl.expected.msl
index b3f3f59a32..d70293b962 100644
--- a/test/builtins/gen/textureDimensions/12c9bb.wgsl.expected.msl
+++ b/test/builtins/gen/textureDimensions/12c9bb.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void textureDimensions_12c9bb(depth2d<float, access::sample> tint_symbol_1) {
   int2 res = int2(tint_symbol_1.get_width(0), tint_symbol_1.get_height(0));
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner(depth2d<float, access::sample> tint_symbol_2) {
   textureDimensions_12c9bb(tint_symbol_2);
   return float4();
diff --git a/test/builtins/gen/textureDimensions/147998.wgsl.expected.msl b/test/builtins/gen/textureDimensions/147998.wgsl.expected.msl
index c350f80137..442985e860 100644
--- a/test/builtins/gen/textureDimensions/147998.wgsl.expected.msl
+++ b/test/builtins/gen/textureDimensions/147998.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void textureDimensions_147998(texture2d<float, access::write> tint_symbol_1) {
   int2 res = int2(tint_symbol_1.get_width(), tint_symbol_1.get_height());
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner(texture2d<float, access::write> tint_symbol_2) {
   textureDimensions_147998(tint_symbol_2);
   return float4();
diff --git a/test/builtins/gen/textureDimensions/16036c.wgsl.expected.msl b/test/builtins/gen/textureDimensions/16036c.wgsl.expected.msl
index ed7ed8d1bd..f8656f6dd6 100644
--- a/test/builtins/gen/textureDimensions/16036c.wgsl.expected.msl
+++ b/test/builtins/gen/textureDimensions/16036c.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void textureDimensions_16036c(texture2d_array<int, access::write> tint_symbol_1) {
   int2 res = int2(tint_symbol_1.get_width(), tint_symbol_1.get_height());
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner(texture2d_array<int, access::write> tint_symbol_2) {
   textureDimensions_16036c(tint_symbol_2);
   return float4();
diff --git a/test/builtins/gen/textureDimensions/1b71f0.wgsl.expected.msl b/test/builtins/gen/textureDimensions/1b71f0.wgsl.expected.msl
index 3a0980decd..54e8e1256d 100644
--- a/test/builtins/gen/textureDimensions/1b71f0.wgsl.expected.msl
+++ b/test/builtins/gen/textureDimensions/1b71f0.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void textureDimensions_1b71f0(texture3d<int, access::write> tint_symbol_1) {
   int3 res = int3(tint_symbol_1.get_width(), tint_symbol_1.get_height(), tint_symbol_1.get_depth());
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner(texture3d<int, access::write> tint_symbol_2) {
   textureDimensions_1b71f0(tint_symbol_2);
   return float4();
diff --git a/test/builtins/gen/textureDimensions/1d6c26.wgsl.expected.msl b/test/builtins/gen/textureDimensions/1d6c26.wgsl.expected.msl
index 6336706b32..ba2b6292db 100644
--- a/test/builtins/gen/textureDimensions/1d6c26.wgsl.expected.msl
+++ b/test/builtins/gen/textureDimensions/1d6c26.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void textureDimensions_1d6c26(texture2d_array<float, access::write> tint_symbol_1) {
   int2 res = int2(tint_symbol_1.get_width(), tint_symbol_1.get_height());
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner(texture2d_array<float, access::write> tint_symbol_2) {
   textureDimensions_1d6c26(tint_symbol_2);
   return float4();
diff --git a/test/builtins/gen/textureDimensions/1e9e39.wgsl.expected.msl b/test/builtins/gen/textureDimensions/1e9e39.wgsl.expected.msl
index 37bf3f3d71..c6219c278b 100644
--- a/test/builtins/gen/textureDimensions/1e9e39.wgsl.expected.msl
+++ b/test/builtins/gen/textureDimensions/1e9e39.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void textureDimensions_1e9e39(texture1d<float, access::write> tint_symbol_1) {
   int res = int(tint_symbol_1.get_width(0));
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner(texture1d<float, access::write> tint_symbol_2) {
   textureDimensions_1e9e39(tint_symbol_2);
   return float4();
diff --git a/test/builtins/gen/textureDimensions/1f20c5.wgsl.expected.msl b/test/builtins/gen/textureDimensions/1f20c5.wgsl.expected.msl
index c3196ad60f..8d7cbc489b 100644
--- a/test/builtins/gen/textureDimensions/1f20c5.wgsl.expected.msl
+++ b/test/builtins/gen/textureDimensions/1f20c5.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void textureDimensions_1f20c5(texture2d_array<uint, access::sample> tint_symbol_1) {
   int2 res = int2(tint_symbol_1.get_width(), tint_symbol_1.get_height());
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner(texture2d_array<uint, access::sample> tint_symbol_2) {
   textureDimensions_1f20c5(tint_symbol_2);
   return float4();
diff --git a/test/builtins/gen/textureDimensions/214dd4.wgsl.expected.msl b/test/builtins/gen/textureDimensions/214dd4.wgsl.expected.msl
index 36ddac323b..dcda00a789 100644
--- a/test/builtins/gen/textureDimensions/214dd4.wgsl.expected.msl
+++ b/test/builtins/gen/textureDimensions/214dd4.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void textureDimensions_214dd4(texture3d<int, access::write> tint_symbol_1) {
   int3 res = int3(tint_symbol_1.get_width(), tint_symbol_1.get_height(), tint_symbol_1.get_depth());
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner(texture3d<int, access::write> tint_symbol_2) {
   textureDimensions_214dd4(tint_symbol_2);
   return float4();
diff --git a/test/builtins/gen/textureDimensions/221f22.wgsl.expected.msl b/test/builtins/gen/textureDimensions/221f22.wgsl.expected.msl
index 4007f21d32..b482e8d65c 100644
--- a/test/builtins/gen/textureDimensions/221f22.wgsl.expected.msl
+++ b/test/builtins/gen/textureDimensions/221f22.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void textureDimensions_221f22(texturecube_array<int, access::sample> tint_symbol_1) {
   int2 res = int2(tint_symbol_1.get_width(0), tint_symbol_1.get_height(0));
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner(texturecube_array<int, access::sample> tint_symbol_2) {
   textureDimensions_221f22(tint_symbol_2);
   return float4();
diff --git a/test/builtins/gen/textureDimensions/267788.wgsl.expected.msl b/test/builtins/gen/textureDimensions/267788.wgsl.expected.msl
index 0f21f84189..3590ad73a2 100644
--- a/test/builtins/gen/textureDimensions/267788.wgsl.expected.msl
+++ b/test/builtins/gen/textureDimensions/267788.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void textureDimensions_267788(texture2d_array<uint, access::sample> tint_symbol_1) {
   int2 res = int2(tint_symbol_1.get_width(0), tint_symbol_1.get_height(0));
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner(texture2d_array<uint, access::sample> tint_symbol_2) {
   textureDimensions_267788(tint_symbol_2);
   return float4();
diff --git a/test/builtins/gen/textureDimensions/26bdfa.wgsl.expected.msl b/test/builtins/gen/textureDimensions/26bdfa.wgsl.expected.msl
index d65df2399f..862a81e715 100644
--- a/test/builtins/gen/textureDimensions/26bdfa.wgsl.expected.msl
+++ b/test/builtins/gen/textureDimensions/26bdfa.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void textureDimensions_26bdfa(texture3d<float, access::sample> tint_symbol_1) {
   int3 res = int3(tint_symbol_1.get_width(0), tint_symbol_1.get_height(0), tint_symbol_1.get_depth(0));
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner(texture3d<float, access::sample> tint_symbol_2) {
   textureDimensions_26bdfa(tint_symbol_2);
   return float4();
diff --git a/test/builtins/gen/textureDimensions/26ef6c.wgsl.expected.msl b/test/builtins/gen/textureDimensions/26ef6c.wgsl.expected.msl
index 692a2be410..14cfc8ca13 100644
--- a/test/builtins/gen/textureDimensions/26ef6c.wgsl.expected.msl
+++ b/test/builtins/gen/textureDimensions/26ef6c.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void textureDimensions_26ef6c(texture2d_array<uint, access::write> tint_symbol_1) {
   int2 res = int2(tint_symbol_1.get_width(), tint_symbol_1.get_height());
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner(texture2d_array<uint, access::write> tint_symbol_2) {
   textureDimensions_26ef6c(tint_symbol_2);
   return float4();
diff --git a/test/builtins/gen/textureDimensions/2ad087.wgsl.expected.msl b/test/builtins/gen/textureDimensions/2ad087.wgsl.expected.msl
index 48b104f77d..848bc3b8d8 100644
--- a/test/builtins/gen/textureDimensions/2ad087.wgsl.expected.msl
+++ b/test/builtins/gen/textureDimensions/2ad087.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void textureDimensions_2ad087(texture2d<int, access::write> tint_symbol_1) {
   int2 res = int2(tint_symbol_1.get_width(), tint_symbol_1.get_height());
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner(texture2d<int, access::write> tint_symbol_2) {
   textureDimensions_2ad087(tint_symbol_2);
   return float4();
diff --git a/test/builtins/gen/textureDimensions/2efa05.wgsl.expected.msl b/test/builtins/gen/textureDimensions/2efa05.wgsl.expected.msl
index 370a66e853..85bf657323 100644
--- a/test/builtins/gen/textureDimensions/2efa05.wgsl.expected.msl
+++ b/test/builtins/gen/textureDimensions/2efa05.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void textureDimensions_2efa05(texture3d<uint, access::sample> tint_symbol_1) {
   int3 res = int3(tint_symbol_1.get_width(0), tint_symbol_1.get_height(0), tint_symbol_1.get_depth(0));
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner(texture3d<uint, access::sample> tint_symbol_2) {
   textureDimensions_2efa05(tint_symbol_2);
   return float4();
diff --git a/test/builtins/gen/textureDimensions/2f289f.wgsl.expected.msl b/test/builtins/gen/textureDimensions/2f289f.wgsl.expected.msl
index b1daa7edfa..cd44b36b9f 100644
--- a/test/builtins/gen/textureDimensions/2f289f.wgsl.expected.msl
+++ b/test/builtins/gen/textureDimensions/2f289f.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void textureDimensions_2f289f(texture3d<int, access::write> tint_symbol_1) {
   int3 res = int3(tint_symbol_1.get_width(), tint_symbol_1.get_height(), tint_symbol_1.get_depth());
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner(texture3d<int, access::write> tint_symbol_2) {
   textureDimensions_2f289f(tint_symbol_2);
   return float4();
diff --git a/test/builtins/gen/textureDimensions/2fe1cc.wgsl.expected.msl b/test/builtins/gen/textureDimensions/2fe1cc.wgsl.expected.msl
index 72a77bc4c4..28214cb859 100644
--- a/test/builtins/gen/textureDimensions/2fe1cc.wgsl.expected.msl
+++ b/test/builtins/gen/textureDimensions/2fe1cc.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void textureDimensions_2fe1cc(texture2d<float, access::sample> tint_symbol_1) {
   int2 res = int2(tint_symbol_1.get_width(0), tint_symbol_1.get_height(0));
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner(texture2d<float, access::sample> tint_symbol_2) {
   textureDimensions_2fe1cc(tint_symbol_2);
   return float4();
diff --git a/test/builtins/gen/textureDimensions/318ecc.wgsl.expected.msl b/test/builtins/gen/textureDimensions/318ecc.wgsl.expected.msl
index 577e060fd1..d98992ed86 100644
--- a/test/builtins/gen/textureDimensions/318ecc.wgsl.expected.msl
+++ b/test/builtins/gen/textureDimensions/318ecc.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void textureDimensions_318ecc(texture1d<uint, access::write> tint_symbol_1) {
   int res = int(tint_symbol_1.get_width(0));
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner(texture1d<uint, access::write> tint_symbol_2) {
   textureDimensions_318ecc(tint_symbol_2);
   return float4();
diff --git a/test/builtins/gen/textureDimensions/340d06.wgsl.expected.msl b/test/builtins/gen/textureDimensions/340d06.wgsl.expected.msl
index 605424a339..bb2348a3ef 100644
--- a/test/builtins/gen/textureDimensions/340d06.wgsl.expected.msl
+++ b/test/builtins/gen/textureDimensions/340d06.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void textureDimensions_340d06(texture3d<uint, access::write> tint_symbol_1) {
   int3 res = int3(tint_symbol_1.get_width(), tint_symbol_1.get_height(), tint_symbol_1.get_depth());
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner(texture3d<uint, access::write> tint_symbol_2) {
   textureDimensions_340d06(tint_symbol_2);
   return float4();
diff --git a/test/builtins/gen/textureDimensions/398e30.wgsl.expected.msl b/test/builtins/gen/textureDimensions/398e30.wgsl.expected.msl
index 65ea6c2e6b..a2bff50d18 100644
--- a/test/builtins/gen/textureDimensions/398e30.wgsl.expected.msl
+++ b/test/builtins/gen/textureDimensions/398e30.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void textureDimensions_398e30(texture2d_array<uint, access::write> tint_symbol_1) {
   int2 res = int2(tint_symbol_1.get_width(), tint_symbol_1.get_height());
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner(texture2d_array<uint, access::write> tint_symbol_2) {
   textureDimensions_398e30(tint_symbol_2);
   return float4();
diff --git a/test/builtins/gen/textureDimensions/3a94ea.wgsl.expected.msl b/test/builtins/gen/textureDimensions/3a94ea.wgsl.expected.msl
index 964cf0660e..512103551a 100644
--- a/test/builtins/gen/textureDimensions/3a94ea.wgsl.expected.msl
+++ b/test/builtins/gen/textureDimensions/3a94ea.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void textureDimensions_3a94ea(texture2d<uint, access::write> tint_symbol_1) {
   int2 res = int2(tint_symbol_1.get_width(), tint_symbol_1.get_height());
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner(texture2d<uint, access::write> tint_symbol_2) {
   textureDimensions_3a94ea(tint_symbol_2);
   return float4();
diff --git a/test/builtins/gen/textureDimensions/3aca08.wgsl.expected.msl b/test/builtins/gen/textureDimensions/3aca08.wgsl.expected.msl
index 186865ccf8..f5e4b1b481 100644
--- a/test/builtins/gen/textureDimensions/3aca08.wgsl.expected.msl
+++ b/test/builtins/gen/textureDimensions/3aca08.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void textureDimensions_3aca08(texture1d<float, access::write> tint_symbol_1) {
   int res = int(tint_symbol_1.get_width(0));
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner(texture1d<float, access::write> tint_symbol_2) {
   textureDimensions_3aca08(tint_symbol_2);
   return float4();
diff --git a/test/builtins/gen/textureDimensions/3c5ad8.wgsl.expected.msl b/test/builtins/gen/textureDimensions/3c5ad8.wgsl.expected.msl
index 55bc9551bd..1366cdf52d 100644
--- a/test/builtins/gen/textureDimensions/3c5ad8.wgsl.expected.msl
+++ b/test/builtins/gen/textureDimensions/3c5ad8.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void textureDimensions_3c5ad8(texture2d<int, access::write> tint_symbol_1) {
   int2 res = int2(tint_symbol_1.get_width(), tint_symbol_1.get_height());
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner(texture2d<int, access::write> tint_symbol_2) {
   textureDimensions_3c5ad8(tint_symbol_2);
   return float4();
diff --git a/test/builtins/gen/textureDimensions/4152a6.wgsl.expected.msl b/test/builtins/gen/textureDimensions/4152a6.wgsl.expected.msl
index 21c7da3243..afa8c0f219 100644
--- a/test/builtins/gen/textureDimensions/4152a6.wgsl.expected.msl
+++ b/test/builtins/gen/textureDimensions/4152a6.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void textureDimensions_4152a6(texturecube_array<uint, access::sample> tint_symbol_1) {
   int2 res = int2(tint_symbol_1.get_width(), tint_symbol_1.get_height());
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner(texturecube_array<uint, access::sample> tint_symbol_2) {
   textureDimensions_4152a6(tint_symbol_2);
   return float4();
diff --git a/test/builtins/gen/textureDimensions/423f99.wgsl.expected.msl b/test/builtins/gen/textureDimensions/423f99.wgsl.expected.msl
index dc27caea03..f6d8c32bd1 100644
--- a/test/builtins/gen/textureDimensions/423f99.wgsl.expected.msl
+++ b/test/builtins/gen/textureDimensions/423f99.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void textureDimensions_423f99(texture1d<int, access::sample> tint_symbol_1) {
   int res = int(tint_symbol_1.get_width(0));
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner(texture1d<int, access::sample> tint_symbol_2) {
   textureDimensions_423f99(tint_symbol_2);
   return float4();
diff --git a/test/builtins/gen/textureDimensions/4267ee.wgsl.expected.msl b/test/builtins/gen/textureDimensions/4267ee.wgsl.expected.msl
index a172cf5fcf..e6579cdc3c 100644
--- a/test/builtins/gen/textureDimensions/4267ee.wgsl.expected.msl
+++ b/test/builtins/gen/textureDimensions/4267ee.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void textureDimensions_4267ee(texture2d<float, access::write> tint_symbol_1) {
   int2 res = int2(tint_symbol_1.get_width(), tint_symbol_1.get_height());
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner(texture2d<float, access::write> tint_symbol_2) {
   textureDimensions_4267ee(tint_symbol_2);
   return float4();
diff --git a/test/builtins/gen/textureDimensions/42d4e6.wgsl.expected.msl b/test/builtins/gen/textureDimensions/42d4e6.wgsl.expected.msl
index 3156bbb896..5d05c3e452 100644
--- a/test/builtins/gen/textureDimensions/42d4e6.wgsl.expected.msl
+++ b/test/builtins/gen/textureDimensions/42d4e6.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void textureDimensions_42d4e6(texture1d<float, access::write> tint_symbol_1) {
   int res = int(tint_symbol_1.get_width(0));
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner(texture1d<float, access::write> tint_symbol_2) {
   textureDimensions_42d4e6(tint_symbol_2);
   return float4();
diff --git a/test/builtins/gen/textureDimensions/48cb89.wgsl.expected.msl b/test/builtins/gen/textureDimensions/48cb89.wgsl.expected.msl
index dc35032b9d..14a1875b39 100644
--- a/test/builtins/gen/textureDimensions/48cb89.wgsl.expected.msl
+++ b/test/builtins/gen/textureDimensions/48cb89.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void textureDimensions_48cb89(texture2d<float, access::write> tint_symbol_1) {
   int2 res = int2(tint_symbol_1.get_width(), tint_symbol_1.get_height());
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner(texture2d<float, access::write> tint_symbol_2) {
   textureDimensions_48cb89(tint_symbol_2);
   return float4();
diff --git a/test/builtins/gen/textureDimensions/49d274.wgsl.expected.msl b/test/builtins/gen/textureDimensions/49d274.wgsl.expected.msl
index 096c898082..69112a1d96 100644
--- a/test/builtins/gen/textureDimensions/49d274.wgsl.expected.msl
+++ b/test/builtins/gen/textureDimensions/49d274.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void textureDimensions_49d274(texture2d_array<int, access::write> tint_symbol_1) {
   int2 res = int2(tint_symbol_1.get_width(), tint_symbol_1.get_height());
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner(texture2d_array<int, access::write> tint_symbol_2) {
   textureDimensions_49d274(tint_symbol_2);
   return float4();
diff --git a/test/builtins/gen/textureDimensions/4df9a8.wgsl.expected.msl b/test/builtins/gen/textureDimensions/4df9a8.wgsl.expected.msl
index 2f350d560c..36c25c4b56 100644
--- a/test/builtins/gen/textureDimensions/4df9a8.wgsl.expected.msl
+++ b/test/builtins/gen/textureDimensions/4df9a8.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void textureDimensions_4df9a8(texture1d<uint, access::write> tint_symbol_1) {
   int res = int(tint_symbol_1.get_width(0));
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner(texture1d<uint, access::write> tint_symbol_2) {
   textureDimensions_4df9a8(tint_symbol_2);
   return float4();
diff --git a/test/builtins/gen/textureDimensions/50a9ee.wgsl.expected.msl b/test/builtins/gen/textureDimensions/50a9ee.wgsl.expected.msl
index 6d921d1ca5..0924964a8b 100644
--- a/test/builtins/gen/textureDimensions/50a9ee.wgsl.expected.msl
+++ b/test/builtins/gen/textureDimensions/50a9ee.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void textureDimensions_50a9ee(texturecube_array<float, access::sample> tint_symbol_1) {
   int2 res = int2(tint_symbol_1.get_width(0), tint_symbol_1.get_height(0));
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner(texturecube_array<float, access::sample> tint_symbol_2) {
   textureDimensions_50a9ee(tint_symbol_2);
   return float4();
diff --git a/test/builtins/gen/textureDimensions/52045c.wgsl.expected.msl b/test/builtins/gen/textureDimensions/52045c.wgsl.expected.msl
index 0d3cb416a3..81fc60c5cd 100644
--- a/test/builtins/gen/textureDimensions/52045c.wgsl.expected.msl
+++ b/test/builtins/gen/textureDimensions/52045c.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void textureDimensions_52045c(texture1d<int, access::sample> tint_symbol_1) {
   int res = int(tint_symbol_1.get_width(0));
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner(texture1d<int, access::sample> tint_symbol_2) {
   textureDimensions_52045c(tint_symbol_2);
   return float4();
diff --git a/test/builtins/gen/textureDimensions/55b23e.wgsl.expected.msl b/test/builtins/gen/textureDimensions/55b23e.wgsl.expected.msl
index 24fb6e8882..40ee9ecf0e 100644
--- a/test/builtins/gen/textureDimensions/55b23e.wgsl.expected.msl
+++ b/test/builtins/gen/textureDimensions/55b23e.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void textureDimensions_55b23e(texture1d<float, access::write> tint_symbol_1) {
   int res = int(tint_symbol_1.get_width(0));
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner(texture1d<float, access::write> tint_symbol_2) {
   textureDimensions_55b23e(tint_symbol_2);
   return float4();
diff --git a/test/builtins/gen/textureDimensions/579629.wgsl.expected.msl b/test/builtins/gen/textureDimensions/579629.wgsl.expected.msl
index 2cfb158896..f1af5282ce 100644
--- a/test/builtins/gen/textureDimensions/579629.wgsl.expected.msl
+++ b/test/builtins/gen/textureDimensions/579629.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void textureDimensions_579629(texture2d_ms<uint, access::read> tint_symbol_1) {
   int2 res = int2(tint_symbol_1.get_width(), tint_symbol_1.get_height());
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner(texture2d_ms<uint, access::read> tint_symbol_2) {
   textureDimensions_579629(tint_symbol_2);
   return float4();
diff --git a/test/builtins/gen/textureDimensions/57da0b.wgsl.expected.msl b/test/builtins/gen/textureDimensions/57da0b.wgsl.expected.msl
index 44429f3c0d..c71837ffb9 100644
--- a/test/builtins/gen/textureDimensions/57da0b.wgsl.expected.msl
+++ b/test/builtins/gen/textureDimensions/57da0b.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void textureDimensions_57da0b(texture1d<uint, access::write> tint_symbol_1) {
   int res = int(tint_symbol_1.get_width(0));
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner(texture1d<uint, access::write> tint_symbol_2) {
   textureDimensions_57da0b(tint_symbol_2);
   return float4();
diff --git a/test/builtins/gen/textureDimensions/57e28f.wgsl.expected.msl b/test/builtins/gen/textureDimensions/57e28f.wgsl.expected.msl
index b8f10eadc7..fb1f889a99 100644
--- a/test/builtins/gen/textureDimensions/57e28f.wgsl.expected.msl
+++ b/test/builtins/gen/textureDimensions/57e28f.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void textureDimensions_57e28f(depthcube<float, access::sample> tint_symbol_1) {
   int2 res = int2(tint_symbol_1.get_width(), tint_symbol_1.get_height());
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner(depthcube<float, access::sample> tint_symbol_2) {
   textureDimensions_57e28f(tint_symbol_2);
   return float4();
diff --git a/test/builtins/gen/textureDimensions/58a515.wgsl.expected.msl b/test/builtins/gen/textureDimensions/58a515.wgsl.expected.msl
index a1985a9130..2cc6f1a315 100644
--- a/test/builtins/gen/textureDimensions/58a515.wgsl.expected.msl
+++ b/test/builtins/gen/textureDimensions/58a515.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void textureDimensions_58a515(texture2d_array<float, access::write> tint_symbol_1) {
   int2 res = int2(tint_symbol_1.get_width(), tint_symbol_1.get_height());
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner(texture2d_array<float, access::write> tint_symbol_2) {
   textureDimensions_58a515(tint_symbol_2);
   return float4();
diff --git a/test/builtins/gen/textureDimensions/5985f3.wgsl.expected.msl b/test/builtins/gen/textureDimensions/5985f3.wgsl.expected.msl
index d02b064fc2..9d911c8671 100644
--- a/test/builtins/gen/textureDimensions/5985f3.wgsl.expected.msl
+++ b/test/builtins/gen/textureDimensions/5985f3.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void textureDimensions_5985f3(texture2d_array<int, access::write> tint_symbol_1) {
   int2 res = int2(tint_symbol_1.get_width(), tint_symbol_1.get_height());
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner(texture2d_array<int, access::write> tint_symbol_2) {
   textureDimensions_5985f3(tint_symbol_2);
   return float4();
diff --git a/test/builtins/gen/textureDimensions/5caa5e.wgsl.expected.msl b/test/builtins/gen/textureDimensions/5caa5e.wgsl.expected.msl
index 9816f22ae8..a23d4ab6e2 100644
--- a/test/builtins/gen/textureDimensions/5caa5e.wgsl.expected.msl
+++ b/test/builtins/gen/textureDimensions/5caa5e.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void textureDimensions_5caa5e(texture1d<uint, access::write> tint_symbol_1) {
   int res = int(tint_symbol_1.get_width(0));
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner(texture1d<uint, access::write> tint_symbol_2) {
   textureDimensions_5caa5e(tint_symbol_2);
   return float4();
diff --git a/test/builtins/gen/textureDimensions/5e295d.wgsl.expected.msl b/test/builtins/gen/textureDimensions/5e295d.wgsl.expected.msl
index d87109678c..4da0c3b6db 100644
--- a/test/builtins/gen/textureDimensions/5e295d.wgsl.expected.msl
+++ b/test/builtins/gen/textureDimensions/5e295d.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void textureDimensions_5e295d(texture2d_array<uint, access::write> tint_symbol_1) {
   int2 res = int2(tint_symbol_1.get_width(), tint_symbol_1.get_height());
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner(texture2d_array<uint, access::write> tint_symbol_2) {
   textureDimensions_5e295d(tint_symbol_2);
   return float4();
diff --git a/test/builtins/gen/textureDimensions/60bf54.wgsl.expected.msl b/test/builtins/gen/textureDimensions/60bf54.wgsl.expected.msl
index 3adf17cd22..1f35ec2649 100644
--- a/test/builtins/gen/textureDimensions/60bf54.wgsl.expected.msl
+++ b/test/builtins/gen/textureDimensions/60bf54.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void textureDimensions_60bf54(texture3d<int, access::write> tint_symbol_1) {
   int3 res = int3(tint_symbol_1.get_width(), tint_symbol_1.get_height(), tint_symbol_1.get_depth());
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner(texture3d<int, access::write> tint_symbol_2) {
   textureDimensions_60bf54(tint_symbol_2);
   return float4();
diff --git a/test/builtins/gen/textureDimensions/63f3cf.wgsl.expected.msl b/test/builtins/gen/textureDimensions/63f3cf.wgsl.expected.msl
index 7beb7d2eb8..44388bc227 100644
--- a/test/builtins/gen/textureDimensions/63f3cf.wgsl.expected.msl
+++ b/test/builtins/gen/textureDimensions/63f3cf.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void textureDimensions_63f3cf(texture3d<float, access::write> tint_symbol_1) {
   int3 res = int3(tint_symbol_1.get_width(), tint_symbol_1.get_height(), tint_symbol_1.get_depth());
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner(texture3d<float, access::write> tint_symbol_2) {
   textureDimensions_63f3cf(tint_symbol_2);
   return float4();
diff --git a/test/builtins/gen/textureDimensions/68105c.wgsl.expected.msl b/test/builtins/gen/textureDimensions/68105c.wgsl.expected.msl
index 5790d25e06..ebafaa5dde 100644
--- a/test/builtins/gen/textureDimensions/68105c.wgsl.expected.msl
+++ b/test/builtins/gen/textureDimensions/68105c.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void textureDimensions_68105c(texture2d<uint, access::write> tint_symbol_1) {
   int2 res = int2(tint_symbol_1.get_width(), tint_symbol_1.get_height());
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner(texture2d<uint, access::write> tint_symbol_2) {
   textureDimensions_68105c(tint_symbol_2);
   return float4();
diff --git a/test/builtins/gen/textureDimensions/686ef2.wgsl.expected.msl b/test/builtins/gen/textureDimensions/686ef2.wgsl.expected.msl
index 21d82609a1..6facf32607 100644
--- a/test/builtins/gen/textureDimensions/686ef2.wgsl.expected.msl
+++ b/test/builtins/gen/textureDimensions/686ef2.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void textureDimensions_686ef2(texturecube<int, access::sample> tint_symbol_1) {
   int2 res = int2(tint_symbol_1.get_width(0), tint_symbol_1.get_height(0));
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner(texturecube<int, access::sample> tint_symbol_2) {
   textureDimensions_686ef2(tint_symbol_2);
   return float4();
diff --git a/test/builtins/gen/textureDimensions/6adac6.wgsl.expected.msl b/test/builtins/gen/textureDimensions/6adac6.wgsl.expected.msl
index 375da250b1..de1f67b2e8 100644
--- a/test/builtins/gen/textureDimensions/6adac6.wgsl.expected.msl
+++ b/test/builtins/gen/textureDimensions/6adac6.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void textureDimensions_6adac6(texture1d<int, access::write> tint_symbol_1) {
   int res = int(tint_symbol_1.get_width(0));
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner(texture1d<int, access::write> tint_symbol_2) {
   textureDimensions_6adac6(tint_symbol_2);
   return float4();
diff --git a/test/builtins/gen/textureDimensions/6ec1b4.wgsl.expected.msl b/test/builtins/gen/textureDimensions/6ec1b4.wgsl.expected.msl
index d1f686ea70..379a6398fa 100644
--- a/test/builtins/gen/textureDimensions/6ec1b4.wgsl.expected.msl
+++ b/test/builtins/gen/textureDimensions/6ec1b4.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void textureDimensions_6ec1b4(texture3d<uint, access::sample> tint_symbol_1) {
   int3 res = int3(tint_symbol_1.get_width(), tint_symbol_1.get_height(), tint_symbol_1.get_depth());
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner(texture3d<uint, access::sample> tint_symbol_2) {
   textureDimensions_6ec1b4(tint_symbol_2);
   return float4();
diff --git a/test/builtins/gen/textureDimensions/6f0d79.wgsl.expected.msl b/test/builtins/gen/textureDimensions/6f0d79.wgsl.expected.msl
index d7847890f5..0de9feabf4 100644
--- a/test/builtins/gen/textureDimensions/6f0d79.wgsl.expected.msl
+++ b/test/builtins/gen/textureDimensions/6f0d79.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void textureDimensions_6f0d79(texture2d_array<float, access::write> tint_symbol_1) {
   int2 res = int2(tint_symbol_1.get_width(), tint_symbol_1.get_height());
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner(texture2d_array<float, access::write> tint_symbol_2) {
   textureDimensions_6f0d79(tint_symbol_2);
   return float4();
diff --git a/test/builtins/gen/textureDimensions/702c53.wgsl.expected.msl b/test/builtins/gen/textureDimensions/702c53.wgsl.expected.msl
index 9a0bb540c8..3dc0263bc3 100644
--- a/test/builtins/gen/textureDimensions/702c53.wgsl.expected.msl
+++ b/test/builtins/gen/textureDimensions/702c53.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void textureDimensions_702c53(texture2d<float, access::write> tint_symbol_1) {
   int2 res = int2(tint_symbol_1.get_width(), tint_symbol_1.get_height());
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner(texture2d<float, access::write> tint_symbol_2) {
   textureDimensions_702c53(tint_symbol_2);
   return float4();
diff --git a/test/builtins/gen/textureDimensions/72e5d6.wgsl.expected.msl b/test/builtins/gen/textureDimensions/72e5d6.wgsl.expected.msl
index cab3ad711c..5e835e305c 100644
--- a/test/builtins/gen/textureDimensions/72e5d6.wgsl.expected.msl
+++ b/test/builtins/gen/textureDimensions/72e5d6.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void textureDimensions_72e5d6(depth2d_array<float, access::sample> tint_symbol_1) {
   int2 res = int2(tint_symbol_1.get_width(0), tint_symbol_1.get_height(0));
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner(depth2d_array<float, access::sample> tint_symbol_2) {
   textureDimensions_72e5d6(tint_symbol_2);
   return float4();
diff --git a/test/builtins/gen/textureDimensions/79df87.wgsl.expected.msl b/test/builtins/gen/textureDimensions/79df87.wgsl.expected.msl
index d021683631..01adb4d3dc 100644
--- a/test/builtins/gen/textureDimensions/79df87.wgsl.expected.msl
+++ b/test/builtins/gen/textureDimensions/79df87.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void textureDimensions_79df87(texture1d<uint, access::sample> tint_symbol_1) {
   int res = int(tint_symbol_1.get_width(0));
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner(texture1d<uint, access::sample> tint_symbol_2) {
   textureDimensions_79df87(tint_symbol_2);
   return float4();
diff --git a/test/builtins/gen/textureDimensions/7bf826.wgsl.expected.msl b/test/builtins/gen/textureDimensions/7bf826.wgsl.expected.msl
index fdd620141e..4964ca048b 100644
--- a/test/builtins/gen/textureDimensions/7bf826.wgsl.expected.msl
+++ b/test/builtins/gen/textureDimensions/7bf826.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void textureDimensions_7bf826(depth2d_array<float, access::sample> tint_symbol_1) {
   int2 res = int2(tint_symbol_1.get_width(), tint_symbol_1.get_height());
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner(depth2d_array<float, access::sample> tint_symbol_2) {
   textureDimensions_7bf826(tint_symbol_2);
   return float4();
diff --git a/test/builtins/gen/textureDimensions/7f5c2e.wgsl.expected.msl b/test/builtins/gen/textureDimensions/7f5c2e.wgsl.expected.msl
index ec78cea11f..6cae60437a 100644
--- a/test/builtins/gen/textureDimensions/7f5c2e.wgsl.expected.msl
+++ b/test/builtins/gen/textureDimensions/7f5c2e.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void textureDimensions_7f5c2e(texture2d<int, access::write> tint_symbol_1) {
   int2 res = int2(tint_symbol_1.get_width(), tint_symbol_1.get_height());
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner(texture2d<int, access::write> tint_symbol_2) {
   textureDimensions_7f5c2e(tint_symbol_2);
   return float4();
diff --git a/test/builtins/gen/textureDimensions/8028f3.wgsl.expected.msl b/test/builtins/gen/textureDimensions/8028f3.wgsl.expected.msl
index ee91a57e33..50d4cee541 100644
--- a/test/builtins/gen/textureDimensions/8028f3.wgsl.expected.msl
+++ b/test/builtins/gen/textureDimensions/8028f3.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void textureDimensions_8028f3(texture3d<float, access::write> tint_symbol_1) {
   int3 res = int3(tint_symbol_1.get_width(), tint_symbol_1.get_height(), tint_symbol_1.get_depth());
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner(texture3d<float, access::write> tint_symbol_2) {
   textureDimensions_8028f3(tint_symbol_2);
   return float4();
diff --git a/test/builtins/gen/textureDimensions/811679.wgsl.expected.msl b/test/builtins/gen/textureDimensions/811679.wgsl.expected.msl
index 3f92b25988..98b2a954cc 100644
--- a/test/builtins/gen/textureDimensions/811679.wgsl.expected.msl
+++ b/test/builtins/gen/textureDimensions/811679.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void textureDimensions_811679(texture3d<uint, access::write> tint_symbol_1) {
   int3 res = int3(tint_symbol_1.get_width(), tint_symbol_1.get_height(), tint_symbol_1.get_depth());
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner(texture3d<uint, access::write> tint_symbol_2) {
   textureDimensions_811679(tint_symbol_2);
   return float4();
diff --git a/test/builtins/gen/textureDimensions/820596.wgsl.expected.msl b/test/builtins/gen/textureDimensions/820596.wgsl.expected.msl
index bcea7427f8..303771c5c9 100644
--- a/test/builtins/gen/textureDimensions/820596.wgsl.expected.msl
+++ b/test/builtins/gen/textureDimensions/820596.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void textureDimensions_820596(texture3d<uint, access::write> tint_symbol_1) {
   int3 res = int3(tint_symbol_1.get_width(), tint_symbol_1.get_height(), tint_symbol_1.get_depth());
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner(texture3d<uint, access::write> tint_symbol_2) {
   textureDimensions_820596(tint_symbol_2);
   return float4();
diff --git a/test/builtins/gen/textureDimensions/83ee5a.wgsl.expected.msl b/test/builtins/gen/textureDimensions/83ee5a.wgsl.expected.msl
index ae657f3afb..f92d24aacd 100644
--- a/test/builtins/gen/textureDimensions/83ee5a.wgsl.expected.msl
+++ b/test/builtins/gen/textureDimensions/83ee5a.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void textureDimensions_83ee5a(texture2d<int, access::write> tint_symbol_1) {
   int2 res = int2(tint_symbol_1.get_width(), tint_symbol_1.get_height());
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner(texture2d<int, access::write> tint_symbol_2) {
   textureDimensions_83ee5a(tint_symbol_2);
   return float4();
diff --git a/test/builtins/gen/textureDimensions/85d556.wgsl.expected.msl b/test/builtins/gen/textureDimensions/85d556.wgsl.expected.msl
index 6db70942a6..05c997d474 100644
--- a/test/builtins/gen/textureDimensions/85d556.wgsl.expected.msl
+++ b/test/builtins/gen/textureDimensions/85d556.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void textureDimensions_85d556(texture2d_array<float, access::sample> tint_symbol_1) {
   int2 res = int2(tint_symbol_1.get_width(0), tint_symbol_1.get_height(0));
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner(texture2d_array<float, access::sample> tint_symbol_2) {
   textureDimensions_85d556(tint_symbol_2);
   return float4();
diff --git a/test/builtins/gen/textureDimensions/88ad17.wgsl.expected.msl b/test/builtins/gen/textureDimensions/88ad17.wgsl.expected.msl
index 3a51779221..cbd3f88db3 100644
--- a/test/builtins/gen/textureDimensions/88ad17.wgsl.expected.msl
+++ b/test/builtins/gen/textureDimensions/88ad17.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void textureDimensions_88ad17(texturecube<uint, access::sample> tint_symbol_1) {
   int2 res = int2(tint_symbol_1.get_width(0), tint_symbol_1.get_height(0));
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner(texturecube<uint, access::sample> tint_symbol_2) {
   textureDimensions_88ad17(tint_symbol_2);
   return float4();
diff --git a/test/builtins/gen/textureDimensions/8aa4c4.wgsl.expected.msl b/test/builtins/gen/textureDimensions/8aa4c4.wgsl.expected.msl
index 1fc97aadc2..4272060876 100644
--- a/test/builtins/gen/textureDimensions/8aa4c4.wgsl.expected.msl
+++ b/test/builtins/gen/textureDimensions/8aa4c4.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void textureDimensions_8aa4c4(texture3d<float, access::sample> tint_symbol_1) {
   int3 res = int3(tint_symbol_1.get_width(), tint_symbol_1.get_height(), tint_symbol_1.get_depth());
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner(texture3d<float, access::sample> tint_symbol_2) {
   textureDimensions_8aa4c4(tint_symbol_2);
   return float4();
diff --git a/test/builtins/gen/textureDimensions/8deb5e.wgsl.expected.msl b/test/builtins/gen/textureDimensions/8deb5e.wgsl.expected.msl
index 863eb1386e..1b165dfe81 100644
--- a/test/builtins/gen/textureDimensions/8deb5e.wgsl.expected.msl
+++ b/test/builtins/gen/textureDimensions/8deb5e.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void textureDimensions_8deb5e(texture3d<int, access::sample> tint_symbol_1) {
   int3 res = int3(tint_symbol_1.get_width(), tint_symbol_1.get_height(), tint_symbol_1.get_depth());
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner(texture3d<int, access::sample> tint_symbol_2) {
   textureDimensions_8deb5e(tint_symbol_2);
   return float4();
diff --git a/test/builtins/gen/textureDimensions/8f20bf.wgsl.expected.msl b/test/builtins/gen/textureDimensions/8f20bf.wgsl.expected.msl
index edc42afe03..fe8a216299 100644
--- a/test/builtins/gen/textureDimensions/8f20bf.wgsl.expected.msl
+++ b/test/builtins/gen/textureDimensions/8f20bf.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void textureDimensions_8f20bf(texturecube_array<float, access::sample> tint_symbol_1) {
   int2 res = int2(tint_symbol_1.get_width(), tint_symbol_1.get_height());
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner(texturecube_array<float, access::sample> tint_symbol_2) {
   textureDimensions_8f20bf(tint_symbol_2);
   return float4();
diff --git a/test/builtins/gen/textureDimensions/8fca0f.wgsl.expected.msl b/test/builtins/gen/textureDimensions/8fca0f.wgsl.expected.msl
index 8ba811dbaa..b80ae46bc8 100644
--- a/test/builtins/gen/textureDimensions/8fca0f.wgsl.expected.msl
+++ b/test/builtins/gen/textureDimensions/8fca0f.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void textureDimensions_8fca0f(texture3d<float, access::write> tint_symbol_1) {
   int3 res = int3(tint_symbol_1.get_width(), tint_symbol_1.get_height(), tint_symbol_1.get_depth());
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner(texture3d<float, access::write> tint_symbol_2) {
   textureDimensions_8fca0f(tint_symbol_2);
   return float4();
diff --git a/test/builtins/gen/textureDimensions/90340b.wgsl.expected.msl b/test/builtins/gen/textureDimensions/90340b.wgsl.expected.msl
index 958aad9524..0fa625c602 100644
--- a/test/builtins/gen/textureDimensions/90340b.wgsl.expected.msl
+++ b/test/builtins/gen/textureDimensions/90340b.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void textureDimensions_90340b(depthcube_array<float, access::sample> tint_symbol_1) {
   int2 res = int2(tint_symbol_1.get_width(), tint_symbol_1.get_height());
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner(depthcube_array<float, access::sample> tint_symbol_2) {
   textureDimensions_90340b(tint_symbol_2);
   return float4();
diff --git a/test/builtins/gen/textureDimensions/9042ab.wgsl.expected.msl b/test/builtins/gen/textureDimensions/9042ab.wgsl.expected.msl
index 4674efe987..1e47848252 100644
--- a/test/builtins/gen/textureDimensions/9042ab.wgsl.expected.msl
+++ b/test/builtins/gen/textureDimensions/9042ab.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void textureDimensions_9042ab(texture2d_array<uint, access::write> tint_symbol_1) {
   int2 res = int2(tint_symbol_1.get_width(), tint_symbol_1.get_height());
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner(texture2d_array<uint, access::write> tint_symbol_2) {
   textureDimensions_9042ab(tint_symbol_2);
   return float4();
diff --git a/test/builtins/gen/textureDimensions/9393b0.wgsl.expected.msl b/test/builtins/gen/textureDimensions/9393b0.wgsl.expected.msl
index c6a5a898b1..9f2122c712 100644
--- a/test/builtins/gen/textureDimensions/9393b0.wgsl.expected.msl
+++ b/test/builtins/gen/textureDimensions/9393b0.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void textureDimensions_9393b0(depthcube<float, access::sample> tint_symbol_1) {
   int2 res = int2(tint_symbol_1.get_width(0), tint_symbol_1.get_height(0));
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner(depthcube<float, access::sample> tint_symbol_2) {
   textureDimensions_9393b0(tint_symbol_2);
   return float4();
diff --git a/test/builtins/gen/textureDimensions/939fdb.wgsl.expected.msl b/test/builtins/gen/textureDimensions/939fdb.wgsl.expected.msl
index 75a8192120..e825ea3231 100644
--- a/test/builtins/gen/textureDimensions/939fdb.wgsl.expected.msl
+++ b/test/builtins/gen/textureDimensions/939fdb.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void textureDimensions_939fdb(depth2d<float, access::sample> tint_symbol_1) {
   int2 res = int2(tint_symbol_1.get_width(), tint_symbol_1.get_height());
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner(depth2d<float, access::sample> tint_symbol_2) {
   textureDimensions_939fdb(tint_symbol_2);
   return float4();
diff --git a/test/builtins/gen/textureDimensions/962dcd.wgsl.expected.msl b/test/builtins/gen/textureDimensions/962dcd.wgsl.expected.msl
index 8ff752cc2b..8f66f9d7e8 100644
--- a/test/builtins/gen/textureDimensions/962dcd.wgsl.expected.msl
+++ b/test/builtins/gen/textureDimensions/962dcd.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void textureDimensions_962dcd(texturecube<int, access::sample> tint_symbol_1) {
   int2 res = int2(tint_symbol_1.get_width(), tint_symbol_1.get_height());
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner(texturecube<int, access::sample> tint_symbol_2) {
   textureDimensions_962dcd(tint_symbol_2);
   return float4();
diff --git a/test/builtins/gen/textureDimensions/9abfe5.wgsl.expected.msl b/test/builtins/gen/textureDimensions/9abfe5.wgsl.expected.msl
index 1d9e4afad8..4b2bcddf04 100644
--- a/test/builtins/gen/textureDimensions/9abfe5.wgsl.expected.msl
+++ b/test/builtins/gen/textureDimensions/9abfe5.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void textureDimensions_9abfe5(texture2d_array<float, access::write> tint_symbol_1) {
   int2 res = int2(tint_symbol_1.get_width(), tint_symbol_1.get_height());
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner(texture2d_array<float, access::write> tint_symbol_2) {
   textureDimensions_9abfe5(tint_symbol_2);
   return float4();
diff --git a/test/builtins/gen/textureDimensions/9c9c57.wgsl.expected.msl b/test/builtins/gen/textureDimensions/9c9c57.wgsl.expected.msl
index 6b6c20bcce..e457997bfd 100644
--- a/test/builtins/gen/textureDimensions/9c9c57.wgsl.expected.msl
+++ b/test/builtins/gen/textureDimensions/9c9c57.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void textureDimensions_9c9c57(texture2d_array<int, access::sample> tint_symbol_1) {
   int2 res = int2(tint_symbol_1.get_width(0), tint_symbol_1.get_height(0));
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner(texture2d_array<int, access::sample> tint_symbol_2) {
   textureDimensions_9c9c57(tint_symbol_2);
   return float4();
diff --git a/test/builtins/gen/textureDimensions/9da9e2.wgsl.expected.msl b/test/builtins/gen/textureDimensions/9da9e2.wgsl.expected.msl
index e114675ba7..98178fc971 100644
--- a/test/builtins/gen/textureDimensions/9da9e2.wgsl.expected.msl
+++ b/test/builtins/gen/textureDimensions/9da9e2.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void textureDimensions_9da9e2(texture1d<int, access::write> tint_symbol_1) {
   int res = int(tint_symbol_1.get_width(0));
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner(texture1d<int, access::write> tint_symbol_2) {
   textureDimensions_9da9e2(tint_symbol_2);
   return float4();
diff --git a/test/builtins/gen/textureDimensions/9eb8d8.wgsl.expected.msl b/test/builtins/gen/textureDimensions/9eb8d8.wgsl.expected.msl
index ef8e102ee7..8d1ec05550 100644
--- a/test/builtins/gen/textureDimensions/9eb8d8.wgsl.expected.msl
+++ b/test/builtins/gen/textureDimensions/9eb8d8.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void textureDimensions_9eb8d8(texture2d<uint, access::write> tint_symbol_1) {
   int2 res = int2(tint_symbol_1.get_width(), tint_symbol_1.get_height());
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner(texture2d<uint, access::write> tint_symbol_2) {
   textureDimensions_9eb8d8(tint_symbol_2);
   return float4();
diff --git a/test/builtins/gen/textureDimensions/9f8e46.wgsl.expected.msl b/test/builtins/gen/textureDimensions/9f8e46.wgsl.expected.msl
index a823aa4ce2..23edfc2885 100644
--- a/test/builtins/gen/textureDimensions/9f8e46.wgsl.expected.msl
+++ b/test/builtins/gen/textureDimensions/9f8e46.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void textureDimensions_9f8e46(texture2d<float, access::sample> tint_symbol_1) {
   int2 res = int2(tint_symbol_1.get_width(), tint_symbol_1.get_height());
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner(texture2d<float, access::sample> tint_symbol_2) {
   textureDimensions_9f8e46(tint_symbol_2);
   return float4();
diff --git a/test/builtins/gen/textureDimensions/a01845.wgsl.expected.msl b/test/builtins/gen/textureDimensions/a01845.wgsl.expected.msl
index 6fe18da979..02fc57141d 100644
--- a/test/builtins/gen/textureDimensions/a01845.wgsl.expected.msl
+++ b/test/builtins/gen/textureDimensions/a01845.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void textureDimensions_a01845(depthcube_array<float, access::sample> tint_symbol_1) {
   int2 res = int2(tint_symbol_1.get_width(0), tint_symbol_1.get_height(0));
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner(depthcube_array<float, access::sample> tint_symbol_2) {
   textureDimensions_a01845(tint_symbol_2);
   return float4();
diff --git a/test/builtins/gen/textureDimensions/a7d565.wgsl.expected.msl b/test/builtins/gen/textureDimensions/a7d565.wgsl.expected.msl
index e06c9c96dc..22d4338ad1 100644
--- a/test/builtins/gen/textureDimensions/a7d565.wgsl.expected.msl
+++ b/test/builtins/gen/textureDimensions/a7d565.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void textureDimensions_a7d565(texture1d<uint, access::sample> tint_symbol_1) {
   int res = int(tint_symbol_1.get_width(0));
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner(texture1d<uint, access::sample> tint_symbol_2) {
   textureDimensions_a7d565(tint_symbol_2);
   return float4();
diff --git a/test/builtins/gen/textureDimensions/a863f2.wgsl.expected.msl b/test/builtins/gen/textureDimensions/a863f2.wgsl.expected.msl
index 152cdc59c5..3bbebf328a 100644
--- a/test/builtins/gen/textureDimensions/a863f2.wgsl.expected.msl
+++ b/test/builtins/gen/textureDimensions/a863f2.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void textureDimensions_a863f2(texture1d<float, access::write> tint_symbol_1) {
   int res = int(tint_symbol_1.get_width(0));
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner(texture1d<float, access::write> tint_symbol_2) {
   textureDimensions_a863f2(tint_symbol_2);
   return float4();
diff --git a/test/builtins/gen/textureDimensions/a9c9c1.wgsl.expected.msl b/test/builtins/gen/textureDimensions/a9c9c1.wgsl.expected.msl
index 5d5c01c00f..539d007136 100644
--- a/test/builtins/gen/textureDimensions/a9c9c1.wgsl.expected.msl
+++ b/test/builtins/gen/textureDimensions/a9c9c1.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void textureDimensions_a9c9c1(texturecube<float, access::sample> tint_symbol_1) {
   int2 res = int2(tint_symbol_1.get_width(0), tint_symbol_1.get_height(0));
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner(texturecube<float, access::sample> tint_symbol_2) {
   textureDimensions_a9c9c1(tint_symbol_2);
   return float4();
diff --git a/test/builtins/gen/textureDimensions/b0e16d.wgsl.expected.msl b/test/builtins/gen/textureDimensions/b0e16d.wgsl.expected.msl
index 01795172c0..ee971ff9ae 100644
--- a/test/builtins/gen/textureDimensions/b0e16d.wgsl.expected.msl
+++ b/test/builtins/gen/textureDimensions/b0e16d.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void textureDimensions_b0e16d(texture2d<int, access::sample> tint_symbol_1) {
   int2 res = int2(tint_symbol_1.get_width(0), tint_symbol_1.get_height(0));
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner(texture2d<int, access::sample> tint_symbol_2) {
   textureDimensions_b0e16d(tint_symbol_2);
   return float4();
diff --git a/test/builtins/gen/textureDimensions/b3c954.wgsl.expected.msl b/test/builtins/gen/textureDimensions/b3c954.wgsl.expected.msl
index 38d91604d6..a7daabd25d 100644
--- a/test/builtins/gen/textureDimensions/b3c954.wgsl.expected.msl
+++ b/test/builtins/gen/textureDimensions/b3c954.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void textureDimensions_b3c954(texturecube<uint, access::sample> tint_symbol_1) {
   int2 res = int2(tint_symbol_1.get_width(), tint_symbol_1.get_height());
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner(texturecube<uint, access::sample> tint_symbol_2) {
   textureDimensions_b3c954(tint_symbol_2);
   return float4();
diff --git a/test/builtins/gen/textureDimensions/b3e407.wgsl.expected.msl b/test/builtins/gen/textureDimensions/b3e407.wgsl.expected.msl
index 124c951246..6b96a63469 100644
--- a/test/builtins/gen/textureDimensions/b3e407.wgsl.expected.msl
+++ b/test/builtins/gen/textureDimensions/b3e407.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void textureDimensions_b3e407(texture1d<float, access::sample> tint_symbol_1) {
   int res = int(tint_symbol_1.get_width(0));
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner(texture1d<float, access::sample> tint_symbol_2) {
   textureDimensions_b3e407(tint_symbol_2);
   return float4();
diff --git a/test/builtins/gen/textureDimensions/b91240.wgsl.expected.msl b/test/builtins/gen/textureDimensions/b91240.wgsl.expected.msl
index f45b6a6350..84375cac62 100644
--- a/test/builtins/gen/textureDimensions/b91240.wgsl.expected.msl
+++ b/test/builtins/gen/textureDimensions/b91240.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void textureDimensions_b91240(texture2d<float, access::write> tint_symbol_1) {
   int2 res = int2(tint_symbol_1.get_width(), tint_symbol_1.get_height());
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner(texture2d<float, access::write> tint_symbol_2) {
   textureDimensions_b91240(tint_symbol_2);
   return float4();
diff --git a/test/builtins/gen/textureDimensions/ba1481.wgsl.expected.msl b/test/builtins/gen/textureDimensions/ba1481.wgsl.expected.msl
index a4061f5898..5162685ad3 100644
--- a/test/builtins/gen/textureDimensions/ba1481.wgsl.expected.msl
+++ b/test/builtins/gen/textureDimensions/ba1481.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void textureDimensions_ba1481(texture2d<float, access::sample> tint_symbol_1) {
   int2 res = int2(tint_symbol_1.get_width(), tint_symbol_1.get_height());
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner(texture2d<float, access::sample> tint_symbol_2) {
   textureDimensions_ba1481(tint_symbol_2);
   return float4();
diff --git a/test/builtins/gen/textureDimensions/bb3dde.wgsl.expected.msl b/test/builtins/gen/textureDimensions/bb3dde.wgsl.expected.msl
index 6b79d76f0e..89c1d8458c 100644
--- a/test/builtins/gen/textureDimensions/bb3dde.wgsl.expected.msl
+++ b/test/builtins/gen/textureDimensions/bb3dde.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void textureDimensions_bb3dde(texture3d<int, access::write> tint_symbol_1) {
   int3 res = int3(tint_symbol_1.get_width(), tint_symbol_1.get_height(), tint_symbol_1.get_depth());
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner(texture3d<int, access::write> tint_symbol_2) {
   textureDimensions_bb3dde(tint_symbol_2);
   return float4();
diff --git a/test/builtins/gen/textureDimensions/c30e75.wgsl.expected.msl b/test/builtins/gen/textureDimensions/c30e75.wgsl.expected.msl
index 7c7f94aee2..815d44cdbb 100644
--- a/test/builtins/gen/textureDimensions/c30e75.wgsl.expected.msl
+++ b/test/builtins/gen/textureDimensions/c30e75.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void textureDimensions_c30e75(texture2d<int, access::write> tint_symbol_1) {
   int2 res = int2(tint_symbol_1.get_width(), tint_symbol_1.get_height());
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner(texture2d<int, access::write> tint_symbol_2) {
   textureDimensions_c30e75(tint_symbol_2);
   return float4();
diff --git a/test/builtins/gen/textureDimensions/c7943d.wgsl.expected.msl b/test/builtins/gen/textureDimensions/c7943d.wgsl.expected.msl
index 38ba8829aa..ff4d805db4 100644
--- a/test/builtins/gen/textureDimensions/c7943d.wgsl.expected.msl
+++ b/test/builtins/gen/textureDimensions/c7943d.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void textureDimensions_c7943d(texture2d<uint, access::write> tint_symbol_1) {
   int2 res = int2(tint_symbol_1.get_width(), tint_symbol_1.get_height());
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner(texture2d<uint, access::write> tint_symbol_2) {
   textureDimensions_c7943d(tint_symbol_2);
   return float4();
diff --git a/test/builtins/gen/textureDimensions/cc968c.wgsl.expected.msl b/test/builtins/gen/textureDimensions/cc968c.wgsl.expected.msl
index a585ee85ae..93357b83d6 100644
--- a/test/builtins/gen/textureDimensions/cc968c.wgsl.expected.msl
+++ b/test/builtins/gen/textureDimensions/cc968c.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void textureDimensions_cc968c(texture1d<int, access::write> tint_symbol_1) {
   int res = int(tint_symbol_1.get_width(0));
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner(texture1d<int, access::write> tint_symbol_2) {
   textureDimensions_cc968c(tint_symbol_2);
   return float4();
diff --git a/test/builtins/gen/textureDimensions/cccc8f.wgsl.expected.msl b/test/builtins/gen/textureDimensions/cccc8f.wgsl.expected.msl
index d02c7e554c..7e988b4262 100644
--- a/test/builtins/gen/textureDimensions/cccc8f.wgsl.expected.msl
+++ b/test/builtins/gen/textureDimensions/cccc8f.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void textureDimensions_cccc8f(texture1d<float, access::write> tint_symbol_1) {
   int res = int(tint_symbol_1.get_width(0));
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner(texture1d<float, access::write> tint_symbol_2) {
   textureDimensions_cccc8f(tint_symbol_2);
   return float4();
diff --git a/test/builtins/gen/textureDimensions/cd76a7.wgsl.expected.msl b/test/builtins/gen/textureDimensions/cd76a7.wgsl.expected.msl
index 3cf1c7877c..5013514518 100644
--- a/test/builtins/gen/textureDimensions/cd76a7.wgsl.expected.msl
+++ b/test/builtins/gen/textureDimensions/cd76a7.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void textureDimensions_cd76a7(texture3d<float, access::write> tint_symbol_1) {
   int3 res = int3(tint_symbol_1.get_width(), tint_symbol_1.get_height(), tint_symbol_1.get_depth());
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner(texture3d<float, access::write> tint_symbol_2) {
   textureDimensions_cd76a7(tint_symbol_2);
   return float4();
diff --git a/test/builtins/gen/textureDimensions/cdf473.wgsl.expected.msl b/test/builtins/gen/textureDimensions/cdf473.wgsl.expected.msl
index 62699bb3ed..8cd521d7fd 100644
--- a/test/builtins/gen/textureDimensions/cdf473.wgsl.expected.msl
+++ b/test/builtins/gen/textureDimensions/cdf473.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void textureDimensions_cdf473(texture2d_array<int, access::write> tint_symbol_1) {
   int2 res = int2(tint_symbol_1.get_width(), tint_symbol_1.get_height());
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner(texture2d_array<int, access::write> tint_symbol_2) {
   textureDimensions_cdf473(tint_symbol_2);
   return float4();
diff --git a/test/builtins/gen/textureDimensions/cec841.wgsl.expected.msl b/test/builtins/gen/textureDimensions/cec841.wgsl.expected.msl
index e6644985ca..689a796e25 100644
--- a/test/builtins/gen/textureDimensions/cec841.wgsl.expected.msl
+++ b/test/builtins/gen/textureDimensions/cec841.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void textureDimensions_cec841(texture2d_array<float, access::sample> tint_symbol_1) {
   int2 res = int2(tint_symbol_1.get_width(), tint_symbol_1.get_height());
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner(texture2d_array<float, access::sample> tint_symbol_2) {
   textureDimensions_cec841(tint_symbol_2);
   return float4();
diff --git a/test/builtins/gen/textureDimensions/cf7e43.wgsl.expected.msl b/test/builtins/gen/textureDimensions/cf7e43.wgsl.expected.msl
index 9850e71522..d9b49986bc 100644
--- a/test/builtins/gen/textureDimensions/cf7e43.wgsl.expected.msl
+++ b/test/builtins/gen/textureDimensions/cf7e43.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void textureDimensions_cf7e43(texture3d<float, access::write> tint_symbol_1) {
   int3 res = int3(tint_symbol_1.get_width(), tint_symbol_1.get_height(), tint_symbol_1.get_depth());
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner(texture3d<float, access::write> tint_symbol_2) {
   textureDimensions_cf7e43(tint_symbol_2);
   return float4();
diff --git a/test/builtins/gen/textureDimensions/d125bc.wgsl.expected.msl b/test/builtins/gen/textureDimensions/d125bc.wgsl.expected.msl
index 93527ecac4..d36c63f9b0 100644
--- a/test/builtins/gen/textureDimensions/d125bc.wgsl.expected.msl
+++ b/test/builtins/gen/textureDimensions/d125bc.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void textureDimensions_d125bc(texturecube<float, access::sample> tint_symbol_1) {
   int2 res = int2(tint_symbol_1.get_width(), tint_symbol_1.get_height());
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner(texturecube<float, access::sample> tint_symbol_2) {
   textureDimensions_d125bc(tint_symbol_2);
   return float4();
diff --git a/test/builtins/gen/textureDimensions/d83c45.wgsl.expected.msl b/test/builtins/gen/textureDimensions/d83c45.wgsl.expected.msl
index 1e419146f6..c33e6dfcfe 100644
--- a/test/builtins/gen/textureDimensions/d83c45.wgsl.expected.msl
+++ b/test/builtins/gen/textureDimensions/d83c45.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void textureDimensions_d83c45(texturecube_array<uint, access::sample> tint_symbol_1) {
   int2 res = int2(tint_symbol_1.get_width(0), tint_symbol_1.get_height(0));
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner(texturecube_array<uint, access::sample> tint_symbol_2) {
   textureDimensions_d83c45(tint_symbol_2);
   return float4();
diff --git a/test/builtins/gen/textureDimensions/daf7c0.wgsl.expected.msl b/test/builtins/gen/textureDimensions/daf7c0.wgsl.expected.msl
index 4518537251..086ae36ae5 100644
--- a/test/builtins/gen/textureDimensions/daf7c0.wgsl.expected.msl
+++ b/test/builtins/gen/textureDimensions/daf7c0.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void textureDimensions_daf7c0(texture2d_ms<int, access::read> tint_symbol_1) {
   int2 res = int2(tint_symbol_1.get_width(), tint_symbol_1.get_height());
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner(texture2d_ms<int, access::read> tint_symbol_2) {
   textureDimensions_daf7c0(tint_symbol_2);
   return float4();
diff --git a/test/builtins/gen/textureDimensions/dc2dd0.wgsl.expected.msl b/test/builtins/gen/textureDimensions/dc2dd0.wgsl.expected.msl
index f33ba03103..be8620cb32 100644
--- a/test/builtins/gen/textureDimensions/dc2dd0.wgsl.expected.msl
+++ b/test/builtins/gen/textureDimensions/dc2dd0.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void textureDimensions_dc2dd0(texture1d<uint, access::write> tint_symbol_1) {
   int res = int(tint_symbol_1.get_width(0));
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner(texture1d<uint, access::write> tint_symbol_2) {
   textureDimensions_dc2dd0(tint_symbol_2);
   return float4();
diff --git a/test/builtins/gen/textureDimensions/e927be.wgsl.expected.msl b/test/builtins/gen/textureDimensions/e927be.wgsl.expected.msl
index 738c21029f..40d1010494 100644
--- a/test/builtins/gen/textureDimensions/e927be.wgsl.expected.msl
+++ b/test/builtins/gen/textureDimensions/e927be.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void textureDimensions_e927be(texturecube_array<int, access::sample> tint_symbol_1) {
   int2 res = int2(tint_symbol_1.get_width(), tint_symbol_1.get_height());
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner(texturecube_array<int, access::sample> tint_symbol_2) {
   textureDimensions_e927be(tint_symbol_2);
   return float4();
diff --git a/test/builtins/gen/textureDimensions/e9e96c.wgsl.expected.msl b/test/builtins/gen/textureDimensions/e9e96c.wgsl.expected.msl
index 8adc475ab3..71d8e46118 100644
--- a/test/builtins/gen/textureDimensions/e9e96c.wgsl.expected.msl
+++ b/test/builtins/gen/textureDimensions/e9e96c.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void textureDimensions_e9e96c(texture2d_array<float, access::write> tint_symbol_1) {
   int2 res = int2(tint_symbol_1.get_width(), tint_symbol_1.get_height());
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner(texture2d_array<float, access::write> tint_symbol_2) {
   textureDimensions_e9e96c(tint_symbol_2);
   return float4();
diff --git a/test/builtins/gen/textureDimensions/ef5b89.wgsl.expected.msl b/test/builtins/gen/textureDimensions/ef5b89.wgsl.expected.msl
index a1573f0fd8..c6c771a4c9 100644
--- a/test/builtins/gen/textureDimensions/ef5b89.wgsl.expected.msl
+++ b/test/builtins/gen/textureDimensions/ef5b89.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void textureDimensions_ef5b89(texture2d_ms<float, access::read> tint_symbol_1) {
   int2 res = int2(tint_symbol_1.get_width(), tint_symbol_1.get_height());
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner(texture2d_ms<float, access::read> tint_symbol_2) {
   textureDimensions_ef5b89(tint_symbol_2);
   return float4();
diff --git a/test/builtins/gen/textureDimensions/efc8a4.wgsl.expected.msl b/test/builtins/gen/textureDimensions/efc8a4.wgsl.expected.msl
index 26c0bc554c..5f79ff38a9 100644
--- a/test/builtins/gen/textureDimensions/efc8a4.wgsl.expected.msl
+++ b/test/builtins/gen/textureDimensions/efc8a4.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void textureDimensions_efc8a4(texture3d<int, access::sample> tint_symbol_1) {
   int3 res = int3(tint_symbol_1.get_width(0), tint_symbol_1.get_height(0), tint_symbol_1.get_depth(0));
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner(texture3d<int, access::sample> tint_symbol_2) {
   textureDimensions_efc8a4(tint_symbol_2);
   return float4();
diff --git a/test/builtins/gen/textureDimensions/f60bdb.wgsl.expected.msl b/test/builtins/gen/textureDimensions/f60bdb.wgsl.expected.msl
index 2a4fdce24f..13b604c42c 100644
--- a/test/builtins/gen/textureDimensions/f60bdb.wgsl.expected.msl
+++ b/test/builtins/gen/textureDimensions/f60bdb.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void textureDimensions_f60bdb(depth2d_ms<float, access::read> tint_symbol_1) {
   int2 res = int2(tint_symbol_1.get_width(), tint_symbol_1.get_height());
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner(depth2d_ms<float, access::read> tint_symbol_2) {
   textureDimensions_f60bdb(tint_symbol_2);
   return float4();
diff --git a/test/builtins/gen/textureDimensions/f7145b.wgsl.expected.msl b/test/builtins/gen/textureDimensions/f7145b.wgsl.expected.msl
index 71be199dd7..6dbf9e9c75 100644
--- a/test/builtins/gen/textureDimensions/f7145b.wgsl.expected.msl
+++ b/test/builtins/gen/textureDimensions/f7145b.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void textureDimensions_f7145b(texture2d<uint, access::sample> tint_symbol_1) {
   int2 res = int2(tint_symbol_1.get_width(0), tint_symbol_1.get_height(0));
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner(texture2d<uint, access::sample> tint_symbol_2) {
   textureDimensions_f7145b(tint_symbol_2);
   return float4();
diff --git a/test/builtins/gen/textureDimensions/f931c7.wgsl.expected.msl b/test/builtins/gen/textureDimensions/f931c7.wgsl.expected.msl
index 0523c760ac..8167596ae9 100644
--- a/test/builtins/gen/textureDimensions/f931c7.wgsl.expected.msl
+++ b/test/builtins/gen/textureDimensions/f931c7.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void textureDimensions_f931c7(texture2d<float, access::write> tint_symbol_1) {
   int2 res = int2(tint_symbol_1.get_width(), tint_symbol_1.get_height());
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner(texture2d<float, access::write> tint_symbol_2) {
   textureDimensions_f931c7(tint_symbol_2);
   return float4();
diff --git a/test/builtins/gen/textureDimensions/fa9859.wgsl.expected.msl b/test/builtins/gen/textureDimensions/fa9859.wgsl.expected.msl
index 89b8eff818..193d7d995a 100644
--- a/test/builtins/gen/textureDimensions/fa9859.wgsl.expected.msl
+++ b/test/builtins/gen/textureDimensions/fa9859.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void textureDimensions_fa9859(texture2d<int, access::sample> tint_symbol_1) {
   int2 res = int2(tint_symbol_1.get_width(), tint_symbol_1.get_height());
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner(texture2d<int, access::sample> tint_symbol_2) {
   textureDimensions_fa9859(tint_symbol_2);
   return float4();
diff --git a/test/builtins/gen/textureDimensions/fb5670.wgsl.expected.msl b/test/builtins/gen/textureDimensions/fb5670.wgsl.expected.msl
index 0640b97c75..bf7f8df262 100644
--- a/test/builtins/gen/textureDimensions/fb5670.wgsl.expected.msl
+++ b/test/builtins/gen/textureDimensions/fb5670.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void textureDimensions_fb5670(texture2d_array<float, access::write> tint_symbol_1) {
   int2 res = int2(tint_symbol_1.get_width(), tint_symbol_1.get_height());
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner(texture2d_array<float, access::write> tint_symbol_2) {
   textureDimensions_fb5670(tint_symbol_2);
   return float4();
diff --git a/test/builtins/gen/textureDimensions/fcac78.wgsl.expected.msl b/test/builtins/gen/textureDimensions/fcac78.wgsl.expected.msl
index 3b3c4639c9..6049ea8763 100644
--- a/test/builtins/gen/textureDimensions/fcac78.wgsl.expected.msl
+++ b/test/builtins/gen/textureDimensions/fcac78.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void textureDimensions_fcac78(texture3d<uint, access::write> tint_symbol_1) {
   int3 res = int3(tint_symbol_1.get_width(), tint_symbol_1.get_height(), tint_symbol_1.get_depth());
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner(texture3d<uint, access::write> tint_symbol_2) {
   textureDimensions_fcac78(tint_symbol_2);
   return float4();
diff --git a/test/builtins/gen/textureGather/01305f.wgsl.expected.msl b/test/builtins/gen/textureGather/01305f.wgsl.expected.msl
index 2f68275aed..684d655fdd 100644
--- a/test/builtins/gen/textureGather/01305f.wgsl.expected.msl
+++ b/test/builtins/gen/textureGather/01305f.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void textureGather_01305f(texture2d_array<uint, access::sample> tint_symbol_1, sampler tint_symbol_2) {
   uint4 res = tint_symbol_1.gather(tint_symbol_2, float2(), 1, int2(0), component::y);
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner(texture2d_array<uint, access::sample> tint_symbol_3, sampler tint_symbol_4) {
   textureGather_01305f(tint_symbol_3, tint_symbol_4);
   return float4();
diff --git a/test/builtins/gen/textureGather/06030a.wgsl.expected.msl b/test/builtins/gen/textureGather/06030a.wgsl.expected.msl
index 247e4735ad..58cfec266d 100644
--- a/test/builtins/gen/textureGather/06030a.wgsl.expected.msl
+++ b/test/builtins/gen/textureGather/06030a.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void textureGather_06030a(texture2d_array<float, access::sample> tint_symbol_1, sampler tint_symbol_2) {
   float4 res = tint_symbol_1.gather(tint_symbol_2, float2(), 1, int2(), component::y);
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner(texture2d_array<float, access::sample> tint_symbol_3, sampler tint_symbol_4) {
   textureGather_06030a(tint_symbol_3, tint_symbol_4);
   return float4();
diff --git a/test/builtins/gen/textureGather/10c554.wgsl.expected.msl b/test/builtins/gen/textureGather/10c554.wgsl.expected.msl
index 076e0378c0..9fe4166823 100644
--- a/test/builtins/gen/textureGather/10c554.wgsl.expected.msl
+++ b/test/builtins/gen/textureGather/10c554.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void textureGather_10c554(depthcube<float, access::sample> tint_symbol_1, sampler tint_symbol_2) {
   float4 res = tint_symbol_1.gather(tint_symbol_2, float3());
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner(depthcube<float, access::sample> tint_symbol_3, sampler tint_symbol_4) {
   textureGather_10c554(tint_symbol_3, tint_symbol_4);
   return float4();
diff --git a/test/builtins/gen/textureGather/15d79c.wgsl.expected.msl b/test/builtins/gen/textureGather/15d79c.wgsl.expected.msl
index 5290c91d0a..37a9753650 100644
--- a/test/builtins/gen/textureGather/15d79c.wgsl.expected.msl
+++ b/test/builtins/gen/textureGather/15d79c.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void textureGather_15d79c(texture2d<float, access::sample> tint_symbol_1, sampler tint_symbol_2) {
   float4 res = tint_symbol_1.gather(tint_symbol_2, float2(), int2(), component::y);
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner(texture2d<float, access::sample> tint_symbol_3, sampler tint_symbol_4) {
   textureGather_15d79c(tint_symbol_3, tint_symbol_4);
   return float4();
diff --git a/test/builtins/gen/textureGather/2e0ed5.wgsl.expected.msl b/test/builtins/gen/textureGather/2e0ed5.wgsl.expected.msl
index 2406342b4a..dfe89418b5 100644
--- a/test/builtins/gen/textureGather/2e0ed5.wgsl.expected.msl
+++ b/test/builtins/gen/textureGather/2e0ed5.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void textureGather_2e0ed5(depth2d<float, access::sample> tint_symbol_1, sampler tint_symbol_2) {
   float4 res = tint_symbol_1.gather(tint_symbol_2, float2());
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner(depth2d<float, access::sample> tint_symbol_3, sampler tint_symbol_4) {
   textureGather_2e0ed5(tint_symbol_3, tint_symbol_4);
   return float4();
diff --git a/test/builtins/gen/textureGather/3112e8.wgsl.expected.msl b/test/builtins/gen/textureGather/3112e8.wgsl.expected.msl
index e1607710fd..69f2b13bb5 100644
--- a/test/builtins/gen/textureGather/3112e8.wgsl.expected.msl
+++ b/test/builtins/gen/textureGather/3112e8.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void textureGather_3112e8(texturecube_array<float, access::sample> tint_symbol_1, sampler tint_symbol_2) {
   float4 res = tint_symbol_1.gather(tint_symbol_2, float3(), 1, component::y);
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner(texturecube_array<float, access::sample> tint_symbol_3, sampler tint_symbol_4) {
   textureGather_3112e8(tint_symbol_3, tint_symbol_4);
   return float4();
diff --git a/test/builtins/gen/textureGather/3c527e.wgsl.expected.msl b/test/builtins/gen/textureGather/3c527e.wgsl.expected.msl
index 94df2334ea..c5458cf275 100644
--- a/test/builtins/gen/textureGather/3c527e.wgsl.expected.msl
+++ b/test/builtins/gen/textureGather/3c527e.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void textureGather_3c527e(texturecube_array<uint, access::sample> tint_symbol_1, sampler tint_symbol_2) {
   uint4 res = tint_symbol_1.gather(tint_symbol_2, float3(), 1, component::y);
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner(texturecube_array<uint, access::sample> tint_symbol_3, sampler tint_symbol_4) {
   textureGather_3c527e(tint_symbol_3, tint_symbol_4);
   return float4();
diff --git a/test/builtins/gen/textureGather/43025d.wgsl.expected.msl b/test/builtins/gen/textureGather/43025d.wgsl.expected.msl
index 6f16342d56..a2c6d259fe 100644
--- a/test/builtins/gen/textureGather/43025d.wgsl.expected.msl
+++ b/test/builtins/gen/textureGather/43025d.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void textureGather_43025d(depthcube_array<float, access::sample> tint_symbol_1, sampler tint_symbol_2) {
   float4 res = tint_symbol_1.gather(tint_symbol_2, float3(), 1);
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner(depthcube_array<float, access::sample> tint_symbol_3, sampler tint_symbol_4) {
   textureGather_43025d(tint_symbol_3, tint_symbol_4);
   return float4();
diff --git a/test/builtins/gen/textureGather/4f2350.wgsl.expected.msl b/test/builtins/gen/textureGather/4f2350.wgsl.expected.msl
index 767864c614..947743ea44 100644
--- a/test/builtins/gen/textureGather/4f2350.wgsl.expected.msl
+++ b/test/builtins/gen/textureGather/4f2350.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void textureGather_4f2350(texture2d_array<int, access::sample> tint_symbol_1, sampler tint_symbol_2) {
   int4 res = tint_symbol_1.gather(tint_symbol_2, float2(), 1, int2(), component::y);
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner(texture2d_array<int, access::sample> tint_symbol_3, sampler tint_symbol_4) {
   textureGather_4f2350(tint_symbol_3, tint_symbol_4);
   return float4();
diff --git a/test/builtins/gen/textureGather/51cf0b.wgsl.expected.msl b/test/builtins/gen/textureGather/51cf0b.wgsl.expected.msl
index dc883fadd5..a082138171 100644
--- a/test/builtins/gen/textureGather/51cf0b.wgsl.expected.msl
+++ b/test/builtins/gen/textureGather/51cf0b.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void textureGather_51cf0b(texture2d_array<int, access::sample> tint_symbol_1, sampler tint_symbol_2) {
   int4 res = tint_symbol_1.gather(tint_symbol_2, float2(), 1, int2(0), component::y);
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner(texture2d_array<int, access::sample> tint_symbol_3, sampler tint_symbol_4) {
   textureGather_51cf0b(tint_symbol_3, tint_symbol_4);
   return float4();
diff --git a/test/builtins/gen/textureGather/53ece6.wgsl.expected.msl b/test/builtins/gen/textureGather/53ece6.wgsl.expected.msl
index 7da86abb24..2a5dbf0e87 100644
--- a/test/builtins/gen/textureGather/53ece6.wgsl.expected.msl
+++ b/test/builtins/gen/textureGather/53ece6.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void textureGather_53ece6(depth2d_array<float, access::sample> tint_symbol_1, sampler tint_symbol_2) {
   float4 res = tint_symbol_1.gather(tint_symbol_2, float2(), 1, int2());
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner(depth2d_array<float, access::sample> tint_symbol_3, sampler tint_symbol_4) {
   textureGather_53ece6(tint_symbol_3, tint_symbol_4);
   return float4();
diff --git a/test/builtins/gen/textureGather/57bfc6.wgsl.expected.msl b/test/builtins/gen/textureGather/57bfc6.wgsl.expected.msl
index fb947d41a9..426ea2006a 100644
--- a/test/builtins/gen/textureGather/57bfc6.wgsl.expected.msl
+++ b/test/builtins/gen/textureGather/57bfc6.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void textureGather_57bfc6(texturecube<float, access::sample> tint_symbol_1, sampler tint_symbol_2) {
   float4 res = tint_symbol_1.gather(tint_symbol_2, float3(), component::y);
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner(texturecube<float, access::sample> tint_symbol_3, sampler tint_symbol_4) {
   textureGather_57bfc6(tint_symbol_3, tint_symbol_4);
   return float4();
diff --git a/test/builtins/gen/textureGather/587ba3.wgsl.expected.msl b/test/builtins/gen/textureGather/587ba3.wgsl.expected.msl
index 2b32e79a6c..0ce1455606 100644
--- a/test/builtins/gen/textureGather/587ba3.wgsl.expected.msl
+++ b/test/builtins/gen/textureGather/587ba3.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void textureGather_587ba3(texture2d<int, access::sample> tint_symbol_1, sampler tint_symbol_2) {
   int4 res = tint_symbol_1.gather(tint_symbol_2, float2(), int2(0), component::y);
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner(texture2d<int, access::sample> tint_symbol_3, sampler tint_symbol_4) {
   textureGather_587ba3(tint_symbol_3, tint_symbol_4);
   return float4();
diff --git a/test/builtins/gen/textureGather/69e0fb.wgsl.expected.msl b/test/builtins/gen/textureGather/69e0fb.wgsl.expected.msl
index fa09d32ba5..43be4dfa0f 100644
--- a/test/builtins/gen/textureGather/69e0fb.wgsl.expected.msl
+++ b/test/builtins/gen/textureGather/69e0fb.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void textureGather_69e0fb(texture2d<int, access::sample> tint_symbol_1, sampler tint_symbol_2) {
   int4 res = tint_symbol_1.gather(tint_symbol_2, float2(), int2(), component::y);
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner(texture2d<int, access::sample> tint_symbol_3, sampler tint_symbol_4) {
   textureGather_69e0fb(tint_symbol_3, tint_symbol_4);
   return float4();
diff --git a/test/builtins/gen/textureGather/93003d.wgsl.expected.msl b/test/builtins/gen/textureGather/93003d.wgsl.expected.msl
index 5498485139..b7c2ba3547 100644
--- a/test/builtins/gen/textureGather/93003d.wgsl.expected.msl
+++ b/test/builtins/gen/textureGather/93003d.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void textureGather_93003d(texture2d<uint, access::sample> tint_symbol_1, sampler tint_symbol_2) {
   uint4 res = tint_symbol_1.gather(tint_symbol_2, float2(), int2(), component::y);
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner(texture2d<uint, access::sample> tint_symbol_3, sampler tint_symbol_4) {
   textureGather_93003d(tint_symbol_3, tint_symbol_4);
   return float4();
diff --git a/test/builtins/gen/textureGather/9a6358.wgsl.expected.msl b/test/builtins/gen/textureGather/9a6358.wgsl.expected.msl
index d65de71844..8588a79fab 100644
--- a/test/builtins/gen/textureGather/9a6358.wgsl.expected.msl
+++ b/test/builtins/gen/textureGather/9a6358.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void textureGather_9a6358(depth2d_array<float, access::sample> tint_symbol_1, sampler tint_symbol_2) {
   float4 res = tint_symbol_1.gather(tint_symbol_2, float2(), 1);
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner(depth2d_array<float, access::sample> tint_symbol_3, sampler tint_symbol_4) {
   textureGather_9a6358(tint_symbol_3, tint_symbol_4);
   return float4();
diff --git a/test/builtins/gen/textureGather/9efca2.wgsl.expected.msl b/test/builtins/gen/textureGather/9efca2.wgsl.expected.msl
index a99e1db83a..4705de2128 100644
--- a/test/builtins/gen/textureGather/9efca2.wgsl.expected.msl
+++ b/test/builtins/gen/textureGather/9efca2.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void textureGather_9efca2(texture2d_array<float, access::sample> tint_symbol_1, sampler tint_symbol_2) {
   float4 res = tint_symbol_1.gather(tint_symbol_2, float2(), 1, int2(0), component::y);
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner(texture2d_array<float, access::sample> tint_symbol_3, sampler tint_symbol_4) {
   textureGather_9efca2(tint_symbol_3, tint_symbol_4);
   return float4();
diff --git a/test/builtins/gen/textureGather/bd0b1e.wgsl.expected.msl b/test/builtins/gen/textureGather/bd0b1e.wgsl.expected.msl
index 80efabda5d..d8311b3f20 100644
--- a/test/builtins/gen/textureGather/bd0b1e.wgsl.expected.msl
+++ b/test/builtins/gen/textureGather/bd0b1e.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void textureGather_bd0b1e(texture2d<float, access::sample> tint_symbol_1, sampler tint_symbol_2) {
   float4 res = tint_symbol_1.gather(tint_symbol_2, float2(), int2(0), component::y);
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner(texture2d<float, access::sample> tint_symbol_3, sampler tint_symbol_4) {
   textureGather_bd0b1e(tint_symbol_3, tint_symbol_4);
   return float4();
diff --git a/test/builtins/gen/textureGather/c409ae.wgsl.expected.msl b/test/builtins/gen/textureGather/c409ae.wgsl.expected.msl
index 2e63e77b0c..c917900704 100644
--- a/test/builtins/gen/textureGather/c409ae.wgsl.expected.msl
+++ b/test/builtins/gen/textureGather/c409ae.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void textureGather_c409ae(depth2d<float, access::sample> tint_symbol_1, sampler tint_symbol_2) {
   float4 res = tint_symbol_1.gather(tint_symbol_2, float2(), int2());
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner(depth2d<float, access::sample> tint_symbol_3, sampler tint_symbol_4) {
   textureGather_c409ae(tint_symbol_3, tint_symbol_4);
   return float4();
diff --git a/test/builtins/gen/textureGather/c55822.wgsl.expected.msl b/test/builtins/gen/textureGather/c55822.wgsl.expected.msl
index 57ad16e8bd..9f34359fcb 100644
--- a/test/builtins/gen/textureGather/c55822.wgsl.expected.msl
+++ b/test/builtins/gen/textureGather/c55822.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void textureGather_c55822(texturecube_array<int, access::sample> tint_symbol_1, sampler tint_symbol_2) {
   int4 res = tint_symbol_1.gather(tint_symbol_2, float3(), 1, component::y);
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner(texturecube_array<int, access::sample> tint_symbol_3, sampler tint_symbol_4) {
   textureGather_c55822(tint_symbol_3, tint_symbol_4);
   return float4();
diff --git a/test/builtins/gen/textureGather/e1b67d.wgsl.expected.msl b/test/builtins/gen/textureGather/e1b67d.wgsl.expected.msl
index 6e5fb4bb98..8d806f937a 100644
--- a/test/builtins/gen/textureGather/e1b67d.wgsl.expected.msl
+++ b/test/builtins/gen/textureGather/e1b67d.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void textureGather_e1b67d(texturecube<uint, access::sample> tint_symbol_1, sampler tint_symbol_2) {
   uint4 res = tint_symbol_1.gather(tint_symbol_2, float3(), component::y);
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner(texturecube<uint, access::sample> tint_symbol_3, sampler tint_symbol_4) {
   textureGather_e1b67d(tint_symbol_3, tint_symbol_4);
   return float4();
diff --git a/test/builtins/gen/textureGather/e9eff6.wgsl.expected.msl b/test/builtins/gen/textureGather/e9eff6.wgsl.expected.msl
index 7e09a8141e..81c960d082 100644
--- a/test/builtins/gen/textureGather/e9eff6.wgsl.expected.msl
+++ b/test/builtins/gen/textureGather/e9eff6.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void textureGather_e9eff6(texture2d<uint, access::sample> tint_symbol_1, sampler tint_symbol_2) {
   uint4 res = tint_symbol_1.gather(tint_symbol_2, float2(), int2(0), component::y);
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner(texture2d<uint, access::sample> tint_symbol_3, sampler tint_symbol_4) {
   textureGather_e9eff6(tint_symbol_3, tint_symbol_4);
   return float4();
diff --git a/test/builtins/gen/textureGather/f5f3ba.wgsl.expected.msl b/test/builtins/gen/textureGather/f5f3ba.wgsl.expected.msl
index 461f0e48af..674927c5f1 100644
--- a/test/builtins/gen/textureGather/f5f3ba.wgsl.expected.msl
+++ b/test/builtins/gen/textureGather/f5f3ba.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void textureGather_f5f3ba(texture2d_array<uint, access::sample> tint_symbol_1, sampler tint_symbol_2) {
   uint4 res = tint_symbol_1.gather(tint_symbol_2, float2(), 1, int2(), component::y);
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner(texture2d_array<uint, access::sample> tint_symbol_3, sampler tint_symbol_4) {
   textureGather_f5f3ba(tint_symbol_3, tint_symbol_4);
   return float4();
diff --git a/test/builtins/gen/textureGather/f7995a.wgsl.expected.msl b/test/builtins/gen/textureGather/f7995a.wgsl.expected.msl
index e154e15c3c..daf9ec7c0e 100644
--- a/test/builtins/gen/textureGather/f7995a.wgsl.expected.msl
+++ b/test/builtins/gen/textureGather/f7995a.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void textureGather_f7995a(texturecube<int, access::sample> tint_symbol_1, sampler tint_symbol_2) {
   int4 res = tint_symbol_1.gather(tint_symbol_2, float3(), component::y);
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner(texturecube<int, access::sample> tint_symbol_3, sampler tint_symbol_4) {
   textureGather_f7995a(tint_symbol_3, tint_symbol_4);
   return float4();
diff --git a/test/builtins/gen/textureGatherCompare/182fd4.wgsl.expected.msl b/test/builtins/gen/textureGatherCompare/182fd4.wgsl.expected.msl
index 07d9f5c379..87e666155b 100644
--- a/test/builtins/gen/textureGatherCompare/182fd4.wgsl.expected.msl
+++ b/test/builtins/gen/textureGatherCompare/182fd4.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void textureGatherCompare_182fd4(depthcube<float, access::sample> tint_symbol_1, sampler tint_symbol_2) {
   float4 res = tint_symbol_1.gather_compare(tint_symbol_2, float3(), 1.0f);
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner(depthcube<float, access::sample> tint_symbol_3, sampler tint_symbol_4) {
   textureGatherCompare_182fd4(tint_symbol_3, tint_symbol_4);
   return float4();
diff --git a/test/builtins/gen/textureGatherCompare/60d2d1.wgsl.expected.msl b/test/builtins/gen/textureGatherCompare/60d2d1.wgsl.expected.msl
index e504b009db..3fb5c132bb 100644
--- a/test/builtins/gen/textureGatherCompare/60d2d1.wgsl.expected.msl
+++ b/test/builtins/gen/textureGatherCompare/60d2d1.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void textureGatherCompare_60d2d1(depthcube_array<float, access::sample> tint_symbol_1, sampler tint_symbol_2) {
   float4 res = tint_symbol_1.gather_compare(tint_symbol_2, float3(), 1, 1.0f);
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner(depthcube_array<float, access::sample> tint_symbol_3, sampler tint_symbol_4) {
   textureGatherCompare_60d2d1(tint_symbol_3, tint_symbol_4);
   return float4();
diff --git a/test/builtins/gen/textureGatherCompare/6d9352.wgsl.expected.msl b/test/builtins/gen/textureGatherCompare/6d9352.wgsl.expected.msl
index 8bcdc2d532..cacdd370f1 100644
--- a/test/builtins/gen/textureGatherCompare/6d9352.wgsl.expected.msl
+++ b/test/builtins/gen/textureGatherCompare/6d9352.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void textureGatherCompare_6d9352(depth2d<float, access::sample> tint_symbol_1, sampler tint_symbol_2) {
   float4 res = tint_symbol_1.gather_compare(tint_symbol_2, float2(), 1.0f);
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner(depth2d<float, access::sample> tint_symbol_3, sampler tint_symbol_4) {
   textureGatherCompare_6d9352(tint_symbol_3, tint_symbol_4);
   return float4();
diff --git a/test/builtins/gen/textureGatherCompare/6f1267.wgsl.expected.msl b/test/builtins/gen/textureGatherCompare/6f1267.wgsl.expected.msl
index f5fcff2bad..1e3a96faec 100644
--- a/test/builtins/gen/textureGatherCompare/6f1267.wgsl.expected.msl
+++ b/test/builtins/gen/textureGatherCompare/6f1267.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void textureGatherCompare_6f1267(depth2d_array<float, access::sample> tint_symbol_1, sampler tint_symbol_2) {
   float4 res = tint_symbol_1.gather_compare(tint_symbol_2, float2(), 1, 1.0f, int2());
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner(depth2d_array<float, access::sample> tint_symbol_3, sampler tint_symbol_4) {
   textureGatherCompare_6f1267(tint_symbol_3, tint_symbol_4);
   return float4();
diff --git a/test/builtins/gen/textureGatherCompare/783e65.wgsl.expected.msl b/test/builtins/gen/textureGatherCompare/783e65.wgsl.expected.msl
index 86197e65f5..5520d910be 100644
--- a/test/builtins/gen/textureGatherCompare/783e65.wgsl.expected.msl
+++ b/test/builtins/gen/textureGatherCompare/783e65.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void textureGatherCompare_783e65(depth2d_array<float, access::sample> tint_symbol_1, sampler tint_symbol_2) {
   float4 res = tint_symbol_1.gather_compare(tint_symbol_2, float2(), 1, 1.0f);
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner(depth2d_array<float, access::sample> tint_symbol_3, sampler tint_symbol_4) {
   textureGatherCompare_783e65(tint_symbol_3, tint_symbol_4);
   return float4();
diff --git a/test/builtins/gen/textureGatherCompare/a5f587.wgsl.expected.msl b/test/builtins/gen/textureGatherCompare/a5f587.wgsl.expected.msl
index 2c0176b317..94edcaded9 100644
--- a/test/builtins/gen/textureGatherCompare/a5f587.wgsl.expected.msl
+++ b/test/builtins/gen/textureGatherCompare/a5f587.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void textureGatherCompare_a5f587(depth2d<float, access::sample> tint_symbol_1, sampler tint_symbol_2) {
   float4 res = tint_symbol_1.gather_compare(tint_symbol_2, float2(), 1.0f, int2());
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner(depth2d<float, access::sample> tint_symbol_3, sampler tint_symbol_4) {
   textureGatherCompare_a5f587(tint_symbol_3, tint_symbol_4);
   return float4();
diff --git a/test/builtins/gen/textureLoad/19cf87.wgsl.expected.msl b/test/builtins/gen/textureLoad/19cf87.wgsl.expected.msl
index e06a86260c..c9b2c1d39a 100644
--- a/test/builtins/gen/textureLoad/19cf87.wgsl.expected.msl
+++ b/test/builtins/gen/textureLoad/19cf87.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void textureLoad_19cf87(depth2d<float, access::sample> tint_symbol_1) {
   float res = tint_symbol_1.read(uint2(int2()), 0);
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner(depth2d<float, access::sample> tint_symbol_2) {
   textureLoad_19cf87(tint_symbol_2);
   return float4();
diff --git a/test/builtins/gen/textureLoad/1b8588.wgsl.expected.msl b/test/builtins/gen/textureLoad/1b8588.wgsl.expected.msl
index f5f44e83dc..2dd4d15ac0 100644
--- a/test/builtins/gen/textureLoad/1b8588.wgsl.expected.msl
+++ b/test/builtins/gen/textureLoad/1b8588.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void textureLoad_1b8588(texture1d<uint, access::sample> tint_symbol_1) {
   uint4 res = tint_symbol_1.read(uint(1), 0);
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner(texture1d<uint, access::sample> tint_symbol_2) {
   textureLoad_1b8588(tint_symbol_2);
   return float4();
diff --git a/test/builtins/gen/textureLoad/1f2016.wgsl.expected.msl b/test/builtins/gen/textureLoad/1f2016.wgsl.expected.msl
index 4186f510ca..296e7bbbc9 100644
--- a/test/builtins/gen/textureLoad/1f2016.wgsl.expected.msl
+++ b/test/builtins/gen/textureLoad/1f2016.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void textureLoad_1f2016(texture3d<float, access::sample> tint_symbol_1) {
   float4 res = tint_symbol_1.read(uint3(int3()), 0);
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner(texture3d<float, access::sample> tint_symbol_2) {
   textureLoad_1f2016(tint_symbol_2);
   return float4();
diff --git a/test/builtins/gen/textureLoad/484344.wgsl.expected.msl b/test/builtins/gen/textureLoad/484344.wgsl.expected.msl
index 4fb7b021e6..b1ffb1da8a 100644
--- a/test/builtins/gen/textureLoad/484344.wgsl.expected.msl
+++ b/test/builtins/gen/textureLoad/484344.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void textureLoad_484344(texture2d<float, access::sample> tint_symbol_1) {
   float4 res = tint_symbol_1.read(uint2(int2()), 0);
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner(texture2d<float, access::sample> tint_symbol_2) {
   textureLoad_484344(tint_symbol_2);
   return float4();
diff --git a/test/builtins/gen/textureLoad/4fd803.wgsl.expected.msl b/test/builtins/gen/textureLoad/4fd803.wgsl.expected.msl
index a83494a41a..ccfeb6a46b 100644
--- a/test/builtins/gen/textureLoad/4fd803.wgsl.expected.msl
+++ b/test/builtins/gen/textureLoad/4fd803.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void textureLoad_4fd803(texture3d<int, access::sample> tint_symbol_1) {
   int4 res = tint_symbol_1.read(uint3(int3()), 0);
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner(texture3d<int, access::sample> tint_symbol_2) {
   textureLoad_4fd803(tint_symbol_2);
   return float4();
diff --git a/test/builtins/gen/textureLoad/5a2f9d.wgsl.expected.msl b/test/builtins/gen/textureLoad/5a2f9d.wgsl.expected.msl
index 10d913309d..54f52cfb82 100644
--- a/test/builtins/gen/textureLoad/5a2f9d.wgsl.expected.msl
+++ b/test/builtins/gen/textureLoad/5a2f9d.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void textureLoad_5a2f9d(texture1d<int, access::sample> tint_symbol_1) {
   int4 res = tint_symbol_1.read(uint(1), 0);
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner(texture1d<int, access::sample> tint_symbol_2) {
   textureLoad_5a2f9d(tint_symbol_2);
   return float4();
diff --git a/test/builtins/gen/textureLoad/6154d4.wgsl.expected.msl b/test/builtins/gen/textureLoad/6154d4.wgsl.expected.msl
index 9fdd4a4de1..a542c124a6 100644
--- a/test/builtins/gen/textureLoad/6154d4.wgsl.expected.msl
+++ b/test/builtins/gen/textureLoad/6154d4.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void textureLoad_6154d4(texture2d<uint, access::sample> tint_symbol_1) {
   uint4 res = tint_symbol_1.read(uint2(int2()), 0);
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner(texture2d<uint, access::sample> tint_symbol_2) {
   textureLoad_6154d4(tint_symbol_2);
   return float4();
diff --git a/test/builtins/gen/textureLoad/6273b1.wgsl.expected.msl b/test/builtins/gen/textureLoad/6273b1.wgsl.expected.msl
index 69c6257142..8dfd72b2d6 100644
--- a/test/builtins/gen/textureLoad/6273b1.wgsl.expected.msl
+++ b/test/builtins/gen/textureLoad/6273b1.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void textureLoad_6273b1(depth2d_ms<float, access::read> tint_symbol_1) {
   float res = tint_symbol_1.read(uint2(int2()), 1);
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner(depth2d_ms<float, access::read> tint_symbol_2) {
   textureLoad_6273b1(tint_symbol_2);
   return float4();
diff --git a/test/builtins/gen/textureLoad/79e697.wgsl.expected.msl b/test/builtins/gen/textureLoad/79e697.wgsl.expected.msl
index 1a92b23123..4e4cacf963 100644
--- a/test/builtins/gen/textureLoad/79e697.wgsl.expected.msl
+++ b/test/builtins/gen/textureLoad/79e697.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void textureLoad_79e697(texture2d_array<int, access::sample> tint_symbol_1) {
   int4 res = tint_symbol_1.read(uint2(int2()), 1, 0);
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner(texture2d_array<int, access::sample> tint_symbol_2) {
   textureLoad_79e697(tint_symbol_2);
   return float4();
diff --git a/test/builtins/gen/textureLoad/7c90e5.wgsl.expected.msl b/test/builtins/gen/textureLoad/7c90e5.wgsl.expected.msl
index 463f1a951a..a2b782a088 100644
--- a/test/builtins/gen/textureLoad/7c90e5.wgsl.expected.msl
+++ b/test/builtins/gen/textureLoad/7c90e5.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void textureLoad_7c90e5(texture2d_array<uint, access::sample> tint_symbol_1) {
   uint4 res = tint_symbol_1.read(uint2(int2()), 1, 0);
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner(texture2d_array<uint, access::sample> tint_symbol_2) {
   textureLoad_7c90e5(tint_symbol_2);
   return float4();
diff --git a/test/builtins/gen/textureLoad/81c381.wgsl.expected.msl b/test/builtins/gen/textureLoad/81c381.wgsl.expected.msl
index d3d567d3bd..d2fd8d08f0 100644
--- a/test/builtins/gen/textureLoad/81c381.wgsl.expected.msl
+++ b/test/builtins/gen/textureLoad/81c381.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void textureLoad_81c381(texture1d<float, access::sample> tint_symbol_1) {
   float4 res = tint_symbol_1.read(uint(1), 0);
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner(texture1d<float, access::sample> tint_symbol_2) {
   textureLoad_81c381(tint_symbol_2);
   return float4();
diff --git a/test/builtins/gen/textureLoad/87be85.wgsl.expected.msl b/test/builtins/gen/textureLoad/87be85.wgsl.expected.msl
index 7746c5bf57..c8337af61e 100644
--- a/test/builtins/gen/textureLoad/87be85.wgsl.expected.msl
+++ b/test/builtins/gen/textureLoad/87be85.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void textureLoad_87be85(texture2d_array<float, access::sample> tint_symbol_1) {
   float4 res = tint_symbol_1.read(uint2(int2()), 1, 0);
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner(texture2d_array<float, access::sample> tint_symbol_2) {
   textureLoad_87be85(tint_symbol_2);
   return float4();
diff --git a/test/builtins/gen/textureLoad/8acf41.wgsl.expected.msl b/test/builtins/gen/textureLoad/8acf41.wgsl.expected.msl
index 3a747df496..994e6eb8b2 100644
--- a/test/builtins/gen/textureLoad/8acf41.wgsl.expected.msl
+++ b/test/builtins/gen/textureLoad/8acf41.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void textureLoad_8acf41(texture2d<float, access::sample> tint_symbol_1) {
   float4 res = tint_symbol_1.read(uint2(int2()), 0);
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner(texture2d<float, access::sample> tint_symbol_2) {
   textureLoad_8acf41(tint_symbol_2);
   return float4();
diff --git a/test/builtins/gen/textureLoad/9b2667.wgsl.expected.msl b/test/builtins/gen/textureLoad/9b2667.wgsl.expected.msl
index 59d52acc77..9faf689498 100644
--- a/test/builtins/gen/textureLoad/9b2667.wgsl.expected.msl
+++ b/test/builtins/gen/textureLoad/9b2667.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void textureLoad_9b2667(depth2d_array<float, access::sample> tint_symbol_1) {
   float res = tint_symbol_1.read(uint2(int2()), 1, 0);
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner(depth2d_array<float, access::sample> tint_symbol_2) {
   textureLoad_9b2667(tint_symbol_2);
   return float4();
diff --git a/test/builtins/gen/textureLoad/a583c9.wgsl.expected.msl b/test/builtins/gen/textureLoad/a583c9.wgsl.expected.msl
index 0d0a47f459..553f45eed8 100644
--- a/test/builtins/gen/textureLoad/a583c9.wgsl.expected.msl
+++ b/test/builtins/gen/textureLoad/a583c9.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void textureLoad_a583c9(texture2d_ms<float, access::read> tint_symbol_1) {
   float4 res = tint_symbol_1.read(uint2(int2()), 1);
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner(texture2d_ms<float, access::read> tint_symbol_2) {
   textureLoad_a583c9(tint_symbol_2);
   return float4();
diff --git a/test/builtins/gen/textureLoad/a9a9f5.wgsl.expected.msl b/test/builtins/gen/textureLoad/a9a9f5.wgsl.expected.msl
index 35cd32ad53..1d87c99657 100644
--- a/test/builtins/gen/textureLoad/a9a9f5.wgsl.expected.msl
+++ b/test/builtins/gen/textureLoad/a9a9f5.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void textureLoad_a9a9f5(texture3d<uint, access::sample> tint_symbol_1) {
   uint4 res = tint_symbol_1.read(uint3(int3()), 0);
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner(texture3d<uint, access::sample> tint_symbol_2) {
   textureLoad_a9a9f5(tint_symbol_2);
   return float4();
diff --git a/test/builtins/gen/textureLoad/c2a480.wgsl.expected.msl b/test/builtins/gen/textureLoad/c2a480.wgsl.expected.msl
index 645ed0f2c7..01badd3190 100644
--- a/test/builtins/gen/textureLoad/c2a480.wgsl.expected.msl
+++ b/test/builtins/gen/textureLoad/c2a480.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void textureLoad_c2a480(texture2d<int, access::sample> tint_symbol_1) {
   int4 res = tint_symbol_1.read(uint2(int2()), 0);
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner(texture2d<int, access::sample> tint_symbol_2) {
   textureLoad_c2a480(tint_symbol_2);
   return float4();
diff --git a/test/builtins/gen/textureLoad/c378ee.wgsl.expected.msl b/test/builtins/gen/textureLoad/c378ee.wgsl.expected.msl
index 282257c283..60085e0404 100644
--- a/test/builtins/gen/textureLoad/c378ee.wgsl.expected.msl
+++ b/test/builtins/gen/textureLoad/c378ee.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void textureLoad_c378ee(texture2d_ms<uint, access::read> tint_symbol_1) {
   uint4 res = tint_symbol_1.read(uint2(int2()), 1);
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner(texture2d_ms<uint, access::read> tint_symbol_2) {
   textureLoad_c378ee(tint_symbol_2);
   return float4();
diff --git a/test/builtins/gen/textureLoad/e3d2cc.wgsl.expected.msl b/test/builtins/gen/textureLoad/e3d2cc.wgsl.expected.msl
index ff180462d9..1674c168e3 100644
--- a/test/builtins/gen/textureLoad/e3d2cc.wgsl.expected.msl
+++ b/test/builtins/gen/textureLoad/e3d2cc.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void textureLoad_e3d2cc(texture2d_ms<int, access::read> tint_symbol_1) {
   int4 res = tint_symbol_1.read(uint2(int2()), 1);
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner(texture2d_ms<int, access::read> tint_symbol_2) {
   textureLoad_e3d2cc(tint_symbol_2);
   return float4();
diff --git a/test/builtins/gen/textureNumLayers/024820.wgsl.expected.msl b/test/builtins/gen/textureNumLayers/024820.wgsl.expected.msl
index 4c7d325410..cecc24da8d 100644
--- a/test/builtins/gen/textureNumLayers/024820.wgsl.expected.msl
+++ b/test/builtins/gen/textureNumLayers/024820.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void textureNumLayers_024820(texture2d_array<float, access::sample> tint_symbol_1) {
   int res = int(tint_symbol_1.get_array_size());
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner(texture2d_array<float, access::sample> tint_symbol_2) {
   textureNumLayers_024820(tint_symbol_2);
   return float4();
diff --git a/test/builtins/gen/textureNumLayers/053df7.wgsl.expected.msl b/test/builtins/gen/textureNumLayers/053df7.wgsl.expected.msl
index 46a1852ce6..4c77a41b31 100644
--- a/test/builtins/gen/textureNumLayers/053df7.wgsl.expected.msl
+++ b/test/builtins/gen/textureNumLayers/053df7.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void textureNumLayers_053df7(texturecube_array<uint, access::sample> tint_symbol_1) {
   int res = int(tint_symbol_1.get_array_size());
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner(texturecube_array<uint, access::sample> tint_symbol_2) {
   textureNumLayers_053df7(tint_symbol_2);
   return float4();
diff --git a/test/builtins/gen/textureNumLayers/058cc3.wgsl.expected.msl b/test/builtins/gen/textureNumLayers/058cc3.wgsl.expected.msl
index 7327477bd5..6ba3aecf54 100644
--- a/test/builtins/gen/textureNumLayers/058cc3.wgsl.expected.msl
+++ b/test/builtins/gen/textureNumLayers/058cc3.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void textureNumLayers_058cc3(texture2d_array<int, access::write> tint_symbol_1) {
   int res = int(tint_symbol_1.get_array_size());
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner(texture2d_array<int, access::write> tint_symbol_2) {
   textureNumLayers_058cc3(tint_symbol_2);
   return float4();
diff --git a/test/builtins/gen/textureNumLayers/09d05d.wgsl.expected.msl b/test/builtins/gen/textureNumLayers/09d05d.wgsl.expected.msl
index 7a4461bea3..32372b9dab 100644
--- a/test/builtins/gen/textureNumLayers/09d05d.wgsl.expected.msl
+++ b/test/builtins/gen/textureNumLayers/09d05d.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void textureNumLayers_09d05d(texture2d_array<float, access::write> tint_symbol_1) {
   int res = int(tint_symbol_1.get_array_size());
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner(texture2d_array<float, access::write> tint_symbol_2) {
   textureNumLayers_09d05d(tint_symbol_2);
   return float4();
diff --git a/test/builtins/gen/textureNumLayers/13b4ce.wgsl.expected.msl b/test/builtins/gen/textureNumLayers/13b4ce.wgsl.expected.msl
index e91fc4b00e..e48920fa60 100644
--- a/test/builtins/gen/textureNumLayers/13b4ce.wgsl.expected.msl
+++ b/test/builtins/gen/textureNumLayers/13b4ce.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void textureNumLayers_13b4ce(texture2d_array<int, access::write> tint_symbol_1) {
   int res = int(tint_symbol_1.get_array_size());
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner(texture2d_array<int, access::write> tint_symbol_2) {
   textureNumLayers_13b4ce(tint_symbol_2);
   return float4();
diff --git a/test/builtins/gen/textureNumLayers/22e53b.wgsl.expected.msl b/test/builtins/gen/textureNumLayers/22e53b.wgsl.expected.msl
index 09c3768d96..7bfd96a3bf 100644
--- a/test/builtins/gen/textureNumLayers/22e53b.wgsl.expected.msl
+++ b/test/builtins/gen/textureNumLayers/22e53b.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void textureNumLayers_22e53b(texture2d_array<int, access::write> tint_symbol_1) {
   int res = int(tint_symbol_1.get_array_size());
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner(texture2d_array<int, access::write> tint_symbol_2) {
   textureNumLayers_22e53b(tint_symbol_2);
   return float4();
diff --git a/test/builtins/gen/textureNumLayers/562013.wgsl.expected.msl b/test/builtins/gen/textureNumLayers/562013.wgsl.expected.msl
index aa1efc5442..29e697e304 100644
--- a/test/builtins/gen/textureNumLayers/562013.wgsl.expected.msl
+++ b/test/builtins/gen/textureNumLayers/562013.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void textureNumLayers_562013(texture2d_array<float, access::write> tint_symbol_1) {
   int res = int(tint_symbol_1.get_array_size());
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner(texture2d_array<float, access::write> tint_symbol_2) {
   textureNumLayers_562013(tint_symbol_2);
   return float4();
diff --git a/test/builtins/gen/textureNumLayers/5d59cd.wgsl.expected.msl b/test/builtins/gen/textureNumLayers/5d59cd.wgsl.expected.msl
index 023d182b34..ecbee5958c 100644
--- a/test/builtins/gen/textureNumLayers/5d59cd.wgsl.expected.msl
+++ b/test/builtins/gen/textureNumLayers/5d59cd.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void textureNumLayers_5d59cd(texturecube_array<float, access::sample> tint_symbol_1) {
   int res = int(tint_symbol_1.get_array_size());
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner(texturecube_array<float, access::sample> tint_symbol_2) {
   textureNumLayers_5d59cd(tint_symbol_2);
   return float4();
diff --git a/test/builtins/gen/textureNumLayers/68a65b.wgsl.expected.msl b/test/builtins/gen/textureNumLayers/68a65b.wgsl.expected.msl
index bd4a5509bc..a71e53d3b4 100644
--- a/test/builtins/gen/textureNumLayers/68a65b.wgsl.expected.msl
+++ b/test/builtins/gen/textureNumLayers/68a65b.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void textureNumLayers_68a65b(texture2d_array<float, access::write> tint_symbol_1) {
   int res = int(tint_symbol_1.get_array_size());
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner(texture2d_array<float, access::write> tint_symbol_2) {
   textureNumLayers_68a65b(tint_symbol_2);
   return float4();
diff --git a/test/builtins/gen/textureNumLayers/778bd1.wgsl.expected.msl b/test/builtins/gen/textureNumLayers/778bd1.wgsl.expected.msl
index a9531296fa..7d8fb0f57a 100644
--- a/test/builtins/gen/textureNumLayers/778bd1.wgsl.expected.msl
+++ b/test/builtins/gen/textureNumLayers/778bd1.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void textureNumLayers_778bd1(depthcube_array<float, access::sample> tint_symbol_1) {
   int res = int(tint_symbol_1.get_array_size());
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner(depthcube_array<float, access::sample> tint_symbol_2) {
   textureNumLayers_778bd1(tint_symbol_2);
   return float4();
diff --git a/test/builtins/gen/textureNumLayers/7f1937.wgsl.expected.msl b/test/builtins/gen/textureNumLayers/7f1937.wgsl.expected.msl
index d094de4409..e7027f1374 100644
--- a/test/builtins/gen/textureNumLayers/7f1937.wgsl.expected.msl
+++ b/test/builtins/gen/textureNumLayers/7f1937.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void textureNumLayers_7f1937(texture2d_array<float, access::write> tint_symbol_1) {
   int res = int(tint_symbol_1.get_array_size());
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner(texture2d_array<float, access::write> tint_symbol_2) {
   textureNumLayers_7f1937(tint_symbol_2);
   return float4();
diff --git a/test/builtins/gen/textureNumLayers/85f980.wgsl.expected.msl b/test/builtins/gen/textureNumLayers/85f980.wgsl.expected.msl
index 0967c44aed..ce07ab5e96 100644
--- a/test/builtins/gen/textureNumLayers/85f980.wgsl.expected.msl
+++ b/test/builtins/gen/textureNumLayers/85f980.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void textureNumLayers_85f980(texturecube_array<int, access::sample> tint_symbol_1) {
   int res = int(tint_symbol_1.get_array_size());
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner(texturecube_array<int, access::sample> tint_symbol_2) {
   textureNumLayers_85f980(tint_symbol_2);
   return float4();
diff --git a/test/builtins/gen/textureNumLayers/87953e.wgsl.expected.msl b/test/builtins/gen/textureNumLayers/87953e.wgsl.expected.msl
index e64875b3d7..344a256724 100644
--- a/test/builtins/gen/textureNumLayers/87953e.wgsl.expected.msl
+++ b/test/builtins/gen/textureNumLayers/87953e.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void textureNumLayers_87953e(texture2d_array<uint, access::sample> tint_symbol_1) {
   int res = int(tint_symbol_1.get_array_size());
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner(texture2d_array<uint, access::sample> tint_symbol_2) {
   textureNumLayers_87953e(tint_symbol_2);
   return float4();
diff --git a/test/builtins/gen/textureNumLayers/893e7c.wgsl.expected.msl b/test/builtins/gen/textureNumLayers/893e7c.wgsl.expected.msl
index ca4397b4aa..9282aa8ff0 100644
--- a/test/builtins/gen/textureNumLayers/893e7c.wgsl.expected.msl
+++ b/test/builtins/gen/textureNumLayers/893e7c.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void textureNumLayers_893e7c(texture2d_array<int, access::sample> tint_symbol_1) {
   int res = int(tint_symbol_1.get_array_size());
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner(texture2d_array<int, access::sample> tint_symbol_2) {
   textureNumLayers_893e7c(tint_symbol_2);
   return float4();
diff --git a/test/builtins/gen/textureNumLayers/9700fb.wgsl.expected.msl b/test/builtins/gen/textureNumLayers/9700fb.wgsl.expected.msl
index 7563653f7c..9cd8aad10d 100644
--- a/test/builtins/gen/textureNumLayers/9700fb.wgsl.expected.msl
+++ b/test/builtins/gen/textureNumLayers/9700fb.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void textureNumLayers_9700fb(texture2d_array<uint, access::write> tint_symbol_1) {
   int res = int(tint_symbol_1.get_array_size());
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner(texture2d_array<uint, access::write> tint_symbol_2) {
   textureNumLayers_9700fb(tint_symbol_2);
   return float4();
diff --git a/test/builtins/gen/textureNumLayers/a216d2.wgsl.expected.msl b/test/builtins/gen/textureNumLayers/a216d2.wgsl.expected.msl
index dc42607280..67624d6bbd 100644
--- a/test/builtins/gen/textureNumLayers/a216d2.wgsl.expected.msl
+++ b/test/builtins/gen/textureNumLayers/a216d2.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void textureNumLayers_a216d2(texture2d_array<int, access::write> tint_symbol_1) {
   int res = int(tint_symbol_1.get_array_size());
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner(texture2d_array<int, access::write> tint_symbol_2) {
   textureNumLayers_a216d2(tint_symbol_2);
   return float4();
diff --git a/test/builtins/gen/textureNumLayers/cd5dc8.wgsl.expected.msl b/test/builtins/gen/textureNumLayers/cd5dc8.wgsl.expected.msl
index 43c8cdb677..d783a2d845 100644
--- a/test/builtins/gen/textureNumLayers/cd5dc8.wgsl.expected.msl
+++ b/test/builtins/gen/textureNumLayers/cd5dc8.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void textureNumLayers_cd5dc8(texture2d_array<uint, access::write> tint_symbol_1) {
   int res = int(tint_symbol_1.get_array_size());
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner(texture2d_array<uint, access::write> tint_symbol_2) {
   textureNumLayers_cd5dc8(tint_symbol_2);
   return float4();
diff --git a/test/builtins/gen/textureNumLayers/d5b228.wgsl.expected.msl b/test/builtins/gen/textureNumLayers/d5b228.wgsl.expected.msl
index 89bc26e439..d8f24b2eae 100644
--- a/test/builtins/gen/textureNumLayers/d5b228.wgsl.expected.msl
+++ b/test/builtins/gen/textureNumLayers/d5b228.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void textureNumLayers_d5b228(texture2d_array<float, access::write> tint_symbol_1) {
   int res = int(tint_symbol_1.get_array_size());
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner(texture2d_array<float, access::write> tint_symbol_2) {
   textureNumLayers_d5b228(tint_symbol_2);
   return float4();
diff --git a/test/builtins/gen/textureNumLayers/e31be1.wgsl.expected.msl b/test/builtins/gen/textureNumLayers/e31be1.wgsl.expected.msl
index 037b86def7..8935085d84 100644
--- a/test/builtins/gen/textureNumLayers/e31be1.wgsl.expected.msl
+++ b/test/builtins/gen/textureNumLayers/e31be1.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void textureNumLayers_e31be1(texture2d_array<float, access::write> tint_symbol_1) {
   int res = int(tint_symbol_1.get_array_size());
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner(texture2d_array<float, access::write> tint_symbol_2) {
   textureNumLayers_e31be1(tint_symbol_2);
   return float4();
diff --git a/test/builtins/gen/textureNumLayers/e653c0.wgsl.expected.msl b/test/builtins/gen/textureNumLayers/e653c0.wgsl.expected.msl
index 6ef95eac5a..d37e9d9b69 100644
--- a/test/builtins/gen/textureNumLayers/e653c0.wgsl.expected.msl
+++ b/test/builtins/gen/textureNumLayers/e653c0.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void textureNumLayers_e653c0(depth2d_array<float, access::sample> tint_symbol_1) {
   int res = int(tint_symbol_1.get_array_size());
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner(depth2d_array<float, access::sample> tint_symbol_2) {
   textureNumLayers_e653c0(tint_symbol_2);
   return float4();
diff --git a/test/builtins/gen/textureNumLayers/ee942f.wgsl.expected.msl b/test/builtins/gen/textureNumLayers/ee942f.wgsl.expected.msl
index bddf8a105d..399e5bd7d9 100644
--- a/test/builtins/gen/textureNumLayers/ee942f.wgsl.expected.msl
+++ b/test/builtins/gen/textureNumLayers/ee942f.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void textureNumLayers_ee942f(texture2d_array<uint, access::write> tint_symbol_1) {
   int res = int(tint_symbol_1.get_array_size());
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner(texture2d_array<uint, access::write> tint_symbol_2) {
   textureNumLayers_ee942f(tint_symbol_2);
   return float4();
diff --git a/test/builtins/gen/textureNumLayers/f33005.wgsl.expected.msl b/test/builtins/gen/textureNumLayers/f33005.wgsl.expected.msl
index 37f4a9adb4..78959f67b9 100644
--- a/test/builtins/gen/textureNumLayers/f33005.wgsl.expected.msl
+++ b/test/builtins/gen/textureNumLayers/f33005.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void textureNumLayers_f33005(texture2d_array<int, access::write> tint_symbol_1) {
   int res = int(tint_symbol_1.get_array_size());
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner(texture2d_array<int, access::write> tint_symbol_2) {
   textureNumLayers_f33005(tint_symbol_2);
   return float4();
diff --git a/test/builtins/gen/textureNumLayers/fcec98.wgsl.expected.msl b/test/builtins/gen/textureNumLayers/fcec98.wgsl.expected.msl
index 9e764d33cc..ffcba511ab 100644
--- a/test/builtins/gen/textureNumLayers/fcec98.wgsl.expected.msl
+++ b/test/builtins/gen/textureNumLayers/fcec98.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void textureNumLayers_fcec98(texture2d_array<uint, access::write> tint_symbol_1) {
   int res = int(tint_symbol_1.get_array_size());
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner(texture2d_array<uint, access::write> tint_symbol_2) {
   textureNumLayers_fcec98(tint_symbol_2);
   return float4();
diff --git a/test/builtins/gen/textureNumLayers/ff5e89.wgsl.expected.msl b/test/builtins/gen/textureNumLayers/ff5e89.wgsl.expected.msl
index 1d0a63877e..2a83087bfb 100644
--- a/test/builtins/gen/textureNumLayers/ff5e89.wgsl.expected.msl
+++ b/test/builtins/gen/textureNumLayers/ff5e89.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void textureNumLayers_ff5e89(texture2d_array<uint, access::write> tint_symbol_1) {
   int res = int(tint_symbol_1.get_array_size());
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner(texture2d_array<uint, access::write> tint_symbol_2) {
   textureNumLayers_ff5e89(tint_symbol_2);
   return float4();
diff --git a/test/builtins/gen/textureNumLevels/076cb5.wgsl.expected.msl b/test/builtins/gen/textureNumLevels/076cb5.wgsl.expected.msl
index 14c225f31c..e60a683f7d 100644
--- a/test/builtins/gen/textureNumLevels/076cb5.wgsl.expected.msl
+++ b/test/builtins/gen/textureNumLevels/076cb5.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void textureNumLevels_076cb5(depthcube<float, access::sample> tint_symbol_1) {
   int res = int(tint_symbol_1.get_num_mip_levels());
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner(depthcube<float, access::sample> tint_symbol_2) {
   textureNumLevels_076cb5(tint_symbol_2);
   return float4();
diff --git a/test/builtins/gen/textureNumLevels/080d95.wgsl.expected.msl b/test/builtins/gen/textureNumLevels/080d95.wgsl.expected.msl
index b05f3ee370..c8fb39c2f1 100644
--- a/test/builtins/gen/textureNumLevels/080d95.wgsl.expected.msl
+++ b/test/builtins/gen/textureNumLevels/080d95.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void textureNumLevels_080d95(texturecube<int, access::sample> tint_symbol_1) {
   int res = int(tint_symbol_1.get_num_mip_levels());
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner(texturecube<int, access::sample> tint_symbol_2) {
   textureNumLevels_080d95(tint_symbol_2);
   return float4();
diff --git a/test/builtins/gen/textureNumLevels/09ddd0.wgsl.expected.msl b/test/builtins/gen/textureNumLevels/09ddd0.wgsl.expected.msl
index c1df2e621b..be2500ac8e 100644
--- a/test/builtins/gen/textureNumLevels/09ddd0.wgsl.expected.msl
+++ b/test/builtins/gen/textureNumLevels/09ddd0.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void textureNumLevels_09ddd0(texture2d<uint, access::sample> tint_symbol_1) {
   int res = int(tint_symbol_1.get_num_mip_levels());
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner(texture2d<uint, access::sample> tint_symbol_2) {
   textureNumLevels_09ddd0(tint_symbol_2);
   return float4();
diff --git a/test/builtins/gen/textureNumLevels/105988.wgsl.expected.msl b/test/builtins/gen/textureNumLevels/105988.wgsl.expected.msl
index 3ed02e4d70..096d48d290 100644
--- a/test/builtins/gen/textureNumLevels/105988.wgsl.expected.msl
+++ b/test/builtins/gen/textureNumLevels/105988.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void textureNumLevels_105988(texture2d_array<float, access::sample> tint_symbol_1) {
   int res = int(tint_symbol_1.get_num_mip_levels());
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner(texture2d_array<float, access::sample> tint_symbol_2) {
   textureNumLevels_105988(tint_symbol_2);
   return float4();
diff --git a/test/builtins/gen/textureNumLevels/1e6f3b.wgsl.expected.msl b/test/builtins/gen/textureNumLevels/1e6f3b.wgsl.expected.msl
index bd923ca988..fb21aa7064 100644
--- a/test/builtins/gen/textureNumLevels/1e6f3b.wgsl.expected.msl
+++ b/test/builtins/gen/textureNumLevels/1e6f3b.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void textureNumLevels_1e6f3b(texture1d<uint, access::sample> tint_symbol_1) {
   int res = int(tint_symbol_1.get_num_mip_levels());
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner(texture1d<uint, access::sample> tint_symbol_2) {
   textureNumLevels_1e6f3b(tint_symbol_2);
   return float4();
diff --git a/test/builtins/gen/textureNumLevels/23f750.wgsl.expected.msl b/test/builtins/gen/textureNumLevels/23f750.wgsl.expected.msl
index 588b57bb8a..dc6fd0a9c5 100644
--- a/test/builtins/gen/textureNumLevels/23f750.wgsl.expected.msl
+++ b/test/builtins/gen/textureNumLevels/23f750.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void textureNumLevels_23f750(texture2d<int, access::sample> tint_symbol_1) {
   int res = int(tint_symbol_1.get_num_mip_levels());
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner(texture2d<int, access::sample> tint_symbol_2) {
   textureNumLevels_23f750(tint_symbol_2);
   return float4();
diff --git a/test/builtins/gen/textureNumLevels/2c3575.wgsl.expected.msl b/test/builtins/gen/textureNumLevels/2c3575.wgsl.expected.msl
index 4acb4d6c86..1492f86a7d 100644
--- a/test/builtins/gen/textureNumLevels/2c3575.wgsl.expected.msl
+++ b/test/builtins/gen/textureNumLevels/2c3575.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void textureNumLevels_2c3575(depthcube_array<float, access::sample> tint_symbol_1) {
   int res = int(tint_symbol_1.get_num_mip_levels());
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner(depthcube_array<float, access::sample> tint_symbol_2) {
   textureNumLevels_2c3575(tint_symbol_2);
   return float4();
diff --git a/test/builtins/gen/textureNumLevels/32a0ae.wgsl.expected.msl b/test/builtins/gen/textureNumLevels/32a0ae.wgsl.expected.msl
index 985edcb051..9f66634525 100644
--- a/test/builtins/gen/textureNumLevels/32a0ae.wgsl.expected.msl
+++ b/test/builtins/gen/textureNumLevels/32a0ae.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void textureNumLevels_32a0ae(texture1d<int, access::sample> tint_symbol_1) {
   int res = int(tint_symbol_1.get_num_mip_levels());
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner(texture1d<int, access::sample> tint_symbol_2) {
   textureNumLevels_32a0ae(tint_symbol_2);
   return float4();
diff --git a/test/builtins/gen/textureNumLevels/5101cf.wgsl.expected.msl b/test/builtins/gen/textureNumLevels/5101cf.wgsl.expected.msl
index c675b3f980..9f5a2eb7bd 100644
--- a/test/builtins/gen/textureNumLevels/5101cf.wgsl.expected.msl
+++ b/test/builtins/gen/textureNumLevels/5101cf.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void textureNumLevels_5101cf(texture2d_array<uint, access::sample> tint_symbol_1) {
   int res = int(tint_symbol_1.get_num_mip_levels());
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner(texture2d_array<uint, access::sample> tint_symbol_2) {
   textureNumLevels_5101cf(tint_symbol_2);
   return float4();
diff --git a/test/builtins/gen/textureNumLevels/51b5bb.wgsl.expected.msl b/test/builtins/gen/textureNumLevels/51b5bb.wgsl.expected.msl
index c1bb13c64c..eac33e922c 100644
--- a/test/builtins/gen/textureNumLevels/51b5bb.wgsl.expected.msl
+++ b/test/builtins/gen/textureNumLevels/51b5bb.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void textureNumLevels_51b5bb(texture1d<float, access::sample> tint_symbol_1) {
   int res = int(tint_symbol_1.get_num_mip_levels());
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner(texture1d<float, access::sample> tint_symbol_2) {
   textureNumLevels_51b5bb(tint_symbol_2);
   return float4();
diff --git a/test/builtins/gen/textureNumLevels/897aaf.wgsl.expected.msl b/test/builtins/gen/textureNumLevels/897aaf.wgsl.expected.msl
index 2bf8904b4c..90a35ee14d 100644
--- a/test/builtins/gen/textureNumLevels/897aaf.wgsl.expected.msl
+++ b/test/builtins/gen/textureNumLevels/897aaf.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void textureNumLevels_897aaf(texturecube<float, access::sample> tint_symbol_1) {
   int res = int(tint_symbol_1.get_num_mip_levels());
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner(texturecube<float, access::sample> tint_symbol_2) {
   textureNumLevels_897aaf(tint_symbol_2);
   return float4();
diff --git a/test/builtins/gen/textureNumLevels/9da7a5.wgsl.expected.msl b/test/builtins/gen/textureNumLevels/9da7a5.wgsl.expected.msl
index f079eeadea..7e8f856dc7 100644
--- a/test/builtins/gen/textureNumLevels/9da7a5.wgsl.expected.msl
+++ b/test/builtins/gen/textureNumLevels/9da7a5.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void textureNumLevels_9da7a5(texture3d<int, access::sample> tint_symbol_1) {
   int res = int(tint_symbol_1.get_num_mip_levels());
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner(texture3d<int, access::sample> tint_symbol_2) {
   textureNumLevels_9da7a5(tint_symbol_2);
   return float4();
diff --git a/test/builtins/gen/textureNumLevels/a91c03.wgsl.expected.msl b/test/builtins/gen/textureNumLevels/a91c03.wgsl.expected.msl
index 52ef85bad0..2a9faacb95 100644
--- a/test/builtins/gen/textureNumLevels/a91c03.wgsl.expected.msl
+++ b/test/builtins/gen/textureNumLevels/a91c03.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void textureNumLevels_a91c03(texturecube_array<int, access::sample> tint_symbol_1) {
   int res = int(tint_symbol_1.get_num_mip_levels());
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner(texturecube_array<int, access::sample> tint_symbol_2) {
   textureNumLevels_a91c03(tint_symbol_2);
   return float4();
diff --git a/test/builtins/gen/textureNumLevels/aee7c8.wgsl.expected.msl b/test/builtins/gen/textureNumLevels/aee7c8.wgsl.expected.msl
index 30353f3a85..0b5172c631 100644
--- a/test/builtins/gen/textureNumLevels/aee7c8.wgsl.expected.msl
+++ b/test/builtins/gen/textureNumLevels/aee7c8.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void textureNumLevels_aee7c8(texturecube_array<float, access::sample> tint_symbol_1) {
   int res = int(tint_symbol_1.get_num_mip_levels());
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner(texturecube_array<float, access::sample> tint_symbol_2) {
   textureNumLevels_aee7c8(tint_symbol_2);
   return float4();
diff --git a/test/builtins/gen/textureNumLevels/b1b12b.wgsl.expected.msl b/test/builtins/gen/textureNumLevels/b1b12b.wgsl.expected.msl
index ecaa1cc165..992a0acc27 100644
--- a/test/builtins/gen/textureNumLevels/b1b12b.wgsl.expected.msl
+++ b/test/builtins/gen/textureNumLevels/b1b12b.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void textureNumLevels_b1b12b(depth2d<float, access::sample> tint_symbol_1) {
   int res = int(tint_symbol_1.get_num_mip_levels());
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner(depth2d<float, access::sample> tint_symbol_2) {
   textureNumLevels_b1b12b(tint_symbol_2);
   return float4();
diff --git a/test/builtins/gen/textureNumLevels/b4f5ea.wgsl.expected.msl b/test/builtins/gen/textureNumLevels/b4f5ea.wgsl.expected.msl
index 13415a666d..f355a6d3e9 100644
--- a/test/builtins/gen/textureNumLevels/b4f5ea.wgsl.expected.msl
+++ b/test/builtins/gen/textureNumLevels/b4f5ea.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void textureNumLevels_b4f5ea(texture3d<uint, access::sample> tint_symbol_1) {
   int res = int(tint_symbol_1.get_num_mip_levels());
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner(texture3d<uint, access::sample> tint_symbol_2) {
   textureNumLevels_b4f5ea(tint_symbol_2);
   return float4();
diff --git a/test/builtins/gen/textureNumLevels/d004a9.wgsl.expected.msl b/test/builtins/gen/textureNumLevels/d004a9.wgsl.expected.msl
index 6dc92ef4e6..f3a4601862 100644
--- a/test/builtins/gen/textureNumLevels/d004a9.wgsl.expected.msl
+++ b/test/builtins/gen/textureNumLevels/d004a9.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void textureNumLevels_d004a9(texture2d_array<int, access::sample> tint_symbol_1) {
   int res = int(tint_symbol_1.get_num_mip_levels());
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner(texture2d_array<int, access::sample> tint_symbol_2) {
   textureNumLevels_d004a9(tint_symbol_2);
   return float4();
diff --git a/test/builtins/gen/textureNumLevels/dca09e.wgsl.expected.msl b/test/builtins/gen/textureNumLevels/dca09e.wgsl.expected.msl
index b347341ab6..2b06e6b75d 100644
--- a/test/builtins/gen/textureNumLevels/dca09e.wgsl.expected.msl
+++ b/test/builtins/gen/textureNumLevels/dca09e.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void textureNumLevels_dca09e(texture3d<float, access::sample> tint_symbol_1) {
   int res = int(tint_symbol_1.get_num_mip_levels());
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner(texture3d<float, access::sample> tint_symbol_2) {
   textureNumLevels_dca09e(tint_symbol_2);
   return float4();
diff --git a/test/builtins/gen/textureNumLevels/e67231.wgsl.expected.msl b/test/builtins/gen/textureNumLevels/e67231.wgsl.expected.msl
index 2e89dbf920..f4f23bc00c 100644
--- a/test/builtins/gen/textureNumLevels/e67231.wgsl.expected.msl
+++ b/test/builtins/gen/textureNumLevels/e67231.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void textureNumLevels_e67231(texture2d<float, access::sample> tint_symbol_1) {
   int res = int(tint_symbol_1.get_num_mip_levels());
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner(texture2d<float, access::sample> tint_symbol_2) {
   textureNumLevels_e67231(tint_symbol_2);
   return float4();
diff --git a/test/builtins/gen/textureNumLevels/ed078b.wgsl.expected.msl b/test/builtins/gen/textureNumLevels/ed078b.wgsl.expected.msl
index a3c75b191c..65e9dac98c 100644
--- a/test/builtins/gen/textureNumLevels/ed078b.wgsl.expected.msl
+++ b/test/builtins/gen/textureNumLevels/ed078b.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void textureNumLevels_ed078b(texturecube<uint, access::sample> tint_symbol_1) {
   int res = int(tint_symbol_1.get_num_mip_levels());
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner(texturecube<uint, access::sample> tint_symbol_2) {
   textureNumLevels_ed078b(tint_symbol_2);
   return float4();
diff --git a/test/builtins/gen/textureNumLevels/f46ec6.wgsl.expected.msl b/test/builtins/gen/textureNumLevels/f46ec6.wgsl.expected.msl
index daa9048c3e..64bd4855da 100644
--- a/test/builtins/gen/textureNumLevels/f46ec6.wgsl.expected.msl
+++ b/test/builtins/gen/textureNumLevels/f46ec6.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void textureNumLevels_f46ec6(texturecube_array<uint, access::sample> tint_symbol_1) {
   int res = int(tint_symbol_1.get_num_mip_levels());
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner(texturecube_array<uint, access::sample> tint_symbol_2) {
   textureNumLevels_f46ec6(tint_symbol_2);
   return float4();
diff --git a/test/builtins/gen/textureNumLevels/f5828d.wgsl.expected.msl b/test/builtins/gen/textureNumLevels/f5828d.wgsl.expected.msl
index 9a85d11b15..6c562b82b3 100644
--- a/test/builtins/gen/textureNumLevels/f5828d.wgsl.expected.msl
+++ b/test/builtins/gen/textureNumLevels/f5828d.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void textureNumLevels_f5828d(depth2d_array<float, access::sample> tint_symbol_1) {
   int res = int(tint_symbol_1.get_num_mip_levels());
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner(depth2d_array<float, access::sample> tint_symbol_2) {
   textureNumLevels_f5828d(tint_symbol_2);
   return float4();
diff --git a/test/builtins/gen/textureNumSamples/2c6f14.wgsl.expected.msl b/test/builtins/gen/textureNumSamples/2c6f14.wgsl.expected.msl
index 9da173ffbd..465294cca7 100644
--- a/test/builtins/gen/textureNumSamples/2c6f14.wgsl.expected.msl
+++ b/test/builtins/gen/textureNumSamples/2c6f14.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void textureNumSamples_2c6f14(texture2d_ms<float, access::read> tint_symbol_1) {
   int res = int(tint_symbol_1.get_num_samples());
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner(texture2d_ms<float, access::read> tint_symbol_2) {
   textureNumSamples_2c6f14(tint_symbol_2);
   return float4();
diff --git a/test/builtins/gen/textureNumSamples/42f8bb.wgsl.expected.msl b/test/builtins/gen/textureNumSamples/42f8bb.wgsl.expected.msl
index 520f48486b..77c2cc9578 100644
--- a/test/builtins/gen/textureNumSamples/42f8bb.wgsl.expected.msl
+++ b/test/builtins/gen/textureNumSamples/42f8bb.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void textureNumSamples_42f8bb(texture2d_ms<uint, access::read> tint_symbol_1) {
   int res = int(tint_symbol_1.get_num_samples());
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner(texture2d_ms<uint, access::read> tint_symbol_2) {
   textureNumSamples_42f8bb(tint_symbol_2);
   return float4();
diff --git a/test/builtins/gen/textureNumSamples/449d23.wgsl.expected.msl b/test/builtins/gen/textureNumSamples/449d23.wgsl.expected.msl
index 7935aff003..ef9c562780 100644
--- a/test/builtins/gen/textureNumSamples/449d23.wgsl.expected.msl
+++ b/test/builtins/gen/textureNumSamples/449d23.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void textureNumSamples_449d23(texture2d_ms<int, access::read> tint_symbol_1) {
   int res = int(tint_symbol_1.get_num_samples());
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner(texture2d_ms<int, access::read> tint_symbol_2) {
   textureNumSamples_449d23(tint_symbol_2);
   return float4();
diff --git a/test/builtins/gen/textureNumSamples/a3c8a0.wgsl.expected.msl b/test/builtins/gen/textureNumSamples/a3c8a0.wgsl.expected.msl
index a5fbae4994..011207af71 100644
--- a/test/builtins/gen/textureNumSamples/a3c8a0.wgsl.expected.msl
+++ b/test/builtins/gen/textureNumSamples/a3c8a0.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void textureNumSamples_a3c8a0(depth2d_ms<float, access::read> tint_symbol_1) {
   int res = int(tint_symbol_1.get_num_samples());
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner(depth2d_ms<float, access::read> tint_symbol_2) {
   textureNumSamples_a3c8a0(tint_symbol_2);
   return float4();
diff --git a/test/builtins/gen/textureSampleCompareLevel/011a8f.wgsl.expected.msl b/test/builtins/gen/textureSampleCompareLevel/011a8f.wgsl.expected.msl
index 73b0c18045..07485ae20b 100644
--- a/test/builtins/gen/textureSampleCompareLevel/011a8f.wgsl.expected.msl
+++ b/test/builtins/gen/textureSampleCompareLevel/011a8f.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void textureSampleCompareLevel_011a8f(depth2d_array<float, access::sample> tint_symbol_1, sampler tint_symbol_2) {
   float res = tint_symbol_1.sample_compare(tint_symbol_2, float2(), 1, 1.0f, level(0), int2());
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner(depth2d_array<float, access::sample> tint_symbol_3, sampler tint_symbol_4) {
   textureSampleCompareLevel_011a8f(tint_symbol_3, tint_symbol_4);
   return float4();
diff --git a/test/builtins/gen/textureSampleCompareLevel/1116ed.wgsl.expected.msl b/test/builtins/gen/textureSampleCompareLevel/1116ed.wgsl.expected.msl
index b60dcc07fb..afa4f782f8 100644
--- a/test/builtins/gen/textureSampleCompareLevel/1116ed.wgsl.expected.msl
+++ b/test/builtins/gen/textureSampleCompareLevel/1116ed.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void textureSampleCompareLevel_1116ed(depth2d_array<float, access::sample> tint_symbol_1, sampler tint_symbol_2) {
   float res = tint_symbol_1.sample_compare(tint_symbol_2, float2(), 1, 1.0f, level(0));
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner(depth2d_array<float, access::sample> tint_symbol_3, sampler tint_symbol_4) {
   textureSampleCompareLevel_1116ed(tint_symbol_3, tint_symbol_4);
   return float4();
diff --git a/test/builtins/gen/textureSampleCompareLevel/1568e3.wgsl.expected.msl b/test/builtins/gen/textureSampleCompareLevel/1568e3.wgsl.expected.msl
index f021d80e9d..3c3babe1a8 100644
--- a/test/builtins/gen/textureSampleCompareLevel/1568e3.wgsl.expected.msl
+++ b/test/builtins/gen/textureSampleCompareLevel/1568e3.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void textureSampleCompareLevel_1568e3(depthcube<float, access::sample> tint_symbol_1, sampler tint_symbol_2) {
   float res = tint_symbol_1.sample_compare(tint_symbol_2, float3(), 1.0f, level(0));
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner(depthcube<float, access::sample> tint_symbol_3, sampler tint_symbol_4) {
   textureSampleCompareLevel_1568e3(tint_symbol_3, tint_symbol_4);
   return float4();
diff --git a/test/builtins/gen/textureSampleCompareLevel/2ad2b1.wgsl.expected.msl b/test/builtins/gen/textureSampleCompareLevel/2ad2b1.wgsl.expected.msl
index 4697c85588..0757bfe25d 100644
--- a/test/builtins/gen/textureSampleCompareLevel/2ad2b1.wgsl.expected.msl
+++ b/test/builtins/gen/textureSampleCompareLevel/2ad2b1.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void textureSampleCompareLevel_2ad2b1(depth2d<float, access::sample> tint_symbol_1, sampler tint_symbol_2) {
   float res = tint_symbol_1.sample_compare(tint_symbol_2, float2(), 1.0f, level(0));
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner(depth2d<float, access::sample> tint_symbol_3, sampler tint_symbol_4) {
   textureSampleCompareLevel_2ad2b1(tint_symbol_3, tint_symbol_4);
   return float4();
diff --git a/test/builtins/gen/textureSampleCompareLevel/4cf3a2.wgsl.expected.msl b/test/builtins/gen/textureSampleCompareLevel/4cf3a2.wgsl.expected.msl
index 7bef512585..a2db2a966c 100644
--- a/test/builtins/gen/textureSampleCompareLevel/4cf3a2.wgsl.expected.msl
+++ b/test/builtins/gen/textureSampleCompareLevel/4cf3a2.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void textureSampleCompareLevel_4cf3a2(depthcube_array<float, access::sample> tint_symbol_1, sampler tint_symbol_2) {
   float res = tint_symbol_1.sample_compare(tint_symbol_2, float3(), 1, 1.0f, level(0));
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner(depthcube_array<float, access::sample> tint_symbol_3, sampler tint_symbol_4) {
   textureSampleCompareLevel_4cf3a2(tint_symbol_3, tint_symbol_4);
   return float4();
diff --git a/test/builtins/gen/textureSampleCompareLevel/f8121c.wgsl.expected.msl b/test/builtins/gen/textureSampleCompareLevel/f8121c.wgsl.expected.msl
index d18e34c083..c72e97bfb3 100644
--- a/test/builtins/gen/textureSampleCompareLevel/f8121c.wgsl.expected.msl
+++ b/test/builtins/gen/textureSampleCompareLevel/f8121c.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void textureSampleCompareLevel_f8121c(depth2d<float, access::sample> tint_symbol_1, sampler tint_symbol_2) {
   float res = tint_symbol_1.sample_compare(tint_symbol_2, float2(), 1.0f, level(0), int2());
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner(depth2d<float, access::sample> tint_symbol_3, sampler tint_symbol_4) {
   textureSampleCompareLevel_f8121c(tint_symbol_3, tint_symbol_4);
   return float4();
diff --git a/test/builtins/gen/textureSampleGrad/21402b.wgsl.expected.msl b/test/builtins/gen/textureSampleGrad/21402b.wgsl.expected.msl
index f44e7d5902..611f192f40 100644
--- a/test/builtins/gen/textureSampleGrad/21402b.wgsl.expected.msl
+++ b/test/builtins/gen/textureSampleGrad/21402b.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void textureSampleGrad_21402b(texture3d<float, access::sample> tint_symbol_1, sampler tint_symbol_2) {
   float4 res = tint_symbol_1.sample(tint_symbol_2, float3(), gradient3d(float3(), float3()));
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner(texture3d<float, access::sample> tint_symbol_3, sampler tint_symbol_4) {
   textureSampleGrad_21402b(tint_symbol_3, tint_symbol_4);
   return float4();
diff --git a/test/builtins/gen/textureSampleGrad/2ecd8f.wgsl.expected.msl b/test/builtins/gen/textureSampleGrad/2ecd8f.wgsl.expected.msl
index 8c63d94df2..cb35a40226 100644
--- a/test/builtins/gen/textureSampleGrad/2ecd8f.wgsl.expected.msl
+++ b/test/builtins/gen/textureSampleGrad/2ecd8f.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void textureSampleGrad_2ecd8f(texture2d_array<float, access::sample> tint_symbol_1, sampler tint_symbol_2) {
   float4 res = tint_symbol_1.sample(tint_symbol_2, float2(), 1, gradient2d(float2(), float2()));
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner(texture2d_array<float, access::sample> tint_symbol_3, sampler tint_symbol_4) {
   textureSampleGrad_2ecd8f(tint_symbol_3, tint_symbol_4);
   return float4();
diff --git a/test/builtins/gen/textureSampleGrad/468f88.wgsl.expected.msl b/test/builtins/gen/textureSampleGrad/468f88.wgsl.expected.msl
index 340a1f779f..984039bb85 100644
--- a/test/builtins/gen/textureSampleGrad/468f88.wgsl.expected.msl
+++ b/test/builtins/gen/textureSampleGrad/468f88.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void textureSampleGrad_468f88(texture2d<float, access::sample> tint_symbol_1, sampler tint_symbol_2) {
   float4 res = tint_symbol_1.sample(tint_symbol_2, float2(), gradient2d(float2(), float2()), int2());
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner(texture2d<float, access::sample> tint_symbol_3, sampler tint_symbol_4) {
   textureSampleGrad_468f88(tint_symbol_3, tint_symbol_4);
   return float4();
diff --git a/test/builtins/gen/textureSampleGrad/521263.wgsl.expected.msl b/test/builtins/gen/textureSampleGrad/521263.wgsl.expected.msl
index a2da7c28d5..fdf14137f5 100644
--- a/test/builtins/gen/textureSampleGrad/521263.wgsl.expected.msl
+++ b/test/builtins/gen/textureSampleGrad/521263.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void textureSampleGrad_521263(texture2d<float, access::sample> tint_symbol_1, sampler tint_symbol_2) {
   float4 res = tint_symbol_1.sample(tint_symbol_2, float2(), gradient2d(float2(), float2()));
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner(texture2d<float, access::sample> tint_symbol_3, sampler tint_symbol_4) {
   textureSampleGrad_521263(tint_symbol_3, tint_symbol_4);
   return float4();
diff --git a/test/builtins/gen/textureSampleGrad/5312f4.wgsl.expected.msl b/test/builtins/gen/textureSampleGrad/5312f4.wgsl.expected.msl
index ae5bec642e..e76967f74d 100644
--- a/test/builtins/gen/textureSampleGrad/5312f4.wgsl.expected.msl
+++ b/test/builtins/gen/textureSampleGrad/5312f4.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void textureSampleGrad_5312f4(texturecube<float, access::sample> tint_symbol_1, sampler tint_symbol_2) {
   float4 res = tint_symbol_1.sample(tint_symbol_2, float3(), gradientcube(float3(), float3()));
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner(texturecube<float, access::sample> tint_symbol_3, sampler tint_symbol_4) {
   textureSampleGrad_5312f4(tint_symbol_3, tint_symbol_4);
   return float4();
diff --git a/test/builtins/gen/textureSampleGrad/872f00.wgsl.expected.msl b/test/builtins/gen/textureSampleGrad/872f00.wgsl.expected.msl
index 5ed27aa287..c4756df015 100644
--- a/test/builtins/gen/textureSampleGrad/872f00.wgsl.expected.msl
+++ b/test/builtins/gen/textureSampleGrad/872f00.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void textureSampleGrad_872f00(texture2d_array<float, access::sample> tint_symbol_1, sampler tint_symbol_2) {
   float4 res = tint_symbol_1.sample(tint_symbol_2, float2(), 1, gradient2d(float2(), float2()), int2());
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner(texture2d_array<float, access::sample> tint_symbol_3, sampler tint_symbol_4) {
   textureSampleGrad_872f00(tint_symbol_3, tint_symbol_4);
   return float4();
diff --git a/test/builtins/gen/textureSampleGrad/e383db.wgsl.expected.msl b/test/builtins/gen/textureSampleGrad/e383db.wgsl.expected.msl
index 3cd832a7ab..0df18f03b0 100644
--- a/test/builtins/gen/textureSampleGrad/e383db.wgsl.expected.msl
+++ b/test/builtins/gen/textureSampleGrad/e383db.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void textureSampleGrad_e383db(texturecube_array<float, access::sample> tint_symbol_1, sampler tint_symbol_2) {
   float4 res = tint_symbol_1.sample(tint_symbol_2, float3(), 1, gradientcube(float3(), float3()));
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner(texturecube_array<float, access::sample> tint_symbol_3, sampler tint_symbol_4) {
   textureSampleGrad_e383db(tint_symbol_3, tint_symbol_4);
   return float4();
diff --git a/test/builtins/gen/textureSampleGrad/e9a2f7.wgsl.expected.msl b/test/builtins/gen/textureSampleGrad/e9a2f7.wgsl.expected.msl
index 8742f682c6..8c31911f3c 100644
--- a/test/builtins/gen/textureSampleGrad/e9a2f7.wgsl.expected.msl
+++ b/test/builtins/gen/textureSampleGrad/e9a2f7.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void textureSampleGrad_e9a2f7(texture3d<float, access::sample> tint_symbol_1, sampler tint_symbol_2) {
   float4 res = tint_symbol_1.sample(tint_symbol_2, float3(), gradient3d(float3(), float3()), int3());
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner(texture3d<float, access::sample> tint_symbol_3, sampler tint_symbol_4) {
   textureSampleGrad_e9a2f7(tint_symbol_3, tint_symbol_4);
   return float4();
diff --git a/test/builtins/gen/textureSampleLevel/02be59.wgsl.expected.msl b/test/builtins/gen/textureSampleLevel/02be59.wgsl.expected.msl
index 5dd9b81440..a8efa2b92d 100644
--- a/test/builtins/gen/textureSampleLevel/02be59.wgsl.expected.msl
+++ b/test/builtins/gen/textureSampleLevel/02be59.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void textureSampleLevel_02be59(depth2d<float, access::sample> tint_symbol_1, sampler tint_symbol_2) {
   float res = tint_symbol_1.sample(tint_symbol_2, float2(), level(0));
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner(depth2d<float, access::sample> tint_symbol_3, sampler tint_symbol_4) {
   textureSampleLevel_02be59(tint_symbol_3, tint_symbol_4);
   return float4();
diff --git a/test/builtins/gen/textureSampleLevel/0bdd9a.wgsl.expected.msl b/test/builtins/gen/textureSampleLevel/0bdd9a.wgsl.expected.msl
index 566e4dcc6e..5250bb5b44 100644
--- a/test/builtins/gen/textureSampleLevel/0bdd9a.wgsl.expected.msl
+++ b/test/builtins/gen/textureSampleLevel/0bdd9a.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void textureSampleLevel_0bdd9a(texturecube_array<float, access::sample> tint_symbol_1, sampler tint_symbol_2) {
   float4 res = tint_symbol_1.sample(tint_symbol_2, float3(), 1, level(1.0f));
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner(texturecube_array<float, access::sample> tint_symbol_3, sampler tint_symbol_4) {
   textureSampleLevel_0bdd9a(tint_symbol_3, tint_symbol_4);
   return float4();
diff --git a/test/builtins/gen/textureSampleLevel/1b0291.wgsl.expected.msl b/test/builtins/gen/textureSampleLevel/1b0291.wgsl.expected.msl
index 8af50d5b19..d16918218e 100644
--- a/test/builtins/gen/textureSampleLevel/1b0291.wgsl.expected.msl
+++ b/test/builtins/gen/textureSampleLevel/1b0291.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void textureSampleLevel_1b0291(depthcube<float, access::sample> tint_symbol_1, sampler tint_symbol_2) {
   float res = tint_symbol_1.sample(tint_symbol_2, float3(), level(0));
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner(depthcube<float, access::sample> tint_symbol_3, sampler tint_symbol_4) {
   textureSampleLevel_1b0291(tint_symbol_3, tint_symbol_4);
   return float4();
diff --git a/test/builtins/gen/textureSampleLevel/1bf73e.wgsl.expected.msl b/test/builtins/gen/textureSampleLevel/1bf73e.wgsl.expected.msl
index 7607d296c3..e792a86a11 100644
--- a/test/builtins/gen/textureSampleLevel/1bf73e.wgsl.expected.msl
+++ b/test/builtins/gen/textureSampleLevel/1bf73e.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void textureSampleLevel_1bf73e(depth2d_array<float, access::sample> tint_symbol_1, sampler tint_symbol_2) {
   float res = tint_symbol_1.sample(tint_symbol_2, float2(), 1, level(0));
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner(depth2d_array<float, access::sample> tint_symbol_3, sampler tint_symbol_4) {
   textureSampleLevel_1bf73e(tint_symbol_3, tint_symbol_4);
   return float4();
diff --git a/test/builtins/gen/textureSampleLevel/302be4.wgsl.expected.msl b/test/builtins/gen/textureSampleLevel/302be4.wgsl.expected.msl
index 025fb43c46..81fb6d9992 100644
--- a/test/builtins/gen/textureSampleLevel/302be4.wgsl.expected.msl
+++ b/test/builtins/gen/textureSampleLevel/302be4.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void textureSampleLevel_302be4(texture2d_array<float, access::sample> tint_symbol_1, sampler tint_symbol_2) {
   float4 res = tint_symbol_1.sample(tint_symbol_2, float2(), 1, level(1.0f));
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner(texture2d_array<float, access::sample> tint_symbol_3, sampler tint_symbol_4) {
   textureSampleLevel_302be4(tint_symbol_3, tint_symbol_4);
   return float4();
diff --git a/test/builtins/gen/textureSampleLevel/47daa4.wgsl.expected.msl b/test/builtins/gen/textureSampleLevel/47daa4.wgsl.expected.msl
index 542fdf1cb6..932bcb38b8 100644
--- a/test/builtins/gen/textureSampleLevel/47daa4.wgsl.expected.msl
+++ b/test/builtins/gen/textureSampleLevel/47daa4.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void textureSampleLevel_47daa4(depth2d<float, access::sample> tint_symbol_1, sampler tint_symbol_2) {
   float res = tint_symbol_1.sample(tint_symbol_2, float2(), level(0), int2());
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner(depth2d<float, access::sample> tint_symbol_3, sampler tint_symbol_4) {
   textureSampleLevel_47daa4(tint_symbol_3, tint_symbol_4);
   return float4();
diff --git a/test/builtins/gen/textureSampleLevel/690d95.wgsl.expected.msl b/test/builtins/gen/textureSampleLevel/690d95.wgsl.expected.msl
index 402c509566..508a589e31 100644
--- a/test/builtins/gen/textureSampleLevel/690d95.wgsl.expected.msl
+++ b/test/builtins/gen/textureSampleLevel/690d95.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void textureSampleLevel_690d95(texture2d<float, access::sample> tint_symbol_1, sampler tint_symbol_2) {
   float4 res = tint_symbol_1.sample(tint_symbol_2, float2(), level(1.0f), int2());
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner(texture2d<float, access::sample> tint_symbol_3, sampler tint_symbol_4) {
   textureSampleLevel_690d95(tint_symbol_3, tint_symbol_4);
   return float4();
diff --git a/test/builtins/gen/textureSampleLevel/979816.wgsl.expected.msl b/test/builtins/gen/textureSampleLevel/979816.wgsl.expected.msl
index e00269518e..47e2da142f 100644
--- a/test/builtins/gen/textureSampleLevel/979816.wgsl.expected.msl
+++ b/test/builtins/gen/textureSampleLevel/979816.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void textureSampleLevel_979816(texture2d<float, access::sample> tint_symbol_1, sampler tint_symbol_2) {
   float4 res = tint_symbol_1.sample(tint_symbol_2, float2(), level(0.0f));
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner(texture2d<float, access::sample> tint_symbol_3, sampler tint_symbol_4) {
   textureSampleLevel_979816(tint_symbol_3, tint_symbol_4);
   return float4();
diff --git a/test/builtins/gen/textureSampleLevel/9bd37b.wgsl.expected.msl b/test/builtins/gen/textureSampleLevel/9bd37b.wgsl.expected.msl
index 2baa149281..b1f5d43ba7 100644
--- a/test/builtins/gen/textureSampleLevel/9bd37b.wgsl.expected.msl
+++ b/test/builtins/gen/textureSampleLevel/9bd37b.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void textureSampleLevel_9bd37b(texture3d<float, access::sample> tint_symbol_1, sampler tint_symbol_2) {
   float4 res = tint_symbol_1.sample(tint_symbol_2, float3(), level(1.0f), int3());
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner(texture3d<float, access::sample> tint_symbol_3, sampler tint_symbol_4) {
   textureSampleLevel_9bd37b(tint_symbol_3, tint_symbol_4);
   return float4();
diff --git a/test/builtins/gen/textureSampleLevel/a4af26.wgsl.expected.msl b/test/builtins/gen/textureSampleLevel/a4af26.wgsl.expected.msl
index c9d14ff826..4fc39a8aae 100644
--- a/test/builtins/gen/textureSampleLevel/a4af26.wgsl.expected.msl
+++ b/test/builtins/gen/textureSampleLevel/a4af26.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void textureSampleLevel_a4af26(texture2d_array<float, access::sample> tint_symbol_1, sampler tint_symbol_2) {
   float4 res = tint_symbol_1.sample(tint_symbol_2, float2(), 1, level(1.0f), int2());
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner(texture2d_array<float, access::sample> tint_symbol_3, sampler tint_symbol_4) {
   textureSampleLevel_a4af26(tint_symbol_3, tint_symbol_4);
   return float4();
diff --git a/test/builtins/gen/textureSampleLevel/abfcc0.wgsl.expected.msl b/test/builtins/gen/textureSampleLevel/abfcc0.wgsl.expected.msl
index 601c19fdbb..6bf2714ca4 100644
--- a/test/builtins/gen/textureSampleLevel/abfcc0.wgsl.expected.msl
+++ b/test/builtins/gen/textureSampleLevel/abfcc0.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void textureSampleLevel_abfcc0(texture3d<float, access::sample> tint_symbol_1, sampler tint_symbol_2) {
   float4 res = tint_symbol_1.sample(tint_symbol_2, float3(), level(1.0f));
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner(texture3d<float, access::sample> tint_symbol_3, sampler tint_symbol_4) {
   textureSampleLevel_abfcc0(tint_symbol_3, tint_symbol_4);
   return float4();
diff --git a/test/builtins/gen/textureSampleLevel/ae5e39.wgsl.expected.msl b/test/builtins/gen/textureSampleLevel/ae5e39.wgsl.expected.msl
index 0a54672c91..43f1b2b126 100644
--- a/test/builtins/gen/textureSampleLevel/ae5e39.wgsl.expected.msl
+++ b/test/builtins/gen/textureSampleLevel/ae5e39.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void textureSampleLevel_ae5e39(depthcube_array<float, access::sample> tint_symbol_1, sampler tint_symbol_2) {
   float res = tint_symbol_1.sample(tint_symbol_2, float3(), 1, level(0));
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner(depthcube_array<float, access::sample> tint_symbol_3, sampler tint_symbol_4) {
   textureSampleLevel_ae5e39(tint_symbol_3, tint_symbol_4);
   return float4();
diff --git a/test/builtins/gen/textureSampleLevel/ba93b3.wgsl.expected.msl b/test/builtins/gen/textureSampleLevel/ba93b3.wgsl.expected.msl
index 0435ba314f..411b77e098 100644
--- a/test/builtins/gen/textureSampleLevel/ba93b3.wgsl.expected.msl
+++ b/test/builtins/gen/textureSampleLevel/ba93b3.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void textureSampleLevel_ba93b3(depth2d_array<float, access::sample> tint_symbol_1, sampler tint_symbol_2) {
   float res = tint_symbol_1.sample(tint_symbol_2, float2(), 1, level(0), int2());
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner(depth2d_array<float, access::sample> tint_symbol_3, sampler tint_symbol_4) {
   textureSampleLevel_ba93b3(tint_symbol_3, tint_symbol_4);
   return float4();
diff --git a/test/builtins/gen/textureSampleLevel/c32df7.wgsl.expected.msl b/test/builtins/gen/textureSampleLevel/c32df7.wgsl.expected.msl
index d2bc371ccc..0dccab6296 100644
--- a/test/builtins/gen/textureSampleLevel/c32df7.wgsl.expected.msl
+++ b/test/builtins/gen/textureSampleLevel/c32df7.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void textureSampleLevel_c32df7(texturecube<float, access::sample> tint_symbol_1, sampler tint_symbol_2) {
   float4 res = tint_symbol_1.sample(tint_symbol_2, float3(), level(1.0f));
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner(texturecube<float, access::sample> tint_symbol_3, sampler tint_symbol_4) {
   textureSampleLevel_c32df7(tint_symbol_3, tint_symbol_4);
   return float4();
diff --git a/test/builtins/gen/textureSampleLevel/c6aca6.wgsl.expected.msl b/test/builtins/gen/textureSampleLevel/c6aca6.wgsl.expected.msl
index a07b0ef2f6..804b0eb85b 100644
--- a/test/builtins/gen/textureSampleLevel/c6aca6.wgsl.expected.msl
+++ b/test/builtins/gen/textureSampleLevel/c6aca6.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void textureSampleLevel_c6aca6(texture2d<float, access::sample> tint_symbol_1, sampler tint_symbol_2) {
   float4 res = tint_symbol_1.sample(tint_symbol_2, float2(), level(1.0f));
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner(texture2d<float, access::sample> tint_symbol_3, sampler tint_symbol_4) {
   textureSampleLevel_c6aca6(tint_symbol_3, tint_symbol_4);
   return float4();
diff --git a/test/builtins/gen/textureStore/05ce15.wgsl.expected.msl b/test/builtins/gen/textureStore/05ce15.wgsl.expected.msl
index c041d583dd..96f17cc685 100644
--- a/test/builtins/gen/textureStore/05ce15.wgsl.expected.msl
+++ b/test/builtins/gen/textureStore/05ce15.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void textureStore_05ce15(texture2d<float, access::write> tint_symbol_1) {
   tint_symbol_1.write(float4(), uint2(int2()));
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner(texture2d<float, access::write> tint_symbol_2) {
   textureStore_05ce15(tint_symbol_2);
   return float4();
diff --git a/test/builtins/gen/textureStore/064c7f.wgsl.expected.msl b/test/builtins/gen/textureStore/064c7f.wgsl.expected.msl
index 6f99242b71..7e40f3e340 100644
--- a/test/builtins/gen/textureStore/064c7f.wgsl.expected.msl
+++ b/test/builtins/gen/textureStore/064c7f.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void textureStore_064c7f(texture2d<float, access::write> tint_symbol_1) {
   tint_symbol_1.write(float4(), uint2(int2()));
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner(texture2d<float, access::write> tint_symbol_2) {
   textureStore_064c7f(tint_symbol_2);
   return float4();
diff --git a/test/builtins/gen/textureStore/068641.wgsl.expected.msl b/test/builtins/gen/textureStore/068641.wgsl.expected.msl
index 4853ced2e7..dc1bdc8860 100644
--- a/test/builtins/gen/textureStore/068641.wgsl.expected.msl
+++ b/test/builtins/gen/textureStore/068641.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void textureStore_068641(texture3d<uint, access::write> tint_symbol_1) {
   tint_symbol_1.write(uint4(), uint3(int3()));
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner(texture3d<uint, access::write> tint_symbol_2) {
   textureStore_068641(tint_symbol_2);
   return float4();
diff --git a/test/builtins/gen/textureStore/0af6b5.wgsl.expected.msl b/test/builtins/gen/textureStore/0af6b5.wgsl.expected.msl
index 1e3da7e555..74b0941fa4 100644
--- a/test/builtins/gen/textureStore/0af6b5.wgsl.expected.msl
+++ b/test/builtins/gen/textureStore/0af6b5.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void textureStore_0af6b5(texture2d<float, access::write> tint_symbol_1) {
   tint_symbol_1.write(float4(), uint2(int2()));
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner(texture2d<float, access::write> tint_symbol_2) {
   textureStore_0af6b5(tint_symbol_2);
   return float4();
diff --git a/test/builtins/gen/textureStore/0c3dff.wgsl.expected.msl b/test/builtins/gen/textureStore/0c3dff.wgsl.expected.msl
index e3cbd453a4..408f6948dc 100644
--- a/test/builtins/gen/textureStore/0c3dff.wgsl.expected.msl
+++ b/test/builtins/gen/textureStore/0c3dff.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void textureStore_0c3dff(texture2d<uint, access::write> tint_symbol_1) {
   tint_symbol_1.write(uint4(), uint2(int2()));
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner(texture2d<uint, access::write> tint_symbol_2) {
   textureStore_0c3dff(tint_symbol_2);
   return float4();
diff --git a/test/builtins/gen/textureStore/102722.wgsl.expected.msl b/test/builtins/gen/textureStore/102722.wgsl.expected.msl
index 7857f9fb81..5846677897 100644
--- a/test/builtins/gen/textureStore/102722.wgsl.expected.msl
+++ b/test/builtins/gen/textureStore/102722.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void textureStore_102722(texture1d<uint, access::write> tint_symbol_1) {
   tint_symbol_1.write(uint4(), uint(1));
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner(texture1d<uint, access::write> tint_symbol_2) {
   textureStore_102722(tint_symbol_2);
   return float4();
diff --git a/test/builtins/gen/textureStore/1bbd08.wgsl.expected.msl b/test/builtins/gen/textureStore/1bbd08.wgsl.expected.msl
index dea867a4e1..abc4ff09e6 100644
--- a/test/builtins/gen/textureStore/1bbd08.wgsl.expected.msl
+++ b/test/builtins/gen/textureStore/1bbd08.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void textureStore_1bbd08(texture3d<float, access::write> tint_symbol_1) {
   tint_symbol_1.write(float4(), uint3(int3()));
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner(texture3d<float, access::write> tint_symbol_2) {
   textureStore_1bbd08(tint_symbol_2);
   return float4();
diff --git a/test/builtins/gen/textureStore/1c02e7.wgsl.expected.msl b/test/builtins/gen/textureStore/1c02e7.wgsl.expected.msl
index d4cfdf2935..2f25bbfa7b 100644
--- a/test/builtins/gen/textureStore/1c02e7.wgsl.expected.msl
+++ b/test/builtins/gen/textureStore/1c02e7.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void textureStore_1c02e7(texture2d_array<int, access::write> tint_symbol_1) {
   tint_symbol_1.write(int4(), uint2(int2()), 1);
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner(texture2d_array<int, access::write> tint_symbol_2) {
   textureStore_1c02e7(tint_symbol_2);
   return float4();
diff --git a/test/builtins/gen/textureStore/22d955.wgsl.expected.msl b/test/builtins/gen/textureStore/22d955.wgsl.expected.msl
index ae923cf0aa..41c9ba061f 100644
--- a/test/builtins/gen/textureStore/22d955.wgsl.expected.msl
+++ b/test/builtins/gen/textureStore/22d955.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void textureStore_22d955(texture2d_array<uint, access::write> tint_symbol_1) {
   tint_symbol_1.write(uint4(), uint2(int2()), 1);
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner(texture2d_array<uint, access::write> tint_symbol_2) {
   textureStore_22d955(tint_symbol_2);
   return float4();
diff --git a/test/builtins/gen/textureStore/26bf70.wgsl.expected.msl b/test/builtins/gen/textureStore/26bf70.wgsl.expected.msl
index 9a6b102976..b016d7fa02 100644
--- a/test/builtins/gen/textureStore/26bf70.wgsl.expected.msl
+++ b/test/builtins/gen/textureStore/26bf70.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void textureStore_26bf70(texture2d<uint, access::write> tint_symbol_1) {
   tint_symbol_1.write(uint4(), uint2(int2()));
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner(texture2d<uint, access::write> tint_symbol_2) {
   textureStore_26bf70(tint_symbol_2);
   return float4();
diff --git a/test/builtins/gen/textureStore/2796b4.wgsl.expected.msl b/test/builtins/gen/textureStore/2796b4.wgsl.expected.msl
index be3965bc50..4c315532b3 100644
--- a/test/builtins/gen/textureStore/2796b4.wgsl.expected.msl
+++ b/test/builtins/gen/textureStore/2796b4.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void textureStore_2796b4(texture3d<int, access::write> tint_symbol_1) {
   tint_symbol_1.write(int4(), uint3(int3()));
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner(texture3d<int, access::write> tint_symbol_2) {
   textureStore_2796b4(tint_symbol_2);
   return float4();
diff --git a/test/builtins/gen/textureStore/2ac6c7.wgsl.expected.msl b/test/builtins/gen/textureStore/2ac6c7.wgsl.expected.msl
index 29ad3142d4..5fb901be62 100644
--- a/test/builtins/gen/textureStore/2ac6c7.wgsl.expected.msl
+++ b/test/builtins/gen/textureStore/2ac6c7.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void textureStore_2ac6c7(texture1d<float, access::write> tint_symbol_1) {
   tint_symbol_1.write(float4(), uint(1));
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner(texture1d<float, access::write> tint_symbol_2) {
   textureStore_2ac6c7(tint_symbol_2);
   return float4();
diff --git a/test/builtins/gen/textureStore/2eb2a4.wgsl.expected.msl b/test/builtins/gen/textureStore/2eb2a4.wgsl.expected.msl
index 3fc966aa30..52eff0b1a3 100644
--- a/test/builtins/gen/textureStore/2eb2a4.wgsl.expected.msl
+++ b/test/builtins/gen/textureStore/2eb2a4.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void textureStore_2eb2a4(texture1d<uint, access::write> tint_symbol_1) {
   tint_symbol_1.write(uint4(), uint(1));
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner(texture1d<uint, access::write> tint_symbol_2) {
   textureStore_2eb2a4(tint_symbol_2);
   return float4();
diff --git a/test/builtins/gen/textureStore/2ed2a3.wgsl.expected.msl b/test/builtins/gen/textureStore/2ed2a3.wgsl.expected.msl
index 6e9b58412d..3f46f67f3f 100644
--- a/test/builtins/gen/textureStore/2ed2a3.wgsl.expected.msl
+++ b/test/builtins/gen/textureStore/2ed2a3.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void textureStore_2ed2a3(texture1d<float, access::write> tint_symbol_1) {
   tint_symbol_1.write(float4(), uint(1));
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner(texture1d<float, access::write> tint_symbol_2) {
   textureStore_2ed2a3(tint_symbol_2);
   return float4();
diff --git a/test/builtins/gen/textureStore/31745b.wgsl.expected.msl b/test/builtins/gen/textureStore/31745b.wgsl.expected.msl
index 5fad31945e..21a80b4087 100644
--- a/test/builtins/gen/textureStore/31745b.wgsl.expected.msl
+++ b/test/builtins/gen/textureStore/31745b.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void textureStore_31745b(texture2d<int, access::write> tint_symbol_1) {
   tint_symbol_1.write(int4(), uint2(int2()));
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner(texture2d<int, access::write> tint_symbol_2) {
   textureStore_31745b(tint_symbol_2);
   return float4();
diff --git a/test/builtins/gen/textureStore/32f368.wgsl.expected.msl b/test/builtins/gen/textureStore/32f368.wgsl.expected.msl
index be3045e6cc..869f74d9de 100644
--- a/test/builtins/gen/textureStore/32f368.wgsl.expected.msl
+++ b/test/builtins/gen/textureStore/32f368.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void textureStore_32f368(texture2d_array<float, access::write> tint_symbol_1) {
   tint_symbol_1.write(float4(), uint2(int2()), 1);
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner(texture2d_array<float, access::write> tint_symbol_2) {
   textureStore_32f368(tint_symbol_2);
   return float4();
diff --git a/test/builtins/gen/textureStore/331aee.wgsl.expected.msl b/test/builtins/gen/textureStore/331aee.wgsl.expected.msl
index 62e62dd1ff..aab61d34c6 100644
--- a/test/builtins/gen/textureStore/331aee.wgsl.expected.msl
+++ b/test/builtins/gen/textureStore/331aee.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void textureStore_331aee(texture3d<float, access::write> tint_symbol_1) {
   tint_symbol_1.write(float4(), uint3(int3()));
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner(texture3d<float, access::write> tint_symbol_2) {
   textureStore_331aee(tint_symbol_2);
   return float4();
diff --git a/test/builtins/gen/textureStore/38e8d7.wgsl.expected.msl b/test/builtins/gen/textureStore/38e8d7.wgsl.expected.msl
index 0a7fa791ab..7b2b0f17a2 100644
--- a/test/builtins/gen/textureStore/38e8d7.wgsl.expected.msl
+++ b/test/builtins/gen/textureStore/38e8d7.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void textureStore_38e8d7(texture2d_array<uint, access::write> tint_symbol_1) {
   tint_symbol_1.write(uint4(), uint2(int2()), 1);
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner(texture2d_array<uint, access::write> tint_symbol_2) {
   textureStore_38e8d7(tint_symbol_2);
   return float4();
diff --git a/test/builtins/gen/textureStore/3a52ac.wgsl.expected.msl b/test/builtins/gen/textureStore/3a52ac.wgsl.expected.msl
index 22fa157514..6dc9c94aa0 100644
--- a/test/builtins/gen/textureStore/3a52ac.wgsl.expected.msl
+++ b/test/builtins/gen/textureStore/3a52ac.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void textureStore_3a52ac(texture2d_array<int, access::write> tint_symbol_1) {
   tint_symbol_1.write(int4(), uint2(int2()), 1);
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner(texture2d_array<int, access::write> tint_symbol_2) {
   textureStore_3a52ac(tint_symbol_2);
   return float4();
diff --git a/test/builtins/gen/textureStore/3bb7a1.wgsl.expected.msl b/test/builtins/gen/textureStore/3bb7a1.wgsl.expected.msl
index 8f2e7cf9a5..d3dcf83376 100644
--- a/test/builtins/gen/textureStore/3bb7a1.wgsl.expected.msl
+++ b/test/builtins/gen/textureStore/3bb7a1.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void textureStore_3bb7a1(texture2d_array<float, access::write> tint_symbol_1) {
   tint_symbol_1.write(float4(), uint2(int2()), 1);
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner(texture2d_array<float, access::write> tint_symbol_2) {
   textureStore_3bb7a1(tint_symbol_2);
   return float4();
diff --git a/test/builtins/gen/textureStore/3bec15.wgsl.expected.msl b/test/builtins/gen/textureStore/3bec15.wgsl.expected.msl
index 3364232472..63deae2576 100644
--- a/test/builtins/gen/textureStore/3bec15.wgsl.expected.msl
+++ b/test/builtins/gen/textureStore/3bec15.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void textureStore_3bec15(texture1d<uint, access::write> tint_symbol_1) {
   tint_symbol_1.write(uint4(), uint(1));
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner(texture1d<uint, access::write> tint_symbol_2) {
   textureStore_3bec15(tint_symbol_2);
   return float4();
diff --git a/test/builtins/gen/textureStore/441ba8.wgsl.expected.msl b/test/builtins/gen/textureStore/441ba8.wgsl.expected.msl
index 2f99fdfc72..ddd88f9f31 100644
--- a/test/builtins/gen/textureStore/441ba8.wgsl.expected.msl
+++ b/test/builtins/gen/textureStore/441ba8.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void textureStore_441ba8(texture3d<uint, access::write> tint_symbol_1) {
   tint_symbol_1.write(uint4(), uint3(int3()));
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner(texture3d<uint, access::write> tint_symbol_2) {
   textureStore_441ba8(tint_symbol_2);
   return float4();
diff --git a/test/builtins/gen/textureStore/4fc057.wgsl.expected.msl b/test/builtins/gen/textureStore/4fc057.wgsl.expected.msl
index 631009a615..73b2de8c04 100644
--- a/test/builtins/gen/textureStore/4fc057.wgsl.expected.msl
+++ b/test/builtins/gen/textureStore/4fc057.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void textureStore_4fc057(texture2d_array<float, access::write> tint_symbol_1) {
   tint_symbol_1.write(float4(), uint2(int2()), 1);
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner(texture2d_array<float, access::write> tint_symbol_2) {
   textureStore_4fc057(tint_symbol_2);
   return float4();
diff --git a/test/builtins/gen/textureStore/5a2f8f.wgsl.expected.msl b/test/builtins/gen/textureStore/5a2f8f.wgsl.expected.msl
index fdbd1c59ce..a1a8470722 100644
--- a/test/builtins/gen/textureStore/5a2f8f.wgsl.expected.msl
+++ b/test/builtins/gen/textureStore/5a2f8f.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void textureStore_5a2f8f(texture1d<int, access::write> tint_symbol_1) {
   tint_symbol_1.write(int4(), uint(1));
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner(texture1d<int, access::write> tint_symbol_2) {
   textureStore_5a2f8f(tint_symbol_2);
   return float4();
diff --git a/test/builtins/gen/textureStore/60975f.wgsl.expected.msl b/test/builtins/gen/textureStore/60975f.wgsl.expected.msl
index e9e4275ad7..38bf10c6f7 100644
--- a/test/builtins/gen/textureStore/60975f.wgsl.expected.msl
+++ b/test/builtins/gen/textureStore/60975f.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void textureStore_60975f(texture2d_array<float, access::write> tint_symbol_1) {
   tint_symbol_1.write(float4(), uint2(int2()), 1);
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner(texture2d_array<float, access::write> tint_symbol_2) {
   textureStore_60975f(tint_symbol_2);
   return float4();
diff --git a/test/builtins/gen/textureStore/682fd6.wgsl.expected.msl b/test/builtins/gen/textureStore/682fd6.wgsl.expected.msl
index 457dcffee8..592b20f09a 100644
--- a/test/builtins/gen/textureStore/682fd6.wgsl.expected.msl
+++ b/test/builtins/gen/textureStore/682fd6.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void textureStore_682fd6(texture2d<uint, access::write> tint_symbol_1) {
   tint_symbol_1.write(uint4(), uint2(int2()));
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner(texture2d<uint, access::write> tint_symbol_2) {
   textureStore_682fd6(tint_symbol_2);
   return float4();
diff --git a/test/builtins/gen/textureStore/6b75c3.wgsl.expected.msl b/test/builtins/gen/textureStore/6b75c3.wgsl.expected.msl
index 457a6b2d9b..7f987b232a 100644
--- a/test/builtins/gen/textureStore/6b75c3.wgsl.expected.msl
+++ b/test/builtins/gen/textureStore/6b75c3.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void textureStore_6b75c3(texture1d<float, access::write> tint_symbol_1) {
   tint_symbol_1.write(float4(), uint(1));
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner(texture1d<float, access::write> tint_symbol_2) {
   textureStore_6b75c3(tint_symbol_2);
   return float4();
diff --git a/test/builtins/gen/textureStore/6b80d2.wgsl.expected.msl b/test/builtins/gen/textureStore/6b80d2.wgsl.expected.msl
index fa97d97e10..5db31c8e0c 100644
--- a/test/builtins/gen/textureStore/6b80d2.wgsl.expected.msl
+++ b/test/builtins/gen/textureStore/6b80d2.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void textureStore_6b80d2(texture1d<int, access::write> tint_symbol_1) {
   tint_symbol_1.write(int4(), uint(1));
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner(texture1d<int, access::write> tint_symbol_2) {
   textureStore_6b80d2(tint_symbol_2);
   return float4();
diff --git a/test/builtins/gen/textureStore/6cff2e.wgsl.expected.msl b/test/builtins/gen/textureStore/6cff2e.wgsl.expected.msl
index 1653c874d7..b086eed446 100644
--- a/test/builtins/gen/textureStore/6cff2e.wgsl.expected.msl
+++ b/test/builtins/gen/textureStore/6cff2e.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void textureStore_6cff2e(texture2d<uint, access::write> tint_symbol_1) {
   tint_symbol_1.write(uint4(), uint2(int2()));
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner(texture2d<uint, access::write> tint_symbol_2) {
   textureStore_6cff2e(tint_symbol_2);
   return float4();
diff --git a/test/builtins/gen/textureStore/6da692.wgsl.expected.msl b/test/builtins/gen/textureStore/6da692.wgsl.expected.msl
index ac4c507671..a83fda74df 100644
--- a/test/builtins/gen/textureStore/6da692.wgsl.expected.msl
+++ b/test/builtins/gen/textureStore/6da692.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void textureStore_6da692(texture2d_array<uint, access::write> tint_symbol_1) {
   tint_symbol_1.write(uint4(), uint2(int2()), 1);
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner(texture2d_array<uint, access::write> tint_symbol_2) {
   textureStore_6da692(tint_symbol_2);
   return float4();
diff --git a/test/builtins/gen/textureStore/731349.wgsl.expected.msl b/test/builtins/gen/textureStore/731349.wgsl.expected.msl
index 29ceabc177..2346b59a83 100644
--- a/test/builtins/gen/textureStore/731349.wgsl.expected.msl
+++ b/test/builtins/gen/textureStore/731349.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void textureStore_731349(texture2d<float, access::write> tint_symbol_1) {
   tint_symbol_1.write(float4(), uint2(int2()));
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner(texture2d<float, access::write> tint_symbol_2) {
   textureStore_731349(tint_symbol_2);
   return float4();
diff --git a/test/builtins/gen/textureStore/752da6.wgsl.expected.msl b/test/builtins/gen/textureStore/752da6.wgsl.expected.msl
index 999bc504da..3c4ff0b185 100644
--- a/test/builtins/gen/textureStore/752da6.wgsl.expected.msl
+++ b/test/builtins/gen/textureStore/752da6.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void textureStore_752da6(texture2d<int, access::write> tint_symbol_1) {
   tint_symbol_1.write(int4(), uint2(int2()));
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner(texture2d<int, access::write> tint_symbol_2) {
   textureStore_752da6(tint_symbol_2);
   return float4();
diff --git a/test/builtins/gen/textureStore/77c0ae.wgsl.expected.msl b/test/builtins/gen/textureStore/77c0ae.wgsl.expected.msl
index de193a5521..051bd4e07b 100644
--- a/test/builtins/gen/textureStore/77c0ae.wgsl.expected.msl
+++ b/test/builtins/gen/textureStore/77c0ae.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void textureStore_77c0ae(texture2d<uint, access::write> tint_symbol_1) {
   tint_symbol_1.write(uint4(), uint2(int2()));
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner(texture2d<uint, access::write> tint_symbol_2) {
   textureStore_77c0ae(tint_symbol_2);
   return float4();
diff --git a/test/builtins/gen/textureStore/7cec8d.wgsl.expected.msl b/test/builtins/gen/textureStore/7cec8d.wgsl.expected.msl
index 5b1c950f8c..00250f3235 100644
--- a/test/builtins/gen/textureStore/7cec8d.wgsl.expected.msl
+++ b/test/builtins/gen/textureStore/7cec8d.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void textureStore_7cec8d(texture2d_array<int, access::write> tint_symbol_1) {
   tint_symbol_1.write(int4(), uint2(int2()), 1);
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner(texture2d_array<int, access::write> tint_symbol_2) {
   textureStore_7cec8d(tint_symbol_2);
   return float4();
diff --git a/test/builtins/gen/textureStore/7f7fae.wgsl.expected.msl b/test/builtins/gen/textureStore/7f7fae.wgsl.expected.msl
index b1482ceee8..8b11e389dc 100644
--- a/test/builtins/gen/textureStore/7f7fae.wgsl.expected.msl
+++ b/test/builtins/gen/textureStore/7f7fae.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void textureStore_7f7fae(texture1d<float, access::write> tint_symbol_1) {
   tint_symbol_1.write(float4(), uint(1));
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner(texture1d<float, access::write> tint_symbol_2) {
   textureStore_7f7fae(tint_symbol_2);
   return float4();
diff --git a/test/builtins/gen/textureStore/804942.wgsl.expected.msl b/test/builtins/gen/textureStore/804942.wgsl.expected.msl
index e58994eee0..df25a3242a 100644
--- a/test/builtins/gen/textureStore/804942.wgsl.expected.msl
+++ b/test/builtins/gen/textureStore/804942.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void textureStore_804942(texture2d<int, access::write> tint_symbol_1) {
   tint_symbol_1.write(int4(), uint2(int2()));
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner(texture2d<int, access::write> tint_symbol_2) {
   textureStore_804942(tint_symbol_2);
   return float4();
diff --git a/test/builtins/gen/textureStore/805dae.wgsl.expected.msl b/test/builtins/gen/textureStore/805dae.wgsl.expected.msl
index d8fa59400f..bd51b5ae12 100644
--- a/test/builtins/gen/textureStore/805dae.wgsl.expected.msl
+++ b/test/builtins/gen/textureStore/805dae.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void textureStore_805dae(texture2d<float, access::write> tint_symbol_1) {
   tint_symbol_1.write(float4(), uint2(int2()));
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner(texture2d<float, access::write> tint_symbol_2) {
   textureStore_805dae(tint_symbol_2);
   return float4();
diff --git a/test/builtins/gen/textureStore/83bcc1.wgsl.expected.msl b/test/builtins/gen/textureStore/83bcc1.wgsl.expected.msl
index ac927b784a..f0be4b0be3 100644
--- a/test/builtins/gen/textureStore/83bcc1.wgsl.expected.msl
+++ b/test/builtins/gen/textureStore/83bcc1.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void textureStore_83bcc1(texture1d<uint, access::write> tint_symbol_1) {
   tint_symbol_1.write(uint4(), uint(1));
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner(texture1d<uint, access::write> tint_symbol_2) {
   textureStore_83bcc1(tint_symbol_2);
   return float4();
diff --git a/test/builtins/gen/textureStore/872747.wgsl.expected.msl b/test/builtins/gen/textureStore/872747.wgsl.expected.msl
index 4cdef4d754..916a2be74c 100644
--- a/test/builtins/gen/textureStore/872747.wgsl.expected.msl
+++ b/test/builtins/gen/textureStore/872747.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void textureStore_872747(texture1d<float, access::write> tint_symbol_1) {
   tint_symbol_1.write(float4(), uint(1));
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner(texture1d<float, access::write> tint_symbol_2) {
   textureStore_872747(tint_symbol_2);
   return float4();
diff --git a/test/builtins/gen/textureStore/8e0479.wgsl.expected.msl b/test/builtins/gen/textureStore/8e0479.wgsl.expected.msl
index afda699dd1..b7b344bc02 100644
--- a/test/builtins/gen/textureStore/8e0479.wgsl.expected.msl
+++ b/test/builtins/gen/textureStore/8e0479.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void textureStore_8e0479(texture2d_array<uint, access::write> tint_symbol_1) {
   tint_symbol_1.write(uint4(), uint2(int2()), 1);
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner(texture2d_array<uint, access::write> tint_symbol_2) {
   textureStore_8e0479(tint_symbol_2);
   return float4();
diff --git a/test/builtins/gen/textureStore/8f71a1.wgsl.expected.msl b/test/builtins/gen/textureStore/8f71a1.wgsl.expected.msl
index 9070535625..097f768caa 100644
--- a/test/builtins/gen/textureStore/8f71a1.wgsl.expected.msl
+++ b/test/builtins/gen/textureStore/8f71a1.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void textureStore_8f71a1(texture3d<int, access::write> tint_symbol_1) {
   tint_symbol_1.write(int4(), uint3(int3()));
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner(texture3d<int, access::write> tint_symbol_2) {
   textureStore_8f71a1(tint_symbol_2);
   return float4();
diff --git a/test/builtins/gen/textureStore/969534.wgsl.expected.msl b/test/builtins/gen/textureStore/969534.wgsl.expected.msl
index 9ff764b403..9792266077 100644
--- a/test/builtins/gen/textureStore/969534.wgsl.expected.msl
+++ b/test/builtins/gen/textureStore/969534.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void textureStore_969534(texture1d<int, access::write> tint_symbol_1) {
   tint_symbol_1.write(int4(), uint(1));
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner(texture1d<int, access::write> tint_symbol_2) {
   textureStore_969534(tint_symbol_2);
   return float4();
diff --git a/test/builtins/gen/textureStore/9a3ecc.wgsl.expected.msl b/test/builtins/gen/textureStore/9a3ecc.wgsl.expected.msl
index 09a9db9d79..7977030aad 100644
--- a/test/builtins/gen/textureStore/9a3ecc.wgsl.expected.msl
+++ b/test/builtins/gen/textureStore/9a3ecc.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void textureStore_9a3ecc(texture3d<int, access::write> tint_symbol_1) {
   tint_symbol_1.write(int4(), uint3(int3()));
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner(texture3d<int, access::write> tint_symbol_2) {
   textureStore_9a3ecc(tint_symbol_2);
   return float4();
diff --git a/test/builtins/gen/textureStore/9d9cd5.wgsl.expected.msl b/test/builtins/gen/textureStore/9d9cd5.wgsl.expected.msl
index e08d4a10d5..6e704caace 100644
--- a/test/builtins/gen/textureStore/9d9cd5.wgsl.expected.msl
+++ b/test/builtins/gen/textureStore/9d9cd5.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void textureStore_9d9cd5(texture2d_array<float, access::write> tint_symbol_1) {
   tint_symbol_1.write(float4(), uint2(int2()), 1);
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner(texture2d_array<float, access::write> tint_symbol_2) {
   textureStore_9d9cd5(tint_symbol_2);
   return float4();
diff --git a/test/builtins/gen/textureStore/9e3ec5.wgsl.expected.msl b/test/builtins/gen/textureStore/9e3ec5.wgsl.expected.msl
index d08f76d7eb..9bdfb7a314 100644
--- a/test/builtins/gen/textureStore/9e3ec5.wgsl.expected.msl
+++ b/test/builtins/gen/textureStore/9e3ec5.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void textureStore_9e3ec5(texture2d<int, access::write> tint_symbol_1) {
   tint_symbol_1.write(int4(), uint2(int2()));
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner(texture2d<int, access::write> tint_symbol_2) {
   textureStore_9e3ec5(tint_symbol_2);
   return float4();
diff --git a/test/builtins/gen/textureStore/ac67aa.wgsl.expected.msl b/test/builtins/gen/textureStore/ac67aa.wgsl.expected.msl
index 47a142d3bd..f61229ed22 100644
--- a/test/builtins/gen/textureStore/ac67aa.wgsl.expected.msl
+++ b/test/builtins/gen/textureStore/ac67aa.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void textureStore_ac67aa(texture3d<uint, access::write> tint_symbol_1) {
   tint_symbol_1.write(uint4(), uint3(int3()));
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner(texture3d<uint, access::write> tint_symbol_2) {
   textureStore_ac67aa(tint_symbol_2);
   return float4();
diff --git a/test/builtins/gen/textureStore/b706b1.wgsl.expected.msl b/test/builtins/gen/textureStore/b706b1.wgsl.expected.msl
index 9d9c3f7671..a28cf356c7 100644
--- a/test/builtins/gen/textureStore/b706b1.wgsl.expected.msl
+++ b/test/builtins/gen/textureStore/b706b1.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void textureStore_b706b1(texture3d<int, access::write> tint_symbol_1) {
   tint_symbol_1.write(int4(), uint3(int3()));
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner(texture3d<int, access::write> tint_symbol_2) {
   textureStore_b706b1(tint_symbol_2);
   return float4();
diff --git a/test/builtins/gen/textureStore/bbcb7f.wgsl.expected.msl b/test/builtins/gen/textureStore/bbcb7f.wgsl.expected.msl
index 4e92cd5470..8eff861150 100644
--- a/test/builtins/gen/textureStore/bbcb7f.wgsl.expected.msl
+++ b/test/builtins/gen/textureStore/bbcb7f.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void textureStore_bbcb7f(texture2d<int, access::write> tint_symbol_1) {
   tint_symbol_1.write(int4(), uint2(int2()));
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner(texture2d<int, access::write> tint_symbol_2) {
   textureStore_bbcb7f(tint_symbol_2);
   return float4();
diff --git a/test/builtins/gen/textureStore/be6e30.wgsl.expected.msl b/test/builtins/gen/textureStore/be6e30.wgsl.expected.msl
index a5e126d169..5ed9b5f0aa 100644
--- a/test/builtins/gen/textureStore/be6e30.wgsl.expected.msl
+++ b/test/builtins/gen/textureStore/be6e30.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void textureStore_be6e30(texture2d<float, access::write> tint_symbol_1) {
   tint_symbol_1.write(float4(), uint2(int2()));
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner(texture2d<float, access::write> tint_symbol_2) {
   textureStore_be6e30(tint_symbol_2);
   return float4();
diff --git a/test/builtins/gen/textureStore/bf775c.wgsl.expected.msl b/test/builtins/gen/textureStore/bf775c.wgsl.expected.msl
index bbd28edf7b..d722999e9c 100644
--- a/test/builtins/gen/textureStore/bf775c.wgsl.expected.msl
+++ b/test/builtins/gen/textureStore/bf775c.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void textureStore_bf775c(texture1d<int, access::write> tint_symbol_1) {
   tint_symbol_1.write(int4(), uint(1));
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner(texture1d<int, access::write> tint_symbol_2) {
   textureStore_bf775c(tint_symbol_2);
   return float4();
diff --git a/test/builtins/gen/textureStore/c5af1e.wgsl.expected.msl b/test/builtins/gen/textureStore/c5af1e.wgsl.expected.msl
index 220943d150..2ed8fe7d4d 100644
--- a/test/builtins/gen/textureStore/c5af1e.wgsl.expected.msl
+++ b/test/builtins/gen/textureStore/c5af1e.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void textureStore_c5af1e(texture3d<float, access::write> tint_symbol_1) {
   tint_symbol_1.write(float4(), uint3(int3()));
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner(texture3d<float, access::write> tint_symbol_2) {
   textureStore_c5af1e(tint_symbol_2);
   return float4();
diff --git a/test/builtins/gen/textureStore/c863be.wgsl.expected.msl b/test/builtins/gen/textureStore/c863be.wgsl.expected.msl
index e55e2c48e1..cea5b8e7a4 100644
--- a/test/builtins/gen/textureStore/c863be.wgsl.expected.msl
+++ b/test/builtins/gen/textureStore/c863be.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void textureStore_c863be(texture2d_array<float, access::write> tint_symbol_1) {
   tint_symbol_1.write(float4(), uint2(int2()), 1);
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner(texture2d_array<float, access::write> tint_symbol_2) {
   textureStore_c863be(tint_symbol_2);
   return float4();
diff --git a/test/builtins/gen/textureStore/d73b5c.wgsl.expected.msl b/test/builtins/gen/textureStore/d73b5c.wgsl.expected.msl
index e41c4390eb..44ed0f4d8f 100644
--- a/test/builtins/gen/textureStore/d73b5c.wgsl.expected.msl
+++ b/test/builtins/gen/textureStore/d73b5c.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void textureStore_d73b5c(texture1d<int, access::write> tint_symbol_1) {
   tint_symbol_1.write(int4(), uint(1));
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner(texture1d<int, access::write> tint_symbol_2) {
   textureStore_d73b5c(tint_symbol_2);
   return float4();
diff --git a/test/builtins/gen/textureStore/dd7d81.wgsl.expected.msl b/test/builtins/gen/textureStore/dd7d81.wgsl.expected.msl
index 3e3903830d..13e19b40a8 100644
--- a/test/builtins/gen/textureStore/dd7d81.wgsl.expected.msl
+++ b/test/builtins/gen/textureStore/dd7d81.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void textureStore_dd7d81(texture3d<float, access::write> tint_symbol_1) {
   tint_symbol_1.write(float4(), uint3(int3()));
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner(texture3d<float, access::write> tint_symbol_2) {
   textureStore_dd7d81(tint_symbol_2);
   return float4();
diff --git a/test/builtins/gen/textureStore/dde364.wgsl.expected.msl b/test/builtins/gen/textureStore/dde364.wgsl.expected.msl
index 115e7ab108..bf69fde29d 100644
--- a/test/builtins/gen/textureStore/dde364.wgsl.expected.msl
+++ b/test/builtins/gen/textureStore/dde364.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void textureStore_dde364(texture2d_array<uint, access::write> tint_symbol_1) {
   tint_symbol_1.write(uint4(), uint2(int2()), 1);
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner(texture2d_array<uint, access::write> tint_symbol_2) {
   textureStore_dde364(tint_symbol_2);
   return float4();
diff --git a/test/builtins/gen/textureStore/e885e8.wgsl.expected.msl b/test/builtins/gen/textureStore/e885e8.wgsl.expected.msl
index 8ef1a12300..b69dd1b20f 100644
--- a/test/builtins/gen/textureStore/e885e8.wgsl.expected.msl
+++ b/test/builtins/gen/textureStore/e885e8.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void textureStore_e885e8(texture1d<float, access::write> tint_symbol_1) {
   tint_symbol_1.write(float4(), uint(1));
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner(texture1d<float, access::write> tint_symbol_2) {
   textureStore_e885e8(tint_symbol_2);
   return float4();
diff --git a/test/builtins/gen/textureStore/eb702f.wgsl.expected.msl b/test/builtins/gen/textureStore/eb702f.wgsl.expected.msl
index 41d7c7f4fa..3265301a11 100644
--- a/test/builtins/gen/textureStore/eb702f.wgsl.expected.msl
+++ b/test/builtins/gen/textureStore/eb702f.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void textureStore_eb702f(texture3d<float, access::write> tint_symbol_1) {
   tint_symbol_1.write(float4(), uint3(int3()));
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner(texture3d<float, access::write> tint_symbol_2) {
   textureStore_eb702f(tint_symbol_2);
   return float4();
diff --git a/test/builtins/gen/textureStore/eb78b9.wgsl.expected.msl b/test/builtins/gen/textureStore/eb78b9.wgsl.expected.msl
index c96a6be4aa..f5956b7486 100644
--- a/test/builtins/gen/textureStore/eb78b9.wgsl.expected.msl
+++ b/test/builtins/gen/textureStore/eb78b9.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void textureStore_eb78b9(texture3d<int, access::write> tint_symbol_1) {
   tint_symbol_1.write(int4(), uint3(int3()));
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner(texture3d<int, access::write> tint_symbol_2) {
   textureStore_eb78b9(tint_symbol_2);
   return float4();
diff --git a/test/builtins/gen/textureStore/ee6acc.wgsl.expected.msl b/test/builtins/gen/textureStore/ee6acc.wgsl.expected.msl
index ff1b33757f..e2577eabbe 100644
--- a/test/builtins/gen/textureStore/ee6acc.wgsl.expected.msl
+++ b/test/builtins/gen/textureStore/ee6acc.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void textureStore_ee6acc(texture3d<float, access::write> tint_symbol_1) {
   tint_symbol_1.write(float4(), uint3(int3()));
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner(texture3d<float, access::write> tint_symbol_2) {
   textureStore_ee6acc(tint_symbol_2);
   return float4();
diff --git a/test/builtins/gen/textureStore/ef9f2f.wgsl.expected.msl b/test/builtins/gen/textureStore/ef9f2f.wgsl.expected.msl
index ea717deaa0..28b42e68ea 100644
--- a/test/builtins/gen/textureStore/ef9f2f.wgsl.expected.msl
+++ b/test/builtins/gen/textureStore/ef9f2f.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void textureStore_ef9f2f(texture3d<uint, access::write> tint_symbol_1) {
   tint_symbol_1.write(uint4(), uint3(int3()));
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner(texture3d<uint, access::write> tint_symbol_2) {
   textureStore_ef9f2f(tint_symbol_2);
   return float4();
diff --git a/test/builtins/gen/textureStore/f8dead.wgsl.expected.msl b/test/builtins/gen/textureStore/f8dead.wgsl.expected.msl
index 86b857ad64..35885fa586 100644
--- a/test/builtins/gen/textureStore/f8dead.wgsl.expected.msl
+++ b/test/builtins/gen/textureStore/f8dead.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void textureStore_f8dead(texture3d<uint, access::write> tint_symbol_1) {
   tint_symbol_1.write(uint4(), uint3(int3()));
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner(texture3d<uint, access::write> tint_symbol_2) {
   textureStore_f8dead(tint_symbol_2);
   return float4();
diff --git a/test/builtins/gen/textureStore/f9be83.wgsl.expected.msl b/test/builtins/gen/textureStore/f9be83.wgsl.expected.msl
index c8bb94f237..04178a6047 100644
--- a/test/builtins/gen/textureStore/f9be83.wgsl.expected.msl
+++ b/test/builtins/gen/textureStore/f9be83.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void textureStore_f9be83(texture2d_array<int, access::write> tint_symbol_1) {
   tint_symbol_1.write(int4(), uint2(int2()), 1);
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner(texture2d_array<int, access::write> tint_symbol_2) {
   textureStore_f9be83(tint_symbol_2);
   return float4();
diff --git a/test/builtins/gen/textureStore/fb9a8f.wgsl.expected.msl b/test/builtins/gen/textureStore/fb9a8f.wgsl.expected.msl
index ee37f346e8..0522eb949b 100644
--- a/test/builtins/gen/textureStore/fb9a8f.wgsl.expected.msl
+++ b/test/builtins/gen/textureStore/fb9a8f.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void textureStore_fb9a8f(texture1d<uint, access::write> tint_symbol_1) {
   tint_symbol_1.write(uint4(), uint(1));
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner(texture1d<uint, access::write> tint_symbol_2) {
   textureStore_fb9a8f(tint_symbol_2);
   return float4();
diff --git a/test/builtins/gen/textureStore/fbf53f.wgsl.expected.msl b/test/builtins/gen/textureStore/fbf53f.wgsl.expected.msl
index 68b5283fdf..3b9a0e69d8 100644
--- a/test/builtins/gen/textureStore/fbf53f.wgsl.expected.msl
+++ b/test/builtins/gen/textureStore/fbf53f.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void textureStore_fbf53f(texture2d_array<int, access::write> tint_symbol_1) {
   tint_symbol_1.write(int4(), uint2(int2()), 1);
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner(texture2d_array<int, access::write> tint_symbol_2) {
   textureStore_fbf53f(tint_symbol_2);
   return float4();
diff --git a/test/builtins/gen/transpose/2585cd.wgsl.expected.msl b/test/builtins/gen/transpose/2585cd.wgsl.expected.msl
index b3b56c86ad..bd0aea83d5 100644
--- a/test/builtins/gen/transpose/2585cd.wgsl.expected.msl
+++ b/test/builtins/gen/transpose/2585cd.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void transpose_2585cd() {
   float3x4 res = transpose(float4x3());
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner() {
   transpose_2585cd();
   return float4();
diff --git a/test/builtins/gen/transpose/31d679.wgsl.expected.msl b/test/builtins/gen/transpose/31d679.wgsl.expected.msl
index 6e589edadb..37161be200 100644
--- a/test/builtins/gen/transpose/31d679.wgsl.expected.msl
+++ b/test/builtins/gen/transpose/31d679.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void transpose_31d679() {
   float2x2 res = transpose(float2x2());
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner() {
   transpose_31d679();
   return float4();
diff --git a/test/builtins/gen/transpose/31e37e.wgsl.expected.msl b/test/builtins/gen/transpose/31e37e.wgsl.expected.msl
index e0fd198dfe..393d1c2dd3 100644
--- a/test/builtins/gen/transpose/31e37e.wgsl.expected.msl
+++ b/test/builtins/gen/transpose/31e37e.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void transpose_31e37e() {
   float2x4 res = transpose(float4x2());
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner() {
   transpose_31e37e();
   return float4();
diff --git a/test/builtins/gen/transpose/4ce359.wgsl.expected.msl b/test/builtins/gen/transpose/4ce359.wgsl.expected.msl
index 84d1993e11..6f191fcac0 100644
--- a/test/builtins/gen/transpose/4ce359.wgsl.expected.msl
+++ b/test/builtins/gen/transpose/4ce359.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void transpose_4ce359() {
   float4x2 res = transpose(float2x4());
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner() {
   transpose_4ce359();
   return float4();
diff --git a/test/builtins/gen/transpose/4dc9a1.wgsl.expected.msl b/test/builtins/gen/transpose/4dc9a1.wgsl.expected.msl
index b26fea1780..758e4046b4 100644
--- a/test/builtins/gen/transpose/4dc9a1.wgsl.expected.msl
+++ b/test/builtins/gen/transpose/4dc9a1.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void transpose_4dc9a1() {
   float3x2 res = transpose(float2x3());
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner() {
   transpose_4dc9a1();
   return float4();
diff --git a/test/builtins/gen/transpose/854336.wgsl.expected.msl b/test/builtins/gen/transpose/854336.wgsl.expected.msl
index 745cc681d8..f541c74fc9 100644
--- a/test/builtins/gen/transpose/854336.wgsl.expected.msl
+++ b/test/builtins/gen/transpose/854336.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void transpose_854336() {
   float3x3 res = transpose(float3x3());
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner() {
   transpose_854336();
   return float4();
diff --git a/test/builtins/gen/transpose/c1b600.wgsl.expected.msl b/test/builtins/gen/transpose/c1b600.wgsl.expected.msl
index df995780b7..b1c7ea42d1 100644
--- a/test/builtins/gen/transpose/c1b600.wgsl.expected.msl
+++ b/test/builtins/gen/transpose/c1b600.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void transpose_c1b600() {
   float4x4 res = transpose(float4x4());
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner() {
   transpose_c1b600();
   return float4();
diff --git a/test/builtins/gen/transpose/d8f8ba.wgsl.expected.msl b/test/builtins/gen/transpose/d8f8ba.wgsl.expected.msl
index fd5a36fd0c..c0fe7fe9f9 100644
--- a/test/builtins/gen/transpose/d8f8ba.wgsl.expected.msl
+++ b/test/builtins/gen/transpose/d8f8ba.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void transpose_d8f8ba() {
   float4x3 res = transpose(float3x4());
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner() {
   transpose_d8f8ba();
   return float4();
diff --git a/test/builtins/gen/transpose/ed4bdc.wgsl.expected.msl b/test/builtins/gen/transpose/ed4bdc.wgsl.expected.msl
index 5952069a30..3b4dfac436 100644
--- a/test/builtins/gen/transpose/ed4bdc.wgsl.expected.msl
+++ b/test/builtins/gen/transpose/ed4bdc.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void transpose_ed4bdc() {
   float2x3 res = transpose(float3x2());
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner() {
   transpose_ed4bdc();
   return float4();
diff --git a/test/builtins/gen/trunc/562d05.wgsl.expected.msl b/test/builtins/gen/trunc/562d05.wgsl.expected.msl
index 75d45acbcb..491d58729a 100644
--- a/test/builtins/gen/trunc/562d05.wgsl.expected.msl
+++ b/test/builtins/gen/trunc/562d05.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void trunc_562d05() {
   float3 res = trunc(float3());
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner() {
   trunc_562d05();
   return float4();
diff --git a/test/builtins/gen/trunc/e183aa.wgsl.expected.msl b/test/builtins/gen/trunc/e183aa.wgsl.expected.msl
index b6fb817f91..3e8d78d6f1 100644
--- a/test/builtins/gen/trunc/e183aa.wgsl.expected.msl
+++ b/test/builtins/gen/trunc/e183aa.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void trunc_e183aa() {
   float4 res = trunc(float4());
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner() {
   trunc_e183aa();
   return float4();
diff --git a/test/builtins/gen/trunc/eb83df.wgsl.expected.msl b/test/builtins/gen/trunc/eb83df.wgsl.expected.msl
index 5e951029cf..950182f686 100644
--- a/test/builtins/gen/trunc/eb83df.wgsl.expected.msl
+++ b/test/builtins/gen/trunc/eb83df.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void trunc_eb83df() {
   float res = trunc(1.0f);
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner() {
   trunc_eb83df();
   return float4();
diff --git a/test/builtins/gen/trunc/f370d3.wgsl.expected.msl b/test/builtins/gen/trunc/f370d3.wgsl.expected.msl
index da0192f46e..aa5a099944 100644
--- a/test/builtins/gen/trunc/f370d3.wgsl.expected.msl
+++ b/test/builtins/gen/trunc/f370d3.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void trunc_f370d3() {
   float2 res = trunc(float2());
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner() {
   trunc_f370d3();
   return float4();
diff --git a/test/builtins/gen/unpack2x16float/32a5cf.wgsl.expected.msl b/test/builtins/gen/unpack2x16float/32a5cf.wgsl.expected.msl
index 780a847eed..ba41cd61d7 100644
--- a/test/builtins/gen/unpack2x16float/32a5cf.wgsl.expected.msl
+++ b/test/builtins/gen/unpack2x16float/32a5cf.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void unpack2x16float_32a5cf() {
   float2 res = float2(as_type<half2>(1u));
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner() {
   unpack2x16float_32a5cf();
   return float4();
diff --git a/test/builtins/gen/unpack2x16snorm/b4aea6.wgsl.expected.msl b/test/builtins/gen/unpack2x16snorm/b4aea6.wgsl.expected.msl
index 4b72608903..03a4ab63d1 100644
--- a/test/builtins/gen/unpack2x16snorm/b4aea6.wgsl.expected.msl
+++ b/test/builtins/gen/unpack2x16snorm/b4aea6.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void unpack2x16snorm_b4aea6() {
   float2 res = unpack_snorm2x16_to_float(1u);
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner() {
   unpack2x16snorm_b4aea6();
   return float4();
diff --git a/test/builtins/gen/unpack2x16unorm/7699c0.wgsl.expected.msl b/test/builtins/gen/unpack2x16unorm/7699c0.wgsl.expected.msl
index c4eba4ece1..fda9e15242 100644
--- a/test/builtins/gen/unpack2x16unorm/7699c0.wgsl.expected.msl
+++ b/test/builtins/gen/unpack2x16unorm/7699c0.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void unpack2x16unorm_7699c0() {
   float2 res = unpack_unorm2x16_to_float(1u);
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner() {
   unpack2x16unorm_7699c0();
   return float4();
diff --git a/test/builtins/gen/unpack4x8snorm/523fb3.wgsl.expected.msl b/test/builtins/gen/unpack4x8snorm/523fb3.wgsl.expected.msl
index e3e1244bd4..9235de24ba 100644
--- a/test/builtins/gen/unpack4x8snorm/523fb3.wgsl.expected.msl
+++ b/test/builtins/gen/unpack4x8snorm/523fb3.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void unpack4x8snorm_523fb3() {
   float4 res = unpack_snorm4x8_to_float(1u);
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner() {
   unpack4x8snorm_523fb3();
   return float4();
diff --git a/test/builtins/gen/unpack4x8unorm/750c74.wgsl.expected.msl b/test/builtins/gen/unpack4x8unorm/750c74.wgsl.expected.msl
index e05632de07..cc5cd0a170 100644
--- a/test/builtins/gen/unpack4x8unorm/750c74.wgsl.expected.msl
+++ b/test/builtins/gen/unpack4x8unorm/750c74.wgsl.expected.msl
@@ -1,14 +1,14 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
 void unpack4x8unorm_750c74() {
   float4 res = unpack_unorm4x8_to_float(1u);
 }
 
+struct tint_symbol {
+  float4 value [[position]];
+};
+
 float4 vertex_main_inner() {
   unpack4x8unorm_750c74();
   return float4();
diff --git a/test/builtins/textureDimensions/depth_ms.spvasm.expected.msl b/test/builtins/textureDimensions/depth_ms.spvasm.expected.msl
index f615d7a3bd..670bd019f3 100644
--- a/test/builtins/textureDimensions/depth_ms.spvasm.expected.msl
+++ b/test/builtins/textureDimensions/depth_ms.spvasm.expected.msl
@@ -1,13 +1,6 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct vertex_main_out {
-  float4 tint_symbol_1_1;
-};
-struct tint_symbol_3 {
-  float4 tint_symbol_1_1 [[position]];
-};
-
 void textureDimensions_f60bdb(depth2d_ms<float, access::read> tint_symbol_5) {
   int2 res = int2();
   int2 const x_16 = int2(int2(tint_symbol_5.get_width(), tint_symbol_5.get_height()));
@@ -26,6 +19,14 @@ void vertex_main_1(depth2d_ms<float, access::read> tint_symbol_7, thread float4*
   return;
 }
 
+struct vertex_main_out {
+  float4 tint_symbol_1_1;
+};
+
+struct tint_symbol_3 {
+  float4 tint_symbol_1_1 [[position]];
+};
+
 vertex_main_out vertex_main_inner(depth2d_ms<float, access::read> tint_symbol_9, thread float4* const tint_symbol_10) {
   vertex_main_1(tint_symbol_9, tint_symbol_10);
   vertex_main_out const tint_symbol_4 = {.tint_symbol_1_1=*(tint_symbol_10)};
diff --git a/test/builtins/textureLoad/depth_ms.spvasm.expected.msl b/test/builtins/textureLoad/depth_ms.spvasm.expected.msl
index acbe9b1d2b..072549da16 100644
--- a/test/builtins/textureLoad/depth_ms.spvasm.expected.msl
+++ b/test/builtins/textureLoad/depth_ms.spvasm.expected.msl
@@ -1,13 +1,6 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct vertex_main_out {
-  float4 tint_symbol_1_1;
-};
-struct tint_symbol_3 {
-  float4 tint_symbol_1_1 [[position]];
-};
-
 void textureLoad_6273b1(depth2d_ms<float, access::read> tint_symbol_5) {
   float res = 0.0f;
   float4 const x_17 = float4(tint_symbol_5.read(uint2(int2()), 1), 0.0f, 0.0f, 0.0f);
@@ -26,6 +19,14 @@ void vertex_main_1(depth2d_ms<float, access::read> tint_symbol_7, thread float4*
   return;
 }
 
+struct vertex_main_out {
+  float4 tint_symbol_1_1;
+};
+
+struct tint_symbol_3 {
+  float4 tint_symbol_1_1 [[position]];
+};
+
 vertex_main_out vertex_main_inner(depth2d_ms<float, access::read> tint_symbol_9, thread float4* const tint_symbol_10) {
   vertex_main_1(tint_symbol_9, tint_symbol_10);
   vertex_main_out const tint_symbol_4 = {.tint_symbol_1_1=*(tint_symbol_10)};
diff --git a/test/builtins/textureNumSamples/depth_ms.spvasm.expected.msl b/test/builtins/textureNumSamples/depth_ms.spvasm.expected.msl
index 6f38d371c0..8a92713589 100644
--- a/test/builtins/textureNumSamples/depth_ms.spvasm.expected.msl
+++ b/test/builtins/textureNumSamples/depth_ms.spvasm.expected.msl
@@ -1,13 +1,6 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct vertex_main_out {
-  float4 tint_symbol_1_1;
-};
-struct tint_symbol_3 {
-  float4 tint_symbol_1_1 [[position]];
-};
-
 void textureNumSamples_a3c8a0(depth2d_ms<float, access::read> tint_symbol_5) {
   int res = 0;
   int const x_16 = int(tint_symbol_5.get_num_samples());
@@ -26,6 +19,14 @@ void vertex_main_1(depth2d_ms<float, access::read> tint_symbol_7, thread float4*
   return;
 }
 
+struct vertex_main_out {
+  float4 tint_symbol_1_1;
+};
+
+struct tint_symbol_3 {
+  float4 tint_symbol_1_1 [[position]];
+};
+
 vertex_main_out vertex_main_inner(depth2d_ms<float, access::read> tint_symbol_9, thread float4* const tint_symbol_10) {
   vertex_main_1(tint_symbol_9, tint_symbol_10);
   vertex_main_out const tint_symbol_4 = {.tint_symbol_1_1=*(tint_symbol_10)};
diff --git a/test/expressions/literals/-inf.spvasm.expected.msl b/test/expressions/literals/-inf.spvasm.expected.msl
index e3b3640f23..f9c80baa16 100644
--- a/test/expressions/literals/-inf.spvasm.expected.msl
+++ b/test/expressions/literals/-inf.spvasm.expected.msl
@@ -1,18 +1,19 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct main_out {
-  float4 out_var_SV_TARGET_1;
-};
-struct tint_symbol_1 {
-  float4 out_var_SV_TARGET_1 [[color(0)]];
-};
-
 void main_1(thread float4* const tint_symbol_3) {
   *(tint_symbol_3) = float4(-INFINITY, -INFINITY, -INFINITY, -INFINITY);
   return;
 }
 
+struct main_out {
+  float4 out_var_SV_TARGET_1;
+};
+
+struct tint_symbol_1 {
+  float4 out_var_SV_TARGET_1 [[color(0)]];
+};
+
 main_out tint_symbol_inner(thread float4* const tint_symbol_4) {
   main_1(tint_symbol_4);
   main_out const tint_symbol_2 = {.out_var_SV_TARGET_1=*(tint_symbol_4)};
diff --git a/test/expressions/literals/inf.spvasm.expected.msl b/test/expressions/literals/inf.spvasm.expected.msl
index 3135a4e61d..73aca9e91e 100644
--- a/test/expressions/literals/inf.spvasm.expected.msl
+++ b/test/expressions/literals/inf.spvasm.expected.msl
@@ -1,18 +1,19 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct main_out {
-  float4 out_var_SV_TARGET_1;
-};
-struct tint_symbol_1 {
-  float4 out_var_SV_TARGET_1 [[color(0)]];
-};
-
 void main_1(thread float4* const tint_symbol_3) {
   *(tint_symbol_3) = float4(INFINITY, INFINITY, INFINITY, INFINITY);
   return;
 }
 
+struct main_out {
+  float4 out_var_SV_TARGET_1;
+};
+
+struct tint_symbol_1 {
+  float4 out_var_SV_TARGET_1 [[color(0)]];
+};
+
 main_out tint_symbol_inner(thread float4* const tint_symbol_4) {
   main_1(tint_symbol_4);
   main_out const tint_symbol_2 = {.out_var_SV_TARGET_1=*(tint_symbol_4)};
diff --git a/test/expressions/literals/nan.spvasm.expected.msl b/test/expressions/literals/nan.spvasm.expected.msl
index 740613bd28..90317e4bd6 100644
--- a/test/expressions/literals/nan.spvasm.expected.msl
+++ b/test/expressions/literals/nan.spvasm.expected.msl
@@ -1,18 +1,19 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct main_out {
-  float4 out_var_SV_TARGET_1;
-};
-struct tint_symbol_1 {
-  float4 out_var_SV_TARGET_1 [[color(0)]];
-};
-
 void main_1(thread float4* const tint_symbol_3) {
   *(tint_symbol_3) = float4(NAN, NAN, NAN, NAN);
   return;
 }
 
+struct main_out {
+  float4 out_var_SV_TARGET_1;
+};
+
+struct tint_symbol_1 {
+  float4 out_var_SV_TARGET_1 [[color(0)]];
+};
+
 main_out tint_symbol_inner(thread float4* const tint_symbol_4) {
   main_1(tint_symbol_4);
   main_out const tint_symbol_2 = {.out_var_SV_TARGET_1=*(tint_symbol_4)};
diff --git a/test/expressions/type_ctor/mat2x2/explicit/scalars/f32.wgsl.expected.msl b/test/expressions/type_ctor/mat2x2/explicit/scalars/f32.wgsl.expected.msl
index e33850fc69..b62a321cb2 100644
--- a/test/expressions/type_ctor/mat2x2/explicit/scalars/f32.wgsl.expected.msl
+++ b/test/expressions/type_ctor/mat2x2/explicit/scalars/f32.wgsl.expected.msl
@@ -2,3 +2,4 @@
 
 using namespace metal;
 constant float2x2 m = float2x2(float2(0.0f, 1.0f), float2(2.0f, 3.0f));
+
diff --git a/test/expressions/type_ctor/mat2x2/explicit/vectors/f32.wgsl.expected.msl b/test/expressions/type_ctor/mat2x2/explicit/vectors/f32.wgsl.expected.msl
index e33850fc69..b62a321cb2 100644
--- a/test/expressions/type_ctor/mat2x2/explicit/vectors/f32.wgsl.expected.msl
+++ b/test/expressions/type_ctor/mat2x2/explicit/vectors/f32.wgsl.expected.msl
@@ -2,3 +2,4 @@
 
 using namespace metal;
 constant float2x2 m = float2x2(float2(0.0f, 1.0f), float2(2.0f, 3.0f));
+
diff --git a/test/expressions/type_ctor/mat2x2/inferred/scalars/f32.wgsl.expected.msl b/test/expressions/type_ctor/mat2x2/inferred/scalars/f32.wgsl.expected.msl
index e33850fc69..b62a321cb2 100644
--- a/test/expressions/type_ctor/mat2x2/inferred/scalars/f32.wgsl.expected.msl
+++ b/test/expressions/type_ctor/mat2x2/inferred/scalars/f32.wgsl.expected.msl
@@ -2,3 +2,4 @@
 
 using namespace metal;
 constant float2x2 m = float2x2(float2(0.0f, 1.0f), float2(2.0f, 3.0f));
+
diff --git a/test/expressions/type_ctor/mat2x2/inferred/vectors/f32.wgsl.expected.msl b/test/expressions/type_ctor/mat2x2/inferred/vectors/f32.wgsl.expected.msl
index e33850fc69..b62a321cb2 100644
--- a/test/expressions/type_ctor/mat2x2/inferred/vectors/f32.wgsl.expected.msl
+++ b/test/expressions/type_ctor/mat2x2/inferred/vectors/f32.wgsl.expected.msl
@@ -2,3 +2,4 @@
 
 using namespace metal;
 constant float2x2 m = float2x2(float2(0.0f, 1.0f), float2(2.0f, 3.0f));
+
diff --git a/test/expressions/type_ctor/mat2x3/explicit/scalars/f32.wgsl.expected.msl b/test/expressions/type_ctor/mat2x3/explicit/scalars/f32.wgsl.expected.msl
index 86b17e2215..443c61f166 100644
--- a/test/expressions/type_ctor/mat2x3/explicit/scalars/f32.wgsl.expected.msl
+++ b/test/expressions/type_ctor/mat2x3/explicit/scalars/f32.wgsl.expected.msl
@@ -2,3 +2,4 @@
 
 using namespace metal;
 constant float2x3 m = float2x3(float3(0.0f, 1.0f, 2.0f), float3(3.0f, 4.0f, 5.0f));
+
diff --git a/test/expressions/type_ctor/mat2x3/explicit/vectors/f32.wgsl.expected.msl b/test/expressions/type_ctor/mat2x3/explicit/vectors/f32.wgsl.expected.msl
index 86b17e2215..443c61f166 100644
--- a/test/expressions/type_ctor/mat2x3/explicit/vectors/f32.wgsl.expected.msl
+++ b/test/expressions/type_ctor/mat2x3/explicit/vectors/f32.wgsl.expected.msl
@@ -2,3 +2,4 @@
 
 using namespace metal;
 constant float2x3 m = float2x3(float3(0.0f, 1.0f, 2.0f), float3(3.0f, 4.0f, 5.0f));
+
diff --git a/test/expressions/type_ctor/mat2x3/inferred/scalars/f32.wgsl.expected.msl b/test/expressions/type_ctor/mat2x3/inferred/scalars/f32.wgsl.expected.msl
index 86b17e2215..443c61f166 100644
--- a/test/expressions/type_ctor/mat2x3/inferred/scalars/f32.wgsl.expected.msl
+++ b/test/expressions/type_ctor/mat2x3/inferred/scalars/f32.wgsl.expected.msl
@@ -2,3 +2,4 @@
 
 using namespace metal;
 constant float2x3 m = float2x3(float3(0.0f, 1.0f, 2.0f), float3(3.0f, 4.0f, 5.0f));
+
diff --git a/test/expressions/type_ctor/mat2x3/inferred/vectors/f32.wgsl.expected.msl b/test/expressions/type_ctor/mat2x3/inferred/vectors/f32.wgsl.expected.msl
index 86b17e2215..443c61f166 100644
--- a/test/expressions/type_ctor/mat2x3/inferred/vectors/f32.wgsl.expected.msl
+++ b/test/expressions/type_ctor/mat2x3/inferred/vectors/f32.wgsl.expected.msl
@@ -2,3 +2,4 @@
 
 using namespace metal;
 constant float2x3 m = float2x3(float3(0.0f, 1.0f, 2.0f), float3(3.0f, 4.0f, 5.0f));
+
diff --git a/test/expressions/type_ctor/mat2x4/explicit/scalars/f32.wgsl.expected.msl b/test/expressions/type_ctor/mat2x4/explicit/scalars/f32.wgsl.expected.msl
index 684918a11f..b309bde1e4 100644
--- a/test/expressions/type_ctor/mat2x4/explicit/scalars/f32.wgsl.expected.msl
+++ b/test/expressions/type_ctor/mat2x4/explicit/scalars/f32.wgsl.expected.msl
@@ -2,3 +2,4 @@
 
 using namespace metal;
 constant float2x4 m = float2x4(float4(0.0f, 1.0f, 2.0f, 3.0f), float4(4.0f, 5.0f, 6.0f, 7.0f));
+
diff --git a/test/expressions/type_ctor/mat2x4/explicit/vectors/f32.wgsl.expected.msl b/test/expressions/type_ctor/mat2x4/explicit/vectors/f32.wgsl.expected.msl
index 684918a11f..b309bde1e4 100644
--- a/test/expressions/type_ctor/mat2x4/explicit/vectors/f32.wgsl.expected.msl
+++ b/test/expressions/type_ctor/mat2x4/explicit/vectors/f32.wgsl.expected.msl
@@ -2,3 +2,4 @@
 
 using namespace metal;
 constant float2x4 m = float2x4(float4(0.0f, 1.0f, 2.0f, 3.0f), float4(4.0f, 5.0f, 6.0f, 7.0f));
+
diff --git a/test/expressions/type_ctor/mat2x4/inferred/scalars/f32.wgsl.expected.msl b/test/expressions/type_ctor/mat2x4/inferred/scalars/f32.wgsl.expected.msl
index 684918a11f..b309bde1e4 100644
--- a/test/expressions/type_ctor/mat2x4/inferred/scalars/f32.wgsl.expected.msl
+++ b/test/expressions/type_ctor/mat2x4/inferred/scalars/f32.wgsl.expected.msl
@@ -2,3 +2,4 @@
 
 using namespace metal;
 constant float2x4 m = float2x4(float4(0.0f, 1.0f, 2.0f, 3.0f), float4(4.0f, 5.0f, 6.0f, 7.0f));
+
diff --git a/test/expressions/type_ctor/mat2x4/inferred/vectors/f32.wgsl.expected.msl b/test/expressions/type_ctor/mat2x4/inferred/vectors/f32.wgsl.expected.msl
index 684918a11f..b309bde1e4 100644
--- a/test/expressions/type_ctor/mat2x4/inferred/vectors/f32.wgsl.expected.msl
+++ b/test/expressions/type_ctor/mat2x4/inferred/vectors/f32.wgsl.expected.msl
@@ -2,3 +2,4 @@
 
 using namespace metal;
 constant float2x4 m = float2x4(float4(0.0f, 1.0f, 2.0f, 3.0f), float4(4.0f, 5.0f, 6.0f, 7.0f));
+
diff --git a/test/expressions/type_ctor/mat3x2/explicit/scalars/f32.wgsl.expected.msl b/test/expressions/type_ctor/mat3x2/explicit/scalars/f32.wgsl.expected.msl
index 04aad8e324..ae7f33c2da 100644
--- a/test/expressions/type_ctor/mat3x2/explicit/scalars/f32.wgsl.expected.msl
+++ b/test/expressions/type_ctor/mat3x2/explicit/scalars/f32.wgsl.expected.msl
@@ -2,3 +2,4 @@
 
 using namespace metal;
 constant float3x2 m = float3x2(float2(0.0f, 1.0f), float2(2.0f, 3.0f), float2(4.0f, 5.0f));
+
diff --git a/test/expressions/type_ctor/mat3x2/explicit/vectors/f32.wgsl.expected.msl b/test/expressions/type_ctor/mat3x2/explicit/vectors/f32.wgsl.expected.msl
index 04aad8e324..ae7f33c2da 100644
--- a/test/expressions/type_ctor/mat3x2/explicit/vectors/f32.wgsl.expected.msl
+++ b/test/expressions/type_ctor/mat3x2/explicit/vectors/f32.wgsl.expected.msl
@@ -2,3 +2,4 @@
 
 using namespace metal;
 constant float3x2 m = float3x2(float2(0.0f, 1.0f), float2(2.0f, 3.0f), float2(4.0f, 5.0f));
+
diff --git a/test/expressions/type_ctor/mat3x2/inferred/scalars/f32.wgsl.expected.msl b/test/expressions/type_ctor/mat3x2/inferred/scalars/f32.wgsl.expected.msl
index 04aad8e324..ae7f33c2da 100644
--- a/test/expressions/type_ctor/mat3x2/inferred/scalars/f32.wgsl.expected.msl
+++ b/test/expressions/type_ctor/mat3x2/inferred/scalars/f32.wgsl.expected.msl
@@ -2,3 +2,4 @@
 
 using namespace metal;
 constant float3x2 m = float3x2(float2(0.0f, 1.0f), float2(2.0f, 3.0f), float2(4.0f, 5.0f));
+
diff --git a/test/expressions/type_ctor/mat3x2/inferred/vectors/f32.wgsl.expected.msl b/test/expressions/type_ctor/mat3x2/inferred/vectors/f32.wgsl.expected.msl
index 04aad8e324..ae7f33c2da 100644
--- a/test/expressions/type_ctor/mat3x2/inferred/vectors/f32.wgsl.expected.msl
+++ b/test/expressions/type_ctor/mat3x2/inferred/vectors/f32.wgsl.expected.msl
@@ -2,3 +2,4 @@
 
 using namespace metal;
 constant float3x2 m = float3x2(float2(0.0f, 1.0f), float2(2.0f, 3.0f), float2(4.0f, 5.0f));
+
diff --git a/test/expressions/type_ctor/mat3x3/explicit/scalars/f32.wgsl.expected.msl b/test/expressions/type_ctor/mat3x3/explicit/scalars/f32.wgsl.expected.msl
index c8c096ac44..2635df5e2e 100644
--- a/test/expressions/type_ctor/mat3x3/explicit/scalars/f32.wgsl.expected.msl
+++ b/test/expressions/type_ctor/mat3x3/explicit/scalars/f32.wgsl.expected.msl
@@ -2,3 +2,4 @@
 
 using namespace metal;
 constant float3x3 m = float3x3(float3(0.0f, 1.0f, 2.0f), float3(3.0f, 4.0f, 5.0f), float3(6.0f, 7.0f, 8.0f));
+
diff --git a/test/expressions/type_ctor/mat3x3/explicit/vectors/f32.wgsl.expected.msl b/test/expressions/type_ctor/mat3x3/explicit/vectors/f32.wgsl.expected.msl
index c8c096ac44..2635df5e2e 100644
--- a/test/expressions/type_ctor/mat3x3/explicit/vectors/f32.wgsl.expected.msl
+++ b/test/expressions/type_ctor/mat3x3/explicit/vectors/f32.wgsl.expected.msl
@@ -2,3 +2,4 @@
 
 using namespace metal;
 constant float3x3 m = float3x3(float3(0.0f, 1.0f, 2.0f), float3(3.0f, 4.0f, 5.0f), float3(6.0f, 7.0f, 8.0f));
+
diff --git a/test/expressions/type_ctor/mat3x3/inferred/scalars/f32.wgsl.expected.msl b/test/expressions/type_ctor/mat3x3/inferred/scalars/f32.wgsl.expected.msl
index c8c096ac44..2635df5e2e 100644
--- a/test/expressions/type_ctor/mat3x3/inferred/scalars/f32.wgsl.expected.msl
+++ b/test/expressions/type_ctor/mat3x3/inferred/scalars/f32.wgsl.expected.msl
@@ -2,3 +2,4 @@
 
 using namespace metal;
 constant float3x3 m = float3x3(float3(0.0f, 1.0f, 2.0f), float3(3.0f, 4.0f, 5.0f), float3(6.0f, 7.0f, 8.0f));
+
diff --git a/test/expressions/type_ctor/mat3x3/inferred/vectors/f32.wgsl.expected.msl b/test/expressions/type_ctor/mat3x3/inferred/vectors/f32.wgsl.expected.msl
index c8c096ac44..2635df5e2e 100644
--- a/test/expressions/type_ctor/mat3x3/inferred/vectors/f32.wgsl.expected.msl
+++ b/test/expressions/type_ctor/mat3x3/inferred/vectors/f32.wgsl.expected.msl
@@ -2,3 +2,4 @@
 
 using namespace metal;
 constant float3x3 m = float3x3(float3(0.0f, 1.0f, 2.0f), float3(3.0f, 4.0f, 5.0f), float3(6.0f, 7.0f, 8.0f));
+
diff --git a/test/expressions/type_ctor/mat3x4/explicit/scalars/f32.wgsl.expected.msl b/test/expressions/type_ctor/mat3x4/explicit/scalars/f32.wgsl.expected.msl
index 114cb09a09..3608220014 100644
--- a/test/expressions/type_ctor/mat3x4/explicit/scalars/f32.wgsl.expected.msl
+++ b/test/expressions/type_ctor/mat3x4/explicit/scalars/f32.wgsl.expected.msl
@@ -2,3 +2,4 @@
 
 using namespace metal;
 constant float3x4 m = float3x4(float4(0.0f, 1.0f, 2.0f, 3.0f), float4(4.0f, 5.0f, 6.0f, 7.0f), float4(8.0f, 9.0f, 10.0f, 11.0f));
+
diff --git a/test/expressions/type_ctor/mat3x4/explicit/vectors/f32.wgsl.expected.msl b/test/expressions/type_ctor/mat3x4/explicit/vectors/f32.wgsl.expected.msl
index 114cb09a09..3608220014 100644
--- a/test/expressions/type_ctor/mat3x4/explicit/vectors/f32.wgsl.expected.msl
+++ b/test/expressions/type_ctor/mat3x4/explicit/vectors/f32.wgsl.expected.msl
@@ -2,3 +2,4 @@
 
 using namespace metal;
 constant float3x4 m = float3x4(float4(0.0f, 1.0f, 2.0f, 3.0f), float4(4.0f, 5.0f, 6.0f, 7.0f), float4(8.0f, 9.0f, 10.0f, 11.0f));
+
diff --git a/test/expressions/type_ctor/mat3x4/inferred/scalars/f32.wgsl.expected.msl b/test/expressions/type_ctor/mat3x4/inferred/scalars/f32.wgsl.expected.msl
index 114cb09a09..3608220014 100644
--- a/test/expressions/type_ctor/mat3x4/inferred/scalars/f32.wgsl.expected.msl
+++ b/test/expressions/type_ctor/mat3x4/inferred/scalars/f32.wgsl.expected.msl
@@ -2,3 +2,4 @@
 
 using namespace metal;
 constant float3x4 m = float3x4(float4(0.0f, 1.0f, 2.0f, 3.0f), float4(4.0f, 5.0f, 6.0f, 7.0f), float4(8.0f, 9.0f, 10.0f, 11.0f));
+
diff --git a/test/expressions/type_ctor/mat3x4/inferred/vectors/f32.wgsl.expected.msl b/test/expressions/type_ctor/mat3x4/inferred/vectors/f32.wgsl.expected.msl
index 114cb09a09..3608220014 100644
--- a/test/expressions/type_ctor/mat3x4/inferred/vectors/f32.wgsl.expected.msl
+++ b/test/expressions/type_ctor/mat3x4/inferred/vectors/f32.wgsl.expected.msl
@@ -2,3 +2,4 @@
 
 using namespace metal;
 constant float3x4 m = float3x4(float4(0.0f, 1.0f, 2.0f, 3.0f), float4(4.0f, 5.0f, 6.0f, 7.0f), float4(8.0f, 9.0f, 10.0f, 11.0f));
+
diff --git a/test/expressions/type_ctor/mat4x2/explicit/scalars/f32.wgsl.expected.msl b/test/expressions/type_ctor/mat4x2/explicit/scalars/f32.wgsl.expected.msl
index 0df65ff38a..0597230800 100644
--- a/test/expressions/type_ctor/mat4x2/explicit/scalars/f32.wgsl.expected.msl
+++ b/test/expressions/type_ctor/mat4x2/explicit/scalars/f32.wgsl.expected.msl
@@ -2,3 +2,4 @@
 
 using namespace metal;
 constant float4x2 m = float4x2(float2(0.0f, 1.0f), float2(2.0f, 3.0f), float2(4.0f, 5.0f), float2(6.0f, 7.0f));
+
diff --git a/test/expressions/type_ctor/mat4x2/explicit/vectors/f32.wgsl.expected.msl b/test/expressions/type_ctor/mat4x2/explicit/vectors/f32.wgsl.expected.msl
index 0df65ff38a..0597230800 100644
--- a/test/expressions/type_ctor/mat4x2/explicit/vectors/f32.wgsl.expected.msl
+++ b/test/expressions/type_ctor/mat4x2/explicit/vectors/f32.wgsl.expected.msl
@@ -2,3 +2,4 @@
 
 using namespace metal;
 constant float4x2 m = float4x2(float2(0.0f, 1.0f), float2(2.0f, 3.0f), float2(4.0f, 5.0f), float2(6.0f, 7.0f));
+
diff --git a/test/expressions/type_ctor/mat4x2/inferred/scalars/f32.wgsl.expected.msl b/test/expressions/type_ctor/mat4x2/inferred/scalars/f32.wgsl.expected.msl
index 0df65ff38a..0597230800 100644
--- a/test/expressions/type_ctor/mat4x2/inferred/scalars/f32.wgsl.expected.msl
+++ b/test/expressions/type_ctor/mat4x2/inferred/scalars/f32.wgsl.expected.msl
@@ -2,3 +2,4 @@
 
 using namespace metal;
 constant float4x2 m = float4x2(float2(0.0f, 1.0f), float2(2.0f, 3.0f), float2(4.0f, 5.0f), float2(6.0f, 7.0f));
+
diff --git a/test/expressions/type_ctor/mat4x2/inferred/vectors/f32.wgsl.expected.msl b/test/expressions/type_ctor/mat4x2/inferred/vectors/f32.wgsl.expected.msl
index 0df65ff38a..0597230800 100644
--- a/test/expressions/type_ctor/mat4x2/inferred/vectors/f32.wgsl.expected.msl
+++ b/test/expressions/type_ctor/mat4x2/inferred/vectors/f32.wgsl.expected.msl
@@ -2,3 +2,4 @@
 
 using namespace metal;
 constant float4x2 m = float4x2(float2(0.0f, 1.0f), float2(2.0f, 3.0f), float2(4.0f, 5.0f), float2(6.0f, 7.0f));
+
diff --git a/test/expressions/type_ctor/mat4x3/explicit/scalars/f32.wgsl.expected.msl b/test/expressions/type_ctor/mat4x3/explicit/scalars/f32.wgsl.expected.msl
index 2a7c078a3a..d935650860 100644
--- a/test/expressions/type_ctor/mat4x3/explicit/scalars/f32.wgsl.expected.msl
+++ b/test/expressions/type_ctor/mat4x3/explicit/scalars/f32.wgsl.expected.msl
@@ -2,3 +2,4 @@
 
 using namespace metal;
 constant float4x3 m = float4x3(float3(0.0f, 1.0f, 2.0f), float3(3.0f, 4.0f, 5.0f), float3(6.0f, 7.0f, 8.0f), float3(9.0f, 10.0f, 11.0f));
+
diff --git a/test/expressions/type_ctor/mat4x3/explicit/vectors/f32.wgsl.expected.msl b/test/expressions/type_ctor/mat4x3/explicit/vectors/f32.wgsl.expected.msl
index 2a7c078a3a..d935650860 100644
--- a/test/expressions/type_ctor/mat4x3/explicit/vectors/f32.wgsl.expected.msl
+++ b/test/expressions/type_ctor/mat4x3/explicit/vectors/f32.wgsl.expected.msl
@@ -2,3 +2,4 @@
 
 using namespace metal;
 constant float4x3 m = float4x3(float3(0.0f, 1.0f, 2.0f), float3(3.0f, 4.0f, 5.0f), float3(6.0f, 7.0f, 8.0f), float3(9.0f, 10.0f, 11.0f));
+
diff --git a/test/expressions/type_ctor/mat4x3/inferred/scalars/f32.wgsl.expected.msl b/test/expressions/type_ctor/mat4x3/inferred/scalars/f32.wgsl.expected.msl
index 2a7c078a3a..d935650860 100644
--- a/test/expressions/type_ctor/mat4x3/inferred/scalars/f32.wgsl.expected.msl
+++ b/test/expressions/type_ctor/mat4x3/inferred/scalars/f32.wgsl.expected.msl
@@ -2,3 +2,4 @@
 
 using namespace metal;
 constant float4x3 m = float4x3(float3(0.0f, 1.0f, 2.0f), float3(3.0f, 4.0f, 5.0f), float3(6.0f, 7.0f, 8.0f), float3(9.0f, 10.0f, 11.0f));
+
diff --git a/test/expressions/type_ctor/mat4x3/inferred/vectors/f32.wgsl.expected.msl b/test/expressions/type_ctor/mat4x3/inferred/vectors/f32.wgsl.expected.msl
index 2a7c078a3a..d935650860 100644
--- a/test/expressions/type_ctor/mat4x3/inferred/vectors/f32.wgsl.expected.msl
+++ b/test/expressions/type_ctor/mat4x3/inferred/vectors/f32.wgsl.expected.msl
@@ -2,3 +2,4 @@
 
 using namespace metal;
 constant float4x3 m = float4x3(float3(0.0f, 1.0f, 2.0f), float3(3.0f, 4.0f, 5.0f), float3(6.0f, 7.0f, 8.0f), float3(9.0f, 10.0f, 11.0f));
+
diff --git a/test/expressions/type_ctor/mat4x4/explicit/scalars/f32.wgsl.expected.msl b/test/expressions/type_ctor/mat4x4/explicit/scalars/f32.wgsl.expected.msl
index 6fb51a25b9..053e23dbe9 100644
--- a/test/expressions/type_ctor/mat4x4/explicit/scalars/f32.wgsl.expected.msl
+++ b/test/expressions/type_ctor/mat4x4/explicit/scalars/f32.wgsl.expected.msl
@@ -2,3 +2,4 @@
 
 using namespace metal;
 constant float4x4 m = float4x4(float4(0.0f, 1.0f, 2.0f, 3.0f), float4(4.0f, 5.0f, 6.0f, 7.0f), float4(8.0f, 9.0f, 10.0f, 11.0f), float4(12.0f, 13.0f, 14.0f, 15.0f));
+
diff --git a/test/expressions/type_ctor/mat4x4/explicit/vectors/f32.wgsl.expected.msl b/test/expressions/type_ctor/mat4x4/explicit/vectors/f32.wgsl.expected.msl
index 6fb51a25b9..053e23dbe9 100644
--- a/test/expressions/type_ctor/mat4x4/explicit/vectors/f32.wgsl.expected.msl
+++ b/test/expressions/type_ctor/mat4x4/explicit/vectors/f32.wgsl.expected.msl
@@ -2,3 +2,4 @@
 
 using namespace metal;
 constant float4x4 m = float4x4(float4(0.0f, 1.0f, 2.0f, 3.0f), float4(4.0f, 5.0f, 6.0f, 7.0f), float4(8.0f, 9.0f, 10.0f, 11.0f), float4(12.0f, 13.0f, 14.0f, 15.0f));
+
diff --git a/test/expressions/type_ctor/mat4x4/inferred/scalars/f32.wgsl.expected.msl b/test/expressions/type_ctor/mat4x4/inferred/scalars/f32.wgsl.expected.msl
index 6fb51a25b9..053e23dbe9 100644
--- a/test/expressions/type_ctor/mat4x4/inferred/scalars/f32.wgsl.expected.msl
+++ b/test/expressions/type_ctor/mat4x4/inferred/scalars/f32.wgsl.expected.msl
@@ -2,3 +2,4 @@
 
 using namespace metal;
 constant float4x4 m = float4x4(float4(0.0f, 1.0f, 2.0f, 3.0f), float4(4.0f, 5.0f, 6.0f, 7.0f), float4(8.0f, 9.0f, 10.0f, 11.0f), float4(12.0f, 13.0f, 14.0f, 15.0f));
+
diff --git a/test/expressions/type_ctor/mat4x4/inferred/vectors/f32.wgsl.expected.msl b/test/expressions/type_ctor/mat4x4/inferred/vectors/f32.wgsl.expected.msl
index 6fb51a25b9..053e23dbe9 100644
--- a/test/expressions/type_ctor/mat4x4/inferred/vectors/f32.wgsl.expected.msl
+++ b/test/expressions/type_ctor/mat4x4/inferred/vectors/f32.wgsl.expected.msl
@@ -2,3 +2,4 @@
 
 using namespace metal;
 constant float4x4 m = float4x4(float4(0.0f, 1.0f, 2.0f, 3.0f), float4(4.0f, 5.0f, 6.0f, 7.0f), float4(8.0f, 9.0f, 10.0f, 11.0f), float4(12.0f, 13.0f, 14.0f, 15.0f));
+
diff --git a/test/expressions/type_ctor/vec2/explicit/bool.wgsl.expected.msl b/test/expressions/type_ctor/vec2/explicit/bool.wgsl.expected.msl
index 3103a854a9..15bd21b7a2 100644
--- a/test/expressions/type_ctor/vec2/explicit/bool.wgsl.expected.msl
+++ b/test/expressions/type_ctor/vec2/explicit/bool.wgsl.expected.msl
@@ -2,3 +2,4 @@
 
 using namespace metal;
 constant bool2 v = bool2(false, true);
+
diff --git a/test/expressions/type_ctor/vec2/explicit/f32.wgsl.expected.msl b/test/expressions/type_ctor/vec2/explicit/f32.wgsl.expected.msl
index 6e66829b23..f343a2593e 100644
--- a/test/expressions/type_ctor/vec2/explicit/f32.wgsl.expected.msl
+++ b/test/expressions/type_ctor/vec2/explicit/f32.wgsl.expected.msl
@@ -2,3 +2,4 @@
 
 using namespace metal;
 constant float2 v = float2(0.0f, 1.0f);
+
diff --git a/test/expressions/type_ctor/vec2/explicit/i32.wgsl.expected.msl b/test/expressions/type_ctor/vec2/explicit/i32.wgsl.expected.msl
index 2a0fc8d484..af85d231cc 100644
--- a/test/expressions/type_ctor/vec2/explicit/i32.wgsl.expected.msl
+++ b/test/expressions/type_ctor/vec2/explicit/i32.wgsl.expected.msl
@@ -2,3 +2,4 @@
 
 using namespace metal;
 constant int2 v = int2(0, 1);
+
diff --git a/test/expressions/type_ctor/vec2/explicit/u32.wgsl.expected.msl b/test/expressions/type_ctor/vec2/explicit/u32.wgsl.expected.msl
index 132ee56d08..764c49a343 100644
--- a/test/expressions/type_ctor/vec2/explicit/u32.wgsl.expected.msl
+++ b/test/expressions/type_ctor/vec2/explicit/u32.wgsl.expected.msl
@@ -2,3 +2,4 @@
 
 using namespace metal;
 constant uint2 v = uint2(0u, 1u);
+
diff --git a/test/expressions/type_ctor/vec2/inferred/bool.wgsl.expected.msl b/test/expressions/type_ctor/vec2/inferred/bool.wgsl.expected.msl
index 3103a854a9..15bd21b7a2 100644
--- a/test/expressions/type_ctor/vec2/inferred/bool.wgsl.expected.msl
+++ b/test/expressions/type_ctor/vec2/inferred/bool.wgsl.expected.msl
@@ -2,3 +2,4 @@
 
 using namespace metal;
 constant bool2 v = bool2(false, true);
+
diff --git a/test/expressions/type_ctor/vec2/inferred/f32.wgsl.expected.msl b/test/expressions/type_ctor/vec2/inferred/f32.wgsl.expected.msl
index 6e66829b23..f343a2593e 100644
--- a/test/expressions/type_ctor/vec2/inferred/f32.wgsl.expected.msl
+++ b/test/expressions/type_ctor/vec2/inferred/f32.wgsl.expected.msl
@@ -2,3 +2,4 @@
 
 using namespace metal;
 constant float2 v = float2(0.0f, 1.0f);
+
diff --git a/test/expressions/type_ctor/vec2/inferred/i32.wgsl.expected.msl b/test/expressions/type_ctor/vec2/inferred/i32.wgsl.expected.msl
index 2a0fc8d484..af85d231cc 100644
--- a/test/expressions/type_ctor/vec2/inferred/i32.wgsl.expected.msl
+++ b/test/expressions/type_ctor/vec2/inferred/i32.wgsl.expected.msl
@@ -2,3 +2,4 @@
 
 using namespace metal;
 constant int2 v = int2(0, 1);
+
diff --git a/test/expressions/type_ctor/vec2/inferred/u32.wgsl.expected.msl b/test/expressions/type_ctor/vec2/inferred/u32.wgsl.expected.msl
index 132ee56d08..764c49a343 100644
--- a/test/expressions/type_ctor/vec2/inferred/u32.wgsl.expected.msl
+++ b/test/expressions/type_ctor/vec2/inferred/u32.wgsl.expected.msl
@@ -2,3 +2,4 @@
 
 using namespace metal;
 constant uint2 v = uint2(0u, 1u);
+
diff --git a/test/expressions/type_ctor/vec3/explicit/bool.wgsl.expected.msl b/test/expressions/type_ctor/vec3/explicit/bool.wgsl.expected.msl
index 5393cb3292..0cd9b5b483 100644
--- a/test/expressions/type_ctor/vec3/explicit/bool.wgsl.expected.msl
+++ b/test/expressions/type_ctor/vec3/explicit/bool.wgsl.expected.msl
@@ -2,3 +2,4 @@
 
 using namespace metal;
 constant bool3 v = bool3(false, true, false);
+
diff --git a/test/expressions/type_ctor/vec3/explicit/f32.wgsl.expected.msl b/test/expressions/type_ctor/vec3/explicit/f32.wgsl.expected.msl
index 6b8d4ff82f..b0b245a391 100644
--- a/test/expressions/type_ctor/vec3/explicit/f32.wgsl.expected.msl
+++ b/test/expressions/type_ctor/vec3/explicit/f32.wgsl.expected.msl
@@ -2,3 +2,4 @@
 
 using namespace metal;
 constant float3 v = float3(0.0f, 1.0f, 2.0f);
+
diff --git a/test/expressions/type_ctor/vec3/explicit/i32.wgsl.expected.msl b/test/expressions/type_ctor/vec3/explicit/i32.wgsl.expected.msl
index 941501eccc..63fbce8f89 100644
--- a/test/expressions/type_ctor/vec3/explicit/i32.wgsl.expected.msl
+++ b/test/expressions/type_ctor/vec3/explicit/i32.wgsl.expected.msl
@@ -2,3 +2,4 @@
 
 using namespace metal;
 constant int3 v = int3(0, 1, 2);
+
diff --git a/test/expressions/type_ctor/vec3/explicit/u32.wgsl.expected.msl b/test/expressions/type_ctor/vec3/explicit/u32.wgsl.expected.msl
index d2a07cfd47..6090ecfdc8 100644
--- a/test/expressions/type_ctor/vec3/explicit/u32.wgsl.expected.msl
+++ b/test/expressions/type_ctor/vec3/explicit/u32.wgsl.expected.msl
@@ -2,3 +2,4 @@
 
 using namespace metal;
 constant uint3 v = uint3(0u, 1u, 2u);
+
diff --git a/test/expressions/type_ctor/vec4/explicit/bool.wgsl.expected.msl b/test/expressions/type_ctor/vec4/explicit/bool.wgsl.expected.msl
index 2d872de6d3..840b113e49 100644
--- a/test/expressions/type_ctor/vec4/explicit/bool.wgsl.expected.msl
+++ b/test/expressions/type_ctor/vec4/explicit/bool.wgsl.expected.msl
@@ -2,3 +2,4 @@
 
 using namespace metal;
 constant bool4 v = bool4(false, true, false, true);
+
diff --git a/test/expressions/type_ctor/vec4/explicit/f32.wgsl.expected.msl b/test/expressions/type_ctor/vec4/explicit/f32.wgsl.expected.msl
index 08af7257e3..568e746ed8 100644
--- a/test/expressions/type_ctor/vec4/explicit/f32.wgsl.expected.msl
+++ b/test/expressions/type_ctor/vec4/explicit/f32.wgsl.expected.msl
@@ -2,3 +2,4 @@
 
 using namespace metal;
 constant float4 v = float4(0.0f, 1.0f, 2.0f, 3.0f);
+
diff --git a/test/expressions/type_ctor/vec4/explicit/i32.wgsl.expected.msl b/test/expressions/type_ctor/vec4/explicit/i32.wgsl.expected.msl
index b4294a3d41..f00d2ebbd7 100644
--- a/test/expressions/type_ctor/vec4/explicit/i32.wgsl.expected.msl
+++ b/test/expressions/type_ctor/vec4/explicit/i32.wgsl.expected.msl
@@ -2,3 +2,4 @@
 
 using namespace metal;
 constant int4 v = int4(0, 1, 2, 3);
+
diff --git a/test/expressions/type_ctor/vec4/explicit/u32.wgsl.expected.msl b/test/expressions/type_ctor/vec4/explicit/u32.wgsl.expected.msl
index c51f246ed9..83695b894d 100644
--- a/test/expressions/type_ctor/vec4/explicit/u32.wgsl.expected.msl
+++ b/test/expressions/type_ctor/vec4/explicit/u32.wgsl.expected.msl
@@ -2,3 +2,4 @@
 
 using namespace metal;
 constant uint4 v = uint4(0u, 1u, 2u, 3u);
+
diff --git a/test/expressions/zero_init/array/struct.wgsl.expected.msl b/test/expressions/zero_init/array/struct.wgsl.expected.msl
index 8dc9f2e750..79d7fd70d9 100644
--- a/test/expressions/zero_init/array/struct.wgsl.expected.msl
+++ b/test/expressions/zero_init/array/struct.wgsl.expected.msl
@@ -7,6 +7,7 @@ struct S {
   float f;
   bool b;
 };
+
 struct tint_array_wrapper {
   S arr[4];
 };
diff --git a/test/expressions/zero_init/struct/array.wgsl.expected.msl b/test/expressions/zero_init/struct/array.wgsl.expected.msl
index 61b9dc1c92..260053689d 100644
--- a/test/expressions/zero_init/struct/array.wgsl.expected.msl
+++ b/test/expressions/zero_init/struct/array.wgsl.expected.msl
@@ -4,6 +4,7 @@ using namespace metal;
 struct tint_array_wrapper {
   float arr[4];
 };
+
 struct S {
   tint_array_wrapper a;
 };
diff --git a/test/identifiers/underscore/double/alias.wgsl.expected.msl b/test/identifiers/underscore/double/alias.wgsl.expected.msl
index 7e91cf7b58..cdb6bd93c5 100644
--- a/test/identifiers/underscore/double/alias.wgsl.expected.msl
+++ b/test/identifiers/underscore/double/alias.wgsl.expected.msl
@@ -1,7 +1,6 @@
 #include <metal_stdlib>
 
 using namespace metal;
-
 void f() {
   int c = 0;
   int d = 0;
diff --git a/test/identifiers/underscore/double/let.wgsl.expected.msl b/test/identifiers/underscore/double/let.wgsl.expected.msl
index af5a2362a7..47c1b05685 100644
--- a/test/identifiers/underscore/double/let.wgsl.expected.msl
+++ b/test/identifiers/underscore/double/let.wgsl.expected.msl
@@ -2,7 +2,9 @@
 
 using namespace metal;
 constant int a = 1;
+
 constant int a__ = 2;
+
 void f() {
   int const b = a;
   int const b__ = a__;
diff --git a/test/identifiers/underscore/double/struct.wgsl.expected.msl b/test/identifiers/underscore/double/struct.wgsl.expected.msl
index 2389d0e111..0b38868282 100644
--- a/test/identifiers/underscore/double/struct.wgsl.expected.msl
+++ b/test/identifiers/underscore/double/struct.wgsl.expected.msl
@@ -4,6 +4,7 @@ using namespace metal;
 struct a {
   int b;
 };
+
 struct a__ {
   int b__;
 };
diff --git a/test/identifiers/underscore/prefix/lower/alias.wgsl.expected.msl b/test/identifiers/underscore/prefix/lower/alias.wgsl.expected.msl
index 7e91cf7b58..cdb6bd93c5 100644
--- a/test/identifiers/underscore/prefix/lower/alias.wgsl.expected.msl
+++ b/test/identifiers/underscore/prefix/lower/alias.wgsl.expected.msl
@@ -1,7 +1,6 @@
 #include <metal_stdlib>
 
 using namespace metal;
-
 void f() {
   int c = 0;
   int d = 0;
diff --git a/test/identifiers/underscore/prefix/lower/let.wgsl.expected.msl b/test/identifiers/underscore/prefix/lower/let.wgsl.expected.msl
index 555cfd156d..7b3d669476 100644
--- a/test/identifiers/underscore/prefix/lower/let.wgsl.expected.msl
+++ b/test/identifiers/underscore/prefix/lower/let.wgsl.expected.msl
@@ -2,7 +2,9 @@
 
 using namespace metal;
 constant int a = 1;
+
 constant int _a = 2;
+
 void f() {
   int const b = a;
   int const _b = _a;
diff --git a/test/identifiers/underscore/prefix/lower/struct.wgsl.expected.msl b/test/identifiers/underscore/prefix/lower/struct.wgsl.expected.msl
index 32bffa1170..72759ea544 100644
--- a/test/identifiers/underscore/prefix/lower/struct.wgsl.expected.msl
+++ b/test/identifiers/underscore/prefix/lower/struct.wgsl.expected.msl
@@ -4,6 +4,7 @@ using namespace metal;
 struct a {
   int b;
 };
+
 struct _a {
   int _b;
 };
diff --git a/test/identifiers/underscore/prefix/upper/alias.wgsl.expected.msl b/test/identifiers/underscore/prefix/upper/alias.wgsl.expected.msl
index 7e91cf7b58..cdb6bd93c5 100644
--- a/test/identifiers/underscore/prefix/upper/alias.wgsl.expected.msl
+++ b/test/identifiers/underscore/prefix/upper/alias.wgsl.expected.msl
@@ -1,7 +1,6 @@
 #include <metal_stdlib>
 
 using namespace metal;
-
 void f() {
   int c = 0;
   int d = 0;
diff --git a/test/identifiers/underscore/prefix/upper/let.wgsl.expected.msl b/test/identifiers/underscore/prefix/upper/let.wgsl.expected.msl
index e1af5ac41e..5afe76fb2b 100644
--- a/test/identifiers/underscore/prefix/upper/let.wgsl.expected.msl
+++ b/test/identifiers/underscore/prefix/upper/let.wgsl.expected.msl
@@ -2,7 +2,9 @@
 
 using namespace metal;
 constant int A = 1;
+
 constant int _A = 2;
+
 void f() {
   int const B = A;
   int const _B = _A;
diff --git a/test/identifiers/underscore/prefix/upper/struct.wgsl.expected.msl b/test/identifiers/underscore/prefix/upper/struct.wgsl.expected.msl
index bafed70c8a..cc20aac0d5 100644
--- a/test/identifiers/underscore/prefix/upper/struct.wgsl.expected.msl
+++ b/test/identifiers/underscore/prefix/upper/struct.wgsl.expected.msl
@@ -4,6 +4,7 @@ using namespace metal;
 struct A {
   int B;
 };
+
 struct _A {
   int _B;
 };
diff --git a/test/layout/storage/mat2x2/stride/16.spvasm.expected.msl b/test/layout/storage/mat2x2/stride/16.spvasm.expected.msl
index 6a0ca3e1cd..9454d471dc 100644
--- a/test/layout/storage/mat2x2/stride/16.spvasm.expected.msl
+++ b/test/layout/storage/mat2x2/stride/16.spvasm.expected.msl
@@ -5,9 +5,11 @@ struct strided_arr {
   /* 0x0000 */ float2 el;
   /* 0x0008 */ int8_t tint_pad[8];
 };
+
 struct tint_array_wrapper {
   /* 0x0000 */ strided_arr arr[2];
 };
+
 struct SSBO {
   /* 0x0000 */ tint_array_wrapper m;
 };
diff --git a/test/let/global/global.wgsl.expected.msl b/test/let/global/global.wgsl.expected.msl
index 2a9302bb31..d5efc4eda1 100644
--- a/test/let/global/global.wgsl.expected.msl
+++ b/test/let/global/global.wgsl.expected.msl
@@ -4,22 +4,33 @@ using namespace metal;
 struct MyStruct {
   float f1;
 };
+
 struct tint_array_wrapper {
   float arr[10];
 };
+
+constant int v1 = 1;
+
+constant uint v2 = 1u;
+
+constant float v3 = 1.0f;
+
+constant int3 v4 = int3(1, 1, 1);
+
+constant uint3 v5 = uint3(1u, 1u, 1u);
+
+constant float3 v6 = float3(1.0f, 1.0f, 1.0f);
+
+constant float3x3 v7 = float3x3(float3(1.0f, 1.0f, 1.0f), float3(1.0f, 1.0f, 1.0f), float3(1.0f, 1.0f, 1.0f));
+
+constant MyStruct v8 = {};
+
+constant tint_array_wrapper v9 = {.arr={}};
+
 struct tint_symbol_1 {
   float4 value [[color(0)]];
 };
 
-constant int v1 = 1;
-constant uint v2 = 1u;
-constant float v3 = 1.0f;
-constant int3 v4 = int3(1, 1, 1);
-constant uint3 v5 = uint3(1u, 1u, 1u);
-constant float3 v6 = float3(1.0f, 1.0f, 1.0f);
-constant float3x3 v7 = float3x3(float3(1.0f, 1.0f, 1.0f), float3(1.0f, 1.0f, 1.0f), float3(1.0f, 1.0f, 1.0f));
-constant MyStruct v8 = {};
-constant tint_array_wrapper v9 = {.arr={}};
 float4 tint_symbol_inner() {
   return float4(0.0f, 0.0f, 0.0f, 0.0f);
 }
diff --git a/test/let/inferred/function.wgsl.expected.msl b/test/let/inferred/function.wgsl.expected.msl
index 9de5eafc2b..6a699b5f81 100644
--- a/test/let/inferred/function.wgsl.expected.msl
+++ b/test/let/inferred/function.wgsl.expected.msl
@@ -4,12 +4,10 @@ using namespace metal;
 struct MyStruct {
   float f1;
 };
+
 struct tint_array_wrapper {
   float arr[10];
 };
-struct tint_symbol_1 {
-  float4 value [[color(0)]];
-};
 
 int ret_i32() {
   return 1;
@@ -51,6 +49,10 @@ void let_decls() {
   tint_array_wrapper const v15 = ret_MyArray();
 }
 
+struct tint_symbol_1 {
+  float4 value [[color(0)]];
+};
+
 float4 tint_symbol_inner() {
   return float4(0.0f, 0.0f, 0.0f, 0.0f);
 }
diff --git a/test/samples/compute_boids.wgsl.expected.msl b/test/samples/compute_boids.wgsl.expected.msl
index e0fde9b347..399bdf38c2 100644
--- a/test/samples/compute_boids.wgsl.expected.msl
+++ b/test/samples/compute_boids.wgsl.expected.msl
@@ -6,31 +6,10 @@ struct tint_symbol_1 {
   float2 a_particleVel [[attribute(1)]];
   float2 a_pos [[attribute(2)]];
 };
+
 struct tint_symbol_2 {
   float4 value [[position]];
 };
-struct tint_symbol_3 {
-  float4 value [[color(0)]];
-};
-struct Particle {
-  /* 0x0000 */ float2 pos;
-  /* 0x0008 */ float2 vel;
-};
-struct SimParams {
-  /* 0x0000 */ float deltaT;
-  /* 0x0004 */ float rule1Distance;
-  /* 0x0008 */ float rule2Distance;
-  /* 0x000c */ float rule3Distance;
-  /* 0x0010 */ float rule1Scale;
-  /* 0x0014 */ float rule2Scale;
-  /* 0x0018 */ float rule3Scale;
-};
-struct tint_array_wrapper {
-  /* 0x0000 */ Particle arr[5];
-};
-struct Particles {
-  /* 0x0000 */ tint_array_wrapper particles;
-};
 
 float4 vert_main_inner(float2 a_particlePos, float2 a_particleVel, float2 a_pos) {
   float angle = -(atan2(a_particleVel[0], a_particleVel[1]));
@@ -45,6 +24,10 @@ vertex tint_symbol_2 vert_main(tint_symbol_1 tint_symbol [[stage_in]]) {
   return wrapper_result;
 }
 
+struct tint_symbol_3 {
+  float4 value [[color(0)]];
+};
+
 float4 frag_main_inner() {
   return float4(1.0f, 1.0f, 1.0f, 1.0f);
 }
@@ -56,6 +39,29 @@ fragment tint_symbol_3 frag_main() {
   return wrapper_result_1;
 }
 
+struct Particle {
+  /* 0x0000 */ float2 pos;
+  /* 0x0008 */ float2 vel;
+};
+
+struct SimParams {
+  /* 0x0000 */ float deltaT;
+  /* 0x0004 */ float rule1Distance;
+  /* 0x0008 */ float rule2Distance;
+  /* 0x000c */ float rule3Distance;
+  /* 0x0010 */ float rule1Scale;
+  /* 0x0014 */ float rule2Scale;
+  /* 0x0018 */ float rule3Scale;
+};
+
+struct tint_array_wrapper {
+  /* 0x0000 */ Particle arr[5];
+};
+
+struct Particles {
+  /* 0x0000 */ tint_array_wrapper particles;
+};
+
 void comp_main_inner(uint3 gl_GlobalInvocationID, device Particles* const tint_symbol_4, const constant SimParams* const tint_symbol_5, device Particles* const tint_symbol_6) {
   uint index = gl_GlobalInvocationID[0];
   if ((index >= 5u)) {
diff --git a/test/samples/cube.wgsl.expected.msl b/test/samples/cube.wgsl.expected.msl
index bcf2f8a23e..e5cbb88598 100644
--- a/test/samples/cube.wgsl.expected.msl
+++ b/test/samples/cube.wgsl.expected.msl
@@ -4,28 +4,26 @@ using namespace metal;
 struct Uniforms {
   /* 0x0000 */ float4x4 modelViewProjectionMatrix;
 };
+
 struct VertexInput {
   float4 cur_position;
   float4 color;
 };
+
 struct VertexOutput {
   float4 vtxFragColor;
   float4 Position;
 };
+
 struct tint_symbol_1 {
   float4 cur_position [[attribute(0)]];
   float4 color [[attribute(1)]];
 };
+
 struct tint_symbol_2 {
   float4 vtxFragColor [[user(locn0)]];
   float4 Position [[position]];
 };
-struct tint_symbol_4 {
-  float4 fragColor [[user(locn0)]];
-};
-struct tint_symbol_5 {
-  float4 value [[color(0)]];
-};
 
 VertexOutput vtx_main_inner(VertexInput input, const constant Uniforms* const tint_symbol_7) {
   VertexOutput output = {};
@@ -43,6 +41,14 @@ vertex tint_symbol_2 vtx_main(const constant Uniforms* tint_symbol_8 [[buffer(0)
   return wrapper_result;
 }
 
+struct tint_symbol_4 {
+  float4 fragColor [[user(locn0)]];
+};
+
+struct tint_symbol_5 {
+  float4 value [[color(0)]];
+};
+
 float4 frag_main_inner(float4 fragColor) {
   return fragColor;
 }
diff --git a/test/samples/simple.wgsl.expected.msl b/test/samples/simple.wgsl.expected.msl
index 2f376672fb..d7fde539d8 100644
--- a/test/samples/simple.wgsl.expected.msl
+++ b/test/samples/simple.wgsl.expected.msl
@@ -1,13 +1,13 @@
 #include <metal_stdlib>
 
 using namespace metal;
+void bar() {
+}
+
 struct tint_symbol_1 {
   float4 value [[color(0)]];
 };
 
-void bar() {
-}
-
 float4 tint_symbol_inner() {
   float2 a = float2();
   bar();
diff --git a/test/samples/simple_vertex.spvasm.expected.msl b/test/samples/simple_vertex.spvasm.expected.msl
index 8622e3b4ca..f12b315596 100644
--- a/test/samples/simple_vertex.spvasm.expected.msl
+++ b/test/samples/simple_vertex.spvasm.expected.msl
@@ -1,18 +1,19 @@
 #include <metal_stdlib>
 
 using namespace metal;
-struct main_out {
-  float4 gl_Position;
-};
-struct tint_symbol_1 {
-  float4 gl_Position [[position]];
-};
-
 void main_1(thread float4* const tint_symbol_3) {
   *(tint_symbol_3) = float4(0.0f, 0.0f, 0.0f, 0.0f);
   return;
 }
 
+struct main_out {
+  float4 gl_Position;
+};
+
+struct tint_symbol_1 {
+  float4 gl_Position [[position]];
+};
+
 main_out tint_symbol_inner(thread float4* const tint_symbol_4) {
   main_1(tint_symbol_4);
   main_out const tint_symbol_2 = {.gl_Position=*(tint_symbol_4)};
diff --git a/test/samples/triangle.wgsl.expected.msl b/test/samples/triangle.wgsl.expected.msl
index fa2cab64bb..246e75c83f 100644
--- a/test/samples/triangle.wgsl.expected.msl
+++ b/test/samples/triangle.wgsl.expected.msl
@@ -4,14 +4,13 @@ using namespace metal;
 struct tint_array_wrapper {
   float2 arr[3];
 };
+
+constant tint_array_wrapper pos = {.arr={float2(0.0f, 0.5f), float2(-0.5f, -0.5f), float2(0.5f, -0.5f)}};
+
 struct tint_symbol {
   float4 value [[position]];
 };
-struct tint_symbol_1 {
-  float4 value [[color(0)]];
-};
 
-constant tint_array_wrapper pos = {.arr={float2(0.0f, 0.5f), float2(-0.5f, -0.5f), float2(0.5f, -0.5f)}};
 float4 vtx_main_inner(uint VertexIndex) {
   return float4(pos.arr[VertexIndex], 0.0f, 1.0f);
 }
@@ -23,6 +22,10 @@ vertex tint_symbol vtx_main(uint VertexIndex [[vertex_id]]) {
   return wrapper_result;
 }
 
+struct tint_symbol_1 {
+  float4 value [[color(0)]];
+};
+
 float4 frag_main_inner() {
   return float4(1.0f, 0.0f, 0.0f, 1.0f);
 }
diff --git a/test/shader_io/compute_input_mixed.wgsl.expected.msl b/test/shader_io/compute_input_mixed.wgsl.expected.msl
index e46f80d75a..1f5d6464a0 100644
--- a/test/shader_io/compute_input_mixed.wgsl.expected.msl
+++ b/test/shader_io/compute_input_mixed.wgsl.expected.msl
@@ -4,6 +4,7 @@ using namespace metal;
 struct ComputeInputs0 {
   uint3 local_invocation_id;
 };
+
 struct ComputeInputs1 {
   uint3 workgroup_id;
 };
diff --git a/test/shader_io/fragment_input_locations_struct.wgsl.expected.msl b/test/shader_io/fragment_input_locations_struct.wgsl.expected.msl
index 2f233c5c73..3c7f5c4c06 100644
--- a/test/shader_io/fragment_input_locations_struct.wgsl.expected.msl
+++ b/test/shader_io/fragment_input_locations_struct.wgsl.expected.msl
@@ -7,6 +7,7 @@ struct FragmentInputs {
   float loc2;
   float4 loc3;
 };
+
 struct tint_symbol_2 {
   int loc0 [[user(locn0)]] [[flat]];
   uint loc1 [[user(locn1)]] [[flat]];
diff --git a/test/shader_io/fragment_input_mixed.wgsl.expected.msl b/test/shader_io/fragment_input_mixed.wgsl.expected.msl
index 5210ca2b35..5756387be5 100644
--- a/test/shader_io/fragment_input_mixed.wgsl.expected.msl
+++ b/test/shader_io/fragment_input_mixed.wgsl.expected.msl
@@ -5,10 +5,12 @@ struct FragmentInputs0 {
   float4 position;
   int loc0;
 };
+
 struct FragmentInputs1 {
   float4 loc3;
   uint sample_mask;
 };
+
 struct tint_symbol_2 {
   int loc0 [[user(locn0)]] [[flat]];
   uint loc1 [[user(locn1)]] [[flat]];
diff --git a/test/shader_io/fragment_output_builtins.wgsl.expected.msl b/test/shader_io/fragment_output_builtins.wgsl.expected.msl
index 97d6904308..a537666012 100644
--- a/test/shader_io/fragment_output_builtins.wgsl.expected.msl
+++ b/test/shader_io/fragment_output_builtins.wgsl.expected.msl
@@ -4,9 +4,6 @@ using namespace metal;
 struct tint_symbol {
   float value [[depth(any)]];
 };
-struct tint_symbol_1 {
-  uint value [[sample_mask]];
-};
 
 float main1_inner() {
   return 1.0f;
@@ -19,6 +16,10 @@ fragment tint_symbol main1() {
   return wrapper_result;
 }
 
+struct tint_symbol_1 {
+  uint value [[sample_mask]];
+};
+
 uint main2_inner() {
   return 1u;
 }
diff --git a/test/shader_io/fragment_output_builtins_struct.wgsl.expected.msl b/test/shader_io/fragment_output_builtins_struct.wgsl.expected.msl
index 65de6df63f..c30a67d1be 100644
--- a/test/shader_io/fragment_output_builtins_struct.wgsl.expected.msl
+++ b/test/shader_io/fragment_output_builtins_struct.wgsl.expected.msl
@@ -5,6 +5,7 @@ struct FragmentOutputs {
   float frag_depth;
   uint sample_mask;
 };
+
 struct tint_symbol_1 {
   float frag_depth [[depth(any)]];
   uint sample_mask [[sample_mask]];
diff --git a/test/shader_io/fragment_output_locations.wgsl.expected.msl b/test/shader_io/fragment_output_locations.wgsl.expected.msl
index 03ba9bb2d9..d381524d9a 100644
--- a/test/shader_io/fragment_output_locations.wgsl.expected.msl
+++ b/test/shader_io/fragment_output_locations.wgsl.expected.msl
@@ -4,15 +4,6 @@ using namespace metal;
 struct tint_symbol {
   int value [[color(0)]];
 };
-struct tint_symbol_1 {
-  uint value [[color(1)]];
-};
-struct tint_symbol_2 {
-  float value [[color(2)]];
-};
-struct tint_symbol_3 {
-  float4 value [[color(3)]];
-};
 
 int main0_inner() {
   return 1;
@@ -25,6 +16,10 @@ fragment tint_symbol main0() {
   return wrapper_result;
 }
 
+struct tint_symbol_1 {
+  uint value [[color(1)]];
+};
+
 uint main1_inner() {
   return 1u;
 }
@@ -36,6 +31,10 @@ fragment tint_symbol_1 main1() {
   return wrapper_result_1;
 }
 
+struct tint_symbol_2 {
+  float value [[color(2)]];
+};
+
 float main2_inner() {
   return 1.0f;
 }
@@ -47,6 +46,10 @@ fragment tint_symbol_2 main2() {
   return wrapper_result_2;
 }
 
+struct tint_symbol_3 {
+  float4 value [[color(3)]];
+};
+
 float4 main3_inner() {
   return float4(1.0f, 2.0f, 3.0f, 4.0f);
 }
diff --git a/test/shader_io/fragment_output_locations_struct.wgsl.expected.msl b/test/shader_io/fragment_output_locations_struct.wgsl.expected.msl
index 6cfad1a54e..1cf0682166 100644
--- a/test/shader_io/fragment_output_locations_struct.wgsl.expected.msl
+++ b/test/shader_io/fragment_output_locations_struct.wgsl.expected.msl
@@ -7,6 +7,7 @@ struct FragmentOutputs {
   float loc2;
   float4 loc3;
 };
+
 struct tint_symbol_1 {
   int loc0 [[color(0)]];
   uint loc1 [[color(1)]];
diff --git a/test/shader_io/fragment_output_mixed.wgsl.expected.msl b/test/shader_io/fragment_output_mixed.wgsl.expected.msl
index c7d2a13e50..591468cd10 100644
--- a/test/shader_io/fragment_output_mixed.wgsl.expected.msl
+++ b/test/shader_io/fragment_output_mixed.wgsl.expected.msl
@@ -9,6 +9,7 @@ struct FragmentOutputs {
   uint sample_mask;
   float4 loc3;
 };
+
 struct tint_symbol_1 {
   int loc0 [[color(0)]];
   uint loc1 [[color(1)]];
diff --git a/test/shader_io/interpolate_input_struct.wgsl.expected.msl b/test/shader_io/interpolate_input_struct.wgsl.expected.msl
index edc350fb1f..4f68cb49ae 100644
--- a/test/shader_io/interpolate_input_struct.wgsl.expected.msl
+++ b/test/shader_io/interpolate_input_struct.wgsl.expected.msl
@@ -11,6 +11,7 @@ struct In {
   float linear_centroid;
   float linear_sample;
 };
+
 struct tint_symbol_2 {
   float none [[user(locn0)]];
   float flat [[user(locn1)]] [[flat]];
diff --git a/test/shader_io/interpolate_integers.wgsl.expected.msl b/test/shader_io/interpolate_integers.wgsl.expected.msl
index 49980af5b6..4a2e39e907 100644
--- a/test/shader_io/interpolate_integers.wgsl.expected.msl
+++ b/test/shader_io/interpolate_integers.wgsl.expected.msl
@@ -8,6 +8,7 @@ struct Interface {
   uint4 vu;
   float4 pos;
 };
+
 struct tint_symbol {
   int i [[user(locn0)]] [[flat]];
   uint u [[user(locn1)]] [[flat]];
@@ -15,15 +16,6 @@ struct tint_symbol {
   uint4 vu [[user(locn3)]] [[flat]];
   float4 pos [[position]];
 };
-struct tint_symbol_2 {
-  int i [[user(locn0)]] [[flat]];
-  uint u [[user(locn1)]] [[flat]];
-  int4 vi [[user(locn2)]] [[flat]];
-  uint4 vu [[user(locn3)]] [[flat]];
-};
-struct tint_symbol_3 {
-  int value [[color(0)]];
-};
 
 Interface vert_main_inner() {
   Interface const tint_symbol_4 = {};
@@ -41,6 +33,17 @@ vertex tint_symbol vert_main() {
   return wrapper_result;
 }
 
+struct tint_symbol_2 {
+  int i [[user(locn0)]] [[flat]];
+  uint u [[user(locn1)]] [[flat]];
+  int4 vi [[user(locn2)]] [[flat]];
+  uint4 vu [[user(locn3)]] [[flat]];
+};
+
+struct tint_symbol_3 {
+  int value [[color(0)]];
+};
+
 int frag_main_inner(Interface inputs) {
   return inputs.i;
 }
diff --git a/test/shader_io/interpolate_return_struct.wgsl.expected.msl b/test/shader_io/interpolate_return_struct.wgsl.expected.msl
index afac16e733..4c51b62db1 100644
--- a/test/shader_io/interpolate_return_struct.wgsl.expected.msl
+++ b/test/shader_io/interpolate_return_struct.wgsl.expected.msl
@@ -12,6 +12,7 @@ struct Out {
   float linear_centroid;
   float linear_sample;
 };
+
 struct tint_symbol_1 {
   float none [[user(locn0)]];
   float flat [[user(locn1)]] [[flat]];
diff --git a/test/shader_io/invariant_struct_member.wgsl.expected.msl b/test/shader_io/invariant_struct_member.wgsl.expected.msl
index c85f9a1271..666b8dd801 100644
--- a/test/shader_io/invariant_struct_member.wgsl.expected.msl
+++ b/test/shader_io/invariant_struct_member.wgsl.expected.msl
@@ -11,6 +11,7 @@ using namespace metal;
 struct Out {
   float4 pos;
 };
+
 struct tint_symbol_1 {
   float4 pos [[position]] TINT_INVARIANT;
 };
diff --git a/test/shader_io/shared_struct_different_stages.wgsl.expected.msl b/test/shader_io/shared_struct_different_stages.wgsl.expected.msl
index c4388b7e6a..4dc3f1f0a9 100644
--- a/test/shader_io/shared_struct_different_stages.wgsl.expected.msl
+++ b/test/shader_io/shared_struct_different_stages.wgsl.expected.msl
@@ -6,15 +6,12 @@ struct Interface {
   float col2;
   float4 pos;
 };
+
 struct tint_symbol {
   float col1 [[user(locn1)]];
   float col2 [[user(locn2)]];
   float4 pos [[position]];
 };
-struct tint_symbol_2 {
-  float col1 [[user(locn1)]];
-  float col2 [[user(locn2)]];
-};
 
 Interface vert_main_inner() {
   Interface const tint_symbol_3 = {.col1=0.400000006f, .col2=0.600000024f, .pos=float4()};
@@ -30,6 +27,11 @@ vertex tint_symbol vert_main() {
   return wrapper_result;
 }
 
+struct tint_symbol_2 {
+  float col1 [[user(locn1)]];
+  float col2 [[user(locn2)]];
+};
+
 void frag_main_inner(Interface colors) {
   float const r = colors.col1;
   float const g = colors.col2;
diff --git a/test/shader_io/shared_struct_helper_function.wgsl.expected.msl b/test/shader_io/shared_struct_helper_function.wgsl.expected.msl
index 76e7412e91..e2f4365fff 100644
--- a/test/shader_io/shared_struct_helper_function.wgsl.expected.msl
+++ b/test/shader_io/shared_struct_helper_function.wgsl.expected.msl
@@ -5,20 +5,17 @@ struct VertexOutput {
   float4 pos;
   int loc0;
 };
-struct tint_symbol {
-  int loc0 [[user(locn0)]] [[flat]];
-  float4 pos [[position]];
-};
-struct tint_symbol_1 {
-  int loc0 [[user(locn0)]] [[flat]];
-  float4 pos [[position]];
-};
 
 VertexOutput foo(float x) {
   VertexOutput const tint_symbol_2 = {.pos=float4(x, x, x, 1.0f), .loc0=42};
   return tint_symbol_2;
 }
 
+struct tint_symbol {
+  int loc0 [[user(locn0)]] [[flat]];
+  float4 pos [[position]];
+};
+
 VertexOutput vert_main1_inner() {
   return foo(0.5f);
 }
@@ -31,6 +28,11 @@ vertex tint_symbol vert_main1() {
   return wrapper_result;
 }
 
+struct tint_symbol_1 {
+  int loc0 [[user(locn0)]] [[flat]];
+  float4 pos [[position]];
+};
+
 VertexOutput vert_main2_inner() {
   return foo(0.25f);
 }
diff --git a/test/shader_io/shared_struct_storage_buffer.wgsl.expected.msl b/test/shader_io/shared_struct_storage_buffer.wgsl.expected.msl
index 6de625828d..7b765f6ad3 100644
--- a/test/shader_io/shared_struct_storage_buffer.wgsl.expected.msl
+++ b/test/shader_io/shared_struct_storage_buffer.wgsl.expected.msl
@@ -8,6 +8,7 @@ struct S {
   /* 0x0080 */ float4 v;
   /* 0x0090 */ int8_t tint_pad_1[112];
 };
+
 struct tint_symbol_1 {
   float f [[user(locn0)]];
   uint u [[user(locn1)]] [[flat]];
diff --git a/test/shader_io/vertex_input_builtins_struct.wgsl.expected.msl b/test/shader_io/vertex_input_builtins_struct.wgsl.expected.msl
index bd974410cd..6f67049881 100644
--- a/test/shader_io/vertex_input_builtins_struct.wgsl.expected.msl
+++ b/test/shader_io/vertex_input_builtins_struct.wgsl.expected.msl
@@ -5,6 +5,7 @@ struct VertexInputs {
   uint vertex_index;
   uint instance_index;
 };
+
 struct tint_symbol_1 {
   float4 value [[position]];
 };
diff --git a/test/shader_io/vertex_input_locations.wgsl.expected.msl b/test/shader_io/vertex_input_locations.wgsl.expected.msl
index a7e865860e..f45c47ec65 100644
--- a/test/shader_io/vertex_input_locations.wgsl.expected.msl
+++ b/test/shader_io/vertex_input_locations.wgsl.expected.msl
@@ -7,6 +7,7 @@ struct tint_symbol_2 {
   float loc2 [[attribute(2)]];
   float4 loc3 [[attribute(3)]];
 };
+
 struct tint_symbol_3 {
   float4 value [[position]];
 };
diff --git a/test/shader_io/vertex_input_locations_struct.wgsl.expected.msl b/test/shader_io/vertex_input_locations_struct.wgsl.expected.msl
index c85b7f9e10..0391ee480c 100644
--- a/test/shader_io/vertex_input_locations_struct.wgsl.expected.msl
+++ b/test/shader_io/vertex_input_locations_struct.wgsl.expected.msl
@@ -7,12 +7,14 @@ struct VertexInputs {
   float loc2;
   float4 loc3;
 };
+
 struct tint_symbol_2 {
   int loc0 [[attribute(0)]];
   uint loc1 [[attribute(1)]];
   float loc2 [[attribute(2)]];
   float4 loc3 [[attribute(3)]];
 };
+
 struct tint_symbol_3 {
   float4 value [[position]];
 };
diff --git a/test/shader_io/vertex_input_mixed.wgsl.expected.msl b/test/shader_io/vertex_input_mixed.wgsl.expected.msl
index 07dd9b9039..03c4e970dd 100644
--- a/test/shader_io/vertex_input_mixed.wgsl.expected.msl
+++ b/test/shader_io/vertex_input_mixed.wgsl.expected.msl
@@ -5,16 +5,19 @@ struct VertexInputs0 {
   uint vertex_index;
   int loc0;
 };
+
 struct VertexInputs1 {
   float loc2;
   float4 loc3;
 };
+
 struct tint_symbol_2 {
   int loc0 [[attribute(0)]];
   uint loc1 [[attribute(1)]];
   float loc2 [[attribute(2)]];
   float4 loc3 [[attribute(3)]];
 };
+
 struct tint_symbol_3 {
   float4 value [[position]];
 };
diff --git a/test/shader_io/vertex_output_builtins_struct.wgsl.expected.msl b/test/shader_io/vertex_output_builtins_struct.wgsl.expected.msl
index d077ccc732..2a8b1bcf30 100644
--- a/test/shader_io/vertex_output_builtins_struct.wgsl.expected.msl
+++ b/test/shader_io/vertex_output_builtins_struct.wgsl.expected.msl
@@ -4,6 +4,7 @@ using namespace metal;
 struct VertexOutputs {
   float4 position;
 };
+
 struct tint_symbol_1 {
   float4 position [[position]];
 };
diff --git a/test/shader_io/vertex_output_locations_struct.wgsl.expected.msl b/test/shader_io/vertex_output_locations_struct.wgsl.expected.msl
index 834f345106..b24884e721 100644
--- a/test/shader_io/vertex_output_locations_struct.wgsl.expected.msl
+++ b/test/shader_io/vertex_output_locations_struct.wgsl.expected.msl
@@ -8,6 +8,7 @@ struct VertexOutputs {
   float4 loc3;
   float4 position;
 };
+
 struct tint_symbol_1 {
   int loc0 [[user(locn0)]] [[flat]];
   uint loc1 [[user(locn1)]] [[flat]];
diff --git a/test/shadowing/alias/let.wgsl.expected.msl b/test/shadowing/alias/let.wgsl.expected.msl
index 292a0ba14e..acd894e4c2 100644
--- a/test/shadowing/alias/let.wgsl.expected.msl
+++ b/test/shadowing/alias/let.wgsl.expected.msl
@@ -1,7 +1,6 @@
 #include <metal_stdlib>
 
 using namespace metal;
-
 void f() {
   {
     int const a_1 = int();
diff --git a/test/shadowing/alias/param.wgsl.expected.msl b/test/shadowing/alias/param.wgsl.expected.msl
index 770f18edc9..111b1e8474 100644
--- a/test/shadowing/alias/param.wgsl.expected.msl
+++ b/test/shadowing/alias/param.wgsl.expected.msl
@@ -1,7 +1,6 @@
 #include <metal_stdlib>
 
 using namespace metal;
-
 void f(int a_1) {
   int const b = a_1;
 }
diff --git a/test/shadowing/alias/var.wgsl.expected.msl b/test/shadowing/alias/var.wgsl.expected.msl
index 9958607f26..d507d61cb0 100644
--- a/test/shadowing/alias/var.wgsl.expected.msl
+++ b/test/shadowing/alias/var.wgsl.expected.msl
@@ -1,7 +1,6 @@
 #include <metal_stdlib>
 
 using namespace metal;
-
 void f() {
   {
     int a_1 = int();
diff --git a/test/statements/assign/indexed_assign_to_array_in_struct/in_for_loop_body.wgsl.expected.msl b/test/statements/assign/indexed_assign_to_array_in_struct/in_for_loop_body.wgsl.expected.msl
index dad374d3f0..acf0cc60bc 100644
--- a/test/statements/assign/indexed_assign_to_array_in_struct/in_for_loop_body.wgsl.expected.msl
+++ b/test/statements/assign/indexed_assign_to_array_in_struct/in_for_loop_body.wgsl.expected.msl
@@ -4,12 +4,15 @@ using namespace metal;
 struct Uniforms {
   /* 0x0000 */ uint i;
 };
+
 struct InnerS {
   int v;
 };
+
 struct tint_array_wrapper {
   InnerS arr[8];
 };
+
 struct OuterS {
   tint_array_wrapper a1;
 };
diff --git a/test/statements/assign/indexed_assign_to_array_in_struct/in_for_loop_continuing.wgsl.expected.msl b/test/statements/assign/indexed_assign_to_array_in_struct/in_for_loop_continuing.wgsl.expected.msl
index 6ed5562b3e..60c282a077 100644
--- a/test/statements/assign/indexed_assign_to_array_in_struct/in_for_loop_continuing.wgsl.expected.msl
+++ b/test/statements/assign/indexed_assign_to_array_in_struct/in_for_loop_continuing.wgsl.expected.msl
@@ -4,12 +4,15 @@ using namespace metal;
 struct Uniforms {
   /* 0x0000 */ uint i;
 };
+
 struct InnerS {
   int v;
 };
+
 struct tint_array_wrapper {
   InnerS arr[8];
 };
+
 struct OuterS {
   tint_array_wrapper a1;
 };
diff --git a/test/statements/assign/indexed_assign_to_array_in_struct/in_for_loop_init.wgsl.expected.msl b/test/statements/assign/indexed_assign_to_array_in_struct/in_for_loop_init.wgsl.expected.msl
index 7e27cf01fa..8f331410d7 100644
--- a/test/statements/assign/indexed_assign_to_array_in_struct/in_for_loop_init.wgsl.expected.msl
+++ b/test/statements/assign/indexed_assign_to_array_in_struct/in_for_loop_init.wgsl.expected.msl
@@ -4,12 +4,15 @@ using namespace metal;
 struct Uniforms {
   /* 0x0000 */ uint i;
 };
+
 struct InnerS {
   int v;
 };
+
 struct tint_array_wrapper {
   InnerS arr[8];
 };
+
 struct OuterS {
   tint_array_wrapper a1;
 };
diff --git a/test/statements/assign/indexed_assign_to_array_in_struct/indexing_with_side_effect_func.wgsl.expected.msl b/test/statements/assign/indexed_assign_to_array_in_struct/indexing_with_side_effect_func.wgsl.expected.msl
index b01712d4fe..7d3a1ad090 100644
--- a/test/statements/assign/indexed_assign_to_array_in_struct/indexing_with_side_effect_func.wgsl.expected.msl
+++ b/test/statements/assign/indexed_assign_to_array_in_struct/indexing_with_side_effect_func.wgsl.expected.msl
@@ -5,18 +5,23 @@ struct Uniforms {
   /* 0x0000 */ uint i;
   /* 0x0004 */ uint j;
 };
+
 struct InnerS {
   int v;
 };
+
 struct tint_array_wrapper {
   InnerS arr[8];
 };
+
 struct S1 {
   tint_array_wrapper a2;
 };
+
 struct tint_array_wrapper_1 {
   S1 arr[8];
 };
+
 struct OuterS {
   tint_array_wrapper_1 a1;
 };
diff --git a/test/statements/assign/indexed_assign_to_array_in_struct/struct_array.wgsl.expected.msl b/test/statements/assign/indexed_assign_to_array_in_struct/struct_array.wgsl.expected.msl
index 9430b2c971..17a3a5e16d 100644
--- a/test/statements/assign/indexed_assign_to_array_in_struct/struct_array.wgsl.expected.msl
+++ b/test/statements/assign/indexed_assign_to_array_in_struct/struct_array.wgsl.expected.msl
@@ -4,12 +4,15 @@ using namespace metal;
 struct Uniforms {
   /* 0x0000 */ uint i;
 };
+
 struct InnerS {
   int v;
 };
+
 struct tint_array_wrapper {
   InnerS arr[8];
 };
+
 struct OuterS {
   tint_array_wrapper a1;
 };
diff --git a/test/statements/assign/indexed_assign_to_array_in_struct/struct_array_array.wgsl.expected.msl b/test/statements/assign/indexed_assign_to_array_in_struct/struct_array_array.wgsl.expected.msl
index 020719b55f..12691cd6ba 100644
--- a/test/statements/assign/indexed_assign_to_array_in_struct/struct_array_array.wgsl.expected.msl
+++ b/test/statements/assign/indexed_assign_to_array_in_struct/struct_array_array.wgsl.expected.msl
@@ -5,15 +5,19 @@ struct Uniforms {
   /* 0x0000 */ uint i;
   /* 0x0004 */ uint j;
 };
+
 struct InnerS {
   int v;
 };
+
 struct tint_array_wrapper_1 {
   InnerS arr[8];
 };
+
 struct tint_array_wrapper {
   tint_array_wrapper_1 arr[8];
 };
+
 struct OuterS {
   tint_array_wrapper a1;
 };
diff --git a/test/statements/assign/indexed_assign_to_array_in_struct/struct_array_struct.wgsl.expected.msl b/test/statements/assign/indexed_assign_to_array_in_struct/struct_array_struct.wgsl.expected.msl
index c2ee63f2d0..768693939b 100644
--- a/test/statements/assign/indexed_assign_to_array_in_struct/struct_array_struct.wgsl.expected.msl
+++ b/test/statements/assign/indexed_assign_to_array_in_struct/struct_array_struct.wgsl.expected.msl
@@ -4,15 +4,19 @@ using namespace metal;
 struct Uniforms {
   /* 0x0000 */ uint i;
 };
+
 struct InnerS {
   int v;
 };
+
 struct S1 {
   InnerS s2;
 };
+
 struct tint_array_wrapper {
   S1 arr[8];
 };
+
 struct OuterS {
   tint_array_wrapper a1;
 };
diff --git a/test/statements/assign/indexed_assign_to_array_in_struct/struct_array_struct_array.wgsl.expected.msl b/test/statements/assign/indexed_assign_to_array_in_struct/struct_array_struct_array.wgsl.expected.msl
index 54092b5100..a638c3fdcd 100644
--- a/test/statements/assign/indexed_assign_to_array_in_struct/struct_array_struct_array.wgsl.expected.msl
+++ b/test/statements/assign/indexed_assign_to_array_in_struct/struct_array_struct_array.wgsl.expected.msl
@@ -5,18 +5,23 @@ struct Uniforms {
   /* 0x0000 */ uint i;
   /* 0x0004 */ uint j;
 };
+
 struct InnerS {
   int v;
 };
+
 struct tint_array_wrapper {
   InnerS arr[8];
 };
+
 struct S1 {
   tint_array_wrapper a2;
 };
+
 struct tint_array_wrapper_1 {
   S1 arr[8];
 };
+
 struct OuterS {
   tint_array_wrapper_1 a1;
 };
diff --git a/test/statements/assign/indexed_assign_to_array_in_struct/struct_dynamic_array.wgsl.expected.msl b/test/statements/assign/indexed_assign_to_array_in_struct/struct_dynamic_array.wgsl.expected.msl
index ffa277ba34..6d0fc32343 100644
--- a/test/statements/assign/indexed_assign_to_array_in_struct/struct_dynamic_array.wgsl.expected.msl
+++ b/test/statements/assign/indexed_assign_to_array_in_struct/struct_dynamic_array.wgsl.expected.msl
@@ -4,9 +4,11 @@ using namespace metal;
 struct Uniforms {
   /* 0x0000 */ uint i;
 };
+
 struct InnerS {
   /* 0x0000 */ int v;
 };
+
 struct OuterS {
   /* 0x0000 */ InnerS a1[1];
 };
diff --git a/test/statements/assign/indexed_assign_to_array_in_struct/struct_dynamic_array_struct_array.wgsl.expected.msl b/test/statements/assign/indexed_assign_to_array_in_struct/struct_dynamic_array_struct_array.wgsl.expected.msl
index 1f40a6227a..2b230841f4 100644
--- a/test/statements/assign/indexed_assign_to_array_in_struct/struct_dynamic_array_struct_array.wgsl.expected.msl
+++ b/test/statements/assign/indexed_assign_to_array_in_struct/struct_dynamic_array_struct_array.wgsl.expected.msl
@@ -5,15 +5,19 @@ struct Uniforms {
   /* 0x0000 */ uint i;
   /* 0x0004 */ uint j;
 };
+
 struct InnerS {
   /* 0x0000 */ int v;
 };
+
 struct tint_array_wrapper {
   /* 0x0000 */ InnerS arr[8];
 };
+
 struct S1 {
   /* 0x0000 */ tint_array_wrapper a2;
 };
+
 struct OuterS {
   /* 0x0000 */ S1 a1[1];
 };
diff --git a/test/statements/assign/indexed_assign_to_array_in_struct/struct_matrix.wgsl.expected.msl b/test/statements/assign/indexed_assign_to_array_in_struct/struct_matrix.wgsl.expected.msl
index 5563dcff99..226c64484f 100644
--- a/test/statements/assign/indexed_assign_to_array_in_struct/struct_matrix.wgsl.expected.msl
+++ b/test/statements/assign/indexed_assign_to_array_in_struct/struct_matrix.wgsl.expected.msl
@@ -4,6 +4,7 @@ using namespace metal;
 struct Uniforms {
   /* 0x0000 */ uint i;
 };
+
 struct OuterS {
   float2x4 m1;
 };
diff --git a/test/statements/assign/indexed_assign_to_array_in_struct/struct_multiple_arrays.wgsl.expected.msl b/test/statements/assign/indexed_assign_to_array_in_struct/struct_multiple_arrays.wgsl.expected.msl
index ec021bcbf3..3a268a0fdf 100644
--- a/test/statements/assign/indexed_assign_to_array_in_struct/struct_multiple_arrays.wgsl.expected.msl
+++ b/test/statements/assign/indexed_assign_to_array_in_struct/struct_multiple_arrays.wgsl.expected.msl
@@ -4,12 +4,15 @@ using namespace metal;
 struct Uniforms {
   /* 0x0000 */ uint i;
 };
+
 struct InnerS {
   int v;
 };
+
 struct tint_array_wrapper {
   InnerS arr[8];
 };
+
 struct OuterS {
   tint_array_wrapper a1;
   tint_array_wrapper a2;
diff --git a/test/statements/assign/indexed_assign_to_array_in_struct/struct_struct_array.wgsl.expected.msl b/test/statements/assign/indexed_assign_to_array_in_struct/struct_struct_array.wgsl.expected.msl
index 9e85490823..2d164b24af 100644
--- a/test/statements/assign/indexed_assign_to_array_in_struct/struct_struct_array.wgsl.expected.msl
+++ b/test/statements/assign/indexed_assign_to_array_in_struct/struct_struct_array.wgsl.expected.msl
@@ -4,15 +4,19 @@ using namespace metal;
 struct Uniforms {
   /* 0x0000 */ uint i;
 };
+
 struct InnerS {
   int v;
 };
+
 struct tint_array_wrapper {
   InnerS arr[8];
 };
+
 struct S1 {
   tint_array_wrapper a;
 };
+
 struct OuterS {
   S1 s2;
 };
diff --git a/test/statements/assign/indexed_assign_to_array_in_struct/struct_vector.wgsl.expected.msl b/test/statements/assign/indexed_assign_to_array_in_struct/struct_vector.wgsl.expected.msl
index 4e61683afc..4999967397 100644
--- a/test/statements/assign/indexed_assign_to_array_in_struct/struct_vector.wgsl.expected.msl
+++ b/test/statements/assign/indexed_assign_to_array_in_struct/struct_vector.wgsl.expected.msl
@@ -4,6 +4,7 @@ using namespace metal;
 struct Uniforms {
   /* 0x0000 */ uint i;
 };
+
 struct OuterS {
   float3 v1;
 };
diff --git a/test/statements/assign/indexed_assign_to_array_in_struct/vector_assign.wgsl.expected.msl b/test/statements/assign/indexed_assign_to_array_in_struct/vector_assign.wgsl.expected.msl
index 584841e04b..bdb67f8bd7 100644
--- a/test/statements/assign/indexed_assign_to_array_in_struct/vector_assign.wgsl.expected.msl
+++ b/test/statements/assign/indexed_assign_to_array_in_struct/vector_assign.wgsl.expected.msl
@@ -4,9 +4,11 @@ using namespace metal;
 struct Uniforms {
   /* 0x0000 */ uint i;
 };
+
 struct tint_array_wrapper {
   uint arr[8];
 };
+
 struct OuterS {
   tint_array_wrapper a1;
 };
diff --git a/test/statements/assign/indexed_assign_to_array_in_struct/via_pointer.wgsl.expected.msl b/test/statements/assign/indexed_assign_to_array_in_struct/via_pointer.wgsl.expected.msl
index d42fec8a95..2f71f6e9bf 100644
--- a/test/statements/assign/indexed_assign_to_array_in_struct/via_pointer.wgsl.expected.msl
+++ b/test/statements/assign/indexed_assign_to_array_in_struct/via_pointer.wgsl.expected.msl
@@ -4,12 +4,15 @@ using namespace metal;
 struct Uniforms {
   /* 0x0000 */ uint i;
 };
+
 struct InnerS {
   int v;
 };
+
 struct tint_array_wrapper {
   InnerS arr[8];
 };
+
 struct OuterS {
   tint_array_wrapper a1;
 };
diff --git a/test/statements/assign/indexed_assign_to_array_in_struct/via_pointer_arg.wgsl.expected.msl b/test/statements/assign/indexed_assign_to_array_in_struct/via_pointer_arg.wgsl.expected.msl
index d6c3a35c6a..6ceb36f872 100644
--- a/test/statements/assign/indexed_assign_to_array_in_struct/via_pointer_arg.wgsl.expected.msl
+++ b/test/statements/assign/indexed_assign_to_array_in_struct/via_pointer_arg.wgsl.expected.msl
@@ -4,12 +4,15 @@ using namespace metal;
 struct Uniforms {
   /* 0x0000 */ uint i;
 };
+
 struct InnerS {
   int v;
 };
+
 struct tint_array_wrapper {
   InnerS arr[8];
 };
+
 struct OuterS {
   tint_array_wrapper a1;
 };
diff --git a/test/struct/type_constructor.wgsl.expected.msl b/test/struct/type_constructor.wgsl.expected.msl
index 69583e6ebf..e36df06a43 100644
--- a/test/struct/type_constructor.wgsl.expected.msl
+++ b/test/struct/type_constructor.wgsl.expected.msl
@@ -7,21 +7,26 @@ struct S1 {
   int c;
   int d;
 };
+
 struct S2 {
   int e;
   S1 f;
 };
+
 struct S3 {
   int g;
   S1 h;
   S2 i;
 };
+
 struct tint_array_wrapper {
   int arr[2];
 };
+
 struct T {
   tint_array_wrapper a;
 };
+
 struct tint_array_wrapper_1 {
   T arr[2];
 };
diff --git a/test/types/function_scope_declarations.wgsl.expected.msl b/test/types/function_scope_declarations.wgsl.expected.msl
index 687cea4d6e..fc5a302fd2 100644
--- a/test/types/function_scope_declarations.wgsl.expected.msl
+++ b/test/types/function_scope_declarations.wgsl.expected.msl
@@ -4,6 +4,7 @@ using namespace metal;
 struct S {
   float a;
 };
+
 struct tint_array_wrapper {
   float arr[4];
 };
diff --git a/test/types/module_scope_let.wgsl.expected.msl b/test/types/module_scope_let.wgsl.expected.msl
index 109ae085e5..547c797b9e 100644
--- a/test/types/module_scope_let.wgsl.expected.msl
+++ b/test/types/module_scope_let.wgsl.expected.msl
@@ -4,20 +4,31 @@ using namespace metal;
 struct S {
   float a;
 };
+
+constant bool bool_let = bool();
+
+constant int i32_let = int();
+
+constant uint u32_let = uint();
+
+constant float f32_let = float();
+
+constant int2 v2i32_let = int2();
+
+constant uint3 v3u32_let = uint3();
+
+constant float4 v4f32_let = float4();
+
+constant float3x4 m3x4_let = float3x4();
+
 struct tint_array_wrapper {
   float arr[4];
 };
 
-constant bool bool_let = bool();
-constant int i32_let = int();
-constant uint u32_let = uint();
-constant float f32_let = float();
-constant int2 v2i32_let = int2();
-constant uint3 v3u32_let = uint3();
-constant float4 v4f32_let = float4();
-constant float3x4 m3x4_let = float3x4();
 constant tint_array_wrapper arr_let = {.arr={}};
+
 constant S struct_let = {};
+
 kernel void tint_symbol() {
   return;
 }
diff --git a/test/types/module_scope_var.wgsl.expected.msl b/test/types/module_scope_var.wgsl.expected.msl
index 6f48ccd866..4fcfa9e7ad 100644
--- a/test/types/module_scope_var.wgsl.expected.msl
+++ b/test/types/module_scope_var.wgsl.expected.msl
@@ -4,6 +4,7 @@ using namespace metal;
 struct S {
   float a;
 };
+
 struct tint_array_wrapper {
   float arr[4];
 };
diff --git a/test/types/module_scope_var_initializers.wgsl.expected.msl b/test/types/module_scope_var_initializers.wgsl.expected.msl
index 3f96def136..afbc577f13 100644
--- a/test/types/module_scope_var_initializers.wgsl.expected.msl
+++ b/test/types/module_scope_var_initializers.wgsl.expected.msl
@@ -4,6 +4,7 @@ using namespace metal;
 struct S {
   float a;
 };
+
 struct tint_array_wrapper {
   float arr[4];
 };
diff --git a/test/types/parameters.wgsl.expected.msl b/test/types/parameters.wgsl.expected.msl
index 18d5a35eda..3c1db257f9 100644
--- a/test/types/parameters.wgsl.expected.msl
+++ b/test/types/parameters.wgsl.expected.msl
@@ -4,6 +4,7 @@ using namespace metal;
 struct S {
   float a;
 };
+
 struct tint_array_wrapper {
   float arr[4];
 };
diff --git a/test/types/return_types.wgsl.expected.msl b/test/types/return_types.wgsl.expected.msl
index 4d43323bf2..2d5d9cb8d4 100644
--- a/test/types/return_types.wgsl.expected.msl
+++ b/test/types/return_types.wgsl.expected.msl
@@ -4,9 +4,6 @@ using namespace metal;
 struct S {
   float a;
 };
-struct tint_array_wrapper {
-  float arr[4];
-};
 
 bool ret_bool() {
   return bool();
@@ -40,6 +37,10 @@ float2x3 ret_m2x3() {
   return float2x3();
 }
 
+struct tint_array_wrapper {
+  float arr[4];
+};
+
 tint_array_wrapper ret_arr() {
   tint_array_wrapper const tint_symbol_1 = {.arr={}};
   return tint_symbol_1;
diff --git a/test/types/struct_members.wgsl.expected.msl b/test/types/struct_members.wgsl.expected.msl
index 59af17da7b..a43d5e0a10 100644
--- a/test/types/struct_members.wgsl.expected.msl
+++ b/test/types/struct_members.wgsl.expected.msl
@@ -4,9 +4,11 @@ using namespace metal;
 struct S_inner {
   float a;
 };
+
 struct tint_array_wrapper {
   float arr[4];
 };
+
 struct S {
   bool member_bool;
   int member_i32;
diff --git a/test/var/inferred/function.wgsl.expected.msl b/test/var/inferred/function.wgsl.expected.msl
index 6786e04a60..ac84088451 100644
--- a/test/var/inferred/function.wgsl.expected.msl
+++ b/test/var/inferred/function.wgsl.expected.msl
@@ -4,12 +4,10 @@ using namespace metal;
 struct MyStruct {
   float f1;
 };
+
 struct tint_array_wrapper {
   float arr[10];
 };
-struct tint_symbol_1 {
-  float4 value [[color(0)]];
-};
 
 int ret_i32() {
   return 1;
@@ -51,6 +49,10 @@ void var_decls() {
   tint_array_wrapper v15 = ret_MyArray();
 }
 
+struct tint_symbol_1 {
+  float4 value [[color(0)]];
+};
+
 float4 tint_symbol_inner() {
   return float4(0.0f, 0.0f, 0.0f, 0.0f);
 }
diff --git a/test/var/override/named/no_init/bool.wgsl.expected.msl b/test/var/override/named/no_init/bool.wgsl.expected.msl
index 95ce385236..014e3b1fd3 100644
--- a/test/var/override/named/no_init/bool.wgsl.expected.msl
+++ b/test/var/override/named/no_init/bool.wgsl.expected.msl
@@ -2,6 +2,7 @@
 
 using namespace metal;
 constant bool o [[function_constant(0)]];
+
 kernel void tint_symbol() {
   return;
 }
diff --git a/test/var/override/named/no_init/f32.wgsl.expected.msl b/test/var/override/named/no_init/f32.wgsl.expected.msl
index 2ed922c18f..ecf89c4c91 100644
--- a/test/var/override/named/no_init/f32.wgsl.expected.msl
+++ b/test/var/override/named/no_init/f32.wgsl.expected.msl
@@ -2,6 +2,7 @@
 
 using namespace metal;
 constant float o [[function_constant(0)]];
+
 kernel void tint_symbol() {
   return;
 }
diff --git a/test/var/override/named/no_init/i32.wgsl.expected.msl b/test/var/override/named/no_init/i32.wgsl.expected.msl
index b5b1fae715..6df39feed4 100644
--- a/test/var/override/named/no_init/i32.wgsl.expected.msl
+++ b/test/var/override/named/no_init/i32.wgsl.expected.msl
@@ -2,6 +2,7 @@
 
 using namespace metal;
 constant int o [[function_constant(0)]];
+
 kernel void tint_symbol() {
   return;
 }
diff --git a/test/var/override/named/no_init/u32.wgsl.expected.msl b/test/var/override/named/no_init/u32.wgsl.expected.msl
index 918348cdd0..8254bed60e 100644
--- a/test/var/override/named/no_init/u32.wgsl.expected.msl
+++ b/test/var/override/named/no_init/u32.wgsl.expected.msl
@@ -2,6 +2,7 @@
 
 using namespace metal;
 constant uint o [[function_constant(0)]];
+
 kernel void tint_symbol() {
   return;
 }
diff --git a/test/var/override/named/val_init/bool.wgsl.expected.msl b/test/var/override/named/val_init/bool.wgsl.expected.msl
index 95ce385236..014e3b1fd3 100644
--- a/test/var/override/named/val_init/bool.wgsl.expected.msl
+++ b/test/var/override/named/val_init/bool.wgsl.expected.msl
@@ -2,6 +2,7 @@
 
 using namespace metal;
 constant bool o [[function_constant(0)]];
+
 kernel void tint_symbol() {
   return;
 }
diff --git a/test/var/override/named/val_init/f32.wgsl.expected.msl b/test/var/override/named/val_init/f32.wgsl.expected.msl
index 2ed922c18f..ecf89c4c91 100644
--- a/test/var/override/named/val_init/f32.wgsl.expected.msl
+++ b/test/var/override/named/val_init/f32.wgsl.expected.msl
@@ -2,6 +2,7 @@
 
 using namespace metal;
 constant float o [[function_constant(0)]];
+
 kernel void tint_symbol() {
   return;
 }
diff --git a/test/var/override/named/val_init/i32.wgsl.expected.msl b/test/var/override/named/val_init/i32.wgsl.expected.msl
index b5b1fae715..6df39feed4 100644
--- a/test/var/override/named/val_init/i32.wgsl.expected.msl
+++ b/test/var/override/named/val_init/i32.wgsl.expected.msl
@@ -2,6 +2,7 @@
 
 using namespace metal;
 constant int o [[function_constant(0)]];
+
 kernel void tint_symbol() {
   return;
 }
diff --git a/test/var/override/named/val_init/u32.wgsl.expected.msl b/test/var/override/named/val_init/u32.wgsl.expected.msl
index 918348cdd0..8254bed60e 100644
--- a/test/var/override/named/val_init/u32.wgsl.expected.msl
+++ b/test/var/override/named/val_init/u32.wgsl.expected.msl
@@ -2,6 +2,7 @@
 
 using namespace metal;
 constant uint o [[function_constant(0)]];
+
 kernel void tint_symbol() {
   return;
 }
diff --git a/test/var/override/named/zero_init/bool.wgsl.expected.msl b/test/var/override/named/zero_init/bool.wgsl.expected.msl
index 95ce385236..014e3b1fd3 100644
--- a/test/var/override/named/zero_init/bool.wgsl.expected.msl
+++ b/test/var/override/named/zero_init/bool.wgsl.expected.msl
@@ -2,6 +2,7 @@
 
 using namespace metal;
 constant bool o [[function_constant(0)]];
+
 kernel void tint_symbol() {
   return;
 }
diff --git a/test/var/override/named/zero_init/f32.wgsl.expected.msl b/test/var/override/named/zero_init/f32.wgsl.expected.msl
index 2ed922c18f..ecf89c4c91 100644
--- a/test/var/override/named/zero_init/f32.wgsl.expected.msl
+++ b/test/var/override/named/zero_init/f32.wgsl.expected.msl
@@ -2,6 +2,7 @@
 
 using namespace metal;
 constant float o [[function_constant(0)]];
+
 kernel void tint_symbol() {
   return;
 }
diff --git a/test/var/override/named/zero_init/i32.wgsl.expected.msl b/test/var/override/named/zero_init/i32.wgsl.expected.msl
index b5b1fae715..6df39feed4 100644
--- a/test/var/override/named/zero_init/i32.wgsl.expected.msl
+++ b/test/var/override/named/zero_init/i32.wgsl.expected.msl
@@ -2,6 +2,7 @@
 
 using namespace metal;
 constant int o [[function_constant(0)]];
+
 kernel void tint_symbol() {
   return;
 }
diff --git a/test/var/override/named/zero_init/u32.wgsl.expected.msl b/test/var/override/named/zero_init/u32.wgsl.expected.msl
index 918348cdd0..8254bed60e 100644
--- a/test/var/override/named/zero_init/u32.wgsl.expected.msl
+++ b/test/var/override/named/zero_init/u32.wgsl.expected.msl
@@ -2,6 +2,7 @@
 
 using namespace metal;
 constant uint o [[function_constant(0)]];
+
 kernel void tint_symbol() {
   return;
 }
diff --git a/test/var/override/numbered/no_init/bool.wgsl.expected.msl b/test/var/override/numbered/no_init/bool.wgsl.expected.msl
index d6cbfe9df6..28e456b41b 100644
--- a/test/var/override/numbered/no_init/bool.wgsl.expected.msl
+++ b/test/var/override/numbered/no_init/bool.wgsl.expected.msl
@@ -2,6 +2,7 @@
 
 using namespace metal;
 constant bool o [[function_constant(1234)]];
+
 kernel void tint_symbol() {
   return;
 }
diff --git a/test/var/override/numbered/no_init/f32.wgsl.expected.msl b/test/var/override/numbered/no_init/f32.wgsl.expected.msl
index 41134e2213..ce09e6ef83 100644
--- a/test/var/override/numbered/no_init/f32.wgsl.expected.msl
+++ b/test/var/override/numbered/no_init/f32.wgsl.expected.msl
@@ -2,6 +2,7 @@
 
 using namespace metal;
 constant float o [[function_constant(1234)]];
+
 kernel void tint_symbol() {
   return;
 }
diff --git a/test/var/override/numbered/no_init/i32.wgsl.expected.msl b/test/var/override/numbered/no_init/i32.wgsl.expected.msl
index 812c466766..3e8475293b 100644
--- a/test/var/override/numbered/no_init/i32.wgsl.expected.msl
+++ b/test/var/override/numbered/no_init/i32.wgsl.expected.msl
@@ -2,6 +2,7 @@
 
 using namespace metal;
 constant int o [[function_constant(1234)]];
+
 kernel void tint_symbol() {
   return;
 }
diff --git a/test/var/override/numbered/no_init/u32.wgsl.expected.msl b/test/var/override/numbered/no_init/u32.wgsl.expected.msl
index 799a682390..51e2d724d4 100644
--- a/test/var/override/numbered/no_init/u32.wgsl.expected.msl
+++ b/test/var/override/numbered/no_init/u32.wgsl.expected.msl
@@ -2,6 +2,7 @@
 
 using namespace metal;
 constant uint o [[function_constant(1234)]];
+
 kernel void tint_symbol() {
   return;
 }
diff --git a/test/var/override/numbered/val_init/bool.wgsl.expected.msl b/test/var/override/numbered/val_init/bool.wgsl.expected.msl
index d6cbfe9df6..28e456b41b 100644
--- a/test/var/override/numbered/val_init/bool.wgsl.expected.msl
+++ b/test/var/override/numbered/val_init/bool.wgsl.expected.msl
@@ -2,6 +2,7 @@
 
 using namespace metal;
 constant bool o [[function_constant(1234)]];
+
 kernel void tint_symbol() {
   return;
 }
diff --git a/test/var/override/numbered/val_init/f32.wgsl.expected.msl b/test/var/override/numbered/val_init/f32.wgsl.expected.msl
index 41134e2213..ce09e6ef83 100644
--- a/test/var/override/numbered/val_init/f32.wgsl.expected.msl
+++ b/test/var/override/numbered/val_init/f32.wgsl.expected.msl
@@ -2,6 +2,7 @@
 
 using namespace metal;
 constant float o [[function_constant(1234)]];
+
 kernel void tint_symbol() {
   return;
 }
diff --git a/test/var/override/numbered/val_init/i32.wgsl.expected.msl b/test/var/override/numbered/val_init/i32.wgsl.expected.msl
index 812c466766..3e8475293b 100644
--- a/test/var/override/numbered/val_init/i32.wgsl.expected.msl
+++ b/test/var/override/numbered/val_init/i32.wgsl.expected.msl
@@ -2,6 +2,7 @@
 
 using namespace metal;
 constant int o [[function_constant(1234)]];
+
 kernel void tint_symbol() {
   return;
 }
diff --git a/test/var/override/numbered/val_init/u32.wgsl.expected.msl b/test/var/override/numbered/val_init/u32.wgsl.expected.msl
index 799a682390..51e2d724d4 100644
--- a/test/var/override/numbered/val_init/u32.wgsl.expected.msl
+++ b/test/var/override/numbered/val_init/u32.wgsl.expected.msl
@@ -2,6 +2,7 @@
 
 using namespace metal;
 constant uint o [[function_constant(1234)]];
+
 kernel void tint_symbol() {
   return;
 }
diff --git a/test/var/override/numbered/zero_init/bool.wgsl.expected.msl b/test/var/override/numbered/zero_init/bool.wgsl.expected.msl
index d6cbfe9df6..28e456b41b 100644
--- a/test/var/override/numbered/zero_init/bool.wgsl.expected.msl
+++ b/test/var/override/numbered/zero_init/bool.wgsl.expected.msl
@@ -2,6 +2,7 @@
 
 using namespace metal;
 constant bool o [[function_constant(1234)]];
+
 kernel void tint_symbol() {
   return;
 }
diff --git a/test/var/override/numbered/zero_init/f32.wgsl.expected.msl b/test/var/override/numbered/zero_init/f32.wgsl.expected.msl
index 41134e2213..ce09e6ef83 100644
--- a/test/var/override/numbered/zero_init/f32.wgsl.expected.msl
+++ b/test/var/override/numbered/zero_init/f32.wgsl.expected.msl
@@ -2,6 +2,7 @@
 
 using namespace metal;
 constant float o [[function_constant(1234)]];
+
 kernel void tint_symbol() {
   return;
 }
diff --git a/test/var/override/numbered/zero_init/i32.wgsl.expected.msl b/test/var/override/numbered/zero_init/i32.wgsl.expected.msl
index 812c466766..3e8475293b 100644
--- a/test/var/override/numbered/zero_init/i32.wgsl.expected.msl
+++ b/test/var/override/numbered/zero_init/i32.wgsl.expected.msl
@@ -2,6 +2,7 @@
 
 using namespace metal;
 constant int o [[function_constant(1234)]];
+
 kernel void tint_symbol() {
   return;
 }
diff --git a/test/var/override/numbered/zero_init/u32.wgsl.expected.msl b/test/var/override/numbered/zero_init/u32.wgsl.expected.msl
index 799a682390..51e2d724d4 100644
--- a/test/var/override/numbered/zero_init/u32.wgsl.expected.msl
+++ b/test/var/override/numbered/zero_init/u32.wgsl.expected.msl
@@ -2,6 +2,7 @@
 
 using namespace metal;
 constant uint o [[function_constant(1234)]];
+
 kernel void tint_symbol() {
   return;
 }