tools: Update post-shuffle paths for builtin-gen

Bug: tint:1418
Change-Id: Ic1560bf7a0aa99ecbe554b985dc07f1b055fab64
Reviewed-on: https://dawn-review.googlesource.com/c/tint/+/81500
Auto-Submit: Ben Clayton <bclayton@google.com>
Kokoro: Kokoro <noreply+kokoro@google.com>
Reviewed-by: Ryan Harrison <rharrison@chromium.org>
Commit-Queue: Ryan Harrison <rharrison@chromium.org>

src/tint/builtin_table.inl

diff --git a/src/tint/builtin_table.inl b/src/tint/builtin_table.inl
index e6a30f8..0cd1f77 100644
--- a/src/tint/builtin_table.inl
+++ b/src/tint/builtin_table.inl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   src/builtin_table.inl.tmpl
+//   src/tint/builtin_table.inl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
@@ -25,7 +25,7 @@
 // clang-format off
 
 /// TypeMatcher for 'type bool'
-/// @see src/builtins.def:68:6
+/// @see src/tint/builtins.def:68:6
 class Bool : public TypeMatcher {
  public:
   /// Checks whether the given type matches the matcher rules.
@@ -52,7 +52,7 @@
 }
 
 /// TypeMatcher for 'type f32'
-/// @see src/builtins.def:69:6
+/// @see src/tint/builtins.def:69:6
 class F32 : public TypeMatcher {
  public:
   /// Checks whether the given type matches the matcher rules.
@@ -79,7 +79,7 @@
 }
 
 /// TypeMatcher for 'type i32'
-/// @see src/builtins.def:70:6
+/// @see src/tint/builtins.def:70:6
 class I32 : public TypeMatcher {
  public:
   /// Checks whether the given type matches the matcher rules.
@@ -106,7 +106,7 @@
 }
 
 /// TypeMatcher for 'type u32'
-/// @see src/builtins.def:71:6
+/// @see src/tint/builtins.def:71:6
 class U32 : public TypeMatcher {
  public:
   /// Checks whether the given type matches the matcher rules.
@@ -133,7 +133,7 @@
 }
 
 /// TypeMatcher for 'type vec2'
-/// @see src/builtins.def:72:6
+/// @see src/tint/builtins.def:72:6
 class Vec2 : public TypeMatcher {
  public:
   /// Checks whether the given type matches the matcher rules.
@@ -166,7 +166,7 @@
 }
 
 /// TypeMatcher for 'type vec3'
-/// @see src/builtins.def:73:6
+/// @see src/tint/builtins.def:73:6
 class Vec3 : public TypeMatcher {
  public:
   /// Checks whether the given type matches the matcher rules.
@@ -199,7 +199,7 @@
 }
 
 /// TypeMatcher for 'type vec4'
-/// @see src/builtins.def:74:6
+/// @see src/tint/builtins.def:74:6
 class Vec4 : public TypeMatcher {
  public:
   /// Checks whether the given type matches the matcher rules.
@@ -232,7 +232,7 @@
 }
 
 /// TypeMatcher for 'type vec'
-/// @see src/builtins.def:75:37
+/// @see src/tint/builtins.def:75:37
 class Vec : public TypeMatcher {
  public:
   /// Checks whether the given type matches the matcher rules.
@@ -273,7 +273,7 @@
 }
 
 /// TypeMatcher for 'type mat'
-/// @see src/builtins.def:76:37
+/// @see src/tint/builtins.def:76:37
 class Mat : public TypeMatcher {
  public:
   /// Checks whether the given type matches the matcher rules.
@@ -320,7 +320,7 @@
 }
 
 /// TypeMatcher for 'type ptr'
-/// @see src/builtins.def:77:6
+/// @see src/tint/builtins.def:77:6
 class Ptr : public TypeMatcher {
  public:
   /// Checks whether the given type matches the matcher rules.
@@ -365,7 +365,7 @@
 }
 
 /// TypeMatcher for 'type atomic'
-/// @see src/builtins.def:78:6
+/// @see src/tint/builtins.def:78:6
 class Atomic : public TypeMatcher {
  public:
   /// Checks whether the given type matches the matcher rules.
@@ -398,7 +398,7 @@
 }
 
 /// TypeMatcher for 'type array'
-/// @see src/builtins.def:79:6
+/// @see src/tint/builtins.def:79:6
 class Array : public TypeMatcher {
  public:
   /// Checks whether the given type matches the matcher rules.
@@ -431,7 +431,7 @@
 }
 
 /// TypeMatcher for 'type sampler'
-/// @see src/builtins.def:80:6
+/// @see src/tint/builtins.def:80:6
 class Sampler : public TypeMatcher {
  public:
   /// Checks whether the given type matches the matcher rules.
@@ -458,7 +458,7 @@
 }
 
 /// TypeMatcher for 'type sampler_comparison'
-/// @see src/builtins.def:81:6
+/// @see src/tint/builtins.def:81:6
 class SamplerComparison : public TypeMatcher {
  public:
   /// Checks whether the given type matches the matcher rules.
@@ -485,7 +485,7 @@
 }
 
 /// TypeMatcher for 'type texture_1d'
-/// @see src/builtins.def:82:6
+/// @see src/tint/builtins.def:82:6
 class Texture1D : public TypeMatcher {
  public:
   /// Checks whether the given type matches the matcher rules.
@@ -518,7 +518,7 @@
 }
 
 /// TypeMatcher for 'type texture_2d'
-/// @see src/builtins.def:83:6
+/// @see src/tint/builtins.def:83:6
 class Texture2D : public TypeMatcher {
  public:
   /// Checks whether the given type matches the matcher rules.
@@ -551,7 +551,7 @@
 }
 
 /// TypeMatcher for 'type texture_2d_array'
-/// @see src/builtins.def:84:6
+/// @see src/tint/builtins.def:84:6
 class Texture2DArray : public TypeMatcher {
  public:
   /// Checks whether the given type matches the matcher rules.
@@ -584,7 +584,7 @@
 }
 
 /// TypeMatcher for 'type texture_3d'
-/// @see src/builtins.def:85:6
+/// @see src/tint/builtins.def:85:6
 class Texture3D : public TypeMatcher {
  public:
   /// Checks whether the given type matches the matcher rules.
@@ -617,7 +617,7 @@
 }
 
 /// TypeMatcher for 'type texture_cube'
-/// @see src/builtins.def:86:6
+/// @see src/tint/builtins.def:86:6
 class TextureCube : public TypeMatcher {
  public:
   /// Checks whether the given type matches the matcher rules.
@@ -650,7 +650,7 @@
 }
 
 /// TypeMatcher for 'type texture_cube_array'
-/// @see src/builtins.def:87:6
+/// @see src/tint/builtins.def:87:6
 class TextureCubeArray : public TypeMatcher {
  public:
   /// Checks whether the given type matches the matcher rules.
@@ -683,7 +683,7 @@
 }
 
 /// TypeMatcher for 'type texture_multisampled_2d'
-/// @see src/builtins.def:88:6
+/// @see src/tint/builtins.def:88:6
 class TextureMultisampled2D : public TypeMatcher {
  public:
   /// Checks whether the given type matches the matcher rules.
@@ -716,7 +716,7 @@
 }
 
 /// TypeMatcher for 'type texture_depth_2d'
-/// @see src/builtins.def:89:6
+/// @see src/tint/builtins.def:89:6
 class TextureDepth2D : public TypeMatcher {
  public:
   /// Checks whether the given type matches the matcher rules.
@@ -743,7 +743,7 @@
 }
 
 /// TypeMatcher for 'type texture_depth_2d_array'
-/// @see src/builtins.def:90:6
+/// @see src/tint/builtins.def:90:6
 class TextureDepth2DArray : public TypeMatcher {
  public:
   /// Checks whether the given type matches the matcher rules.
@@ -770,7 +770,7 @@
 }
 
 /// TypeMatcher for 'type texture_depth_cube'
-/// @see src/builtins.def:91:6
+/// @see src/tint/builtins.def:91:6
 class TextureDepthCube : public TypeMatcher {
  public:
   /// Checks whether the given type matches the matcher rules.
@@ -797,7 +797,7 @@
 }
 
 /// TypeMatcher for 'type texture_depth_cube_array'
-/// @see src/builtins.def:92:6
+/// @see src/tint/builtins.def:92:6
 class TextureDepthCubeArray : public TypeMatcher {
  public:
   /// Checks whether the given type matches the matcher rules.
@@ -824,7 +824,7 @@
 }
 
 /// TypeMatcher for 'type texture_depth_multisampled_2d'
-/// @see src/builtins.def:93:6
+/// @see src/tint/builtins.def:93:6
 class TextureDepthMultisampled2D : public TypeMatcher {
  public:
   /// Checks whether the given type matches the matcher rules.
@@ -851,7 +851,7 @@
 }
 
 /// TypeMatcher for 'type texture_storage_1d'
-/// @see src/builtins.def:94:6
+/// @see src/tint/builtins.def:94:6
 class TextureStorage1D : public TypeMatcher {
  public:
   /// Checks whether the given type matches the matcher rules.
@@ -890,7 +890,7 @@
 }
 
 /// TypeMatcher for 'type texture_storage_2d'
-/// @see src/builtins.def:95:6
+/// @see src/tint/builtins.def:95:6
 class TextureStorage2D : public TypeMatcher {
  public:
   /// Checks whether the given type matches the matcher rules.
@@ -929,7 +929,7 @@
 }
 
 /// TypeMatcher for 'type texture_storage_2d_array'
-/// @see src/builtins.def:96:6
+/// @see src/tint/builtins.def:96:6
 class TextureStorage2DArray : public TypeMatcher {
  public:
   /// Checks whether the given type matches the matcher rules.
@@ -968,7 +968,7 @@
 }
 
 /// TypeMatcher for 'type texture_storage_3d'
-/// @see src/builtins.def:97:6
+/// @see src/tint/builtins.def:97:6
 class TextureStorage3D : public TypeMatcher {
  public:
   /// Checks whether the given type matches the matcher rules.
@@ -1007,7 +1007,7 @@
 }
 
 /// TypeMatcher for 'type texture_external'
-/// @see src/builtins.def:98:6
+/// @see src/tint/builtins.def:98:6
 class TextureExternal : public TypeMatcher {
  public:
   /// Checks whether the given type matches the matcher rules.
@@ -1034,7 +1034,7 @@
 }
 
 /// TypeMatcher for 'type __modf_result'
-/// @see src/builtins.def:100:6
+/// @see src/tint/builtins.def:100:6
 class ModfResult : public TypeMatcher {
  public:
   /// Checks whether the given type matches the matcher rules.
@@ -1061,7 +1061,7 @@
 }
 
 /// TypeMatcher for 'type __modf_result_vec'
-/// @see src/builtins.def:101:42
+/// @see src/tint/builtins.def:101:42
 class ModfResultVec : public TypeMatcher {
  public:
   /// Checks whether the given type matches the matcher rules.
@@ -1096,7 +1096,7 @@
 }
 
 /// TypeMatcher for 'type __frexp_result'
-/// @see src/builtins.def:102:6
+/// @see src/tint/builtins.def:102:6
 class FrexpResult : public TypeMatcher {
  public:
   /// Checks whether the given type matches the matcher rules.
@@ -1123,7 +1123,7 @@
 }
 
 /// TypeMatcher for 'type __frexp_result_vec'
-/// @see src/builtins.def:103:43
+/// @see src/tint/builtins.def:103:43
 class FrexpResultVec : public TypeMatcher {
  public:
   /// Checks whether the given type matches the matcher rules.
@@ -1158,7 +1158,7 @@
 }
 
 /// TypeMatcher for 'match fiu32'
-/// @see src/builtins.def:111:7
+/// @see src/tint/builtins.def:111:7
 class Fiu32 : public TypeMatcher {
  public:
   /// Checks whether the given type matches the matcher rules, and returns the
@@ -1192,7 +1192,7 @@
 }
 
 /// TypeMatcher for 'match iu32'
-/// @see src/builtins.def:112:7
+/// @see src/tint/builtins.def:112:7
 class Iu32 : public TypeMatcher {
  public:
   /// Checks whether the given type matches the matcher rules, and returns the
@@ -1223,7 +1223,7 @@
 }
 
 /// TypeMatcher for 'match scalar'
-/// @see src/builtins.def:113:7
+/// @see src/tint/builtins.def:113:7
 class Scalar : public TypeMatcher {
  public:
   /// Checks whether the given type matches the matcher rules, and returns the
@@ -1260,7 +1260,7 @@
 }
 
 /// EnumMatcher for 'match f32_texel_format'
-/// @see src/builtins.def:124:7
+/// @see src/tint/builtins.def:124:7
 class F32TexelFormat : public NumberMatcher {
  public:
   /// Checks whether the given number matches the enum matcher rules.
@@ -1293,7 +1293,7 @@
 }
 
 /// EnumMatcher for 'match i32_texel_format'
-/// @see src/builtins.def:126:7
+/// @see src/tint/builtins.def:126:7
 class I32TexelFormat : public NumberMatcher {
  public:
   /// Checks whether the given number matches the enum matcher rules.
@@ -1325,7 +1325,7 @@
 }
 
 /// EnumMatcher for 'match u32_texel_format'
-/// @see src/builtins.def:128:7
+/// @see src/tint/builtins.def:128:7
 class U32TexelFormat : public NumberMatcher {
  public:
   /// Checks whether the given number matches the enum matcher rules.
@@ -1357,7 +1357,7 @@
 }
 
 /// EnumMatcher for 'match write_only'
-/// @see src/builtins.def:131:7
+/// @see src/tint/builtins.def:131:7
 class WriteOnly : public NumberMatcher {
  public:
   /// Checks whether the given number matches the enum matcher rules.
@@ -1383,7 +1383,7 @@
 }
 
 /// EnumMatcher for 'match function_private_workgroup'
-/// @see src/builtins.def:133:7
+/// @see src/tint/builtins.def:133:7
 class FunctionPrivateWorkgroup : public NumberMatcher {
  public:
   /// Checks whether the given number matches the enum matcher rules.
@@ -1413,7 +1413,7 @@
 }
 
 /// EnumMatcher for 'match workgroup_or_storage'
-/// @see src/builtins.def:134:7
+/// @see src/tint/builtins.def:134:7
 class WorkgroupOrStorage : public NumberMatcher {
  public:
   /// Checks whether the given number matches the enum matcher rules.

src/tint/sem/builtin_type.cc

diff --git a/src/tint/sem/builtin_type.cc b/src/tint/sem/builtin_type.cc
index 1a59272..4eadf74 100644
--- a/src/tint/sem/builtin_type.cc
+++ b/src/tint/sem/builtin_type.cc
@@ -17,7 +17,7 @@
 // using the template:
 //   src/tint/sem/builtin_type.cc.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

src/tint/sem/builtin_type.h

diff --git a/src/tint/sem/builtin_type.h b/src/tint/sem/builtin_type.h
index e8fc934..9b4dfcc 100644
--- a/src/tint/sem/builtin_type.h
+++ b/src/tint/sem/builtin_type.h
@@ -17,7 +17,7 @@
 // using the template:
 //   src/tint/sem/builtin_type.h.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

src/tint/sem/parameter_usage.cc

diff --git a/src/tint/sem/parameter_usage.cc b/src/tint/sem/parameter_usage.cc
index c703f64..5721882 100644
--- a/src/tint/sem/parameter_usage.cc
+++ b/src/tint/sem/parameter_usage.cc
@@ -17,7 +17,7 @@
 // using the template:
 //   src/tint/sem/parameter_usage.cc.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

src/tint/sem/parameter_usage.h

diff --git a/src/tint/sem/parameter_usage.h b/src/tint/sem/parameter_usage.h
index 7175714..698d9cb 100644
--- a/src/tint/sem/parameter_usage.h
+++ b/src/tint/sem/parameter_usage.h
@@ -17,7 +17,7 @@
 // using the template:
 //   src/tint/sem/parameter_usage.h.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/abs/002533.wgsl

diff --git a/test/tint/builtins/gen/abs/002533.wgsl b/test/tint/builtins/gen/abs/002533.wgsl
index 0a476d3..bdafa50 100644
--- a/test/tint/builtins/gen/abs/002533.wgsl
+++ b/test/tint/builtins/gen/abs/002533.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/abs/005174.wgsl

diff --git a/test/tint/builtins/gen/abs/005174.wgsl b/test/tint/builtins/gen/abs/005174.wgsl
index 25a250a..e00ef77 100644
--- a/test/tint/builtins/gen/abs/005174.wgsl
+++ b/test/tint/builtins/gen/abs/005174.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/abs/1ce782.wgsl

diff --git a/test/tint/builtins/gen/abs/1ce782.wgsl b/test/tint/builtins/gen/abs/1ce782.wgsl
index a9903ca..b35fe99 100644
--- a/test/tint/builtins/gen/abs/1ce782.wgsl
+++ b/test/tint/builtins/gen/abs/1ce782.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/abs/1e9d53.wgsl

diff --git a/test/tint/builtins/gen/abs/1e9d53.wgsl b/test/tint/builtins/gen/abs/1e9d53.wgsl
index ea898e9..96f14f4 100644
--- a/test/tint/builtins/gen/abs/1e9d53.wgsl
+++ b/test/tint/builtins/gen/abs/1e9d53.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/abs/467cd1.wgsl

diff --git a/test/tint/builtins/gen/abs/467cd1.wgsl b/test/tint/builtins/gen/abs/467cd1.wgsl
index e136df2..71492ab 100644
--- a/test/tint/builtins/gen/abs/467cd1.wgsl
+++ b/test/tint/builtins/gen/abs/467cd1.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/abs/4ad288.wgsl

diff --git a/test/tint/builtins/gen/abs/4ad288.wgsl b/test/tint/builtins/gen/abs/4ad288.wgsl
index b33ffaa..f2824a7 100644
--- a/test/tint/builtins/gen/abs/4ad288.wgsl
+++ b/test/tint/builtins/gen/abs/4ad288.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/abs/5ad50a.wgsl

diff --git a/test/tint/builtins/gen/abs/5ad50a.wgsl b/test/tint/builtins/gen/abs/5ad50a.wgsl
index 6f40a4b..59be633 100644
--- a/test/tint/builtins/gen/abs/5ad50a.wgsl
+++ b/test/tint/builtins/gen/abs/5ad50a.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/abs/7326de.wgsl

diff --git a/test/tint/builtins/gen/abs/7326de.wgsl b/test/tint/builtins/gen/abs/7326de.wgsl
index b06e0c3..cc54874 100644
--- a/test/tint/builtins/gen/abs/7326de.wgsl
+++ b/test/tint/builtins/gen/abs/7326de.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/abs/7f28e6.wgsl

diff --git a/test/tint/builtins/gen/abs/7f28e6.wgsl b/test/tint/builtins/gen/abs/7f28e6.wgsl
index 51d137c..3bf83f3 100644
--- a/test/tint/builtins/gen/abs/7f28e6.wgsl
+++ b/test/tint/builtins/gen/abs/7f28e6.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/abs/7faa9e.wgsl

diff --git a/test/tint/builtins/gen/abs/7faa9e.wgsl b/test/tint/builtins/gen/abs/7faa9e.wgsl
index 5136e6f..118296e 100644
--- a/test/tint/builtins/gen/abs/7faa9e.wgsl
+++ b/test/tint/builtins/gen/abs/7faa9e.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/abs/9c80a6.wgsl

diff --git a/test/tint/builtins/gen/abs/9c80a6.wgsl b/test/tint/builtins/gen/abs/9c80a6.wgsl
index 7df8995..6697bce 100644
--- a/test/tint/builtins/gen/abs/9c80a6.wgsl
+++ b/test/tint/builtins/gen/abs/9c80a6.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/abs/b96037.wgsl

diff --git a/test/tint/builtins/gen/abs/b96037.wgsl b/test/tint/builtins/gen/abs/b96037.wgsl
index f3a6385..16d7aca 100644
--- a/test/tint/builtins/gen/abs/b96037.wgsl
+++ b/test/tint/builtins/gen/abs/b96037.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/acos/489247.wgsl

diff --git a/test/tint/builtins/gen/acos/489247.wgsl b/test/tint/builtins/gen/acos/489247.wgsl
index 5f6b124..6807f42 100644
--- a/test/tint/builtins/gen/acos/489247.wgsl
+++ b/test/tint/builtins/gen/acos/489247.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/acos/8e2acf.wgsl

diff --git a/test/tint/builtins/gen/acos/8e2acf.wgsl b/test/tint/builtins/gen/acos/8e2acf.wgsl
index 5e18348..cd8ec5f 100644
--- a/test/tint/builtins/gen/acos/8e2acf.wgsl
+++ b/test/tint/builtins/gen/acos/8e2acf.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/acos/a610c4.wgsl

diff --git a/test/tint/builtins/gen/acos/a610c4.wgsl b/test/tint/builtins/gen/acos/a610c4.wgsl
index 88d8cc2..417d5be 100644
--- a/test/tint/builtins/gen/acos/a610c4.wgsl
+++ b/test/tint/builtins/gen/acos/a610c4.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/acos/dfc915.wgsl

diff --git a/test/tint/builtins/gen/acos/dfc915.wgsl b/test/tint/builtins/gen/acos/dfc915.wgsl
index aa36605..9e93bf5 100644
--- a/test/tint/builtins/gen/acos/dfc915.wgsl
+++ b/test/tint/builtins/gen/acos/dfc915.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/all/353d6a.wgsl

diff --git a/test/tint/builtins/gen/all/353d6a.wgsl b/test/tint/builtins/gen/all/353d6a.wgsl
index 985d068..ca4d3ae 100644
--- a/test/tint/builtins/gen/all/353d6a.wgsl
+++ b/test/tint/builtins/gen/all/353d6a.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/all/986c7b.wgsl

diff --git a/test/tint/builtins/gen/all/986c7b.wgsl b/test/tint/builtins/gen/all/986c7b.wgsl
index 7f58c25..f135a9f 100644
--- a/test/tint/builtins/gen/all/986c7b.wgsl
+++ b/test/tint/builtins/gen/all/986c7b.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/all/bd2dba.wgsl

diff --git a/test/tint/builtins/gen/all/bd2dba.wgsl b/test/tint/builtins/gen/all/bd2dba.wgsl
index f36e3f7..16c6ac6 100644
--- a/test/tint/builtins/gen/all/bd2dba.wgsl
+++ b/test/tint/builtins/gen/all/bd2dba.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/all/f46790.wgsl

diff --git a/test/tint/builtins/gen/all/f46790.wgsl b/test/tint/builtins/gen/all/f46790.wgsl
index e3e3f72..aaf9f06 100644
--- a/test/tint/builtins/gen/all/f46790.wgsl
+++ b/test/tint/builtins/gen/all/f46790.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/any/083428.wgsl

diff --git a/test/tint/builtins/gen/any/083428.wgsl b/test/tint/builtins/gen/any/083428.wgsl
index 542fbcd..6eb6b27 100644
--- a/test/tint/builtins/gen/any/083428.wgsl
+++ b/test/tint/builtins/gen/any/083428.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/any/0e3e58.wgsl

diff --git a/test/tint/builtins/gen/any/0e3e58.wgsl b/test/tint/builtins/gen/any/0e3e58.wgsl
index 506de4c..e8a9c40 100644
--- a/test/tint/builtins/gen/any/0e3e58.wgsl
+++ b/test/tint/builtins/gen/any/0e3e58.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/any/2ab91a.wgsl

diff --git a/test/tint/builtins/gen/any/2ab91a.wgsl b/test/tint/builtins/gen/any/2ab91a.wgsl
index 7e32b80..7a826f9 100644
--- a/test/tint/builtins/gen/any/2ab91a.wgsl
+++ b/test/tint/builtins/gen/any/2ab91a.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/any/e755c1.wgsl

diff --git a/test/tint/builtins/gen/any/e755c1.wgsl b/test/tint/builtins/gen/any/e755c1.wgsl
index 6362a68..5808fda 100644
--- a/test/tint/builtins/gen/any/e755c1.wgsl
+++ b/test/tint/builtins/gen/any/e755c1.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/arrayLength/1588cd.wgsl

diff --git a/test/tint/builtins/gen/arrayLength/1588cd.wgsl b/test/tint/builtins/gen/arrayLength/1588cd.wgsl
index 25f05b2..80a190d 100644
--- a/test/tint/builtins/gen/arrayLength/1588cd.wgsl
+++ b/test/tint/builtins/gen/arrayLength/1588cd.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/arrayLength/61b1c7.wgsl

diff --git a/test/tint/builtins/gen/arrayLength/61b1c7.wgsl b/test/tint/builtins/gen/arrayLength/61b1c7.wgsl
index 1bac505..cae364a 100644
--- a/test/tint/builtins/gen/arrayLength/61b1c7.wgsl
+++ b/test/tint/builtins/gen/arrayLength/61b1c7.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/arrayLength/a0f5ca.wgsl

diff --git a/test/tint/builtins/gen/arrayLength/a0f5ca.wgsl b/test/tint/builtins/gen/arrayLength/a0f5ca.wgsl
index b313858..c7ab943 100644
--- a/test/tint/builtins/gen/arrayLength/a0f5ca.wgsl
+++ b/test/tint/builtins/gen/arrayLength/a0f5ca.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/arrayLength/cdd123.wgsl

diff --git a/test/tint/builtins/gen/arrayLength/cdd123.wgsl b/test/tint/builtins/gen/arrayLength/cdd123.wgsl
index 0589da2..3b325ff 100644
--- a/test/tint/builtins/gen/arrayLength/cdd123.wgsl
+++ b/test/tint/builtins/gen/arrayLength/cdd123.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/arrayLength/cfca0a.wgsl

diff --git a/test/tint/builtins/gen/arrayLength/cfca0a.wgsl b/test/tint/builtins/gen/arrayLength/cfca0a.wgsl
index 51f628b..f797c03 100644
--- a/test/tint/builtins/gen/arrayLength/cfca0a.wgsl
+++ b/test/tint/builtins/gen/arrayLength/cfca0a.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/arrayLength/eb510f.wgsl

diff --git a/test/tint/builtins/gen/arrayLength/eb510f.wgsl b/test/tint/builtins/gen/arrayLength/eb510f.wgsl
index 44ade8b..a678ae0 100644
--- a/test/tint/builtins/gen/arrayLength/eb510f.wgsl
+++ b/test/tint/builtins/gen/arrayLength/eb510f.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/asin/064953.wgsl

diff --git a/test/tint/builtins/gen/asin/064953.wgsl b/test/tint/builtins/gen/asin/064953.wgsl
index 5a08a25..2051a83 100644
--- a/test/tint/builtins/gen/asin/064953.wgsl
+++ b/test/tint/builtins/gen/asin/064953.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/asin/7b6a44.wgsl

diff --git a/test/tint/builtins/gen/asin/7b6a44.wgsl b/test/tint/builtins/gen/asin/7b6a44.wgsl
index 22ddf8b..de1b8a0 100644
--- a/test/tint/builtins/gen/asin/7b6a44.wgsl
+++ b/test/tint/builtins/gen/asin/7b6a44.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/asin/8cd9c9.wgsl

diff --git a/test/tint/builtins/gen/asin/8cd9c9.wgsl b/test/tint/builtins/gen/asin/8cd9c9.wgsl
index f5a9266..c487d6e 100644
--- a/test/tint/builtins/gen/asin/8cd9c9.wgsl
+++ b/test/tint/builtins/gen/asin/8cd9c9.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/asin/c0c272.wgsl

diff --git a/test/tint/builtins/gen/asin/c0c272.wgsl b/test/tint/builtins/gen/asin/c0c272.wgsl
index 133657e..2b2846d 100644
--- a/test/tint/builtins/gen/asin/c0c272.wgsl
+++ b/test/tint/builtins/gen/asin/c0c272.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/atan/02979a.wgsl

diff --git a/test/tint/builtins/gen/atan/02979a.wgsl b/test/tint/builtins/gen/atan/02979a.wgsl
index 4624dbc..0404f6d 100644
--- a/test/tint/builtins/gen/atan/02979a.wgsl
+++ b/test/tint/builtins/gen/atan/02979a.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/atan/331e6d.wgsl

diff --git a/test/tint/builtins/gen/atan/331e6d.wgsl b/test/tint/builtins/gen/atan/331e6d.wgsl
index 43d3be6..f1227b9 100644
--- a/test/tint/builtins/gen/atan/331e6d.wgsl
+++ b/test/tint/builtins/gen/atan/331e6d.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/atan/a8b696.wgsl

diff --git a/test/tint/builtins/gen/atan/a8b696.wgsl b/test/tint/builtins/gen/atan/a8b696.wgsl
index 4d946e6..6140bd4 100644
--- a/test/tint/builtins/gen/atan/a8b696.wgsl
+++ b/test/tint/builtins/gen/atan/a8b696.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/atan/ad96e4.wgsl

diff --git a/test/tint/builtins/gen/atan/ad96e4.wgsl b/test/tint/builtins/gen/atan/ad96e4.wgsl
index f0d71ed..c1962a3 100644
--- a/test/tint/builtins/gen/atan/ad96e4.wgsl
+++ b/test/tint/builtins/gen/atan/ad96e4.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/atan2/57fb13.wgsl

diff --git a/test/tint/builtins/gen/atan2/57fb13.wgsl b/test/tint/builtins/gen/atan2/57fb13.wgsl
index 0362c9d..b0dcf5b 100644
--- a/test/tint/builtins/gen/atan2/57fb13.wgsl
+++ b/test/tint/builtins/gen/atan2/57fb13.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/atan2/96057c.wgsl

diff --git a/test/tint/builtins/gen/atan2/96057c.wgsl b/test/tint/builtins/gen/atan2/96057c.wgsl
index a3bad62..fdb568d 100644
--- a/test/tint/builtins/gen/atan2/96057c.wgsl
+++ b/test/tint/builtins/gen/atan2/96057c.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/atan2/a70d0d.wgsl

diff --git a/test/tint/builtins/gen/atan2/a70d0d.wgsl b/test/tint/builtins/gen/atan2/a70d0d.wgsl
index fe3ec65..32606c5 100644
--- a/test/tint/builtins/gen/atan2/a70d0d.wgsl
+++ b/test/tint/builtins/gen/atan2/a70d0d.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/atan2/ae713e.wgsl

diff --git a/test/tint/builtins/gen/atan2/ae713e.wgsl b/test/tint/builtins/gen/atan2/ae713e.wgsl
index 50b8b8f..04c90a5 100644
--- a/test/tint/builtins/gen/atan2/ae713e.wgsl
+++ b/test/tint/builtins/gen/atan2/ae713e.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/atomicAdd/794055.wgsl

diff --git a/test/tint/builtins/gen/atomicAdd/794055.wgsl b/test/tint/builtins/gen/atomicAdd/794055.wgsl
index 97cf17c..7dc9f15 100644
--- a/test/tint/builtins/gen/atomicAdd/794055.wgsl
+++ b/test/tint/builtins/gen/atomicAdd/794055.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/atomicAdd/8a199a.wgsl

diff --git a/test/tint/builtins/gen/atomicAdd/8a199a.wgsl b/test/tint/builtins/gen/atomicAdd/8a199a.wgsl
index 55ef7cf..dcd02ce 100644
--- a/test/tint/builtins/gen/atomicAdd/8a199a.wgsl
+++ b/test/tint/builtins/gen/atomicAdd/8a199a.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/atomicAdd/d32fe4.wgsl

diff --git a/test/tint/builtins/gen/atomicAdd/d32fe4.wgsl b/test/tint/builtins/gen/atomicAdd/d32fe4.wgsl
index 167c225..1d392dd 100644
--- a/test/tint/builtins/gen/atomicAdd/d32fe4.wgsl
+++ b/test/tint/builtins/gen/atomicAdd/d32fe4.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/atomicAdd/d5db1d.wgsl

diff --git a/test/tint/builtins/gen/atomicAdd/d5db1d.wgsl b/test/tint/builtins/gen/atomicAdd/d5db1d.wgsl
index aa00e56..2b898a3 100644
--- a/test/tint/builtins/gen/atomicAdd/d5db1d.wgsl
+++ b/test/tint/builtins/gen/atomicAdd/d5db1d.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/atomicAnd/152966.wgsl

diff --git a/test/tint/builtins/gen/atomicAnd/152966.wgsl b/test/tint/builtins/gen/atomicAnd/152966.wgsl
index 5e9a323..f6506d6 100644
--- a/test/tint/builtins/gen/atomicAnd/152966.wgsl
+++ b/test/tint/builtins/gen/atomicAnd/152966.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/atomicAnd/34edd3.wgsl

diff --git a/test/tint/builtins/gen/atomicAnd/34edd3.wgsl b/test/tint/builtins/gen/atomicAnd/34edd3.wgsl
index a77f6bf..acfcca1 100644
--- a/test/tint/builtins/gen/atomicAnd/34edd3.wgsl
+++ b/test/tint/builtins/gen/atomicAnd/34edd3.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/atomicAnd/45a819.wgsl

diff --git a/test/tint/builtins/gen/atomicAnd/45a819.wgsl b/test/tint/builtins/gen/atomicAnd/45a819.wgsl
index 35979fe..59730ce 100644
--- a/test/tint/builtins/gen/atomicAnd/45a819.wgsl
+++ b/test/tint/builtins/gen/atomicAnd/45a819.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/atomicAnd/85a8d9.wgsl

diff --git a/test/tint/builtins/gen/atomicAnd/85a8d9.wgsl b/test/tint/builtins/gen/atomicAnd/85a8d9.wgsl
index bfdd088..719459d 100644
--- a/test/tint/builtins/gen/atomicAnd/85a8d9.wgsl
+++ b/test/tint/builtins/gen/atomicAnd/85a8d9.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/atomicCompareExchangeWeak/12871c.wgsl

diff --git a/test/tint/builtins/gen/atomicCompareExchangeWeak/12871c.wgsl b/test/tint/builtins/gen/atomicCompareExchangeWeak/12871c.wgsl
index 66ffc04..650f0d8 100644
--- a/test/tint/builtins/gen/atomicCompareExchangeWeak/12871c.wgsl
+++ b/test/tint/builtins/gen/atomicCompareExchangeWeak/12871c.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/atomicCompareExchangeWeak/6673da.wgsl

diff --git a/test/tint/builtins/gen/atomicCompareExchangeWeak/6673da.wgsl b/test/tint/builtins/gen/atomicCompareExchangeWeak/6673da.wgsl
index f9f15bb..ffa555d 100644
--- a/test/tint/builtins/gen/atomicCompareExchangeWeak/6673da.wgsl
+++ b/test/tint/builtins/gen/atomicCompareExchangeWeak/6673da.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/atomicCompareExchangeWeak/89ea3b.wgsl

diff --git a/test/tint/builtins/gen/atomicCompareExchangeWeak/89ea3b.wgsl b/test/tint/builtins/gen/atomicCompareExchangeWeak/89ea3b.wgsl
index 2f2c251..b36f366 100644
--- a/test/tint/builtins/gen/atomicCompareExchangeWeak/89ea3b.wgsl
+++ b/test/tint/builtins/gen/atomicCompareExchangeWeak/89ea3b.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/atomicCompareExchangeWeak/b2ab2c.wgsl

diff --git a/test/tint/builtins/gen/atomicCompareExchangeWeak/b2ab2c.wgsl b/test/tint/builtins/gen/atomicCompareExchangeWeak/b2ab2c.wgsl
index 0df6c0f..755b539 100644
--- a/test/tint/builtins/gen/atomicCompareExchangeWeak/b2ab2c.wgsl
+++ b/test/tint/builtins/gen/atomicCompareExchangeWeak/b2ab2c.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/atomicExchange/0a5dca.wgsl

diff --git a/test/tint/builtins/gen/atomicExchange/0a5dca.wgsl b/test/tint/builtins/gen/atomicExchange/0a5dca.wgsl
index 5fb5b65..f224317 100644
--- a/test/tint/builtins/gen/atomicExchange/0a5dca.wgsl
+++ b/test/tint/builtins/gen/atomicExchange/0a5dca.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/atomicExchange/d59712.wgsl

diff --git a/test/tint/builtins/gen/atomicExchange/d59712.wgsl b/test/tint/builtins/gen/atomicExchange/d59712.wgsl
index 5109bb7..a5c16a0 100644
--- a/test/tint/builtins/gen/atomicExchange/d59712.wgsl
+++ b/test/tint/builtins/gen/atomicExchange/d59712.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/atomicExchange/e114ba.wgsl

diff --git a/test/tint/builtins/gen/atomicExchange/e114ba.wgsl b/test/tint/builtins/gen/atomicExchange/e114ba.wgsl
index bb22f27..8a72838 100644
--- a/test/tint/builtins/gen/atomicExchange/e114ba.wgsl
+++ b/test/tint/builtins/gen/atomicExchange/e114ba.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/atomicExchange/f2e22f.wgsl

diff --git a/test/tint/builtins/gen/atomicExchange/f2e22f.wgsl b/test/tint/builtins/gen/atomicExchange/f2e22f.wgsl
index f9af168..338ddb4 100644
--- a/test/tint/builtins/gen/atomicExchange/f2e22f.wgsl
+++ b/test/tint/builtins/gen/atomicExchange/f2e22f.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/atomicLoad/0806ad.wgsl

diff --git a/test/tint/builtins/gen/atomicLoad/0806ad.wgsl b/test/tint/builtins/gen/atomicLoad/0806ad.wgsl
index 61fd4ec..f6c8578 100644
--- a/test/tint/builtins/gen/atomicLoad/0806ad.wgsl
+++ b/test/tint/builtins/gen/atomicLoad/0806ad.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/atomicLoad/361bf1.wgsl

diff --git a/test/tint/builtins/gen/atomicLoad/361bf1.wgsl b/test/tint/builtins/gen/atomicLoad/361bf1.wgsl
index 23841ab..bc93e52 100644
--- a/test/tint/builtins/gen/atomicLoad/361bf1.wgsl
+++ b/test/tint/builtins/gen/atomicLoad/361bf1.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/atomicLoad/afcc03.wgsl

diff --git a/test/tint/builtins/gen/atomicLoad/afcc03.wgsl b/test/tint/builtins/gen/atomicLoad/afcc03.wgsl
index 2f29bbc..f20d63a 100644
--- a/test/tint/builtins/gen/atomicLoad/afcc03.wgsl
+++ b/test/tint/builtins/gen/atomicLoad/afcc03.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/atomicLoad/fe6cc3.wgsl

diff --git a/test/tint/builtins/gen/atomicLoad/fe6cc3.wgsl b/test/tint/builtins/gen/atomicLoad/fe6cc3.wgsl
index 854e9fe..c03d971 100644
--- a/test/tint/builtins/gen/atomicLoad/fe6cc3.wgsl
+++ b/test/tint/builtins/gen/atomicLoad/fe6cc3.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/atomicMax/51b9be.wgsl

diff --git a/test/tint/builtins/gen/atomicMax/51b9be.wgsl b/test/tint/builtins/gen/atomicMax/51b9be.wgsl
index 6303854..ce0f800 100644
--- a/test/tint/builtins/gen/atomicMax/51b9be.wgsl
+++ b/test/tint/builtins/gen/atomicMax/51b9be.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/atomicMax/92aa72.wgsl

diff --git a/test/tint/builtins/gen/atomicMax/92aa72.wgsl b/test/tint/builtins/gen/atomicMax/92aa72.wgsl
index 4924d84..38aafe7 100644
--- a/test/tint/builtins/gen/atomicMax/92aa72.wgsl
+++ b/test/tint/builtins/gen/atomicMax/92aa72.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/atomicMax/a89cc3.wgsl

diff --git a/test/tint/builtins/gen/atomicMax/a89cc3.wgsl b/test/tint/builtins/gen/atomicMax/a89cc3.wgsl
index 904cea8..549d4ed 100644
--- a/test/tint/builtins/gen/atomicMax/a89cc3.wgsl
+++ b/test/tint/builtins/gen/atomicMax/a89cc3.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/atomicMax/beccfc.wgsl

diff --git a/test/tint/builtins/gen/atomicMax/beccfc.wgsl b/test/tint/builtins/gen/atomicMax/beccfc.wgsl
index b26574d..e72c315 100644
--- a/test/tint/builtins/gen/atomicMax/beccfc.wgsl
+++ b/test/tint/builtins/gen/atomicMax/beccfc.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/atomicMin/278235.wgsl

diff --git a/test/tint/builtins/gen/atomicMin/278235.wgsl b/test/tint/builtins/gen/atomicMin/278235.wgsl
index 591d091..4ed90a6 100644
--- a/test/tint/builtins/gen/atomicMin/278235.wgsl
+++ b/test/tint/builtins/gen/atomicMin/278235.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/atomicMin/69d383.wgsl

diff --git a/test/tint/builtins/gen/atomicMin/69d383.wgsl b/test/tint/builtins/gen/atomicMin/69d383.wgsl
index 9b435d4..7c161a2 100644
--- a/test/tint/builtins/gen/atomicMin/69d383.wgsl
+++ b/test/tint/builtins/gen/atomicMin/69d383.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/atomicMin/8e38dc.wgsl

diff --git a/test/tint/builtins/gen/atomicMin/8e38dc.wgsl b/test/tint/builtins/gen/atomicMin/8e38dc.wgsl
index fdde4a5..8c89ffc 100644
--- a/test/tint/builtins/gen/atomicMin/8e38dc.wgsl
+++ b/test/tint/builtins/gen/atomicMin/8e38dc.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/atomicMin/c67a74.wgsl

diff --git a/test/tint/builtins/gen/atomicMin/c67a74.wgsl b/test/tint/builtins/gen/atomicMin/c67a74.wgsl
index f55c394..1f2c3e0 100644
--- a/test/tint/builtins/gen/atomicMin/c67a74.wgsl
+++ b/test/tint/builtins/gen/atomicMin/c67a74.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/atomicOr/5e3d61.wgsl

diff --git a/test/tint/builtins/gen/atomicOr/5e3d61.wgsl b/test/tint/builtins/gen/atomicOr/5e3d61.wgsl
index d6a8468..346ba96 100644
--- a/test/tint/builtins/gen/atomicOr/5e3d61.wgsl
+++ b/test/tint/builtins/gen/atomicOr/5e3d61.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/atomicOr/5e95d4.wgsl

diff --git a/test/tint/builtins/gen/atomicOr/5e95d4.wgsl b/test/tint/builtins/gen/atomicOr/5e95d4.wgsl
index b66fd0c..877a558 100644
--- a/test/tint/builtins/gen/atomicOr/5e95d4.wgsl
+++ b/test/tint/builtins/gen/atomicOr/5e95d4.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/atomicOr/8d96a0.wgsl

diff --git a/test/tint/builtins/gen/atomicOr/8d96a0.wgsl b/test/tint/builtins/gen/atomicOr/8d96a0.wgsl
index 2f95738..248067b 100644
--- a/test/tint/builtins/gen/atomicOr/8d96a0.wgsl
+++ b/test/tint/builtins/gen/atomicOr/8d96a0.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/atomicOr/d09248.wgsl

diff --git a/test/tint/builtins/gen/atomicOr/d09248.wgsl b/test/tint/builtins/gen/atomicOr/d09248.wgsl
index 7ffd645..04799d3 100644
--- a/test/tint/builtins/gen/atomicOr/d09248.wgsl
+++ b/test/tint/builtins/gen/atomicOr/d09248.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/atomicStore/726882.wgsl

diff --git a/test/tint/builtins/gen/atomicStore/726882.wgsl b/test/tint/builtins/gen/atomicStore/726882.wgsl
index 3287e49..2e06a11 100644
--- a/test/tint/builtins/gen/atomicStore/726882.wgsl
+++ b/test/tint/builtins/gen/atomicStore/726882.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/atomicStore/8bea94.wgsl

diff --git a/test/tint/builtins/gen/atomicStore/8bea94.wgsl b/test/tint/builtins/gen/atomicStore/8bea94.wgsl
index bf474e77..adf6bc8 100644
--- a/test/tint/builtins/gen/atomicStore/8bea94.wgsl
+++ b/test/tint/builtins/gen/atomicStore/8bea94.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/atomicStore/cdc29e.wgsl

diff --git a/test/tint/builtins/gen/atomicStore/cdc29e.wgsl b/test/tint/builtins/gen/atomicStore/cdc29e.wgsl
index 362f702..50f0599 100644
--- a/test/tint/builtins/gen/atomicStore/cdc29e.wgsl
+++ b/test/tint/builtins/gen/atomicStore/cdc29e.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/atomicStore/d1e9a6.wgsl

diff --git a/test/tint/builtins/gen/atomicStore/d1e9a6.wgsl b/test/tint/builtins/gen/atomicStore/d1e9a6.wgsl
index 0de53f5..74463ef 100644
--- a/test/tint/builtins/gen/atomicStore/d1e9a6.wgsl
+++ b/test/tint/builtins/gen/atomicStore/d1e9a6.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/atomicSub/051100.wgsl

diff --git a/test/tint/builtins/gen/atomicSub/051100.wgsl b/test/tint/builtins/gen/atomicSub/051100.wgsl
index 818b85f..7a6c121 100644
--- a/test/tint/builtins/gen/atomicSub/051100.wgsl
+++ b/test/tint/builtins/gen/atomicSub/051100.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/atomicSub/0d26c2.wgsl

diff --git a/test/tint/builtins/gen/atomicSub/0d26c2.wgsl b/test/tint/builtins/gen/atomicSub/0d26c2.wgsl
index 43478d7..90b69e4 100644
--- a/test/tint/builtins/gen/atomicSub/0d26c2.wgsl
+++ b/test/tint/builtins/gen/atomicSub/0d26c2.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/atomicSub/15bfc9.wgsl

diff --git a/test/tint/builtins/gen/atomicSub/15bfc9.wgsl b/test/tint/builtins/gen/atomicSub/15bfc9.wgsl
index 8609e9f..1b0f4fe 100644
--- a/test/tint/builtins/gen/atomicSub/15bfc9.wgsl
+++ b/test/tint/builtins/gen/atomicSub/15bfc9.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/atomicSub/77883a.wgsl

diff --git a/test/tint/builtins/gen/atomicSub/77883a.wgsl b/test/tint/builtins/gen/atomicSub/77883a.wgsl
index 3ab3abd..d9ee7f7 100644
--- a/test/tint/builtins/gen/atomicSub/77883a.wgsl
+++ b/test/tint/builtins/gen/atomicSub/77883a.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/atomicXor/54510e.wgsl

diff --git a/test/tint/builtins/gen/atomicXor/54510e.wgsl b/test/tint/builtins/gen/atomicXor/54510e.wgsl
index 755c218..ad0809d 100644
--- a/test/tint/builtins/gen/atomicXor/54510e.wgsl
+++ b/test/tint/builtins/gen/atomicXor/54510e.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/atomicXor/75dc95.wgsl

diff --git a/test/tint/builtins/gen/atomicXor/75dc95.wgsl b/test/tint/builtins/gen/atomicXor/75dc95.wgsl
index 951d732..b7efd78 100644
--- a/test/tint/builtins/gen/atomicXor/75dc95.wgsl
+++ b/test/tint/builtins/gen/atomicXor/75dc95.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/atomicXor/c1b78c.wgsl

diff --git a/test/tint/builtins/gen/atomicXor/c1b78c.wgsl b/test/tint/builtins/gen/atomicXor/c1b78c.wgsl
index 54c82df..b8a9a98 100644
--- a/test/tint/builtins/gen/atomicXor/c1b78c.wgsl
+++ b/test/tint/builtins/gen/atomicXor/c1b78c.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/atomicXor/c8e6be.wgsl

diff --git a/test/tint/builtins/gen/atomicXor/c8e6be.wgsl b/test/tint/builtins/gen/atomicXor/c8e6be.wgsl
index bfc379d..2457d46 100644
--- a/test/tint/builtins/gen/atomicXor/c8e6be.wgsl
+++ b/test/tint/builtins/gen/atomicXor/c8e6be.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/ceil/34064b.wgsl

diff --git a/test/tint/builtins/gen/ceil/34064b.wgsl b/test/tint/builtins/gen/ceil/34064b.wgsl
index 41f8602..5cd3ccc 100644
--- a/test/tint/builtins/gen/ceil/34064b.wgsl
+++ b/test/tint/builtins/gen/ceil/34064b.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/ceil/678655.wgsl

diff --git a/test/tint/builtins/gen/ceil/678655.wgsl b/test/tint/builtins/gen/ceil/678655.wgsl
index e9d4249..d09fe2c 100644
--- a/test/tint/builtins/gen/ceil/678655.wgsl
+++ b/test/tint/builtins/gen/ceil/678655.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/ceil/96f597.wgsl

diff --git a/test/tint/builtins/gen/ceil/96f597.wgsl b/test/tint/builtins/gen/ceil/96f597.wgsl
index 4b21a85..10cf5ab 100644
--- a/test/tint/builtins/gen/ceil/96f597.wgsl
+++ b/test/tint/builtins/gen/ceil/96f597.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/ceil/b74c16.wgsl

diff --git a/test/tint/builtins/gen/ceil/b74c16.wgsl b/test/tint/builtins/gen/ceil/b74c16.wgsl
index f80ec4d..229e58e 100644
--- a/test/tint/builtins/gen/ceil/b74c16.wgsl
+++ b/test/tint/builtins/gen/ceil/b74c16.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/clamp/0acf8f.wgsl

diff --git a/test/tint/builtins/gen/clamp/0acf8f.wgsl b/test/tint/builtins/gen/clamp/0acf8f.wgsl
index e7a635b..31b7207 100644
--- a/test/tint/builtins/gen/clamp/0acf8f.wgsl
+++ b/test/tint/builtins/gen/clamp/0acf8f.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/clamp/1a32e3.wgsl

diff --git a/test/tint/builtins/gen/clamp/1a32e3.wgsl b/test/tint/builtins/gen/clamp/1a32e3.wgsl
index a42b965..b2450e5 100644
--- a/test/tint/builtins/gen/clamp/1a32e3.wgsl
+++ b/test/tint/builtins/gen/clamp/1a32e3.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/clamp/2bd567.wgsl

diff --git a/test/tint/builtins/gen/clamp/2bd567.wgsl b/test/tint/builtins/gen/clamp/2bd567.wgsl
index 9fa69a0..7858c5a 100644
--- a/test/tint/builtins/gen/clamp/2bd567.wgsl
+++ b/test/tint/builtins/gen/clamp/2bd567.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/clamp/2bde41.wgsl

diff --git a/test/tint/builtins/gen/clamp/2bde41.wgsl b/test/tint/builtins/gen/clamp/2bde41.wgsl
index bdc06b9..ba46736 100644
--- a/test/tint/builtins/gen/clamp/2bde41.wgsl
+++ b/test/tint/builtins/gen/clamp/2bde41.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/clamp/548fc7.wgsl

diff --git a/test/tint/builtins/gen/clamp/548fc7.wgsl b/test/tint/builtins/gen/clamp/548fc7.wgsl
index 202aecb..81e1882 100644
--- a/test/tint/builtins/gen/clamp/548fc7.wgsl
+++ b/test/tint/builtins/gen/clamp/548fc7.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/clamp/5f0819.wgsl

diff --git a/test/tint/builtins/gen/clamp/5f0819.wgsl b/test/tint/builtins/gen/clamp/5f0819.wgsl
index 5ee0369..6c211d3 100644
--- a/test/tint/builtins/gen/clamp/5f0819.wgsl
+++ b/test/tint/builtins/gen/clamp/5f0819.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/clamp/6c1749.wgsl

diff --git a/test/tint/builtins/gen/clamp/6c1749.wgsl b/test/tint/builtins/gen/clamp/6c1749.wgsl
index dd62b9c..b27362c 100644
--- a/test/tint/builtins/gen/clamp/6c1749.wgsl
+++ b/test/tint/builtins/gen/clamp/6c1749.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/clamp/7706d7.wgsl

diff --git a/test/tint/builtins/gen/clamp/7706d7.wgsl b/test/tint/builtins/gen/clamp/7706d7.wgsl
index 0ab5c81..587ba3d 100644
--- a/test/tint/builtins/gen/clamp/7706d7.wgsl
+++ b/test/tint/builtins/gen/clamp/7706d7.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/clamp/867397.wgsl

diff --git a/test/tint/builtins/gen/clamp/867397.wgsl b/test/tint/builtins/gen/clamp/867397.wgsl
index 6a0e4f3..9a48f1d 100644
--- a/test/tint/builtins/gen/clamp/867397.wgsl
+++ b/test/tint/builtins/gen/clamp/867397.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/clamp/a2de25.wgsl

diff --git a/test/tint/builtins/gen/clamp/a2de25.wgsl b/test/tint/builtins/gen/clamp/a2de25.wgsl
index 671ecbc..4d61378 100644
--- a/test/tint/builtins/gen/clamp/a2de25.wgsl
+++ b/test/tint/builtins/gen/clamp/a2de25.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/clamp/b07c65.wgsl

diff --git a/test/tint/builtins/gen/clamp/b07c65.wgsl b/test/tint/builtins/gen/clamp/b07c65.wgsl
index 1616879..7fbfccf 100644
--- a/test/tint/builtins/gen/clamp/b07c65.wgsl
+++ b/test/tint/builtins/gen/clamp/b07c65.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/clamp/bd43ce.wgsl

diff --git a/test/tint/builtins/gen/clamp/bd43ce.wgsl b/test/tint/builtins/gen/clamp/bd43ce.wgsl
index fbdbb70..55d2efe 100644
--- a/test/tint/builtins/gen/clamp/bd43ce.wgsl
+++ b/test/tint/builtins/gen/clamp/bd43ce.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/cos/16dc15.wgsl

diff --git a/test/tint/builtins/gen/cos/16dc15.wgsl b/test/tint/builtins/gen/cos/16dc15.wgsl
index 0e917e3..6d7f97d 100644
--- a/test/tint/builtins/gen/cos/16dc15.wgsl
+++ b/test/tint/builtins/gen/cos/16dc15.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/cos/29d66d.wgsl

diff --git a/test/tint/builtins/gen/cos/29d66d.wgsl b/test/tint/builtins/gen/cos/29d66d.wgsl
index 7c47ea4..d3c4d96 100644
--- a/test/tint/builtins/gen/cos/29d66d.wgsl
+++ b/test/tint/builtins/gen/cos/29d66d.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/cos/c3b486.wgsl

diff --git a/test/tint/builtins/gen/cos/c3b486.wgsl b/test/tint/builtins/gen/cos/c3b486.wgsl
index 942f1bd..b96d9d5 100644
--- a/test/tint/builtins/gen/cos/c3b486.wgsl
+++ b/test/tint/builtins/gen/cos/c3b486.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/cos/c5c28e.wgsl

diff --git a/test/tint/builtins/gen/cos/c5c28e.wgsl b/test/tint/builtins/gen/cos/c5c28e.wgsl
index d88b9e1..735be07 100644
--- a/test/tint/builtins/gen/cos/c5c28e.wgsl
+++ b/test/tint/builtins/gen/cos/c5c28e.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/cosh/377652.wgsl

diff --git a/test/tint/builtins/gen/cosh/377652.wgsl b/test/tint/builtins/gen/cosh/377652.wgsl
index ff336ed..25ca8eb 100644
--- a/test/tint/builtins/gen/cosh/377652.wgsl
+++ b/test/tint/builtins/gen/cosh/377652.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/cosh/c13756.wgsl

diff --git a/test/tint/builtins/gen/cosh/c13756.wgsl b/test/tint/builtins/gen/cosh/c13756.wgsl
index 4eadf79..ef05045 100644
--- a/test/tint/builtins/gen/cosh/c13756.wgsl
+++ b/test/tint/builtins/gen/cosh/c13756.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/cosh/da92dd.wgsl

diff --git a/test/tint/builtins/gen/cosh/da92dd.wgsl b/test/tint/builtins/gen/cosh/da92dd.wgsl
index 770696c..029d87d 100644
--- a/test/tint/builtins/gen/cosh/da92dd.wgsl
+++ b/test/tint/builtins/gen/cosh/da92dd.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/cosh/e0c1de.wgsl

diff --git a/test/tint/builtins/gen/cosh/e0c1de.wgsl b/test/tint/builtins/gen/cosh/e0c1de.wgsl
index 79f948e..9bc0f11 100644
--- a/test/tint/builtins/gen/cosh/e0c1de.wgsl
+++ b/test/tint/builtins/gen/cosh/e0c1de.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/countOneBits/0d0e46.wgsl

diff --git a/test/tint/builtins/gen/countOneBits/0d0e46.wgsl b/test/tint/builtins/gen/countOneBits/0d0e46.wgsl
index adef749..b9bcc99 100644
--- a/test/tint/builtins/gen/countOneBits/0d0e46.wgsl
+++ b/test/tint/builtins/gen/countOneBits/0d0e46.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/countOneBits/0f7980.wgsl

diff --git a/test/tint/builtins/gen/countOneBits/0f7980.wgsl b/test/tint/builtins/gen/countOneBits/0f7980.wgsl
index 95185f5..035d338 100644
--- a/test/tint/builtins/gen/countOneBits/0f7980.wgsl
+++ b/test/tint/builtins/gen/countOneBits/0f7980.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/countOneBits/65d2ae.wgsl

diff --git a/test/tint/builtins/gen/countOneBits/65d2ae.wgsl b/test/tint/builtins/gen/countOneBits/65d2ae.wgsl
index c0d2bfa..7d21d1b 100644
--- a/test/tint/builtins/gen/countOneBits/65d2ae.wgsl
+++ b/test/tint/builtins/gen/countOneBits/65d2ae.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/countOneBits/690cfc.wgsl

diff --git a/test/tint/builtins/gen/countOneBits/690cfc.wgsl b/test/tint/builtins/gen/countOneBits/690cfc.wgsl
index 7770626..0b81a72 100644
--- a/test/tint/builtins/gen/countOneBits/690cfc.wgsl
+++ b/test/tint/builtins/gen/countOneBits/690cfc.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/countOneBits/94fd81.wgsl

diff --git a/test/tint/builtins/gen/countOneBits/94fd81.wgsl b/test/tint/builtins/gen/countOneBits/94fd81.wgsl
index 7c4d42f..b2c90a7 100644
--- a/test/tint/builtins/gen/countOneBits/94fd81.wgsl
+++ b/test/tint/builtins/gen/countOneBits/94fd81.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/countOneBits/ae44f9.wgsl

diff --git a/test/tint/builtins/gen/countOneBits/ae44f9.wgsl b/test/tint/builtins/gen/countOneBits/ae44f9.wgsl
index 713ab90..214e9a0 100644
--- a/test/tint/builtins/gen/countOneBits/ae44f9.wgsl
+++ b/test/tint/builtins/gen/countOneBits/ae44f9.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/countOneBits/af90e2.wgsl

diff --git a/test/tint/builtins/gen/countOneBits/af90e2.wgsl b/test/tint/builtins/gen/countOneBits/af90e2.wgsl
index 48ea794..73881b5 100644
--- a/test/tint/builtins/gen/countOneBits/af90e2.wgsl
+++ b/test/tint/builtins/gen/countOneBits/af90e2.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/countOneBits/fd88b2.wgsl

diff --git a/test/tint/builtins/gen/countOneBits/fd88b2.wgsl b/test/tint/builtins/gen/countOneBits/fd88b2.wgsl
index a0f758d..2aa57cb 100644
--- a/test/tint/builtins/gen/countOneBits/fd88b2.wgsl
+++ b/test/tint/builtins/gen/countOneBits/fd88b2.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/cross/041cb0.wgsl

diff --git a/test/tint/builtins/gen/cross/041cb0.wgsl b/test/tint/builtins/gen/cross/041cb0.wgsl
index ce0f043..e328d7a 100644
--- a/test/tint/builtins/gen/cross/041cb0.wgsl
+++ b/test/tint/builtins/gen/cross/041cb0.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/degrees/0d170c.wgsl

diff --git a/test/tint/builtins/gen/degrees/0d170c.wgsl b/test/tint/builtins/gen/degrees/0d170c.wgsl
index 3dc201e..acb37d1 100644
--- a/test/tint/builtins/gen/degrees/0d170c.wgsl
+++ b/test/tint/builtins/gen/degrees/0d170c.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/degrees/1ad5df.wgsl

diff --git a/test/tint/builtins/gen/degrees/1ad5df.wgsl b/test/tint/builtins/gen/degrees/1ad5df.wgsl
index d6ec551..e28327c 100644
--- a/test/tint/builtins/gen/degrees/1ad5df.wgsl
+++ b/test/tint/builtins/gen/degrees/1ad5df.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/degrees/2af623.wgsl

diff --git a/test/tint/builtins/gen/degrees/2af623.wgsl b/test/tint/builtins/gen/degrees/2af623.wgsl
index 55f67d8d..06fae0b 100644
--- a/test/tint/builtins/gen/degrees/2af623.wgsl
+++ b/test/tint/builtins/gen/degrees/2af623.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/degrees/51f705.wgsl

diff --git a/test/tint/builtins/gen/degrees/51f705.wgsl b/test/tint/builtins/gen/degrees/51f705.wgsl
index c55523a..25a905f 100644
--- a/test/tint/builtins/gen/degrees/51f705.wgsl
+++ b/test/tint/builtins/gen/degrees/51f705.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/determinant/2b62ba.wgsl

diff --git a/test/tint/builtins/gen/determinant/2b62ba.wgsl b/test/tint/builtins/gen/determinant/2b62ba.wgsl
index 7189a45..843d2fd 100644
--- a/test/tint/builtins/gen/determinant/2b62ba.wgsl
+++ b/test/tint/builtins/gen/determinant/2b62ba.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/determinant/a0a87c.wgsl

diff --git a/test/tint/builtins/gen/determinant/a0a87c.wgsl b/test/tint/builtins/gen/determinant/a0a87c.wgsl
index 31873fa..07acc02 100644
--- a/test/tint/builtins/gen/determinant/a0a87c.wgsl
+++ b/test/tint/builtins/gen/determinant/a0a87c.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/determinant/e19305.wgsl

diff --git a/test/tint/builtins/gen/determinant/e19305.wgsl b/test/tint/builtins/gen/determinant/e19305.wgsl
index 7b3329e..a9fbdf3 100644
--- a/test/tint/builtins/gen/determinant/e19305.wgsl
+++ b/test/tint/builtins/gen/determinant/e19305.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/distance/0657d4.wgsl

diff --git a/test/tint/builtins/gen/distance/0657d4.wgsl b/test/tint/builtins/gen/distance/0657d4.wgsl
index 73d4596..e23b25d 100644
--- a/test/tint/builtins/gen/distance/0657d4.wgsl
+++ b/test/tint/builtins/gen/distance/0657d4.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/distance/9646ea.wgsl

diff --git a/test/tint/builtins/gen/distance/9646ea.wgsl b/test/tint/builtins/gen/distance/9646ea.wgsl
index da013ae..0d9fcf9 100644
--- a/test/tint/builtins/gen/distance/9646ea.wgsl
+++ b/test/tint/builtins/gen/distance/9646ea.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/distance/aa4055.wgsl

diff --git a/test/tint/builtins/gen/distance/aa4055.wgsl b/test/tint/builtins/gen/distance/aa4055.wgsl
index bce51c6..c6707c6 100644
--- a/test/tint/builtins/gen/distance/aa4055.wgsl
+++ b/test/tint/builtins/gen/distance/aa4055.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/distance/cfed73.wgsl

diff --git a/test/tint/builtins/gen/distance/cfed73.wgsl b/test/tint/builtins/gen/distance/cfed73.wgsl
index 9ad9a81..072a5a3 100644
--- a/test/tint/builtins/gen/distance/cfed73.wgsl
+++ b/test/tint/builtins/gen/distance/cfed73.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/dot/0c577b.wgsl

diff --git a/test/tint/builtins/gen/dot/0c577b.wgsl b/test/tint/builtins/gen/dot/0c577b.wgsl
index 0724d16..31880ee 100644
--- a/test/tint/builtins/gen/dot/0c577b.wgsl
+++ b/test/tint/builtins/gen/dot/0c577b.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/dot/7548a0.wgsl

diff --git a/test/tint/builtins/gen/dot/7548a0.wgsl b/test/tint/builtins/gen/dot/7548a0.wgsl
index 647c3a7..4ec257b 100644
--- a/test/tint/builtins/gen/dot/7548a0.wgsl
+++ b/test/tint/builtins/gen/dot/7548a0.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/dot/883f0e.wgsl

diff --git a/test/tint/builtins/gen/dot/883f0e.wgsl b/test/tint/builtins/gen/dot/883f0e.wgsl
index 4b8db17..e4fa57f 100644
--- a/test/tint/builtins/gen/dot/883f0e.wgsl
+++ b/test/tint/builtins/gen/dot/883f0e.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/dot/97c7ee.wgsl

diff --git a/test/tint/builtins/gen/dot/97c7ee.wgsl b/test/tint/builtins/gen/dot/97c7ee.wgsl
index 5dc7481..cd625a5 100644
--- a/test/tint/builtins/gen/dot/97c7ee.wgsl
+++ b/test/tint/builtins/gen/dot/97c7ee.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/dot/ba4246.wgsl

diff --git a/test/tint/builtins/gen/dot/ba4246.wgsl b/test/tint/builtins/gen/dot/ba4246.wgsl
index cc7bb12..65c37bc 100644
--- a/test/tint/builtins/gen/dot/ba4246.wgsl
+++ b/test/tint/builtins/gen/dot/ba4246.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/dot/e994c7.wgsl

diff --git a/test/tint/builtins/gen/dot/e994c7.wgsl b/test/tint/builtins/gen/dot/e994c7.wgsl
index 2fbaa28..276d319 100644
--- a/test/tint/builtins/gen/dot/e994c7.wgsl
+++ b/test/tint/builtins/gen/dot/e994c7.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/dot/ef6b1d.wgsl

diff --git a/test/tint/builtins/gen/dot/ef6b1d.wgsl b/test/tint/builtins/gen/dot/ef6b1d.wgsl
index 3a39735..12a1413 100644
--- a/test/tint/builtins/gen/dot/ef6b1d.wgsl
+++ b/test/tint/builtins/gen/dot/ef6b1d.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/dot/f1312c.wgsl

diff --git a/test/tint/builtins/gen/dot/f1312c.wgsl b/test/tint/builtins/gen/dot/f1312c.wgsl
index 22e38b1..d927a0b 100644
--- a/test/tint/builtins/gen/dot/f1312c.wgsl
+++ b/test/tint/builtins/gen/dot/f1312c.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/dot/fc5f7c.wgsl

diff --git a/test/tint/builtins/gen/dot/fc5f7c.wgsl b/test/tint/builtins/gen/dot/fc5f7c.wgsl
index dda5044..266ffef 100644
--- a/test/tint/builtins/gen/dot/fc5f7c.wgsl
+++ b/test/tint/builtins/gen/dot/fc5f7c.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/dpdx/0763f7.wgsl

diff --git a/test/tint/builtins/gen/dpdx/0763f7.wgsl b/test/tint/builtins/gen/dpdx/0763f7.wgsl
index 003e03f..7d10a9f 100644
--- a/test/tint/builtins/gen/dpdx/0763f7.wgsl
+++ b/test/tint/builtins/gen/dpdx/0763f7.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/dpdx/99edb1.wgsl

diff --git a/test/tint/builtins/gen/dpdx/99edb1.wgsl b/test/tint/builtins/gen/dpdx/99edb1.wgsl
index 59f8956..2d9088f 100644
--- a/test/tint/builtins/gen/dpdx/99edb1.wgsl
+++ b/test/tint/builtins/gen/dpdx/99edb1.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/dpdx/c487fa.wgsl

diff --git a/test/tint/builtins/gen/dpdx/c487fa.wgsl b/test/tint/builtins/gen/dpdx/c487fa.wgsl
index 289a97d..6ab9184 100644
--- a/test/tint/builtins/gen/dpdx/c487fa.wgsl
+++ b/test/tint/builtins/gen/dpdx/c487fa.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/dpdx/e263de.wgsl

diff --git a/test/tint/builtins/gen/dpdx/e263de.wgsl b/test/tint/builtins/gen/dpdx/e263de.wgsl
index ff46515..1d82da5 100644
--- a/test/tint/builtins/gen/dpdx/e263de.wgsl
+++ b/test/tint/builtins/gen/dpdx/e263de.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/dpdxCoarse/029152.wgsl

diff --git a/test/tint/builtins/gen/dpdxCoarse/029152.wgsl b/test/tint/builtins/gen/dpdxCoarse/029152.wgsl
index 7792ffa..4a531d6 100644
--- a/test/tint/builtins/gen/dpdxCoarse/029152.wgsl
+++ b/test/tint/builtins/gen/dpdxCoarse/029152.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/dpdxCoarse/9581cf.wgsl

diff --git a/test/tint/builtins/gen/dpdxCoarse/9581cf.wgsl b/test/tint/builtins/gen/dpdxCoarse/9581cf.wgsl
index 2a08179..a7277e6 100644
--- a/test/tint/builtins/gen/dpdxCoarse/9581cf.wgsl
+++ b/test/tint/builtins/gen/dpdxCoarse/9581cf.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/dpdxCoarse/c28641.wgsl

diff --git a/test/tint/builtins/gen/dpdxCoarse/c28641.wgsl b/test/tint/builtins/gen/dpdxCoarse/c28641.wgsl
index 3fe013e..1d63a07 100644
--- a/test/tint/builtins/gen/dpdxCoarse/c28641.wgsl
+++ b/test/tint/builtins/gen/dpdxCoarse/c28641.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/dpdxCoarse/f64d7b.wgsl

diff --git a/test/tint/builtins/gen/dpdxCoarse/f64d7b.wgsl b/test/tint/builtins/gen/dpdxCoarse/f64d7b.wgsl
index e5543ea..9919283 100644
--- a/test/tint/builtins/gen/dpdxCoarse/f64d7b.wgsl
+++ b/test/tint/builtins/gen/dpdxCoarse/f64d7b.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/dpdxFine/8c5069.wgsl

diff --git a/test/tint/builtins/gen/dpdxFine/8c5069.wgsl b/test/tint/builtins/gen/dpdxFine/8c5069.wgsl
index a19dccd..ca1b3cc 100644
--- a/test/tint/builtins/gen/dpdxFine/8c5069.wgsl
+++ b/test/tint/builtins/gen/dpdxFine/8c5069.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/dpdxFine/9631de.wgsl

diff --git a/test/tint/builtins/gen/dpdxFine/9631de.wgsl b/test/tint/builtins/gen/dpdxFine/9631de.wgsl
index 1c1c50d..a51878e 100644
--- a/test/tint/builtins/gen/dpdxFine/9631de.wgsl
+++ b/test/tint/builtins/gen/dpdxFine/9631de.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/dpdxFine/f401a2.wgsl

diff --git a/test/tint/builtins/gen/dpdxFine/f401a2.wgsl b/test/tint/builtins/gen/dpdxFine/f401a2.wgsl
index d501e7a..2a688e3 100644
--- a/test/tint/builtins/gen/dpdxFine/f401a2.wgsl
+++ b/test/tint/builtins/gen/dpdxFine/f401a2.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/dpdxFine/f92fb6.wgsl

diff --git a/test/tint/builtins/gen/dpdxFine/f92fb6.wgsl b/test/tint/builtins/gen/dpdxFine/f92fb6.wgsl
index 99f58b7..c8e8ce0 100644
--- a/test/tint/builtins/gen/dpdxFine/f92fb6.wgsl
+++ b/test/tint/builtins/gen/dpdxFine/f92fb6.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/dpdy/699a05.wgsl

diff --git a/test/tint/builtins/gen/dpdy/699a05.wgsl b/test/tint/builtins/gen/dpdy/699a05.wgsl
index 6ffa8d8..b82a4b0 100644
--- a/test/tint/builtins/gen/dpdy/699a05.wgsl
+++ b/test/tint/builtins/gen/dpdy/699a05.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/dpdy/7f8d84.wgsl

diff --git a/test/tint/builtins/gen/dpdy/7f8d84.wgsl b/test/tint/builtins/gen/dpdy/7f8d84.wgsl
index 0298c49..e53e294 100644
--- a/test/tint/builtins/gen/dpdy/7f8d84.wgsl
+++ b/test/tint/builtins/gen/dpdy/7f8d84.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/dpdy/a8b56e.wgsl

diff --git a/test/tint/builtins/gen/dpdy/a8b56e.wgsl b/test/tint/builtins/gen/dpdy/a8b56e.wgsl
index 62408d5..6952e04 100644
--- a/test/tint/builtins/gen/dpdy/a8b56e.wgsl
+++ b/test/tint/builtins/gen/dpdy/a8b56e.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/dpdy/feb40f.wgsl

diff --git a/test/tint/builtins/gen/dpdy/feb40f.wgsl b/test/tint/builtins/gen/dpdy/feb40f.wgsl
index e6ff720..6e50d7c 100644
--- a/test/tint/builtins/gen/dpdy/feb40f.wgsl
+++ b/test/tint/builtins/gen/dpdy/feb40f.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/dpdyCoarse/3e1ab4.wgsl

diff --git a/test/tint/builtins/gen/dpdyCoarse/3e1ab4.wgsl b/test/tint/builtins/gen/dpdyCoarse/3e1ab4.wgsl
index 5817c55..7d6c58c 100644
--- a/test/tint/builtins/gen/dpdyCoarse/3e1ab4.wgsl
+++ b/test/tint/builtins/gen/dpdyCoarse/3e1ab4.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/dpdyCoarse/445d24.wgsl

diff --git a/test/tint/builtins/gen/dpdyCoarse/445d24.wgsl b/test/tint/builtins/gen/dpdyCoarse/445d24.wgsl
index 9206d8f..8c3197d 100644
--- a/test/tint/builtins/gen/dpdyCoarse/445d24.wgsl
+++ b/test/tint/builtins/gen/dpdyCoarse/445d24.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/dpdyCoarse/870a7e.wgsl

diff --git a/test/tint/builtins/gen/dpdyCoarse/870a7e.wgsl b/test/tint/builtins/gen/dpdyCoarse/870a7e.wgsl
index 81f0cd2..96addfa 100644
--- a/test/tint/builtins/gen/dpdyCoarse/870a7e.wgsl
+++ b/test/tint/builtins/gen/dpdyCoarse/870a7e.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/dpdyCoarse/ae1873.wgsl

diff --git a/test/tint/builtins/gen/dpdyCoarse/ae1873.wgsl b/test/tint/builtins/gen/dpdyCoarse/ae1873.wgsl
index ec0b565..a69bf63 100644
--- a/test/tint/builtins/gen/dpdyCoarse/ae1873.wgsl
+++ b/test/tint/builtins/gen/dpdyCoarse/ae1873.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/dpdyFine/1fb7ab.wgsl

diff --git a/test/tint/builtins/gen/dpdyFine/1fb7ab.wgsl b/test/tint/builtins/gen/dpdyFine/1fb7ab.wgsl
index 28d6efc..c316f63 100644
--- a/test/tint/builtins/gen/dpdyFine/1fb7ab.wgsl
+++ b/test/tint/builtins/gen/dpdyFine/1fb7ab.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/dpdyFine/6eb673.wgsl

diff --git a/test/tint/builtins/gen/dpdyFine/6eb673.wgsl b/test/tint/builtins/gen/dpdyFine/6eb673.wgsl
index 87c154a..dc7a60c 100644
--- a/test/tint/builtins/gen/dpdyFine/6eb673.wgsl
+++ b/test/tint/builtins/gen/dpdyFine/6eb673.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/dpdyFine/d0a648.wgsl

diff --git a/test/tint/builtins/gen/dpdyFine/d0a648.wgsl b/test/tint/builtins/gen/dpdyFine/d0a648.wgsl
index d5477f8..d1b444c 100644
--- a/test/tint/builtins/gen/dpdyFine/d0a648.wgsl
+++ b/test/tint/builtins/gen/dpdyFine/d0a648.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/dpdyFine/df33aa.wgsl

diff --git a/test/tint/builtins/gen/dpdyFine/df33aa.wgsl b/test/tint/builtins/gen/dpdyFine/df33aa.wgsl
index e2206ef..2d6985d 100644
--- a/test/tint/builtins/gen/dpdyFine/df33aa.wgsl
+++ b/test/tint/builtins/gen/dpdyFine/df33aa.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/exp/0f70eb.wgsl

diff --git a/test/tint/builtins/gen/exp/0f70eb.wgsl b/test/tint/builtins/gen/exp/0f70eb.wgsl
index 2798c27..69938fd 100644
--- a/test/tint/builtins/gen/exp/0f70eb.wgsl
+++ b/test/tint/builtins/gen/exp/0f70eb.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/exp/1951e7.wgsl

diff --git a/test/tint/builtins/gen/exp/1951e7.wgsl b/test/tint/builtins/gen/exp/1951e7.wgsl
index 085a58f..3963c2e 100644
--- a/test/tint/builtins/gen/exp/1951e7.wgsl
+++ b/test/tint/builtins/gen/exp/1951e7.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/exp/771fd2.wgsl

diff --git a/test/tint/builtins/gen/exp/771fd2.wgsl b/test/tint/builtins/gen/exp/771fd2.wgsl
index f7bb800..3b03860 100644
--- a/test/tint/builtins/gen/exp/771fd2.wgsl
+++ b/test/tint/builtins/gen/exp/771fd2.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/exp/d98450.wgsl

diff --git a/test/tint/builtins/gen/exp/d98450.wgsl b/test/tint/builtins/gen/exp/d98450.wgsl
index caf87a5..b33e510 100644
--- a/test/tint/builtins/gen/exp/d98450.wgsl
+++ b/test/tint/builtins/gen/exp/d98450.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/exp2/1f8680.wgsl

diff --git a/test/tint/builtins/gen/exp2/1f8680.wgsl b/test/tint/builtins/gen/exp2/1f8680.wgsl
index f5f34be..88c195d 100644
--- a/test/tint/builtins/gen/exp2/1f8680.wgsl
+++ b/test/tint/builtins/gen/exp2/1f8680.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/exp2/a9d0a7.wgsl

diff --git a/test/tint/builtins/gen/exp2/a9d0a7.wgsl b/test/tint/builtins/gen/exp2/a9d0a7.wgsl
index e827c11..339275b 100644
--- a/test/tint/builtins/gen/exp2/a9d0a7.wgsl
+++ b/test/tint/builtins/gen/exp2/a9d0a7.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/exp2/d6777c.wgsl

diff --git a/test/tint/builtins/gen/exp2/d6777c.wgsl b/test/tint/builtins/gen/exp2/d6777c.wgsl
index 3927cc8..6463f4f 100644
--- a/test/tint/builtins/gen/exp2/d6777c.wgsl
+++ b/test/tint/builtins/gen/exp2/d6777c.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/exp2/dea523.wgsl

diff --git a/test/tint/builtins/gen/exp2/dea523.wgsl b/test/tint/builtins/gen/exp2/dea523.wgsl
index 7feb8af..b853625 100644
--- a/test/tint/builtins/gen/exp2/dea523.wgsl
+++ b/test/tint/builtins/gen/exp2/dea523.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/faceForward/5afbd5.wgsl

diff --git a/test/tint/builtins/gen/faceForward/5afbd5.wgsl b/test/tint/builtins/gen/faceForward/5afbd5.wgsl
index 644b9c4..33b4b73 100644
--- a/test/tint/builtins/gen/faceForward/5afbd5.wgsl
+++ b/test/tint/builtins/gen/faceForward/5afbd5.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/faceForward/b316e5.wgsl

diff --git a/test/tint/builtins/gen/faceForward/b316e5.wgsl b/test/tint/builtins/gen/faceForward/b316e5.wgsl
index a349af9..56142e3 100644
--- a/test/tint/builtins/gen/faceForward/b316e5.wgsl
+++ b/test/tint/builtins/gen/faceForward/b316e5.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/faceForward/e6908b.wgsl

diff --git a/test/tint/builtins/gen/faceForward/e6908b.wgsl b/test/tint/builtins/gen/faceForward/e6908b.wgsl
index d7c41ed..be801db 100644
--- a/test/tint/builtins/gen/faceForward/e6908b.wgsl
+++ b/test/tint/builtins/gen/faceForward/e6908b.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/floor/3bccc4.wgsl

diff --git a/test/tint/builtins/gen/floor/3bccc4.wgsl b/test/tint/builtins/gen/floor/3bccc4.wgsl
index 1b128ea..31b2cda 100644
--- a/test/tint/builtins/gen/floor/3bccc4.wgsl
+++ b/test/tint/builtins/gen/floor/3bccc4.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/floor/5fc9ac.wgsl

diff --git a/test/tint/builtins/gen/floor/5fc9ac.wgsl b/test/tint/builtins/gen/floor/5fc9ac.wgsl
index 4982415..7628a40 100644
--- a/test/tint/builtins/gen/floor/5fc9ac.wgsl
+++ b/test/tint/builtins/gen/floor/5fc9ac.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/floor/60d7ea.wgsl

diff --git a/test/tint/builtins/gen/floor/60d7ea.wgsl b/test/tint/builtins/gen/floor/60d7ea.wgsl
index 6a0ab7e..5411952 100644
--- a/test/tint/builtins/gen/floor/60d7ea.wgsl
+++ b/test/tint/builtins/gen/floor/60d7ea.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/floor/66f154.wgsl

diff --git a/test/tint/builtins/gen/floor/66f154.wgsl b/test/tint/builtins/gen/floor/66f154.wgsl
index c3d4592..3c438df 100644
--- a/test/tint/builtins/gen/floor/66f154.wgsl
+++ b/test/tint/builtins/gen/floor/66f154.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/fma/26a7a9.wgsl

diff --git a/test/tint/builtins/gen/fma/26a7a9.wgsl b/test/tint/builtins/gen/fma/26a7a9.wgsl
index 2bb2903..0c726f6 100644
--- a/test/tint/builtins/gen/fma/26a7a9.wgsl
+++ b/test/tint/builtins/gen/fma/26a7a9.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/fma/6a3283.wgsl

diff --git a/test/tint/builtins/gen/fma/6a3283.wgsl b/test/tint/builtins/gen/fma/6a3283.wgsl
index ad45590..05d4481 100644
--- a/test/tint/builtins/gen/fma/6a3283.wgsl
+++ b/test/tint/builtins/gen/fma/6a3283.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/fma/c10ba3.wgsl

diff --git a/test/tint/builtins/gen/fma/c10ba3.wgsl b/test/tint/builtins/gen/fma/c10ba3.wgsl
index 1b0b477..608d2f5 100644
--- a/test/tint/builtins/gen/fma/c10ba3.wgsl
+++ b/test/tint/builtins/gen/fma/c10ba3.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/fma/e17c5c.wgsl

diff --git a/test/tint/builtins/gen/fma/e17c5c.wgsl b/test/tint/builtins/gen/fma/e17c5c.wgsl
index ca7e621..0be2ea7 100644
--- a/test/tint/builtins/gen/fma/e17c5c.wgsl
+++ b/test/tint/builtins/gen/fma/e17c5c.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/fract/8bc1e9.wgsl

diff --git a/test/tint/builtins/gen/fract/8bc1e9.wgsl b/test/tint/builtins/gen/fract/8bc1e9.wgsl
index 5e0bd12..1d423a4 100644
--- a/test/tint/builtins/gen/fract/8bc1e9.wgsl
+++ b/test/tint/builtins/gen/fract/8bc1e9.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/fract/943cb1.wgsl

diff --git a/test/tint/builtins/gen/fract/943cb1.wgsl b/test/tint/builtins/gen/fract/943cb1.wgsl
index b269c78..e137bb2 100644
--- a/test/tint/builtins/gen/fract/943cb1.wgsl
+++ b/test/tint/builtins/gen/fract/943cb1.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/fract/a49758.wgsl

diff --git a/test/tint/builtins/gen/fract/a49758.wgsl b/test/tint/builtins/gen/fract/a49758.wgsl
index fe560aa..148492e 100644
--- a/test/tint/builtins/gen/fract/a49758.wgsl
+++ b/test/tint/builtins/gen/fract/a49758.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/fract/fa5c71.wgsl

diff --git a/test/tint/builtins/gen/fract/fa5c71.wgsl b/test/tint/builtins/gen/fract/fa5c71.wgsl
index bd33eec..bd0145b 100644
--- a/test/tint/builtins/gen/fract/fa5c71.wgsl
+++ b/test/tint/builtins/gen/fract/fa5c71.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/frexp/368997.wgsl

diff --git a/test/tint/builtins/gen/frexp/368997.wgsl b/test/tint/builtins/gen/frexp/368997.wgsl
index 231ffdc..e58770f 100644
--- a/test/tint/builtins/gen/frexp/368997.wgsl
+++ b/test/tint/builtins/gen/frexp/368997.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/frexp/3c4f48.wgsl

diff --git a/test/tint/builtins/gen/frexp/3c4f48.wgsl b/test/tint/builtins/gen/frexp/3c4f48.wgsl
index cafc0f7..2e9c241 100644
--- a/test/tint/builtins/gen/frexp/3c4f48.wgsl
+++ b/test/tint/builtins/gen/frexp/3c4f48.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/frexp/4bdfc7.wgsl

diff --git a/test/tint/builtins/gen/frexp/4bdfc7.wgsl b/test/tint/builtins/gen/frexp/4bdfc7.wgsl
index 81504c3..bf08ec0 100644
--- a/test/tint/builtins/gen/frexp/4bdfc7.wgsl
+++ b/test/tint/builtins/gen/frexp/4bdfc7.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/frexp/eabd40.wgsl

diff --git a/test/tint/builtins/gen/frexp/eabd40.wgsl b/test/tint/builtins/gen/frexp/eabd40.wgsl
index 3451539..c3d364a 100644
--- a/test/tint/builtins/gen/frexp/eabd40.wgsl
+++ b/test/tint/builtins/gen/frexp/eabd40.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/fwidth/5d1b39.wgsl

diff --git a/test/tint/builtins/gen/fwidth/5d1b39.wgsl b/test/tint/builtins/gen/fwidth/5d1b39.wgsl
index 991a417..8be9e8e 100644
--- a/test/tint/builtins/gen/fwidth/5d1b39.wgsl
+++ b/test/tint/builtins/gen/fwidth/5d1b39.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/fwidth/b83ebb.wgsl

diff --git a/test/tint/builtins/gen/fwidth/b83ebb.wgsl b/test/tint/builtins/gen/fwidth/b83ebb.wgsl
index f616e2b..78eed53 100644
--- a/test/tint/builtins/gen/fwidth/b83ebb.wgsl
+++ b/test/tint/builtins/gen/fwidth/b83ebb.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/fwidth/d2ab9a.wgsl

diff --git a/test/tint/builtins/gen/fwidth/d2ab9a.wgsl b/test/tint/builtins/gen/fwidth/d2ab9a.wgsl
index 4e3e059..2b8fc9e 100644
--- a/test/tint/builtins/gen/fwidth/d2ab9a.wgsl
+++ b/test/tint/builtins/gen/fwidth/d2ab9a.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/fwidth/df38ef.wgsl

diff --git a/test/tint/builtins/gen/fwidth/df38ef.wgsl b/test/tint/builtins/gen/fwidth/df38ef.wgsl
index c38975d..96b05c5 100644
--- a/test/tint/builtins/gen/fwidth/df38ef.wgsl
+++ b/test/tint/builtins/gen/fwidth/df38ef.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/fwidthCoarse/159c8a.wgsl

diff --git a/test/tint/builtins/gen/fwidthCoarse/159c8a.wgsl b/test/tint/builtins/gen/fwidthCoarse/159c8a.wgsl
index eebdef6..26fbc0d 100644
--- a/test/tint/builtins/gen/fwidthCoarse/159c8a.wgsl
+++ b/test/tint/builtins/gen/fwidthCoarse/159c8a.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/fwidthCoarse/1e59d9.wgsl

diff --git a/test/tint/builtins/gen/fwidthCoarse/1e59d9.wgsl b/test/tint/builtins/gen/fwidthCoarse/1e59d9.wgsl
index 7416c8b..9b9662a 100644
--- a/test/tint/builtins/gen/fwidthCoarse/1e59d9.wgsl
+++ b/test/tint/builtins/gen/fwidthCoarse/1e59d9.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/fwidthCoarse/4e4fc4.wgsl

diff --git a/test/tint/builtins/gen/fwidthCoarse/4e4fc4.wgsl b/test/tint/builtins/gen/fwidthCoarse/4e4fc4.wgsl
index d1cbee8..d45debf 100644
--- a/test/tint/builtins/gen/fwidthCoarse/4e4fc4.wgsl
+++ b/test/tint/builtins/gen/fwidthCoarse/4e4fc4.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/fwidthCoarse/e653f7.wgsl

diff --git a/test/tint/builtins/gen/fwidthCoarse/e653f7.wgsl b/test/tint/builtins/gen/fwidthCoarse/e653f7.wgsl
index 5736185..78a8a9a 100644
--- a/test/tint/builtins/gen/fwidthCoarse/e653f7.wgsl
+++ b/test/tint/builtins/gen/fwidthCoarse/e653f7.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/fwidthFine/523fdc.wgsl

diff --git a/test/tint/builtins/gen/fwidthFine/523fdc.wgsl b/test/tint/builtins/gen/fwidthFine/523fdc.wgsl
index fe89ae7..dbf7066 100644
--- a/test/tint/builtins/gen/fwidthFine/523fdc.wgsl
+++ b/test/tint/builtins/gen/fwidthFine/523fdc.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/fwidthFine/68f4ef.wgsl

diff --git a/test/tint/builtins/gen/fwidthFine/68f4ef.wgsl b/test/tint/builtins/gen/fwidthFine/68f4ef.wgsl
index f53e145..c9bc272 100644
--- a/test/tint/builtins/gen/fwidthFine/68f4ef.wgsl
+++ b/test/tint/builtins/gen/fwidthFine/68f4ef.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/fwidthFine/f1742d.wgsl

diff --git a/test/tint/builtins/gen/fwidthFine/f1742d.wgsl b/test/tint/builtins/gen/fwidthFine/f1742d.wgsl
index 51c2e44..b3b89b4 100644
--- a/test/tint/builtins/gen/fwidthFine/f1742d.wgsl
+++ b/test/tint/builtins/gen/fwidthFine/f1742d.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/fwidthFine/ff6aa0.wgsl

diff --git a/test/tint/builtins/gen/fwidthFine/ff6aa0.wgsl b/test/tint/builtins/gen/fwidthFine/ff6aa0.wgsl
index c30a97a..a0a53a0 100644
--- a/test/tint/builtins/gen/fwidthFine/ff6aa0.wgsl
+++ b/test/tint/builtins/gen/fwidthFine/ff6aa0.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/inverseSqrt/84407e.wgsl

diff --git a/test/tint/builtins/gen/inverseSqrt/84407e.wgsl b/test/tint/builtins/gen/inverseSqrt/84407e.wgsl
index d46dfea..dfd7333 100644
--- a/test/tint/builtins/gen/inverseSqrt/84407e.wgsl
+++ b/test/tint/builtins/gen/inverseSqrt/84407e.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/inverseSqrt/8f2bd2.wgsl

diff --git a/test/tint/builtins/gen/inverseSqrt/8f2bd2.wgsl b/test/tint/builtins/gen/inverseSqrt/8f2bd2.wgsl
index 3cd7ac9..6c1fc59 100644
--- a/test/tint/builtins/gen/inverseSqrt/8f2bd2.wgsl
+++ b/test/tint/builtins/gen/inverseSqrt/8f2bd2.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/inverseSqrt/b197b1.wgsl

diff --git a/test/tint/builtins/gen/inverseSqrt/b197b1.wgsl b/test/tint/builtins/gen/inverseSqrt/b197b1.wgsl
index a061520..6227839 100644
--- a/test/tint/builtins/gen/inverseSqrt/b197b1.wgsl
+++ b/test/tint/builtins/gen/inverseSqrt/b197b1.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/inverseSqrt/c22347.wgsl

diff --git a/test/tint/builtins/gen/inverseSqrt/c22347.wgsl b/test/tint/builtins/gen/inverseSqrt/c22347.wgsl
index 7a9d368..477aad9 100644
--- a/test/tint/builtins/gen/inverseSqrt/c22347.wgsl
+++ b/test/tint/builtins/gen/inverseSqrt/c22347.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/isFinite/34d32b.wgsl

diff --git a/test/tint/builtins/gen/isFinite/34d32b.wgsl b/test/tint/builtins/gen/isFinite/34d32b.wgsl
index ef5358d..90950d2 100644
--- a/test/tint/builtins/gen/isFinite/34d32b.wgsl
+++ b/test/tint/builtins/gen/isFinite/34d32b.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/isFinite/426f9f.wgsl

diff --git a/test/tint/builtins/gen/isFinite/426f9f.wgsl b/test/tint/builtins/gen/isFinite/426f9f.wgsl
index 43e2406..0f9dd1e 100644
--- a/test/tint/builtins/gen/isFinite/426f9f.wgsl
+++ b/test/tint/builtins/gen/isFinite/426f9f.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/isFinite/8a23ad.wgsl

diff --git a/test/tint/builtins/gen/isFinite/8a23ad.wgsl b/test/tint/builtins/gen/isFinite/8a23ad.wgsl
index 7f554c3..f4b54ec 100644
--- a/test/tint/builtins/gen/isFinite/8a23ad.wgsl
+++ b/test/tint/builtins/gen/isFinite/8a23ad.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/isFinite/f31987.wgsl

diff --git a/test/tint/builtins/gen/isFinite/f31987.wgsl b/test/tint/builtins/gen/isFinite/f31987.wgsl
index d2f5926..6582552 100644
--- a/test/tint/builtins/gen/isFinite/f31987.wgsl
+++ b/test/tint/builtins/gen/isFinite/f31987.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/isInf/666f2a.wgsl

diff --git a/test/tint/builtins/gen/isInf/666f2a.wgsl b/test/tint/builtins/gen/isInf/666f2a.wgsl
index c3e9927..0ba01ef 100644
--- a/test/tint/builtins/gen/isInf/666f2a.wgsl
+++ b/test/tint/builtins/gen/isInf/666f2a.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/isInf/7bd98f.wgsl

diff --git a/test/tint/builtins/gen/isInf/7bd98f.wgsl b/test/tint/builtins/gen/isInf/7bd98f.wgsl
index ce3683d..a51c084 100644
--- a/test/tint/builtins/gen/isInf/7bd98f.wgsl
+++ b/test/tint/builtins/gen/isInf/7bd98f.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/isInf/7e81b5.wgsl

diff --git a/test/tint/builtins/gen/isInf/7e81b5.wgsl b/test/tint/builtins/gen/isInf/7e81b5.wgsl
index 4b077bd..8e9ce1a 100644
--- a/test/tint/builtins/gen/isInf/7e81b5.wgsl
+++ b/test/tint/builtins/gen/isInf/7e81b5.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/isInf/a46d6f.wgsl

diff --git a/test/tint/builtins/gen/isInf/a46d6f.wgsl b/test/tint/builtins/gen/isInf/a46d6f.wgsl
index 0d08ca2..a878687 100644
--- a/test/tint/builtins/gen/isInf/a46d6f.wgsl
+++ b/test/tint/builtins/gen/isInf/a46d6f.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/isNan/1280ab.wgsl

diff --git a/test/tint/builtins/gen/isNan/1280ab.wgsl b/test/tint/builtins/gen/isNan/1280ab.wgsl
index 7495a29..2159b59 100644
--- a/test/tint/builtins/gen/isNan/1280ab.wgsl
+++ b/test/tint/builtins/gen/isNan/1280ab.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/isNan/4d280d.wgsl

diff --git a/test/tint/builtins/gen/isNan/4d280d.wgsl b/test/tint/builtins/gen/isNan/4d280d.wgsl
index a779709..36838c1 100644
--- a/test/tint/builtins/gen/isNan/4d280d.wgsl
+++ b/test/tint/builtins/gen/isNan/4d280d.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/isNan/67ecd3.wgsl

diff --git a/test/tint/builtins/gen/isNan/67ecd3.wgsl b/test/tint/builtins/gen/isNan/67ecd3.wgsl
index 6fa16a6..5a0a949 100644
--- a/test/tint/builtins/gen/isNan/67ecd3.wgsl
+++ b/test/tint/builtins/gen/isNan/67ecd3.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/isNan/e4978e.wgsl

diff --git a/test/tint/builtins/gen/isNan/e4978e.wgsl b/test/tint/builtins/gen/isNan/e4978e.wgsl
index 458f6c1..19422d1 100644
--- a/test/tint/builtins/gen/isNan/e4978e.wgsl
+++ b/test/tint/builtins/gen/isNan/e4978e.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/isNormal/863dcd.wgsl

diff --git a/test/tint/builtins/gen/isNormal/863dcd.wgsl b/test/tint/builtins/gen/isNormal/863dcd.wgsl
index 207f3b6..52cc65c 100644
--- a/test/tint/builtins/gen/isNormal/863dcd.wgsl
+++ b/test/tint/builtins/gen/isNormal/863dcd.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/isNormal/b00ab1.wgsl

diff --git a/test/tint/builtins/gen/isNormal/b00ab1.wgsl b/test/tint/builtins/gen/isNormal/b00ab1.wgsl
index 3820c63..737c045 100644
--- a/test/tint/builtins/gen/isNormal/b00ab1.wgsl
+++ b/test/tint/builtins/gen/isNormal/b00ab1.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/isNormal/c286b7.wgsl

diff --git a/test/tint/builtins/gen/isNormal/c286b7.wgsl b/test/tint/builtins/gen/isNormal/c286b7.wgsl
index b7cecad..98d2d0a 100644
--- a/test/tint/builtins/gen/isNormal/c286b7.wgsl
+++ b/test/tint/builtins/gen/isNormal/c286b7.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/isNormal/c6e880.wgsl

diff --git a/test/tint/builtins/gen/isNormal/c6e880.wgsl b/test/tint/builtins/gen/isNormal/c6e880.wgsl
index 25053e5..2f5957a 100644
--- a/test/tint/builtins/gen/isNormal/c6e880.wgsl
+++ b/test/tint/builtins/gen/isNormal/c6e880.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/ldexp/a31cdc.wgsl

diff --git a/test/tint/builtins/gen/ldexp/a31cdc.wgsl b/test/tint/builtins/gen/ldexp/a31cdc.wgsl
index 575bcca..ed82bca 100644
--- a/test/tint/builtins/gen/ldexp/a31cdc.wgsl
+++ b/test/tint/builtins/gen/ldexp/a31cdc.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/ldexp/abd718.wgsl

diff --git a/test/tint/builtins/gen/ldexp/abd718.wgsl b/test/tint/builtins/gen/ldexp/abd718.wgsl
index 9d03bd8..cc0c1d8 100644
--- a/test/tint/builtins/gen/ldexp/abd718.wgsl
+++ b/test/tint/builtins/gen/ldexp/abd718.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/ldexp/cc9cde.wgsl

diff --git a/test/tint/builtins/gen/ldexp/cc9cde.wgsl b/test/tint/builtins/gen/ldexp/cc9cde.wgsl
index aaed15c..73e300b 100644
--- a/test/tint/builtins/gen/ldexp/cc9cde.wgsl
+++ b/test/tint/builtins/gen/ldexp/cc9cde.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/ldexp/db8b49.wgsl

diff --git a/test/tint/builtins/gen/ldexp/db8b49.wgsl b/test/tint/builtins/gen/ldexp/db8b49.wgsl
index 18a79ea..5df9f3d 100644
--- a/test/tint/builtins/gen/ldexp/db8b49.wgsl
+++ b/test/tint/builtins/gen/ldexp/db8b49.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/length/056071.wgsl

diff --git a/test/tint/builtins/gen/length/056071.wgsl b/test/tint/builtins/gen/length/056071.wgsl
index dab742f..fd54ff0 100644
--- a/test/tint/builtins/gen/length/056071.wgsl
+++ b/test/tint/builtins/gen/length/056071.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/length/602a17.wgsl

diff --git a/test/tint/builtins/gen/length/602a17.wgsl b/test/tint/builtins/gen/length/602a17.wgsl
index 092a024..4284883 100644
--- a/test/tint/builtins/gen/length/602a17.wgsl
+++ b/test/tint/builtins/gen/length/602a17.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/length/afde8b.wgsl

diff --git a/test/tint/builtins/gen/length/afde8b.wgsl b/test/tint/builtins/gen/length/afde8b.wgsl
index eb77530..11a621b 100644
--- a/test/tint/builtins/gen/length/afde8b.wgsl
+++ b/test/tint/builtins/gen/length/afde8b.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/length/becebf.wgsl

diff --git a/test/tint/builtins/gen/length/becebf.wgsl b/test/tint/builtins/gen/length/becebf.wgsl
index ca992f1..d2cdcca 100644
--- a/test/tint/builtins/gen/length/becebf.wgsl
+++ b/test/tint/builtins/gen/length/becebf.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/log/3da25a.wgsl

diff --git a/test/tint/builtins/gen/log/3da25a.wgsl b/test/tint/builtins/gen/log/3da25a.wgsl
index 6504dc1..c080ec3 100644
--- a/test/tint/builtins/gen/log/3da25a.wgsl
+++ b/test/tint/builtins/gen/log/3da25a.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/log/7114a6.wgsl

diff --git a/test/tint/builtins/gen/log/7114a6.wgsl b/test/tint/builtins/gen/log/7114a6.wgsl
index d37f9f9..f444dd6 100644
--- a/test/tint/builtins/gen/log/7114a6.wgsl
+++ b/test/tint/builtins/gen/log/7114a6.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/log/b2ce28.wgsl

diff --git a/test/tint/builtins/gen/log/b2ce28.wgsl b/test/tint/builtins/gen/log/b2ce28.wgsl
index 38e21d5..2c1f211 100644
--- a/test/tint/builtins/gen/log/b2ce28.wgsl
+++ b/test/tint/builtins/gen/log/b2ce28.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/log/f4c570.wgsl

diff --git a/test/tint/builtins/gen/log/f4c570.wgsl b/test/tint/builtins/gen/log/f4c570.wgsl
index 62edf13..abda0dd 100644
--- a/test/tint/builtins/gen/log/f4c570.wgsl
+++ b/test/tint/builtins/gen/log/f4c570.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/log2/4036ed.wgsl

diff --git a/test/tint/builtins/gen/log2/4036ed.wgsl b/test/tint/builtins/gen/log2/4036ed.wgsl
index 9f08fb0..6c9fd0e 100644
--- a/test/tint/builtins/gen/log2/4036ed.wgsl
+++ b/test/tint/builtins/gen/log2/4036ed.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/log2/902988.wgsl

diff --git a/test/tint/builtins/gen/log2/902988.wgsl b/test/tint/builtins/gen/log2/902988.wgsl
index e3ed97f..7f1c68e 100644
--- a/test/tint/builtins/gen/log2/902988.wgsl
+++ b/test/tint/builtins/gen/log2/902988.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/log2/adb233.wgsl

diff --git a/test/tint/builtins/gen/log2/adb233.wgsl b/test/tint/builtins/gen/log2/adb233.wgsl
index 07ea6c1..6aad52c 100644
--- a/test/tint/builtins/gen/log2/adb233.wgsl
+++ b/test/tint/builtins/gen/log2/adb233.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/log2/aea659.wgsl

diff --git a/test/tint/builtins/gen/log2/aea659.wgsl b/test/tint/builtins/gen/log2/aea659.wgsl
index 6b91da2..6ce1916 100644
--- a/test/tint/builtins/gen/log2/aea659.wgsl
+++ b/test/tint/builtins/gen/log2/aea659.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/max/0c0aae.wgsl

diff --git a/test/tint/builtins/gen/max/0c0aae.wgsl b/test/tint/builtins/gen/max/0c0aae.wgsl
index 0f8c133..fb3df4d 100644
--- a/test/tint/builtins/gen/max/0c0aae.wgsl
+++ b/test/tint/builtins/gen/max/0c0aae.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/max/25eafe.wgsl

diff --git a/test/tint/builtins/gen/max/25eafe.wgsl b/test/tint/builtins/gen/max/25eafe.wgsl
index ecc90be..18ace6d 100644
--- a/test/tint/builtins/gen/max/25eafe.wgsl
+++ b/test/tint/builtins/gen/max/25eafe.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/max/320815.wgsl

diff --git a/test/tint/builtins/gen/max/320815.wgsl b/test/tint/builtins/gen/max/320815.wgsl
index c9e83eb..e4f6b56 100644
--- a/test/tint/builtins/gen/max/320815.wgsl
+++ b/test/tint/builtins/gen/max/320815.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/max/44a39d.wgsl

diff --git a/test/tint/builtins/gen/max/44a39d.wgsl b/test/tint/builtins/gen/max/44a39d.wgsl
index 882e4e3..89be332 100644
--- a/test/tint/builtins/gen/max/44a39d.wgsl
+++ b/test/tint/builtins/gen/max/44a39d.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/max/453e04.wgsl

diff --git a/test/tint/builtins/gen/max/453e04.wgsl b/test/tint/builtins/gen/max/453e04.wgsl
index 8b62913..677a411 100644
--- a/test/tint/builtins/gen/max/453e04.wgsl
+++ b/test/tint/builtins/gen/max/453e04.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/max/462050.wgsl

diff --git a/test/tint/builtins/gen/max/462050.wgsl b/test/tint/builtins/gen/max/462050.wgsl
index 2e2bcaf..795d7db 100644
--- a/test/tint/builtins/gen/max/462050.wgsl
+++ b/test/tint/builtins/gen/max/462050.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/max/4883ac.wgsl

diff --git a/test/tint/builtins/gen/max/4883ac.wgsl b/test/tint/builtins/gen/max/4883ac.wgsl
index b574471..472687c 100644
--- a/test/tint/builtins/gen/max/4883ac.wgsl
+++ b/test/tint/builtins/gen/max/4883ac.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/max/85e6bc.wgsl

diff --git a/test/tint/builtins/gen/max/85e6bc.wgsl b/test/tint/builtins/gen/max/85e6bc.wgsl
index c46eede..54f6b30 100644
--- a/test/tint/builtins/gen/max/85e6bc.wgsl
+++ b/test/tint/builtins/gen/max/85e6bc.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/max/a93419.wgsl

diff --git a/test/tint/builtins/gen/max/a93419.wgsl b/test/tint/builtins/gen/max/a93419.wgsl
index a3c3d0d..8f0cfba 100644
--- a/test/tint/builtins/gen/max/a93419.wgsl
+++ b/test/tint/builtins/gen/max/a93419.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/max/b1b73a.wgsl

diff --git a/test/tint/builtins/gen/max/b1b73a.wgsl b/test/tint/builtins/gen/max/b1b73a.wgsl
index 40cc26c..378985e 100644
--- a/test/tint/builtins/gen/max/b1b73a.wgsl
+++ b/test/tint/builtins/gen/max/b1b73a.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/max/ce7c30.wgsl

diff --git a/test/tint/builtins/gen/max/ce7c30.wgsl b/test/tint/builtins/gen/max/ce7c30.wgsl
index 6673713..b9ad069 100644
--- a/test/tint/builtins/gen/max/ce7c30.wgsl
+++ b/test/tint/builtins/gen/max/ce7c30.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/max/e8192f.wgsl

diff --git a/test/tint/builtins/gen/max/e8192f.wgsl b/test/tint/builtins/gen/max/e8192f.wgsl
index cd111e3..4e59937 100644
--- a/test/tint/builtins/gen/max/e8192f.wgsl
+++ b/test/tint/builtins/gen/max/e8192f.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/min/03c7e3.wgsl

diff --git a/test/tint/builtins/gen/min/03c7e3.wgsl b/test/tint/builtins/gen/min/03c7e3.wgsl
index 7a2690f..99c5c52 100644
--- a/test/tint/builtins/gen/min/03c7e3.wgsl
+++ b/test/tint/builtins/gen/min/03c7e3.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/min/0dc614.wgsl

diff --git a/test/tint/builtins/gen/min/0dc614.wgsl b/test/tint/builtins/gen/min/0dc614.wgsl
index 4b937bc..9fb101ca 100644
--- a/test/tint/builtins/gen/min/0dc614.wgsl
+++ b/test/tint/builtins/gen/min/0dc614.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/min/3941e1.wgsl

diff --git a/test/tint/builtins/gen/min/3941e1.wgsl b/test/tint/builtins/gen/min/3941e1.wgsl
index 2e263fe..1b35ffb 100644
--- a/test/tint/builtins/gen/min/3941e1.wgsl
+++ b/test/tint/builtins/gen/min/3941e1.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/min/46c5d3.wgsl

diff --git a/test/tint/builtins/gen/min/46c5d3.wgsl b/test/tint/builtins/gen/min/46c5d3.wgsl
index 730fe94..57d6b7c 100644
--- a/test/tint/builtins/gen/min/46c5d3.wgsl
+++ b/test/tint/builtins/gen/min/46c5d3.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/min/82b28f.wgsl

diff --git a/test/tint/builtins/gen/min/82b28f.wgsl b/test/tint/builtins/gen/min/82b28f.wgsl
index def0748..57d999a 100644
--- a/test/tint/builtins/gen/min/82b28f.wgsl
+++ b/test/tint/builtins/gen/min/82b28f.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/min/93cfc4.wgsl

diff --git a/test/tint/builtins/gen/min/93cfc4.wgsl b/test/tint/builtins/gen/min/93cfc4.wgsl
index 66c46b7..cb4953e 100644
--- a/test/tint/builtins/gen/min/93cfc4.wgsl
+++ b/test/tint/builtins/gen/min/93cfc4.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/min/a45171.wgsl

diff --git a/test/tint/builtins/gen/min/a45171.wgsl b/test/tint/builtins/gen/min/a45171.wgsl
index eb640de..0960d1f 100644
--- a/test/tint/builtins/gen/min/a45171.wgsl
+++ b/test/tint/builtins/gen/min/a45171.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/min/aa28ad.wgsl

diff --git a/test/tint/builtins/gen/min/aa28ad.wgsl b/test/tint/builtins/gen/min/aa28ad.wgsl
index 9242dec..2fdaace 100644
--- a/test/tint/builtins/gen/min/aa28ad.wgsl
+++ b/test/tint/builtins/gen/min/aa28ad.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/min/af326d.wgsl

diff --git a/test/tint/builtins/gen/min/af326d.wgsl b/test/tint/builtins/gen/min/af326d.wgsl
index d603bcb..f6346b3 100644
--- a/test/tint/builtins/gen/min/af326d.wgsl
+++ b/test/tint/builtins/gen/min/af326d.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/min/c70bb7.wgsl

diff --git a/test/tint/builtins/gen/min/c70bb7.wgsl b/test/tint/builtins/gen/min/c70bb7.wgsl
index 5440784..7837b1c 100644
--- a/test/tint/builtins/gen/min/c70bb7.wgsl
+++ b/test/tint/builtins/gen/min/c70bb7.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/min/c73147.wgsl

diff --git a/test/tint/builtins/gen/min/c73147.wgsl b/test/tint/builtins/gen/min/c73147.wgsl
index bb48303..0274f54 100644
--- a/test/tint/builtins/gen/min/c73147.wgsl
+++ b/test/tint/builtins/gen/min/c73147.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/min/c76fa6.wgsl

diff --git a/test/tint/builtins/gen/min/c76fa6.wgsl b/test/tint/builtins/gen/min/c76fa6.wgsl
index d4a831a..57d89eb 100644
--- a/test/tint/builtins/gen/min/c76fa6.wgsl
+++ b/test/tint/builtins/gen/min/c76fa6.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/mix/0c8c33.wgsl

diff --git a/test/tint/builtins/gen/mix/0c8c33.wgsl b/test/tint/builtins/gen/mix/0c8c33.wgsl
index 16f9a64..426df70 100644
--- a/test/tint/builtins/gen/mix/0c8c33.wgsl
+++ b/test/tint/builtins/gen/mix/0c8c33.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/mix/1faeb1.wgsl

diff --git a/test/tint/builtins/gen/mix/1faeb1.wgsl b/test/tint/builtins/gen/mix/1faeb1.wgsl
index 4777805..5c4441f 100644
--- a/test/tint/builtins/gen/mix/1faeb1.wgsl
+++ b/test/tint/builtins/gen/mix/1faeb1.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/mix/2fadab.wgsl

diff --git a/test/tint/builtins/gen/mix/2fadab.wgsl b/test/tint/builtins/gen/mix/2fadab.wgsl
index a89fb83..d119b89 100644
--- a/test/tint/builtins/gen/mix/2fadab.wgsl
+++ b/test/tint/builtins/gen/mix/2fadab.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/mix/315264.wgsl

diff --git a/test/tint/builtins/gen/mix/315264.wgsl b/test/tint/builtins/gen/mix/315264.wgsl
index ae2dca3..bb1bde1 100644
--- a/test/tint/builtins/gen/mix/315264.wgsl
+++ b/test/tint/builtins/gen/mix/315264.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/mix/4f0b5e.wgsl

diff --git a/test/tint/builtins/gen/mix/4f0b5e.wgsl b/test/tint/builtins/gen/mix/4f0b5e.wgsl
index 22eea63..588fcec 100644
--- a/test/tint/builtins/gen/mix/4f0b5e.wgsl
+++ b/test/tint/builtins/gen/mix/4f0b5e.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/mix/6f8adc.wgsl

diff --git a/test/tint/builtins/gen/mix/6f8adc.wgsl b/test/tint/builtins/gen/mix/6f8adc.wgsl
index a024424..d6b858a 100644
--- a/test/tint/builtins/gen/mix/6f8adc.wgsl
+++ b/test/tint/builtins/gen/mix/6f8adc.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/mix/c37ede.wgsl

diff --git a/test/tint/builtins/gen/mix/c37ede.wgsl b/test/tint/builtins/gen/mix/c37ede.wgsl
index 47aa83a..430db8b 100644
--- a/test/tint/builtins/gen/mix/c37ede.wgsl
+++ b/test/tint/builtins/gen/mix/c37ede.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/modf/180fed.wgsl

diff --git a/test/tint/builtins/gen/modf/180fed.wgsl b/test/tint/builtins/gen/modf/180fed.wgsl
index 2280611..50809ab 100644
--- a/test/tint/builtins/gen/modf/180fed.wgsl
+++ b/test/tint/builtins/gen/modf/180fed.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/modf/9b75f7.wgsl

diff --git a/test/tint/builtins/gen/modf/9b75f7.wgsl b/test/tint/builtins/gen/modf/9b75f7.wgsl
index f18546c..538bcf0 100644
--- a/test/tint/builtins/gen/modf/9b75f7.wgsl
+++ b/test/tint/builtins/gen/modf/9b75f7.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/modf/ec2dbc.wgsl

diff --git a/test/tint/builtins/gen/modf/ec2dbc.wgsl b/test/tint/builtins/gen/modf/ec2dbc.wgsl
index da66827..2939648 100644
--- a/test/tint/builtins/gen/modf/ec2dbc.wgsl
+++ b/test/tint/builtins/gen/modf/ec2dbc.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/modf/f5f20d.wgsl

diff --git a/test/tint/builtins/gen/modf/f5f20d.wgsl b/test/tint/builtins/gen/modf/f5f20d.wgsl
index 1070fb7..344c9e8 100644
--- a/test/tint/builtins/gen/modf/f5f20d.wgsl
+++ b/test/tint/builtins/gen/modf/f5f20d.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/normalize/64d8c0.wgsl

diff --git a/test/tint/builtins/gen/normalize/64d8c0.wgsl b/test/tint/builtins/gen/normalize/64d8c0.wgsl
index 0c32b91..35f1687 100644
--- a/test/tint/builtins/gen/normalize/64d8c0.wgsl
+++ b/test/tint/builtins/gen/normalize/64d8c0.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/normalize/9a0aab.wgsl

diff --git a/test/tint/builtins/gen/normalize/9a0aab.wgsl b/test/tint/builtins/gen/normalize/9a0aab.wgsl
index 5560b20..d6b7945 100644
--- a/test/tint/builtins/gen/normalize/9a0aab.wgsl
+++ b/test/tint/builtins/gen/normalize/9a0aab.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/normalize/fc2ef1.wgsl

diff --git a/test/tint/builtins/gen/normalize/fc2ef1.wgsl b/test/tint/builtins/gen/normalize/fc2ef1.wgsl
index 2c70e6d..5b23870 100644
--- a/test/tint/builtins/gen/normalize/fc2ef1.wgsl
+++ b/test/tint/builtins/gen/normalize/fc2ef1.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/pack2x16float/0e97b3.wgsl

diff --git a/test/tint/builtins/gen/pack2x16float/0e97b3.wgsl b/test/tint/builtins/gen/pack2x16float/0e97b3.wgsl
index 92252ef..7c6d21a 100644
--- a/test/tint/builtins/gen/pack2x16float/0e97b3.wgsl
+++ b/test/tint/builtins/gen/pack2x16float/0e97b3.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/pack2x16snorm/6c169b.wgsl

diff --git a/test/tint/builtins/gen/pack2x16snorm/6c169b.wgsl b/test/tint/builtins/gen/pack2x16snorm/6c169b.wgsl
index ce748f8..5895e33 100644
--- a/test/tint/builtins/gen/pack2x16snorm/6c169b.wgsl
+++ b/test/tint/builtins/gen/pack2x16snorm/6c169b.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/pack2x16unorm/0f08e4.wgsl

diff --git a/test/tint/builtins/gen/pack2x16unorm/0f08e4.wgsl b/test/tint/builtins/gen/pack2x16unorm/0f08e4.wgsl
index 9f58257..29726d6 100644
--- a/test/tint/builtins/gen/pack2x16unorm/0f08e4.wgsl
+++ b/test/tint/builtins/gen/pack2x16unorm/0f08e4.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/pack4x8snorm/4d22e7.wgsl

diff --git a/test/tint/builtins/gen/pack4x8snorm/4d22e7.wgsl b/test/tint/builtins/gen/pack4x8snorm/4d22e7.wgsl
index cebba85..0272846 100644
--- a/test/tint/builtins/gen/pack4x8snorm/4d22e7.wgsl
+++ b/test/tint/builtins/gen/pack4x8snorm/4d22e7.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/pack4x8unorm/95c456.wgsl

diff --git a/test/tint/builtins/gen/pack4x8unorm/95c456.wgsl b/test/tint/builtins/gen/pack4x8unorm/95c456.wgsl
index f7f20ab..bf91c35 100644
--- a/test/tint/builtins/gen/pack4x8unorm/95c456.wgsl
+++ b/test/tint/builtins/gen/pack4x8unorm/95c456.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/pow/04a908.wgsl

diff --git a/test/tint/builtins/gen/pow/04a908.wgsl b/test/tint/builtins/gen/pow/04a908.wgsl
index 87e649b..a25f8ff 100644
--- a/test/tint/builtins/gen/pow/04a908.wgsl
+++ b/test/tint/builtins/gen/pow/04a908.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/pow/46e029.wgsl

diff --git a/test/tint/builtins/gen/pow/46e029.wgsl b/test/tint/builtins/gen/pow/46e029.wgsl
index 030f087..12060f6 100644
--- a/test/tint/builtins/gen/pow/46e029.wgsl
+++ b/test/tint/builtins/gen/pow/46e029.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/pow/4a46c9.wgsl

diff --git a/test/tint/builtins/gen/pow/4a46c9.wgsl b/test/tint/builtins/gen/pow/4a46c9.wgsl
index 8d31659..02c68c0 100644
--- a/test/tint/builtins/gen/pow/4a46c9.wgsl
+++ b/test/tint/builtins/gen/pow/4a46c9.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/pow/e60ea5.wgsl

diff --git a/test/tint/builtins/gen/pow/e60ea5.wgsl b/test/tint/builtins/gen/pow/e60ea5.wgsl
index 266bc05..a7bcc94 100644
--- a/test/tint/builtins/gen/pow/e60ea5.wgsl
+++ b/test/tint/builtins/gen/pow/e60ea5.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/radians/09b7fc.wgsl

diff --git a/test/tint/builtins/gen/radians/09b7fc.wgsl b/test/tint/builtins/gen/radians/09b7fc.wgsl
index d0617db..35a621f 100644
--- a/test/tint/builtins/gen/radians/09b7fc.wgsl
+++ b/test/tint/builtins/gen/radians/09b7fc.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/radians/61687a.wgsl

diff --git a/test/tint/builtins/gen/radians/61687a.wgsl b/test/tint/builtins/gen/radians/61687a.wgsl
index d1e80df..6bfbc07 100644
--- a/test/tint/builtins/gen/radians/61687a.wgsl
+++ b/test/tint/builtins/gen/radians/61687a.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/radians/6b0ff2.wgsl

diff --git a/test/tint/builtins/gen/radians/6b0ff2.wgsl b/test/tint/builtins/gen/radians/6b0ff2.wgsl
index 4ba7942..5e11c02 100644
--- a/test/tint/builtins/gen/radians/6b0ff2.wgsl
+++ b/test/tint/builtins/gen/radians/6b0ff2.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/radians/f96258.wgsl

diff --git a/test/tint/builtins/gen/radians/f96258.wgsl b/test/tint/builtins/gen/radians/f96258.wgsl
index 5f96335..e093182 100644
--- a/test/tint/builtins/gen/radians/f96258.wgsl
+++ b/test/tint/builtins/gen/radians/f96258.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/reflect/05357e.wgsl

diff --git a/test/tint/builtins/gen/reflect/05357e.wgsl b/test/tint/builtins/gen/reflect/05357e.wgsl
index cbf045d..c6e1d76 100644
--- a/test/tint/builtins/gen/reflect/05357e.wgsl
+++ b/test/tint/builtins/gen/reflect/05357e.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/reflect/b61e10.wgsl

diff --git a/test/tint/builtins/gen/reflect/b61e10.wgsl b/test/tint/builtins/gen/reflect/b61e10.wgsl
index 15e1ec7..247c913 100644
--- a/test/tint/builtins/gen/reflect/b61e10.wgsl
+++ b/test/tint/builtins/gen/reflect/b61e10.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/reflect/f47fdb.wgsl

diff --git a/test/tint/builtins/gen/reflect/f47fdb.wgsl b/test/tint/builtins/gen/reflect/f47fdb.wgsl
index 86290aa..522fdac 100644
--- a/test/tint/builtins/gen/reflect/f47fdb.wgsl
+++ b/test/tint/builtins/gen/reflect/f47fdb.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/refract/7e02e6.wgsl

diff --git a/test/tint/builtins/gen/refract/7e02e6.wgsl b/test/tint/builtins/gen/refract/7e02e6.wgsl
index e49ccde..c5bd36e 100644
--- a/test/tint/builtins/gen/refract/7e02e6.wgsl
+++ b/test/tint/builtins/gen/refract/7e02e6.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/refract/cbc1d2.wgsl

diff --git a/test/tint/builtins/gen/refract/cbc1d2.wgsl b/test/tint/builtins/gen/refract/cbc1d2.wgsl
index 6abdc6e..80b7a6e 100644
--- a/test/tint/builtins/gen/refract/cbc1d2.wgsl
+++ b/test/tint/builtins/gen/refract/cbc1d2.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/refract/cd905f.wgsl

diff --git a/test/tint/builtins/gen/refract/cd905f.wgsl b/test/tint/builtins/gen/refract/cd905f.wgsl
index 44d4e1b..15d20da 100644
--- a/test/tint/builtins/gen/refract/cd905f.wgsl
+++ b/test/tint/builtins/gen/refract/cd905f.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/reverseBits/222177.wgsl

diff --git a/test/tint/builtins/gen/reverseBits/222177.wgsl b/test/tint/builtins/gen/reverseBits/222177.wgsl
index 467bc9f..66a921d 100644
--- a/test/tint/builtins/gen/reverseBits/222177.wgsl
+++ b/test/tint/builtins/gen/reverseBits/222177.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/reverseBits/35fea9.wgsl

diff --git a/test/tint/builtins/gen/reverseBits/35fea9.wgsl b/test/tint/builtins/gen/reverseBits/35fea9.wgsl
index 61ba539..48bb2e7 100644
--- a/test/tint/builtins/gen/reverseBits/35fea9.wgsl
+++ b/test/tint/builtins/gen/reverseBits/35fea9.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/reverseBits/4dbd6f.wgsl

diff --git a/test/tint/builtins/gen/reverseBits/4dbd6f.wgsl b/test/tint/builtins/gen/reverseBits/4dbd6f.wgsl
index ff3d4f8..ae6bccf 100644
--- a/test/tint/builtins/gen/reverseBits/4dbd6f.wgsl
+++ b/test/tint/builtins/gen/reverseBits/4dbd6f.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/reverseBits/7c4269.wgsl

diff --git a/test/tint/builtins/gen/reverseBits/7c4269.wgsl b/test/tint/builtins/gen/reverseBits/7c4269.wgsl
index 699344a..a6c9864 100644
--- a/test/tint/builtins/gen/reverseBits/7c4269.wgsl
+++ b/test/tint/builtins/gen/reverseBits/7c4269.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/reverseBits/a6ccd4.wgsl

diff --git a/test/tint/builtins/gen/reverseBits/a6ccd4.wgsl b/test/tint/builtins/gen/reverseBits/a6ccd4.wgsl
index 6b1c244..315b5a1 100644
--- a/test/tint/builtins/gen/reverseBits/a6ccd4.wgsl
+++ b/test/tint/builtins/gen/reverseBits/a6ccd4.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/reverseBits/c21bc1.wgsl

diff --git a/test/tint/builtins/gen/reverseBits/c21bc1.wgsl b/test/tint/builtins/gen/reverseBits/c21bc1.wgsl
index cb6f8e3..c5dcd2e 100644
--- a/test/tint/builtins/gen/reverseBits/c21bc1.wgsl
+++ b/test/tint/builtins/gen/reverseBits/c21bc1.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/reverseBits/e1f4c1.wgsl

diff --git a/test/tint/builtins/gen/reverseBits/e1f4c1.wgsl b/test/tint/builtins/gen/reverseBits/e1f4c1.wgsl
index 5076c6f..2e937c1 100644
--- a/test/tint/builtins/gen/reverseBits/e1f4c1.wgsl
+++ b/test/tint/builtins/gen/reverseBits/e1f4c1.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/reverseBits/e31adf.wgsl

diff --git a/test/tint/builtins/gen/reverseBits/e31adf.wgsl b/test/tint/builtins/gen/reverseBits/e31adf.wgsl
index 3b31bae..444c5dd 100644
--- a/test/tint/builtins/gen/reverseBits/e31adf.wgsl
+++ b/test/tint/builtins/gen/reverseBits/e31adf.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/round/106c0b.wgsl

diff --git a/test/tint/builtins/gen/round/106c0b.wgsl b/test/tint/builtins/gen/round/106c0b.wgsl
index 5d684ce..92abf15 100644
--- a/test/tint/builtins/gen/round/106c0b.wgsl
+++ b/test/tint/builtins/gen/round/106c0b.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/round/1c7897.wgsl

diff --git a/test/tint/builtins/gen/round/1c7897.wgsl b/test/tint/builtins/gen/round/1c7897.wgsl
index 8e9898b..110db4f 100644
--- a/test/tint/builtins/gen/round/1c7897.wgsl
+++ b/test/tint/builtins/gen/round/1c7897.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/round/52c84d.wgsl

diff --git a/test/tint/builtins/gen/round/52c84d.wgsl b/test/tint/builtins/gen/round/52c84d.wgsl
index f3bc8bf..b56593d 100644
--- a/test/tint/builtins/gen/round/52c84d.wgsl
+++ b/test/tint/builtins/gen/round/52c84d.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/round/9edc38.wgsl

diff --git a/test/tint/builtins/gen/round/9edc38.wgsl b/test/tint/builtins/gen/round/9edc38.wgsl
index 010071b..99a0391 100644
--- a/test/tint/builtins/gen/round/9edc38.wgsl
+++ b/test/tint/builtins/gen/round/9edc38.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/select/00b848.wgsl

diff --git a/test/tint/builtins/gen/select/00b848.wgsl b/test/tint/builtins/gen/select/00b848.wgsl
index 32c7ffb..c7c4e14 100644
--- a/test/tint/builtins/gen/select/00b848.wgsl
+++ b/test/tint/builtins/gen/select/00b848.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/select/01e2cd.wgsl

diff --git a/test/tint/builtins/gen/select/01e2cd.wgsl b/test/tint/builtins/gen/select/01e2cd.wgsl
index 7715860..9cb446d 100644
--- a/test/tint/builtins/gen/select/01e2cd.wgsl
+++ b/test/tint/builtins/gen/select/01e2cd.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/select/087ea4.wgsl

diff --git a/test/tint/builtins/gen/select/087ea4.wgsl b/test/tint/builtins/gen/select/087ea4.wgsl
index a2fcf56..472afb5 100644
--- a/test/tint/builtins/gen/select/087ea4.wgsl
+++ b/test/tint/builtins/gen/select/087ea4.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/select/1e960b.wgsl

diff --git a/test/tint/builtins/gen/select/1e960b.wgsl b/test/tint/builtins/gen/select/1e960b.wgsl
index 6594ce1..9b69ab5 100644
--- a/test/tint/builtins/gen/select/1e960b.wgsl
+++ b/test/tint/builtins/gen/select/1e960b.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/select/266aff.wgsl

diff --git a/test/tint/builtins/gen/select/266aff.wgsl b/test/tint/builtins/gen/select/266aff.wgsl
index 56e311a..32e95fc 100644
--- a/test/tint/builtins/gen/select/266aff.wgsl
+++ b/test/tint/builtins/gen/select/266aff.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/select/28a27e.wgsl

diff --git a/test/tint/builtins/gen/select/28a27e.wgsl b/test/tint/builtins/gen/select/28a27e.wgsl
index 42151b5..85b4778 100644
--- a/test/tint/builtins/gen/select/28a27e.wgsl
+++ b/test/tint/builtins/gen/select/28a27e.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/select/3c25ce.wgsl

diff --git a/test/tint/builtins/gen/select/3c25ce.wgsl b/test/tint/builtins/gen/select/3c25ce.wgsl
index 3670bd6..74a0235 100644
--- a/test/tint/builtins/gen/select/3c25ce.wgsl
+++ b/test/tint/builtins/gen/select/3c25ce.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/select/416e14.wgsl

diff --git a/test/tint/builtins/gen/select/416e14.wgsl b/test/tint/builtins/gen/select/416e14.wgsl
index 78d799d..c33ac0e 100644
--- a/test/tint/builtins/gen/select/416e14.wgsl
+++ b/test/tint/builtins/gen/select/416e14.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/select/51b047.wgsl

diff --git a/test/tint/builtins/gen/select/51b047.wgsl b/test/tint/builtins/gen/select/51b047.wgsl
index 63c6e77..87d4693 100644
--- a/test/tint/builtins/gen/select/51b047.wgsl
+++ b/test/tint/builtins/gen/select/51b047.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/select/713567.wgsl

diff --git a/test/tint/builtins/gen/select/713567.wgsl b/test/tint/builtins/gen/select/713567.wgsl
index 1e3b646..7ef740f 100644
--- a/test/tint/builtins/gen/select/713567.wgsl
+++ b/test/tint/builtins/gen/select/713567.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/select/78be5f.wgsl

diff --git a/test/tint/builtins/gen/select/78be5f.wgsl b/test/tint/builtins/gen/select/78be5f.wgsl
index 59b5f04..49a3773 100644
--- a/test/tint/builtins/gen/select/78be5f.wgsl
+++ b/test/tint/builtins/gen/select/78be5f.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/select/80a9a9.wgsl

diff --git a/test/tint/builtins/gen/select/80a9a9.wgsl b/test/tint/builtins/gen/select/80a9a9.wgsl
index 5e1fc6c..0eaaddd 100644
--- a/test/tint/builtins/gen/select/80a9a9.wgsl
+++ b/test/tint/builtins/gen/select/80a9a9.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/select/8fa62c.wgsl

diff --git a/test/tint/builtins/gen/select/8fa62c.wgsl b/test/tint/builtins/gen/select/8fa62c.wgsl
index 97a8fe7..8457c9c 100644
--- a/test/tint/builtins/gen/select/8fa62c.wgsl
+++ b/test/tint/builtins/gen/select/8fa62c.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/select/99f883.wgsl

diff --git a/test/tint/builtins/gen/select/99f883.wgsl b/test/tint/builtins/gen/select/99f883.wgsl
index 7fd93b3..1c05b01 100644
--- a/test/tint/builtins/gen/select/99f883.wgsl
+++ b/test/tint/builtins/gen/select/99f883.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/select/a2860e.wgsl

diff --git a/test/tint/builtins/gen/select/a2860e.wgsl b/test/tint/builtins/gen/select/a2860e.wgsl
index f808503..ea40ec5 100644
--- a/test/tint/builtins/gen/select/a2860e.wgsl
+++ b/test/tint/builtins/gen/select/a2860e.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/select/ab069f.wgsl

diff --git a/test/tint/builtins/gen/select/ab069f.wgsl b/test/tint/builtins/gen/select/ab069f.wgsl
index e9d766a..b05ddda 100644
--- a/test/tint/builtins/gen/select/ab069f.wgsl
+++ b/test/tint/builtins/gen/select/ab069f.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/select/b04721.wgsl

diff --git a/test/tint/builtins/gen/select/b04721.wgsl b/test/tint/builtins/gen/select/b04721.wgsl
index 2d3f476..fb5ad56 100644
--- a/test/tint/builtins/gen/select/b04721.wgsl
+++ b/test/tint/builtins/gen/select/b04721.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/select/bb447f.wgsl

diff --git a/test/tint/builtins/gen/select/bb447f.wgsl b/test/tint/builtins/gen/select/bb447f.wgsl
index fe72109..2a6f85b 100644
--- a/test/tint/builtins/gen/select/bb447f.wgsl
+++ b/test/tint/builtins/gen/select/bb447f.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/select/bb8aae.wgsl

diff --git a/test/tint/builtins/gen/select/bb8aae.wgsl b/test/tint/builtins/gen/select/bb8aae.wgsl
index 18b8a09..8bcb4ef 100644
--- a/test/tint/builtins/gen/select/bb8aae.wgsl
+++ b/test/tint/builtins/gen/select/bb8aae.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/select/bf3d29.wgsl

diff --git a/test/tint/builtins/gen/select/bf3d29.wgsl b/test/tint/builtins/gen/select/bf3d29.wgsl
index 571a586..086cb87 100644
--- a/test/tint/builtins/gen/select/bf3d29.wgsl
+++ b/test/tint/builtins/gen/select/bf3d29.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/select/c31f9e.wgsl

diff --git a/test/tint/builtins/gen/select/c31f9e.wgsl b/test/tint/builtins/gen/select/c31f9e.wgsl
index 1239a04..9c88e0c 100644
--- a/test/tint/builtins/gen/select/c31f9e.wgsl
+++ b/test/tint/builtins/gen/select/c31f9e.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/select/c41bd1.wgsl

diff --git a/test/tint/builtins/gen/select/c41bd1.wgsl b/test/tint/builtins/gen/select/c41bd1.wgsl
index 1f5405e..9b25fa1 100644
--- a/test/tint/builtins/gen/select/c41bd1.wgsl
+++ b/test/tint/builtins/gen/select/c41bd1.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/select/c4a4ef.wgsl

diff --git a/test/tint/builtins/gen/select/c4a4ef.wgsl b/test/tint/builtins/gen/select/c4a4ef.wgsl
index 2c79927..829a645 100644
--- a/test/tint/builtins/gen/select/c4a4ef.wgsl
+++ b/test/tint/builtins/gen/select/c4a4ef.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/select/cb9301.wgsl

diff --git a/test/tint/builtins/gen/select/cb9301.wgsl b/test/tint/builtins/gen/select/cb9301.wgsl
index 5f2a238..9cb7f66 100644
--- a/test/tint/builtins/gen/select/cb9301.wgsl
+++ b/test/tint/builtins/gen/select/cb9301.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/select/e3e028.wgsl

diff --git a/test/tint/builtins/gen/select/e3e028.wgsl b/test/tint/builtins/gen/select/e3e028.wgsl
index 157715b..a16dc3f 100644
--- a/test/tint/builtins/gen/select/e3e028.wgsl
+++ b/test/tint/builtins/gen/select/e3e028.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/select/ebfea2.wgsl

diff --git a/test/tint/builtins/gen/select/ebfea2.wgsl b/test/tint/builtins/gen/select/ebfea2.wgsl
index a67374c..9785582 100644
--- a/test/tint/builtins/gen/select/ebfea2.wgsl
+++ b/test/tint/builtins/gen/select/ebfea2.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/select/ed8a15.wgsl

diff --git a/test/tint/builtins/gen/select/ed8a15.wgsl b/test/tint/builtins/gen/select/ed8a15.wgsl
index 4821ffe..bf8afaf 100644
--- a/test/tint/builtins/gen/select/ed8a15.wgsl
+++ b/test/tint/builtins/gen/select/ed8a15.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/select/fb7e53.wgsl

diff --git a/test/tint/builtins/gen/select/fb7e53.wgsl b/test/tint/builtins/gen/select/fb7e53.wgsl
index de66cf2..2513b57 100644
--- a/test/tint/builtins/gen/select/fb7e53.wgsl
+++ b/test/tint/builtins/gen/select/fb7e53.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/sign/159665.wgsl

diff --git a/test/tint/builtins/gen/sign/159665.wgsl b/test/tint/builtins/gen/sign/159665.wgsl
index adb28ab..5234109 100644
--- a/test/tint/builtins/gen/sign/159665.wgsl
+++ b/test/tint/builtins/gen/sign/159665.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/sign/b8f634.wgsl

diff --git a/test/tint/builtins/gen/sign/b8f634.wgsl b/test/tint/builtins/gen/sign/b8f634.wgsl
index e308a0b..2ce41af 100644
--- a/test/tint/builtins/gen/sign/b8f634.wgsl
+++ b/test/tint/builtins/gen/sign/b8f634.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/sign/d065d8.wgsl

diff --git a/test/tint/builtins/gen/sign/d065d8.wgsl b/test/tint/builtins/gen/sign/d065d8.wgsl
index 4efd33f..1d5b548 100644
--- a/test/tint/builtins/gen/sign/d065d8.wgsl
+++ b/test/tint/builtins/gen/sign/d065d8.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/sign/dd790e.wgsl

diff --git a/test/tint/builtins/gen/sign/dd790e.wgsl b/test/tint/builtins/gen/sign/dd790e.wgsl
index 6a065f3..ac68d39 100644
--- a/test/tint/builtins/gen/sign/dd790e.wgsl
+++ b/test/tint/builtins/gen/sign/dd790e.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/sin/01f241.wgsl

diff --git a/test/tint/builtins/gen/sin/01f241.wgsl b/test/tint/builtins/gen/sin/01f241.wgsl
index 4d78c4a..28bfe26 100644
--- a/test/tint/builtins/gen/sin/01f241.wgsl
+++ b/test/tint/builtins/gen/sin/01f241.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/sin/4e3979.wgsl

diff --git a/test/tint/builtins/gen/sin/4e3979.wgsl b/test/tint/builtins/gen/sin/4e3979.wgsl
index 4bfeed5..dabf113 100644
--- a/test/tint/builtins/gen/sin/4e3979.wgsl
+++ b/test/tint/builtins/gen/sin/4e3979.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/sin/b78c91.wgsl

diff --git a/test/tint/builtins/gen/sin/b78c91.wgsl b/test/tint/builtins/gen/sin/b78c91.wgsl
index 83d02dd..f7e2641 100644
--- a/test/tint/builtins/gen/sin/b78c91.wgsl
+++ b/test/tint/builtins/gen/sin/b78c91.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/sin/fc8bc4.wgsl

diff --git a/test/tint/builtins/gen/sin/fc8bc4.wgsl b/test/tint/builtins/gen/sin/fc8bc4.wgsl
index 154c7d0..45f5605 100644
--- a/test/tint/builtins/gen/sin/fc8bc4.wgsl
+++ b/test/tint/builtins/gen/sin/fc8bc4.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/sinh/445e33.wgsl

diff --git a/test/tint/builtins/gen/sinh/445e33.wgsl b/test/tint/builtins/gen/sinh/445e33.wgsl
index 21c0c8f..87fa6c2 100644
--- a/test/tint/builtins/gen/sinh/445e33.wgsl
+++ b/test/tint/builtins/gen/sinh/445e33.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/sinh/7bb598.wgsl

diff --git a/test/tint/builtins/gen/sinh/7bb598.wgsl b/test/tint/builtins/gen/sinh/7bb598.wgsl
index b0dc762..b2da9a5 100644
--- a/test/tint/builtins/gen/sinh/7bb598.wgsl
+++ b/test/tint/builtins/gen/sinh/7bb598.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/sinh/b9860e.wgsl

diff --git a/test/tint/builtins/gen/sinh/b9860e.wgsl b/test/tint/builtins/gen/sinh/b9860e.wgsl
index 11bf85b..b1666ef 100644
--- a/test/tint/builtins/gen/sinh/b9860e.wgsl
+++ b/test/tint/builtins/gen/sinh/b9860e.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/sinh/c9a5eb.wgsl

diff --git a/test/tint/builtins/gen/sinh/c9a5eb.wgsl b/test/tint/builtins/gen/sinh/c9a5eb.wgsl
index ada4792..66ff96b 100644
--- a/test/tint/builtins/gen/sinh/c9a5eb.wgsl
+++ b/test/tint/builtins/gen/sinh/c9a5eb.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/smoothStep/5f615b.wgsl

diff --git a/test/tint/builtins/gen/smoothStep/5f615b.wgsl b/test/tint/builtins/gen/smoothStep/5f615b.wgsl
index 2a74908..565e625 100644
--- a/test/tint/builtins/gen/smoothStep/5f615b.wgsl
+++ b/test/tint/builtins/gen/smoothStep/5f615b.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/smoothStep/658be3.wgsl

diff --git a/test/tint/builtins/gen/smoothStep/658be3.wgsl b/test/tint/builtins/gen/smoothStep/658be3.wgsl
index 65f4011..bd29528 100644
--- a/test/tint/builtins/gen/smoothStep/658be3.wgsl
+++ b/test/tint/builtins/gen/smoothStep/658be3.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/smoothStep/c11eef.wgsl

diff --git a/test/tint/builtins/gen/smoothStep/c11eef.wgsl b/test/tint/builtins/gen/smoothStep/c11eef.wgsl
index 3953e37..518847a 100644
--- a/test/tint/builtins/gen/smoothStep/c11eef.wgsl
+++ b/test/tint/builtins/gen/smoothStep/c11eef.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/smoothStep/cb0bfb.wgsl

diff --git a/test/tint/builtins/gen/smoothStep/cb0bfb.wgsl b/test/tint/builtins/gen/smoothStep/cb0bfb.wgsl
index ff81a88..a30a304 100644
--- a/test/tint/builtins/gen/smoothStep/cb0bfb.wgsl
+++ b/test/tint/builtins/gen/smoothStep/cb0bfb.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/sqrt/20c74e.wgsl

diff --git a/test/tint/builtins/gen/sqrt/20c74e.wgsl b/test/tint/builtins/gen/sqrt/20c74e.wgsl
index b4ce20f..f5d13b7 100644
--- a/test/tint/builtins/gen/sqrt/20c74e.wgsl
+++ b/test/tint/builtins/gen/sqrt/20c74e.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/sqrt/8c7024.wgsl

diff --git a/test/tint/builtins/gen/sqrt/8c7024.wgsl b/test/tint/builtins/gen/sqrt/8c7024.wgsl
index 96bea10..fd73ed8 100644
--- a/test/tint/builtins/gen/sqrt/8c7024.wgsl
+++ b/test/tint/builtins/gen/sqrt/8c7024.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/sqrt/aa0d7a.wgsl

diff --git a/test/tint/builtins/gen/sqrt/aa0d7a.wgsl b/test/tint/builtins/gen/sqrt/aa0d7a.wgsl
index 4848c54..835d0f3 100644
--- a/test/tint/builtins/gen/sqrt/aa0d7a.wgsl
+++ b/test/tint/builtins/gen/sqrt/aa0d7a.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/sqrt/f8c59a.wgsl

diff --git a/test/tint/builtins/gen/sqrt/f8c59a.wgsl b/test/tint/builtins/gen/sqrt/f8c59a.wgsl
index b4aeefd..bf860d2 100644
--- a/test/tint/builtins/gen/sqrt/f8c59a.wgsl
+++ b/test/tint/builtins/gen/sqrt/f8c59a.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/step/0b073b.wgsl

diff --git a/test/tint/builtins/gen/step/0b073b.wgsl b/test/tint/builtins/gen/step/0b073b.wgsl
index f1006d6..12a6a42 100644
--- a/test/tint/builtins/gen/step/0b073b.wgsl
+++ b/test/tint/builtins/gen/step/0b073b.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/step/19accd.wgsl

diff --git a/test/tint/builtins/gen/step/19accd.wgsl b/test/tint/builtins/gen/step/19accd.wgsl
index 5e6276d..7c6807d 100644
--- a/test/tint/builtins/gen/step/19accd.wgsl
+++ b/test/tint/builtins/gen/step/19accd.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/step/334303.wgsl

diff --git a/test/tint/builtins/gen/step/334303.wgsl b/test/tint/builtins/gen/step/334303.wgsl
index 3b53ace..b9495b6 100644
--- a/test/tint/builtins/gen/step/334303.wgsl
+++ b/test/tint/builtins/gen/step/334303.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/step/e2b337.wgsl

diff --git a/test/tint/builtins/gen/step/e2b337.wgsl b/test/tint/builtins/gen/step/e2b337.wgsl
index bf13f3c..148689e 100644
--- a/test/tint/builtins/gen/step/e2b337.wgsl
+++ b/test/tint/builtins/gen/step/e2b337.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/storageBarrier/d87211.wgsl

diff --git a/test/tint/builtins/gen/storageBarrier/d87211.wgsl b/test/tint/builtins/gen/storageBarrier/d87211.wgsl
index 2620443..2925302 100644
--- a/test/tint/builtins/gen/storageBarrier/d87211.wgsl
+++ b/test/tint/builtins/gen/storageBarrier/d87211.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/tan/244e2a.wgsl

diff --git a/test/tint/builtins/gen/tan/244e2a.wgsl b/test/tint/builtins/gen/tan/244e2a.wgsl
index 24eed7b..1108dcc 100644
--- a/test/tint/builtins/gen/tan/244e2a.wgsl
+++ b/test/tint/builtins/gen/tan/244e2a.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/tan/2f030e.wgsl

diff --git a/test/tint/builtins/gen/tan/2f030e.wgsl b/test/tint/builtins/gen/tan/2f030e.wgsl
index cb7ecc9..005619a 100644
--- a/test/tint/builtins/gen/tan/2f030e.wgsl
+++ b/test/tint/builtins/gen/tan/2f030e.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/tan/7ea104.wgsl

diff --git a/test/tint/builtins/gen/tan/7ea104.wgsl b/test/tint/builtins/gen/tan/7ea104.wgsl
index caf5f99..a19522f 100644
--- a/test/tint/builtins/gen/tan/7ea104.wgsl
+++ b/test/tint/builtins/gen/tan/7ea104.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/tan/8ce3e9.wgsl

diff --git a/test/tint/builtins/gen/tan/8ce3e9.wgsl b/test/tint/builtins/gen/tan/8ce3e9.wgsl
index d4a3663..ddcaa32 100644
--- a/test/tint/builtins/gen/tan/8ce3e9.wgsl
+++ b/test/tint/builtins/gen/tan/8ce3e9.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/tanh/5663c5.wgsl

diff --git a/test/tint/builtins/gen/tanh/5663c5.wgsl b/test/tint/builtins/gen/tanh/5663c5.wgsl
index f752060..cb86030 100644
--- a/test/tint/builtins/gen/tanh/5663c5.wgsl
+++ b/test/tint/builtins/gen/tanh/5663c5.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/tanh/5724b3.wgsl

diff --git a/test/tint/builtins/gen/tanh/5724b3.wgsl b/test/tint/builtins/gen/tanh/5724b3.wgsl
index 95f5807..3f88159 100644
--- a/test/tint/builtins/gen/tanh/5724b3.wgsl
+++ b/test/tint/builtins/gen/tanh/5724b3.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/tanh/9f9fb9.wgsl

diff --git a/test/tint/builtins/gen/tanh/9f9fb9.wgsl b/test/tint/builtins/gen/tanh/9f9fb9.wgsl
index d8530dc..e090651 100644
--- a/test/tint/builtins/gen/tanh/9f9fb9.wgsl
+++ b/test/tint/builtins/gen/tanh/9f9fb9.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/tanh/c15fdb.wgsl

diff --git a/test/tint/builtins/gen/tanh/c15fdb.wgsl b/test/tint/builtins/gen/tanh/c15fdb.wgsl
index e9b0c19..71a6cb4 100644
--- a/test/tint/builtins/gen/tanh/c15fdb.wgsl
+++ b/test/tint/builtins/gen/tanh/c15fdb.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/textureDimensions/002b2a.wgsl

diff --git a/test/tint/builtins/gen/textureDimensions/002b2a.wgsl b/test/tint/builtins/gen/textureDimensions/002b2a.wgsl
index abdf125..7747aea 100644
--- a/test/tint/builtins/gen/textureDimensions/002b2a.wgsl
+++ b/test/tint/builtins/gen/textureDimensions/002b2a.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/textureDimensions/012b82.wgsl

diff --git a/test/tint/builtins/gen/textureDimensions/012b82.wgsl b/test/tint/builtins/gen/textureDimensions/012b82.wgsl
index 92bdad0..49d760b 100644
--- a/test/tint/builtins/gen/textureDimensions/012b82.wgsl
+++ b/test/tint/builtins/gen/textureDimensions/012b82.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/textureDimensions/08753d.wgsl

diff --git a/test/tint/builtins/gen/textureDimensions/08753d.wgsl b/test/tint/builtins/gen/textureDimensions/08753d.wgsl
index 08e10f1..b8ad116 100644
--- a/test/tint/builtins/gen/textureDimensions/08753d.wgsl
+++ b/test/tint/builtins/gen/textureDimensions/08753d.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/textureDimensions/0c4772.wgsl

diff --git a/test/tint/builtins/gen/textureDimensions/0c4772.wgsl b/test/tint/builtins/gen/textureDimensions/0c4772.wgsl
index 8e2fdc5..6dd8a79 100644
--- a/test/tint/builtins/gen/textureDimensions/0c4772.wgsl
+++ b/test/tint/builtins/gen/textureDimensions/0c4772.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/textureDimensions/0cce40.wgsl

diff --git a/test/tint/builtins/gen/textureDimensions/0cce40.wgsl b/test/tint/builtins/gen/textureDimensions/0cce40.wgsl
index f3718fc..4c14203 100644
--- a/test/tint/builtins/gen/textureDimensions/0cce40.wgsl
+++ b/test/tint/builtins/gen/textureDimensions/0cce40.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/textureDimensions/0cf2ff.wgsl

diff --git a/test/tint/builtins/gen/textureDimensions/0cf2ff.wgsl b/test/tint/builtins/gen/textureDimensions/0cf2ff.wgsl
index 2cd31ca..f52c1a6 100644
--- a/test/tint/builtins/gen/textureDimensions/0cf2ff.wgsl
+++ b/test/tint/builtins/gen/textureDimensions/0cf2ff.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/textureDimensions/0d8b7e.wgsl

diff --git a/test/tint/builtins/gen/textureDimensions/0d8b7e.wgsl b/test/tint/builtins/gen/textureDimensions/0d8b7e.wgsl
index c287d5c..2688d83 100644
--- a/test/tint/builtins/gen/textureDimensions/0d8b7e.wgsl
+++ b/test/tint/builtins/gen/textureDimensions/0d8b7e.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/textureDimensions/0e32ee.wgsl

diff --git a/test/tint/builtins/gen/textureDimensions/0e32ee.wgsl b/test/tint/builtins/gen/textureDimensions/0e32ee.wgsl
index b0bd534..3e9df2c 100644
--- a/test/tint/builtins/gen/textureDimensions/0e32ee.wgsl
+++ b/test/tint/builtins/gen/textureDimensions/0e32ee.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/textureDimensions/0f3c50.wgsl

diff --git a/test/tint/builtins/gen/textureDimensions/0f3c50.wgsl b/test/tint/builtins/gen/textureDimensions/0f3c50.wgsl
index c5c653b..11a3f9a 100644
--- a/test/tint/builtins/gen/textureDimensions/0f3c50.wgsl
+++ b/test/tint/builtins/gen/textureDimensions/0f3c50.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/textureDimensions/1191a5.wgsl

diff --git a/test/tint/builtins/gen/textureDimensions/1191a5.wgsl b/test/tint/builtins/gen/textureDimensions/1191a5.wgsl
index 8b27fb3..4dc1a05 100644
--- a/test/tint/builtins/gen/textureDimensions/1191a5.wgsl
+++ b/test/tint/builtins/gen/textureDimensions/1191a5.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/textureDimensions/12c9bb.wgsl

diff --git a/test/tint/builtins/gen/textureDimensions/12c9bb.wgsl b/test/tint/builtins/gen/textureDimensions/12c9bb.wgsl
index 78ced16..fad46f8 100644
--- a/test/tint/builtins/gen/textureDimensions/12c9bb.wgsl
+++ b/test/tint/builtins/gen/textureDimensions/12c9bb.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/textureDimensions/147998.wgsl

diff --git a/test/tint/builtins/gen/textureDimensions/147998.wgsl b/test/tint/builtins/gen/textureDimensions/147998.wgsl
index 8b386d9..801354f 100644
--- a/test/tint/builtins/gen/textureDimensions/147998.wgsl
+++ b/test/tint/builtins/gen/textureDimensions/147998.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/textureDimensions/16036c.wgsl

diff --git a/test/tint/builtins/gen/textureDimensions/16036c.wgsl b/test/tint/builtins/gen/textureDimensions/16036c.wgsl
index 44057b8..31caead 100644
--- a/test/tint/builtins/gen/textureDimensions/16036c.wgsl
+++ b/test/tint/builtins/gen/textureDimensions/16036c.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/textureDimensions/1b71f0.wgsl

diff --git a/test/tint/builtins/gen/textureDimensions/1b71f0.wgsl b/test/tint/builtins/gen/textureDimensions/1b71f0.wgsl
index f7a1e04..f16a467 100644
--- a/test/tint/builtins/gen/textureDimensions/1b71f0.wgsl
+++ b/test/tint/builtins/gen/textureDimensions/1b71f0.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/textureDimensions/1d6c26.wgsl

diff --git a/test/tint/builtins/gen/textureDimensions/1d6c26.wgsl b/test/tint/builtins/gen/textureDimensions/1d6c26.wgsl
index 592b9ea..9aef149 100644
--- a/test/tint/builtins/gen/textureDimensions/1d6c26.wgsl
+++ b/test/tint/builtins/gen/textureDimensions/1d6c26.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/textureDimensions/1e9e39.wgsl

diff --git a/test/tint/builtins/gen/textureDimensions/1e9e39.wgsl b/test/tint/builtins/gen/textureDimensions/1e9e39.wgsl
index e848f69..bd05eec 100644
--- a/test/tint/builtins/gen/textureDimensions/1e9e39.wgsl
+++ b/test/tint/builtins/gen/textureDimensions/1e9e39.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/textureDimensions/1f20c5.wgsl

diff --git a/test/tint/builtins/gen/textureDimensions/1f20c5.wgsl b/test/tint/builtins/gen/textureDimensions/1f20c5.wgsl
index 57dc1ee..73fca6f 100644
--- a/test/tint/builtins/gen/textureDimensions/1f20c5.wgsl
+++ b/test/tint/builtins/gen/textureDimensions/1f20c5.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/textureDimensions/214dd4.wgsl

diff --git a/test/tint/builtins/gen/textureDimensions/214dd4.wgsl b/test/tint/builtins/gen/textureDimensions/214dd4.wgsl
index ac2815d..f06b779 100644
--- a/test/tint/builtins/gen/textureDimensions/214dd4.wgsl
+++ b/test/tint/builtins/gen/textureDimensions/214dd4.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/textureDimensions/221f22.wgsl

diff --git a/test/tint/builtins/gen/textureDimensions/221f22.wgsl b/test/tint/builtins/gen/textureDimensions/221f22.wgsl
index 14d0237..3b798f4 100644
--- a/test/tint/builtins/gen/textureDimensions/221f22.wgsl
+++ b/test/tint/builtins/gen/textureDimensions/221f22.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/textureDimensions/267788.wgsl

diff --git a/test/tint/builtins/gen/textureDimensions/267788.wgsl b/test/tint/builtins/gen/textureDimensions/267788.wgsl
index 373e44e..03db51c 100644
--- a/test/tint/builtins/gen/textureDimensions/267788.wgsl
+++ b/test/tint/builtins/gen/textureDimensions/267788.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/textureDimensions/26bdfa.wgsl

diff --git a/test/tint/builtins/gen/textureDimensions/26bdfa.wgsl b/test/tint/builtins/gen/textureDimensions/26bdfa.wgsl
index 7921095..de93de7 100644
--- a/test/tint/builtins/gen/textureDimensions/26bdfa.wgsl
+++ b/test/tint/builtins/gen/textureDimensions/26bdfa.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/textureDimensions/26ef6c.wgsl

diff --git a/test/tint/builtins/gen/textureDimensions/26ef6c.wgsl b/test/tint/builtins/gen/textureDimensions/26ef6c.wgsl
index a09c30b..e4c00a8 100644
--- a/test/tint/builtins/gen/textureDimensions/26ef6c.wgsl
+++ b/test/tint/builtins/gen/textureDimensions/26ef6c.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/textureDimensions/2ad087.wgsl

diff --git a/test/tint/builtins/gen/textureDimensions/2ad087.wgsl b/test/tint/builtins/gen/textureDimensions/2ad087.wgsl
index fe036cd..0a409cb 100644
--- a/test/tint/builtins/gen/textureDimensions/2ad087.wgsl
+++ b/test/tint/builtins/gen/textureDimensions/2ad087.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/textureDimensions/2efa05.wgsl

diff --git a/test/tint/builtins/gen/textureDimensions/2efa05.wgsl b/test/tint/builtins/gen/textureDimensions/2efa05.wgsl
index ad39eb2..f675b2a 100644
--- a/test/tint/builtins/gen/textureDimensions/2efa05.wgsl
+++ b/test/tint/builtins/gen/textureDimensions/2efa05.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/textureDimensions/2f289f.wgsl

diff --git a/test/tint/builtins/gen/textureDimensions/2f289f.wgsl b/test/tint/builtins/gen/textureDimensions/2f289f.wgsl
index b7bd4c9..31b274b 100644
--- a/test/tint/builtins/gen/textureDimensions/2f289f.wgsl
+++ b/test/tint/builtins/gen/textureDimensions/2f289f.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/textureDimensions/2fe1cc.wgsl

diff --git a/test/tint/builtins/gen/textureDimensions/2fe1cc.wgsl b/test/tint/builtins/gen/textureDimensions/2fe1cc.wgsl
index b069814..fffa5ef 100644
--- a/test/tint/builtins/gen/textureDimensions/2fe1cc.wgsl
+++ b/test/tint/builtins/gen/textureDimensions/2fe1cc.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/textureDimensions/318ecc.wgsl

diff --git a/test/tint/builtins/gen/textureDimensions/318ecc.wgsl b/test/tint/builtins/gen/textureDimensions/318ecc.wgsl
index 94f6e05..e1ac7ce 100644
--- a/test/tint/builtins/gen/textureDimensions/318ecc.wgsl
+++ b/test/tint/builtins/gen/textureDimensions/318ecc.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/textureDimensions/340d06.wgsl

diff --git a/test/tint/builtins/gen/textureDimensions/340d06.wgsl b/test/tint/builtins/gen/textureDimensions/340d06.wgsl
index 96fb75c..d6ac699 100644
--- a/test/tint/builtins/gen/textureDimensions/340d06.wgsl
+++ b/test/tint/builtins/gen/textureDimensions/340d06.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/textureDimensions/398e30.wgsl

diff --git a/test/tint/builtins/gen/textureDimensions/398e30.wgsl b/test/tint/builtins/gen/textureDimensions/398e30.wgsl
index 578d684..416d6a1 100644
--- a/test/tint/builtins/gen/textureDimensions/398e30.wgsl
+++ b/test/tint/builtins/gen/textureDimensions/398e30.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/textureDimensions/3a94ea.wgsl

diff --git a/test/tint/builtins/gen/textureDimensions/3a94ea.wgsl b/test/tint/builtins/gen/textureDimensions/3a94ea.wgsl
index a55d872..933c78c 100644
--- a/test/tint/builtins/gen/textureDimensions/3a94ea.wgsl
+++ b/test/tint/builtins/gen/textureDimensions/3a94ea.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/textureDimensions/3aca08.wgsl

diff --git a/test/tint/builtins/gen/textureDimensions/3aca08.wgsl b/test/tint/builtins/gen/textureDimensions/3aca08.wgsl
index 015a10d..9661ae0 100644
--- a/test/tint/builtins/gen/textureDimensions/3aca08.wgsl
+++ b/test/tint/builtins/gen/textureDimensions/3aca08.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/textureDimensions/3c5ad8.wgsl

diff --git a/test/tint/builtins/gen/textureDimensions/3c5ad8.wgsl b/test/tint/builtins/gen/textureDimensions/3c5ad8.wgsl
index 4c83496..2b12ec8 100644
--- a/test/tint/builtins/gen/textureDimensions/3c5ad8.wgsl
+++ b/test/tint/builtins/gen/textureDimensions/3c5ad8.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/textureDimensions/4152a6.wgsl

diff --git a/test/tint/builtins/gen/textureDimensions/4152a6.wgsl b/test/tint/builtins/gen/textureDimensions/4152a6.wgsl
index cdb0684..77336b5 100644
--- a/test/tint/builtins/gen/textureDimensions/4152a6.wgsl
+++ b/test/tint/builtins/gen/textureDimensions/4152a6.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/textureDimensions/423f99.wgsl

diff --git a/test/tint/builtins/gen/textureDimensions/423f99.wgsl b/test/tint/builtins/gen/textureDimensions/423f99.wgsl
index b2534a3..f08084f 100644
--- a/test/tint/builtins/gen/textureDimensions/423f99.wgsl
+++ b/test/tint/builtins/gen/textureDimensions/423f99.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/textureDimensions/4267ee.wgsl

diff --git a/test/tint/builtins/gen/textureDimensions/4267ee.wgsl b/test/tint/builtins/gen/textureDimensions/4267ee.wgsl
index 0039183..de5c300 100644
--- a/test/tint/builtins/gen/textureDimensions/4267ee.wgsl
+++ b/test/tint/builtins/gen/textureDimensions/4267ee.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/textureDimensions/42d4e6.wgsl

diff --git a/test/tint/builtins/gen/textureDimensions/42d4e6.wgsl b/test/tint/builtins/gen/textureDimensions/42d4e6.wgsl
index 9db52bc..dc40509 100644
--- a/test/tint/builtins/gen/textureDimensions/42d4e6.wgsl
+++ b/test/tint/builtins/gen/textureDimensions/42d4e6.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/textureDimensions/48cb89.wgsl

diff --git a/test/tint/builtins/gen/textureDimensions/48cb89.wgsl b/test/tint/builtins/gen/textureDimensions/48cb89.wgsl
index d6b5e93..dc66bf5 100644
--- a/test/tint/builtins/gen/textureDimensions/48cb89.wgsl
+++ b/test/tint/builtins/gen/textureDimensions/48cb89.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/textureDimensions/49d274.wgsl

diff --git a/test/tint/builtins/gen/textureDimensions/49d274.wgsl b/test/tint/builtins/gen/textureDimensions/49d274.wgsl
index 365b4d9..5fbacdf 100644
--- a/test/tint/builtins/gen/textureDimensions/49d274.wgsl
+++ b/test/tint/builtins/gen/textureDimensions/49d274.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/textureDimensions/4df9a8.wgsl

diff --git a/test/tint/builtins/gen/textureDimensions/4df9a8.wgsl b/test/tint/builtins/gen/textureDimensions/4df9a8.wgsl
index 0d57047..1597c8d 100644
--- a/test/tint/builtins/gen/textureDimensions/4df9a8.wgsl
+++ b/test/tint/builtins/gen/textureDimensions/4df9a8.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/textureDimensions/50a9ee.wgsl

diff --git a/test/tint/builtins/gen/textureDimensions/50a9ee.wgsl b/test/tint/builtins/gen/textureDimensions/50a9ee.wgsl
index eb49af8..af4ba9f 100644
--- a/test/tint/builtins/gen/textureDimensions/50a9ee.wgsl
+++ b/test/tint/builtins/gen/textureDimensions/50a9ee.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/textureDimensions/52045c.wgsl

diff --git a/test/tint/builtins/gen/textureDimensions/52045c.wgsl b/test/tint/builtins/gen/textureDimensions/52045c.wgsl
index 4bcfa46..cd248ae 100644
--- a/test/tint/builtins/gen/textureDimensions/52045c.wgsl
+++ b/test/tint/builtins/gen/textureDimensions/52045c.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/textureDimensions/55b23e.wgsl

diff --git a/test/tint/builtins/gen/textureDimensions/55b23e.wgsl b/test/tint/builtins/gen/textureDimensions/55b23e.wgsl
index f8365a7..ef9278a 100644
--- a/test/tint/builtins/gen/textureDimensions/55b23e.wgsl
+++ b/test/tint/builtins/gen/textureDimensions/55b23e.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/textureDimensions/579629.wgsl

diff --git a/test/tint/builtins/gen/textureDimensions/579629.wgsl b/test/tint/builtins/gen/textureDimensions/579629.wgsl
index 307a03a..67c7425 100644
--- a/test/tint/builtins/gen/textureDimensions/579629.wgsl
+++ b/test/tint/builtins/gen/textureDimensions/579629.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/textureDimensions/57da0b.wgsl

diff --git a/test/tint/builtins/gen/textureDimensions/57da0b.wgsl b/test/tint/builtins/gen/textureDimensions/57da0b.wgsl
index b0f707a..b33c892 100644
--- a/test/tint/builtins/gen/textureDimensions/57da0b.wgsl
+++ b/test/tint/builtins/gen/textureDimensions/57da0b.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/textureDimensions/57e28f.wgsl

diff --git a/test/tint/builtins/gen/textureDimensions/57e28f.wgsl b/test/tint/builtins/gen/textureDimensions/57e28f.wgsl
index 7e40bd0..ee86198 100644
--- a/test/tint/builtins/gen/textureDimensions/57e28f.wgsl
+++ b/test/tint/builtins/gen/textureDimensions/57e28f.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/textureDimensions/58a515.wgsl

diff --git a/test/tint/builtins/gen/textureDimensions/58a515.wgsl b/test/tint/builtins/gen/textureDimensions/58a515.wgsl
index 02ecaea..5b43631 100644
--- a/test/tint/builtins/gen/textureDimensions/58a515.wgsl
+++ b/test/tint/builtins/gen/textureDimensions/58a515.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/textureDimensions/5985f3.wgsl

diff --git a/test/tint/builtins/gen/textureDimensions/5985f3.wgsl b/test/tint/builtins/gen/textureDimensions/5985f3.wgsl
index b181622..3db373d 100644
--- a/test/tint/builtins/gen/textureDimensions/5985f3.wgsl
+++ b/test/tint/builtins/gen/textureDimensions/5985f3.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/textureDimensions/5caa5e.wgsl

diff --git a/test/tint/builtins/gen/textureDimensions/5caa5e.wgsl b/test/tint/builtins/gen/textureDimensions/5caa5e.wgsl
index 8541575..7519fd7 100644
--- a/test/tint/builtins/gen/textureDimensions/5caa5e.wgsl
+++ b/test/tint/builtins/gen/textureDimensions/5caa5e.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/textureDimensions/5e295d.wgsl

diff --git a/test/tint/builtins/gen/textureDimensions/5e295d.wgsl b/test/tint/builtins/gen/textureDimensions/5e295d.wgsl
index 62b1c79..2feb748 100644
--- a/test/tint/builtins/gen/textureDimensions/5e295d.wgsl
+++ b/test/tint/builtins/gen/textureDimensions/5e295d.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/textureDimensions/60bf54.wgsl

diff --git a/test/tint/builtins/gen/textureDimensions/60bf54.wgsl b/test/tint/builtins/gen/textureDimensions/60bf54.wgsl
index 6eb6787..40adfcd 100644
--- a/test/tint/builtins/gen/textureDimensions/60bf54.wgsl
+++ b/test/tint/builtins/gen/textureDimensions/60bf54.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/textureDimensions/63f3cf.wgsl

diff --git a/test/tint/builtins/gen/textureDimensions/63f3cf.wgsl b/test/tint/builtins/gen/textureDimensions/63f3cf.wgsl
index c104a38..93dc8b9 100644
--- a/test/tint/builtins/gen/textureDimensions/63f3cf.wgsl
+++ b/test/tint/builtins/gen/textureDimensions/63f3cf.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/textureDimensions/68105c.wgsl

diff --git a/test/tint/builtins/gen/textureDimensions/68105c.wgsl b/test/tint/builtins/gen/textureDimensions/68105c.wgsl
index 4e457db..b129e2b 100644
--- a/test/tint/builtins/gen/textureDimensions/68105c.wgsl
+++ b/test/tint/builtins/gen/textureDimensions/68105c.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/textureDimensions/686ef2.wgsl

diff --git a/test/tint/builtins/gen/textureDimensions/686ef2.wgsl b/test/tint/builtins/gen/textureDimensions/686ef2.wgsl
index b05f0c5..11d39e7 100644
--- a/test/tint/builtins/gen/textureDimensions/686ef2.wgsl
+++ b/test/tint/builtins/gen/textureDimensions/686ef2.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/textureDimensions/6adac6.wgsl

diff --git a/test/tint/builtins/gen/textureDimensions/6adac6.wgsl b/test/tint/builtins/gen/textureDimensions/6adac6.wgsl
index 1474994..035e9f8 100644
--- a/test/tint/builtins/gen/textureDimensions/6adac6.wgsl
+++ b/test/tint/builtins/gen/textureDimensions/6adac6.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/textureDimensions/6ec1b4.wgsl

diff --git a/test/tint/builtins/gen/textureDimensions/6ec1b4.wgsl b/test/tint/builtins/gen/textureDimensions/6ec1b4.wgsl
index 652a4e1..12ae43f 100644
--- a/test/tint/builtins/gen/textureDimensions/6ec1b4.wgsl
+++ b/test/tint/builtins/gen/textureDimensions/6ec1b4.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/textureDimensions/6f0d79.wgsl

diff --git a/test/tint/builtins/gen/textureDimensions/6f0d79.wgsl b/test/tint/builtins/gen/textureDimensions/6f0d79.wgsl
index 51b2d16..910d901 100644
--- a/test/tint/builtins/gen/textureDimensions/6f0d79.wgsl
+++ b/test/tint/builtins/gen/textureDimensions/6f0d79.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/textureDimensions/702c53.wgsl

diff --git a/test/tint/builtins/gen/textureDimensions/702c53.wgsl b/test/tint/builtins/gen/textureDimensions/702c53.wgsl
index aa809aa..97f4f85 100644
--- a/test/tint/builtins/gen/textureDimensions/702c53.wgsl
+++ b/test/tint/builtins/gen/textureDimensions/702c53.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/textureDimensions/72e5d6.wgsl

diff --git a/test/tint/builtins/gen/textureDimensions/72e5d6.wgsl b/test/tint/builtins/gen/textureDimensions/72e5d6.wgsl
index 3527443..cb9953a 100644
--- a/test/tint/builtins/gen/textureDimensions/72e5d6.wgsl
+++ b/test/tint/builtins/gen/textureDimensions/72e5d6.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/textureDimensions/79df87.wgsl

diff --git a/test/tint/builtins/gen/textureDimensions/79df87.wgsl b/test/tint/builtins/gen/textureDimensions/79df87.wgsl
index a4402f3..8994e92 100644
--- a/test/tint/builtins/gen/textureDimensions/79df87.wgsl
+++ b/test/tint/builtins/gen/textureDimensions/79df87.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/textureDimensions/7bf826.wgsl

diff --git a/test/tint/builtins/gen/textureDimensions/7bf826.wgsl b/test/tint/builtins/gen/textureDimensions/7bf826.wgsl
index ae9fb9e..53a138f 100644
--- a/test/tint/builtins/gen/textureDimensions/7bf826.wgsl
+++ b/test/tint/builtins/gen/textureDimensions/7bf826.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/textureDimensions/7f5c2e.wgsl

diff --git a/test/tint/builtins/gen/textureDimensions/7f5c2e.wgsl b/test/tint/builtins/gen/textureDimensions/7f5c2e.wgsl
index b1434fb..50d3225 100644
--- a/test/tint/builtins/gen/textureDimensions/7f5c2e.wgsl
+++ b/test/tint/builtins/gen/textureDimensions/7f5c2e.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/textureDimensions/8028f3.wgsl

diff --git a/test/tint/builtins/gen/textureDimensions/8028f3.wgsl b/test/tint/builtins/gen/textureDimensions/8028f3.wgsl
index c50ad78..95622d8 100644
--- a/test/tint/builtins/gen/textureDimensions/8028f3.wgsl
+++ b/test/tint/builtins/gen/textureDimensions/8028f3.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/textureDimensions/811679.wgsl

diff --git a/test/tint/builtins/gen/textureDimensions/811679.wgsl b/test/tint/builtins/gen/textureDimensions/811679.wgsl
index efc5213..1aa8ded 100644
--- a/test/tint/builtins/gen/textureDimensions/811679.wgsl
+++ b/test/tint/builtins/gen/textureDimensions/811679.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/textureDimensions/820596.wgsl

diff --git a/test/tint/builtins/gen/textureDimensions/820596.wgsl b/test/tint/builtins/gen/textureDimensions/820596.wgsl
index 8a900d4..814c19f 100644
--- a/test/tint/builtins/gen/textureDimensions/820596.wgsl
+++ b/test/tint/builtins/gen/textureDimensions/820596.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/textureDimensions/83ee5a.wgsl

diff --git a/test/tint/builtins/gen/textureDimensions/83ee5a.wgsl b/test/tint/builtins/gen/textureDimensions/83ee5a.wgsl
index b2b2e7b..eeaa4f1 100644
--- a/test/tint/builtins/gen/textureDimensions/83ee5a.wgsl
+++ b/test/tint/builtins/gen/textureDimensions/83ee5a.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/textureDimensions/85d556.wgsl

diff --git a/test/tint/builtins/gen/textureDimensions/85d556.wgsl b/test/tint/builtins/gen/textureDimensions/85d556.wgsl
index 4c98522..3c58ad8 100644
--- a/test/tint/builtins/gen/textureDimensions/85d556.wgsl
+++ b/test/tint/builtins/gen/textureDimensions/85d556.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/textureDimensions/88ad17.wgsl

diff --git a/test/tint/builtins/gen/textureDimensions/88ad17.wgsl b/test/tint/builtins/gen/textureDimensions/88ad17.wgsl
index c4354f9..b2401be 100644
--- a/test/tint/builtins/gen/textureDimensions/88ad17.wgsl
+++ b/test/tint/builtins/gen/textureDimensions/88ad17.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/textureDimensions/8aa4c4.wgsl

diff --git a/test/tint/builtins/gen/textureDimensions/8aa4c4.wgsl b/test/tint/builtins/gen/textureDimensions/8aa4c4.wgsl
index 08f144d..781a0b4 100644
--- a/test/tint/builtins/gen/textureDimensions/8aa4c4.wgsl
+++ b/test/tint/builtins/gen/textureDimensions/8aa4c4.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/textureDimensions/8deb5e.wgsl

diff --git a/test/tint/builtins/gen/textureDimensions/8deb5e.wgsl b/test/tint/builtins/gen/textureDimensions/8deb5e.wgsl
index 580b23d..8f603fe 100644
--- a/test/tint/builtins/gen/textureDimensions/8deb5e.wgsl
+++ b/test/tint/builtins/gen/textureDimensions/8deb5e.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/textureDimensions/8f20bf.wgsl

diff --git a/test/tint/builtins/gen/textureDimensions/8f20bf.wgsl b/test/tint/builtins/gen/textureDimensions/8f20bf.wgsl
index f4b74a79..3c315b3 100644
--- a/test/tint/builtins/gen/textureDimensions/8f20bf.wgsl
+++ b/test/tint/builtins/gen/textureDimensions/8f20bf.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/textureDimensions/8fca0f.wgsl

diff --git a/test/tint/builtins/gen/textureDimensions/8fca0f.wgsl b/test/tint/builtins/gen/textureDimensions/8fca0f.wgsl
index f7eda13..32c1ee2 100644
--- a/test/tint/builtins/gen/textureDimensions/8fca0f.wgsl
+++ b/test/tint/builtins/gen/textureDimensions/8fca0f.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/textureDimensions/90340b.wgsl

diff --git a/test/tint/builtins/gen/textureDimensions/90340b.wgsl b/test/tint/builtins/gen/textureDimensions/90340b.wgsl
index fdc2d1f..cdfd3c1 100644
--- a/test/tint/builtins/gen/textureDimensions/90340b.wgsl
+++ b/test/tint/builtins/gen/textureDimensions/90340b.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/textureDimensions/9042ab.wgsl

diff --git a/test/tint/builtins/gen/textureDimensions/9042ab.wgsl b/test/tint/builtins/gen/textureDimensions/9042ab.wgsl
index 44a55b9..815b3a3 100644
--- a/test/tint/builtins/gen/textureDimensions/9042ab.wgsl
+++ b/test/tint/builtins/gen/textureDimensions/9042ab.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/textureDimensions/9393b0.wgsl

diff --git a/test/tint/builtins/gen/textureDimensions/9393b0.wgsl b/test/tint/builtins/gen/textureDimensions/9393b0.wgsl
index f9d4901..8d3a4d4 100644
--- a/test/tint/builtins/gen/textureDimensions/9393b0.wgsl
+++ b/test/tint/builtins/gen/textureDimensions/9393b0.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/textureDimensions/939fdb.wgsl

diff --git a/test/tint/builtins/gen/textureDimensions/939fdb.wgsl b/test/tint/builtins/gen/textureDimensions/939fdb.wgsl
index bd19de4..1fb04e3 100644
--- a/test/tint/builtins/gen/textureDimensions/939fdb.wgsl
+++ b/test/tint/builtins/gen/textureDimensions/939fdb.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/textureDimensions/962dcd.wgsl

diff --git a/test/tint/builtins/gen/textureDimensions/962dcd.wgsl b/test/tint/builtins/gen/textureDimensions/962dcd.wgsl
index 68269ee..0efc394 100644
--- a/test/tint/builtins/gen/textureDimensions/962dcd.wgsl
+++ b/test/tint/builtins/gen/textureDimensions/962dcd.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/textureDimensions/9abfe5.wgsl

diff --git a/test/tint/builtins/gen/textureDimensions/9abfe5.wgsl b/test/tint/builtins/gen/textureDimensions/9abfe5.wgsl
index 9cb143c..0f0a5f6 100644
--- a/test/tint/builtins/gen/textureDimensions/9abfe5.wgsl
+++ b/test/tint/builtins/gen/textureDimensions/9abfe5.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/textureDimensions/9c9c57.wgsl

diff --git a/test/tint/builtins/gen/textureDimensions/9c9c57.wgsl b/test/tint/builtins/gen/textureDimensions/9c9c57.wgsl
index cd7870c..3469b12 100644
--- a/test/tint/builtins/gen/textureDimensions/9c9c57.wgsl
+++ b/test/tint/builtins/gen/textureDimensions/9c9c57.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/textureDimensions/9da9e2.wgsl

diff --git a/test/tint/builtins/gen/textureDimensions/9da9e2.wgsl b/test/tint/builtins/gen/textureDimensions/9da9e2.wgsl
index 832f406..72d2a8f 100644
--- a/test/tint/builtins/gen/textureDimensions/9da9e2.wgsl
+++ b/test/tint/builtins/gen/textureDimensions/9da9e2.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/textureDimensions/9eb8d8.wgsl

diff --git a/test/tint/builtins/gen/textureDimensions/9eb8d8.wgsl b/test/tint/builtins/gen/textureDimensions/9eb8d8.wgsl
index 20884ff..14df0a4 100644
--- a/test/tint/builtins/gen/textureDimensions/9eb8d8.wgsl
+++ b/test/tint/builtins/gen/textureDimensions/9eb8d8.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/textureDimensions/9f8e46.wgsl

diff --git a/test/tint/builtins/gen/textureDimensions/9f8e46.wgsl b/test/tint/builtins/gen/textureDimensions/9f8e46.wgsl
index b6f4be2..84e1790 100644
--- a/test/tint/builtins/gen/textureDimensions/9f8e46.wgsl
+++ b/test/tint/builtins/gen/textureDimensions/9f8e46.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/textureDimensions/a01845.wgsl

diff --git a/test/tint/builtins/gen/textureDimensions/a01845.wgsl b/test/tint/builtins/gen/textureDimensions/a01845.wgsl
index 86c1911..6c5c3b8 100644
--- a/test/tint/builtins/gen/textureDimensions/a01845.wgsl
+++ b/test/tint/builtins/gen/textureDimensions/a01845.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/textureDimensions/a7d565.wgsl

diff --git a/test/tint/builtins/gen/textureDimensions/a7d565.wgsl b/test/tint/builtins/gen/textureDimensions/a7d565.wgsl
index 457d50c..6062dad 100644
--- a/test/tint/builtins/gen/textureDimensions/a7d565.wgsl
+++ b/test/tint/builtins/gen/textureDimensions/a7d565.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/textureDimensions/a863f2.wgsl

diff --git a/test/tint/builtins/gen/textureDimensions/a863f2.wgsl b/test/tint/builtins/gen/textureDimensions/a863f2.wgsl
index 94c32bc..b406745 100644
--- a/test/tint/builtins/gen/textureDimensions/a863f2.wgsl
+++ b/test/tint/builtins/gen/textureDimensions/a863f2.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/textureDimensions/a9c9c1.wgsl

diff --git a/test/tint/builtins/gen/textureDimensions/a9c9c1.wgsl b/test/tint/builtins/gen/textureDimensions/a9c9c1.wgsl
index 83639dc..2f9f456 100644
--- a/test/tint/builtins/gen/textureDimensions/a9c9c1.wgsl
+++ b/test/tint/builtins/gen/textureDimensions/a9c9c1.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/textureDimensions/b0e16d.wgsl

diff --git a/test/tint/builtins/gen/textureDimensions/b0e16d.wgsl b/test/tint/builtins/gen/textureDimensions/b0e16d.wgsl
index 2f55df0..975ed3e 100644
--- a/test/tint/builtins/gen/textureDimensions/b0e16d.wgsl
+++ b/test/tint/builtins/gen/textureDimensions/b0e16d.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/textureDimensions/b3c954.wgsl

diff --git a/test/tint/builtins/gen/textureDimensions/b3c954.wgsl b/test/tint/builtins/gen/textureDimensions/b3c954.wgsl
index 46c2786..32431df 100644
--- a/test/tint/builtins/gen/textureDimensions/b3c954.wgsl
+++ b/test/tint/builtins/gen/textureDimensions/b3c954.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/textureDimensions/b3e407.wgsl

diff --git a/test/tint/builtins/gen/textureDimensions/b3e407.wgsl b/test/tint/builtins/gen/textureDimensions/b3e407.wgsl
index f5e1391..541b20f 100644
--- a/test/tint/builtins/gen/textureDimensions/b3e407.wgsl
+++ b/test/tint/builtins/gen/textureDimensions/b3e407.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/textureDimensions/b91240.wgsl

diff --git a/test/tint/builtins/gen/textureDimensions/b91240.wgsl b/test/tint/builtins/gen/textureDimensions/b91240.wgsl
index e7aba5a..2b0618f 100644
--- a/test/tint/builtins/gen/textureDimensions/b91240.wgsl
+++ b/test/tint/builtins/gen/textureDimensions/b91240.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/textureDimensions/ba1481.wgsl

diff --git a/test/tint/builtins/gen/textureDimensions/ba1481.wgsl b/test/tint/builtins/gen/textureDimensions/ba1481.wgsl
index b9f20b8..c748cd4 100644
--- a/test/tint/builtins/gen/textureDimensions/ba1481.wgsl
+++ b/test/tint/builtins/gen/textureDimensions/ba1481.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/textureDimensions/bb3dde.wgsl

diff --git a/test/tint/builtins/gen/textureDimensions/bb3dde.wgsl b/test/tint/builtins/gen/textureDimensions/bb3dde.wgsl
index dfab743..106e673 100644
--- a/test/tint/builtins/gen/textureDimensions/bb3dde.wgsl
+++ b/test/tint/builtins/gen/textureDimensions/bb3dde.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/textureDimensions/c30e75.wgsl

diff --git a/test/tint/builtins/gen/textureDimensions/c30e75.wgsl b/test/tint/builtins/gen/textureDimensions/c30e75.wgsl
index b8a1e10..64589a1 100644
--- a/test/tint/builtins/gen/textureDimensions/c30e75.wgsl
+++ b/test/tint/builtins/gen/textureDimensions/c30e75.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/textureDimensions/c7943d.wgsl

diff --git a/test/tint/builtins/gen/textureDimensions/c7943d.wgsl b/test/tint/builtins/gen/textureDimensions/c7943d.wgsl
index 6da3f5a..045d675 100644
--- a/test/tint/builtins/gen/textureDimensions/c7943d.wgsl
+++ b/test/tint/builtins/gen/textureDimensions/c7943d.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/textureDimensions/cc968c.wgsl

diff --git a/test/tint/builtins/gen/textureDimensions/cc968c.wgsl b/test/tint/builtins/gen/textureDimensions/cc968c.wgsl
index f001aa6..5cac06a 100644
--- a/test/tint/builtins/gen/textureDimensions/cc968c.wgsl
+++ b/test/tint/builtins/gen/textureDimensions/cc968c.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/textureDimensions/cccc8f.wgsl

diff --git a/test/tint/builtins/gen/textureDimensions/cccc8f.wgsl b/test/tint/builtins/gen/textureDimensions/cccc8f.wgsl
index d990bc6..a29f56d 100644
--- a/test/tint/builtins/gen/textureDimensions/cccc8f.wgsl
+++ b/test/tint/builtins/gen/textureDimensions/cccc8f.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/textureDimensions/cd76a7.wgsl

diff --git a/test/tint/builtins/gen/textureDimensions/cd76a7.wgsl b/test/tint/builtins/gen/textureDimensions/cd76a7.wgsl
index bcf3f8f..698f801 100644
--- a/test/tint/builtins/gen/textureDimensions/cd76a7.wgsl
+++ b/test/tint/builtins/gen/textureDimensions/cd76a7.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/textureDimensions/cdf473.wgsl

diff --git a/test/tint/builtins/gen/textureDimensions/cdf473.wgsl b/test/tint/builtins/gen/textureDimensions/cdf473.wgsl
index 04b17c9..8484555 100644
--- a/test/tint/builtins/gen/textureDimensions/cdf473.wgsl
+++ b/test/tint/builtins/gen/textureDimensions/cdf473.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/textureDimensions/cec841.wgsl

diff --git a/test/tint/builtins/gen/textureDimensions/cec841.wgsl b/test/tint/builtins/gen/textureDimensions/cec841.wgsl
index 21c773a..27a00d8 100644
--- a/test/tint/builtins/gen/textureDimensions/cec841.wgsl
+++ b/test/tint/builtins/gen/textureDimensions/cec841.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/textureDimensions/cf7e43.wgsl

diff --git a/test/tint/builtins/gen/textureDimensions/cf7e43.wgsl b/test/tint/builtins/gen/textureDimensions/cf7e43.wgsl
index 76495cd..aef9ce2 100644
--- a/test/tint/builtins/gen/textureDimensions/cf7e43.wgsl
+++ b/test/tint/builtins/gen/textureDimensions/cf7e43.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/textureDimensions/d125bc.wgsl

diff --git a/test/tint/builtins/gen/textureDimensions/d125bc.wgsl b/test/tint/builtins/gen/textureDimensions/d125bc.wgsl
index 0e3d559..d9b9b75 100644
--- a/test/tint/builtins/gen/textureDimensions/d125bc.wgsl
+++ b/test/tint/builtins/gen/textureDimensions/d125bc.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/textureDimensions/d83c45.wgsl

diff --git a/test/tint/builtins/gen/textureDimensions/d83c45.wgsl b/test/tint/builtins/gen/textureDimensions/d83c45.wgsl
index 6e9f883..f1547b4 100644
--- a/test/tint/builtins/gen/textureDimensions/d83c45.wgsl
+++ b/test/tint/builtins/gen/textureDimensions/d83c45.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/textureDimensions/daf7c0.wgsl

diff --git a/test/tint/builtins/gen/textureDimensions/daf7c0.wgsl b/test/tint/builtins/gen/textureDimensions/daf7c0.wgsl
index 1615d62..1abea43 100644
--- a/test/tint/builtins/gen/textureDimensions/daf7c0.wgsl
+++ b/test/tint/builtins/gen/textureDimensions/daf7c0.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/textureDimensions/dc2dd0.wgsl

diff --git a/test/tint/builtins/gen/textureDimensions/dc2dd0.wgsl b/test/tint/builtins/gen/textureDimensions/dc2dd0.wgsl
index 4836b46..ce71a03 100644
--- a/test/tint/builtins/gen/textureDimensions/dc2dd0.wgsl
+++ b/test/tint/builtins/gen/textureDimensions/dc2dd0.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/textureDimensions/e927be.wgsl

diff --git a/test/tint/builtins/gen/textureDimensions/e927be.wgsl b/test/tint/builtins/gen/textureDimensions/e927be.wgsl
index a4ebee5..b868f85 100644
--- a/test/tint/builtins/gen/textureDimensions/e927be.wgsl
+++ b/test/tint/builtins/gen/textureDimensions/e927be.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/textureDimensions/e9e96c.wgsl

diff --git a/test/tint/builtins/gen/textureDimensions/e9e96c.wgsl b/test/tint/builtins/gen/textureDimensions/e9e96c.wgsl
index 49c2b15..095d3de 100644
--- a/test/tint/builtins/gen/textureDimensions/e9e96c.wgsl
+++ b/test/tint/builtins/gen/textureDimensions/e9e96c.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/textureDimensions/ef5b89.wgsl

diff --git a/test/tint/builtins/gen/textureDimensions/ef5b89.wgsl b/test/tint/builtins/gen/textureDimensions/ef5b89.wgsl
index 58838e2..bc5d8d1 100644
--- a/test/tint/builtins/gen/textureDimensions/ef5b89.wgsl
+++ b/test/tint/builtins/gen/textureDimensions/ef5b89.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/textureDimensions/efc8a4.wgsl

diff --git a/test/tint/builtins/gen/textureDimensions/efc8a4.wgsl b/test/tint/builtins/gen/textureDimensions/efc8a4.wgsl
index 843c647..d7492fc 100644
--- a/test/tint/builtins/gen/textureDimensions/efc8a4.wgsl
+++ b/test/tint/builtins/gen/textureDimensions/efc8a4.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/textureDimensions/f60bdb.wgsl

diff --git a/test/tint/builtins/gen/textureDimensions/f60bdb.wgsl b/test/tint/builtins/gen/textureDimensions/f60bdb.wgsl
index ad2bb47..dec639c 100644
--- a/test/tint/builtins/gen/textureDimensions/f60bdb.wgsl
+++ b/test/tint/builtins/gen/textureDimensions/f60bdb.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/textureDimensions/f7145b.wgsl

diff --git a/test/tint/builtins/gen/textureDimensions/f7145b.wgsl b/test/tint/builtins/gen/textureDimensions/f7145b.wgsl
index 02b68c1..2d6573d 100644
--- a/test/tint/builtins/gen/textureDimensions/f7145b.wgsl
+++ b/test/tint/builtins/gen/textureDimensions/f7145b.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/textureDimensions/f931c7.wgsl

diff --git a/test/tint/builtins/gen/textureDimensions/f931c7.wgsl b/test/tint/builtins/gen/textureDimensions/f931c7.wgsl
index 0270f12..ce008b8 100644
--- a/test/tint/builtins/gen/textureDimensions/f931c7.wgsl
+++ b/test/tint/builtins/gen/textureDimensions/f931c7.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/textureDimensions/fa9859.wgsl

diff --git a/test/tint/builtins/gen/textureDimensions/fa9859.wgsl b/test/tint/builtins/gen/textureDimensions/fa9859.wgsl
index 0035510..b37414d 100644
--- a/test/tint/builtins/gen/textureDimensions/fa9859.wgsl
+++ b/test/tint/builtins/gen/textureDimensions/fa9859.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/textureDimensions/fb5670.wgsl

diff --git a/test/tint/builtins/gen/textureDimensions/fb5670.wgsl b/test/tint/builtins/gen/textureDimensions/fb5670.wgsl
index 1ac4723..de55708 100644
--- a/test/tint/builtins/gen/textureDimensions/fb5670.wgsl
+++ b/test/tint/builtins/gen/textureDimensions/fb5670.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/textureDimensions/fcac78.wgsl

diff --git a/test/tint/builtins/gen/textureDimensions/fcac78.wgsl b/test/tint/builtins/gen/textureDimensions/fcac78.wgsl
index 3b2121e..e5a3cdc 100644
--- a/test/tint/builtins/gen/textureDimensions/fcac78.wgsl
+++ b/test/tint/builtins/gen/textureDimensions/fcac78.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/textureGather/01305f.wgsl

diff --git a/test/tint/builtins/gen/textureGather/01305f.wgsl b/test/tint/builtins/gen/textureGather/01305f.wgsl
index 8c521bf..3998267 100644
--- a/test/tint/builtins/gen/textureGather/01305f.wgsl
+++ b/test/tint/builtins/gen/textureGather/01305f.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/textureGather/06030a.wgsl

diff --git a/test/tint/builtins/gen/textureGather/06030a.wgsl b/test/tint/builtins/gen/textureGather/06030a.wgsl
index c3cfc07..d7c86c5 100644
--- a/test/tint/builtins/gen/textureGather/06030a.wgsl
+++ b/test/tint/builtins/gen/textureGather/06030a.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/textureGather/10c554.wgsl

diff --git a/test/tint/builtins/gen/textureGather/10c554.wgsl b/test/tint/builtins/gen/textureGather/10c554.wgsl
index e240c55..4261dde 100644
--- a/test/tint/builtins/gen/textureGather/10c554.wgsl
+++ b/test/tint/builtins/gen/textureGather/10c554.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/textureGather/15d79c.wgsl

diff --git a/test/tint/builtins/gen/textureGather/15d79c.wgsl b/test/tint/builtins/gen/textureGather/15d79c.wgsl
index 830c832..65b7d82 100644
--- a/test/tint/builtins/gen/textureGather/15d79c.wgsl
+++ b/test/tint/builtins/gen/textureGather/15d79c.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/textureGather/2e0ed5.wgsl

diff --git a/test/tint/builtins/gen/textureGather/2e0ed5.wgsl b/test/tint/builtins/gen/textureGather/2e0ed5.wgsl
index 39b32d1..fccd2a9 100644
--- a/test/tint/builtins/gen/textureGather/2e0ed5.wgsl
+++ b/test/tint/builtins/gen/textureGather/2e0ed5.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/textureGather/3112e8.wgsl

diff --git a/test/tint/builtins/gen/textureGather/3112e8.wgsl b/test/tint/builtins/gen/textureGather/3112e8.wgsl
index 90210b6..26dcca8 100644
--- a/test/tint/builtins/gen/textureGather/3112e8.wgsl
+++ b/test/tint/builtins/gen/textureGather/3112e8.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/textureGather/3c527e.wgsl

diff --git a/test/tint/builtins/gen/textureGather/3c527e.wgsl b/test/tint/builtins/gen/textureGather/3c527e.wgsl
index 9a90afe..52f9073 100644
--- a/test/tint/builtins/gen/textureGather/3c527e.wgsl
+++ b/test/tint/builtins/gen/textureGather/3c527e.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/textureGather/43025d.wgsl

diff --git a/test/tint/builtins/gen/textureGather/43025d.wgsl b/test/tint/builtins/gen/textureGather/43025d.wgsl
index c96d1c4..61bd966 100644
--- a/test/tint/builtins/gen/textureGather/43025d.wgsl
+++ b/test/tint/builtins/gen/textureGather/43025d.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/textureGather/4f2350.wgsl

diff --git a/test/tint/builtins/gen/textureGather/4f2350.wgsl b/test/tint/builtins/gen/textureGather/4f2350.wgsl
index 29250e9..4f2ea5f 100644
--- a/test/tint/builtins/gen/textureGather/4f2350.wgsl
+++ b/test/tint/builtins/gen/textureGather/4f2350.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/textureGather/51cf0b.wgsl

diff --git a/test/tint/builtins/gen/textureGather/51cf0b.wgsl b/test/tint/builtins/gen/textureGather/51cf0b.wgsl
index f27f6b5..9899ff7 100644
--- a/test/tint/builtins/gen/textureGather/51cf0b.wgsl
+++ b/test/tint/builtins/gen/textureGather/51cf0b.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/textureGather/53ece6.wgsl

diff --git a/test/tint/builtins/gen/textureGather/53ece6.wgsl b/test/tint/builtins/gen/textureGather/53ece6.wgsl
index 2f4e0b4..242a1fe 100644
--- a/test/tint/builtins/gen/textureGather/53ece6.wgsl
+++ b/test/tint/builtins/gen/textureGather/53ece6.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/textureGather/57bfc6.wgsl

diff --git a/test/tint/builtins/gen/textureGather/57bfc6.wgsl b/test/tint/builtins/gen/textureGather/57bfc6.wgsl
index 0fc0b73..c9c7185 100644
--- a/test/tint/builtins/gen/textureGather/57bfc6.wgsl
+++ b/test/tint/builtins/gen/textureGather/57bfc6.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/textureGather/587ba3.wgsl

diff --git a/test/tint/builtins/gen/textureGather/587ba3.wgsl b/test/tint/builtins/gen/textureGather/587ba3.wgsl
index 3f1e1e7..4b20c24 100644
--- a/test/tint/builtins/gen/textureGather/587ba3.wgsl
+++ b/test/tint/builtins/gen/textureGather/587ba3.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/textureGather/69e0fb.wgsl

diff --git a/test/tint/builtins/gen/textureGather/69e0fb.wgsl b/test/tint/builtins/gen/textureGather/69e0fb.wgsl
index 8d09197..be794c5 100644
--- a/test/tint/builtins/gen/textureGather/69e0fb.wgsl
+++ b/test/tint/builtins/gen/textureGather/69e0fb.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/textureGather/93003d.wgsl

diff --git a/test/tint/builtins/gen/textureGather/93003d.wgsl b/test/tint/builtins/gen/textureGather/93003d.wgsl
index 5fda02b..0f5b7bd 100644
--- a/test/tint/builtins/gen/textureGather/93003d.wgsl
+++ b/test/tint/builtins/gen/textureGather/93003d.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/textureGather/9a6358.wgsl

diff --git a/test/tint/builtins/gen/textureGather/9a6358.wgsl b/test/tint/builtins/gen/textureGather/9a6358.wgsl
index 2159a40..a5682c4 100644
--- a/test/tint/builtins/gen/textureGather/9a6358.wgsl
+++ b/test/tint/builtins/gen/textureGather/9a6358.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/textureGather/9efca2.wgsl

diff --git a/test/tint/builtins/gen/textureGather/9efca2.wgsl b/test/tint/builtins/gen/textureGather/9efca2.wgsl
index 8b48e61..dd8a24c 100644
--- a/test/tint/builtins/gen/textureGather/9efca2.wgsl
+++ b/test/tint/builtins/gen/textureGather/9efca2.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/textureGather/bd0b1e.wgsl

diff --git a/test/tint/builtins/gen/textureGather/bd0b1e.wgsl b/test/tint/builtins/gen/textureGather/bd0b1e.wgsl
index 892c997..b6c67b4 100644
--- a/test/tint/builtins/gen/textureGather/bd0b1e.wgsl
+++ b/test/tint/builtins/gen/textureGather/bd0b1e.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/textureGather/c409ae.wgsl

diff --git a/test/tint/builtins/gen/textureGather/c409ae.wgsl b/test/tint/builtins/gen/textureGather/c409ae.wgsl
index d37b2a4..613eb8f 100644
--- a/test/tint/builtins/gen/textureGather/c409ae.wgsl
+++ b/test/tint/builtins/gen/textureGather/c409ae.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/textureGather/c55822.wgsl

diff --git a/test/tint/builtins/gen/textureGather/c55822.wgsl b/test/tint/builtins/gen/textureGather/c55822.wgsl
index 2cebaac..4f2cf18 100644
--- a/test/tint/builtins/gen/textureGather/c55822.wgsl
+++ b/test/tint/builtins/gen/textureGather/c55822.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/textureGather/e1b67d.wgsl

diff --git a/test/tint/builtins/gen/textureGather/e1b67d.wgsl b/test/tint/builtins/gen/textureGather/e1b67d.wgsl
index 9341319..7dda59d 100644
--- a/test/tint/builtins/gen/textureGather/e1b67d.wgsl
+++ b/test/tint/builtins/gen/textureGather/e1b67d.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/textureGather/e9eff6.wgsl

diff --git a/test/tint/builtins/gen/textureGather/e9eff6.wgsl b/test/tint/builtins/gen/textureGather/e9eff6.wgsl
index bccabe3..b15f8d9e 100644
--- a/test/tint/builtins/gen/textureGather/e9eff6.wgsl
+++ b/test/tint/builtins/gen/textureGather/e9eff6.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/textureGather/f5f3ba.wgsl

diff --git a/test/tint/builtins/gen/textureGather/f5f3ba.wgsl b/test/tint/builtins/gen/textureGather/f5f3ba.wgsl
index 1d83ce1..cda4039 100644
--- a/test/tint/builtins/gen/textureGather/f5f3ba.wgsl
+++ b/test/tint/builtins/gen/textureGather/f5f3ba.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/textureGather/f7995a.wgsl

diff --git a/test/tint/builtins/gen/textureGather/f7995a.wgsl b/test/tint/builtins/gen/textureGather/f7995a.wgsl
index 2960054..aeb9e1e 100644
--- a/test/tint/builtins/gen/textureGather/f7995a.wgsl
+++ b/test/tint/builtins/gen/textureGather/f7995a.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/textureGatherCompare/182fd4.wgsl

diff --git a/test/tint/builtins/gen/textureGatherCompare/182fd4.wgsl b/test/tint/builtins/gen/textureGatherCompare/182fd4.wgsl
index c62de56..0d7cbee 100644
--- a/test/tint/builtins/gen/textureGatherCompare/182fd4.wgsl
+++ b/test/tint/builtins/gen/textureGatherCompare/182fd4.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/textureGatherCompare/60d2d1.wgsl

diff --git a/test/tint/builtins/gen/textureGatherCompare/60d2d1.wgsl b/test/tint/builtins/gen/textureGatherCompare/60d2d1.wgsl
index 5baa378..c92cd8a 100644
--- a/test/tint/builtins/gen/textureGatherCompare/60d2d1.wgsl
+++ b/test/tint/builtins/gen/textureGatherCompare/60d2d1.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/textureGatherCompare/6d9352.wgsl

diff --git a/test/tint/builtins/gen/textureGatherCompare/6d9352.wgsl b/test/tint/builtins/gen/textureGatherCompare/6d9352.wgsl
index e9edc14..6fcd808 100644
--- a/test/tint/builtins/gen/textureGatherCompare/6d9352.wgsl
+++ b/test/tint/builtins/gen/textureGatherCompare/6d9352.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/textureGatherCompare/6f1267.wgsl

diff --git a/test/tint/builtins/gen/textureGatherCompare/6f1267.wgsl b/test/tint/builtins/gen/textureGatherCompare/6f1267.wgsl
index 19e744d..cf01908 100644
--- a/test/tint/builtins/gen/textureGatherCompare/6f1267.wgsl
+++ b/test/tint/builtins/gen/textureGatherCompare/6f1267.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/textureGatherCompare/783e65.wgsl

diff --git a/test/tint/builtins/gen/textureGatherCompare/783e65.wgsl b/test/tint/builtins/gen/textureGatherCompare/783e65.wgsl
index 7801019..a4238f7 100644
--- a/test/tint/builtins/gen/textureGatherCompare/783e65.wgsl
+++ b/test/tint/builtins/gen/textureGatherCompare/783e65.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/textureGatherCompare/a5f587.wgsl

diff --git a/test/tint/builtins/gen/textureGatherCompare/a5f587.wgsl b/test/tint/builtins/gen/textureGatherCompare/a5f587.wgsl
index fe285c7..ff7a2d3 100644
--- a/test/tint/builtins/gen/textureGatherCompare/a5f587.wgsl
+++ b/test/tint/builtins/gen/textureGatherCompare/a5f587.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/textureLoad/19cf87.wgsl

diff --git a/test/tint/builtins/gen/textureLoad/19cf87.wgsl b/test/tint/builtins/gen/textureLoad/19cf87.wgsl
index 9d91de0..fe204c4 100644
--- a/test/tint/builtins/gen/textureLoad/19cf87.wgsl
+++ b/test/tint/builtins/gen/textureLoad/19cf87.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/textureLoad/1b8588.wgsl

diff --git a/test/tint/builtins/gen/textureLoad/1b8588.wgsl b/test/tint/builtins/gen/textureLoad/1b8588.wgsl
index ba23838..161abf5 100644
--- a/test/tint/builtins/gen/textureLoad/1b8588.wgsl
+++ b/test/tint/builtins/gen/textureLoad/1b8588.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/textureLoad/1f2016.wgsl

diff --git a/test/tint/builtins/gen/textureLoad/1f2016.wgsl b/test/tint/builtins/gen/textureLoad/1f2016.wgsl
index 64354c3..58f3e49 100644
--- a/test/tint/builtins/gen/textureLoad/1f2016.wgsl
+++ b/test/tint/builtins/gen/textureLoad/1f2016.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/textureLoad/484344.wgsl

diff --git a/test/tint/builtins/gen/textureLoad/484344.wgsl b/test/tint/builtins/gen/textureLoad/484344.wgsl
index b82bb67..7ce3c74 100644
--- a/test/tint/builtins/gen/textureLoad/484344.wgsl
+++ b/test/tint/builtins/gen/textureLoad/484344.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/textureLoad/4fd803.wgsl

diff --git a/test/tint/builtins/gen/textureLoad/4fd803.wgsl b/test/tint/builtins/gen/textureLoad/4fd803.wgsl
index 34fac87..edf3d4e 100644
--- a/test/tint/builtins/gen/textureLoad/4fd803.wgsl
+++ b/test/tint/builtins/gen/textureLoad/4fd803.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/textureLoad/5a2f9d.wgsl

diff --git a/test/tint/builtins/gen/textureLoad/5a2f9d.wgsl b/test/tint/builtins/gen/textureLoad/5a2f9d.wgsl
index f03d92c..0e8a1c9 100644
--- a/test/tint/builtins/gen/textureLoad/5a2f9d.wgsl
+++ b/test/tint/builtins/gen/textureLoad/5a2f9d.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/textureLoad/6154d4.wgsl

diff --git a/test/tint/builtins/gen/textureLoad/6154d4.wgsl b/test/tint/builtins/gen/textureLoad/6154d4.wgsl
index 1d4e4b1..535d518 100644
--- a/test/tint/builtins/gen/textureLoad/6154d4.wgsl
+++ b/test/tint/builtins/gen/textureLoad/6154d4.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/textureLoad/6273b1.wgsl

diff --git a/test/tint/builtins/gen/textureLoad/6273b1.wgsl b/test/tint/builtins/gen/textureLoad/6273b1.wgsl
index 0ae2f4e..469ccaf 100644
--- a/test/tint/builtins/gen/textureLoad/6273b1.wgsl
+++ b/test/tint/builtins/gen/textureLoad/6273b1.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/textureLoad/79e697.wgsl

diff --git a/test/tint/builtins/gen/textureLoad/79e697.wgsl b/test/tint/builtins/gen/textureLoad/79e697.wgsl
index 3104323..0894fcc 100644
--- a/test/tint/builtins/gen/textureLoad/79e697.wgsl
+++ b/test/tint/builtins/gen/textureLoad/79e697.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/textureLoad/7c90e5.wgsl

diff --git a/test/tint/builtins/gen/textureLoad/7c90e5.wgsl b/test/tint/builtins/gen/textureLoad/7c90e5.wgsl
index 54a7a17..ee7d6d8 100644
--- a/test/tint/builtins/gen/textureLoad/7c90e5.wgsl
+++ b/test/tint/builtins/gen/textureLoad/7c90e5.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/textureLoad/81c381.wgsl

diff --git a/test/tint/builtins/gen/textureLoad/81c381.wgsl b/test/tint/builtins/gen/textureLoad/81c381.wgsl
index 7bcc8cd..b96d812 100644
--- a/test/tint/builtins/gen/textureLoad/81c381.wgsl
+++ b/test/tint/builtins/gen/textureLoad/81c381.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/textureLoad/87be85.wgsl

diff --git a/test/tint/builtins/gen/textureLoad/87be85.wgsl b/test/tint/builtins/gen/textureLoad/87be85.wgsl
index 5317dab..493b223 100644
--- a/test/tint/builtins/gen/textureLoad/87be85.wgsl
+++ b/test/tint/builtins/gen/textureLoad/87be85.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/textureLoad/8acf41.wgsl

diff --git a/test/tint/builtins/gen/textureLoad/8acf41.wgsl b/test/tint/builtins/gen/textureLoad/8acf41.wgsl
index 02bcc10..32f8d7a 100644
--- a/test/tint/builtins/gen/textureLoad/8acf41.wgsl
+++ b/test/tint/builtins/gen/textureLoad/8acf41.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/textureLoad/9b2667.wgsl

diff --git a/test/tint/builtins/gen/textureLoad/9b2667.wgsl b/test/tint/builtins/gen/textureLoad/9b2667.wgsl
index df70318..363dd81 100644
--- a/test/tint/builtins/gen/textureLoad/9b2667.wgsl
+++ b/test/tint/builtins/gen/textureLoad/9b2667.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/textureLoad/a583c9.wgsl

diff --git a/test/tint/builtins/gen/textureLoad/a583c9.wgsl b/test/tint/builtins/gen/textureLoad/a583c9.wgsl
index 1c8e21d..1edbd2b 100644
--- a/test/tint/builtins/gen/textureLoad/a583c9.wgsl
+++ b/test/tint/builtins/gen/textureLoad/a583c9.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/textureLoad/a9a9f5.wgsl

diff --git a/test/tint/builtins/gen/textureLoad/a9a9f5.wgsl b/test/tint/builtins/gen/textureLoad/a9a9f5.wgsl
index 83d4755..c46c2e9 100644
--- a/test/tint/builtins/gen/textureLoad/a9a9f5.wgsl
+++ b/test/tint/builtins/gen/textureLoad/a9a9f5.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/textureLoad/c2a480.wgsl

diff --git a/test/tint/builtins/gen/textureLoad/c2a480.wgsl b/test/tint/builtins/gen/textureLoad/c2a480.wgsl
index cc70b1a..3d7ba91 100644
--- a/test/tint/builtins/gen/textureLoad/c2a480.wgsl
+++ b/test/tint/builtins/gen/textureLoad/c2a480.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/textureLoad/c378ee.wgsl

diff --git a/test/tint/builtins/gen/textureLoad/c378ee.wgsl b/test/tint/builtins/gen/textureLoad/c378ee.wgsl
index 3c34a60..50b6a75 100644
--- a/test/tint/builtins/gen/textureLoad/c378ee.wgsl
+++ b/test/tint/builtins/gen/textureLoad/c378ee.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/textureLoad/e3d2cc.wgsl

diff --git a/test/tint/builtins/gen/textureLoad/e3d2cc.wgsl b/test/tint/builtins/gen/textureLoad/e3d2cc.wgsl
index bc5ddf7..22314e3 100644
--- a/test/tint/builtins/gen/textureLoad/e3d2cc.wgsl
+++ b/test/tint/builtins/gen/textureLoad/e3d2cc.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/textureNumLayers/024820.wgsl

diff --git a/test/tint/builtins/gen/textureNumLayers/024820.wgsl b/test/tint/builtins/gen/textureNumLayers/024820.wgsl
index c812b9d..f0435df 100644
--- a/test/tint/builtins/gen/textureNumLayers/024820.wgsl
+++ b/test/tint/builtins/gen/textureNumLayers/024820.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/textureNumLayers/053df7.wgsl

diff --git a/test/tint/builtins/gen/textureNumLayers/053df7.wgsl b/test/tint/builtins/gen/textureNumLayers/053df7.wgsl
index 1322b40..d6091ab 100644
--- a/test/tint/builtins/gen/textureNumLayers/053df7.wgsl
+++ b/test/tint/builtins/gen/textureNumLayers/053df7.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/textureNumLayers/058cc3.wgsl

diff --git a/test/tint/builtins/gen/textureNumLayers/058cc3.wgsl b/test/tint/builtins/gen/textureNumLayers/058cc3.wgsl
index 30263b7..48ac7ce 100644
--- a/test/tint/builtins/gen/textureNumLayers/058cc3.wgsl
+++ b/test/tint/builtins/gen/textureNumLayers/058cc3.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/textureNumLayers/09d05d.wgsl

diff --git a/test/tint/builtins/gen/textureNumLayers/09d05d.wgsl b/test/tint/builtins/gen/textureNumLayers/09d05d.wgsl
index d3d8aef..5dc0761 100644
--- a/test/tint/builtins/gen/textureNumLayers/09d05d.wgsl
+++ b/test/tint/builtins/gen/textureNumLayers/09d05d.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/textureNumLayers/13b4ce.wgsl

diff --git a/test/tint/builtins/gen/textureNumLayers/13b4ce.wgsl b/test/tint/builtins/gen/textureNumLayers/13b4ce.wgsl
index ced8911..af05038 100644
--- a/test/tint/builtins/gen/textureNumLayers/13b4ce.wgsl
+++ b/test/tint/builtins/gen/textureNumLayers/13b4ce.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/textureNumLayers/22e53b.wgsl

diff --git a/test/tint/builtins/gen/textureNumLayers/22e53b.wgsl b/test/tint/builtins/gen/textureNumLayers/22e53b.wgsl
index fee9bca..9a78274 100644
--- a/test/tint/builtins/gen/textureNumLayers/22e53b.wgsl
+++ b/test/tint/builtins/gen/textureNumLayers/22e53b.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/textureNumLayers/562013.wgsl

diff --git a/test/tint/builtins/gen/textureNumLayers/562013.wgsl b/test/tint/builtins/gen/textureNumLayers/562013.wgsl
index df02d84..3c3a749 100644
--- a/test/tint/builtins/gen/textureNumLayers/562013.wgsl
+++ b/test/tint/builtins/gen/textureNumLayers/562013.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/textureNumLayers/5d59cd.wgsl

diff --git a/test/tint/builtins/gen/textureNumLayers/5d59cd.wgsl b/test/tint/builtins/gen/textureNumLayers/5d59cd.wgsl
index 339d2f0..23b022f 100644
--- a/test/tint/builtins/gen/textureNumLayers/5d59cd.wgsl
+++ b/test/tint/builtins/gen/textureNumLayers/5d59cd.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/textureNumLayers/68a65b.wgsl

diff --git a/test/tint/builtins/gen/textureNumLayers/68a65b.wgsl b/test/tint/builtins/gen/textureNumLayers/68a65b.wgsl
index fdaf92b..18c9fe8 100644
--- a/test/tint/builtins/gen/textureNumLayers/68a65b.wgsl
+++ b/test/tint/builtins/gen/textureNumLayers/68a65b.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/textureNumLayers/778bd1.wgsl

diff --git a/test/tint/builtins/gen/textureNumLayers/778bd1.wgsl b/test/tint/builtins/gen/textureNumLayers/778bd1.wgsl
index a3c4ddc..f2a4a1d 100644
--- a/test/tint/builtins/gen/textureNumLayers/778bd1.wgsl
+++ b/test/tint/builtins/gen/textureNumLayers/778bd1.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/textureNumLayers/7f1937.wgsl

diff --git a/test/tint/builtins/gen/textureNumLayers/7f1937.wgsl b/test/tint/builtins/gen/textureNumLayers/7f1937.wgsl
index 1cbfaff..3f7fae9 100644
--- a/test/tint/builtins/gen/textureNumLayers/7f1937.wgsl
+++ b/test/tint/builtins/gen/textureNumLayers/7f1937.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/textureNumLayers/85f980.wgsl

diff --git a/test/tint/builtins/gen/textureNumLayers/85f980.wgsl b/test/tint/builtins/gen/textureNumLayers/85f980.wgsl
index 83d405a..229e7dc 100644
--- a/test/tint/builtins/gen/textureNumLayers/85f980.wgsl
+++ b/test/tint/builtins/gen/textureNumLayers/85f980.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/textureNumLayers/87953e.wgsl

diff --git a/test/tint/builtins/gen/textureNumLayers/87953e.wgsl b/test/tint/builtins/gen/textureNumLayers/87953e.wgsl
index 8fcd190..8f83d93 100644
--- a/test/tint/builtins/gen/textureNumLayers/87953e.wgsl
+++ b/test/tint/builtins/gen/textureNumLayers/87953e.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/textureNumLayers/893e7c.wgsl

diff --git a/test/tint/builtins/gen/textureNumLayers/893e7c.wgsl b/test/tint/builtins/gen/textureNumLayers/893e7c.wgsl
index f583a9f..5769468 100644
--- a/test/tint/builtins/gen/textureNumLayers/893e7c.wgsl
+++ b/test/tint/builtins/gen/textureNumLayers/893e7c.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/textureNumLayers/9700fb.wgsl

diff --git a/test/tint/builtins/gen/textureNumLayers/9700fb.wgsl b/test/tint/builtins/gen/textureNumLayers/9700fb.wgsl
index 07d1e40..92809e6 100644
--- a/test/tint/builtins/gen/textureNumLayers/9700fb.wgsl
+++ b/test/tint/builtins/gen/textureNumLayers/9700fb.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/textureNumLayers/a216d2.wgsl

diff --git a/test/tint/builtins/gen/textureNumLayers/a216d2.wgsl b/test/tint/builtins/gen/textureNumLayers/a216d2.wgsl
index 991471e..6a413b4 100644
--- a/test/tint/builtins/gen/textureNumLayers/a216d2.wgsl
+++ b/test/tint/builtins/gen/textureNumLayers/a216d2.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/textureNumLayers/cd5dc8.wgsl

diff --git a/test/tint/builtins/gen/textureNumLayers/cd5dc8.wgsl b/test/tint/builtins/gen/textureNumLayers/cd5dc8.wgsl
index 8351f88..81b90c1 100644
--- a/test/tint/builtins/gen/textureNumLayers/cd5dc8.wgsl
+++ b/test/tint/builtins/gen/textureNumLayers/cd5dc8.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/textureNumLayers/d5b228.wgsl

diff --git a/test/tint/builtins/gen/textureNumLayers/d5b228.wgsl b/test/tint/builtins/gen/textureNumLayers/d5b228.wgsl
index ee873c1..82a57bb 100644
--- a/test/tint/builtins/gen/textureNumLayers/d5b228.wgsl
+++ b/test/tint/builtins/gen/textureNumLayers/d5b228.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/textureNumLayers/e31be1.wgsl

diff --git a/test/tint/builtins/gen/textureNumLayers/e31be1.wgsl b/test/tint/builtins/gen/textureNumLayers/e31be1.wgsl
index 4c3a5ee..38398a8 100644
--- a/test/tint/builtins/gen/textureNumLayers/e31be1.wgsl
+++ b/test/tint/builtins/gen/textureNumLayers/e31be1.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/textureNumLayers/e653c0.wgsl

diff --git a/test/tint/builtins/gen/textureNumLayers/e653c0.wgsl b/test/tint/builtins/gen/textureNumLayers/e653c0.wgsl
index d033b73..23e103f 100644
--- a/test/tint/builtins/gen/textureNumLayers/e653c0.wgsl
+++ b/test/tint/builtins/gen/textureNumLayers/e653c0.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/textureNumLayers/ee942f.wgsl

diff --git a/test/tint/builtins/gen/textureNumLayers/ee942f.wgsl b/test/tint/builtins/gen/textureNumLayers/ee942f.wgsl
index b995bd8..76f9e16 100644
--- a/test/tint/builtins/gen/textureNumLayers/ee942f.wgsl
+++ b/test/tint/builtins/gen/textureNumLayers/ee942f.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/textureNumLayers/f33005.wgsl

diff --git a/test/tint/builtins/gen/textureNumLayers/f33005.wgsl b/test/tint/builtins/gen/textureNumLayers/f33005.wgsl
index 38c5eff..9d32054 100644
--- a/test/tint/builtins/gen/textureNumLayers/f33005.wgsl
+++ b/test/tint/builtins/gen/textureNumLayers/f33005.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/textureNumLayers/fcec98.wgsl

diff --git a/test/tint/builtins/gen/textureNumLayers/fcec98.wgsl b/test/tint/builtins/gen/textureNumLayers/fcec98.wgsl
index 845f7cb..a8d6006 100644
--- a/test/tint/builtins/gen/textureNumLayers/fcec98.wgsl
+++ b/test/tint/builtins/gen/textureNumLayers/fcec98.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/textureNumLayers/ff5e89.wgsl

diff --git a/test/tint/builtins/gen/textureNumLayers/ff5e89.wgsl b/test/tint/builtins/gen/textureNumLayers/ff5e89.wgsl
index a641eed..c30691b 100644
--- a/test/tint/builtins/gen/textureNumLayers/ff5e89.wgsl
+++ b/test/tint/builtins/gen/textureNumLayers/ff5e89.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/textureNumLevels/076cb5.wgsl

diff --git a/test/tint/builtins/gen/textureNumLevels/076cb5.wgsl b/test/tint/builtins/gen/textureNumLevels/076cb5.wgsl
index 574393a..5d1c2a8 100644
--- a/test/tint/builtins/gen/textureNumLevels/076cb5.wgsl
+++ b/test/tint/builtins/gen/textureNumLevels/076cb5.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/textureNumLevels/080d95.wgsl

diff --git a/test/tint/builtins/gen/textureNumLevels/080d95.wgsl b/test/tint/builtins/gen/textureNumLevels/080d95.wgsl
index 31a1cc0..d6456ef 100644
--- a/test/tint/builtins/gen/textureNumLevels/080d95.wgsl
+++ b/test/tint/builtins/gen/textureNumLevels/080d95.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/textureNumLevels/09ddd0.wgsl

diff --git a/test/tint/builtins/gen/textureNumLevels/09ddd0.wgsl b/test/tint/builtins/gen/textureNumLevels/09ddd0.wgsl
index 90e763b..7bee67a 100644
--- a/test/tint/builtins/gen/textureNumLevels/09ddd0.wgsl
+++ b/test/tint/builtins/gen/textureNumLevels/09ddd0.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/textureNumLevels/105988.wgsl

diff --git a/test/tint/builtins/gen/textureNumLevels/105988.wgsl b/test/tint/builtins/gen/textureNumLevels/105988.wgsl
index 1bc80d2..65504ed 100644
--- a/test/tint/builtins/gen/textureNumLevels/105988.wgsl
+++ b/test/tint/builtins/gen/textureNumLevels/105988.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/textureNumLevels/1e6f3b.wgsl

diff --git a/test/tint/builtins/gen/textureNumLevels/1e6f3b.wgsl b/test/tint/builtins/gen/textureNumLevels/1e6f3b.wgsl
index b053b55..9edd5e5 100644
--- a/test/tint/builtins/gen/textureNumLevels/1e6f3b.wgsl
+++ b/test/tint/builtins/gen/textureNumLevels/1e6f3b.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/textureNumLevels/23f750.wgsl

diff --git a/test/tint/builtins/gen/textureNumLevels/23f750.wgsl b/test/tint/builtins/gen/textureNumLevels/23f750.wgsl
index 8b1d5a0..dff448d 100644
--- a/test/tint/builtins/gen/textureNumLevels/23f750.wgsl
+++ b/test/tint/builtins/gen/textureNumLevels/23f750.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/textureNumLevels/2c3575.wgsl

diff --git a/test/tint/builtins/gen/textureNumLevels/2c3575.wgsl b/test/tint/builtins/gen/textureNumLevels/2c3575.wgsl
index 1b4e271..43da5e9 100644
--- a/test/tint/builtins/gen/textureNumLevels/2c3575.wgsl
+++ b/test/tint/builtins/gen/textureNumLevels/2c3575.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/textureNumLevels/32a0ae.wgsl

diff --git a/test/tint/builtins/gen/textureNumLevels/32a0ae.wgsl b/test/tint/builtins/gen/textureNumLevels/32a0ae.wgsl
index 64a18fc..5eae1b0 100644
--- a/test/tint/builtins/gen/textureNumLevels/32a0ae.wgsl
+++ b/test/tint/builtins/gen/textureNumLevels/32a0ae.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/textureNumLevels/5101cf.wgsl

diff --git a/test/tint/builtins/gen/textureNumLevels/5101cf.wgsl b/test/tint/builtins/gen/textureNumLevels/5101cf.wgsl
index c487f7a..24cd1a6 100644
--- a/test/tint/builtins/gen/textureNumLevels/5101cf.wgsl
+++ b/test/tint/builtins/gen/textureNumLevels/5101cf.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/textureNumLevels/51b5bb.wgsl

diff --git a/test/tint/builtins/gen/textureNumLevels/51b5bb.wgsl b/test/tint/builtins/gen/textureNumLevels/51b5bb.wgsl
index 4697f32..605689d 100644
--- a/test/tint/builtins/gen/textureNumLevels/51b5bb.wgsl
+++ b/test/tint/builtins/gen/textureNumLevels/51b5bb.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/textureNumLevels/897aaf.wgsl

diff --git a/test/tint/builtins/gen/textureNumLevels/897aaf.wgsl b/test/tint/builtins/gen/textureNumLevels/897aaf.wgsl
index 4416fd7..e2528d4 100644
--- a/test/tint/builtins/gen/textureNumLevels/897aaf.wgsl
+++ b/test/tint/builtins/gen/textureNumLevels/897aaf.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/textureNumLevels/9da7a5.wgsl

diff --git a/test/tint/builtins/gen/textureNumLevels/9da7a5.wgsl b/test/tint/builtins/gen/textureNumLevels/9da7a5.wgsl
index 922f518..c3f93f3 100644
--- a/test/tint/builtins/gen/textureNumLevels/9da7a5.wgsl
+++ b/test/tint/builtins/gen/textureNumLevels/9da7a5.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/textureNumLevels/a91c03.wgsl

diff --git a/test/tint/builtins/gen/textureNumLevels/a91c03.wgsl b/test/tint/builtins/gen/textureNumLevels/a91c03.wgsl
index c69f645..4cdd6c2 100644
--- a/test/tint/builtins/gen/textureNumLevels/a91c03.wgsl
+++ b/test/tint/builtins/gen/textureNumLevels/a91c03.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/textureNumLevels/aee7c8.wgsl

diff --git a/test/tint/builtins/gen/textureNumLevels/aee7c8.wgsl b/test/tint/builtins/gen/textureNumLevels/aee7c8.wgsl
index 6f1ca33..9f56e14 100644
--- a/test/tint/builtins/gen/textureNumLevels/aee7c8.wgsl
+++ b/test/tint/builtins/gen/textureNumLevels/aee7c8.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/textureNumLevels/b1b12b.wgsl

diff --git a/test/tint/builtins/gen/textureNumLevels/b1b12b.wgsl b/test/tint/builtins/gen/textureNumLevels/b1b12b.wgsl
index b2cfd09..018e54b 100644
--- a/test/tint/builtins/gen/textureNumLevels/b1b12b.wgsl
+++ b/test/tint/builtins/gen/textureNumLevels/b1b12b.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/textureNumLevels/b4f5ea.wgsl

diff --git a/test/tint/builtins/gen/textureNumLevels/b4f5ea.wgsl b/test/tint/builtins/gen/textureNumLevels/b4f5ea.wgsl
index b83d5d1..b6451eb 100644
--- a/test/tint/builtins/gen/textureNumLevels/b4f5ea.wgsl
+++ b/test/tint/builtins/gen/textureNumLevels/b4f5ea.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/textureNumLevels/d004a9.wgsl

diff --git a/test/tint/builtins/gen/textureNumLevels/d004a9.wgsl b/test/tint/builtins/gen/textureNumLevels/d004a9.wgsl
index 11cd5ec..a78bb40 100644
--- a/test/tint/builtins/gen/textureNumLevels/d004a9.wgsl
+++ b/test/tint/builtins/gen/textureNumLevels/d004a9.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/textureNumLevels/dca09e.wgsl

diff --git a/test/tint/builtins/gen/textureNumLevels/dca09e.wgsl b/test/tint/builtins/gen/textureNumLevels/dca09e.wgsl
index 69431a6..84b5e9a 100644
--- a/test/tint/builtins/gen/textureNumLevels/dca09e.wgsl
+++ b/test/tint/builtins/gen/textureNumLevels/dca09e.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/textureNumLevels/e67231.wgsl

diff --git a/test/tint/builtins/gen/textureNumLevels/e67231.wgsl b/test/tint/builtins/gen/textureNumLevels/e67231.wgsl
index 1f965ba..4461005 100644
--- a/test/tint/builtins/gen/textureNumLevels/e67231.wgsl
+++ b/test/tint/builtins/gen/textureNumLevels/e67231.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/textureNumLevels/ed078b.wgsl

diff --git a/test/tint/builtins/gen/textureNumLevels/ed078b.wgsl b/test/tint/builtins/gen/textureNumLevels/ed078b.wgsl
index d9a8320..9af2809 100644
--- a/test/tint/builtins/gen/textureNumLevels/ed078b.wgsl
+++ b/test/tint/builtins/gen/textureNumLevels/ed078b.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/textureNumLevels/f46ec6.wgsl

diff --git a/test/tint/builtins/gen/textureNumLevels/f46ec6.wgsl b/test/tint/builtins/gen/textureNumLevels/f46ec6.wgsl
index ed727a0..97dfad0 100644
--- a/test/tint/builtins/gen/textureNumLevels/f46ec6.wgsl
+++ b/test/tint/builtins/gen/textureNumLevels/f46ec6.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/textureNumLevels/f5828d.wgsl

diff --git a/test/tint/builtins/gen/textureNumLevels/f5828d.wgsl b/test/tint/builtins/gen/textureNumLevels/f5828d.wgsl
index 3619b7c..cbe606e 100644
--- a/test/tint/builtins/gen/textureNumLevels/f5828d.wgsl
+++ b/test/tint/builtins/gen/textureNumLevels/f5828d.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/textureNumSamples/2c6f14.wgsl

diff --git a/test/tint/builtins/gen/textureNumSamples/2c6f14.wgsl b/test/tint/builtins/gen/textureNumSamples/2c6f14.wgsl
index 327bfce..a7ebd78 100644
--- a/test/tint/builtins/gen/textureNumSamples/2c6f14.wgsl
+++ b/test/tint/builtins/gen/textureNumSamples/2c6f14.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/textureNumSamples/42f8bb.wgsl

diff --git a/test/tint/builtins/gen/textureNumSamples/42f8bb.wgsl b/test/tint/builtins/gen/textureNumSamples/42f8bb.wgsl
index 3e64edd..af4e0c8 100644
--- a/test/tint/builtins/gen/textureNumSamples/42f8bb.wgsl
+++ b/test/tint/builtins/gen/textureNumSamples/42f8bb.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/textureNumSamples/449d23.wgsl

diff --git a/test/tint/builtins/gen/textureNumSamples/449d23.wgsl b/test/tint/builtins/gen/textureNumSamples/449d23.wgsl
index 51be43a..af49329 100644
--- a/test/tint/builtins/gen/textureNumSamples/449d23.wgsl
+++ b/test/tint/builtins/gen/textureNumSamples/449d23.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/textureNumSamples/a3c8a0.wgsl

diff --git a/test/tint/builtins/gen/textureNumSamples/a3c8a0.wgsl b/test/tint/builtins/gen/textureNumSamples/a3c8a0.wgsl
index f0f05fd..2e54a68 100644
--- a/test/tint/builtins/gen/textureNumSamples/a3c8a0.wgsl
+++ b/test/tint/builtins/gen/textureNumSamples/a3c8a0.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/textureSample/02aa9b.wgsl

diff --git a/test/tint/builtins/gen/textureSample/02aa9b.wgsl b/test/tint/builtins/gen/textureSample/02aa9b.wgsl
index f5070fc..03b397e 100644
--- a/test/tint/builtins/gen/textureSample/02aa9b.wgsl
+++ b/test/tint/builtins/gen/textureSample/02aa9b.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/textureSample/100dc0.wgsl

diff --git a/test/tint/builtins/gen/textureSample/100dc0.wgsl b/test/tint/builtins/gen/textureSample/100dc0.wgsl
index 3bf6d64..e9ba3d2 100644
--- a/test/tint/builtins/gen/textureSample/100dc0.wgsl
+++ b/test/tint/builtins/gen/textureSample/100dc0.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/textureSample/38bbb9.wgsl

diff --git a/test/tint/builtins/gen/textureSample/38bbb9.wgsl b/test/tint/builtins/gen/textureSample/38bbb9.wgsl
index cf78f1e..6791e57 100644
--- a/test/tint/builtins/gen/textureSample/38bbb9.wgsl
+++ b/test/tint/builtins/gen/textureSample/38bbb9.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/textureSample/3b50bd.wgsl

diff --git a/test/tint/builtins/gen/textureSample/3b50bd.wgsl b/test/tint/builtins/gen/textureSample/3b50bd.wgsl
index 1e6fcfa..a15b413 100644
--- a/test/tint/builtins/gen/textureSample/3b50bd.wgsl
+++ b/test/tint/builtins/gen/textureSample/3b50bd.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/textureSample/4dd1bf.wgsl

diff --git a/test/tint/builtins/gen/textureSample/4dd1bf.wgsl b/test/tint/builtins/gen/textureSample/4dd1bf.wgsl
index e4d0327..12f4695 100644
--- a/test/tint/builtins/gen/textureSample/4dd1bf.wgsl
+++ b/test/tint/builtins/gen/textureSample/4dd1bf.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/textureSample/51b514.wgsl

diff --git a/test/tint/builtins/gen/textureSample/51b514.wgsl b/test/tint/builtins/gen/textureSample/51b514.wgsl
index 4c3b2da..21af203 100644
--- a/test/tint/builtins/gen/textureSample/51b514.wgsl
+++ b/test/tint/builtins/gen/textureSample/51b514.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/textureSample/667d76.wgsl

diff --git a/test/tint/builtins/gen/textureSample/667d76.wgsl b/test/tint/builtins/gen/textureSample/667d76.wgsl
index 387a0bf..26ae96c 100644
--- a/test/tint/builtins/gen/textureSample/667d76.wgsl
+++ b/test/tint/builtins/gen/textureSample/667d76.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/textureSample/6717ca.wgsl

diff --git a/test/tint/builtins/gen/textureSample/6717ca.wgsl b/test/tint/builtins/gen/textureSample/6717ca.wgsl
index 85157dd..2006a02 100644
--- a/test/tint/builtins/gen/textureSample/6717ca.wgsl
+++ b/test/tint/builtins/gen/textureSample/6717ca.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/textureSample/6e64fb.wgsl

diff --git a/test/tint/builtins/gen/textureSample/6e64fb.wgsl b/test/tint/builtins/gen/textureSample/6e64fb.wgsl
index e1277dc..c1361ff 100644
--- a/test/tint/builtins/gen/textureSample/6e64fb.wgsl
+++ b/test/tint/builtins/gen/textureSample/6e64fb.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/textureSample/7c3baa.wgsl

diff --git a/test/tint/builtins/gen/textureSample/7c3baa.wgsl b/test/tint/builtins/gen/textureSample/7c3baa.wgsl
index 571ae07..20ce74f 100644
--- a/test/tint/builtins/gen/textureSample/7c3baa.wgsl
+++ b/test/tint/builtins/gen/textureSample/7c3baa.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/textureSample/7e9ffd.wgsl

diff --git a/test/tint/builtins/gen/textureSample/7e9ffd.wgsl b/test/tint/builtins/gen/textureSample/7e9ffd.wgsl
index f6b9fd6..cf1c461 100644
--- a/test/tint/builtins/gen/textureSample/7e9ffd.wgsl
+++ b/test/tint/builtins/gen/textureSample/7e9ffd.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/textureSample/8522e7.wgsl

diff --git a/test/tint/builtins/gen/textureSample/8522e7.wgsl b/test/tint/builtins/gen/textureSample/8522e7.wgsl
index 2121c79..6ee81a0 100644
--- a/test/tint/builtins/gen/textureSample/8522e7.wgsl
+++ b/test/tint/builtins/gen/textureSample/8522e7.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/textureSample/c2f4e8.wgsl

diff --git a/test/tint/builtins/gen/textureSample/c2f4e8.wgsl b/test/tint/builtins/gen/textureSample/c2f4e8.wgsl
index 504966c..49dbe3e 100644
--- a/test/tint/builtins/gen/textureSample/c2f4e8.wgsl
+++ b/test/tint/builtins/gen/textureSample/c2f4e8.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/textureSample/e53267.wgsl

diff --git a/test/tint/builtins/gen/textureSample/e53267.wgsl b/test/tint/builtins/gen/textureSample/e53267.wgsl
index f4611db..b077c25 100644
--- a/test/tint/builtins/gen/textureSample/e53267.wgsl
+++ b/test/tint/builtins/gen/textureSample/e53267.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/textureSample/ea7030.wgsl

diff --git a/test/tint/builtins/gen/textureSample/ea7030.wgsl b/test/tint/builtins/gen/textureSample/ea7030.wgsl
index ae40c4e..2181147 100644
--- a/test/tint/builtins/gen/textureSample/ea7030.wgsl
+++ b/test/tint/builtins/gen/textureSample/ea7030.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/textureSampleBias/53b9f7.wgsl

diff --git a/test/tint/builtins/gen/textureSampleBias/53b9f7.wgsl b/test/tint/builtins/gen/textureSampleBias/53b9f7.wgsl
index 14f0a89..8a7c89e 100644
--- a/test/tint/builtins/gen/textureSampleBias/53b9f7.wgsl
+++ b/test/tint/builtins/gen/textureSampleBias/53b9f7.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/textureSampleBias/65ac50.wgsl

diff --git a/test/tint/builtins/gen/textureSampleBias/65ac50.wgsl b/test/tint/builtins/gen/textureSampleBias/65ac50.wgsl
index 1fdb307..22ff16f 100644
--- a/test/tint/builtins/gen/textureSampleBias/65ac50.wgsl
+++ b/test/tint/builtins/gen/textureSampleBias/65ac50.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/textureSampleBias/6a9113.wgsl

diff --git a/test/tint/builtins/gen/textureSampleBias/6a9113.wgsl b/test/tint/builtins/gen/textureSampleBias/6a9113.wgsl
index 6d2e058..113e850 100644
--- a/test/tint/builtins/gen/textureSampleBias/6a9113.wgsl
+++ b/test/tint/builtins/gen/textureSampleBias/6a9113.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/textureSampleBias/80e579.wgsl

diff --git a/test/tint/builtins/gen/textureSampleBias/80e579.wgsl b/test/tint/builtins/gen/textureSampleBias/80e579.wgsl
index 3fed9f3..4697288 100644
--- a/test/tint/builtins/gen/textureSampleBias/80e579.wgsl
+++ b/test/tint/builtins/gen/textureSampleBias/80e579.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/textureSampleBias/81c19a.wgsl

diff --git a/test/tint/builtins/gen/textureSampleBias/81c19a.wgsl b/test/tint/builtins/gen/textureSampleBias/81c19a.wgsl
index 7bd26b4..8335655 100644
--- a/test/tint/builtins/gen/textureSampleBias/81c19a.wgsl
+++ b/test/tint/builtins/gen/textureSampleBias/81c19a.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/textureSampleBias/d3fa1b.wgsl

diff --git a/test/tint/builtins/gen/textureSampleBias/d3fa1b.wgsl b/test/tint/builtins/gen/textureSampleBias/d3fa1b.wgsl
index 8eaa91d..cfcf277 100644
--- a/test/tint/builtins/gen/textureSampleBias/d3fa1b.wgsl
+++ b/test/tint/builtins/gen/textureSampleBias/d3fa1b.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/textureSampleBias/df91bb.wgsl

diff --git a/test/tint/builtins/gen/textureSampleBias/df91bb.wgsl b/test/tint/builtins/gen/textureSampleBias/df91bb.wgsl
index 88b1003..0c8f85f 100644
--- a/test/tint/builtins/gen/textureSampleBias/df91bb.wgsl
+++ b/test/tint/builtins/gen/textureSampleBias/df91bb.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/textureSampleBias/eed7c4.wgsl

diff --git a/test/tint/builtins/gen/textureSampleBias/eed7c4.wgsl b/test/tint/builtins/gen/textureSampleBias/eed7c4.wgsl
index 14a3307..79d0779 100644
--- a/test/tint/builtins/gen/textureSampleBias/eed7c4.wgsl
+++ b/test/tint/builtins/gen/textureSampleBias/eed7c4.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/textureSampleCompare/25fcd1.wgsl

diff --git a/test/tint/builtins/gen/textureSampleCompare/25fcd1.wgsl b/test/tint/builtins/gen/textureSampleCompare/25fcd1.wgsl
index c72a430..a222cac 100644
--- a/test/tint/builtins/gen/textureSampleCompare/25fcd1.wgsl
+++ b/test/tint/builtins/gen/textureSampleCompare/25fcd1.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/textureSampleCompare/3a5923.wgsl

diff --git a/test/tint/builtins/gen/textureSampleCompare/3a5923.wgsl b/test/tint/builtins/gen/textureSampleCompare/3a5923.wgsl
index 39453fe..2e1e031 100644
--- a/test/tint/builtins/gen/textureSampleCompare/3a5923.wgsl
+++ b/test/tint/builtins/gen/textureSampleCompare/3a5923.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/textureSampleCompare/63fb83.wgsl

diff --git a/test/tint/builtins/gen/textureSampleCompare/63fb83.wgsl b/test/tint/builtins/gen/textureSampleCompare/63fb83.wgsl
index a056ddd..243c949 100644
--- a/test/tint/builtins/gen/textureSampleCompare/63fb83.wgsl
+++ b/test/tint/builtins/gen/textureSampleCompare/63fb83.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/textureSampleCompare/98b85c.wgsl

diff --git a/test/tint/builtins/gen/textureSampleCompare/98b85c.wgsl b/test/tint/builtins/gen/textureSampleCompare/98b85c.wgsl
index 2e8e5d9..3e6d0e7 100644
--- a/test/tint/builtins/gen/textureSampleCompare/98b85c.wgsl
+++ b/test/tint/builtins/gen/textureSampleCompare/98b85c.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/textureSampleCompare/a3ca7e.wgsl

diff --git a/test/tint/builtins/gen/textureSampleCompare/a3ca7e.wgsl b/test/tint/builtins/gen/textureSampleCompare/a3ca7e.wgsl
index 23127fd..1280d26 100644
--- a/test/tint/builtins/gen/textureSampleCompare/a3ca7e.wgsl
+++ b/test/tint/builtins/gen/textureSampleCompare/a3ca7e.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/textureSampleCompare/dd431d.wgsl

diff --git a/test/tint/builtins/gen/textureSampleCompare/dd431d.wgsl b/test/tint/builtins/gen/textureSampleCompare/dd431d.wgsl
index 226c953..b323342 100644
--- a/test/tint/builtins/gen/textureSampleCompare/dd431d.wgsl
+++ b/test/tint/builtins/gen/textureSampleCompare/dd431d.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/textureSampleCompareLevel/011a8f.wgsl

diff --git a/test/tint/builtins/gen/textureSampleCompareLevel/011a8f.wgsl b/test/tint/builtins/gen/textureSampleCompareLevel/011a8f.wgsl
index 0a998bd..c764ab5 100644
--- a/test/tint/builtins/gen/textureSampleCompareLevel/011a8f.wgsl
+++ b/test/tint/builtins/gen/textureSampleCompareLevel/011a8f.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/textureSampleCompareLevel/1116ed.wgsl

diff --git a/test/tint/builtins/gen/textureSampleCompareLevel/1116ed.wgsl b/test/tint/builtins/gen/textureSampleCompareLevel/1116ed.wgsl
index 1dd53b7..adb0244 100644
--- a/test/tint/builtins/gen/textureSampleCompareLevel/1116ed.wgsl
+++ b/test/tint/builtins/gen/textureSampleCompareLevel/1116ed.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/textureSampleCompareLevel/1568e3.wgsl

diff --git a/test/tint/builtins/gen/textureSampleCompareLevel/1568e3.wgsl b/test/tint/builtins/gen/textureSampleCompareLevel/1568e3.wgsl
index 2d620a8..315f06a 100644
--- a/test/tint/builtins/gen/textureSampleCompareLevel/1568e3.wgsl
+++ b/test/tint/builtins/gen/textureSampleCompareLevel/1568e3.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/textureSampleCompareLevel/2ad2b1.wgsl

diff --git a/test/tint/builtins/gen/textureSampleCompareLevel/2ad2b1.wgsl b/test/tint/builtins/gen/textureSampleCompareLevel/2ad2b1.wgsl
index 13451e8..f6b37a5 100644
--- a/test/tint/builtins/gen/textureSampleCompareLevel/2ad2b1.wgsl
+++ b/test/tint/builtins/gen/textureSampleCompareLevel/2ad2b1.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/textureSampleCompareLevel/4cf3a2.wgsl

diff --git a/test/tint/builtins/gen/textureSampleCompareLevel/4cf3a2.wgsl b/test/tint/builtins/gen/textureSampleCompareLevel/4cf3a2.wgsl
index 2fbaf40..26ac0e0 100644
--- a/test/tint/builtins/gen/textureSampleCompareLevel/4cf3a2.wgsl
+++ b/test/tint/builtins/gen/textureSampleCompareLevel/4cf3a2.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/textureSampleCompareLevel/f8121c.wgsl

diff --git a/test/tint/builtins/gen/textureSampleCompareLevel/f8121c.wgsl b/test/tint/builtins/gen/textureSampleCompareLevel/f8121c.wgsl
index 55617da..1635329 100644
--- a/test/tint/builtins/gen/textureSampleCompareLevel/f8121c.wgsl
+++ b/test/tint/builtins/gen/textureSampleCompareLevel/f8121c.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/textureSampleGrad/21402b.wgsl

diff --git a/test/tint/builtins/gen/textureSampleGrad/21402b.wgsl b/test/tint/builtins/gen/textureSampleGrad/21402b.wgsl
index 106be97..f55d52e 100644
--- a/test/tint/builtins/gen/textureSampleGrad/21402b.wgsl
+++ b/test/tint/builtins/gen/textureSampleGrad/21402b.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/textureSampleGrad/2ecd8f.wgsl

diff --git a/test/tint/builtins/gen/textureSampleGrad/2ecd8f.wgsl b/test/tint/builtins/gen/textureSampleGrad/2ecd8f.wgsl
index fa20488..de0f36c 100644
--- a/test/tint/builtins/gen/textureSampleGrad/2ecd8f.wgsl
+++ b/test/tint/builtins/gen/textureSampleGrad/2ecd8f.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/textureSampleGrad/468f88.wgsl

diff --git a/test/tint/builtins/gen/textureSampleGrad/468f88.wgsl b/test/tint/builtins/gen/textureSampleGrad/468f88.wgsl
index 38cbf88..5e35642 100644
--- a/test/tint/builtins/gen/textureSampleGrad/468f88.wgsl
+++ b/test/tint/builtins/gen/textureSampleGrad/468f88.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/textureSampleGrad/521263.wgsl

diff --git a/test/tint/builtins/gen/textureSampleGrad/521263.wgsl b/test/tint/builtins/gen/textureSampleGrad/521263.wgsl
index 7c9e0f3..2cf79b5 100644
--- a/test/tint/builtins/gen/textureSampleGrad/521263.wgsl
+++ b/test/tint/builtins/gen/textureSampleGrad/521263.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/textureSampleGrad/5312f4.wgsl

diff --git a/test/tint/builtins/gen/textureSampleGrad/5312f4.wgsl b/test/tint/builtins/gen/textureSampleGrad/5312f4.wgsl
index ceadd61..16d60ef 100644
--- a/test/tint/builtins/gen/textureSampleGrad/5312f4.wgsl
+++ b/test/tint/builtins/gen/textureSampleGrad/5312f4.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/textureSampleGrad/872f00.wgsl

diff --git a/test/tint/builtins/gen/textureSampleGrad/872f00.wgsl b/test/tint/builtins/gen/textureSampleGrad/872f00.wgsl
index adcfee3..ed633d8 100644
--- a/test/tint/builtins/gen/textureSampleGrad/872f00.wgsl
+++ b/test/tint/builtins/gen/textureSampleGrad/872f00.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/textureSampleGrad/e383db.wgsl

diff --git a/test/tint/builtins/gen/textureSampleGrad/e383db.wgsl b/test/tint/builtins/gen/textureSampleGrad/e383db.wgsl
index c5edcac..ee940f8 100644
--- a/test/tint/builtins/gen/textureSampleGrad/e383db.wgsl
+++ b/test/tint/builtins/gen/textureSampleGrad/e383db.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/textureSampleGrad/e9a2f7.wgsl

diff --git a/test/tint/builtins/gen/textureSampleGrad/e9a2f7.wgsl b/test/tint/builtins/gen/textureSampleGrad/e9a2f7.wgsl
index ca07aeb..934299e 100644
--- a/test/tint/builtins/gen/textureSampleGrad/e9a2f7.wgsl
+++ b/test/tint/builtins/gen/textureSampleGrad/e9a2f7.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/textureSampleLevel/02be59.wgsl

diff --git a/test/tint/builtins/gen/textureSampleLevel/02be59.wgsl b/test/tint/builtins/gen/textureSampleLevel/02be59.wgsl
index b7c576c..d644dd6 100644
--- a/test/tint/builtins/gen/textureSampleLevel/02be59.wgsl
+++ b/test/tint/builtins/gen/textureSampleLevel/02be59.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/textureSampleLevel/0bdd9a.wgsl

diff --git a/test/tint/builtins/gen/textureSampleLevel/0bdd9a.wgsl b/test/tint/builtins/gen/textureSampleLevel/0bdd9a.wgsl
index 7f93103..b9b46cb 100644
--- a/test/tint/builtins/gen/textureSampleLevel/0bdd9a.wgsl
+++ b/test/tint/builtins/gen/textureSampleLevel/0bdd9a.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/textureSampleLevel/1b0291.wgsl

diff --git a/test/tint/builtins/gen/textureSampleLevel/1b0291.wgsl b/test/tint/builtins/gen/textureSampleLevel/1b0291.wgsl
index 21fe71d..95e2ace 100644
--- a/test/tint/builtins/gen/textureSampleLevel/1b0291.wgsl
+++ b/test/tint/builtins/gen/textureSampleLevel/1b0291.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/textureSampleLevel/1bf73e.wgsl

diff --git a/test/tint/builtins/gen/textureSampleLevel/1bf73e.wgsl b/test/tint/builtins/gen/textureSampleLevel/1bf73e.wgsl
index 33adc88..aadcb61 100644
--- a/test/tint/builtins/gen/textureSampleLevel/1bf73e.wgsl
+++ b/test/tint/builtins/gen/textureSampleLevel/1bf73e.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/textureSampleLevel/302be4.wgsl

diff --git a/test/tint/builtins/gen/textureSampleLevel/302be4.wgsl b/test/tint/builtins/gen/textureSampleLevel/302be4.wgsl
index 88fb77c..de528ee 100644
--- a/test/tint/builtins/gen/textureSampleLevel/302be4.wgsl
+++ b/test/tint/builtins/gen/textureSampleLevel/302be4.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/textureSampleLevel/47daa4.wgsl

diff --git a/test/tint/builtins/gen/textureSampleLevel/47daa4.wgsl b/test/tint/builtins/gen/textureSampleLevel/47daa4.wgsl
index 9ddf9f0..1745cfd 100644
--- a/test/tint/builtins/gen/textureSampleLevel/47daa4.wgsl
+++ b/test/tint/builtins/gen/textureSampleLevel/47daa4.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/textureSampleLevel/690d95.wgsl

diff --git a/test/tint/builtins/gen/textureSampleLevel/690d95.wgsl b/test/tint/builtins/gen/textureSampleLevel/690d95.wgsl
index 678b4e4..d885201 100644
--- a/test/tint/builtins/gen/textureSampleLevel/690d95.wgsl
+++ b/test/tint/builtins/gen/textureSampleLevel/690d95.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/textureSampleLevel/979816.wgsl

diff --git a/test/tint/builtins/gen/textureSampleLevel/979816.wgsl b/test/tint/builtins/gen/textureSampleLevel/979816.wgsl
index b8a0045..15c68a3 100644
--- a/test/tint/builtins/gen/textureSampleLevel/979816.wgsl
+++ b/test/tint/builtins/gen/textureSampleLevel/979816.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/textureSampleLevel/9bd37b.wgsl

diff --git a/test/tint/builtins/gen/textureSampleLevel/9bd37b.wgsl b/test/tint/builtins/gen/textureSampleLevel/9bd37b.wgsl
index 3e8b5d3..3bf97be 100644
--- a/test/tint/builtins/gen/textureSampleLevel/9bd37b.wgsl
+++ b/test/tint/builtins/gen/textureSampleLevel/9bd37b.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/textureSampleLevel/a4af26.wgsl

diff --git a/test/tint/builtins/gen/textureSampleLevel/a4af26.wgsl b/test/tint/builtins/gen/textureSampleLevel/a4af26.wgsl
index 9a65ca3..9e9ecfe 100644
--- a/test/tint/builtins/gen/textureSampleLevel/a4af26.wgsl
+++ b/test/tint/builtins/gen/textureSampleLevel/a4af26.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/textureSampleLevel/abfcc0.wgsl

diff --git a/test/tint/builtins/gen/textureSampleLevel/abfcc0.wgsl b/test/tint/builtins/gen/textureSampleLevel/abfcc0.wgsl
index f5f2e29..26c7932 100644
--- a/test/tint/builtins/gen/textureSampleLevel/abfcc0.wgsl
+++ b/test/tint/builtins/gen/textureSampleLevel/abfcc0.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/textureSampleLevel/ae5e39.wgsl

diff --git a/test/tint/builtins/gen/textureSampleLevel/ae5e39.wgsl b/test/tint/builtins/gen/textureSampleLevel/ae5e39.wgsl
index 76bce20..5b328aa 100644
--- a/test/tint/builtins/gen/textureSampleLevel/ae5e39.wgsl
+++ b/test/tint/builtins/gen/textureSampleLevel/ae5e39.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/textureSampleLevel/ba93b3.wgsl

diff --git a/test/tint/builtins/gen/textureSampleLevel/ba93b3.wgsl b/test/tint/builtins/gen/textureSampleLevel/ba93b3.wgsl
index c4d0a3d..ee6cd52 100644
--- a/test/tint/builtins/gen/textureSampleLevel/ba93b3.wgsl
+++ b/test/tint/builtins/gen/textureSampleLevel/ba93b3.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/textureSampleLevel/c32df7.wgsl

diff --git a/test/tint/builtins/gen/textureSampleLevel/c32df7.wgsl b/test/tint/builtins/gen/textureSampleLevel/c32df7.wgsl
index 9cee583..a3724df 100644
--- a/test/tint/builtins/gen/textureSampleLevel/c32df7.wgsl
+++ b/test/tint/builtins/gen/textureSampleLevel/c32df7.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/textureSampleLevel/c6aca6.wgsl

diff --git a/test/tint/builtins/gen/textureSampleLevel/c6aca6.wgsl b/test/tint/builtins/gen/textureSampleLevel/c6aca6.wgsl
index 532b6c3..97b4cdd 100644
--- a/test/tint/builtins/gen/textureSampleLevel/c6aca6.wgsl
+++ b/test/tint/builtins/gen/textureSampleLevel/c6aca6.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/textureStore/05ce15.wgsl

diff --git a/test/tint/builtins/gen/textureStore/05ce15.wgsl b/test/tint/builtins/gen/textureStore/05ce15.wgsl
index 890e421..52dc747 100644
--- a/test/tint/builtins/gen/textureStore/05ce15.wgsl
+++ b/test/tint/builtins/gen/textureStore/05ce15.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/textureStore/064c7f.wgsl

diff --git a/test/tint/builtins/gen/textureStore/064c7f.wgsl b/test/tint/builtins/gen/textureStore/064c7f.wgsl
index a05b1ab..e4d7b7d 100644
--- a/test/tint/builtins/gen/textureStore/064c7f.wgsl
+++ b/test/tint/builtins/gen/textureStore/064c7f.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/textureStore/068641.wgsl

diff --git a/test/tint/builtins/gen/textureStore/068641.wgsl b/test/tint/builtins/gen/textureStore/068641.wgsl
index 8f2cf0c..706d59d 100644
--- a/test/tint/builtins/gen/textureStore/068641.wgsl
+++ b/test/tint/builtins/gen/textureStore/068641.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/textureStore/0af6b5.wgsl

diff --git a/test/tint/builtins/gen/textureStore/0af6b5.wgsl b/test/tint/builtins/gen/textureStore/0af6b5.wgsl
index aef7b6c..b40da90 100644
--- a/test/tint/builtins/gen/textureStore/0af6b5.wgsl
+++ b/test/tint/builtins/gen/textureStore/0af6b5.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/textureStore/0c3dff.wgsl

diff --git a/test/tint/builtins/gen/textureStore/0c3dff.wgsl b/test/tint/builtins/gen/textureStore/0c3dff.wgsl
index 9d3b608..33d5189 100644
--- a/test/tint/builtins/gen/textureStore/0c3dff.wgsl
+++ b/test/tint/builtins/gen/textureStore/0c3dff.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/textureStore/102722.wgsl

diff --git a/test/tint/builtins/gen/textureStore/102722.wgsl b/test/tint/builtins/gen/textureStore/102722.wgsl
index 48a2f6b..e3999df 100644
--- a/test/tint/builtins/gen/textureStore/102722.wgsl
+++ b/test/tint/builtins/gen/textureStore/102722.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/textureStore/1bbd08.wgsl

diff --git a/test/tint/builtins/gen/textureStore/1bbd08.wgsl b/test/tint/builtins/gen/textureStore/1bbd08.wgsl
index 709455e..0346b61 100644
--- a/test/tint/builtins/gen/textureStore/1bbd08.wgsl
+++ b/test/tint/builtins/gen/textureStore/1bbd08.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/textureStore/1c02e7.wgsl

diff --git a/test/tint/builtins/gen/textureStore/1c02e7.wgsl b/test/tint/builtins/gen/textureStore/1c02e7.wgsl
index 8d069d8..42e48c3 100644
--- a/test/tint/builtins/gen/textureStore/1c02e7.wgsl
+++ b/test/tint/builtins/gen/textureStore/1c02e7.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/textureStore/22d955.wgsl

diff --git a/test/tint/builtins/gen/textureStore/22d955.wgsl b/test/tint/builtins/gen/textureStore/22d955.wgsl
index cf8aeb1..cf7e86b 100644
--- a/test/tint/builtins/gen/textureStore/22d955.wgsl
+++ b/test/tint/builtins/gen/textureStore/22d955.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/textureStore/26bf70.wgsl

diff --git a/test/tint/builtins/gen/textureStore/26bf70.wgsl b/test/tint/builtins/gen/textureStore/26bf70.wgsl
index 68435b3..7bc2362 100644
--- a/test/tint/builtins/gen/textureStore/26bf70.wgsl
+++ b/test/tint/builtins/gen/textureStore/26bf70.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/textureStore/2796b4.wgsl

diff --git a/test/tint/builtins/gen/textureStore/2796b4.wgsl b/test/tint/builtins/gen/textureStore/2796b4.wgsl
index a6cb869..698c4e7 100644
--- a/test/tint/builtins/gen/textureStore/2796b4.wgsl
+++ b/test/tint/builtins/gen/textureStore/2796b4.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/textureStore/2ac6c7.wgsl

diff --git a/test/tint/builtins/gen/textureStore/2ac6c7.wgsl b/test/tint/builtins/gen/textureStore/2ac6c7.wgsl
index c77c788..6bc41e1 100644
--- a/test/tint/builtins/gen/textureStore/2ac6c7.wgsl
+++ b/test/tint/builtins/gen/textureStore/2ac6c7.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/textureStore/2eb2a4.wgsl

diff --git a/test/tint/builtins/gen/textureStore/2eb2a4.wgsl b/test/tint/builtins/gen/textureStore/2eb2a4.wgsl
index 757a807..6f216ae 100644
--- a/test/tint/builtins/gen/textureStore/2eb2a4.wgsl
+++ b/test/tint/builtins/gen/textureStore/2eb2a4.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/textureStore/2ed2a3.wgsl

diff --git a/test/tint/builtins/gen/textureStore/2ed2a3.wgsl b/test/tint/builtins/gen/textureStore/2ed2a3.wgsl
index 1116d06..f4493b3 100644
--- a/test/tint/builtins/gen/textureStore/2ed2a3.wgsl
+++ b/test/tint/builtins/gen/textureStore/2ed2a3.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/textureStore/31745b.wgsl

diff --git a/test/tint/builtins/gen/textureStore/31745b.wgsl b/test/tint/builtins/gen/textureStore/31745b.wgsl
index 92ba02e..05e3810 100644
--- a/test/tint/builtins/gen/textureStore/31745b.wgsl
+++ b/test/tint/builtins/gen/textureStore/31745b.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/textureStore/32f368.wgsl

diff --git a/test/tint/builtins/gen/textureStore/32f368.wgsl b/test/tint/builtins/gen/textureStore/32f368.wgsl
index ac8b536..9065583 100644
--- a/test/tint/builtins/gen/textureStore/32f368.wgsl
+++ b/test/tint/builtins/gen/textureStore/32f368.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/textureStore/331aee.wgsl

diff --git a/test/tint/builtins/gen/textureStore/331aee.wgsl b/test/tint/builtins/gen/textureStore/331aee.wgsl
index 3297999..3f04506 100644
--- a/test/tint/builtins/gen/textureStore/331aee.wgsl
+++ b/test/tint/builtins/gen/textureStore/331aee.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/textureStore/38e8d7.wgsl

diff --git a/test/tint/builtins/gen/textureStore/38e8d7.wgsl b/test/tint/builtins/gen/textureStore/38e8d7.wgsl
index 926527c..5f80d00 100644
--- a/test/tint/builtins/gen/textureStore/38e8d7.wgsl
+++ b/test/tint/builtins/gen/textureStore/38e8d7.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/textureStore/3a52ac.wgsl

diff --git a/test/tint/builtins/gen/textureStore/3a52ac.wgsl b/test/tint/builtins/gen/textureStore/3a52ac.wgsl
index 46140cf..e9f140f 100644
--- a/test/tint/builtins/gen/textureStore/3a52ac.wgsl
+++ b/test/tint/builtins/gen/textureStore/3a52ac.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/textureStore/3bb7a1.wgsl

diff --git a/test/tint/builtins/gen/textureStore/3bb7a1.wgsl b/test/tint/builtins/gen/textureStore/3bb7a1.wgsl
index c033c45..da7673c 100644
--- a/test/tint/builtins/gen/textureStore/3bb7a1.wgsl
+++ b/test/tint/builtins/gen/textureStore/3bb7a1.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/textureStore/3bec15.wgsl

diff --git a/test/tint/builtins/gen/textureStore/3bec15.wgsl b/test/tint/builtins/gen/textureStore/3bec15.wgsl
index 38a0b2a..8273eea 100644
--- a/test/tint/builtins/gen/textureStore/3bec15.wgsl
+++ b/test/tint/builtins/gen/textureStore/3bec15.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/textureStore/441ba8.wgsl

diff --git a/test/tint/builtins/gen/textureStore/441ba8.wgsl b/test/tint/builtins/gen/textureStore/441ba8.wgsl
index 40be067..2884786 100644
--- a/test/tint/builtins/gen/textureStore/441ba8.wgsl
+++ b/test/tint/builtins/gen/textureStore/441ba8.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/textureStore/4fc057.wgsl

diff --git a/test/tint/builtins/gen/textureStore/4fc057.wgsl b/test/tint/builtins/gen/textureStore/4fc057.wgsl
index 12c2b38..c8322c5 100644
--- a/test/tint/builtins/gen/textureStore/4fc057.wgsl
+++ b/test/tint/builtins/gen/textureStore/4fc057.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/textureStore/5a2f8f.wgsl

diff --git a/test/tint/builtins/gen/textureStore/5a2f8f.wgsl b/test/tint/builtins/gen/textureStore/5a2f8f.wgsl
index 10f1c5d..3bb2c4f 100644
--- a/test/tint/builtins/gen/textureStore/5a2f8f.wgsl
+++ b/test/tint/builtins/gen/textureStore/5a2f8f.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/textureStore/60975f.wgsl

diff --git a/test/tint/builtins/gen/textureStore/60975f.wgsl b/test/tint/builtins/gen/textureStore/60975f.wgsl
index e73e4f0..3c4e270 100644
--- a/test/tint/builtins/gen/textureStore/60975f.wgsl
+++ b/test/tint/builtins/gen/textureStore/60975f.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/textureStore/682fd6.wgsl

diff --git a/test/tint/builtins/gen/textureStore/682fd6.wgsl b/test/tint/builtins/gen/textureStore/682fd6.wgsl
index 68be6e3..5c045a2 100644
--- a/test/tint/builtins/gen/textureStore/682fd6.wgsl
+++ b/test/tint/builtins/gen/textureStore/682fd6.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/textureStore/6b75c3.wgsl

diff --git a/test/tint/builtins/gen/textureStore/6b75c3.wgsl b/test/tint/builtins/gen/textureStore/6b75c3.wgsl
index 6ded5c1..e2e4428 100644
--- a/test/tint/builtins/gen/textureStore/6b75c3.wgsl
+++ b/test/tint/builtins/gen/textureStore/6b75c3.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/textureStore/6b80d2.wgsl

diff --git a/test/tint/builtins/gen/textureStore/6b80d2.wgsl b/test/tint/builtins/gen/textureStore/6b80d2.wgsl
index dcd07a5..e90d882 100644
--- a/test/tint/builtins/gen/textureStore/6b80d2.wgsl
+++ b/test/tint/builtins/gen/textureStore/6b80d2.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/textureStore/6cff2e.wgsl

diff --git a/test/tint/builtins/gen/textureStore/6cff2e.wgsl b/test/tint/builtins/gen/textureStore/6cff2e.wgsl
index 565fd4d..35ae4c1 100644
--- a/test/tint/builtins/gen/textureStore/6cff2e.wgsl
+++ b/test/tint/builtins/gen/textureStore/6cff2e.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/textureStore/6da692.wgsl

diff --git a/test/tint/builtins/gen/textureStore/6da692.wgsl b/test/tint/builtins/gen/textureStore/6da692.wgsl
index 0f147fb..aca5be5 100644
--- a/test/tint/builtins/gen/textureStore/6da692.wgsl
+++ b/test/tint/builtins/gen/textureStore/6da692.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/textureStore/731349.wgsl

diff --git a/test/tint/builtins/gen/textureStore/731349.wgsl b/test/tint/builtins/gen/textureStore/731349.wgsl
index 7082079..8024c9c 100644
--- a/test/tint/builtins/gen/textureStore/731349.wgsl
+++ b/test/tint/builtins/gen/textureStore/731349.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/textureStore/752da6.wgsl

diff --git a/test/tint/builtins/gen/textureStore/752da6.wgsl b/test/tint/builtins/gen/textureStore/752da6.wgsl
index 40c615c..d08feee 100644
--- a/test/tint/builtins/gen/textureStore/752da6.wgsl
+++ b/test/tint/builtins/gen/textureStore/752da6.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/textureStore/77c0ae.wgsl

diff --git a/test/tint/builtins/gen/textureStore/77c0ae.wgsl b/test/tint/builtins/gen/textureStore/77c0ae.wgsl
index 2a82ed7..b66192d 100644
--- a/test/tint/builtins/gen/textureStore/77c0ae.wgsl
+++ b/test/tint/builtins/gen/textureStore/77c0ae.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/textureStore/7cec8d.wgsl

diff --git a/test/tint/builtins/gen/textureStore/7cec8d.wgsl b/test/tint/builtins/gen/textureStore/7cec8d.wgsl
index d3a2b80..c8b02eb 100644
--- a/test/tint/builtins/gen/textureStore/7cec8d.wgsl
+++ b/test/tint/builtins/gen/textureStore/7cec8d.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/textureStore/7f7fae.wgsl

diff --git a/test/tint/builtins/gen/textureStore/7f7fae.wgsl b/test/tint/builtins/gen/textureStore/7f7fae.wgsl
index 589db22..dc895e3 100644
--- a/test/tint/builtins/gen/textureStore/7f7fae.wgsl
+++ b/test/tint/builtins/gen/textureStore/7f7fae.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/textureStore/804942.wgsl

diff --git a/test/tint/builtins/gen/textureStore/804942.wgsl b/test/tint/builtins/gen/textureStore/804942.wgsl
index bcdd0c7..12a15ed 100644
--- a/test/tint/builtins/gen/textureStore/804942.wgsl
+++ b/test/tint/builtins/gen/textureStore/804942.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/textureStore/805dae.wgsl

diff --git a/test/tint/builtins/gen/textureStore/805dae.wgsl b/test/tint/builtins/gen/textureStore/805dae.wgsl
index 15061f9..ab12e56 100644
--- a/test/tint/builtins/gen/textureStore/805dae.wgsl
+++ b/test/tint/builtins/gen/textureStore/805dae.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/textureStore/83bcc1.wgsl

diff --git a/test/tint/builtins/gen/textureStore/83bcc1.wgsl b/test/tint/builtins/gen/textureStore/83bcc1.wgsl
index 1e13ead..8910936 100644
--- a/test/tint/builtins/gen/textureStore/83bcc1.wgsl
+++ b/test/tint/builtins/gen/textureStore/83bcc1.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/textureStore/872747.wgsl

diff --git a/test/tint/builtins/gen/textureStore/872747.wgsl b/test/tint/builtins/gen/textureStore/872747.wgsl
index 8975750..d06d0c5 100644
--- a/test/tint/builtins/gen/textureStore/872747.wgsl
+++ b/test/tint/builtins/gen/textureStore/872747.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/textureStore/8e0479.wgsl

diff --git a/test/tint/builtins/gen/textureStore/8e0479.wgsl b/test/tint/builtins/gen/textureStore/8e0479.wgsl
index 265532c..2b5fe0a 100644
--- a/test/tint/builtins/gen/textureStore/8e0479.wgsl
+++ b/test/tint/builtins/gen/textureStore/8e0479.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/textureStore/8f71a1.wgsl

diff --git a/test/tint/builtins/gen/textureStore/8f71a1.wgsl b/test/tint/builtins/gen/textureStore/8f71a1.wgsl
index e2f77ff..6b69dbb 100644
--- a/test/tint/builtins/gen/textureStore/8f71a1.wgsl
+++ b/test/tint/builtins/gen/textureStore/8f71a1.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/textureStore/969534.wgsl

diff --git a/test/tint/builtins/gen/textureStore/969534.wgsl b/test/tint/builtins/gen/textureStore/969534.wgsl
index c16476d..4e9da11 100644
--- a/test/tint/builtins/gen/textureStore/969534.wgsl
+++ b/test/tint/builtins/gen/textureStore/969534.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/textureStore/9a3ecc.wgsl

diff --git a/test/tint/builtins/gen/textureStore/9a3ecc.wgsl b/test/tint/builtins/gen/textureStore/9a3ecc.wgsl
index 0cb6232..19c3dd8 100644
--- a/test/tint/builtins/gen/textureStore/9a3ecc.wgsl
+++ b/test/tint/builtins/gen/textureStore/9a3ecc.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/textureStore/9d9cd5.wgsl

diff --git a/test/tint/builtins/gen/textureStore/9d9cd5.wgsl b/test/tint/builtins/gen/textureStore/9d9cd5.wgsl
index 514db90..663ecb4 100644
--- a/test/tint/builtins/gen/textureStore/9d9cd5.wgsl
+++ b/test/tint/builtins/gen/textureStore/9d9cd5.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/textureStore/9e3ec5.wgsl

diff --git a/test/tint/builtins/gen/textureStore/9e3ec5.wgsl b/test/tint/builtins/gen/textureStore/9e3ec5.wgsl
index 45a8963..f571ee5 100644
--- a/test/tint/builtins/gen/textureStore/9e3ec5.wgsl
+++ b/test/tint/builtins/gen/textureStore/9e3ec5.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/textureStore/ac67aa.wgsl

diff --git a/test/tint/builtins/gen/textureStore/ac67aa.wgsl b/test/tint/builtins/gen/textureStore/ac67aa.wgsl
index 3431a53..db9ed24 100644
--- a/test/tint/builtins/gen/textureStore/ac67aa.wgsl
+++ b/test/tint/builtins/gen/textureStore/ac67aa.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/textureStore/b706b1.wgsl

diff --git a/test/tint/builtins/gen/textureStore/b706b1.wgsl b/test/tint/builtins/gen/textureStore/b706b1.wgsl
index 3852067..db32739 100644
--- a/test/tint/builtins/gen/textureStore/b706b1.wgsl
+++ b/test/tint/builtins/gen/textureStore/b706b1.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/textureStore/bbcb7f.wgsl

diff --git a/test/tint/builtins/gen/textureStore/bbcb7f.wgsl b/test/tint/builtins/gen/textureStore/bbcb7f.wgsl
index 84d3a16..3006729 100644
--- a/test/tint/builtins/gen/textureStore/bbcb7f.wgsl
+++ b/test/tint/builtins/gen/textureStore/bbcb7f.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/textureStore/be6e30.wgsl

diff --git a/test/tint/builtins/gen/textureStore/be6e30.wgsl b/test/tint/builtins/gen/textureStore/be6e30.wgsl
index 92713bb..a21d2cc 100644
--- a/test/tint/builtins/gen/textureStore/be6e30.wgsl
+++ b/test/tint/builtins/gen/textureStore/be6e30.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/textureStore/bf775c.wgsl

diff --git a/test/tint/builtins/gen/textureStore/bf775c.wgsl b/test/tint/builtins/gen/textureStore/bf775c.wgsl
index 5dc738f..e815250 100644
--- a/test/tint/builtins/gen/textureStore/bf775c.wgsl
+++ b/test/tint/builtins/gen/textureStore/bf775c.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/textureStore/c5af1e.wgsl

diff --git a/test/tint/builtins/gen/textureStore/c5af1e.wgsl b/test/tint/builtins/gen/textureStore/c5af1e.wgsl
index 65b7ee8..bd91c6b 100644
--- a/test/tint/builtins/gen/textureStore/c5af1e.wgsl
+++ b/test/tint/builtins/gen/textureStore/c5af1e.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/textureStore/c863be.wgsl

diff --git a/test/tint/builtins/gen/textureStore/c863be.wgsl b/test/tint/builtins/gen/textureStore/c863be.wgsl
index 6b97911..555f7c5 100644
--- a/test/tint/builtins/gen/textureStore/c863be.wgsl
+++ b/test/tint/builtins/gen/textureStore/c863be.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/textureStore/d73b5c.wgsl

diff --git a/test/tint/builtins/gen/textureStore/d73b5c.wgsl b/test/tint/builtins/gen/textureStore/d73b5c.wgsl
index ff53404..081cfaa 100644
--- a/test/tint/builtins/gen/textureStore/d73b5c.wgsl
+++ b/test/tint/builtins/gen/textureStore/d73b5c.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/textureStore/dd7d81.wgsl

diff --git a/test/tint/builtins/gen/textureStore/dd7d81.wgsl b/test/tint/builtins/gen/textureStore/dd7d81.wgsl
index a9e5dda..8d464b3 100644
--- a/test/tint/builtins/gen/textureStore/dd7d81.wgsl
+++ b/test/tint/builtins/gen/textureStore/dd7d81.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/textureStore/dde364.wgsl

diff --git a/test/tint/builtins/gen/textureStore/dde364.wgsl b/test/tint/builtins/gen/textureStore/dde364.wgsl
index 1bf72fd..17ad913 100644
--- a/test/tint/builtins/gen/textureStore/dde364.wgsl
+++ b/test/tint/builtins/gen/textureStore/dde364.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/textureStore/e885e8.wgsl

diff --git a/test/tint/builtins/gen/textureStore/e885e8.wgsl b/test/tint/builtins/gen/textureStore/e885e8.wgsl
index 1aedddc..c2fc4e3 100644
--- a/test/tint/builtins/gen/textureStore/e885e8.wgsl
+++ b/test/tint/builtins/gen/textureStore/e885e8.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/textureStore/eb702f.wgsl

diff --git a/test/tint/builtins/gen/textureStore/eb702f.wgsl b/test/tint/builtins/gen/textureStore/eb702f.wgsl
index 0974770..a73e622 100644
--- a/test/tint/builtins/gen/textureStore/eb702f.wgsl
+++ b/test/tint/builtins/gen/textureStore/eb702f.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/textureStore/eb78b9.wgsl

diff --git a/test/tint/builtins/gen/textureStore/eb78b9.wgsl b/test/tint/builtins/gen/textureStore/eb78b9.wgsl
index d0416f9..a18ce91 100644
--- a/test/tint/builtins/gen/textureStore/eb78b9.wgsl
+++ b/test/tint/builtins/gen/textureStore/eb78b9.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/textureStore/ee6acc.wgsl

diff --git a/test/tint/builtins/gen/textureStore/ee6acc.wgsl b/test/tint/builtins/gen/textureStore/ee6acc.wgsl
index 80976c4..904b12e 100644
--- a/test/tint/builtins/gen/textureStore/ee6acc.wgsl
+++ b/test/tint/builtins/gen/textureStore/ee6acc.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/textureStore/ef9f2f.wgsl

diff --git a/test/tint/builtins/gen/textureStore/ef9f2f.wgsl b/test/tint/builtins/gen/textureStore/ef9f2f.wgsl
index 5913a24..726ec09 100644
--- a/test/tint/builtins/gen/textureStore/ef9f2f.wgsl
+++ b/test/tint/builtins/gen/textureStore/ef9f2f.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/textureStore/f8dead.wgsl

diff --git a/test/tint/builtins/gen/textureStore/f8dead.wgsl b/test/tint/builtins/gen/textureStore/f8dead.wgsl
index 955c42c..d9ce55a 100644
--- a/test/tint/builtins/gen/textureStore/f8dead.wgsl
+++ b/test/tint/builtins/gen/textureStore/f8dead.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/textureStore/f9be83.wgsl

diff --git a/test/tint/builtins/gen/textureStore/f9be83.wgsl b/test/tint/builtins/gen/textureStore/f9be83.wgsl
index f0627b4..23ab5fe 100644
--- a/test/tint/builtins/gen/textureStore/f9be83.wgsl
+++ b/test/tint/builtins/gen/textureStore/f9be83.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/textureStore/fb9a8f.wgsl

diff --git a/test/tint/builtins/gen/textureStore/fb9a8f.wgsl b/test/tint/builtins/gen/textureStore/fb9a8f.wgsl
index 9fcc489..69f7515 100644
--- a/test/tint/builtins/gen/textureStore/fb9a8f.wgsl
+++ b/test/tint/builtins/gen/textureStore/fb9a8f.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/textureStore/fbf53f.wgsl

diff --git a/test/tint/builtins/gen/textureStore/fbf53f.wgsl b/test/tint/builtins/gen/textureStore/fbf53f.wgsl
index 158d3f0..3179ff3 100644
--- a/test/tint/builtins/gen/textureStore/fbf53f.wgsl
+++ b/test/tint/builtins/gen/textureStore/fbf53f.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/transpose/2585cd.wgsl

diff --git a/test/tint/builtins/gen/transpose/2585cd.wgsl b/test/tint/builtins/gen/transpose/2585cd.wgsl
index 93d79ad..4b2d678 100644
--- a/test/tint/builtins/gen/transpose/2585cd.wgsl
+++ b/test/tint/builtins/gen/transpose/2585cd.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/transpose/31d679.wgsl

diff --git a/test/tint/builtins/gen/transpose/31d679.wgsl b/test/tint/builtins/gen/transpose/31d679.wgsl
index 0d59682..2e7764b 100644
--- a/test/tint/builtins/gen/transpose/31d679.wgsl
+++ b/test/tint/builtins/gen/transpose/31d679.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/transpose/31e37e.wgsl

diff --git a/test/tint/builtins/gen/transpose/31e37e.wgsl b/test/tint/builtins/gen/transpose/31e37e.wgsl
index 9773170..27f5115 100644
--- a/test/tint/builtins/gen/transpose/31e37e.wgsl
+++ b/test/tint/builtins/gen/transpose/31e37e.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/transpose/4ce359.wgsl

diff --git a/test/tint/builtins/gen/transpose/4ce359.wgsl b/test/tint/builtins/gen/transpose/4ce359.wgsl
index 88b25bc..ce8637a 100644
--- a/test/tint/builtins/gen/transpose/4ce359.wgsl
+++ b/test/tint/builtins/gen/transpose/4ce359.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/transpose/4dc9a1.wgsl

diff --git a/test/tint/builtins/gen/transpose/4dc9a1.wgsl b/test/tint/builtins/gen/transpose/4dc9a1.wgsl
index 9cc6473..4e9b505 100644
--- a/test/tint/builtins/gen/transpose/4dc9a1.wgsl
+++ b/test/tint/builtins/gen/transpose/4dc9a1.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/transpose/854336.wgsl

diff --git a/test/tint/builtins/gen/transpose/854336.wgsl b/test/tint/builtins/gen/transpose/854336.wgsl
index a6ed5e3..2a70805 100644
--- a/test/tint/builtins/gen/transpose/854336.wgsl
+++ b/test/tint/builtins/gen/transpose/854336.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/transpose/c1b600.wgsl

diff --git a/test/tint/builtins/gen/transpose/c1b600.wgsl b/test/tint/builtins/gen/transpose/c1b600.wgsl
index fdc47dc..56c4333 100644
--- a/test/tint/builtins/gen/transpose/c1b600.wgsl
+++ b/test/tint/builtins/gen/transpose/c1b600.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/transpose/d8f8ba.wgsl

diff --git a/test/tint/builtins/gen/transpose/d8f8ba.wgsl b/test/tint/builtins/gen/transpose/d8f8ba.wgsl
index d22d71d..b4fd7ae 100644
--- a/test/tint/builtins/gen/transpose/d8f8ba.wgsl
+++ b/test/tint/builtins/gen/transpose/d8f8ba.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/transpose/ed4bdc.wgsl

diff --git a/test/tint/builtins/gen/transpose/ed4bdc.wgsl b/test/tint/builtins/gen/transpose/ed4bdc.wgsl
index 5fd4e48..409646d 100644
--- a/test/tint/builtins/gen/transpose/ed4bdc.wgsl
+++ b/test/tint/builtins/gen/transpose/ed4bdc.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/trunc/562d05.wgsl

diff --git a/test/tint/builtins/gen/trunc/562d05.wgsl b/test/tint/builtins/gen/trunc/562d05.wgsl
index 1d792e8..2f11f6a 100644
--- a/test/tint/builtins/gen/trunc/562d05.wgsl
+++ b/test/tint/builtins/gen/trunc/562d05.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/trunc/e183aa.wgsl

diff --git a/test/tint/builtins/gen/trunc/e183aa.wgsl b/test/tint/builtins/gen/trunc/e183aa.wgsl
index d719d01..c450642 100644
--- a/test/tint/builtins/gen/trunc/e183aa.wgsl
+++ b/test/tint/builtins/gen/trunc/e183aa.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/trunc/eb83df.wgsl

diff --git a/test/tint/builtins/gen/trunc/eb83df.wgsl b/test/tint/builtins/gen/trunc/eb83df.wgsl
index 685dcba..1983f32 100644
--- a/test/tint/builtins/gen/trunc/eb83df.wgsl
+++ b/test/tint/builtins/gen/trunc/eb83df.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/trunc/f370d3.wgsl

diff --git a/test/tint/builtins/gen/trunc/f370d3.wgsl b/test/tint/builtins/gen/trunc/f370d3.wgsl
index dbf5a05..4990c18 100644
--- a/test/tint/builtins/gen/trunc/f370d3.wgsl
+++ b/test/tint/builtins/gen/trunc/f370d3.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/unpack2x16float/32a5cf.wgsl

diff --git a/test/tint/builtins/gen/unpack2x16float/32a5cf.wgsl b/test/tint/builtins/gen/unpack2x16float/32a5cf.wgsl
index c270720..84896b0 100644
--- a/test/tint/builtins/gen/unpack2x16float/32a5cf.wgsl
+++ b/test/tint/builtins/gen/unpack2x16float/32a5cf.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/unpack2x16snorm/b4aea6.wgsl

diff --git a/test/tint/builtins/gen/unpack2x16snorm/b4aea6.wgsl b/test/tint/builtins/gen/unpack2x16snorm/b4aea6.wgsl
index 7a284ce..230035a 100644
--- a/test/tint/builtins/gen/unpack2x16snorm/b4aea6.wgsl
+++ b/test/tint/builtins/gen/unpack2x16snorm/b4aea6.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/unpack2x16unorm/7699c0.wgsl

diff --git a/test/tint/builtins/gen/unpack2x16unorm/7699c0.wgsl b/test/tint/builtins/gen/unpack2x16unorm/7699c0.wgsl
index 9e20260..8d893e1 100644
--- a/test/tint/builtins/gen/unpack2x16unorm/7699c0.wgsl
+++ b/test/tint/builtins/gen/unpack2x16unorm/7699c0.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/unpack4x8snorm/523fb3.wgsl

diff --git a/test/tint/builtins/gen/unpack4x8snorm/523fb3.wgsl b/test/tint/builtins/gen/unpack4x8snorm/523fb3.wgsl
index a6495ea..a4c4e19 100644
--- a/test/tint/builtins/gen/unpack4x8snorm/523fb3.wgsl
+++ b/test/tint/builtins/gen/unpack4x8snorm/523fb3.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/unpack4x8unorm/750c74.wgsl

diff --git a/test/tint/builtins/gen/unpack4x8unorm/750c74.wgsl b/test/tint/builtins/gen/unpack4x8unorm/750c74.wgsl
index 89fa81c..a522dd1 100644
--- a/test/tint/builtins/gen/unpack4x8unorm/750c74.wgsl
+++ b/test/tint/builtins/gen/unpack4x8unorm/750c74.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

test/tint/builtins/gen/workgroupBarrier/a17f7f.wgsl

diff --git a/test/tint/builtins/gen/workgroupBarrier/a17f7f.wgsl b/test/tint/builtins/gen/workgroupBarrier/a17f7f.wgsl
index 89fc240..076c18c 100644
--- a/test/tint/builtins/gen/workgroupBarrier/a17f7f.wgsl
+++ b/test/tint/builtins/gen/workgroupBarrier/a17f7f.wgsl
@@ -15,9 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/builtin-gen
 // using the template:
-//   test/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/builtins.wgsl.tmpl
 // and the builtin defintion file:
-//   src/builtins.def
+//   src/tint/builtins.def
 //
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////

tools/src/cmd/builtin-gen/main.go

diff --git a/tools/src/cmd/builtin-gen/main.go b/tools/src/cmd/builtin-gen/main.go
index d126cf9..cc8d8e6 100644
--- a/tools/src/cmd/builtin-gen/main.go
+++ b/tools/src/cmd/builtin-gen/main.go
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-// builtin-gen parses the <tint>/src/builtins.def file, then scans the
+// builtin-gen parses the <tint>/src/tint/builtins.def file, then scans the
 // project directory for '<file>.tmpl' files, to produce '<file>' source code
 // files.
 package main
@@ -32,7 +32,7 @@
 	"dawn.googlesource.com/tint/tools/src/glob"
 )
 
-const defProjectRelPath = "src/builtins.def"
+const defProjectRelPath = "src/tint/builtins.def"
 
 func main() {
 	if err := run(); err != nil {
@@ -45,7 +45,7 @@
 	fmt.Println(`
 builtin-gen generates the builtin table for the Tint compiler
 
-builtin-gen parses the <tint>/src/builtins.def file, then scans the project
+builtin-gen parses the <tint>/src/tint/builtins.def file, then scans the project
 directory for '<file>.tmpl' files, to produce '<file>' source code files.
 
 usage: