diff --git a/test/tint/builtins/builtins.wgsl.tmpl b/test/tint/builtins/gen/gen.wgsl.tmpl
similarity index 98%
rename from test/tint/builtins/builtins.wgsl.tmpl
rename to test/tint/builtins/gen/gen.wgsl.tmpl
index fb3f318727..d4360f443d 100644
--- a/test/tint/builtins/builtins.wgsl.tmpl
+++ b/test/tint/builtins/gen/gen.wgsl.tmpl
@@ -1,7 +1,7 @@
 {{- /*
 --------------------------------------------------------------------------------
 Template file for use with tools/builtin-gen to generate the wgsl files in the
-./gen/... subdirectories
+./literal/... subdirectories
 
 See:
 * tools/cmd/intrinsic-gen/gen for structures used by this template
@@ -16,9 +16,9 @@ See:
 {{- if not (or (eq .Name "smoothStep") (eq .Name "dot4I8Packed") (eq .Name "dot4U8Packed"))}}
 {{-   range .Overloads  -}}
 {{-     range Permute . -}}
-{{- /*    Generate a ./gen/<function>/<permuataion-hash>.wgsl file using
+{{- /*    Generate a ./literal/<function>/<permuataion-hash>.wgsl file using
           the Permutation macro defined below                             */ -}}
-{{-       $file := printf "./gen/%v/%v.wgsl" .Intrinsic.Name .Hash -}}
+{{-       $file := printf "./literal/%v/%v.wgsl" .Intrinsic.Name .Hash -}}
 {{-       $content := Eval "Permutation" . -}}
 {{-       WriteFile $file $content -}}
 {{-     end  }}
diff --git a/test/tint/builtins/gen/abs/002533.wgsl b/test/tint/builtins/gen/literal/abs/002533.wgsl
similarity index 96%
rename from test/tint/builtins/gen/abs/002533.wgsl
rename to test/tint/builtins/gen/literal/abs/002533.wgsl
index 0ec97222bf..629d1459ca 100644
--- a/test/tint/builtins/gen/abs/002533.wgsl
+++ b/test/tint/builtins/gen/literal/abs/002533.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/abs/002533.wgsl.expected.glsl b/test/tint/builtins/gen/literal/abs/002533.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/abs/002533.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/abs/002533.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/abs/002533.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/abs/002533.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/abs/002533.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/abs/002533.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/abs/002533.wgsl.expected.msl b/test/tint/builtins/gen/literal/abs/002533.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/abs/002533.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/abs/002533.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/abs/002533.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/abs/002533.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/abs/002533.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/abs/002533.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/abs/002533.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/abs/002533.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/abs/002533.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/abs/002533.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/abs/005174.wgsl b/test/tint/builtins/gen/literal/abs/005174.wgsl
similarity index 96%
rename from test/tint/builtins/gen/abs/005174.wgsl
rename to test/tint/builtins/gen/literal/abs/005174.wgsl
index 1dff647955..b22b60dfd5 100644
--- a/test/tint/builtins/gen/abs/005174.wgsl
+++ b/test/tint/builtins/gen/literal/abs/005174.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/abs/005174.wgsl.expected.glsl b/test/tint/builtins/gen/literal/abs/005174.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/abs/005174.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/abs/005174.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/abs/005174.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/abs/005174.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/abs/005174.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/abs/005174.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/abs/005174.wgsl.expected.msl b/test/tint/builtins/gen/literal/abs/005174.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/abs/005174.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/abs/005174.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/abs/005174.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/abs/005174.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/abs/005174.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/abs/005174.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/abs/005174.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/abs/005174.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/abs/005174.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/abs/005174.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/abs/1ce782.wgsl b/test/tint/builtins/gen/literal/abs/1ce782.wgsl
similarity index 96%
rename from test/tint/builtins/gen/abs/1ce782.wgsl
rename to test/tint/builtins/gen/literal/abs/1ce782.wgsl
index 9625dec919..7487129ce0 100644
--- a/test/tint/builtins/gen/abs/1ce782.wgsl
+++ b/test/tint/builtins/gen/literal/abs/1ce782.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/abs/1ce782.wgsl.expected.glsl b/test/tint/builtins/gen/literal/abs/1ce782.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/abs/1ce782.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/abs/1ce782.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/abs/1ce782.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/abs/1ce782.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/abs/1ce782.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/abs/1ce782.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/abs/1ce782.wgsl.expected.msl b/test/tint/builtins/gen/literal/abs/1ce782.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/abs/1ce782.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/abs/1ce782.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/abs/1ce782.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/abs/1ce782.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/abs/1ce782.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/abs/1ce782.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/abs/1ce782.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/abs/1ce782.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/abs/1ce782.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/abs/1ce782.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/abs/1e9d53.wgsl b/test/tint/builtins/gen/literal/abs/1e9d53.wgsl
similarity index 96%
rename from test/tint/builtins/gen/abs/1e9d53.wgsl
rename to test/tint/builtins/gen/literal/abs/1e9d53.wgsl
index 9ad99cd24d..0a43ebc342 100644
--- a/test/tint/builtins/gen/abs/1e9d53.wgsl
+++ b/test/tint/builtins/gen/literal/abs/1e9d53.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/abs/1e9d53.wgsl.expected.glsl b/test/tint/builtins/gen/literal/abs/1e9d53.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/abs/1e9d53.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/abs/1e9d53.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/abs/1e9d53.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/abs/1e9d53.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/abs/1e9d53.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/abs/1e9d53.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/abs/1e9d53.wgsl.expected.msl b/test/tint/builtins/gen/literal/abs/1e9d53.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/abs/1e9d53.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/abs/1e9d53.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/abs/1e9d53.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/abs/1e9d53.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/abs/1e9d53.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/abs/1e9d53.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/abs/1e9d53.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/abs/1e9d53.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/abs/1e9d53.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/abs/1e9d53.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/abs/467cd1.wgsl b/test/tint/builtins/gen/literal/abs/467cd1.wgsl
similarity index 96%
rename from test/tint/builtins/gen/abs/467cd1.wgsl
rename to test/tint/builtins/gen/literal/abs/467cd1.wgsl
index 888fbb10c9..f56c0e7549 100644
--- a/test/tint/builtins/gen/abs/467cd1.wgsl
+++ b/test/tint/builtins/gen/literal/abs/467cd1.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/abs/467cd1.wgsl.expected.glsl b/test/tint/builtins/gen/literal/abs/467cd1.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/abs/467cd1.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/abs/467cd1.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/abs/467cd1.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/abs/467cd1.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/abs/467cd1.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/abs/467cd1.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/abs/467cd1.wgsl.expected.msl b/test/tint/builtins/gen/literal/abs/467cd1.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/abs/467cd1.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/abs/467cd1.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/abs/467cd1.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/abs/467cd1.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/abs/467cd1.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/abs/467cd1.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/abs/467cd1.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/abs/467cd1.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/abs/467cd1.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/abs/467cd1.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/abs/4ad288.wgsl b/test/tint/builtins/gen/literal/abs/4ad288.wgsl
similarity index 96%
rename from test/tint/builtins/gen/abs/4ad288.wgsl
rename to test/tint/builtins/gen/literal/abs/4ad288.wgsl
index 62af62aa40..ac0a540cbb 100644
--- a/test/tint/builtins/gen/abs/4ad288.wgsl
+++ b/test/tint/builtins/gen/literal/abs/4ad288.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/abs/4ad288.wgsl.expected.glsl b/test/tint/builtins/gen/literal/abs/4ad288.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/abs/4ad288.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/abs/4ad288.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/abs/4ad288.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/abs/4ad288.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/abs/4ad288.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/abs/4ad288.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/abs/4ad288.wgsl.expected.msl b/test/tint/builtins/gen/literal/abs/4ad288.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/abs/4ad288.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/abs/4ad288.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/abs/4ad288.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/abs/4ad288.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/abs/4ad288.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/abs/4ad288.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/abs/4ad288.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/abs/4ad288.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/abs/4ad288.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/abs/4ad288.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/abs/5ad50a.wgsl b/test/tint/builtins/gen/literal/abs/5ad50a.wgsl
similarity index 96%
rename from test/tint/builtins/gen/abs/5ad50a.wgsl
rename to test/tint/builtins/gen/literal/abs/5ad50a.wgsl
index 5344a49451..b31a2d7e3f 100644
--- a/test/tint/builtins/gen/abs/5ad50a.wgsl
+++ b/test/tint/builtins/gen/literal/abs/5ad50a.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/abs/5ad50a.wgsl.expected.glsl b/test/tint/builtins/gen/literal/abs/5ad50a.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/abs/5ad50a.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/abs/5ad50a.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/abs/5ad50a.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/abs/5ad50a.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/abs/5ad50a.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/abs/5ad50a.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/abs/5ad50a.wgsl.expected.msl b/test/tint/builtins/gen/literal/abs/5ad50a.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/abs/5ad50a.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/abs/5ad50a.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/abs/5ad50a.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/abs/5ad50a.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/abs/5ad50a.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/abs/5ad50a.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/abs/5ad50a.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/abs/5ad50a.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/abs/5ad50a.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/abs/5ad50a.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/abs/7326de.wgsl b/test/tint/builtins/gen/literal/abs/7326de.wgsl
similarity index 96%
rename from test/tint/builtins/gen/abs/7326de.wgsl
rename to test/tint/builtins/gen/literal/abs/7326de.wgsl
index 860ec8adc5..2341b407bd 100644
--- a/test/tint/builtins/gen/abs/7326de.wgsl
+++ b/test/tint/builtins/gen/literal/abs/7326de.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/abs/7326de.wgsl.expected.glsl b/test/tint/builtins/gen/literal/abs/7326de.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/abs/7326de.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/abs/7326de.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/abs/7326de.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/abs/7326de.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/abs/7326de.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/abs/7326de.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/abs/7326de.wgsl.expected.msl b/test/tint/builtins/gen/literal/abs/7326de.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/abs/7326de.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/abs/7326de.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/abs/7326de.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/abs/7326de.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/abs/7326de.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/abs/7326de.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/abs/7326de.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/abs/7326de.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/abs/7326de.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/abs/7326de.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/abs/7f28e6.wgsl b/test/tint/builtins/gen/literal/abs/7f28e6.wgsl
similarity index 96%
rename from test/tint/builtins/gen/abs/7f28e6.wgsl
rename to test/tint/builtins/gen/literal/abs/7f28e6.wgsl
index af3bf446d7..140a4a81fe 100644
--- a/test/tint/builtins/gen/abs/7f28e6.wgsl
+++ b/test/tint/builtins/gen/literal/abs/7f28e6.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/abs/7f28e6.wgsl.expected.glsl b/test/tint/builtins/gen/literal/abs/7f28e6.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/abs/7f28e6.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/abs/7f28e6.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/abs/7f28e6.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/abs/7f28e6.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/abs/7f28e6.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/abs/7f28e6.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/abs/7f28e6.wgsl.expected.msl b/test/tint/builtins/gen/literal/abs/7f28e6.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/abs/7f28e6.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/abs/7f28e6.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/abs/7f28e6.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/abs/7f28e6.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/abs/7f28e6.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/abs/7f28e6.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/abs/7f28e6.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/abs/7f28e6.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/abs/7f28e6.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/abs/7f28e6.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/abs/7faa9e.wgsl b/test/tint/builtins/gen/literal/abs/7faa9e.wgsl
similarity index 96%
rename from test/tint/builtins/gen/abs/7faa9e.wgsl
rename to test/tint/builtins/gen/literal/abs/7faa9e.wgsl
index b88f802b70..23011a2f3c 100644
--- a/test/tint/builtins/gen/abs/7faa9e.wgsl
+++ b/test/tint/builtins/gen/literal/abs/7faa9e.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/abs/7faa9e.wgsl.expected.glsl b/test/tint/builtins/gen/literal/abs/7faa9e.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/abs/7faa9e.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/abs/7faa9e.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/abs/7faa9e.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/abs/7faa9e.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/abs/7faa9e.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/abs/7faa9e.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/abs/7faa9e.wgsl.expected.msl b/test/tint/builtins/gen/literal/abs/7faa9e.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/abs/7faa9e.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/abs/7faa9e.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/abs/7faa9e.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/abs/7faa9e.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/abs/7faa9e.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/abs/7faa9e.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/abs/7faa9e.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/abs/7faa9e.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/abs/7faa9e.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/abs/7faa9e.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/abs/9c80a6.wgsl b/test/tint/builtins/gen/literal/abs/9c80a6.wgsl
similarity index 96%
rename from test/tint/builtins/gen/abs/9c80a6.wgsl
rename to test/tint/builtins/gen/literal/abs/9c80a6.wgsl
index 7a66ed0ed7..1fba92e646 100644
--- a/test/tint/builtins/gen/abs/9c80a6.wgsl
+++ b/test/tint/builtins/gen/literal/abs/9c80a6.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/abs/9c80a6.wgsl.expected.glsl b/test/tint/builtins/gen/literal/abs/9c80a6.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/abs/9c80a6.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/abs/9c80a6.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/abs/9c80a6.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/abs/9c80a6.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/abs/9c80a6.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/abs/9c80a6.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/abs/9c80a6.wgsl.expected.msl b/test/tint/builtins/gen/literal/abs/9c80a6.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/abs/9c80a6.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/abs/9c80a6.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/abs/9c80a6.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/abs/9c80a6.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/abs/9c80a6.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/abs/9c80a6.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/abs/9c80a6.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/abs/9c80a6.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/abs/9c80a6.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/abs/9c80a6.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/abs/b96037.wgsl b/test/tint/builtins/gen/literal/abs/b96037.wgsl
similarity index 96%
rename from test/tint/builtins/gen/abs/b96037.wgsl
rename to test/tint/builtins/gen/literal/abs/b96037.wgsl
index 36b06a4482..603d341dc4 100644
--- a/test/tint/builtins/gen/abs/b96037.wgsl
+++ b/test/tint/builtins/gen/literal/abs/b96037.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/abs/b96037.wgsl.expected.glsl b/test/tint/builtins/gen/literal/abs/b96037.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/abs/b96037.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/abs/b96037.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/abs/b96037.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/abs/b96037.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/abs/b96037.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/abs/b96037.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/abs/b96037.wgsl.expected.msl b/test/tint/builtins/gen/literal/abs/b96037.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/abs/b96037.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/abs/b96037.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/abs/b96037.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/abs/b96037.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/abs/b96037.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/abs/b96037.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/abs/b96037.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/abs/b96037.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/abs/b96037.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/abs/b96037.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/acos/489247.wgsl b/test/tint/builtins/gen/literal/acos/489247.wgsl
similarity index 96%
rename from test/tint/builtins/gen/acos/489247.wgsl
rename to test/tint/builtins/gen/literal/acos/489247.wgsl
index d43d0440a6..0bdc1bf6c3 100644
--- a/test/tint/builtins/gen/acos/489247.wgsl
+++ b/test/tint/builtins/gen/literal/acos/489247.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/acos/489247.wgsl.expected.glsl b/test/tint/builtins/gen/literal/acos/489247.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/acos/489247.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/acos/489247.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/acos/489247.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/acos/489247.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/acos/489247.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/acos/489247.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/acos/489247.wgsl.expected.msl b/test/tint/builtins/gen/literal/acos/489247.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/acos/489247.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/acos/489247.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/acos/489247.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/acos/489247.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/acos/489247.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/acos/489247.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/acos/489247.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/acos/489247.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/acos/489247.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/acos/489247.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/acos/8e2acf.wgsl b/test/tint/builtins/gen/literal/acos/8e2acf.wgsl
similarity index 96%
rename from test/tint/builtins/gen/acos/8e2acf.wgsl
rename to test/tint/builtins/gen/literal/acos/8e2acf.wgsl
index d4f40c64ac..6371bc9c80 100644
--- a/test/tint/builtins/gen/acos/8e2acf.wgsl
+++ b/test/tint/builtins/gen/literal/acos/8e2acf.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/acos/8e2acf.wgsl.expected.glsl b/test/tint/builtins/gen/literal/acos/8e2acf.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/acos/8e2acf.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/acos/8e2acf.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/acos/8e2acf.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/acos/8e2acf.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/acos/8e2acf.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/acos/8e2acf.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/acos/8e2acf.wgsl.expected.msl b/test/tint/builtins/gen/literal/acos/8e2acf.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/acos/8e2acf.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/acos/8e2acf.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/acos/8e2acf.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/acos/8e2acf.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/acos/8e2acf.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/acos/8e2acf.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/acos/8e2acf.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/acos/8e2acf.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/acos/8e2acf.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/acos/8e2acf.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/acos/a610c4.wgsl b/test/tint/builtins/gen/literal/acos/a610c4.wgsl
similarity index 96%
rename from test/tint/builtins/gen/acos/a610c4.wgsl
rename to test/tint/builtins/gen/literal/acos/a610c4.wgsl
index 32ec90b1ab..1d8c7f0abb 100644
--- a/test/tint/builtins/gen/acos/a610c4.wgsl
+++ b/test/tint/builtins/gen/literal/acos/a610c4.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/acos/a610c4.wgsl.expected.glsl b/test/tint/builtins/gen/literal/acos/a610c4.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/acos/a610c4.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/acos/a610c4.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/acos/a610c4.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/acos/a610c4.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/acos/a610c4.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/acos/a610c4.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/acos/a610c4.wgsl.expected.msl b/test/tint/builtins/gen/literal/acos/a610c4.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/acos/a610c4.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/acos/a610c4.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/acos/a610c4.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/acos/a610c4.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/acos/a610c4.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/acos/a610c4.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/acos/a610c4.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/acos/a610c4.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/acos/a610c4.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/acos/a610c4.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/acos/dfc915.wgsl b/test/tint/builtins/gen/literal/acos/dfc915.wgsl
similarity index 96%
rename from test/tint/builtins/gen/acos/dfc915.wgsl
rename to test/tint/builtins/gen/literal/acos/dfc915.wgsl
index f1313be17e..b8d95bdc89 100644
--- a/test/tint/builtins/gen/acos/dfc915.wgsl
+++ b/test/tint/builtins/gen/literal/acos/dfc915.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/acos/dfc915.wgsl.expected.glsl b/test/tint/builtins/gen/literal/acos/dfc915.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/acos/dfc915.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/acos/dfc915.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/acos/dfc915.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/acos/dfc915.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/acos/dfc915.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/acos/dfc915.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/acos/dfc915.wgsl.expected.msl b/test/tint/builtins/gen/literal/acos/dfc915.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/acos/dfc915.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/acos/dfc915.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/acos/dfc915.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/acos/dfc915.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/acos/dfc915.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/acos/dfc915.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/acos/dfc915.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/acos/dfc915.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/acos/dfc915.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/acos/dfc915.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/all/353d6a.wgsl b/test/tint/builtins/gen/literal/all/353d6a.wgsl
similarity index 96%
rename from test/tint/builtins/gen/all/353d6a.wgsl
rename to test/tint/builtins/gen/literal/all/353d6a.wgsl
index 11e9479382..2709c4401d 100644
--- a/test/tint/builtins/gen/all/353d6a.wgsl
+++ b/test/tint/builtins/gen/literal/all/353d6a.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/all/353d6a.wgsl.expected.glsl b/test/tint/builtins/gen/literal/all/353d6a.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/all/353d6a.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/all/353d6a.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/all/353d6a.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/all/353d6a.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/all/353d6a.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/all/353d6a.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/all/353d6a.wgsl.expected.msl b/test/tint/builtins/gen/literal/all/353d6a.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/all/353d6a.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/all/353d6a.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/all/353d6a.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/all/353d6a.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/all/353d6a.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/all/353d6a.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/all/353d6a.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/all/353d6a.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/all/353d6a.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/all/353d6a.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/all/986c7b.wgsl b/test/tint/builtins/gen/literal/all/986c7b.wgsl
similarity index 96%
rename from test/tint/builtins/gen/all/986c7b.wgsl
rename to test/tint/builtins/gen/literal/all/986c7b.wgsl
index 5e3d3c42fd..92714f7c6c 100644
--- a/test/tint/builtins/gen/all/986c7b.wgsl
+++ b/test/tint/builtins/gen/literal/all/986c7b.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/all/986c7b.wgsl.expected.glsl b/test/tint/builtins/gen/literal/all/986c7b.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/all/986c7b.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/all/986c7b.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/all/986c7b.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/all/986c7b.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/all/986c7b.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/all/986c7b.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/all/986c7b.wgsl.expected.msl b/test/tint/builtins/gen/literal/all/986c7b.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/all/986c7b.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/all/986c7b.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/all/986c7b.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/all/986c7b.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/all/986c7b.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/all/986c7b.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/all/986c7b.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/all/986c7b.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/all/986c7b.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/all/986c7b.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/all/bd2dba.wgsl b/test/tint/builtins/gen/literal/all/bd2dba.wgsl
similarity index 96%
rename from test/tint/builtins/gen/all/bd2dba.wgsl
rename to test/tint/builtins/gen/literal/all/bd2dba.wgsl
index 7b98f0de9f..e28d07bd75 100644
--- a/test/tint/builtins/gen/all/bd2dba.wgsl
+++ b/test/tint/builtins/gen/literal/all/bd2dba.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/all/bd2dba.wgsl.expected.glsl b/test/tint/builtins/gen/literal/all/bd2dba.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/all/bd2dba.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/all/bd2dba.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/all/bd2dba.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/all/bd2dba.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/all/bd2dba.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/all/bd2dba.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/all/bd2dba.wgsl.expected.msl b/test/tint/builtins/gen/literal/all/bd2dba.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/all/bd2dba.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/all/bd2dba.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/all/bd2dba.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/all/bd2dba.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/all/bd2dba.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/all/bd2dba.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/all/bd2dba.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/all/bd2dba.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/all/bd2dba.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/all/bd2dba.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/all/f46790.wgsl b/test/tint/builtins/gen/literal/all/f46790.wgsl
similarity index 96%
rename from test/tint/builtins/gen/all/f46790.wgsl
rename to test/tint/builtins/gen/literal/all/f46790.wgsl
index 6e5b3eae97..cef2ae2326 100644
--- a/test/tint/builtins/gen/all/f46790.wgsl
+++ b/test/tint/builtins/gen/literal/all/f46790.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/all/f46790.wgsl.expected.glsl b/test/tint/builtins/gen/literal/all/f46790.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/all/f46790.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/all/f46790.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/all/f46790.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/all/f46790.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/all/f46790.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/all/f46790.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/all/f46790.wgsl.expected.msl b/test/tint/builtins/gen/literal/all/f46790.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/all/f46790.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/all/f46790.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/all/f46790.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/all/f46790.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/all/f46790.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/all/f46790.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/all/f46790.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/all/f46790.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/all/f46790.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/all/f46790.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/any/083428.wgsl b/test/tint/builtins/gen/literal/any/083428.wgsl
similarity index 96%
rename from test/tint/builtins/gen/any/083428.wgsl
rename to test/tint/builtins/gen/literal/any/083428.wgsl
index d360268c95..0d7f1b3839 100644
--- a/test/tint/builtins/gen/any/083428.wgsl
+++ b/test/tint/builtins/gen/literal/any/083428.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/any/083428.wgsl.expected.glsl b/test/tint/builtins/gen/literal/any/083428.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/any/083428.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/any/083428.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/any/083428.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/any/083428.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/any/083428.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/any/083428.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/any/083428.wgsl.expected.msl b/test/tint/builtins/gen/literal/any/083428.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/any/083428.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/any/083428.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/any/083428.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/any/083428.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/any/083428.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/any/083428.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/any/083428.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/any/083428.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/any/083428.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/any/083428.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/any/0e3e58.wgsl b/test/tint/builtins/gen/literal/any/0e3e58.wgsl
similarity index 96%
rename from test/tint/builtins/gen/any/0e3e58.wgsl
rename to test/tint/builtins/gen/literal/any/0e3e58.wgsl
index a2d13f58cf..c71e30b2f7 100644
--- a/test/tint/builtins/gen/any/0e3e58.wgsl
+++ b/test/tint/builtins/gen/literal/any/0e3e58.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/any/0e3e58.wgsl.expected.glsl b/test/tint/builtins/gen/literal/any/0e3e58.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/any/0e3e58.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/any/0e3e58.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/any/0e3e58.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/any/0e3e58.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/any/0e3e58.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/any/0e3e58.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/any/0e3e58.wgsl.expected.msl b/test/tint/builtins/gen/literal/any/0e3e58.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/any/0e3e58.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/any/0e3e58.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/any/0e3e58.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/any/0e3e58.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/any/0e3e58.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/any/0e3e58.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/any/0e3e58.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/any/0e3e58.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/any/0e3e58.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/any/0e3e58.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/any/2ab91a.wgsl b/test/tint/builtins/gen/literal/any/2ab91a.wgsl
similarity index 96%
rename from test/tint/builtins/gen/any/2ab91a.wgsl
rename to test/tint/builtins/gen/literal/any/2ab91a.wgsl
index c02781c3b8..819c6921b4 100644
--- a/test/tint/builtins/gen/any/2ab91a.wgsl
+++ b/test/tint/builtins/gen/literal/any/2ab91a.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/any/2ab91a.wgsl.expected.glsl b/test/tint/builtins/gen/literal/any/2ab91a.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/any/2ab91a.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/any/2ab91a.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/any/2ab91a.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/any/2ab91a.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/any/2ab91a.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/any/2ab91a.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/any/2ab91a.wgsl.expected.msl b/test/tint/builtins/gen/literal/any/2ab91a.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/any/2ab91a.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/any/2ab91a.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/any/2ab91a.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/any/2ab91a.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/any/2ab91a.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/any/2ab91a.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/any/2ab91a.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/any/2ab91a.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/any/2ab91a.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/any/2ab91a.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/any/e755c1.wgsl b/test/tint/builtins/gen/literal/any/e755c1.wgsl
similarity index 96%
rename from test/tint/builtins/gen/any/e755c1.wgsl
rename to test/tint/builtins/gen/literal/any/e755c1.wgsl
index 342c9d2643..39e9415cbb 100644
--- a/test/tint/builtins/gen/any/e755c1.wgsl
+++ b/test/tint/builtins/gen/literal/any/e755c1.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/any/e755c1.wgsl.expected.glsl b/test/tint/builtins/gen/literal/any/e755c1.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/any/e755c1.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/any/e755c1.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/any/e755c1.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/any/e755c1.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/any/e755c1.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/any/e755c1.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/any/e755c1.wgsl.expected.msl b/test/tint/builtins/gen/literal/any/e755c1.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/any/e755c1.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/any/e755c1.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/any/e755c1.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/any/e755c1.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/any/e755c1.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/any/e755c1.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/any/e755c1.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/any/e755c1.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/any/e755c1.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/any/e755c1.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/arrayLength/1588cd.wgsl b/test/tint/builtins/gen/literal/arrayLength/1588cd.wgsl
similarity index 97%
rename from test/tint/builtins/gen/arrayLength/1588cd.wgsl
rename to test/tint/builtins/gen/literal/arrayLength/1588cd.wgsl
index 02b63c6ffa..c4dec13c3c 100644
--- a/test/tint/builtins/gen/arrayLength/1588cd.wgsl
+++ b/test/tint/builtins/gen/literal/arrayLength/1588cd.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/arrayLength/1588cd.wgsl.expected.glsl b/test/tint/builtins/gen/literal/arrayLength/1588cd.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/arrayLength/1588cd.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/arrayLength/1588cd.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/arrayLength/1588cd.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/arrayLength/1588cd.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/arrayLength/1588cd.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/arrayLength/1588cd.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/arrayLength/1588cd.wgsl.expected.msl b/test/tint/builtins/gen/literal/arrayLength/1588cd.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/arrayLength/1588cd.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/arrayLength/1588cd.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/arrayLength/1588cd.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/arrayLength/1588cd.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/arrayLength/1588cd.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/arrayLength/1588cd.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/arrayLength/1588cd.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/arrayLength/1588cd.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/arrayLength/1588cd.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/arrayLength/1588cd.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/arrayLength/61b1c7.wgsl b/test/tint/builtins/gen/literal/arrayLength/61b1c7.wgsl
similarity index 97%
rename from test/tint/builtins/gen/arrayLength/61b1c7.wgsl
rename to test/tint/builtins/gen/literal/arrayLength/61b1c7.wgsl
index 195f911845..a7adcc1bea 100644
--- a/test/tint/builtins/gen/arrayLength/61b1c7.wgsl
+++ b/test/tint/builtins/gen/literal/arrayLength/61b1c7.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/arrayLength/61b1c7.wgsl.expected.glsl b/test/tint/builtins/gen/literal/arrayLength/61b1c7.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/arrayLength/61b1c7.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/arrayLength/61b1c7.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/arrayLength/61b1c7.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/arrayLength/61b1c7.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/arrayLength/61b1c7.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/arrayLength/61b1c7.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/arrayLength/61b1c7.wgsl.expected.msl b/test/tint/builtins/gen/literal/arrayLength/61b1c7.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/arrayLength/61b1c7.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/arrayLength/61b1c7.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/arrayLength/61b1c7.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/arrayLength/61b1c7.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/arrayLength/61b1c7.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/arrayLength/61b1c7.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/arrayLength/61b1c7.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/arrayLength/61b1c7.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/arrayLength/61b1c7.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/arrayLength/61b1c7.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/arrayLength/a0f5ca.wgsl b/test/tint/builtins/gen/literal/arrayLength/a0f5ca.wgsl
similarity index 97%
rename from test/tint/builtins/gen/arrayLength/a0f5ca.wgsl
rename to test/tint/builtins/gen/literal/arrayLength/a0f5ca.wgsl
index a9ae5dc509..3f83858e27 100644
--- a/test/tint/builtins/gen/arrayLength/a0f5ca.wgsl
+++ b/test/tint/builtins/gen/literal/arrayLength/a0f5ca.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/arrayLength/a0f5ca.wgsl.expected.glsl b/test/tint/builtins/gen/literal/arrayLength/a0f5ca.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/arrayLength/a0f5ca.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/arrayLength/a0f5ca.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/arrayLength/a0f5ca.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/arrayLength/a0f5ca.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/arrayLength/a0f5ca.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/arrayLength/a0f5ca.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/arrayLength/a0f5ca.wgsl.expected.msl b/test/tint/builtins/gen/literal/arrayLength/a0f5ca.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/arrayLength/a0f5ca.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/arrayLength/a0f5ca.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/arrayLength/a0f5ca.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/arrayLength/a0f5ca.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/arrayLength/a0f5ca.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/arrayLength/a0f5ca.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/arrayLength/a0f5ca.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/arrayLength/a0f5ca.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/arrayLength/a0f5ca.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/arrayLength/a0f5ca.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/arrayLength/cdd123.wgsl b/test/tint/builtins/gen/literal/arrayLength/cdd123.wgsl
similarity index 97%
rename from test/tint/builtins/gen/arrayLength/cdd123.wgsl
rename to test/tint/builtins/gen/literal/arrayLength/cdd123.wgsl
index fae8c7f4cf..3b38e51c77 100644
--- a/test/tint/builtins/gen/arrayLength/cdd123.wgsl
+++ b/test/tint/builtins/gen/literal/arrayLength/cdd123.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/arrayLength/cdd123.wgsl.expected.glsl b/test/tint/builtins/gen/literal/arrayLength/cdd123.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/arrayLength/cdd123.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/arrayLength/cdd123.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/arrayLength/cdd123.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/arrayLength/cdd123.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/arrayLength/cdd123.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/arrayLength/cdd123.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/arrayLength/cdd123.wgsl.expected.msl b/test/tint/builtins/gen/literal/arrayLength/cdd123.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/arrayLength/cdd123.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/arrayLength/cdd123.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/arrayLength/cdd123.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/arrayLength/cdd123.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/arrayLength/cdd123.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/arrayLength/cdd123.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/arrayLength/cdd123.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/arrayLength/cdd123.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/arrayLength/cdd123.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/arrayLength/cdd123.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/arrayLength/cfca0a.wgsl b/test/tint/builtins/gen/literal/arrayLength/cfca0a.wgsl
similarity index 97%
rename from test/tint/builtins/gen/arrayLength/cfca0a.wgsl
rename to test/tint/builtins/gen/literal/arrayLength/cfca0a.wgsl
index afebc263e3..99d788d87b 100644
--- a/test/tint/builtins/gen/arrayLength/cfca0a.wgsl
+++ b/test/tint/builtins/gen/literal/arrayLength/cfca0a.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/arrayLength/cfca0a.wgsl.expected.glsl b/test/tint/builtins/gen/literal/arrayLength/cfca0a.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/arrayLength/cfca0a.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/arrayLength/cfca0a.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/arrayLength/cfca0a.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/arrayLength/cfca0a.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/arrayLength/cfca0a.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/arrayLength/cfca0a.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/arrayLength/cfca0a.wgsl.expected.msl b/test/tint/builtins/gen/literal/arrayLength/cfca0a.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/arrayLength/cfca0a.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/arrayLength/cfca0a.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/arrayLength/cfca0a.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/arrayLength/cfca0a.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/arrayLength/cfca0a.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/arrayLength/cfca0a.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/arrayLength/cfca0a.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/arrayLength/cfca0a.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/arrayLength/cfca0a.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/arrayLength/cfca0a.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/arrayLength/eb510f.wgsl b/test/tint/builtins/gen/literal/arrayLength/eb510f.wgsl
similarity index 97%
rename from test/tint/builtins/gen/arrayLength/eb510f.wgsl
rename to test/tint/builtins/gen/literal/arrayLength/eb510f.wgsl
index f9d0163437..cc2627bbda 100644
--- a/test/tint/builtins/gen/arrayLength/eb510f.wgsl
+++ b/test/tint/builtins/gen/literal/arrayLength/eb510f.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/arrayLength/eb510f.wgsl.expected.glsl b/test/tint/builtins/gen/literal/arrayLength/eb510f.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/arrayLength/eb510f.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/arrayLength/eb510f.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/arrayLength/eb510f.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/arrayLength/eb510f.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/arrayLength/eb510f.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/arrayLength/eb510f.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/arrayLength/eb510f.wgsl.expected.msl b/test/tint/builtins/gen/literal/arrayLength/eb510f.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/arrayLength/eb510f.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/arrayLength/eb510f.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/arrayLength/eb510f.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/arrayLength/eb510f.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/arrayLength/eb510f.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/arrayLength/eb510f.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/arrayLength/eb510f.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/arrayLength/eb510f.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/arrayLength/eb510f.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/arrayLength/eb510f.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/asin/064953.wgsl b/test/tint/builtins/gen/literal/asin/064953.wgsl
similarity index 96%
rename from test/tint/builtins/gen/asin/064953.wgsl
rename to test/tint/builtins/gen/literal/asin/064953.wgsl
index e26ebf28f1..0d11d1d3ee 100644
--- a/test/tint/builtins/gen/asin/064953.wgsl
+++ b/test/tint/builtins/gen/literal/asin/064953.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/asin/064953.wgsl.expected.glsl b/test/tint/builtins/gen/literal/asin/064953.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/asin/064953.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/asin/064953.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/asin/064953.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/asin/064953.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/asin/064953.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/asin/064953.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/asin/064953.wgsl.expected.msl b/test/tint/builtins/gen/literal/asin/064953.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/asin/064953.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/asin/064953.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/asin/064953.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/asin/064953.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/asin/064953.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/asin/064953.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/asin/064953.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/asin/064953.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/asin/064953.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/asin/064953.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/asin/7b6a44.wgsl b/test/tint/builtins/gen/literal/asin/7b6a44.wgsl
similarity index 96%
rename from test/tint/builtins/gen/asin/7b6a44.wgsl
rename to test/tint/builtins/gen/literal/asin/7b6a44.wgsl
index 57b4c94d92..d51fc3fdcb 100644
--- a/test/tint/builtins/gen/asin/7b6a44.wgsl
+++ b/test/tint/builtins/gen/literal/asin/7b6a44.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/asin/7b6a44.wgsl.expected.glsl b/test/tint/builtins/gen/literal/asin/7b6a44.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/asin/7b6a44.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/asin/7b6a44.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/asin/7b6a44.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/asin/7b6a44.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/asin/7b6a44.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/asin/7b6a44.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/asin/7b6a44.wgsl.expected.msl b/test/tint/builtins/gen/literal/asin/7b6a44.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/asin/7b6a44.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/asin/7b6a44.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/asin/7b6a44.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/asin/7b6a44.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/asin/7b6a44.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/asin/7b6a44.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/asin/7b6a44.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/asin/7b6a44.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/asin/7b6a44.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/asin/7b6a44.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/asin/8cd9c9.wgsl b/test/tint/builtins/gen/literal/asin/8cd9c9.wgsl
similarity index 96%
rename from test/tint/builtins/gen/asin/8cd9c9.wgsl
rename to test/tint/builtins/gen/literal/asin/8cd9c9.wgsl
index 5406bd961d..0fec6234f1 100644
--- a/test/tint/builtins/gen/asin/8cd9c9.wgsl
+++ b/test/tint/builtins/gen/literal/asin/8cd9c9.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/asin/8cd9c9.wgsl.expected.glsl b/test/tint/builtins/gen/literal/asin/8cd9c9.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/asin/8cd9c9.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/asin/8cd9c9.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/asin/8cd9c9.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/asin/8cd9c9.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/asin/8cd9c9.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/asin/8cd9c9.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/asin/8cd9c9.wgsl.expected.msl b/test/tint/builtins/gen/literal/asin/8cd9c9.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/asin/8cd9c9.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/asin/8cd9c9.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/asin/8cd9c9.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/asin/8cd9c9.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/asin/8cd9c9.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/asin/8cd9c9.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/asin/8cd9c9.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/asin/8cd9c9.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/asin/8cd9c9.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/asin/8cd9c9.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/asin/c0c272.wgsl b/test/tint/builtins/gen/literal/asin/c0c272.wgsl
similarity index 96%
rename from test/tint/builtins/gen/asin/c0c272.wgsl
rename to test/tint/builtins/gen/literal/asin/c0c272.wgsl
index 339c53fcd9..155742887d 100644
--- a/test/tint/builtins/gen/asin/c0c272.wgsl
+++ b/test/tint/builtins/gen/literal/asin/c0c272.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/asin/c0c272.wgsl.expected.glsl b/test/tint/builtins/gen/literal/asin/c0c272.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/asin/c0c272.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/asin/c0c272.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/asin/c0c272.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/asin/c0c272.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/asin/c0c272.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/asin/c0c272.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/asin/c0c272.wgsl.expected.msl b/test/tint/builtins/gen/literal/asin/c0c272.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/asin/c0c272.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/asin/c0c272.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/asin/c0c272.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/asin/c0c272.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/asin/c0c272.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/asin/c0c272.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/asin/c0c272.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/asin/c0c272.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/asin/c0c272.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/asin/c0c272.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/atan/02979a.wgsl b/test/tint/builtins/gen/literal/atan/02979a.wgsl
similarity index 96%
rename from test/tint/builtins/gen/atan/02979a.wgsl
rename to test/tint/builtins/gen/literal/atan/02979a.wgsl
index 99fc24b64f..11619cc543 100644
--- a/test/tint/builtins/gen/atan/02979a.wgsl
+++ b/test/tint/builtins/gen/literal/atan/02979a.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/atan/02979a.wgsl.expected.glsl b/test/tint/builtins/gen/literal/atan/02979a.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/atan/02979a.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/atan/02979a.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/atan/02979a.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/atan/02979a.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/atan/02979a.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/atan/02979a.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/atan/02979a.wgsl.expected.msl b/test/tint/builtins/gen/literal/atan/02979a.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/atan/02979a.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/atan/02979a.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/atan/02979a.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/atan/02979a.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/atan/02979a.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/atan/02979a.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/atan/02979a.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/atan/02979a.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/atan/02979a.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/atan/02979a.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/atan/331e6d.wgsl b/test/tint/builtins/gen/literal/atan/331e6d.wgsl
similarity index 96%
rename from test/tint/builtins/gen/atan/331e6d.wgsl
rename to test/tint/builtins/gen/literal/atan/331e6d.wgsl
index e3f4989b9a..d3bac2d325 100644
--- a/test/tint/builtins/gen/atan/331e6d.wgsl
+++ b/test/tint/builtins/gen/literal/atan/331e6d.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/atan/331e6d.wgsl.expected.glsl b/test/tint/builtins/gen/literal/atan/331e6d.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/atan/331e6d.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/atan/331e6d.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/atan/331e6d.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/atan/331e6d.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/atan/331e6d.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/atan/331e6d.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/atan/331e6d.wgsl.expected.msl b/test/tint/builtins/gen/literal/atan/331e6d.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/atan/331e6d.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/atan/331e6d.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/atan/331e6d.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/atan/331e6d.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/atan/331e6d.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/atan/331e6d.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/atan/331e6d.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/atan/331e6d.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/atan/331e6d.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/atan/331e6d.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/atan/a8b696.wgsl b/test/tint/builtins/gen/literal/atan/a8b696.wgsl
similarity index 96%
rename from test/tint/builtins/gen/atan/a8b696.wgsl
rename to test/tint/builtins/gen/literal/atan/a8b696.wgsl
index 2eea8423af..e517917baf 100644
--- a/test/tint/builtins/gen/atan/a8b696.wgsl
+++ b/test/tint/builtins/gen/literal/atan/a8b696.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/atan/a8b696.wgsl.expected.glsl b/test/tint/builtins/gen/literal/atan/a8b696.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/atan/a8b696.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/atan/a8b696.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/atan/a8b696.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/atan/a8b696.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/atan/a8b696.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/atan/a8b696.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/atan/a8b696.wgsl.expected.msl b/test/tint/builtins/gen/literal/atan/a8b696.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/atan/a8b696.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/atan/a8b696.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/atan/a8b696.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/atan/a8b696.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/atan/a8b696.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/atan/a8b696.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/atan/a8b696.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/atan/a8b696.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/atan/a8b696.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/atan/a8b696.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/atan/ad96e4.wgsl b/test/tint/builtins/gen/literal/atan/ad96e4.wgsl
similarity index 96%
rename from test/tint/builtins/gen/atan/ad96e4.wgsl
rename to test/tint/builtins/gen/literal/atan/ad96e4.wgsl
index 170c7fc41a..75a7564c8c 100644
--- a/test/tint/builtins/gen/atan/ad96e4.wgsl
+++ b/test/tint/builtins/gen/literal/atan/ad96e4.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/atan/ad96e4.wgsl.expected.glsl b/test/tint/builtins/gen/literal/atan/ad96e4.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/atan/ad96e4.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/atan/ad96e4.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/atan/ad96e4.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/atan/ad96e4.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/atan/ad96e4.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/atan/ad96e4.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/atan/ad96e4.wgsl.expected.msl b/test/tint/builtins/gen/literal/atan/ad96e4.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/atan/ad96e4.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/atan/ad96e4.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/atan/ad96e4.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/atan/ad96e4.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/atan/ad96e4.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/atan/ad96e4.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/atan/ad96e4.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/atan/ad96e4.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/atan/ad96e4.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/atan/ad96e4.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/atan2/57fb13.wgsl b/test/tint/builtins/gen/literal/atan2/57fb13.wgsl
similarity index 96%
rename from test/tint/builtins/gen/atan2/57fb13.wgsl
rename to test/tint/builtins/gen/literal/atan2/57fb13.wgsl
index be99214c3e..e1d196774f 100644
--- a/test/tint/builtins/gen/atan2/57fb13.wgsl
+++ b/test/tint/builtins/gen/literal/atan2/57fb13.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/atan2/57fb13.wgsl.expected.glsl b/test/tint/builtins/gen/literal/atan2/57fb13.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/atan2/57fb13.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/atan2/57fb13.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/atan2/57fb13.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/atan2/57fb13.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/atan2/57fb13.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/atan2/57fb13.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/atan2/57fb13.wgsl.expected.msl b/test/tint/builtins/gen/literal/atan2/57fb13.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/atan2/57fb13.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/atan2/57fb13.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/atan2/57fb13.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/atan2/57fb13.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/atan2/57fb13.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/atan2/57fb13.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/atan2/57fb13.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/atan2/57fb13.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/atan2/57fb13.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/atan2/57fb13.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/atan2/96057c.wgsl b/test/tint/builtins/gen/literal/atan2/96057c.wgsl
similarity index 96%
rename from test/tint/builtins/gen/atan2/96057c.wgsl
rename to test/tint/builtins/gen/literal/atan2/96057c.wgsl
index dad1ef2553..d4c2769a22 100644
--- a/test/tint/builtins/gen/atan2/96057c.wgsl
+++ b/test/tint/builtins/gen/literal/atan2/96057c.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/atan2/96057c.wgsl.expected.glsl b/test/tint/builtins/gen/literal/atan2/96057c.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/atan2/96057c.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/atan2/96057c.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/atan2/96057c.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/atan2/96057c.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/atan2/96057c.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/atan2/96057c.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/atan2/96057c.wgsl.expected.msl b/test/tint/builtins/gen/literal/atan2/96057c.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/atan2/96057c.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/atan2/96057c.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/atan2/96057c.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/atan2/96057c.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/atan2/96057c.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/atan2/96057c.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/atan2/96057c.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/atan2/96057c.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/atan2/96057c.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/atan2/96057c.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/atan2/a70d0d.wgsl b/test/tint/builtins/gen/literal/atan2/a70d0d.wgsl
similarity index 96%
rename from test/tint/builtins/gen/atan2/a70d0d.wgsl
rename to test/tint/builtins/gen/literal/atan2/a70d0d.wgsl
index 26af2e66ee..7341157b99 100644
--- a/test/tint/builtins/gen/atan2/a70d0d.wgsl
+++ b/test/tint/builtins/gen/literal/atan2/a70d0d.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/atan2/a70d0d.wgsl.expected.glsl b/test/tint/builtins/gen/literal/atan2/a70d0d.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/atan2/a70d0d.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/atan2/a70d0d.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/atan2/a70d0d.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/atan2/a70d0d.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/atan2/a70d0d.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/atan2/a70d0d.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/atan2/a70d0d.wgsl.expected.msl b/test/tint/builtins/gen/literal/atan2/a70d0d.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/atan2/a70d0d.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/atan2/a70d0d.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/atan2/a70d0d.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/atan2/a70d0d.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/atan2/a70d0d.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/atan2/a70d0d.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/atan2/a70d0d.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/atan2/a70d0d.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/atan2/a70d0d.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/atan2/a70d0d.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/atan2/ae713e.wgsl b/test/tint/builtins/gen/literal/atan2/ae713e.wgsl
similarity index 96%
rename from test/tint/builtins/gen/atan2/ae713e.wgsl
rename to test/tint/builtins/gen/literal/atan2/ae713e.wgsl
index 63a6442c9e..3b021564f5 100644
--- a/test/tint/builtins/gen/atan2/ae713e.wgsl
+++ b/test/tint/builtins/gen/literal/atan2/ae713e.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/atan2/ae713e.wgsl.expected.glsl b/test/tint/builtins/gen/literal/atan2/ae713e.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/atan2/ae713e.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/atan2/ae713e.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/atan2/ae713e.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/atan2/ae713e.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/atan2/ae713e.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/atan2/ae713e.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/atan2/ae713e.wgsl.expected.msl b/test/tint/builtins/gen/literal/atan2/ae713e.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/atan2/ae713e.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/atan2/ae713e.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/atan2/ae713e.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/atan2/ae713e.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/atan2/ae713e.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/atan2/ae713e.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/atan2/ae713e.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/atan2/ae713e.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/atan2/ae713e.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/atan2/ae713e.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/atomicAdd/794055.wgsl b/test/tint/builtins/gen/literal/atomicAdd/794055.wgsl
similarity index 96%
rename from test/tint/builtins/gen/atomicAdd/794055.wgsl
rename to test/tint/builtins/gen/literal/atomicAdd/794055.wgsl
index 6c60c665b9..56d93383c0 100644
--- a/test/tint/builtins/gen/atomicAdd/794055.wgsl
+++ b/test/tint/builtins/gen/literal/atomicAdd/794055.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/atomicAdd/794055.wgsl.expected.glsl b/test/tint/builtins/gen/literal/atomicAdd/794055.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/atomicAdd/794055.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/atomicAdd/794055.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/atomicAdd/794055.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/atomicAdd/794055.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/atomicAdd/794055.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/atomicAdd/794055.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/atomicAdd/794055.wgsl.expected.msl b/test/tint/builtins/gen/literal/atomicAdd/794055.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/atomicAdd/794055.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/atomicAdd/794055.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/atomicAdd/794055.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/atomicAdd/794055.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/atomicAdd/794055.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/atomicAdd/794055.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/atomicAdd/794055.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/atomicAdd/794055.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/atomicAdd/794055.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/atomicAdd/794055.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/atomicAdd/8a199a.wgsl b/test/tint/builtins/gen/literal/atomicAdd/8a199a.wgsl
similarity index 96%
rename from test/tint/builtins/gen/atomicAdd/8a199a.wgsl
rename to test/tint/builtins/gen/literal/atomicAdd/8a199a.wgsl
index af301b7e92..91e2298eeb 100644
--- a/test/tint/builtins/gen/atomicAdd/8a199a.wgsl
+++ b/test/tint/builtins/gen/literal/atomicAdd/8a199a.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/atomicAdd/8a199a.wgsl.expected.glsl b/test/tint/builtins/gen/literal/atomicAdd/8a199a.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/atomicAdd/8a199a.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/atomicAdd/8a199a.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/atomicAdd/8a199a.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/atomicAdd/8a199a.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/atomicAdd/8a199a.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/atomicAdd/8a199a.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/atomicAdd/8a199a.wgsl.expected.msl b/test/tint/builtins/gen/literal/atomicAdd/8a199a.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/atomicAdd/8a199a.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/atomicAdd/8a199a.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/atomicAdd/8a199a.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/atomicAdd/8a199a.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/atomicAdd/8a199a.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/atomicAdd/8a199a.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/atomicAdd/8a199a.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/atomicAdd/8a199a.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/atomicAdd/8a199a.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/atomicAdd/8a199a.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/atomicAdd/d32fe4.wgsl b/test/tint/builtins/gen/literal/atomicAdd/d32fe4.wgsl
similarity index 96%
rename from test/tint/builtins/gen/atomicAdd/d32fe4.wgsl
rename to test/tint/builtins/gen/literal/atomicAdd/d32fe4.wgsl
index 23fd6a4ede..8bbef8b068 100644
--- a/test/tint/builtins/gen/atomicAdd/d32fe4.wgsl
+++ b/test/tint/builtins/gen/literal/atomicAdd/d32fe4.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/atomicAdd/d32fe4.wgsl.expected.glsl b/test/tint/builtins/gen/literal/atomicAdd/d32fe4.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/atomicAdd/d32fe4.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/atomicAdd/d32fe4.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/atomicAdd/d32fe4.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/atomicAdd/d32fe4.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/atomicAdd/d32fe4.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/atomicAdd/d32fe4.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/atomicAdd/d32fe4.wgsl.expected.msl b/test/tint/builtins/gen/literal/atomicAdd/d32fe4.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/atomicAdd/d32fe4.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/atomicAdd/d32fe4.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/atomicAdd/d32fe4.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/atomicAdd/d32fe4.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/atomicAdd/d32fe4.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/atomicAdd/d32fe4.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/atomicAdd/d32fe4.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/atomicAdd/d32fe4.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/atomicAdd/d32fe4.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/atomicAdd/d32fe4.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/atomicAdd/d5db1d.wgsl b/test/tint/builtins/gen/literal/atomicAdd/d5db1d.wgsl
similarity index 96%
rename from test/tint/builtins/gen/atomicAdd/d5db1d.wgsl
rename to test/tint/builtins/gen/literal/atomicAdd/d5db1d.wgsl
index ba04b1a14a..b5e30f2ffa 100644
--- a/test/tint/builtins/gen/atomicAdd/d5db1d.wgsl
+++ b/test/tint/builtins/gen/literal/atomicAdd/d5db1d.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/atomicAdd/d5db1d.wgsl.expected.glsl b/test/tint/builtins/gen/literal/atomicAdd/d5db1d.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/atomicAdd/d5db1d.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/atomicAdd/d5db1d.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/atomicAdd/d5db1d.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/atomicAdd/d5db1d.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/atomicAdd/d5db1d.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/atomicAdd/d5db1d.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/atomicAdd/d5db1d.wgsl.expected.msl b/test/tint/builtins/gen/literal/atomicAdd/d5db1d.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/atomicAdd/d5db1d.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/atomicAdd/d5db1d.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/atomicAdd/d5db1d.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/atomicAdd/d5db1d.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/atomicAdd/d5db1d.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/atomicAdd/d5db1d.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/atomicAdd/d5db1d.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/atomicAdd/d5db1d.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/atomicAdd/d5db1d.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/atomicAdd/d5db1d.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/atomicAnd/152966.wgsl b/test/tint/builtins/gen/literal/atomicAnd/152966.wgsl
similarity index 96%
rename from test/tint/builtins/gen/atomicAnd/152966.wgsl
rename to test/tint/builtins/gen/literal/atomicAnd/152966.wgsl
index fa2fee45cd..4409003216 100644
--- a/test/tint/builtins/gen/atomicAnd/152966.wgsl
+++ b/test/tint/builtins/gen/literal/atomicAnd/152966.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/atomicAnd/152966.wgsl.expected.glsl b/test/tint/builtins/gen/literal/atomicAnd/152966.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/atomicAnd/152966.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/atomicAnd/152966.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/atomicAnd/152966.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/atomicAnd/152966.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/atomicAnd/152966.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/atomicAnd/152966.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/atomicAnd/152966.wgsl.expected.msl b/test/tint/builtins/gen/literal/atomicAnd/152966.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/atomicAnd/152966.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/atomicAnd/152966.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/atomicAnd/152966.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/atomicAnd/152966.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/atomicAnd/152966.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/atomicAnd/152966.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/atomicAnd/152966.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/atomicAnd/152966.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/atomicAnd/152966.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/atomicAnd/152966.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/atomicAnd/34edd3.wgsl b/test/tint/builtins/gen/literal/atomicAnd/34edd3.wgsl
similarity index 96%
rename from test/tint/builtins/gen/atomicAnd/34edd3.wgsl
rename to test/tint/builtins/gen/literal/atomicAnd/34edd3.wgsl
index 18f2a0cde3..4029423cdd 100644
--- a/test/tint/builtins/gen/atomicAnd/34edd3.wgsl
+++ b/test/tint/builtins/gen/literal/atomicAnd/34edd3.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/atomicAnd/34edd3.wgsl.expected.glsl b/test/tint/builtins/gen/literal/atomicAnd/34edd3.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/atomicAnd/34edd3.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/atomicAnd/34edd3.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/atomicAnd/34edd3.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/atomicAnd/34edd3.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/atomicAnd/34edd3.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/atomicAnd/34edd3.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/atomicAnd/34edd3.wgsl.expected.msl b/test/tint/builtins/gen/literal/atomicAnd/34edd3.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/atomicAnd/34edd3.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/atomicAnd/34edd3.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/atomicAnd/34edd3.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/atomicAnd/34edd3.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/atomicAnd/34edd3.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/atomicAnd/34edd3.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/atomicAnd/34edd3.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/atomicAnd/34edd3.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/atomicAnd/34edd3.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/atomicAnd/34edd3.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/atomicAnd/45a819.wgsl b/test/tint/builtins/gen/literal/atomicAnd/45a819.wgsl
similarity index 96%
rename from test/tint/builtins/gen/atomicAnd/45a819.wgsl
rename to test/tint/builtins/gen/literal/atomicAnd/45a819.wgsl
index 2eedbaf125..b47df1c931 100644
--- a/test/tint/builtins/gen/atomicAnd/45a819.wgsl
+++ b/test/tint/builtins/gen/literal/atomicAnd/45a819.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/atomicAnd/45a819.wgsl.expected.glsl b/test/tint/builtins/gen/literal/atomicAnd/45a819.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/atomicAnd/45a819.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/atomicAnd/45a819.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/atomicAnd/45a819.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/atomicAnd/45a819.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/atomicAnd/45a819.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/atomicAnd/45a819.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/atomicAnd/45a819.wgsl.expected.msl b/test/tint/builtins/gen/literal/atomicAnd/45a819.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/atomicAnd/45a819.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/atomicAnd/45a819.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/atomicAnd/45a819.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/atomicAnd/45a819.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/atomicAnd/45a819.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/atomicAnd/45a819.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/atomicAnd/45a819.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/atomicAnd/45a819.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/atomicAnd/45a819.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/atomicAnd/45a819.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/atomicAnd/85a8d9.wgsl b/test/tint/builtins/gen/literal/atomicAnd/85a8d9.wgsl
similarity index 96%
rename from test/tint/builtins/gen/atomicAnd/85a8d9.wgsl
rename to test/tint/builtins/gen/literal/atomicAnd/85a8d9.wgsl
index b4027bd9bc..2948f9aa78 100644
--- a/test/tint/builtins/gen/atomicAnd/85a8d9.wgsl
+++ b/test/tint/builtins/gen/literal/atomicAnd/85a8d9.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/atomicAnd/85a8d9.wgsl.expected.glsl b/test/tint/builtins/gen/literal/atomicAnd/85a8d9.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/atomicAnd/85a8d9.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/atomicAnd/85a8d9.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/atomicAnd/85a8d9.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/atomicAnd/85a8d9.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/atomicAnd/85a8d9.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/atomicAnd/85a8d9.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/atomicAnd/85a8d9.wgsl.expected.msl b/test/tint/builtins/gen/literal/atomicAnd/85a8d9.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/atomicAnd/85a8d9.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/atomicAnd/85a8d9.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/atomicAnd/85a8d9.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/atomicAnd/85a8d9.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/atomicAnd/85a8d9.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/atomicAnd/85a8d9.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/atomicAnd/85a8d9.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/atomicAnd/85a8d9.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/atomicAnd/85a8d9.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/atomicAnd/85a8d9.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/atomicCompareExchangeWeak/1bd40a.wgsl b/test/tint/builtins/gen/literal/atomicCompareExchangeWeak/1bd40a.wgsl
similarity index 97%
rename from test/tint/builtins/gen/atomicCompareExchangeWeak/1bd40a.wgsl
rename to test/tint/builtins/gen/literal/atomicCompareExchangeWeak/1bd40a.wgsl
index f3c62f75cb..7732bd9983 100644
--- a/test/tint/builtins/gen/atomicCompareExchangeWeak/1bd40a.wgsl
+++ b/test/tint/builtins/gen/literal/atomicCompareExchangeWeak/1bd40a.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/atomicCompareExchangeWeak/1bd40a.wgsl.expected.glsl b/test/tint/builtins/gen/literal/atomicCompareExchangeWeak/1bd40a.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/atomicCompareExchangeWeak/1bd40a.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/atomicCompareExchangeWeak/1bd40a.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/atomicCompareExchangeWeak/1bd40a.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/atomicCompareExchangeWeak/1bd40a.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/atomicCompareExchangeWeak/1bd40a.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/atomicCompareExchangeWeak/1bd40a.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/atomicCompareExchangeWeak/1bd40a.wgsl.expected.msl b/test/tint/builtins/gen/literal/atomicCompareExchangeWeak/1bd40a.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/atomicCompareExchangeWeak/1bd40a.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/atomicCompareExchangeWeak/1bd40a.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/atomicCompareExchangeWeak/1bd40a.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/atomicCompareExchangeWeak/1bd40a.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/atomicCompareExchangeWeak/1bd40a.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/atomicCompareExchangeWeak/1bd40a.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/atomicCompareExchangeWeak/1bd40a.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/atomicCompareExchangeWeak/1bd40a.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/atomicCompareExchangeWeak/1bd40a.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/atomicCompareExchangeWeak/1bd40a.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/atomicCompareExchangeWeak/63d8e6.wgsl b/test/tint/builtins/gen/literal/atomicCompareExchangeWeak/63d8e6.wgsl
similarity index 97%
rename from test/tint/builtins/gen/atomicCompareExchangeWeak/63d8e6.wgsl
rename to test/tint/builtins/gen/literal/atomicCompareExchangeWeak/63d8e6.wgsl
index 2fde0d8537..61972dcd71 100644
--- a/test/tint/builtins/gen/atomicCompareExchangeWeak/63d8e6.wgsl
+++ b/test/tint/builtins/gen/literal/atomicCompareExchangeWeak/63d8e6.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/atomicCompareExchangeWeak/63d8e6.wgsl.expected.glsl b/test/tint/builtins/gen/literal/atomicCompareExchangeWeak/63d8e6.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/atomicCompareExchangeWeak/63d8e6.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/atomicCompareExchangeWeak/63d8e6.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/atomicCompareExchangeWeak/63d8e6.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/atomicCompareExchangeWeak/63d8e6.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/atomicCompareExchangeWeak/63d8e6.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/atomicCompareExchangeWeak/63d8e6.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/atomicCompareExchangeWeak/63d8e6.wgsl.expected.msl b/test/tint/builtins/gen/literal/atomicCompareExchangeWeak/63d8e6.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/atomicCompareExchangeWeak/63d8e6.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/atomicCompareExchangeWeak/63d8e6.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/atomicCompareExchangeWeak/63d8e6.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/atomicCompareExchangeWeak/63d8e6.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/atomicCompareExchangeWeak/63d8e6.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/atomicCompareExchangeWeak/63d8e6.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/atomicCompareExchangeWeak/63d8e6.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/atomicCompareExchangeWeak/63d8e6.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/atomicCompareExchangeWeak/63d8e6.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/atomicCompareExchangeWeak/63d8e6.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/atomicCompareExchangeWeak/83580d.wgsl b/test/tint/builtins/gen/literal/atomicCompareExchangeWeak/83580d.wgsl
similarity index 96%
rename from test/tint/builtins/gen/atomicCompareExchangeWeak/83580d.wgsl
rename to test/tint/builtins/gen/literal/atomicCompareExchangeWeak/83580d.wgsl
index 599f9be635..9545b423e8 100644
--- a/test/tint/builtins/gen/atomicCompareExchangeWeak/83580d.wgsl
+++ b/test/tint/builtins/gen/literal/atomicCompareExchangeWeak/83580d.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/atomicCompareExchangeWeak/83580d.wgsl.expected.glsl b/test/tint/builtins/gen/literal/atomicCompareExchangeWeak/83580d.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/atomicCompareExchangeWeak/83580d.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/atomicCompareExchangeWeak/83580d.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/atomicCompareExchangeWeak/83580d.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/atomicCompareExchangeWeak/83580d.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/atomicCompareExchangeWeak/83580d.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/atomicCompareExchangeWeak/83580d.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/atomicCompareExchangeWeak/83580d.wgsl.expected.msl b/test/tint/builtins/gen/literal/atomicCompareExchangeWeak/83580d.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/atomicCompareExchangeWeak/83580d.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/atomicCompareExchangeWeak/83580d.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/atomicCompareExchangeWeak/83580d.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/atomicCompareExchangeWeak/83580d.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/atomicCompareExchangeWeak/83580d.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/atomicCompareExchangeWeak/83580d.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/atomicCompareExchangeWeak/83580d.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/atomicCompareExchangeWeak/83580d.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/atomicCompareExchangeWeak/83580d.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/atomicCompareExchangeWeak/83580d.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/atomicCompareExchangeWeak/e88938.wgsl b/test/tint/builtins/gen/literal/atomicCompareExchangeWeak/e88938.wgsl
similarity index 96%
rename from test/tint/builtins/gen/atomicCompareExchangeWeak/e88938.wgsl
rename to test/tint/builtins/gen/literal/atomicCompareExchangeWeak/e88938.wgsl
index 2147f98f2f..03076c54cd 100644
--- a/test/tint/builtins/gen/atomicCompareExchangeWeak/e88938.wgsl
+++ b/test/tint/builtins/gen/literal/atomicCompareExchangeWeak/e88938.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/atomicCompareExchangeWeak/e88938.wgsl.expected.glsl b/test/tint/builtins/gen/literal/atomicCompareExchangeWeak/e88938.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/atomicCompareExchangeWeak/e88938.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/atomicCompareExchangeWeak/e88938.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/atomicCompareExchangeWeak/e88938.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/atomicCompareExchangeWeak/e88938.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/atomicCompareExchangeWeak/e88938.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/atomicCompareExchangeWeak/e88938.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/atomicCompareExchangeWeak/e88938.wgsl.expected.msl b/test/tint/builtins/gen/literal/atomicCompareExchangeWeak/e88938.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/atomicCompareExchangeWeak/e88938.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/atomicCompareExchangeWeak/e88938.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/atomicCompareExchangeWeak/e88938.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/atomicCompareExchangeWeak/e88938.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/atomicCompareExchangeWeak/e88938.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/atomicCompareExchangeWeak/e88938.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/atomicCompareExchangeWeak/e88938.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/atomicCompareExchangeWeak/e88938.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/atomicCompareExchangeWeak/e88938.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/atomicCompareExchangeWeak/e88938.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/atomicExchange/0a5dca.wgsl b/test/tint/builtins/gen/literal/atomicExchange/0a5dca.wgsl
similarity index 96%
rename from test/tint/builtins/gen/atomicExchange/0a5dca.wgsl
rename to test/tint/builtins/gen/literal/atomicExchange/0a5dca.wgsl
index 092c5ac3b2..eea1d0fdc6 100644
--- a/test/tint/builtins/gen/atomicExchange/0a5dca.wgsl
+++ b/test/tint/builtins/gen/literal/atomicExchange/0a5dca.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/atomicExchange/0a5dca.wgsl.expected.glsl b/test/tint/builtins/gen/literal/atomicExchange/0a5dca.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/atomicExchange/0a5dca.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/atomicExchange/0a5dca.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/atomicExchange/0a5dca.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/atomicExchange/0a5dca.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/atomicExchange/0a5dca.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/atomicExchange/0a5dca.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/atomicExchange/0a5dca.wgsl.expected.msl b/test/tint/builtins/gen/literal/atomicExchange/0a5dca.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/atomicExchange/0a5dca.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/atomicExchange/0a5dca.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/atomicExchange/0a5dca.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/atomicExchange/0a5dca.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/atomicExchange/0a5dca.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/atomicExchange/0a5dca.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/atomicExchange/0a5dca.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/atomicExchange/0a5dca.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/atomicExchange/0a5dca.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/atomicExchange/0a5dca.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/atomicExchange/d59712.wgsl b/test/tint/builtins/gen/literal/atomicExchange/d59712.wgsl
similarity index 96%
rename from test/tint/builtins/gen/atomicExchange/d59712.wgsl
rename to test/tint/builtins/gen/literal/atomicExchange/d59712.wgsl
index 2aa8b8b58f..e47ed14e50 100644
--- a/test/tint/builtins/gen/atomicExchange/d59712.wgsl
+++ b/test/tint/builtins/gen/literal/atomicExchange/d59712.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/atomicExchange/d59712.wgsl.expected.glsl b/test/tint/builtins/gen/literal/atomicExchange/d59712.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/atomicExchange/d59712.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/atomicExchange/d59712.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/atomicExchange/d59712.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/atomicExchange/d59712.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/atomicExchange/d59712.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/atomicExchange/d59712.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/atomicExchange/d59712.wgsl.expected.msl b/test/tint/builtins/gen/literal/atomicExchange/d59712.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/atomicExchange/d59712.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/atomicExchange/d59712.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/atomicExchange/d59712.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/atomicExchange/d59712.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/atomicExchange/d59712.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/atomicExchange/d59712.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/atomicExchange/d59712.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/atomicExchange/d59712.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/atomicExchange/d59712.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/atomicExchange/d59712.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/atomicExchange/e114ba.wgsl b/test/tint/builtins/gen/literal/atomicExchange/e114ba.wgsl
similarity index 96%
rename from test/tint/builtins/gen/atomicExchange/e114ba.wgsl
rename to test/tint/builtins/gen/literal/atomicExchange/e114ba.wgsl
index 3fc0b8f7a8..541c188e8a 100644
--- a/test/tint/builtins/gen/atomicExchange/e114ba.wgsl
+++ b/test/tint/builtins/gen/literal/atomicExchange/e114ba.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/atomicExchange/e114ba.wgsl.expected.glsl b/test/tint/builtins/gen/literal/atomicExchange/e114ba.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/atomicExchange/e114ba.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/atomicExchange/e114ba.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/atomicExchange/e114ba.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/atomicExchange/e114ba.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/atomicExchange/e114ba.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/atomicExchange/e114ba.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/atomicExchange/e114ba.wgsl.expected.msl b/test/tint/builtins/gen/literal/atomicExchange/e114ba.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/atomicExchange/e114ba.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/atomicExchange/e114ba.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/atomicExchange/e114ba.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/atomicExchange/e114ba.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/atomicExchange/e114ba.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/atomicExchange/e114ba.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/atomicExchange/e114ba.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/atomicExchange/e114ba.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/atomicExchange/e114ba.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/atomicExchange/e114ba.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/atomicExchange/f2e22f.wgsl b/test/tint/builtins/gen/literal/atomicExchange/f2e22f.wgsl
similarity index 96%
rename from test/tint/builtins/gen/atomicExchange/f2e22f.wgsl
rename to test/tint/builtins/gen/literal/atomicExchange/f2e22f.wgsl
index 566f56382b..5832659304 100644
--- a/test/tint/builtins/gen/atomicExchange/f2e22f.wgsl
+++ b/test/tint/builtins/gen/literal/atomicExchange/f2e22f.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/atomicExchange/f2e22f.wgsl.expected.glsl b/test/tint/builtins/gen/literal/atomicExchange/f2e22f.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/atomicExchange/f2e22f.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/atomicExchange/f2e22f.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/atomicExchange/f2e22f.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/atomicExchange/f2e22f.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/atomicExchange/f2e22f.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/atomicExchange/f2e22f.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/atomicExchange/f2e22f.wgsl.expected.msl b/test/tint/builtins/gen/literal/atomicExchange/f2e22f.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/atomicExchange/f2e22f.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/atomicExchange/f2e22f.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/atomicExchange/f2e22f.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/atomicExchange/f2e22f.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/atomicExchange/f2e22f.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/atomicExchange/f2e22f.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/atomicExchange/f2e22f.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/atomicExchange/f2e22f.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/atomicExchange/f2e22f.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/atomicExchange/f2e22f.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/atomicLoad/0806ad.wgsl b/test/tint/builtins/gen/literal/atomicLoad/0806ad.wgsl
similarity index 96%
rename from test/tint/builtins/gen/atomicLoad/0806ad.wgsl
rename to test/tint/builtins/gen/literal/atomicLoad/0806ad.wgsl
index 9fc9f60996..e20d830b0e 100644
--- a/test/tint/builtins/gen/atomicLoad/0806ad.wgsl
+++ b/test/tint/builtins/gen/literal/atomicLoad/0806ad.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/atomicLoad/0806ad.wgsl.expected.glsl b/test/tint/builtins/gen/literal/atomicLoad/0806ad.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/atomicLoad/0806ad.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/atomicLoad/0806ad.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/atomicLoad/0806ad.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/atomicLoad/0806ad.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/atomicLoad/0806ad.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/atomicLoad/0806ad.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/atomicLoad/0806ad.wgsl.expected.msl b/test/tint/builtins/gen/literal/atomicLoad/0806ad.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/atomicLoad/0806ad.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/atomicLoad/0806ad.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/atomicLoad/0806ad.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/atomicLoad/0806ad.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/atomicLoad/0806ad.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/atomicLoad/0806ad.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/atomicLoad/0806ad.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/atomicLoad/0806ad.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/atomicLoad/0806ad.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/atomicLoad/0806ad.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/atomicLoad/361bf1.wgsl b/test/tint/builtins/gen/literal/atomicLoad/361bf1.wgsl
similarity index 96%
rename from test/tint/builtins/gen/atomicLoad/361bf1.wgsl
rename to test/tint/builtins/gen/literal/atomicLoad/361bf1.wgsl
index 99e9c04932..e0cc43fdb4 100644
--- a/test/tint/builtins/gen/atomicLoad/361bf1.wgsl
+++ b/test/tint/builtins/gen/literal/atomicLoad/361bf1.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/atomicLoad/361bf1.wgsl.expected.glsl b/test/tint/builtins/gen/literal/atomicLoad/361bf1.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/atomicLoad/361bf1.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/atomicLoad/361bf1.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/atomicLoad/361bf1.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/atomicLoad/361bf1.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/atomicLoad/361bf1.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/atomicLoad/361bf1.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/atomicLoad/361bf1.wgsl.expected.msl b/test/tint/builtins/gen/literal/atomicLoad/361bf1.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/atomicLoad/361bf1.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/atomicLoad/361bf1.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/atomicLoad/361bf1.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/atomicLoad/361bf1.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/atomicLoad/361bf1.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/atomicLoad/361bf1.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/atomicLoad/361bf1.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/atomicLoad/361bf1.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/atomicLoad/361bf1.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/atomicLoad/361bf1.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/atomicLoad/afcc03.wgsl b/test/tint/builtins/gen/literal/atomicLoad/afcc03.wgsl
similarity index 96%
rename from test/tint/builtins/gen/atomicLoad/afcc03.wgsl
rename to test/tint/builtins/gen/literal/atomicLoad/afcc03.wgsl
index 935ab5fe45..025384fc78 100644
--- a/test/tint/builtins/gen/atomicLoad/afcc03.wgsl
+++ b/test/tint/builtins/gen/literal/atomicLoad/afcc03.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/atomicLoad/afcc03.wgsl.expected.glsl b/test/tint/builtins/gen/literal/atomicLoad/afcc03.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/atomicLoad/afcc03.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/atomicLoad/afcc03.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/atomicLoad/afcc03.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/atomicLoad/afcc03.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/atomicLoad/afcc03.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/atomicLoad/afcc03.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/atomicLoad/afcc03.wgsl.expected.msl b/test/tint/builtins/gen/literal/atomicLoad/afcc03.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/atomicLoad/afcc03.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/atomicLoad/afcc03.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/atomicLoad/afcc03.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/atomicLoad/afcc03.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/atomicLoad/afcc03.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/atomicLoad/afcc03.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/atomicLoad/afcc03.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/atomicLoad/afcc03.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/atomicLoad/afcc03.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/atomicLoad/afcc03.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/atomicLoad/fe6cc3.wgsl b/test/tint/builtins/gen/literal/atomicLoad/fe6cc3.wgsl
similarity index 96%
rename from test/tint/builtins/gen/atomicLoad/fe6cc3.wgsl
rename to test/tint/builtins/gen/literal/atomicLoad/fe6cc3.wgsl
index e1e256a20d..63b1594678 100644
--- a/test/tint/builtins/gen/atomicLoad/fe6cc3.wgsl
+++ b/test/tint/builtins/gen/literal/atomicLoad/fe6cc3.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/atomicLoad/fe6cc3.wgsl.expected.glsl b/test/tint/builtins/gen/literal/atomicLoad/fe6cc3.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/atomicLoad/fe6cc3.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/atomicLoad/fe6cc3.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/atomicLoad/fe6cc3.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/atomicLoad/fe6cc3.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/atomicLoad/fe6cc3.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/atomicLoad/fe6cc3.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/atomicLoad/fe6cc3.wgsl.expected.msl b/test/tint/builtins/gen/literal/atomicLoad/fe6cc3.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/atomicLoad/fe6cc3.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/atomicLoad/fe6cc3.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/atomicLoad/fe6cc3.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/atomicLoad/fe6cc3.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/atomicLoad/fe6cc3.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/atomicLoad/fe6cc3.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/atomicLoad/fe6cc3.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/atomicLoad/fe6cc3.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/atomicLoad/fe6cc3.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/atomicLoad/fe6cc3.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/atomicMax/51b9be.wgsl b/test/tint/builtins/gen/literal/atomicMax/51b9be.wgsl
similarity index 96%
rename from test/tint/builtins/gen/atomicMax/51b9be.wgsl
rename to test/tint/builtins/gen/literal/atomicMax/51b9be.wgsl
index 43a6f6cd99..f83327c7d2 100644
--- a/test/tint/builtins/gen/atomicMax/51b9be.wgsl
+++ b/test/tint/builtins/gen/literal/atomicMax/51b9be.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/atomicMax/51b9be.wgsl.expected.glsl b/test/tint/builtins/gen/literal/atomicMax/51b9be.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/atomicMax/51b9be.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/atomicMax/51b9be.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/atomicMax/51b9be.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/atomicMax/51b9be.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/atomicMax/51b9be.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/atomicMax/51b9be.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/atomicMax/51b9be.wgsl.expected.msl b/test/tint/builtins/gen/literal/atomicMax/51b9be.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/atomicMax/51b9be.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/atomicMax/51b9be.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/atomicMax/51b9be.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/atomicMax/51b9be.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/atomicMax/51b9be.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/atomicMax/51b9be.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/atomicMax/51b9be.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/atomicMax/51b9be.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/atomicMax/51b9be.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/atomicMax/51b9be.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/atomicMax/92aa72.wgsl b/test/tint/builtins/gen/literal/atomicMax/92aa72.wgsl
similarity index 96%
rename from test/tint/builtins/gen/atomicMax/92aa72.wgsl
rename to test/tint/builtins/gen/literal/atomicMax/92aa72.wgsl
index 7336d647fc..29f0e77f2d 100644
--- a/test/tint/builtins/gen/atomicMax/92aa72.wgsl
+++ b/test/tint/builtins/gen/literal/atomicMax/92aa72.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/atomicMax/92aa72.wgsl.expected.glsl b/test/tint/builtins/gen/literal/atomicMax/92aa72.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/atomicMax/92aa72.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/atomicMax/92aa72.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/atomicMax/92aa72.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/atomicMax/92aa72.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/atomicMax/92aa72.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/atomicMax/92aa72.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/atomicMax/92aa72.wgsl.expected.msl b/test/tint/builtins/gen/literal/atomicMax/92aa72.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/atomicMax/92aa72.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/atomicMax/92aa72.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/atomicMax/92aa72.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/atomicMax/92aa72.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/atomicMax/92aa72.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/atomicMax/92aa72.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/atomicMax/92aa72.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/atomicMax/92aa72.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/atomicMax/92aa72.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/atomicMax/92aa72.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/atomicMax/a89cc3.wgsl b/test/tint/builtins/gen/literal/atomicMax/a89cc3.wgsl
similarity index 96%
rename from test/tint/builtins/gen/atomicMax/a89cc3.wgsl
rename to test/tint/builtins/gen/literal/atomicMax/a89cc3.wgsl
index beea1a7e35..c008f256be 100644
--- a/test/tint/builtins/gen/atomicMax/a89cc3.wgsl
+++ b/test/tint/builtins/gen/literal/atomicMax/a89cc3.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/atomicMax/a89cc3.wgsl.expected.glsl b/test/tint/builtins/gen/literal/atomicMax/a89cc3.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/atomicMax/a89cc3.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/atomicMax/a89cc3.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/atomicMax/a89cc3.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/atomicMax/a89cc3.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/atomicMax/a89cc3.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/atomicMax/a89cc3.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/atomicMax/a89cc3.wgsl.expected.msl b/test/tint/builtins/gen/literal/atomicMax/a89cc3.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/atomicMax/a89cc3.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/atomicMax/a89cc3.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/atomicMax/a89cc3.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/atomicMax/a89cc3.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/atomicMax/a89cc3.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/atomicMax/a89cc3.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/atomicMax/a89cc3.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/atomicMax/a89cc3.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/atomicMax/a89cc3.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/atomicMax/a89cc3.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/atomicMax/beccfc.wgsl b/test/tint/builtins/gen/literal/atomicMax/beccfc.wgsl
similarity index 96%
rename from test/tint/builtins/gen/atomicMax/beccfc.wgsl
rename to test/tint/builtins/gen/literal/atomicMax/beccfc.wgsl
index 452b30788c..eee2d88442 100644
--- a/test/tint/builtins/gen/atomicMax/beccfc.wgsl
+++ b/test/tint/builtins/gen/literal/atomicMax/beccfc.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/atomicMax/beccfc.wgsl.expected.glsl b/test/tint/builtins/gen/literal/atomicMax/beccfc.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/atomicMax/beccfc.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/atomicMax/beccfc.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/atomicMax/beccfc.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/atomicMax/beccfc.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/atomicMax/beccfc.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/atomicMax/beccfc.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/atomicMax/beccfc.wgsl.expected.msl b/test/tint/builtins/gen/literal/atomicMax/beccfc.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/atomicMax/beccfc.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/atomicMax/beccfc.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/atomicMax/beccfc.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/atomicMax/beccfc.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/atomicMax/beccfc.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/atomicMax/beccfc.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/atomicMax/beccfc.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/atomicMax/beccfc.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/atomicMax/beccfc.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/atomicMax/beccfc.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/atomicMin/278235.wgsl b/test/tint/builtins/gen/literal/atomicMin/278235.wgsl
similarity index 96%
rename from test/tint/builtins/gen/atomicMin/278235.wgsl
rename to test/tint/builtins/gen/literal/atomicMin/278235.wgsl
index ff8a7cf72c..e21994e08b 100644
--- a/test/tint/builtins/gen/atomicMin/278235.wgsl
+++ b/test/tint/builtins/gen/literal/atomicMin/278235.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/atomicMin/278235.wgsl.expected.glsl b/test/tint/builtins/gen/literal/atomicMin/278235.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/atomicMin/278235.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/atomicMin/278235.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/atomicMin/278235.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/atomicMin/278235.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/atomicMin/278235.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/atomicMin/278235.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/atomicMin/278235.wgsl.expected.msl b/test/tint/builtins/gen/literal/atomicMin/278235.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/atomicMin/278235.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/atomicMin/278235.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/atomicMin/278235.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/atomicMin/278235.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/atomicMin/278235.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/atomicMin/278235.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/atomicMin/278235.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/atomicMin/278235.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/atomicMin/278235.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/atomicMin/278235.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/atomicMin/69d383.wgsl b/test/tint/builtins/gen/literal/atomicMin/69d383.wgsl
similarity index 96%
rename from test/tint/builtins/gen/atomicMin/69d383.wgsl
rename to test/tint/builtins/gen/literal/atomicMin/69d383.wgsl
index f4f70b13b3..1eacad5d6d 100644
--- a/test/tint/builtins/gen/atomicMin/69d383.wgsl
+++ b/test/tint/builtins/gen/literal/atomicMin/69d383.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/atomicMin/69d383.wgsl.expected.glsl b/test/tint/builtins/gen/literal/atomicMin/69d383.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/atomicMin/69d383.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/atomicMin/69d383.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/atomicMin/69d383.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/atomicMin/69d383.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/atomicMin/69d383.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/atomicMin/69d383.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/atomicMin/69d383.wgsl.expected.msl b/test/tint/builtins/gen/literal/atomicMin/69d383.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/atomicMin/69d383.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/atomicMin/69d383.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/atomicMin/69d383.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/atomicMin/69d383.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/atomicMin/69d383.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/atomicMin/69d383.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/atomicMin/69d383.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/atomicMin/69d383.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/atomicMin/69d383.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/atomicMin/69d383.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/atomicMin/8e38dc.wgsl b/test/tint/builtins/gen/literal/atomicMin/8e38dc.wgsl
similarity index 96%
rename from test/tint/builtins/gen/atomicMin/8e38dc.wgsl
rename to test/tint/builtins/gen/literal/atomicMin/8e38dc.wgsl
index 484f709f43..66134fea4e 100644
--- a/test/tint/builtins/gen/atomicMin/8e38dc.wgsl
+++ b/test/tint/builtins/gen/literal/atomicMin/8e38dc.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/atomicMin/8e38dc.wgsl.expected.glsl b/test/tint/builtins/gen/literal/atomicMin/8e38dc.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/atomicMin/8e38dc.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/atomicMin/8e38dc.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/atomicMin/8e38dc.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/atomicMin/8e38dc.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/atomicMin/8e38dc.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/atomicMin/8e38dc.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/atomicMin/8e38dc.wgsl.expected.msl b/test/tint/builtins/gen/literal/atomicMin/8e38dc.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/atomicMin/8e38dc.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/atomicMin/8e38dc.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/atomicMin/8e38dc.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/atomicMin/8e38dc.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/atomicMin/8e38dc.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/atomicMin/8e38dc.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/atomicMin/8e38dc.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/atomicMin/8e38dc.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/atomicMin/8e38dc.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/atomicMin/8e38dc.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/atomicMin/c67a74.wgsl b/test/tint/builtins/gen/literal/atomicMin/c67a74.wgsl
similarity index 96%
rename from test/tint/builtins/gen/atomicMin/c67a74.wgsl
rename to test/tint/builtins/gen/literal/atomicMin/c67a74.wgsl
index cf8986bdf7..150bb3f9a9 100644
--- a/test/tint/builtins/gen/atomicMin/c67a74.wgsl
+++ b/test/tint/builtins/gen/literal/atomicMin/c67a74.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/atomicMin/c67a74.wgsl.expected.glsl b/test/tint/builtins/gen/literal/atomicMin/c67a74.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/atomicMin/c67a74.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/atomicMin/c67a74.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/atomicMin/c67a74.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/atomicMin/c67a74.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/atomicMin/c67a74.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/atomicMin/c67a74.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/atomicMin/c67a74.wgsl.expected.msl b/test/tint/builtins/gen/literal/atomicMin/c67a74.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/atomicMin/c67a74.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/atomicMin/c67a74.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/atomicMin/c67a74.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/atomicMin/c67a74.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/atomicMin/c67a74.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/atomicMin/c67a74.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/atomicMin/c67a74.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/atomicMin/c67a74.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/atomicMin/c67a74.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/atomicMin/c67a74.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/atomicOr/5e3d61.wgsl b/test/tint/builtins/gen/literal/atomicOr/5e3d61.wgsl
similarity index 96%
rename from test/tint/builtins/gen/atomicOr/5e3d61.wgsl
rename to test/tint/builtins/gen/literal/atomicOr/5e3d61.wgsl
index 9520869ea0..17f9ba1777 100644
--- a/test/tint/builtins/gen/atomicOr/5e3d61.wgsl
+++ b/test/tint/builtins/gen/literal/atomicOr/5e3d61.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/atomicOr/5e3d61.wgsl.expected.glsl b/test/tint/builtins/gen/literal/atomicOr/5e3d61.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/atomicOr/5e3d61.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/atomicOr/5e3d61.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/atomicOr/5e3d61.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/atomicOr/5e3d61.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/atomicOr/5e3d61.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/atomicOr/5e3d61.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/atomicOr/5e3d61.wgsl.expected.msl b/test/tint/builtins/gen/literal/atomicOr/5e3d61.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/atomicOr/5e3d61.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/atomicOr/5e3d61.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/atomicOr/5e3d61.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/atomicOr/5e3d61.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/atomicOr/5e3d61.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/atomicOr/5e3d61.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/atomicOr/5e3d61.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/atomicOr/5e3d61.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/atomicOr/5e3d61.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/atomicOr/5e3d61.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/atomicOr/5e95d4.wgsl b/test/tint/builtins/gen/literal/atomicOr/5e95d4.wgsl
similarity index 96%
rename from test/tint/builtins/gen/atomicOr/5e95d4.wgsl
rename to test/tint/builtins/gen/literal/atomicOr/5e95d4.wgsl
index d35f50242f..64fd15531f 100644
--- a/test/tint/builtins/gen/atomicOr/5e95d4.wgsl
+++ b/test/tint/builtins/gen/literal/atomicOr/5e95d4.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/atomicOr/5e95d4.wgsl.expected.glsl b/test/tint/builtins/gen/literal/atomicOr/5e95d4.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/atomicOr/5e95d4.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/atomicOr/5e95d4.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/atomicOr/5e95d4.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/atomicOr/5e95d4.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/atomicOr/5e95d4.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/atomicOr/5e95d4.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/atomicOr/5e95d4.wgsl.expected.msl b/test/tint/builtins/gen/literal/atomicOr/5e95d4.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/atomicOr/5e95d4.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/atomicOr/5e95d4.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/atomicOr/5e95d4.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/atomicOr/5e95d4.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/atomicOr/5e95d4.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/atomicOr/5e95d4.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/atomicOr/5e95d4.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/atomicOr/5e95d4.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/atomicOr/5e95d4.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/atomicOr/5e95d4.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/atomicOr/8d96a0.wgsl b/test/tint/builtins/gen/literal/atomicOr/8d96a0.wgsl
similarity index 96%
rename from test/tint/builtins/gen/atomicOr/8d96a0.wgsl
rename to test/tint/builtins/gen/literal/atomicOr/8d96a0.wgsl
index 901470f1b8..506fe202bc 100644
--- a/test/tint/builtins/gen/atomicOr/8d96a0.wgsl
+++ b/test/tint/builtins/gen/literal/atomicOr/8d96a0.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/atomicOr/8d96a0.wgsl.expected.glsl b/test/tint/builtins/gen/literal/atomicOr/8d96a0.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/atomicOr/8d96a0.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/atomicOr/8d96a0.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/atomicOr/8d96a0.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/atomicOr/8d96a0.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/atomicOr/8d96a0.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/atomicOr/8d96a0.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/atomicOr/8d96a0.wgsl.expected.msl b/test/tint/builtins/gen/literal/atomicOr/8d96a0.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/atomicOr/8d96a0.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/atomicOr/8d96a0.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/atomicOr/8d96a0.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/atomicOr/8d96a0.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/atomicOr/8d96a0.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/atomicOr/8d96a0.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/atomicOr/8d96a0.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/atomicOr/8d96a0.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/atomicOr/8d96a0.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/atomicOr/8d96a0.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/atomicOr/d09248.wgsl b/test/tint/builtins/gen/literal/atomicOr/d09248.wgsl
similarity index 96%
rename from test/tint/builtins/gen/atomicOr/d09248.wgsl
rename to test/tint/builtins/gen/literal/atomicOr/d09248.wgsl
index da2bd7981e..29d80f8c05 100644
--- a/test/tint/builtins/gen/atomicOr/d09248.wgsl
+++ b/test/tint/builtins/gen/literal/atomicOr/d09248.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/atomicOr/d09248.wgsl.expected.glsl b/test/tint/builtins/gen/literal/atomicOr/d09248.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/atomicOr/d09248.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/atomicOr/d09248.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/atomicOr/d09248.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/atomicOr/d09248.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/atomicOr/d09248.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/atomicOr/d09248.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/atomicOr/d09248.wgsl.expected.msl b/test/tint/builtins/gen/literal/atomicOr/d09248.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/atomicOr/d09248.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/atomicOr/d09248.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/atomicOr/d09248.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/atomicOr/d09248.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/atomicOr/d09248.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/atomicOr/d09248.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/atomicOr/d09248.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/atomicOr/d09248.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/atomicOr/d09248.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/atomicOr/d09248.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/atomicStore/726882.wgsl b/test/tint/builtins/gen/literal/atomicStore/726882.wgsl
similarity index 96%
rename from test/tint/builtins/gen/atomicStore/726882.wgsl
rename to test/tint/builtins/gen/literal/atomicStore/726882.wgsl
index 4ee9d6f2f8..c9ebbffd13 100644
--- a/test/tint/builtins/gen/atomicStore/726882.wgsl
+++ b/test/tint/builtins/gen/literal/atomicStore/726882.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/atomicStore/726882.wgsl.expected.glsl b/test/tint/builtins/gen/literal/atomicStore/726882.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/atomicStore/726882.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/atomicStore/726882.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/atomicStore/726882.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/atomicStore/726882.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/atomicStore/726882.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/atomicStore/726882.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/atomicStore/726882.wgsl.expected.msl b/test/tint/builtins/gen/literal/atomicStore/726882.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/atomicStore/726882.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/atomicStore/726882.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/atomicStore/726882.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/atomicStore/726882.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/atomicStore/726882.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/atomicStore/726882.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/atomicStore/726882.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/atomicStore/726882.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/atomicStore/726882.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/atomicStore/726882.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/atomicStore/8bea94.wgsl b/test/tint/builtins/gen/literal/atomicStore/8bea94.wgsl
similarity index 96%
rename from test/tint/builtins/gen/atomicStore/8bea94.wgsl
rename to test/tint/builtins/gen/literal/atomicStore/8bea94.wgsl
index c22ea05545..079c62eb99 100644
--- a/test/tint/builtins/gen/atomicStore/8bea94.wgsl
+++ b/test/tint/builtins/gen/literal/atomicStore/8bea94.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/atomicStore/8bea94.wgsl.expected.glsl b/test/tint/builtins/gen/literal/atomicStore/8bea94.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/atomicStore/8bea94.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/atomicStore/8bea94.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/atomicStore/8bea94.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/atomicStore/8bea94.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/atomicStore/8bea94.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/atomicStore/8bea94.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/atomicStore/8bea94.wgsl.expected.msl b/test/tint/builtins/gen/literal/atomicStore/8bea94.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/atomicStore/8bea94.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/atomicStore/8bea94.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/atomicStore/8bea94.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/atomicStore/8bea94.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/atomicStore/8bea94.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/atomicStore/8bea94.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/atomicStore/8bea94.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/atomicStore/8bea94.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/atomicStore/8bea94.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/atomicStore/8bea94.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/atomicStore/cdc29e.wgsl b/test/tint/builtins/gen/literal/atomicStore/cdc29e.wgsl
similarity index 96%
rename from test/tint/builtins/gen/atomicStore/cdc29e.wgsl
rename to test/tint/builtins/gen/literal/atomicStore/cdc29e.wgsl
index ef3c49ca68..1b35f8078f 100644
--- a/test/tint/builtins/gen/atomicStore/cdc29e.wgsl
+++ b/test/tint/builtins/gen/literal/atomicStore/cdc29e.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/atomicStore/cdc29e.wgsl.expected.glsl b/test/tint/builtins/gen/literal/atomicStore/cdc29e.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/atomicStore/cdc29e.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/atomicStore/cdc29e.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/atomicStore/cdc29e.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/atomicStore/cdc29e.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/atomicStore/cdc29e.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/atomicStore/cdc29e.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/atomicStore/cdc29e.wgsl.expected.msl b/test/tint/builtins/gen/literal/atomicStore/cdc29e.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/atomicStore/cdc29e.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/atomicStore/cdc29e.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/atomicStore/cdc29e.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/atomicStore/cdc29e.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/atomicStore/cdc29e.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/atomicStore/cdc29e.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/atomicStore/cdc29e.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/atomicStore/cdc29e.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/atomicStore/cdc29e.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/atomicStore/cdc29e.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/atomicStore/d1e9a6.wgsl b/test/tint/builtins/gen/literal/atomicStore/d1e9a6.wgsl
similarity index 96%
rename from test/tint/builtins/gen/atomicStore/d1e9a6.wgsl
rename to test/tint/builtins/gen/literal/atomicStore/d1e9a6.wgsl
index ea7559df92..00cb359c29 100644
--- a/test/tint/builtins/gen/atomicStore/d1e9a6.wgsl
+++ b/test/tint/builtins/gen/literal/atomicStore/d1e9a6.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/atomicStore/d1e9a6.wgsl.expected.glsl b/test/tint/builtins/gen/literal/atomicStore/d1e9a6.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/atomicStore/d1e9a6.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/atomicStore/d1e9a6.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/atomicStore/d1e9a6.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/atomicStore/d1e9a6.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/atomicStore/d1e9a6.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/atomicStore/d1e9a6.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/atomicStore/d1e9a6.wgsl.expected.msl b/test/tint/builtins/gen/literal/atomicStore/d1e9a6.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/atomicStore/d1e9a6.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/atomicStore/d1e9a6.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/atomicStore/d1e9a6.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/atomicStore/d1e9a6.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/atomicStore/d1e9a6.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/atomicStore/d1e9a6.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/atomicStore/d1e9a6.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/atomicStore/d1e9a6.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/atomicStore/d1e9a6.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/atomicStore/d1e9a6.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/atomicSub/051100.wgsl b/test/tint/builtins/gen/literal/atomicSub/051100.wgsl
similarity index 96%
rename from test/tint/builtins/gen/atomicSub/051100.wgsl
rename to test/tint/builtins/gen/literal/atomicSub/051100.wgsl
index 6b84ec19b1..38f24bc56c 100644
--- a/test/tint/builtins/gen/atomicSub/051100.wgsl
+++ b/test/tint/builtins/gen/literal/atomicSub/051100.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/atomicSub/051100.wgsl.expected.glsl b/test/tint/builtins/gen/literal/atomicSub/051100.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/atomicSub/051100.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/atomicSub/051100.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/atomicSub/051100.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/atomicSub/051100.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/atomicSub/051100.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/atomicSub/051100.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/atomicSub/051100.wgsl.expected.msl b/test/tint/builtins/gen/literal/atomicSub/051100.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/atomicSub/051100.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/atomicSub/051100.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/atomicSub/051100.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/atomicSub/051100.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/atomicSub/051100.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/atomicSub/051100.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/atomicSub/051100.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/atomicSub/051100.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/atomicSub/051100.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/atomicSub/051100.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/atomicSub/0d26c2.wgsl b/test/tint/builtins/gen/literal/atomicSub/0d26c2.wgsl
similarity index 96%
rename from test/tint/builtins/gen/atomicSub/0d26c2.wgsl
rename to test/tint/builtins/gen/literal/atomicSub/0d26c2.wgsl
index 9617c0ae61..4104bbf4d7 100644
--- a/test/tint/builtins/gen/atomicSub/0d26c2.wgsl
+++ b/test/tint/builtins/gen/literal/atomicSub/0d26c2.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/atomicSub/0d26c2.wgsl.expected.glsl b/test/tint/builtins/gen/literal/atomicSub/0d26c2.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/atomicSub/0d26c2.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/atomicSub/0d26c2.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/atomicSub/0d26c2.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/atomicSub/0d26c2.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/atomicSub/0d26c2.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/atomicSub/0d26c2.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/atomicSub/0d26c2.wgsl.expected.msl b/test/tint/builtins/gen/literal/atomicSub/0d26c2.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/atomicSub/0d26c2.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/atomicSub/0d26c2.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/atomicSub/0d26c2.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/atomicSub/0d26c2.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/atomicSub/0d26c2.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/atomicSub/0d26c2.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/atomicSub/0d26c2.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/atomicSub/0d26c2.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/atomicSub/0d26c2.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/atomicSub/0d26c2.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/atomicSub/15bfc9.wgsl b/test/tint/builtins/gen/literal/atomicSub/15bfc9.wgsl
similarity index 96%
rename from test/tint/builtins/gen/atomicSub/15bfc9.wgsl
rename to test/tint/builtins/gen/literal/atomicSub/15bfc9.wgsl
index c7f190a830..fb46746aee 100644
--- a/test/tint/builtins/gen/atomicSub/15bfc9.wgsl
+++ b/test/tint/builtins/gen/literal/atomicSub/15bfc9.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/atomicSub/15bfc9.wgsl.expected.glsl b/test/tint/builtins/gen/literal/atomicSub/15bfc9.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/atomicSub/15bfc9.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/atomicSub/15bfc9.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/atomicSub/15bfc9.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/atomicSub/15bfc9.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/atomicSub/15bfc9.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/atomicSub/15bfc9.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/atomicSub/15bfc9.wgsl.expected.msl b/test/tint/builtins/gen/literal/atomicSub/15bfc9.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/atomicSub/15bfc9.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/atomicSub/15bfc9.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/atomicSub/15bfc9.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/atomicSub/15bfc9.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/atomicSub/15bfc9.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/atomicSub/15bfc9.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/atomicSub/15bfc9.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/atomicSub/15bfc9.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/atomicSub/15bfc9.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/atomicSub/15bfc9.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/atomicSub/77883a.wgsl b/test/tint/builtins/gen/literal/atomicSub/77883a.wgsl
similarity index 96%
rename from test/tint/builtins/gen/atomicSub/77883a.wgsl
rename to test/tint/builtins/gen/literal/atomicSub/77883a.wgsl
index fbd20fc094..257aead823 100644
--- a/test/tint/builtins/gen/atomicSub/77883a.wgsl
+++ b/test/tint/builtins/gen/literal/atomicSub/77883a.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/atomicSub/77883a.wgsl.expected.glsl b/test/tint/builtins/gen/literal/atomicSub/77883a.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/atomicSub/77883a.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/atomicSub/77883a.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/atomicSub/77883a.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/atomicSub/77883a.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/atomicSub/77883a.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/atomicSub/77883a.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/atomicSub/77883a.wgsl.expected.msl b/test/tint/builtins/gen/literal/atomicSub/77883a.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/atomicSub/77883a.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/atomicSub/77883a.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/atomicSub/77883a.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/atomicSub/77883a.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/atomicSub/77883a.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/atomicSub/77883a.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/atomicSub/77883a.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/atomicSub/77883a.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/atomicSub/77883a.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/atomicSub/77883a.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/atomicXor/54510e.wgsl b/test/tint/builtins/gen/literal/atomicXor/54510e.wgsl
similarity index 96%
rename from test/tint/builtins/gen/atomicXor/54510e.wgsl
rename to test/tint/builtins/gen/literal/atomicXor/54510e.wgsl
index 86e9648009..8de2df608f 100644
--- a/test/tint/builtins/gen/atomicXor/54510e.wgsl
+++ b/test/tint/builtins/gen/literal/atomicXor/54510e.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/atomicXor/54510e.wgsl.expected.glsl b/test/tint/builtins/gen/literal/atomicXor/54510e.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/atomicXor/54510e.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/atomicXor/54510e.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/atomicXor/54510e.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/atomicXor/54510e.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/atomicXor/54510e.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/atomicXor/54510e.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/atomicXor/54510e.wgsl.expected.msl b/test/tint/builtins/gen/literal/atomicXor/54510e.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/atomicXor/54510e.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/atomicXor/54510e.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/atomicXor/54510e.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/atomicXor/54510e.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/atomicXor/54510e.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/atomicXor/54510e.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/atomicXor/54510e.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/atomicXor/54510e.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/atomicXor/54510e.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/atomicXor/54510e.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/atomicXor/75dc95.wgsl b/test/tint/builtins/gen/literal/atomicXor/75dc95.wgsl
similarity index 96%
rename from test/tint/builtins/gen/atomicXor/75dc95.wgsl
rename to test/tint/builtins/gen/literal/atomicXor/75dc95.wgsl
index 3676e85bf5..8bc0705322 100644
--- a/test/tint/builtins/gen/atomicXor/75dc95.wgsl
+++ b/test/tint/builtins/gen/literal/atomicXor/75dc95.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/atomicXor/75dc95.wgsl.expected.glsl b/test/tint/builtins/gen/literal/atomicXor/75dc95.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/atomicXor/75dc95.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/atomicXor/75dc95.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/atomicXor/75dc95.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/atomicXor/75dc95.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/atomicXor/75dc95.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/atomicXor/75dc95.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/atomicXor/75dc95.wgsl.expected.msl b/test/tint/builtins/gen/literal/atomicXor/75dc95.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/atomicXor/75dc95.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/atomicXor/75dc95.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/atomicXor/75dc95.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/atomicXor/75dc95.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/atomicXor/75dc95.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/atomicXor/75dc95.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/atomicXor/75dc95.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/atomicXor/75dc95.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/atomicXor/75dc95.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/atomicXor/75dc95.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/atomicXor/c1b78c.wgsl b/test/tint/builtins/gen/literal/atomicXor/c1b78c.wgsl
similarity index 96%
rename from test/tint/builtins/gen/atomicXor/c1b78c.wgsl
rename to test/tint/builtins/gen/literal/atomicXor/c1b78c.wgsl
index 9842ed4daa..9fd915eb21 100644
--- a/test/tint/builtins/gen/atomicXor/c1b78c.wgsl
+++ b/test/tint/builtins/gen/literal/atomicXor/c1b78c.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/atomicXor/c1b78c.wgsl.expected.glsl b/test/tint/builtins/gen/literal/atomicXor/c1b78c.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/atomicXor/c1b78c.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/atomicXor/c1b78c.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/atomicXor/c1b78c.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/atomicXor/c1b78c.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/atomicXor/c1b78c.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/atomicXor/c1b78c.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/atomicXor/c1b78c.wgsl.expected.msl b/test/tint/builtins/gen/literal/atomicXor/c1b78c.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/atomicXor/c1b78c.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/atomicXor/c1b78c.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/atomicXor/c1b78c.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/atomicXor/c1b78c.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/atomicXor/c1b78c.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/atomicXor/c1b78c.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/atomicXor/c1b78c.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/atomicXor/c1b78c.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/atomicXor/c1b78c.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/atomicXor/c1b78c.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/atomicXor/c8e6be.wgsl b/test/tint/builtins/gen/literal/atomicXor/c8e6be.wgsl
similarity index 96%
rename from test/tint/builtins/gen/atomicXor/c8e6be.wgsl
rename to test/tint/builtins/gen/literal/atomicXor/c8e6be.wgsl
index 3307d26add..5a7f935574 100644
--- a/test/tint/builtins/gen/atomicXor/c8e6be.wgsl
+++ b/test/tint/builtins/gen/literal/atomicXor/c8e6be.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/atomicXor/c8e6be.wgsl.expected.glsl b/test/tint/builtins/gen/literal/atomicXor/c8e6be.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/atomicXor/c8e6be.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/atomicXor/c8e6be.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/atomicXor/c8e6be.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/atomicXor/c8e6be.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/atomicXor/c8e6be.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/atomicXor/c8e6be.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/atomicXor/c8e6be.wgsl.expected.msl b/test/tint/builtins/gen/literal/atomicXor/c8e6be.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/atomicXor/c8e6be.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/atomicXor/c8e6be.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/atomicXor/c8e6be.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/atomicXor/c8e6be.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/atomicXor/c8e6be.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/atomicXor/c8e6be.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/atomicXor/c8e6be.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/atomicXor/c8e6be.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/atomicXor/c8e6be.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/atomicXor/c8e6be.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/ceil/34064b.wgsl b/test/tint/builtins/gen/literal/ceil/34064b.wgsl
similarity index 96%
rename from test/tint/builtins/gen/ceil/34064b.wgsl
rename to test/tint/builtins/gen/literal/ceil/34064b.wgsl
index 1445063bb6..99b39a4724 100644
--- a/test/tint/builtins/gen/ceil/34064b.wgsl
+++ b/test/tint/builtins/gen/literal/ceil/34064b.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/ceil/34064b.wgsl.expected.glsl b/test/tint/builtins/gen/literal/ceil/34064b.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/ceil/34064b.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/ceil/34064b.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/ceil/34064b.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/ceil/34064b.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/ceil/34064b.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/ceil/34064b.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/ceil/34064b.wgsl.expected.msl b/test/tint/builtins/gen/literal/ceil/34064b.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/ceil/34064b.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/ceil/34064b.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/ceil/34064b.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/ceil/34064b.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/ceil/34064b.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/ceil/34064b.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/ceil/34064b.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/ceil/34064b.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/ceil/34064b.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/ceil/34064b.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/ceil/678655.wgsl b/test/tint/builtins/gen/literal/ceil/678655.wgsl
similarity index 96%
rename from test/tint/builtins/gen/ceil/678655.wgsl
rename to test/tint/builtins/gen/literal/ceil/678655.wgsl
index d749c91f69..7af78008b9 100644
--- a/test/tint/builtins/gen/ceil/678655.wgsl
+++ b/test/tint/builtins/gen/literal/ceil/678655.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/ceil/678655.wgsl.expected.glsl b/test/tint/builtins/gen/literal/ceil/678655.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/ceil/678655.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/ceil/678655.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/ceil/678655.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/ceil/678655.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/ceil/678655.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/ceil/678655.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/ceil/678655.wgsl.expected.msl b/test/tint/builtins/gen/literal/ceil/678655.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/ceil/678655.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/ceil/678655.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/ceil/678655.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/ceil/678655.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/ceil/678655.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/ceil/678655.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/ceil/678655.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/ceil/678655.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/ceil/678655.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/ceil/678655.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/ceil/96f597.wgsl b/test/tint/builtins/gen/literal/ceil/96f597.wgsl
similarity index 96%
rename from test/tint/builtins/gen/ceil/96f597.wgsl
rename to test/tint/builtins/gen/literal/ceil/96f597.wgsl
index 9d9a2f08a6..13dd9afcda 100644
--- a/test/tint/builtins/gen/ceil/96f597.wgsl
+++ b/test/tint/builtins/gen/literal/ceil/96f597.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/ceil/96f597.wgsl.expected.glsl b/test/tint/builtins/gen/literal/ceil/96f597.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/ceil/96f597.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/ceil/96f597.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/ceil/96f597.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/ceil/96f597.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/ceil/96f597.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/ceil/96f597.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/ceil/96f597.wgsl.expected.msl b/test/tint/builtins/gen/literal/ceil/96f597.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/ceil/96f597.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/ceil/96f597.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/ceil/96f597.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/ceil/96f597.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/ceil/96f597.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/ceil/96f597.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/ceil/96f597.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/ceil/96f597.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/ceil/96f597.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/ceil/96f597.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/ceil/b74c16.wgsl b/test/tint/builtins/gen/literal/ceil/b74c16.wgsl
similarity index 96%
rename from test/tint/builtins/gen/ceil/b74c16.wgsl
rename to test/tint/builtins/gen/literal/ceil/b74c16.wgsl
index ea41b22748..6f2a52f4ba 100644
--- a/test/tint/builtins/gen/ceil/b74c16.wgsl
+++ b/test/tint/builtins/gen/literal/ceil/b74c16.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/ceil/b74c16.wgsl.expected.glsl b/test/tint/builtins/gen/literal/ceil/b74c16.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/ceil/b74c16.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/ceil/b74c16.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/ceil/b74c16.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/ceil/b74c16.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/ceil/b74c16.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/ceil/b74c16.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/ceil/b74c16.wgsl.expected.msl b/test/tint/builtins/gen/literal/ceil/b74c16.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/ceil/b74c16.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/ceil/b74c16.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/ceil/b74c16.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/ceil/b74c16.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/ceil/b74c16.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/ceil/b74c16.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/ceil/b74c16.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/ceil/b74c16.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/ceil/b74c16.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/ceil/b74c16.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/clamp/0acf8f.wgsl b/test/tint/builtins/gen/literal/clamp/0acf8f.wgsl
similarity index 96%
rename from test/tint/builtins/gen/clamp/0acf8f.wgsl
rename to test/tint/builtins/gen/literal/clamp/0acf8f.wgsl
index 0650d845cd..75e94eef93 100644
--- a/test/tint/builtins/gen/clamp/0acf8f.wgsl
+++ b/test/tint/builtins/gen/literal/clamp/0acf8f.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/clamp/0acf8f.wgsl.expected.glsl b/test/tint/builtins/gen/literal/clamp/0acf8f.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/clamp/0acf8f.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/clamp/0acf8f.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/clamp/0acf8f.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/clamp/0acf8f.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/clamp/0acf8f.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/clamp/0acf8f.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/clamp/0acf8f.wgsl.expected.msl b/test/tint/builtins/gen/literal/clamp/0acf8f.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/clamp/0acf8f.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/clamp/0acf8f.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/clamp/0acf8f.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/clamp/0acf8f.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/clamp/0acf8f.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/clamp/0acf8f.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/clamp/0acf8f.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/clamp/0acf8f.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/clamp/0acf8f.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/clamp/0acf8f.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/clamp/1a32e3.wgsl b/test/tint/builtins/gen/literal/clamp/1a32e3.wgsl
similarity index 96%
rename from test/tint/builtins/gen/clamp/1a32e3.wgsl
rename to test/tint/builtins/gen/literal/clamp/1a32e3.wgsl
index 491e906f67..908c846585 100644
--- a/test/tint/builtins/gen/clamp/1a32e3.wgsl
+++ b/test/tint/builtins/gen/literal/clamp/1a32e3.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/clamp/1a32e3.wgsl.expected.glsl b/test/tint/builtins/gen/literal/clamp/1a32e3.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/clamp/1a32e3.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/clamp/1a32e3.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/clamp/1a32e3.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/clamp/1a32e3.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/clamp/1a32e3.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/clamp/1a32e3.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/clamp/1a32e3.wgsl.expected.msl b/test/tint/builtins/gen/literal/clamp/1a32e3.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/clamp/1a32e3.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/clamp/1a32e3.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/clamp/1a32e3.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/clamp/1a32e3.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/clamp/1a32e3.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/clamp/1a32e3.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/clamp/1a32e3.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/clamp/1a32e3.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/clamp/1a32e3.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/clamp/1a32e3.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/clamp/2bd567.wgsl b/test/tint/builtins/gen/literal/clamp/2bd567.wgsl
similarity index 96%
rename from test/tint/builtins/gen/clamp/2bd567.wgsl
rename to test/tint/builtins/gen/literal/clamp/2bd567.wgsl
index 51804e2c29..464ea3323f 100644
--- a/test/tint/builtins/gen/clamp/2bd567.wgsl
+++ b/test/tint/builtins/gen/literal/clamp/2bd567.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/clamp/2bd567.wgsl.expected.glsl b/test/tint/builtins/gen/literal/clamp/2bd567.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/clamp/2bd567.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/clamp/2bd567.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/clamp/2bd567.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/clamp/2bd567.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/clamp/2bd567.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/clamp/2bd567.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/clamp/2bd567.wgsl.expected.msl b/test/tint/builtins/gen/literal/clamp/2bd567.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/clamp/2bd567.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/clamp/2bd567.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/clamp/2bd567.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/clamp/2bd567.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/clamp/2bd567.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/clamp/2bd567.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/clamp/2bd567.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/clamp/2bd567.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/clamp/2bd567.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/clamp/2bd567.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/clamp/2bde41.wgsl b/test/tint/builtins/gen/literal/clamp/2bde41.wgsl
similarity index 96%
rename from test/tint/builtins/gen/clamp/2bde41.wgsl
rename to test/tint/builtins/gen/literal/clamp/2bde41.wgsl
index 9c7f458750..0b91f22911 100644
--- a/test/tint/builtins/gen/clamp/2bde41.wgsl
+++ b/test/tint/builtins/gen/literal/clamp/2bde41.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/clamp/2bde41.wgsl.expected.glsl b/test/tint/builtins/gen/literal/clamp/2bde41.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/clamp/2bde41.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/clamp/2bde41.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/clamp/2bde41.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/clamp/2bde41.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/clamp/2bde41.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/clamp/2bde41.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/clamp/2bde41.wgsl.expected.msl b/test/tint/builtins/gen/literal/clamp/2bde41.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/clamp/2bde41.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/clamp/2bde41.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/clamp/2bde41.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/clamp/2bde41.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/clamp/2bde41.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/clamp/2bde41.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/clamp/2bde41.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/clamp/2bde41.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/clamp/2bde41.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/clamp/2bde41.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/clamp/548fc7.wgsl b/test/tint/builtins/gen/literal/clamp/548fc7.wgsl
similarity index 96%
rename from test/tint/builtins/gen/clamp/548fc7.wgsl
rename to test/tint/builtins/gen/literal/clamp/548fc7.wgsl
index 7465eaaef4..a12a22e8cb 100644
--- a/test/tint/builtins/gen/clamp/548fc7.wgsl
+++ b/test/tint/builtins/gen/literal/clamp/548fc7.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/clamp/548fc7.wgsl.expected.glsl b/test/tint/builtins/gen/literal/clamp/548fc7.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/clamp/548fc7.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/clamp/548fc7.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/clamp/548fc7.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/clamp/548fc7.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/clamp/548fc7.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/clamp/548fc7.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/clamp/548fc7.wgsl.expected.msl b/test/tint/builtins/gen/literal/clamp/548fc7.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/clamp/548fc7.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/clamp/548fc7.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/clamp/548fc7.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/clamp/548fc7.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/clamp/548fc7.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/clamp/548fc7.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/clamp/548fc7.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/clamp/548fc7.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/clamp/548fc7.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/clamp/548fc7.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/clamp/5f0819.wgsl b/test/tint/builtins/gen/literal/clamp/5f0819.wgsl
similarity index 96%
rename from test/tint/builtins/gen/clamp/5f0819.wgsl
rename to test/tint/builtins/gen/literal/clamp/5f0819.wgsl
index 09a03f729c..04d79c7707 100644
--- a/test/tint/builtins/gen/clamp/5f0819.wgsl
+++ b/test/tint/builtins/gen/literal/clamp/5f0819.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/clamp/5f0819.wgsl.expected.glsl b/test/tint/builtins/gen/literal/clamp/5f0819.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/clamp/5f0819.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/clamp/5f0819.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/clamp/5f0819.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/clamp/5f0819.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/clamp/5f0819.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/clamp/5f0819.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/clamp/5f0819.wgsl.expected.msl b/test/tint/builtins/gen/literal/clamp/5f0819.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/clamp/5f0819.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/clamp/5f0819.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/clamp/5f0819.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/clamp/5f0819.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/clamp/5f0819.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/clamp/5f0819.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/clamp/5f0819.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/clamp/5f0819.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/clamp/5f0819.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/clamp/5f0819.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/clamp/6c1749.wgsl b/test/tint/builtins/gen/literal/clamp/6c1749.wgsl
similarity index 96%
rename from test/tint/builtins/gen/clamp/6c1749.wgsl
rename to test/tint/builtins/gen/literal/clamp/6c1749.wgsl
index 71a22c76e9..430bd15b8b 100644
--- a/test/tint/builtins/gen/clamp/6c1749.wgsl
+++ b/test/tint/builtins/gen/literal/clamp/6c1749.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/clamp/6c1749.wgsl.expected.glsl b/test/tint/builtins/gen/literal/clamp/6c1749.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/clamp/6c1749.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/clamp/6c1749.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/clamp/6c1749.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/clamp/6c1749.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/clamp/6c1749.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/clamp/6c1749.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/clamp/6c1749.wgsl.expected.msl b/test/tint/builtins/gen/literal/clamp/6c1749.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/clamp/6c1749.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/clamp/6c1749.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/clamp/6c1749.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/clamp/6c1749.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/clamp/6c1749.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/clamp/6c1749.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/clamp/6c1749.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/clamp/6c1749.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/clamp/6c1749.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/clamp/6c1749.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/clamp/7706d7.wgsl b/test/tint/builtins/gen/literal/clamp/7706d7.wgsl
similarity index 96%
rename from test/tint/builtins/gen/clamp/7706d7.wgsl
rename to test/tint/builtins/gen/literal/clamp/7706d7.wgsl
index 04c333b4af..381e25d449 100644
--- a/test/tint/builtins/gen/clamp/7706d7.wgsl
+++ b/test/tint/builtins/gen/literal/clamp/7706d7.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/clamp/7706d7.wgsl.expected.glsl b/test/tint/builtins/gen/literal/clamp/7706d7.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/clamp/7706d7.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/clamp/7706d7.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/clamp/7706d7.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/clamp/7706d7.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/clamp/7706d7.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/clamp/7706d7.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/clamp/7706d7.wgsl.expected.msl b/test/tint/builtins/gen/literal/clamp/7706d7.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/clamp/7706d7.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/clamp/7706d7.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/clamp/7706d7.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/clamp/7706d7.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/clamp/7706d7.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/clamp/7706d7.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/clamp/7706d7.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/clamp/7706d7.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/clamp/7706d7.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/clamp/7706d7.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/clamp/867397.wgsl b/test/tint/builtins/gen/literal/clamp/867397.wgsl
similarity index 96%
rename from test/tint/builtins/gen/clamp/867397.wgsl
rename to test/tint/builtins/gen/literal/clamp/867397.wgsl
index 328951dfba..91cacc2196 100644
--- a/test/tint/builtins/gen/clamp/867397.wgsl
+++ b/test/tint/builtins/gen/literal/clamp/867397.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/clamp/867397.wgsl.expected.glsl b/test/tint/builtins/gen/literal/clamp/867397.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/clamp/867397.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/clamp/867397.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/clamp/867397.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/clamp/867397.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/clamp/867397.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/clamp/867397.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/clamp/867397.wgsl.expected.msl b/test/tint/builtins/gen/literal/clamp/867397.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/clamp/867397.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/clamp/867397.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/clamp/867397.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/clamp/867397.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/clamp/867397.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/clamp/867397.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/clamp/867397.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/clamp/867397.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/clamp/867397.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/clamp/867397.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/clamp/a2de25.wgsl b/test/tint/builtins/gen/literal/clamp/a2de25.wgsl
similarity index 96%
rename from test/tint/builtins/gen/clamp/a2de25.wgsl
rename to test/tint/builtins/gen/literal/clamp/a2de25.wgsl
index ffec765d92..bc687e3854 100644
--- a/test/tint/builtins/gen/clamp/a2de25.wgsl
+++ b/test/tint/builtins/gen/literal/clamp/a2de25.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/clamp/a2de25.wgsl.expected.glsl b/test/tint/builtins/gen/literal/clamp/a2de25.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/clamp/a2de25.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/clamp/a2de25.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/clamp/a2de25.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/clamp/a2de25.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/clamp/a2de25.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/clamp/a2de25.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/clamp/a2de25.wgsl.expected.msl b/test/tint/builtins/gen/literal/clamp/a2de25.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/clamp/a2de25.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/clamp/a2de25.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/clamp/a2de25.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/clamp/a2de25.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/clamp/a2de25.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/clamp/a2de25.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/clamp/a2de25.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/clamp/a2de25.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/clamp/a2de25.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/clamp/a2de25.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/clamp/b07c65.wgsl b/test/tint/builtins/gen/literal/clamp/b07c65.wgsl
similarity index 96%
rename from test/tint/builtins/gen/clamp/b07c65.wgsl
rename to test/tint/builtins/gen/literal/clamp/b07c65.wgsl
index 057b56e17d..4387f72607 100644
--- a/test/tint/builtins/gen/clamp/b07c65.wgsl
+++ b/test/tint/builtins/gen/literal/clamp/b07c65.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/clamp/b07c65.wgsl.expected.glsl b/test/tint/builtins/gen/literal/clamp/b07c65.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/clamp/b07c65.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/clamp/b07c65.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/clamp/b07c65.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/clamp/b07c65.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/clamp/b07c65.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/clamp/b07c65.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/clamp/b07c65.wgsl.expected.msl b/test/tint/builtins/gen/literal/clamp/b07c65.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/clamp/b07c65.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/clamp/b07c65.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/clamp/b07c65.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/clamp/b07c65.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/clamp/b07c65.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/clamp/b07c65.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/clamp/b07c65.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/clamp/b07c65.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/clamp/b07c65.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/clamp/b07c65.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/clamp/bd43ce.wgsl b/test/tint/builtins/gen/literal/clamp/bd43ce.wgsl
similarity index 96%
rename from test/tint/builtins/gen/clamp/bd43ce.wgsl
rename to test/tint/builtins/gen/literal/clamp/bd43ce.wgsl
index bf1e316d32..80d6b853dd 100644
--- a/test/tint/builtins/gen/clamp/bd43ce.wgsl
+++ b/test/tint/builtins/gen/literal/clamp/bd43ce.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/clamp/bd43ce.wgsl.expected.glsl b/test/tint/builtins/gen/literal/clamp/bd43ce.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/clamp/bd43ce.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/clamp/bd43ce.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/clamp/bd43ce.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/clamp/bd43ce.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/clamp/bd43ce.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/clamp/bd43ce.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/clamp/bd43ce.wgsl.expected.msl b/test/tint/builtins/gen/literal/clamp/bd43ce.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/clamp/bd43ce.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/clamp/bd43ce.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/clamp/bd43ce.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/clamp/bd43ce.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/clamp/bd43ce.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/clamp/bd43ce.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/clamp/bd43ce.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/clamp/bd43ce.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/clamp/bd43ce.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/clamp/bd43ce.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/cos/16dc15.wgsl b/test/tint/builtins/gen/literal/cos/16dc15.wgsl
similarity index 96%
rename from test/tint/builtins/gen/cos/16dc15.wgsl
rename to test/tint/builtins/gen/literal/cos/16dc15.wgsl
index 021e5c440e..a49842f846 100644
--- a/test/tint/builtins/gen/cos/16dc15.wgsl
+++ b/test/tint/builtins/gen/literal/cos/16dc15.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/cos/16dc15.wgsl.expected.glsl b/test/tint/builtins/gen/literal/cos/16dc15.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/cos/16dc15.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/cos/16dc15.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/cos/16dc15.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/cos/16dc15.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/cos/16dc15.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/cos/16dc15.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/cos/16dc15.wgsl.expected.msl b/test/tint/builtins/gen/literal/cos/16dc15.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/cos/16dc15.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/cos/16dc15.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/cos/16dc15.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/cos/16dc15.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/cos/16dc15.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/cos/16dc15.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/cos/16dc15.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/cos/16dc15.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/cos/16dc15.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/cos/16dc15.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/cos/29d66d.wgsl b/test/tint/builtins/gen/literal/cos/29d66d.wgsl
similarity index 96%
rename from test/tint/builtins/gen/cos/29d66d.wgsl
rename to test/tint/builtins/gen/literal/cos/29d66d.wgsl
index 0c13e978da..2488f6f439 100644
--- a/test/tint/builtins/gen/cos/29d66d.wgsl
+++ b/test/tint/builtins/gen/literal/cos/29d66d.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/cos/29d66d.wgsl.expected.glsl b/test/tint/builtins/gen/literal/cos/29d66d.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/cos/29d66d.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/cos/29d66d.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/cos/29d66d.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/cos/29d66d.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/cos/29d66d.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/cos/29d66d.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/cos/29d66d.wgsl.expected.msl b/test/tint/builtins/gen/literal/cos/29d66d.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/cos/29d66d.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/cos/29d66d.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/cos/29d66d.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/cos/29d66d.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/cos/29d66d.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/cos/29d66d.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/cos/29d66d.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/cos/29d66d.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/cos/29d66d.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/cos/29d66d.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/cos/c3b486.wgsl b/test/tint/builtins/gen/literal/cos/c3b486.wgsl
similarity index 96%
rename from test/tint/builtins/gen/cos/c3b486.wgsl
rename to test/tint/builtins/gen/literal/cos/c3b486.wgsl
index 47e96863ef..053ed820c4 100644
--- a/test/tint/builtins/gen/cos/c3b486.wgsl
+++ b/test/tint/builtins/gen/literal/cos/c3b486.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/cos/c3b486.wgsl.expected.glsl b/test/tint/builtins/gen/literal/cos/c3b486.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/cos/c3b486.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/cos/c3b486.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/cos/c3b486.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/cos/c3b486.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/cos/c3b486.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/cos/c3b486.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/cos/c3b486.wgsl.expected.msl b/test/tint/builtins/gen/literal/cos/c3b486.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/cos/c3b486.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/cos/c3b486.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/cos/c3b486.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/cos/c3b486.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/cos/c3b486.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/cos/c3b486.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/cos/c3b486.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/cos/c3b486.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/cos/c3b486.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/cos/c3b486.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/cos/c5c28e.wgsl b/test/tint/builtins/gen/literal/cos/c5c28e.wgsl
similarity index 96%
rename from test/tint/builtins/gen/cos/c5c28e.wgsl
rename to test/tint/builtins/gen/literal/cos/c5c28e.wgsl
index a23fe4d5ac..649e53f521 100644
--- a/test/tint/builtins/gen/cos/c5c28e.wgsl
+++ b/test/tint/builtins/gen/literal/cos/c5c28e.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/cos/c5c28e.wgsl.expected.glsl b/test/tint/builtins/gen/literal/cos/c5c28e.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/cos/c5c28e.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/cos/c5c28e.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/cos/c5c28e.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/cos/c5c28e.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/cos/c5c28e.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/cos/c5c28e.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/cos/c5c28e.wgsl.expected.msl b/test/tint/builtins/gen/literal/cos/c5c28e.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/cos/c5c28e.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/cos/c5c28e.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/cos/c5c28e.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/cos/c5c28e.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/cos/c5c28e.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/cos/c5c28e.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/cos/c5c28e.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/cos/c5c28e.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/cos/c5c28e.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/cos/c5c28e.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/cosh/377652.wgsl b/test/tint/builtins/gen/literal/cosh/377652.wgsl
similarity index 96%
rename from test/tint/builtins/gen/cosh/377652.wgsl
rename to test/tint/builtins/gen/literal/cosh/377652.wgsl
index 0ad3390a3d..b30d0f0936 100644
--- a/test/tint/builtins/gen/cosh/377652.wgsl
+++ b/test/tint/builtins/gen/literal/cosh/377652.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/cosh/377652.wgsl.expected.glsl b/test/tint/builtins/gen/literal/cosh/377652.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/cosh/377652.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/cosh/377652.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/cosh/377652.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/cosh/377652.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/cosh/377652.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/cosh/377652.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/cosh/377652.wgsl.expected.msl b/test/tint/builtins/gen/literal/cosh/377652.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/cosh/377652.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/cosh/377652.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/cosh/377652.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/cosh/377652.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/cosh/377652.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/cosh/377652.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/cosh/377652.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/cosh/377652.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/cosh/377652.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/cosh/377652.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/cosh/c13756.wgsl b/test/tint/builtins/gen/literal/cosh/c13756.wgsl
similarity index 96%
rename from test/tint/builtins/gen/cosh/c13756.wgsl
rename to test/tint/builtins/gen/literal/cosh/c13756.wgsl
index 4f3a5f33e7..fb791cf5e8 100644
--- a/test/tint/builtins/gen/cosh/c13756.wgsl
+++ b/test/tint/builtins/gen/literal/cosh/c13756.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/cosh/c13756.wgsl.expected.glsl b/test/tint/builtins/gen/literal/cosh/c13756.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/cosh/c13756.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/cosh/c13756.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/cosh/c13756.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/cosh/c13756.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/cosh/c13756.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/cosh/c13756.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/cosh/c13756.wgsl.expected.msl b/test/tint/builtins/gen/literal/cosh/c13756.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/cosh/c13756.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/cosh/c13756.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/cosh/c13756.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/cosh/c13756.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/cosh/c13756.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/cosh/c13756.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/cosh/c13756.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/cosh/c13756.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/cosh/c13756.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/cosh/c13756.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/cosh/da92dd.wgsl b/test/tint/builtins/gen/literal/cosh/da92dd.wgsl
similarity index 96%
rename from test/tint/builtins/gen/cosh/da92dd.wgsl
rename to test/tint/builtins/gen/literal/cosh/da92dd.wgsl
index a109d8db3d..61dc016552 100644
--- a/test/tint/builtins/gen/cosh/da92dd.wgsl
+++ b/test/tint/builtins/gen/literal/cosh/da92dd.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/cosh/da92dd.wgsl.expected.glsl b/test/tint/builtins/gen/literal/cosh/da92dd.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/cosh/da92dd.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/cosh/da92dd.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/cosh/da92dd.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/cosh/da92dd.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/cosh/da92dd.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/cosh/da92dd.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/cosh/da92dd.wgsl.expected.msl b/test/tint/builtins/gen/literal/cosh/da92dd.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/cosh/da92dd.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/cosh/da92dd.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/cosh/da92dd.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/cosh/da92dd.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/cosh/da92dd.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/cosh/da92dd.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/cosh/da92dd.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/cosh/da92dd.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/cosh/da92dd.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/cosh/da92dd.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/cosh/e0c1de.wgsl b/test/tint/builtins/gen/literal/cosh/e0c1de.wgsl
similarity index 96%
rename from test/tint/builtins/gen/cosh/e0c1de.wgsl
rename to test/tint/builtins/gen/literal/cosh/e0c1de.wgsl
index 36fd554ebf..10fe5b4fef 100644
--- a/test/tint/builtins/gen/cosh/e0c1de.wgsl
+++ b/test/tint/builtins/gen/literal/cosh/e0c1de.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/cosh/e0c1de.wgsl.expected.glsl b/test/tint/builtins/gen/literal/cosh/e0c1de.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/cosh/e0c1de.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/cosh/e0c1de.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/cosh/e0c1de.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/cosh/e0c1de.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/cosh/e0c1de.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/cosh/e0c1de.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/cosh/e0c1de.wgsl.expected.msl b/test/tint/builtins/gen/literal/cosh/e0c1de.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/cosh/e0c1de.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/cosh/e0c1de.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/cosh/e0c1de.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/cosh/e0c1de.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/cosh/e0c1de.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/cosh/e0c1de.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/cosh/e0c1de.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/cosh/e0c1de.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/cosh/e0c1de.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/cosh/e0c1de.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/countLeadingZeros/208d46.wgsl b/test/tint/builtins/gen/literal/countLeadingZeros/208d46.wgsl
similarity index 96%
rename from test/tint/builtins/gen/countLeadingZeros/208d46.wgsl
rename to test/tint/builtins/gen/literal/countLeadingZeros/208d46.wgsl
index fe5e75b1e0..b68a887dcc 100644
--- a/test/tint/builtins/gen/countLeadingZeros/208d46.wgsl
+++ b/test/tint/builtins/gen/literal/countLeadingZeros/208d46.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/countLeadingZeros/208d46.wgsl.expected.glsl b/test/tint/builtins/gen/literal/countLeadingZeros/208d46.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/countLeadingZeros/208d46.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/countLeadingZeros/208d46.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/countLeadingZeros/208d46.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/countLeadingZeros/208d46.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/countLeadingZeros/208d46.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/countLeadingZeros/208d46.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/countLeadingZeros/208d46.wgsl.expected.msl b/test/tint/builtins/gen/literal/countLeadingZeros/208d46.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/countLeadingZeros/208d46.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/countLeadingZeros/208d46.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/countLeadingZeros/208d46.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/countLeadingZeros/208d46.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/countLeadingZeros/208d46.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/countLeadingZeros/208d46.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/countLeadingZeros/208d46.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/countLeadingZeros/208d46.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/countLeadingZeros/208d46.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/countLeadingZeros/208d46.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/countLeadingZeros/6d4656.wgsl b/test/tint/builtins/gen/literal/countLeadingZeros/6d4656.wgsl
similarity index 96%
rename from test/tint/builtins/gen/countLeadingZeros/6d4656.wgsl
rename to test/tint/builtins/gen/literal/countLeadingZeros/6d4656.wgsl
index 7eb079db8b..bb8d2f1371 100644
--- a/test/tint/builtins/gen/countLeadingZeros/6d4656.wgsl
+++ b/test/tint/builtins/gen/literal/countLeadingZeros/6d4656.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/countLeadingZeros/6d4656.wgsl.expected.glsl b/test/tint/builtins/gen/literal/countLeadingZeros/6d4656.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/countLeadingZeros/6d4656.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/countLeadingZeros/6d4656.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/countLeadingZeros/6d4656.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/countLeadingZeros/6d4656.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/countLeadingZeros/6d4656.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/countLeadingZeros/6d4656.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/countLeadingZeros/6d4656.wgsl.expected.msl b/test/tint/builtins/gen/literal/countLeadingZeros/6d4656.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/countLeadingZeros/6d4656.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/countLeadingZeros/6d4656.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/countLeadingZeros/6d4656.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/countLeadingZeros/6d4656.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/countLeadingZeros/6d4656.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/countLeadingZeros/6d4656.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/countLeadingZeros/6d4656.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/countLeadingZeros/6d4656.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/countLeadingZeros/6d4656.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/countLeadingZeros/6d4656.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/countLeadingZeros/70783f.wgsl b/test/tint/builtins/gen/literal/countLeadingZeros/70783f.wgsl
similarity index 96%
rename from test/tint/builtins/gen/countLeadingZeros/70783f.wgsl
rename to test/tint/builtins/gen/literal/countLeadingZeros/70783f.wgsl
index 548e9eb197..2c807da509 100644
--- a/test/tint/builtins/gen/countLeadingZeros/70783f.wgsl
+++ b/test/tint/builtins/gen/literal/countLeadingZeros/70783f.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/countLeadingZeros/70783f.wgsl.expected.glsl b/test/tint/builtins/gen/literal/countLeadingZeros/70783f.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/countLeadingZeros/70783f.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/countLeadingZeros/70783f.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/countLeadingZeros/70783f.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/countLeadingZeros/70783f.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/countLeadingZeros/70783f.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/countLeadingZeros/70783f.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/countLeadingZeros/70783f.wgsl.expected.msl b/test/tint/builtins/gen/literal/countLeadingZeros/70783f.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/countLeadingZeros/70783f.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/countLeadingZeros/70783f.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/countLeadingZeros/70783f.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/countLeadingZeros/70783f.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/countLeadingZeros/70783f.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/countLeadingZeros/70783f.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/countLeadingZeros/70783f.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/countLeadingZeros/70783f.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/countLeadingZeros/70783f.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/countLeadingZeros/70783f.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/countLeadingZeros/7c38a6.wgsl b/test/tint/builtins/gen/literal/countLeadingZeros/7c38a6.wgsl
similarity index 96%
rename from test/tint/builtins/gen/countLeadingZeros/7c38a6.wgsl
rename to test/tint/builtins/gen/literal/countLeadingZeros/7c38a6.wgsl
index 3b78cb8860..d17f72b085 100644
--- a/test/tint/builtins/gen/countLeadingZeros/7c38a6.wgsl
+++ b/test/tint/builtins/gen/literal/countLeadingZeros/7c38a6.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/countLeadingZeros/7c38a6.wgsl.expected.glsl b/test/tint/builtins/gen/literal/countLeadingZeros/7c38a6.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/countLeadingZeros/7c38a6.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/countLeadingZeros/7c38a6.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/countLeadingZeros/7c38a6.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/countLeadingZeros/7c38a6.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/countLeadingZeros/7c38a6.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/countLeadingZeros/7c38a6.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/countLeadingZeros/7c38a6.wgsl.expected.msl b/test/tint/builtins/gen/literal/countLeadingZeros/7c38a6.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/countLeadingZeros/7c38a6.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/countLeadingZeros/7c38a6.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/countLeadingZeros/7c38a6.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/countLeadingZeros/7c38a6.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/countLeadingZeros/7c38a6.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/countLeadingZeros/7c38a6.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/countLeadingZeros/7c38a6.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/countLeadingZeros/7c38a6.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/countLeadingZeros/7c38a6.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/countLeadingZeros/7c38a6.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/countLeadingZeros/858d40.wgsl b/test/tint/builtins/gen/literal/countLeadingZeros/858d40.wgsl
similarity index 96%
rename from test/tint/builtins/gen/countLeadingZeros/858d40.wgsl
rename to test/tint/builtins/gen/literal/countLeadingZeros/858d40.wgsl
index 572c079326..6690e558a0 100644
--- a/test/tint/builtins/gen/countLeadingZeros/858d40.wgsl
+++ b/test/tint/builtins/gen/literal/countLeadingZeros/858d40.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/countLeadingZeros/858d40.wgsl.expected.glsl b/test/tint/builtins/gen/literal/countLeadingZeros/858d40.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/countLeadingZeros/858d40.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/countLeadingZeros/858d40.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/countLeadingZeros/858d40.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/countLeadingZeros/858d40.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/countLeadingZeros/858d40.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/countLeadingZeros/858d40.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/countLeadingZeros/858d40.wgsl.expected.msl b/test/tint/builtins/gen/literal/countLeadingZeros/858d40.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/countLeadingZeros/858d40.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/countLeadingZeros/858d40.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/countLeadingZeros/858d40.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/countLeadingZeros/858d40.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/countLeadingZeros/858d40.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/countLeadingZeros/858d40.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/countLeadingZeros/858d40.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/countLeadingZeros/858d40.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/countLeadingZeros/858d40.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/countLeadingZeros/858d40.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/countLeadingZeros/ab6345.wgsl b/test/tint/builtins/gen/literal/countLeadingZeros/ab6345.wgsl
similarity index 96%
rename from test/tint/builtins/gen/countLeadingZeros/ab6345.wgsl
rename to test/tint/builtins/gen/literal/countLeadingZeros/ab6345.wgsl
index e5563bde1b..64926a4541 100644
--- a/test/tint/builtins/gen/countLeadingZeros/ab6345.wgsl
+++ b/test/tint/builtins/gen/literal/countLeadingZeros/ab6345.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/countLeadingZeros/ab6345.wgsl.expected.glsl b/test/tint/builtins/gen/literal/countLeadingZeros/ab6345.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/countLeadingZeros/ab6345.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/countLeadingZeros/ab6345.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/countLeadingZeros/ab6345.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/countLeadingZeros/ab6345.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/countLeadingZeros/ab6345.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/countLeadingZeros/ab6345.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/countLeadingZeros/ab6345.wgsl.expected.msl b/test/tint/builtins/gen/literal/countLeadingZeros/ab6345.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/countLeadingZeros/ab6345.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/countLeadingZeros/ab6345.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/countLeadingZeros/ab6345.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/countLeadingZeros/ab6345.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/countLeadingZeros/ab6345.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/countLeadingZeros/ab6345.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/countLeadingZeros/ab6345.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/countLeadingZeros/ab6345.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/countLeadingZeros/ab6345.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/countLeadingZeros/ab6345.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/countLeadingZeros/eab32b.wgsl b/test/tint/builtins/gen/literal/countLeadingZeros/eab32b.wgsl
similarity index 96%
rename from test/tint/builtins/gen/countLeadingZeros/eab32b.wgsl
rename to test/tint/builtins/gen/literal/countLeadingZeros/eab32b.wgsl
index 63d3fb100e..b62ce8579b 100644
--- a/test/tint/builtins/gen/countLeadingZeros/eab32b.wgsl
+++ b/test/tint/builtins/gen/literal/countLeadingZeros/eab32b.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/countLeadingZeros/eab32b.wgsl.expected.glsl b/test/tint/builtins/gen/literal/countLeadingZeros/eab32b.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/countLeadingZeros/eab32b.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/countLeadingZeros/eab32b.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/countLeadingZeros/eab32b.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/countLeadingZeros/eab32b.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/countLeadingZeros/eab32b.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/countLeadingZeros/eab32b.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/countLeadingZeros/eab32b.wgsl.expected.msl b/test/tint/builtins/gen/literal/countLeadingZeros/eab32b.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/countLeadingZeros/eab32b.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/countLeadingZeros/eab32b.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/countLeadingZeros/eab32b.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/countLeadingZeros/eab32b.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/countLeadingZeros/eab32b.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/countLeadingZeros/eab32b.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/countLeadingZeros/eab32b.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/countLeadingZeros/eab32b.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/countLeadingZeros/eab32b.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/countLeadingZeros/eab32b.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/countLeadingZeros/f70103.wgsl b/test/tint/builtins/gen/literal/countLeadingZeros/f70103.wgsl
similarity index 96%
rename from test/tint/builtins/gen/countLeadingZeros/f70103.wgsl
rename to test/tint/builtins/gen/literal/countLeadingZeros/f70103.wgsl
index 223906e77e..0c19060e4a 100644
--- a/test/tint/builtins/gen/countLeadingZeros/f70103.wgsl
+++ b/test/tint/builtins/gen/literal/countLeadingZeros/f70103.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/countLeadingZeros/f70103.wgsl.expected.glsl b/test/tint/builtins/gen/literal/countLeadingZeros/f70103.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/countLeadingZeros/f70103.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/countLeadingZeros/f70103.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/countLeadingZeros/f70103.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/countLeadingZeros/f70103.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/countLeadingZeros/f70103.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/countLeadingZeros/f70103.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/countLeadingZeros/f70103.wgsl.expected.msl b/test/tint/builtins/gen/literal/countLeadingZeros/f70103.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/countLeadingZeros/f70103.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/countLeadingZeros/f70103.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/countLeadingZeros/f70103.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/countLeadingZeros/f70103.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/countLeadingZeros/f70103.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/countLeadingZeros/f70103.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/countLeadingZeros/f70103.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/countLeadingZeros/f70103.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/countLeadingZeros/f70103.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/countLeadingZeros/f70103.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/countOneBits/0d0e46.wgsl b/test/tint/builtins/gen/literal/countOneBits/0d0e46.wgsl
similarity index 96%
rename from test/tint/builtins/gen/countOneBits/0d0e46.wgsl
rename to test/tint/builtins/gen/literal/countOneBits/0d0e46.wgsl
index 611d80f2a1..cd82445abc 100644
--- a/test/tint/builtins/gen/countOneBits/0d0e46.wgsl
+++ b/test/tint/builtins/gen/literal/countOneBits/0d0e46.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/countOneBits/0d0e46.wgsl.expected.glsl b/test/tint/builtins/gen/literal/countOneBits/0d0e46.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/countOneBits/0d0e46.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/countOneBits/0d0e46.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/countOneBits/0d0e46.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/countOneBits/0d0e46.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/countOneBits/0d0e46.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/countOneBits/0d0e46.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/countOneBits/0d0e46.wgsl.expected.msl b/test/tint/builtins/gen/literal/countOneBits/0d0e46.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/countOneBits/0d0e46.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/countOneBits/0d0e46.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/countOneBits/0d0e46.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/countOneBits/0d0e46.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/countOneBits/0d0e46.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/countOneBits/0d0e46.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/countOneBits/0d0e46.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/countOneBits/0d0e46.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/countOneBits/0d0e46.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/countOneBits/0d0e46.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/countOneBits/0f7980.wgsl b/test/tint/builtins/gen/literal/countOneBits/0f7980.wgsl
similarity index 96%
rename from test/tint/builtins/gen/countOneBits/0f7980.wgsl
rename to test/tint/builtins/gen/literal/countOneBits/0f7980.wgsl
index 3073ef7281..0e1a0c528b 100644
--- a/test/tint/builtins/gen/countOneBits/0f7980.wgsl
+++ b/test/tint/builtins/gen/literal/countOneBits/0f7980.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/countOneBits/0f7980.wgsl.expected.glsl b/test/tint/builtins/gen/literal/countOneBits/0f7980.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/countOneBits/0f7980.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/countOneBits/0f7980.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/countOneBits/0f7980.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/countOneBits/0f7980.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/countOneBits/0f7980.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/countOneBits/0f7980.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/countOneBits/0f7980.wgsl.expected.msl b/test/tint/builtins/gen/literal/countOneBits/0f7980.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/countOneBits/0f7980.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/countOneBits/0f7980.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/countOneBits/0f7980.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/countOneBits/0f7980.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/countOneBits/0f7980.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/countOneBits/0f7980.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/countOneBits/0f7980.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/countOneBits/0f7980.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/countOneBits/0f7980.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/countOneBits/0f7980.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/countOneBits/65d2ae.wgsl b/test/tint/builtins/gen/literal/countOneBits/65d2ae.wgsl
similarity index 96%
rename from test/tint/builtins/gen/countOneBits/65d2ae.wgsl
rename to test/tint/builtins/gen/literal/countOneBits/65d2ae.wgsl
index 1a5a546512..b2d344b32e 100644
--- a/test/tint/builtins/gen/countOneBits/65d2ae.wgsl
+++ b/test/tint/builtins/gen/literal/countOneBits/65d2ae.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/countOneBits/65d2ae.wgsl.expected.glsl b/test/tint/builtins/gen/literal/countOneBits/65d2ae.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/countOneBits/65d2ae.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/countOneBits/65d2ae.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/countOneBits/65d2ae.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/countOneBits/65d2ae.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/countOneBits/65d2ae.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/countOneBits/65d2ae.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/countOneBits/65d2ae.wgsl.expected.msl b/test/tint/builtins/gen/literal/countOneBits/65d2ae.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/countOneBits/65d2ae.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/countOneBits/65d2ae.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/countOneBits/65d2ae.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/countOneBits/65d2ae.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/countOneBits/65d2ae.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/countOneBits/65d2ae.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/countOneBits/65d2ae.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/countOneBits/65d2ae.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/countOneBits/65d2ae.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/countOneBits/65d2ae.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/countOneBits/690cfc.wgsl b/test/tint/builtins/gen/literal/countOneBits/690cfc.wgsl
similarity index 96%
rename from test/tint/builtins/gen/countOneBits/690cfc.wgsl
rename to test/tint/builtins/gen/literal/countOneBits/690cfc.wgsl
index b867e47513..3ffaaad64e 100644
--- a/test/tint/builtins/gen/countOneBits/690cfc.wgsl
+++ b/test/tint/builtins/gen/literal/countOneBits/690cfc.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/countOneBits/690cfc.wgsl.expected.glsl b/test/tint/builtins/gen/literal/countOneBits/690cfc.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/countOneBits/690cfc.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/countOneBits/690cfc.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/countOneBits/690cfc.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/countOneBits/690cfc.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/countOneBits/690cfc.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/countOneBits/690cfc.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/countOneBits/690cfc.wgsl.expected.msl b/test/tint/builtins/gen/literal/countOneBits/690cfc.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/countOneBits/690cfc.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/countOneBits/690cfc.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/countOneBits/690cfc.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/countOneBits/690cfc.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/countOneBits/690cfc.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/countOneBits/690cfc.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/countOneBits/690cfc.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/countOneBits/690cfc.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/countOneBits/690cfc.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/countOneBits/690cfc.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/countOneBits/94fd81.wgsl b/test/tint/builtins/gen/literal/countOneBits/94fd81.wgsl
similarity index 96%
rename from test/tint/builtins/gen/countOneBits/94fd81.wgsl
rename to test/tint/builtins/gen/literal/countOneBits/94fd81.wgsl
index e47075b133..f3dc8110e6 100644
--- a/test/tint/builtins/gen/countOneBits/94fd81.wgsl
+++ b/test/tint/builtins/gen/literal/countOneBits/94fd81.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/countOneBits/94fd81.wgsl.expected.glsl b/test/tint/builtins/gen/literal/countOneBits/94fd81.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/countOneBits/94fd81.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/countOneBits/94fd81.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/countOneBits/94fd81.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/countOneBits/94fd81.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/countOneBits/94fd81.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/countOneBits/94fd81.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/countOneBits/94fd81.wgsl.expected.msl b/test/tint/builtins/gen/literal/countOneBits/94fd81.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/countOneBits/94fd81.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/countOneBits/94fd81.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/countOneBits/94fd81.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/countOneBits/94fd81.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/countOneBits/94fd81.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/countOneBits/94fd81.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/countOneBits/94fd81.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/countOneBits/94fd81.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/countOneBits/94fd81.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/countOneBits/94fd81.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/countOneBits/ae44f9.wgsl b/test/tint/builtins/gen/literal/countOneBits/ae44f9.wgsl
similarity index 96%
rename from test/tint/builtins/gen/countOneBits/ae44f9.wgsl
rename to test/tint/builtins/gen/literal/countOneBits/ae44f9.wgsl
index 72fcca7a3b..db3be109b1 100644
--- a/test/tint/builtins/gen/countOneBits/ae44f9.wgsl
+++ b/test/tint/builtins/gen/literal/countOneBits/ae44f9.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/countOneBits/ae44f9.wgsl.expected.glsl b/test/tint/builtins/gen/literal/countOneBits/ae44f9.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/countOneBits/ae44f9.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/countOneBits/ae44f9.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/countOneBits/ae44f9.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/countOneBits/ae44f9.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/countOneBits/ae44f9.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/countOneBits/ae44f9.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/countOneBits/ae44f9.wgsl.expected.msl b/test/tint/builtins/gen/literal/countOneBits/ae44f9.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/countOneBits/ae44f9.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/countOneBits/ae44f9.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/countOneBits/ae44f9.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/countOneBits/ae44f9.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/countOneBits/ae44f9.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/countOneBits/ae44f9.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/countOneBits/ae44f9.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/countOneBits/ae44f9.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/countOneBits/ae44f9.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/countOneBits/ae44f9.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/countOneBits/af90e2.wgsl b/test/tint/builtins/gen/literal/countOneBits/af90e2.wgsl
similarity index 96%
rename from test/tint/builtins/gen/countOneBits/af90e2.wgsl
rename to test/tint/builtins/gen/literal/countOneBits/af90e2.wgsl
index 29c605d7b1..1a12e33abb 100644
--- a/test/tint/builtins/gen/countOneBits/af90e2.wgsl
+++ b/test/tint/builtins/gen/literal/countOneBits/af90e2.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/countOneBits/af90e2.wgsl.expected.glsl b/test/tint/builtins/gen/literal/countOneBits/af90e2.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/countOneBits/af90e2.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/countOneBits/af90e2.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/countOneBits/af90e2.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/countOneBits/af90e2.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/countOneBits/af90e2.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/countOneBits/af90e2.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/countOneBits/af90e2.wgsl.expected.msl b/test/tint/builtins/gen/literal/countOneBits/af90e2.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/countOneBits/af90e2.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/countOneBits/af90e2.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/countOneBits/af90e2.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/countOneBits/af90e2.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/countOneBits/af90e2.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/countOneBits/af90e2.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/countOneBits/af90e2.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/countOneBits/af90e2.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/countOneBits/af90e2.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/countOneBits/af90e2.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/countOneBits/fd88b2.wgsl b/test/tint/builtins/gen/literal/countOneBits/fd88b2.wgsl
similarity index 96%
rename from test/tint/builtins/gen/countOneBits/fd88b2.wgsl
rename to test/tint/builtins/gen/literal/countOneBits/fd88b2.wgsl
index 9e2785961a..7f1ec3c3d7 100644
--- a/test/tint/builtins/gen/countOneBits/fd88b2.wgsl
+++ b/test/tint/builtins/gen/literal/countOneBits/fd88b2.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/countOneBits/fd88b2.wgsl.expected.glsl b/test/tint/builtins/gen/literal/countOneBits/fd88b2.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/countOneBits/fd88b2.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/countOneBits/fd88b2.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/countOneBits/fd88b2.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/countOneBits/fd88b2.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/countOneBits/fd88b2.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/countOneBits/fd88b2.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/countOneBits/fd88b2.wgsl.expected.msl b/test/tint/builtins/gen/literal/countOneBits/fd88b2.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/countOneBits/fd88b2.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/countOneBits/fd88b2.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/countOneBits/fd88b2.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/countOneBits/fd88b2.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/countOneBits/fd88b2.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/countOneBits/fd88b2.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/countOneBits/fd88b2.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/countOneBits/fd88b2.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/countOneBits/fd88b2.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/countOneBits/fd88b2.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/countTrailingZeros/1ad138.wgsl b/test/tint/builtins/gen/literal/countTrailingZeros/1ad138.wgsl
similarity index 96%
rename from test/tint/builtins/gen/countTrailingZeros/1ad138.wgsl
rename to test/tint/builtins/gen/literal/countTrailingZeros/1ad138.wgsl
index c5a085301f..ead70fac48 100644
--- a/test/tint/builtins/gen/countTrailingZeros/1ad138.wgsl
+++ b/test/tint/builtins/gen/literal/countTrailingZeros/1ad138.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/countTrailingZeros/1ad138.wgsl.expected.glsl b/test/tint/builtins/gen/literal/countTrailingZeros/1ad138.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/countTrailingZeros/1ad138.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/countTrailingZeros/1ad138.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/countTrailingZeros/1ad138.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/countTrailingZeros/1ad138.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/countTrailingZeros/1ad138.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/countTrailingZeros/1ad138.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/countTrailingZeros/1ad138.wgsl.expected.msl b/test/tint/builtins/gen/literal/countTrailingZeros/1ad138.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/countTrailingZeros/1ad138.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/countTrailingZeros/1ad138.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/countTrailingZeros/1ad138.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/countTrailingZeros/1ad138.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/countTrailingZeros/1ad138.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/countTrailingZeros/1ad138.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/countTrailingZeros/1ad138.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/countTrailingZeros/1ad138.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/countTrailingZeros/1ad138.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/countTrailingZeros/1ad138.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/countTrailingZeros/1dc84a.wgsl b/test/tint/builtins/gen/literal/countTrailingZeros/1dc84a.wgsl
similarity index 96%
rename from test/tint/builtins/gen/countTrailingZeros/1dc84a.wgsl
rename to test/tint/builtins/gen/literal/countTrailingZeros/1dc84a.wgsl
index 1d30317f5b..0a6e556b27 100644
--- a/test/tint/builtins/gen/countTrailingZeros/1dc84a.wgsl
+++ b/test/tint/builtins/gen/literal/countTrailingZeros/1dc84a.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/countTrailingZeros/1dc84a.wgsl.expected.glsl b/test/tint/builtins/gen/literal/countTrailingZeros/1dc84a.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/countTrailingZeros/1dc84a.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/countTrailingZeros/1dc84a.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/countTrailingZeros/1dc84a.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/countTrailingZeros/1dc84a.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/countTrailingZeros/1dc84a.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/countTrailingZeros/1dc84a.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/countTrailingZeros/1dc84a.wgsl.expected.msl b/test/tint/builtins/gen/literal/countTrailingZeros/1dc84a.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/countTrailingZeros/1dc84a.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/countTrailingZeros/1dc84a.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/countTrailingZeros/1dc84a.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/countTrailingZeros/1dc84a.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/countTrailingZeros/1dc84a.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/countTrailingZeros/1dc84a.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/countTrailingZeros/1dc84a.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/countTrailingZeros/1dc84a.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/countTrailingZeros/1dc84a.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/countTrailingZeros/1dc84a.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/countTrailingZeros/21e394.wgsl b/test/tint/builtins/gen/literal/countTrailingZeros/21e394.wgsl
similarity index 96%
rename from test/tint/builtins/gen/countTrailingZeros/21e394.wgsl
rename to test/tint/builtins/gen/literal/countTrailingZeros/21e394.wgsl
index e2666714ca..114ae5752f 100644
--- a/test/tint/builtins/gen/countTrailingZeros/21e394.wgsl
+++ b/test/tint/builtins/gen/literal/countTrailingZeros/21e394.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/countTrailingZeros/21e394.wgsl.expected.glsl b/test/tint/builtins/gen/literal/countTrailingZeros/21e394.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/countTrailingZeros/21e394.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/countTrailingZeros/21e394.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/countTrailingZeros/21e394.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/countTrailingZeros/21e394.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/countTrailingZeros/21e394.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/countTrailingZeros/21e394.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/countTrailingZeros/21e394.wgsl.expected.msl b/test/tint/builtins/gen/literal/countTrailingZeros/21e394.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/countTrailingZeros/21e394.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/countTrailingZeros/21e394.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/countTrailingZeros/21e394.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/countTrailingZeros/21e394.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/countTrailingZeros/21e394.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/countTrailingZeros/21e394.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/countTrailingZeros/21e394.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/countTrailingZeros/21e394.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/countTrailingZeros/21e394.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/countTrailingZeros/21e394.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/countTrailingZeros/327c37.wgsl b/test/tint/builtins/gen/literal/countTrailingZeros/327c37.wgsl
similarity index 96%
rename from test/tint/builtins/gen/countTrailingZeros/327c37.wgsl
rename to test/tint/builtins/gen/literal/countTrailingZeros/327c37.wgsl
index 2aca57f61a..36f93b1a54 100644
--- a/test/tint/builtins/gen/countTrailingZeros/327c37.wgsl
+++ b/test/tint/builtins/gen/literal/countTrailingZeros/327c37.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/countTrailingZeros/327c37.wgsl.expected.glsl b/test/tint/builtins/gen/literal/countTrailingZeros/327c37.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/countTrailingZeros/327c37.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/countTrailingZeros/327c37.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/countTrailingZeros/327c37.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/countTrailingZeros/327c37.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/countTrailingZeros/327c37.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/countTrailingZeros/327c37.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/countTrailingZeros/327c37.wgsl.expected.msl b/test/tint/builtins/gen/literal/countTrailingZeros/327c37.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/countTrailingZeros/327c37.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/countTrailingZeros/327c37.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/countTrailingZeros/327c37.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/countTrailingZeros/327c37.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/countTrailingZeros/327c37.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/countTrailingZeros/327c37.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/countTrailingZeros/327c37.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/countTrailingZeros/327c37.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/countTrailingZeros/327c37.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/countTrailingZeros/327c37.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/countTrailingZeros/42fed6.wgsl b/test/tint/builtins/gen/literal/countTrailingZeros/42fed6.wgsl
similarity index 96%
rename from test/tint/builtins/gen/countTrailingZeros/42fed6.wgsl
rename to test/tint/builtins/gen/literal/countTrailingZeros/42fed6.wgsl
index 6006270964..178f96e678 100644
--- a/test/tint/builtins/gen/countTrailingZeros/42fed6.wgsl
+++ b/test/tint/builtins/gen/literal/countTrailingZeros/42fed6.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/countTrailingZeros/42fed6.wgsl.expected.glsl b/test/tint/builtins/gen/literal/countTrailingZeros/42fed6.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/countTrailingZeros/42fed6.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/countTrailingZeros/42fed6.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/countTrailingZeros/42fed6.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/countTrailingZeros/42fed6.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/countTrailingZeros/42fed6.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/countTrailingZeros/42fed6.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/countTrailingZeros/42fed6.wgsl.expected.msl b/test/tint/builtins/gen/literal/countTrailingZeros/42fed6.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/countTrailingZeros/42fed6.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/countTrailingZeros/42fed6.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/countTrailingZeros/42fed6.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/countTrailingZeros/42fed6.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/countTrailingZeros/42fed6.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/countTrailingZeros/42fed6.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/countTrailingZeros/42fed6.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/countTrailingZeros/42fed6.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/countTrailingZeros/42fed6.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/countTrailingZeros/42fed6.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/countTrailingZeros/8ed26f.wgsl b/test/tint/builtins/gen/literal/countTrailingZeros/8ed26f.wgsl
similarity index 96%
rename from test/tint/builtins/gen/countTrailingZeros/8ed26f.wgsl
rename to test/tint/builtins/gen/literal/countTrailingZeros/8ed26f.wgsl
index 967f8007fa..5e515f9fe3 100644
--- a/test/tint/builtins/gen/countTrailingZeros/8ed26f.wgsl
+++ b/test/tint/builtins/gen/literal/countTrailingZeros/8ed26f.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/countTrailingZeros/8ed26f.wgsl.expected.glsl b/test/tint/builtins/gen/literal/countTrailingZeros/8ed26f.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/countTrailingZeros/8ed26f.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/countTrailingZeros/8ed26f.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/countTrailingZeros/8ed26f.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/countTrailingZeros/8ed26f.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/countTrailingZeros/8ed26f.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/countTrailingZeros/8ed26f.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/countTrailingZeros/8ed26f.wgsl.expected.msl b/test/tint/builtins/gen/literal/countTrailingZeros/8ed26f.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/countTrailingZeros/8ed26f.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/countTrailingZeros/8ed26f.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/countTrailingZeros/8ed26f.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/countTrailingZeros/8ed26f.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/countTrailingZeros/8ed26f.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/countTrailingZeros/8ed26f.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/countTrailingZeros/8ed26f.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/countTrailingZeros/8ed26f.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/countTrailingZeros/8ed26f.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/countTrailingZeros/8ed26f.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/countTrailingZeros/acfacb.wgsl b/test/tint/builtins/gen/literal/countTrailingZeros/acfacb.wgsl
similarity index 96%
rename from test/tint/builtins/gen/countTrailingZeros/acfacb.wgsl
rename to test/tint/builtins/gen/literal/countTrailingZeros/acfacb.wgsl
index 3ba9cdeadb..59019eb38a 100644
--- a/test/tint/builtins/gen/countTrailingZeros/acfacb.wgsl
+++ b/test/tint/builtins/gen/literal/countTrailingZeros/acfacb.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/countTrailingZeros/acfacb.wgsl.expected.glsl b/test/tint/builtins/gen/literal/countTrailingZeros/acfacb.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/countTrailingZeros/acfacb.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/countTrailingZeros/acfacb.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/countTrailingZeros/acfacb.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/countTrailingZeros/acfacb.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/countTrailingZeros/acfacb.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/countTrailingZeros/acfacb.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/countTrailingZeros/acfacb.wgsl.expected.msl b/test/tint/builtins/gen/literal/countTrailingZeros/acfacb.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/countTrailingZeros/acfacb.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/countTrailingZeros/acfacb.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/countTrailingZeros/acfacb.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/countTrailingZeros/acfacb.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/countTrailingZeros/acfacb.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/countTrailingZeros/acfacb.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/countTrailingZeros/acfacb.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/countTrailingZeros/acfacb.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/countTrailingZeros/acfacb.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/countTrailingZeros/acfacb.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/countTrailingZeros/d2b4a0.wgsl b/test/tint/builtins/gen/literal/countTrailingZeros/d2b4a0.wgsl
similarity index 96%
rename from test/tint/builtins/gen/countTrailingZeros/d2b4a0.wgsl
rename to test/tint/builtins/gen/literal/countTrailingZeros/d2b4a0.wgsl
index 71eb20dda5..4ce8b4deb4 100644
--- a/test/tint/builtins/gen/countTrailingZeros/d2b4a0.wgsl
+++ b/test/tint/builtins/gen/literal/countTrailingZeros/d2b4a0.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/countTrailingZeros/d2b4a0.wgsl.expected.glsl b/test/tint/builtins/gen/literal/countTrailingZeros/d2b4a0.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/countTrailingZeros/d2b4a0.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/countTrailingZeros/d2b4a0.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/countTrailingZeros/d2b4a0.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/countTrailingZeros/d2b4a0.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/countTrailingZeros/d2b4a0.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/countTrailingZeros/d2b4a0.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/countTrailingZeros/d2b4a0.wgsl.expected.msl b/test/tint/builtins/gen/literal/countTrailingZeros/d2b4a0.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/countTrailingZeros/d2b4a0.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/countTrailingZeros/d2b4a0.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/countTrailingZeros/d2b4a0.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/countTrailingZeros/d2b4a0.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/countTrailingZeros/d2b4a0.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/countTrailingZeros/d2b4a0.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/countTrailingZeros/d2b4a0.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/countTrailingZeros/d2b4a0.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/countTrailingZeros/d2b4a0.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/countTrailingZeros/d2b4a0.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/cross/041cb0.wgsl b/test/tint/builtins/gen/literal/cross/041cb0.wgsl
similarity index 96%
rename from test/tint/builtins/gen/cross/041cb0.wgsl
rename to test/tint/builtins/gen/literal/cross/041cb0.wgsl
index 91dc4dd1cd..1d68e7c721 100644
--- a/test/tint/builtins/gen/cross/041cb0.wgsl
+++ b/test/tint/builtins/gen/literal/cross/041cb0.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/cross/041cb0.wgsl.expected.glsl b/test/tint/builtins/gen/literal/cross/041cb0.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/cross/041cb0.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/cross/041cb0.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/cross/041cb0.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/cross/041cb0.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/cross/041cb0.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/cross/041cb0.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/cross/041cb0.wgsl.expected.msl b/test/tint/builtins/gen/literal/cross/041cb0.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/cross/041cb0.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/cross/041cb0.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/cross/041cb0.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/cross/041cb0.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/cross/041cb0.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/cross/041cb0.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/cross/041cb0.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/cross/041cb0.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/cross/041cb0.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/cross/041cb0.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/degrees/0d170c.wgsl b/test/tint/builtins/gen/literal/degrees/0d170c.wgsl
similarity index 96%
rename from test/tint/builtins/gen/degrees/0d170c.wgsl
rename to test/tint/builtins/gen/literal/degrees/0d170c.wgsl
index ea8d9b0eac..eb220638fd 100644
--- a/test/tint/builtins/gen/degrees/0d170c.wgsl
+++ b/test/tint/builtins/gen/literal/degrees/0d170c.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/degrees/0d170c.wgsl.expected.glsl b/test/tint/builtins/gen/literal/degrees/0d170c.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/degrees/0d170c.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/degrees/0d170c.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/degrees/0d170c.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/degrees/0d170c.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/degrees/0d170c.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/degrees/0d170c.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/degrees/0d170c.wgsl.expected.msl b/test/tint/builtins/gen/literal/degrees/0d170c.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/degrees/0d170c.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/degrees/0d170c.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/degrees/0d170c.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/degrees/0d170c.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/degrees/0d170c.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/degrees/0d170c.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/degrees/0d170c.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/degrees/0d170c.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/degrees/0d170c.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/degrees/0d170c.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/degrees/1ad5df.wgsl b/test/tint/builtins/gen/literal/degrees/1ad5df.wgsl
similarity index 96%
rename from test/tint/builtins/gen/degrees/1ad5df.wgsl
rename to test/tint/builtins/gen/literal/degrees/1ad5df.wgsl
index 5aefd49f09..a0dac14b9c 100644
--- a/test/tint/builtins/gen/degrees/1ad5df.wgsl
+++ b/test/tint/builtins/gen/literal/degrees/1ad5df.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/degrees/1ad5df.wgsl.expected.glsl b/test/tint/builtins/gen/literal/degrees/1ad5df.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/degrees/1ad5df.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/degrees/1ad5df.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/degrees/1ad5df.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/degrees/1ad5df.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/degrees/1ad5df.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/degrees/1ad5df.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/degrees/1ad5df.wgsl.expected.msl b/test/tint/builtins/gen/literal/degrees/1ad5df.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/degrees/1ad5df.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/degrees/1ad5df.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/degrees/1ad5df.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/degrees/1ad5df.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/degrees/1ad5df.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/degrees/1ad5df.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/degrees/1ad5df.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/degrees/1ad5df.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/degrees/1ad5df.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/degrees/1ad5df.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/degrees/2af623.wgsl b/test/tint/builtins/gen/literal/degrees/2af623.wgsl
similarity index 96%
rename from test/tint/builtins/gen/degrees/2af623.wgsl
rename to test/tint/builtins/gen/literal/degrees/2af623.wgsl
index a348fb1d59..b01e1a6981 100644
--- a/test/tint/builtins/gen/degrees/2af623.wgsl
+++ b/test/tint/builtins/gen/literal/degrees/2af623.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/degrees/2af623.wgsl.expected.glsl b/test/tint/builtins/gen/literal/degrees/2af623.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/degrees/2af623.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/degrees/2af623.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/degrees/2af623.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/degrees/2af623.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/degrees/2af623.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/degrees/2af623.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/degrees/2af623.wgsl.expected.msl b/test/tint/builtins/gen/literal/degrees/2af623.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/degrees/2af623.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/degrees/2af623.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/degrees/2af623.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/degrees/2af623.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/degrees/2af623.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/degrees/2af623.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/degrees/2af623.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/degrees/2af623.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/degrees/2af623.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/degrees/2af623.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/degrees/51f705.wgsl b/test/tint/builtins/gen/literal/degrees/51f705.wgsl
similarity index 96%
rename from test/tint/builtins/gen/degrees/51f705.wgsl
rename to test/tint/builtins/gen/literal/degrees/51f705.wgsl
index 54b7f32da7..3ff7ecec84 100644
--- a/test/tint/builtins/gen/degrees/51f705.wgsl
+++ b/test/tint/builtins/gen/literal/degrees/51f705.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/degrees/51f705.wgsl.expected.glsl b/test/tint/builtins/gen/literal/degrees/51f705.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/degrees/51f705.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/degrees/51f705.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/degrees/51f705.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/degrees/51f705.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/degrees/51f705.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/degrees/51f705.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/degrees/51f705.wgsl.expected.msl b/test/tint/builtins/gen/literal/degrees/51f705.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/degrees/51f705.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/degrees/51f705.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/degrees/51f705.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/degrees/51f705.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/degrees/51f705.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/degrees/51f705.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/degrees/51f705.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/degrees/51f705.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/degrees/51f705.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/degrees/51f705.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/determinant/2b62ba.wgsl b/test/tint/builtins/gen/literal/determinant/2b62ba.wgsl
similarity index 96%
rename from test/tint/builtins/gen/determinant/2b62ba.wgsl
rename to test/tint/builtins/gen/literal/determinant/2b62ba.wgsl
index c409909e61..8c5b626471 100644
--- a/test/tint/builtins/gen/determinant/2b62ba.wgsl
+++ b/test/tint/builtins/gen/literal/determinant/2b62ba.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/determinant/2b62ba.wgsl.expected.glsl b/test/tint/builtins/gen/literal/determinant/2b62ba.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/determinant/2b62ba.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/determinant/2b62ba.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/determinant/2b62ba.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/determinant/2b62ba.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/determinant/2b62ba.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/determinant/2b62ba.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/determinant/2b62ba.wgsl.expected.msl b/test/tint/builtins/gen/literal/determinant/2b62ba.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/determinant/2b62ba.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/determinant/2b62ba.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/determinant/2b62ba.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/determinant/2b62ba.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/determinant/2b62ba.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/determinant/2b62ba.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/determinant/2b62ba.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/determinant/2b62ba.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/determinant/2b62ba.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/determinant/2b62ba.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/determinant/a0a87c.wgsl b/test/tint/builtins/gen/literal/determinant/a0a87c.wgsl
similarity index 96%
rename from test/tint/builtins/gen/determinant/a0a87c.wgsl
rename to test/tint/builtins/gen/literal/determinant/a0a87c.wgsl
index e247511828..541f546e27 100644
--- a/test/tint/builtins/gen/determinant/a0a87c.wgsl
+++ b/test/tint/builtins/gen/literal/determinant/a0a87c.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/determinant/a0a87c.wgsl.expected.glsl b/test/tint/builtins/gen/literal/determinant/a0a87c.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/determinant/a0a87c.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/determinant/a0a87c.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/determinant/a0a87c.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/determinant/a0a87c.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/determinant/a0a87c.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/determinant/a0a87c.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/determinant/a0a87c.wgsl.expected.msl b/test/tint/builtins/gen/literal/determinant/a0a87c.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/determinant/a0a87c.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/determinant/a0a87c.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/determinant/a0a87c.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/determinant/a0a87c.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/determinant/a0a87c.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/determinant/a0a87c.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/determinant/a0a87c.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/determinant/a0a87c.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/determinant/a0a87c.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/determinant/a0a87c.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/determinant/e19305.wgsl b/test/tint/builtins/gen/literal/determinant/e19305.wgsl
similarity index 96%
rename from test/tint/builtins/gen/determinant/e19305.wgsl
rename to test/tint/builtins/gen/literal/determinant/e19305.wgsl
index 65866818ae..18cc6b2374 100644
--- a/test/tint/builtins/gen/determinant/e19305.wgsl
+++ b/test/tint/builtins/gen/literal/determinant/e19305.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/determinant/e19305.wgsl.expected.glsl b/test/tint/builtins/gen/literal/determinant/e19305.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/determinant/e19305.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/determinant/e19305.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/determinant/e19305.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/determinant/e19305.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/determinant/e19305.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/determinant/e19305.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/determinant/e19305.wgsl.expected.msl b/test/tint/builtins/gen/literal/determinant/e19305.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/determinant/e19305.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/determinant/e19305.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/determinant/e19305.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/determinant/e19305.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/determinant/e19305.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/determinant/e19305.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/determinant/e19305.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/determinant/e19305.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/determinant/e19305.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/determinant/e19305.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/distance/0657d4.wgsl b/test/tint/builtins/gen/literal/distance/0657d4.wgsl
similarity index 96%
rename from test/tint/builtins/gen/distance/0657d4.wgsl
rename to test/tint/builtins/gen/literal/distance/0657d4.wgsl
index 760f0038f2..a0b3af80d3 100644
--- a/test/tint/builtins/gen/distance/0657d4.wgsl
+++ b/test/tint/builtins/gen/literal/distance/0657d4.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/distance/0657d4.wgsl.expected.glsl b/test/tint/builtins/gen/literal/distance/0657d4.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/distance/0657d4.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/distance/0657d4.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/distance/0657d4.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/distance/0657d4.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/distance/0657d4.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/distance/0657d4.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/distance/0657d4.wgsl.expected.msl b/test/tint/builtins/gen/literal/distance/0657d4.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/distance/0657d4.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/distance/0657d4.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/distance/0657d4.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/distance/0657d4.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/distance/0657d4.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/distance/0657d4.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/distance/0657d4.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/distance/0657d4.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/distance/0657d4.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/distance/0657d4.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/distance/9646ea.wgsl b/test/tint/builtins/gen/literal/distance/9646ea.wgsl
similarity index 96%
rename from test/tint/builtins/gen/distance/9646ea.wgsl
rename to test/tint/builtins/gen/literal/distance/9646ea.wgsl
index d4ff160ee3..3b8aa55099 100644
--- a/test/tint/builtins/gen/distance/9646ea.wgsl
+++ b/test/tint/builtins/gen/literal/distance/9646ea.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/distance/9646ea.wgsl.expected.glsl b/test/tint/builtins/gen/literal/distance/9646ea.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/distance/9646ea.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/distance/9646ea.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/distance/9646ea.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/distance/9646ea.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/distance/9646ea.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/distance/9646ea.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/distance/9646ea.wgsl.expected.msl b/test/tint/builtins/gen/literal/distance/9646ea.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/distance/9646ea.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/distance/9646ea.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/distance/9646ea.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/distance/9646ea.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/distance/9646ea.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/distance/9646ea.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/distance/9646ea.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/distance/9646ea.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/distance/9646ea.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/distance/9646ea.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/distance/aa4055.wgsl b/test/tint/builtins/gen/literal/distance/aa4055.wgsl
similarity index 96%
rename from test/tint/builtins/gen/distance/aa4055.wgsl
rename to test/tint/builtins/gen/literal/distance/aa4055.wgsl
index 742f5766ba..71334d58de 100644
--- a/test/tint/builtins/gen/distance/aa4055.wgsl
+++ b/test/tint/builtins/gen/literal/distance/aa4055.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/distance/aa4055.wgsl.expected.glsl b/test/tint/builtins/gen/literal/distance/aa4055.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/distance/aa4055.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/distance/aa4055.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/distance/aa4055.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/distance/aa4055.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/distance/aa4055.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/distance/aa4055.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/distance/aa4055.wgsl.expected.msl b/test/tint/builtins/gen/literal/distance/aa4055.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/distance/aa4055.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/distance/aa4055.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/distance/aa4055.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/distance/aa4055.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/distance/aa4055.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/distance/aa4055.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/distance/aa4055.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/distance/aa4055.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/distance/aa4055.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/distance/aa4055.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/distance/cfed73.wgsl b/test/tint/builtins/gen/literal/distance/cfed73.wgsl
similarity index 96%
rename from test/tint/builtins/gen/distance/cfed73.wgsl
rename to test/tint/builtins/gen/literal/distance/cfed73.wgsl
index ab06206079..c7fe4c53d7 100644
--- a/test/tint/builtins/gen/distance/cfed73.wgsl
+++ b/test/tint/builtins/gen/literal/distance/cfed73.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/distance/cfed73.wgsl.expected.glsl b/test/tint/builtins/gen/literal/distance/cfed73.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/distance/cfed73.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/distance/cfed73.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/distance/cfed73.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/distance/cfed73.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/distance/cfed73.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/distance/cfed73.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/distance/cfed73.wgsl.expected.msl b/test/tint/builtins/gen/literal/distance/cfed73.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/distance/cfed73.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/distance/cfed73.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/distance/cfed73.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/distance/cfed73.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/distance/cfed73.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/distance/cfed73.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/distance/cfed73.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/distance/cfed73.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/distance/cfed73.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/distance/cfed73.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/dot/0c577b.wgsl b/test/tint/builtins/gen/literal/dot/0c577b.wgsl
similarity index 96%
rename from test/tint/builtins/gen/dot/0c577b.wgsl
rename to test/tint/builtins/gen/literal/dot/0c577b.wgsl
index 4580e0ddf3..e48b6697fa 100644
--- a/test/tint/builtins/gen/dot/0c577b.wgsl
+++ b/test/tint/builtins/gen/literal/dot/0c577b.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/dot/0c577b.wgsl.expected.glsl b/test/tint/builtins/gen/literal/dot/0c577b.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/dot/0c577b.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/dot/0c577b.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/dot/0c577b.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/dot/0c577b.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/dot/0c577b.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/dot/0c577b.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/dot/0c577b.wgsl.expected.msl b/test/tint/builtins/gen/literal/dot/0c577b.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/dot/0c577b.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/dot/0c577b.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/dot/0c577b.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/dot/0c577b.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/dot/0c577b.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/dot/0c577b.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/dot/0c577b.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/dot/0c577b.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/dot/0c577b.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/dot/0c577b.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/dot/7548a0.wgsl b/test/tint/builtins/gen/literal/dot/7548a0.wgsl
similarity index 96%
rename from test/tint/builtins/gen/dot/7548a0.wgsl
rename to test/tint/builtins/gen/literal/dot/7548a0.wgsl
index 2b0fccf76f..567e340004 100644
--- a/test/tint/builtins/gen/dot/7548a0.wgsl
+++ b/test/tint/builtins/gen/literal/dot/7548a0.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/dot/7548a0.wgsl.expected.glsl b/test/tint/builtins/gen/literal/dot/7548a0.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/dot/7548a0.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/dot/7548a0.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/dot/7548a0.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/dot/7548a0.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/dot/7548a0.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/dot/7548a0.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/dot/7548a0.wgsl.expected.msl b/test/tint/builtins/gen/literal/dot/7548a0.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/dot/7548a0.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/dot/7548a0.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/dot/7548a0.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/dot/7548a0.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/dot/7548a0.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/dot/7548a0.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/dot/7548a0.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/dot/7548a0.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/dot/7548a0.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/dot/7548a0.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/dot/883f0e.wgsl b/test/tint/builtins/gen/literal/dot/883f0e.wgsl
similarity index 96%
rename from test/tint/builtins/gen/dot/883f0e.wgsl
rename to test/tint/builtins/gen/literal/dot/883f0e.wgsl
index 06618c1083..fbf13b5b06 100644
--- a/test/tint/builtins/gen/dot/883f0e.wgsl
+++ b/test/tint/builtins/gen/literal/dot/883f0e.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/dot/883f0e.wgsl.expected.glsl b/test/tint/builtins/gen/literal/dot/883f0e.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/dot/883f0e.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/dot/883f0e.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/dot/883f0e.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/dot/883f0e.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/dot/883f0e.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/dot/883f0e.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/dot/883f0e.wgsl.expected.msl b/test/tint/builtins/gen/literal/dot/883f0e.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/dot/883f0e.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/dot/883f0e.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/dot/883f0e.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/dot/883f0e.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/dot/883f0e.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/dot/883f0e.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/dot/883f0e.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/dot/883f0e.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/dot/883f0e.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/dot/883f0e.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/dot/97c7ee.wgsl b/test/tint/builtins/gen/literal/dot/97c7ee.wgsl
similarity index 96%
rename from test/tint/builtins/gen/dot/97c7ee.wgsl
rename to test/tint/builtins/gen/literal/dot/97c7ee.wgsl
index d2dc8a4b7a..f802cca771 100644
--- a/test/tint/builtins/gen/dot/97c7ee.wgsl
+++ b/test/tint/builtins/gen/literal/dot/97c7ee.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/dot/97c7ee.wgsl.expected.glsl b/test/tint/builtins/gen/literal/dot/97c7ee.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/dot/97c7ee.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/dot/97c7ee.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/dot/97c7ee.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/dot/97c7ee.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/dot/97c7ee.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/dot/97c7ee.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/dot/97c7ee.wgsl.expected.msl b/test/tint/builtins/gen/literal/dot/97c7ee.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/dot/97c7ee.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/dot/97c7ee.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/dot/97c7ee.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/dot/97c7ee.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/dot/97c7ee.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/dot/97c7ee.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/dot/97c7ee.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/dot/97c7ee.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/dot/97c7ee.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/dot/97c7ee.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/dot/ba4246.wgsl b/test/tint/builtins/gen/literal/dot/ba4246.wgsl
similarity index 96%
rename from test/tint/builtins/gen/dot/ba4246.wgsl
rename to test/tint/builtins/gen/literal/dot/ba4246.wgsl
index 867556a357..ed2c792159 100644
--- a/test/tint/builtins/gen/dot/ba4246.wgsl
+++ b/test/tint/builtins/gen/literal/dot/ba4246.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/dot/ba4246.wgsl.expected.glsl b/test/tint/builtins/gen/literal/dot/ba4246.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/dot/ba4246.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/dot/ba4246.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/dot/ba4246.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/dot/ba4246.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/dot/ba4246.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/dot/ba4246.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/dot/ba4246.wgsl.expected.msl b/test/tint/builtins/gen/literal/dot/ba4246.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/dot/ba4246.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/dot/ba4246.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/dot/ba4246.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/dot/ba4246.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/dot/ba4246.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/dot/ba4246.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/dot/ba4246.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/dot/ba4246.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/dot/ba4246.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/dot/ba4246.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/dot/e994c7.wgsl b/test/tint/builtins/gen/literal/dot/e994c7.wgsl
similarity index 96%
rename from test/tint/builtins/gen/dot/e994c7.wgsl
rename to test/tint/builtins/gen/literal/dot/e994c7.wgsl
index 02ce1d0e98..bbcfafb9e0 100644
--- a/test/tint/builtins/gen/dot/e994c7.wgsl
+++ b/test/tint/builtins/gen/literal/dot/e994c7.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/dot/e994c7.wgsl.expected.glsl b/test/tint/builtins/gen/literal/dot/e994c7.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/dot/e994c7.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/dot/e994c7.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/dot/e994c7.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/dot/e994c7.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/dot/e994c7.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/dot/e994c7.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/dot/e994c7.wgsl.expected.msl b/test/tint/builtins/gen/literal/dot/e994c7.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/dot/e994c7.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/dot/e994c7.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/dot/e994c7.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/dot/e994c7.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/dot/e994c7.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/dot/e994c7.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/dot/e994c7.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/dot/e994c7.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/dot/e994c7.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/dot/e994c7.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/dot/ef6b1d.wgsl b/test/tint/builtins/gen/literal/dot/ef6b1d.wgsl
similarity index 96%
rename from test/tint/builtins/gen/dot/ef6b1d.wgsl
rename to test/tint/builtins/gen/literal/dot/ef6b1d.wgsl
index be5a79e25f..2c73a7a7d3 100644
--- a/test/tint/builtins/gen/dot/ef6b1d.wgsl
+++ b/test/tint/builtins/gen/literal/dot/ef6b1d.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/dot/ef6b1d.wgsl.expected.glsl b/test/tint/builtins/gen/literal/dot/ef6b1d.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/dot/ef6b1d.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/dot/ef6b1d.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/dot/ef6b1d.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/dot/ef6b1d.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/dot/ef6b1d.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/dot/ef6b1d.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/dot/ef6b1d.wgsl.expected.msl b/test/tint/builtins/gen/literal/dot/ef6b1d.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/dot/ef6b1d.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/dot/ef6b1d.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/dot/ef6b1d.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/dot/ef6b1d.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/dot/ef6b1d.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/dot/ef6b1d.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/dot/ef6b1d.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/dot/ef6b1d.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/dot/ef6b1d.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/dot/ef6b1d.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/dot/f1312c.wgsl b/test/tint/builtins/gen/literal/dot/f1312c.wgsl
similarity index 96%
rename from test/tint/builtins/gen/dot/f1312c.wgsl
rename to test/tint/builtins/gen/literal/dot/f1312c.wgsl
index 32e1075e0d..7966682d7a 100644
--- a/test/tint/builtins/gen/dot/f1312c.wgsl
+++ b/test/tint/builtins/gen/literal/dot/f1312c.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/dot/f1312c.wgsl.expected.glsl b/test/tint/builtins/gen/literal/dot/f1312c.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/dot/f1312c.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/dot/f1312c.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/dot/f1312c.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/dot/f1312c.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/dot/f1312c.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/dot/f1312c.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/dot/f1312c.wgsl.expected.msl b/test/tint/builtins/gen/literal/dot/f1312c.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/dot/f1312c.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/dot/f1312c.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/dot/f1312c.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/dot/f1312c.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/dot/f1312c.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/dot/f1312c.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/dot/f1312c.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/dot/f1312c.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/dot/f1312c.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/dot/f1312c.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/dot/fc5f7c.wgsl b/test/tint/builtins/gen/literal/dot/fc5f7c.wgsl
similarity index 96%
rename from test/tint/builtins/gen/dot/fc5f7c.wgsl
rename to test/tint/builtins/gen/literal/dot/fc5f7c.wgsl
index 5cd141daea..a7d1354c47 100644
--- a/test/tint/builtins/gen/dot/fc5f7c.wgsl
+++ b/test/tint/builtins/gen/literal/dot/fc5f7c.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/dot/fc5f7c.wgsl.expected.glsl b/test/tint/builtins/gen/literal/dot/fc5f7c.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/dot/fc5f7c.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/dot/fc5f7c.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/dot/fc5f7c.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/dot/fc5f7c.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/dot/fc5f7c.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/dot/fc5f7c.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/dot/fc5f7c.wgsl.expected.msl b/test/tint/builtins/gen/literal/dot/fc5f7c.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/dot/fc5f7c.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/dot/fc5f7c.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/dot/fc5f7c.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/dot/fc5f7c.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/dot/fc5f7c.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/dot/fc5f7c.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/dot/fc5f7c.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/dot/fc5f7c.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/dot/fc5f7c.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/dot/fc5f7c.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/dpdx/0763f7.wgsl b/test/tint/builtins/gen/literal/dpdx/0763f7.wgsl
similarity index 96%
rename from test/tint/builtins/gen/dpdx/0763f7.wgsl
rename to test/tint/builtins/gen/literal/dpdx/0763f7.wgsl
index 8c44f2a8e9..0c0cfadf8a 100644
--- a/test/tint/builtins/gen/dpdx/0763f7.wgsl
+++ b/test/tint/builtins/gen/literal/dpdx/0763f7.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/dpdx/0763f7.wgsl.expected.glsl b/test/tint/builtins/gen/literal/dpdx/0763f7.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/dpdx/0763f7.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/dpdx/0763f7.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/dpdx/0763f7.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/dpdx/0763f7.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/dpdx/0763f7.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/dpdx/0763f7.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/dpdx/0763f7.wgsl.expected.msl b/test/tint/builtins/gen/literal/dpdx/0763f7.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/dpdx/0763f7.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/dpdx/0763f7.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/dpdx/0763f7.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/dpdx/0763f7.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/dpdx/0763f7.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/dpdx/0763f7.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/dpdx/0763f7.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/dpdx/0763f7.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/dpdx/0763f7.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/dpdx/0763f7.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/dpdx/99edb1.wgsl b/test/tint/builtins/gen/literal/dpdx/99edb1.wgsl
similarity index 96%
rename from test/tint/builtins/gen/dpdx/99edb1.wgsl
rename to test/tint/builtins/gen/literal/dpdx/99edb1.wgsl
index 3231b03f96..45393f10d7 100644
--- a/test/tint/builtins/gen/dpdx/99edb1.wgsl
+++ b/test/tint/builtins/gen/literal/dpdx/99edb1.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/dpdx/99edb1.wgsl.expected.glsl b/test/tint/builtins/gen/literal/dpdx/99edb1.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/dpdx/99edb1.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/dpdx/99edb1.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/dpdx/99edb1.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/dpdx/99edb1.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/dpdx/99edb1.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/dpdx/99edb1.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/dpdx/99edb1.wgsl.expected.msl b/test/tint/builtins/gen/literal/dpdx/99edb1.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/dpdx/99edb1.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/dpdx/99edb1.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/dpdx/99edb1.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/dpdx/99edb1.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/dpdx/99edb1.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/dpdx/99edb1.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/dpdx/99edb1.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/dpdx/99edb1.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/dpdx/99edb1.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/dpdx/99edb1.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/dpdx/c487fa.wgsl b/test/tint/builtins/gen/literal/dpdx/c487fa.wgsl
similarity index 96%
rename from test/tint/builtins/gen/dpdx/c487fa.wgsl
rename to test/tint/builtins/gen/literal/dpdx/c487fa.wgsl
index 857bad4ce8..c05487c268 100644
--- a/test/tint/builtins/gen/dpdx/c487fa.wgsl
+++ b/test/tint/builtins/gen/literal/dpdx/c487fa.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/dpdx/c487fa.wgsl.expected.glsl b/test/tint/builtins/gen/literal/dpdx/c487fa.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/dpdx/c487fa.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/dpdx/c487fa.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/dpdx/c487fa.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/dpdx/c487fa.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/dpdx/c487fa.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/dpdx/c487fa.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/dpdx/c487fa.wgsl.expected.msl b/test/tint/builtins/gen/literal/dpdx/c487fa.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/dpdx/c487fa.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/dpdx/c487fa.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/dpdx/c487fa.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/dpdx/c487fa.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/dpdx/c487fa.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/dpdx/c487fa.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/dpdx/c487fa.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/dpdx/c487fa.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/dpdx/c487fa.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/dpdx/c487fa.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/dpdx/e263de.wgsl b/test/tint/builtins/gen/literal/dpdx/e263de.wgsl
similarity index 96%
rename from test/tint/builtins/gen/dpdx/e263de.wgsl
rename to test/tint/builtins/gen/literal/dpdx/e263de.wgsl
index a95caa7ff8..f367bd52a9 100644
--- a/test/tint/builtins/gen/dpdx/e263de.wgsl
+++ b/test/tint/builtins/gen/literal/dpdx/e263de.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/dpdx/e263de.wgsl.expected.glsl b/test/tint/builtins/gen/literal/dpdx/e263de.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/dpdx/e263de.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/dpdx/e263de.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/dpdx/e263de.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/dpdx/e263de.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/dpdx/e263de.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/dpdx/e263de.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/dpdx/e263de.wgsl.expected.msl b/test/tint/builtins/gen/literal/dpdx/e263de.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/dpdx/e263de.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/dpdx/e263de.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/dpdx/e263de.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/dpdx/e263de.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/dpdx/e263de.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/dpdx/e263de.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/dpdx/e263de.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/dpdx/e263de.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/dpdx/e263de.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/dpdx/e263de.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/dpdxCoarse/029152.wgsl b/test/tint/builtins/gen/literal/dpdxCoarse/029152.wgsl
similarity index 96%
rename from test/tint/builtins/gen/dpdxCoarse/029152.wgsl
rename to test/tint/builtins/gen/literal/dpdxCoarse/029152.wgsl
index 86d126d404..c490c29c20 100644
--- a/test/tint/builtins/gen/dpdxCoarse/029152.wgsl
+++ b/test/tint/builtins/gen/literal/dpdxCoarse/029152.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/dpdxCoarse/029152.wgsl.expected.glsl b/test/tint/builtins/gen/literal/dpdxCoarse/029152.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/dpdxCoarse/029152.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/dpdxCoarse/029152.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/dpdxCoarse/029152.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/dpdxCoarse/029152.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/dpdxCoarse/029152.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/dpdxCoarse/029152.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/dpdxCoarse/029152.wgsl.expected.msl b/test/tint/builtins/gen/literal/dpdxCoarse/029152.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/dpdxCoarse/029152.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/dpdxCoarse/029152.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/dpdxCoarse/029152.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/dpdxCoarse/029152.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/dpdxCoarse/029152.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/dpdxCoarse/029152.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/dpdxCoarse/029152.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/dpdxCoarse/029152.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/dpdxCoarse/029152.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/dpdxCoarse/029152.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/dpdxCoarse/9581cf.wgsl b/test/tint/builtins/gen/literal/dpdxCoarse/9581cf.wgsl
similarity index 96%
rename from test/tint/builtins/gen/dpdxCoarse/9581cf.wgsl
rename to test/tint/builtins/gen/literal/dpdxCoarse/9581cf.wgsl
index 54dd7e45e4..864f0a1460 100644
--- a/test/tint/builtins/gen/dpdxCoarse/9581cf.wgsl
+++ b/test/tint/builtins/gen/literal/dpdxCoarse/9581cf.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/dpdxCoarse/9581cf.wgsl.expected.glsl b/test/tint/builtins/gen/literal/dpdxCoarse/9581cf.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/dpdxCoarse/9581cf.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/dpdxCoarse/9581cf.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/dpdxCoarse/9581cf.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/dpdxCoarse/9581cf.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/dpdxCoarse/9581cf.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/dpdxCoarse/9581cf.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/dpdxCoarse/9581cf.wgsl.expected.msl b/test/tint/builtins/gen/literal/dpdxCoarse/9581cf.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/dpdxCoarse/9581cf.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/dpdxCoarse/9581cf.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/dpdxCoarse/9581cf.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/dpdxCoarse/9581cf.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/dpdxCoarse/9581cf.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/dpdxCoarse/9581cf.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/dpdxCoarse/9581cf.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/dpdxCoarse/9581cf.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/dpdxCoarse/9581cf.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/dpdxCoarse/9581cf.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/dpdxCoarse/c28641.wgsl b/test/tint/builtins/gen/literal/dpdxCoarse/c28641.wgsl
similarity index 96%
rename from test/tint/builtins/gen/dpdxCoarse/c28641.wgsl
rename to test/tint/builtins/gen/literal/dpdxCoarse/c28641.wgsl
index 20ae7bfafe..98b2ca8943 100644
--- a/test/tint/builtins/gen/dpdxCoarse/c28641.wgsl
+++ b/test/tint/builtins/gen/literal/dpdxCoarse/c28641.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/dpdxCoarse/c28641.wgsl.expected.glsl b/test/tint/builtins/gen/literal/dpdxCoarse/c28641.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/dpdxCoarse/c28641.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/dpdxCoarse/c28641.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/dpdxCoarse/c28641.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/dpdxCoarse/c28641.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/dpdxCoarse/c28641.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/dpdxCoarse/c28641.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/dpdxCoarse/c28641.wgsl.expected.msl b/test/tint/builtins/gen/literal/dpdxCoarse/c28641.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/dpdxCoarse/c28641.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/dpdxCoarse/c28641.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/dpdxCoarse/c28641.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/dpdxCoarse/c28641.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/dpdxCoarse/c28641.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/dpdxCoarse/c28641.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/dpdxCoarse/c28641.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/dpdxCoarse/c28641.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/dpdxCoarse/c28641.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/dpdxCoarse/c28641.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/dpdxCoarse/f64d7b.wgsl b/test/tint/builtins/gen/literal/dpdxCoarse/f64d7b.wgsl
similarity index 96%
rename from test/tint/builtins/gen/dpdxCoarse/f64d7b.wgsl
rename to test/tint/builtins/gen/literal/dpdxCoarse/f64d7b.wgsl
index 81681e566c..b9e6721fb2 100644
--- a/test/tint/builtins/gen/dpdxCoarse/f64d7b.wgsl
+++ b/test/tint/builtins/gen/literal/dpdxCoarse/f64d7b.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/dpdxCoarse/f64d7b.wgsl.expected.glsl b/test/tint/builtins/gen/literal/dpdxCoarse/f64d7b.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/dpdxCoarse/f64d7b.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/dpdxCoarse/f64d7b.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/dpdxCoarse/f64d7b.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/dpdxCoarse/f64d7b.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/dpdxCoarse/f64d7b.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/dpdxCoarse/f64d7b.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/dpdxCoarse/f64d7b.wgsl.expected.msl b/test/tint/builtins/gen/literal/dpdxCoarse/f64d7b.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/dpdxCoarse/f64d7b.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/dpdxCoarse/f64d7b.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/dpdxCoarse/f64d7b.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/dpdxCoarse/f64d7b.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/dpdxCoarse/f64d7b.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/dpdxCoarse/f64d7b.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/dpdxCoarse/f64d7b.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/dpdxCoarse/f64d7b.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/dpdxCoarse/f64d7b.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/dpdxCoarse/f64d7b.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/dpdxFine/8c5069.wgsl b/test/tint/builtins/gen/literal/dpdxFine/8c5069.wgsl
similarity index 96%
rename from test/tint/builtins/gen/dpdxFine/8c5069.wgsl
rename to test/tint/builtins/gen/literal/dpdxFine/8c5069.wgsl
index 1b4274d8dc..55e5fdd02f 100644
--- a/test/tint/builtins/gen/dpdxFine/8c5069.wgsl
+++ b/test/tint/builtins/gen/literal/dpdxFine/8c5069.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/dpdxFine/8c5069.wgsl.expected.glsl b/test/tint/builtins/gen/literal/dpdxFine/8c5069.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/dpdxFine/8c5069.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/dpdxFine/8c5069.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/dpdxFine/8c5069.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/dpdxFine/8c5069.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/dpdxFine/8c5069.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/dpdxFine/8c5069.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/dpdxFine/8c5069.wgsl.expected.msl b/test/tint/builtins/gen/literal/dpdxFine/8c5069.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/dpdxFine/8c5069.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/dpdxFine/8c5069.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/dpdxFine/8c5069.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/dpdxFine/8c5069.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/dpdxFine/8c5069.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/dpdxFine/8c5069.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/dpdxFine/8c5069.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/dpdxFine/8c5069.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/dpdxFine/8c5069.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/dpdxFine/8c5069.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/dpdxFine/9631de.wgsl b/test/tint/builtins/gen/literal/dpdxFine/9631de.wgsl
similarity index 96%
rename from test/tint/builtins/gen/dpdxFine/9631de.wgsl
rename to test/tint/builtins/gen/literal/dpdxFine/9631de.wgsl
index 847a81cf3b..96f4ef3852 100644
--- a/test/tint/builtins/gen/dpdxFine/9631de.wgsl
+++ b/test/tint/builtins/gen/literal/dpdxFine/9631de.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/dpdxFine/9631de.wgsl.expected.glsl b/test/tint/builtins/gen/literal/dpdxFine/9631de.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/dpdxFine/9631de.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/dpdxFine/9631de.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/dpdxFine/9631de.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/dpdxFine/9631de.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/dpdxFine/9631de.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/dpdxFine/9631de.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/dpdxFine/9631de.wgsl.expected.msl b/test/tint/builtins/gen/literal/dpdxFine/9631de.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/dpdxFine/9631de.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/dpdxFine/9631de.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/dpdxFine/9631de.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/dpdxFine/9631de.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/dpdxFine/9631de.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/dpdxFine/9631de.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/dpdxFine/9631de.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/dpdxFine/9631de.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/dpdxFine/9631de.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/dpdxFine/9631de.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/dpdxFine/f401a2.wgsl b/test/tint/builtins/gen/literal/dpdxFine/f401a2.wgsl
similarity index 96%
rename from test/tint/builtins/gen/dpdxFine/f401a2.wgsl
rename to test/tint/builtins/gen/literal/dpdxFine/f401a2.wgsl
index de0a8b28f5..0c287599ab 100644
--- a/test/tint/builtins/gen/dpdxFine/f401a2.wgsl
+++ b/test/tint/builtins/gen/literal/dpdxFine/f401a2.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/dpdxFine/f401a2.wgsl.expected.glsl b/test/tint/builtins/gen/literal/dpdxFine/f401a2.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/dpdxFine/f401a2.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/dpdxFine/f401a2.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/dpdxFine/f401a2.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/dpdxFine/f401a2.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/dpdxFine/f401a2.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/dpdxFine/f401a2.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/dpdxFine/f401a2.wgsl.expected.msl b/test/tint/builtins/gen/literal/dpdxFine/f401a2.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/dpdxFine/f401a2.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/dpdxFine/f401a2.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/dpdxFine/f401a2.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/dpdxFine/f401a2.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/dpdxFine/f401a2.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/dpdxFine/f401a2.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/dpdxFine/f401a2.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/dpdxFine/f401a2.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/dpdxFine/f401a2.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/dpdxFine/f401a2.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/dpdxFine/f92fb6.wgsl b/test/tint/builtins/gen/literal/dpdxFine/f92fb6.wgsl
similarity index 96%
rename from test/tint/builtins/gen/dpdxFine/f92fb6.wgsl
rename to test/tint/builtins/gen/literal/dpdxFine/f92fb6.wgsl
index 85f9d43e62..c387414a17 100644
--- a/test/tint/builtins/gen/dpdxFine/f92fb6.wgsl
+++ b/test/tint/builtins/gen/literal/dpdxFine/f92fb6.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/dpdxFine/f92fb6.wgsl.expected.glsl b/test/tint/builtins/gen/literal/dpdxFine/f92fb6.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/dpdxFine/f92fb6.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/dpdxFine/f92fb6.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/dpdxFine/f92fb6.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/dpdxFine/f92fb6.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/dpdxFine/f92fb6.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/dpdxFine/f92fb6.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/dpdxFine/f92fb6.wgsl.expected.msl b/test/tint/builtins/gen/literal/dpdxFine/f92fb6.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/dpdxFine/f92fb6.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/dpdxFine/f92fb6.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/dpdxFine/f92fb6.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/dpdxFine/f92fb6.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/dpdxFine/f92fb6.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/dpdxFine/f92fb6.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/dpdxFine/f92fb6.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/dpdxFine/f92fb6.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/dpdxFine/f92fb6.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/dpdxFine/f92fb6.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/dpdy/699a05.wgsl b/test/tint/builtins/gen/literal/dpdy/699a05.wgsl
similarity index 96%
rename from test/tint/builtins/gen/dpdy/699a05.wgsl
rename to test/tint/builtins/gen/literal/dpdy/699a05.wgsl
index b2255a01e7..14025bc84d 100644
--- a/test/tint/builtins/gen/dpdy/699a05.wgsl
+++ b/test/tint/builtins/gen/literal/dpdy/699a05.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/dpdy/699a05.wgsl.expected.glsl b/test/tint/builtins/gen/literal/dpdy/699a05.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/dpdy/699a05.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/dpdy/699a05.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/dpdy/699a05.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/dpdy/699a05.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/dpdy/699a05.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/dpdy/699a05.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/dpdy/699a05.wgsl.expected.msl b/test/tint/builtins/gen/literal/dpdy/699a05.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/dpdy/699a05.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/dpdy/699a05.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/dpdy/699a05.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/dpdy/699a05.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/dpdy/699a05.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/dpdy/699a05.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/dpdy/699a05.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/dpdy/699a05.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/dpdy/699a05.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/dpdy/699a05.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/dpdy/7f8d84.wgsl b/test/tint/builtins/gen/literal/dpdy/7f8d84.wgsl
similarity index 96%
rename from test/tint/builtins/gen/dpdy/7f8d84.wgsl
rename to test/tint/builtins/gen/literal/dpdy/7f8d84.wgsl
index 00fe00e435..4d2fb93ac1 100644
--- a/test/tint/builtins/gen/dpdy/7f8d84.wgsl
+++ b/test/tint/builtins/gen/literal/dpdy/7f8d84.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/dpdy/7f8d84.wgsl.expected.glsl b/test/tint/builtins/gen/literal/dpdy/7f8d84.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/dpdy/7f8d84.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/dpdy/7f8d84.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/dpdy/7f8d84.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/dpdy/7f8d84.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/dpdy/7f8d84.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/dpdy/7f8d84.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/dpdy/7f8d84.wgsl.expected.msl b/test/tint/builtins/gen/literal/dpdy/7f8d84.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/dpdy/7f8d84.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/dpdy/7f8d84.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/dpdy/7f8d84.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/dpdy/7f8d84.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/dpdy/7f8d84.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/dpdy/7f8d84.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/dpdy/7f8d84.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/dpdy/7f8d84.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/dpdy/7f8d84.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/dpdy/7f8d84.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/dpdy/a8b56e.wgsl b/test/tint/builtins/gen/literal/dpdy/a8b56e.wgsl
similarity index 96%
rename from test/tint/builtins/gen/dpdy/a8b56e.wgsl
rename to test/tint/builtins/gen/literal/dpdy/a8b56e.wgsl
index e9fe4e6166..f7a51b3d3b 100644
--- a/test/tint/builtins/gen/dpdy/a8b56e.wgsl
+++ b/test/tint/builtins/gen/literal/dpdy/a8b56e.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/dpdy/a8b56e.wgsl.expected.glsl b/test/tint/builtins/gen/literal/dpdy/a8b56e.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/dpdy/a8b56e.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/dpdy/a8b56e.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/dpdy/a8b56e.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/dpdy/a8b56e.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/dpdy/a8b56e.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/dpdy/a8b56e.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/dpdy/a8b56e.wgsl.expected.msl b/test/tint/builtins/gen/literal/dpdy/a8b56e.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/dpdy/a8b56e.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/dpdy/a8b56e.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/dpdy/a8b56e.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/dpdy/a8b56e.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/dpdy/a8b56e.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/dpdy/a8b56e.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/dpdy/a8b56e.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/dpdy/a8b56e.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/dpdy/a8b56e.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/dpdy/a8b56e.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/dpdy/feb40f.wgsl b/test/tint/builtins/gen/literal/dpdy/feb40f.wgsl
similarity index 96%
rename from test/tint/builtins/gen/dpdy/feb40f.wgsl
rename to test/tint/builtins/gen/literal/dpdy/feb40f.wgsl
index 6e5626557d..ac9641c8c8 100644
--- a/test/tint/builtins/gen/dpdy/feb40f.wgsl
+++ b/test/tint/builtins/gen/literal/dpdy/feb40f.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/dpdy/feb40f.wgsl.expected.glsl b/test/tint/builtins/gen/literal/dpdy/feb40f.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/dpdy/feb40f.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/dpdy/feb40f.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/dpdy/feb40f.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/dpdy/feb40f.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/dpdy/feb40f.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/dpdy/feb40f.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/dpdy/feb40f.wgsl.expected.msl b/test/tint/builtins/gen/literal/dpdy/feb40f.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/dpdy/feb40f.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/dpdy/feb40f.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/dpdy/feb40f.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/dpdy/feb40f.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/dpdy/feb40f.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/dpdy/feb40f.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/dpdy/feb40f.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/dpdy/feb40f.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/dpdy/feb40f.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/dpdy/feb40f.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/dpdyCoarse/3e1ab4.wgsl b/test/tint/builtins/gen/literal/dpdyCoarse/3e1ab4.wgsl
similarity index 96%
rename from test/tint/builtins/gen/dpdyCoarse/3e1ab4.wgsl
rename to test/tint/builtins/gen/literal/dpdyCoarse/3e1ab4.wgsl
index e29e79462f..7e36fd049f 100644
--- a/test/tint/builtins/gen/dpdyCoarse/3e1ab4.wgsl
+++ b/test/tint/builtins/gen/literal/dpdyCoarse/3e1ab4.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/dpdyCoarse/3e1ab4.wgsl.expected.glsl b/test/tint/builtins/gen/literal/dpdyCoarse/3e1ab4.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/dpdyCoarse/3e1ab4.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/dpdyCoarse/3e1ab4.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/dpdyCoarse/3e1ab4.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/dpdyCoarse/3e1ab4.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/dpdyCoarse/3e1ab4.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/dpdyCoarse/3e1ab4.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/dpdyCoarse/3e1ab4.wgsl.expected.msl b/test/tint/builtins/gen/literal/dpdyCoarse/3e1ab4.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/dpdyCoarse/3e1ab4.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/dpdyCoarse/3e1ab4.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/dpdyCoarse/3e1ab4.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/dpdyCoarse/3e1ab4.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/dpdyCoarse/3e1ab4.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/dpdyCoarse/3e1ab4.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/dpdyCoarse/3e1ab4.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/dpdyCoarse/3e1ab4.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/dpdyCoarse/3e1ab4.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/dpdyCoarse/3e1ab4.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/dpdyCoarse/445d24.wgsl b/test/tint/builtins/gen/literal/dpdyCoarse/445d24.wgsl
similarity index 96%
rename from test/tint/builtins/gen/dpdyCoarse/445d24.wgsl
rename to test/tint/builtins/gen/literal/dpdyCoarse/445d24.wgsl
index 8f4045d88d..99ef18d45a 100644
--- a/test/tint/builtins/gen/dpdyCoarse/445d24.wgsl
+++ b/test/tint/builtins/gen/literal/dpdyCoarse/445d24.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/dpdyCoarse/445d24.wgsl.expected.glsl b/test/tint/builtins/gen/literal/dpdyCoarse/445d24.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/dpdyCoarse/445d24.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/dpdyCoarse/445d24.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/dpdyCoarse/445d24.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/dpdyCoarse/445d24.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/dpdyCoarse/445d24.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/dpdyCoarse/445d24.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/dpdyCoarse/445d24.wgsl.expected.msl b/test/tint/builtins/gen/literal/dpdyCoarse/445d24.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/dpdyCoarse/445d24.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/dpdyCoarse/445d24.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/dpdyCoarse/445d24.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/dpdyCoarse/445d24.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/dpdyCoarse/445d24.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/dpdyCoarse/445d24.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/dpdyCoarse/445d24.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/dpdyCoarse/445d24.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/dpdyCoarse/445d24.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/dpdyCoarse/445d24.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/dpdyCoarse/870a7e.wgsl b/test/tint/builtins/gen/literal/dpdyCoarse/870a7e.wgsl
similarity index 96%
rename from test/tint/builtins/gen/dpdyCoarse/870a7e.wgsl
rename to test/tint/builtins/gen/literal/dpdyCoarse/870a7e.wgsl
index ec41cef77c..f7cff8de7e 100644
--- a/test/tint/builtins/gen/dpdyCoarse/870a7e.wgsl
+++ b/test/tint/builtins/gen/literal/dpdyCoarse/870a7e.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/dpdyCoarse/870a7e.wgsl.expected.glsl b/test/tint/builtins/gen/literal/dpdyCoarse/870a7e.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/dpdyCoarse/870a7e.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/dpdyCoarse/870a7e.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/dpdyCoarse/870a7e.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/dpdyCoarse/870a7e.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/dpdyCoarse/870a7e.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/dpdyCoarse/870a7e.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/dpdyCoarse/870a7e.wgsl.expected.msl b/test/tint/builtins/gen/literal/dpdyCoarse/870a7e.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/dpdyCoarse/870a7e.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/dpdyCoarse/870a7e.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/dpdyCoarse/870a7e.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/dpdyCoarse/870a7e.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/dpdyCoarse/870a7e.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/dpdyCoarse/870a7e.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/dpdyCoarse/870a7e.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/dpdyCoarse/870a7e.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/dpdyCoarse/870a7e.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/dpdyCoarse/870a7e.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/dpdyCoarse/ae1873.wgsl b/test/tint/builtins/gen/literal/dpdyCoarse/ae1873.wgsl
similarity index 96%
rename from test/tint/builtins/gen/dpdyCoarse/ae1873.wgsl
rename to test/tint/builtins/gen/literal/dpdyCoarse/ae1873.wgsl
index ac3ea31393..f5d5fdb2ad 100644
--- a/test/tint/builtins/gen/dpdyCoarse/ae1873.wgsl
+++ b/test/tint/builtins/gen/literal/dpdyCoarse/ae1873.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/dpdyCoarse/ae1873.wgsl.expected.glsl b/test/tint/builtins/gen/literal/dpdyCoarse/ae1873.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/dpdyCoarse/ae1873.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/dpdyCoarse/ae1873.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/dpdyCoarse/ae1873.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/dpdyCoarse/ae1873.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/dpdyCoarse/ae1873.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/dpdyCoarse/ae1873.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/dpdyCoarse/ae1873.wgsl.expected.msl b/test/tint/builtins/gen/literal/dpdyCoarse/ae1873.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/dpdyCoarse/ae1873.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/dpdyCoarse/ae1873.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/dpdyCoarse/ae1873.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/dpdyCoarse/ae1873.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/dpdyCoarse/ae1873.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/dpdyCoarse/ae1873.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/dpdyCoarse/ae1873.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/dpdyCoarse/ae1873.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/dpdyCoarse/ae1873.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/dpdyCoarse/ae1873.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/dpdyFine/1fb7ab.wgsl b/test/tint/builtins/gen/literal/dpdyFine/1fb7ab.wgsl
similarity index 96%
rename from test/tint/builtins/gen/dpdyFine/1fb7ab.wgsl
rename to test/tint/builtins/gen/literal/dpdyFine/1fb7ab.wgsl
index fd7c18c267..ff40e48c32 100644
--- a/test/tint/builtins/gen/dpdyFine/1fb7ab.wgsl
+++ b/test/tint/builtins/gen/literal/dpdyFine/1fb7ab.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/dpdyFine/1fb7ab.wgsl.expected.glsl b/test/tint/builtins/gen/literal/dpdyFine/1fb7ab.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/dpdyFine/1fb7ab.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/dpdyFine/1fb7ab.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/dpdyFine/1fb7ab.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/dpdyFine/1fb7ab.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/dpdyFine/1fb7ab.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/dpdyFine/1fb7ab.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/dpdyFine/1fb7ab.wgsl.expected.msl b/test/tint/builtins/gen/literal/dpdyFine/1fb7ab.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/dpdyFine/1fb7ab.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/dpdyFine/1fb7ab.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/dpdyFine/1fb7ab.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/dpdyFine/1fb7ab.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/dpdyFine/1fb7ab.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/dpdyFine/1fb7ab.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/dpdyFine/1fb7ab.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/dpdyFine/1fb7ab.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/dpdyFine/1fb7ab.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/dpdyFine/1fb7ab.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/dpdyFine/6eb673.wgsl b/test/tint/builtins/gen/literal/dpdyFine/6eb673.wgsl
similarity index 96%
rename from test/tint/builtins/gen/dpdyFine/6eb673.wgsl
rename to test/tint/builtins/gen/literal/dpdyFine/6eb673.wgsl
index 2477a40ea3..67acf71c31 100644
--- a/test/tint/builtins/gen/dpdyFine/6eb673.wgsl
+++ b/test/tint/builtins/gen/literal/dpdyFine/6eb673.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/dpdyFine/6eb673.wgsl.expected.glsl b/test/tint/builtins/gen/literal/dpdyFine/6eb673.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/dpdyFine/6eb673.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/dpdyFine/6eb673.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/dpdyFine/6eb673.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/dpdyFine/6eb673.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/dpdyFine/6eb673.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/dpdyFine/6eb673.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/dpdyFine/6eb673.wgsl.expected.msl b/test/tint/builtins/gen/literal/dpdyFine/6eb673.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/dpdyFine/6eb673.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/dpdyFine/6eb673.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/dpdyFine/6eb673.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/dpdyFine/6eb673.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/dpdyFine/6eb673.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/dpdyFine/6eb673.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/dpdyFine/6eb673.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/dpdyFine/6eb673.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/dpdyFine/6eb673.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/dpdyFine/6eb673.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/dpdyFine/d0a648.wgsl b/test/tint/builtins/gen/literal/dpdyFine/d0a648.wgsl
similarity index 96%
rename from test/tint/builtins/gen/dpdyFine/d0a648.wgsl
rename to test/tint/builtins/gen/literal/dpdyFine/d0a648.wgsl
index 7bc1312364..9b0a079a01 100644
--- a/test/tint/builtins/gen/dpdyFine/d0a648.wgsl
+++ b/test/tint/builtins/gen/literal/dpdyFine/d0a648.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/dpdyFine/d0a648.wgsl.expected.glsl b/test/tint/builtins/gen/literal/dpdyFine/d0a648.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/dpdyFine/d0a648.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/dpdyFine/d0a648.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/dpdyFine/d0a648.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/dpdyFine/d0a648.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/dpdyFine/d0a648.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/dpdyFine/d0a648.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/dpdyFine/d0a648.wgsl.expected.msl b/test/tint/builtins/gen/literal/dpdyFine/d0a648.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/dpdyFine/d0a648.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/dpdyFine/d0a648.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/dpdyFine/d0a648.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/dpdyFine/d0a648.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/dpdyFine/d0a648.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/dpdyFine/d0a648.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/dpdyFine/d0a648.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/dpdyFine/d0a648.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/dpdyFine/d0a648.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/dpdyFine/d0a648.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/dpdyFine/df33aa.wgsl b/test/tint/builtins/gen/literal/dpdyFine/df33aa.wgsl
similarity index 96%
rename from test/tint/builtins/gen/dpdyFine/df33aa.wgsl
rename to test/tint/builtins/gen/literal/dpdyFine/df33aa.wgsl
index 0a10ff414e..1686e0d066 100644
--- a/test/tint/builtins/gen/dpdyFine/df33aa.wgsl
+++ b/test/tint/builtins/gen/literal/dpdyFine/df33aa.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/dpdyFine/df33aa.wgsl.expected.glsl b/test/tint/builtins/gen/literal/dpdyFine/df33aa.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/dpdyFine/df33aa.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/dpdyFine/df33aa.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/dpdyFine/df33aa.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/dpdyFine/df33aa.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/dpdyFine/df33aa.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/dpdyFine/df33aa.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/dpdyFine/df33aa.wgsl.expected.msl b/test/tint/builtins/gen/literal/dpdyFine/df33aa.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/dpdyFine/df33aa.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/dpdyFine/df33aa.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/dpdyFine/df33aa.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/dpdyFine/df33aa.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/dpdyFine/df33aa.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/dpdyFine/df33aa.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/dpdyFine/df33aa.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/dpdyFine/df33aa.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/dpdyFine/df33aa.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/dpdyFine/df33aa.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/exp/0f70eb.wgsl b/test/tint/builtins/gen/literal/exp/0f70eb.wgsl
similarity index 96%
rename from test/tint/builtins/gen/exp/0f70eb.wgsl
rename to test/tint/builtins/gen/literal/exp/0f70eb.wgsl
index c72f26dc52..7778d3fa82 100644
--- a/test/tint/builtins/gen/exp/0f70eb.wgsl
+++ b/test/tint/builtins/gen/literal/exp/0f70eb.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/exp/0f70eb.wgsl.expected.glsl b/test/tint/builtins/gen/literal/exp/0f70eb.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/exp/0f70eb.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/exp/0f70eb.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/exp/0f70eb.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/exp/0f70eb.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/exp/0f70eb.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/exp/0f70eb.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/exp/0f70eb.wgsl.expected.msl b/test/tint/builtins/gen/literal/exp/0f70eb.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/exp/0f70eb.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/exp/0f70eb.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/exp/0f70eb.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/exp/0f70eb.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/exp/0f70eb.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/exp/0f70eb.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/exp/0f70eb.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/exp/0f70eb.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/exp/0f70eb.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/exp/0f70eb.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/exp/1951e7.wgsl b/test/tint/builtins/gen/literal/exp/1951e7.wgsl
similarity index 96%
rename from test/tint/builtins/gen/exp/1951e7.wgsl
rename to test/tint/builtins/gen/literal/exp/1951e7.wgsl
index a7de999485..3f525c0451 100644
--- a/test/tint/builtins/gen/exp/1951e7.wgsl
+++ b/test/tint/builtins/gen/literal/exp/1951e7.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/exp/1951e7.wgsl.expected.glsl b/test/tint/builtins/gen/literal/exp/1951e7.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/exp/1951e7.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/exp/1951e7.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/exp/1951e7.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/exp/1951e7.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/exp/1951e7.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/exp/1951e7.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/exp/1951e7.wgsl.expected.msl b/test/tint/builtins/gen/literal/exp/1951e7.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/exp/1951e7.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/exp/1951e7.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/exp/1951e7.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/exp/1951e7.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/exp/1951e7.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/exp/1951e7.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/exp/1951e7.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/exp/1951e7.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/exp/1951e7.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/exp/1951e7.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/exp/771fd2.wgsl b/test/tint/builtins/gen/literal/exp/771fd2.wgsl
similarity index 96%
rename from test/tint/builtins/gen/exp/771fd2.wgsl
rename to test/tint/builtins/gen/literal/exp/771fd2.wgsl
index 9361a219b5..f5cb80262f 100644
--- a/test/tint/builtins/gen/exp/771fd2.wgsl
+++ b/test/tint/builtins/gen/literal/exp/771fd2.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/exp/771fd2.wgsl.expected.glsl b/test/tint/builtins/gen/literal/exp/771fd2.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/exp/771fd2.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/exp/771fd2.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/exp/771fd2.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/exp/771fd2.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/exp/771fd2.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/exp/771fd2.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/exp/771fd2.wgsl.expected.msl b/test/tint/builtins/gen/literal/exp/771fd2.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/exp/771fd2.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/exp/771fd2.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/exp/771fd2.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/exp/771fd2.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/exp/771fd2.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/exp/771fd2.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/exp/771fd2.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/exp/771fd2.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/exp/771fd2.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/exp/771fd2.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/exp/d98450.wgsl b/test/tint/builtins/gen/literal/exp/d98450.wgsl
similarity index 96%
rename from test/tint/builtins/gen/exp/d98450.wgsl
rename to test/tint/builtins/gen/literal/exp/d98450.wgsl
index d3d666f9a4..de9f54514f 100644
--- a/test/tint/builtins/gen/exp/d98450.wgsl
+++ b/test/tint/builtins/gen/literal/exp/d98450.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/exp/d98450.wgsl.expected.glsl b/test/tint/builtins/gen/literal/exp/d98450.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/exp/d98450.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/exp/d98450.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/exp/d98450.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/exp/d98450.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/exp/d98450.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/exp/d98450.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/exp/d98450.wgsl.expected.msl b/test/tint/builtins/gen/literal/exp/d98450.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/exp/d98450.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/exp/d98450.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/exp/d98450.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/exp/d98450.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/exp/d98450.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/exp/d98450.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/exp/d98450.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/exp/d98450.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/exp/d98450.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/exp/d98450.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/exp2/1f8680.wgsl b/test/tint/builtins/gen/literal/exp2/1f8680.wgsl
similarity index 96%
rename from test/tint/builtins/gen/exp2/1f8680.wgsl
rename to test/tint/builtins/gen/literal/exp2/1f8680.wgsl
index 334932c578..bd6cf52dc4 100644
--- a/test/tint/builtins/gen/exp2/1f8680.wgsl
+++ b/test/tint/builtins/gen/literal/exp2/1f8680.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/exp2/1f8680.wgsl.expected.glsl b/test/tint/builtins/gen/literal/exp2/1f8680.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/exp2/1f8680.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/exp2/1f8680.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/exp2/1f8680.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/exp2/1f8680.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/exp2/1f8680.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/exp2/1f8680.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/exp2/1f8680.wgsl.expected.msl b/test/tint/builtins/gen/literal/exp2/1f8680.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/exp2/1f8680.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/exp2/1f8680.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/exp2/1f8680.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/exp2/1f8680.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/exp2/1f8680.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/exp2/1f8680.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/exp2/1f8680.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/exp2/1f8680.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/exp2/1f8680.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/exp2/1f8680.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/exp2/a9d0a7.wgsl b/test/tint/builtins/gen/literal/exp2/a9d0a7.wgsl
similarity index 96%
rename from test/tint/builtins/gen/exp2/a9d0a7.wgsl
rename to test/tint/builtins/gen/literal/exp2/a9d0a7.wgsl
index 31bfbbbc40..6afd6dff42 100644
--- a/test/tint/builtins/gen/exp2/a9d0a7.wgsl
+++ b/test/tint/builtins/gen/literal/exp2/a9d0a7.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/exp2/a9d0a7.wgsl.expected.glsl b/test/tint/builtins/gen/literal/exp2/a9d0a7.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/exp2/a9d0a7.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/exp2/a9d0a7.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/exp2/a9d0a7.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/exp2/a9d0a7.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/exp2/a9d0a7.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/exp2/a9d0a7.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/exp2/a9d0a7.wgsl.expected.msl b/test/tint/builtins/gen/literal/exp2/a9d0a7.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/exp2/a9d0a7.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/exp2/a9d0a7.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/exp2/a9d0a7.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/exp2/a9d0a7.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/exp2/a9d0a7.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/exp2/a9d0a7.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/exp2/a9d0a7.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/exp2/a9d0a7.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/exp2/a9d0a7.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/exp2/a9d0a7.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/exp2/d6777c.wgsl b/test/tint/builtins/gen/literal/exp2/d6777c.wgsl
similarity index 96%
rename from test/tint/builtins/gen/exp2/d6777c.wgsl
rename to test/tint/builtins/gen/literal/exp2/d6777c.wgsl
index ee1044e335..f11932f756 100644
--- a/test/tint/builtins/gen/exp2/d6777c.wgsl
+++ b/test/tint/builtins/gen/literal/exp2/d6777c.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/exp2/d6777c.wgsl.expected.glsl b/test/tint/builtins/gen/literal/exp2/d6777c.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/exp2/d6777c.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/exp2/d6777c.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/exp2/d6777c.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/exp2/d6777c.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/exp2/d6777c.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/exp2/d6777c.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/exp2/d6777c.wgsl.expected.msl b/test/tint/builtins/gen/literal/exp2/d6777c.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/exp2/d6777c.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/exp2/d6777c.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/exp2/d6777c.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/exp2/d6777c.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/exp2/d6777c.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/exp2/d6777c.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/exp2/d6777c.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/exp2/d6777c.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/exp2/d6777c.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/exp2/d6777c.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/exp2/dea523.wgsl b/test/tint/builtins/gen/literal/exp2/dea523.wgsl
similarity index 96%
rename from test/tint/builtins/gen/exp2/dea523.wgsl
rename to test/tint/builtins/gen/literal/exp2/dea523.wgsl
index 65a879ccea..2930f5026e 100644
--- a/test/tint/builtins/gen/exp2/dea523.wgsl
+++ b/test/tint/builtins/gen/literal/exp2/dea523.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/exp2/dea523.wgsl.expected.glsl b/test/tint/builtins/gen/literal/exp2/dea523.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/exp2/dea523.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/exp2/dea523.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/exp2/dea523.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/exp2/dea523.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/exp2/dea523.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/exp2/dea523.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/exp2/dea523.wgsl.expected.msl b/test/tint/builtins/gen/literal/exp2/dea523.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/exp2/dea523.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/exp2/dea523.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/exp2/dea523.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/exp2/dea523.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/exp2/dea523.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/exp2/dea523.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/exp2/dea523.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/exp2/dea523.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/exp2/dea523.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/exp2/dea523.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/extractBits/12b197.wgsl b/test/tint/builtins/gen/literal/extractBits/12b197.wgsl
similarity index 96%
rename from test/tint/builtins/gen/extractBits/12b197.wgsl
rename to test/tint/builtins/gen/literal/extractBits/12b197.wgsl
index 7777e581e7..d67e896071 100644
--- a/test/tint/builtins/gen/extractBits/12b197.wgsl
+++ b/test/tint/builtins/gen/literal/extractBits/12b197.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/extractBits/12b197.wgsl.expected.glsl b/test/tint/builtins/gen/literal/extractBits/12b197.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/extractBits/12b197.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/extractBits/12b197.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/extractBits/12b197.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/extractBits/12b197.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/extractBits/12b197.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/extractBits/12b197.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/extractBits/12b197.wgsl.expected.msl b/test/tint/builtins/gen/literal/extractBits/12b197.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/extractBits/12b197.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/extractBits/12b197.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/extractBits/12b197.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/extractBits/12b197.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/extractBits/12b197.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/extractBits/12b197.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/extractBits/12b197.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/extractBits/12b197.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/extractBits/12b197.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/extractBits/12b197.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/extractBits/249874.wgsl b/test/tint/builtins/gen/literal/extractBits/249874.wgsl
similarity index 96%
rename from test/tint/builtins/gen/extractBits/249874.wgsl
rename to test/tint/builtins/gen/literal/extractBits/249874.wgsl
index 8f67de0771..dc06fb70db 100644
--- a/test/tint/builtins/gen/extractBits/249874.wgsl
+++ b/test/tint/builtins/gen/literal/extractBits/249874.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/extractBits/249874.wgsl.expected.glsl b/test/tint/builtins/gen/literal/extractBits/249874.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/extractBits/249874.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/extractBits/249874.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/extractBits/249874.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/extractBits/249874.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/extractBits/249874.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/extractBits/249874.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/extractBits/249874.wgsl.expected.msl b/test/tint/builtins/gen/literal/extractBits/249874.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/extractBits/249874.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/extractBits/249874.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/extractBits/249874.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/extractBits/249874.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/extractBits/249874.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/extractBits/249874.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/extractBits/249874.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/extractBits/249874.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/extractBits/249874.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/extractBits/249874.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/extractBits/631377.wgsl b/test/tint/builtins/gen/literal/extractBits/631377.wgsl
similarity index 96%
rename from test/tint/builtins/gen/extractBits/631377.wgsl
rename to test/tint/builtins/gen/literal/extractBits/631377.wgsl
index 824f5a41f9..ca0f97f413 100644
--- a/test/tint/builtins/gen/extractBits/631377.wgsl
+++ b/test/tint/builtins/gen/literal/extractBits/631377.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/extractBits/631377.wgsl.expected.glsl b/test/tint/builtins/gen/literal/extractBits/631377.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/extractBits/631377.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/extractBits/631377.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/extractBits/631377.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/extractBits/631377.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/extractBits/631377.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/extractBits/631377.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/extractBits/631377.wgsl.expected.msl b/test/tint/builtins/gen/literal/extractBits/631377.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/extractBits/631377.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/extractBits/631377.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/extractBits/631377.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/extractBits/631377.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/extractBits/631377.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/extractBits/631377.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/extractBits/631377.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/extractBits/631377.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/extractBits/631377.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/extractBits/631377.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/extractBits/a99a8d.wgsl b/test/tint/builtins/gen/literal/extractBits/a99a8d.wgsl
similarity index 96%
rename from test/tint/builtins/gen/extractBits/a99a8d.wgsl
rename to test/tint/builtins/gen/literal/extractBits/a99a8d.wgsl
index 7313723eb1..2e8fb05556 100644
--- a/test/tint/builtins/gen/extractBits/a99a8d.wgsl
+++ b/test/tint/builtins/gen/literal/extractBits/a99a8d.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/extractBits/a99a8d.wgsl.expected.glsl b/test/tint/builtins/gen/literal/extractBits/a99a8d.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/extractBits/a99a8d.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/extractBits/a99a8d.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/extractBits/a99a8d.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/extractBits/a99a8d.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/extractBits/a99a8d.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/extractBits/a99a8d.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/extractBits/a99a8d.wgsl.expected.msl b/test/tint/builtins/gen/literal/extractBits/a99a8d.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/extractBits/a99a8d.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/extractBits/a99a8d.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/extractBits/a99a8d.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/extractBits/a99a8d.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/extractBits/a99a8d.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/extractBits/a99a8d.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/extractBits/a99a8d.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/extractBits/a99a8d.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/extractBits/a99a8d.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/extractBits/a99a8d.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/extractBits/ce81f8.wgsl b/test/tint/builtins/gen/literal/extractBits/ce81f8.wgsl
similarity index 96%
rename from test/tint/builtins/gen/extractBits/ce81f8.wgsl
rename to test/tint/builtins/gen/literal/extractBits/ce81f8.wgsl
index c546e96b9f..c99a7c5421 100644
--- a/test/tint/builtins/gen/extractBits/ce81f8.wgsl
+++ b/test/tint/builtins/gen/literal/extractBits/ce81f8.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/extractBits/ce81f8.wgsl.expected.glsl b/test/tint/builtins/gen/literal/extractBits/ce81f8.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/extractBits/ce81f8.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/extractBits/ce81f8.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/extractBits/ce81f8.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/extractBits/ce81f8.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/extractBits/ce81f8.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/extractBits/ce81f8.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/extractBits/ce81f8.wgsl.expected.msl b/test/tint/builtins/gen/literal/extractBits/ce81f8.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/extractBits/ce81f8.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/extractBits/ce81f8.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/extractBits/ce81f8.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/extractBits/ce81f8.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/extractBits/ce81f8.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/extractBits/ce81f8.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/extractBits/ce81f8.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/extractBits/ce81f8.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/extractBits/ce81f8.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/extractBits/ce81f8.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/extractBits/e04f5d.wgsl b/test/tint/builtins/gen/literal/extractBits/e04f5d.wgsl
similarity index 96%
rename from test/tint/builtins/gen/extractBits/e04f5d.wgsl
rename to test/tint/builtins/gen/literal/extractBits/e04f5d.wgsl
index 783ae66ab6..858610192d 100644
--- a/test/tint/builtins/gen/extractBits/e04f5d.wgsl
+++ b/test/tint/builtins/gen/literal/extractBits/e04f5d.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/extractBits/e04f5d.wgsl.expected.glsl b/test/tint/builtins/gen/literal/extractBits/e04f5d.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/extractBits/e04f5d.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/extractBits/e04f5d.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/extractBits/e04f5d.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/extractBits/e04f5d.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/extractBits/e04f5d.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/extractBits/e04f5d.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/extractBits/e04f5d.wgsl.expected.msl b/test/tint/builtins/gen/literal/extractBits/e04f5d.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/extractBits/e04f5d.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/extractBits/e04f5d.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/extractBits/e04f5d.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/extractBits/e04f5d.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/extractBits/e04f5d.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/extractBits/e04f5d.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/extractBits/e04f5d.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/extractBits/e04f5d.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/extractBits/e04f5d.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/extractBits/e04f5d.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/extractBits/f28f69.wgsl b/test/tint/builtins/gen/literal/extractBits/f28f69.wgsl
similarity index 96%
rename from test/tint/builtins/gen/extractBits/f28f69.wgsl
rename to test/tint/builtins/gen/literal/extractBits/f28f69.wgsl
index e98dd9788c..9a358de48b 100644
--- a/test/tint/builtins/gen/extractBits/f28f69.wgsl
+++ b/test/tint/builtins/gen/literal/extractBits/f28f69.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/extractBits/f28f69.wgsl.expected.glsl b/test/tint/builtins/gen/literal/extractBits/f28f69.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/extractBits/f28f69.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/extractBits/f28f69.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/extractBits/f28f69.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/extractBits/f28f69.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/extractBits/f28f69.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/extractBits/f28f69.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/extractBits/f28f69.wgsl.expected.msl b/test/tint/builtins/gen/literal/extractBits/f28f69.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/extractBits/f28f69.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/extractBits/f28f69.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/extractBits/f28f69.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/extractBits/f28f69.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/extractBits/f28f69.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/extractBits/f28f69.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/extractBits/f28f69.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/extractBits/f28f69.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/extractBits/f28f69.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/extractBits/f28f69.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/extractBits/fb850f.wgsl b/test/tint/builtins/gen/literal/extractBits/fb850f.wgsl
similarity index 96%
rename from test/tint/builtins/gen/extractBits/fb850f.wgsl
rename to test/tint/builtins/gen/literal/extractBits/fb850f.wgsl
index 73279336d2..aeb2fd7a23 100644
--- a/test/tint/builtins/gen/extractBits/fb850f.wgsl
+++ b/test/tint/builtins/gen/literal/extractBits/fb850f.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/extractBits/fb850f.wgsl.expected.glsl b/test/tint/builtins/gen/literal/extractBits/fb850f.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/extractBits/fb850f.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/extractBits/fb850f.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/extractBits/fb850f.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/extractBits/fb850f.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/extractBits/fb850f.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/extractBits/fb850f.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/extractBits/fb850f.wgsl.expected.msl b/test/tint/builtins/gen/literal/extractBits/fb850f.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/extractBits/fb850f.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/extractBits/fb850f.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/extractBits/fb850f.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/extractBits/fb850f.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/extractBits/fb850f.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/extractBits/fb850f.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/extractBits/fb850f.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/extractBits/fb850f.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/extractBits/fb850f.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/extractBits/fb850f.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/faceForward/5afbd5.wgsl b/test/tint/builtins/gen/literal/faceForward/5afbd5.wgsl
similarity index 96%
rename from test/tint/builtins/gen/faceForward/5afbd5.wgsl
rename to test/tint/builtins/gen/literal/faceForward/5afbd5.wgsl
index 73c26b144b..99f293a004 100644
--- a/test/tint/builtins/gen/faceForward/5afbd5.wgsl
+++ b/test/tint/builtins/gen/literal/faceForward/5afbd5.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/faceForward/5afbd5.wgsl.expected.glsl b/test/tint/builtins/gen/literal/faceForward/5afbd5.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/faceForward/5afbd5.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/faceForward/5afbd5.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/faceForward/5afbd5.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/faceForward/5afbd5.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/faceForward/5afbd5.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/faceForward/5afbd5.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/faceForward/5afbd5.wgsl.expected.msl b/test/tint/builtins/gen/literal/faceForward/5afbd5.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/faceForward/5afbd5.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/faceForward/5afbd5.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/faceForward/5afbd5.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/faceForward/5afbd5.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/faceForward/5afbd5.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/faceForward/5afbd5.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/faceForward/5afbd5.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/faceForward/5afbd5.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/faceForward/5afbd5.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/faceForward/5afbd5.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/faceForward/b316e5.wgsl b/test/tint/builtins/gen/literal/faceForward/b316e5.wgsl
similarity index 96%
rename from test/tint/builtins/gen/faceForward/b316e5.wgsl
rename to test/tint/builtins/gen/literal/faceForward/b316e5.wgsl
index 67d10314a7..4782cf646f 100644
--- a/test/tint/builtins/gen/faceForward/b316e5.wgsl
+++ b/test/tint/builtins/gen/literal/faceForward/b316e5.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/faceForward/b316e5.wgsl.expected.glsl b/test/tint/builtins/gen/literal/faceForward/b316e5.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/faceForward/b316e5.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/faceForward/b316e5.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/faceForward/b316e5.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/faceForward/b316e5.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/faceForward/b316e5.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/faceForward/b316e5.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/faceForward/b316e5.wgsl.expected.msl b/test/tint/builtins/gen/literal/faceForward/b316e5.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/faceForward/b316e5.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/faceForward/b316e5.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/faceForward/b316e5.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/faceForward/b316e5.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/faceForward/b316e5.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/faceForward/b316e5.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/faceForward/b316e5.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/faceForward/b316e5.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/faceForward/b316e5.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/faceForward/b316e5.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/faceForward/e6908b.wgsl b/test/tint/builtins/gen/literal/faceForward/e6908b.wgsl
similarity index 96%
rename from test/tint/builtins/gen/faceForward/e6908b.wgsl
rename to test/tint/builtins/gen/literal/faceForward/e6908b.wgsl
index c10108198a..ee829ed1ef 100644
--- a/test/tint/builtins/gen/faceForward/e6908b.wgsl
+++ b/test/tint/builtins/gen/literal/faceForward/e6908b.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/faceForward/e6908b.wgsl.expected.glsl b/test/tint/builtins/gen/literal/faceForward/e6908b.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/faceForward/e6908b.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/faceForward/e6908b.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/faceForward/e6908b.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/faceForward/e6908b.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/faceForward/e6908b.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/faceForward/e6908b.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/faceForward/e6908b.wgsl.expected.msl b/test/tint/builtins/gen/literal/faceForward/e6908b.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/faceForward/e6908b.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/faceForward/e6908b.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/faceForward/e6908b.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/faceForward/e6908b.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/faceForward/e6908b.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/faceForward/e6908b.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/faceForward/e6908b.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/faceForward/e6908b.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/faceForward/e6908b.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/faceForward/e6908b.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/firstLeadingBit/000ff3.wgsl b/test/tint/builtins/gen/literal/firstLeadingBit/000ff3.wgsl
similarity index 96%
rename from test/tint/builtins/gen/firstLeadingBit/000ff3.wgsl
rename to test/tint/builtins/gen/literal/firstLeadingBit/000ff3.wgsl
index 0a8a5da2d7..faa49e4556 100644
--- a/test/tint/builtins/gen/firstLeadingBit/000ff3.wgsl
+++ b/test/tint/builtins/gen/literal/firstLeadingBit/000ff3.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/firstLeadingBit/000ff3.wgsl.expected.glsl b/test/tint/builtins/gen/literal/firstLeadingBit/000ff3.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/firstLeadingBit/000ff3.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/firstLeadingBit/000ff3.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/firstLeadingBit/000ff3.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/firstLeadingBit/000ff3.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/firstLeadingBit/000ff3.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/firstLeadingBit/000ff3.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/firstLeadingBit/000ff3.wgsl.expected.msl b/test/tint/builtins/gen/literal/firstLeadingBit/000ff3.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/firstLeadingBit/000ff3.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/firstLeadingBit/000ff3.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/firstLeadingBit/000ff3.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/firstLeadingBit/000ff3.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/firstLeadingBit/000ff3.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/firstLeadingBit/000ff3.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/firstLeadingBit/000ff3.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/firstLeadingBit/000ff3.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/firstLeadingBit/000ff3.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/firstLeadingBit/000ff3.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/firstLeadingBit/35053e.wgsl b/test/tint/builtins/gen/literal/firstLeadingBit/35053e.wgsl
similarity index 96%
rename from test/tint/builtins/gen/firstLeadingBit/35053e.wgsl
rename to test/tint/builtins/gen/literal/firstLeadingBit/35053e.wgsl
index 6fd1880537..5922e0d56b 100644
--- a/test/tint/builtins/gen/firstLeadingBit/35053e.wgsl
+++ b/test/tint/builtins/gen/literal/firstLeadingBit/35053e.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/firstLeadingBit/35053e.wgsl.expected.glsl b/test/tint/builtins/gen/literal/firstLeadingBit/35053e.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/firstLeadingBit/35053e.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/firstLeadingBit/35053e.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/firstLeadingBit/35053e.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/firstLeadingBit/35053e.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/firstLeadingBit/35053e.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/firstLeadingBit/35053e.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/firstLeadingBit/35053e.wgsl.expected.msl b/test/tint/builtins/gen/literal/firstLeadingBit/35053e.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/firstLeadingBit/35053e.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/firstLeadingBit/35053e.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/firstLeadingBit/35053e.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/firstLeadingBit/35053e.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/firstLeadingBit/35053e.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/firstLeadingBit/35053e.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/firstLeadingBit/35053e.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/firstLeadingBit/35053e.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/firstLeadingBit/35053e.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/firstLeadingBit/35053e.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/firstLeadingBit/3fd7d0.wgsl b/test/tint/builtins/gen/literal/firstLeadingBit/3fd7d0.wgsl
similarity index 96%
rename from test/tint/builtins/gen/firstLeadingBit/3fd7d0.wgsl
rename to test/tint/builtins/gen/literal/firstLeadingBit/3fd7d0.wgsl
index 3dcfca1659..e799c27371 100644
--- a/test/tint/builtins/gen/firstLeadingBit/3fd7d0.wgsl
+++ b/test/tint/builtins/gen/literal/firstLeadingBit/3fd7d0.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/firstLeadingBit/3fd7d0.wgsl.expected.glsl b/test/tint/builtins/gen/literal/firstLeadingBit/3fd7d0.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/firstLeadingBit/3fd7d0.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/firstLeadingBit/3fd7d0.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/firstLeadingBit/3fd7d0.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/firstLeadingBit/3fd7d0.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/firstLeadingBit/3fd7d0.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/firstLeadingBit/3fd7d0.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/firstLeadingBit/3fd7d0.wgsl.expected.msl b/test/tint/builtins/gen/literal/firstLeadingBit/3fd7d0.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/firstLeadingBit/3fd7d0.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/firstLeadingBit/3fd7d0.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/firstLeadingBit/3fd7d0.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/firstLeadingBit/3fd7d0.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/firstLeadingBit/3fd7d0.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/firstLeadingBit/3fd7d0.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/firstLeadingBit/3fd7d0.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/firstLeadingBit/3fd7d0.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/firstLeadingBit/3fd7d0.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/firstLeadingBit/3fd7d0.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/firstLeadingBit/57a1a3.wgsl b/test/tint/builtins/gen/literal/firstLeadingBit/57a1a3.wgsl
similarity index 96%
rename from test/tint/builtins/gen/firstLeadingBit/57a1a3.wgsl
rename to test/tint/builtins/gen/literal/firstLeadingBit/57a1a3.wgsl
index 7a77849eef..c79d1dd874 100644
--- a/test/tint/builtins/gen/firstLeadingBit/57a1a3.wgsl
+++ b/test/tint/builtins/gen/literal/firstLeadingBit/57a1a3.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/firstLeadingBit/57a1a3.wgsl.expected.glsl b/test/tint/builtins/gen/literal/firstLeadingBit/57a1a3.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/firstLeadingBit/57a1a3.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/firstLeadingBit/57a1a3.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/firstLeadingBit/57a1a3.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/firstLeadingBit/57a1a3.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/firstLeadingBit/57a1a3.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/firstLeadingBit/57a1a3.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/firstLeadingBit/57a1a3.wgsl.expected.msl b/test/tint/builtins/gen/literal/firstLeadingBit/57a1a3.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/firstLeadingBit/57a1a3.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/firstLeadingBit/57a1a3.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/firstLeadingBit/57a1a3.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/firstLeadingBit/57a1a3.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/firstLeadingBit/57a1a3.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/firstLeadingBit/57a1a3.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/firstLeadingBit/57a1a3.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/firstLeadingBit/57a1a3.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/firstLeadingBit/57a1a3.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/firstLeadingBit/57a1a3.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/firstLeadingBit/6fe804.wgsl b/test/tint/builtins/gen/literal/firstLeadingBit/6fe804.wgsl
similarity index 96%
rename from test/tint/builtins/gen/firstLeadingBit/6fe804.wgsl
rename to test/tint/builtins/gen/literal/firstLeadingBit/6fe804.wgsl
index 6f22f4c409..87838a75de 100644
--- a/test/tint/builtins/gen/firstLeadingBit/6fe804.wgsl
+++ b/test/tint/builtins/gen/literal/firstLeadingBit/6fe804.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/firstLeadingBit/6fe804.wgsl.expected.glsl b/test/tint/builtins/gen/literal/firstLeadingBit/6fe804.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/firstLeadingBit/6fe804.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/firstLeadingBit/6fe804.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/firstLeadingBit/6fe804.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/firstLeadingBit/6fe804.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/firstLeadingBit/6fe804.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/firstLeadingBit/6fe804.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/firstLeadingBit/6fe804.wgsl.expected.msl b/test/tint/builtins/gen/literal/firstLeadingBit/6fe804.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/firstLeadingBit/6fe804.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/firstLeadingBit/6fe804.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/firstLeadingBit/6fe804.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/firstLeadingBit/6fe804.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/firstLeadingBit/6fe804.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/firstLeadingBit/6fe804.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/firstLeadingBit/6fe804.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/firstLeadingBit/6fe804.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/firstLeadingBit/6fe804.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/firstLeadingBit/6fe804.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/firstLeadingBit/a622c2.wgsl b/test/tint/builtins/gen/literal/firstLeadingBit/a622c2.wgsl
similarity index 96%
rename from test/tint/builtins/gen/firstLeadingBit/a622c2.wgsl
rename to test/tint/builtins/gen/literal/firstLeadingBit/a622c2.wgsl
index 984432418a..64b2c7b247 100644
--- a/test/tint/builtins/gen/firstLeadingBit/a622c2.wgsl
+++ b/test/tint/builtins/gen/literal/firstLeadingBit/a622c2.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/firstLeadingBit/a622c2.wgsl.expected.glsl b/test/tint/builtins/gen/literal/firstLeadingBit/a622c2.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/firstLeadingBit/a622c2.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/firstLeadingBit/a622c2.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/firstLeadingBit/a622c2.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/firstLeadingBit/a622c2.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/firstLeadingBit/a622c2.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/firstLeadingBit/a622c2.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/firstLeadingBit/a622c2.wgsl.expected.msl b/test/tint/builtins/gen/literal/firstLeadingBit/a622c2.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/firstLeadingBit/a622c2.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/firstLeadingBit/a622c2.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/firstLeadingBit/a622c2.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/firstLeadingBit/a622c2.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/firstLeadingBit/a622c2.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/firstLeadingBit/a622c2.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/firstLeadingBit/a622c2.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/firstLeadingBit/a622c2.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/firstLeadingBit/a622c2.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/firstLeadingBit/a622c2.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/firstLeadingBit/c1f940.wgsl b/test/tint/builtins/gen/literal/firstLeadingBit/c1f940.wgsl
similarity index 96%
rename from test/tint/builtins/gen/firstLeadingBit/c1f940.wgsl
rename to test/tint/builtins/gen/literal/firstLeadingBit/c1f940.wgsl
index 5b1610e155..f09a593d1b 100644
--- a/test/tint/builtins/gen/firstLeadingBit/c1f940.wgsl
+++ b/test/tint/builtins/gen/literal/firstLeadingBit/c1f940.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/firstLeadingBit/c1f940.wgsl.expected.glsl b/test/tint/builtins/gen/literal/firstLeadingBit/c1f940.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/firstLeadingBit/c1f940.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/firstLeadingBit/c1f940.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/firstLeadingBit/c1f940.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/firstLeadingBit/c1f940.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/firstLeadingBit/c1f940.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/firstLeadingBit/c1f940.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/firstLeadingBit/c1f940.wgsl.expected.msl b/test/tint/builtins/gen/literal/firstLeadingBit/c1f940.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/firstLeadingBit/c1f940.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/firstLeadingBit/c1f940.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/firstLeadingBit/c1f940.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/firstLeadingBit/c1f940.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/firstLeadingBit/c1f940.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/firstLeadingBit/c1f940.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/firstLeadingBit/c1f940.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/firstLeadingBit/c1f940.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/firstLeadingBit/c1f940.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/firstLeadingBit/c1f940.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/firstLeadingBit/f0779d.wgsl b/test/tint/builtins/gen/literal/firstLeadingBit/f0779d.wgsl
similarity index 96%
rename from test/tint/builtins/gen/firstLeadingBit/f0779d.wgsl
rename to test/tint/builtins/gen/literal/firstLeadingBit/f0779d.wgsl
index 6d1365d326..a1a5a3df41 100644
--- a/test/tint/builtins/gen/firstLeadingBit/f0779d.wgsl
+++ b/test/tint/builtins/gen/literal/firstLeadingBit/f0779d.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/firstLeadingBit/f0779d.wgsl.expected.glsl b/test/tint/builtins/gen/literal/firstLeadingBit/f0779d.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/firstLeadingBit/f0779d.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/firstLeadingBit/f0779d.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/firstLeadingBit/f0779d.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/firstLeadingBit/f0779d.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/firstLeadingBit/f0779d.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/firstLeadingBit/f0779d.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/firstLeadingBit/f0779d.wgsl.expected.msl b/test/tint/builtins/gen/literal/firstLeadingBit/f0779d.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/firstLeadingBit/f0779d.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/firstLeadingBit/f0779d.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/firstLeadingBit/f0779d.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/firstLeadingBit/f0779d.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/firstLeadingBit/f0779d.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/firstLeadingBit/f0779d.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/firstLeadingBit/f0779d.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/firstLeadingBit/f0779d.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/firstLeadingBit/f0779d.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/firstLeadingBit/f0779d.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/firstTrailingBit/110f2c.wgsl b/test/tint/builtins/gen/literal/firstTrailingBit/110f2c.wgsl
similarity index 96%
rename from test/tint/builtins/gen/firstTrailingBit/110f2c.wgsl
rename to test/tint/builtins/gen/literal/firstTrailingBit/110f2c.wgsl
index 9128ec42db..818e922f94 100644
--- a/test/tint/builtins/gen/firstTrailingBit/110f2c.wgsl
+++ b/test/tint/builtins/gen/literal/firstTrailingBit/110f2c.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/firstTrailingBit/110f2c.wgsl.expected.glsl b/test/tint/builtins/gen/literal/firstTrailingBit/110f2c.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/firstTrailingBit/110f2c.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/firstTrailingBit/110f2c.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/firstTrailingBit/110f2c.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/firstTrailingBit/110f2c.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/firstTrailingBit/110f2c.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/firstTrailingBit/110f2c.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/firstTrailingBit/110f2c.wgsl.expected.msl b/test/tint/builtins/gen/literal/firstTrailingBit/110f2c.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/firstTrailingBit/110f2c.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/firstTrailingBit/110f2c.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/firstTrailingBit/110f2c.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/firstTrailingBit/110f2c.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/firstTrailingBit/110f2c.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/firstTrailingBit/110f2c.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/firstTrailingBit/110f2c.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/firstTrailingBit/110f2c.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/firstTrailingBit/110f2c.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/firstTrailingBit/110f2c.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/firstTrailingBit/3a2acc.wgsl b/test/tint/builtins/gen/literal/firstTrailingBit/3a2acc.wgsl
similarity index 96%
rename from test/tint/builtins/gen/firstTrailingBit/3a2acc.wgsl
rename to test/tint/builtins/gen/literal/firstTrailingBit/3a2acc.wgsl
index 7ac0acf1fe..3842f4fe2c 100644
--- a/test/tint/builtins/gen/firstTrailingBit/3a2acc.wgsl
+++ b/test/tint/builtins/gen/literal/firstTrailingBit/3a2acc.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/firstTrailingBit/3a2acc.wgsl.expected.glsl b/test/tint/builtins/gen/literal/firstTrailingBit/3a2acc.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/firstTrailingBit/3a2acc.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/firstTrailingBit/3a2acc.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/firstTrailingBit/3a2acc.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/firstTrailingBit/3a2acc.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/firstTrailingBit/3a2acc.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/firstTrailingBit/3a2acc.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/firstTrailingBit/3a2acc.wgsl.expected.msl b/test/tint/builtins/gen/literal/firstTrailingBit/3a2acc.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/firstTrailingBit/3a2acc.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/firstTrailingBit/3a2acc.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/firstTrailingBit/3a2acc.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/firstTrailingBit/3a2acc.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/firstTrailingBit/3a2acc.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/firstTrailingBit/3a2acc.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/firstTrailingBit/3a2acc.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/firstTrailingBit/3a2acc.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/firstTrailingBit/3a2acc.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/firstTrailingBit/3a2acc.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/firstTrailingBit/45eb10.wgsl b/test/tint/builtins/gen/literal/firstTrailingBit/45eb10.wgsl
similarity index 96%
rename from test/tint/builtins/gen/firstTrailingBit/45eb10.wgsl
rename to test/tint/builtins/gen/literal/firstTrailingBit/45eb10.wgsl
index 05678e5a7c..396593e151 100644
--- a/test/tint/builtins/gen/firstTrailingBit/45eb10.wgsl
+++ b/test/tint/builtins/gen/literal/firstTrailingBit/45eb10.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/firstTrailingBit/45eb10.wgsl.expected.glsl b/test/tint/builtins/gen/literal/firstTrailingBit/45eb10.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/firstTrailingBit/45eb10.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/firstTrailingBit/45eb10.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/firstTrailingBit/45eb10.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/firstTrailingBit/45eb10.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/firstTrailingBit/45eb10.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/firstTrailingBit/45eb10.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/firstTrailingBit/45eb10.wgsl.expected.msl b/test/tint/builtins/gen/literal/firstTrailingBit/45eb10.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/firstTrailingBit/45eb10.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/firstTrailingBit/45eb10.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/firstTrailingBit/45eb10.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/firstTrailingBit/45eb10.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/firstTrailingBit/45eb10.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/firstTrailingBit/45eb10.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/firstTrailingBit/45eb10.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/firstTrailingBit/45eb10.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/firstTrailingBit/45eb10.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/firstTrailingBit/45eb10.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/firstTrailingBit/47d475.wgsl b/test/tint/builtins/gen/literal/firstTrailingBit/47d475.wgsl
similarity index 96%
rename from test/tint/builtins/gen/firstTrailingBit/47d475.wgsl
rename to test/tint/builtins/gen/literal/firstTrailingBit/47d475.wgsl
index 43f7a728c2..d0268afb5a 100644
--- a/test/tint/builtins/gen/firstTrailingBit/47d475.wgsl
+++ b/test/tint/builtins/gen/literal/firstTrailingBit/47d475.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/firstTrailingBit/47d475.wgsl.expected.glsl b/test/tint/builtins/gen/literal/firstTrailingBit/47d475.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/firstTrailingBit/47d475.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/firstTrailingBit/47d475.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/firstTrailingBit/47d475.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/firstTrailingBit/47d475.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/firstTrailingBit/47d475.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/firstTrailingBit/47d475.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/firstTrailingBit/47d475.wgsl.expected.msl b/test/tint/builtins/gen/literal/firstTrailingBit/47d475.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/firstTrailingBit/47d475.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/firstTrailingBit/47d475.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/firstTrailingBit/47d475.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/firstTrailingBit/47d475.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/firstTrailingBit/47d475.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/firstTrailingBit/47d475.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/firstTrailingBit/47d475.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/firstTrailingBit/47d475.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/firstTrailingBit/47d475.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/firstTrailingBit/47d475.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/firstTrailingBit/50c072.wgsl b/test/tint/builtins/gen/literal/firstTrailingBit/50c072.wgsl
similarity index 96%
rename from test/tint/builtins/gen/firstTrailingBit/50c072.wgsl
rename to test/tint/builtins/gen/literal/firstTrailingBit/50c072.wgsl
index faab74f189..fa986e0326 100644
--- a/test/tint/builtins/gen/firstTrailingBit/50c072.wgsl
+++ b/test/tint/builtins/gen/literal/firstTrailingBit/50c072.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/firstTrailingBit/50c072.wgsl.expected.glsl b/test/tint/builtins/gen/literal/firstTrailingBit/50c072.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/firstTrailingBit/50c072.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/firstTrailingBit/50c072.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/firstTrailingBit/50c072.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/firstTrailingBit/50c072.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/firstTrailingBit/50c072.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/firstTrailingBit/50c072.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/firstTrailingBit/50c072.wgsl.expected.msl b/test/tint/builtins/gen/literal/firstTrailingBit/50c072.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/firstTrailingBit/50c072.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/firstTrailingBit/50c072.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/firstTrailingBit/50c072.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/firstTrailingBit/50c072.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/firstTrailingBit/50c072.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/firstTrailingBit/50c072.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/firstTrailingBit/50c072.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/firstTrailingBit/50c072.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/firstTrailingBit/50c072.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/firstTrailingBit/50c072.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/firstTrailingBit/7496d6.wgsl b/test/tint/builtins/gen/literal/firstTrailingBit/7496d6.wgsl
similarity index 96%
rename from test/tint/builtins/gen/firstTrailingBit/7496d6.wgsl
rename to test/tint/builtins/gen/literal/firstTrailingBit/7496d6.wgsl
index 5d106be138..c1dff0a563 100644
--- a/test/tint/builtins/gen/firstTrailingBit/7496d6.wgsl
+++ b/test/tint/builtins/gen/literal/firstTrailingBit/7496d6.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/firstTrailingBit/7496d6.wgsl.expected.glsl b/test/tint/builtins/gen/literal/firstTrailingBit/7496d6.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/firstTrailingBit/7496d6.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/firstTrailingBit/7496d6.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/firstTrailingBit/7496d6.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/firstTrailingBit/7496d6.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/firstTrailingBit/7496d6.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/firstTrailingBit/7496d6.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/firstTrailingBit/7496d6.wgsl.expected.msl b/test/tint/builtins/gen/literal/firstTrailingBit/7496d6.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/firstTrailingBit/7496d6.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/firstTrailingBit/7496d6.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/firstTrailingBit/7496d6.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/firstTrailingBit/7496d6.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/firstTrailingBit/7496d6.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/firstTrailingBit/7496d6.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/firstTrailingBit/7496d6.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/firstTrailingBit/7496d6.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/firstTrailingBit/7496d6.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/firstTrailingBit/7496d6.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/firstTrailingBit/86551b.wgsl b/test/tint/builtins/gen/literal/firstTrailingBit/86551b.wgsl
similarity index 96%
rename from test/tint/builtins/gen/firstTrailingBit/86551b.wgsl
rename to test/tint/builtins/gen/literal/firstTrailingBit/86551b.wgsl
index 5bf7d26b4f..97e389e94b 100644
--- a/test/tint/builtins/gen/firstTrailingBit/86551b.wgsl
+++ b/test/tint/builtins/gen/literal/firstTrailingBit/86551b.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/firstTrailingBit/86551b.wgsl.expected.glsl b/test/tint/builtins/gen/literal/firstTrailingBit/86551b.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/firstTrailingBit/86551b.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/firstTrailingBit/86551b.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/firstTrailingBit/86551b.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/firstTrailingBit/86551b.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/firstTrailingBit/86551b.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/firstTrailingBit/86551b.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/firstTrailingBit/86551b.wgsl.expected.msl b/test/tint/builtins/gen/literal/firstTrailingBit/86551b.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/firstTrailingBit/86551b.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/firstTrailingBit/86551b.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/firstTrailingBit/86551b.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/firstTrailingBit/86551b.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/firstTrailingBit/86551b.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/firstTrailingBit/86551b.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/firstTrailingBit/86551b.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/firstTrailingBit/86551b.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/firstTrailingBit/86551b.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/firstTrailingBit/86551b.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/firstTrailingBit/cb51ce.wgsl b/test/tint/builtins/gen/literal/firstTrailingBit/cb51ce.wgsl
similarity index 96%
rename from test/tint/builtins/gen/firstTrailingBit/cb51ce.wgsl
rename to test/tint/builtins/gen/literal/firstTrailingBit/cb51ce.wgsl
index 62ed98ef72..895e9bbb7c 100644
--- a/test/tint/builtins/gen/firstTrailingBit/cb51ce.wgsl
+++ b/test/tint/builtins/gen/literal/firstTrailingBit/cb51ce.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/firstTrailingBit/cb51ce.wgsl.expected.glsl b/test/tint/builtins/gen/literal/firstTrailingBit/cb51ce.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/firstTrailingBit/cb51ce.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/firstTrailingBit/cb51ce.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/firstTrailingBit/cb51ce.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/firstTrailingBit/cb51ce.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/firstTrailingBit/cb51ce.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/firstTrailingBit/cb51ce.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/firstTrailingBit/cb51ce.wgsl.expected.msl b/test/tint/builtins/gen/literal/firstTrailingBit/cb51ce.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/firstTrailingBit/cb51ce.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/firstTrailingBit/cb51ce.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/firstTrailingBit/cb51ce.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/firstTrailingBit/cb51ce.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/firstTrailingBit/cb51ce.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/firstTrailingBit/cb51ce.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/firstTrailingBit/cb51ce.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/firstTrailingBit/cb51ce.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/firstTrailingBit/cb51ce.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/firstTrailingBit/cb51ce.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/floor/3bccc4.wgsl b/test/tint/builtins/gen/literal/floor/3bccc4.wgsl
similarity index 96%
rename from test/tint/builtins/gen/floor/3bccc4.wgsl
rename to test/tint/builtins/gen/literal/floor/3bccc4.wgsl
index ac8b3d4694..117cb5c3fc 100644
--- a/test/tint/builtins/gen/floor/3bccc4.wgsl
+++ b/test/tint/builtins/gen/literal/floor/3bccc4.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/floor/3bccc4.wgsl.expected.glsl b/test/tint/builtins/gen/literal/floor/3bccc4.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/floor/3bccc4.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/floor/3bccc4.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/floor/3bccc4.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/floor/3bccc4.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/floor/3bccc4.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/floor/3bccc4.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/floor/3bccc4.wgsl.expected.msl b/test/tint/builtins/gen/literal/floor/3bccc4.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/floor/3bccc4.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/floor/3bccc4.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/floor/3bccc4.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/floor/3bccc4.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/floor/3bccc4.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/floor/3bccc4.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/floor/3bccc4.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/floor/3bccc4.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/floor/3bccc4.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/floor/3bccc4.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/floor/5fc9ac.wgsl b/test/tint/builtins/gen/literal/floor/5fc9ac.wgsl
similarity index 96%
rename from test/tint/builtins/gen/floor/5fc9ac.wgsl
rename to test/tint/builtins/gen/literal/floor/5fc9ac.wgsl
index cdc9c45a1b..daab1702fb 100644
--- a/test/tint/builtins/gen/floor/5fc9ac.wgsl
+++ b/test/tint/builtins/gen/literal/floor/5fc9ac.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/floor/5fc9ac.wgsl.expected.glsl b/test/tint/builtins/gen/literal/floor/5fc9ac.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/floor/5fc9ac.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/floor/5fc9ac.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/floor/5fc9ac.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/floor/5fc9ac.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/floor/5fc9ac.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/floor/5fc9ac.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/floor/5fc9ac.wgsl.expected.msl b/test/tint/builtins/gen/literal/floor/5fc9ac.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/floor/5fc9ac.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/floor/5fc9ac.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/floor/5fc9ac.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/floor/5fc9ac.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/floor/5fc9ac.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/floor/5fc9ac.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/floor/5fc9ac.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/floor/5fc9ac.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/floor/5fc9ac.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/floor/5fc9ac.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/floor/60d7ea.wgsl b/test/tint/builtins/gen/literal/floor/60d7ea.wgsl
similarity index 96%
rename from test/tint/builtins/gen/floor/60d7ea.wgsl
rename to test/tint/builtins/gen/literal/floor/60d7ea.wgsl
index a8bf8b6807..0cbaf4369a 100644
--- a/test/tint/builtins/gen/floor/60d7ea.wgsl
+++ b/test/tint/builtins/gen/literal/floor/60d7ea.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/floor/60d7ea.wgsl.expected.glsl b/test/tint/builtins/gen/literal/floor/60d7ea.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/floor/60d7ea.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/floor/60d7ea.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/floor/60d7ea.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/floor/60d7ea.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/floor/60d7ea.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/floor/60d7ea.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/floor/60d7ea.wgsl.expected.msl b/test/tint/builtins/gen/literal/floor/60d7ea.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/floor/60d7ea.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/floor/60d7ea.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/floor/60d7ea.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/floor/60d7ea.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/floor/60d7ea.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/floor/60d7ea.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/floor/60d7ea.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/floor/60d7ea.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/floor/60d7ea.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/floor/60d7ea.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/floor/66f154.wgsl b/test/tint/builtins/gen/literal/floor/66f154.wgsl
similarity index 96%
rename from test/tint/builtins/gen/floor/66f154.wgsl
rename to test/tint/builtins/gen/literal/floor/66f154.wgsl
index 1f0c1f8a94..ec55b67830 100644
--- a/test/tint/builtins/gen/floor/66f154.wgsl
+++ b/test/tint/builtins/gen/literal/floor/66f154.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/floor/66f154.wgsl.expected.glsl b/test/tint/builtins/gen/literal/floor/66f154.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/floor/66f154.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/floor/66f154.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/floor/66f154.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/floor/66f154.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/floor/66f154.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/floor/66f154.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/floor/66f154.wgsl.expected.msl b/test/tint/builtins/gen/literal/floor/66f154.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/floor/66f154.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/floor/66f154.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/floor/66f154.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/floor/66f154.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/floor/66f154.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/floor/66f154.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/floor/66f154.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/floor/66f154.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/floor/66f154.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/floor/66f154.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/fma/26a7a9.wgsl b/test/tint/builtins/gen/literal/fma/26a7a9.wgsl
similarity index 96%
rename from test/tint/builtins/gen/fma/26a7a9.wgsl
rename to test/tint/builtins/gen/literal/fma/26a7a9.wgsl
index 8d1b31ae93..834ed38e43 100644
--- a/test/tint/builtins/gen/fma/26a7a9.wgsl
+++ b/test/tint/builtins/gen/literal/fma/26a7a9.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/fma/26a7a9.wgsl.expected.glsl b/test/tint/builtins/gen/literal/fma/26a7a9.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/fma/26a7a9.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/fma/26a7a9.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/fma/26a7a9.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/fma/26a7a9.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/fma/26a7a9.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/fma/26a7a9.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/fma/26a7a9.wgsl.expected.msl b/test/tint/builtins/gen/literal/fma/26a7a9.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/fma/26a7a9.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/fma/26a7a9.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/fma/26a7a9.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/fma/26a7a9.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/fma/26a7a9.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/fma/26a7a9.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/fma/26a7a9.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/fma/26a7a9.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/fma/26a7a9.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/fma/26a7a9.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/fma/6a3283.wgsl b/test/tint/builtins/gen/literal/fma/6a3283.wgsl
similarity index 96%
rename from test/tint/builtins/gen/fma/6a3283.wgsl
rename to test/tint/builtins/gen/literal/fma/6a3283.wgsl
index 7304803533..d5cf90fab4 100644
--- a/test/tint/builtins/gen/fma/6a3283.wgsl
+++ b/test/tint/builtins/gen/literal/fma/6a3283.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/fma/6a3283.wgsl.expected.glsl b/test/tint/builtins/gen/literal/fma/6a3283.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/fma/6a3283.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/fma/6a3283.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/fma/6a3283.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/fma/6a3283.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/fma/6a3283.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/fma/6a3283.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/fma/6a3283.wgsl.expected.msl b/test/tint/builtins/gen/literal/fma/6a3283.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/fma/6a3283.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/fma/6a3283.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/fma/6a3283.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/fma/6a3283.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/fma/6a3283.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/fma/6a3283.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/fma/6a3283.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/fma/6a3283.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/fma/6a3283.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/fma/6a3283.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/fma/c10ba3.wgsl b/test/tint/builtins/gen/literal/fma/c10ba3.wgsl
similarity index 96%
rename from test/tint/builtins/gen/fma/c10ba3.wgsl
rename to test/tint/builtins/gen/literal/fma/c10ba3.wgsl
index b7099cc291..d26b50466c 100644
--- a/test/tint/builtins/gen/fma/c10ba3.wgsl
+++ b/test/tint/builtins/gen/literal/fma/c10ba3.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/fma/c10ba3.wgsl.expected.glsl b/test/tint/builtins/gen/literal/fma/c10ba3.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/fma/c10ba3.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/fma/c10ba3.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/fma/c10ba3.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/fma/c10ba3.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/fma/c10ba3.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/fma/c10ba3.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/fma/c10ba3.wgsl.expected.msl b/test/tint/builtins/gen/literal/fma/c10ba3.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/fma/c10ba3.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/fma/c10ba3.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/fma/c10ba3.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/fma/c10ba3.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/fma/c10ba3.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/fma/c10ba3.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/fma/c10ba3.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/fma/c10ba3.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/fma/c10ba3.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/fma/c10ba3.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/fma/e17c5c.wgsl b/test/tint/builtins/gen/literal/fma/e17c5c.wgsl
similarity index 96%
rename from test/tint/builtins/gen/fma/e17c5c.wgsl
rename to test/tint/builtins/gen/literal/fma/e17c5c.wgsl
index 1729e62895..afba1f1da6 100644
--- a/test/tint/builtins/gen/fma/e17c5c.wgsl
+++ b/test/tint/builtins/gen/literal/fma/e17c5c.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/fma/e17c5c.wgsl.expected.glsl b/test/tint/builtins/gen/literal/fma/e17c5c.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/fma/e17c5c.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/fma/e17c5c.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/fma/e17c5c.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/fma/e17c5c.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/fma/e17c5c.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/fma/e17c5c.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/fma/e17c5c.wgsl.expected.msl b/test/tint/builtins/gen/literal/fma/e17c5c.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/fma/e17c5c.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/fma/e17c5c.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/fma/e17c5c.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/fma/e17c5c.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/fma/e17c5c.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/fma/e17c5c.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/fma/e17c5c.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/fma/e17c5c.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/fma/e17c5c.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/fma/e17c5c.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/fract/8bc1e9.wgsl b/test/tint/builtins/gen/literal/fract/8bc1e9.wgsl
similarity index 96%
rename from test/tint/builtins/gen/fract/8bc1e9.wgsl
rename to test/tint/builtins/gen/literal/fract/8bc1e9.wgsl
index 2e3663bc3a..c816bce065 100644
--- a/test/tint/builtins/gen/fract/8bc1e9.wgsl
+++ b/test/tint/builtins/gen/literal/fract/8bc1e9.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/fract/8bc1e9.wgsl.expected.glsl b/test/tint/builtins/gen/literal/fract/8bc1e9.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/fract/8bc1e9.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/fract/8bc1e9.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/fract/8bc1e9.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/fract/8bc1e9.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/fract/8bc1e9.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/fract/8bc1e9.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/fract/8bc1e9.wgsl.expected.msl b/test/tint/builtins/gen/literal/fract/8bc1e9.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/fract/8bc1e9.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/fract/8bc1e9.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/fract/8bc1e9.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/fract/8bc1e9.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/fract/8bc1e9.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/fract/8bc1e9.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/fract/8bc1e9.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/fract/8bc1e9.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/fract/8bc1e9.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/fract/8bc1e9.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/fract/943cb1.wgsl b/test/tint/builtins/gen/literal/fract/943cb1.wgsl
similarity index 96%
rename from test/tint/builtins/gen/fract/943cb1.wgsl
rename to test/tint/builtins/gen/literal/fract/943cb1.wgsl
index 940f4692e1..a940bab7be 100644
--- a/test/tint/builtins/gen/fract/943cb1.wgsl
+++ b/test/tint/builtins/gen/literal/fract/943cb1.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/fract/943cb1.wgsl.expected.glsl b/test/tint/builtins/gen/literal/fract/943cb1.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/fract/943cb1.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/fract/943cb1.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/fract/943cb1.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/fract/943cb1.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/fract/943cb1.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/fract/943cb1.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/fract/943cb1.wgsl.expected.msl b/test/tint/builtins/gen/literal/fract/943cb1.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/fract/943cb1.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/fract/943cb1.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/fract/943cb1.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/fract/943cb1.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/fract/943cb1.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/fract/943cb1.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/fract/943cb1.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/fract/943cb1.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/fract/943cb1.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/fract/943cb1.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/fract/a49758.wgsl b/test/tint/builtins/gen/literal/fract/a49758.wgsl
similarity index 96%
rename from test/tint/builtins/gen/fract/a49758.wgsl
rename to test/tint/builtins/gen/literal/fract/a49758.wgsl
index e8d73a0428..693a6e95bf 100644
--- a/test/tint/builtins/gen/fract/a49758.wgsl
+++ b/test/tint/builtins/gen/literal/fract/a49758.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/fract/a49758.wgsl.expected.glsl b/test/tint/builtins/gen/literal/fract/a49758.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/fract/a49758.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/fract/a49758.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/fract/a49758.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/fract/a49758.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/fract/a49758.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/fract/a49758.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/fract/a49758.wgsl.expected.msl b/test/tint/builtins/gen/literal/fract/a49758.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/fract/a49758.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/fract/a49758.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/fract/a49758.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/fract/a49758.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/fract/a49758.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/fract/a49758.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/fract/a49758.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/fract/a49758.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/fract/a49758.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/fract/a49758.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/fract/fa5c71.wgsl b/test/tint/builtins/gen/literal/fract/fa5c71.wgsl
similarity index 96%
rename from test/tint/builtins/gen/fract/fa5c71.wgsl
rename to test/tint/builtins/gen/literal/fract/fa5c71.wgsl
index ec0fed4f0b..c2e96d29d7 100644
--- a/test/tint/builtins/gen/fract/fa5c71.wgsl
+++ b/test/tint/builtins/gen/literal/fract/fa5c71.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/fract/fa5c71.wgsl.expected.glsl b/test/tint/builtins/gen/literal/fract/fa5c71.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/fract/fa5c71.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/fract/fa5c71.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/fract/fa5c71.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/fract/fa5c71.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/fract/fa5c71.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/fract/fa5c71.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/fract/fa5c71.wgsl.expected.msl b/test/tint/builtins/gen/literal/fract/fa5c71.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/fract/fa5c71.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/fract/fa5c71.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/fract/fa5c71.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/fract/fa5c71.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/fract/fa5c71.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/fract/fa5c71.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/fract/fa5c71.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/fract/fa5c71.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/fract/fa5c71.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/fract/fa5c71.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/frexp/368997.wgsl b/test/tint/builtins/gen/literal/frexp/368997.wgsl
similarity index 96%
rename from test/tint/builtins/gen/frexp/368997.wgsl
rename to test/tint/builtins/gen/literal/frexp/368997.wgsl
index 57930edfe0..42095a87e1 100644
--- a/test/tint/builtins/gen/frexp/368997.wgsl
+++ b/test/tint/builtins/gen/literal/frexp/368997.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/frexp/368997.wgsl.expected.glsl b/test/tint/builtins/gen/literal/frexp/368997.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/frexp/368997.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/frexp/368997.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/frexp/368997.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/frexp/368997.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/frexp/368997.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/frexp/368997.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/frexp/368997.wgsl.expected.msl b/test/tint/builtins/gen/literal/frexp/368997.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/frexp/368997.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/frexp/368997.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/frexp/368997.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/frexp/368997.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/frexp/368997.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/frexp/368997.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/frexp/368997.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/frexp/368997.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/frexp/368997.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/frexp/368997.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/frexp/3c4f48.wgsl b/test/tint/builtins/gen/literal/frexp/3c4f48.wgsl
similarity index 96%
rename from test/tint/builtins/gen/frexp/3c4f48.wgsl
rename to test/tint/builtins/gen/literal/frexp/3c4f48.wgsl
index 74a8ef1582..13c6c1e62d 100644
--- a/test/tint/builtins/gen/frexp/3c4f48.wgsl
+++ b/test/tint/builtins/gen/literal/frexp/3c4f48.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/frexp/3c4f48.wgsl.expected.glsl b/test/tint/builtins/gen/literal/frexp/3c4f48.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/frexp/3c4f48.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/frexp/3c4f48.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/frexp/3c4f48.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/frexp/3c4f48.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/frexp/3c4f48.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/frexp/3c4f48.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/frexp/3c4f48.wgsl.expected.msl b/test/tint/builtins/gen/literal/frexp/3c4f48.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/frexp/3c4f48.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/frexp/3c4f48.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/frexp/3c4f48.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/frexp/3c4f48.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/frexp/3c4f48.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/frexp/3c4f48.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/frexp/3c4f48.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/frexp/3c4f48.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/frexp/3c4f48.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/frexp/3c4f48.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/frexp/4bdfc7.wgsl b/test/tint/builtins/gen/literal/frexp/4bdfc7.wgsl
similarity index 96%
rename from test/tint/builtins/gen/frexp/4bdfc7.wgsl
rename to test/tint/builtins/gen/literal/frexp/4bdfc7.wgsl
index c9471780e3..78428e3f2b 100644
--- a/test/tint/builtins/gen/frexp/4bdfc7.wgsl
+++ b/test/tint/builtins/gen/literal/frexp/4bdfc7.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/frexp/4bdfc7.wgsl.expected.glsl b/test/tint/builtins/gen/literal/frexp/4bdfc7.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/frexp/4bdfc7.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/frexp/4bdfc7.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/frexp/4bdfc7.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/frexp/4bdfc7.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/frexp/4bdfc7.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/frexp/4bdfc7.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/frexp/4bdfc7.wgsl.expected.msl b/test/tint/builtins/gen/literal/frexp/4bdfc7.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/frexp/4bdfc7.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/frexp/4bdfc7.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/frexp/4bdfc7.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/frexp/4bdfc7.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/frexp/4bdfc7.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/frexp/4bdfc7.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/frexp/4bdfc7.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/frexp/4bdfc7.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/frexp/4bdfc7.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/frexp/4bdfc7.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/frexp/eabd40.wgsl b/test/tint/builtins/gen/literal/frexp/eabd40.wgsl
similarity index 96%
rename from test/tint/builtins/gen/frexp/eabd40.wgsl
rename to test/tint/builtins/gen/literal/frexp/eabd40.wgsl
index 9eeab1d8da..a2feb4e016 100644
--- a/test/tint/builtins/gen/frexp/eabd40.wgsl
+++ b/test/tint/builtins/gen/literal/frexp/eabd40.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/frexp/eabd40.wgsl.expected.glsl b/test/tint/builtins/gen/literal/frexp/eabd40.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/frexp/eabd40.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/frexp/eabd40.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/frexp/eabd40.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/frexp/eabd40.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/frexp/eabd40.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/frexp/eabd40.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/frexp/eabd40.wgsl.expected.msl b/test/tint/builtins/gen/literal/frexp/eabd40.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/frexp/eabd40.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/frexp/eabd40.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/frexp/eabd40.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/frexp/eabd40.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/frexp/eabd40.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/frexp/eabd40.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/frexp/eabd40.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/frexp/eabd40.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/frexp/eabd40.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/frexp/eabd40.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/fwidth/5d1b39.wgsl b/test/tint/builtins/gen/literal/fwidth/5d1b39.wgsl
similarity index 96%
rename from test/tint/builtins/gen/fwidth/5d1b39.wgsl
rename to test/tint/builtins/gen/literal/fwidth/5d1b39.wgsl
index b0f3e21a43..08e2628221 100644
--- a/test/tint/builtins/gen/fwidth/5d1b39.wgsl
+++ b/test/tint/builtins/gen/literal/fwidth/5d1b39.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/fwidth/5d1b39.wgsl.expected.glsl b/test/tint/builtins/gen/literal/fwidth/5d1b39.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/fwidth/5d1b39.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/fwidth/5d1b39.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/fwidth/5d1b39.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/fwidth/5d1b39.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/fwidth/5d1b39.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/fwidth/5d1b39.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/fwidth/5d1b39.wgsl.expected.msl b/test/tint/builtins/gen/literal/fwidth/5d1b39.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/fwidth/5d1b39.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/fwidth/5d1b39.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/fwidth/5d1b39.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/fwidth/5d1b39.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/fwidth/5d1b39.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/fwidth/5d1b39.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/fwidth/5d1b39.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/fwidth/5d1b39.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/fwidth/5d1b39.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/fwidth/5d1b39.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/fwidth/b83ebb.wgsl b/test/tint/builtins/gen/literal/fwidth/b83ebb.wgsl
similarity index 96%
rename from test/tint/builtins/gen/fwidth/b83ebb.wgsl
rename to test/tint/builtins/gen/literal/fwidth/b83ebb.wgsl
index d4d9fd7b49..a63be9c3bd 100644
--- a/test/tint/builtins/gen/fwidth/b83ebb.wgsl
+++ b/test/tint/builtins/gen/literal/fwidth/b83ebb.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/fwidth/b83ebb.wgsl.expected.glsl b/test/tint/builtins/gen/literal/fwidth/b83ebb.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/fwidth/b83ebb.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/fwidth/b83ebb.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/fwidth/b83ebb.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/fwidth/b83ebb.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/fwidth/b83ebb.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/fwidth/b83ebb.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/fwidth/b83ebb.wgsl.expected.msl b/test/tint/builtins/gen/literal/fwidth/b83ebb.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/fwidth/b83ebb.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/fwidth/b83ebb.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/fwidth/b83ebb.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/fwidth/b83ebb.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/fwidth/b83ebb.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/fwidth/b83ebb.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/fwidth/b83ebb.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/fwidth/b83ebb.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/fwidth/b83ebb.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/fwidth/b83ebb.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/fwidth/d2ab9a.wgsl b/test/tint/builtins/gen/literal/fwidth/d2ab9a.wgsl
similarity index 96%
rename from test/tint/builtins/gen/fwidth/d2ab9a.wgsl
rename to test/tint/builtins/gen/literal/fwidth/d2ab9a.wgsl
index 81dbd35078..01a99c6826 100644
--- a/test/tint/builtins/gen/fwidth/d2ab9a.wgsl
+++ b/test/tint/builtins/gen/literal/fwidth/d2ab9a.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/fwidth/d2ab9a.wgsl.expected.glsl b/test/tint/builtins/gen/literal/fwidth/d2ab9a.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/fwidth/d2ab9a.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/fwidth/d2ab9a.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/fwidth/d2ab9a.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/fwidth/d2ab9a.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/fwidth/d2ab9a.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/fwidth/d2ab9a.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/fwidth/d2ab9a.wgsl.expected.msl b/test/tint/builtins/gen/literal/fwidth/d2ab9a.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/fwidth/d2ab9a.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/fwidth/d2ab9a.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/fwidth/d2ab9a.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/fwidth/d2ab9a.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/fwidth/d2ab9a.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/fwidth/d2ab9a.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/fwidth/d2ab9a.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/fwidth/d2ab9a.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/fwidth/d2ab9a.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/fwidth/d2ab9a.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/fwidth/df38ef.wgsl b/test/tint/builtins/gen/literal/fwidth/df38ef.wgsl
similarity index 96%
rename from test/tint/builtins/gen/fwidth/df38ef.wgsl
rename to test/tint/builtins/gen/literal/fwidth/df38ef.wgsl
index 3392f905ea..573352214e 100644
--- a/test/tint/builtins/gen/fwidth/df38ef.wgsl
+++ b/test/tint/builtins/gen/literal/fwidth/df38ef.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/fwidth/df38ef.wgsl.expected.glsl b/test/tint/builtins/gen/literal/fwidth/df38ef.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/fwidth/df38ef.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/fwidth/df38ef.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/fwidth/df38ef.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/fwidth/df38ef.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/fwidth/df38ef.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/fwidth/df38ef.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/fwidth/df38ef.wgsl.expected.msl b/test/tint/builtins/gen/literal/fwidth/df38ef.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/fwidth/df38ef.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/fwidth/df38ef.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/fwidth/df38ef.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/fwidth/df38ef.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/fwidth/df38ef.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/fwidth/df38ef.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/fwidth/df38ef.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/fwidth/df38ef.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/fwidth/df38ef.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/fwidth/df38ef.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/fwidthCoarse/159c8a.wgsl b/test/tint/builtins/gen/literal/fwidthCoarse/159c8a.wgsl
similarity index 96%
rename from test/tint/builtins/gen/fwidthCoarse/159c8a.wgsl
rename to test/tint/builtins/gen/literal/fwidthCoarse/159c8a.wgsl
index bada6df2c3..6c82cb2a41 100644
--- a/test/tint/builtins/gen/fwidthCoarse/159c8a.wgsl
+++ b/test/tint/builtins/gen/literal/fwidthCoarse/159c8a.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/fwidthCoarse/159c8a.wgsl.expected.glsl b/test/tint/builtins/gen/literal/fwidthCoarse/159c8a.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/fwidthCoarse/159c8a.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/fwidthCoarse/159c8a.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/fwidthCoarse/159c8a.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/fwidthCoarse/159c8a.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/fwidthCoarse/159c8a.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/fwidthCoarse/159c8a.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/fwidthCoarse/159c8a.wgsl.expected.msl b/test/tint/builtins/gen/literal/fwidthCoarse/159c8a.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/fwidthCoarse/159c8a.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/fwidthCoarse/159c8a.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/fwidthCoarse/159c8a.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/fwidthCoarse/159c8a.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/fwidthCoarse/159c8a.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/fwidthCoarse/159c8a.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/fwidthCoarse/159c8a.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/fwidthCoarse/159c8a.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/fwidthCoarse/159c8a.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/fwidthCoarse/159c8a.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/fwidthCoarse/1e59d9.wgsl b/test/tint/builtins/gen/literal/fwidthCoarse/1e59d9.wgsl
similarity index 96%
rename from test/tint/builtins/gen/fwidthCoarse/1e59d9.wgsl
rename to test/tint/builtins/gen/literal/fwidthCoarse/1e59d9.wgsl
index 54a33245c2..1973cd7f65 100644
--- a/test/tint/builtins/gen/fwidthCoarse/1e59d9.wgsl
+++ b/test/tint/builtins/gen/literal/fwidthCoarse/1e59d9.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/fwidthCoarse/1e59d9.wgsl.expected.glsl b/test/tint/builtins/gen/literal/fwidthCoarse/1e59d9.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/fwidthCoarse/1e59d9.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/fwidthCoarse/1e59d9.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/fwidthCoarse/1e59d9.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/fwidthCoarse/1e59d9.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/fwidthCoarse/1e59d9.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/fwidthCoarse/1e59d9.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/fwidthCoarse/1e59d9.wgsl.expected.msl b/test/tint/builtins/gen/literal/fwidthCoarse/1e59d9.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/fwidthCoarse/1e59d9.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/fwidthCoarse/1e59d9.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/fwidthCoarse/1e59d9.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/fwidthCoarse/1e59d9.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/fwidthCoarse/1e59d9.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/fwidthCoarse/1e59d9.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/fwidthCoarse/1e59d9.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/fwidthCoarse/1e59d9.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/fwidthCoarse/1e59d9.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/fwidthCoarse/1e59d9.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/fwidthCoarse/4e4fc4.wgsl b/test/tint/builtins/gen/literal/fwidthCoarse/4e4fc4.wgsl
similarity index 96%
rename from test/tint/builtins/gen/fwidthCoarse/4e4fc4.wgsl
rename to test/tint/builtins/gen/literal/fwidthCoarse/4e4fc4.wgsl
index 236b9edaa2..56243c3d4f 100644
--- a/test/tint/builtins/gen/fwidthCoarse/4e4fc4.wgsl
+++ b/test/tint/builtins/gen/literal/fwidthCoarse/4e4fc4.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/fwidthCoarse/4e4fc4.wgsl.expected.glsl b/test/tint/builtins/gen/literal/fwidthCoarse/4e4fc4.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/fwidthCoarse/4e4fc4.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/fwidthCoarse/4e4fc4.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/fwidthCoarse/4e4fc4.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/fwidthCoarse/4e4fc4.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/fwidthCoarse/4e4fc4.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/fwidthCoarse/4e4fc4.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/fwidthCoarse/4e4fc4.wgsl.expected.msl b/test/tint/builtins/gen/literal/fwidthCoarse/4e4fc4.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/fwidthCoarse/4e4fc4.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/fwidthCoarse/4e4fc4.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/fwidthCoarse/4e4fc4.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/fwidthCoarse/4e4fc4.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/fwidthCoarse/4e4fc4.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/fwidthCoarse/4e4fc4.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/fwidthCoarse/4e4fc4.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/fwidthCoarse/4e4fc4.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/fwidthCoarse/4e4fc4.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/fwidthCoarse/4e4fc4.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/fwidthCoarse/e653f7.wgsl b/test/tint/builtins/gen/literal/fwidthCoarse/e653f7.wgsl
similarity index 96%
rename from test/tint/builtins/gen/fwidthCoarse/e653f7.wgsl
rename to test/tint/builtins/gen/literal/fwidthCoarse/e653f7.wgsl
index 7bc209ded2..389e52d9c4 100644
--- a/test/tint/builtins/gen/fwidthCoarse/e653f7.wgsl
+++ b/test/tint/builtins/gen/literal/fwidthCoarse/e653f7.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/fwidthCoarse/e653f7.wgsl.expected.glsl b/test/tint/builtins/gen/literal/fwidthCoarse/e653f7.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/fwidthCoarse/e653f7.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/fwidthCoarse/e653f7.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/fwidthCoarse/e653f7.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/fwidthCoarse/e653f7.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/fwidthCoarse/e653f7.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/fwidthCoarse/e653f7.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/fwidthCoarse/e653f7.wgsl.expected.msl b/test/tint/builtins/gen/literal/fwidthCoarse/e653f7.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/fwidthCoarse/e653f7.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/fwidthCoarse/e653f7.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/fwidthCoarse/e653f7.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/fwidthCoarse/e653f7.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/fwidthCoarse/e653f7.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/fwidthCoarse/e653f7.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/fwidthCoarse/e653f7.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/fwidthCoarse/e653f7.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/fwidthCoarse/e653f7.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/fwidthCoarse/e653f7.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/fwidthFine/523fdc.wgsl b/test/tint/builtins/gen/literal/fwidthFine/523fdc.wgsl
similarity index 96%
rename from test/tint/builtins/gen/fwidthFine/523fdc.wgsl
rename to test/tint/builtins/gen/literal/fwidthFine/523fdc.wgsl
index 7c95dd0076..93bc4403a3 100644
--- a/test/tint/builtins/gen/fwidthFine/523fdc.wgsl
+++ b/test/tint/builtins/gen/literal/fwidthFine/523fdc.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/fwidthFine/523fdc.wgsl.expected.glsl b/test/tint/builtins/gen/literal/fwidthFine/523fdc.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/fwidthFine/523fdc.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/fwidthFine/523fdc.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/fwidthFine/523fdc.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/fwidthFine/523fdc.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/fwidthFine/523fdc.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/fwidthFine/523fdc.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/fwidthFine/523fdc.wgsl.expected.msl b/test/tint/builtins/gen/literal/fwidthFine/523fdc.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/fwidthFine/523fdc.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/fwidthFine/523fdc.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/fwidthFine/523fdc.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/fwidthFine/523fdc.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/fwidthFine/523fdc.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/fwidthFine/523fdc.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/fwidthFine/523fdc.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/fwidthFine/523fdc.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/fwidthFine/523fdc.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/fwidthFine/523fdc.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/fwidthFine/68f4ef.wgsl b/test/tint/builtins/gen/literal/fwidthFine/68f4ef.wgsl
similarity index 96%
rename from test/tint/builtins/gen/fwidthFine/68f4ef.wgsl
rename to test/tint/builtins/gen/literal/fwidthFine/68f4ef.wgsl
index 20fef192fe..80005f1812 100644
--- a/test/tint/builtins/gen/fwidthFine/68f4ef.wgsl
+++ b/test/tint/builtins/gen/literal/fwidthFine/68f4ef.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/fwidthFine/68f4ef.wgsl.expected.glsl b/test/tint/builtins/gen/literal/fwidthFine/68f4ef.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/fwidthFine/68f4ef.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/fwidthFine/68f4ef.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/fwidthFine/68f4ef.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/fwidthFine/68f4ef.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/fwidthFine/68f4ef.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/fwidthFine/68f4ef.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/fwidthFine/68f4ef.wgsl.expected.msl b/test/tint/builtins/gen/literal/fwidthFine/68f4ef.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/fwidthFine/68f4ef.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/fwidthFine/68f4ef.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/fwidthFine/68f4ef.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/fwidthFine/68f4ef.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/fwidthFine/68f4ef.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/fwidthFine/68f4ef.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/fwidthFine/68f4ef.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/fwidthFine/68f4ef.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/fwidthFine/68f4ef.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/fwidthFine/68f4ef.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/fwidthFine/f1742d.wgsl b/test/tint/builtins/gen/literal/fwidthFine/f1742d.wgsl
similarity index 96%
rename from test/tint/builtins/gen/fwidthFine/f1742d.wgsl
rename to test/tint/builtins/gen/literal/fwidthFine/f1742d.wgsl
index d24600cfae..4310d22416 100644
--- a/test/tint/builtins/gen/fwidthFine/f1742d.wgsl
+++ b/test/tint/builtins/gen/literal/fwidthFine/f1742d.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/fwidthFine/f1742d.wgsl.expected.glsl b/test/tint/builtins/gen/literal/fwidthFine/f1742d.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/fwidthFine/f1742d.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/fwidthFine/f1742d.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/fwidthFine/f1742d.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/fwidthFine/f1742d.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/fwidthFine/f1742d.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/fwidthFine/f1742d.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/fwidthFine/f1742d.wgsl.expected.msl b/test/tint/builtins/gen/literal/fwidthFine/f1742d.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/fwidthFine/f1742d.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/fwidthFine/f1742d.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/fwidthFine/f1742d.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/fwidthFine/f1742d.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/fwidthFine/f1742d.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/fwidthFine/f1742d.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/fwidthFine/f1742d.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/fwidthFine/f1742d.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/fwidthFine/f1742d.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/fwidthFine/f1742d.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/fwidthFine/ff6aa0.wgsl b/test/tint/builtins/gen/literal/fwidthFine/ff6aa0.wgsl
similarity index 96%
rename from test/tint/builtins/gen/fwidthFine/ff6aa0.wgsl
rename to test/tint/builtins/gen/literal/fwidthFine/ff6aa0.wgsl
index 0002542937..e8e4c08c19 100644
--- a/test/tint/builtins/gen/fwidthFine/ff6aa0.wgsl
+++ b/test/tint/builtins/gen/literal/fwidthFine/ff6aa0.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/fwidthFine/ff6aa0.wgsl.expected.glsl b/test/tint/builtins/gen/literal/fwidthFine/ff6aa0.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/fwidthFine/ff6aa0.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/fwidthFine/ff6aa0.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/fwidthFine/ff6aa0.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/fwidthFine/ff6aa0.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/fwidthFine/ff6aa0.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/fwidthFine/ff6aa0.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/fwidthFine/ff6aa0.wgsl.expected.msl b/test/tint/builtins/gen/literal/fwidthFine/ff6aa0.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/fwidthFine/ff6aa0.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/fwidthFine/ff6aa0.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/fwidthFine/ff6aa0.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/fwidthFine/ff6aa0.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/fwidthFine/ff6aa0.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/fwidthFine/ff6aa0.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/fwidthFine/ff6aa0.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/fwidthFine/ff6aa0.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/fwidthFine/ff6aa0.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/fwidthFine/ff6aa0.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/insertBits/3c7ba5.wgsl b/test/tint/builtins/gen/literal/insertBits/3c7ba5.wgsl
similarity index 96%
rename from test/tint/builtins/gen/insertBits/3c7ba5.wgsl
rename to test/tint/builtins/gen/literal/insertBits/3c7ba5.wgsl
index 8816fa477b..f5879a69ae 100644
--- a/test/tint/builtins/gen/insertBits/3c7ba5.wgsl
+++ b/test/tint/builtins/gen/literal/insertBits/3c7ba5.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/insertBits/3c7ba5.wgsl.expected.glsl b/test/tint/builtins/gen/literal/insertBits/3c7ba5.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/insertBits/3c7ba5.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/insertBits/3c7ba5.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/insertBits/3c7ba5.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/insertBits/3c7ba5.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/insertBits/3c7ba5.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/insertBits/3c7ba5.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/insertBits/3c7ba5.wgsl.expected.msl b/test/tint/builtins/gen/literal/insertBits/3c7ba5.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/insertBits/3c7ba5.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/insertBits/3c7ba5.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/insertBits/3c7ba5.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/insertBits/3c7ba5.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/insertBits/3c7ba5.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/insertBits/3c7ba5.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/insertBits/3c7ba5.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/insertBits/3c7ba5.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/insertBits/3c7ba5.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/insertBits/3c7ba5.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/insertBits/428b0b.wgsl b/test/tint/builtins/gen/literal/insertBits/428b0b.wgsl
similarity index 96%
rename from test/tint/builtins/gen/insertBits/428b0b.wgsl
rename to test/tint/builtins/gen/literal/insertBits/428b0b.wgsl
index 8fafe77d17..1dd773e588 100644
--- a/test/tint/builtins/gen/insertBits/428b0b.wgsl
+++ b/test/tint/builtins/gen/literal/insertBits/428b0b.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/insertBits/428b0b.wgsl.expected.glsl b/test/tint/builtins/gen/literal/insertBits/428b0b.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/insertBits/428b0b.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/insertBits/428b0b.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/insertBits/428b0b.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/insertBits/428b0b.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/insertBits/428b0b.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/insertBits/428b0b.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/insertBits/428b0b.wgsl.expected.msl b/test/tint/builtins/gen/literal/insertBits/428b0b.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/insertBits/428b0b.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/insertBits/428b0b.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/insertBits/428b0b.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/insertBits/428b0b.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/insertBits/428b0b.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/insertBits/428b0b.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/insertBits/428b0b.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/insertBits/428b0b.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/insertBits/428b0b.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/insertBits/428b0b.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/insertBits/51ede1.wgsl b/test/tint/builtins/gen/literal/insertBits/51ede1.wgsl
similarity index 96%
rename from test/tint/builtins/gen/insertBits/51ede1.wgsl
rename to test/tint/builtins/gen/literal/insertBits/51ede1.wgsl
index e21ce9b1da..0ba617a867 100644
--- a/test/tint/builtins/gen/insertBits/51ede1.wgsl
+++ b/test/tint/builtins/gen/literal/insertBits/51ede1.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/insertBits/51ede1.wgsl.expected.glsl b/test/tint/builtins/gen/literal/insertBits/51ede1.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/insertBits/51ede1.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/insertBits/51ede1.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/insertBits/51ede1.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/insertBits/51ede1.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/insertBits/51ede1.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/insertBits/51ede1.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/insertBits/51ede1.wgsl.expected.msl b/test/tint/builtins/gen/literal/insertBits/51ede1.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/insertBits/51ede1.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/insertBits/51ede1.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/insertBits/51ede1.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/insertBits/51ede1.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/insertBits/51ede1.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/insertBits/51ede1.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/insertBits/51ede1.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/insertBits/51ede1.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/insertBits/51ede1.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/insertBits/51ede1.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/insertBits/65468b.wgsl b/test/tint/builtins/gen/literal/insertBits/65468b.wgsl
similarity index 96%
rename from test/tint/builtins/gen/insertBits/65468b.wgsl
rename to test/tint/builtins/gen/literal/insertBits/65468b.wgsl
index 45fe4f9480..b426cf5372 100644
--- a/test/tint/builtins/gen/insertBits/65468b.wgsl
+++ b/test/tint/builtins/gen/literal/insertBits/65468b.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/insertBits/65468b.wgsl.expected.glsl b/test/tint/builtins/gen/literal/insertBits/65468b.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/insertBits/65468b.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/insertBits/65468b.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/insertBits/65468b.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/insertBits/65468b.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/insertBits/65468b.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/insertBits/65468b.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/insertBits/65468b.wgsl.expected.msl b/test/tint/builtins/gen/literal/insertBits/65468b.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/insertBits/65468b.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/insertBits/65468b.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/insertBits/65468b.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/insertBits/65468b.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/insertBits/65468b.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/insertBits/65468b.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/insertBits/65468b.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/insertBits/65468b.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/insertBits/65468b.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/insertBits/65468b.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/insertBits/87826b.wgsl b/test/tint/builtins/gen/literal/insertBits/87826b.wgsl
similarity index 96%
rename from test/tint/builtins/gen/insertBits/87826b.wgsl
rename to test/tint/builtins/gen/literal/insertBits/87826b.wgsl
index 66bbaebf56..6ca4dd0aa8 100644
--- a/test/tint/builtins/gen/insertBits/87826b.wgsl
+++ b/test/tint/builtins/gen/literal/insertBits/87826b.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/insertBits/87826b.wgsl.expected.glsl b/test/tint/builtins/gen/literal/insertBits/87826b.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/insertBits/87826b.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/insertBits/87826b.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/insertBits/87826b.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/insertBits/87826b.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/insertBits/87826b.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/insertBits/87826b.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/insertBits/87826b.wgsl.expected.msl b/test/tint/builtins/gen/literal/insertBits/87826b.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/insertBits/87826b.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/insertBits/87826b.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/insertBits/87826b.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/insertBits/87826b.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/insertBits/87826b.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/insertBits/87826b.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/insertBits/87826b.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/insertBits/87826b.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/insertBits/87826b.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/insertBits/87826b.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/insertBits/d86978.wgsl b/test/tint/builtins/gen/literal/insertBits/d86978.wgsl
similarity index 96%
rename from test/tint/builtins/gen/insertBits/d86978.wgsl
rename to test/tint/builtins/gen/literal/insertBits/d86978.wgsl
index 3de726399d..421a87559e 100644
--- a/test/tint/builtins/gen/insertBits/d86978.wgsl
+++ b/test/tint/builtins/gen/literal/insertBits/d86978.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/insertBits/d86978.wgsl.expected.glsl b/test/tint/builtins/gen/literal/insertBits/d86978.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/insertBits/d86978.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/insertBits/d86978.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/insertBits/d86978.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/insertBits/d86978.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/insertBits/d86978.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/insertBits/d86978.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/insertBits/d86978.wgsl.expected.msl b/test/tint/builtins/gen/literal/insertBits/d86978.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/insertBits/d86978.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/insertBits/d86978.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/insertBits/d86978.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/insertBits/d86978.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/insertBits/d86978.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/insertBits/d86978.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/insertBits/d86978.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/insertBits/d86978.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/insertBits/d86978.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/insertBits/d86978.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/insertBits/e3e3a2.wgsl b/test/tint/builtins/gen/literal/insertBits/e3e3a2.wgsl
similarity index 96%
rename from test/tint/builtins/gen/insertBits/e3e3a2.wgsl
rename to test/tint/builtins/gen/literal/insertBits/e3e3a2.wgsl
index 2a43d7e314..7e12f244e6 100644
--- a/test/tint/builtins/gen/insertBits/e3e3a2.wgsl
+++ b/test/tint/builtins/gen/literal/insertBits/e3e3a2.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/insertBits/e3e3a2.wgsl.expected.glsl b/test/tint/builtins/gen/literal/insertBits/e3e3a2.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/insertBits/e3e3a2.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/insertBits/e3e3a2.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/insertBits/e3e3a2.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/insertBits/e3e3a2.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/insertBits/e3e3a2.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/insertBits/e3e3a2.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/insertBits/e3e3a2.wgsl.expected.msl b/test/tint/builtins/gen/literal/insertBits/e3e3a2.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/insertBits/e3e3a2.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/insertBits/e3e3a2.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/insertBits/e3e3a2.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/insertBits/e3e3a2.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/insertBits/e3e3a2.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/insertBits/e3e3a2.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/insertBits/e3e3a2.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/insertBits/e3e3a2.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/insertBits/e3e3a2.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/insertBits/e3e3a2.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/insertBits/fe6ba6.wgsl b/test/tint/builtins/gen/literal/insertBits/fe6ba6.wgsl
similarity index 96%
rename from test/tint/builtins/gen/insertBits/fe6ba6.wgsl
rename to test/tint/builtins/gen/literal/insertBits/fe6ba6.wgsl
index 550a23997c..56c4b03d39 100644
--- a/test/tint/builtins/gen/insertBits/fe6ba6.wgsl
+++ b/test/tint/builtins/gen/literal/insertBits/fe6ba6.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/insertBits/fe6ba6.wgsl.expected.glsl b/test/tint/builtins/gen/literal/insertBits/fe6ba6.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/insertBits/fe6ba6.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/insertBits/fe6ba6.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/insertBits/fe6ba6.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/insertBits/fe6ba6.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/insertBits/fe6ba6.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/insertBits/fe6ba6.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/insertBits/fe6ba6.wgsl.expected.msl b/test/tint/builtins/gen/literal/insertBits/fe6ba6.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/insertBits/fe6ba6.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/insertBits/fe6ba6.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/insertBits/fe6ba6.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/insertBits/fe6ba6.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/insertBits/fe6ba6.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/insertBits/fe6ba6.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/insertBits/fe6ba6.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/insertBits/fe6ba6.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/insertBits/fe6ba6.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/insertBits/fe6ba6.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/inverseSqrt/84407e.wgsl b/test/tint/builtins/gen/literal/inverseSqrt/84407e.wgsl
similarity index 96%
rename from test/tint/builtins/gen/inverseSqrt/84407e.wgsl
rename to test/tint/builtins/gen/literal/inverseSqrt/84407e.wgsl
index 42711dffa3..3d97d0fbc1 100644
--- a/test/tint/builtins/gen/inverseSqrt/84407e.wgsl
+++ b/test/tint/builtins/gen/literal/inverseSqrt/84407e.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/inverseSqrt/84407e.wgsl.expected.glsl b/test/tint/builtins/gen/literal/inverseSqrt/84407e.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/inverseSqrt/84407e.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/inverseSqrt/84407e.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/inverseSqrt/84407e.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/inverseSqrt/84407e.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/inverseSqrt/84407e.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/inverseSqrt/84407e.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/inverseSqrt/84407e.wgsl.expected.msl b/test/tint/builtins/gen/literal/inverseSqrt/84407e.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/inverseSqrt/84407e.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/inverseSqrt/84407e.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/inverseSqrt/84407e.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/inverseSqrt/84407e.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/inverseSqrt/84407e.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/inverseSqrt/84407e.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/inverseSqrt/84407e.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/inverseSqrt/84407e.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/inverseSqrt/84407e.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/inverseSqrt/84407e.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/inverseSqrt/8f2bd2.wgsl b/test/tint/builtins/gen/literal/inverseSqrt/8f2bd2.wgsl
similarity index 96%
rename from test/tint/builtins/gen/inverseSqrt/8f2bd2.wgsl
rename to test/tint/builtins/gen/literal/inverseSqrt/8f2bd2.wgsl
index 3e2c581199..d64ff26ab8 100644
--- a/test/tint/builtins/gen/inverseSqrt/8f2bd2.wgsl
+++ b/test/tint/builtins/gen/literal/inverseSqrt/8f2bd2.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/inverseSqrt/8f2bd2.wgsl.expected.glsl b/test/tint/builtins/gen/literal/inverseSqrt/8f2bd2.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/inverseSqrt/8f2bd2.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/inverseSqrt/8f2bd2.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/inverseSqrt/8f2bd2.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/inverseSqrt/8f2bd2.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/inverseSqrt/8f2bd2.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/inverseSqrt/8f2bd2.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/inverseSqrt/8f2bd2.wgsl.expected.msl b/test/tint/builtins/gen/literal/inverseSqrt/8f2bd2.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/inverseSqrt/8f2bd2.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/inverseSqrt/8f2bd2.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/inverseSqrt/8f2bd2.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/inverseSqrt/8f2bd2.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/inverseSqrt/8f2bd2.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/inverseSqrt/8f2bd2.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/inverseSqrt/8f2bd2.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/inverseSqrt/8f2bd2.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/inverseSqrt/8f2bd2.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/inverseSqrt/8f2bd2.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/inverseSqrt/b197b1.wgsl b/test/tint/builtins/gen/literal/inverseSqrt/b197b1.wgsl
similarity index 96%
rename from test/tint/builtins/gen/inverseSqrt/b197b1.wgsl
rename to test/tint/builtins/gen/literal/inverseSqrt/b197b1.wgsl
index 9edad1ba7c..1fe63f979d 100644
--- a/test/tint/builtins/gen/inverseSqrt/b197b1.wgsl
+++ b/test/tint/builtins/gen/literal/inverseSqrt/b197b1.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/inverseSqrt/b197b1.wgsl.expected.glsl b/test/tint/builtins/gen/literal/inverseSqrt/b197b1.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/inverseSqrt/b197b1.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/inverseSqrt/b197b1.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/inverseSqrt/b197b1.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/inverseSqrt/b197b1.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/inverseSqrt/b197b1.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/inverseSqrt/b197b1.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/inverseSqrt/b197b1.wgsl.expected.msl b/test/tint/builtins/gen/literal/inverseSqrt/b197b1.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/inverseSqrt/b197b1.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/inverseSqrt/b197b1.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/inverseSqrt/b197b1.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/inverseSqrt/b197b1.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/inverseSqrt/b197b1.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/inverseSqrt/b197b1.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/inverseSqrt/b197b1.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/inverseSqrt/b197b1.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/inverseSqrt/b197b1.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/inverseSqrt/b197b1.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/inverseSqrt/c22347.wgsl b/test/tint/builtins/gen/literal/inverseSqrt/c22347.wgsl
similarity index 96%
rename from test/tint/builtins/gen/inverseSqrt/c22347.wgsl
rename to test/tint/builtins/gen/literal/inverseSqrt/c22347.wgsl
index a0394fb90d..4536cb7a80 100644
--- a/test/tint/builtins/gen/inverseSqrt/c22347.wgsl
+++ b/test/tint/builtins/gen/literal/inverseSqrt/c22347.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/inverseSqrt/c22347.wgsl.expected.glsl b/test/tint/builtins/gen/literal/inverseSqrt/c22347.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/inverseSqrt/c22347.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/inverseSqrt/c22347.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/inverseSqrt/c22347.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/inverseSqrt/c22347.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/inverseSqrt/c22347.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/inverseSqrt/c22347.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/inverseSqrt/c22347.wgsl.expected.msl b/test/tint/builtins/gen/literal/inverseSqrt/c22347.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/inverseSqrt/c22347.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/inverseSqrt/c22347.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/inverseSqrt/c22347.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/inverseSqrt/c22347.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/inverseSqrt/c22347.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/inverseSqrt/c22347.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/inverseSqrt/c22347.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/inverseSqrt/c22347.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/inverseSqrt/c22347.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/inverseSqrt/c22347.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/ldexp/a31cdc.wgsl b/test/tint/builtins/gen/literal/ldexp/a31cdc.wgsl
similarity index 96%
rename from test/tint/builtins/gen/ldexp/a31cdc.wgsl
rename to test/tint/builtins/gen/literal/ldexp/a31cdc.wgsl
index 1a0c392210..daede0ba40 100644
--- a/test/tint/builtins/gen/ldexp/a31cdc.wgsl
+++ b/test/tint/builtins/gen/literal/ldexp/a31cdc.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/ldexp/a31cdc.wgsl.expected.glsl b/test/tint/builtins/gen/literal/ldexp/a31cdc.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/ldexp/a31cdc.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/ldexp/a31cdc.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/ldexp/a31cdc.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/ldexp/a31cdc.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/ldexp/a31cdc.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/ldexp/a31cdc.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/ldexp/a31cdc.wgsl.expected.msl b/test/tint/builtins/gen/literal/ldexp/a31cdc.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/ldexp/a31cdc.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/ldexp/a31cdc.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/ldexp/a31cdc.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/ldexp/a31cdc.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/ldexp/a31cdc.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/ldexp/a31cdc.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/ldexp/a31cdc.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/ldexp/a31cdc.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/ldexp/a31cdc.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/ldexp/a31cdc.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/ldexp/abd718.wgsl b/test/tint/builtins/gen/literal/ldexp/abd718.wgsl
similarity index 96%
rename from test/tint/builtins/gen/ldexp/abd718.wgsl
rename to test/tint/builtins/gen/literal/ldexp/abd718.wgsl
index ffa468a9dd..fb5d9b523d 100644
--- a/test/tint/builtins/gen/ldexp/abd718.wgsl
+++ b/test/tint/builtins/gen/literal/ldexp/abd718.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/ldexp/abd718.wgsl.expected.glsl b/test/tint/builtins/gen/literal/ldexp/abd718.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/ldexp/abd718.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/ldexp/abd718.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/ldexp/abd718.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/ldexp/abd718.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/ldexp/abd718.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/ldexp/abd718.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/ldexp/abd718.wgsl.expected.msl b/test/tint/builtins/gen/literal/ldexp/abd718.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/ldexp/abd718.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/ldexp/abd718.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/ldexp/abd718.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/ldexp/abd718.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/ldexp/abd718.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/ldexp/abd718.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/ldexp/abd718.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/ldexp/abd718.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/ldexp/abd718.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/ldexp/abd718.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/ldexp/cc9cde.wgsl b/test/tint/builtins/gen/literal/ldexp/cc9cde.wgsl
similarity index 96%
rename from test/tint/builtins/gen/ldexp/cc9cde.wgsl
rename to test/tint/builtins/gen/literal/ldexp/cc9cde.wgsl
index f2774fde35..6b1452982a 100644
--- a/test/tint/builtins/gen/ldexp/cc9cde.wgsl
+++ b/test/tint/builtins/gen/literal/ldexp/cc9cde.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/ldexp/cc9cde.wgsl.expected.glsl b/test/tint/builtins/gen/literal/ldexp/cc9cde.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/ldexp/cc9cde.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/ldexp/cc9cde.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/ldexp/cc9cde.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/ldexp/cc9cde.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/ldexp/cc9cde.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/ldexp/cc9cde.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/ldexp/cc9cde.wgsl.expected.msl b/test/tint/builtins/gen/literal/ldexp/cc9cde.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/ldexp/cc9cde.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/ldexp/cc9cde.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/ldexp/cc9cde.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/ldexp/cc9cde.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/ldexp/cc9cde.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/ldexp/cc9cde.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/ldexp/cc9cde.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/ldexp/cc9cde.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/ldexp/cc9cde.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/ldexp/cc9cde.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/ldexp/db8b49.wgsl b/test/tint/builtins/gen/literal/ldexp/db8b49.wgsl
similarity index 96%
rename from test/tint/builtins/gen/ldexp/db8b49.wgsl
rename to test/tint/builtins/gen/literal/ldexp/db8b49.wgsl
index aad5fdcae7..7ed2b37aaf 100644
--- a/test/tint/builtins/gen/ldexp/db8b49.wgsl
+++ b/test/tint/builtins/gen/literal/ldexp/db8b49.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/ldexp/db8b49.wgsl.expected.glsl b/test/tint/builtins/gen/literal/ldexp/db8b49.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/ldexp/db8b49.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/ldexp/db8b49.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/ldexp/db8b49.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/ldexp/db8b49.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/ldexp/db8b49.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/ldexp/db8b49.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/ldexp/db8b49.wgsl.expected.msl b/test/tint/builtins/gen/literal/ldexp/db8b49.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/ldexp/db8b49.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/ldexp/db8b49.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/ldexp/db8b49.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/ldexp/db8b49.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/ldexp/db8b49.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/ldexp/db8b49.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/ldexp/db8b49.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/ldexp/db8b49.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/ldexp/db8b49.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/ldexp/db8b49.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/length/056071.wgsl b/test/tint/builtins/gen/literal/length/056071.wgsl
similarity index 96%
rename from test/tint/builtins/gen/length/056071.wgsl
rename to test/tint/builtins/gen/literal/length/056071.wgsl
index 34bc10d70b..159a0c184a 100644
--- a/test/tint/builtins/gen/length/056071.wgsl
+++ b/test/tint/builtins/gen/literal/length/056071.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/length/056071.wgsl.expected.glsl b/test/tint/builtins/gen/literal/length/056071.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/length/056071.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/length/056071.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/length/056071.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/length/056071.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/length/056071.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/length/056071.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/length/056071.wgsl.expected.msl b/test/tint/builtins/gen/literal/length/056071.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/length/056071.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/length/056071.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/length/056071.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/length/056071.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/length/056071.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/length/056071.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/length/056071.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/length/056071.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/length/056071.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/length/056071.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/length/602a17.wgsl b/test/tint/builtins/gen/literal/length/602a17.wgsl
similarity index 96%
rename from test/tint/builtins/gen/length/602a17.wgsl
rename to test/tint/builtins/gen/literal/length/602a17.wgsl
index a2f82a6e26..4ad050ba78 100644
--- a/test/tint/builtins/gen/length/602a17.wgsl
+++ b/test/tint/builtins/gen/literal/length/602a17.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/length/602a17.wgsl.expected.glsl b/test/tint/builtins/gen/literal/length/602a17.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/length/602a17.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/length/602a17.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/length/602a17.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/length/602a17.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/length/602a17.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/length/602a17.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/length/602a17.wgsl.expected.msl b/test/tint/builtins/gen/literal/length/602a17.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/length/602a17.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/length/602a17.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/length/602a17.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/length/602a17.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/length/602a17.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/length/602a17.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/length/602a17.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/length/602a17.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/length/602a17.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/length/602a17.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/length/afde8b.wgsl b/test/tint/builtins/gen/literal/length/afde8b.wgsl
similarity index 96%
rename from test/tint/builtins/gen/length/afde8b.wgsl
rename to test/tint/builtins/gen/literal/length/afde8b.wgsl
index 4f4ec0b84e..b936e5e78d 100644
--- a/test/tint/builtins/gen/length/afde8b.wgsl
+++ b/test/tint/builtins/gen/literal/length/afde8b.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/length/afde8b.wgsl.expected.glsl b/test/tint/builtins/gen/literal/length/afde8b.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/length/afde8b.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/length/afde8b.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/length/afde8b.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/length/afde8b.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/length/afde8b.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/length/afde8b.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/length/afde8b.wgsl.expected.msl b/test/tint/builtins/gen/literal/length/afde8b.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/length/afde8b.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/length/afde8b.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/length/afde8b.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/length/afde8b.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/length/afde8b.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/length/afde8b.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/length/afde8b.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/length/afde8b.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/length/afde8b.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/length/afde8b.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/length/becebf.wgsl b/test/tint/builtins/gen/literal/length/becebf.wgsl
similarity index 96%
rename from test/tint/builtins/gen/length/becebf.wgsl
rename to test/tint/builtins/gen/literal/length/becebf.wgsl
index ea489454b2..6a3481e3bb 100644
--- a/test/tint/builtins/gen/length/becebf.wgsl
+++ b/test/tint/builtins/gen/literal/length/becebf.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/length/becebf.wgsl.expected.glsl b/test/tint/builtins/gen/literal/length/becebf.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/length/becebf.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/length/becebf.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/length/becebf.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/length/becebf.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/length/becebf.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/length/becebf.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/length/becebf.wgsl.expected.msl b/test/tint/builtins/gen/literal/length/becebf.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/length/becebf.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/length/becebf.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/length/becebf.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/length/becebf.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/length/becebf.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/length/becebf.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/length/becebf.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/length/becebf.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/length/becebf.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/length/becebf.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/log/3da25a.wgsl b/test/tint/builtins/gen/literal/log/3da25a.wgsl
similarity index 96%
rename from test/tint/builtins/gen/log/3da25a.wgsl
rename to test/tint/builtins/gen/literal/log/3da25a.wgsl
index c487a2028b..b10d7ce268 100644
--- a/test/tint/builtins/gen/log/3da25a.wgsl
+++ b/test/tint/builtins/gen/literal/log/3da25a.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/log/3da25a.wgsl.expected.glsl b/test/tint/builtins/gen/literal/log/3da25a.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/log/3da25a.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/log/3da25a.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/log/3da25a.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/log/3da25a.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/log/3da25a.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/log/3da25a.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/log/3da25a.wgsl.expected.msl b/test/tint/builtins/gen/literal/log/3da25a.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/log/3da25a.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/log/3da25a.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/log/3da25a.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/log/3da25a.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/log/3da25a.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/log/3da25a.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/log/3da25a.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/log/3da25a.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/log/3da25a.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/log/3da25a.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/log/7114a6.wgsl b/test/tint/builtins/gen/literal/log/7114a6.wgsl
similarity index 96%
rename from test/tint/builtins/gen/log/7114a6.wgsl
rename to test/tint/builtins/gen/literal/log/7114a6.wgsl
index b3c4b747c8..3bce023dd2 100644
--- a/test/tint/builtins/gen/log/7114a6.wgsl
+++ b/test/tint/builtins/gen/literal/log/7114a6.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/log/7114a6.wgsl.expected.glsl b/test/tint/builtins/gen/literal/log/7114a6.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/log/7114a6.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/log/7114a6.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/log/7114a6.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/log/7114a6.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/log/7114a6.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/log/7114a6.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/log/7114a6.wgsl.expected.msl b/test/tint/builtins/gen/literal/log/7114a6.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/log/7114a6.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/log/7114a6.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/log/7114a6.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/log/7114a6.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/log/7114a6.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/log/7114a6.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/log/7114a6.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/log/7114a6.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/log/7114a6.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/log/7114a6.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/log/b2ce28.wgsl b/test/tint/builtins/gen/literal/log/b2ce28.wgsl
similarity index 96%
rename from test/tint/builtins/gen/log/b2ce28.wgsl
rename to test/tint/builtins/gen/literal/log/b2ce28.wgsl
index 1a52cf45c0..842afe4022 100644
--- a/test/tint/builtins/gen/log/b2ce28.wgsl
+++ b/test/tint/builtins/gen/literal/log/b2ce28.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/log/b2ce28.wgsl.expected.glsl b/test/tint/builtins/gen/literal/log/b2ce28.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/log/b2ce28.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/log/b2ce28.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/log/b2ce28.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/log/b2ce28.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/log/b2ce28.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/log/b2ce28.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/log/b2ce28.wgsl.expected.msl b/test/tint/builtins/gen/literal/log/b2ce28.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/log/b2ce28.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/log/b2ce28.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/log/b2ce28.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/log/b2ce28.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/log/b2ce28.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/log/b2ce28.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/log/b2ce28.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/log/b2ce28.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/log/b2ce28.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/log/b2ce28.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/log/f4c570.wgsl b/test/tint/builtins/gen/literal/log/f4c570.wgsl
similarity index 96%
rename from test/tint/builtins/gen/log/f4c570.wgsl
rename to test/tint/builtins/gen/literal/log/f4c570.wgsl
index f6a1a388aa..544d8802a2 100644
--- a/test/tint/builtins/gen/log/f4c570.wgsl
+++ b/test/tint/builtins/gen/literal/log/f4c570.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/log/f4c570.wgsl.expected.glsl b/test/tint/builtins/gen/literal/log/f4c570.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/log/f4c570.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/log/f4c570.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/log/f4c570.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/log/f4c570.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/log/f4c570.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/log/f4c570.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/log/f4c570.wgsl.expected.msl b/test/tint/builtins/gen/literal/log/f4c570.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/log/f4c570.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/log/f4c570.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/log/f4c570.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/log/f4c570.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/log/f4c570.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/log/f4c570.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/log/f4c570.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/log/f4c570.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/log/f4c570.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/log/f4c570.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/log2/4036ed.wgsl b/test/tint/builtins/gen/literal/log2/4036ed.wgsl
similarity index 96%
rename from test/tint/builtins/gen/log2/4036ed.wgsl
rename to test/tint/builtins/gen/literal/log2/4036ed.wgsl
index bd4b0f34a9..da8ae3ed5a 100644
--- a/test/tint/builtins/gen/log2/4036ed.wgsl
+++ b/test/tint/builtins/gen/literal/log2/4036ed.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/log2/4036ed.wgsl.expected.glsl b/test/tint/builtins/gen/literal/log2/4036ed.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/log2/4036ed.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/log2/4036ed.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/log2/4036ed.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/log2/4036ed.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/log2/4036ed.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/log2/4036ed.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/log2/4036ed.wgsl.expected.msl b/test/tint/builtins/gen/literal/log2/4036ed.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/log2/4036ed.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/log2/4036ed.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/log2/4036ed.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/log2/4036ed.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/log2/4036ed.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/log2/4036ed.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/log2/4036ed.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/log2/4036ed.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/log2/4036ed.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/log2/4036ed.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/log2/902988.wgsl b/test/tint/builtins/gen/literal/log2/902988.wgsl
similarity index 96%
rename from test/tint/builtins/gen/log2/902988.wgsl
rename to test/tint/builtins/gen/literal/log2/902988.wgsl
index 19328feb7c..c9af8549d5 100644
--- a/test/tint/builtins/gen/log2/902988.wgsl
+++ b/test/tint/builtins/gen/literal/log2/902988.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/log2/902988.wgsl.expected.glsl b/test/tint/builtins/gen/literal/log2/902988.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/log2/902988.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/log2/902988.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/log2/902988.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/log2/902988.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/log2/902988.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/log2/902988.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/log2/902988.wgsl.expected.msl b/test/tint/builtins/gen/literal/log2/902988.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/log2/902988.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/log2/902988.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/log2/902988.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/log2/902988.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/log2/902988.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/log2/902988.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/log2/902988.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/log2/902988.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/log2/902988.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/log2/902988.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/log2/adb233.wgsl b/test/tint/builtins/gen/literal/log2/adb233.wgsl
similarity index 96%
rename from test/tint/builtins/gen/log2/adb233.wgsl
rename to test/tint/builtins/gen/literal/log2/adb233.wgsl
index dfd796f073..f4d516f1be 100644
--- a/test/tint/builtins/gen/log2/adb233.wgsl
+++ b/test/tint/builtins/gen/literal/log2/adb233.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/log2/adb233.wgsl.expected.glsl b/test/tint/builtins/gen/literal/log2/adb233.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/log2/adb233.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/log2/adb233.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/log2/adb233.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/log2/adb233.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/log2/adb233.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/log2/adb233.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/log2/adb233.wgsl.expected.msl b/test/tint/builtins/gen/literal/log2/adb233.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/log2/adb233.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/log2/adb233.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/log2/adb233.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/log2/adb233.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/log2/adb233.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/log2/adb233.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/log2/adb233.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/log2/adb233.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/log2/adb233.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/log2/adb233.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/log2/aea659.wgsl b/test/tint/builtins/gen/literal/log2/aea659.wgsl
similarity index 96%
rename from test/tint/builtins/gen/log2/aea659.wgsl
rename to test/tint/builtins/gen/literal/log2/aea659.wgsl
index 1cc02c6271..46e3ef8c49 100644
--- a/test/tint/builtins/gen/log2/aea659.wgsl
+++ b/test/tint/builtins/gen/literal/log2/aea659.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/log2/aea659.wgsl.expected.glsl b/test/tint/builtins/gen/literal/log2/aea659.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/log2/aea659.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/log2/aea659.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/log2/aea659.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/log2/aea659.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/log2/aea659.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/log2/aea659.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/log2/aea659.wgsl.expected.msl b/test/tint/builtins/gen/literal/log2/aea659.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/log2/aea659.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/log2/aea659.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/log2/aea659.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/log2/aea659.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/log2/aea659.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/log2/aea659.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/log2/aea659.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/log2/aea659.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/log2/aea659.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/log2/aea659.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/max/0c0aae.wgsl b/test/tint/builtins/gen/literal/max/0c0aae.wgsl
similarity index 96%
rename from test/tint/builtins/gen/max/0c0aae.wgsl
rename to test/tint/builtins/gen/literal/max/0c0aae.wgsl
index 0df86118f6..31e3b8c7b9 100644
--- a/test/tint/builtins/gen/max/0c0aae.wgsl
+++ b/test/tint/builtins/gen/literal/max/0c0aae.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/max/0c0aae.wgsl.expected.glsl b/test/tint/builtins/gen/literal/max/0c0aae.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/max/0c0aae.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/max/0c0aae.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/max/0c0aae.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/max/0c0aae.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/max/0c0aae.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/max/0c0aae.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/max/0c0aae.wgsl.expected.msl b/test/tint/builtins/gen/literal/max/0c0aae.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/max/0c0aae.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/max/0c0aae.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/max/0c0aae.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/max/0c0aae.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/max/0c0aae.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/max/0c0aae.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/max/0c0aae.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/max/0c0aae.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/max/0c0aae.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/max/0c0aae.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/max/25eafe.wgsl b/test/tint/builtins/gen/literal/max/25eafe.wgsl
similarity index 96%
rename from test/tint/builtins/gen/max/25eafe.wgsl
rename to test/tint/builtins/gen/literal/max/25eafe.wgsl
index b86d13796a..717de1972e 100644
--- a/test/tint/builtins/gen/max/25eafe.wgsl
+++ b/test/tint/builtins/gen/literal/max/25eafe.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/max/25eafe.wgsl.expected.glsl b/test/tint/builtins/gen/literal/max/25eafe.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/max/25eafe.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/max/25eafe.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/max/25eafe.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/max/25eafe.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/max/25eafe.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/max/25eafe.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/max/25eafe.wgsl.expected.msl b/test/tint/builtins/gen/literal/max/25eafe.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/max/25eafe.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/max/25eafe.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/max/25eafe.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/max/25eafe.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/max/25eafe.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/max/25eafe.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/max/25eafe.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/max/25eafe.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/max/25eafe.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/max/25eafe.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/max/320815.wgsl b/test/tint/builtins/gen/literal/max/320815.wgsl
similarity index 96%
rename from test/tint/builtins/gen/max/320815.wgsl
rename to test/tint/builtins/gen/literal/max/320815.wgsl
index c931f35972..4c70788c48 100644
--- a/test/tint/builtins/gen/max/320815.wgsl
+++ b/test/tint/builtins/gen/literal/max/320815.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/max/320815.wgsl.expected.glsl b/test/tint/builtins/gen/literal/max/320815.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/max/320815.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/max/320815.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/max/320815.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/max/320815.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/max/320815.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/max/320815.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/max/320815.wgsl.expected.msl b/test/tint/builtins/gen/literal/max/320815.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/max/320815.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/max/320815.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/max/320815.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/max/320815.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/max/320815.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/max/320815.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/max/320815.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/max/320815.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/max/320815.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/max/320815.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/max/44a39d.wgsl b/test/tint/builtins/gen/literal/max/44a39d.wgsl
similarity index 96%
rename from test/tint/builtins/gen/max/44a39d.wgsl
rename to test/tint/builtins/gen/literal/max/44a39d.wgsl
index 02154637c9..5c38a89749 100644
--- a/test/tint/builtins/gen/max/44a39d.wgsl
+++ b/test/tint/builtins/gen/literal/max/44a39d.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/max/44a39d.wgsl.expected.glsl b/test/tint/builtins/gen/literal/max/44a39d.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/max/44a39d.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/max/44a39d.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/max/44a39d.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/max/44a39d.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/max/44a39d.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/max/44a39d.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/max/44a39d.wgsl.expected.msl b/test/tint/builtins/gen/literal/max/44a39d.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/max/44a39d.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/max/44a39d.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/max/44a39d.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/max/44a39d.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/max/44a39d.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/max/44a39d.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/max/44a39d.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/max/44a39d.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/max/44a39d.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/max/44a39d.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/max/453e04.wgsl b/test/tint/builtins/gen/literal/max/453e04.wgsl
similarity index 96%
rename from test/tint/builtins/gen/max/453e04.wgsl
rename to test/tint/builtins/gen/literal/max/453e04.wgsl
index 9d55ca87e2..df4f70beba 100644
--- a/test/tint/builtins/gen/max/453e04.wgsl
+++ b/test/tint/builtins/gen/literal/max/453e04.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/max/453e04.wgsl.expected.glsl b/test/tint/builtins/gen/literal/max/453e04.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/max/453e04.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/max/453e04.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/max/453e04.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/max/453e04.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/max/453e04.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/max/453e04.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/max/453e04.wgsl.expected.msl b/test/tint/builtins/gen/literal/max/453e04.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/max/453e04.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/max/453e04.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/max/453e04.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/max/453e04.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/max/453e04.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/max/453e04.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/max/453e04.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/max/453e04.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/max/453e04.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/max/453e04.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/max/462050.wgsl b/test/tint/builtins/gen/literal/max/462050.wgsl
similarity index 96%
rename from test/tint/builtins/gen/max/462050.wgsl
rename to test/tint/builtins/gen/literal/max/462050.wgsl
index bbff876d5f..7c37686828 100644
--- a/test/tint/builtins/gen/max/462050.wgsl
+++ b/test/tint/builtins/gen/literal/max/462050.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/max/462050.wgsl.expected.glsl b/test/tint/builtins/gen/literal/max/462050.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/max/462050.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/max/462050.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/max/462050.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/max/462050.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/max/462050.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/max/462050.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/max/462050.wgsl.expected.msl b/test/tint/builtins/gen/literal/max/462050.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/max/462050.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/max/462050.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/max/462050.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/max/462050.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/max/462050.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/max/462050.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/max/462050.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/max/462050.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/max/462050.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/max/462050.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/max/4883ac.wgsl b/test/tint/builtins/gen/literal/max/4883ac.wgsl
similarity index 96%
rename from test/tint/builtins/gen/max/4883ac.wgsl
rename to test/tint/builtins/gen/literal/max/4883ac.wgsl
index 5656824b33..f94ba6cd6c 100644
--- a/test/tint/builtins/gen/max/4883ac.wgsl
+++ b/test/tint/builtins/gen/literal/max/4883ac.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/max/4883ac.wgsl.expected.glsl b/test/tint/builtins/gen/literal/max/4883ac.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/max/4883ac.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/max/4883ac.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/max/4883ac.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/max/4883ac.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/max/4883ac.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/max/4883ac.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/max/4883ac.wgsl.expected.msl b/test/tint/builtins/gen/literal/max/4883ac.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/max/4883ac.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/max/4883ac.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/max/4883ac.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/max/4883ac.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/max/4883ac.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/max/4883ac.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/max/4883ac.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/max/4883ac.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/max/4883ac.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/max/4883ac.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/max/85e6bc.wgsl b/test/tint/builtins/gen/literal/max/85e6bc.wgsl
similarity index 96%
rename from test/tint/builtins/gen/max/85e6bc.wgsl
rename to test/tint/builtins/gen/literal/max/85e6bc.wgsl
index 478a4059ce..e62f000d1d 100644
--- a/test/tint/builtins/gen/max/85e6bc.wgsl
+++ b/test/tint/builtins/gen/literal/max/85e6bc.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/max/85e6bc.wgsl.expected.glsl b/test/tint/builtins/gen/literal/max/85e6bc.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/max/85e6bc.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/max/85e6bc.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/max/85e6bc.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/max/85e6bc.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/max/85e6bc.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/max/85e6bc.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/max/85e6bc.wgsl.expected.msl b/test/tint/builtins/gen/literal/max/85e6bc.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/max/85e6bc.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/max/85e6bc.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/max/85e6bc.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/max/85e6bc.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/max/85e6bc.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/max/85e6bc.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/max/85e6bc.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/max/85e6bc.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/max/85e6bc.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/max/85e6bc.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/max/a93419.wgsl b/test/tint/builtins/gen/literal/max/a93419.wgsl
similarity index 96%
rename from test/tint/builtins/gen/max/a93419.wgsl
rename to test/tint/builtins/gen/literal/max/a93419.wgsl
index 1779143aa3..8105d255eb 100644
--- a/test/tint/builtins/gen/max/a93419.wgsl
+++ b/test/tint/builtins/gen/literal/max/a93419.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/max/a93419.wgsl.expected.glsl b/test/tint/builtins/gen/literal/max/a93419.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/max/a93419.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/max/a93419.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/max/a93419.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/max/a93419.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/max/a93419.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/max/a93419.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/max/a93419.wgsl.expected.msl b/test/tint/builtins/gen/literal/max/a93419.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/max/a93419.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/max/a93419.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/max/a93419.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/max/a93419.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/max/a93419.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/max/a93419.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/max/a93419.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/max/a93419.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/max/a93419.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/max/a93419.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/max/b1b73a.wgsl b/test/tint/builtins/gen/literal/max/b1b73a.wgsl
similarity index 96%
rename from test/tint/builtins/gen/max/b1b73a.wgsl
rename to test/tint/builtins/gen/literal/max/b1b73a.wgsl
index 07dd4a2e83..ae43e46e50 100644
--- a/test/tint/builtins/gen/max/b1b73a.wgsl
+++ b/test/tint/builtins/gen/literal/max/b1b73a.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/max/b1b73a.wgsl.expected.glsl b/test/tint/builtins/gen/literal/max/b1b73a.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/max/b1b73a.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/max/b1b73a.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/max/b1b73a.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/max/b1b73a.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/max/b1b73a.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/max/b1b73a.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/max/b1b73a.wgsl.expected.msl b/test/tint/builtins/gen/literal/max/b1b73a.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/max/b1b73a.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/max/b1b73a.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/max/b1b73a.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/max/b1b73a.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/max/b1b73a.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/max/b1b73a.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/max/b1b73a.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/max/b1b73a.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/max/b1b73a.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/max/b1b73a.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/max/ce7c30.wgsl b/test/tint/builtins/gen/literal/max/ce7c30.wgsl
similarity index 96%
rename from test/tint/builtins/gen/max/ce7c30.wgsl
rename to test/tint/builtins/gen/literal/max/ce7c30.wgsl
index c119aaec29..ce0ecbbcaa 100644
--- a/test/tint/builtins/gen/max/ce7c30.wgsl
+++ b/test/tint/builtins/gen/literal/max/ce7c30.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/max/ce7c30.wgsl.expected.glsl b/test/tint/builtins/gen/literal/max/ce7c30.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/max/ce7c30.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/max/ce7c30.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/max/ce7c30.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/max/ce7c30.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/max/ce7c30.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/max/ce7c30.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/max/ce7c30.wgsl.expected.msl b/test/tint/builtins/gen/literal/max/ce7c30.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/max/ce7c30.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/max/ce7c30.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/max/ce7c30.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/max/ce7c30.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/max/ce7c30.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/max/ce7c30.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/max/ce7c30.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/max/ce7c30.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/max/ce7c30.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/max/ce7c30.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/max/e8192f.wgsl b/test/tint/builtins/gen/literal/max/e8192f.wgsl
similarity index 96%
rename from test/tint/builtins/gen/max/e8192f.wgsl
rename to test/tint/builtins/gen/literal/max/e8192f.wgsl
index aa0ebb30c6..61085c4be3 100644
--- a/test/tint/builtins/gen/max/e8192f.wgsl
+++ b/test/tint/builtins/gen/literal/max/e8192f.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/max/e8192f.wgsl.expected.glsl b/test/tint/builtins/gen/literal/max/e8192f.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/max/e8192f.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/max/e8192f.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/max/e8192f.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/max/e8192f.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/max/e8192f.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/max/e8192f.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/max/e8192f.wgsl.expected.msl b/test/tint/builtins/gen/literal/max/e8192f.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/max/e8192f.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/max/e8192f.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/max/e8192f.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/max/e8192f.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/max/e8192f.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/max/e8192f.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/max/e8192f.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/max/e8192f.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/max/e8192f.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/max/e8192f.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/min/03c7e3.wgsl b/test/tint/builtins/gen/literal/min/03c7e3.wgsl
similarity index 96%
rename from test/tint/builtins/gen/min/03c7e3.wgsl
rename to test/tint/builtins/gen/literal/min/03c7e3.wgsl
index e237394855..8155b49534 100644
--- a/test/tint/builtins/gen/min/03c7e3.wgsl
+++ b/test/tint/builtins/gen/literal/min/03c7e3.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/min/03c7e3.wgsl.expected.glsl b/test/tint/builtins/gen/literal/min/03c7e3.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/min/03c7e3.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/min/03c7e3.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/min/03c7e3.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/min/03c7e3.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/min/03c7e3.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/min/03c7e3.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/min/03c7e3.wgsl.expected.msl b/test/tint/builtins/gen/literal/min/03c7e3.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/min/03c7e3.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/min/03c7e3.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/min/03c7e3.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/min/03c7e3.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/min/03c7e3.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/min/03c7e3.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/min/03c7e3.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/min/03c7e3.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/min/03c7e3.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/min/03c7e3.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/min/0dc614.wgsl b/test/tint/builtins/gen/literal/min/0dc614.wgsl
similarity index 96%
rename from test/tint/builtins/gen/min/0dc614.wgsl
rename to test/tint/builtins/gen/literal/min/0dc614.wgsl
index 8c896eed08..41af73e045 100644
--- a/test/tint/builtins/gen/min/0dc614.wgsl
+++ b/test/tint/builtins/gen/literal/min/0dc614.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/min/0dc614.wgsl.expected.glsl b/test/tint/builtins/gen/literal/min/0dc614.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/min/0dc614.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/min/0dc614.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/min/0dc614.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/min/0dc614.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/min/0dc614.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/min/0dc614.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/min/0dc614.wgsl.expected.msl b/test/tint/builtins/gen/literal/min/0dc614.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/min/0dc614.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/min/0dc614.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/min/0dc614.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/min/0dc614.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/min/0dc614.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/min/0dc614.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/min/0dc614.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/min/0dc614.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/min/0dc614.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/min/0dc614.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/min/3941e1.wgsl b/test/tint/builtins/gen/literal/min/3941e1.wgsl
similarity index 96%
rename from test/tint/builtins/gen/min/3941e1.wgsl
rename to test/tint/builtins/gen/literal/min/3941e1.wgsl
index 350d70f347..3ae488ab81 100644
--- a/test/tint/builtins/gen/min/3941e1.wgsl
+++ b/test/tint/builtins/gen/literal/min/3941e1.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/min/3941e1.wgsl.expected.glsl b/test/tint/builtins/gen/literal/min/3941e1.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/min/3941e1.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/min/3941e1.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/min/3941e1.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/min/3941e1.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/min/3941e1.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/min/3941e1.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/min/3941e1.wgsl.expected.msl b/test/tint/builtins/gen/literal/min/3941e1.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/min/3941e1.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/min/3941e1.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/min/3941e1.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/min/3941e1.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/min/3941e1.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/min/3941e1.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/min/3941e1.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/min/3941e1.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/min/3941e1.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/min/3941e1.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/min/46c5d3.wgsl b/test/tint/builtins/gen/literal/min/46c5d3.wgsl
similarity index 96%
rename from test/tint/builtins/gen/min/46c5d3.wgsl
rename to test/tint/builtins/gen/literal/min/46c5d3.wgsl
index 9d6e7018ae..d81860d278 100644
--- a/test/tint/builtins/gen/min/46c5d3.wgsl
+++ b/test/tint/builtins/gen/literal/min/46c5d3.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/min/46c5d3.wgsl.expected.glsl b/test/tint/builtins/gen/literal/min/46c5d3.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/min/46c5d3.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/min/46c5d3.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/min/46c5d3.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/min/46c5d3.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/min/46c5d3.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/min/46c5d3.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/min/46c5d3.wgsl.expected.msl b/test/tint/builtins/gen/literal/min/46c5d3.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/min/46c5d3.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/min/46c5d3.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/min/46c5d3.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/min/46c5d3.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/min/46c5d3.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/min/46c5d3.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/min/46c5d3.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/min/46c5d3.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/min/46c5d3.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/min/46c5d3.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/min/82b28f.wgsl b/test/tint/builtins/gen/literal/min/82b28f.wgsl
similarity index 96%
rename from test/tint/builtins/gen/min/82b28f.wgsl
rename to test/tint/builtins/gen/literal/min/82b28f.wgsl
index b6e12bc186..7ddd2ed883 100644
--- a/test/tint/builtins/gen/min/82b28f.wgsl
+++ b/test/tint/builtins/gen/literal/min/82b28f.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/min/82b28f.wgsl.expected.glsl b/test/tint/builtins/gen/literal/min/82b28f.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/min/82b28f.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/min/82b28f.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/min/82b28f.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/min/82b28f.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/min/82b28f.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/min/82b28f.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/min/82b28f.wgsl.expected.msl b/test/tint/builtins/gen/literal/min/82b28f.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/min/82b28f.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/min/82b28f.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/min/82b28f.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/min/82b28f.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/min/82b28f.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/min/82b28f.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/min/82b28f.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/min/82b28f.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/min/82b28f.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/min/82b28f.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/min/93cfc4.wgsl b/test/tint/builtins/gen/literal/min/93cfc4.wgsl
similarity index 96%
rename from test/tint/builtins/gen/min/93cfc4.wgsl
rename to test/tint/builtins/gen/literal/min/93cfc4.wgsl
index bb98a54774..e550e19d86 100644
--- a/test/tint/builtins/gen/min/93cfc4.wgsl
+++ b/test/tint/builtins/gen/literal/min/93cfc4.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/min/93cfc4.wgsl.expected.glsl b/test/tint/builtins/gen/literal/min/93cfc4.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/min/93cfc4.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/min/93cfc4.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/min/93cfc4.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/min/93cfc4.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/min/93cfc4.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/min/93cfc4.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/min/93cfc4.wgsl.expected.msl b/test/tint/builtins/gen/literal/min/93cfc4.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/min/93cfc4.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/min/93cfc4.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/min/93cfc4.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/min/93cfc4.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/min/93cfc4.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/min/93cfc4.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/min/93cfc4.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/min/93cfc4.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/min/93cfc4.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/min/93cfc4.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/min/a45171.wgsl b/test/tint/builtins/gen/literal/min/a45171.wgsl
similarity index 96%
rename from test/tint/builtins/gen/min/a45171.wgsl
rename to test/tint/builtins/gen/literal/min/a45171.wgsl
index 4504a1a3c2..6d0bce1840 100644
--- a/test/tint/builtins/gen/min/a45171.wgsl
+++ b/test/tint/builtins/gen/literal/min/a45171.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/min/a45171.wgsl.expected.glsl b/test/tint/builtins/gen/literal/min/a45171.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/min/a45171.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/min/a45171.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/min/a45171.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/min/a45171.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/min/a45171.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/min/a45171.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/min/a45171.wgsl.expected.msl b/test/tint/builtins/gen/literal/min/a45171.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/min/a45171.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/min/a45171.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/min/a45171.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/min/a45171.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/min/a45171.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/min/a45171.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/min/a45171.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/min/a45171.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/min/a45171.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/min/a45171.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/min/aa28ad.wgsl b/test/tint/builtins/gen/literal/min/aa28ad.wgsl
similarity index 96%
rename from test/tint/builtins/gen/min/aa28ad.wgsl
rename to test/tint/builtins/gen/literal/min/aa28ad.wgsl
index 741e3cb72d..4c1777f52a 100644
--- a/test/tint/builtins/gen/min/aa28ad.wgsl
+++ b/test/tint/builtins/gen/literal/min/aa28ad.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/min/aa28ad.wgsl.expected.glsl b/test/tint/builtins/gen/literal/min/aa28ad.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/min/aa28ad.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/min/aa28ad.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/min/aa28ad.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/min/aa28ad.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/min/aa28ad.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/min/aa28ad.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/min/aa28ad.wgsl.expected.msl b/test/tint/builtins/gen/literal/min/aa28ad.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/min/aa28ad.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/min/aa28ad.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/min/aa28ad.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/min/aa28ad.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/min/aa28ad.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/min/aa28ad.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/min/aa28ad.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/min/aa28ad.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/min/aa28ad.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/min/aa28ad.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/min/af326d.wgsl b/test/tint/builtins/gen/literal/min/af326d.wgsl
similarity index 96%
rename from test/tint/builtins/gen/min/af326d.wgsl
rename to test/tint/builtins/gen/literal/min/af326d.wgsl
index aa0b6dabce..d7b275db19 100644
--- a/test/tint/builtins/gen/min/af326d.wgsl
+++ b/test/tint/builtins/gen/literal/min/af326d.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/min/af326d.wgsl.expected.glsl b/test/tint/builtins/gen/literal/min/af326d.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/min/af326d.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/min/af326d.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/min/af326d.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/min/af326d.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/min/af326d.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/min/af326d.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/min/af326d.wgsl.expected.msl b/test/tint/builtins/gen/literal/min/af326d.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/min/af326d.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/min/af326d.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/min/af326d.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/min/af326d.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/min/af326d.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/min/af326d.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/min/af326d.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/min/af326d.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/min/af326d.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/min/af326d.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/min/c70bb7.wgsl b/test/tint/builtins/gen/literal/min/c70bb7.wgsl
similarity index 96%
rename from test/tint/builtins/gen/min/c70bb7.wgsl
rename to test/tint/builtins/gen/literal/min/c70bb7.wgsl
index 3be96121a5..cc382f72fa 100644
--- a/test/tint/builtins/gen/min/c70bb7.wgsl
+++ b/test/tint/builtins/gen/literal/min/c70bb7.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/min/c70bb7.wgsl.expected.glsl b/test/tint/builtins/gen/literal/min/c70bb7.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/min/c70bb7.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/min/c70bb7.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/min/c70bb7.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/min/c70bb7.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/min/c70bb7.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/min/c70bb7.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/min/c70bb7.wgsl.expected.msl b/test/tint/builtins/gen/literal/min/c70bb7.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/min/c70bb7.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/min/c70bb7.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/min/c70bb7.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/min/c70bb7.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/min/c70bb7.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/min/c70bb7.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/min/c70bb7.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/min/c70bb7.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/min/c70bb7.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/min/c70bb7.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/min/c73147.wgsl b/test/tint/builtins/gen/literal/min/c73147.wgsl
similarity index 96%
rename from test/tint/builtins/gen/min/c73147.wgsl
rename to test/tint/builtins/gen/literal/min/c73147.wgsl
index 80b0a21024..f7c6d21faf 100644
--- a/test/tint/builtins/gen/min/c73147.wgsl
+++ b/test/tint/builtins/gen/literal/min/c73147.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/min/c73147.wgsl.expected.glsl b/test/tint/builtins/gen/literal/min/c73147.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/min/c73147.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/min/c73147.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/min/c73147.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/min/c73147.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/min/c73147.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/min/c73147.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/min/c73147.wgsl.expected.msl b/test/tint/builtins/gen/literal/min/c73147.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/min/c73147.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/min/c73147.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/min/c73147.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/min/c73147.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/min/c73147.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/min/c73147.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/min/c73147.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/min/c73147.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/min/c73147.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/min/c73147.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/min/c76fa6.wgsl b/test/tint/builtins/gen/literal/min/c76fa6.wgsl
similarity index 96%
rename from test/tint/builtins/gen/min/c76fa6.wgsl
rename to test/tint/builtins/gen/literal/min/c76fa6.wgsl
index 1de3701499..a696f37875 100644
--- a/test/tint/builtins/gen/min/c76fa6.wgsl
+++ b/test/tint/builtins/gen/literal/min/c76fa6.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/min/c76fa6.wgsl.expected.glsl b/test/tint/builtins/gen/literal/min/c76fa6.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/min/c76fa6.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/min/c76fa6.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/min/c76fa6.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/min/c76fa6.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/min/c76fa6.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/min/c76fa6.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/min/c76fa6.wgsl.expected.msl b/test/tint/builtins/gen/literal/min/c76fa6.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/min/c76fa6.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/min/c76fa6.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/min/c76fa6.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/min/c76fa6.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/min/c76fa6.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/min/c76fa6.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/min/c76fa6.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/min/c76fa6.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/min/c76fa6.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/min/c76fa6.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/mix/0c8c33.wgsl b/test/tint/builtins/gen/literal/mix/0c8c33.wgsl
similarity index 96%
rename from test/tint/builtins/gen/mix/0c8c33.wgsl
rename to test/tint/builtins/gen/literal/mix/0c8c33.wgsl
index a78946ce20..b6c3b9077a 100644
--- a/test/tint/builtins/gen/mix/0c8c33.wgsl
+++ b/test/tint/builtins/gen/literal/mix/0c8c33.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/mix/0c8c33.wgsl.expected.glsl b/test/tint/builtins/gen/literal/mix/0c8c33.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/mix/0c8c33.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/mix/0c8c33.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/mix/0c8c33.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/mix/0c8c33.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/mix/0c8c33.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/mix/0c8c33.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/mix/0c8c33.wgsl.expected.msl b/test/tint/builtins/gen/literal/mix/0c8c33.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/mix/0c8c33.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/mix/0c8c33.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/mix/0c8c33.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/mix/0c8c33.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/mix/0c8c33.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/mix/0c8c33.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/mix/0c8c33.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/mix/0c8c33.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/mix/0c8c33.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/mix/0c8c33.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/mix/1faeb1.wgsl b/test/tint/builtins/gen/literal/mix/1faeb1.wgsl
similarity index 96%
rename from test/tint/builtins/gen/mix/1faeb1.wgsl
rename to test/tint/builtins/gen/literal/mix/1faeb1.wgsl
index d453ef65fc..bf90b085ef 100644
--- a/test/tint/builtins/gen/mix/1faeb1.wgsl
+++ b/test/tint/builtins/gen/literal/mix/1faeb1.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/mix/1faeb1.wgsl.expected.glsl b/test/tint/builtins/gen/literal/mix/1faeb1.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/mix/1faeb1.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/mix/1faeb1.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/mix/1faeb1.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/mix/1faeb1.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/mix/1faeb1.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/mix/1faeb1.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/mix/1faeb1.wgsl.expected.msl b/test/tint/builtins/gen/literal/mix/1faeb1.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/mix/1faeb1.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/mix/1faeb1.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/mix/1faeb1.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/mix/1faeb1.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/mix/1faeb1.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/mix/1faeb1.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/mix/1faeb1.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/mix/1faeb1.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/mix/1faeb1.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/mix/1faeb1.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/mix/2fadab.wgsl b/test/tint/builtins/gen/literal/mix/2fadab.wgsl
similarity index 96%
rename from test/tint/builtins/gen/mix/2fadab.wgsl
rename to test/tint/builtins/gen/literal/mix/2fadab.wgsl
index a360975402..175c4ed52b 100644
--- a/test/tint/builtins/gen/mix/2fadab.wgsl
+++ b/test/tint/builtins/gen/literal/mix/2fadab.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/mix/2fadab.wgsl.expected.glsl b/test/tint/builtins/gen/literal/mix/2fadab.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/mix/2fadab.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/mix/2fadab.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/mix/2fadab.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/mix/2fadab.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/mix/2fadab.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/mix/2fadab.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/mix/2fadab.wgsl.expected.msl b/test/tint/builtins/gen/literal/mix/2fadab.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/mix/2fadab.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/mix/2fadab.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/mix/2fadab.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/mix/2fadab.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/mix/2fadab.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/mix/2fadab.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/mix/2fadab.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/mix/2fadab.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/mix/2fadab.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/mix/2fadab.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/mix/315264.wgsl b/test/tint/builtins/gen/literal/mix/315264.wgsl
similarity index 96%
rename from test/tint/builtins/gen/mix/315264.wgsl
rename to test/tint/builtins/gen/literal/mix/315264.wgsl
index c70834f31e..0e8b9dbdea 100644
--- a/test/tint/builtins/gen/mix/315264.wgsl
+++ b/test/tint/builtins/gen/literal/mix/315264.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/mix/315264.wgsl.expected.glsl b/test/tint/builtins/gen/literal/mix/315264.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/mix/315264.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/mix/315264.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/mix/315264.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/mix/315264.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/mix/315264.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/mix/315264.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/mix/315264.wgsl.expected.msl b/test/tint/builtins/gen/literal/mix/315264.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/mix/315264.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/mix/315264.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/mix/315264.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/mix/315264.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/mix/315264.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/mix/315264.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/mix/315264.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/mix/315264.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/mix/315264.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/mix/315264.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/mix/4f0b5e.wgsl b/test/tint/builtins/gen/literal/mix/4f0b5e.wgsl
similarity index 96%
rename from test/tint/builtins/gen/mix/4f0b5e.wgsl
rename to test/tint/builtins/gen/literal/mix/4f0b5e.wgsl
index 0b075862b5..f9591310f6 100644
--- a/test/tint/builtins/gen/mix/4f0b5e.wgsl
+++ b/test/tint/builtins/gen/literal/mix/4f0b5e.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/mix/4f0b5e.wgsl.expected.glsl b/test/tint/builtins/gen/literal/mix/4f0b5e.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/mix/4f0b5e.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/mix/4f0b5e.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/mix/4f0b5e.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/mix/4f0b5e.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/mix/4f0b5e.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/mix/4f0b5e.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/mix/4f0b5e.wgsl.expected.msl b/test/tint/builtins/gen/literal/mix/4f0b5e.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/mix/4f0b5e.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/mix/4f0b5e.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/mix/4f0b5e.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/mix/4f0b5e.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/mix/4f0b5e.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/mix/4f0b5e.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/mix/4f0b5e.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/mix/4f0b5e.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/mix/4f0b5e.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/mix/4f0b5e.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/mix/6f8adc.wgsl b/test/tint/builtins/gen/literal/mix/6f8adc.wgsl
similarity index 96%
rename from test/tint/builtins/gen/mix/6f8adc.wgsl
rename to test/tint/builtins/gen/literal/mix/6f8adc.wgsl
index ad177e2840..d95c6dc81b 100644
--- a/test/tint/builtins/gen/mix/6f8adc.wgsl
+++ b/test/tint/builtins/gen/literal/mix/6f8adc.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/mix/6f8adc.wgsl.expected.glsl b/test/tint/builtins/gen/literal/mix/6f8adc.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/mix/6f8adc.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/mix/6f8adc.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/mix/6f8adc.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/mix/6f8adc.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/mix/6f8adc.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/mix/6f8adc.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/mix/6f8adc.wgsl.expected.msl b/test/tint/builtins/gen/literal/mix/6f8adc.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/mix/6f8adc.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/mix/6f8adc.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/mix/6f8adc.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/mix/6f8adc.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/mix/6f8adc.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/mix/6f8adc.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/mix/6f8adc.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/mix/6f8adc.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/mix/6f8adc.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/mix/6f8adc.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/mix/c37ede.wgsl b/test/tint/builtins/gen/literal/mix/c37ede.wgsl
similarity index 96%
rename from test/tint/builtins/gen/mix/c37ede.wgsl
rename to test/tint/builtins/gen/literal/mix/c37ede.wgsl
index d72f984be8..4c28c9b3aa 100644
--- a/test/tint/builtins/gen/mix/c37ede.wgsl
+++ b/test/tint/builtins/gen/literal/mix/c37ede.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/mix/c37ede.wgsl.expected.glsl b/test/tint/builtins/gen/literal/mix/c37ede.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/mix/c37ede.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/mix/c37ede.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/mix/c37ede.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/mix/c37ede.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/mix/c37ede.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/mix/c37ede.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/mix/c37ede.wgsl.expected.msl b/test/tint/builtins/gen/literal/mix/c37ede.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/mix/c37ede.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/mix/c37ede.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/mix/c37ede.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/mix/c37ede.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/mix/c37ede.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/mix/c37ede.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/mix/c37ede.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/mix/c37ede.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/mix/c37ede.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/mix/c37ede.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/modf/180fed.wgsl b/test/tint/builtins/gen/literal/modf/180fed.wgsl
similarity index 96%
rename from test/tint/builtins/gen/modf/180fed.wgsl
rename to test/tint/builtins/gen/literal/modf/180fed.wgsl
index 962e3f3264..64fb940b0f 100644
--- a/test/tint/builtins/gen/modf/180fed.wgsl
+++ b/test/tint/builtins/gen/literal/modf/180fed.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/modf/180fed.wgsl.expected.glsl b/test/tint/builtins/gen/literal/modf/180fed.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/modf/180fed.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/modf/180fed.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/modf/180fed.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/modf/180fed.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/modf/180fed.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/modf/180fed.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/modf/180fed.wgsl.expected.msl b/test/tint/builtins/gen/literal/modf/180fed.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/modf/180fed.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/modf/180fed.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/modf/180fed.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/modf/180fed.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/modf/180fed.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/modf/180fed.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/modf/180fed.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/modf/180fed.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/modf/180fed.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/modf/180fed.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/modf/9b75f7.wgsl b/test/tint/builtins/gen/literal/modf/9b75f7.wgsl
similarity index 96%
rename from test/tint/builtins/gen/modf/9b75f7.wgsl
rename to test/tint/builtins/gen/literal/modf/9b75f7.wgsl
index aff6139558..514c34522c 100644
--- a/test/tint/builtins/gen/modf/9b75f7.wgsl
+++ b/test/tint/builtins/gen/literal/modf/9b75f7.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/modf/9b75f7.wgsl.expected.glsl b/test/tint/builtins/gen/literal/modf/9b75f7.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/modf/9b75f7.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/modf/9b75f7.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/modf/9b75f7.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/modf/9b75f7.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/modf/9b75f7.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/modf/9b75f7.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/modf/9b75f7.wgsl.expected.msl b/test/tint/builtins/gen/literal/modf/9b75f7.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/modf/9b75f7.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/modf/9b75f7.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/modf/9b75f7.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/modf/9b75f7.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/modf/9b75f7.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/modf/9b75f7.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/modf/9b75f7.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/modf/9b75f7.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/modf/9b75f7.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/modf/9b75f7.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/modf/ec2dbc.wgsl b/test/tint/builtins/gen/literal/modf/ec2dbc.wgsl
similarity index 96%
rename from test/tint/builtins/gen/modf/ec2dbc.wgsl
rename to test/tint/builtins/gen/literal/modf/ec2dbc.wgsl
index 3bf8cb7d68..175dd84a05 100644
--- a/test/tint/builtins/gen/modf/ec2dbc.wgsl
+++ b/test/tint/builtins/gen/literal/modf/ec2dbc.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/modf/ec2dbc.wgsl.expected.glsl b/test/tint/builtins/gen/literal/modf/ec2dbc.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/modf/ec2dbc.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/modf/ec2dbc.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/modf/ec2dbc.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/modf/ec2dbc.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/modf/ec2dbc.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/modf/ec2dbc.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/modf/ec2dbc.wgsl.expected.msl b/test/tint/builtins/gen/literal/modf/ec2dbc.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/modf/ec2dbc.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/modf/ec2dbc.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/modf/ec2dbc.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/modf/ec2dbc.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/modf/ec2dbc.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/modf/ec2dbc.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/modf/ec2dbc.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/modf/ec2dbc.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/modf/ec2dbc.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/modf/ec2dbc.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/modf/f5f20d.wgsl b/test/tint/builtins/gen/literal/modf/f5f20d.wgsl
similarity index 96%
rename from test/tint/builtins/gen/modf/f5f20d.wgsl
rename to test/tint/builtins/gen/literal/modf/f5f20d.wgsl
index c251d46b3c..e3b3becace 100644
--- a/test/tint/builtins/gen/modf/f5f20d.wgsl
+++ b/test/tint/builtins/gen/literal/modf/f5f20d.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/modf/f5f20d.wgsl.expected.glsl b/test/tint/builtins/gen/literal/modf/f5f20d.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/modf/f5f20d.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/modf/f5f20d.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/modf/f5f20d.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/modf/f5f20d.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/modf/f5f20d.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/modf/f5f20d.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/modf/f5f20d.wgsl.expected.msl b/test/tint/builtins/gen/literal/modf/f5f20d.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/modf/f5f20d.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/modf/f5f20d.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/modf/f5f20d.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/modf/f5f20d.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/modf/f5f20d.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/modf/f5f20d.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/modf/f5f20d.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/modf/f5f20d.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/modf/f5f20d.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/modf/f5f20d.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/normalize/64d8c0.wgsl b/test/tint/builtins/gen/literal/normalize/64d8c0.wgsl
similarity index 96%
rename from test/tint/builtins/gen/normalize/64d8c0.wgsl
rename to test/tint/builtins/gen/literal/normalize/64d8c0.wgsl
index 4843a9e59c..78db9df47c 100644
--- a/test/tint/builtins/gen/normalize/64d8c0.wgsl
+++ b/test/tint/builtins/gen/literal/normalize/64d8c0.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/normalize/64d8c0.wgsl.expected.glsl b/test/tint/builtins/gen/literal/normalize/64d8c0.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/normalize/64d8c0.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/normalize/64d8c0.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/normalize/64d8c0.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/normalize/64d8c0.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/normalize/64d8c0.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/normalize/64d8c0.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/normalize/64d8c0.wgsl.expected.msl b/test/tint/builtins/gen/literal/normalize/64d8c0.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/normalize/64d8c0.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/normalize/64d8c0.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/normalize/64d8c0.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/normalize/64d8c0.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/normalize/64d8c0.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/normalize/64d8c0.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/normalize/64d8c0.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/normalize/64d8c0.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/normalize/64d8c0.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/normalize/64d8c0.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/normalize/9a0aab.wgsl b/test/tint/builtins/gen/literal/normalize/9a0aab.wgsl
similarity index 96%
rename from test/tint/builtins/gen/normalize/9a0aab.wgsl
rename to test/tint/builtins/gen/literal/normalize/9a0aab.wgsl
index 4bb13a2e03..8c041adde5 100644
--- a/test/tint/builtins/gen/normalize/9a0aab.wgsl
+++ b/test/tint/builtins/gen/literal/normalize/9a0aab.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/normalize/9a0aab.wgsl.expected.glsl b/test/tint/builtins/gen/literal/normalize/9a0aab.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/normalize/9a0aab.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/normalize/9a0aab.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/normalize/9a0aab.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/normalize/9a0aab.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/normalize/9a0aab.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/normalize/9a0aab.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/normalize/9a0aab.wgsl.expected.msl b/test/tint/builtins/gen/literal/normalize/9a0aab.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/normalize/9a0aab.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/normalize/9a0aab.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/normalize/9a0aab.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/normalize/9a0aab.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/normalize/9a0aab.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/normalize/9a0aab.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/normalize/9a0aab.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/normalize/9a0aab.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/normalize/9a0aab.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/normalize/9a0aab.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/normalize/fc2ef1.wgsl b/test/tint/builtins/gen/literal/normalize/fc2ef1.wgsl
similarity index 96%
rename from test/tint/builtins/gen/normalize/fc2ef1.wgsl
rename to test/tint/builtins/gen/literal/normalize/fc2ef1.wgsl
index f56eb0eb0b..83c160580b 100644
--- a/test/tint/builtins/gen/normalize/fc2ef1.wgsl
+++ b/test/tint/builtins/gen/literal/normalize/fc2ef1.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/normalize/fc2ef1.wgsl.expected.glsl b/test/tint/builtins/gen/literal/normalize/fc2ef1.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/normalize/fc2ef1.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/normalize/fc2ef1.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/normalize/fc2ef1.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/normalize/fc2ef1.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/normalize/fc2ef1.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/normalize/fc2ef1.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/normalize/fc2ef1.wgsl.expected.msl b/test/tint/builtins/gen/literal/normalize/fc2ef1.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/normalize/fc2ef1.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/normalize/fc2ef1.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/normalize/fc2ef1.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/normalize/fc2ef1.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/normalize/fc2ef1.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/normalize/fc2ef1.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/normalize/fc2ef1.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/normalize/fc2ef1.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/normalize/fc2ef1.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/normalize/fc2ef1.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/pack2x16float/0e97b3.wgsl b/test/tint/builtins/gen/literal/pack2x16float/0e97b3.wgsl
similarity index 96%
rename from test/tint/builtins/gen/pack2x16float/0e97b3.wgsl
rename to test/tint/builtins/gen/literal/pack2x16float/0e97b3.wgsl
index 978bf65bf9..2f2d664927 100644
--- a/test/tint/builtins/gen/pack2x16float/0e97b3.wgsl
+++ b/test/tint/builtins/gen/literal/pack2x16float/0e97b3.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/pack2x16float/0e97b3.wgsl.expected.glsl b/test/tint/builtins/gen/literal/pack2x16float/0e97b3.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/pack2x16float/0e97b3.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/pack2x16float/0e97b3.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/pack2x16float/0e97b3.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/pack2x16float/0e97b3.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/pack2x16float/0e97b3.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/pack2x16float/0e97b3.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/pack2x16float/0e97b3.wgsl.expected.msl b/test/tint/builtins/gen/literal/pack2x16float/0e97b3.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/pack2x16float/0e97b3.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/pack2x16float/0e97b3.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/pack2x16float/0e97b3.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/pack2x16float/0e97b3.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/pack2x16float/0e97b3.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/pack2x16float/0e97b3.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/pack2x16float/0e97b3.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/pack2x16float/0e97b3.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/pack2x16float/0e97b3.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/pack2x16float/0e97b3.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/pack2x16snorm/6c169b.wgsl b/test/tint/builtins/gen/literal/pack2x16snorm/6c169b.wgsl
similarity index 96%
rename from test/tint/builtins/gen/pack2x16snorm/6c169b.wgsl
rename to test/tint/builtins/gen/literal/pack2x16snorm/6c169b.wgsl
index 24346b79e2..980f6f3af8 100644
--- a/test/tint/builtins/gen/pack2x16snorm/6c169b.wgsl
+++ b/test/tint/builtins/gen/literal/pack2x16snorm/6c169b.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/pack2x16snorm/6c169b.wgsl.expected.glsl b/test/tint/builtins/gen/literal/pack2x16snorm/6c169b.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/pack2x16snorm/6c169b.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/pack2x16snorm/6c169b.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/pack2x16snorm/6c169b.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/pack2x16snorm/6c169b.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/pack2x16snorm/6c169b.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/pack2x16snorm/6c169b.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/pack2x16snorm/6c169b.wgsl.expected.msl b/test/tint/builtins/gen/literal/pack2x16snorm/6c169b.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/pack2x16snorm/6c169b.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/pack2x16snorm/6c169b.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/pack2x16snorm/6c169b.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/pack2x16snorm/6c169b.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/pack2x16snorm/6c169b.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/pack2x16snorm/6c169b.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/pack2x16snorm/6c169b.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/pack2x16snorm/6c169b.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/pack2x16snorm/6c169b.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/pack2x16snorm/6c169b.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/pack2x16unorm/0f08e4.wgsl b/test/tint/builtins/gen/literal/pack2x16unorm/0f08e4.wgsl
similarity index 96%
rename from test/tint/builtins/gen/pack2x16unorm/0f08e4.wgsl
rename to test/tint/builtins/gen/literal/pack2x16unorm/0f08e4.wgsl
index 037c11b5fb..1e4432323c 100644
--- a/test/tint/builtins/gen/pack2x16unorm/0f08e4.wgsl
+++ b/test/tint/builtins/gen/literal/pack2x16unorm/0f08e4.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/pack2x16unorm/0f08e4.wgsl.expected.glsl b/test/tint/builtins/gen/literal/pack2x16unorm/0f08e4.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/pack2x16unorm/0f08e4.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/pack2x16unorm/0f08e4.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/pack2x16unorm/0f08e4.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/pack2x16unorm/0f08e4.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/pack2x16unorm/0f08e4.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/pack2x16unorm/0f08e4.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/pack2x16unorm/0f08e4.wgsl.expected.msl b/test/tint/builtins/gen/literal/pack2x16unorm/0f08e4.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/pack2x16unorm/0f08e4.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/pack2x16unorm/0f08e4.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/pack2x16unorm/0f08e4.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/pack2x16unorm/0f08e4.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/pack2x16unorm/0f08e4.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/pack2x16unorm/0f08e4.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/pack2x16unorm/0f08e4.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/pack2x16unorm/0f08e4.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/pack2x16unorm/0f08e4.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/pack2x16unorm/0f08e4.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/pack4x8snorm/4d22e7.wgsl b/test/tint/builtins/gen/literal/pack4x8snorm/4d22e7.wgsl
similarity index 96%
rename from test/tint/builtins/gen/pack4x8snorm/4d22e7.wgsl
rename to test/tint/builtins/gen/literal/pack4x8snorm/4d22e7.wgsl
index 681af1d4f4..97c44f9882 100644
--- a/test/tint/builtins/gen/pack4x8snorm/4d22e7.wgsl
+++ b/test/tint/builtins/gen/literal/pack4x8snorm/4d22e7.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/pack4x8snorm/4d22e7.wgsl.expected.glsl b/test/tint/builtins/gen/literal/pack4x8snorm/4d22e7.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/pack4x8snorm/4d22e7.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/pack4x8snorm/4d22e7.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/pack4x8snorm/4d22e7.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/pack4x8snorm/4d22e7.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/pack4x8snorm/4d22e7.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/pack4x8snorm/4d22e7.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/pack4x8snorm/4d22e7.wgsl.expected.msl b/test/tint/builtins/gen/literal/pack4x8snorm/4d22e7.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/pack4x8snorm/4d22e7.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/pack4x8snorm/4d22e7.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/pack4x8snorm/4d22e7.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/pack4x8snorm/4d22e7.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/pack4x8snorm/4d22e7.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/pack4x8snorm/4d22e7.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/pack4x8snorm/4d22e7.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/pack4x8snorm/4d22e7.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/pack4x8snorm/4d22e7.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/pack4x8snorm/4d22e7.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/pack4x8unorm/95c456.wgsl b/test/tint/builtins/gen/literal/pack4x8unorm/95c456.wgsl
similarity index 96%
rename from test/tint/builtins/gen/pack4x8unorm/95c456.wgsl
rename to test/tint/builtins/gen/literal/pack4x8unorm/95c456.wgsl
index ae25428f67..8f242babf0 100644
--- a/test/tint/builtins/gen/pack4x8unorm/95c456.wgsl
+++ b/test/tint/builtins/gen/literal/pack4x8unorm/95c456.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/pack4x8unorm/95c456.wgsl.expected.glsl b/test/tint/builtins/gen/literal/pack4x8unorm/95c456.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/pack4x8unorm/95c456.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/pack4x8unorm/95c456.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/pack4x8unorm/95c456.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/pack4x8unorm/95c456.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/pack4x8unorm/95c456.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/pack4x8unorm/95c456.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/pack4x8unorm/95c456.wgsl.expected.msl b/test/tint/builtins/gen/literal/pack4x8unorm/95c456.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/pack4x8unorm/95c456.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/pack4x8unorm/95c456.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/pack4x8unorm/95c456.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/pack4x8unorm/95c456.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/pack4x8unorm/95c456.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/pack4x8unorm/95c456.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/pack4x8unorm/95c456.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/pack4x8unorm/95c456.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/pack4x8unorm/95c456.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/pack4x8unorm/95c456.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/pow/04a908.wgsl b/test/tint/builtins/gen/literal/pow/04a908.wgsl
similarity index 96%
rename from test/tint/builtins/gen/pow/04a908.wgsl
rename to test/tint/builtins/gen/literal/pow/04a908.wgsl
index b195279684..537184752f 100644
--- a/test/tint/builtins/gen/pow/04a908.wgsl
+++ b/test/tint/builtins/gen/literal/pow/04a908.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/pow/04a908.wgsl.expected.glsl b/test/tint/builtins/gen/literal/pow/04a908.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/pow/04a908.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/pow/04a908.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/pow/04a908.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/pow/04a908.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/pow/04a908.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/pow/04a908.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/pow/04a908.wgsl.expected.msl b/test/tint/builtins/gen/literal/pow/04a908.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/pow/04a908.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/pow/04a908.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/pow/04a908.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/pow/04a908.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/pow/04a908.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/pow/04a908.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/pow/04a908.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/pow/04a908.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/pow/04a908.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/pow/04a908.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/pow/46e029.wgsl b/test/tint/builtins/gen/literal/pow/46e029.wgsl
similarity index 96%
rename from test/tint/builtins/gen/pow/46e029.wgsl
rename to test/tint/builtins/gen/literal/pow/46e029.wgsl
index fbe76121be..16241f6ee6 100644
--- a/test/tint/builtins/gen/pow/46e029.wgsl
+++ b/test/tint/builtins/gen/literal/pow/46e029.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/pow/46e029.wgsl.expected.glsl b/test/tint/builtins/gen/literal/pow/46e029.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/pow/46e029.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/pow/46e029.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/pow/46e029.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/pow/46e029.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/pow/46e029.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/pow/46e029.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/pow/46e029.wgsl.expected.msl b/test/tint/builtins/gen/literal/pow/46e029.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/pow/46e029.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/pow/46e029.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/pow/46e029.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/pow/46e029.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/pow/46e029.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/pow/46e029.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/pow/46e029.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/pow/46e029.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/pow/46e029.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/pow/46e029.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/pow/4a46c9.wgsl b/test/tint/builtins/gen/literal/pow/4a46c9.wgsl
similarity index 96%
rename from test/tint/builtins/gen/pow/4a46c9.wgsl
rename to test/tint/builtins/gen/literal/pow/4a46c9.wgsl
index c8293dfd2c..58ceff0906 100644
--- a/test/tint/builtins/gen/pow/4a46c9.wgsl
+++ b/test/tint/builtins/gen/literal/pow/4a46c9.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/pow/4a46c9.wgsl.expected.glsl b/test/tint/builtins/gen/literal/pow/4a46c9.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/pow/4a46c9.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/pow/4a46c9.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/pow/4a46c9.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/pow/4a46c9.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/pow/4a46c9.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/pow/4a46c9.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/pow/4a46c9.wgsl.expected.msl b/test/tint/builtins/gen/literal/pow/4a46c9.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/pow/4a46c9.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/pow/4a46c9.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/pow/4a46c9.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/pow/4a46c9.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/pow/4a46c9.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/pow/4a46c9.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/pow/4a46c9.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/pow/4a46c9.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/pow/4a46c9.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/pow/4a46c9.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/pow/e60ea5.wgsl b/test/tint/builtins/gen/literal/pow/e60ea5.wgsl
similarity index 96%
rename from test/tint/builtins/gen/pow/e60ea5.wgsl
rename to test/tint/builtins/gen/literal/pow/e60ea5.wgsl
index f718b1e96b..49392326d0 100644
--- a/test/tint/builtins/gen/pow/e60ea5.wgsl
+++ b/test/tint/builtins/gen/literal/pow/e60ea5.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/pow/e60ea5.wgsl.expected.glsl b/test/tint/builtins/gen/literal/pow/e60ea5.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/pow/e60ea5.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/pow/e60ea5.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/pow/e60ea5.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/pow/e60ea5.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/pow/e60ea5.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/pow/e60ea5.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/pow/e60ea5.wgsl.expected.msl b/test/tint/builtins/gen/literal/pow/e60ea5.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/pow/e60ea5.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/pow/e60ea5.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/pow/e60ea5.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/pow/e60ea5.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/pow/e60ea5.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/pow/e60ea5.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/pow/e60ea5.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/pow/e60ea5.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/pow/e60ea5.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/pow/e60ea5.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/radians/09b7fc.wgsl b/test/tint/builtins/gen/literal/radians/09b7fc.wgsl
similarity index 96%
rename from test/tint/builtins/gen/radians/09b7fc.wgsl
rename to test/tint/builtins/gen/literal/radians/09b7fc.wgsl
index 96d745ebbe..1bd06058c5 100644
--- a/test/tint/builtins/gen/radians/09b7fc.wgsl
+++ b/test/tint/builtins/gen/literal/radians/09b7fc.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/radians/09b7fc.wgsl.expected.glsl b/test/tint/builtins/gen/literal/radians/09b7fc.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/radians/09b7fc.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/radians/09b7fc.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/radians/09b7fc.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/radians/09b7fc.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/radians/09b7fc.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/radians/09b7fc.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/radians/09b7fc.wgsl.expected.msl b/test/tint/builtins/gen/literal/radians/09b7fc.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/radians/09b7fc.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/radians/09b7fc.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/radians/09b7fc.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/radians/09b7fc.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/radians/09b7fc.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/radians/09b7fc.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/radians/09b7fc.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/radians/09b7fc.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/radians/09b7fc.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/radians/09b7fc.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/radians/61687a.wgsl b/test/tint/builtins/gen/literal/radians/61687a.wgsl
similarity index 96%
rename from test/tint/builtins/gen/radians/61687a.wgsl
rename to test/tint/builtins/gen/literal/radians/61687a.wgsl
index f5f8a32977..0b281eee81 100644
--- a/test/tint/builtins/gen/radians/61687a.wgsl
+++ b/test/tint/builtins/gen/literal/radians/61687a.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/radians/61687a.wgsl.expected.glsl b/test/tint/builtins/gen/literal/radians/61687a.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/radians/61687a.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/radians/61687a.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/radians/61687a.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/radians/61687a.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/radians/61687a.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/radians/61687a.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/radians/61687a.wgsl.expected.msl b/test/tint/builtins/gen/literal/radians/61687a.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/radians/61687a.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/radians/61687a.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/radians/61687a.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/radians/61687a.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/radians/61687a.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/radians/61687a.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/radians/61687a.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/radians/61687a.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/radians/61687a.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/radians/61687a.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/radians/6b0ff2.wgsl b/test/tint/builtins/gen/literal/radians/6b0ff2.wgsl
similarity index 96%
rename from test/tint/builtins/gen/radians/6b0ff2.wgsl
rename to test/tint/builtins/gen/literal/radians/6b0ff2.wgsl
index 859ff69687..b4f4aa7d0f 100644
--- a/test/tint/builtins/gen/radians/6b0ff2.wgsl
+++ b/test/tint/builtins/gen/literal/radians/6b0ff2.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/radians/6b0ff2.wgsl.expected.glsl b/test/tint/builtins/gen/literal/radians/6b0ff2.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/radians/6b0ff2.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/radians/6b0ff2.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/radians/6b0ff2.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/radians/6b0ff2.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/radians/6b0ff2.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/radians/6b0ff2.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/radians/6b0ff2.wgsl.expected.msl b/test/tint/builtins/gen/literal/radians/6b0ff2.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/radians/6b0ff2.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/radians/6b0ff2.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/radians/6b0ff2.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/radians/6b0ff2.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/radians/6b0ff2.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/radians/6b0ff2.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/radians/6b0ff2.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/radians/6b0ff2.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/radians/6b0ff2.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/radians/6b0ff2.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/radians/f96258.wgsl b/test/tint/builtins/gen/literal/radians/f96258.wgsl
similarity index 96%
rename from test/tint/builtins/gen/radians/f96258.wgsl
rename to test/tint/builtins/gen/literal/radians/f96258.wgsl
index 0e86d0e856..e07869556b 100644
--- a/test/tint/builtins/gen/radians/f96258.wgsl
+++ b/test/tint/builtins/gen/literal/radians/f96258.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/radians/f96258.wgsl.expected.glsl b/test/tint/builtins/gen/literal/radians/f96258.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/radians/f96258.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/radians/f96258.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/radians/f96258.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/radians/f96258.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/radians/f96258.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/radians/f96258.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/radians/f96258.wgsl.expected.msl b/test/tint/builtins/gen/literal/radians/f96258.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/radians/f96258.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/radians/f96258.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/radians/f96258.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/radians/f96258.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/radians/f96258.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/radians/f96258.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/radians/f96258.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/radians/f96258.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/radians/f96258.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/radians/f96258.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/reflect/05357e.wgsl b/test/tint/builtins/gen/literal/reflect/05357e.wgsl
similarity index 96%
rename from test/tint/builtins/gen/reflect/05357e.wgsl
rename to test/tint/builtins/gen/literal/reflect/05357e.wgsl
index ef948954e0..7d26fdf938 100644
--- a/test/tint/builtins/gen/reflect/05357e.wgsl
+++ b/test/tint/builtins/gen/literal/reflect/05357e.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/reflect/05357e.wgsl.expected.glsl b/test/tint/builtins/gen/literal/reflect/05357e.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/reflect/05357e.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/reflect/05357e.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/reflect/05357e.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/reflect/05357e.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/reflect/05357e.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/reflect/05357e.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/reflect/05357e.wgsl.expected.msl b/test/tint/builtins/gen/literal/reflect/05357e.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/reflect/05357e.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/reflect/05357e.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/reflect/05357e.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/reflect/05357e.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/reflect/05357e.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/reflect/05357e.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/reflect/05357e.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/reflect/05357e.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/reflect/05357e.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/reflect/05357e.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/reflect/b61e10.wgsl b/test/tint/builtins/gen/literal/reflect/b61e10.wgsl
similarity index 96%
rename from test/tint/builtins/gen/reflect/b61e10.wgsl
rename to test/tint/builtins/gen/literal/reflect/b61e10.wgsl
index 47cd039a3b..fa6215bd87 100644
--- a/test/tint/builtins/gen/reflect/b61e10.wgsl
+++ b/test/tint/builtins/gen/literal/reflect/b61e10.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/reflect/b61e10.wgsl.expected.glsl b/test/tint/builtins/gen/literal/reflect/b61e10.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/reflect/b61e10.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/reflect/b61e10.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/reflect/b61e10.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/reflect/b61e10.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/reflect/b61e10.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/reflect/b61e10.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/reflect/b61e10.wgsl.expected.msl b/test/tint/builtins/gen/literal/reflect/b61e10.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/reflect/b61e10.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/reflect/b61e10.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/reflect/b61e10.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/reflect/b61e10.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/reflect/b61e10.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/reflect/b61e10.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/reflect/b61e10.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/reflect/b61e10.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/reflect/b61e10.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/reflect/b61e10.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/reflect/f47fdb.wgsl b/test/tint/builtins/gen/literal/reflect/f47fdb.wgsl
similarity index 96%
rename from test/tint/builtins/gen/reflect/f47fdb.wgsl
rename to test/tint/builtins/gen/literal/reflect/f47fdb.wgsl
index 5bbf74c0e8..7ce4d2ab5a 100644
--- a/test/tint/builtins/gen/reflect/f47fdb.wgsl
+++ b/test/tint/builtins/gen/literal/reflect/f47fdb.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/reflect/f47fdb.wgsl.expected.glsl b/test/tint/builtins/gen/literal/reflect/f47fdb.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/reflect/f47fdb.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/reflect/f47fdb.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/reflect/f47fdb.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/reflect/f47fdb.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/reflect/f47fdb.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/reflect/f47fdb.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/reflect/f47fdb.wgsl.expected.msl b/test/tint/builtins/gen/literal/reflect/f47fdb.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/reflect/f47fdb.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/reflect/f47fdb.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/reflect/f47fdb.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/reflect/f47fdb.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/reflect/f47fdb.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/reflect/f47fdb.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/reflect/f47fdb.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/reflect/f47fdb.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/reflect/f47fdb.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/reflect/f47fdb.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/refract/7e02e6.wgsl b/test/tint/builtins/gen/literal/refract/7e02e6.wgsl
similarity index 96%
rename from test/tint/builtins/gen/refract/7e02e6.wgsl
rename to test/tint/builtins/gen/literal/refract/7e02e6.wgsl
index 1a2e7e4df4..24a7718ced 100644
--- a/test/tint/builtins/gen/refract/7e02e6.wgsl
+++ b/test/tint/builtins/gen/literal/refract/7e02e6.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/refract/7e02e6.wgsl.expected.glsl b/test/tint/builtins/gen/literal/refract/7e02e6.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/refract/7e02e6.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/refract/7e02e6.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/refract/7e02e6.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/refract/7e02e6.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/refract/7e02e6.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/refract/7e02e6.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/refract/7e02e6.wgsl.expected.msl b/test/tint/builtins/gen/literal/refract/7e02e6.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/refract/7e02e6.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/refract/7e02e6.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/refract/7e02e6.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/refract/7e02e6.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/refract/7e02e6.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/refract/7e02e6.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/refract/7e02e6.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/refract/7e02e6.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/refract/7e02e6.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/refract/7e02e6.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/refract/cbc1d2.wgsl b/test/tint/builtins/gen/literal/refract/cbc1d2.wgsl
similarity index 96%
rename from test/tint/builtins/gen/refract/cbc1d2.wgsl
rename to test/tint/builtins/gen/literal/refract/cbc1d2.wgsl
index f34e7cd82c..d30a12e410 100644
--- a/test/tint/builtins/gen/refract/cbc1d2.wgsl
+++ b/test/tint/builtins/gen/literal/refract/cbc1d2.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/refract/cbc1d2.wgsl.expected.glsl b/test/tint/builtins/gen/literal/refract/cbc1d2.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/refract/cbc1d2.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/refract/cbc1d2.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/refract/cbc1d2.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/refract/cbc1d2.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/refract/cbc1d2.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/refract/cbc1d2.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/refract/cbc1d2.wgsl.expected.msl b/test/tint/builtins/gen/literal/refract/cbc1d2.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/refract/cbc1d2.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/refract/cbc1d2.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/refract/cbc1d2.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/refract/cbc1d2.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/refract/cbc1d2.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/refract/cbc1d2.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/refract/cbc1d2.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/refract/cbc1d2.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/refract/cbc1d2.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/refract/cbc1d2.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/refract/cd905f.wgsl b/test/tint/builtins/gen/literal/refract/cd905f.wgsl
similarity index 96%
rename from test/tint/builtins/gen/refract/cd905f.wgsl
rename to test/tint/builtins/gen/literal/refract/cd905f.wgsl
index d5338347be..5d486b2199 100644
--- a/test/tint/builtins/gen/refract/cd905f.wgsl
+++ b/test/tint/builtins/gen/literal/refract/cd905f.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/refract/cd905f.wgsl.expected.glsl b/test/tint/builtins/gen/literal/refract/cd905f.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/refract/cd905f.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/refract/cd905f.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/refract/cd905f.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/refract/cd905f.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/refract/cd905f.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/refract/cd905f.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/refract/cd905f.wgsl.expected.msl b/test/tint/builtins/gen/literal/refract/cd905f.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/refract/cd905f.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/refract/cd905f.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/refract/cd905f.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/refract/cd905f.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/refract/cd905f.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/refract/cd905f.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/refract/cd905f.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/refract/cd905f.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/refract/cd905f.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/refract/cd905f.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/reverseBits/222177.wgsl b/test/tint/builtins/gen/literal/reverseBits/222177.wgsl
similarity index 96%
rename from test/tint/builtins/gen/reverseBits/222177.wgsl
rename to test/tint/builtins/gen/literal/reverseBits/222177.wgsl
index 1224dd9195..3fb14c1637 100644
--- a/test/tint/builtins/gen/reverseBits/222177.wgsl
+++ b/test/tint/builtins/gen/literal/reverseBits/222177.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/reverseBits/222177.wgsl.expected.glsl b/test/tint/builtins/gen/literal/reverseBits/222177.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/reverseBits/222177.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/reverseBits/222177.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/reverseBits/222177.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/reverseBits/222177.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/reverseBits/222177.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/reverseBits/222177.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/reverseBits/222177.wgsl.expected.msl b/test/tint/builtins/gen/literal/reverseBits/222177.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/reverseBits/222177.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/reverseBits/222177.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/reverseBits/222177.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/reverseBits/222177.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/reverseBits/222177.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/reverseBits/222177.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/reverseBits/222177.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/reverseBits/222177.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/reverseBits/222177.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/reverseBits/222177.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/reverseBits/35fea9.wgsl b/test/tint/builtins/gen/literal/reverseBits/35fea9.wgsl
similarity index 96%
rename from test/tint/builtins/gen/reverseBits/35fea9.wgsl
rename to test/tint/builtins/gen/literal/reverseBits/35fea9.wgsl
index f62e494bc8..952fc114bf 100644
--- a/test/tint/builtins/gen/reverseBits/35fea9.wgsl
+++ b/test/tint/builtins/gen/literal/reverseBits/35fea9.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/reverseBits/35fea9.wgsl.expected.glsl b/test/tint/builtins/gen/literal/reverseBits/35fea9.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/reverseBits/35fea9.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/reverseBits/35fea9.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/reverseBits/35fea9.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/reverseBits/35fea9.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/reverseBits/35fea9.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/reverseBits/35fea9.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/reverseBits/35fea9.wgsl.expected.msl b/test/tint/builtins/gen/literal/reverseBits/35fea9.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/reverseBits/35fea9.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/reverseBits/35fea9.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/reverseBits/35fea9.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/reverseBits/35fea9.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/reverseBits/35fea9.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/reverseBits/35fea9.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/reverseBits/35fea9.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/reverseBits/35fea9.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/reverseBits/35fea9.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/reverseBits/35fea9.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/reverseBits/4dbd6f.wgsl b/test/tint/builtins/gen/literal/reverseBits/4dbd6f.wgsl
similarity index 96%
rename from test/tint/builtins/gen/reverseBits/4dbd6f.wgsl
rename to test/tint/builtins/gen/literal/reverseBits/4dbd6f.wgsl
index b48ae4dcfa..9aa9ef0a7e 100644
--- a/test/tint/builtins/gen/reverseBits/4dbd6f.wgsl
+++ b/test/tint/builtins/gen/literal/reverseBits/4dbd6f.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/reverseBits/4dbd6f.wgsl.expected.glsl b/test/tint/builtins/gen/literal/reverseBits/4dbd6f.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/reverseBits/4dbd6f.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/reverseBits/4dbd6f.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/reverseBits/4dbd6f.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/reverseBits/4dbd6f.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/reverseBits/4dbd6f.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/reverseBits/4dbd6f.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/reverseBits/4dbd6f.wgsl.expected.msl b/test/tint/builtins/gen/literal/reverseBits/4dbd6f.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/reverseBits/4dbd6f.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/reverseBits/4dbd6f.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/reverseBits/4dbd6f.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/reverseBits/4dbd6f.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/reverseBits/4dbd6f.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/reverseBits/4dbd6f.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/reverseBits/4dbd6f.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/reverseBits/4dbd6f.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/reverseBits/4dbd6f.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/reverseBits/4dbd6f.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/reverseBits/7c4269.wgsl b/test/tint/builtins/gen/literal/reverseBits/7c4269.wgsl
similarity index 96%
rename from test/tint/builtins/gen/reverseBits/7c4269.wgsl
rename to test/tint/builtins/gen/literal/reverseBits/7c4269.wgsl
index e0b5fe82ab..0f2b62fc0c 100644
--- a/test/tint/builtins/gen/reverseBits/7c4269.wgsl
+++ b/test/tint/builtins/gen/literal/reverseBits/7c4269.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/reverseBits/7c4269.wgsl.expected.glsl b/test/tint/builtins/gen/literal/reverseBits/7c4269.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/reverseBits/7c4269.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/reverseBits/7c4269.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/reverseBits/7c4269.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/reverseBits/7c4269.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/reverseBits/7c4269.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/reverseBits/7c4269.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/reverseBits/7c4269.wgsl.expected.msl b/test/tint/builtins/gen/literal/reverseBits/7c4269.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/reverseBits/7c4269.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/reverseBits/7c4269.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/reverseBits/7c4269.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/reverseBits/7c4269.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/reverseBits/7c4269.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/reverseBits/7c4269.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/reverseBits/7c4269.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/reverseBits/7c4269.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/reverseBits/7c4269.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/reverseBits/7c4269.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/reverseBits/a6ccd4.wgsl b/test/tint/builtins/gen/literal/reverseBits/a6ccd4.wgsl
similarity index 96%
rename from test/tint/builtins/gen/reverseBits/a6ccd4.wgsl
rename to test/tint/builtins/gen/literal/reverseBits/a6ccd4.wgsl
index 6a104db301..9a312da843 100644
--- a/test/tint/builtins/gen/reverseBits/a6ccd4.wgsl
+++ b/test/tint/builtins/gen/literal/reverseBits/a6ccd4.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/reverseBits/a6ccd4.wgsl.expected.glsl b/test/tint/builtins/gen/literal/reverseBits/a6ccd4.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/reverseBits/a6ccd4.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/reverseBits/a6ccd4.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/reverseBits/a6ccd4.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/reverseBits/a6ccd4.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/reverseBits/a6ccd4.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/reverseBits/a6ccd4.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/reverseBits/a6ccd4.wgsl.expected.msl b/test/tint/builtins/gen/literal/reverseBits/a6ccd4.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/reverseBits/a6ccd4.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/reverseBits/a6ccd4.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/reverseBits/a6ccd4.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/reverseBits/a6ccd4.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/reverseBits/a6ccd4.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/reverseBits/a6ccd4.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/reverseBits/a6ccd4.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/reverseBits/a6ccd4.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/reverseBits/a6ccd4.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/reverseBits/a6ccd4.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/reverseBits/c21bc1.wgsl b/test/tint/builtins/gen/literal/reverseBits/c21bc1.wgsl
similarity index 96%
rename from test/tint/builtins/gen/reverseBits/c21bc1.wgsl
rename to test/tint/builtins/gen/literal/reverseBits/c21bc1.wgsl
index 62e66a1839..53ec0daf44 100644
--- a/test/tint/builtins/gen/reverseBits/c21bc1.wgsl
+++ b/test/tint/builtins/gen/literal/reverseBits/c21bc1.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/reverseBits/c21bc1.wgsl.expected.glsl b/test/tint/builtins/gen/literal/reverseBits/c21bc1.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/reverseBits/c21bc1.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/reverseBits/c21bc1.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/reverseBits/c21bc1.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/reverseBits/c21bc1.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/reverseBits/c21bc1.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/reverseBits/c21bc1.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/reverseBits/c21bc1.wgsl.expected.msl b/test/tint/builtins/gen/literal/reverseBits/c21bc1.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/reverseBits/c21bc1.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/reverseBits/c21bc1.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/reverseBits/c21bc1.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/reverseBits/c21bc1.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/reverseBits/c21bc1.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/reverseBits/c21bc1.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/reverseBits/c21bc1.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/reverseBits/c21bc1.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/reverseBits/c21bc1.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/reverseBits/c21bc1.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/reverseBits/e1f4c1.wgsl b/test/tint/builtins/gen/literal/reverseBits/e1f4c1.wgsl
similarity index 96%
rename from test/tint/builtins/gen/reverseBits/e1f4c1.wgsl
rename to test/tint/builtins/gen/literal/reverseBits/e1f4c1.wgsl
index 9bed87a3f2..d53c491982 100644
--- a/test/tint/builtins/gen/reverseBits/e1f4c1.wgsl
+++ b/test/tint/builtins/gen/literal/reverseBits/e1f4c1.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/reverseBits/e1f4c1.wgsl.expected.glsl b/test/tint/builtins/gen/literal/reverseBits/e1f4c1.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/reverseBits/e1f4c1.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/reverseBits/e1f4c1.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/reverseBits/e1f4c1.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/reverseBits/e1f4c1.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/reverseBits/e1f4c1.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/reverseBits/e1f4c1.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/reverseBits/e1f4c1.wgsl.expected.msl b/test/tint/builtins/gen/literal/reverseBits/e1f4c1.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/reverseBits/e1f4c1.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/reverseBits/e1f4c1.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/reverseBits/e1f4c1.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/reverseBits/e1f4c1.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/reverseBits/e1f4c1.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/reverseBits/e1f4c1.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/reverseBits/e1f4c1.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/reverseBits/e1f4c1.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/reverseBits/e1f4c1.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/reverseBits/e1f4c1.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/reverseBits/e31adf.wgsl b/test/tint/builtins/gen/literal/reverseBits/e31adf.wgsl
similarity index 96%
rename from test/tint/builtins/gen/reverseBits/e31adf.wgsl
rename to test/tint/builtins/gen/literal/reverseBits/e31adf.wgsl
index 2a599eb0aa..3f4635ec0f 100644
--- a/test/tint/builtins/gen/reverseBits/e31adf.wgsl
+++ b/test/tint/builtins/gen/literal/reverseBits/e31adf.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/reverseBits/e31adf.wgsl.expected.glsl b/test/tint/builtins/gen/literal/reverseBits/e31adf.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/reverseBits/e31adf.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/reverseBits/e31adf.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/reverseBits/e31adf.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/reverseBits/e31adf.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/reverseBits/e31adf.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/reverseBits/e31adf.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/reverseBits/e31adf.wgsl.expected.msl b/test/tint/builtins/gen/literal/reverseBits/e31adf.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/reverseBits/e31adf.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/reverseBits/e31adf.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/reverseBits/e31adf.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/reverseBits/e31adf.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/reverseBits/e31adf.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/reverseBits/e31adf.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/reverseBits/e31adf.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/reverseBits/e31adf.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/reverseBits/e31adf.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/reverseBits/e31adf.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/round/106c0b.wgsl b/test/tint/builtins/gen/literal/round/106c0b.wgsl
similarity index 96%
rename from test/tint/builtins/gen/round/106c0b.wgsl
rename to test/tint/builtins/gen/literal/round/106c0b.wgsl
index ab45faa67c..2bb4ab2519 100644
--- a/test/tint/builtins/gen/round/106c0b.wgsl
+++ b/test/tint/builtins/gen/literal/round/106c0b.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/round/106c0b.wgsl.expected.glsl b/test/tint/builtins/gen/literal/round/106c0b.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/round/106c0b.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/round/106c0b.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/round/106c0b.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/round/106c0b.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/round/106c0b.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/round/106c0b.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/round/106c0b.wgsl.expected.msl b/test/tint/builtins/gen/literal/round/106c0b.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/round/106c0b.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/round/106c0b.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/round/106c0b.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/round/106c0b.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/round/106c0b.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/round/106c0b.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/round/106c0b.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/round/106c0b.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/round/106c0b.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/round/106c0b.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/round/1c7897.wgsl b/test/tint/builtins/gen/literal/round/1c7897.wgsl
similarity index 96%
rename from test/tint/builtins/gen/round/1c7897.wgsl
rename to test/tint/builtins/gen/literal/round/1c7897.wgsl
index cf9399677d..14c38cac4f 100644
--- a/test/tint/builtins/gen/round/1c7897.wgsl
+++ b/test/tint/builtins/gen/literal/round/1c7897.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/round/1c7897.wgsl.expected.glsl b/test/tint/builtins/gen/literal/round/1c7897.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/round/1c7897.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/round/1c7897.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/round/1c7897.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/round/1c7897.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/round/1c7897.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/round/1c7897.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/round/1c7897.wgsl.expected.msl b/test/tint/builtins/gen/literal/round/1c7897.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/round/1c7897.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/round/1c7897.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/round/1c7897.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/round/1c7897.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/round/1c7897.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/round/1c7897.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/round/1c7897.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/round/1c7897.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/round/1c7897.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/round/1c7897.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/round/52c84d.wgsl b/test/tint/builtins/gen/literal/round/52c84d.wgsl
similarity index 96%
rename from test/tint/builtins/gen/round/52c84d.wgsl
rename to test/tint/builtins/gen/literal/round/52c84d.wgsl
index 94dff00cde..e7780281f0 100644
--- a/test/tint/builtins/gen/round/52c84d.wgsl
+++ b/test/tint/builtins/gen/literal/round/52c84d.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/round/52c84d.wgsl.expected.glsl b/test/tint/builtins/gen/literal/round/52c84d.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/round/52c84d.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/round/52c84d.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/round/52c84d.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/round/52c84d.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/round/52c84d.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/round/52c84d.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/round/52c84d.wgsl.expected.msl b/test/tint/builtins/gen/literal/round/52c84d.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/round/52c84d.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/round/52c84d.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/round/52c84d.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/round/52c84d.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/round/52c84d.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/round/52c84d.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/round/52c84d.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/round/52c84d.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/round/52c84d.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/round/52c84d.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/round/9edc38.wgsl b/test/tint/builtins/gen/literal/round/9edc38.wgsl
similarity index 96%
rename from test/tint/builtins/gen/round/9edc38.wgsl
rename to test/tint/builtins/gen/literal/round/9edc38.wgsl
index f0d74685e4..85f6a27d61 100644
--- a/test/tint/builtins/gen/round/9edc38.wgsl
+++ b/test/tint/builtins/gen/literal/round/9edc38.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/round/9edc38.wgsl.expected.glsl b/test/tint/builtins/gen/literal/round/9edc38.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/round/9edc38.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/round/9edc38.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/round/9edc38.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/round/9edc38.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/round/9edc38.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/round/9edc38.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/round/9edc38.wgsl.expected.msl b/test/tint/builtins/gen/literal/round/9edc38.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/round/9edc38.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/round/9edc38.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/round/9edc38.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/round/9edc38.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/round/9edc38.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/round/9edc38.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/round/9edc38.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/round/9edc38.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/round/9edc38.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/round/9edc38.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/select/00b848.wgsl b/test/tint/builtins/gen/literal/select/00b848.wgsl
similarity index 96%
rename from test/tint/builtins/gen/select/00b848.wgsl
rename to test/tint/builtins/gen/literal/select/00b848.wgsl
index cfe6e06565..a22201b8f2 100644
--- a/test/tint/builtins/gen/select/00b848.wgsl
+++ b/test/tint/builtins/gen/literal/select/00b848.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/select/00b848.wgsl.expected.glsl b/test/tint/builtins/gen/literal/select/00b848.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/select/00b848.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/select/00b848.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/select/00b848.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/select/00b848.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/select/00b848.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/select/00b848.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/select/00b848.wgsl.expected.msl b/test/tint/builtins/gen/literal/select/00b848.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/select/00b848.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/select/00b848.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/select/00b848.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/select/00b848.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/select/00b848.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/select/00b848.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/select/00b848.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/select/00b848.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/select/00b848.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/select/00b848.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/select/01e2cd.wgsl b/test/tint/builtins/gen/literal/select/01e2cd.wgsl
similarity index 96%
rename from test/tint/builtins/gen/select/01e2cd.wgsl
rename to test/tint/builtins/gen/literal/select/01e2cd.wgsl
index 8e2a17b736..6fba1df4ee 100644
--- a/test/tint/builtins/gen/select/01e2cd.wgsl
+++ b/test/tint/builtins/gen/literal/select/01e2cd.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/select/01e2cd.wgsl.expected.glsl b/test/tint/builtins/gen/literal/select/01e2cd.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/select/01e2cd.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/select/01e2cd.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/select/01e2cd.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/select/01e2cd.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/select/01e2cd.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/select/01e2cd.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/select/01e2cd.wgsl.expected.msl b/test/tint/builtins/gen/literal/select/01e2cd.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/select/01e2cd.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/select/01e2cd.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/select/01e2cd.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/select/01e2cd.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/select/01e2cd.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/select/01e2cd.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/select/01e2cd.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/select/01e2cd.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/select/01e2cd.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/select/01e2cd.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/select/087ea4.wgsl b/test/tint/builtins/gen/literal/select/087ea4.wgsl
similarity index 96%
rename from test/tint/builtins/gen/select/087ea4.wgsl
rename to test/tint/builtins/gen/literal/select/087ea4.wgsl
index 17021a126e..2bc9d0aef5 100644
--- a/test/tint/builtins/gen/select/087ea4.wgsl
+++ b/test/tint/builtins/gen/literal/select/087ea4.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/select/087ea4.wgsl.expected.glsl b/test/tint/builtins/gen/literal/select/087ea4.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/select/087ea4.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/select/087ea4.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/select/087ea4.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/select/087ea4.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/select/087ea4.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/select/087ea4.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/select/087ea4.wgsl.expected.msl b/test/tint/builtins/gen/literal/select/087ea4.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/select/087ea4.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/select/087ea4.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/select/087ea4.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/select/087ea4.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/select/087ea4.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/select/087ea4.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/select/087ea4.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/select/087ea4.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/select/087ea4.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/select/087ea4.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/select/1e960b.wgsl b/test/tint/builtins/gen/literal/select/1e960b.wgsl
similarity index 96%
rename from test/tint/builtins/gen/select/1e960b.wgsl
rename to test/tint/builtins/gen/literal/select/1e960b.wgsl
index 7ccf1112dc..650b9e4da2 100644
--- a/test/tint/builtins/gen/select/1e960b.wgsl
+++ b/test/tint/builtins/gen/literal/select/1e960b.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/select/1e960b.wgsl.expected.glsl b/test/tint/builtins/gen/literal/select/1e960b.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/select/1e960b.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/select/1e960b.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/select/1e960b.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/select/1e960b.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/select/1e960b.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/select/1e960b.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/select/1e960b.wgsl.expected.msl b/test/tint/builtins/gen/literal/select/1e960b.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/select/1e960b.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/select/1e960b.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/select/1e960b.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/select/1e960b.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/select/1e960b.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/select/1e960b.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/select/1e960b.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/select/1e960b.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/select/1e960b.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/select/1e960b.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/select/266aff.wgsl b/test/tint/builtins/gen/literal/select/266aff.wgsl
similarity index 96%
rename from test/tint/builtins/gen/select/266aff.wgsl
rename to test/tint/builtins/gen/literal/select/266aff.wgsl
index d475b4a130..80d50b0865 100644
--- a/test/tint/builtins/gen/select/266aff.wgsl
+++ b/test/tint/builtins/gen/literal/select/266aff.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/select/266aff.wgsl.expected.glsl b/test/tint/builtins/gen/literal/select/266aff.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/select/266aff.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/select/266aff.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/select/266aff.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/select/266aff.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/select/266aff.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/select/266aff.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/select/266aff.wgsl.expected.msl b/test/tint/builtins/gen/literal/select/266aff.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/select/266aff.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/select/266aff.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/select/266aff.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/select/266aff.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/select/266aff.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/select/266aff.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/select/266aff.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/select/266aff.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/select/266aff.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/select/266aff.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/select/28a27e.wgsl b/test/tint/builtins/gen/literal/select/28a27e.wgsl
similarity index 96%
rename from test/tint/builtins/gen/select/28a27e.wgsl
rename to test/tint/builtins/gen/literal/select/28a27e.wgsl
index 149379ef14..0837ea7d60 100644
--- a/test/tint/builtins/gen/select/28a27e.wgsl
+++ b/test/tint/builtins/gen/literal/select/28a27e.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/select/28a27e.wgsl.expected.glsl b/test/tint/builtins/gen/literal/select/28a27e.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/select/28a27e.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/select/28a27e.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/select/28a27e.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/select/28a27e.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/select/28a27e.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/select/28a27e.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/select/28a27e.wgsl.expected.msl b/test/tint/builtins/gen/literal/select/28a27e.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/select/28a27e.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/select/28a27e.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/select/28a27e.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/select/28a27e.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/select/28a27e.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/select/28a27e.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/select/28a27e.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/select/28a27e.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/select/28a27e.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/select/28a27e.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/select/3c25ce.wgsl b/test/tint/builtins/gen/literal/select/3c25ce.wgsl
similarity index 96%
rename from test/tint/builtins/gen/select/3c25ce.wgsl
rename to test/tint/builtins/gen/literal/select/3c25ce.wgsl
index a855d398f5..e76b138e48 100644
--- a/test/tint/builtins/gen/select/3c25ce.wgsl
+++ b/test/tint/builtins/gen/literal/select/3c25ce.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/select/3c25ce.wgsl.expected.glsl b/test/tint/builtins/gen/literal/select/3c25ce.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/select/3c25ce.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/select/3c25ce.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/select/3c25ce.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/select/3c25ce.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/select/3c25ce.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/select/3c25ce.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/select/3c25ce.wgsl.expected.msl b/test/tint/builtins/gen/literal/select/3c25ce.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/select/3c25ce.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/select/3c25ce.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/select/3c25ce.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/select/3c25ce.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/select/3c25ce.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/select/3c25ce.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/select/3c25ce.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/select/3c25ce.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/select/3c25ce.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/select/3c25ce.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/select/416e14.wgsl b/test/tint/builtins/gen/literal/select/416e14.wgsl
similarity index 96%
rename from test/tint/builtins/gen/select/416e14.wgsl
rename to test/tint/builtins/gen/literal/select/416e14.wgsl
index b953b5ad29..32f3026144 100644
--- a/test/tint/builtins/gen/select/416e14.wgsl
+++ b/test/tint/builtins/gen/literal/select/416e14.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/select/416e14.wgsl.expected.glsl b/test/tint/builtins/gen/literal/select/416e14.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/select/416e14.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/select/416e14.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/select/416e14.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/select/416e14.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/select/416e14.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/select/416e14.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/select/416e14.wgsl.expected.msl b/test/tint/builtins/gen/literal/select/416e14.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/select/416e14.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/select/416e14.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/select/416e14.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/select/416e14.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/select/416e14.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/select/416e14.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/select/416e14.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/select/416e14.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/select/416e14.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/select/416e14.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/select/51b047.wgsl b/test/tint/builtins/gen/literal/select/51b047.wgsl
similarity index 96%
rename from test/tint/builtins/gen/select/51b047.wgsl
rename to test/tint/builtins/gen/literal/select/51b047.wgsl
index 702cdedde9..c30d299863 100644
--- a/test/tint/builtins/gen/select/51b047.wgsl
+++ b/test/tint/builtins/gen/literal/select/51b047.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/select/51b047.wgsl.expected.glsl b/test/tint/builtins/gen/literal/select/51b047.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/select/51b047.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/select/51b047.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/select/51b047.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/select/51b047.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/select/51b047.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/select/51b047.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/select/51b047.wgsl.expected.msl b/test/tint/builtins/gen/literal/select/51b047.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/select/51b047.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/select/51b047.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/select/51b047.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/select/51b047.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/select/51b047.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/select/51b047.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/select/51b047.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/select/51b047.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/select/51b047.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/select/51b047.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/select/713567.wgsl b/test/tint/builtins/gen/literal/select/713567.wgsl
similarity index 96%
rename from test/tint/builtins/gen/select/713567.wgsl
rename to test/tint/builtins/gen/literal/select/713567.wgsl
index 3473d9f0c5..633b85b15f 100644
--- a/test/tint/builtins/gen/select/713567.wgsl
+++ b/test/tint/builtins/gen/literal/select/713567.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/select/713567.wgsl.expected.glsl b/test/tint/builtins/gen/literal/select/713567.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/select/713567.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/select/713567.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/select/713567.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/select/713567.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/select/713567.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/select/713567.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/select/713567.wgsl.expected.msl b/test/tint/builtins/gen/literal/select/713567.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/select/713567.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/select/713567.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/select/713567.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/select/713567.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/select/713567.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/select/713567.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/select/713567.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/select/713567.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/select/713567.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/select/713567.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/select/78be5f.wgsl b/test/tint/builtins/gen/literal/select/78be5f.wgsl
similarity index 96%
rename from test/tint/builtins/gen/select/78be5f.wgsl
rename to test/tint/builtins/gen/literal/select/78be5f.wgsl
index 3b95703cde..08ffe222f2 100644
--- a/test/tint/builtins/gen/select/78be5f.wgsl
+++ b/test/tint/builtins/gen/literal/select/78be5f.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/select/78be5f.wgsl.expected.glsl b/test/tint/builtins/gen/literal/select/78be5f.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/select/78be5f.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/select/78be5f.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/select/78be5f.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/select/78be5f.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/select/78be5f.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/select/78be5f.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/select/78be5f.wgsl.expected.msl b/test/tint/builtins/gen/literal/select/78be5f.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/select/78be5f.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/select/78be5f.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/select/78be5f.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/select/78be5f.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/select/78be5f.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/select/78be5f.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/select/78be5f.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/select/78be5f.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/select/78be5f.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/select/78be5f.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/select/80a9a9.wgsl b/test/tint/builtins/gen/literal/select/80a9a9.wgsl
similarity index 96%
rename from test/tint/builtins/gen/select/80a9a9.wgsl
rename to test/tint/builtins/gen/literal/select/80a9a9.wgsl
index f24b7f63ee..ce846af9c5 100644
--- a/test/tint/builtins/gen/select/80a9a9.wgsl
+++ b/test/tint/builtins/gen/literal/select/80a9a9.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/select/80a9a9.wgsl.expected.glsl b/test/tint/builtins/gen/literal/select/80a9a9.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/select/80a9a9.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/select/80a9a9.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/select/80a9a9.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/select/80a9a9.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/select/80a9a9.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/select/80a9a9.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/select/80a9a9.wgsl.expected.msl b/test/tint/builtins/gen/literal/select/80a9a9.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/select/80a9a9.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/select/80a9a9.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/select/80a9a9.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/select/80a9a9.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/select/80a9a9.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/select/80a9a9.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/select/80a9a9.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/select/80a9a9.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/select/80a9a9.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/select/80a9a9.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/select/8fa62c.wgsl b/test/tint/builtins/gen/literal/select/8fa62c.wgsl
similarity index 96%
rename from test/tint/builtins/gen/select/8fa62c.wgsl
rename to test/tint/builtins/gen/literal/select/8fa62c.wgsl
index c5f67f32cd..2033877f9c 100644
--- a/test/tint/builtins/gen/select/8fa62c.wgsl
+++ b/test/tint/builtins/gen/literal/select/8fa62c.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/select/8fa62c.wgsl.expected.glsl b/test/tint/builtins/gen/literal/select/8fa62c.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/select/8fa62c.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/select/8fa62c.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/select/8fa62c.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/select/8fa62c.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/select/8fa62c.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/select/8fa62c.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/select/8fa62c.wgsl.expected.msl b/test/tint/builtins/gen/literal/select/8fa62c.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/select/8fa62c.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/select/8fa62c.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/select/8fa62c.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/select/8fa62c.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/select/8fa62c.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/select/8fa62c.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/select/8fa62c.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/select/8fa62c.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/select/8fa62c.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/select/8fa62c.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/select/99f883.wgsl b/test/tint/builtins/gen/literal/select/99f883.wgsl
similarity index 96%
rename from test/tint/builtins/gen/select/99f883.wgsl
rename to test/tint/builtins/gen/literal/select/99f883.wgsl
index a292314c40..c501388f1c 100644
--- a/test/tint/builtins/gen/select/99f883.wgsl
+++ b/test/tint/builtins/gen/literal/select/99f883.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/select/99f883.wgsl.expected.glsl b/test/tint/builtins/gen/literal/select/99f883.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/select/99f883.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/select/99f883.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/select/99f883.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/select/99f883.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/select/99f883.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/select/99f883.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/select/99f883.wgsl.expected.msl b/test/tint/builtins/gen/literal/select/99f883.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/select/99f883.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/select/99f883.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/select/99f883.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/select/99f883.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/select/99f883.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/select/99f883.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/select/99f883.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/select/99f883.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/select/99f883.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/select/99f883.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/select/a2860e.wgsl b/test/tint/builtins/gen/literal/select/a2860e.wgsl
similarity index 96%
rename from test/tint/builtins/gen/select/a2860e.wgsl
rename to test/tint/builtins/gen/literal/select/a2860e.wgsl
index 0f8a6354cd..7d284e8262 100644
--- a/test/tint/builtins/gen/select/a2860e.wgsl
+++ b/test/tint/builtins/gen/literal/select/a2860e.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/select/a2860e.wgsl.expected.glsl b/test/tint/builtins/gen/literal/select/a2860e.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/select/a2860e.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/select/a2860e.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/select/a2860e.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/select/a2860e.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/select/a2860e.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/select/a2860e.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/select/a2860e.wgsl.expected.msl b/test/tint/builtins/gen/literal/select/a2860e.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/select/a2860e.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/select/a2860e.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/select/a2860e.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/select/a2860e.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/select/a2860e.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/select/a2860e.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/select/a2860e.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/select/a2860e.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/select/a2860e.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/select/a2860e.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/select/ab069f.wgsl b/test/tint/builtins/gen/literal/select/ab069f.wgsl
similarity index 96%
rename from test/tint/builtins/gen/select/ab069f.wgsl
rename to test/tint/builtins/gen/literal/select/ab069f.wgsl
index d138d9e34e..b806234593 100644
--- a/test/tint/builtins/gen/select/ab069f.wgsl
+++ b/test/tint/builtins/gen/literal/select/ab069f.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/select/ab069f.wgsl.expected.glsl b/test/tint/builtins/gen/literal/select/ab069f.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/select/ab069f.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/select/ab069f.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/select/ab069f.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/select/ab069f.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/select/ab069f.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/select/ab069f.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/select/ab069f.wgsl.expected.msl b/test/tint/builtins/gen/literal/select/ab069f.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/select/ab069f.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/select/ab069f.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/select/ab069f.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/select/ab069f.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/select/ab069f.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/select/ab069f.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/select/ab069f.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/select/ab069f.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/select/ab069f.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/select/ab069f.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/select/b04721.wgsl b/test/tint/builtins/gen/literal/select/b04721.wgsl
similarity index 96%
rename from test/tint/builtins/gen/select/b04721.wgsl
rename to test/tint/builtins/gen/literal/select/b04721.wgsl
index 7f084562de..d0b5455168 100644
--- a/test/tint/builtins/gen/select/b04721.wgsl
+++ b/test/tint/builtins/gen/literal/select/b04721.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/select/b04721.wgsl.expected.glsl b/test/tint/builtins/gen/literal/select/b04721.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/select/b04721.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/select/b04721.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/select/b04721.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/select/b04721.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/select/b04721.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/select/b04721.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/select/b04721.wgsl.expected.msl b/test/tint/builtins/gen/literal/select/b04721.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/select/b04721.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/select/b04721.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/select/b04721.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/select/b04721.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/select/b04721.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/select/b04721.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/select/b04721.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/select/b04721.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/select/b04721.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/select/b04721.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/select/bb447f.wgsl b/test/tint/builtins/gen/literal/select/bb447f.wgsl
similarity index 96%
rename from test/tint/builtins/gen/select/bb447f.wgsl
rename to test/tint/builtins/gen/literal/select/bb447f.wgsl
index 4ad509c0c9..efaac74bc1 100644
--- a/test/tint/builtins/gen/select/bb447f.wgsl
+++ b/test/tint/builtins/gen/literal/select/bb447f.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/select/bb447f.wgsl.expected.glsl b/test/tint/builtins/gen/literal/select/bb447f.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/select/bb447f.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/select/bb447f.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/select/bb447f.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/select/bb447f.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/select/bb447f.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/select/bb447f.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/select/bb447f.wgsl.expected.msl b/test/tint/builtins/gen/literal/select/bb447f.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/select/bb447f.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/select/bb447f.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/select/bb447f.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/select/bb447f.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/select/bb447f.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/select/bb447f.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/select/bb447f.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/select/bb447f.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/select/bb447f.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/select/bb447f.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/select/bb8aae.wgsl b/test/tint/builtins/gen/literal/select/bb8aae.wgsl
similarity index 96%
rename from test/tint/builtins/gen/select/bb8aae.wgsl
rename to test/tint/builtins/gen/literal/select/bb8aae.wgsl
index f8ea5558b9..f7283700eb 100644
--- a/test/tint/builtins/gen/select/bb8aae.wgsl
+++ b/test/tint/builtins/gen/literal/select/bb8aae.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/select/bb8aae.wgsl.expected.glsl b/test/tint/builtins/gen/literal/select/bb8aae.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/select/bb8aae.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/select/bb8aae.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/select/bb8aae.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/select/bb8aae.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/select/bb8aae.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/select/bb8aae.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/select/bb8aae.wgsl.expected.msl b/test/tint/builtins/gen/literal/select/bb8aae.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/select/bb8aae.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/select/bb8aae.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/select/bb8aae.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/select/bb8aae.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/select/bb8aae.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/select/bb8aae.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/select/bb8aae.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/select/bb8aae.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/select/bb8aae.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/select/bb8aae.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/select/bf3d29.wgsl b/test/tint/builtins/gen/literal/select/bf3d29.wgsl
similarity index 96%
rename from test/tint/builtins/gen/select/bf3d29.wgsl
rename to test/tint/builtins/gen/literal/select/bf3d29.wgsl
index 411feeb1d7..e841aa4abb 100644
--- a/test/tint/builtins/gen/select/bf3d29.wgsl
+++ b/test/tint/builtins/gen/literal/select/bf3d29.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/select/bf3d29.wgsl.expected.glsl b/test/tint/builtins/gen/literal/select/bf3d29.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/select/bf3d29.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/select/bf3d29.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/select/bf3d29.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/select/bf3d29.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/select/bf3d29.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/select/bf3d29.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/select/bf3d29.wgsl.expected.msl b/test/tint/builtins/gen/literal/select/bf3d29.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/select/bf3d29.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/select/bf3d29.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/select/bf3d29.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/select/bf3d29.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/select/bf3d29.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/select/bf3d29.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/select/bf3d29.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/select/bf3d29.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/select/bf3d29.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/select/bf3d29.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/select/c31f9e.wgsl b/test/tint/builtins/gen/literal/select/c31f9e.wgsl
similarity index 96%
rename from test/tint/builtins/gen/select/c31f9e.wgsl
rename to test/tint/builtins/gen/literal/select/c31f9e.wgsl
index 90cd213202..a4b50a22bc 100644
--- a/test/tint/builtins/gen/select/c31f9e.wgsl
+++ b/test/tint/builtins/gen/literal/select/c31f9e.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/select/c31f9e.wgsl.expected.glsl b/test/tint/builtins/gen/literal/select/c31f9e.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/select/c31f9e.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/select/c31f9e.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/select/c31f9e.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/select/c31f9e.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/select/c31f9e.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/select/c31f9e.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/select/c31f9e.wgsl.expected.msl b/test/tint/builtins/gen/literal/select/c31f9e.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/select/c31f9e.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/select/c31f9e.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/select/c31f9e.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/select/c31f9e.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/select/c31f9e.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/select/c31f9e.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/select/c31f9e.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/select/c31f9e.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/select/c31f9e.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/select/c31f9e.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/select/c41bd1.wgsl b/test/tint/builtins/gen/literal/select/c41bd1.wgsl
similarity index 96%
rename from test/tint/builtins/gen/select/c41bd1.wgsl
rename to test/tint/builtins/gen/literal/select/c41bd1.wgsl
index fe6b19c428..259ac4e854 100644
--- a/test/tint/builtins/gen/select/c41bd1.wgsl
+++ b/test/tint/builtins/gen/literal/select/c41bd1.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/select/c41bd1.wgsl.expected.glsl b/test/tint/builtins/gen/literal/select/c41bd1.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/select/c41bd1.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/select/c41bd1.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/select/c41bd1.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/select/c41bd1.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/select/c41bd1.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/select/c41bd1.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/select/c41bd1.wgsl.expected.msl b/test/tint/builtins/gen/literal/select/c41bd1.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/select/c41bd1.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/select/c41bd1.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/select/c41bd1.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/select/c41bd1.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/select/c41bd1.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/select/c41bd1.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/select/c41bd1.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/select/c41bd1.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/select/c41bd1.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/select/c41bd1.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/select/c4a4ef.wgsl b/test/tint/builtins/gen/literal/select/c4a4ef.wgsl
similarity index 96%
rename from test/tint/builtins/gen/select/c4a4ef.wgsl
rename to test/tint/builtins/gen/literal/select/c4a4ef.wgsl
index 36d6fe1885..09e1e82561 100644
--- a/test/tint/builtins/gen/select/c4a4ef.wgsl
+++ b/test/tint/builtins/gen/literal/select/c4a4ef.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/select/c4a4ef.wgsl.expected.glsl b/test/tint/builtins/gen/literal/select/c4a4ef.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/select/c4a4ef.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/select/c4a4ef.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/select/c4a4ef.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/select/c4a4ef.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/select/c4a4ef.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/select/c4a4ef.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/select/c4a4ef.wgsl.expected.msl b/test/tint/builtins/gen/literal/select/c4a4ef.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/select/c4a4ef.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/select/c4a4ef.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/select/c4a4ef.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/select/c4a4ef.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/select/c4a4ef.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/select/c4a4ef.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/select/c4a4ef.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/select/c4a4ef.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/select/c4a4ef.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/select/c4a4ef.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/select/cb9301.wgsl b/test/tint/builtins/gen/literal/select/cb9301.wgsl
similarity index 96%
rename from test/tint/builtins/gen/select/cb9301.wgsl
rename to test/tint/builtins/gen/literal/select/cb9301.wgsl
index 90deaf256b..6a18667471 100644
--- a/test/tint/builtins/gen/select/cb9301.wgsl
+++ b/test/tint/builtins/gen/literal/select/cb9301.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/select/cb9301.wgsl.expected.glsl b/test/tint/builtins/gen/literal/select/cb9301.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/select/cb9301.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/select/cb9301.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/select/cb9301.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/select/cb9301.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/select/cb9301.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/select/cb9301.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/select/cb9301.wgsl.expected.msl b/test/tint/builtins/gen/literal/select/cb9301.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/select/cb9301.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/select/cb9301.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/select/cb9301.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/select/cb9301.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/select/cb9301.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/select/cb9301.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/select/cb9301.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/select/cb9301.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/select/cb9301.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/select/cb9301.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/select/e3e028.wgsl b/test/tint/builtins/gen/literal/select/e3e028.wgsl
similarity index 96%
rename from test/tint/builtins/gen/select/e3e028.wgsl
rename to test/tint/builtins/gen/literal/select/e3e028.wgsl
index d1fc18e461..60b9de69f7 100644
--- a/test/tint/builtins/gen/select/e3e028.wgsl
+++ b/test/tint/builtins/gen/literal/select/e3e028.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/select/e3e028.wgsl.expected.glsl b/test/tint/builtins/gen/literal/select/e3e028.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/select/e3e028.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/select/e3e028.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/select/e3e028.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/select/e3e028.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/select/e3e028.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/select/e3e028.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/select/e3e028.wgsl.expected.msl b/test/tint/builtins/gen/literal/select/e3e028.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/select/e3e028.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/select/e3e028.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/select/e3e028.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/select/e3e028.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/select/e3e028.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/select/e3e028.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/select/e3e028.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/select/e3e028.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/select/e3e028.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/select/e3e028.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/select/ebfea2.wgsl b/test/tint/builtins/gen/literal/select/ebfea2.wgsl
similarity index 96%
rename from test/tint/builtins/gen/select/ebfea2.wgsl
rename to test/tint/builtins/gen/literal/select/ebfea2.wgsl
index 24056f3182..f67652ed64 100644
--- a/test/tint/builtins/gen/select/ebfea2.wgsl
+++ b/test/tint/builtins/gen/literal/select/ebfea2.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/select/ebfea2.wgsl.expected.glsl b/test/tint/builtins/gen/literal/select/ebfea2.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/select/ebfea2.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/select/ebfea2.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/select/ebfea2.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/select/ebfea2.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/select/ebfea2.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/select/ebfea2.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/select/ebfea2.wgsl.expected.msl b/test/tint/builtins/gen/literal/select/ebfea2.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/select/ebfea2.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/select/ebfea2.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/select/ebfea2.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/select/ebfea2.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/select/ebfea2.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/select/ebfea2.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/select/ebfea2.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/select/ebfea2.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/select/ebfea2.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/select/ebfea2.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/select/ed8a15.wgsl b/test/tint/builtins/gen/literal/select/ed8a15.wgsl
similarity index 96%
rename from test/tint/builtins/gen/select/ed8a15.wgsl
rename to test/tint/builtins/gen/literal/select/ed8a15.wgsl
index 10986bf66c..f51a5f5864 100644
--- a/test/tint/builtins/gen/select/ed8a15.wgsl
+++ b/test/tint/builtins/gen/literal/select/ed8a15.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/select/ed8a15.wgsl.expected.glsl b/test/tint/builtins/gen/literal/select/ed8a15.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/select/ed8a15.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/select/ed8a15.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/select/ed8a15.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/select/ed8a15.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/select/ed8a15.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/select/ed8a15.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/select/ed8a15.wgsl.expected.msl b/test/tint/builtins/gen/literal/select/ed8a15.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/select/ed8a15.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/select/ed8a15.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/select/ed8a15.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/select/ed8a15.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/select/ed8a15.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/select/ed8a15.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/select/ed8a15.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/select/ed8a15.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/select/ed8a15.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/select/ed8a15.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/select/fb7e53.wgsl b/test/tint/builtins/gen/literal/select/fb7e53.wgsl
similarity index 96%
rename from test/tint/builtins/gen/select/fb7e53.wgsl
rename to test/tint/builtins/gen/literal/select/fb7e53.wgsl
index f81d8df49d..a0bffa8aca 100644
--- a/test/tint/builtins/gen/select/fb7e53.wgsl
+++ b/test/tint/builtins/gen/literal/select/fb7e53.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/select/fb7e53.wgsl.expected.glsl b/test/tint/builtins/gen/literal/select/fb7e53.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/select/fb7e53.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/select/fb7e53.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/select/fb7e53.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/select/fb7e53.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/select/fb7e53.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/select/fb7e53.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/select/fb7e53.wgsl.expected.msl b/test/tint/builtins/gen/literal/select/fb7e53.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/select/fb7e53.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/select/fb7e53.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/select/fb7e53.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/select/fb7e53.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/select/fb7e53.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/select/fb7e53.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/select/fb7e53.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/select/fb7e53.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/select/fb7e53.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/select/fb7e53.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/sign/159665.wgsl b/test/tint/builtins/gen/literal/sign/159665.wgsl
similarity index 96%
rename from test/tint/builtins/gen/sign/159665.wgsl
rename to test/tint/builtins/gen/literal/sign/159665.wgsl
index 2cfae2efa3..2c3bd1bf77 100644
--- a/test/tint/builtins/gen/sign/159665.wgsl
+++ b/test/tint/builtins/gen/literal/sign/159665.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/sign/159665.wgsl.expected.glsl b/test/tint/builtins/gen/literal/sign/159665.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/sign/159665.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/sign/159665.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/sign/159665.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/sign/159665.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/sign/159665.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/sign/159665.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/sign/159665.wgsl.expected.msl b/test/tint/builtins/gen/literal/sign/159665.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/sign/159665.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/sign/159665.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/sign/159665.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/sign/159665.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/sign/159665.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/sign/159665.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/sign/159665.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/sign/159665.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/sign/159665.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/sign/159665.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/sign/b8f634.wgsl b/test/tint/builtins/gen/literal/sign/b8f634.wgsl
similarity index 96%
rename from test/tint/builtins/gen/sign/b8f634.wgsl
rename to test/tint/builtins/gen/literal/sign/b8f634.wgsl
index 7b936e3ba9..ae50e74280 100644
--- a/test/tint/builtins/gen/sign/b8f634.wgsl
+++ b/test/tint/builtins/gen/literal/sign/b8f634.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/sign/b8f634.wgsl.expected.glsl b/test/tint/builtins/gen/literal/sign/b8f634.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/sign/b8f634.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/sign/b8f634.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/sign/b8f634.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/sign/b8f634.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/sign/b8f634.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/sign/b8f634.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/sign/b8f634.wgsl.expected.msl b/test/tint/builtins/gen/literal/sign/b8f634.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/sign/b8f634.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/sign/b8f634.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/sign/b8f634.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/sign/b8f634.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/sign/b8f634.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/sign/b8f634.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/sign/b8f634.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/sign/b8f634.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/sign/b8f634.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/sign/b8f634.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/sign/d065d8.wgsl b/test/tint/builtins/gen/literal/sign/d065d8.wgsl
similarity index 96%
rename from test/tint/builtins/gen/sign/d065d8.wgsl
rename to test/tint/builtins/gen/literal/sign/d065d8.wgsl
index 1dadd5c76f..954aa60641 100644
--- a/test/tint/builtins/gen/sign/d065d8.wgsl
+++ b/test/tint/builtins/gen/literal/sign/d065d8.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/sign/d065d8.wgsl.expected.glsl b/test/tint/builtins/gen/literal/sign/d065d8.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/sign/d065d8.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/sign/d065d8.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/sign/d065d8.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/sign/d065d8.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/sign/d065d8.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/sign/d065d8.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/sign/d065d8.wgsl.expected.msl b/test/tint/builtins/gen/literal/sign/d065d8.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/sign/d065d8.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/sign/d065d8.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/sign/d065d8.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/sign/d065d8.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/sign/d065d8.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/sign/d065d8.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/sign/d065d8.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/sign/d065d8.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/sign/d065d8.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/sign/d065d8.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/sign/dd790e.wgsl b/test/tint/builtins/gen/literal/sign/dd790e.wgsl
similarity index 96%
rename from test/tint/builtins/gen/sign/dd790e.wgsl
rename to test/tint/builtins/gen/literal/sign/dd790e.wgsl
index 0124aa81b0..06c50c9f1a 100644
--- a/test/tint/builtins/gen/sign/dd790e.wgsl
+++ b/test/tint/builtins/gen/literal/sign/dd790e.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/sign/dd790e.wgsl.expected.glsl b/test/tint/builtins/gen/literal/sign/dd790e.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/sign/dd790e.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/sign/dd790e.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/sign/dd790e.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/sign/dd790e.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/sign/dd790e.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/sign/dd790e.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/sign/dd790e.wgsl.expected.msl b/test/tint/builtins/gen/literal/sign/dd790e.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/sign/dd790e.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/sign/dd790e.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/sign/dd790e.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/sign/dd790e.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/sign/dd790e.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/sign/dd790e.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/sign/dd790e.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/sign/dd790e.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/sign/dd790e.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/sign/dd790e.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/sin/01f241.wgsl b/test/tint/builtins/gen/literal/sin/01f241.wgsl
similarity index 96%
rename from test/tint/builtins/gen/sin/01f241.wgsl
rename to test/tint/builtins/gen/literal/sin/01f241.wgsl
index 951c1b9f35..967e7c0663 100644
--- a/test/tint/builtins/gen/sin/01f241.wgsl
+++ b/test/tint/builtins/gen/literal/sin/01f241.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/sin/01f241.wgsl.expected.glsl b/test/tint/builtins/gen/literal/sin/01f241.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/sin/01f241.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/sin/01f241.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/sin/01f241.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/sin/01f241.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/sin/01f241.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/sin/01f241.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/sin/01f241.wgsl.expected.msl b/test/tint/builtins/gen/literal/sin/01f241.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/sin/01f241.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/sin/01f241.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/sin/01f241.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/sin/01f241.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/sin/01f241.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/sin/01f241.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/sin/01f241.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/sin/01f241.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/sin/01f241.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/sin/01f241.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/sin/4e3979.wgsl b/test/tint/builtins/gen/literal/sin/4e3979.wgsl
similarity index 96%
rename from test/tint/builtins/gen/sin/4e3979.wgsl
rename to test/tint/builtins/gen/literal/sin/4e3979.wgsl
index 5932c6f246..cde754f6a7 100644
--- a/test/tint/builtins/gen/sin/4e3979.wgsl
+++ b/test/tint/builtins/gen/literal/sin/4e3979.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/sin/4e3979.wgsl.expected.glsl b/test/tint/builtins/gen/literal/sin/4e3979.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/sin/4e3979.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/sin/4e3979.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/sin/4e3979.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/sin/4e3979.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/sin/4e3979.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/sin/4e3979.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/sin/4e3979.wgsl.expected.msl b/test/tint/builtins/gen/literal/sin/4e3979.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/sin/4e3979.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/sin/4e3979.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/sin/4e3979.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/sin/4e3979.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/sin/4e3979.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/sin/4e3979.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/sin/4e3979.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/sin/4e3979.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/sin/4e3979.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/sin/4e3979.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/sin/b78c91.wgsl b/test/tint/builtins/gen/literal/sin/b78c91.wgsl
similarity index 96%
rename from test/tint/builtins/gen/sin/b78c91.wgsl
rename to test/tint/builtins/gen/literal/sin/b78c91.wgsl
index 234b758799..7a2120ae4b 100644
--- a/test/tint/builtins/gen/sin/b78c91.wgsl
+++ b/test/tint/builtins/gen/literal/sin/b78c91.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/sin/b78c91.wgsl.expected.glsl b/test/tint/builtins/gen/literal/sin/b78c91.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/sin/b78c91.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/sin/b78c91.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/sin/b78c91.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/sin/b78c91.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/sin/b78c91.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/sin/b78c91.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/sin/b78c91.wgsl.expected.msl b/test/tint/builtins/gen/literal/sin/b78c91.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/sin/b78c91.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/sin/b78c91.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/sin/b78c91.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/sin/b78c91.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/sin/b78c91.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/sin/b78c91.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/sin/b78c91.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/sin/b78c91.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/sin/b78c91.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/sin/b78c91.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/sin/fc8bc4.wgsl b/test/tint/builtins/gen/literal/sin/fc8bc4.wgsl
similarity index 96%
rename from test/tint/builtins/gen/sin/fc8bc4.wgsl
rename to test/tint/builtins/gen/literal/sin/fc8bc4.wgsl
index a035f8c1c1..0888f2e23b 100644
--- a/test/tint/builtins/gen/sin/fc8bc4.wgsl
+++ b/test/tint/builtins/gen/literal/sin/fc8bc4.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/sin/fc8bc4.wgsl.expected.glsl b/test/tint/builtins/gen/literal/sin/fc8bc4.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/sin/fc8bc4.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/sin/fc8bc4.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/sin/fc8bc4.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/sin/fc8bc4.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/sin/fc8bc4.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/sin/fc8bc4.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/sin/fc8bc4.wgsl.expected.msl b/test/tint/builtins/gen/literal/sin/fc8bc4.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/sin/fc8bc4.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/sin/fc8bc4.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/sin/fc8bc4.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/sin/fc8bc4.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/sin/fc8bc4.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/sin/fc8bc4.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/sin/fc8bc4.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/sin/fc8bc4.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/sin/fc8bc4.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/sin/fc8bc4.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/sinh/445e33.wgsl b/test/tint/builtins/gen/literal/sinh/445e33.wgsl
similarity index 96%
rename from test/tint/builtins/gen/sinh/445e33.wgsl
rename to test/tint/builtins/gen/literal/sinh/445e33.wgsl
index bd3aff2e30..6ddbf4fc16 100644
--- a/test/tint/builtins/gen/sinh/445e33.wgsl
+++ b/test/tint/builtins/gen/literal/sinh/445e33.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/sinh/445e33.wgsl.expected.glsl b/test/tint/builtins/gen/literal/sinh/445e33.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/sinh/445e33.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/sinh/445e33.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/sinh/445e33.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/sinh/445e33.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/sinh/445e33.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/sinh/445e33.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/sinh/445e33.wgsl.expected.msl b/test/tint/builtins/gen/literal/sinh/445e33.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/sinh/445e33.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/sinh/445e33.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/sinh/445e33.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/sinh/445e33.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/sinh/445e33.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/sinh/445e33.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/sinh/445e33.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/sinh/445e33.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/sinh/445e33.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/sinh/445e33.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/sinh/7bb598.wgsl b/test/tint/builtins/gen/literal/sinh/7bb598.wgsl
similarity index 96%
rename from test/tint/builtins/gen/sinh/7bb598.wgsl
rename to test/tint/builtins/gen/literal/sinh/7bb598.wgsl
index df3be7998e..e45c7f02bf 100644
--- a/test/tint/builtins/gen/sinh/7bb598.wgsl
+++ b/test/tint/builtins/gen/literal/sinh/7bb598.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/sinh/7bb598.wgsl.expected.glsl b/test/tint/builtins/gen/literal/sinh/7bb598.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/sinh/7bb598.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/sinh/7bb598.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/sinh/7bb598.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/sinh/7bb598.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/sinh/7bb598.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/sinh/7bb598.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/sinh/7bb598.wgsl.expected.msl b/test/tint/builtins/gen/literal/sinh/7bb598.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/sinh/7bb598.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/sinh/7bb598.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/sinh/7bb598.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/sinh/7bb598.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/sinh/7bb598.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/sinh/7bb598.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/sinh/7bb598.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/sinh/7bb598.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/sinh/7bb598.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/sinh/7bb598.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/sinh/b9860e.wgsl b/test/tint/builtins/gen/literal/sinh/b9860e.wgsl
similarity index 96%
rename from test/tint/builtins/gen/sinh/b9860e.wgsl
rename to test/tint/builtins/gen/literal/sinh/b9860e.wgsl
index 7f4fa1d3b2..e913cb912d 100644
--- a/test/tint/builtins/gen/sinh/b9860e.wgsl
+++ b/test/tint/builtins/gen/literal/sinh/b9860e.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/sinh/b9860e.wgsl.expected.glsl b/test/tint/builtins/gen/literal/sinh/b9860e.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/sinh/b9860e.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/sinh/b9860e.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/sinh/b9860e.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/sinh/b9860e.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/sinh/b9860e.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/sinh/b9860e.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/sinh/b9860e.wgsl.expected.msl b/test/tint/builtins/gen/literal/sinh/b9860e.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/sinh/b9860e.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/sinh/b9860e.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/sinh/b9860e.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/sinh/b9860e.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/sinh/b9860e.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/sinh/b9860e.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/sinh/b9860e.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/sinh/b9860e.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/sinh/b9860e.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/sinh/b9860e.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/sinh/c9a5eb.wgsl b/test/tint/builtins/gen/literal/sinh/c9a5eb.wgsl
similarity index 96%
rename from test/tint/builtins/gen/sinh/c9a5eb.wgsl
rename to test/tint/builtins/gen/literal/sinh/c9a5eb.wgsl
index 699d4a8c0d..1ec2a5bcd3 100644
--- a/test/tint/builtins/gen/sinh/c9a5eb.wgsl
+++ b/test/tint/builtins/gen/literal/sinh/c9a5eb.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/sinh/c9a5eb.wgsl.expected.glsl b/test/tint/builtins/gen/literal/sinh/c9a5eb.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/sinh/c9a5eb.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/sinh/c9a5eb.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/sinh/c9a5eb.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/sinh/c9a5eb.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/sinh/c9a5eb.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/sinh/c9a5eb.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/sinh/c9a5eb.wgsl.expected.msl b/test/tint/builtins/gen/literal/sinh/c9a5eb.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/sinh/c9a5eb.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/sinh/c9a5eb.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/sinh/c9a5eb.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/sinh/c9a5eb.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/sinh/c9a5eb.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/sinh/c9a5eb.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/sinh/c9a5eb.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/sinh/c9a5eb.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/sinh/c9a5eb.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/sinh/c9a5eb.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/smoothstep/392c19.wgsl b/test/tint/builtins/gen/literal/smoothstep/392c19.wgsl
similarity index 96%
rename from test/tint/builtins/gen/smoothstep/392c19.wgsl
rename to test/tint/builtins/gen/literal/smoothstep/392c19.wgsl
index 018e920ed3..9df76b3764 100644
--- a/test/tint/builtins/gen/smoothstep/392c19.wgsl
+++ b/test/tint/builtins/gen/literal/smoothstep/392c19.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/smoothstep/392c19.wgsl.expected.glsl b/test/tint/builtins/gen/literal/smoothstep/392c19.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/smoothstep/392c19.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/smoothstep/392c19.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/smoothstep/392c19.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/smoothstep/392c19.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/smoothstep/392c19.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/smoothstep/392c19.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/smoothstep/392c19.wgsl.expected.msl b/test/tint/builtins/gen/literal/smoothstep/392c19.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/smoothstep/392c19.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/smoothstep/392c19.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/smoothstep/392c19.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/smoothstep/392c19.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/smoothstep/392c19.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/smoothstep/392c19.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/smoothstep/392c19.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/smoothstep/392c19.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/smoothstep/392c19.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/smoothstep/392c19.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/smoothstep/40864c.wgsl b/test/tint/builtins/gen/literal/smoothstep/40864c.wgsl
similarity index 96%
rename from test/tint/builtins/gen/smoothstep/40864c.wgsl
rename to test/tint/builtins/gen/literal/smoothstep/40864c.wgsl
index 403e8bff4e..2989f50d50 100644
--- a/test/tint/builtins/gen/smoothstep/40864c.wgsl
+++ b/test/tint/builtins/gen/literal/smoothstep/40864c.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/smoothstep/40864c.wgsl.expected.glsl b/test/tint/builtins/gen/literal/smoothstep/40864c.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/smoothstep/40864c.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/smoothstep/40864c.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/smoothstep/40864c.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/smoothstep/40864c.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/smoothstep/40864c.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/smoothstep/40864c.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/smoothstep/40864c.wgsl.expected.msl b/test/tint/builtins/gen/literal/smoothstep/40864c.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/smoothstep/40864c.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/smoothstep/40864c.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/smoothstep/40864c.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/smoothstep/40864c.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/smoothstep/40864c.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/smoothstep/40864c.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/smoothstep/40864c.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/smoothstep/40864c.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/smoothstep/40864c.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/smoothstep/40864c.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/smoothstep/5f615b.wgsl b/test/tint/builtins/gen/literal/smoothstep/5f615b.wgsl
similarity index 100%
rename from test/tint/builtins/gen/smoothstep/5f615b.wgsl
rename to test/tint/builtins/gen/literal/smoothstep/5f615b.wgsl
diff --git a/test/tint/builtins/gen/smoothstep/5f615b.wgsl.expected.glsl b/test/tint/builtins/gen/literal/smoothstep/5f615b.wgsl.expected.glsl
similarity index 92%
rename from test/tint/builtins/gen/smoothstep/5f615b.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/smoothstep/5f615b.wgsl.expected.glsl
index 45ae81fc3e..ea38d871d0 100644
--- a/test/tint/builtins/gen/smoothstep/5f615b.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/smoothstep/5f615b.wgsl.expected.glsl
@@ -1,4 +1,4 @@
-builtins/gen/smoothstep/5f615b.wgsl:28:24 warning: use of deprecated builtin
+builtins/gen/literal/smoothstep/5f615b.wgsl:28:24 warning: use of deprecated builtin
   var res: vec4<f32> = smoothStep(vec4<f32>(), vec4<f32>(), vec4<f32>());
                        ^^^^^^^^^^
 
diff --git a/test/tint/builtins/gen/smoothstep/5f615b.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/smoothstep/5f615b.wgsl.expected.hlsl
similarity index 88%
rename from test/tint/builtins/gen/smoothstep/5f615b.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/smoothstep/5f615b.wgsl.expected.hlsl
index 256447d760..56e07230d0 100644
--- a/test/tint/builtins/gen/smoothstep/5f615b.wgsl.expected.hlsl
+++ b/test/tint/builtins/gen/literal/smoothstep/5f615b.wgsl.expected.hlsl
@@ -1,4 +1,4 @@
-builtins/gen/smoothstep/5f615b.wgsl:28:24 warning: use of deprecated builtin
+builtins/gen/literal/smoothstep/5f615b.wgsl:28:24 warning: use of deprecated builtin
   var res: vec4<f32> = smoothStep(vec4<f32>(), vec4<f32>(), vec4<f32>());
                        ^^^^^^^^^^
 
diff --git a/test/tint/builtins/gen/smoothstep/5f615b.wgsl.expected.msl b/test/tint/builtins/gen/literal/smoothstep/5f615b.wgsl.expected.msl
similarity index 89%
rename from test/tint/builtins/gen/smoothstep/5f615b.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/smoothstep/5f615b.wgsl.expected.msl
index 3ba77c1d02..58d65be04c 100644
--- a/test/tint/builtins/gen/smoothstep/5f615b.wgsl.expected.msl
+++ b/test/tint/builtins/gen/literal/smoothstep/5f615b.wgsl.expected.msl
@@ -1,4 +1,4 @@
-builtins/gen/smoothstep/5f615b.wgsl:28:24 warning: use of deprecated builtin
+builtins/gen/literal/smoothstep/5f615b.wgsl:28:24 warning: use of deprecated builtin
   var res: vec4<f32> = smoothStep(vec4<f32>(), vec4<f32>(), vec4<f32>());
                        ^^^^^^^^^^
 
diff --git a/test/tint/builtins/gen/smoothstep/5f615b.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/smoothstep/5f615b.wgsl.expected.spvasm
similarity index 97%
rename from test/tint/builtins/gen/smoothstep/5f615b.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/smoothstep/5f615b.wgsl.expected.spvasm
index 3e78282248..ec41447437 100644
--- a/test/tint/builtins/gen/smoothstep/5f615b.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/smoothstep/5f615b.wgsl.expected.spvasm
@@ -1,4 +1,4 @@
-builtins/gen/smoothstep/5f615b.wgsl:28:24 warning: use of deprecated builtin
+builtins/gen/literal/smoothstep/5f615b.wgsl:28:24 warning: use of deprecated builtin
   var res: vec4<f32> = smoothStep(vec4<f32>(), vec4<f32>(), vec4<f32>());
                        ^^^^^^^^^^
 
diff --git a/test/tint/builtins/gen/smoothstep/5f615b.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/smoothstep/5f615b.wgsl.expected.wgsl
similarity index 84%
rename from test/tint/builtins/gen/smoothstep/5f615b.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/smoothstep/5f615b.wgsl.expected.wgsl
index 89cc7bfeaf..f87d953096 100644
--- a/test/tint/builtins/gen/smoothstep/5f615b.wgsl.expected.wgsl
+++ b/test/tint/builtins/gen/literal/smoothstep/5f615b.wgsl.expected.wgsl
@@ -1,4 +1,4 @@
-builtins/gen/smoothstep/5f615b.wgsl:28:24 warning: use of deprecated builtin
+builtins/gen/literal/smoothstep/5f615b.wgsl:28:24 warning: use of deprecated builtin
   var res: vec4<f32> = smoothStep(vec4<f32>(), vec4<f32>(), vec4<f32>());
                        ^^^^^^^^^^
 
diff --git a/test/tint/builtins/gen/smoothstep/658be3.wgsl b/test/tint/builtins/gen/literal/smoothstep/658be3.wgsl
similarity index 100%
rename from test/tint/builtins/gen/smoothstep/658be3.wgsl
rename to test/tint/builtins/gen/literal/smoothstep/658be3.wgsl
diff --git a/test/tint/builtins/gen/smoothstep/658be3.wgsl.expected.glsl b/test/tint/builtins/gen/literal/smoothstep/658be3.wgsl.expected.glsl
similarity index 92%
rename from test/tint/builtins/gen/smoothstep/658be3.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/smoothstep/658be3.wgsl.expected.glsl
index 662c57411f..23ebb6ae07 100644
--- a/test/tint/builtins/gen/smoothstep/658be3.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/smoothstep/658be3.wgsl.expected.glsl
@@ -1,4 +1,4 @@
-builtins/gen/smoothstep/658be3.wgsl:28:24 warning: use of deprecated builtin
+builtins/gen/literal/smoothstep/658be3.wgsl:28:24 warning: use of deprecated builtin
   var res: vec3<f32> = smoothStep(vec3<f32>(), vec3<f32>(), vec3<f32>());
                        ^^^^^^^^^^
 
diff --git a/test/tint/builtins/gen/smoothstep/658be3.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/smoothstep/658be3.wgsl.expected.hlsl
similarity index 88%
rename from test/tint/builtins/gen/smoothstep/658be3.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/smoothstep/658be3.wgsl.expected.hlsl
index 0cc1cb4fb8..20ebd1f277 100644
--- a/test/tint/builtins/gen/smoothstep/658be3.wgsl.expected.hlsl
+++ b/test/tint/builtins/gen/literal/smoothstep/658be3.wgsl.expected.hlsl
@@ -1,4 +1,4 @@
-builtins/gen/smoothstep/658be3.wgsl:28:24 warning: use of deprecated builtin
+builtins/gen/literal/smoothstep/658be3.wgsl:28:24 warning: use of deprecated builtin
   var res: vec3<f32> = smoothStep(vec3<f32>(), vec3<f32>(), vec3<f32>());
                        ^^^^^^^^^^
 
diff --git a/test/tint/builtins/gen/smoothstep/658be3.wgsl.expected.msl b/test/tint/builtins/gen/literal/smoothstep/658be3.wgsl.expected.msl
similarity index 89%
rename from test/tint/builtins/gen/smoothstep/658be3.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/smoothstep/658be3.wgsl.expected.msl
index 0cbf36bc0f..2368c8d85b 100644
--- a/test/tint/builtins/gen/smoothstep/658be3.wgsl.expected.msl
+++ b/test/tint/builtins/gen/literal/smoothstep/658be3.wgsl.expected.msl
@@ -1,4 +1,4 @@
-builtins/gen/smoothstep/658be3.wgsl:28:24 warning: use of deprecated builtin
+builtins/gen/literal/smoothstep/658be3.wgsl:28:24 warning: use of deprecated builtin
   var res: vec3<f32> = smoothStep(vec3<f32>(), vec3<f32>(), vec3<f32>());
                        ^^^^^^^^^^
 
diff --git a/test/tint/builtins/gen/smoothstep/658be3.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/smoothstep/658be3.wgsl.expected.spvasm
similarity index 97%
rename from test/tint/builtins/gen/smoothstep/658be3.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/smoothstep/658be3.wgsl.expected.spvasm
index 032e30d42e..77eaa09fe4 100644
--- a/test/tint/builtins/gen/smoothstep/658be3.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/smoothstep/658be3.wgsl.expected.spvasm
@@ -1,4 +1,4 @@
-builtins/gen/smoothstep/658be3.wgsl:28:24 warning: use of deprecated builtin
+builtins/gen/literal/smoothstep/658be3.wgsl:28:24 warning: use of deprecated builtin
   var res: vec3<f32> = smoothStep(vec3<f32>(), vec3<f32>(), vec3<f32>());
                        ^^^^^^^^^^
 
diff --git a/test/tint/builtins/gen/smoothstep/658be3.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/smoothstep/658be3.wgsl.expected.wgsl
similarity index 84%
rename from test/tint/builtins/gen/smoothstep/658be3.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/smoothstep/658be3.wgsl.expected.wgsl
index 7e3aa5c005..62eb3cb966 100644
--- a/test/tint/builtins/gen/smoothstep/658be3.wgsl.expected.wgsl
+++ b/test/tint/builtins/gen/literal/smoothstep/658be3.wgsl.expected.wgsl
@@ -1,4 +1,4 @@
-builtins/gen/smoothstep/658be3.wgsl:28:24 warning: use of deprecated builtin
+builtins/gen/literal/smoothstep/658be3.wgsl:28:24 warning: use of deprecated builtin
   var res: vec3<f32> = smoothStep(vec3<f32>(), vec3<f32>(), vec3<f32>());
                        ^^^^^^^^^^
 
diff --git a/test/tint/builtins/gen/smoothstep/6c4975.wgsl b/test/tint/builtins/gen/literal/smoothstep/6c4975.wgsl
similarity index 96%
rename from test/tint/builtins/gen/smoothstep/6c4975.wgsl
rename to test/tint/builtins/gen/literal/smoothstep/6c4975.wgsl
index aa22a453e5..83ae2973ff 100644
--- a/test/tint/builtins/gen/smoothstep/6c4975.wgsl
+++ b/test/tint/builtins/gen/literal/smoothstep/6c4975.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/smoothstep/6c4975.wgsl.expected.glsl b/test/tint/builtins/gen/literal/smoothstep/6c4975.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/smoothstep/6c4975.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/smoothstep/6c4975.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/smoothstep/6c4975.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/smoothstep/6c4975.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/smoothstep/6c4975.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/smoothstep/6c4975.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/smoothstep/6c4975.wgsl.expected.msl b/test/tint/builtins/gen/literal/smoothstep/6c4975.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/smoothstep/6c4975.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/smoothstep/6c4975.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/smoothstep/6c4975.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/smoothstep/6c4975.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/smoothstep/6c4975.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/smoothstep/6c4975.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/smoothstep/6c4975.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/smoothstep/6c4975.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/smoothstep/6c4975.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/smoothstep/6c4975.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/smoothstep/aad1db.wgsl b/test/tint/builtins/gen/literal/smoothstep/aad1db.wgsl
similarity index 96%
rename from test/tint/builtins/gen/smoothstep/aad1db.wgsl
rename to test/tint/builtins/gen/literal/smoothstep/aad1db.wgsl
index a3960d6d26..8be3f55705 100644
--- a/test/tint/builtins/gen/smoothstep/aad1db.wgsl
+++ b/test/tint/builtins/gen/literal/smoothstep/aad1db.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/smoothstep/aad1db.wgsl.expected.glsl b/test/tint/builtins/gen/literal/smoothstep/aad1db.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/smoothstep/aad1db.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/smoothstep/aad1db.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/smoothstep/aad1db.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/smoothstep/aad1db.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/smoothstep/aad1db.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/smoothstep/aad1db.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/smoothstep/aad1db.wgsl.expected.msl b/test/tint/builtins/gen/literal/smoothstep/aad1db.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/smoothstep/aad1db.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/smoothstep/aad1db.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/smoothstep/aad1db.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/smoothstep/aad1db.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/smoothstep/aad1db.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/smoothstep/aad1db.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/smoothstep/aad1db.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/smoothstep/aad1db.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/smoothstep/aad1db.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/smoothstep/aad1db.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/smoothstep/c11eef.wgsl b/test/tint/builtins/gen/literal/smoothstep/c11eef.wgsl
similarity index 100%
rename from test/tint/builtins/gen/smoothstep/c11eef.wgsl
rename to test/tint/builtins/gen/literal/smoothstep/c11eef.wgsl
diff --git a/test/tint/builtins/gen/smoothstep/c11eef.wgsl.expected.glsl b/test/tint/builtins/gen/literal/smoothstep/c11eef.wgsl.expected.glsl
similarity index 92%
rename from test/tint/builtins/gen/smoothstep/c11eef.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/smoothstep/c11eef.wgsl.expected.glsl
index f81ae7f463..38c8c76a53 100644
--- a/test/tint/builtins/gen/smoothstep/c11eef.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/smoothstep/c11eef.wgsl.expected.glsl
@@ -1,4 +1,4 @@
-builtins/gen/smoothstep/c11eef.wgsl:28:24 warning: use of deprecated builtin
+builtins/gen/literal/smoothstep/c11eef.wgsl:28:24 warning: use of deprecated builtin
   var res: vec2<f32> = smoothStep(vec2<f32>(), vec2<f32>(), vec2<f32>());
                        ^^^^^^^^^^
 
diff --git a/test/tint/builtins/gen/smoothstep/c11eef.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/smoothstep/c11eef.wgsl.expected.hlsl
similarity index 88%
rename from test/tint/builtins/gen/smoothstep/c11eef.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/smoothstep/c11eef.wgsl.expected.hlsl
index 15fe54d12e..3a932fe3f7 100644
--- a/test/tint/builtins/gen/smoothstep/c11eef.wgsl.expected.hlsl
+++ b/test/tint/builtins/gen/literal/smoothstep/c11eef.wgsl.expected.hlsl
@@ -1,4 +1,4 @@
-builtins/gen/smoothstep/c11eef.wgsl:28:24 warning: use of deprecated builtin
+builtins/gen/literal/smoothstep/c11eef.wgsl:28:24 warning: use of deprecated builtin
   var res: vec2<f32> = smoothStep(vec2<f32>(), vec2<f32>(), vec2<f32>());
                        ^^^^^^^^^^
 
diff --git a/test/tint/builtins/gen/smoothstep/c11eef.wgsl.expected.msl b/test/tint/builtins/gen/literal/smoothstep/c11eef.wgsl.expected.msl
similarity index 89%
rename from test/tint/builtins/gen/smoothstep/c11eef.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/smoothstep/c11eef.wgsl.expected.msl
index ed1317d002..c705e543cd 100644
--- a/test/tint/builtins/gen/smoothstep/c11eef.wgsl.expected.msl
+++ b/test/tint/builtins/gen/literal/smoothstep/c11eef.wgsl.expected.msl
@@ -1,4 +1,4 @@
-builtins/gen/smoothstep/c11eef.wgsl:28:24 warning: use of deprecated builtin
+builtins/gen/literal/smoothstep/c11eef.wgsl:28:24 warning: use of deprecated builtin
   var res: vec2<f32> = smoothStep(vec2<f32>(), vec2<f32>(), vec2<f32>());
                        ^^^^^^^^^^
 
diff --git a/test/tint/builtins/gen/smoothstep/c11eef.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/smoothstep/c11eef.wgsl.expected.spvasm
similarity index 97%
rename from test/tint/builtins/gen/smoothstep/c11eef.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/smoothstep/c11eef.wgsl.expected.spvasm
index 3bdb215c80..9220aeccd7 100644
--- a/test/tint/builtins/gen/smoothstep/c11eef.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/smoothstep/c11eef.wgsl.expected.spvasm
@@ -1,4 +1,4 @@
-builtins/gen/smoothstep/c11eef.wgsl:28:24 warning: use of deprecated builtin
+builtins/gen/literal/smoothstep/c11eef.wgsl:28:24 warning: use of deprecated builtin
   var res: vec2<f32> = smoothStep(vec2<f32>(), vec2<f32>(), vec2<f32>());
                        ^^^^^^^^^^
 
diff --git a/test/tint/builtins/gen/smoothstep/c11eef.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/smoothstep/c11eef.wgsl.expected.wgsl
similarity index 84%
rename from test/tint/builtins/gen/smoothstep/c11eef.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/smoothstep/c11eef.wgsl.expected.wgsl
index c390acb4f5..00193102be 100644
--- a/test/tint/builtins/gen/smoothstep/c11eef.wgsl.expected.wgsl
+++ b/test/tint/builtins/gen/literal/smoothstep/c11eef.wgsl.expected.wgsl
@@ -1,4 +1,4 @@
-builtins/gen/smoothstep/c11eef.wgsl:28:24 warning: use of deprecated builtin
+builtins/gen/literal/smoothstep/c11eef.wgsl:28:24 warning: use of deprecated builtin
   var res: vec2<f32> = smoothStep(vec2<f32>(), vec2<f32>(), vec2<f32>());
                        ^^^^^^^^^^
 
diff --git a/test/tint/builtins/gen/smoothstep/cb0bfb.wgsl b/test/tint/builtins/gen/literal/smoothstep/cb0bfb.wgsl
similarity index 100%
rename from test/tint/builtins/gen/smoothstep/cb0bfb.wgsl
rename to test/tint/builtins/gen/literal/smoothstep/cb0bfb.wgsl
diff --git a/test/tint/builtins/gen/smoothstep/cb0bfb.wgsl.expected.glsl b/test/tint/builtins/gen/literal/smoothstep/cb0bfb.wgsl.expected.glsl
similarity index 91%
rename from test/tint/builtins/gen/smoothstep/cb0bfb.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/smoothstep/cb0bfb.wgsl.expected.glsl
index 05627a1f96..ed815ff525 100644
--- a/test/tint/builtins/gen/smoothstep/cb0bfb.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/smoothstep/cb0bfb.wgsl.expected.glsl
@@ -1,4 +1,4 @@
-builtins/gen/smoothstep/cb0bfb.wgsl:28:18 warning: use of deprecated builtin
+builtins/gen/literal/smoothstep/cb0bfb.wgsl:28:18 warning: use of deprecated builtin
   var res: f32 = smoothStep(1.0, 1.0, 1.0);
                  ^^^^^^^^^^
 
diff --git a/test/tint/builtins/gen/smoothstep/cb0bfb.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/smoothstep/cb0bfb.wgsl.expected.hlsl
similarity index 87%
rename from test/tint/builtins/gen/smoothstep/cb0bfb.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/smoothstep/cb0bfb.wgsl.expected.hlsl
index 96f8e7dd7f..55e794bcf2 100644
--- a/test/tint/builtins/gen/smoothstep/cb0bfb.wgsl.expected.hlsl
+++ b/test/tint/builtins/gen/literal/smoothstep/cb0bfb.wgsl.expected.hlsl
@@ -1,4 +1,4 @@
-builtins/gen/smoothstep/cb0bfb.wgsl:28:18 warning: use of deprecated builtin
+builtins/gen/literal/smoothstep/cb0bfb.wgsl:28:18 warning: use of deprecated builtin
   var res: f32 = smoothStep(1.0, 1.0, 1.0);
                  ^^^^^^^^^^
 
diff --git a/test/tint/builtins/gen/smoothstep/cb0bfb.wgsl.expected.msl b/test/tint/builtins/gen/literal/smoothstep/cb0bfb.wgsl.expected.msl
similarity index 88%
rename from test/tint/builtins/gen/smoothstep/cb0bfb.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/smoothstep/cb0bfb.wgsl.expected.msl
index 4f835bc778..ae8ef1286d 100644
--- a/test/tint/builtins/gen/smoothstep/cb0bfb.wgsl.expected.msl
+++ b/test/tint/builtins/gen/literal/smoothstep/cb0bfb.wgsl.expected.msl
@@ -1,4 +1,4 @@
-builtins/gen/smoothstep/cb0bfb.wgsl:28:18 warning: use of deprecated builtin
+builtins/gen/literal/smoothstep/cb0bfb.wgsl:28:18 warning: use of deprecated builtin
   var res: f32 = smoothStep(1.0, 1.0, 1.0);
                  ^^^^^^^^^^
 
diff --git a/test/tint/builtins/gen/smoothstep/cb0bfb.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/smoothstep/cb0bfb.wgsl.expected.spvasm
similarity index 97%
rename from test/tint/builtins/gen/smoothstep/cb0bfb.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/smoothstep/cb0bfb.wgsl.expected.spvasm
index 6286bc5a7a..1e46e2db44 100644
--- a/test/tint/builtins/gen/smoothstep/cb0bfb.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/smoothstep/cb0bfb.wgsl.expected.spvasm
@@ -1,4 +1,4 @@
-builtins/gen/smoothstep/cb0bfb.wgsl:28:18 warning: use of deprecated builtin
+builtins/gen/literal/smoothstep/cb0bfb.wgsl:28:18 warning: use of deprecated builtin
   var res: f32 = smoothStep(1.0, 1.0, 1.0);
                  ^^^^^^^^^^
 
diff --git a/test/tint/builtins/gen/smoothstep/cb0bfb.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/smoothstep/cb0bfb.wgsl.expected.wgsl
similarity index 82%
rename from test/tint/builtins/gen/smoothstep/cb0bfb.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/smoothstep/cb0bfb.wgsl.expected.wgsl
index d75d5f3801..cfa44d362b 100644
--- a/test/tint/builtins/gen/smoothstep/cb0bfb.wgsl.expected.wgsl
+++ b/test/tint/builtins/gen/literal/smoothstep/cb0bfb.wgsl.expected.wgsl
@@ -1,4 +1,4 @@
-builtins/gen/smoothstep/cb0bfb.wgsl:28:18 warning: use of deprecated builtin
+builtins/gen/literal/smoothstep/cb0bfb.wgsl:28:18 warning: use of deprecated builtin
   var res: f32 = smoothStep(1.0, 1.0, 1.0);
                  ^^^^^^^^^^
 
diff --git a/test/tint/builtins/gen/sqrt/20c74e.wgsl b/test/tint/builtins/gen/literal/sqrt/20c74e.wgsl
similarity index 96%
rename from test/tint/builtins/gen/sqrt/20c74e.wgsl
rename to test/tint/builtins/gen/literal/sqrt/20c74e.wgsl
index 50d97173bb..b99db85248 100644
--- a/test/tint/builtins/gen/sqrt/20c74e.wgsl
+++ b/test/tint/builtins/gen/literal/sqrt/20c74e.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/sqrt/20c74e.wgsl.expected.glsl b/test/tint/builtins/gen/literal/sqrt/20c74e.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/sqrt/20c74e.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/sqrt/20c74e.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/sqrt/20c74e.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/sqrt/20c74e.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/sqrt/20c74e.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/sqrt/20c74e.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/sqrt/20c74e.wgsl.expected.msl b/test/tint/builtins/gen/literal/sqrt/20c74e.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/sqrt/20c74e.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/sqrt/20c74e.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/sqrt/20c74e.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/sqrt/20c74e.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/sqrt/20c74e.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/sqrt/20c74e.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/sqrt/20c74e.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/sqrt/20c74e.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/sqrt/20c74e.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/sqrt/20c74e.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/sqrt/8c7024.wgsl b/test/tint/builtins/gen/literal/sqrt/8c7024.wgsl
similarity index 96%
rename from test/tint/builtins/gen/sqrt/8c7024.wgsl
rename to test/tint/builtins/gen/literal/sqrt/8c7024.wgsl
index d2d31e7f35..006206931b 100644
--- a/test/tint/builtins/gen/sqrt/8c7024.wgsl
+++ b/test/tint/builtins/gen/literal/sqrt/8c7024.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/sqrt/8c7024.wgsl.expected.glsl b/test/tint/builtins/gen/literal/sqrt/8c7024.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/sqrt/8c7024.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/sqrt/8c7024.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/sqrt/8c7024.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/sqrt/8c7024.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/sqrt/8c7024.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/sqrt/8c7024.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/sqrt/8c7024.wgsl.expected.msl b/test/tint/builtins/gen/literal/sqrt/8c7024.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/sqrt/8c7024.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/sqrt/8c7024.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/sqrt/8c7024.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/sqrt/8c7024.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/sqrt/8c7024.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/sqrt/8c7024.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/sqrt/8c7024.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/sqrt/8c7024.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/sqrt/8c7024.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/sqrt/8c7024.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/sqrt/aa0d7a.wgsl b/test/tint/builtins/gen/literal/sqrt/aa0d7a.wgsl
similarity index 96%
rename from test/tint/builtins/gen/sqrt/aa0d7a.wgsl
rename to test/tint/builtins/gen/literal/sqrt/aa0d7a.wgsl
index 5cbb2c32e5..d28e561d4d 100644
--- a/test/tint/builtins/gen/sqrt/aa0d7a.wgsl
+++ b/test/tint/builtins/gen/literal/sqrt/aa0d7a.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/sqrt/aa0d7a.wgsl.expected.glsl b/test/tint/builtins/gen/literal/sqrt/aa0d7a.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/sqrt/aa0d7a.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/sqrt/aa0d7a.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/sqrt/aa0d7a.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/sqrt/aa0d7a.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/sqrt/aa0d7a.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/sqrt/aa0d7a.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/sqrt/aa0d7a.wgsl.expected.msl b/test/tint/builtins/gen/literal/sqrt/aa0d7a.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/sqrt/aa0d7a.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/sqrt/aa0d7a.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/sqrt/aa0d7a.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/sqrt/aa0d7a.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/sqrt/aa0d7a.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/sqrt/aa0d7a.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/sqrt/aa0d7a.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/sqrt/aa0d7a.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/sqrt/aa0d7a.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/sqrt/aa0d7a.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/sqrt/f8c59a.wgsl b/test/tint/builtins/gen/literal/sqrt/f8c59a.wgsl
similarity index 96%
rename from test/tint/builtins/gen/sqrt/f8c59a.wgsl
rename to test/tint/builtins/gen/literal/sqrt/f8c59a.wgsl
index 82edecb7a0..11ea95ce92 100644
--- a/test/tint/builtins/gen/sqrt/f8c59a.wgsl
+++ b/test/tint/builtins/gen/literal/sqrt/f8c59a.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/sqrt/f8c59a.wgsl.expected.glsl b/test/tint/builtins/gen/literal/sqrt/f8c59a.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/sqrt/f8c59a.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/sqrt/f8c59a.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/sqrt/f8c59a.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/sqrt/f8c59a.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/sqrt/f8c59a.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/sqrt/f8c59a.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/sqrt/f8c59a.wgsl.expected.msl b/test/tint/builtins/gen/literal/sqrt/f8c59a.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/sqrt/f8c59a.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/sqrt/f8c59a.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/sqrt/f8c59a.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/sqrt/f8c59a.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/sqrt/f8c59a.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/sqrt/f8c59a.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/sqrt/f8c59a.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/sqrt/f8c59a.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/sqrt/f8c59a.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/sqrt/f8c59a.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/step/0b073b.wgsl b/test/tint/builtins/gen/literal/step/0b073b.wgsl
similarity index 96%
rename from test/tint/builtins/gen/step/0b073b.wgsl
rename to test/tint/builtins/gen/literal/step/0b073b.wgsl
index e90d956e3b..c143dd8bac 100644
--- a/test/tint/builtins/gen/step/0b073b.wgsl
+++ b/test/tint/builtins/gen/literal/step/0b073b.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/step/0b073b.wgsl.expected.glsl b/test/tint/builtins/gen/literal/step/0b073b.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/step/0b073b.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/step/0b073b.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/step/0b073b.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/step/0b073b.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/step/0b073b.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/step/0b073b.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/step/0b073b.wgsl.expected.msl b/test/tint/builtins/gen/literal/step/0b073b.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/step/0b073b.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/step/0b073b.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/step/0b073b.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/step/0b073b.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/step/0b073b.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/step/0b073b.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/step/0b073b.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/step/0b073b.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/step/0b073b.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/step/0b073b.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/step/19accd.wgsl b/test/tint/builtins/gen/literal/step/19accd.wgsl
similarity index 96%
rename from test/tint/builtins/gen/step/19accd.wgsl
rename to test/tint/builtins/gen/literal/step/19accd.wgsl
index 9f54581a1e..10741be58f 100644
--- a/test/tint/builtins/gen/step/19accd.wgsl
+++ b/test/tint/builtins/gen/literal/step/19accd.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/step/19accd.wgsl.expected.glsl b/test/tint/builtins/gen/literal/step/19accd.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/step/19accd.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/step/19accd.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/step/19accd.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/step/19accd.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/step/19accd.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/step/19accd.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/step/19accd.wgsl.expected.msl b/test/tint/builtins/gen/literal/step/19accd.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/step/19accd.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/step/19accd.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/step/19accd.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/step/19accd.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/step/19accd.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/step/19accd.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/step/19accd.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/step/19accd.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/step/19accd.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/step/19accd.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/step/334303.wgsl b/test/tint/builtins/gen/literal/step/334303.wgsl
similarity index 96%
rename from test/tint/builtins/gen/step/334303.wgsl
rename to test/tint/builtins/gen/literal/step/334303.wgsl
index 922ffb19fa..4643f33c7b 100644
--- a/test/tint/builtins/gen/step/334303.wgsl
+++ b/test/tint/builtins/gen/literal/step/334303.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/step/334303.wgsl.expected.glsl b/test/tint/builtins/gen/literal/step/334303.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/step/334303.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/step/334303.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/step/334303.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/step/334303.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/step/334303.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/step/334303.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/step/334303.wgsl.expected.msl b/test/tint/builtins/gen/literal/step/334303.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/step/334303.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/step/334303.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/step/334303.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/step/334303.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/step/334303.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/step/334303.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/step/334303.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/step/334303.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/step/334303.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/step/334303.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/step/e2b337.wgsl b/test/tint/builtins/gen/literal/step/e2b337.wgsl
similarity index 96%
rename from test/tint/builtins/gen/step/e2b337.wgsl
rename to test/tint/builtins/gen/literal/step/e2b337.wgsl
index 218fde588e..41cff04e25 100644
--- a/test/tint/builtins/gen/step/e2b337.wgsl
+++ b/test/tint/builtins/gen/literal/step/e2b337.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/step/e2b337.wgsl.expected.glsl b/test/tint/builtins/gen/literal/step/e2b337.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/step/e2b337.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/step/e2b337.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/step/e2b337.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/step/e2b337.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/step/e2b337.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/step/e2b337.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/step/e2b337.wgsl.expected.msl b/test/tint/builtins/gen/literal/step/e2b337.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/step/e2b337.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/step/e2b337.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/step/e2b337.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/step/e2b337.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/step/e2b337.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/step/e2b337.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/step/e2b337.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/step/e2b337.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/step/e2b337.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/step/e2b337.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/storageBarrier/d87211.wgsl b/test/tint/builtins/gen/literal/storageBarrier/d87211.wgsl
similarity index 96%
rename from test/tint/builtins/gen/storageBarrier/d87211.wgsl
rename to test/tint/builtins/gen/literal/storageBarrier/d87211.wgsl
index b98fa8c06c..5306f6c3bc 100644
--- a/test/tint/builtins/gen/storageBarrier/d87211.wgsl
+++ b/test/tint/builtins/gen/literal/storageBarrier/d87211.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/storageBarrier/d87211.wgsl.expected.glsl b/test/tint/builtins/gen/literal/storageBarrier/d87211.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/storageBarrier/d87211.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/storageBarrier/d87211.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/storageBarrier/d87211.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/storageBarrier/d87211.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/storageBarrier/d87211.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/storageBarrier/d87211.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/storageBarrier/d87211.wgsl.expected.msl b/test/tint/builtins/gen/literal/storageBarrier/d87211.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/storageBarrier/d87211.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/storageBarrier/d87211.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/storageBarrier/d87211.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/storageBarrier/d87211.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/storageBarrier/d87211.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/storageBarrier/d87211.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/storageBarrier/d87211.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/storageBarrier/d87211.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/storageBarrier/d87211.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/storageBarrier/d87211.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/tan/244e2a.wgsl b/test/tint/builtins/gen/literal/tan/244e2a.wgsl
similarity index 96%
rename from test/tint/builtins/gen/tan/244e2a.wgsl
rename to test/tint/builtins/gen/literal/tan/244e2a.wgsl
index 2d61b0e142..f9920e7a73 100644
--- a/test/tint/builtins/gen/tan/244e2a.wgsl
+++ b/test/tint/builtins/gen/literal/tan/244e2a.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/tan/244e2a.wgsl.expected.glsl b/test/tint/builtins/gen/literal/tan/244e2a.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/tan/244e2a.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/tan/244e2a.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/tan/244e2a.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/tan/244e2a.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/tan/244e2a.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/tan/244e2a.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/tan/244e2a.wgsl.expected.msl b/test/tint/builtins/gen/literal/tan/244e2a.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/tan/244e2a.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/tan/244e2a.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/tan/244e2a.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/tan/244e2a.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/tan/244e2a.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/tan/244e2a.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/tan/244e2a.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/tan/244e2a.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/tan/244e2a.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/tan/244e2a.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/tan/2f030e.wgsl b/test/tint/builtins/gen/literal/tan/2f030e.wgsl
similarity index 96%
rename from test/tint/builtins/gen/tan/2f030e.wgsl
rename to test/tint/builtins/gen/literal/tan/2f030e.wgsl
index b5b038ad4d..39c06f5ae5 100644
--- a/test/tint/builtins/gen/tan/2f030e.wgsl
+++ b/test/tint/builtins/gen/literal/tan/2f030e.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/tan/2f030e.wgsl.expected.glsl b/test/tint/builtins/gen/literal/tan/2f030e.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/tan/2f030e.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/tan/2f030e.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/tan/2f030e.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/tan/2f030e.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/tan/2f030e.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/tan/2f030e.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/tan/2f030e.wgsl.expected.msl b/test/tint/builtins/gen/literal/tan/2f030e.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/tan/2f030e.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/tan/2f030e.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/tan/2f030e.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/tan/2f030e.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/tan/2f030e.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/tan/2f030e.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/tan/2f030e.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/tan/2f030e.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/tan/2f030e.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/tan/2f030e.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/tan/7ea104.wgsl b/test/tint/builtins/gen/literal/tan/7ea104.wgsl
similarity index 96%
rename from test/tint/builtins/gen/tan/7ea104.wgsl
rename to test/tint/builtins/gen/literal/tan/7ea104.wgsl
index 1a2554758f..4ed0b9be95 100644
--- a/test/tint/builtins/gen/tan/7ea104.wgsl
+++ b/test/tint/builtins/gen/literal/tan/7ea104.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/tan/7ea104.wgsl.expected.glsl b/test/tint/builtins/gen/literal/tan/7ea104.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/tan/7ea104.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/tan/7ea104.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/tan/7ea104.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/tan/7ea104.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/tan/7ea104.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/tan/7ea104.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/tan/7ea104.wgsl.expected.msl b/test/tint/builtins/gen/literal/tan/7ea104.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/tan/7ea104.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/tan/7ea104.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/tan/7ea104.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/tan/7ea104.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/tan/7ea104.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/tan/7ea104.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/tan/7ea104.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/tan/7ea104.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/tan/7ea104.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/tan/7ea104.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/tan/8ce3e9.wgsl b/test/tint/builtins/gen/literal/tan/8ce3e9.wgsl
similarity index 96%
rename from test/tint/builtins/gen/tan/8ce3e9.wgsl
rename to test/tint/builtins/gen/literal/tan/8ce3e9.wgsl
index ec2ff093b3..3c587aa834 100644
--- a/test/tint/builtins/gen/tan/8ce3e9.wgsl
+++ b/test/tint/builtins/gen/literal/tan/8ce3e9.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/tan/8ce3e9.wgsl.expected.glsl b/test/tint/builtins/gen/literal/tan/8ce3e9.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/tan/8ce3e9.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/tan/8ce3e9.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/tan/8ce3e9.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/tan/8ce3e9.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/tan/8ce3e9.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/tan/8ce3e9.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/tan/8ce3e9.wgsl.expected.msl b/test/tint/builtins/gen/literal/tan/8ce3e9.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/tan/8ce3e9.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/tan/8ce3e9.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/tan/8ce3e9.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/tan/8ce3e9.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/tan/8ce3e9.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/tan/8ce3e9.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/tan/8ce3e9.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/tan/8ce3e9.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/tan/8ce3e9.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/tan/8ce3e9.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/tanh/5663c5.wgsl b/test/tint/builtins/gen/literal/tanh/5663c5.wgsl
similarity index 96%
rename from test/tint/builtins/gen/tanh/5663c5.wgsl
rename to test/tint/builtins/gen/literal/tanh/5663c5.wgsl
index d8b3708273..3f88d44780 100644
--- a/test/tint/builtins/gen/tanh/5663c5.wgsl
+++ b/test/tint/builtins/gen/literal/tanh/5663c5.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/tanh/5663c5.wgsl.expected.glsl b/test/tint/builtins/gen/literal/tanh/5663c5.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/tanh/5663c5.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/tanh/5663c5.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/tanh/5663c5.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/tanh/5663c5.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/tanh/5663c5.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/tanh/5663c5.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/tanh/5663c5.wgsl.expected.msl b/test/tint/builtins/gen/literal/tanh/5663c5.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/tanh/5663c5.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/tanh/5663c5.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/tanh/5663c5.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/tanh/5663c5.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/tanh/5663c5.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/tanh/5663c5.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/tanh/5663c5.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/tanh/5663c5.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/tanh/5663c5.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/tanh/5663c5.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/tanh/5724b3.wgsl b/test/tint/builtins/gen/literal/tanh/5724b3.wgsl
similarity index 96%
rename from test/tint/builtins/gen/tanh/5724b3.wgsl
rename to test/tint/builtins/gen/literal/tanh/5724b3.wgsl
index 0a184d2360..8715b26e04 100644
--- a/test/tint/builtins/gen/tanh/5724b3.wgsl
+++ b/test/tint/builtins/gen/literal/tanh/5724b3.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/tanh/5724b3.wgsl.expected.glsl b/test/tint/builtins/gen/literal/tanh/5724b3.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/tanh/5724b3.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/tanh/5724b3.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/tanh/5724b3.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/tanh/5724b3.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/tanh/5724b3.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/tanh/5724b3.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/tanh/5724b3.wgsl.expected.msl b/test/tint/builtins/gen/literal/tanh/5724b3.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/tanh/5724b3.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/tanh/5724b3.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/tanh/5724b3.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/tanh/5724b3.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/tanh/5724b3.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/tanh/5724b3.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/tanh/5724b3.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/tanh/5724b3.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/tanh/5724b3.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/tanh/5724b3.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/tanh/9f9fb9.wgsl b/test/tint/builtins/gen/literal/tanh/9f9fb9.wgsl
similarity index 96%
rename from test/tint/builtins/gen/tanh/9f9fb9.wgsl
rename to test/tint/builtins/gen/literal/tanh/9f9fb9.wgsl
index 861bf41388..7602a18694 100644
--- a/test/tint/builtins/gen/tanh/9f9fb9.wgsl
+++ b/test/tint/builtins/gen/literal/tanh/9f9fb9.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/tanh/9f9fb9.wgsl.expected.glsl b/test/tint/builtins/gen/literal/tanh/9f9fb9.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/tanh/9f9fb9.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/tanh/9f9fb9.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/tanh/9f9fb9.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/tanh/9f9fb9.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/tanh/9f9fb9.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/tanh/9f9fb9.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/tanh/9f9fb9.wgsl.expected.msl b/test/tint/builtins/gen/literal/tanh/9f9fb9.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/tanh/9f9fb9.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/tanh/9f9fb9.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/tanh/9f9fb9.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/tanh/9f9fb9.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/tanh/9f9fb9.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/tanh/9f9fb9.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/tanh/9f9fb9.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/tanh/9f9fb9.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/tanh/9f9fb9.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/tanh/9f9fb9.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/tanh/c15fdb.wgsl b/test/tint/builtins/gen/literal/tanh/c15fdb.wgsl
similarity index 96%
rename from test/tint/builtins/gen/tanh/c15fdb.wgsl
rename to test/tint/builtins/gen/literal/tanh/c15fdb.wgsl
index 35b0597a79..f83b8419d8 100644
--- a/test/tint/builtins/gen/tanh/c15fdb.wgsl
+++ b/test/tint/builtins/gen/literal/tanh/c15fdb.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/tanh/c15fdb.wgsl.expected.glsl b/test/tint/builtins/gen/literal/tanh/c15fdb.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/tanh/c15fdb.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/tanh/c15fdb.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/tanh/c15fdb.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/tanh/c15fdb.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/tanh/c15fdb.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/tanh/c15fdb.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/tanh/c15fdb.wgsl.expected.msl b/test/tint/builtins/gen/literal/tanh/c15fdb.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/tanh/c15fdb.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/tanh/c15fdb.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/tanh/c15fdb.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/tanh/c15fdb.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/tanh/c15fdb.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/tanh/c15fdb.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/tanh/c15fdb.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/tanh/c15fdb.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/tanh/c15fdb.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/tanh/c15fdb.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/textureDimensions/002b2a.wgsl b/test/tint/builtins/gen/literal/textureDimensions/002b2a.wgsl
similarity index 97%
rename from test/tint/builtins/gen/textureDimensions/002b2a.wgsl
rename to test/tint/builtins/gen/literal/textureDimensions/002b2a.wgsl
index 3edc18bd1b..b93721f74c 100644
--- a/test/tint/builtins/gen/textureDimensions/002b2a.wgsl
+++ b/test/tint/builtins/gen/literal/textureDimensions/002b2a.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/textureDimensions/002b2a.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureDimensions/002b2a.wgsl.expected.glsl
similarity index 97%
rename from test/tint/builtins/gen/textureDimensions/002b2a.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/textureDimensions/002b2a.wgsl.expected.glsl
index d2663c5d59..9ee3490e43 100644
--- a/test/tint/builtins/gen/textureDimensions/002b2a.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureDimensions/002b2a.wgsl.expected.glsl
@@ -9,7 +9,7 @@ void textureDimensions_002b2a() {
 
 vec4 vertex_main() {
   textureDimensions_002b2a();
-  return vec4(0.0f, 0.0f, 0.0f, 0.0f);
+  return vec4(0.0f);
 }
 
 void main() {
diff --git a/test/tint/builtins/gen/textureDimensions/002b2a.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/textureDimensions/002b2a.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/002b2a.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/textureDimensions/002b2a.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/textureDimensions/002b2a.wgsl.expected.msl b/test/tint/builtins/gen/literal/textureDimensions/002b2a.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/002b2a.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/textureDimensions/002b2a.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/textureDimensions/002b2a.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureDimensions/002b2a.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/002b2a.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/textureDimensions/002b2a.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/textureDimensions/002b2a.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/textureDimensions/002b2a.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/002b2a.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/textureDimensions/002b2a.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/textureDimensions/012b82.wgsl b/test/tint/builtins/gen/literal/textureDimensions/012b82.wgsl
similarity index 97%
rename from test/tint/builtins/gen/textureDimensions/012b82.wgsl
rename to test/tint/builtins/gen/literal/textureDimensions/012b82.wgsl
index af04cf494a..d011596a67 100644
--- a/test/tint/builtins/gen/textureDimensions/012b82.wgsl
+++ b/test/tint/builtins/gen/literal/textureDimensions/012b82.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/textureDimensions/012b82.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureDimensions/012b82.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/012b82.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/textureDimensions/012b82.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/textureDimensions/012b82.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/textureDimensions/012b82.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/012b82.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/textureDimensions/012b82.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/textureDimensions/012b82.wgsl.expected.msl b/test/tint/builtins/gen/literal/textureDimensions/012b82.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/012b82.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/textureDimensions/012b82.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/textureDimensions/012b82.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureDimensions/012b82.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/012b82.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/textureDimensions/012b82.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/textureDimensions/012b82.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/textureDimensions/012b82.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/012b82.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/textureDimensions/012b82.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/textureDimensions/08753d.wgsl b/test/tint/builtins/gen/literal/textureDimensions/08753d.wgsl
similarity index 97%
rename from test/tint/builtins/gen/textureDimensions/08753d.wgsl
rename to test/tint/builtins/gen/literal/textureDimensions/08753d.wgsl
index e012e2c50f..4e071a0b4f 100644
--- a/test/tint/builtins/gen/textureDimensions/08753d.wgsl
+++ b/test/tint/builtins/gen/literal/textureDimensions/08753d.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/textureDimensions/08753d.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureDimensions/08753d.wgsl.expected.glsl
similarity index 97%
rename from test/tint/builtins/gen/textureDimensions/08753d.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/textureDimensions/08753d.wgsl.expected.glsl
index 9f92f84227..0b0f9e39c8 100644
--- a/test/tint/builtins/gen/textureDimensions/08753d.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureDimensions/08753d.wgsl.expected.glsl
@@ -9,7 +9,7 @@ void textureDimensions_08753d() {
 
 vec4 vertex_main() {
   textureDimensions_08753d();
-  return vec4(0.0f, 0.0f, 0.0f, 0.0f);
+  return vec4(0.0f);
 }
 
 void main() {
diff --git a/test/tint/builtins/gen/textureDimensions/08753d.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/textureDimensions/08753d.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/08753d.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/textureDimensions/08753d.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/textureDimensions/08753d.wgsl.expected.msl b/test/tint/builtins/gen/literal/textureDimensions/08753d.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/08753d.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/textureDimensions/08753d.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/textureDimensions/08753d.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureDimensions/08753d.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/08753d.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/textureDimensions/08753d.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/textureDimensions/08753d.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/textureDimensions/08753d.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/08753d.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/textureDimensions/08753d.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/textureDimensions/0c4772.wgsl b/test/tint/builtins/gen/literal/textureDimensions/0c4772.wgsl
similarity index 97%
rename from test/tint/builtins/gen/textureDimensions/0c4772.wgsl
rename to test/tint/builtins/gen/literal/textureDimensions/0c4772.wgsl
index 42af723c53..3acce510b9 100644
--- a/test/tint/builtins/gen/textureDimensions/0c4772.wgsl
+++ b/test/tint/builtins/gen/literal/textureDimensions/0c4772.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/textureDimensions/0c4772.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureDimensions/0c4772.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/0c4772.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/textureDimensions/0c4772.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/textureDimensions/0c4772.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/textureDimensions/0c4772.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/0c4772.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/textureDimensions/0c4772.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/textureDimensions/0c4772.wgsl.expected.msl b/test/tint/builtins/gen/literal/textureDimensions/0c4772.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/0c4772.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/textureDimensions/0c4772.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/textureDimensions/0c4772.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureDimensions/0c4772.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/0c4772.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/textureDimensions/0c4772.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/textureDimensions/0c4772.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/textureDimensions/0c4772.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/0c4772.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/textureDimensions/0c4772.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/textureDimensions/0cce40.wgsl b/test/tint/builtins/gen/literal/textureDimensions/0cce40.wgsl
similarity index 97%
rename from test/tint/builtins/gen/textureDimensions/0cce40.wgsl
rename to test/tint/builtins/gen/literal/textureDimensions/0cce40.wgsl
index cb527a915c..410f924b2b 100644
--- a/test/tint/builtins/gen/textureDimensions/0cce40.wgsl
+++ b/test/tint/builtins/gen/literal/textureDimensions/0cce40.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/textureDimensions/0cce40.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureDimensions/0cce40.wgsl.expected.glsl
similarity index 97%
rename from test/tint/builtins/gen/textureDimensions/0cce40.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/textureDimensions/0cce40.wgsl.expected.glsl
index 3e1b29face..a0df901a1e 100644
--- a/test/tint/builtins/gen/textureDimensions/0cce40.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureDimensions/0cce40.wgsl.expected.glsl
@@ -9,7 +9,7 @@ void textureDimensions_0cce40() {
 
 vec4 vertex_main() {
   textureDimensions_0cce40();
-  return vec4(0.0f, 0.0f, 0.0f, 0.0f);
+  return vec4(0.0f);
 }
 
 void main() {
diff --git a/test/tint/builtins/gen/textureDimensions/0cce40.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/textureDimensions/0cce40.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/0cce40.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/textureDimensions/0cce40.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/textureDimensions/0cce40.wgsl.expected.msl b/test/tint/builtins/gen/literal/textureDimensions/0cce40.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/0cce40.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/textureDimensions/0cce40.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/textureDimensions/0cce40.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureDimensions/0cce40.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/0cce40.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/textureDimensions/0cce40.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/textureDimensions/0cce40.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/textureDimensions/0cce40.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/0cce40.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/textureDimensions/0cce40.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/textureDimensions/0cf2ff.wgsl b/test/tint/builtins/gen/literal/textureDimensions/0cf2ff.wgsl
similarity index 97%
rename from test/tint/builtins/gen/textureDimensions/0cf2ff.wgsl
rename to test/tint/builtins/gen/literal/textureDimensions/0cf2ff.wgsl
index 738123f22b..4ca09283fc 100644
--- a/test/tint/builtins/gen/textureDimensions/0cf2ff.wgsl
+++ b/test/tint/builtins/gen/literal/textureDimensions/0cf2ff.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/textureDimensions/0cf2ff.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureDimensions/0cf2ff.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/0cf2ff.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/textureDimensions/0cf2ff.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/textureDimensions/0cf2ff.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/textureDimensions/0cf2ff.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/0cf2ff.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/textureDimensions/0cf2ff.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/textureDimensions/0cf2ff.wgsl.expected.msl b/test/tint/builtins/gen/literal/textureDimensions/0cf2ff.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/0cf2ff.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/textureDimensions/0cf2ff.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/textureDimensions/0cf2ff.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureDimensions/0cf2ff.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/0cf2ff.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/textureDimensions/0cf2ff.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/textureDimensions/0cf2ff.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/textureDimensions/0cf2ff.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/0cf2ff.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/textureDimensions/0cf2ff.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/textureDimensions/0d8b7e.wgsl b/test/tint/builtins/gen/literal/textureDimensions/0d8b7e.wgsl
similarity index 97%
rename from test/tint/builtins/gen/textureDimensions/0d8b7e.wgsl
rename to test/tint/builtins/gen/literal/textureDimensions/0d8b7e.wgsl
index 19b92f6a77..69277768d9 100644
--- a/test/tint/builtins/gen/textureDimensions/0d8b7e.wgsl
+++ b/test/tint/builtins/gen/literal/textureDimensions/0d8b7e.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/textureDimensions/0d8b7e.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureDimensions/0d8b7e.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/0d8b7e.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/textureDimensions/0d8b7e.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/textureDimensions/0d8b7e.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/textureDimensions/0d8b7e.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/0d8b7e.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/textureDimensions/0d8b7e.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/textureDimensions/0d8b7e.wgsl.expected.msl b/test/tint/builtins/gen/literal/textureDimensions/0d8b7e.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/0d8b7e.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/textureDimensions/0d8b7e.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/textureDimensions/0d8b7e.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureDimensions/0d8b7e.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/0d8b7e.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/textureDimensions/0d8b7e.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/textureDimensions/0d8b7e.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/textureDimensions/0d8b7e.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/0d8b7e.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/textureDimensions/0d8b7e.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/textureDimensions/0e32ee.wgsl b/test/tint/builtins/gen/literal/textureDimensions/0e32ee.wgsl
similarity index 97%
rename from test/tint/builtins/gen/textureDimensions/0e32ee.wgsl
rename to test/tint/builtins/gen/literal/textureDimensions/0e32ee.wgsl
index 8a368163fa..60d2aa3469 100644
--- a/test/tint/builtins/gen/textureDimensions/0e32ee.wgsl
+++ b/test/tint/builtins/gen/literal/textureDimensions/0e32ee.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/textureDimensions/0e32ee.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureDimensions/0e32ee.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/0e32ee.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/textureDimensions/0e32ee.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/textureDimensions/0e32ee.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/textureDimensions/0e32ee.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/0e32ee.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/textureDimensions/0e32ee.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/textureDimensions/0e32ee.wgsl.expected.msl b/test/tint/builtins/gen/literal/textureDimensions/0e32ee.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/0e32ee.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/textureDimensions/0e32ee.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/textureDimensions/0e32ee.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureDimensions/0e32ee.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/0e32ee.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/textureDimensions/0e32ee.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/textureDimensions/0e32ee.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/textureDimensions/0e32ee.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/0e32ee.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/textureDimensions/0e32ee.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/textureDimensions/0f3c50.wgsl b/test/tint/builtins/gen/literal/textureDimensions/0f3c50.wgsl
similarity index 97%
rename from test/tint/builtins/gen/textureDimensions/0f3c50.wgsl
rename to test/tint/builtins/gen/literal/textureDimensions/0f3c50.wgsl
index 17a8ef1599..c8010cbe59 100644
--- a/test/tint/builtins/gen/textureDimensions/0f3c50.wgsl
+++ b/test/tint/builtins/gen/literal/textureDimensions/0f3c50.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/textureDimensions/0f3c50.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureDimensions/0f3c50.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/0f3c50.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/textureDimensions/0f3c50.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/textureDimensions/0f3c50.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/textureDimensions/0f3c50.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/0f3c50.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/textureDimensions/0f3c50.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/textureDimensions/0f3c50.wgsl.expected.msl b/test/tint/builtins/gen/literal/textureDimensions/0f3c50.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/0f3c50.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/textureDimensions/0f3c50.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/textureDimensions/0f3c50.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureDimensions/0f3c50.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/0f3c50.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/textureDimensions/0f3c50.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/textureDimensions/0f3c50.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/textureDimensions/0f3c50.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/0f3c50.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/textureDimensions/0f3c50.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/textureDimensions/1191a5.wgsl b/test/tint/builtins/gen/literal/textureDimensions/1191a5.wgsl
similarity index 97%
rename from test/tint/builtins/gen/textureDimensions/1191a5.wgsl
rename to test/tint/builtins/gen/literal/textureDimensions/1191a5.wgsl
index ad3dab85c4..172d0496ae 100644
--- a/test/tint/builtins/gen/textureDimensions/1191a5.wgsl
+++ b/test/tint/builtins/gen/literal/textureDimensions/1191a5.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/textureDimensions/1191a5.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureDimensions/1191a5.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/1191a5.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/textureDimensions/1191a5.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/textureDimensions/1191a5.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/textureDimensions/1191a5.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/1191a5.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/textureDimensions/1191a5.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/textureDimensions/1191a5.wgsl.expected.msl b/test/tint/builtins/gen/literal/textureDimensions/1191a5.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/1191a5.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/textureDimensions/1191a5.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/textureDimensions/1191a5.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureDimensions/1191a5.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/1191a5.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/textureDimensions/1191a5.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/textureDimensions/1191a5.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/textureDimensions/1191a5.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/1191a5.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/textureDimensions/1191a5.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/textureDimensions/12c9bb.wgsl b/test/tint/builtins/gen/literal/textureDimensions/12c9bb.wgsl
similarity index 97%
rename from test/tint/builtins/gen/textureDimensions/12c9bb.wgsl
rename to test/tint/builtins/gen/literal/textureDimensions/12c9bb.wgsl
index f292f6dc55..582382ea2d 100644
--- a/test/tint/builtins/gen/textureDimensions/12c9bb.wgsl
+++ b/test/tint/builtins/gen/literal/textureDimensions/12c9bb.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/textureDimensions/12c9bb.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureDimensions/12c9bb.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/12c9bb.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/textureDimensions/12c9bb.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/textureDimensions/12c9bb.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/textureDimensions/12c9bb.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/12c9bb.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/textureDimensions/12c9bb.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/textureDimensions/12c9bb.wgsl.expected.msl b/test/tint/builtins/gen/literal/textureDimensions/12c9bb.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/12c9bb.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/textureDimensions/12c9bb.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/textureDimensions/12c9bb.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureDimensions/12c9bb.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/12c9bb.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/textureDimensions/12c9bb.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/textureDimensions/12c9bb.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/textureDimensions/12c9bb.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/12c9bb.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/textureDimensions/12c9bb.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/textureDimensions/147998.wgsl b/test/tint/builtins/gen/literal/textureDimensions/147998.wgsl
similarity index 97%
rename from test/tint/builtins/gen/textureDimensions/147998.wgsl
rename to test/tint/builtins/gen/literal/textureDimensions/147998.wgsl
index 5acc4c1536..17e2e21255 100644
--- a/test/tint/builtins/gen/textureDimensions/147998.wgsl
+++ b/test/tint/builtins/gen/literal/textureDimensions/147998.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/textureDimensions/147998.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureDimensions/147998.wgsl.expected.glsl
similarity index 97%
rename from test/tint/builtins/gen/textureDimensions/147998.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/textureDimensions/147998.wgsl.expected.glsl
index 077635f9a8..90d19e81e0 100644
--- a/test/tint/builtins/gen/textureDimensions/147998.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureDimensions/147998.wgsl.expected.glsl
@@ -9,7 +9,7 @@ void textureDimensions_147998() {
 
 vec4 vertex_main() {
   textureDimensions_147998();
-  return vec4(0.0f, 0.0f, 0.0f, 0.0f);
+  return vec4(0.0f);
 }
 
 void main() {
diff --git a/test/tint/builtins/gen/textureDimensions/147998.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/textureDimensions/147998.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/147998.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/textureDimensions/147998.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/textureDimensions/147998.wgsl.expected.msl b/test/tint/builtins/gen/literal/textureDimensions/147998.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/147998.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/textureDimensions/147998.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/textureDimensions/147998.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureDimensions/147998.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/147998.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/textureDimensions/147998.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/textureDimensions/147998.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/textureDimensions/147998.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/147998.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/textureDimensions/147998.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/textureDimensions/16036c.wgsl b/test/tint/builtins/gen/literal/textureDimensions/16036c.wgsl
similarity index 97%
rename from test/tint/builtins/gen/textureDimensions/16036c.wgsl
rename to test/tint/builtins/gen/literal/textureDimensions/16036c.wgsl
index dbaa1deb61..84ce99813b 100644
--- a/test/tint/builtins/gen/textureDimensions/16036c.wgsl
+++ b/test/tint/builtins/gen/literal/textureDimensions/16036c.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/textureDimensions/16036c.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureDimensions/16036c.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/16036c.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/textureDimensions/16036c.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/textureDimensions/16036c.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/textureDimensions/16036c.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/16036c.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/textureDimensions/16036c.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/textureDimensions/16036c.wgsl.expected.msl b/test/tint/builtins/gen/literal/textureDimensions/16036c.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/16036c.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/textureDimensions/16036c.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/textureDimensions/16036c.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureDimensions/16036c.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/16036c.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/textureDimensions/16036c.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/textureDimensions/16036c.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/textureDimensions/16036c.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/16036c.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/textureDimensions/16036c.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/textureDimensions/1b71f0.wgsl b/test/tint/builtins/gen/literal/textureDimensions/1b71f0.wgsl
similarity index 97%
rename from test/tint/builtins/gen/textureDimensions/1b71f0.wgsl
rename to test/tint/builtins/gen/literal/textureDimensions/1b71f0.wgsl
index daa39542b5..77f345dd70 100644
--- a/test/tint/builtins/gen/textureDimensions/1b71f0.wgsl
+++ b/test/tint/builtins/gen/literal/textureDimensions/1b71f0.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/textureDimensions/1b71f0.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureDimensions/1b71f0.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/1b71f0.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/textureDimensions/1b71f0.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/textureDimensions/1b71f0.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/textureDimensions/1b71f0.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/1b71f0.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/textureDimensions/1b71f0.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/textureDimensions/1b71f0.wgsl.expected.msl b/test/tint/builtins/gen/literal/textureDimensions/1b71f0.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/1b71f0.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/textureDimensions/1b71f0.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/textureDimensions/1b71f0.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureDimensions/1b71f0.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/1b71f0.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/textureDimensions/1b71f0.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/textureDimensions/1b71f0.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/textureDimensions/1b71f0.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/1b71f0.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/textureDimensions/1b71f0.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/textureDimensions/1d6c26.wgsl b/test/tint/builtins/gen/literal/textureDimensions/1d6c26.wgsl
similarity index 97%
rename from test/tint/builtins/gen/textureDimensions/1d6c26.wgsl
rename to test/tint/builtins/gen/literal/textureDimensions/1d6c26.wgsl
index 428f5ed009..0b5857db45 100644
--- a/test/tint/builtins/gen/textureDimensions/1d6c26.wgsl
+++ b/test/tint/builtins/gen/literal/textureDimensions/1d6c26.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/textureDimensions/1d6c26.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureDimensions/1d6c26.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/1d6c26.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/textureDimensions/1d6c26.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/textureDimensions/1d6c26.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/textureDimensions/1d6c26.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/1d6c26.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/textureDimensions/1d6c26.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/textureDimensions/1d6c26.wgsl.expected.msl b/test/tint/builtins/gen/literal/textureDimensions/1d6c26.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/1d6c26.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/textureDimensions/1d6c26.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/textureDimensions/1d6c26.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureDimensions/1d6c26.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/1d6c26.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/textureDimensions/1d6c26.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/textureDimensions/1d6c26.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/textureDimensions/1d6c26.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/1d6c26.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/textureDimensions/1d6c26.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/textureDimensions/1e9e39.wgsl b/test/tint/builtins/gen/literal/textureDimensions/1e9e39.wgsl
similarity index 97%
rename from test/tint/builtins/gen/textureDimensions/1e9e39.wgsl
rename to test/tint/builtins/gen/literal/textureDimensions/1e9e39.wgsl
index 17be4e0120..c40f9c0e1c 100644
--- a/test/tint/builtins/gen/textureDimensions/1e9e39.wgsl
+++ b/test/tint/builtins/gen/literal/textureDimensions/1e9e39.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/textureDimensions/1e9e39.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureDimensions/1e9e39.wgsl.expected.glsl
similarity index 97%
rename from test/tint/builtins/gen/textureDimensions/1e9e39.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/textureDimensions/1e9e39.wgsl.expected.glsl
index 8a9a8c804b..067bc8bce7 100644
--- a/test/tint/builtins/gen/textureDimensions/1e9e39.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureDimensions/1e9e39.wgsl.expected.glsl
@@ -9,7 +9,7 @@ void textureDimensions_1e9e39() {
 
 vec4 vertex_main() {
   textureDimensions_1e9e39();
-  return vec4(0.0f, 0.0f, 0.0f, 0.0f);
+  return vec4(0.0f);
 }
 
 void main() {
diff --git a/test/tint/builtins/gen/textureDimensions/1e9e39.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/textureDimensions/1e9e39.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/1e9e39.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/textureDimensions/1e9e39.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/textureDimensions/1e9e39.wgsl.expected.msl b/test/tint/builtins/gen/literal/textureDimensions/1e9e39.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/1e9e39.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/textureDimensions/1e9e39.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/textureDimensions/1e9e39.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureDimensions/1e9e39.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/1e9e39.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/textureDimensions/1e9e39.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/textureDimensions/1e9e39.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/textureDimensions/1e9e39.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/1e9e39.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/textureDimensions/1e9e39.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/textureDimensions/1f20c5.wgsl b/test/tint/builtins/gen/literal/textureDimensions/1f20c5.wgsl
similarity index 97%
rename from test/tint/builtins/gen/textureDimensions/1f20c5.wgsl
rename to test/tint/builtins/gen/literal/textureDimensions/1f20c5.wgsl
index 6598efbe51..8301b57d00 100644
--- a/test/tint/builtins/gen/textureDimensions/1f20c5.wgsl
+++ b/test/tint/builtins/gen/literal/textureDimensions/1f20c5.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/textureDimensions/1f20c5.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureDimensions/1f20c5.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/1f20c5.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/textureDimensions/1f20c5.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/textureDimensions/1f20c5.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/textureDimensions/1f20c5.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/1f20c5.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/textureDimensions/1f20c5.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/textureDimensions/1f20c5.wgsl.expected.msl b/test/tint/builtins/gen/literal/textureDimensions/1f20c5.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/1f20c5.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/textureDimensions/1f20c5.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/textureDimensions/1f20c5.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureDimensions/1f20c5.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/1f20c5.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/textureDimensions/1f20c5.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/textureDimensions/1f20c5.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/textureDimensions/1f20c5.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/1f20c5.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/textureDimensions/1f20c5.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/textureDimensions/214dd4.wgsl b/test/tint/builtins/gen/literal/textureDimensions/214dd4.wgsl
similarity index 97%
rename from test/tint/builtins/gen/textureDimensions/214dd4.wgsl
rename to test/tint/builtins/gen/literal/textureDimensions/214dd4.wgsl
index b462c702c0..e3ac96cdb7 100644
--- a/test/tint/builtins/gen/textureDimensions/214dd4.wgsl
+++ b/test/tint/builtins/gen/literal/textureDimensions/214dd4.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/textureDimensions/214dd4.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureDimensions/214dd4.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/214dd4.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/textureDimensions/214dd4.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/textureDimensions/214dd4.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/textureDimensions/214dd4.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/214dd4.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/textureDimensions/214dd4.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/textureDimensions/214dd4.wgsl.expected.msl b/test/tint/builtins/gen/literal/textureDimensions/214dd4.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/214dd4.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/textureDimensions/214dd4.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/textureDimensions/214dd4.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureDimensions/214dd4.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/214dd4.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/textureDimensions/214dd4.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/textureDimensions/214dd4.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/textureDimensions/214dd4.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/214dd4.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/textureDimensions/214dd4.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/textureDimensions/221f22.wgsl b/test/tint/builtins/gen/literal/textureDimensions/221f22.wgsl
similarity index 97%
rename from test/tint/builtins/gen/textureDimensions/221f22.wgsl
rename to test/tint/builtins/gen/literal/textureDimensions/221f22.wgsl
index 8b3835af27..b2c83dcb89 100644
--- a/test/tint/builtins/gen/textureDimensions/221f22.wgsl
+++ b/test/tint/builtins/gen/literal/textureDimensions/221f22.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/textureDimensions/221f22.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureDimensions/221f22.wgsl.expected.glsl
similarity index 97%
rename from test/tint/builtins/gen/textureDimensions/221f22.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/textureDimensions/221f22.wgsl.expected.glsl
index a66bf2c7cb..2e53eb0ae1 100644
--- a/test/tint/builtins/gen/textureDimensions/221f22.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureDimensions/221f22.wgsl.expected.glsl
@@ -9,7 +9,7 @@ void textureDimensions_221f22() {
 
 vec4 vertex_main() {
   textureDimensions_221f22();
-  return vec4(0.0f, 0.0f, 0.0f, 0.0f);
+  return vec4(0.0f);
 }
 
 void main() {
diff --git a/test/tint/builtins/gen/textureDimensions/221f22.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/textureDimensions/221f22.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/221f22.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/textureDimensions/221f22.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/textureDimensions/221f22.wgsl.expected.msl b/test/tint/builtins/gen/literal/textureDimensions/221f22.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/221f22.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/textureDimensions/221f22.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/textureDimensions/221f22.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureDimensions/221f22.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/221f22.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/textureDimensions/221f22.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/textureDimensions/221f22.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/textureDimensions/221f22.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/221f22.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/textureDimensions/221f22.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/textureDimensions/267788.wgsl b/test/tint/builtins/gen/literal/textureDimensions/267788.wgsl
similarity index 97%
rename from test/tint/builtins/gen/textureDimensions/267788.wgsl
rename to test/tint/builtins/gen/literal/textureDimensions/267788.wgsl
index a90cd8148e..47d79853f4 100644
--- a/test/tint/builtins/gen/textureDimensions/267788.wgsl
+++ b/test/tint/builtins/gen/literal/textureDimensions/267788.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/textureDimensions/267788.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureDimensions/267788.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/267788.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/textureDimensions/267788.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/textureDimensions/267788.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/textureDimensions/267788.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/267788.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/textureDimensions/267788.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/textureDimensions/267788.wgsl.expected.msl b/test/tint/builtins/gen/literal/textureDimensions/267788.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/267788.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/textureDimensions/267788.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/textureDimensions/267788.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureDimensions/267788.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/267788.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/textureDimensions/267788.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/textureDimensions/267788.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/textureDimensions/267788.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/267788.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/textureDimensions/267788.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/textureDimensions/26bdfa.wgsl b/test/tint/builtins/gen/literal/textureDimensions/26bdfa.wgsl
similarity index 97%
rename from test/tint/builtins/gen/textureDimensions/26bdfa.wgsl
rename to test/tint/builtins/gen/literal/textureDimensions/26bdfa.wgsl
index 6f4278baf6..fa5800947a 100644
--- a/test/tint/builtins/gen/textureDimensions/26bdfa.wgsl
+++ b/test/tint/builtins/gen/literal/textureDimensions/26bdfa.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/textureDimensions/26bdfa.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureDimensions/26bdfa.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/26bdfa.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/textureDimensions/26bdfa.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/textureDimensions/26bdfa.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/textureDimensions/26bdfa.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/26bdfa.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/textureDimensions/26bdfa.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/textureDimensions/26bdfa.wgsl.expected.msl b/test/tint/builtins/gen/literal/textureDimensions/26bdfa.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/26bdfa.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/textureDimensions/26bdfa.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/textureDimensions/26bdfa.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureDimensions/26bdfa.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/26bdfa.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/textureDimensions/26bdfa.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/textureDimensions/26bdfa.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/textureDimensions/26bdfa.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/26bdfa.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/textureDimensions/26bdfa.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/textureDimensions/26ef6c.wgsl b/test/tint/builtins/gen/literal/textureDimensions/26ef6c.wgsl
similarity index 97%
rename from test/tint/builtins/gen/textureDimensions/26ef6c.wgsl
rename to test/tint/builtins/gen/literal/textureDimensions/26ef6c.wgsl
index 45a5004ed9..ccf3250e86 100644
--- a/test/tint/builtins/gen/textureDimensions/26ef6c.wgsl
+++ b/test/tint/builtins/gen/literal/textureDimensions/26ef6c.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/textureDimensions/26ef6c.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureDimensions/26ef6c.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/26ef6c.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/textureDimensions/26ef6c.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/textureDimensions/26ef6c.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/textureDimensions/26ef6c.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/26ef6c.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/textureDimensions/26ef6c.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/textureDimensions/26ef6c.wgsl.expected.msl b/test/tint/builtins/gen/literal/textureDimensions/26ef6c.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/26ef6c.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/textureDimensions/26ef6c.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/textureDimensions/26ef6c.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureDimensions/26ef6c.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/26ef6c.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/textureDimensions/26ef6c.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/textureDimensions/26ef6c.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/textureDimensions/26ef6c.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/26ef6c.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/textureDimensions/26ef6c.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/textureDimensions/2ad087.wgsl b/test/tint/builtins/gen/literal/textureDimensions/2ad087.wgsl
similarity index 97%
rename from test/tint/builtins/gen/textureDimensions/2ad087.wgsl
rename to test/tint/builtins/gen/literal/textureDimensions/2ad087.wgsl
index b26368dc73..25a8b28efd 100644
--- a/test/tint/builtins/gen/textureDimensions/2ad087.wgsl
+++ b/test/tint/builtins/gen/literal/textureDimensions/2ad087.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/textureDimensions/2ad087.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureDimensions/2ad087.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/2ad087.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/textureDimensions/2ad087.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/textureDimensions/2ad087.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/textureDimensions/2ad087.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/2ad087.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/textureDimensions/2ad087.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/textureDimensions/2ad087.wgsl.expected.msl b/test/tint/builtins/gen/literal/textureDimensions/2ad087.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/2ad087.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/textureDimensions/2ad087.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/textureDimensions/2ad087.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureDimensions/2ad087.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/2ad087.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/textureDimensions/2ad087.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/textureDimensions/2ad087.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/textureDimensions/2ad087.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/2ad087.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/textureDimensions/2ad087.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/textureDimensions/2efa05.wgsl b/test/tint/builtins/gen/literal/textureDimensions/2efa05.wgsl
similarity index 97%
rename from test/tint/builtins/gen/textureDimensions/2efa05.wgsl
rename to test/tint/builtins/gen/literal/textureDimensions/2efa05.wgsl
index 8989190b51..313b799fe1 100644
--- a/test/tint/builtins/gen/textureDimensions/2efa05.wgsl
+++ b/test/tint/builtins/gen/literal/textureDimensions/2efa05.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/textureDimensions/2efa05.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureDimensions/2efa05.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/2efa05.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/textureDimensions/2efa05.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/textureDimensions/2efa05.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/textureDimensions/2efa05.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/2efa05.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/textureDimensions/2efa05.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/textureDimensions/2efa05.wgsl.expected.msl b/test/tint/builtins/gen/literal/textureDimensions/2efa05.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/2efa05.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/textureDimensions/2efa05.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/textureDimensions/2efa05.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureDimensions/2efa05.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/2efa05.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/textureDimensions/2efa05.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/textureDimensions/2efa05.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/textureDimensions/2efa05.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/2efa05.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/textureDimensions/2efa05.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/textureDimensions/2f289f.wgsl b/test/tint/builtins/gen/literal/textureDimensions/2f289f.wgsl
similarity index 97%
rename from test/tint/builtins/gen/textureDimensions/2f289f.wgsl
rename to test/tint/builtins/gen/literal/textureDimensions/2f289f.wgsl
index bb5a07f3f3..63835a1d8c 100644
--- a/test/tint/builtins/gen/textureDimensions/2f289f.wgsl
+++ b/test/tint/builtins/gen/literal/textureDimensions/2f289f.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/textureDimensions/2f289f.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureDimensions/2f289f.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/2f289f.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/textureDimensions/2f289f.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/textureDimensions/2f289f.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/textureDimensions/2f289f.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/2f289f.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/textureDimensions/2f289f.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/textureDimensions/2f289f.wgsl.expected.msl b/test/tint/builtins/gen/literal/textureDimensions/2f289f.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/2f289f.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/textureDimensions/2f289f.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/textureDimensions/2f289f.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureDimensions/2f289f.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/2f289f.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/textureDimensions/2f289f.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/textureDimensions/2f289f.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/textureDimensions/2f289f.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/2f289f.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/textureDimensions/2f289f.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/textureDimensions/2fe1cc.wgsl b/test/tint/builtins/gen/literal/textureDimensions/2fe1cc.wgsl
similarity index 97%
rename from test/tint/builtins/gen/textureDimensions/2fe1cc.wgsl
rename to test/tint/builtins/gen/literal/textureDimensions/2fe1cc.wgsl
index 4b3ebb548d..3ac48327ef 100644
--- a/test/tint/builtins/gen/textureDimensions/2fe1cc.wgsl
+++ b/test/tint/builtins/gen/literal/textureDimensions/2fe1cc.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/textureDimensions/2fe1cc.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureDimensions/2fe1cc.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/2fe1cc.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/textureDimensions/2fe1cc.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/textureDimensions/2fe1cc.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/textureDimensions/2fe1cc.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/2fe1cc.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/textureDimensions/2fe1cc.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/textureDimensions/2fe1cc.wgsl.expected.msl b/test/tint/builtins/gen/literal/textureDimensions/2fe1cc.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/2fe1cc.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/textureDimensions/2fe1cc.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/textureDimensions/2fe1cc.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureDimensions/2fe1cc.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/2fe1cc.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/textureDimensions/2fe1cc.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/textureDimensions/2fe1cc.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/textureDimensions/2fe1cc.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/2fe1cc.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/textureDimensions/2fe1cc.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/textureDimensions/318ecc.wgsl b/test/tint/builtins/gen/literal/textureDimensions/318ecc.wgsl
similarity index 97%
rename from test/tint/builtins/gen/textureDimensions/318ecc.wgsl
rename to test/tint/builtins/gen/literal/textureDimensions/318ecc.wgsl
index 88f0459124..4563fc8955 100644
--- a/test/tint/builtins/gen/textureDimensions/318ecc.wgsl
+++ b/test/tint/builtins/gen/literal/textureDimensions/318ecc.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/textureDimensions/318ecc.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureDimensions/318ecc.wgsl.expected.glsl
similarity index 97%
rename from test/tint/builtins/gen/textureDimensions/318ecc.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/textureDimensions/318ecc.wgsl.expected.glsl
index 1e789b983b..078e8b3968 100644
--- a/test/tint/builtins/gen/textureDimensions/318ecc.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureDimensions/318ecc.wgsl.expected.glsl
@@ -9,7 +9,7 @@ void textureDimensions_318ecc() {
 
 vec4 vertex_main() {
   textureDimensions_318ecc();
-  return vec4(0.0f, 0.0f, 0.0f, 0.0f);
+  return vec4(0.0f);
 }
 
 void main() {
diff --git a/test/tint/builtins/gen/textureDimensions/318ecc.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/textureDimensions/318ecc.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/318ecc.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/textureDimensions/318ecc.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/textureDimensions/318ecc.wgsl.expected.msl b/test/tint/builtins/gen/literal/textureDimensions/318ecc.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/318ecc.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/textureDimensions/318ecc.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/textureDimensions/318ecc.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureDimensions/318ecc.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/318ecc.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/textureDimensions/318ecc.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/textureDimensions/318ecc.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/textureDimensions/318ecc.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/318ecc.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/textureDimensions/318ecc.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/textureDimensions/340d06.wgsl b/test/tint/builtins/gen/literal/textureDimensions/340d06.wgsl
similarity index 97%
rename from test/tint/builtins/gen/textureDimensions/340d06.wgsl
rename to test/tint/builtins/gen/literal/textureDimensions/340d06.wgsl
index aa5d78eba8..801a81e511 100644
--- a/test/tint/builtins/gen/textureDimensions/340d06.wgsl
+++ b/test/tint/builtins/gen/literal/textureDimensions/340d06.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/textureDimensions/340d06.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureDimensions/340d06.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/340d06.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/textureDimensions/340d06.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/textureDimensions/340d06.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/textureDimensions/340d06.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/340d06.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/textureDimensions/340d06.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/textureDimensions/340d06.wgsl.expected.msl b/test/tint/builtins/gen/literal/textureDimensions/340d06.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/340d06.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/textureDimensions/340d06.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/textureDimensions/340d06.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureDimensions/340d06.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/340d06.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/textureDimensions/340d06.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/textureDimensions/340d06.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/textureDimensions/340d06.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/340d06.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/textureDimensions/340d06.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/textureDimensions/398e30.wgsl b/test/tint/builtins/gen/literal/textureDimensions/398e30.wgsl
similarity index 97%
rename from test/tint/builtins/gen/textureDimensions/398e30.wgsl
rename to test/tint/builtins/gen/literal/textureDimensions/398e30.wgsl
index ba00534176..d8a22e3716 100644
--- a/test/tint/builtins/gen/textureDimensions/398e30.wgsl
+++ b/test/tint/builtins/gen/literal/textureDimensions/398e30.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/textureDimensions/398e30.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureDimensions/398e30.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/398e30.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/textureDimensions/398e30.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/textureDimensions/398e30.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/textureDimensions/398e30.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/398e30.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/textureDimensions/398e30.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/textureDimensions/398e30.wgsl.expected.msl b/test/tint/builtins/gen/literal/textureDimensions/398e30.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/398e30.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/textureDimensions/398e30.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/textureDimensions/398e30.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureDimensions/398e30.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/398e30.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/textureDimensions/398e30.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/textureDimensions/398e30.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/textureDimensions/398e30.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/398e30.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/textureDimensions/398e30.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/textureDimensions/3a94ea.wgsl b/test/tint/builtins/gen/literal/textureDimensions/3a94ea.wgsl
similarity index 97%
rename from test/tint/builtins/gen/textureDimensions/3a94ea.wgsl
rename to test/tint/builtins/gen/literal/textureDimensions/3a94ea.wgsl
index b0083331be..d00adb2a00 100644
--- a/test/tint/builtins/gen/textureDimensions/3a94ea.wgsl
+++ b/test/tint/builtins/gen/literal/textureDimensions/3a94ea.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/textureDimensions/3a94ea.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureDimensions/3a94ea.wgsl.expected.glsl
similarity index 97%
rename from test/tint/builtins/gen/textureDimensions/3a94ea.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/textureDimensions/3a94ea.wgsl.expected.glsl
index 8ea82bfcfb..4e7d2639ab 100644
--- a/test/tint/builtins/gen/textureDimensions/3a94ea.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureDimensions/3a94ea.wgsl.expected.glsl
@@ -9,7 +9,7 @@ void textureDimensions_3a94ea() {
 
 vec4 vertex_main() {
   textureDimensions_3a94ea();
-  return vec4(0.0f, 0.0f, 0.0f, 0.0f);
+  return vec4(0.0f);
 }
 
 void main() {
diff --git a/test/tint/builtins/gen/textureDimensions/3a94ea.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/textureDimensions/3a94ea.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/3a94ea.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/textureDimensions/3a94ea.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/textureDimensions/3a94ea.wgsl.expected.msl b/test/tint/builtins/gen/literal/textureDimensions/3a94ea.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/3a94ea.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/textureDimensions/3a94ea.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/textureDimensions/3a94ea.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureDimensions/3a94ea.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/3a94ea.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/textureDimensions/3a94ea.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/textureDimensions/3a94ea.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/textureDimensions/3a94ea.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/3a94ea.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/textureDimensions/3a94ea.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/textureDimensions/3aca08.wgsl b/test/tint/builtins/gen/literal/textureDimensions/3aca08.wgsl
similarity index 97%
rename from test/tint/builtins/gen/textureDimensions/3aca08.wgsl
rename to test/tint/builtins/gen/literal/textureDimensions/3aca08.wgsl
index de36f08505..01a56a9e53 100644
--- a/test/tint/builtins/gen/textureDimensions/3aca08.wgsl
+++ b/test/tint/builtins/gen/literal/textureDimensions/3aca08.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/textureDimensions/3aca08.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureDimensions/3aca08.wgsl.expected.glsl
similarity index 97%
rename from test/tint/builtins/gen/textureDimensions/3aca08.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/textureDimensions/3aca08.wgsl.expected.glsl
index eb335ead36..e9c16564df 100644
--- a/test/tint/builtins/gen/textureDimensions/3aca08.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureDimensions/3aca08.wgsl.expected.glsl
@@ -9,7 +9,7 @@ void textureDimensions_3aca08() {
 
 vec4 vertex_main() {
   textureDimensions_3aca08();
-  return vec4(0.0f, 0.0f, 0.0f, 0.0f);
+  return vec4(0.0f);
 }
 
 void main() {
diff --git a/test/tint/builtins/gen/textureDimensions/3aca08.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/textureDimensions/3aca08.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/3aca08.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/textureDimensions/3aca08.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/textureDimensions/3aca08.wgsl.expected.msl b/test/tint/builtins/gen/literal/textureDimensions/3aca08.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/3aca08.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/textureDimensions/3aca08.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/textureDimensions/3aca08.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureDimensions/3aca08.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/3aca08.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/textureDimensions/3aca08.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/textureDimensions/3aca08.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/textureDimensions/3aca08.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/3aca08.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/textureDimensions/3aca08.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/textureDimensions/3c5ad8.wgsl b/test/tint/builtins/gen/literal/textureDimensions/3c5ad8.wgsl
similarity index 97%
rename from test/tint/builtins/gen/textureDimensions/3c5ad8.wgsl
rename to test/tint/builtins/gen/literal/textureDimensions/3c5ad8.wgsl
index 63398de6fe..9d72673e4d 100644
--- a/test/tint/builtins/gen/textureDimensions/3c5ad8.wgsl
+++ b/test/tint/builtins/gen/literal/textureDimensions/3c5ad8.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/textureDimensions/3c5ad8.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureDimensions/3c5ad8.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/3c5ad8.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/textureDimensions/3c5ad8.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/textureDimensions/3c5ad8.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/textureDimensions/3c5ad8.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/3c5ad8.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/textureDimensions/3c5ad8.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/textureDimensions/3c5ad8.wgsl.expected.msl b/test/tint/builtins/gen/literal/textureDimensions/3c5ad8.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/3c5ad8.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/textureDimensions/3c5ad8.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/textureDimensions/3c5ad8.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureDimensions/3c5ad8.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/3c5ad8.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/textureDimensions/3c5ad8.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/textureDimensions/3c5ad8.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/textureDimensions/3c5ad8.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/3c5ad8.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/textureDimensions/3c5ad8.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/textureDimensions/4152a6.wgsl b/test/tint/builtins/gen/literal/textureDimensions/4152a6.wgsl
similarity index 97%
rename from test/tint/builtins/gen/textureDimensions/4152a6.wgsl
rename to test/tint/builtins/gen/literal/textureDimensions/4152a6.wgsl
index a8ee80ce67..52a3a0760a 100644
--- a/test/tint/builtins/gen/textureDimensions/4152a6.wgsl
+++ b/test/tint/builtins/gen/literal/textureDimensions/4152a6.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/textureDimensions/4152a6.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureDimensions/4152a6.wgsl.expected.glsl
similarity index 97%
rename from test/tint/builtins/gen/textureDimensions/4152a6.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/textureDimensions/4152a6.wgsl.expected.glsl
index 8517e62616..d3120a3cc5 100644
--- a/test/tint/builtins/gen/textureDimensions/4152a6.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureDimensions/4152a6.wgsl.expected.glsl
@@ -9,7 +9,7 @@ void textureDimensions_4152a6() {
 
 vec4 vertex_main() {
   textureDimensions_4152a6();
-  return vec4(0.0f, 0.0f, 0.0f, 0.0f);
+  return vec4(0.0f);
 }
 
 void main() {
diff --git a/test/tint/builtins/gen/textureDimensions/4152a6.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/textureDimensions/4152a6.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/4152a6.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/textureDimensions/4152a6.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/textureDimensions/4152a6.wgsl.expected.msl b/test/tint/builtins/gen/literal/textureDimensions/4152a6.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/4152a6.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/textureDimensions/4152a6.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/textureDimensions/4152a6.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureDimensions/4152a6.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/4152a6.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/textureDimensions/4152a6.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/textureDimensions/4152a6.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/textureDimensions/4152a6.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/4152a6.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/textureDimensions/4152a6.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/textureDimensions/423f99.wgsl b/test/tint/builtins/gen/literal/textureDimensions/423f99.wgsl
similarity index 97%
rename from test/tint/builtins/gen/textureDimensions/423f99.wgsl
rename to test/tint/builtins/gen/literal/textureDimensions/423f99.wgsl
index 8029171004..3fd9d7b0a8 100644
--- a/test/tint/builtins/gen/textureDimensions/423f99.wgsl
+++ b/test/tint/builtins/gen/literal/textureDimensions/423f99.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/textureDimensions/423f99.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureDimensions/423f99.wgsl.expected.glsl
similarity index 97%
rename from test/tint/builtins/gen/textureDimensions/423f99.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/textureDimensions/423f99.wgsl.expected.glsl
index 7602271e2f..08f2e2498f 100644
--- a/test/tint/builtins/gen/textureDimensions/423f99.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureDimensions/423f99.wgsl.expected.glsl
@@ -9,7 +9,7 @@ void textureDimensions_423f99() {
 
 vec4 vertex_main() {
   textureDimensions_423f99();
-  return vec4(0.0f, 0.0f, 0.0f, 0.0f);
+  return vec4(0.0f);
 }
 
 void main() {
diff --git a/test/tint/builtins/gen/textureDimensions/423f99.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/textureDimensions/423f99.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/423f99.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/textureDimensions/423f99.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/textureDimensions/423f99.wgsl.expected.msl b/test/tint/builtins/gen/literal/textureDimensions/423f99.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/423f99.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/textureDimensions/423f99.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/textureDimensions/423f99.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureDimensions/423f99.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/423f99.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/textureDimensions/423f99.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/textureDimensions/423f99.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/textureDimensions/423f99.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/423f99.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/textureDimensions/423f99.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/textureDimensions/4267ee.wgsl b/test/tint/builtins/gen/literal/textureDimensions/4267ee.wgsl
similarity index 97%
rename from test/tint/builtins/gen/textureDimensions/4267ee.wgsl
rename to test/tint/builtins/gen/literal/textureDimensions/4267ee.wgsl
index 1596f1c809..1c849b8130 100644
--- a/test/tint/builtins/gen/textureDimensions/4267ee.wgsl
+++ b/test/tint/builtins/gen/literal/textureDimensions/4267ee.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/textureDimensions/4267ee.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureDimensions/4267ee.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/4267ee.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/textureDimensions/4267ee.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/textureDimensions/4267ee.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/textureDimensions/4267ee.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/4267ee.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/textureDimensions/4267ee.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/textureDimensions/4267ee.wgsl.expected.msl b/test/tint/builtins/gen/literal/textureDimensions/4267ee.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/4267ee.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/textureDimensions/4267ee.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/textureDimensions/4267ee.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureDimensions/4267ee.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/4267ee.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/textureDimensions/4267ee.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/textureDimensions/4267ee.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/textureDimensions/4267ee.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/4267ee.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/textureDimensions/4267ee.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/textureDimensions/42d4e6.wgsl b/test/tint/builtins/gen/literal/textureDimensions/42d4e6.wgsl
similarity index 97%
rename from test/tint/builtins/gen/textureDimensions/42d4e6.wgsl
rename to test/tint/builtins/gen/literal/textureDimensions/42d4e6.wgsl
index 06b887ad06..ac087c5e62 100644
--- a/test/tint/builtins/gen/textureDimensions/42d4e6.wgsl
+++ b/test/tint/builtins/gen/literal/textureDimensions/42d4e6.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/textureDimensions/42d4e6.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureDimensions/42d4e6.wgsl.expected.glsl
similarity index 97%
rename from test/tint/builtins/gen/textureDimensions/42d4e6.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/textureDimensions/42d4e6.wgsl.expected.glsl
index a7bb3d2066..f59d1757c9 100644
--- a/test/tint/builtins/gen/textureDimensions/42d4e6.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureDimensions/42d4e6.wgsl.expected.glsl
@@ -9,7 +9,7 @@ void textureDimensions_42d4e6() {
 
 vec4 vertex_main() {
   textureDimensions_42d4e6();
-  return vec4(0.0f, 0.0f, 0.0f, 0.0f);
+  return vec4(0.0f);
 }
 
 void main() {
diff --git a/test/tint/builtins/gen/textureDimensions/42d4e6.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/textureDimensions/42d4e6.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/42d4e6.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/textureDimensions/42d4e6.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/textureDimensions/42d4e6.wgsl.expected.msl b/test/tint/builtins/gen/literal/textureDimensions/42d4e6.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/42d4e6.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/textureDimensions/42d4e6.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/textureDimensions/42d4e6.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureDimensions/42d4e6.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/42d4e6.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/textureDimensions/42d4e6.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/textureDimensions/42d4e6.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/textureDimensions/42d4e6.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/42d4e6.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/textureDimensions/42d4e6.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/textureDimensions/48cb89.wgsl b/test/tint/builtins/gen/literal/textureDimensions/48cb89.wgsl
similarity index 97%
rename from test/tint/builtins/gen/textureDimensions/48cb89.wgsl
rename to test/tint/builtins/gen/literal/textureDimensions/48cb89.wgsl
index 25deb1bb0c..c278ed8e5b 100644
--- a/test/tint/builtins/gen/textureDimensions/48cb89.wgsl
+++ b/test/tint/builtins/gen/literal/textureDimensions/48cb89.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/textureDimensions/48cb89.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureDimensions/48cb89.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/48cb89.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/textureDimensions/48cb89.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/textureDimensions/48cb89.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/textureDimensions/48cb89.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/48cb89.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/textureDimensions/48cb89.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/textureDimensions/48cb89.wgsl.expected.msl b/test/tint/builtins/gen/literal/textureDimensions/48cb89.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/48cb89.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/textureDimensions/48cb89.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/textureDimensions/48cb89.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureDimensions/48cb89.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/48cb89.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/textureDimensions/48cb89.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/textureDimensions/48cb89.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/textureDimensions/48cb89.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/48cb89.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/textureDimensions/48cb89.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/textureDimensions/49d274.wgsl b/test/tint/builtins/gen/literal/textureDimensions/49d274.wgsl
similarity index 97%
rename from test/tint/builtins/gen/textureDimensions/49d274.wgsl
rename to test/tint/builtins/gen/literal/textureDimensions/49d274.wgsl
index 37783cf96a..dd8592605d 100644
--- a/test/tint/builtins/gen/textureDimensions/49d274.wgsl
+++ b/test/tint/builtins/gen/literal/textureDimensions/49d274.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/textureDimensions/49d274.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureDimensions/49d274.wgsl.expected.glsl
similarity index 97%
rename from test/tint/builtins/gen/textureDimensions/49d274.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/textureDimensions/49d274.wgsl.expected.glsl
index e441a6156f..70347a6ef3 100644
--- a/test/tint/builtins/gen/textureDimensions/49d274.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureDimensions/49d274.wgsl.expected.glsl
@@ -9,7 +9,7 @@ void textureDimensions_49d274() {
 
 vec4 vertex_main() {
   textureDimensions_49d274();
-  return vec4(0.0f, 0.0f, 0.0f, 0.0f);
+  return vec4(0.0f);
 }
 
 void main() {
diff --git a/test/tint/builtins/gen/textureDimensions/49d274.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/textureDimensions/49d274.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/49d274.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/textureDimensions/49d274.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/textureDimensions/49d274.wgsl.expected.msl b/test/tint/builtins/gen/literal/textureDimensions/49d274.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/49d274.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/textureDimensions/49d274.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/textureDimensions/49d274.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureDimensions/49d274.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/49d274.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/textureDimensions/49d274.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/textureDimensions/49d274.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/textureDimensions/49d274.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/49d274.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/textureDimensions/49d274.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/textureDimensions/4df9a8.wgsl b/test/tint/builtins/gen/literal/textureDimensions/4df9a8.wgsl
similarity index 97%
rename from test/tint/builtins/gen/textureDimensions/4df9a8.wgsl
rename to test/tint/builtins/gen/literal/textureDimensions/4df9a8.wgsl
index c5ea5dd0eb..c95dd96fa5 100644
--- a/test/tint/builtins/gen/textureDimensions/4df9a8.wgsl
+++ b/test/tint/builtins/gen/literal/textureDimensions/4df9a8.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/textureDimensions/4df9a8.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureDimensions/4df9a8.wgsl.expected.glsl
similarity index 97%
rename from test/tint/builtins/gen/textureDimensions/4df9a8.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/textureDimensions/4df9a8.wgsl.expected.glsl
index 7eed976490..7871ed7d01 100644
--- a/test/tint/builtins/gen/textureDimensions/4df9a8.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureDimensions/4df9a8.wgsl.expected.glsl
@@ -9,7 +9,7 @@ void textureDimensions_4df9a8() {
 
 vec4 vertex_main() {
   textureDimensions_4df9a8();
-  return vec4(0.0f, 0.0f, 0.0f, 0.0f);
+  return vec4(0.0f);
 }
 
 void main() {
diff --git a/test/tint/builtins/gen/textureDimensions/4df9a8.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/textureDimensions/4df9a8.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/4df9a8.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/textureDimensions/4df9a8.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/textureDimensions/4df9a8.wgsl.expected.msl b/test/tint/builtins/gen/literal/textureDimensions/4df9a8.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/4df9a8.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/textureDimensions/4df9a8.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/textureDimensions/4df9a8.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureDimensions/4df9a8.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/4df9a8.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/textureDimensions/4df9a8.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/textureDimensions/4df9a8.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/textureDimensions/4df9a8.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/4df9a8.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/textureDimensions/4df9a8.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/textureDimensions/50a9ee.wgsl b/test/tint/builtins/gen/literal/textureDimensions/50a9ee.wgsl
similarity index 97%
rename from test/tint/builtins/gen/textureDimensions/50a9ee.wgsl
rename to test/tint/builtins/gen/literal/textureDimensions/50a9ee.wgsl
index eefaaf8539..92c35abd6b 100644
--- a/test/tint/builtins/gen/textureDimensions/50a9ee.wgsl
+++ b/test/tint/builtins/gen/literal/textureDimensions/50a9ee.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/textureDimensions/50a9ee.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureDimensions/50a9ee.wgsl.expected.glsl
similarity index 97%
rename from test/tint/builtins/gen/textureDimensions/50a9ee.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/textureDimensions/50a9ee.wgsl.expected.glsl
index c74de1bf6f..a02b6e603f 100644
--- a/test/tint/builtins/gen/textureDimensions/50a9ee.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureDimensions/50a9ee.wgsl.expected.glsl
@@ -9,7 +9,7 @@ void textureDimensions_50a9ee() {
 
 vec4 vertex_main() {
   textureDimensions_50a9ee();
-  return vec4(0.0f, 0.0f, 0.0f, 0.0f);
+  return vec4(0.0f);
 }
 
 void main() {
diff --git a/test/tint/builtins/gen/textureDimensions/50a9ee.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/textureDimensions/50a9ee.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/50a9ee.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/textureDimensions/50a9ee.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/textureDimensions/50a9ee.wgsl.expected.msl b/test/tint/builtins/gen/literal/textureDimensions/50a9ee.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/50a9ee.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/textureDimensions/50a9ee.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/textureDimensions/50a9ee.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureDimensions/50a9ee.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/50a9ee.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/textureDimensions/50a9ee.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/textureDimensions/50a9ee.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/textureDimensions/50a9ee.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/50a9ee.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/textureDimensions/50a9ee.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/textureDimensions/52045c.wgsl b/test/tint/builtins/gen/literal/textureDimensions/52045c.wgsl
similarity index 97%
rename from test/tint/builtins/gen/textureDimensions/52045c.wgsl
rename to test/tint/builtins/gen/literal/textureDimensions/52045c.wgsl
index e31d6be353..5a7c5ff21d 100644
--- a/test/tint/builtins/gen/textureDimensions/52045c.wgsl
+++ b/test/tint/builtins/gen/literal/textureDimensions/52045c.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/textureDimensions/52045c.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureDimensions/52045c.wgsl.expected.glsl
similarity index 97%
rename from test/tint/builtins/gen/textureDimensions/52045c.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/textureDimensions/52045c.wgsl.expected.glsl
index 29cd75f6ea..f4c5ca9d2c 100644
--- a/test/tint/builtins/gen/textureDimensions/52045c.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureDimensions/52045c.wgsl.expected.glsl
@@ -9,7 +9,7 @@ void textureDimensions_52045c() {
 
 vec4 vertex_main() {
   textureDimensions_52045c();
-  return vec4(0.0f, 0.0f, 0.0f, 0.0f);
+  return vec4(0.0f);
 }
 
 void main() {
diff --git a/test/tint/builtins/gen/textureDimensions/52045c.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/textureDimensions/52045c.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/52045c.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/textureDimensions/52045c.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/textureDimensions/52045c.wgsl.expected.msl b/test/tint/builtins/gen/literal/textureDimensions/52045c.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/52045c.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/textureDimensions/52045c.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/textureDimensions/52045c.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureDimensions/52045c.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/52045c.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/textureDimensions/52045c.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/textureDimensions/52045c.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/textureDimensions/52045c.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/52045c.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/textureDimensions/52045c.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/textureDimensions/55b23e.wgsl b/test/tint/builtins/gen/literal/textureDimensions/55b23e.wgsl
similarity index 97%
rename from test/tint/builtins/gen/textureDimensions/55b23e.wgsl
rename to test/tint/builtins/gen/literal/textureDimensions/55b23e.wgsl
index 82cc5664aa..06255e84f4 100644
--- a/test/tint/builtins/gen/textureDimensions/55b23e.wgsl
+++ b/test/tint/builtins/gen/literal/textureDimensions/55b23e.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/textureDimensions/55b23e.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureDimensions/55b23e.wgsl.expected.glsl
similarity index 97%
rename from test/tint/builtins/gen/textureDimensions/55b23e.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/textureDimensions/55b23e.wgsl.expected.glsl
index 5941a905aa..a9465b8a2c 100644
--- a/test/tint/builtins/gen/textureDimensions/55b23e.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureDimensions/55b23e.wgsl.expected.glsl
@@ -9,7 +9,7 @@ void textureDimensions_55b23e() {
 
 vec4 vertex_main() {
   textureDimensions_55b23e();
-  return vec4(0.0f, 0.0f, 0.0f, 0.0f);
+  return vec4(0.0f);
 }
 
 void main() {
diff --git a/test/tint/builtins/gen/textureDimensions/55b23e.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/textureDimensions/55b23e.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/55b23e.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/textureDimensions/55b23e.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/textureDimensions/55b23e.wgsl.expected.msl b/test/tint/builtins/gen/literal/textureDimensions/55b23e.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/55b23e.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/textureDimensions/55b23e.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/textureDimensions/55b23e.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureDimensions/55b23e.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/55b23e.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/textureDimensions/55b23e.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/textureDimensions/55b23e.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/textureDimensions/55b23e.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/55b23e.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/textureDimensions/55b23e.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/textureDimensions/579629.wgsl b/test/tint/builtins/gen/literal/textureDimensions/579629.wgsl
similarity index 97%
rename from test/tint/builtins/gen/textureDimensions/579629.wgsl
rename to test/tint/builtins/gen/literal/textureDimensions/579629.wgsl
index 49e35e3ffa..963d480a3d 100644
--- a/test/tint/builtins/gen/textureDimensions/579629.wgsl
+++ b/test/tint/builtins/gen/literal/textureDimensions/579629.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/textureDimensions/579629.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureDimensions/579629.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/579629.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/textureDimensions/579629.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/textureDimensions/579629.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/textureDimensions/579629.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/579629.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/textureDimensions/579629.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/textureDimensions/579629.wgsl.expected.msl b/test/tint/builtins/gen/literal/textureDimensions/579629.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/579629.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/textureDimensions/579629.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/textureDimensions/579629.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureDimensions/579629.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/579629.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/textureDimensions/579629.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/textureDimensions/579629.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/textureDimensions/579629.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/579629.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/textureDimensions/579629.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/textureDimensions/57da0b.wgsl b/test/tint/builtins/gen/literal/textureDimensions/57da0b.wgsl
similarity index 97%
rename from test/tint/builtins/gen/textureDimensions/57da0b.wgsl
rename to test/tint/builtins/gen/literal/textureDimensions/57da0b.wgsl
index bf57595617..5b7a1689fb 100644
--- a/test/tint/builtins/gen/textureDimensions/57da0b.wgsl
+++ b/test/tint/builtins/gen/literal/textureDimensions/57da0b.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/textureDimensions/57da0b.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureDimensions/57da0b.wgsl.expected.glsl
similarity index 97%
rename from test/tint/builtins/gen/textureDimensions/57da0b.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/textureDimensions/57da0b.wgsl.expected.glsl
index b9922a5257..c45ed2f613 100644
--- a/test/tint/builtins/gen/textureDimensions/57da0b.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureDimensions/57da0b.wgsl.expected.glsl
@@ -9,7 +9,7 @@ void textureDimensions_57da0b() {
 
 vec4 vertex_main() {
   textureDimensions_57da0b();
-  return vec4(0.0f, 0.0f, 0.0f, 0.0f);
+  return vec4(0.0f);
 }
 
 void main() {
diff --git a/test/tint/builtins/gen/textureDimensions/57da0b.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/textureDimensions/57da0b.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/57da0b.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/textureDimensions/57da0b.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/textureDimensions/57da0b.wgsl.expected.msl b/test/tint/builtins/gen/literal/textureDimensions/57da0b.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/57da0b.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/textureDimensions/57da0b.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/textureDimensions/57da0b.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureDimensions/57da0b.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/57da0b.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/textureDimensions/57da0b.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/textureDimensions/57da0b.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/textureDimensions/57da0b.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/57da0b.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/textureDimensions/57da0b.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/textureDimensions/57e28f.wgsl b/test/tint/builtins/gen/literal/textureDimensions/57e28f.wgsl
similarity index 97%
rename from test/tint/builtins/gen/textureDimensions/57e28f.wgsl
rename to test/tint/builtins/gen/literal/textureDimensions/57e28f.wgsl
index d782714f4d..0b9d680776 100644
--- a/test/tint/builtins/gen/textureDimensions/57e28f.wgsl
+++ b/test/tint/builtins/gen/literal/textureDimensions/57e28f.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/textureDimensions/57e28f.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureDimensions/57e28f.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/57e28f.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/textureDimensions/57e28f.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/textureDimensions/57e28f.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/textureDimensions/57e28f.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/57e28f.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/textureDimensions/57e28f.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/textureDimensions/57e28f.wgsl.expected.msl b/test/tint/builtins/gen/literal/textureDimensions/57e28f.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/57e28f.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/textureDimensions/57e28f.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/textureDimensions/57e28f.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureDimensions/57e28f.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/57e28f.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/textureDimensions/57e28f.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/textureDimensions/57e28f.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/textureDimensions/57e28f.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/57e28f.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/textureDimensions/57e28f.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/textureDimensions/58a515.wgsl b/test/tint/builtins/gen/literal/textureDimensions/58a515.wgsl
similarity index 97%
rename from test/tint/builtins/gen/textureDimensions/58a515.wgsl
rename to test/tint/builtins/gen/literal/textureDimensions/58a515.wgsl
index 1f024d4a8f..df0e9cd509 100644
--- a/test/tint/builtins/gen/textureDimensions/58a515.wgsl
+++ b/test/tint/builtins/gen/literal/textureDimensions/58a515.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/textureDimensions/58a515.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureDimensions/58a515.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/58a515.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/textureDimensions/58a515.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/textureDimensions/58a515.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/textureDimensions/58a515.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/58a515.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/textureDimensions/58a515.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/textureDimensions/58a515.wgsl.expected.msl b/test/tint/builtins/gen/literal/textureDimensions/58a515.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/58a515.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/textureDimensions/58a515.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/textureDimensions/58a515.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureDimensions/58a515.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/58a515.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/textureDimensions/58a515.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/textureDimensions/58a515.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/textureDimensions/58a515.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/58a515.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/textureDimensions/58a515.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/textureDimensions/5985f3.wgsl b/test/tint/builtins/gen/literal/textureDimensions/5985f3.wgsl
similarity index 97%
rename from test/tint/builtins/gen/textureDimensions/5985f3.wgsl
rename to test/tint/builtins/gen/literal/textureDimensions/5985f3.wgsl
index ba79f20a83..dffa849250 100644
--- a/test/tint/builtins/gen/textureDimensions/5985f3.wgsl
+++ b/test/tint/builtins/gen/literal/textureDimensions/5985f3.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/textureDimensions/5985f3.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureDimensions/5985f3.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/5985f3.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/textureDimensions/5985f3.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/textureDimensions/5985f3.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/textureDimensions/5985f3.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/5985f3.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/textureDimensions/5985f3.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/textureDimensions/5985f3.wgsl.expected.msl b/test/tint/builtins/gen/literal/textureDimensions/5985f3.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/5985f3.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/textureDimensions/5985f3.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/textureDimensions/5985f3.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureDimensions/5985f3.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/5985f3.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/textureDimensions/5985f3.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/textureDimensions/5985f3.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/textureDimensions/5985f3.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/5985f3.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/textureDimensions/5985f3.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/textureDimensions/5caa5e.wgsl b/test/tint/builtins/gen/literal/textureDimensions/5caa5e.wgsl
similarity index 97%
rename from test/tint/builtins/gen/textureDimensions/5caa5e.wgsl
rename to test/tint/builtins/gen/literal/textureDimensions/5caa5e.wgsl
index bc26c57c7c..5582c6e7ab 100644
--- a/test/tint/builtins/gen/textureDimensions/5caa5e.wgsl
+++ b/test/tint/builtins/gen/literal/textureDimensions/5caa5e.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/textureDimensions/5caa5e.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureDimensions/5caa5e.wgsl.expected.glsl
similarity index 97%
rename from test/tint/builtins/gen/textureDimensions/5caa5e.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/textureDimensions/5caa5e.wgsl.expected.glsl
index ea9f7ed86a..d02caf1a45 100644
--- a/test/tint/builtins/gen/textureDimensions/5caa5e.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureDimensions/5caa5e.wgsl.expected.glsl
@@ -9,7 +9,7 @@ void textureDimensions_5caa5e() {
 
 vec4 vertex_main() {
   textureDimensions_5caa5e();
-  return vec4(0.0f, 0.0f, 0.0f, 0.0f);
+  return vec4(0.0f);
 }
 
 void main() {
diff --git a/test/tint/builtins/gen/textureDimensions/5caa5e.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/textureDimensions/5caa5e.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/5caa5e.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/textureDimensions/5caa5e.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/textureDimensions/5caa5e.wgsl.expected.msl b/test/tint/builtins/gen/literal/textureDimensions/5caa5e.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/5caa5e.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/textureDimensions/5caa5e.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/textureDimensions/5caa5e.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureDimensions/5caa5e.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/5caa5e.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/textureDimensions/5caa5e.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/textureDimensions/5caa5e.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/textureDimensions/5caa5e.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/5caa5e.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/textureDimensions/5caa5e.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/textureDimensions/5e295d.wgsl b/test/tint/builtins/gen/literal/textureDimensions/5e295d.wgsl
similarity index 97%
rename from test/tint/builtins/gen/textureDimensions/5e295d.wgsl
rename to test/tint/builtins/gen/literal/textureDimensions/5e295d.wgsl
index ed4854d3f7..b855d3c2d2 100644
--- a/test/tint/builtins/gen/textureDimensions/5e295d.wgsl
+++ b/test/tint/builtins/gen/literal/textureDimensions/5e295d.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/textureDimensions/5e295d.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureDimensions/5e295d.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/5e295d.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/textureDimensions/5e295d.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/textureDimensions/5e295d.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/textureDimensions/5e295d.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/5e295d.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/textureDimensions/5e295d.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/textureDimensions/5e295d.wgsl.expected.msl b/test/tint/builtins/gen/literal/textureDimensions/5e295d.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/5e295d.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/textureDimensions/5e295d.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/textureDimensions/5e295d.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureDimensions/5e295d.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/5e295d.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/textureDimensions/5e295d.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/textureDimensions/5e295d.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/textureDimensions/5e295d.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/5e295d.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/textureDimensions/5e295d.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/textureDimensions/60bf54.wgsl b/test/tint/builtins/gen/literal/textureDimensions/60bf54.wgsl
similarity index 97%
rename from test/tint/builtins/gen/textureDimensions/60bf54.wgsl
rename to test/tint/builtins/gen/literal/textureDimensions/60bf54.wgsl
index 1838e87158..df274c5399 100644
--- a/test/tint/builtins/gen/textureDimensions/60bf54.wgsl
+++ b/test/tint/builtins/gen/literal/textureDimensions/60bf54.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/textureDimensions/60bf54.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureDimensions/60bf54.wgsl.expected.glsl
similarity index 97%
rename from test/tint/builtins/gen/textureDimensions/60bf54.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/textureDimensions/60bf54.wgsl.expected.glsl
index 3b56047632..91d08156b2 100644
--- a/test/tint/builtins/gen/textureDimensions/60bf54.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureDimensions/60bf54.wgsl.expected.glsl
@@ -9,7 +9,7 @@ void textureDimensions_60bf54() {
 
 vec4 vertex_main() {
   textureDimensions_60bf54();
-  return vec4(0.0f, 0.0f, 0.0f, 0.0f);
+  return vec4(0.0f);
 }
 
 void main() {
diff --git a/test/tint/builtins/gen/textureDimensions/60bf54.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/textureDimensions/60bf54.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/60bf54.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/textureDimensions/60bf54.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/textureDimensions/60bf54.wgsl.expected.msl b/test/tint/builtins/gen/literal/textureDimensions/60bf54.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/60bf54.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/textureDimensions/60bf54.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/textureDimensions/60bf54.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureDimensions/60bf54.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/60bf54.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/textureDimensions/60bf54.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/textureDimensions/60bf54.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/textureDimensions/60bf54.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/60bf54.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/textureDimensions/60bf54.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/textureDimensions/63f3cf.wgsl b/test/tint/builtins/gen/literal/textureDimensions/63f3cf.wgsl
similarity index 97%
rename from test/tint/builtins/gen/textureDimensions/63f3cf.wgsl
rename to test/tint/builtins/gen/literal/textureDimensions/63f3cf.wgsl
index b997655052..ae013ed060 100644
--- a/test/tint/builtins/gen/textureDimensions/63f3cf.wgsl
+++ b/test/tint/builtins/gen/literal/textureDimensions/63f3cf.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/textureDimensions/63f3cf.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureDimensions/63f3cf.wgsl.expected.glsl
similarity index 97%
rename from test/tint/builtins/gen/textureDimensions/63f3cf.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/textureDimensions/63f3cf.wgsl.expected.glsl
index c209b7730d..6a77ea9751 100644
--- a/test/tint/builtins/gen/textureDimensions/63f3cf.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureDimensions/63f3cf.wgsl.expected.glsl
@@ -9,7 +9,7 @@ void textureDimensions_63f3cf() {
 
 vec4 vertex_main() {
   textureDimensions_63f3cf();
-  return vec4(0.0f, 0.0f, 0.0f, 0.0f);
+  return vec4(0.0f);
 }
 
 void main() {
diff --git a/test/tint/builtins/gen/textureDimensions/63f3cf.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/textureDimensions/63f3cf.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/63f3cf.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/textureDimensions/63f3cf.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/textureDimensions/63f3cf.wgsl.expected.msl b/test/tint/builtins/gen/literal/textureDimensions/63f3cf.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/63f3cf.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/textureDimensions/63f3cf.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/textureDimensions/63f3cf.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureDimensions/63f3cf.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/63f3cf.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/textureDimensions/63f3cf.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/textureDimensions/63f3cf.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/textureDimensions/63f3cf.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/63f3cf.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/textureDimensions/63f3cf.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/textureDimensions/68105c.wgsl b/test/tint/builtins/gen/literal/textureDimensions/68105c.wgsl
similarity index 97%
rename from test/tint/builtins/gen/textureDimensions/68105c.wgsl
rename to test/tint/builtins/gen/literal/textureDimensions/68105c.wgsl
index c3ab22330f..ddac6b66ab 100644
--- a/test/tint/builtins/gen/textureDimensions/68105c.wgsl
+++ b/test/tint/builtins/gen/literal/textureDimensions/68105c.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/textureDimensions/68105c.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureDimensions/68105c.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/68105c.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/textureDimensions/68105c.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/textureDimensions/68105c.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/textureDimensions/68105c.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/68105c.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/textureDimensions/68105c.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/textureDimensions/68105c.wgsl.expected.msl b/test/tint/builtins/gen/literal/textureDimensions/68105c.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/68105c.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/textureDimensions/68105c.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/textureDimensions/68105c.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureDimensions/68105c.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/68105c.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/textureDimensions/68105c.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/textureDimensions/68105c.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/textureDimensions/68105c.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/68105c.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/textureDimensions/68105c.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/textureDimensions/686ef2.wgsl b/test/tint/builtins/gen/literal/textureDimensions/686ef2.wgsl
similarity index 97%
rename from test/tint/builtins/gen/textureDimensions/686ef2.wgsl
rename to test/tint/builtins/gen/literal/textureDimensions/686ef2.wgsl
index 36f10f4fa0..c85334c907 100644
--- a/test/tint/builtins/gen/textureDimensions/686ef2.wgsl
+++ b/test/tint/builtins/gen/literal/textureDimensions/686ef2.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/textureDimensions/686ef2.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureDimensions/686ef2.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/686ef2.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/textureDimensions/686ef2.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/textureDimensions/686ef2.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/textureDimensions/686ef2.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/686ef2.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/textureDimensions/686ef2.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/textureDimensions/686ef2.wgsl.expected.msl b/test/tint/builtins/gen/literal/textureDimensions/686ef2.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/686ef2.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/textureDimensions/686ef2.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/textureDimensions/686ef2.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureDimensions/686ef2.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/686ef2.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/textureDimensions/686ef2.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/textureDimensions/686ef2.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/textureDimensions/686ef2.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/686ef2.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/textureDimensions/686ef2.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/textureDimensions/6adac6.wgsl b/test/tint/builtins/gen/literal/textureDimensions/6adac6.wgsl
similarity index 97%
rename from test/tint/builtins/gen/textureDimensions/6adac6.wgsl
rename to test/tint/builtins/gen/literal/textureDimensions/6adac6.wgsl
index 4d454d13f0..d079cf96b7 100644
--- a/test/tint/builtins/gen/textureDimensions/6adac6.wgsl
+++ b/test/tint/builtins/gen/literal/textureDimensions/6adac6.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/textureDimensions/6adac6.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureDimensions/6adac6.wgsl.expected.glsl
similarity index 97%
rename from test/tint/builtins/gen/textureDimensions/6adac6.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/textureDimensions/6adac6.wgsl.expected.glsl
index 6ebb1cef6e..acaaa5adf0 100644
--- a/test/tint/builtins/gen/textureDimensions/6adac6.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureDimensions/6adac6.wgsl.expected.glsl
@@ -9,7 +9,7 @@ void textureDimensions_6adac6() {
 
 vec4 vertex_main() {
   textureDimensions_6adac6();
-  return vec4(0.0f, 0.0f, 0.0f, 0.0f);
+  return vec4(0.0f);
 }
 
 void main() {
diff --git a/test/tint/builtins/gen/textureDimensions/6adac6.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/textureDimensions/6adac6.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/6adac6.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/textureDimensions/6adac6.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/textureDimensions/6adac6.wgsl.expected.msl b/test/tint/builtins/gen/literal/textureDimensions/6adac6.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/6adac6.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/textureDimensions/6adac6.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/textureDimensions/6adac6.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureDimensions/6adac6.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/6adac6.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/textureDimensions/6adac6.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/textureDimensions/6adac6.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/textureDimensions/6adac6.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/6adac6.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/textureDimensions/6adac6.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/textureDimensions/6ec1b4.wgsl b/test/tint/builtins/gen/literal/textureDimensions/6ec1b4.wgsl
similarity index 97%
rename from test/tint/builtins/gen/textureDimensions/6ec1b4.wgsl
rename to test/tint/builtins/gen/literal/textureDimensions/6ec1b4.wgsl
index 71ea69ea1b..eaab1916bb 100644
--- a/test/tint/builtins/gen/textureDimensions/6ec1b4.wgsl
+++ b/test/tint/builtins/gen/literal/textureDimensions/6ec1b4.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/textureDimensions/6ec1b4.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureDimensions/6ec1b4.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/6ec1b4.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/textureDimensions/6ec1b4.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/textureDimensions/6ec1b4.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/textureDimensions/6ec1b4.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/6ec1b4.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/textureDimensions/6ec1b4.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/textureDimensions/6ec1b4.wgsl.expected.msl b/test/tint/builtins/gen/literal/textureDimensions/6ec1b4.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/6ec1b4.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/textureDimensions/6ec1b4.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/textureDimensions/6ec1b4.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureDimensions/6ec1b4.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/6ec1b4.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/textureDimensions/6ec1b4.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/textureDimensions/6ec1b4.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/textureDimensions/6ec1b4.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/6ec1b4.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/textureDimensions/6ec1b4.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/textureDimensions/6f0d79.wgsl b/test/tint/builtins/gen/literal/textureDimensions/6f0d79.wgsl
similarity index 97%
rename from test/tint/builtins/gen/textureDimensions/6f0d79.wgsl
rename to test/tint/builtins/gen/literal/textureDimensions/6f0d79.wgsl
index 0be50aa52f..05ff7506bd 100644
--- a/test/tint/builtins/gen/textureDimensions/6f0d79.wgsl
+++ b/test/tint/builtins/gen/literal/textureDimensions/6f0d79.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/textureDimensions/6f0d79.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureDimensions/6f0d79.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/6f0d79.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/textureDimensions/6f0d79.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/textureDimensions/6f0d79.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/textureDimensions/6f0d79.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/6f0d79.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/textureDimensions/6f0d79.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/textureDimensions/6f0d79.wgsl.expected.msl b/test/tint/builtins/gen/literal/textureDimensions/6f0d79.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/6f0d79.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/textureDimensions/6f0d79.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/textureDimensions/6f0d79.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureDimensions/6f0d79.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/6f0d79.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/textureDimensions/6f0d79.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/textureDimensions/6f0d79.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/textureDimensions/6f0d79.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/6f0d79.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/textureDimensions/6f0d79.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/textureDimensions/702c53.wgsl b/test/tint/builtins/gen/literal/textureDimensions/702c53.wgsl
similarity index 97%
rename from test/tint/builtins/gen/textureDimensions/702c53.wgsl
rename to test/tint/builtins/gen/literal/textureDimensions/702c53.wgsl
index 7b217b35bf..0673cb460d 100644
--- a/test/tint/builtins/gen/textureDimensions/702c53.wgsl
+++ b/test/tint/builtins/gen/literal/textureDimensions/702c53.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/textureDimensions/702c53.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureDimensions/702c53.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/702c53.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/textureDimensions/702c53.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/textureDimensions/702c53.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/textureDimensions/702c53.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/702c53.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/textureDimensions/702c53.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/textureDimensions/702c53.wgsl.expected.msl b/test/tint/builtins/gen/literal/textureDimensions/702c53.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/702c53.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/textureDimensions/702c53.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/textureDimensions/702c53.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureDimensions/702c53.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/702c53.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/textureDimensions/702c53.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/textureDimensions/702c53.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/textureDimensions/702c53.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/702c53.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/textureDimensions/702c53.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/textureDimensions/72e5d6.wgsl b/test/tint/builtins/gen/literal/textureDimensions/72e5d6.wgsl
similarity index 97%
rename from test/tint/builtins/gen/textureDimensions/72e5d6.wgsl
rename to test/tint/builtins/gen/literal/textureDimensions/72e5d6.wgsl
index ba2e7b00d1..997406c8cc 100644
--- a/test/tint/builtins/gen/textureDimensions/72e5d6.wgsl
+++ b/test/tint/builtins/gen/literal/textureDimensions/72e5d6.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/textureDimensions/72e5d6.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureDimensions/72e5d6.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/72e5d6.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/textureDimensions/72e5d6.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/textureDimensions/72e5d6.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/textureDimensions/72e5d6.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/72e5d6.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/textureDimensions/72e5d6.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/textureDimensions/72e5d6.wgsl.expected.msl b/test/tint/builtins/gen/literal/textureDimensions/72e5d6.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/72e5d6.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/textureDimensions/72e5d6.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/textureDimensions/72e5d6.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureDimensions/72e5d6.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/72e5d6.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/textureDimensions/72e5d6.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/textureDimensions/72e5d6.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/textureDimensions/72e5d6.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/72e5d6.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/textureDimensions/72e5d6.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/textureDimensions/79df87.wgsl b/test/tint/builtins/gen/literal/textureDimensions/79df87.wgsl
similarity index 97%
rename from test/tint/builtins/gen/textureDimensions/79df87.wgsl
rename to test/tint/builtins/gen/literal/textureDimensions/79df87.wgsl
index 2c05574653..1b70f6aa6a 100644
--- a/test/tint/builtins/gen/textureDimensions/79df87.wgsl
+++ b/test/tint/builtins/gen/literal/textureDimensions/79df87.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/textureDimensions/79df87.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureDimensions/79df87.wgsl.expected.glsl
similarity index 97%
rename from test/tint/builtins/gen/textureDimensions/79df87.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/textureDimensions/79df87.wgsl.expected.glsl
index b8ee4b2a7c..b7ee7fd681 100644
--- a/test/tint/builtins/gen/textureDimensions/79df87.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureDimensions/79df87.wgsl.expected.glsl
@@ -9,7 +9,7 @@ void textureDimensions_79df87() {
 
 vec4 vertex_main() {
   textureDimensions_79df87();
-  return vec4(0.0f, 0.0f, 0.0f, 0.0f);
+  return vec4(0.0f);
 }
 
 void main() {
diff --git a/test/tint/builtins/gen/textureDimensions/79df87.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/textureDimensions/79df87.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/79df87.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/textureDimensions/79df87.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/textureDimensions/79df87.wgsl.expected.msl b/test/tint/builtins/gen/literal/textureDimensions/79df87.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/79df87.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/textureDimensions/79df87.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/textureDimensions/79df87.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureDimensions/79df87.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/79df87.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/textureDimensions/79df87.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/textureDimensions/79df87.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/textureDimensions/79df87.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/79df87.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/textureDimensions/79df87.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/textureDimensions/7bf826.wgsl b/test/tint/builtins/gen/literal/textureDimensions/7bf826.wgsl
similarity index 97%
rename from test/tint/builtins/gen/textureDimensions/7bf826.wgsl
rename to test/tint/builtins/gen/literal/textureDimensions/7bf826.wgsl
index 6a2f24a8ee..6297e5a335 100644
--- a/test/tint/builtins/gen/textureDimensions/7bf826.wgsl
+++ b/test/tint/builtins/gen/literal/textureDimensions/7bf826.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/textureDimensions/7bf826.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureDimensions/7bf826.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/7bf826.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/textureDimensions/7bf826.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/textureDimensions/7bf826.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/textureDimensions/7bf826.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/7bf826.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/textureDimensions/7bf826.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/textureDimensions/7bf826.wgsl.expected.msl b/test/tint/builtins/gen/literal/textureDimensions/7bf826.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/7bf826.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/textureDimensions/7bf826.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/textureDimensions/7bf826.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureDimensions/7bf826.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/7bf826.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/textureDimensions/7bf826.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/textureDimensions/7bf826.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/textureDimensions/7bf826.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/7bf826.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/textureDimensions/7bf826.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/textureDimensions/7f5c2e.wgsl b/test/tint/builtins/gen/literal/textureDimensions/7f5c2e.wgsl
similarity index 97%
rename from test/tint/builtins/gen/textureDimensions/7f5c2e.wgsl
rename to test/tint/builtins/gen/literal/textureDimensions/7f5c2e.wgsl
index 18bce03db4..97ce4ddafd 100644
--- a/test/tint/builtins/gen/textureDimensions/7f5c2e.wgsl
+++ b/test/tint/builtins/gen/literal/textureDimensions/7f5c2e.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/textureDimensions/7f5c2e.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureDimensions/7f5c2e.wgsl.expected.glsl
similarity index 97%
rename from test/tint/builtins/gen/textureDimensions/7f5c2e.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/textureDimensions/7f5c2e.wgsl.expected.glsl
index 4e93c77924..ed85e7deb1 100644
--- a/test/tint/builtins/gen/textureDimensions/7f5c2e.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureDimensions/7f5c2e.wgsl.expected.glsl
@@ -9,7 +9,7 @@ void textureDimensions_7f5c2e() {
 
 vec4 vertex_main() {
   textureDimensions_7f5c2e();
-  return vec4(0.0f, 0.0f, 0.0f, 0.0f);
+  return vec4(0.0f);
 }
 
 void main() {
diff --git a/test/tint/builtins/gen/textureDimensions/7f5c2e.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/textureDimensions/7f5c2e.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/7f5c2e.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/textureDimensions/7f5c2e.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/textureDimensions/7f5c2e.wgsl.expected.msl b/test/tint/builtins/gen/literal/textureDimensions/7f5c2e.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/7f5c2e.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/textureDimensions/7f5c2e.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/textureDimensions/7f5c2e.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureDimensions/7f5c2e.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/7f5c2e.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/textureDimensions/7f5c2e.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/textureDimensions/7f5c2e.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/textureDimensions/7f5c2e.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/7f5c2e.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/textureDimensions/7f5c2e.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/textureDimensions/8028f3.wgsl b/test/tint/builtins/gen/literal/textureDimensions/8028f3.wgsl
similarity index 97%
rename from test/tint/builtins/gen/textureDimensions/8028f3.wgsl
rename to test/tint/builtins/gen/literal/textureDimensions/8028f3.wgsl
index b67521333e..b478fa2d96 100644
--- a/test/tint/builtins/gen/textureDimensions/8028f3.wgsl
+++ b/test/tint/builtins/gen/literal/textureDimensions/8028f3.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/textureDimensions/8028f3.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureDimensions/8028f3.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/8028f3.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/textureDimensions/8028f3.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/textureDimensions/8028f3.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/textureDimensions/8028f3.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/8028f3.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/textureDimensions/8028f3.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/textureDimensions/8028f3.wgsl.expected.msl b/test/tint/builtins/gen/literal/textureDimensions/8028f3.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/8028f3.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/textureDimensions/8028f3.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/textureDimensions/8028f3.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureDimensions/8028f3.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/8028f3.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/textureDimensions/8028f3.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/textureDimensions/8028f3.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/textureDimensions/8028f3.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/8028f3.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/textureDimensions/8028f3.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/textureDimensions/811679.wgsl b/test/tint/builtins/gen/literal/textureDimensions/811679.wgsl
similarity index 97%
rename from test/tint/builtins/gen/textureDimensions/811679.wgsl
rename to test/tint/builtins/gen/literal/textureDimensions/811679.wgsl
index 9223f56065..7d7722d4f0 100644
--- a/test/tint/builtins/gen/textureDimensions/811679.wgsl
+++ b/test/tint/builtins/gen/literal/textureDimensions/811679.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/textureDimensions/811679.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureDimensions/811679.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/811679.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/textureDimensions/811679.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/textureDimensions/811679.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/textureDimensions/811679.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/811679.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/textureDimensions/811679.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/textureDimensions/811679.wgsl.expected.msl b/test/tint/builtins/gen/literal/textureDimensions/811679.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/811679.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/textureDimensions/811679.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/textureDimensions/811679.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureDimensions/811679.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/811679.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/textureDimensions/811679.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/textureDimensions/811679.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/textureDimensions/811679.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/811679.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/textureDimensions/811679.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/textureDimensions/820596.wgsl b/test/tint/builtins/gen/literal/textureDimensions/820596.wgsl
similarity index 97%
rename from test/tint/builtins/gen/textureDimensions/820596.wgsl
rename to test/tint/builtins/gen/literal/textureDimensions/820596.wgsl
index a6ff78299e..8ec3269dce 100644
--- a/test/tint/builtins/gen/textureDimensions/820596.wgsl
+++ b/test/tint/builtins/gen/literal/textureDimensions/820596.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/textureDimensions/820596.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureDimensions/820596.wgsl.expected.glsl
similarity index 97%
rename from test/tint/builtins/gen/textureDimensions/820596.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/textureDimensions/820596.wgsl.expected.glsl
index 7dc7763c22..12ee4ecbbe 100644
--- a/test/tint/builtins/gen/textureDimensions/820596.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureDimensions/820596.wgsl.expected.glsl
@@ -9,7 +9,7 @@ void textureDimensions_820596() {
 
 vec4 vertex_main() {
   textureDimensions_820596();
-  return vec4(0.0f, 0.0f, 0.0f, 0.0f);
+  return vec4(0.0f);
 }
 
 void main() {
diff --git a/test/tint/builtins/gen/textureDimensions/820596.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/textureDimensions/820596.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/820596.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/textureDimensions/820596.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/textureDimensions/820596.wgsl.expected.msl b/test/tint/builtins/gen/literal/textureDimensions/820596.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/820596.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/textureDimensions/820596.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/textureDimensions/820596.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureDimensions/820596.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/820596.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/textureDimensions/820596.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/textureDimensions/820596.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/textureDimensions/820596.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/820596.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/textureDimensions/820596.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/textureDimensions/83ee5a.wgsl b/test/tint/builtins/gen/literal/textureDimensions/83ee5a.wgsl
similarity index 97%
rename from test/tint/builtins/gen/textureDimensions/83ee5a.wgsl
rename to test/tint/builtins/gen/literal/textureDimensions/83ee5a.wgsl
index 3ac74e8222..bdd0b53c32 100644
--- a/test/tint/builtins/gen/textureDimensions/83ee5a.wgsl
+++ b/test/tint/builtins/gen/literal/textureDimensions/83ee5a.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/textureDimensions/83ee5a.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureDimensions/83ee5a.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/83ee5a.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/textureDimensions/83ee5a.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/textureDimensions/83ee5a.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/textureDimensions/83ee5a.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/83ee5a.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/textureDimensions/83ee5a.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/textureDimensions/83ee5a.wgsl.expected.msl b/test/tint/builtins/gen/literal/textureDimensions/83ee5a.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/83ee5a.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/textureDimensions/83ee5a.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/textureDimensions/83ee5a.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureDimensions/83ee5a.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/83ee5a.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/textureDimensions/83ee5a.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/textureDimensions/83ee5a.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/textureDimensions/83ee5a.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/83ee5a.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/textureDimensions/83ee5a.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/textureDimensions/85d556.wgsl b/test/tint/builtins/gen/literal/textureDimensions/85d556.wgsl
similarity index 97%
rename from test/tint/builtins/gen/textureDimensions/85d556.wgsl
rename to test/tint/builtins/gen/literal/textureDimensions/85d556.wgsl
index 628e35c92b..18cf513ca1 100644
--- a/test/tint/builtins/gen/textureDimensions/85d556.wgsl
+++ b/test/tint/builtins/gen/literal/textureDimensions/85d556.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/textureDimensions/85d556.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureDimensions/85d556.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/85d556.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/textureDimensions/85d556.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/textureDimensions/85d556.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/textureDimensions/85d556.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/85d556.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/textureDimensions/85d556.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/textureDimensions/85d556.wgsl.expected.msl b/test/tint/builtins/gen/literal/textureDimensions/85d556.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/85d556.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/textureDimensions/85d556.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/textureDimensions/85d556.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureDimensions/85d556.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/85d556.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/textureDimensions/85d556.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/textureDimensions/85d556.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/textureDimensions/85d556.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/85d556.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/textureDimensions/85d556.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/textureDimensions/88ad17.wgsl b/test/tint/builtins/gen/literal/textureDimensions/88ad17.wgsl
similarity index 97%
rename from test/tint/builtins/gen/textureDimensions/88ad17.wgsl
rename to test/tint/builtins/gen/literal/textureDimensions/88ad17.wgsl
index 79eef6f98e..88f43f8945 100644
--- a/test/tint/builtins/gen/textureDimensions/88ad17.wgsl
+++ b/test/tint/builtins/gen/literal/textureDimensions/88ad17.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/textureDimensions/88ad17.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureDimensions/88ad17.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/88ad17.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/textureDimensions/88ad17.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/textureDimensions/88ad17.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/textureDimensions/88ad17.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/88ad17.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/textureDimensions/88ad17.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/textureDimensions/88ad17.wgsl.expected.msl b/test/tint/builtins/gen/literal/textureDimensions/88ad17.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/88ad17.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/textureDimensions/88ad17.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/textureDimensions/88ad17.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureDimensions/88ad17.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/88ad17.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/textureDimensions/88ad17.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/textureDimensions/88ad17.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/textureDimensions/88ad17.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/88ad17.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/textureDimensions/88ad17.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/textureDimensions/8aa4c4.wgsl b/test/tint/builtins/gen/literal/textureDimensions/8aa4c4.wgsl
similarity index 97%
rename from test/tint/builtins/gen/textureDimensions/8aa4c4.wgsl
rename to test/tint/builtins/gen/literal/textureDimensions/8aa4c4.wgsl
index 4dd29cf257..4468f2676d 100644
--- a/test/tint/builtins/gen/textureDimensions/8aa4c4.wgsl
+++ b/test/tint/builtins/gen/literal/textureDimensions/8aa4c4.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/textureDimensions/8aa4c4.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureDimensions/8aa4c4.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/8aa4c4.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/textureDimensions/8aa4c4.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/textureDimensions/8aa4c4.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/textureDimensions/8aa4c4.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/8aa4c4.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/textureDimensions/8aa4c4.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/textureDimensions/8aa4c4.wgsl.expected.msl b/test/tint/builtins/gen/literal/textureDimensions/8aa4c4.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/8aa4c4.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/textureDimensions/8aa4c4.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/textureDimensions/8aa4c4.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureDimensions/8aa4c4.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/8aa4c4.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/textureDimensions/8aa4c4.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/textureDimensions/8aa4c4.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/textureDimensions/8aa4c4.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/8aa4c4.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/textureDimensions/8aa4c4.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/textureDimensions/8deb5e.wgsl b/test/tint/builtins/gen/literal/textureDimensions/8deb5e.wgsl
similarity index 97%
rename from test/tint/builtins/gen/textureDimensions/8deb5e.wgsl
rename to test/tint/builtins/gen/literal/textureDimensions/8deb5e.wgsl
index d885845bb8..de87126016 100644
--- a/test/tint/builtins/gen/textureDimensions/8deb5e.wgsl
+++ b/test/tint/builtins/gen/literal/textureDimensions/8deb5e.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/textureDimensions/8deb5e.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureDimensions/8deb5e.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/8deb5e.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/textureDimensions/8deb5e.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/textureDimensions/8deb5e.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/textureDimensions/8deb5e.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/8deb5e.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/textureDimensions/8deb5e.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/textureDimensions/8deb5e.wgsl.expected.msl b/test/tint/builtins/gen/literal/textureDimensions/8deb5e.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/8deb5e.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/textureDimensions/8deb5e.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/textureDimensions/8deb5e.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureDimensions/8deb5e.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/8deb5e.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/textureDimensions/8deb5e.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/textureDimensions/8deb5e.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/textureDimensions/8deb5e.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/8deb5e.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/textureDimensions/8deb5e.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/textureDimensions/8f20bf.wgsl b/test/tint/builtins/gen/literal/textureDimensions/8f20bf.wgsl
similarity index 97%
rename from test/tint/builtins/gen/textureDimensions/8f20bf.wgsl
rename to test/tint/builtins/gen/literal/textureDimensions/8f20bf.wgsl
index 1af7247a8d..ba505967cf 100644
--- a/test/tint/builtins/gen/textureDimensions/8f20bf.wgsl
+++ b/test/tint/builtins/gen/literal/textureDimensions/8f20bf.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/textureDimensions/8f20bf.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureDimensions/8f20bf.wgsl.expected.glsl
similarity index 97%
rename from test/tint/builtins/gen/textureDimensions/8f20bf.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/textureDimensions/8f20bf.wgsl.expected.glsl
index 5c2fdc6d08..a01eead6eb 100644
--- a/test/tint/builtins/gen/textureDimensions/8f20bf.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureDimensions/8f20bf.wgsl.expected.glsl
@@ -9,7 +9,7 @@ void textureDimensions_8f20bf() {
 
 vec4 vertex_main() {
   textureDimensions_8f20bf();
-  return vec4(0.0f, 0.0f, 0.0f, 0.0f);
+  return vec4(0.0f);
 }
 
 void main() {
diff --git a/test/tint/builtins/gen/textureDimensions/8f20bf.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/textureDimensions/8f20bf.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/8f20bf.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/textureDimensions/8f20bf.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/textureDimensions/8f20bf.wgsl.expected.msl b/test/tint/builtins/gen/literal/textureDimensions/8f20bf.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/8f20bf.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/textureDimensions/8f20bf.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/textureDimensions/8f20bf.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureDimensions/8f20bf.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/8f20bf.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/textureDimensions/8f20bf.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/textureDimensions/8f20bf.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/textureDimensions/8f20bf.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/8f20bf.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/textureDimensions/8f20bf.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/textureDimensions/8fca0f.wgsl b/test/tint/builtins/gen/literal/textureDimensions/8fca0f.wgsl
similarity index 97%
rename from test/tint/builtins/gen/textureDimensions/8fca0f.wgsl
rename to test/tint/builtins/gen/literal/textureDimensions/8fca0f.wgsl
index a7cd8cf791..ca949de724 100644
--- a/test/tint/builtins/gen/textureDimensions/8fca0f.wgsl
+++ b/test/tint/builtins/gen/literal/textureDimensions/8fca0f.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/textureDimensions/8fca0f.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureDimensions/8fca0f.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/8fca0f.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/textureDimensions/8fca0f.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/textureDimensions/8fca0f.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/textureDimensions/8fca0f.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/8fca0f.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/textureDimensions/8fca0f.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/textureDimensions/8fca0f.wgsl.expected.msl b/test/tint/builtins/gen/literal/textureDimensions/8fca0f.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/8fca0f.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/textureDimensions/8fca0f.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/textureDimensions/8fca0f.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureDimensions/8fca0f.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/8fca0f.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/textureDimensions/8fca0f.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/textureDimensions/8fca0f.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/textureDimensions/8fca0f.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/8fca0f.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/textureDimensions/8fca0f.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/textureDimensions/90340b.wgsl b/test/tint/builtins/gen/literal/textureDimensions/90340b.wgsl
similarity index 97%
rename from test/tint/builtins/gen/textureDimensions/90340b.wgsl
rename to test/tint/builtins/gen/literal/textureDimensions/90340b.wgsl
index 842621eb48..4acb1f6412 100644
--- a/test/tint/builtins/gen/textureDimensions/90340b.wgsl
+++ b/test/tint/builtins/gen/literal/textureDimensions/90340b.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/textureDimensions/90340b.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureDimensions/90340b.wgsl.expected.glsl
similarity index 97%
rename from test/tint/builtins/gen/textureDimensions/90340b.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/textureDimensions/90340b.wgsl.expected.glsl
index 142ad6144c..09d10eb7bb 100644
--- a/test/tint/builtins/gen/textureDimensions/90340b.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureDimensions/90340b.wgsl.expected.glsl
@@ -9,7 +9,7 @@ void textureDimensions_90340b() {
 
 vec4 vertex_main() {
   textureDimensions_90340b();
-  return vec4(0.0f, 0.0f, 0.0f, 0.0f);
+  return vec4(0.0f);
 }
 
 void main() {
diff --git a/test/tint/builtins/gen/textureDimensions/90340b.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/textureDimensions/90340b.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/90340b.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/textureDimensions/90340b.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/textureDimensions/90340b.wgsl.expected.msl b/test/tint/builtins/gen/literal/textureDimensions/90340b.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/90340b.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/textureDimensions/90340b.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/textureDimensions/90340b.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureDimensions/90340b.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/90340b.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/textureDimensions/90340b.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/textureDimensions/90340b.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/textureDimensions/90340b.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/90340b.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/textureDimensions/90340b.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/textureDimensions/9042ab.wgsl b/test/tint/builtins/gen/literal/textureDimensions/9042ab.wgsl
similarity index 97%
rename from test/tint/builtins/gen/textureDimensions/9042ab.wgsl
rename to test/tint/builtins/gen/literal/textureDimensions/9042ab.wgsl
index fbdaabe363..6365cba61e 100644
--- a/test/tint/builtins/gen/textureDimensions/9042ab.wgsl
+++ b/test/tint/builtins/gen/literal/textureDimensions/9042ab.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/textureDimensions/9042ab.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureDimensions/9042ab.wgsl.expected.glsl
similarity index 97%
rename from test/tint/builtins/gen/textureDimensions/9042ab.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/textureDimensions/9042ab.wgsl.expected.glsl
index b0f3eac068..1fb6520aad 100644
--- a/test/tint/builtins/gen/textureDimensions/9042ab.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureDimensions/9042ab.wgsl.expected.glsl
@@ -9,7 +9,7 @@ void textureDimensions_9042ab() {
 
 vec4 vertex_main() {
   textureDimensions_9042ab();
-  return vec4(0.0f, 0.0f, 0.0f, 0.0f);
+  return vec4(0.0f);
 }
 
 void main() {
diff --git a/test/tint/builtins/gen/textureDimensions/9042ab.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/textureDimensions/9042ab.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/9042ab.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/textureDimensions/9042ab.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/textureDimensions/9042ab.wgsl.expected.msl b/test/tint/builtins/gen/literal/textureDimensions/9042ab.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/9042ab.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/textureDimensions/9042ab.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/textureDimensions/9042ab.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureDimensions/9042ab.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/9042ab.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/textureDimensions/9042ab.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/textureDimensions/9042ab.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/textureDimensions/9042ab.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/9042ab.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/textureDimensions/9042ab.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/textureDimensions/9393b0.wgsl b/test/tint/builtins/gen/literal/textureDimensions/9393b0.wgsl
similarity index 97%
rename from test/tint/builtins/gen/textureDimensions/9393b0.wgsl
rename to test/tint/builtins/gen/literal/textureDimensions/9393b0.wgsl
index 0f6af45b3c..3247df59a4 100644
--- a/test/tint/builtins/gen/textureDimensions/9393b0.wgsl
+++ b/test/tint/builtins/gen/literal/textureDimensions/9393b0.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/textureDimensions/9393b0.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureDimensions/9393b0.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/9393b0.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/textureDimensions/9393b0.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/textureDimensions/9393b0.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/textureDimensions/9393b0.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/9393b0.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/textureDimensions/9393b0.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/textureDimensions/9393b0.wgsl.expected.msl b/test/tint/builtins/gen/literal/textureDimensions/9393b0.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/9393b0.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/textureDimensions/9393b0.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/textureDimensions/9393b0.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureDimensions/9393b0.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/9393b0.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/textureDimensions/9393b0.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/textureDimensions/9393b0.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/textureDimensions/9393b0.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/9393b0.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/textureDimensions/9393b0.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/textureDimensions/939fdb.wgsl b/test/tint/builtins/gen/literal/textureDimensions/939fdb.wgsl
similarity index 97%
rename from test/tint/builtins/gen/textureDimensions/939fdb.wgsl
rename to test/tint/builtins/gen/literal/textureDimensions/939fdb.wgsl
index 591453207a..9852d37cf8 100644
--- a/test/tint/builtins/gen/textureDimensions/939fdb.wgsl
+++ b/test/tint/builtins/gen/literal/textureDimensions/939fdb.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/textureDimensions/939fdb.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureDimensions/939fdb.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/939fdb.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/textureDimensions/939fdb.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/textureDimensions/939fdb.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/textureDimensions/939fdb.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/939fdb.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/textureDimensions/939fdb.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/textureDimensions/939fdb.wgsl.expected.msl b/test/tint/builtins/gen/literal/textureDimensions/939fdb.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/939fdb.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/textureDimensions/939fdb.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/textureDimensions/939fdb.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureDimensions/939fdb.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/939fdb.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/textureDimensions/939fdb.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/textureDimensions/939fdb.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/textureDimensions/939fdb.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/939fdb.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/textureDimensions/939fdb.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/textureDimensions/962dcd.wgsl b/test/tint/builtins/gen/literal/textureDimensions/962dcd.wgsl
similarity index 97%
rename from test/tint/builtins/gen/textureDimensions/962dcd.wgsl
rename to test/tint/builtins/gen/literal/textureDimensions/962dcd.wgsl
index 5f248250c6..fddb8289a4 100644
--- a/test/tint/builtins/gen/textureDimensions/962dcd.wgsl
+++ b/test/tint/builtins/gen/literal/textureDimensions/962dcd.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/textureDimensions/962dcd.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureDimensions/962dcd.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/962dcd.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/textureDimensions/962dcd.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/textureDimensions/962dcd.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/textureDimensions/962dcd.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/962dcd.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/textureDimensions/962dcd.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/textureDimensions/962dcd.wgsl.expected.msl b/test/tint/builtins/gen/literal/textureDimensions/962dcd.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/962dcd.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/textureDimensions/962dcd.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/textureDimensions/962dcd.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureDimensions/962dcd.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/962dcd.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/textureDimensions/962dcd.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/textureDimensions/962dcd.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/textureDimensions/962dcd.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/962dcd.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/textureDimensions/962dcd.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/textureDimensions/9abfe5.wgsl b/test/tint/builtins/gen/literal/textureDimensions/9abfe5.wgsl
similarity index 97%
rename from test/tint/builtins/gen/textureDimensions/9abfe5.wgsl
rename to test/tint/builtins/gen/literal/textureDimensions/9abfe5.wgsl
index 08c18fd6e8..4fea70cd28 100644
--- a/test/tint/builtins/gen/textureDimensions/9abfe5.wgsl
+++ b/test/tint/builtins/gen/literal/textureDimensions/9abfe5.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/textureDimensions/9abfe5.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureDimensions/9abfe5.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/9abfe5.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/textureDimensions/9abfe5.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/textureDimensions/9abfe5.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/textureDimensions/9abfe5.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/9abfe5.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/textureDimensions/9abfe5.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/textureDimensions/9abfe5.wgsl.expected.msl b/test/tint/builtins/gen/literal/textureDimensions/9abfe5.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/9abfe5.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/textureDimensions/9abfe5.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/textureDimensions/9abfe5.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureDimensions/9abfe5.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/9abfe5.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/textureDimensions/9abfe5.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/textureDimensions/9abfe5.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/textureDimensions/9abfe5.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/9abfe5.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/textureDimensions/9abfe5.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/textureDimensions/9c9c57.wgsl b/test/tint/builtins/gen/literal/textureDimensions/9c9c57.wgsl
similarity index 97%
rename from test/tint/builtins/gen/textureDimensions/9c9c57.wgsl
rename to test/tint/builtins/gen/literal/textureDimensions/9c9c57.wgsl
index 1ea3761b12..93cee591bf 100644
--- a/test/tint/builtins/gen/textureDimensions/9c9c57.wgsl
+++ b/test/tint/builtins/gen/literal/textureDimensions/9c9c57.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/textureDimensions/9c9c57.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureDimensions/9c9c57.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/9c9c57.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/textureDimensions/9c9c57.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/textureDimensions/9c9c57.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/textureDimensions/9c9c57.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/9c9c57.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/textureDimensions/9c9c57.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/textureDimensions/9c9c57.wgsl.expected.msl b/test/tint/builtins/gen/literal/textureDimensions/9c9c57.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/9c9c57.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/textureDimensions/9c9c57.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/textureDimensions/9c9c57.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureDimensions/9c9c57.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/9c9c57.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/textureDimensions/9c9c57.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/textureDimensions/9c9c57.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/textureDimensions/9c9c57.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/9c9c57.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/textureDimensions/9c9c57.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/textureDimensions/9da9e2.wgsl b/test/tint/builtins/gen/literal/textureDimensions/9da9e2.wgsl
similarity index 97%
rename from test/tint/builtins/gen/textureDimensions/9da9e2.wgsl
rename to test/tint/builtins/gen/literal/textureDimensions/9da9e2.wgsl
index 96b2672b66..05e9f02a72 100644
--- a/test/tint/builtins/gen/textureDimensions/9da9e2.wgsl
+++ b/test/tint/builtins/gen/literal/textureDimensions/9da9e2.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/textureDimensions/9da9e2.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureDimensions/9da9e2.wgsl.expected.glsl
similarity index 97%
rename from test/tint/builtins/gen/textureDimensions/9da9e2.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/textureDimensions/9da9e2.wgsl.expected.glsl
index 52e2d90767..5773b40625 100644
--- a/test/tint/builtins/gen/textureDimensions/9da9e2.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureDimensions/9da9e2.wgsl.expected.glsl
@@ -9,7 +9,7 @@ void textureDimensions_9da9e2() {
 
 vec4 vertex_main() {
   textureDimensions_9da9e2();
-  return vec4(0.0f, 0.0f, 0.0f, 0.0f);
+  return vec4(0.0f);
 }
 
 void main() {
diff --git a/test/tint/builtins/gen/textureDimensions/9da9e2.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/textureDimensions/9da9e2.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/9da9e2.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/textureDimensions/9da9e2.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/textureDimensions/9da9e2.wgsl.expected.msl b/test/tint/builtins/gen/literal/textureDimensions/9da9e2.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/9da9e2.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/textureDimensions/9da9e2.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/textureDimensions/9da9e2.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureDimensions/9da9e2.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/9da9e2.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/textureDimensions/9da9e2.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/textureDimensions/9da9e2.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/textureDimensions/9da9e2.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/9da9e2.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/textureDimensions/9da9e2.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/textureDimensions/9eb8d8.wgsl b/test/tint/builtins/gen/literal/textureDimensions/9eb8d8.wgsl
similarity index 97%
rename from test/tint/builtins/gen/textureDimensions/9eb8d8.wgsl
rename to test/tint/builtins/gen/literal/textureDimensions/9eb8d8.wgsl
index c2805cfbcf..8a3f461c91 100644
--- a/test/tint/builtins/gen/textureDimensions/9eb8d8.wgsl
+++ b/test/tint/builtins/gen/literal/textureDimensions/9eb8d8.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/textureDimensions/9eb8d8.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureDimensions/9eb8d8.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/9eb8d8.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/textureDimensions/9eb8d8.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/textureDimensions/9eb8d8.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/textureDimensions/9eb8d8.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/9eb8d8.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/textureDimensions/9eb8d8.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/textureDimensions/9eb8d8.wgsl.expected.msl b/test/tint/builtins/gen/literal/textureDimensions/9eb8d8.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/9eb8d8.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/textureDimensions/9eb8d8.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/textureDimensions/9eb8d8.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureDimensions/9eb8d8.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/9eb8d8.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/textureDimensions/9eb8d8.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/textureDimensions/9eb8d8.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/textureDimensions/9eb8d8.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/9eb8d8.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/textureDimensions/9eb8d8.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/textureDimensions/9f8e46.wgsl b/test/tint/builtins/gen/literal/textureDimensions/9f8e46.wgsl
similarity index 97%
rename from test/tint/builtins/gen/textureDimensions/9f8e46.wgsl
rename to test/tint/builtins/gen/literal/textureDimensions/9f8e46.wgsl
index 810ecd5349..c2caccf29d 100644
--- a/test/tint/builtins/gen/textureDimensions/9f8e46.wgsl
+++ b/test/tint/builtins/gen/literal/textureDimensions/9f8e46.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/textureDimensions/9f8e46.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureDimensions/9f8e46.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/9f8e46.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/textureDimensions/9f8e46.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/textureDimensions/9f8e46.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/textureDimensions/9f8e46.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/9f8e46.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/textureDimensions/9f8e46.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/textureDimensions/9f8e46.wgsl.expected.msl b/test/tint/builtins/gen/literal/textureDimensions/9f8e46.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/9f8e46.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/textureDimensions/9f8e46.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/textureDimensions/9f8e46.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureDimensions/9f8e46.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/9f8e46.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/textureDimensions/9f8e46.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/textureDimensions/9f8e46.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/textureDimensions/9f8e46.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/9f8e46.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/textureDimensions/9f8e46.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/textureDimensions/a01845.wgsl b/test/tint/builtins/gen/literal/textureDimensions/a01845.wgsl
similarity index 97%
rename from test/tint/builtins/gen/textureDimensions/a01845.wgsl
rename to test/tint/builtins/gen/literal/textureDimensions/a01845.wgsl
index a3e1c14f09..96e2e3e082 100644
--- a/test/tint/builtins/gen/textureDimensions/a01845.wgsl
+++ b/test/tint/builtins/gen/literal/textureDimensions/a01845.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/textureDimensions/a01845.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureDimensions/a01845.wgsl.expected.glsl
similarity index 97%
rename from test/tint/builtins/gen/textureDimensions/a01845.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/textureDimensions/a01845.wgsl.expected.glsl
index 691b98c65c..5be0e3e1bc 100644
--- a/test/tint/builtins/gen/textureDimensions/a01845.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureDimensions/a01845.wgsl.expected.glsl
@@ -9,7 +9,7 @@ void textureDimensions_a01845() {
 
 vec4 vertex_main() {
   textureDimensions_a01845();
-  return vec4(0.0f, 0.0f, 0.0f, 0.0f);
+  return vec4(0.0f);
 }
 
 void main() {
diff --git a/test/tint/builtins/gen/textureDimensions/a01845.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/textureDimensions/a01845.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/a01845.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/textureDimensions/a01845.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/textureDimensions/a01845.wgsl.expected.msl b/test/tint/builtins/gen/literal/textureDimensions/a01845.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/a01845.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/textureDimensions/a01845.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/textureDimensions/a01845.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureDimensions/a01845.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/a01845.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/textureDimensions/a01845.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/textureDimensions/a01845.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/textureDimensions/a01845.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/a01845.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/textureDimensions/a01845.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/textureDimensions/a7d565.wgsl b/test/tint/builtins/gen/literal/textureDimensions/a7d565.wgsl
similarity index 97%
rename from test/tint/builtins/gen/textureDimensions/a7d565.wgsl
rename to test/tint/builtins/gen/literal/textureDimensions/a7d565.wgsl
index 904dbce36e..2559f773d8 100644
--- a/test/tint/builtins/gen/textureDimensions/a7d565.wgsl
+++ b/test/tint/builtins/gen/literal/textureDimensions/a7d565.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/textureDimensions/a7d565.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureDimensions/a7d565.wgsl.expected.glsl
similarity index 97%
rename from test/tint/builtins/gen/textureDimensions/a7d565.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/textureDimensions/a7d565.wgsl.expected.glsl
index e92841e967..24152c71b7 100644
--- a/test/tint/builtins/gen/textureDimensions/a7d565.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureDimensions/a7d565.wgsl.expected.glsl
@@ -9,7 +9,7 @@ void textureDimensions_a7d565() {
 
 vec4 vertex_main() {
   textureDimensions_a7d565();
-  return vec4(0.0f, 0.0f, 0.0f, 0.0f);
+  return vec4(0.0f);
 }
 
 void main() {
diff --git a/test/tint/builtins/gen/textureDimensions/a7d565.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/textureDimensions/a7d565.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/a7d565.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/textureDimensions/a7d565.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/textureDimensions/a7d565.wgsl.expected.msl b/test/tint/builtins/gen/literal/textureDimensions/a7d565.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/a7d565.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/textureDimensions/a7d565.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/textureDimensions/a7d565.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureDimensions/a7d565.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/a7d565.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/textureDimensions/a7d565.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/textureDimensions/a7d565.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/textureDimensions/a7d565.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/a7d565.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/textureDimensions/a7d565.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/textureDimensions/a863f2.wgsl b/test/tint/builtins/gen/literal/textureDimensions/a863f2.wgsl
similarity index 97%
rename from test/tint/builtins/gen/textureDimensions/a863f2.wgsl
rename to test/tint/builtins/gen/literal/textureDimensions/a863f2.wgsl
index 6b5fdac25e..d88716e58e 100644
--- a/test/tint/builtins/gen/textureDimensions/a863f2.wgsl
+++ b/test/tint/builtins/gen/literal/textureDimensions/a863f2.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/textureDimensions/a863f2.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureDimensions/a863f2.wgsl.expected.glsl
similarity index 97%
rename from test/tint/builtins/gen/textureDimensions/a863f2.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/textureDimensions/a863f2.wgsl.expected.glsl
index b14d6439ea..b157dd9015 100644
--- a/test/tint/builtins/gen/textureDimensions/a863f2.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureDimensions/a863f2.wgsl.expected.glsl
@@ -9,7 +9,7 @@ void textureDimensions_a863f2() {
 
 vec4 vertex_main() {
   textureDimensions_a863f2();
-  return vec4(0.0f, 0.0f, 0.0f, 0.0f);
+  return vec4(0.0f);
 }
 
 void main() {
diff --git a/test/tint/builtins/gen/textureDimensions/a863f2.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/textureDimensions/a863f2.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/a863f2.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/textureDimensions/a863f2.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/textureDimensions/a863f2.wgsl.expected.msl b/test/tint/builtins/gen/literal/textureDimensions/a863f2.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/a863f2.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/textureDimensions/a863f2.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/textureDimensions/a863f2.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureDimensions/a863f2.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/a863f2.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/textureDimensions/a863f2.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/textureDimensions/a863f2.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/textureDimensions/a863f2.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/a863f2.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/textureDimensions/a863f2.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/textureDimensions/a9c9c1.wgsl b/test/tint/builtins/gen/literal/textureDimensions/a9c9c1.wgsl
similarity index 97%
rename from test/tint/builtins/gen/textureDimensions/a9c9c1.wgsl
rename to test/tint/builtins/gen/literal/textureDimensions/a9c9c1.wgsl
index 19cd6e114a..dfc597876b 100644
--- a/test/tint/builtins/gen/textureDimensions/a9c9c1.wgsl
+++ b/test/tint/builtins/gen/literal/textureDimensions/a9c9c1.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/textureDimensions/a9c9c1.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureDimensions/a9c9c1.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/a9c9c1.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/textureDimensions/a9c9c1.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/textureDimensions/a9c9c1.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/textureDimensions/a9c9c1.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/a9c9c1.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/textureDimensions/a9c9c1.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/textureDimensions/a9c9c1.wgsl.expected.msl b/test/tint/builtins/gen/literal/textureDimensions/a9c9c1.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/a9c9c1.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/textureDimensions/a9c9c1.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/textureDimensions/a9c9c1.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureDimensions/a9c9c1.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/a9c9c1.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/textureDimensions/a9c9c1.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/textureDimensions/a9c9c1.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/textureDimensions/a9c9c1.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/a9c9c1.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/textureDimensions/a9c9c1.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/textureDimensions/b0e16d.wgsl b/test/tint/builtins/gen/literal/textureDimensions/b0e16d.wgsl
similarity index 97%
rename from test/tint/builtins/gen/textureDimensions/b0e16d.wgsl
rename to test/tint/builtins/gen/literal/textureDimensions/b0e16d.wgsl
index 4b25df8e85..98b443a887 100644
--- a/test/tint/builtins/gen/textureDimensions/b0e16d.wgsl
+++ b/test/tint/builtins/gen/literal/textureDimensions/b0e16d.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/textureDimensions/b0e16d.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureDimensions/b0e16d.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/b0e16d.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/textureDimensions/b0e16d.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/textureDimensions/b0e16d.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/textureDimensions/b0e16d.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/b0e16d.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/textureDimensions/b0e16d.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/textureDimensions/b0e16d.wgsl.expected.msl b/test/tint/builtins/gen/literal/textureDimensions/b0e16d.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/b0e16d.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/textureDimensions/b0e16d.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/textureDimensions/b0e16d.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureDimensions/b0e16d.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/b0e16d.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/textureDimensions/b0e16d.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/textureDimensions/b0e16d.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/textureDimensions/b0e16d.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/b0e16d.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/textureDimensions/b0e16d.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/textureDimensions/b3c954.wgsl b/test/tint/builtins/gen/literal/textureDimensions/b3c954.wgsl
similarity index 97%
rename from test/tint/builtins/gen/textureDimensions/b3c954.wgsl
rename to test/tint/builtins/gen/literal/textureDimensions/b3c954.wgsl
index 588af6c824..2fb0e3d12c 100644
--- a/test/tint/builtins/gen/textureDimensions/b3c954.wgsl
+++ b/test/tint/builtins/gen/literal/textureDimensions/b3c954.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/textureDimensions/b3c954.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureDimensions/b3c954.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/b3c954.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/textureDimensions/b3c954.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/textureDimensions/b3c954.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/textureDimensions/b3c954.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/b3c954.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/textureDimensions/b3c954.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/textureDimensions/b3c954.wgsl.expected.msl b/test/tint/builtins/gen/literal/textureDimensions/b3c954.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/b3c954.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/textureDimensions/b3c954.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/textureDimensions/b3c954.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureDimensions/b3c954.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/b3c954.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/textureDimensions/b3c954.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/textureDimensions/b3c954.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/textureDimensions/b3c954.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/b3c954.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/textureDimensions/b3c954.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/textureDimensions/b3e407.wgsl b/test/tint/builtins/gen/literal/textureDimensions/b3e407.wgsl
similarity index 97%
rename from test/tint/builtins/gen/textureDimensions/b3e407.wgsl
rename to test/tint/builtins/gen/literal/textureDimensions/b3e407.wgsl
index 1c04110216..47ae776c13 100644
--- a/test/tint/builtins/gen/textureDimensions/b3e407.wgsl
+++ b/test/tint/builtins/gen/literal/textureDimensions/b3e407.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/textureDimensions/b3e407.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureDimensions/b3e407.wgsl.expected.glsl
similarity index 97%
rename from test/tint/builtins/gen/textureDimensions/b3e407.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/textureDimensions/b3e407.wgsl.expected.glsl
index 199507417a..438d8fb195 100644
--- a/test/tint/builtins/gen/textureDimensions/b3e407.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureDimensions/b3e407.wgsl.expected.glsl
@@ -9,7 +9,7 @@ void textureDimensions_b3e407() {
 
 vec4 vertex_main() {
   textureDimensions_b3e407();
-  return vec4(0.0f, 0.0f, 0.0f, 0.0f);
+  return vec4(0.0f);
 }
 
 void main() {
diff --git a/test/tint/builtins/gen/textureDimensions/b3e407.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/textureDimensions/b3e407.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/b3e407.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/textureDimensions/b3e407.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/textureDimensions/b3e407.wgsl.expected.msl b/test/tint/builtins/gen/literal/textureDimensions/b3e407.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/b3e407.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/textureDimensions/b3e407.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/textureDimensions/b3e407.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureDimensions/b3e407.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/b3e407.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/textureDimensions/b3e407.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/textureDimensions/b3e407.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/textureDimensions/b3e407.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/b3e407.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/textureDimensions/b3e407.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/textureDimensions/b91240.wgsl b/test/tint/builtins/gen/literal/textureDimensions/b91240.wgsl
similarity index 97%
rename from test/tint/builtins/gen/textureDimensions/b91240.wgsl
rename to test/tint/builtins/gen/literal/textureDimensions/b91240.wgsl
index 4c8707c1fa..df6cccbef5 100644
--- a/test/tint/builtins/gen/textureDimensions/b91240.wgsl
+++ b/test/tint/builtins/gen/literal/textureDimensions/b91240.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/textureDimensions/b91240.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureDimensions/b91240.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/b91240.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/textureDimensions/b91240.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/textureDimensions/b91240.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/textureDimensions/b91240.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/b91240.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/textureDimensions/b91240.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/textureDimensions/b91240.wgsl.expected.msl b/test/tint/builtins/gen/literal/textureDimensions/b91240.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/b91240.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/textureDimensions/b91240.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/textureDimensions/b91240.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureDimensions/b91240.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/b91240.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/textureDimensions/b91240.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/textureDimensions/b91240.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/textureDimensions/b91240.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/b91240.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/textureDimensions/b91240.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/textureDimensions/ba1481.wgsl b/test/tint/builtins/gen/literal/textureDimensions/ba1481.wgsl
similarity index 97%
rename from test/tint/builtins/gen/textureDimensions/ba1481.wgsl
rename to test/tint/builtins/gen/literal/textureDimensions/ba1481.wgsl
index 521e1cecb7..1cb0abe122 100644
--- a/test/tint/builtins/gen/textureDimensions/ba1481.wgsl
+++ b/test/tint/builtins/gen/literal/textureDimensions/ba1481.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/textureDimensions/ba1481.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureDimensions/ba1481.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/ba1481.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/textureDimensions/ba1481.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/textureDimensions/ba1481.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/textureDimensions/ba1481.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/ba1481.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/textureDimensions/ba1481.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/textureDimensions/ba1481.wgsl.expected.msl b/test/tint/builtins/gen/literal/textureDimensions/ba1481.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/ba1481.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/textureDimensions/ba1481.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/textureDimensions/ba1481.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureDimensions/ba1481.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/ba1481.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/textureDimensions/ba1481.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/textureDimensions/ba1481.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/textureDimensions/ba1481.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/ba1481.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/textureDimensions/ba1481.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/textureDimensions/bb3dde.wgsl b/test/tint/builtins/gen/literal/textureDimensions/bb3dde.wgsl
similarity index 97%
rename from test/tint/builtins/gen/textureDimensions/bb3dde.wgsl
rename to test/tint/builtins/gen/literal/textureDimensions/bb3dde.wgsl
index b37b33e029..fec2488e79 100644
--- a/test/tint/builtins/gen/textureDimensions/bb3dde.wgsl
+++ b/test/tint/builtins/gen/literal/textureDimensions/bb3dde.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/textureDimensions/bb3dde.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureDimensions/bb3dde.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/bb3dde.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/textureDimensions/bb3dde.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/textureDimensions/bb3dde.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/textureDimensions/bb3dde.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/bb3dde.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/textureDimensions/bb3dde.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/textureDimensions/bb3dde.wgsl.expected.msl b/test/tint/builtins/gen/literal/textureDimensions/bb3dde.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/bb3dde.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/textureDimensions/bb3dde.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/textureDimensions/bb3dde.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureDimensions/bb3dde.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/bb3dde.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/textureDimensions/bb3dde.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/textureDimensions/bb3dde.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/textureDimensions/bb3dde.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/bb3dde.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/textureDimensions/bb3dde.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/textureDimensions/c30e75.wgsl b/test/tint/builtins/gen/literal/textureDimensions/c30e75.wgsl
similarity index 97%
rename from test/tint/builtins/gen/textureDimensions/c30e75.wgsl
rename to test/tint/builtins/gen/literal/textureDimensions/c30e75.wgsl
index d16d53858a..c5afaf371b 100644
--- a/test/tint/builtins/gen/textureDimensions/c30e75.wgsl
+++ b/test/tint/builtins/gen/literal/textureDimensions/c30e75.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/textureDimensions/c30e75.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureDimensions/c30e75.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/c30e75.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/textureDimensions/c30e75.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/textureDimensions/c30e75.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/textureDimensions/c30e75.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/c30e75.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/textureDimensions/c30e75.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/textureDimensions/c30e75.wgsl.expected.msl b/test/tint/builtins/gen/literal/textureDimensions/c30e75.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/c30e75.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/textureDimensions/c30e75.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/textureDimensions/c30e75.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureDimensions/c30e75.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/c30e75.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/textureDimensions/c30e75.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/textureDimensions/c30e75.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/textureDimensions/c30e75.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/c30e75.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/textureDimensions/c30e75.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/textureDimensions/c7943d.wgsl b/test/tint/builtins/gen/literal/textureDimensions/c7943d.wgsl
similarity index 97%
rename from test/tint/builtins/gen/textureDimensions/c7943d.wgsl
rename to test/tint/builtins/gen/literal/textureDimensions/c7943d.wgsl
index 73cb2ca487..892ea87552 100644
--- a/test/tint/builtins/gen/textureDimensions/c7943d.wgsl
+++ b/test/tint/builtins/gen/literal/textureDimensions/c7943d.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/textureDimensions/c7943d.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureDimensions/c7943d.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/c7943d.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/textureDimensions/c7943d.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/textureDimensions/c7943d.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/textureDimensions/c7943d.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/c7943d.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/textureDimensions/c7943d.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/textureDimensions/c7943d.wgsl.expected.msl b/test/tint/builtins/gen/literal/textureDimensions/c7943d.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/c7943d.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/textureDimensions/c7943d.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/textureDimensions/c7943d.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureDimensions/c7943d.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/c7943d.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/textureDimensions/c7943d.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/textureDimensions/c7943d.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/textureDimensions/c7943d.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/c7943d.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/textureDimensions/c7943d.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/textureDimensions/cc968c.wgsl b/test/tint/builtins/gen/literal/textureDimensions/cc968c.wgsl
similarity index 97%
rename from test/tint/builtins/gen/textureDimensions/cc968c.wgsl
rename to test/tint/builtins/gen/literal/textureDimensions/cc968c.wgsl
index 89e96200e1..42f777f254 100644
--- a/test/tint/builtins/gen/textureDimensions/cc968c.wgsl
+++ b/test/tint/builtins/gen/literal/textureDimensions/cc968c.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/textureDimensions/cc968c.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureDimensions/cc968c.wgsl.expected.glsl
similarity index 97%
rename from test/tint/builtins/gen/textureDimensions/cc968c.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/textureDimensions/cc968c.wgsl.expected.glsl
index efc15a9c4a..d7f3becc89 100644
--- a/test/tint/builtins/gen/textureDimensions/cc968c.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureDimensions/cc968c.wgsl.expected.glsl
@@ -9,7 +9,7 @@ void textureDimensions_cc968c() {
 
 vec4 vertex_main() {
   textureDimensions_cc968c();
-  return vec4(0.0f, 0.0f, 0.0f, 0.0f);
+  return vec4(0.0f);
 }
 
 void main() {
diff --git a/test/tint/builtins/gen/textureDimensions/cc968c.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/textureDimensions/cc968c.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/cc968c.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/textureDimensions/cc968c.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/textureDimensions/cc968c.wgsl.expected.msl b/test/tint/builtins/gen/literal/textureDimensions/cc968c.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/cc968c.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/textureDimensions/cc968c.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/textureDimensions/cc968c.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureDimensions/cc968c.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/cc968c.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/textureDimensions/cc968c.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/textureDimensions/cc968c.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/textureDimensions/cc968c.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/cc968c.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/textureDimensions/cc968c.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/textureDimensions/cccc8f.wgsl b/test/tint/builtins/gen/literal/textureDimensions/cccc8f.wgsl
similarity index 97%
rename from test/tint/builtins/gen/textureDimensions/cccc8f.wgsl
rename to test/tint/builtins/gen/literal/textureDimensions/cccc8f.wgsl
index a0738bccd5..b320e91e14 100644
--- a/test/tint/builtins/gen/textureDimensions/cccc8f.wgsl
+++ b/test/tint/builtins/gen/literal/textureDimensions/cccc8f.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/textureDimensions/cccc8f.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureDimensions/cccc8f.wgsl.expected.glsl
similarity index 97%
rename from test/tint/builtins/gen/textureDimensions/cccc8f.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/textureDimensions/cccc8f.wgsl.expected.glsl
index eefeffa95a..8ea9b9ed23 100644
--- a/test/tint/builtins/gen/textureDimensions/cccc8f.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureDimensions/cccc8f.wgsl.expected.glsl
@@ -9,7 +9,7 @@ void textureDimensions_cccc8f() {
 
 vec4 vertex_main() {
   textureDimensions_cccc8f();
-  return vec4(0.0f, 0.0f, 0.0f, 0.0f);
+  return vec4(0.0f);
 }
 
 void main() {
diff --git a/test/tint/builtins/gen/textureDimensions/cccc8f.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/textureDimensions/cccc8f.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/cccc8f.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/textureDimensions/cccc8f.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/textureDimensions/cccc8f.wgsl.expected.msl b/test/tint/builtins/gen/literal/textureDimensions/cccc8f.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/cccc8f.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/textureDimensions/cccc8f.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/textureDimensions/cccc8f.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureDimensions/cccc8f.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/cccc8f.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/textureDimensions/cccc8f.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/textureDimensions/cccc8f.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/textureDimensions/cccc8f.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/cccc8f.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/textureDimensions/cccc8f.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/textureDimensions/cd76a7.wgsl b/test/tint/builtins/gen/literal/textureDimensions/cd76a7.wgsl
similarity index 97%
rename from test/tint/builtins/gen/textureDimensions/cd76a7.wgsl
rename to test/tint/builtins/gen/literal/textureDimensions/cd76a7.wgsl
index 3bce5a61d3..8959a179d7 100644
--- a/test/tint/builtins/gen/textureDimensions/cd76a7.wgsl
+++ b/test/tint/builtins/gen/literal/textureDimensions/cd76a7.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/textureDimensions/cd76a7.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureDimensions/cd76a7.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/cd76a7.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/textureDimensions/cd76a7.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/textureDimensions/cd76a7.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/textureDimensions/cd76a7.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/cd76a7.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/textureDimensions/cd76a7.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/textureDimensions/cd76a7.wgsl.expected.msl b/test/tint/builtins/gen/literal/textureDimensions/cd76a7.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/cd76a7.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/textureDimensions/cd76a7.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/textureDimensions/cd76a7.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureDimensions/cd76a7.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/cd76a7.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/textureDimensions/cd76a7.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/textureDimensions/cd76a7.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/textureDimensions/cd76a7.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/cd76a7.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/textureDimensions/cd76a7.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/textureDimensions/cdf473.wgsl b/test/tint/builtins/gen/literal/textureDimensions/cdf473.wgsl
similarity index 97%
rename from test/tint/builtins/gen/textureDimensions/cdf473.wgsl
rename to test/tint/builtins/gen/literal/textureDimensions/cdf473.wgsl
index db67b124ee..3eb0f09d1d 100644
--- a/test/tint/builtins/gen/textureDimensions/cdf473.wgsl
+++ b/test/tint/builtins/gen/literal/textureDimensions/cdf473.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/textureDimensions/cdf473.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureDimensions/cdf473.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/cdf473.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/textureDimensions/cdf473.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/textureDimensions/cdf473.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/textureDimensions/cdf473.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/cdf473.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/textureDimensions/cdf473.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/textureDimensions/cdf473.wgsl.expected.msl b/test/tint/builtins/gen/literal/textureDimensions/cdf473.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/cdf473.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/textureDimensions/cdf473.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/textureDimensions/cdf473.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureDimensions/cdf473.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/cdf473.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/textureDimensions/cdf473.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/textureDimensions/cdf473.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/textureDimensions/cdf473.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/cdf473.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/textureDimensions/cdf473.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/textureDimensions/cec841.wgsl b/test/tint/builtins/gen/literal/textureDimensions/cec841.wgsl
similarity index 97%
rename from test/tint/builtins/gen/textureDimensions/cec841.wgsl
rename to test/tint/builtins/gen/literal/textureDimensions/cec841.wgsl
index 29e5903f71..abd76b16c5 100644
--- a/test/tint/builtins/gen/textureDimensions/cec841.wgsl
+++ b/test/tint/builtins/gen/literal/textureDimensions/cec841.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/textureDimensions/cec841.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureDimensions/cec841.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/cec841.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/textureDimensions/cec841.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/textureDimensions/cec841.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/textureDimensions/cec841.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/cec841.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/textureDimensions/cec841.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/textureDimensions/cec841.wgsl.expected.msl b/test/tint/builtins/gen/literal/textureDimensions/cec841.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/cec841.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/textureDimensions/cec841.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/textureDimensions/cec841.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureDimensions/cec841.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/cec841.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/textureDimensions/cec841.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/textureDimensions/cec841.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/textureDimensions/cec841.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/cec841.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/textureDimensions/cec841.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/textureDimensions/cf7e43.wgsl b/test/tint/builtins/gen/literal/textureDimensions/cf7e43.wgsl
similarity index 97%
rename from test/tint/builtins/gen/textureDimensions/cf7e43.wgsl
rename to test/tint/builtins/gen/literal/textureDimensions/cf7e43.wgsl
index bd8e0bb856..8faa148e88 100644
--- a/test/tint/builtins/gen/textureDimensions/cf7e43.wgsl
+++ b/test/tint/builtins/gen/literal/textureDimensions/cf7e43.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/textureDimensions/cf7e43.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureDimensions/cf7e43.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/cf7e43.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/textureDimensions/cf7e43.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/textureDimensions/cf7e43.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/textureDimensions/cf7e43.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/cf7e43.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/textureDimensions/cf7e43.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/textureDimensions/cf7e43.wgsl.expected.msl b/test/tint/builtins/gen/literal/textureDimensions/cf7e43.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/cf7e43.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/textureDimensions/cf7e43.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/textureDimensions/cf7e43.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureDimensions/cf7e43.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/cf7e43.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/textureDimensions/cf7e43.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/textureDimensions/cf7e43.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/textureDimensions/cf7e43.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/cf7e43.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/textureDimensions/cf7e43.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/textureDimensions/d125bc.wgsl b/test/tint/builtins/gen/literal/textureDimensions/d125bc.wgsl
similarity index 97%
rename from test/tint/builtins/gen/textureDimensions/d125bc.wgsl
rename to test/tint/builtins/gen/literal/textureDimensions/d125bc.wgsl
index d01cb3593b..62a607fe01 100644
--- a/test/tint/builtins/gen/textureDimensions/d125bc.wgsl
+++ b/test/tint/builtins/gen/literal/textureDimensions/d125bc.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/textureDimensions/d125bc.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureDimensions/d125bc.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/d125bc.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/textureDimensions/d125bc.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/textureDimensions/d125bc.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/textureDimensions/d125bc.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/d125bc.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/textureDimensions/d125bc.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/textureDimensions/d125bc.wgsl.expected.msl b/test/tint/builtins/gen/literal/textureDimensions/d125bc.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/d125bc.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/textureDimensions/d125bc.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/textureDimensions/d125bc.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureDimensions/d125bc.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/d125bc.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/textureDimensions/d125bc.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/textureDimensions/d125bc.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/textureDimensions/d125bc.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/d125bc.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/textureDimensions/d125bc.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/textureDimensions/d83c45.wgsl b/test/tint/builtins/gen/literal/textureDimensions/d83c45.wgsl
similarity index 97%
rename from test/tint/builtins/gen/textureDimensions/d83c45.wgsl
rename to test/tint/builtins/gen/literal/textureDimensions/d83c45.wgsl
index 0cf89206f2..e9bf089141 100644
--- a/test/tint/builtins/gen/textureDimensions/d83c45.wgsl
+++ b/test/tint/builtins/gen/literal/textureDimensions/d83c45.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/textureDimensions/d83c45.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureDimensions/d83c45.wgsl.expected.glsl
similarity index 97%
rename from test/tint/builtins/gen/textureDimensions/d83c45.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/textureDimensions/d83c45.wgsl.expected.glsl
index eb69da3cef..94aef0c3af 100644
--- a/test/tint/builtins/gen/textureDimensions/d83c45.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureDimensions/d83c45.wgsl.expected.glsl
@@ -9,7 +9,7 @@ void textureDimensions_d83c45() {
 
 vec4 vertex_main() {
   textureDimensions_d83c45();
-  return vec4(0.0f, 0.0f, 0.0f, 0.0f);
+  return vec4(0.0f);
 }
 
 void main() {
diff --git a/test/tint/builtins/gen/textureDimensions/d83c45.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/textureDimensions/d83c45.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/d83c45.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/textureDimensions/d83c45.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/textureDimensions/d83c45.wgsl.expected.msl b/test/tint/builtins/gen/literal/textureDimensions/d83c45.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/d83c45.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/textureDimensions/d83c45.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/textureDimensions/d83c45.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureDimensions/d83c45.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/d83c45.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/textureDimensions/d83c45.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/textureDimensions/d83c45.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/textureDimensions/d83c45.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/d83c45.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/textureDimensions/d83c45.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/textureDimensions/daf7c0.wgsl b/test/tint/builtins/gen/literal/textureDimensions/daf7c0.wgsl
similarity index 97%
rename from test/tint/builtins/gen/textureDimensions/daf7c0.wgsl
rename to test/tint/builtins/gen/literal/textureDimensions/daf7c0.wgsl
index b7207bd29f..9d66ada51a 100644
--- a/test/tint/builtins/gen/textureDimensions/daf7c0.wgsl
+++ b/test/tint/builtins/gen/literal/textureDimensions/daf7c0.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/textureDimensions/daf7c0.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureDimensions/daf7c0.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/daf7c0.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/textureDimensions/daf7c0.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/textureDimensions/daf7c0.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/textureDimensions/daf7c0.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/daf7c0.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/textureDimensions/daf7c0.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/textureDimensions/daf7c0.wgsl.expected.msl b/test/tint/builtins/gen/literal/textureDimensions/daf7c0.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/daf7c0.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/textureDimensions/daf7c0.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/textureDimensions/daf7c0.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureDimensions/daf7c0.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/daf7c0.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/textureDimensions/daf7c0.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/textureDimensions/daf7c0.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/textureDimensions/daf7c0.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/daf7c0.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/textureDimensions/daf7c0.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/textureDimensions/dc2dd0.wgsl b/test/tint/builtins/gen/literal/textureDimensions/dc2dd0.wgsl
similarity index 97%
rename from test/tint/builtins/gen/textureDimensions/dc2dd0.wgsl
rename to test/tint/builtins/gen/literal/textureDimensions/dc2dd0.wgsl
index bd87d0c39a..dd28eb479d 100644
--- a/test/tint/builtins/gen/textureDimensions/dc2dd0.wgsl
+++ b/test/tint/builtins/gen/literal/textureDimensions/dc2dd0.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/textureDimensions/dc2dd0.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureDimensions/dc2dd0.wgsl.expected.glsl
similarity index 97%
rename from test/tint/builtins/gen/textureDimensions/dc2dd0.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/textureDimensions/dc2dd0.wgsl.expected.glsl
index 312215024d..3d7ac148af 100644
--- a/test/tint/builtins/gen/textureDimensions/dc2dd0.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureDimensions/dc2dd0.wgsl.expected.glsl
@@ -9,7 +9,7 @@ void textureDimensions_dc2dd0() {
 
 vec4 vertex_main() {
   textureDimensions_dc2dd0();
-  return vec4(0.0f, 0.0f, 0.0f, 0.0f);
+  return vec4(0.0f);
 }
 
 void main() {
diff --git a/test/tint/builtins/gen/textureDimensions/dc2dd0.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/textureDimensions/dc2dd0.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/dc2dd0.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/textureDimensions/dc2dd0.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/textureDimensions/dc2dd0.wgsl.expected.msl b/test/tint/builtins/gen/literal/textureDimensions/dc2dd0.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/dc2dd0.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/textureDimensions/dc2dd0.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/textureDimensions/dc2dd0.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureDimensions/dc2dd0.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/dc2dd0.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/textureDimensions/dc2dd0.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/textureDimensions/dc2dd0.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/textureDimensions/dc2dd0.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/dc2dd0.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/textureDimensions/dc2dd0.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/textureDimensions/e927be.wgsl b/test/tint/builtins/gen/literal/textureDimensions/e927be.wgsl
similarity index 97%
rename from test/tint/builtins/gen/textureDimensions/e927be.wgsl
rename to test/tint/builtins/gen/literal/textureDimensions/e927be.wgsl
index 1deab90e96..e711cdd7da 100644
--- a/test/tint/builtins/gen/textureDimensions/e927be.wgsl
+++ b/test/tint/builtins/gen/literal/textureDimensions/e927be.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/textureDimensions/e927be.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureDimensions/e927be.wgsl.expected.glsl
similarity index 97%
rename from test/tint/builtins/gen/textureDimensions/e927be.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/textureDimensions/e927be.wgsl.expected.glsl
index 9acd8d5b03..a476da2758 100644
--- a/test/tint/builtins/gen/textureDimensions/e927be.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureDimensions/e927be.wgsl.expected.glsl
@@ -9,7 +9,7 @@ void textureDimensions_e927be() {
 
 vec4 vertex_main() {
   textureDimensions_e927be();
-  return vec4(0.0f, 0.0f, 0.0f, 0.0f);
+  return vec4(0.0f);
 }
 
 void main() {
diff --git a/test/tint/builtins/gen/textureDimensions/e927be.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/textureDimensions/e927be.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/e927be.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/textureDimensions/e927be.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/textureDimensions/e927be.wgsl.expected.msl b/test/tint/builtins/gen/literal/textureDimensions/e927be.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/e927be.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/textureDimensions/e927be.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/textureDimensions/e927be.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureDimensions/e927be.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/e927be.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/textureDimensions/e927be.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/textureDimensions/e927be.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/textureDimensions/e927be.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/e927be.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/textureDimensions/e927be.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/textureDimensions/e9e96c.wgsl b/test/tint/builtins/gen/literal/textureDimensions/e9e96c.wgsl
similarity index 97%
rename from test/tint/builtins/gen/textureDimensions/e9e96c.wgsl
rename to test/tint/builtins/gen/literal/textureDimensions/e9e96c.wgsl
index f0967abc72..41b9f1e4ac 100644
--- a/test/tint/builtins/gen/textureDimensions/e9e96c.wgsl
+++ b/test/tint/builtins/gen/literal/textureDimensions/e9e96c.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/textureDimensions/e9e96c.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureDimensions/e9e96c.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/e9e96c.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/textureDimensions/e9e96c.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/textureDimensions/e9e96c.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/textureDimensions/e9e96c.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/e9e96c.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/textureDimensions/e9e96c.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/textureDimensions/e9e96c.wgsl.expected.msl b/test/tint/builtins/gen/literal/textureDimensions/e9e96c.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/e9e96c.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/textureDimensions/e9e96c.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/textureDimensions/e9e96c.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureDimensions/e9e96c.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/e9e96c.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/textureDimensions/e9e96c.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/textureDimensions/e9e96c.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/textureDimensions/e9e96c.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/e9e96c.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/textureDimensions/e9e96c.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/textureDimensions/ef5b89.wgsl b/test/tint/builtins/gen/literal/textureDimensions/ef5b89.wgsl
similarity index 97%
rename from test/tint/builtins/gen/textureDimensions/ef5b89.wgsl
rename to test/tint/builtins/gen/literal/textureDimensions/ef5b89.wgsl
index 5526818bf9..b533d388c6 100644
--- a/test/tint/builtins/gen/textureDimensions/ef5b89.wgsl
+++ b/test/tint/builtins/gen/literal/textureDimensions/ef5b89.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/textureDimensions/ef5b89.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureDimensions/ef5b89.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/ef5b89.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/textureDimensions/ef5b89.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/textureDimensions/ef5b89.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/textureDimensions/ef5b89.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/ef5b89.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/textureDimensions/ef5b89.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/textureDimensions/ef5b89.wgsl.expected.msl b/test/tint/builtins/gen/literal/textureDimensions/ef5b89.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/ef5b89.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/textureDimensions/ef5b89.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/textureDimensions/ef5b89.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureDimensions/ef5b89.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/ef5b89.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/textureDimensions/ef5b89.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/textureDimensions/ef5b89.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/textureDimensions/ef5b89.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/ef5b89.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/textureDimensions/ef5b89.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/textureDimensions/efc8a4.wgsl b/test/tint/builtins/gen/literal/textureDimensions/efc8a4.wgsl
similarity index 97%
rename from test/tint/builtins/gen/textureDimensions/efc8a4.wgsl
rename to test/tint/builtins/gen/literal/textureDimensions/efc8a4.wgsl
index 382191f596..f93caa2277 100644
--- a/test/tint/builtins/gen/textureDimensions/efc8a4.wgsl
+++ b/test/tint/builtins/gen/literal/textureDimensions/efc8a4.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/textureDimensions/efc8a4.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureDimensions/efc8a4.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/efc8a4.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/textureDimensions/efc8a4.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/textureDimensions/efc8a4.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/textureDimensions/efc8a4.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/efc8a4.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/textureDimensions/efc8a4.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/textureDimensions/efc8a4.wgsl.expected.msl b/test/tint/builtins/gen/literal/textureDimensions/efc8a4.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/efc8a4.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/textureDimensions/efc8a4.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/textureDimensions/efc8a4.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureDimensions/efc8a4.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/efc8a4.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/textureDimensions/efc8a4.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/textureDimensions/efc8a4.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/textureDimensions/efc8a4.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/efc8a4.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/textureDimensions/efc8a4.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/textureDimensions/f60bdb.wgsl b/test/tint/builtins/gen/literal/textureDimensions/f60bdb.wgsl
similarity index 97%
rename from test/tint/builtins/gen/textureDimensions/f60bdb.wgsl
rename to test/tint/builtins/gen/literal/textureDimensions/f60bdb.wgsl
index 496b024840..167f39a254 100644
--- a/test/tint/builtins/gen/textureDimensions/f60bdb.wgsl
+++ b/test/tint/builtins/gen/literal/textureDimensions/f60bdb.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/textureDimensions/f60bdb.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureDimensions/f60bdb.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/f60bdb.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/textureDimensions/f60bdb.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/textureDimensions/f60bdb.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/textureDimensions/f60bdb.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/f60bdb.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/textureDimensions/f60bdb.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/textureDimensions/f60bdb.wgsl.expected.msl b/test/tint/builtins/gen/literal/textureDimensions/f60bdb.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/f60bdb.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/textureDimensions/f60bdb.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/textureDimensions/f60bdb.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureDimensions/f60bdb.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/f60bdb.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/textureDimensions/f60bdb.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/textureDimensions/f60bdb.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/textureDimensions/f60bdb.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/f60bdb.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/textureDimensions/f60bdb.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/textureDimensions/f7145b.wgsl b/test/tint/builtins/gen/literal/textureDimensions/f7145b.wgsl
similarity index 97%
rename from test/tint/builtins/gen/textureDimensions/f7145b.wgsl
rename to test/tint/builtins/gen/literal/textureDimensions/f7145b.wgsl
index 0c2834eee2..55ed1c7f2f 100644
--- a/test/tint/builtins/gen/textureDimensions/f7145b.wgsl
+++ b/test/tint/builtins/gen/literal/textureDimensions/f7145b.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/textureDimensions/f7145b.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureDimensions/f7145b.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/f7145b.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/textureDimensions/f7145b.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/textureDimensions/f7145b.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/textureDimensions/f7145b.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/f7145b.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/textureDimensions/f7145b.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/textureDimensions/f7145b.wgsl.expected.msl b/test/tint/builtins/gen/literal/textureDimensions/f7145b.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/f7145b.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/textureDimensions/f7145b.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/textureDimensions/f7145b.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureDimensions/f7145b.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/f7145b.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/textureDimensions/f7145b.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/textureDimensions/f7145b.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/textureDimensions/f7145b.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/f7145b.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/textureDimensions/f7145b.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/textureDimensions/f931c7.wgsl b/test/tint/builtins/gen/literal/textureDimensions/f931c7.wgsl
similarity index 97%
rename from test/tint/builtins/gen/textureDimensions/f931c7.wgsl
rename to test/tint/builtins/gen/literal/textureDimensions/f931c7.wgsl
index 6dcbc80cf5..85c0fab066 100644
--- a/test/tint/builtins/gen/textureDimensions/f931c7.wgsl
+++ b/test/tint/builtins/gen/literal/textureDimensions/f931c7.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/textureDimensions/f931c7.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureDimensions/f931c7.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/f931c7.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/textureDimensions/f931c7.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/textureDimensions/f931c7.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/textureDimensions/f931c7.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/f931c7.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/textureDimensions/f931c7.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/textureDimensions/f931c7.wgsl.expected.msl b/test/tint/builtins/gen/literal/textureDimensions/f931c7.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/f931c7.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/textureDimensions/f931c7.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/textureDimensions/f931c7.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureDimensions/f931c7.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/f931c7.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/textureDimensions/f931c7.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/textureDimensions/f931c7.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/textureDimensions/f931c7.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/f931c7.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/textureDimensions/f931c7.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/textureDimensions/fa9859.wgsl b/test/tint/builtins/gen/literal/textureDimensions/fa9859.wgsl
similarity index 97%
rename from test/tint/builtins/gen/textureDimensions/fa9859.wgsl
rename to test/tint/builtins/gen/literal/textureDimensions/fa9859.wgsl
index 7c3d137d3f..206c54ecf8 100644
--- a/test/tint/builtins/gen/textureDimensions/fa9859.wgsl
+++ b/test/tint/builtins/gen/literal/textureDimensions/fa9859.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/textureDimensions/fa9859.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureDimensions/fa9859.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/fa9859.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/textureDimensions/fa9859.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/textureDimensions/fa9859.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/textureDimensions/fa9859.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/fa9859.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/textureDimensions/fa9859.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/textureDimensions/fa9859.wgsl.expected.msl b/test/tint/builtins/gen/literal/textureDimensions/fa9859.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/fa9859.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/textureDimensions/fa9859.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/textureDimensions/fa9859.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureDimensions/fa9859.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/fa9859.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/textureDimensions/fa9859.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/textureDimensions/fa9859.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/textureDimensions/fa9859.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/fa9859.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/textureDimensions/fa9859.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/textureDimensions/fb5670.wgsl b/test/tint/builtins/gen/literal/textureDimensions/fb5670.wgsl
similarity index 97%
rename from test/tint/builtins/gen/textureDimensions/fb5670.wgsl
rename to test/tint/builtins/gen/literal/textureDimensions/fb5670.wgsl
index 73aa7aa875..fcfb9cf8c8 100644
--- a/test/tint/builtins/gen/textureDimensions/fb5670.wgsl
+++ b/test/tint/builtins/gen/literal/textureDimensions/fb5670.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/textureDimensions/fb5670.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureDimensions/fb5670.wgsl.expected.glsl
similarity index 97%
rename from test/tint/builtins/gen/textureDimensions/fb5670.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/textureDimensions/fb5670.wgsl.expected.glsl
index 515efe6e7b..5c3bd40cfc 100644
--- a/test/tint/builtins/gen/textureDimensions/fb5670.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureDimensions/fb5670.wgsl.expected.glsl
@@ -9,7 +9,7 @@ void textureDimensions_fb5670() {
 
 vec4 vertex_main() {
   textureDimensions_fb5670();
-  return vec4(0.0f, 0.0f, 0.0f, 0.0f);
+  return vec4(0.0f);
 }
 
 void main() {
diff --git a/test/tint/builtins/gen/textureDimensions/fb5670.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/textureDimensions/fb5670.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/fb5670.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/textureDimensions/fb5670.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/textureDimensions/fb5670.wgsl.expected.msl b/test/tint/builtins/gen/literal/textureDimensions/fb5670.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/fb5670.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/textureDimensions/fb5670.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/textureDimensions/fb5670.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureDimensions/fb5670.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/fb5670.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/textureDimensions/fb5670.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/textureDimensions/fb5670.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/textureDimensions/fb5670.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/fb5670.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/textureDimensions/fb5670.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/textureDimensions/fcac78.wgsl b/test/tint/builtins/gen/literal/textureDimensions/fcac78.wgsl
similarity index 97%
rename from test/tint/builtins/gen/textureDimensions/fcac78.wgsl
rename to test/tint/builtins/gen/literal/textureDimensions/fcac78.wgsl
index 8f5c0f0c9e..7e7c4d874f 100644
--- a/test/tint/builtins/gen/textureDimensions/fcac78.wgsl
+++ b/test/tint/builtins/gen/literal/textureDimensions/fcac78.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/textureDimensions/fcac78.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureDimensions/fcac78.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/fcac78.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/textureDimensions/fcac78.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/textureDimensions/fcac78.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/textureDimensions/fcac78.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/fcac78.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/textureDimensions/fcac78.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/textureDimensions/fcac78.wgsl.expected.msl b/test/tint/builtins/gen/literal/textureDimensions/fcac78.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/fcac78.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/textureDimensions/fcac78.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/textureDimensions/fcac78.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureDimensions/fcac78.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/fcac78.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/textureDimensions/fcac78.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/textureDimensions/fcac78.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/textureDimensions/fcac78.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/textureDimensions/fcac78.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/textureDimensions/fcac78.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/textureGather/01305f.wgsl b/test/tint/builtins/gen/literal/textureGather/01305f.wgsl
similarity index 97%
rename from test/tint/builtins/gen/textureGather/01305f.wgsl
rename to test/tint/builtins/gen/literal/textureGather/01305f.wgsl
index fdb193f480..7ac678bf76 100644
--- a/test/tint/builtins/gen/textureGather/01305f.wgsl
+++ b/test/tint/builtins/gen/literal/textureGather/01305f.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/textureGather/01305f.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureGather/01305f.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/textureGather/01305f.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/textureGather/01305f.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/textureGather/01305f.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/textureGather/01305f.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/textureGather/01305f.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/textureGather/01305f.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/textureGather/01305f.wgsl.expected.msl b/test/tint/builtins/gen/literal/textureGather/01305f.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/textureGather/01305f.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/textureGather/01305f.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/textureGather/01305f.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureGather/01305f.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/textureGather/01305f.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/textureGather/01305f.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/textureGather/01305f.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/textureGather/01305f.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/textureGather/01305f.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/textureGather/01305f.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/textureGather/06030a.wgsl b/test/tint/builtins/gen/literal/textureGather/06030a.wgsl
similarity index 97%
rename from test/tint/builtins/gen/textureGather/06030a.wgsl
rename to test/tint/builtins/gen/literal/textureGather/06030a.wgsl
index b2caaed434..aad328cb00 100644
--- a/test/tint/builtins/gen/textureGather/06030a.wgsl
+++ b/test/tint/builtins/gen/literal/textureGather/06030a.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/textureGather/06030a.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureGather/06030a.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/textureGather/06030a.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/textureGather/06030a.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/textureGather/06030a.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/textureGather/06030a.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/textureGather/06030a.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/textureGather/06030a.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/textureGather/06030a.wgsl.expected.msl b/test/tint/builtins/gen/literal/textureGather/06030a.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/textureGather/06030a.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/textureGather/06030a.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/textureGather/06030a.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureGather/06030a.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/textureGather/06030a.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/textureGather/06030a.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/textureGather/06030a.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/textureGather/06030a.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/textureGather/06030a.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/textureGather/06030a.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/textureGather/10c554.wgsl b/test/tint/builtins/gen/literal/textureGather/10c554.wgsl
similarity index 97%
rename from test/tint/builtins/gen/textureGather/10c554.wgsl
rename to test/tint/builtins/gen/literal/textureGather/10c554.wgsl
index 28e958b3b8..4f5250997f 100644
--- a/test/tint/builtins/gen/textureGather/10c554.wgsl
+++ b/test/tint/builtins/gen/literal/textureGather/10c554.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/textureGather/10c554.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureGather/10c554.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/textureGather/10c554.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/textureGather/10c554.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/textureGather/10c554.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/textureGather/10c554.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/textureGather/10c554.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/textureGather/10c554.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/textureGather/10c554.wgsl.expected.msl b/test/tint/builtins/gen/literal/textureGather/10c554.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/textureGather/10c554.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/textureGather/10c554.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/textureGather/10c554.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureGather/10c554.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/textureGather/10c554.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/textureGather/10c554.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/textureGather/10c554.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/textureGather/10c554.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/textureGather/10c554.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/textureGather/10c554.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/textureGather/15d79c.wgsl b/test/tint/builtins/gen/literal/textureGather/15d79c.wgsl
similarity index 97%
rename from test/tint/builtins/gen/textureGather/15d79c.wgsl
rename to test/tint/builtins/gen/literal/textureGather/15d79c.wgsl
index 37b88a0f3e..75f8157128 100644
--- a/test/tint/builtins/gen/textureGather/15d79c.wgsl
+++ b/test/tint/builtins/gen/literal/textureGather/15d79c.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/textureGather/15d79c.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureGather/15d79c.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/textureGather/15d79c.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/textureGather/15d79c.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/textureGather/15d79c.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/textureGather/15d79c.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/textureGather/15d79c.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/textureGather/15d79c.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/textureGather/15d79c.wgsl.expected.msl b/test/tint/builtins/gen/literal/textureGather/15d79c.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/textureGather/15d79c.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/textureGather/15d79c.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/textureGather/15d79c.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureGather/15d79c.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/textureGather/15d79c.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/textureGather/15d79c.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/textureGather/15d79c.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/textureGather/15d79c.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/textureGather/15d79c.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/textureGather/15d79c.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/textureGather/2e0ed5.wgsl b/test/tint/builtins/gen/literal/textureGather/2e0ed5.wgsl
similarity index 97%
rename from test/tint/builtins/gen/textureGather/2e0ed5.wgsl
rename to test/tint/builtins/gen/literal/textureGather/2e0ed5.wgsl
index 4b4d5bc297..93786c439e 100644
--- a/test/tint/builtins/gen/textureGather/2e0ed5.wgsl
+++ b/test/tint/builtins/gen/literal/textureGather/2e0ed5.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/textureGather/2e0ed5.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureGather/2e0ed5.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/textureGather/2e0ed5.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/textureGather/2e0ed5.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/textureGather/2e0ed5.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/textureGather/2e0ed5.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/textureGather/2e0ed5.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/textureGather/2e0ed5.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/textureGather/2e0ed5.wgsl.expected.msl b/test/tint/builtins/gen/literal/textureGather/2e0ed5.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/textureGather/2e0ed5.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/textureGather/2e0ed5.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/textureGather/2e0ed5.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureGather/2e0ed5.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/textureGather/2e0ed5.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/textureGather/2e0ed5.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/textureGather/2e0ed5.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/textureGather/2e0ed5.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/textureGather/2e0ed5.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/textureGather/2e0ed5.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/textureGather/3112e8.wgsl b/test/tint/builtins/gen/literal/textureGather/3112e8.wgsl
similarity index 97%
rename from test/tint/builtins/gen/textureGather/3112e8.wgsl
rename to test/tint/builtins/gen/literal/textureGather/3112e8.wgsl
index cde5dd48cd..8c8de8892d 100644
--- a/test/tint/builtins/gen/textureGather/3112e8.wgsl
+++ b/test/tint/builtins/gen/literal/textureGather/3112e8.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/textureGather/3112e8.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureGather/3112e8.wgsl.expected.glsl
similarity index 97%
rename from test/tint/builtins/gen/textureGather/3112e8.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/textureGather/3112e8.wgsl.expected.glsl
index f4c4935f70..485392506f 100644
--- a/test/tint/builtins/gen/textureGather/3112e8.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureGather/3112e8.wgsl.expected.glsl
@@ -10,7 +10,7 @@ void textureGather_3112e8() {
 
 vec4 vertex_main() {
   textureGather_3112e8();
-  return vec4(0.0f, 0.0f, 0.0f, 0.0f);
+  return vec4(0.0f);
 }
 
 void main() {
diff --git a/test/tint/builtins/gen/textureGather/3112e8.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/textureGather/3112e8.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/textureGather/3112e8.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/textureGather/3112e8.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/textureGather/3112e8.wgsl.expected.msl b/test/tint/builtins/gen/literal/textureGather/3112e8.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/textureGather/3112e8.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/textureGather/3112e8.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/textureGather/3112e8.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureGather/3112e8.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/textureGather/3112e8.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/textureGather/3112e8.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/textureGather/3112e8.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/textureGather/3112e8.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/textureGather/3112e8.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/textureGather/3112e8.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/textureGather/3c527e.wgsl b/test/tint/builtins/gen/literal/textureGather/3c527e.wgsl
similarity index 97%
rename from test/tint/builtins/gen/textureGather/3c527e.wgsl
rename to test/tint/builtins/gen/literal/textureGather/3c527e.wgsl
index 533374898e..8f68c440f3 100644
--- a/test/tint/builtins/gen/textureGather/3c527e.wgsl
+++ b/test/tint/builtins/gen/literal/textureGather/3c527e.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/textureGather/3c527e.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureGather/3c527e.wgsl.expected.glsl
similarity index 97%
rename from test/tint/builtins/gen/textureGather/3c527e.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/textureGather/3c527e.wgsl.expected.glsl
index 9f28e838ef..406f5df550 100644
--- a/test/tint/builtins/gen/textureGather/3c527e.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureGather/3c527e.wgsl.expected.glsl
@@ -10,7 +10,7 @@ void textureGather_3c527e() {
 
 vec4 vertex_main() {
   textureGather_3c527e();
-  return vec4(0.0f, 0.0f, 0.0f, 0.0f);
+  return vec4(0.0f);
 }
 
 void main() {
diff --git a/test/tint/builtins/gen/textureGather/3c527e.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/textureGather/3c527e.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/textureGather/3c527e.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/textureGather/3c527e.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/textureGather/3c527e.wgsl.expected.msl b/test/tint/builtins/gen/literal/textureGather/3c527e.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/textureGather/3c527e.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/textureGather/3c527e.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/textureGather/3c527e.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureGather/3c527e.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/textureGather/3c527e.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/textureGather/3c527e.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/textureGather/3c527e.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/textureGather/3c527e.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/textureGather/3c527e.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/textureGather/3c527e.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/textureGather/43025d.wgsl b/test/tint/builtins/gen/literal/textureGather/43025d.wgsl
similarity index 97%
rename from test/tint/builtins/gen/textureGather/43025d.wgsl
rename to test/tint/builtins/gen/literal/textureGather/43025d.wgsl
index 39681aa8a3..ec5a0b0725 100644
--- a/test/tint/builtins/gen/textureGather/43025d.wgsl
+++ b/test/tint/builtins/gen/literal/textureGather/43025d.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/textureGather/43025d.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureGather/43025d.wgsl.expected.glsl
similarity index 97%
rename from test/tint/builtins/gen/textureGather/43025d.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/textureGather/43025d.wgsl.expected.glsl
index 70b226f721..bccd8f9506 100644
--- a/test/tint/builtins/gen/textureGather/43025d.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureGather/43025d.wgsl.expected.glsl
@@ -10,7 +10,7 @@ void textureGather_43025d() {
 
 vec4 vertex_main() {
   textureGather_43025d();
-  return vec4(0.0f, 0.0f, 0.0f, 0.0f);
+  return vec4(0.0f);
 }
 
 void main() {
diff --git a/test/tint/builtins/gen/textureGather/43025d.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/textureGather/43025d.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/textureGather/43025d.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/textureGather/43025d.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/textureGather/43025d.wgsl.expected.msl b/test/tint/builtins/gen/literal/textureGather/43025d.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/textureGather/43025d.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/textureGather/43025d.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/textureGather/43025d.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureGather/43025d.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/textureGather/43025d.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/textureGather/43025d.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/textureGather/43025d.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/textureGather/43025d.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/textureGather/43025d.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/textureGather/43025d.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/textureGather/4f2350.wgsl b/test/tint/builtins/gen/literal/textureGather/4f2350.wgsl
similarity index 97%
rename from test/tint/builtins/gen/textureGather/4f2350.wgsl
rename to test/tint/builtins/gen/literal/textureGather/4f2350.wgsl
index 27cb542892..8ff0bf7259 100644
--- a/test/tint/builtins/gen/textureGather/4f2350.wgsl
+++ b/test/tint/builtins/gen/literal/textureGather/4f2350.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/textureGather/4f2350.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureGather/4f2350.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/textureGather/4f2350.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/textureGather/4f2350.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/textureGather/4f2350.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/textureGather/4f2350.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/textureGather/4f2350.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/textureGather/4f2350.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/textureGather/4f2350.wgsl.expected.msl b/test/tint/builtins/gen/literal/textureGather/4f2350.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/textureGather/4f2350.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/textureGather/4f2350.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/textureGather/4f2350.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureGather/4f2350.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/textureGather/4f2350.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/textureGather/4f2350.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/textureGather/4f2350.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/textureGather/4f2350.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/textureGather/4f2350.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/textureGather/4f2350.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/textureGather/51cf0b.wgsl b/test/tint/builtins/gen/literal/textureGather/51cf0b.wgsl
similarity index 97%
rename from test/tint/builtins/gen/textureGather/51cf0b.wgsl
rename to test/tint/builtins/gen/literal/textureGather/51cf0b.wgsl
index 3b42e5d682..1fdec123bb 100644
--- a/test/tint/builtins/gen/textureGather/51cf0b.wgsl
+++ b/test/tint/builtins/gen/literal/textureGather/51cf0b.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/textureGather/51cf0b.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureGather/51cf0b.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/textureGather/51cf0b.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/textureGather/51cf0b.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/textureGather/51cf0b.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/textureGather/51cf0b.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/textureGather/51cf0b.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/textureGather/51cf0b.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/textureGather/51cf0b.wgsl.expected.msl b/test/tint/builtins/gen/literal/textureGather/51cf0b.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/textureGather/51cf0b.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/textureGather/51cf0b.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/textureGather/51cf0b.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureGather/51cf0b.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/textureGather/51cf0b.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/textureGather/51cf0b.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/textureGather/51cf0b.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/textureGather/51cf0b.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/textureGather/51cf0b.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/textureGather/51cf0b.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/textureGather/53ece6.wgsl b/test/tint/builtins/gen/literal/textureGather/53ece6.wgsl
similarity index 97%
rename from test/tint/builtins/gen/textureGather/53ece6.wgsl
rename to test/tint/builtins/gen/literal/textureGather/53ece6.wgsl
index fff75b65b0..3bcf11a6a2 100644
--- a/test/tint/builtins/gen/textureGather/53ece6.wgsl
+++ b/test/tint/builtins/gen/literal/textureGather/53ece6.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/textureGather/53ece6.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureGather/53ece6.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/textureGather/53ece6.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/textureGather/53ece6.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/textureGather/53ece6.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/textureGather/53ece6.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/textureGather/53ece6.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/textureGather/53ece6.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/textureGather/53ece6.wgsl.expected.msl b/test/tint/builtins/gen/literal/textureGather/53ece6.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/textureGather/53ece6.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/textureGather/53ece6.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/textureGather/53ece6.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureGather/53ece6.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/textureGather/53ece6.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/textureGather/53ece6.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/textureGather/53ece6.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/textureGather/53ece6.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/textureGather/53ece6.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/textureGather/53ece6.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/textureGather/57bfc6.wgsl b/test/tint/builtins/gen/literal/textureGather/57bfc6.wgsl
similarity index 97%
rename from test/tint/builtins/gen/textureGather/57bfc6.wgsl
rename to test/tint/builtins/gen/literal/textureGather/57bfc6.wgsl
index 66ab90855f..4676766f36 100644
--- a/test/tint/builtins/gen/textureGather/57bfc6.wgsl
+++ b/test/tint/builtins/gen/literal/textureGather/57bfc6.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/textureGather/57bfc6.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureGather/57bfc6.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/textureGather/57bfc6.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/textureGather/57bfc6.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/textureGather/57bfc6.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/textureGather/57bfc6.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/textureGather/57bfc6.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/textureGather/57bfc6.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/textureGather/57bfc6.wgsl.expected.msl b/test/tint/builtins/gen/literal/textureGather/57bfc6.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/textureGather/57bfc6.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/textureGather/57bfc6.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/textureGather/57bfc6.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureGather/57bfc6.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/textureGather/57bfc6.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/textureGather/57bfc6.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/textureGather/57bfc6.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/textureGather/57bfc6.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/textureGather/57bfc6.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/textureGather/57bfc6.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/textureGather/587ba3.wgsl b/test/tint/builtins/gen/literal/textureGather/587ba3.wgsl
similarity index 97%
rename from test/tint/builtins/gen/textureGather/587ba3.wgsl
rename to test/tint/builtins/gen/literal/textureGather/587ba3.wgsl
index 36138e250d..06c9f40c9f 100644
--- a/test/tint/builtins/gen/textureGather/587ba3.wgsl
+++ b/test/tint/builtins/gen/literal/textureGather/587ba3.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/textureGather/587ba3.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureGather/587ba3.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/textureGather/587ba3.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/textureGather/587ba3.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/textureGather/587ba3.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/textureGather/587ba3.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/textureGather/587ba3.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/textureGather/587ba3.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/textureGather/587ba3.wgsl.expected.msl b/test/tint/builtins/gen/literal/textureGather/587ba3.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/textureGather/587ba3.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/textureGather/587ba3.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/textureGather/587ba3.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureGather/587ba3.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/textureGather/587ba3.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/textureGather/587ba3.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/textureGather/587ba3.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/textureGather/587ba3.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/textureGather/587ba3.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/textureGather/587ba3.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/textureGather/69e0fb.wgsl b/test/tint/builtins/gen/literal/textureGather/69e0fb.wgsl
similarity index 97%
rename from test/tint/builtins/gen/textureGather/69e0fb.wgsl
rename to test/tint/builtins/gen/literal/textureGather/69e0fb.wgsl
index eefd1764b8..f2dc5cc58d 100644
--- a/test/tint/builtins/gen/textureGather/69e0fb.wgsl
+++ b/test/tint/builtins/gen/literal/textureGather/69e0fb.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/textureGather/69e0fb.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureGather/69e0fb.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/textureGather/69e0fb.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/textureGather/69e0fb.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/textureGather/69e0fb.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/textureGather/69e0fb.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/textureGather/69e0fb.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/textureGather/69e0fb.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/textureGather/69e0fb.wgsl.expected.msl b/test/tint/builtins/gen/literal/textureGather/69e0fb.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/textureGather/69e0fb.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/textureGather/69e0fb.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/textureGather/69e0fb.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureGather/69e0fb.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/textureGather/69e0fb.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/textureGather/69e0fb.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/textureGather/69e0fb.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/textureGather/69e0fb.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/textureGather/69e0fb.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/textureGather/69e0fb.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/textureGather/93003d.wgsl b/test/tint/builtins/gen/literal/textureGather/93003d.wgsl
similarity index 97%
rename from test/tint/builtins/gen/textureGather/93003d.wgsl
rename to test/tint/builtins/gen/literal/textureGather/93003d.wgsl
index 2d1a14fda0..54eba98205 100644
--- a/test/tint/builtins/gen/textureGather/93003d.wgsl
+++ b/test/tint/builtins/gen/literal/textureGather/93003d.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/textureGather/93003d.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureGather/93003d.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/textureGather/93003d.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/textureGather/93003d.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/textureGather/93003d.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/textureGather/93003d.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/textureGather/93003d.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/textureGather/93003d.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/textureGather/93003d.wgsl.expected.msl b/test/tint/builtins/gen/literal/textureGather/93003d.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/textureGather/93003d.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/textureGather/93003d.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/textureGather/93003d.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureGather/93003d.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/textureGather/93003d.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/textureGather/93003d.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/textureGather/93003d.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/textureGather/93003d.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/textureGather/93003d.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/textureGather/93003d.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/textureGather/9a6358.wgsl b/test/tint/builtins/gen/literal/textureGather/9a6358.wgsl
similarity index 97%
rename from test/tint/builtins/gen/textureGather/9a6358.wgsl
rename to test/tint/builtins/gen/literal/textureGather/9a6358.wgsl
index fe03e14b0d..d8d2bc5e6e 100644
--- a/test/tint/builtins/gen/textureGather/9a6358.wgsl
+++ b/test/tint/builtins/gen/literal/textureGather/9a6358.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/textureGather/9a6358.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureGather/9a6358.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/textureGather/9a6358.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/textureGather/9a6358.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/textureGather/9a6358.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/textureGather/9a6358.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/textureGather/9a6358.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/textureGather/9a6358.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/textureGather/9a6358.wgsl.expected.msl b/test/tint/builtins/gen/literal/textureGather/9a6358.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/textureGather/9a6358.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/textureGather/9a6358.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/textureGather/9a6358.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureGather/9a6358.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/textureGather/9a6358.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/textureGather/9a6358.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/textureGather/9a6358.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/textureGather/9a6358.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/textureGather/9a6358.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/textureGather/9a6358.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/textureGather/9efca2.wgsl b/test/tint/builtins/gen/literal/textureGather/9efca2.wgsl
similarity index 97%
rename from test/tint/builtins/gen/textureGather/9efca2.wgsl
rename to test/tint/builtins/gen/literal/textureGather/9efca2.wgsl
index 01173de9db..3099ce7b48 100644
--- a/test/tint/builtins/gen/textureGather/9efca2.wgsl
+++ b/test/tint/builtins/gen/literal/textureGather/9efca2.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/textureGather/9efca2.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureGather/9efca2.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/textureGather/9efca2.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/textureGather/9efca2.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/textureGather/9efca2.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/textureGather/9efca2.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/textureGather/9efca2.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/textureGather/9efca2.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/textureGather/9efca2.wgsl.expected.msl b/test/tint/builtins/gen/literal/textureGather/9efca2.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/textureGather/9efca2.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/textureGather/9efca2.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/textureGather/9efca2.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureGather/9efca2.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/textureGather/9efca2.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/textureGather/9efca2.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/textureGather/9efca2.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/textureGather/9efca2.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/textureGather/9efca2.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/textureGather/9efca2.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/textureGather/bd0b1e.wgsl b/test/tint/builtins/gen/literal/textureGather/bd0b1e.wgsl
similarity index 97%
rename from test/tint/builtins/gen/textureGather/bd0b1e.wgsl
rename to test/tint/builtins/gen/literal/textureGather/bd0b1e.wgsl
index eff100dad2..2dc3001202 100644
--- a/test/tint/builtins/gen/textureGather/bd0b1e.wgsl
+++ b/test/tint/builtins/gen/literal/textureGather/bd0b1e.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/textureGather/bd0b1e.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureGather/bd0b1e.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/textureGather/bd0b1e.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/textureGather/bd0b1e.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/textureGather/bd0b1e.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/textureGather/bd0b1e.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/textureGather/bd0b1e.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/textureGather/bd0b1e.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/textureGather/bd0b1e.wgsl.expected.msl b/test/tint/builtins/gen/literal/textureGather/bd0b1e.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/textureGather/bd0b1e.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/textureGather/bd0b1e.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/textureGather/bd0b1e.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureGather/bd0b1e.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/textureGather/bd0b1e.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/textureGather/bd0b1e.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/textureGather/bd0b1e.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/textureGather/bd0b1e.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/textureGather/bd0b1e.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/textureGather/bd0b1e.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/textureGather/c409ae.wgsl b/test/tint/builtins/gen/literal/textureGather/c409ae.wgsl
similarity index 97%
rename from test/tint/builtins/gen/textureGather/c409ae.wgsl
rename to test/tint/builtins/gen/literal/textureGather/c409ae.wgsl
index 5ce164326c..f9932477bf 100644
--- a/test/tint/builtins/gen/textureGather/c409ae.wgsl
+++ b/test/tint/builtins/gen/literal/textureGather/c409ae.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/textureGather/c409ae.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureGather/c409ae.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/textureGather/c409ae.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/textureGather/c409ae.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/textureGather/c409ae.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/textureGather/c409ae.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/textureGather/c409ae.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/textureGather/c409ae.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/textureGather/c409ae.wgsl.expected.msl b/test/tint/builtins/gen/literal/textureGather/c409ae.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/textureGather/c409ae.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/textureGather/c409ae.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/textureGather/c409ae.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureGather/c409ae.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/textureGather/c409ae.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/textureGather/c409ae.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/textureGather/c409ae.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/textureGather/c409ae.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/textureGather/c409ae.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/textureGather/c409ae.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/textureGather/c55822.wgsl b/test/tint/builtins/gen/literal/textureGather/c55822.wgsl
similarity index 97%
rename from test/tint/builtins/gen/textureGather/c55822.wgsl
rename to test/tint/builtins/gen/literal/textureGather/c55822.wgsl
index 7c60b3ea51..af96349834 100644
--- a/test/tint/builtins/gen/textureGather/c55822.wgsl
+++ b/test/tint/builtins/gen/literal/textureGather/c55822.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/textureGather/c55822.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureGather/c55822.wgsl.expected.glsl
similarity index 97%
rename from test/tint/builtins/gen/textureGather/c55822.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/textureGather/c55822.wgsl.expected.glsl
index ff259fb120..d2c583ff71 100644
--- a/test/tint/builtins/gen/textureGather/c55822.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureGather/c55822.wgsl.expected.glsl
@@ -10,7 +10,7 @@ void textureGather_c55822() {
 
 vec4 vertex_main() {
   textureGather_c55822();
-  return vec4(0.0f, 0.0f, 0.0f, 0.0f);
+  return vec4(0.0f);
 }
 
 void main() {
diff --git a/test/tint/builtins/gen/textureGather/c55822.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/textureGather/c55822.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/textureGather/c55822.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/textureGather/c55822.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/textureGather/c55822.wgsl.expected.msl b/test/tint/builtins/gen/literal/textureGather/c55822.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/textureGather/c55822.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/textureGather/c55822.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/textureGather/c55822.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureGather/c55822.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/textureGather/c55822.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/textureGather/c55822.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/textureGather/c55822.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/textureGather/c55822.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/textureGather/c55822.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/textureGather/c55822.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/textureGather/e1b67d.wgsl b/test/tint/builtins/gen/literal/textureGather/e1b67d.wgsl
similarity index 97%
rename from test/tint/builtins/gen/textureGather/e1b67d.wgsl
rename to test/tint/builtins/gen/literal/textureGather/e1b67d.wgsl
index 1745a44e20..148009f212 100644
--- a/test/tint/builtins/gen/textureGather/e1b67d.wgsl
+++ b/test/tint/builtins/gen/literal/textureGather/e1b67d.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/textureGather/e1b67d.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureGather/e1b67d.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/textureGather/e1b67d.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/textureGather/e1b67d.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/textureGather/e1b67d.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/textureGather/e1b67d.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/textureGather/e1b67d.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/textureGather/e1b67d.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/textureGather/e1b67d.wgsl.expected.msl b/test/tint/builtins/gen/literal/textureGather/e1b67d.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/textureGather/e1b67d.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/textureGather/e1b67d.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/textureGather/e1b67d.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureGather/e1b67d.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/textureGather/e1b67d.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/textureGather/e1b67d.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/textureGather/e1b67d.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/textureGather/e1b67d.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/textureGather/e1b67d.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/textureGather/e1b67d.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/textureGather/e9eff6.wgsl b/test/tint/builtins/gen/literal/textureGather/e9eff6.wgsl
similarity index 97%
rename from test/tint/builtins/gen/textureGather/e9eff6.wgsl
rename to test/tint/builtins/gen/literal/textureGather/e9eff6.wgsl
index cc3356e5c1..8d001a0b02 100644
--- a/test/tint/builtins/gen/textureGather/e9eff6.wgsl
+++ b/test/tint/builtins/gen/literal/textureGather/e9eff6.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/textureGather/e9eff6.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureGather/e9eff6.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/textureGather/e9eff6.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/textureGather/e9eff6.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/textureGather/e9eff6.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/textureGather/e9eff6.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/textureGather/e9eff6.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/textureGather/e9eff6.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/textureGather/e9eff6.wgsl.expected.msl b/test/tint/builtins/gen/literal/textureGather/e9eff6.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/textureGather/e9eff6.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/textureGather/e9eff6.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/textureGather/e9eff6.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureGather/e9eff6.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/textureGather/e9eff6.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/textureGather/e9eff6.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/textureGather/e9eff6.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/textureGather/e9eff6.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/textureGather/e9eff6.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/textureGather/e9eff6.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/textureGather/f5f3ba.wgsl b/test/tint/builtins/gen/literal/textureGather/f5f3ba.wgsl
similarity index 97%
rename from test/tint/builtins/gen/textureGather/f5f3ba.wgsl
rename to test/tint/builtins/gen/literal/textureGather/f5f3ba.wgsl
index 739a99be02..b7886ebfb3 100644
--- a/test/tint/builtins/gen/textureGather/f5f3ba.wgsl
+++ b/test/tint/builtins/gen/literal/textureGather/f5f3ba.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/textureGather/f5f3ba.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureGather/f5f3ba.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/textureGather/f5f3ba.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/textureGather/f5f3ba.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/textureGather/f5f3ba.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/textureGather/f5f3ba.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/textureGather/f5f3ba.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/textureGather/f5f3ba.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/textureGather/f5f3ba.wgsl.expected.msl b/test/tint/builtins/gen/literal/textureGather/f5f3ba.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/textureGather/f5f3ba.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/textureGather/f5f3ba.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/textureGather/f5f3ba.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureGather/f5f3ba.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/textureGather/f5f3ba.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/textureGather/f5f3ba.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/textureGather/f5f3ba.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/textureGather/f5f3ba.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/textureGather/f5f3ba.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/textureGather/f5f3ba.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/textureGather/f7995a.wgsl b/test/tint/builtins/gen/literal/textureGather/f7995a.wgsl
similarity index 97%
rename from test/tint/builtins/gen/textureGather/f7995a.wgsl
rename to test/tint/builtins/gen/literal/textureGather/f7995a.wgsl
index ef2624f428..b811706f85 100644
--- a/test/tint/builtins/gen/textureGather/f7995a.wgsl
+++ b/test/tint/builtins/gen/literal/textureGather/f7995a.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/textureGather/f7995a.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureGather/f7995a.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/textureGather/f7995a.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/textureGather/f7995a.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/textureGather/f7995a.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/textureGather/f7995a.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/textureGather/f7995a.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/textureGather/f7995a.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/textureGather/f7995a.wgsl.expected.msl b/test/tint/builtins/gen/literal/textureGather/f7995a.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/textureGather/f7995a.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/textureGather/f7995a.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/textureGather/f7995a.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureGather/f7995a.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/textureGather/f7995a.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/textureGather/f7995a.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/textureGather/f7995a.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/textureGather/f7995a.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/textureGather/f7995a.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/textureGather/f7995a.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/textureGatherCompare/182fd4.wgsl b/test/tint/builtins/gen/literal/textureGatherCompare/182fd4.wgsl
similarity index 97%
rename from test/tint/builtins/gen/textureGatherCompare/182fd4.wgsl
rename to test/tint/builtins/gen/literal/textureGatherCompare/182fd4.wgsl
index 90ba7db910..306361a700 100644
--- a/test/tint/builtins/gen/textureGatherCompare/182fd4.wgsl
+++ b/test/tint/builtins/gen/literal/textureGatherCompare/182fd4.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/textureGatherCompare/182fd4.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureGatherCompare/182fd4.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/textureGatherCompare/182fd4.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/textureGatherCompare/182fd4.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/textureGatherCompare/182fd4.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/textureGatherCompare/182fd4.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/textureGatherCompare/182fd4.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/textureGatherCompare/182fd4.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/textureGatherCompare/182fd4.wgsl.expected.msl b/test/tint/builtins/gen/literal/textureGatherCompare/182fd4.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/textureGatherCompare/182fd4.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/textureGatherCompare/182fd4.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/textureGatherCompare/182fd4.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureGatherCompare/182fd4.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/textureGatherCompare/182fd4.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/textureGatherCompare/182fd4.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/textureGatherCompare/182fd4.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/textureGatherCompare/182fd4.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/textureGatherCompare/182fd4.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/textureGatherCompare/182fd4.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/textureGatherCompare/60d2d1.wgsl b/test/tint/builtins/gen/literal/textureGatherCompare/60d2d1.wgsl
similarity index 97%
rename from test/tint/builtins/gen/textureGatherCompare/60d2d1.wgsl
rename to test/tint/builtins/gen/literal/textureGatherCompare/60d2d1.wgsl
index 4fe0fc719a..55833fd824 100644
--- a/test/tint/builtins/gen/textureGatherCompare/60d2d1.wgsl
+++ b/test/tint/builtins/gen/literal/textureGatherCompare/60d2d1.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/textureGatherCompare/60d2d1.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureGatherCompare/60d2d1.wgsl.expected.glsl
similarity index 97%
rename from test/tint/builtins/gen/textureGatherCompare/60d2d1.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/textureGatherCompare/60d2d1.wgsl.expected.glsl
index d2fdd93aa9..be729a04fa 100644
--- a/test/tint/builtins/gen/textureGatherCompare/60d2d1.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureGatherCompare/60d2d1.wgsl.expected.glsl
@@ -10,7 +10,7 @@ void textureGatherCompare_60d2d1() {
 
 vec4 vertex_main() {
   textureGatherCompare_60d2d1();
-  return vec4(0.0f, 0.0f, 0.0f, 0.0f);
+  return vec4(0.0f);
 }
 
 void main() {
diff --git a/test/tint/builtins/gen/textureGatherCompare/60d2d1.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/textureGatherCompare/60d2d1.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/textureGatherCompare/60d2d1.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/textureGatherCompare/60d2d1.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/textureGatherCompare/60d2d1.wgsl.expected.msl b/test/tint/builtins/gen/literal/textureGatherCompare/60d2d1.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/textureGatherCompare/60d2d1.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/textureGatherCompare/60d2d1.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/textureGatherCompare/60d2d1.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureGatherCompare/60d2d1.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/textureGatherCompare/60d2d1.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/textureGatherCompare/60d2d1.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/textureGatherCompare/60d2d1.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/textureGatherCompare/60d2d1.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/textureGatherCompare/60d2d1.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/textureGatherCompare/60d2d1.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/textureGatherCompare/6d9352.wgsl b/test/tint/builtins/gen/literal/textureGatherCompare/6d9352.wgsl
similarity index 97%
rename from test/tint/builtins/gen/textureGatherCompare/6d9352.wgsl
rename to test/tint/builtins/gen/literal/textureGatherCompare/6d9352.wgsl
index e58b3776fb..56b963b878 100644
--- a/test/tint/builtins/gen/textureGatherCompare/6d9352.wgsl
+++ b/test/tint/builtins/gen/literal/textureGatherCompare/6d9352.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/textureGatherCompare/6d9352.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureGatherCompare/6d9352.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/textureGatherCompare/6d9352.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/textureGatherCompare/6d9352.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/textureGatherCompare/6d9352.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/textureGatherCompare/6d9352.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/textureGatherCompare/6d9352.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/textureGatherCompare/6d9352.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/textureGatherCompare/6d9352.wgsl.expected.msl b/test/tint/builtins/gen/literal/textureGatherCompare/6d9352.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/textureGatherCompare/6d9352.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/textureGatherCompare/6d9352.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/textureGatherCompare/6d9352.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureGatherCompare/6d9352.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/textureGatherCompare/6d9352.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/textureGatherCompare/6d9352.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/textureGatherCompare/6d9352.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/textureGatherCompare/6d9352.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/textureGatherCompare/6d9352.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/textureGatherCompare/6d9352.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/textureGatherCompare/6f1267.wgsl b/test/tint/builtins/gen/literal/textureGatherCompare/6f1267.wgsl
similarity index 97%
rename from test/tint/builtins/gen/textureGatherCompare/6f1267.wgsl
rename to test/tint/builtins/gen/literal/textureGatherCompare/6f1267.wgsl
index b3b015d91e..ade1d7ae99 100644
--- a/test/tint/builtins/gen/textureGatherCompare/6f1267.wgsl
+++ b/test/tint/builtins/gen/literal/textureGatherCompare/6f1267.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/textureGatherCompare/6f1267.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureGatherCompare/6f1267.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/textureGatherCompare/6f1267.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/textureGatherCompare/6f1267.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/textureGatherCompare/6f1267.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/textureGatherCompare/6f1267.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/textureGatherCompare/6f1267.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/textureGatherCompare/6f1267.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/textureGatherCompare/6f1267.wgsl.expected.msl b/test/tint/builtins/gen/literal/textureGatherCompare/6f1267.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/textureGatherCompare/6f1267.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/textureGatherCompare/6f1267.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/textureGatherCompare/6f1267.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureGatherCompare/6f1267.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/textureGatherCompare/6f1267.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/textureGatherCompare/6f1267.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/textureGatherCompare/6f1267.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/textureGatherCompare/6f1267.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/textureGatherCompare/6f1267.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/textureGatherCompare/6f1267.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/textureGatherCompare/783e65.wgsl b/test/tint/builtins/gen/literal/textureGatherCompare/783e65.wgsl
similarity index 97%
rename from test/tint/builtins/gen/textureGatherCompare/783e65.wgsl
rename to test/tint/builtins/gen/literal/textureGatherCompare/783e65.wgsl
index cb6fb6d343..c78b79486a 100644
--- a/test/tint/builtins/gen/textureGatherCompare/783e65.wgsl
+++ b/test/tint/builtins/gen/literal/textureGatherCompare/783e65.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/textureGatherCompare/783e65.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureGatherCompare/783e65.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/textureGatherCompare/783e65.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/textureGatherCompare/783e65.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/textureGatherCompare/783e65.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/textureGatherCompare/783e65.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/textureGatherCompare/783e65.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/textureGatherCompare/783e65.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/textureGatherCompare/783e65.wgsl.expected.msl b/test/tint/builtins/gen/literal/textureGatherCompare/783e65.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/textureGatherCompare/783e65.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/textureGatherCompare/783e65.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/textureGatherCompare/783e65.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureGatherCompare/783e65.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/textureGatherCompare/783e65.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/textureGatherCompare/783e65.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/textureGatherCompare/783e65.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/textureGatherCompare/783e65.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/textureGatherCompare/783e65.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/textureGatherCompare/783e65.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/textureGatherCompare/a5f587.wgsl b/test/tint/builtins/gen/literal/textureGatherCompare/a5f587.wgsl
similarity index 97%
rename from test/tint/builtins/gen/textureGatherCompare/a5f587.wgsl
rename to test/tint/builtins/gen/literal/textureGatherCompare/a5f587.wgsl
index 3a2d011291..f8c05c85ec 100644
--- a/test/tint/builtins/gen/textureGatherCompare/a5f587.wgsl
+++ b/test/tint/builtins/gen/literal/textureGatherCompare/a5f587.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/textureGatherCompare/a5f587.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureGatherCompare/a5f587.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/textureGatherCompare/a5f587.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/textureGatherCompare/a5f587.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/textureGatherCompare/a5f587.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/textureGatherCompare/a5f587.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/textureGatherCompare/a5f587.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/textureGatherCompare/a5f587.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/textureGatherCompare/a5f587.wgsl.expected.msl b/test/tint/builtins/gen/literal/textureGatherCompare/a5f587.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/textureGatherCompare/a5f587.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/textureGatherCompare/a5f587.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/textureGatherCompare/a5f587.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureGatherCompare/a5f587.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/textureGatherCompare/a5f587.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/textureGatherCompare/a5f587.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/textureGatherCompare/a5f587.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/textureGatherCompare/a5f587.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/textureGatherCompare/a5f587.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/textureGatherCompare/a5f587.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/textureLoad/19cf87.wgsl b/test/tint/builtins/gen/literal/textureLoad/19cf87.wgsl
similarity index 97%
rename from test/tint/builtins/gen/textureLoad/19cf87.wgsl
rename to test/tint/builtins/gen/literal/textureLoad/19cf87.wgsl
index be3267a268..ed06a2407b 100644
--- a/test/tint/builtins/gen/textureLoad/19cf87.wgsl
+++ b/test/tint/builtins/gen/literal/textureLoad/19cf87.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/textureLoad/19cf87.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureLoad/19cf87.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/textureLoad/19cf87.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/textureLoad/19cf87.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/textureLoad/19cf87.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/textureLoad/19cf87.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/textureLoad/19cf87.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/textureLoad/19cf87.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/textureLoad/19cf87.wgsl.expected.msl b/test/tint/builtins/gen/literal/textureLoad/19cf87.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/textureLoad/19cf87.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/textureLoad/19cf87.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/textureLoad/19cf87.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureLoad/19cf87.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/textureLoad/19cf87.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/textureLoad/19cf87.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/textureLoad/19cf87.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/textureLoad/19cf87.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/textureLoad/19cf87.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/textureLoad/19cf87.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/textureLoad/1b8588.wgsl b/test/tint/builtins/gen/literal/textureLoad/1b8588.wgsl
similarity index 97%
rename from test/tint/builtins/gen/textureLoad/1b8588.wgsl
rename to test/tint/builtins/gen/literal/textureLoad/1b8588.wgsl
index f83d3bc541..011895991f 100644
--- a/test/tint/builtins/gen/textureLoad/1b8588.wgsl
+++ b/test/tint/builtins/gen/literal/textureLoad/1b8588.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/textureLoad/1b8588.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureLoad/1b8588.wgsl.expected.glsl
similarity index 97%
rename from test/tint/builtins/gen/textureLoad/1b8588.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/textureLoad/1b8588.wgsl.expected.glsl
index 147694e534..3645132e8e 100644
--- a/test/tint/builtins/gen/textureLoad/1b8588.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureLoad/1b8588.wgsl.expected.glsl
@@ -9,7 +9,7 @@ void textureLoad_1b8588() {
 
 vec4 vertex_main() {
   textureLoad_1b8588();
-  return vec4(0.0f, 0.0f, 0.0f, 0.0f);
+  return vec4(0.0f);
 }
 
 void main() {
diff --git a/test/tint/builtins/gen/textureLoad/1b8588.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/textureLoad/1b8588.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/textureLoad/1b8588.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/textureLoad/1b8588.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/textureLoad/1b8588.wgsl.expected.msl b/test/tint/builtins/gen/literal/textureLoad/1b8588.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/textureLoad/1b8588.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/textureLoad/1b8588.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/textureLoad/1b8588.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureLoad/1b8588.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/textureLoad/1b8588.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/textureLoad/1b8588.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/textureLoad/1b8588.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/textureLoad/1b8588.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/textureLoad/1b8588.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/textureLoad/1b8588.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/textureLoad/1f2016.wgsl b/test/tint/builtins/gen/literal/textureLoad/1f2016.wgsl
similarity index 97%
rename from test/tint/builtins/gen/textureLoad/1f2016.wgsl
rename to test/tint/builtins/gen/literal/textureLoad/1f2016.wgsl
index 078f87b97d..edf3989d6e 100644
--- a/test/tint/builtins/gen/textureLoad/1f2016.wgsl
+++ b/test/tint/builtins/gen/literal/textureLoad/1f2016.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/textureLoad/1f2016.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureLoad/1f2016.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/textureLoad/1f2016.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/textureLoad/1f2016.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/textureLoad/1f2016.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/textureLoad/1f2016.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/textureLoad/1f2016.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/textureLoad/1f2016.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/textureLoad/1f2016.wgsl.expected.msl b/test/tint/builtins/gen/literal/textureLoad/1f2016.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/textureLoad/1f2016.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/textureLoad/1f2016.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/textureLoad/1f2016.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureLoad/1f2016.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/textureLoad/1f2016.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/textureLoad/1f2016.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/textureLoad/1f2016.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/textureLoad/1f2016.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/textureLoad/1f2016.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/textureLoad/1f2016.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/textureLoad/484344.wgsl b/test/tint/builtins/gen/literal/textureLoad/484344.wgsl
similarity index 97%
rename from test/tint/builtins/gen/textureLoad/484344.wgsl
rename to test/tint/builtins/gen/literal/textureLoad/484344.wgsl
index 498efdae0a..08234e12a9 100644
--- a/test/tint/builtins/gen/textureLoad/484344.wgsl
+++ b/test/tint/builtins/gen/literal/textureLoad/484344.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/textureLoad/484344.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureLoad/484344.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/textureLoad/484344.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/textureLoad/484344.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/textureLoad/484344.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/textureLoad/484344.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/textureLoad/484344.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/textureLoad/484344.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/textureLoad/484344.wgsl.expected.msl b/test/tint/builtins/gen/literal/textureLoad/484344.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/textureLoad/484344.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/textureLoad/484344.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/textureLoad/484344.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureLoad/484344.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/textureLoad/484344.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/textureLoad/484344.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/textureLoad/484344.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/textureLoad/484344.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/textureLoad/484344.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/textureLoad/484344.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/textureLoad/4fd803.wgsl b/test/tint/builtins/gen/literal/textureLoad/4fd803.wgsl
similarity index 97%
rename from test/tint/builtins/gen/textureLoad/4fd803.wgsl
rename to test/tint/builtins/gen/literal/textureLoad/4fd803.wgsl
index 9d60c2526e..3aebc0e72e 100644
--- a/test/tint/builtins/gen/textureLoad/4fd803.wgsl
+++ b/test/tint/builtins/gen/literal/textureLoad/4fd803.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/textureLoad/4fd803.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureLoad/4fd803.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/textureLoad/4fd803.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/textureLoad/4fd803.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/textureLoad/4fd803.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/textureLoad/4fd803.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/textureLoad/4fd803.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/textureLoad/4fd803.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/textureLoad/4fd803.wgsl.expected.msl b/test/tint/builtins/gen/literal/textureLoad/4fd803.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/textureLoad/4fd803.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/textureLoad/4fd803.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/textureLoad/4fd803.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureLoad/4fd803.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/textureLoad/4fd803.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/textureLoad/4fd803.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/textureLoad/4fd803.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/textureLoad/4fd803.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/textureLoad/4fd803.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/textureLoad/4fd803.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/textureLoad/5a2f9d.wgsl b/test/tint/builtins/gen/literal/textureLoad/5a2f9d.wgsl
similarity index 97%
rename from test/tint/builtins/gen/textureLoad/5a2f9d.wgsl
rename to test/tint/builtins/gen/literal/textureLoad/5a2f9d.wgsl
index 1f1e1e1f12..c30b0673d1 100644
--- a/test/tint/builtins/gen/textureLoad/5a2f9d.wgsl
+++ b/test/tint/builtins/gen/literal/textureLoad/5a2f9d.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/textureLoad/5a2f9d.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureLoad/5a2f9d.wgsl.expected.glsl
similarity index 97%
rename from test/tint/builtins/gen/textureLoad/5a2f9d.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/textureLoad/5a2f9d.wgsl.expected.glsl
index 457ddc9b6f..e934bb10f6 100644
--- a/test/tint/builtins/gen/textureLoad/5a2f9d.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureLoad/5a2f9d.wgsl.expected.glsl
@@ -9,7 +9,7 @@ void textureLoad_5a2f9d() {
 
 vec4 vertex_main() {
   textureLoad_5a2f9d();
-  return vec4(0.0f, 0.0f, 0.0f, 0.0f);
+  return vec4(0.0f);
 }
 
 void main() {
diff --git a/test/tint/builtins/gen/textureLoad/5a2f9d.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/textureLoad/5a2f9d.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/textureLoad/5a2f9d.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/textureLoad/5a2f9d.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/textureLoad/5a2f9d.wgsl.expected.msl b/test/tint/builtins/gen/literal/textureLoad/5a2f9d.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/textureLoad/5a2f9d.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/textureLoad/5a2f9d.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/textureLoad/5a2f9d.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureLoad/5a2f9d.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/textureLoad/5a2f9d.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/textureLoad/5a2f9d.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/textureLoad/5a2f9d.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/textureLoad/5a2f9d.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/textureLoad/5a2f9d.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/textureLoad/5a2f9d.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/textureLoad/6154d4.wgsl b/test/tint/builtins/gen/literal/textureLoad/6154d4.wgsl
similarity index 97%
rename from test/tint/builtins/gen/textureLoad/6154d4.wgsl
rename to test/tint/builtins/gen/literal/textureLoad/6154d4.wgsl
index 6078b2d2ad..7a5acec0df 100644
--- a/test/tint/builtins/gen/textureLoad/6154d4.wgsl
+++ b/test/tint/builtins/gen/literal/textureLoad/6154d4.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/textureLoad/6154d4.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureLoad/6154d4.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/textureLoad/6154d4.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/textureLoad/6154d4.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/textureLoad/6154d4.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/textureLoad/6154d4.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/textureLoad/6154d4.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/textureLoad/6154d4.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/textureLoad/6154d4.wgsl.expected.msl b/test/tint/builtins/gen/literal/textureLoad/6154d4.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/textureLoad/6154d4.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/textureLoad/6154d4.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/textureLoad/6154d4.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureLoad/6154d4.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/textureLoad/6154d4.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/textureLoad/6154d4.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/textureLoad/6154d4.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/textureLoad/6154d4.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/textureLoad/6154d4.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/textureLoad/6154d4.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/textureLoad/6273b1.wgsl b/test/tint/builtins/gen/literal/textureLoad/6273b1.wgsl
similarity index 97%
rename from test/tint/builtins/gen/textureLoad/6273b1.wgsl
rename to test/tint/builtins/gen/literal/textureLoad/6273b1.wgsl
index 0bc163feb2..28389f1861 100644
--- a/test/tint/builtins/gen/textureLoad/6273b1.wgsl
+++ b/test/tint/builtins/gen/literal/textureLoad/6273b1.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/textureLoad/6273b1.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureLoad/6273b1.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/textureLoad/6273b1.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/textureLoad/6273b1.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/textureLoad/6273b1.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/textureLoad/6273b1.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/textureLoad/6273b1.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/textureLoad/6273b1.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/textureLoad/6273b1.wgsl.expected.msl b/test/tint/builtins/gen/literal/textureLoad/6273b1.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/textureLoad/6273b1.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/textureLoad/6273b1.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/textureLoad/6273b1.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureLoad/6273b1.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/textureLoad/6273b1.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/textureLoad/6273b1.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/textureLoad/6273b1.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/textureLoad/6273b1.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/textureLoad/6273b1.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/textureLoad/6273b1.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/textureLoad/79e697.wgsl b/test/tint/builtins/gen/literal/textureLoad/79e697.wgsl
similarity index 97%
rename from test/tint/builtins/gen/textureLoad/79e697.wgsl
rename to test/tint/builtins/gen/literal/textureLoad/79e697.wgsl
index 195a489083..a6340f6d9f 100644
--- a/test/tint/builtins/gen/textureLoad/79e697.wgsl
+++ b/test/tint/builtins/gen/literal/textureLoad/79e697.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/textureLoad/79e697.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureLoad/79e697.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/textureLoad/79e697.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/textureLoad/79e697.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/textureLoad/79e697.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/textureLoad/79e697.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/textureLoad/79e697.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/textureLoad/79e697.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/textureLoad/79e697.wgsl.expected.msl b/test/tint/builtins/gen/literal/textureLoad/79e697.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/textureLoad/79e697.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/textureLoad/79e697.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/textureLoad/79e697.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureLoad/79e697.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/textureLoad/79e697.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/textureLoad/79e697.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/textureLoad/79e697.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/textureLoad/79e697.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/textureLoad/79e697.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/textureLoad/79e697.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/textureLoad/7c90e5.wgsl b/test/tint/builtins/gen/literal/textureLoad/7c90e5.wgsl
similarity index 97%
rename from test/tint/builtins/gen/textureLoad/7c90e5.wgsl
rename to test/tint/builtins/gen/literal/textureLoad/7c90e5.wgsl
index 231d9c5791..5399bc0ee4 100644
--- a/test/tint/builtins/gen/textureLoad/7c90e5.wgsl
+++ b/test/tint/builtins/gen/literal/textureLoad/7c90e5.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/textureLoad/7c90e5.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureLoad/7c90e5.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/textureLoad/7c90e5.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/textureLoad/7c90e5.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/textureLoad/7c90e5.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/textureLoad/7c90e5.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/textureLoad/7c90e5.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/textureLoad/7c90e5.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/textureLoad/7c90e5.wgsl.expected.msl b/test/tint/builtins/gen/literal/textureLoad/7c90e5.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/textureLoad/7c90e5.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/textureLoad/7c90e5.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/textureLoad/7c90e5.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureLoad/7c90e5.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/textureLoad/7c90e5.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/textureLoad/7c90e5.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/textureLoad/7c90e5.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/textureLoad/7c90e5.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/textureLoad/7c90e5.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/textureLoad/7c90e5.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/textureLoad/81c381.wgsl b/test/tint/builtins/gen/literal/textureLoad/81c381.wgsl
similarity index 97%
rename from test/tint/builtins/gen/textureLoad/81c381.wgsl
rename to test/tint/builtins/gen/literal/textureLoad/81c381.wgsl
index b68c0ded8e..14e9fce449 100644
--- a/test/tint/builtins/gen/textureLoad/81c381.wgsl
+++ b/test/tint/builtins/gen/literal/textureLoad/81c381.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/textureLoad/81c381.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureLoad/81c381.wgsl.expected.glsl
similarity index 97%
rename from test/tint/builtins/gen/textureLoad/81c381.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/textureLoad/81c381.wgsl.expected.glsl
index e18d7c3608..306366945a 100644
--- a/test/tint/builtins/gen/textureLoad/81c381.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureLoad/81c381.wgsl.expected.glsl
@@ -9,7 +9,7 @@ void textureLoad_81c381() {
 
 vec4 vertex_main() {
   textureLoad_81c381();
-  return vec4(0.0f, 0.0f, 0.0f, 0.0f);
+  return vec4(0.0f);
 }
 
 void main() {
diff --git a/test/tint/builtins/gen/textureLoad/81c381.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/textureLoad/81c381.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/textureLoad/81c381.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/textureLoad/81c381.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/textureLoad/81c381.wgsl.expected.msl b/test/tint/builtins/gen/literal/textureLoad/81c381.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/textureLoad/81c381.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/textureLoad/81c381.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/textureLoad/81c381.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureLoad/81c381.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/textureLoad/81c381.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/textureLoad/81c381.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/textureLoad/81c381.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/textureLoad/81c381.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/textureLoad/81c381.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/textureLoad/81c381.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/textureLoad/87be85.wgsl b/test/tint/builtins/gen/literal/textureLoad/87be85.wgsl
similarity index 97%
rename from test/tint/builtins/gen/textureLoad/87be85.wgsl
rename to test/tint/builtins/gen/literal/textureLoad/87be85.wgsl
index 1440343b4a..576da29120 100644
--- a/test/tint/builtins/gen/textureLoad/87be85.wgsl
+++ b/test/tint/builtins/gen/literal/textureLoad/87be85.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/textureLoad/87be85.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureLoad/87be85.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/textureLoad/87be85.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/textureLoad/87be85.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/textureLoad/87be85.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/textureLoad/87be85.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/textureLoad/87be85.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/textureLoad/87be85.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/textureLoad/87be85.wgsl.expected.msl b/test/tint/builtins/gen/literal/textureLoad/87be85.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/textureLoad/87be85.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/textureLoad/87be85.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/textureLoad/87be85.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureLoad/87be85.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/textureLoad/87be85.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/textureLoad/87be85.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/textureLoad/87be85.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/textureLoad/87be85.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/textureLoad/87be85.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/textureLoad/87be85.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/textureLoad/8acf41.wgsl b/test/tint/builtins/gen/literal/textureLoad/8acf41.wgsl
similarity index 97%
rename from test/tint/builtins/gen/textureLoad/8acf41.wgsl
rename to test/tint/builtins/gen/literal/textureLoad/8acf41.wgsl
index 25aff6cce5..f1b9767566 100644
--- a/test/tint/builtins/gen/textureLoad/8acf41.wgsl
+++ b/test/tint/builtins/gen/literal/textureLoad/8acf41.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/literal/textureLoad/8acf41.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureLoad/8acf41.wgsl.expected.glsl
new file mode 100644
index 0000000000..1e5e98ded2
--- /dev/null
+++ b/test/tint/builtins/gen/literal/textureLoad/8acf41.wgsl.expected.glsl
@@ -0,0 +1,222 @@
+SKIP: FAILED
+
+#version 310 es
+
+struct GammaTransferParams {
+  float G;
+  float A;
+  float B;
+  float C;
+  float D;
+  float E;
+  float F;
+  uint padding;
+};
+
+struct ExternalTextureParams {
+  uint numPlanes;
+  mat3x4 yuvToRgbConversionMatrix;
+  GammaTransferParams gammaDecodeParams;
+  GammaTransferParams gammaEncodeParams;
+  mat3 gamutConversionMatrix;
+};
+
+layout(binding = 2) uniform ExternalTextureParams_1 {
+  uint numPlanes;
+  mat3x4 yuvToRgbConversionMatrix;
+  GammaTransferParams gammaDecodeParams;
+  GammaTransferParams gammaEncodeParams;
+  mat3 gamutConversionMatrix;
+} ext_tex_params;
+
+vec3 gammaCorrection(vec3 v, GammaTransferParams params) {
+  bvec3 cond = lessThan(abs(v), vec3(params.D));
+  vec3 t = (sign(v) * ((params.C * abs(v)) + params.F));
+  vec3 f = (sign(v) * (pow(((params.A * abs(v)) + params.B), vec3(params.G)) + params.E));
+  return mix(f, t, cond);
+}
+
+vec4 textureLoadExternal(highp sampler2D plane0_1, highp sampler2D plane1_1, ivec2 coord, ExternalTextureParams params) {
+  vec3 color = vec3(0.0f, 0.0f, 0.0f);
+  if ((params.numPlanes == 1u)) {
+    color = texelFetch(plane0_1, coord, 0).rgb;
+  } else {
+    color = (vec4(texelFetch(plane0_1, coord, 0).r, texelFetch(plane1_1, coord, 0).rg, 1.0f) * params.yuvToRgbConversionMatrix);
+  }
+  color = gammaCorrection(color, params.gammaDecodeParams);
+  color = (params.gamutConversionMatrix * color);
+  color = gammaCorrection(color, params.gammaEncodeParams);
+  return vec4(color, 1.0f);
+}
+
+uniform highp sampler2D arg_0_1;
+uniform highp sampler2D ext_tex_plane_1_1;
+void textureLoad_8acf41() {
+  vec4 res = textureLoadExternal(arg_0_1, ext_tex_plane_1_1, ivec2(0), ext_tex_params);
+}
+
+vec4 vertex_main() {
+  textureLoad_8acf41();
+  return vec4(0.0f);
+}
+
+void main() {
+  gl_PointSize = 1.0;
+  vec4 inner_result = vertex_main();
+  gl_Position = inner_result;
+  gl_Position.y = -(gl_Position.y);
+  gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
+  return;
+}
+Error parsing GLSL shader:
+ERROR: 0:53: 'textureLoadExternal' : no matching overloaded function found 
+ERROR: 0:53: '=' :  cannot convert from ' const float' to ' temp highp 4-component vector of float'
+ERROR: 0:53: '' : compilation terminated 
+ERROR: 3 compilation errors.  No code generated.
+
+
+
+#version 310 es
+precision mediump float;
+
+struct GammaTransferParams {
+  float G;
+  float A;
+  float B;
+  float C;
+  float D;
+  float E;
+  float F;
+  uint padding;
+};
+
+struct ExternalTextureParams {
+  uint numPlanes;
+  mat3x4 yuvToRgbConversionMatrix;
+  GammaTransferParams gammaDecodeParams;
+  GammaTransferParams gammaEncodeParams;
+  mat3 gamutConversionMatrix;
+};
+
+layout(binding = 2) uniform ExternalTextureParams_1 {
+  uint numPlanes;
+  mat3x4 yuvToRgbConversionMatrix;
+  GammaTransferParams gammaDecodeParams;
+  GammaTransferParams gammaEncodeParams;
+  mat3 gamutConversionMatrix;
+} ext_tex_params;
+
+vec3 gammaCorrection(vec3 v, GammaTransferParams params) {
+  bvec3 cond = lessThan(abs(v), vec3(params.D));
+  vec3 t = (sign(v) * ((params.C * abs(v)) + params.F));
+  vec3 f = (sign(v) * (pow(((params.A * abs(v)) + params.B), vec3(params.G)) + params.E));
+  return mix(f, t, cond);
+}
+
+vec4 textureLoadExternal(highp sampler2D plane0_1, highp sampler2D plane1_1, ivec2 coord, ExternalTextureParams params) {
+  vec3 color = vec3(0.0f, 0.0f, 0.0f);
+  if ((params.numPlanes == 1u)) {
+    color = texelFetch(plane0_1, coord, 0).rgb;
+  } else {
+    color = (vec4(texelFetch(plane0_1, coord, 0).r, texelFetch(plane1_1, coord, 0).rg, 1.0f) * params.yuvToRgbConversionMatrix);
+  }
+  color = gammaCorrection(color, params.gammaDecodeParams);
+  color = (params.gamutConversionMatrix * color);
+  color = gammaCorrection(color, params.gammaEncodeParams);
+  return vec4(color, 1.0f);
+}
+
+uniform highp sampler2D arg_0_1;
+uniform highp sampler2D ext_tex_plane_1_1;
+void textureLoad_8acf41() {
+  vec4 res = textureLoadExternal(arg_0_1, ext_tex_plane_1_1, ivec2(0), ext_tex_params);
+}
+
+void fragment_main() {
+  textureLoad_8acf41();
+}
+
+void main() {
+  fragment_main();
+  return;
+}
+Error parsing GLSL shader:
+ERROR: 0:54: 'textureLoadExternal' : no matching overloaded function found 
+ERROR: 0:54: '=' :  cannot convert from ' const float' to ' temp mediump 4-component vector of float'
+ERROR: 0:54: '' : compilation terminated 
+ERROR: 3 compilation errors.  No code generated.
+
+
+
+#version 310 es
+
+struct GammaTransferParams {
+  float G;
+  float A;
+  float B;
+  float C;
+  float D;
+  float E;
+  float F;
+  uint padding;
+};
+
+struct ExternalTextureParams {
+  uint numPlanes;
+  mat3x4 yuvToRgbConversionMatrix;
+  GammaTransferParams gammaDecodeParams;
+  GammaTransferParams gammaEncodeParams;
+  mat3 gamutConversionMatrix;
+};
+
+layout(binding = 2) uniform ExternalTextureParams_1 {
+  uint numPlanes;
+  mat3x4 yuvToRgbConversionMatrix;
+  GammaTransferParams gammaDecodeParams;
+  GammaTransferParams gammaEncodeParams;
+  mat3 gamutConversionMatrix;
+} ext_tex_params;
+
+vec3 gammaCorrection(vec3 v, GammaTransferParams params) {
+  bvec3 cond = lessThan(abs(v), vec3(params.D));
+  vec3 t = (sign(v) * ((params.C * abs(v)) + params.F));
+  vec3 f = (sign(v) * (pow(((params.A * abs(v)) + params.B), vec3(params.G)) + params.E));
+  return mix(f, t, cond);
+}
+
+vec4 textureLoadExternal(highp sampler2D plane0_1, highp sampler2D plane1_1, ivec2 coord, ExternalTextureParams params) {
+  vec3 color = vec3(0.0f, 0.0f, 0.0f);
+  if ((params.numPlanes == 1u)) {
+    color = texelFetch(plane0_1, coord, 0).rgb;
+  } else {
+    color = (vec4(texelFetch(plane0_1, coord, 0).r, texelFetch(plane1_1, coord, 0).rg, 1.0f) * params.yuvToRgbConversionMatrix);
+  }
+  color = gammaCorrection(color, params.gammaDecodeParams);
+  color = (params.gamutConversionMatrix * color);
+  color = gammaCorrection(color, params.gammaEncodeParams);
+  return vec4(color, 1.0f);
+}
+
+uniform highp sampler2D arg_0_1;
+uniform highp sampler2D ext_tex_plane_1_1;
+void textureLoad_8acf41() {
+  vec4 res = textureLoadExternal(arg_0_1, ext_tex_plane_1_1, ivec2(0), ext_tex_params);
+}
+
+void compute_main() {
+  textureLoad_8acf41();
+}
+
+layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
+void main() {
+  compute_main();
+  return;
+}
+Error parsing GLSL shader:
+ERROR: 0:53: 'textureLoadExternal' : no matching overloaded function found 
+ERROR: 0:53: '=' :  cannot convert from ' const float' to ' temp highp 4-component vector of float'
+ERROR: 0:53: '' : compilation terminated 
+ERROR: 3 compilation errors.  No code generated.
+
+
+
diff --git a/test/tint/builtins/gen/textureLoad/8acf41.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/textureLoad/8acf41.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/textureLoad/8acf41.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/textureLoad/8acf41.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/textureLoad/8acf41.wgsl.expected.msl b/test/tint/builtins/gen/literal/textureLoad/8acf41.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/textureLoad/8acf41.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/textureLoad/8acf41.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/textureLoad/8acf41.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureLoad/8acf41.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/textureLoad/8acf41.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/textureLoad/8acf41.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/textureLoad/8acf41.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/textureLoad/8acf41.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/textureLoad/8acf41.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/textureLoad/8acf41.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/textureLoad/9b2667.wgsl b/test/tint/builtins/gen/literal/textureLoad/9b2667.wgsl
similarity index 97%
rename from test/tint/builtins/gen/textureLoad/9b2667.wgsl
rename to test/tint/builtins/gen/literal/textureLoad/9b2667.wgsl
index 73c2c3177c..decb783776 100644
--- a/test/tint/builtins/gen/textureLoad/9b2667.wgsl
+++ b/test/tint/builtins/gen/literal/textureLoad/9b2667.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/textureLoad/9b2667.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureLoad/9b2667.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/textureLoad/9b2667.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/textureLoad/9b2667.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/textureLoad/9b2667.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/textureLoad/9b2667.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/textureLoad/9b2667.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/textureLoad/9b2667.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/textureLoad/9b2667.wgsl.expected.msl b/test/tint/builtins/gen/literal/textureLoad/9b2667.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/textureLoad/9b2667.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/textureLoad/9b2667.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/textureLoad/9b2667.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureLoad/9b2667.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/textureLoad/9b2667.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/textureLoad/9b2667.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/textureLoad/9b2667.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/textureLoad/9b2667.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/textureLoad/9b2667.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/textureLoad/9b2667.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/textureLoad/a583c9.wgsl b/test/tint/builtins/gen/literal/textureLoad/a583c9.wgsl
similarity index 97%
rename from test/tint/builtins/gen/textureLoad/a583c9.wgsl
rename to test/tint/builtins/gen/literal/textureLoad/a583c9.wgsl
index 9ed4ae7e07..951d9f31b2 100644
--- a/test/tint/builtins/gen/textureLoad/a583c9.wgsl
+++ b/test/tint/builtins/gen/literal/textureLoad/a583c9.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/textureLoad/a583c9.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureLoad/a583c9.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/textureLoad/a583c9.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/textureLoad/a583c9.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/textureLoad/a583c9.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/textureLoad/a583c9.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/textureLoad/a583c9.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/textureLoad/a583c9.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/textureLoad/a583c9.wgsl.expected.msl b/test/tint/builtins/gen/literal/textureLoad/a583c9.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/textureLoad/a583c9.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/textureLoad/a583c9.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/textureLoad/a583c9.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureLoad/a583c9.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/textureLoad/a583c9.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/textureLoad/a583c9.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/textureLoad/a583c9.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/textureLoad/a583c9.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/textureLoad/a583c9.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/textureLoad/a583c9.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/textureLoad/a9a9f5.wgsl b/test/tint/builtins/gen/literal/textureLoad/a9a9f5.wgsl
similarity index 97%
rename from test/tint/builtins/gen/textureLoad/a9a9f5.wgsl
rename to test/tint/builtins/gen/literal/textureLoad/a9a9f5.wgsl
index 095314d15d..5def05cbfc 100644
--- a/test/tint/builtins/gen/textureLoad/a9a9f5.wgsl
+++ b/test/tint/builtins/gen/literal/textureLoad/a9a9f5.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/textureLoad/a9a9f5.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureLoad/a9a9f5.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/textureLoad/a9a9f5.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/textureLoad/a9a9f5.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/textureLoad/a9a9f5.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/textureLoad/a9a9f5.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/textureLoad/a9a9f5.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/textureLoad/a9a9f5.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/textureLoad/a9a9f5.wgsl.expected.msl b/test/tint/builtins/gen/literal/textureLoad/a9a9f5.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/textureLoad/a9a9f5.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/textureLoad/a9a9f5.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/textureLoad/a9a9f5.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureLoad/a9a9f5.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/textureLoad/a9a9f5.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/textureLoad/a9a9f5.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/textureLoad/a9a9f5.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/textureLoad/a9a9f5.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/textureLoad/a9a9f5.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/textureLoad/a9a9f5.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/textureLoad/c2a480.wgsl b/test/tint/builtins/gen/literal/textureLoad/c2a480.wgsl
similarity index 97%
rename from test/tint/builtins/gen/textureLoad/c2a480.wgsl
rename to test/tint/builtins/gen/literal/textureLoad/c2a480.wgsl
index b3ebdccef4..2155704041 100644
--- a/test/tint/builtins/gen/textureLoad/c2a480.wgsl
+++ b/test/tint/builtins/gen/literal/textureLoad/c2a480.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/textureLoad/c2a480.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureLoad/c2a480.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/textureLoad/c2a480.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/textureLoad/c2a480.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/textureLoad/c2a480.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/textureLoad/c2a480.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/textureLoad/c2a480.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/textureLoad/c2a480.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/textureLoad/c2a480.wgsl.expected.msl b/test/tint/builtins/gen/literal/textureLoad/c2a480.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/textureLoad/c2a480.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/textureLoad/c2a480.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/textureLoad/c2a480.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureLoad/c2a480.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/textureLoad/c2a480.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/textureLoad/c2a480.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/textureLoad/c2a480.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/textureLoad/c2a480.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/textureLoad/c2a480.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/textureLoad/c2a480.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/textureLoad/c378ee.wgsl b/test/tint/builtins/gen/literal/textureLoad/c378ee.wgsl
similarity index 97%
rename from test/tint/builtins/gen/textureLoad/c378ee.wgsl
rename to test/tint/builtins/gen/literal/textureLoad/c378ee.wgsl
index 4d56e20dae..39b5713c2b 100644
--- a/test/tint/builtins/gen/textureLoad/c378ee.wgsl
+++ b/test/tint/builtins/gen/literal/textureLoad/c378ee.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/textureLoad/c378ee.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureLoad/c378ee.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/textureLoad/c378ee.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/textureLoad/c378ee.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/textureLoad/c378ee.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/textureLoad/c378ee.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/textureLoad/c378ee.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/textureLoad/c378ee.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/textureLoad/c378ee.wgsl.expected.msl b/test/tint/builtins/gen/literal/textureLoad/c378ee.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/textureLoad/c378ee.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/textureLoad/c378ee.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/textureLoad/c378ee.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureLoad/c378ee.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/textureLoad/c378ee.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/textureLoad/c378ee.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/textureLoad/c378ee.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/textureLoad/c378ee.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/textureLoad/c378ee.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/textureLoad/c378ee.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/textureLoad/e3d2cc.wgsl b/test/tint/builtins/gen/literal/textureLoad/e3d2cc.wgsl
similarity index 97%
rename from test/tint/builtins/gen/textureLoad/e3d2cc.wgsl
rename to test/tint/builtins/gen/literal/textureLoad/e3d2cc.wgsl
index 1a097e7b25..219a31a76c 100644
--- a/test/tint/builtins/gen/textureLoad/e3d2cc.wgsl
+++ b/test/tint/builtins/gen/literal/textureLoad/e3d2cc.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/textureLoad/e3d2cc.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureLoad/e3d2cc.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/textureLoad/e3d2cc.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/textureLoad/e3d2cc.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/textureLoad/e3d2cc.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/textureLoad/e3d2cc.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/textureLoad/e3d2cc.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/textureLoad/e3d2cc.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/textureLoad/e3d2cc.wgsl.expected.msl b/test/tint/builtins/gen/literal/textureLoad/e3d2cc.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/textureLoad/e3d2cc.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/textureLoad/e3d2cc.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/textureLoad/e3d2cc.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureLoad/e3d2cc.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/textureLoad/e3d2cc.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/textureLoad/e3d2cc.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/textureLoad/e3d2cc.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/textureLoad/e3d2cc.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/textureLoad/e3d2cc.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/textureLoad/e3d2cc.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/textureNumLayers/024820.wgsl b/test/tint/builtins/gen/literal/textureNumLayers/024820.wgsl
similarity index 97%
rename from test/tint/builtins/gen/textureNumLayers/024820.wgsl
rename to test/tint/builtins/gen/literal/textureNumLayers/024820.wgsl
index 99a5031fa2..ee39dbbd35 100644
--- a/test/tint/builtins/gen/textureNumLayers/024820.wgsl
+++ b/test/tint/builtins/gen/literal/textureNumLayers/024820.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/textureNumLayers/024820.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureNumLayers/024820.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/textureNumLayers/024820.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/textureNumLayers/024820.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/textureNumLayers/024820.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/textureNumLayers/024820.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/textureNumLayers/024820.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/textureNumLayers/024820.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/textureNumLayers/024820.wgsl.expected.msl b/test/tint/builtins/gen/literal/textureNumLayers/024820.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/textureNumLayers/024820.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/textureNumLayers/024820.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/textureNumLayers/024820.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureNumLayers/024820.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/textureNumLayers/024820.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/textureNumLayers/024820.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/textureNumLayers/024820.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/textureNumLayers/024820.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/textureNumLayers/024820.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/textureNumLayers/024820.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/textureNumLayers/053df7.wgsl b/test/tint/builtins/gen/literal/textureNumLayers/053df7.wgsl
similarity index 97%
rename from test/tint/builtins/gen/textureNumLayers/053df7.wgsl
rename to test/tint/builtins/gen/literal/textureNumLayers/053df7.wgsl
index 9595a93f38..f906fef223 100644
--- a/test/tint/builtins/gen/textureNumLayers/053df7.wgsl
+++ b/test/tint/builtins/gen/literal/textureNumLayers/053df7.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/textureNumLayers/053df7.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureNumLayers/053df7.wgsl.expected.glsl
similarity index 97%
rename from test/tint/builtins/gen/textureNumLayers/053df7.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/textureNumLayers/053df7.wgsl.expected.glsl
index 89d39c3fa0..e995abb9b6 100644
--- a/test/tint/builtins/gen/textureNumLayers/053df7.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureNumLayers/053df7.wgsl.expected.glsl
@@ -9,7 +9,7 @@ void textureNumLayers_053df7() {
 
 vec4 vertex_main() {
   textureNumLayers_053df7();
-  return vec4(0.0f, 0.0f, 0.0f, 0.0f);
+  return vec4(0.0f);
 }
 
 void main() {
diff --git a/test/tint/builtins/gen/textureNumLayers/053df7.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/textureNumLayers/053df7.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/textureNumLayers/053df7.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/textureNumLayers/053df7.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/textureNumLayers/053df7.wgsl.expected.msl b/test/tint/builtins/gen/literal/textureNumLayers/053df7.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/textureNumLayers/053df7.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/textureNumLayers/053df7.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/textureNumLayers/053df7.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureNumLayers/053df7.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/textureNumLayers/053df7.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/textureNumLayers/053df7.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/textureNumLayers/053df7.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/textureNumLayers/053df7.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/textureNumLayers/053df7.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/textureNumLayers/053df7.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/textureNumLayers/058cc3.wgsl b/test/tint/builtins/gen/literal/textureNumLayers/058cc3.wgsl
similarity index 97%
rename from test/tint/builtins/gen/textureNumLayers/058cc3.wgsl
rename to test/tint/builtins/gen/literal/textureNumLayers/058cc3.wgsl
index fe750568ee..55e7ee0848 100644
--- a/test/tint/builtins/gen/textureNumLayers/058cc3.wgsl
+++ b/test/tint/builtins/gen/literal/textureNumLayers/058cc3.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/textureNumLayers/058cc3.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureNumLayers/058cc3.wgsl.expected.glsl
similarity index 97%
rename from test/tint/builtins/gen/textureNumLayers/058cc3.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/textureNumLayers/058cc3.wgsl.expected.glsl
index 21eb267df5..0730d3a356 100644
--- a/test/tint/builtins/gen/textureNumLayers/058cc3.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureNumLayers/058cc3.wgsl.expected.glsl
@@ -9,7 +9,7 @@ void textureNumLayers_058cc3() {
 
 vec4 vertex_main() {
   textureNumLayers_058cc3();
-  return vec4(0.0f, 0.0f, 0.0f, 0.0f);
+  return vec4(0.0f);
 }
 
 void main() {
diff --git a/test/tint/builtins/gen/textureNumLayers/058cc3.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/textureNumLayers/058cc3.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/textureNumLayers/058cc3.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/textureNumLayers/058cc3.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/textureNumLayers/058cc3.wgsl.expected.msl b/test/tint/builtins/gen/literal/textureNumLayers/058cc3.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/textureNumLayers/058cc3.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/textureNumLayers/058cc3.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/textureNumLayers/058cc3.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureNumLayers/058cc3.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/textureNumLayers/058cc3.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/textureNumLayers/058cc3.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/textureNumLayers/058cc3.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/textureNumLayers/058cc3.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/textureNumLayers/058cc3.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/textureNumLayers/058cc3.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/textureNumLayers/09d05d.wgsl b/test/tint/builtins/gen/literal/textureNumLayers/09d05d.wgsl
similarity index 97%
rename from test/tint/builtins/gen/textureNumLayers/09d05d.wgsl
rename to test/tint/builtins/gen/literal/textureNumLayers/09d05d.wgsl
index 9e8fd7c1a5..baf9538784 100644
--- a/test/tint/builtins/gen/textureNumLayers/09d05d.wgsl
+++ b/test/tint/builtins/gen/literal/textureNumLayers/09d05d.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/textureNumLayers/09d05d.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureNumLayers/09d05d.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/textureNumLayers/09d05d.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/textureNumLayers/09d05d.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/textureNumLayers/09d05d.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/textureNumLayers/09d05d.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/textureNumLayers/09d05d.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/textureNumLayers/09d05d.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/textureNumLayers/09d05d.wgsl.expected.msl b/test/tint/builtins/gen/literal/textureNumLayers/09d05d.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/textureNumLayers/09d05d.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/textureNumLayers/09d05d.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/textureNumLayers/09d05d.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureNumLayers/09d05d.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/textureNumLayers/09d05d.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/textureNumLayers/09d05d.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/textureNumLayers/09d05d.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/textureNumLayers/09d05d.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/textureNumLayers/09d05d.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/textureNumLayers/09d05d.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/textureNumLayers/13b4ce.wgsl b/test/tint/builtins/gen/literal/textureNumLayers/13b4ce.wgsl
similarity index 97%
rename from test/tint/builtins/gen/textureNumLayers/13b4ce.wgsl
rename to test/tint/builtins/gen/literal/textureNumLayers/13b4ce.wgsl
index 941d8f6aa6..e21134db8b 100644
--- a/test/tint/builtins/gen/textureNumLayers/13b4ce.wgsl
+++ b/test/tint/builtins/gen/literal/textureNumLayers/13b4ce.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/textureNumLayers/13b4ce.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureNumLayers/13b4ce.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/textureNumLayers/13b4ce.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/textureNumLayers/13b4ce.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/textureNumLayers/13b4ce.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/textureNumLayers/13b4ce.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/textureNumLayers/13b4ce.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/textureNumLayers/13b4ce.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/textureNumLayers/13b4ce.wgsl.expected.msl b/test/tint/builtins/gen/literal/textureNumLayers/13b4ce.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/textureNumLayers/13b4ce.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/textureNumLayers/13b4ce.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/textureNumLayers/13b4ce.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureNumLayers/13b4ce.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/textureNumLayers/13b4ce.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/textureNumLayers/13b4ce.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/textureNumLayers/13b4ce.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/textureNumLayers/13b4ce.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/textureNumLayers/13b4ce.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/textureNumLayers/13b4ce.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/textureNumLayers/22e53b.wgsl b/test/tint/builtins/gen/literal/textureNumLayers/22e53b.wgsl
similarity index 97%
rename from test/tint/builtins/gen/textureNumLayers/22e53b.wgsl
rename to test/tint/builtins/gen/literal/textureNumLayers/22e53b.wgsl
index e2c96d742a..a74f529565 100644
--- a/test/tint/builtins/gen/textureNumLayers/22e53b.wgsl
+++ b/test/tint/builtins/gen/literal/textureNumLayers/22e53b.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/textureNumLayers/22e53b.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureNumLayers/22e53b.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/textureNumLayers/22e53b.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/textureNumLayers/22e53b.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/textureNumLayers/22e53b.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/textureNumLayers/22e53b.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/textureNumLayers/22e53b.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/textureNumLayers/22e53b.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/textureNumLayers/22e53b.wgsl.expected.msl b/test/tint/builtins/gen/literal/textureNumLayers/22e53b.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/textureNumLayers/22e53b.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/textureNumLayers/22e53b.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/textureNumLayers/22e53b.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureNumLayers/22e53b.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/textureNumLayers/22e53b.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/textureNumLayers/22e53b.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/textureNumLayers/22e53b.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/textureNumLayers/22e53b.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/textureNumLayers/22e53b.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/textureNumLayers/22e53b.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/textureNumLayers/562013.wgsl b/test/tint/builtins/gen/literal/textureNumLayers/562013.wgsl
similarity index 97%
rename from test/tint/builtins/gen/textureNumLayers/562013.wgsl
rename to test/tint/builtins/gen/literal/textureNumLayers/562013.wgsl
index aac18a1c47..b6f1c4891b 100644
--- a/test/tint/builtins/gen/textureNumLayers/562013.wgsl
+++ b/test/tint/builtins/gen/literal/textureNumLayers/562013.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/textureNumLayers/562013.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureNumLayers/562013.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/textureNumLayers/562013.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/textureNumLayers/562013.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/textureNumLayers/562013.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/textureNumLayers/562013.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/textureNumLayers/562013.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/textureNumLayers/562013.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/textureNumLayers/562013.wgsl.expected.msl b/test/tint/builtins/gen/literal/textureNumLayers/562013.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/textureNumLayers/562013.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/textureNumLayers/562013.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/textureNumLayers/562013.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureNumLayers/562013.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/textureNumLayers/562013.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/textureNumLayers/562013.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/textureNumLayers/562013.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/textureNumLayers/562013.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/textureNumLayers/562013.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/textureNumLayers/562013.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/textureNumLayers/5d59cd.wgsl b/test/tint/builtins/gen/literal/textureNumLayers/5d59cd.wgsl
similarity index 97%
rename from test/tint/builtins/gen/textureNumLayers/5d59cd.wgsl
rename to test/tint/builtins/gen/literal/textureNumLayers/5d59cd.wgsl
index edf197ff17..d808df9b03 100644
--- a/test/tint/builtins/gen/textureNumLayers/5d59cd.wgsl
+++ b/test/tint/builtins/gen/literal/textureNumLayers/5d59cd.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/textureNumLayers/5d59cd.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureNumLayers/5d59cd.wgsl.expected.glsl
similarity index 97%
rename from test/tint/builtins/gen/textureNumLayers/5d59cd.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/textureNumLayers/5d59cd.wgsl.expected.glsl
index 8d21f6d0d8..c469183479 100644
--- a/test/tint/builtins/gen/textureNumLayers/5d59cd.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureNumLayers/5d59cd.wgsl.expected.glsl
@@ -9,7 +9,7 @@ void textureNumLayers_5d59cd() {
 
 vec4 vertex_main() {
   textureNumLayers_5d59cd();
-  return vec4(0.0f, 0.0f, 0.0f, 0.0f);
+  return vec4(0.0f);
 }
 
 void main() {
diff --git a/test/tint/builtins/gen/textureNumLayers/5d59cd.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/textureNumLayers/5d59cd.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/textureNumLayers/5d59cd.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/textureNumLayers/5d59cd.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/textureNumLayers/5d59cd.wgsl.expected.msl b/test/tint/builtins/gen/literal/textureNumLayers/5d59cd.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/textureNumLayers/5d59cd.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/textureNumLayers/5d59cd.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/textureNumLayers/5d59cd.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureNumLayers/5d59cd.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/textureNumLayers/5d59cd.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/textureNumLayers/5d59cd.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/textureNumLayers/5d59cd.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/textureNumLayers/5d59cd.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/textureNumLayers/5d59cd.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/textureNumLayers/5d59cd.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/textureNumLayers/68a65b.wgsl b/test/tint/builtins/gen/literal/textureNumLayers/68a65b.wgsl
similarity index 97%
rename from test/tint/builtins/gen/textureNumLayers/68a65b.wgsl
rename to test/tint/builtins/gen/literal/textureNumLayers/68a65b.wgsl
index 6743ff5fe3..680221f648 100644
--- a/test/tint/builtins/gen/textureNumLayers/68a65b.wgsl
+++ b/test/tint/builtins/gen/literal/textureNumLayers/68a65b.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/textureNumLayers/68a65b.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureNumLayers/68a65b.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/textureNumLayers/68a65b.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/textureNumLayers/68a65b.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/textureNumLayers/68a65b.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/textureNumLayers/68a65b.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/textureNumLayers/68a65b.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/textureNumLayers/68a65b.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/textureNumLayers/68a65b.wgsl.expected.msl b/test/tint/builtins/gen/literal/textureNumLayers/68a65b.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/textureNumLayers/68a65b.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/textureNumLayers/68a65b.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/textureNumLayers/68a65b.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureNumLayers/68a65b.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/textureNumLayers/68a65b.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/textureNumLayers/68a65b.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/textureNumLayers/68a65b.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/textureNumLayers/68a65b.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/textureNumLayers/68a65b.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/textureNumLayers/68a65b.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/textureNumLayers/778bd1.wgsl b/test/tint/builtins/gen/literal/textureNumLayers/778bd1.wgsl
similarity index 97%
rename from test/tint/builtins/gen/textureNumLayers/778bd1.wgsl
rename to test/tint/builtins/gen/literal/textureNumLayers/778bd1.wgsl
index 2574c2af03..814bad17d6 100644
--- a/test/tint/builtins/gen/textureNumLayers/778bd1.wgsl
+++ b/test/tint/builtins/gen/literal/textureNumLayers/778bd1.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/textureNumLayers/778bd1.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureNumLayers/778bd1.wgsl.expected.glsl
similarity index 97%
rename from test/tint/builtins/gen/textureNumLayers/778bd1.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/textureNumLayers/778bd1.wgsl.expected.glsl
index b4b76bf538..40debcc79c 100644
--- a/test/tint/builtins/gen/textureNumLayers/778bd1.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureNumLayers/778bd1.wgsl.expected.glsl
@@ -9,7 +9,7 @@ void textureNumLayers_778bd1() {
 
 vec4 vertex_main() {
   textureNumLayers_778bd1();
-  return vec4(0.0f, 0.0f, 0.0f, 0.0f);
+  return vec4(0.0f);
 }
 
 void main() {
diff --git a/test/tint/builtins/gen/textureNumLayers/778bd1.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/textureNumLayers/778bd1.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/textureNumLayers/778bd1.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/textureNumLayers/778bd1.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/textureNumLayers/778bd1.wgsl.expected.msl b/test/tint/builtins/gen/literal/textureNumLayers/778bd1.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/textureNumLayers/778bd1.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/textureNumLayers/778bd1.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/textureNumLayers/778bd1.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureNumLayers/778bd1.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/textureNumLayers/778bd1.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/textureNumLayers/778bd1.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/textureNumLayers/778bd1.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/textureNumLayers/778bd1.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/textureNumLayers/778bd1.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/textureNumLayers/778bd1.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/textureNumLayers/7f1937.wgsl b/test/tint/builtins/gen/literal/textureNumLayers/7f1937.wgsl
similarity index 97%
rename from test/tint/builtins/gen/textureNumLayers/7f1937.wgsl
rename to test/tint/builtins/gen/literal/textureNumLayers/7f1937.wgsl
index ed7014f4d1..7e843bd811 100644
--- a/test/tint/builtins/gen/textureNumLayers/7f1937.wgsl
+++ b/test/tint/builtins/gen/literal/textureNumLayers/7f1937.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/textureNumLayers/7f1937.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureNumLayers/7f1937.wgsl.expected.glsl
similarity index 97%
rename from test/tint/builtins/gen/textureNumLayers/7f1937.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/textureNumLayers/7f1937.wgsl.expected.glsl
index 33bd39840d..f6fdbf0fce 100644
--- a/test/tint/builtins/gen/textureNumLayers/7f1937.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureNumLayers/7f1937.wgsl.expected.glsl
@@ -9,7 +9,7 @@ void textureNumLayers_7f1937() {
 
 vec4 vertex_main() {
   textureNumLayers_7f1937();
-  return vec4(0.0f, 0.0f, 0.0f, 0.0f);
+  return vec4(0.0f);
 }
 
 void main() {
diff --git a/test/tint/builtins/gen/textureNumLayers/7f1937.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/textureNumLayers/7f1937.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/textureNumLayers/7f1937.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/textureNumLayers/7f1937.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/textureNumLayers/7f1937.wgsl.expected.msl b/test/tint/builtins/gen/literal/textureNumLayers/7f1937.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/textureNumLayers/7f1937.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/textureNumLayers/7f1937.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/textureNumLayers/7f1937.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureNumLayers/7f1937.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/textureNumLayers/7f1937.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/textureNumLayers/7f1937.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/textureNumLayers/7f1937.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/textureNumLayers/7f1937.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/textureNumLayers/7f1937.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/textureNumLayers/7f1937.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/textureNumLayers/85f980.wgsl b/test/tint/builtins/gen/literal/textureNumLayers/85f980.wgsl
similarity index 97%
rename from test/tint/builtins/gen/textureNumLayers/85f980.wgsl
rename to test/tint/builtins/gen/literal/textureNumLayers/85f980.wgsl
index e01f5769de..dc95da7630 100644
--- a/test/tint/builtins/gen/textureNumLayers/85f980.wgsl
+++ b/test/tint/builtins/gen/literal/textureNumLayers/85f980.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/textureNumLayers/85f980.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureNumLayers/85f980.wgsl.expected.glsl
similarity index 97%
rename from test/tint/builtins/gen/textureNumLayers/85f980.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/textureNumLayers/85f980.wgsl.expected.glsl
index 22a9c53273..529bfb372b 100644
--- a/test/tint/builtins/gen/textureNumLayers/85f980.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureNumLayers/85f980.wgsl.expected.glsl
@@ -9,7 +9,7 @@ void textureNumLayers_85f980() {
 
 vec4 vertex_main() {
   textureNumLayers_85f980();
-  return vec4(0.0f, 0.0f, 0.0f, 0.0f);
+  return vec4(0.0f);
 }
 
 void main() {
diff --git a/test/tint/builtins/gen/textureNumLayers/85f980.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/textureNumLayers/85f980.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/textureNumLayers/85f980.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/textureNumLayers/85f980.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/textureNumLayers/85f980.wgsl.expected.msl b/test/tint/builtins/gen/literal/textureNumLayers/85f980.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/textureNumLayers/85f980.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/textureNumLayers/85f980.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/textureNumLayers/85f980.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureNumLayers/85f980.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/textureNumLayers/85f980.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/textureNumLayers/85f980.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/textureNumLayers/85f980.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/textureNumLayers/85f980.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/textureNumLayers/85f980.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/textureNumLayers/85f980.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/textureNumLayers/87953e.wgsl b/test/tint/builtins/gen/literal/textureNumLayers/87953e.wgsl
similarity index 97%
rename from test/tint/builtins/gen/textureNumLayers/87953e.wgsl
rename to test/tint/builtins/gen/literal/textureNumLayers/87953e.wgsl
index 00db05ea76..09bb3e89bd 100644
--- a/test/tint/builtins/gen/textureNumLayers/87953e.wgsl
+++ b/test/tint/builtins/gen/literal/textureNumLayers/87953e.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/textureNumLayers/87953e.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureNumLayers/87953e.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/textureNumLayers/87953e.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/textureNumLayers/87953e.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/textureNumLayers/87953e.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/textureNumLayers/87953e.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/textureNumLayers/87953e.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/textureNumLayers/87953e.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/textureNumLayers/87953e.wgsl.expected.msl b/test/tint/builtins/gen/literal/textureNumLayers/87953e.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/textureNumLayers/87953e.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/textureNumLayers/87953e.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/textureNumLayers/87953e.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureNumLayers/87953e.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/textureNumLayers/87953e.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/textureNumLayers/87953e.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/textureNumLayers/87953e.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/textureNumLayers/87953e.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/textureNumLayers/87953e.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/textureNumLayers/87953e.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/textureNumLayers/893e7c.wgsl b/test/tint/builtins/gen/literal/textureNumLayers/893e7c.wgsl
similarity index 97%
rename from test/tint/builtins/gen/textureNumLayers/893e7c.wgsl
rename to test/tint/builtins/gen/literal/textureNumLayers/893e7c.wgsl
index 3b58ba3dc1..343198531f 100644
--- a/test/tint/builtins/gen/textureNumLayers/893e7c.wgsl
+++ b/test/tint/builtins/gen/literal/textureNumLayers/893e7c.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/textureNumLayers/893e7c.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureNumLayers/893e7c.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/textureNumLayers/893e7c.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/textureNumLayers/893e7c.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/textureNumLayers/893e7c.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/textureNumLayers/893e7c.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/textureNumLayers/893e7c.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/textureNumLayers/893e7c.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/textureNumLayers/893e7c.wgsl.expected.msl b/test/tint/builtins/gen/literal/textureNumLayers/893e7c.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/textureNumLayers/893e7c.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/textureNumLayers/893e7c.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/textureNumLayers/893e7c.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureNumLayers/893e7c.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/textureNumLayers/893e7c.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/textureNumLayers/893e7c.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/textureNumLayers/893e7c.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/textureNumLayers/893e7c.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/textureNumLayers/893e7c.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/textureNumLayers/893e7c.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/textureNumLayers/9700fb.wgsl b/test/tint/builtins/gen/literal/textureNumLayers/9700fb.wgsl
similarity index 97%
rename from test/tint/builtins/gen/textureNumLayers/9700fb.wgsl
rename to test/tint/builtins/gen/literal/textureNumLayers/9700fb.wgsl
index d02558bbeb..096b3e85ca 100644
--- a/test/tint/builtins/gen/textureNumLayers/9700fb.wgsl
+++ b/test/tint/builtins/gen/literal/textureNumLayers/9700fb.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/textureNumLayers/9700fb.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureNumLayers/9700fb.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/textureNumLayers/9700fb.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/textureNumLayers/9700fb.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/textureNumLayers/9700fb.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/textureNumLayers/9700fb.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/textureNumLayers/9700fb.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/textureNumLayers/9700fb.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/textureNumLayers/9700fb.wgsl.expected.msl b/test/tint/builtins/gen/literal/textureNumLayers/9700fb.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/textureNumLayers/9700fb.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/textureNumLayers/9700fb.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/textureNumLayers/9700fb.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureNumLayers/9700fb.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/textureNumLayers/9700fb.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/textureNumLayers/9700fb.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/textureNumLayers/9700fb.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/textureNumLayers/9700fb.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/textureNumLayers/9700fb.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/textureNumLayers/9700fb.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/textureNumLayers/a216d2.wgsl b/test/tint/builtins/gen/literal/textureNumLayers/a216d2.wgsl
similarity index 97%
rename from test/tint/builtins/gen/textureNumLayers/a216d2.wgsl
rename to test/tint/builtins/gen/literal/textureNumLayers/a216d2.wgsl
index 1bf60ba39f..176205aac9 100644
--- a/test/tint/builtins/gen/textureNumLayers/a216d2.wgsl
+++ b/test/tint/builtins/gen/literal/textureNumLayers/a216d2.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/textureNumLayers/a216d2.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureNumLayers/a216d2.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/textureNumLayers/a216d2.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/textureNumLayers/a216d2.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/textureNumLayers/a216d2.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/textureNumLayers/a216d2.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/textureNumLayers/a216d2.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/textureNumLayers/a216d2.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/textureNumLayers/a216d2.wgsl.expected.msl b/test/tint/builtins/gen/literal/textureNumLayers/a216d2.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/textureNumLayers/a216d2.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/textureNumLayers/a216d2.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/textureNumLayers/a216d2.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureNumLayers/a216d2.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/textureNumLayers/a216d2.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/textureNumLayers/a216d2.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/textureNumLayers/a216d2.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/textureNumLayers/a216d2.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/textureNumLayers/a216d2.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/textureNumLayers/a216d2.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/textureNumLayers/cd5dc8.wgsl b/test/tint/builtins/gen/literal/textureNumLayers/cd5dc8.wgsl
similarity index 97%
rename from test/tint/builtins/gen/textureNumLayers/cd5dc8.wgsl
rename to test/tint/builtins/gen/literal/textureNumLayers/cd5dc8.wgsl
index af6c708665..f99e1181c3 100644
--- a/test/tint/builtins/gen/textureNumLayers/cd5dc8.wgsl
+++ b/test/tint/builtins/gen/literal/textureNumLayers/cd5dc8.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/textureNumLayers/cd5dc8.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureNumLayers/cd5dc8.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/textureNumLayers/cd5dc8.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/textureNumLayers/cd5dc8.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/textureNumLayers/cd5dc8.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/textureNumLayers/cd5dc8.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/textureNumLayers/cd5dc8.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/textureNumLayers/cd5dc8.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/textureNumLayers/cd5dc8.wgsl.expected.msl b/test/tint/builtins/gen/literal/textureNumLayers/cd5dc8.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/textureNumLayers/cd5dc8.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/textureNumLayers/cd5dc8.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/textureNumLayers/cd5dc8.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureNumLayers/cd5dc8.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/textureNumLayers/cd5dc8.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/textureNumLayers/cd5dc8.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/textureNumLayers/cd5dc8.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/textureNumLayers/cd5dc8.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/textureNumLayers/cd5dc8.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/textureNumLayers/cd5dc8.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/textureNumLayers/d5b228.wgsl b/test/tint/builtins/gen/literal/textureNumLayers/d5b228.wgsl
similarity index 97%
rename from test/tint/builtins/gen/textureNumLayers/d5b228.wgsl
rename to test/tint/builtins/gen/literal/textureNumLayers/d5b228.wgsl
index df5ccbd2c3..ba8d85eb53 100644
--- a/test/tint/builtins/gen/textureNumLayers/d5b228.wgsl
+++ b/test/tint/builtins/gen/literal/textureNumLayers/d5b228.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/textureNumLayers/d5b228.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureNumLayers/d5b228.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/textureNumLayers/d5b228.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/textureNumLayers/d5b228.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/textureNumLayers/d5b228.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/textureNumLayers/d5b228.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/textureNumLayers/d5b228.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/textureNumLayers/d5b228.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/textureNumLayers/d5b228.wgsl.expected.msl b/test/tint/builtins/gen/literal/textureNumLayers/d5b228.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/textureNumLayers/d5b228.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/textureNumLayers/d5b228.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/textureNumLayers/d5b228.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureNumLayers/d5b228.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/textureNumLayers/d5b228.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/textureNumLayers/d5b228.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/textureNumLayers/d5b228.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/textureNumLayers/d5b228.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/textureNumLayers/d5b228.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/textureNumLayers/d5b228.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/textureNumLayers/e31be1.wgsl b/test/tint/builtins/gen/literal/textureNumLayers/e31be1.wgsl
similarity index 97%
rename from test/tint/builtins/gen/textureNumLayers/e31be1.wgsl
rename to test/tint/builtins/gen/literal/textureNumLayers/e31be1.wgsl
index a7f2c8ca09..fa0eed7b7f 100644
--- a/test/tint/builtins/gen/textureNumLayers/e31be1.wgsl
+++ b/test/tint/builtins/gen/literal/textureNumLayers/e31be1.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/textureNumLayers/e31be1.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureNumLayers/e31be1.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/textureNumLayers/e31be1.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/textureNumLayers/e31be1.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/textureNumLayers/e31be1.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/textureNumLayers/e31be1.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/textureNumLayers/e31be1.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/textureNumLayers/e31be1.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/textureNumLayers/e31be1.wgsl.expected.msl b/test/tint/builtins/gen/literal/textureNumLayers/e31be1.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/textureNumLayers/e31be1.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/textureNumLayers/e31be1.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/textureNumLayers/e31be1.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureNumLayers/e31be1.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/textureNumLayers/e31be1.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/textureNumLayers/e31be1.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/textureNumLayers/e31be1.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/textureNumLayers/e31be1.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/textureNumLayers/e31be1.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/textureNumLayers/e31be1.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/textureNumLayers/e653c0.wgsl b/test/tint/builtins/gen/literal/textureNumLayers/e653c0.wgsl
similarity index 97%
rename from test/tint/builtins/gen/textureNumLayers/e653c0.wgsl
rename to test/tint/builtins/gen/literal/textureNumLayers/e653c0.wgsl
index cb9d362880..4ee178ccf8 100644
--- a/test/tint/builtins/gen/textureNumLayers/e653c0.wgsl
+++ b/test/tint/builtins/gen/literal/textureNumLayers/e653c0.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/textureNumLayers/e653c0.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureNumLayers/e653c0.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/textureNumLayers/e653c0.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/textureNumLayers/e653c0.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/textureNumLayers/e653c0.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/textureNumLayers/e653c0.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/textureNumLayers/e653c0.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/textureNumLayers/e653c0.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/textureNumLayers/e653c0.wgsl.expected.msl b/test/tint/builtins/gen/literal/textureNumLayers/e653c0.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/textureNumLayers/e653c0.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/textureNumLayers/e653c0.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/textureNumLayers/e653c0.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureNumLayers/e653c0.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/textureNumLayers/e653c0.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/textureNumLayers/e653c0.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/textureNumLayers/e653c0.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/textureNumLayers/e653c0.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/textureNumLayers/e653c0.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/textureNumLayers/e653c0.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/textureNumLayers/ee942f.wgsl b/test/tint/builtins/gen/literal/textureNumLayers/ee942f.wgsl
similarity index 97%
rename from test/tint/builtins/gen/textureNumLayers/ee942f.wgsl
rename to test/tint/builtins/gen/literal/textureNumLayers/ee942f.wgsl
index 5ebae3d73e..ea1d4a8ac6 100644
--- a/test/tint/builtins/gen/textureNumLayers/ee942f.wgsl
+++ b/test/tint/builtins/gen/literal/textureNumLayers/ee942f.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/textureNumLayers/ee942f.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureNumLayers/ee942f.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/textureNumLayers/ee942f.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/textureNumLayers/ee942f.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/textureNumLayers/ee942f.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/textureNumLayers/ee942f.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/textureNumLayers/ee942f.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/textureNumLayers/ee942f.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/textureNumLayers/ee942f.wgsl.expected.msl b/test/tint/builtins/gen/literal/textureNumLayers/ee942f.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/textureNumLayers/ee942f.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/textureNumLayers/ee942f.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/textureNumLayers/ee942f.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureNumLayers/ee942f.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/textureNumLayers/ee942f.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/textureNumLayers/ee942f.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/textureNumLayers/ee942f.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/textureNumLayers/ee942f.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/textureNumLayers/ee942f.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/textureNumLayers/ee942f.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/textureNumLayers/f33005.wgsl b/test/tint/builtins/gen/literal/textureNumLayers/f33005.wgsl
similarity index 97%
rename from test/tint/builtins/gen/textureNumLayers/f33005.wgsl
rename to test/tint/builtins/gen/literal/textureNumLayers/f33005.wgsl
index d12cb268ea..6445227a30 100644
--- a/test/tint/builtins/gen/textureNumLayers/f33005.wgsl
+++ b/test/tint/builtins/gen/literal/textureNumLayers/f33005.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/textureNumLayers/f33005.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureNumLayers/f33005.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/textureNumLayers/f33005.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/textureNumLayers/f33005.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/textureNumLayers/f33005.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/textureNumLayers/f33005.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/textureNumLayers/f33005.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/textureNumLayers/f33005.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/textureNumLayers/f33005.wgsl.expected.msl b/test/tint/builtins/gen/literal/textureNumLayers/f33005.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/textureNumLayers/f33005.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/textureNumLayers/f33005.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/textureNumLayers/f33005.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureNumLayers/f33005.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/textureNumLayers/f33005.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/textureNumLayers/f33005.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/textureNumLayers/f33005.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/textureNumLayers/f33005.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/textureNumLayers/f33005.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/textureNumLayers/f33005.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/textureNumLayers/fcec98.wgsl b/test/tint/builtins/gen/literal/textureNumLayers/fcec98.wgsl
similarity index 97%
rename from test/tint/builtins/gen/textureNumLayers/fcec98.wgsl
rename to test/tint/builtins/gen/literal/textureNumLayers/fcec98.wgsl
index e99f0753a3..0fef907a40 100644
--- a/test/tint/builtins/gen/textureNumLayers/fcec98.wgsl
+++ b/test/tint/builtins/gen/literal/textureNumLayers/fcec98.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/textureNumLayers/fcec98.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureNumLayers/fcec98.wgsl.expected.glsl
similarity index 97%
rename from test/tint/builtins/gen/textureNumLayers/fcec98.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/textureNumLayers/fcec98.wgsl.expected.glsl
index 0befb0d791..bfaa76f926 100644
--- a/test/tint/builtins/gen/textureNumLayers/fcec98.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureNumLayers/fcec98.wgsl.expected.glsl
@@ -9,7 +9,7 @@ void textureNumLayers_fcec98() {
 
 vec4 vertex_main() {
   textureNumLayers_fcec98();
-  return vec4(0.0f, 0.0f, 0.0f, 0.0f);
+  return vec4(0.0f);
 }
 
 void main() {
diff --git a/test/tint/builtins/gen/textureNumLayers/fcec98.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/textureNumLayers/fcec98.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/textureNumLayers/fcec98.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/textureNumLayers/fcec98.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/textureNumLayers/fcec98.wgsl.expected.msl b/test/tint/builtins/gen/literal/textureNumLayers/fcec98.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/textureNumLayers/fcec98.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/textureNumLayers/fcec98.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/textureNumLayers/fcec98.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureNumLayers/fcec98.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/textureNumLayers/fcec98.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/textureNumLayers/fcec98.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/textureNumLayers/fcec98.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/textureNumLayers/fcec98.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/textureNumLayers/fcec98.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/textureNumLayers/fcec98.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/textureNumLayers/ff5e89.wgsl b/test/tint/builtins/gen/literal/textureNumLayers/ff5e89.wgsl
similarity index 97%
rename from test/tint/builtins/gen/textureNumLayers/ff5e89.wgsl
rename to test/tint/builtins/gen/literal/textureNumLayers/ff5e89.wgsl
index 3d50b4fced..f12ea65d97 100644
--- a/test/tint/builtins/gen/textureNumLayers/ff5e89.wgsl
+++ b/test/tint/builtins/gen/literal/textureNumLayers/ff5e89.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/textureNumLayers/ff5e89.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureNumLayers/ff5e89.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/textureNumLayers/ff5e89.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/textureNumLayers/ff5e89.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/textureNumLayers/ff5e89.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/textureNumLayers/ff5e89.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/textureNumLayers/ff5e89.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/textureNumLayers/ff5e89.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/textureNumLayers/ff5e89.wgsl.expected.msl b/test/tint/builtins/gen/literal/textureNumLayers/ff5e89.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/textureNumLayers/ff5e89.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/textureNumLayers/ff5e89.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/textureNumLayers/ff5e89.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureNumLayers/ff5e89.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/textureNumLayers/ff5e89.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/textureNumLayers/ff5e89.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/textureNumLayers/ff5e89.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/textureNumLayers/ff5e89.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/textureNumLayers/ff5e89.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/textureNumLayers/ff5e89.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/textureNumLevels/076cb5.wgsl b/test/tint/builtins/gen/literal/textureNumLevels/076cb5.wgsl
similarity index 97%
rename from test/tint/builtins/gen/textureNumLevels/076cb5.wgsl
rename to test/tint/builtins/gen/literal/textureNumLevels/076cb5.wgsl
index 63b7ea4cea..96b8e96bc3 100644
--- a/test/tint/builtins/gen/textureNumLevels/076cb5.wgsl
+++ b/test/tint/builtins/gen/literal/textureNumLevels/076cb5.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/textureNumLevels/076cb5.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureNumLevels/076cb5.wgsl.expected.glsl
similarity index 97%
rename from test/tint/builtins/gen/textureNumLevels/076cb5.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/textureNumLevels/076cb5.wgsl.expected.glsl
index 492973acac..6b93674f9d 100644
--- a/test/tint/builtins/gen/textureNumLevels/076cb5.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureNumLevels/076cb5.wgsl.expected.glsl
@@ -9,7 +9,7 @@ void textureNumLevels_076cb5() {
 
 vec4 vertex_main() {
   textureNumLevels_076cb5();
-  return vec4(0.0f, 0.0f, 0.0f, 0.0f);
+  return vec4(0.0f);
 }
 
 void main() {
diff --git a/test/tint/builtins/gen/textureNumLevels/076cb5.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/textureNumLevels/076cb5.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/textureNumLevels/076cb5.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/textureNumLevels/076cb5.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/textureNumLevels/076cb5.wgsl.expected.msl b/test/tint/builtins/gen/literal/textureNumLevels/076cb5.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/textureNumLevels/076cb5.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/textureNumLevels/076cb5.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/textureNumLevels/076cb5.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureNumLevels/076cb5.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/textureNumLevels/076cb5.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/textureNumLevels/076cb5.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/textureNumLevels/076cb5.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/textureNumLevels/076cb5.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/textureNumLevels/076cb5.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/textureNumLevels/076cb5.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/textureNumLevels/080d95.wgsl b/test/tint/builtins/gen/literal/textureNumLevels/080d95.wgsl
similarity index 96%
rename from test/tint/builtins/gen/textureNumLevels/080d95.wgsl
rename to test/tint/builtins/gen/literal/textureNumLevels/080d95.wgsl
index ded52c9a96..172e090d78 100644
--- a/test/tint/builtins/gen/textureNumLevels/080d95.wgsl
+++ b/test/tint/builtins/gen/literal/textureNumLevels/080d95.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/textureNumLevels/080d95.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureNumLevels/080d95.wgsl.expected.glsl
similarity index 97%
rename from test/tint/builtins/gen/textureNumLevels/080d95.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/textureNumLevels/080d95.wgsl.expected.glsl
index 39d54d2658..367bb7a01b 100644
--- a/test/tint/builtins/gen/textureNumLevels/080d95.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureNumLevels/080d95.wgsl.expected.glsl
@@ -9,7 +9,7 @@ void textureNumLevels_080d95() {
 
 vec4 vertex_main() {
   textureNumLevels_080d95();
-  return vec4(0.0f, 0.0f, 0.0f, 0.0f);
+  return vec4(0.0f);
 }
 
 void main() {
diff --git a/test/tint/builtins/gen/textureNumLevels/080d95.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/textureNumLevels/080d95.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/textureNumLevels/080d95.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/textureNumLevels/080d95.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/textureNumLevels/080d95.wgsl.expected.msl b/test/tint/builtins/gen/literal/textureNumLevels/080d95.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/textureNumLevels/080d95.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/textureNumLevels/080d95.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/textureNumLevels/080d95.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureNumLevels/080d95.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/textureNumLevels/080d95.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/textureNumLevels/080d95.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/textureNumLevels/080d95.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/textureNumLevels/080d95.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/textureNumLevels/080d95.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/textureNumLevels/080d95.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/textureNumLevels/09ddd0.wgsl b/test/tint/builtins/gen/literal/textureNumLevels/09ddd0.wgsl
similarity index 96%
rename from test/tint/builtins/gen/textureNumLevels/09ddd0.wgsl
rename to test/tint/builtins/gen/literal/textureNumLevels/09ddd0.wgsl
index e843a19449..dea8f54612 100644
--- a/test/tint/builtins/gen/textureNumLevels/09ddd0.wgsl
+++ b/test/tint/builtins/gen/literal/textureNumLevels/09ddd0.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/textureNumLevels/09ddd0.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureNumLevels/09ddd0.wgsl.expected.glsl
similarity index 97%
rename from test/tint/builtins/gen/textureNumLevels/09ddd0.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/textureNumLevels/09ddd0.wgsl.expected.glsl
index 642d73853a..0691d9b2ee 100644
--- a/test/tint/builtins/gen/textureNumLevels/09ddd0.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureNumLevels/09ddd0.wgsl.expected.glsl
@@ -9,7 +9,7 @@ void textureNumLevels_09ddd0() {
 
 vec4 vertex_main() {
   textureNumLevels_09ddd0();
-  return vec4(0.0f, 0.0f, 0.0f, 0.0f);
+  return vec4(0.0f);
 }
 
 void main() {
diff --git a/test/tint/builtins/gen/textureNumLevels/09ddd0.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/textureNumLevels/09ddd0.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/textureNumLevels/09ddd0.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/textureNumLevels/09ddd0.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/textureNumLevels/09ddd0.wgsl.expected.msl b/test/tint/builtins/gen/literal/textureNumLevels/09ddd0.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/textureNumLevels/09ddd0.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/textureNumLevels/09ddd0.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/textureNumLevels/09ddd0.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureNumLevels/09ddd0.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/textureNumLevels/09ddd0.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/textureNumLevels/09ddd0.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/textureNumLevels/09ddd0.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/textureNumLevels/09ddd0.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/textureNumLevels/09ddd0.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/textureNumLevels/09ddd0.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/textureNumLevels/105988.wgsl b/test/tint/builtins/gen/literal/textureNumLevels/105988.wgsl
similarity index 97%
rename from test/tint/builtins/gen/textureNumLevels/105988.wgsl
rename to test/tint/builtins/gen/literal/textureNumLevels/105988.wgsl
index 0014fa3efd..67775fb0b3 100644
--- a/test/tint/builtins/gen/textureNumLevels/105988.wgsl
+++ b/test/tint/builtins/gen/literal/textureNumLevels/105988.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/textureNumLevels/105988.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureNumLevels/105988.wgsl.expected.glsl
similarity index 97%
rename from test/tint/builtins/gen/textureNumLevels/105988.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/textureNumLevels/105988.wgsl.expected.glsl
index 162f265051..90e28da994 100644
--- a/test/tint/builtins/gen/textureNumLevels/105988.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureNumLevels/105988.wgsl.expected.glsl
@@ -9,7 +9,7 @@ void textureNumLevels_105988() {
 
 vec4 vertex_main() {
   textureNumLevels_105988();
-  return vec4(0.0f, 0.0f, 0.0f, 0.0f);
+  return vec4(0.0f);
 }
 
 void main() {
diff --git a/test/tint/builtins/gen/textureNumLevels/105988.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/textureNumLevels/105988.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/textureNumLevels/105988.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/textureNumLevels/105988.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/textureNumLevels/105988.wgsl.expected.msl b/test/tint/builtins/gen/literal/textureNumLevels/105988.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/textureNumLevels/105988.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/textureNumLevels/105988.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/textureNumLevels/105988.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureNumLevels/105988.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/textureNumLevels/105988.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/textureNumLevels/105988.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/textureNumLevels/105988.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/textureNumLevels/105988.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/textureNumLevels/105988.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/textureNumLevels/105988.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/textureNumLevels/1e6f3b.wgsl b/test/tint/builtins/gen/literal/textureNumLevels/1e6f3b.wgsl
similarity index 96%
rename from test/tint/builtins/gen/textureNumLevels/1e6f3b.wgsl
rename to test/tint/builtins/gen/literal/textureNumLevels/1e6f3b.wgsl
index 2dc92a3a30..a921b0cd80 100644
--- a/test/tint/builtins/gen/textureNumLevels/1e6f3b.wgsl
+++ b/test/tint/builtins/gen/literal/textureNumLevels/1e6f3b.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/textureNumLevels/1e6f3b.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureNumLevels/1e6f3b.wgsl.expected.glsl
similarity index 97%
rename from test/tint/builtins/gen/textureNumLevels/1e6f3b.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/textureNumLevels/1e6f3b.wgsl.expected.glsl
index 2b5dbe7100..50f6f13cbd 100644
--- a/test/tint/builtins/gen/textureNumLevels/1e6f3b.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureNumLevels/1e6f3b.wgsl.expected.glsl
@@ -9,7 +9,7 @@ void textureNumLevels_1e6f3b() {
 
 vec4 vertex_main() {
   textureNumLevels_1e6f3b();
-  return vec4(0.0f, 0.0f, 0.0f, 0.0f);
+  return vec4(0.0f);
 }
 
 void main() {
diff --git a/test/tint/builtins/gen/textureNumLevels/1e6f3b.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/textureNumLevels/1e6f3b.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/textureNumLevels/1e6f3b.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/textureNumLevels/1e6f3b.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/textureNumLevels/1e6f3b.wgsl.expected.msl b/test/tint/builtins/gen/literal/textureNumLevels/1e6f3b.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/textureNumLevels/1e6f3b.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/textureNumLevels/1e6f3b.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/textureNumLevels/1e6f3b.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureNumLevels/1e6f3b.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/textureNumLevels/1e6f3b.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/textureNumLevels/1e6f3b.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/textureNumLevels/1e6f3b.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/textureNumLevels/1e6f3b.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/textureNumLevels/1e6f3b.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/textureNumLevels/1e6f3b.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/textureNumLevels/23f750.wgsl b/test/tint/builtins/gen/literal/textureNumLevels/23f750.wgsl
similarity index 96%
rename from test/tint/builtins/gen/textureNumLevels/23f750.wgsl
rename to test/tint/builtins/gen/literal/textureNumLevels/23f750.wgsl
index 20719fc925..c44baad85a 100644
--- a/test/tint/builtins/gen/textureNumLevels/23f750.wgsl
+++ b/test/tint/builtins/gen/literal/textureNumLevels/23f750.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/textureNumLevels/23f750.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureNumLevels/23f750.wgsl.expected.glsl
similarity index 97%
rename from test/tint/builtins/gen/textureNumLevels/23f750.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/textureNumLevels/23f750.wgsl.expected.glsl
index ce7bf96e13..8b964989fe 100644
--- a/test/tint/builtins/gen/textureNumLevels/23f750.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureNumLevels/23f750.wgsl.expected.glsl
@@ -9,7 +9,7 @@ void textureNumLevels_23f750() {
 
 vec4 vertex_main() {
   textureNumLevels_23f750();
-  return vec4(0.0f, 0.0f, 0.0f, 0.0f);
+  return vec4(0.0f);
 }
 
 void main() {
diff --git a/test/tint/builtins/gen/textureNumLevels/23f750.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/textureNumLevels/23f750.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/textureNumLevels/23f750.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/textureNumLevels/23f750.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/textureNumLevels/23f750.wgsl.expected.msl b/test/tint/builtins/gen/literal/textureNumLevels/23f750.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/textureNumLevels/23f750.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/textureNumLevels/23f750.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/textureNumLevels/23f750.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureNumLevels/23f750.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/textureNumLevels/23f750.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/textureNumLevels/23f750.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/textureNumLevels/23f750.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/textureNumLevels/23f750.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/textureNumLevels/23f750.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/textureNumLevels/23f750.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/textureNumLevels/2c3575.wgsl b/test/tint/builtins/gen/literal/textureNumLevels/2c3575.wgsl
similarity index 97%
rename from test/tint/builtins/gen/textureNumLevels/2c3575.wgsl
rename to test/tint/builtins/gen/literal/textureNumLevels/2c3575.wgsl
index c0db1ad608..e94cb62362 100644
--- a/test/tint/builtins/gen/textureNumLevels/2c3575.wgsl
+++ b/test/tint/builtins/gen/literal/textureNumLevels/2c3575.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/textureNumLevels/2c3575.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureNumLevels/2c3575.wgsl.expected.glsl
similarity index 97%
rename from test/tint/builtins/gen/textureNumLevels/2c3575.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/textureNumLevels/2c3575.wgsl.expected.glsl
index 0a82078f5b..2de59fc0b0 100644
--- a/test/tint/builtins/gen/textureNumLevels/2c3575.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureNumLevels/2c3575.wgsl.expected.glsl
@@ -9,7 +9,7 @@ void textureNumLevels_2c3575() {
 
 vec4 vertex_main() {
   textureNumLevels_2c3575();
-  return vec4(0.0f, 0.0f, 0.0f, 0.0f);
+  return vec4(0.0f);
 }
 
 void main() {
diff --git a/test/tint/builtins/gen/textureNumLevels/2c3575.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/textureNumLevels/2c3575.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/textureNumLevels/2c3575.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/textureNumLevels/2c3575.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/textureNumLevels/2c3575.wgsl.expected.msl b/test/tint/builtins/gen/literal/textureNumLevels/2c3575.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/textureNumLevels/2c3575.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/textureNumLevels/2c3575.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/textureNumLevels/2c3575.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureNumLevels/2c3575.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/textureNumLevels/2c3575.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/textureNumLevels/2c3575.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/textureNumLevels/2c3575.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/textureNumLevels/2c3575.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/textureNumLevels/2c3575.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/textureNumLevels/2c3575.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/textureNumLevels/32a0ae.wgsl b/test/tint/builtins/gen/literal/textureNumLevels/32a0ae.wgsl
similarity index 96%
rename from test/tint/builtins/gen/textureNumLevels/32a0ae.wgsl
rename to test/tint/builtins/gen/literal/textureNumLevels/32a0ae.wgsl
index d83db338d5..d7c7297fed 100644
--- a/test/tint/builtins/gen/textureNumLevels/32a0ae.wgsl
+++ b/test/tint/builtins/gen/literal/textureNumLevels/32a0ae.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/textureNumLevels/32a0ae.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureNumLevels/32a0ae.wgsl.expected.glsl
similarity index 97%
rename from test/tint/builtins/gen/textureNumLevels/32a0ae.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/textureNumLevels/32a0ae.wgsl.expected.glsl
index bf2838f77b..b0cdc31466 100644
--- a/test/tint/builtins/gen/textureNumLevels/32a0ae.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureNumLevels/32a0ae.wgsl.expected.glsl
@@ -9,7 +9,7 @@ void textureNumLevels_32a0ae() {
 
 vec4 vertex_main() {
   textureNumLevels_32a0ae();
-  return vec4(0.0f, 0.0f, 0.0f, 0.0f);
+  return vec4(0.0f);
 }
 
 void main() {
diff --git a/test/tint/builtins/gen/textureNumLevels/32a0ae.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/textureNumLevels/32a0ae.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/textureNumLevels/32a0ae.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/textureNumLevels/32a0ae.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/textureNumLevels/32a0ae.wgsl.expected.msl b/test/tint/builtins/gen/literal/textureNumLevels/32a0ae.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/textureNumLevels/32a0ae.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/textureNumLevels/32a0ae.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/textureNumLevels/32a0ae.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureNumLevels/32a0ae.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/textureNumLevels/32a0ae.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/textureNumLevels/32a0ae.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/textureNumLevels/32a0ae.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/textureNumLevels/32a0ae.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/textureNumLevels/32a0ae.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/textureNumLevels/32a0ae.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/textureNumLevels/5101cf.wgsl b/test/tint/builtins/gen/literal/textureNumLevels/5101cf.wgsl
similarity index 97%
rename from test/tint/builtins/gen/textureNumLevels/5101cf.wgsl
rename to test/tint/builtins/gen/literal/textureNumLevels/5101cf.wgsl
index e9cb59fa91..371315a8e1 100644
--- a/test/tint/builtins/gen/textureNumLevels/5101cf.wgsl
+++ b/test/tint/builtins/gen/literal/textureNumLevels/5101cf.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/textureNumLevels/5101cf.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureNumLevels/5101cf.wgsl.expected.glsl
similarity index 97%
rename from test/tint/builtins/gen/textureNumLevels/5101cf.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/textureNumLevels/5101cf.wgsl.expected.glsl
index 764fd83ec5..e372765680 100644
--- a/test/tint/builtins/gen/textureNumLevels/5101cf.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureNumLevels/5101cf.wgsl.expected.glsl
@@ -9,7 +9,7 @@ void textureNumLevels_5101cf() {
 
 vec4 vertex_main() {
   textureNumLevels_5101cf();
-  return vec4(0.0f, 0.0f, 0.0f, 0.0f);
+  return vec4(0.0f);
 }
 
 void main() {
diff --git a/test/tint/builtins/gen/textureNumLevels/5101cf.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/textureNumLevels/5101cf.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/textureNumLevels/5101cf.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/textureNumLevels/5101cf.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/textureNumLevels/5101cf.wgsl.expected.msl b/test/tint/builtins/gen/literal/textureNumLevels/5101cf.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/textureNumLevels/5101cf.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/textureNumLevels/5101cf.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/textureNumLevels/5101cf.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureNumLevels/5101cf.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/textureNumLevels/5101cf.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/textureNumLevels/5101cf.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/textureNumLevels/5101cf.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/textureNumLevels/5101cf.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/textureNumLevels/5101cf.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/textureNumLevels/5101cf.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/textureNumLevels/51b5bb.wgsl b/test/tint/builtins/gen/literal/textureNumLevels/51b5bb.wgsl
similarity index 96%
rename from test/tint/builtins/gen/textureNumLevels/51b5bb.wgsl
rename to test/tint/builtins/gen/literal/textureNumLevels/51b5bb.wgsl
index cad28463af..de1c30b3c8 100644
--- a/test/tint/builtins/gen/textureNumLevels/51b5bb.wgsl
+++ b/test/tint/builtins/gen/literal/textureNumLevels/51b5bb.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/textureNumLevels/51b5bb.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureNumLevels/51b5bb.wgsl.expected.glsl
similarity index 97%
rename from test/tint/builtins/gen/textureNumLevels/51b5bb.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/textureNumLevels/51b5bb.wgsl.expected.glsl
index eb8b6ebeb2..8969352a69 100644
--- a/test/tint/builtins/gen/textureNumLevels/51b5bb.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureNumLevels/51b5bb.wgsl.expected.glsl
@@ -9,7 +9,7 @@ void textureNumLevels_51b5bb() {
 
 vec4 vertex_main() {
   textureNumLevels_51b5bb();
-  return vec4(0.0f, 0.0f, 0.0f, 0.0f);
+  return vec4(0.0f);
 }
 
 void main() {
diff --git a/test/tint/builtins/gen/textureNumLevels/51b5bb.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/textureNumLevels/51b5bb.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/textureNumLevels/51b5bb.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/textureNumLevels/51b5bb.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/textureNumLevels/51b5bb.wgsl.expected.msl b/test/tint/builtins/gen/literal/textureNumLevels/51b5bb.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/textureNumLevels/51b5bb.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/textureNumLevels/51b5bb.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/textureNumLevels/51b5bb.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureNumLevels/51b5bb.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/textureNumLevels/51b5bb.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/textureNumLevels/51b5bb.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/textureNumLevels/51b5bb.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/textureNumLevels/51b5bb.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/textureNumLevels/51b5bb.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/textureNumLevels/51b5bb.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/textureNumLevels/897aaf.wgsl b/test/tint/builtins/gen/literal/textureNumLevels/897aaf.wgsl
similarity index 96%
rename from test/tint/builtins/gen/textureNumLevels/897aaf.wgsl
rename to test/tint/builtins/gen/literal/textureNumLevels/897aaf.wgsl
index edf861312c..b4559d89d2 100644
--- a/test/tint/builtins/gen/textureNumLevels/897aaf.wgsl
+++ b/test/tint/builtins/gen/literal/textureNumLevels/897aaf.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/textureNumLevels/897aaf.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureNumLevels/897aaf.wgsl.expected.glsl
similarity index 97%
rename from test/tint/builtins/gen/textureNumLevels/897aaf.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/textureNumLevels/897aaf.wgsl.expected.glsl
index a88ee828e8..f7d707ee4d 100644
--- a/test/tint/builtins/gen/textureNumLevels/897aaf.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureNumLevels/897aaf.wgsl.expected.glsl
@@ -9,7 +9,7 @@ void textureNumLevels_897aaf() {
 
 vec4 vertex_main() {
   textureNumLevels_897aaf();
-  return vec4(0.0f, 0.0f, 0.0f, 0.0f);
+  return vec4(0.0f);
 }
 
 void main() {
diff --git a/test/tint/builtins/gen/textureNumLevels/897aaf.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/textureNumLevels/897aaf.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/textureNumLevels/897aaf.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/textureNumLevels/897aaf.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/textureNumLevels/897aaf.wgsl.expected.msl b/test/tint/builtins/gen/literal/textureNumLevels/897aaf.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/textureNumLevels/897aaf.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/textureNumLevels/897aaf.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/textureNumLevels/897aaf.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureNumLevels/897aaf.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/textureNumLevels/897aaf.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/textureNumLevels/897aaf.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/textureNumLevels/897aaf.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/textureNumLevels/897aaf.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/textureNumLevels/897aaf.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/textureNumLevels/897aaf.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/textureNumLevels/9da7a5.wgsl b/test/tint/builtins/gen/literal/textureNumLevels/9da7a5.wgsl
similarity index 96%
rename from test/tint/builtins/gen/textureNumLevels/9da7a5.wgsl
rename to test/tint/builtins/gen/literal/textureNumLevels/9da7a5.wgsl
index 3e3a657794..75623c2e98 100644
--- a/test/tint/builtins/gen/textureNumLevels/9da7a5.wgsl
+++ b/test/tint/builtins/gen/literal/textureNumLevels/9da7a5.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/textureNumLevels/9da7a5.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureNumLevels/9da7a5.wgsl.expected.glsl
similarity index 97%
rename from test/tint/builtins/gen/textureNumLevels/9da7a5.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/textureNumLevels/9da7a5.wgsl.expected.glsl
index 8f3d357b97..83706c6e71 100644
--- a/test/tint/builtins/gen/textureNumLevels/9da7a5.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureNumLevels/9da7a5.wgsl.expected.glsl
@@ -9,7 +9,7 @@ void textureNumLevels_9da7a5() {
 
 vec4 vertex_main() {
   textureNumLevels_9da7a5();
-  return vec4(0.0f, 0.0f, 0.0f, 0.0f);
+  return vec4(0.0f);
 }
 
 void main() {
diff --git a/test/tint/builtins/gen/textureNumLevels/9da7a5.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/textureNumLevels/9da7a5.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/textureNumLevels/9da7a5.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/textureNumLevels/9da7a5.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/textureNumLevels/9da7a5.wgsl.expected.msl b/test/tint/builtins/gen/literal/textureNumLevels/9da7a5.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/textureNumLevels/9da7a5.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/textureNumLevels/9da7a5.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/textureNumLevels/9da7a5.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureNumLevels/9da7a5.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/textureNumLevels/9da7a5.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/textureNumLevels/9da7a5.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/textureNumLevels/9da7a5.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/textureNumLevels/9da7a5.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/textureNumLevels/9da7a5.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/textureNumLevels/9da7a5.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/textureNumLevels/a91c03.wgsl b/test/tint/builtins/gen/literal/textureNumLevels/a91c03.wgsl
similarity index 97%
rename from test/tint/builtins/gen/textureNumLevels/a91c03.wgsl
rename to test/tint/builtins/gen/literal/textureNumLevels/a91c03.wgsl
index 212372cdd6..1f9d9aeb88 100644
--- a/test/tint/builtins/gen/textureNumLevels/a91c03.wgsl
+++ b/test/tint/builtins/gen/literal/textureNumLevels/a91c03.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/textureNumLevels/a91c03.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureNumLevels/a91c03.wgsl.expected.glsl
similarity index 97%
rename from test/tint/builtins/gen/textureNumLevels/a91c03.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/textureNumLevels/a91c03.wgsl.expected.glsl
index c2ba89b86c..684bc1b610 100644
--- a/test/tint/builtins/gen/textureNumLevels/a91c03.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureNumLevels/a91c03.wgsl.expected.glsl
@@ -9,7 +9,7 @@ void textureNumLevels_a91c03() {
 
 vec4 vertex_main() {
   textureNumLevels_a91c03();
-  return vec4(0.0f, 0.0f, 0.0f, 0.0f);
+  return vec4(0.0f);
 }
 
 void main() {
diff --git a/test/tint/builtins/gen/textureNumLevels/a91c03.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/textureNumLevels/a91c03.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/textureNumLevels/a91c03.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/textureNumLevels/a91c03.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/textureNumLevels/a91c03.wgsl.expected.msl b/test/tint/builtins/gen/literal/textureNumLevels/a91c03.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/textureNumLevels/a91c03.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/textureNumLevels/a91c03.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/textureNumLevels/a91c03.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureNumLevels/a91c03.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/textureNumLevels/a91c03.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/textureNumLevels/a91c03.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/textureNumLevels/a91c03.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/textureNumLevels/a91c03.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/textureNumLevels/a91c03.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/textureNumLevels/a91c03.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/textureNumLevels/aee7c8.wgsl b/test/tint/builtins/gen/literal/textureNumLevels/aee7c8.wgsl
similarity index 97%
rename from test/tint/builtins/gen/textureNumLevels/aee7c8.wgsl
rename to test/tint/builtins/gen/literal/textureNumLevels/aee7c8.wgsl
index a1ec36dafb..f28913a539 100644
--- a/test/tint/builtins/gen/textureNumLevels/aee7c8.wgsl
+++ b/test/tint/builtins/gen/literal/textureNumLevels/aee7c8.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/textureNumLevels/aee7c8.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureNumLevels/aee7c8.wgsl.expected.glsl
similarity index 97%
rename from test/tint/builtins/gen/textureNumLevels/aee7c8.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/textureNumLevels/aee7c8.wgsl.expected.glsl
index eeabadcb6e..6fbe7623ba 100644
--- a/test/tint/builtins/gen/textureNumLevels/aee7c8.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureNumLevels/aee7c8.wgsl.expected.glsl
@@ -9,7 +9,7 @@ void textureNumLevels_aee7c8() {
 
 vec4 vertex_main() {
   textureNumLevels_aee7c8();
-  return vec4(0.0f, 0.0f, 0.0f, 0.0f);
+  return vec4(0.0f);
 }
 
 void main() {
diff --git a/test/tint/builtins/gen/textureNumLevels/aee7c8.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/textureNumLevels/aee7c8.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/textureNumLevels/aee7c8.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/textureNumLevels/aee7c8.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/textureNumLevels/aee7c8.wgsl.expected.msl b/test/tint/builtins/gen/literal/textureNumLevels/aee7c8.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/textureNumLevels/aee7c8.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/textureNumLevels/aee7c8.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/textureNumLevels/aee7c8.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureNumLevels/aee7c8.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/textureNumLevels/aee7c8.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/textureNumLevels/aee7c8.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/textureNumLevels/aee7c8.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/textureNumLevels/aee7c8.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/textureNumLevels/aee7c8.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/textureNumLevels/aee7c8.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/textureNumLevels/b1b12b.wgsl b/test/tint/builtins/gen/literal/textureNumLevels/b1b12b.wgsl
similarity index 96%
rename from test/tint/builtins/gen/textureNumLevels/b1b12b.wgsl
rename to test/tint/builtins/gen/literal/textureNumLevels/b1b12b.wgsl
index afc20a1773..a03922ce88 100644
--- a/test/tint/builtins/gen/textureNumLevels/b1b12b.wgsl
+++ b/test/tint/builtins/gen/literal/textureNumLevels/b1b12b.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/textureNumLevels/b1b12b.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureNumLevels/b1b12b.wgsl.expected.glsl
similarity index 97%
rename from test/tint/builtins/gen/textureNumLevels/b1b12b.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/textureNumLevels/b1b12b.wgsl.expected.glsl
index 8768e27eea..2a2119a2ae 100644
--- a/test/tint/builtins/gen/textureNumLevels/b1b12b.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureNumLevels/b1b12b.wgsl.expected.glsl
@@ -9,7 +9,7 @@ void textureNumLevels_b1b12b() {
 
 vec4 vertex_main() {
   textureNumLevels_b1b12b();
-  return vec4(0.0f, 0.0f, 0.0f, 0.0f);
+  return vec4(0.0f);
 }
 
 void main() {
diff --git a/test/tint/builtins/gen/textureNumLevels/b1b12b.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/textureNumLevels/b1b12b.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/textureNumLevels/b1b12b.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/textureNumLevels/b1b12b.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/textureNumLevels/b1b12b.wgsl.expected.msl b/test/tint/builtins/gen/literal/textureNumLevels/b1b12b.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/textureNumLevels/b1b12b.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/textureNumLevels/b1b12b.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/textureNumLevels/b1b12b.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureNumLevels/b1b12b.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/textureNumLevels/b1b12b.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/textureNumLevels/b1b12b.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/textureNumLevels/b1b12b.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/textureNumLevels/b1b12b.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/textureNumLevels/b1b12b.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/textureNumLevels/b1b12b.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/textureNumLevels/b4f5ea.wgsl b/test/tint/builtins/gen/literal/textureNumLevels/b4f5ea.wgsl
similarity index 96%
rename from test/tint/builtins/gen/textureNumLevels/b4f5ea.wgsl
rename to test/tint/builtins/gen/literal/textureNumLevels/b4f5ea.wgsl
index 3b2ecf56ab..4d81449ae1 100644
--- a/test/tint/builtins/gen/textureNumLevels/b4f5ea.wgsl
+++ b/test/tint/builtins/gen/literal/textureNumLevels/b4f5ea.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/textureNumLevels/b4f5ea.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureNumLevels/b4f5ea.wgsl.expected.glsl
similarity index 97%
rename from test/tint/builtins/gen/textureNumLevels/b4f5ea.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/textureNumLevels/b4f5ea.wgsl.expected.glsl
index 605253e13c..a857a8aa29 100644
--- a/test/tint/builtins/gen/textureNumLevels/b4f5ea.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureNumLevels/b4f5ea.wgsl.expected.glsl
@@ -9,7 +9,7 @@ void textureNumLevels_b4f5ea() {
 
 vec4 vertex_main() {
   textureNumLevels_b4f5ea();
-  return vec4(0.0f, 0.0f, 0.0f, 0.0f);
+  return vec4(0.0f);
 }
 
 void main() {
diff --git a/test/tint/builtins/gen/textureNumLevels/b4f5ea.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/textureNumLevels/b4f5ea.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/textureNumLevels/b4f5ea.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/textureNumLevels/b4f5ea.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/textureNumLevels/b4f5ea.wgsl.expected.msl b/test/tint/builtins/gen/literal/textureNumLevels/b4f5ea.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/textureNumLevels/b4f5ea.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/textureNumLevels/b4f5ea.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/textureNumLevels/b4f5ea.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureNumLevels/b4f5ea.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/textureNumLevels/b4f5ea.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/textureNumLevels/b4f5ea.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/textureNumLevels/b4f5ea.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/textureNumLevels/b4f5ea.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/textureNumLevels/b4f5ea.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/textureNumLevels/b4f5ea.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/textureNumLevels/d004a9.wgsl b/test/tint/builtins/gen/literal/textureNumLevels/d004a9.wgsl
similarity index 97%
rename from test/tint/builtins/gen/textureNumLevels/d004a9.wgsl
rename to test/tint/builtins/gen/literal/textureNumLevels/d004a9.wgsl
index 8386de5a5c..e191da8c9b 100644
--- a/test/tint/builtins/gen/textureNumLevels/d004a9.wgsl
+++ b/test/tint/builtins/gen/literal/textureNumLevels/d004a9.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/textureNumLevels/d004a9.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureNumLevels/d004a9.wgsl.expected.glsl
similarity index 97%
rename from test/tint/builtins/gen/textureNumLevels/d004a9.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/textureNumLevels/d004a9.wgsl.expected.glsl
index c111772022..926ded3ccb 100644
--- a/test/tint/builtins/gen/textureNumLevels/d004a9.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureNumLevels/d004a9.wgsl.expected.glsl
@@ -9,7 +9,7 @@ void textureNumLevels_d004a9() {
 
 vec4 vertex_main() {
   textureNumLevels_d004a9();
-  return vec4(0.0f, 0.0f, 0.0f, 0.0f);
+  return vec4(0.0f);
 }
 
 void main() {
diff --git a/test/tint/builtins/gen/textureNumLevels/d004a9.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/textureNumLevels/d004a9.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/textureNumLevels/d004a9.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/textureNumLevels/d004a9.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/textureNumLevels/d004a9.wgsl.expected.msl b/test/tint/builtins/gen/literal/textureNumLevels/d004a9.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/textureNumLevels/d004a9.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/textureNumLevels/d004a9.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/textureNumLevels/d004a9.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureNumLevels/d004a9.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/textureNumLevels/d004a9.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/textureNumLevels/d004a9.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/textureNumLevels/d004a9.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/textureNumLevels/d004a9.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/textureNumLevels/d004a9.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/textureNumLevels/d004a9.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/textureNumLevels/dca09e.wgsl b/test/tint/builtins/gen/literal/textureNumLevels/dca09e.wgsl
similarity index 96%
rename from test/tint/builtins/gen/textureNumLevels/dca09e.wgsl
rename to test/tint/builtins/gen/literal/textureNumLevels/dca09e.wgsl
index 2b52ef0bcf..a058700e18 100644
--- a/test/tint/builtins/gen/textureNumLevels/dca09e.wgsl
+++ b/test/tint/builtins/gen/literal/textureNumLevels/dca09e.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/textureNumLevels/dca09e.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureNumLevels/dca09e.wgsl.expected.glsl
similarity index 97%
rename from test/tint/builtins/gen/textureNumLevels/dca09e.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/textureNumLevels/dca09e.wgsl.expected.glsl
index c8d1ce0f68..ba0c815048 100644
--- a/test/tint/builtins/gen/textureNumLevels/dca09e.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureNumLevels/dca09e.wgsl.expected.glsl
@@ -9,7 +9,7 @@ void textureNumLevels_dca09e() {
 
 vec4 vertex_main() {
   textureNumLevels_dca09e();
-  return vec4(0.0f, 0.0f, 0.0f, 0.0f);
+  return vec4(0.0f);
 }
 
 void main() {
diff --git a/test/tint/builtins/gen/textureNumLevels/dca09e.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/textureNumLevels/dca09e.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/textureNumLevels/dca09e.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/textureNumLevels/dca09e.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/textureNumLevels/dca09e.wgsl.expected.msl b/test/tint/builtins/gen/literal/textureNumLevels/dca09e.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/textureNumLevels/dca09e.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/textureNumLevels/dca09e.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/textureNumLevels/dca09e.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureNumLevels/dca09e.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/textureNumLevels/dca09e.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/textureNumLevels/dca09e.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/textureNumLevels/dca09e.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/textureNumLevels/dca09e.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/textureNumLevels/dca09e.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/textureNumLevels/dca09e.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/textureNumLevels/e67231.wgsl b/test/tint/builtins/gen/literal/textureNumLevels/e67231.wgsl
similarity index 96%
rename from test/tint/builtins/gen/textureNumLevels/e67231.wgsl
rename to test/tint/builtins/gen/literal/textureNumLevels/e67231.wgsl
index f718b8ef6c..782d93a6e0 100644
--- a/test/tint/builtins/gen/textureNumLevels/e67231.wgsl
+++ b/test/tint/builtins/gen/literal/textureNumLevels/e67231.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/textureNumLevels/e67231.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureNumLevels/e67231.wgsl.expected.glsl
similarity index 97%
rename from test/tint/builtins/gen/textureNumLevels/e67231.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/textureNumLevels/e67231.wgsl.expected.glsl
index 0e6c2e9ae2..5345038ff9 100644
--- a/test/tint/builtins/gen/textureNumLevels/e67231.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureNumLevels/e67231.wgsl.expected.glsl
@@ -9,7 +9,7 @@ void textureNumLevels_e67231() {
 
 vec4 vertex_main() {
   textureNumLevels_e67231();
-  return vec4(0.0f, 0.0f, 0.0f, 0.0f);
+  return vec4(0.0f);
 }
 
 void main() {
diff --git a/test/tint/builtins/gen/textureNumLevels/e67231.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/textureNumLevels/e67231.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/textureNumLevels/e67231.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/textureNumLevels/e67231.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/textureNumLevels/e67231.wgsl.expected.msl b/test/tint/builtins/gen/literal/textureNumLevels/e67231.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/textureNumLevels/e67231.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/textureNumLevels/e67231.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/textureNumLevels/e67231.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureNumLevels/e67231.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/textureNumLevels/e67231.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/textureNumLevels/e67231.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/textureNumLevels/e67231.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/textureNumLevels/e67231.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/textureNumLevels/e67231.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/textureNumLevels/e67231.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/textureNumLevels/ed078b.wgsl b/test/tint/builtins/gen/literal/textureNumLevels/ed078b.wgsl
similarity index 96%
rename from test/tint/builtins/gen/textureNumLevels/ed078b.wgsl
rename to test/tint/builtins/gen/literal/textureNumLevels/ed078b.wgsl
index 7bd2ff2dea..d3620a2b10 100644
--- a/test/tint/builtins/gen/textureNumLevels/ed078b.wgsl
+++ b/test/tint/builtins/gen/literal/textureNumLevels/ed078b.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/textureNumLevels/ed078b.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureNumLevels/ed078b.wgsl.expected.glsl
similarity index 97%
rename from test/tint/builtins/gen/textureNumLevels/ed078b.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/textureNumLevels/ed078b.wgsl.expected.glsl
index 952eeaceb5..3293d1e204 100644
--- a/test/tint/builtins/gen/textureNumLevels/ed078b.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureNumLevels/ed078b.wgsl.expected.glsl
@@ -9,7 +9,7 @@ void textureNumLevels_ed078b() {
 
 vec4 vertex_main() {
   textureNumLevels_ed078b();
-  return vec4(0.0f, 0.0f, 0.0f, 0.0f);
+  return vec4(0.0f);
 }
 
 void main() {
diff --git a/test/tint/builtins/gen/textureNumLevels/ed078b.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/textureNumLevels/ed078b.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/textureNumLevels/ed078b.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/textureNumLevels/ed078b.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/textureNumLevels/ed078b.wgsl.expected.msl b/test/tint/builtins/gen/literal/textureNumLevels/ed078b.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/textureNumLevels/ed078b.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/textureNumLevels/ed078b.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/textureNumLevels/ed078b.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureNumLevels/ed078b.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/textureNumLevels/ed078b.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/textureNumLevels/ed078b.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/textureNumLevels/ed078b.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/textureNumLevels/ed078b.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/textureNumLevels/ed078b.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/textureNumLevels/ed078b.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/textureNumLevels/f46ec6.wgsl b/test/tint/builtins/gen/literal/textureNumLevels/f46ec6.wgsl
similarity index 97%
rename from test/tint/builtins/gen/textureNumLevels/f46ec6.wgsl
rename to test/tint/builtins/gen/literal/textureNumLevels/f46ec6.wgsl
index 05d8294a93..665436bef1 100644
--- a/test/tint/builtins/gen/textureNumLevels/f46ec6.wgsl
+++ b/test/tint/builtins/gen/literal/textureNumLevels/f46ec6.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/textureNumLevels/f46ec6.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureNumLevels/f46ec6.wgsl.expected.glsl
similarity index 97%
rename from test/tint/builtins/gen/textureNumLevels/f46ec6.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/textureNumLevels/f46ec6.wgsl.expected.glsl
index 634bfe0254..1da3a81ad4 100644
--- a/test/tint/builtins/gen/textureNumLevels/f46ec6.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureNumLevels/f46ec6.wgsl.expected.glsl
@@ -9,7 +9,7 @@ void textureNumLevels_f46ec6() {
 
 vec4 vertex_main() {
   textureNumLevels_f46ec6();
-  return vec4(0.0f, 0.0f, 0.0f, 0.0f);
+  return vec4(0.0f);
 }
 
 void main() {
diff --git a/test/tint/builtins/gen/textureNumLevels/f46ec6.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/textureNumLevels/f46ec6.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/textureNumLevels/f46ec6.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/textureNumLevels/f46ec6.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/textureNumLevels/f46ec6.wgsl.expected.msl b/test/tint/builtins/gen/literal/textureNumLevels/f46ec6.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/textureNumLevels/f46ec6.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/textureNumLevels/f46ec6.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/textureNumLevels/f46ec6.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureNumLevels/f46ec6.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/textureNumLevels/f46ec6.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/textureNumLevels/f46ec6.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/textureNumLevels/f46ec6.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/textureNumLevels/f46ec6.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/textureNumLevels/f46ec6.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/textureNumLevels/f46ec6.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/textureNumLevels/f5828d.wgsl b/test/tint/builtins/gen/literal/textureNumLevels/f5828d.wgsl
similarity index 97%
rename from test/tint/builtins/gen/textureNumLevels/f5828d.wgsl
rename to test/tint/builtins/gen/literal/textureNumLevels/f5828d.wgsl
index b608fff061..0c000af8e8 100644
--- a/test/tint/builtins/gen/textureNumLevels/f5828d.wgsl
+++ b/test/tint/builtins/gen/literal/textureNumLevels/f5828d.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/textureNumLevels/f5828d.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureNumLevels/f5828d.wgsl.expected.glsl
similarity index 97%
rename from test/tint/builtins/gen/textureNumLevels/f5828d.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/textureNumLevels/f5828d.wgsl.expected.glsl
index bc9ef2b589..e810a1a552 100644
--- a/test/tint/builtins/gen/textureNumLevels/f5828d.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureNumLevels/f5828d.wgsl.expected.glsl
@@ -9,7 +9,7 @@ void textureNumLevels_f5828d() {
 
 vec4 vertex_main() {
   textureNumLevels_f5828d();
-  return vec4(0.0f, 0.0f, 0.0f, 0.0f);
+  return vec4(0.0f);
 }
 
 void main() {
diff --git a/test/tint/builtins/gen/textureNumLevels/f5828d.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/textureNumLevels/f5828d.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/textureNumLevels/f5828d.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/textureNumLevels/f5828d.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/textureNumLevels/f5828d.wgsl.expected.msl b/test/tint/builtins/gen/literal/textureNumLevels/f5828d.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/textureNumLevels/f5828d.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/textureNumLevels/f5828d.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/textureNumLevels/f5828d.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureNumLevels/f5828d.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/textureNumLevels/f5828d.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/textureNumLevels/f5828d.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/textureNumLevels/f5828d.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/textureNumLevels/f5828d.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/textureNumLevels/f5828d.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/textureNumLevels/f5828d.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/textureNumSamples/2c6f14.wgsl b/test/tint/builtins/gen/literal/textureNumSamples/2c6f14.wgsl
similarity index 97%
rename from test/tint/builtins/gen/textureNumSamples/2c6f14.wgsl
rename to test/tint/builtins/gen/literal/textureNumSamples/2c6f14.wgsl
index 3be8ac4387..749d887c52 100644
--- a/test/tint/builtins/gen/textureNumSamples/2c6f14.wgsl
+++ b/test/tint/builtins/gen/literal/textureNumSamples/2c6f14.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/textureNumSamples/2c6f14.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureNumSamples/2c6f14.wgsl.expected.glsl
similarity index 97%
rename from test/tint/builtins/gen/textureNumSamples/2c6f14.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/textureNumSamples/2c6f14.wgsl.expected.glsl
index 78affad34f..5abe128e4b 100644
--- a/test/tint/builtins/gen/textureNumSamples/2c6f14.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureNumSamples/2c6f14.wgsl.expected.glsl
@@ -9,7 +9,7 @@ void textureNumSamples_2c6f14() {
 
 vec4 vertex_main() {
   textureNumSamples_2c6f14();
-  return vec4(0.0f, 0.0f, 0.0f, 0.0f);
+  return vec4(0.0f);
 }
 
 void main() {
diff --git a/test/tint/builtins/gen/textureNumSamples/2c6f14.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/textureNumSamples/2c6f14.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/textureNumSamples/2c6f14.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/textureNumSamples/2c6f14.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/textureNumSamples/2c6f14.wgsl.expected.msl b/test/tint/builtins/gen/literal/textureNumSamples/2c6f14.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/textureNumSamples/2c6f14.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/textureNumSamples/2c6f14.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/textureNumSamples/2c6f14.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureNumSamples/2c6f14.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/textureNumSamples/2c6f14.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/textureNumSamples/2c6f14.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/textureNumSamples/2c6f14.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/textureNumSamples/2c6f14.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/textureNumSamples/2c6f14.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/textureNumSamples/2c6f14.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/textureNumSamples/42f8bb.wgsl b/test/tint/builtins/gen/literal/textureNumSamples/42f8bb.wgsl
similarity index 97%
rename from test/tint/builtins/gen/textureNumSamples/42f8bb.wgsl
rename to test/tint/builtins/gen/literal/textureNumSamples/42f8bb.wgsl
index 05af08671a..429e2eb7c2 100644
--- a/test/tint/builtins/gen/textureNumSamples/42f8bb.wgsl
+++ b/test/tint/builtins/gen/literal/textureNumSamples/42f8bb.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/textureNumSamples/42f8bb.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureNumSamples/42f8bb.wgsl.expected.glsl
similarity index 97%
rename from test/tint/builtins/gen/textureNumSamples/42f8bb.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/textureNumSamples/42f8bb.wgsl.expected.glsl
index 586000638a..8a06334bf4 100644
--- a/test/tint/builtins/gen/textureNumSamples/42f8bb.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureNumSamples/42f8bb.wgsl.expected.glsl
@@ -9,7 +9,7 @@ void textureNumSamples_42f8bb() {
 
 vec4 vertex_main() {
   textureNumSamples_42f8bb();
-  return vec4(0.0f, 0.0f, 0.0f, 0.0f);
+  return vec4(0.0f);
 }
 
 void main() {
diff --git a/test/tint/builtins/gen/textureNumSamples/42f8bb.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/textureNumSamples/42f8bb.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/textureNumSamples/42f8bb.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/textureNumSamples/42f8bb.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/textureNumSamples/42f8bb.wgsl.expected.msl b/test/tint/builtins/gen/literal/textureNumSamples/42f8bb.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/textureNumSamples/42f8bb.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/textureNumSamples/42f8bb.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/textureNumSamples/42f8bb.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureNumSamples/42f8bb.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/textureNumSamples/42f8bb.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/textureNumSamples/42f8bb.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/textureNumSamples/42f8bb.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/textureNumSamples/42f8bb.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/textureNumSamples/42f8bb.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/textureNumSamples/42f8bb.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/textureNumSamples/449d23.wgsl b/test/tint/builtins/gen/literal/textureNumSamples/449d23.wgsl
similarity index 97%
rename from test/tint/builtins/gen/textureNumSamples/449d23.wgsl
rename to test/tint/builtins/gen/literal/textureNumSamples/449d23.wgsl
index d0f5b5c1cb..e5e5bafc0a 100644
--- a/test/tint/builtins/gen/textureNumSamples/449d23.wgsl
+++ b/test/tint/builtins/gen/literal/textureNumSamples/449d23.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/textureNumSamples/449d23.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureNumSamples/449d23.wgsl.expected.glsl
similarity index 97%
rename from test/tint/builtins/gen/textureNumSamples/449d23.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/textureNumSamples/449d23.wgsl.expected.glsl
index 84bf1dcccd..2b60dd51be 100644
--- a/test/tint/builtins/gen/textureNumSamples/449d23.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureNumSamples/449d23.wgsl.expected.glsl
@@ -9,7 +9,7 @@ void textureNumSamples_449d23() {
 
 vec4 vertex_main() {
   textureNumSamples_449d23();
-  return vec4(0.0f, 0.0f, 0.0f, 0.0f);
+  return vec4(0.0f);
 }
 
 void main() {
diff --git a/test/tint/builtins/gen/textureNumSamples/449d23.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/textureNumSamples/449d23.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/textureNumSamples/449d23.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/textureNumSamples/449d23.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/textureNumSamples/449d23.wgsl.expected.msl b/test/tint/builtins/gen/literal/textureNumSamples/449d23.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/textureNumSamples/449d23.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/textureNumSamples/449d23.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/textureNumSamples/449d23.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureNumSamples/449d23.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/textureNumSamples/449d23.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/textureNumSamples/449d23.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/textureNumSamples/449d23.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/textureNumSamples/449d23.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/textureNumSamples/449d23.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/textureNumSamples/449d23.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/textureNumSamples/a3c8a0.wgsl b/test/tint/builtins/gen/literal/textureNumSamples/a3c8a0.wgsl
similarity index 97%
rename from test/tint/builtins/gen/textureNumSamples/a3c8a0.wgsl
rename to test/tint/builtins/gen/literal/textureNumSamples/a3c8a0.wgsl
index 3599955e1b..11df4fb6a4 100644
--- a/test/tint/builtins/gen/textureNumSamples/a3c8a0.wgsl
+++ b/test/tint/builtins/gen/literal/textureNumSamples/a3c8a0.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/textureNumSamples/a3c8a0.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureNumSamples/a3c8a0.wgsl.expected.glsl
similarity index 97%
rename from test/tint/builtins/gen/textureNumSamples/a3c8a0.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/textureNumSamples/a3c8a0.wgsl.expected.glsl
index 03bd8d5fbf..826c680985 100644
--- a/test/tint/builtins/gen/textureNumSamples/a3c8a0.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureNumSamples/a3c8a0.wgsl.expected.glsl
@@ -9,7 +9,7 @@ void textureNumSamples_a3c8a0() {
 
 vec4 vertex_main() {
   textureNumSamples_a3c8a0();
-  return vec4(0.0f, 0.0f, 0.0f, 0.0f);
+  return vec4(0.0f);
 }
 
 void main() {
diff --git a/test/tint/builtins/gen/textureNumSamples/a3c8a0.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/textureNumSamples/a3c8a0.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/textureNumSamples/a3c8a0.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/textureNumSamples/a3c8a0.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/textureNumSamples/a3c8a0.wgsl.expected.msl b/test/tint/builtins/gen/literal/textureNumSamples/a3c8a0.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/textureNumSamples/a3c8a0.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/textureNumSamples/a3c8a0.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/textureNumSamples/a3c8a0.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureNumSamples/a3c8a0.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/textureNumSamples/a3c8a0.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/textureNumSamples/a3c8a0.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/textureNumSamples/a3c8a0.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/textureNumSamples/a3c8a0.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/textureNumSamples/a3c8a0.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/textureNumSamples/a3c8a0.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/textureSample/02aa9b.wgsl b/test/tint/builtins/gen/literal/textureSample/02aa9b.wgsl
similarity index 96%
rename from test/tint/builtins/gen/textureSample/02aa9b.wgsl
rename to test/tint/builtins/gen/literal/textureSample/02aa9b.wgsl
index e392604f62..3175d4d7d9 100644
--- a/test/tint/builtins/gen/textureSample/02aa9b.wgsl
+++ b/test/tint/builtins/gen/literal/textureSample/02aa9b.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/textureSample/02aa9b.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureSample/02aa9b.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/textureSample/02aa9b.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/textureSample/02aa9b.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/textureSample/02aa9b.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/textureSample/02aa9b.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/textureSample/02aa9b.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/textureSample/02aa9b.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/textureSample/02aa9b.wgsl.expected.msl b/test/tint/builtins/gen/literal/textureSample/02aa9b.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/textureSample/02aa9b.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/textureSample/02aa9b.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/textureSample/02aa9b.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureSample/02aa9b.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/textureSample/02aa9b.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/textureSample/02aa9b.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/textureSample/02aa9b.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/textureSample/02aa9b.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/textureSample/02aa9b.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/textureSample/02aa9b.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/textureSample/100dc0.wgsl b/test/tint/builtins/gen/literal/textureSample/100dc0.wgsl
similarity index 96%
rename from test/tint/builtins/gen/textureSample/100dc0.wgsl
rename to test/tint/builtins/gen/literal/textureSample/100dc0.wgsl
index 89ecf17588..6cc07aa270 100644
--- a/test/tint/builtins/gen/textureSample/100dc0.wgsl
+++ b/test/tint/builtins/gen/literal/textureSample/100dc0.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/textureSample/100dc0.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureSample/100dc0.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/textureSample/100dc0.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/textureSample/100dc0.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/textureSample/100dc0.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/textureSample/100dc0.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/textureSample/100dc0.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/textureSample/100dc0.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/textureSample/100dc0.wgsl.expected.msl b/test/tint/builtins/gen/literal/textureSample/100dc0.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/textureSample/100dc0.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/textureSample/100dc0.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/textureSample/100dc0.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureSample/100dc0.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/textureSample/100dc0.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/textureSample/100dc0.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/textureSample/100dc0.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/textureSample/100dc0.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/textureSample/100dc0.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/textureSample/100dc0.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/textureSample/38bbb9.wgsl b/test/tint/builtins/gen/literal/textureSample/38bbb9.wgsl
similarity index 96%
rename from test/tint/builtins/gen/textureSample/38bbb9.wgsl
rename to test/tint/builtins/gen/literal/textureSample/38bbb9.wgsl
index 3174564f99..5c5d84bcb8 100644
--- a/test/tint/builtins/gen/textureSample/38bbb9.wgsl
+++ b/test/tint/builtins/gen/literal/textureSample/38bbb9.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/textureSample/38bbb9.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureSample/38bbb9.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/textureSample/38bbb9.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/textureSample/38bbb9.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/textureSample/38bbb9.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/textureSample/38bbb9.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/textureSample/38bbb9.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/textureSample/38bbb9.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/textureSample/38bbb9.wgsl.expected.msl b/test/tint/builtins/gen/literal/textureSample/38bbb9.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/textureSample/38bbb9.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/textureSample/38bbb9.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/textureSample/38bbb9.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureSample/38bbb9.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/textureSample/38bbb9.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/textureSample/38bbb9.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/textureSample/38bbb9.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/textureSample/38bbb9.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/textureSample/38bbb9.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/textureSample/38bbb9.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/textureSample/3b50bd.wgsl b/test/tint/builtins/gen/literal/textureSample/3b50bd.wgsl
similarity index 96%
rename from test/tint/builtins/gen/textureSample/3b50bd.wgsl
rename to test/tint/builtins/gen/literal/textureSample/3b50bd.wgsl
index f0ee1c54da..5daa22a2d1 100644
--- a/test/tint/builtins/gen/textureSample/3b50bd.wgsl
+++ b/test/tint/builtins/gen/literal/textureSample/3b50bd.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/textureSample/3b50bd.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureSample/3b50bd.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/textureSample/3b50bd.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/textureSample/3b50bd.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/textureSample/3b50bd.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/textureSample/3b50bd.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/textureSample/3b50bd.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/textureSample/3b50bd.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/textureSample/3b50bd.wgsl.expected.msl b/test/tint/builtins/gen/literal/textureSample/3b50bd.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/textureSample/3b50bd.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/textureSample/3b50bd.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/textureSample/3b50bd.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureSample/3b50bd.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/textureSample/3b50bd.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/textureSample/3b50bd.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/textureSample/3b50bd.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/textureSample/3b50bd.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/textureSample/3b50bd.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/textureSample/3b50bd.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/textureSample/4dd1bf.wgsl b/test/tint/builtins/gen/literal/textureSample/4dd1bf.wgsl
similarity index 96%
rename from test/tint/builtins/gen/textureSample/4dd1bf.wgsl
rename to test/tint/builtins/gen/literal/textureSample/4dd1bf.wgsl
index 508775aa10..6cced5c916 100644
--- a/test/tint/builtins/gen/textureSample/4dd1bf.wgsl
+++ b/test/tint/builtins/gen/literal/textureSample/4dd1bf.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/textureSample/4dd1bf.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureSample/4dd1bf.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/textureSample/4dd1bf.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/textureSample/4dd1bf.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/textureSample/4dd1bf.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/textureSample/4dd1bf.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/textureSample/4dd1bf.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/textureSample/4dd1bf.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/textureSample/4dd1bf.wgsl.expected.msl b/test/tint/builtins/gen/literal/textureSample/4dd1bf.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/textureSample/4dd1bf.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/textureSample/4dd1bf.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/textureSample/4dd1bf.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureSample/4dd1bf.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/textureSample/4dd1bf.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/textureSample/4dd1bf.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/textureSample/4dd1bf.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/textureSample/4dd1bf.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/textureSample/4dd1bf.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/textureSample/4dd1bf.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/textureSample/51b514.wgsl b/test/tint/builtins/gen/literal/textureSample/51b514.wgsl
similarity index 96%
rename from test/tint/builtins/gen/textureSample/51b514.wgsl
rename to test/tint/builtins/gen/literal/textureSample/51b514.wgsl
index 47f972c504..eb3715e83c 100644
--- a/test/tint/builtins/gen/textureSample/51b514.wgsl
+++ b/test/tint/builtins/gen/literal/textureSample/51b514.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/textureSample/51b514.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureSample/51b514.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/textureSample/51b514.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/textureSample/51b514.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/textureSample/51b514.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/textureSample/51b514.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/textureSample/51b514.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/textureSample/51b514.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/textureSample/51b514.wgsl.expected.msl b/test/tint/builtins/gen/literal/textureSample/51b514.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/textureSample/51b514.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/textureSample/51b514.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/textureSample/51b514.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureSample/51b514.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/textureSample/51b514.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/textureSample/51b514.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/textureSample/51b514.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/textureSample/51b514.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/textureSample/51b514.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/textureSample/51b514.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/textureSample/667d76.wgsl b/test/tint/builtins/gen/literal/textureSample/667d76.wgsl
similarity index 96%
rename from test/tint/builtins/gen/textureSample/667d76.wgsl
rename to test/tint/builtins/gen/literal/textureSample/667d76.wgsl
index f4d62ddfb4..d218e9dbdf 100644
--- a/test/tint/builtins/gen/textureSample/667d76.wgsl
+++ b/test/tint/builtins/gen/literal/textureSample/667d76.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/textureSample/667d76.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureSample/667d76.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/textureSample/667d76.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/textureSample/667d76.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/textureSample/667d76.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/textureSample/667d76.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/textureSample/667d76.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/textureSample/667d76.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/textureSample/667d76.wgsl.expected.msl b/test/tint/builtins/gen/literal/textureSample/667d76.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/textureSample/667d76.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/textureSample/667d76.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/textureSample/667d76.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureSample/667d76.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/textureSample/667d76.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/textureSample/667d76.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/textureSample/667d76.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/textureSample/667d76.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/textureSample/667d76.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/textureSample/667d76.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/textureSample/6717ca.wgsl b/test/tint/builtins/gen/literal/textureSample/6717ca.wgsl
similarity index 96%
rename from test/tint/builtins/gen/textureSample/6717ca.wgsl
rename to test/tint/builtins/gen/literal/textureSample/6717ca.wgsl
index 4180ea0ed7..1cd285f9fd 100644
--- a/test/tint/builtins/gen/textureSample/6717ca.wgsl
+++ b/test/tint/builtins/gen/literal/textureSample/6717ca.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/textureSample/6717ca.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureSample/6717ca.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/textureSample/6717ca.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/textureSample/6717ca.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/textureSample/6717ca.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/textureSample/6717ca.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/textureSample/6717ca.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/textureSample/6717ca.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/textureSample/6717ca.wgsl.expected.msl b/test/tint/builtins/gen/literal/textureSample/6717ca.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/textureSample/6717ca.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/textureSample/6717ca.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/textureSample/6717ca.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureSample/6717ca.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/textureSample/6717ca.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/textureSample/6717ca.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/textureSample/6717ca.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/textureSample/6717ca.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/textureSample/6717ca.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/textureSample/6717ca.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/textureSample/6e64fb.wgsl b/test/tint/builtins/gen/literal/textureSample/6e64fb.wgsl
similarity index 96%
rename from test/tint/builtins/gen/textureSample/6e64fb.wgsl
rename to test/tint/builtins/gen/literal/textureSample/6e64fb.wgsl
index 92ec8555da..92c97bc036 100644
--- a/test/tint/builtins/gen/textureSample/6e64fb.wgsl
+++ b/test/tint/builtins/gen/literal/textureSample/6e64fb.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/textureSample/6e64fb.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureSample/6e64fb.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/textureSample/6e64fb.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/textureSample/6e64fb.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/textureSample/6e64fb.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/textureSample/6e64fb.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/textureSample/6e64fb.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/textureSample/6e64fb.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/textureSample/6e64fb.wgsl.expected.msl b/test/tint/builtins/gen/literal/textureSample/6e64fb.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/textureSample/6e64fb.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/textureSample/6e64fb.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/textureSample/6e64fb.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureSample/6e64fb.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/textureSample/6e64fb.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/textureSample/6e64fb.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/textureSample/6e64fb.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/textureSample/6e64fb.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/textureSample/6e64fb.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/textureSample/6e64fb.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/textureSample/7c3baa.wgsl b/test/tint/builtins/gen/literal/textureSample/7c3baa.wgsl
similarity index 96%
rename from test/tint/builtins/gen/textureSample/7c3baa.wgsl
rename to test/tint/builtins/gen/literal/textureSample/7c3baa.wgsl
index 14d09e4512..534d9ab492 100644
--- a/test/tint/builtins/gen/textureSample/7c3baa.wgsl
+++ b/test/tint/builtins/gen/literal/textureSample/7c3baa.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/textureSample/7c3baa.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureSample/7c3baa.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/textureSample/7c3baa.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/textureSample/7c3baa.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/textureSample/7c3baa.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/textureSample/7c3baa.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/textureSample/7c3baa.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/textureSample/7c3baa.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/textureSample/7c3baa.wgsl.expected.msl b/test/tint/builtins/gen/literal/textureSample/7c3baa.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/textureSample/7c3baa.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/textureSample/7c3baa.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/textureSample/7c3baa.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureSample/7c3baa.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/textureSample/7c3baa.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/textureSample/7c3baa.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/textureSample/7c3baa.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/textureSample/7c3baa.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/textureSample/7c3baa.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/textureSample/7c3baa.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/textureSample/7e9ffd.wgsl b/test/tint/builtins/gen/literal/textureSample/7e9ffd.wgsl
similarity index 96%
rename from test/tint/builtins/gen/textureSample/7e9ffd.wgsl
rename to test/tint/builtins/gen/literal/textureSample/7e9ffd.wgsl
index 15c221cf2d..7864e21d3a 100644
--- a/test/tint/builtins/gen/textureSample/7e9ffd.wgsl
+++ b/test/tint/builtins/gen/literal/textureSample/7e9ffd.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/textureSample/7e9ffd.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureSample/7e9ffd.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/textureSample/7e9ffd.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/textureSample/7e9ffd.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/textureSample/7e9ffd.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/textureSample/7e9ffd.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/textureSample/7e9ffd.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/textureSample/7e9ffd.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/textureSample/7e9ffd.wgsl.expected.msl b/test/tint/builtins/gen/literal/textureSample/7e9ffd.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/textureSample/7e9ffd.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/textureSample/7e9ffd.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/textureSample/7e9ffd.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureSample/7e9ffd.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/textureSample/7e9ffd.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/textureSample/7e9ffd.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/textureSample/7e9ffd.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/textureSample/7e9ffd.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/textureSample/7e9ffd.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/textureSample/7e9ffd.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/textureSample/8522e7.wgsl b/test/tint/builtins/gen/literal/textureSample/8522e7.wgsl
similarity index 96%
rename from test/tint/builtins/gen/textureSample/8522e7.wgsl
rename to test/tint/builtins/gen/literal/textureSample/8522e7.wgsl
index d82c289cd2..8cad6933f6 100644
--- a/test/tint/builtins/gen/textureSample/8522e7.wgsl
+++ b/test/tint/builtins/gen/literal/textureSample/8522e7.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/textureSample/8522e7.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureSample/8522e7.wgsl.expected.glsl
similarity index 95%
rename from test/tint/builtins/gen/textureSample/8522e7.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/textureSample/8522e7.wgsl.expected.glsl
index 762475e343..d0c988b4e1 100644
--- a/test/tint/builtins/gen/textureSample/8522e7.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureSample/8522e7.wgsl.expected.glsl
@@ -6,7 +6,7 @@ precision mediump float;
 uniform highp sampler2DArrayShadow arg_0_arg_1;
 
 void textureSample_8522e7() {
-  float res = textureOffset(arg_0_arg_1, vec4(0.0f, 0.0f, float(1), 0.0f), ivec2(0, 0));
+  float res = textureOffset(arg_0_arg_1, vec4(0.0f, 0.0f, float(1), 0.0f), ivec2(0));
 }
 
 void fragment_main() {
diff --git a/test/tint/builtins/gen/textureSample/8522e7.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/textureSample/8522e7.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/textureSample/8522e7.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/textureSample/8522e7.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/textureSample/8522e7.wgsl.expected.msl b/test/tint/builtins/gen/literal/textureSample/8522e7.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/textureSample/8522e7.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/textureSample/8522e7.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/textureSample/8522e7.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureSample/8522e7.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/textureSample/8522e7.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/textureSample/8522e7.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/textureSample/8522e7.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/textureSample/8522e7.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/textureSample/8522e7.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/textureSample/8522e7.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/textureSample/c2f4e8.wgsl b/test/tint/builtins/gen/literal/textureSample/c2f4e8.wgsl
similarity index 96%
rename from test/tint/builtins/gen/textureSample/c2f4e8.wgsl
rename to test/tint/builtins/gen/literal/textureSample/c2f4e8.wgsl
index b577d22053..cad8d4e586 100644
--- a/test/tint/builtins/gen/textureSample/c2f4e8.wgsl
+++ b/test/tint/builtins/gen/literal/textureSample/c2f4e8.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/textureSample/c2f4e8.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureSample/c2f4e8.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/textureSample/c2f4e8.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/textureSample/c2f4e8.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/textureSample/c2f4e8.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/textureSample/c2f4e8.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/textureSample/c2f4e8.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/textureSample/c2f4e8.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/textureSample/c2f4e8.wgsl.expected.msl b/test/tint/builtins/gen/literal/textureSample/c2f4e8.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/textureSample/c2f4e8.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/textureSample/c2f4e8.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/textureSample/c2f4e8.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureSample/c2f4e8.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/textureSample/c2f4e8.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/textureSample/c2f4e8.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/textureSample/c2f4e8.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/textureSample/c2f4e8.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/textureSample/c2f4e8.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/textureSample/c2f4e8.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/textureSample/e53267.wgsl b/test/tint/builtins/gen/literal/textureSample/e53267.wgsl
similarity index 96%
rename from test/tint/builtins/gen/textureSample/e53267.wgsl
rename to test/tint/builtins/gen/literal/textureSample/e53267.wgsl
index 39add1398c..cacb3e4ef3 100644
--- a/test/tint/builtins/gen/textureSample/e53267.wgsl
+++ b/test/tint/builtins/gen/literal/textureSample/e53267.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/textureSample/e53267.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureSample/e53267.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/textureSample/e53267.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/textureSample/e53267.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/textureSample/e53267.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/textureSample/e53267.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/textureSample/e53267.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/textureSample/e53267.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/textureSample/e53267.wgsl.expected.msl b/test/tint/builtins/gen/literal/textureSample/e53267.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/textureSample/e53267.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/textureSample/e53267.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/textureSample/e53267.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureSample/e53267.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/textureSample/e53267.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/textureSample/e53267.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/textureSample/e53267.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/textureSample/e53267.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/textureSample/e53267.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/textureSample/e53267.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/textureSample/ea7030.wgsl b/test/tint/builtins/gen/literal/textureSample/ea7030.wgsl
similarity index 96%
rename from test/tint/builtins/gen/textureSample/ea7030.wgsl
rename to test/tint/builtins/gen/literal/textureSample/ea7030.wgsl
index ebd9e50c57..e57dddeba2 100644
--- a/test/tint/builtins/gen/textureSample/ea7030.wgsl
+++ b/test/tint/builtins/gen/literal/textureSample/ea7030.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/textureSample/ea7030.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureSample/ea7030.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/textureSample/ea7030.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/textureSample/ea7030.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/textureSample/ea7030.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/textureSample/ea7030.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/textureSample/ea7030.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/textureSample/ea7030.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/textureSample/ea7030.wgsl.expected.msl b/test/tint/builtins/gen/literal/textureSample/ea7030.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/textureSample/ea7030.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/textureSample/ea7030.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/textureSample/ea7030.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureSample/ea7030.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/textureSample/ea7030.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/textureSample/ea7030.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/textureSample/ea7030.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/textureSample/ea7030.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/textureSample/ea7030.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/textureSample/ea7030.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/textureSampleBias/53b9f7.wgsl b/test/tint/builtins/gen/literal/textureSampleBias/53b9f7.wgsl
similarity index 96%
rename from test/tint/builtins/gen/textureSampleBias/53b9f7.wgsl
rename to test/tint/builtins/gen/literal/textureSampleBias/53b9f7.wgsl
index 18c60e7d67..a3699e60df 100644
--- a/test/tint/builtins/gen/textureSampleBias/53b9f7.wgsl
+++ b/test/tint/builtins/gen/literal/textureSampleBias/53b9f7.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/textureSampleBias/53b9f7.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureSampleBias/53b9f7.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/textureSampleBias/53b9f7.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/textureSampleBias/53b9f7.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/textureSampleBias/53b9f7.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/textureSampleBias/53b9f7.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/textureSampleBias/53b9f7.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/textureSampleBias/53b9f7.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/textureSampleBias/53b9f7.wgsl.expected.msl b/test/tint/builtins/gen/literal/textureSampleBias/53b9f7.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/textureSampleBias/53b9f7.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/textureSampleBias/53b9f7.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/textureSampleBias/53b9f7.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureSampleBias/53b9f7.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/textureSampleBias/53b9f7.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/textureSampleBias/53b9f7.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/textureSampleBias/53b9f7.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/textureSampleBias/53b9f7.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/textureSampleBias/53b9f7.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/textureSampleBias/53b9f7.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/textureSampleBias/65ac50.wgsl b/test/tint/builtins/gen/literal/textureSampleBias/65ac50.wgsl
similarity index 96%
rename from test/tint/builtins/gen/textureSampleBias/65ac50.wgsl
rename to test/tint/builtins/gen/literal/textureSampleBias/65ac50.wgsl
index 42615671b3..c4d3ee0561 100644
--- a/test/tint/builtins/gen/textureSampleBias/65ac50.wgsl
+++ b/test/tint/builtins/gen/literal/textureSampleBias/65ac50.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/textureSampleBias/65ac50.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureSampleBias/65ac50.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/textureSampleBias/65ac50.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/textureSampleBias/65ac50.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/textureSampleBias/65ac50.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/textureSampleBias/65ac50.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/textureSampleBias/65ac50.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/textureSampleBias/65ac50.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/textureSampleBias/65ac50.wgsl.expected.msl b/test/tint/builtins/gen/literal/textureSampleBias/65ac50.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/textureSampleBias/65ac50.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/textureSampleBias/65ac50.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/textureSampleBias/65ac50.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureSampleBias/65ac50.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/textureSampleBias/65ac50.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/textureSampleBias/65ac50.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/textureSampleBias/65ac50.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/textureSampleBias/65ac50.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/textureSampleBias/65ac50.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/textureSampleBias/65ac50.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/textureSampleBias/6a9113.wgsl b/test/tint/builtins/gen/literal/textureSampleBias/6a9113.wgsl
similarity index 96%
rename from test/tint/builtins/gen/textureSampleBias/6a9113.wgsl
rename to test/tint/builtins/gen/literal/textureSampleBias/6a9113.wgsl
index 8366a13ac7..298ece3009 100644
--- a/test/tint/builtins/gen/textureSampleBias/6a9113.wgsl
+++ b/test/tint/builtins/gen/literal/textureSampleBias/6a9113.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/textureSampleBias/6a9113.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureSampleBias/6a9113.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/textureSampleBias/6a9113.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/textureSampleBias/6a9113.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/textureSampleBias/6a9113.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/textureSampleBias/6a9113.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/textureSampleBias/6a9113.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/textureSampleBias/6a9113.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/textureSampleBias/6a9113.wgsl.expected.msl b/test/tint/builtins/gen/literal/textureSampleBias/6a9113.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/textureSampleBias/6a9113.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/textureSampleBias/6a9113.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/textureSampleBias/6a9113.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureSampleBias/6a9113.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/textureSampleBias/6a9113.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/textureSampleBias/6a9113.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/textureSampleBias/6a9113.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/textureSampleBias/6a9113.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/textureSampleBias/6a9113.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/textureSampleBias/6a9113.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/textureSampleBias/80e579.wgsl b/test/tint/builtins/gen/literal/textureSampleBias/80e579.wgsl
similarity index 96%
rename from test/tint/builtins/gen/textureSampleBias/80e579.wgsl
rename to test/tint/builtins/gen/literal/textureSampleBias/80e579.wgsl
index bdf66214f7..4282899c5a 100644
--- a/test/tint/builtins/gen/textureSampleBias/80e579.wgsl
+++ b/test/tint/builtins/gen/literal/textureSampleBias/80e579.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/textureSampleBias/80e579.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureSampleBias/80e579.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/textureSampleBias/80e579.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/textureSampleBias/80e579.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/textureSampleBias/80e579.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/textureSampleBias/80e579.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/textureSampleBias/80e579.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/textureSampleBias/80e579.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/textureSampleBias/80e579.wgsl.expected.msl b/test/tint/builtins/gen/literal/textureSampleBias/80e579.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/textureSampleBias/80e579.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/textureSampleBias/80e579.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/textureSampleBias/80e579.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureSampleBias/80e579.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/textureSampleBias/80e579.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/textureSampleBias/80e579.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/textureSampleBias/80e579.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/textureSampleBias/80e579.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/textureSampleBias/80e579.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/textureSampleBias/80e579.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/textureSampleBias/81c19a.wgsl b/test/tint/builtins/gen/literal/textureSampleBias/81c19a.wgsl
similarity index 96%
rename from test/tint/builtins/gen/textureSampleBias/81c19a.wgsl
rename to test/tint/builtins/gen/literal/textureSampleBias/81c19a.wgsl
index 1404fe96e8..1e615ca56c 100644
--- a/test/tint/builtins/gen/textureSampleBias/81c19a.wgsl
+++ b/test/tint/builtins/gen/literal/textureSampleBias/81c19a.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/textureSampleBias/81c19a.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureSampleBias/81c19a.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/textureSampleBias/81c19a.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/textureSampleBias/81c19a.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/textureSampleBias/81c19a.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/textureSampleBias/81c19a.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/textureSampleBias/81c19a.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/textureSampleBias/81c19a.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/textureSampleBias/81c19a.wgsl.expected.msl b/test/tint/builtins/gen/literal/textureSampleBias/81c19a.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/textureSampleBias/81c19a.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/textureSampleBias/81c19a.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/textureSampleBias/81c19a.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureSampleBias/81c19a.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/textureSampleBias/81c19a.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/textureSampleBias/81c19a.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/textureSampleBias/81c19a.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/textureSampleBias/81c19a.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/textureSampleBias/81c19a.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/textureSampleBias/81c19a.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/textureSampleBias/d3fa1b.wgsl b/test/tint/builtins/gen/literal/textureSampleBias/d3fa1b.wgsl
similarity index 96%
rename from test/tint/builtins/gen/textureSampleBias/d3fa1b.wgsl
rename to test/tint/builtins/gen/literal/textureSampleBias/d3fa1b.wgsl
index c35677ced3..1b17a6dd0e 100644
--- a/test/tint/builtins/gen/textureSampleBias/d3fa1b.wgsl
+++ b/test/tint/builtins/gen/literal/textureSampleBias/d3fa1b.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/textureSampleBias/d3fa1b.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureSampleBias/d3fa1b.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/textureSampleBias/d3fa1b.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/textureSampleBias/d3fa1b.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/textureSampleBias/d3fa1b.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/textureSampleBias/d3fa1b.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/textureSampleBias/d3fa1b.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/textureSampleBias/d3fa1b.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/textureSampleBias/d3fa1b.wgsl.expected.msl b/test/tint/builtins/gen/literal/textureSampleBias/d3fa1b.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/textureSampleBias/d3fa1b.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/textureSampleBias/d3fa1b.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/textureSampleBias/d3fa1b.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureSampleBias/d3fa1b.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/textureSampleBias/d3fa1b.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/textureSampleBias/d3fa1b.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/textureSampleBias/d3fa1b.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/textureSampleBias/d3fa1b.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/textureSampleBias/d3fa1b.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/textureSampleBias/d3fa1b.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/textureSampleBias/df91bb.wgsl b/test/tint/builtins/gen/literal/textureSampleBias/df91bb.wgsl
similarity index 96%
rename from test/tint/builtins/gen/textureSampleBias/df91bb.wgsl
rename to test/tint/builtins/gen/literal/textureSampleBias/df91bb.wgsl
index 0232d0aa52..14282eeb10 100644
--- a/test/tint/builtins/gen/textureSampleBias/df91bb.wgsl
+++ b/test/tint/builtins/gen/literal/textureSampleBias/df91bb.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/textureSampleBias/df91bb.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureSampleBias/df91bb.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/textureSampleBias/df91bb.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/textureSampleBias/df91bb.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/textureSampleBias/df91bb.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/textureSampleBias/df91bb.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/textureSampleBias/df91bb.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/textureSampleBias/df91bb.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/textureSampleBias/df91bb.wgsl.expected.msl b/test/tint/builtins/gen/literal/textureSampleBias/df91bb.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/textureSampleBias/df91bb.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/textureSampleBias/df91bb.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/textureSampleBias/df91bb.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureSampleBias/df91bb.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/textureSampleBias/df91bb.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/textureSampleBias/df91bb.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/textureSampleBias/df91bb.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/textureSampleBias/df91bb.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/textureSampleBias/df91bb.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/textureSampleBias/df91bb.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/textureSampleBias/eed7c4.wgsl b/test/tint/builtins/gen/literal/textureSampleBias/eed7c4.wgsl
similarity index 96%
rename from test/tint/builtins/gen/textureSampleBias/eed7c4.wgsl
rename to test/tint/builtins/gen/literal/textureSampleBias/eed7c4.wgsl
index bbc1ad7de6..01eeffae2a 100644
--- a/test/tint/builtins/gen/textureSampleBias/eed7c4.wgsl
+++ b/test/tint/builtins/gen/literal/textureSampleBias/eed7c4.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/textureSampleBias/eed7c4.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureSampleBias/eed7c4.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/textureSampleBias/eed7c4.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/textureSampleBias/eed7c4.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/textureSampleBias/eed7c4.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/textureSampleBias/eed7c4.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/textureSampleBias/eed7c4.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/textureSampleBias/eed7c4.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/textureSampleBias/eed7c4.wgsl.expected.msl b/test/tint/builtins/gen/literal/textureSampleBias/eed7c4.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/textureSampleBias/eed7c4.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/textureSampleBias/eed7c4.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/textureSampleBias/eed7c4.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureSampleBias/eed7c4.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/textureSampleBias/eed7c4.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/textureSampleBias/eed7c4.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/textureSampleBias/eed7c4.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/textureSampleBias/eed7c4.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/textureSampleBias/eed7c4.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/textureSampleBias/eed7c4.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/textureSampleCompare/25fcd1.wgsl b/test/tint/builtins/gen/literal/textureSampleCompare/25fcd1.wgsl
similarity index 96%
rename from test/tint/builtins/gen/textureSampleCompare/25fcd1.wgsl
rename to test/tint/builtins/gen/literal/textureSampleCompare/25fcd1.wgsl
index a5b48036c9..d0e2376fb6 100644
--- a/test/tint/builtins/gen/textureSampleCompare/25fcd1.wgsl
+++ b/test/tint/builtins/gen/literal/textureSampleCompare/25fcd1.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/textureSampleCompare/25fcd1.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureSampleCompare/25fcd1.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/textureSampleCompare/25fcd1.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/textureSampleCompare/25fcd1.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/textureSampleCompare/25fcd1.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/textureSampleCompare/25fcd1.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/textureSampleCompare/25fcd1.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/textureSampleCompare/25fcd1.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/textureSampleCompare/25fcd1.wgsl.expected.msl b/test/tint/builtins/gen/literal/textureSampleCompare/25fcd1.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/textureSampleCompare/25fcd1.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/textureSampleCompare/25fcd1.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/textureSampleCompare/25fcd1.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureSampleCompare/25fcd1.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/textureSampleCompare/25fcd1.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/textureSampleCompare/25fcd1.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/textureSampleCompare/25fcd1.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/textureSampleCompare/25fcd1.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/textureSampleCompare/25fcd1.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/textureSampleCompare/25fcd1.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/textureSampleCompare/3a5923.wgsl b/test/tint/builtins/gen/literal/textureSampleCompare/3a5923.wgsl
similarity index 96%
rename from test/tint/builtins/gen/textureSampleCompare/3a5923.wgsl
rename to test/tint/builtins/gen/literal/textureSampleCompare/3a5923.wgsl
index 7c8fda5e7b..799f5b06f4 100644
--- a/test/tint/builtins/gen/textureSampleCompare/3a5923.wgsl
+++ b/test/tint/builtins/gen/literal/textureSampleCompare/3a5923.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/textureSampleCompare/3a5923.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureSampleCompare/3a5923.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/textureSampleCompare/3a5923.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/textureSampleCompare/3a5923.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/textureSampleCompare/3a5923.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/textureSampleCompare/3a5923.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/textureSampleCompare/3a5923.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/textureSampleCompare/3a5923.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/textureSampleCompare/3a5923.wgsl.expected.msl b/test/tint/builtins/gen/literal/textureSampleCompare/3a5923.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/textureSampleCompare/3a5923.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/textureSampleCompare/3a5923.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/textureSampleCompare/3a5923.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureSampleCompare/3a5923.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/textureSampleCompare/3a5923.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/textureSampleCompare/3a5923.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/textureSampleCompare/3a5923.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/textureSampleCompare/3a5923.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/textureSampleCompare/3a5923.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/textureSampleCompare/3a5923.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/textureSampleCompare/63fb83.wgsl b/test/tint/builtins/gen/literal/textureSampleCompare/63fb83.wgsl
similarity index 96%
rename from test/tint/builtins/gen/textureSampleCompare/63fb83.wgsl
rename to test/tint/builtins/gen/literal/textureSampleCompare/63fb83.wgsl
index 163731a766..dda3efb2b1 100644
--- a/test/tint/builtins/gen/textureSampleCompare/63fb83.wgsl
+++ b/test/tint/builtins/gen/literal/textureSampleCompare/63fb83.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/textureSampleCompare/63fb83.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureSampleCompare/63fb83.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/textureSampleCompare/63fb83.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/textureSampleCompare/63fb83.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/textureSampleCompare/63fb83.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/textureSampleCompare/63fb83.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/textureSampleCompare/63fb83.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/textureSampleCompare/63fb83.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/textureSampleCompare/63fb83.wgsl.expected.msl b/test/tint/builtins/gen/literal/textureSampleCompare/63fb83.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/textureSampleCompare/63fb83.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/textureSampleCompare/63fb83.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/textureSampleCompare/63fb83.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureSampleCompare/63fb83.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/textureSampleCompare/63fb83.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/textureSampleCompare/63fb83.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/textureSampleCompare/63fb83.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/textureSampleCompare/63fb83.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/textureSampleCompare/63fb83.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/textureSampleCompare/63fb83.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/textureSampleCompare/98b85c.wgsl b/test/tint/builtins/gen/literal/textureSampleCompare/98b85c.wgsl
similarity index 97%
rename from test/tint/builtins/gen/textureSampleCompare/98b85c.wgsl
rename to test/tint/builtins/gen/literal/textureSampleCompare/98b85c.wgsl
index a21c6e9659..8af7adc297 100644
--- a/test/tint/builtins/gen/textureSampleCompare/98b85c.wgsl
+++ b/test/tint/builtins/gen/literal/textureSampleCompare/98b85c.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/textureSampleCompare/98b85c.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureSampleCompare/98b85c.wgsl.expected.glsl
similarity index 95%
rename from test/tint/builtins/gen/textureSampleCompare/98b85c.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/textureSampleCompare/98b85c.wgsl.expected.glsl
index 00647179a3..45aa450c51 100644
--- a/test/tint/builtins/gen/textureSampleCompare/98b85c.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureSampleCompare/98b85c.wgsl.expected.glsl
@@ -6,7 +6,7 @@ precision mediump float;
 uniform highp sampler2DArrayShadow arg_0_arg_1;
 
 void textureSampleCompare_98b85c() {
-  float res = textureOffset(arg_0_arg_1, vec4(0.0f, 0.0f, float(1), 1.0f), ivec2(0, 0));
+  float res = textureOffset(arg_0_arg_1, vec4(0.0f, 0.0f, float(1), 1.0f), ivec2(0));
 }
 
 void fragment_main() {
diff --git a/test/tint/builtins/gen/textureSampleCompare/98b85c.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/textureSampleCompare/98b85c.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/textureSampleCompare/98b85c.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/textureSampleCompare/98b85c.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/textureSampleCompare/98b85c.wgsl.expected.msl b/test/tint/builtins/gen/literal/textureSampleCompare/98b85c.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/textureSampleCompare/98b85c.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/textureSampleCompare/98b85c.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/textureSampleCompare/98b85c.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureSampleCompare/98b85c.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/textureSampleCompare/98b85c.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/textureSampleCompare/98b85c.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/textureSampleCompare/98b85c.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/textureSampleCompare/98b85c.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/textureSampleCompare/98b85c.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/textureSampleCompare/98b85c.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/textureSampleCompare/a3ca7e.wgsl b/test/tint/builtins/gen/literal/textureSampleCompare/a3ca7e.wgsl
similarity index 96%
rename from test/tint/builtins/gen/textureSampleCompare/a3ca7e.wgsl
rename to test/tint/builtins/gen/literal/textureSampleCompare/a3ca7e.wgsl
index 24aa9b5b4f..1b9c595920 100644
--- a/test/tint/builtins/gen/textureSampleCompare/a3ca7e.wgsl
+++ b/test/tint/builtins/gen/literal/textureSampleCompare/a3ca7e.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/textureSampleCompare/a3ca7e.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureSampleCompare/a3ca7e.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/textureSampleCompare/a3ca7e.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/textureSampleCompare/a3ca7e.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/textureSampleCompare/a3ca7e.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/textureSampleCompare/a3ca7e.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/textureSampleCompare/a3ca7e.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/textureSampleCompare/a3ca7e.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/textureSampleCompare/a3ca7e.wgsl.expected.msl b/test/tint/builtins/gen/literal/textureSampleCompare/a3ca7e.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/textureSampleCompare/a3ca7e.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/textureSampleCompare/a3ca7e.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/textureSampleCompare/a3ca7e.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureSampleCompare/a3ca7e.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/textureSampleCompare/a3ca7e.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/textureSampleCompare/a3ca7e.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/textureSampleCompare/a3ca7e.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/textureSampleCompare/a3ca7e.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/textureSampleCompare/a3ca7e.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/textureSampleCompare/a3ca7e.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/textureSampleCompare/dd431d.wgsl b/test/tint/builtins/gen/literal/textureSampleCompare/dd431d.wgsl
similarity index 96%
rename from test/tint/builtins/gen/textureSampleCompare/dd431d.wgsl
rename to test/tint/builtins/gen/literal/textureSampleCompare/dd431d.wgsl
index 53015a42bf..1733917489 100644
--- a/test/tint/builtins/gen/textureSampleCompare/dd431d.wgsl
+++ b/test/tint/builtins/gen/literal/textureSampleCompare/dd431d.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/textureSampleCompare/dd431d.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureSampleCompare/dd431d.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/textureSampleCompare/dd431d.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/textureSampleCompare/dd431d.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/textureSampleCompare/dd431d.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/textureSampleCompare/dd431d.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/textureSampleCompare/dd431d.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/textureSampleCompare/dd431d.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/textureSampleCompare/dd431d.wgsl.expected.msl b/test/tint/builtins/gen/literal/textureSampleCompare/dd431d.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/textureSampleCompare/dd431d.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/textureSampleCompare/dd431d.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/textureSampleCompare/dd431d.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureSampleCompare/dd431d.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/textureSampleCompare/dd431d.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/textureSampleCompare/dd431d.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/textureSampleCompare/dd431d.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/textureSampleCompare/dd431d.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/textureSampleCompare/dd431d.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/textureSampleCompare/dd431d.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/textureSampleCompareLevel/011a8f.wgsl b/test/tint/builtins/gen/literal/textureSampleCompareLevel/011a8f.wgsl
similarity index 97%
rename from test/tint/builtins/gen/textureSampleCompareLevel/011a8f.wgsl
rename to test/tint/builtins/gen/literal/textureSampleCompareLevel/011a8f.wgsl
index a6fa885a8b..4ebd76ce7d 100644
--- a/test/tint/builtins/gen/textureSampleCompareLevel/011a8f.wgsl
+++ b/test/tint/builtins/gen/literal/textureSampleCompareLevel/011a8f.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/textureSampleCompareLevel/011a8f.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureSampleCompareLevel/011a8f.wgsl.expected.glsl
similarity index 93%
rename from test/tint/builtins/gen/textureSampleCompareLevel/011a8f.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/textureSampleCompareLevel/011a8f.wgsl.expected.glsl
index 6bc5a40084..ed8868c17c 100644
--- a/test/tint/builtins/gen/textureSampleCompareLevel/011a8f.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureSampleCompareLevel/011a8f.wgsl.expected.glsl
@@ -5,12 +5,12 @@ SKIP: FAILED
 uniform highp sampler2DArrayShadow arg_0_arg_1;
 
 void textureSampleCompareLevel_011a8f() {
-  float res = textureOffset(arg_0_arg_1, vec4(0.0f, 0.0f, float(1), 1.0f), ivec2(0, 0));
+  float res = textureOffset(arg_0_arg_1, vec4(0.0f, 0.0f, float(1), 1.0f), ivec2(0));
 }
 
 vec4 vertex_main() {
   textureSampleCompareLevel_011a8f();
-  return vec4(0.0f, 0.0f, 0.0f, 0.0f);
+  return vec4(0.0f);
 }
 
 void main() {
@@ -34,7 +34,7 @@ precision mediump float;
 uniform highp sampler2DArrayShadow arg_0_arg_1;
 
 void textureSampleCompareLevel_011a8f() {
-  float res = textureOffset(arg_0_arg_1, vec4(0.0f, 0.0f, float(1), 1.0f), ivec2(0, 0));
+  float res = textureOffset(arg_0_arg_1, vec4(0.0f, 0.0f, float(1), 1.0f), ivec2(0));
 }
 
 void fragment_main() {
@@ -57,7 +57,7 @@ ERROR: 2 compilation errors.  No code generated.
 uniform highp sampler2DArrayShadow arg_0_arg_1;
 
 void textureSampleCompareLevel_011a8f() {
-  float res = textureOffset(arg_0_arg_1, vec4(0.0f, 0.0f, float(1), 1.0f), ivec2(0, 0));
+  float res = textureOffset(arg_0_arg_1, vec4(0.0f, 0.0f, float(1), 1.0f), ivec2(0));
 }
 
 void compute_main() {
diff --git a/test/tint/builtins/gen/textureSampleCompareLevel/011a8f.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/textureSampleCompareLevel/011a8f.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/textureSampleCompareLevel/011a8f.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/textureSampleCompareLevel/011a8f.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/textureSampleCompareLevel/011a8f.wgsl.expected.msl b/test/tint/builtins/gen/literal/textureSampleCompareLevel/011a8f.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/textureSampleCompareLevel/011a8f.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/textureSampleCompareLevel/011a8f.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/textureSampleCompareLevel/011a8f.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureSampleCompareLevel/011a8f.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/textureSampleCompareLevel/011a8f.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/textureSampleCompareLevel/011a8f.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/textureSampleCompareLevel/011a8f.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/textureSampleCompareLevel/011a8f.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/textureSampleCompareLevel/011a8f.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/textureSampleCompareLevel/011a8f.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/textureSampleCompareLevel/1116ed.wgsl b/test/tint/builtins/gen/literal/textureSampleCompareLevel/1116ed.wgsl
similarity index 97%
rename from test/tint/builtins/gen/textureSampleCompareLevel/1116ed.wgsl
rename to test/tint/builtins/gen/literal/textureSampleCompareLevel/1116ed.wgsl
index 126cedc97a..4473d1e3d0 100644
--- a/test/tint/builtins/gen/textureSampleCompareLevel/1116ed.wgsl
+++ b/test/tint/builtins/gen/literal/textureSampleCompareLevel/1116ed.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/textureSampleCompareLevel/1116ed.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureSampleCompareLevel/1116ed.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/textureSampleCompareLevel/1116ed.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/textureSampleCompareLevel/1116ed.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/textureSampleCompareLevel/1116ed.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/textureSampleCompareLevel/1116ed.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/textureSampleCompareLevel/1116ed.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/textureSampleCompareLevel/1116ed.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/textureSampleCompareLevel/1116ed.wgsl.expected.msl b/test/tint/builtins/gen/literal/textureSampleCompareLevel/1116ed.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/textureSampleCompareLevel/1116ed.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/textureSampleCompareLevel/1116ed.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/textureSampleCompareLevel/1116ed.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureSampleCompareLevel/1116ed.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/textureSampleCompareLevel/1116ed.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/textureSampleCompareLevel/1116ed.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/textureSampleCompareLevel/1116ed.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/textureSampleCompareLevel/1116ed.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/textureSampleCompareLevel/1116ed.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/textureSampleCompareLevel/1116ed.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/textureSampleCompareLevel/1568e3.wgsl b/test/tint/builtins/gen/literal/textureSampleCompareLevel/1568e3.wgsl
similarity index 97%
rename from test/tint/builtins/gen/textureSampleCompareLevel/1568e3.wgsl
rename to test/tint/builtins/gen/literal/textureSampleCompareLevel/1568e3.wgsl
index 1525450b32..fe74fc9f79 100644
--- a/test/tint/builtins/gen/textureSampleCompareLevel/1568e3.wgsl
+++ b/test/tint/builtins/gen/literal/textureSampleCompareLevel/1568e3.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/textureSampleCompareLevel/1568e3.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureSampleCompareLevel/1568e3.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/textureSampleCompareLevel/1568e3.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/textureSampleCompareLevel/1568e3.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/textureSampleCompareLevel/1568e3.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/textureSampleCompareLevel/1568e3.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/textureSampleCompareLevel/1568e3.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/textureSampleCompareLevel/1568e3.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/textureSampleCompareLevel/1568e3.wgsl.expected.msl b/test/tint/builtins/gen/literal/textureSampleCompareLevel/1568e3.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/textureSampleCompareLevel/1568e3.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/textureSampleCompareLevel/1568e3.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/textureSampleCompareLevel/1568e3.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureSampleCompareLevel/1568e3.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/textureSampleCompareLevel/1568e3.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/textureSampleCompareLevel/1568e3.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/textureSampleCompareLevel/1568e3.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/textureSampleCompareLevel/1568e3.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/textureSampleCompareLevel/1568e3.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/textureSampleCompareLevel/1568e3.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/textureSampleCompareLevel/2ad2b1.wgsl b/test/tint/builtins/gen/literal/textureSampleCompareLevel/2ad2b1.wgsl
similarity index 97%
rename from test/tint/builtins/gen/textureSampleCompareLevel/2ad2b1.wgsl
rename to test/tint/builtins/gen/literal/textureSampleCompareLevel/2ad2b1.wgsl
index b03768d3e1..24c283c22c 100644
--- a/test/tint/builtins/gen/textureSampleCompareLevel/2ad2b1.wgsl
+++ b/test/tint/builtins/gen/literal/textureSampleCompareLevel/2ad2b1.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/textureSampleCompareLevel/2ad2b1.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureSampleCompareLevel/2ad2b1.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/textureSampleCompareLevel/2ad2b1.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/textureSampleCompareLevel/2ad2b1.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/textureSampleCompareLevel/2ad2b1.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/textureSampleCompareLevel/2ad2b1.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/textureSampleCompareLevel/2ad2b1.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/textureSampleCompareLevel/2ad2b1.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/textureSampleCompareLevel/2ad2b1.wgsl.expected.msl b/test/tint/builtins/gen/literal/textureSampleCompareLevel/2ad2b1.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/textureSampleCompareLevel/2ad2b1.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/textureSampleCompareLevel/2ad2b1.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/textureSampleCompareLevel/2ad2b1.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureSampleCompareLevel/2ad2b1.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/textureSampleCompareLevel/2ad2b1.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/textureSampleCompareLevel/2ad2b1.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/textureSampleCompareLevel/2ad2b1.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/textureSampleCompareLevel/2ad2b1.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/textureSampleCompareLevel/2ad2b1.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/textureSampleCompareLevel/2ad2b1.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/textureSampleCompareLevel/4cf3a2.wgsl b/test/tint/builtins/gen/literal/textureSampleCompareLevel/4cf3a2.wgsl
similarity index 97%
rename from test/tint/builtins/gen/textureSampleCompareLevel/4cf3a2.wgsl
rename to test/tint/builtins/gen/literal/textureSampleCompareLevel/4cf3a2.wgsl
index 46931cbd12..cb237dcedd 100644
--- a/test/tint/builtins/gen/textureSampleCompareLevel/4cf3a2.wgsl
+++ b/test/tint/builtins/gen/literal/textureSampleCompareLevel/4cf3a2.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/textureSampleCompareLevel/4cf3a2.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureSampleCompareLevel/4cf3a2.wgsl.expected.glsl
similarity index 97%
rename from test/tint/builtins/gen/textureSampleCompareLevel/4cf3a2.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/textureSampleCompareLevel/4cf3a2.wgsl.expected.glsl
index bdb0e8cefd..50371428ae 100644
--- a/test/tint/builtins/gen/textureSampleCompareLevel/4cf3a2.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureSampleCompareLevel/4cf3a2.wgsl.expected.glsl
@@ -10,7 +10,7 @@ void textureSampleCompareLevel_4cf3a2() {
 
 vec4 vertex_main() {
   textureSampleCompareLevel_4cf3a2();
-  return vec4(0.0f, 0.0f, 0.0f, 0.0f);
+  return vec4(0.0f);
 }
 
 void main() {
diff --git a/test/tint/builtins/gen/textureSampleCompareLevel/4cf3a2.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/textureSampleCompareLevel/4cf3a2.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/textureSampleCompareLevel/4cf3a2.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/textureSampleCompareLevel/4cf3a2.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/textureSampleCompareLevel/4cf3a2.wgsl.expected.msl b/test/tint/builtins/gen/literal/textureSampleCompareLevel/4cf3a2.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/textureSampleCompareLevel/4cf3a2.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/textureSampleCompareLevel/4cf3a2.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/textureSampleCompareLevel/4cf3a2.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureSampleCompareLevel/4cf3a2.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/textureSampleCompareLevel/4cf3a2.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/textureSampleCompareLevel/4cf3a2.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/textureSampleCompareLevel/4cf3a2.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/textureSampleCompareLevel/4cf3a2.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/textureSampleCompareLevel/4cf3a2.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/textureSampleCompareLevel/4cf3a2.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/textureSampleCompareLevel/f8121c.wgsl b/test/tint/builtins/gen/literal/textureSampleCompareLevel/f8121c.wgsl
similarity index 97%
rename from test/tint/builtins/gen/textureSampleCompareLevel/f8121c.wgsl
rename to test/tint/builtins/gen/literal/textureSampleCompareLevel/f8121c.wgsl
index 50fbbe1fdf..51e2027f38 100644
--- a/test/tint/builtins/gen/textureSampleCompareLevel/f8121c.wgsl
+++ b/test/tint/builtins/gen/literal/textureSampleCompareLevel/f8121c.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/textureSampleCompareLevel/f8121c.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureSampleCompareLevel/f8121c.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/textureSampleCompareLevel/f8121c.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/textureSampleCompareLevel/f8121c.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/textureSampleCompareLevel/f8121c.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/textureSampleCompareLevel/f8121c.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/textureSampleCompareLevel/f8121c.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/textureSampleCompareLevel/f8121c.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/textureSampleCompareLevel/f8121c.wgsl.expected.msl b/test/tint/builtins/gen/literal/textureSampleCompareLevel/f8121c.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/textureSampleCompareLevel/f8121c.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/textureSampleCompareLevel/f8121c.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/textureSampleCompareLevel/f8121c.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureSampleCompareLevel/f8121c.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/textureSampleCompareLevel/f8121c.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/textureSampleCompareLevel/f8121c.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/textureSampleCompareLevel/f8121c.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/textureSampleCompareLevel/f8121c.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/textureSampleCompareLevel/f8121c.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/textureSampleCompareLevel/f8121c.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/textureSampleGrad/21402b.wgsl b/test/tint/builtins/gen/literal/textureSampleGrad/21402b.wgsl
similarity index 97%
rename from test/tint/builtins/gen/textureSampleGrad/21402b.wgsl
rename to test/tint/builtins/gen/literal/textureSampleGrad/21402b.wgsl
index ca02ceee79..339576d917 100644
--- a/test/tint/builtins/gen/textureSampleGrad/21402b.wgsl
+++ b/test/tint/builtins/gen/literal/textureSampleGrad/21402b.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/textureSampleGrad/21402b.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureSampleGrad/21402b.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/textureSampleGrad/21402b.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/textureSampleGrad/21402b.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/textureSampleGrad/21402b.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/textureSampleGrad/21402b.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/textureSampleGrad/21402b.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/textureSampleGrad/21402b.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/textureSampleGrad/21402b.wgsl.expected.msl b/test/tint/builtins/gen/literal/textureSampleGrad/21402b.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/textureSampleGrad/21402b.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/textureSampleGrad/21402b.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/textureSampleGrad/21402b.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureSampleGrad/21402b.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/textureSampleGrad/21402b.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/textureSampleGrad/21402b.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/textureSampleGrad/21402b.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/textureSampleGrad/21402b.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/textureSampleGrad/21402b.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/textureSampleGrad/21402b.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/textureSampleGrad/2ecd8f.wgsl b/test/tint/builtins/gen/literal/textureSampleGrad/2ecd8f.wgsl
similarity index 97%
rename from test/tint/builtins/gen/textureSampleGrad/2ecd8f.wgsl
rename to test/tint/builtins/gen/literal/textureSampleGrad/2ecd8f.wgsl
index b68b12e4ab..d4250b15f2 100644
--- a/test/tint/builtins/gen/textureSampleGrad/2ecd8f.wgsl
+++ b/test/tint/builtins/gen/literal/textureSampleGrad/2ecd8f.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/textureSampleGrad/2ecd8f.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureSampleGrad/2ecd8f.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/textureSampleGrad/2ecd8f.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/textureSampleGrad/2ecd8f.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/textureSampleGrad/2ecd8f.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/textureSampleGrad/2ecd8f.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/textureSampleGrad/2ecd8f.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/textureSampleGrad/2ecd8f.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/textureSampleGrad/2ecd8f.wgsl.expected.msl b/test/tint/builtins/gen/literal/textureSampleGrad/2ecd8f.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/textureSampleGrad/2ecd8f.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/textureSampleGrad/2ecd8f.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/textureSampleGrad/2ecd8f.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureSampleGrad/2ecd8f.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/textureSampleGrad/2ecd8f.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/textureSampleGrad/2ecd8f.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/textureSampleGrad/2ecd8f.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/textureSampleGrad/2ecd8f.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/textureSampleGrad/2ecd8f.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/textureSampleGrad/2ecd8f.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/textureSampleGrad/468f88.wgsl b/test/tint/builtins/gen/literal/textureSampleGrad/468f88.wgsl
similarity index 97%
rename from test/tint/builtins/gen/textureSampleGrad/468f88.wgsl
rename to test/tint/builtins/gen/literal/textureSampleGrad/468f88.wgsl
index a15d5446fe..63d4fed537 100644
--- a/test/tint/builtins/gen/textureSampleGrad/468f88.wgsl
+++ b/test/tint/builtins/gen/literal/textureSampleGrad/468f88.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/textureSampleGrad/468f88.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureSampleGrad/468f88.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/textureSampleGrad/468f88.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/textureSampleGrad/468f88.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/textureSampleGrad/468f88.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/textureSampleGrad/468f88.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/textureSampleGrad/468f88.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/textureSampleGrad/468f88.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/textureSampleGrad/468f88.wgsl.expected.msl b/test/tint/builtins/gen/literal/textureSampleGrad/468f88.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/textureSampleGrad/468f88.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/textureSampleGrad/468f88.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/textureSampleGrad/468f88.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureSampleGrad/468f88.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/textureSampleGrad/468f88.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/textureSampleGrad/468f88.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/textureSampleGrad/468f88.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/textureSampleGrad/468f88.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/textureSampleGrad/468f88.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/textureSampleGrad/468f88.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/textureSampleGrad/521263.wgsl b/test/tint/builtins/gen/literal/textureSampleGrad/521263.wgsl
similarity index 97%
rename from test/tint/builtins/gen/textureSampleGrad/521263.wgsl
rename to test/tint/builtins/gen/literal/textureSampleGrad/521263.wgsl
index 37946854bb..31754e87b0 100644
--- a/test/tint/builtins/gen/textureSampleGrad/521263.wgsl
+++ b/test/tint/builtins/gen/literal/textureSampleGrad/521263.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/textureSampleGrad/521263.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureSampleGrad/521263.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/textureSampleGrad/521263.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/textureSampleGrad/521263.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/textureSampleGrad/521263.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/textureSampleGrad/521263.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/textureSampleGrad/521263.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/textureSampleGrad/521263.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/textureSampleGrad/521263.wgsl.expected.msl b/test/tint/builtins/gen/literal/textureSampleGrad/521263.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/textureSampleGrad/521263.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/textureSampleGrad/521263.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/textureSampleGrad/521263.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureSampleGrad/521263.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/textureSampleGrad/521263.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/textureSampleGrad/521263.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/textureSampleGrad/521263.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/textureSampleGrad/521263.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/textureSampleGrad/521263.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/textureSampleGrad/521263.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/textureSampleGrad/5312f4.wgsl b/test/tint/builtins/gen/literal/textureSampleGrad/5312f4.wgsl
similarity index 97%
rename from test/tint/builtins/gen/textureSampleGrad/5312f4.wgsl
rename to test/tint/builtins/gen/literal/textureSampleGrad/5312f4.wgsl
index 03e79302a5..91e8a82b48 100644
--- a/test/tint/builtins/gen/textureSampleGrad/5312f4.wgsl
+++ b/test/tint/builtins/gen/literal/textureSampleGrad/5312f4.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/textureSampleGrad/5312f4.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureSampleGrad/5312f4.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/textureSampleGrad/5312f4.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/textureSampleGrad/5312f4.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/textureSampleGrad/5312f4.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/textureSampleGrad/5312f4.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/textureSampleGrad/5312f4.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/textureSampleGrad/5312f4.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/textureSampleGrad/5312f4.wgsl.expected.msl b/test/tint/builtins/gen/literal/textureSampleGrad/5312f4.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/textureSampleGrad/5312f4.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/textureSampleGrad/5312f4.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/textureSampleGrad/5312f4.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureSampleGrad/5312f4.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/textureSampleGrad/5312f4.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/textureSampleGrad/5312f4.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/textureSampleGrad/5312f4.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/textureSampleGrad/5312f4.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/textureSampleGrad/5312f4.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/textureSampleGrad/5312f4.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/textureSampleGrad/872f00.wgsl b/test/tint/builtins/gen/literal/textureSampleGrad/872f00.wgsl
similarity index 97%
rename from test/tint/builtins/gen/textureSampleGrad/872f00.wgsl
rename to test/tint/builtins/gen/literal/textureSampleGrad/872f00.wgsl
index 13fa7379bd..4037fe2589 100644
--- a/test/tint/builtins/gen/textureSampleGrad/872f00.wgsl
+++ b/test/tint/builtins/gen/literal/textureSampleGrad/872f00.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/textureSampleGrad/872f00.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureSampleGrad/872f00.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/textureSampleGrad/872f00.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/textureSampleGrad/872f00.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/textureSampleGrad/872f00.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/textureSampleGrad/872f00.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/textureSampleGrad/872f00.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/textureSampleGrad/872f00.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/textureSampleGrad/872f00.wgsl.expected.msl b/test/tint/builtins/gen/literal/textureSampleGrad/872f00.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/textureSampleGrad/872f00.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/textureSampleGrad/872f00.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/textureSampleGrad/872f00.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureSampleGrad/872f00.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/textureSampleGrad/872f00.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/textureSampleGrad/872f00.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/textureSampleGrad/872f00.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/textureSampleGrad/872f00.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/textureSampleGrad/872f00.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/textureSampleGrad/872f00.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/textureSampleGrad/e383db.wgsl b/test/tint/builtins/gen/literal/textureSampleGrad/e383db.wgsl
similarity index 97%
rename from test/tint/builtins/gen/textureSampleGrad/e383db.wgsl
rename to test/tint/builtins/gen/literal/textureSampleGrad/e383db.wgsl
index 4e2e62ae24..9f92c4158c 100644
--- a/test/tint/builtins/gen/textureSampleGrad/e383db.wgsl
+++ b/test/tint/builtins/gen/literal/textureSampleGrad/e383db.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/textureSampleGrad/e383db.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureSampleGrad/e383db.wgsl.expected.glsl
similarity index 88%
rename from test/tint/builtins/gen/textureSampleGrad/e383db.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/textureSampleGrad/e383db.wgsl.expected.glsl
index f55321046e..43f6aad626 100644
--- a/test/tint/builtins/gen/textureSampleGrad/e383db.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureSampleGrad/e383db.wgsl.expected.glsl
@@ -5,12 +5,12 @@ SKIP: FAILED
 uniform highp samplerCubeArray arg_0_arg_1;
 
 void textureSampleGrad_e383db() {
-  vec4 res = textureGrad(arg_0_arg_1, vec4(0.0f, 0.0f, 0.0f, float(1)), vec3(0.0f, 0.0f, 0.0f), vec3(0.0f, 0.0f, 0.0f));
+  vec4 res = textureGrad(arg_0_arg_1, vec4(0.0f, 0.0f, 0.0f, float(1)), vec3(0.0f), vec3(0.0f));
 }
 
 vec4 vertex_main() {
   textureSampleGrad_e383db();
-  return vec4(0.0f, 0.0f, 0.0f, 0.0f);
+  return vec4(0.0f);
 }
 
 void main() {
@@ -34,7 +34,7 @@ precision mediump float;
 uniform highp samplerCubeArray arg_0_arg_1;
 
 void textureSampleGrad_e383db() {
-  vec4 res = textureGrad(arg_0_arg_1, vec4(0.0f, 0.0f, 0.0f, float(1)), vec3(0.0f, 0.0f, 0.0f), vec3(0.0f, 0.0f, 0.0f));
+  vec4 res = textureGrad(arg_0_arg_1, vec4(0.0f, 0.0f, 0.0f, float(1)), vec3(0.0f), vec3(0.0f));
 }
 
 void fragment_main() {
@@ -57,7 +57,7 @@ ERROR: 2 compilation errors.  No code generated.
 uniform highp samplerCubeArray arg_0_arg_1;
 
 void textureSampleGrad_e383db() {
-  vec4 res = textureGrad(arg_0_arg_1, vec4(0.0f, 0.0f, 0.0f, float(1)), vec3(0.0f, 0.0f, 0.0f), vec3(0.0f, 0.0f, 0.0f));
+  vec4 res = textureGrad(arg_0_arg_1, vec4(0.0f, 0.0f, 0.0f, float(1)), vec3(0.0f), vec3(0.0f));
 }
 
 void compute_main() {
diff --git a/test/tint/builtins/gen/textureSampleGrad/e383db.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/textureSampleGrad/e383db.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/textureSampleGrad/e383db.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/textureSampleGrad/e383db.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/textureSampleGrad/e383db.wgsl.expected.msl b/test/tint/builtins/gen/literal/textureSampleGrad/e383db.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/textureSampleGrad/e383db.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/textureSampleGrad/e383db.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/textureSampleGrad/e383db.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureSampleGrad/e383db.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/textureSampleGrad/e383db.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/textureSampleGrad/e383db.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/textureSampleGrad/e383db.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/textureSampleGrad/e383db.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/textureSampleGrad/e383db.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/textureSampleGrad/e383db.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/textureSampleGrad/e9a2f7.wgsl b/test/tint/builtins/gen/literal/textureSampleGrad/e9a2f7.wgsl
similarity index 97%
rename from test/tint/builtins/gen/textureSampleGrad/e9a2f7.wgsl
rename to test/tint/builtins/gen/literal/textureSampleGrad/e9a2f7.wgsl
index 0b0c659ca0..d833ed4c99 100644
--- a/test/tint/builtins/gen/textureSampleGrad/e9a2f7.wgsl
+++ b/test/tint/builtins/gen/literal/textureSampleGrad/e9a2f7.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/textureSampleGrad/e9a2f7.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureSampleGrad/e9a2f7.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/textureSampleGrad/e9a2f7.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/textureSampleGrad/e9a2f7.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/textureSampleGrad/e9a2f7.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/textureSampleGrad/e9a2f7.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/textureSampleGrad/e9a2f7.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/textureSampleGrad/e9a2f7.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/textureSampleGrad/e9a2f7.wgsl.expected.msl b/test/tint/builtins/gen/literal/textureSampleGrad/e9a2f7.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/textureSampleGrad/e9a2f7.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/textureSampleGrad/e9a2f7.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/textureSampleGrad/e9a2f7.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureSampleGrad/e9a2f7.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/textureSampleGrad/e9a2f7.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/textureSampleGrad/e9a2f7.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/textureSampleGrad/e9a2f7.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/textureSampleGrad/e9a2f7.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/textureSampleGrad/e9a2f7.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/textureSampleGrad/e9a2f7.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/textureSampleLevel/02be59.wgsl b/test/tint/builtins/gen/literal/textureSampleLevel/02be59.wgsl
similarity index 97%
rename from test/tint/builtins/gen/textureSampleLevel/02be59.wgsl
rename to test/tint/builtins/gen/literal/textureSampleLevel/02be59.wgsl
index 6bce2c61bc..06116a9e84 100644
--- a/test/tint/builtins/gen/textureSampleLevel/02be59.wgsl
+++ b/test/tint/builtins/gen/literal/textureSampleLevel/02be59.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/textureSampleLevel/02be59.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureSampleLevel/02be59.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/textureSampleLevel/02be59.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/textureSampleLevel/02be59.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/textureSampleLevel/02be59.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/textureSampleLevel/02be59.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/textureSampleLevel/02be59.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/textureSampleLevel/02be59.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/textureSampleLevel/02be59.wgsl.expected.msl b/test/tint/builtins/gen/literal/textureSampleLevel/02be59.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/textureSampleLevel/02be59.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/textureSampleLevel/02be59.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/textureSampleLevel/02be59.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureSampleLevel/02be59.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/textureSampleLevel/02be59.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/textureSampleLevel/02be59.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/textureSampleLevel/02be59.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/textureSampleLevel/02be59.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/textureSampleLevel/02be59.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/textureSampleLevel/02be59.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/textureSampleLevel/0bdd9a.wgsl b/test/tint/builtins/gen/literal/textureSampleLevel/0bdd9a.wgsl
similarity index 97%
rename from test/tint/builtins/gen/textureSampleLevel/0bdd9a.wgsl
rename to test/tint/builtins/gen/literal/textureSampleLevel/0bdd9a.wgsl
index f4b34fec6b..3065b6e52b 100644
--- a/test/tint/builtins/gen/textureSampleLevel/0bdd9a.wgsl
+++ b/test/tint/builtins/gen/literal/textureSampleLevel/0bdd9a.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/textureSampleLevel/0bdd9a.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureSampleLevel/0bdd9a.wgsl.expected.glsl
similarity index 97%
rename from test/tint/builtins/gen/textureSampleLevel/0bdd9a.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/textureSampleLevel/0bdd9a.wgsl.expected.glsl
index 60ebf4e7a7..22a75bfba9 100644
--- a/test/tint/builtins/gen/textureSampleLevel/0bdd9a.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureSampleLevel/0bdd9a.wgsl.expected.glsl
@@ -10,7 +10,7 @@ void textureSampleLevel_0bdd9a() {
 
 vec4 vertex_main() {
   textureSampleLevel_0bdd9a();
-  return vec4(0.0f, 0.0f, 0.0f, 0.0f);
+  return vec4(0.0f);
 }
 
 void main() {
diff --git a/test/tint/builtins/gen/textureSampleLevel/0bdd9a.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/textureSampleLevel/0bdd9a.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/textureSampleLevel/0bdd9a.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/textureSampleLevel/0bdd9a.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/textureSampleLevel/0bdd9a.wgsl.expected.msl b/test/tint/builtins/gen/literal/textureSampleLevel/0bdd9a.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/textureSampleLevel/0bdd9a.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/textureSampleLevel/0bdd9a.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/textureSampleLevel/0bdd9a.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureSampleLevel/0bdd9a.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/textureSampleLevel/0bdd9a.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/textureSampleLevel/0bdd9a.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/textureSampleLevel/0bdd9a.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/textureSampleLevel/0bdd9a.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/textureSampleLevel/0bdd9a.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/textureSampleLevel/0bdd9a.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/textureSampleLevel/1b0291.wgsl b/test/tint/builtins/gen/literal/textureSampleLevel/1b0291.wgsl
similarity index 97%
rename from test/tint/builtins/gen/textureSampleLevel/1b0291.wgsl
rename to test/tint/builtins/gen/literal/textureSampleLevel/1b0291.wgsl
index 307442c215..583634c719 100644
--- a/test/tint/builtins/gen/textureSampleLevel/1b0291.wgsl
+++ b/test/tint/builtins/gen/literal/textureSampleLevel/1b0291.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/textureSampleLevel/1b0291.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureSampleLevel/1b0291.wgsl.expected.glsl
similarity index 97%
rename from test/tint/builtins/gen/textureSampleLevel/1b0291.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/textureSampleLevel/1b0291.wgsl.expected.glsl
index c410e7c180..5fddb81da2 100644
--- a/test/tint/builtins/gen/textureSampleLevel/1b0291.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureSampleLevel/1b0291.wgsl.expected.glsl
@@ -10,7 +10,7 @@ void textureSampleLevel_1b0291() {
 
 vec4 vertex_main() {
   textureSampleLevel_1b0291();
-  return vec4(0.0f, 0.0f, 0.0f, 0.0f);
+  return vec4(0.0f);
 }
 
 void main() {
diff --git a/test/tint/builtins/gen/textureSampleLevel/1b0291.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/textureSampleLevel/1b0291.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/textureSampleLevel/1b0291.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/textureSampleLevel/1b0291.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/textureSampleLevel/1b0291.wgsl.expected.msl b/test/tint/builtins/gen/literal/textureSampleLevel/1b0291.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/textureSampleLevel/1b0291.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/textureSampleLevel/1b0291.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/textureSampleLevel/1b0291.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureSampleLevel/1b0291.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/textureSampleLevel/1b0291.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/textureSampleLevel/1b0291.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/textureSampleLevel/1b0291.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/textureSampleLevel/1b0291.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/textureSampleLevel/1b0291.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/textureSampleLevel/1b0291.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/textureSampleLevel/1bf73e.wgsl b/test/tint/builtins/gen/literal/textureSampleLevel/1bf73e.wgsl
similarity index 97%
rename from test/tint/builtins/gen/textureSampleLevel/1bf73e.wgsl
rename to test/tint/builtins/gen/literal/textureSampleLevel/1bf73e.wgsl
index b32ce00f94..e9988593b0 100644
--- a/test/tint/builtins/gen/textureSampleLevel/1bf73e.wgsl
+++ b/test/tint/builtins/gen/literal/textureSampleLevel/1bf73e.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/textureSampleLevel/1bf73e.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureSampleLevel/1bf73e.wgsl.expected.glsl
similarity index 97%
rename from test/tint/builtins/gen/textureSampleLevel/1bf73e.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/textureSampleLevel/1bf73e.wgsl.expected.glsl
index defb6f6aec..b3a3c229b5 100644
--- a/test/tint/builtins/gen/textureSampleLevel/1bf73e.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureSampleLevel/1bf73e.wgsl.expected.glsl
@@ -10,7 +10,7 @@ void textureSampleLevel_1bf73e() {
 
 vec4 vertex_main() {
   textureSampleLevel_1bf73e();
-  return vec4(0.0f, 0.0f, 0.0f, 0.0f);
+  return vec4(0.0f);
 }
 
 void main() {
diff --git a/test/tint/builtins/gen/textureSampleLevel/1bf73e.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/textureSampleLevel/1bf73e.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/textureSampleLevel/1bf73e.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/textureSampleLevel/1bf73e.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/textureSampleLevel/1bf73e.wgsl.expected.msl b/test/tint/builtins/gen/literal/textureSampleLevel/1bf73e.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/textureSampleLevel/1bf73e.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/textureSampleLevel/1bf73e.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/textureSampleLevel/1bf73e.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureSampleLevel/1bf73e.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/textureSampleLevel/1bf73e.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/textureSampleLevel/1bf73e.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/textureSampleLevel/1bf73e.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/textureSampleLevel/1bf73e.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/textureSampleLevel/1bf73e.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/textureSampleLevel/1bf73e.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/textureSampleLevel/302be4.wgsl b/test/tint/builtins/gen/literal/textureSampleLevel/302be4.wgsl
similarity index 97%
rename from test/tint/builtins/gen/textureSampleLevel/302be4.wgsl
rename to test/tint/builtins/gen/literal/textureSampleLevel/302be4.wgsl
index fb1df7c65d..a1eec71fdc 100644
--- a/test/tint/builtins/gen/textureSampleLevel/302be4.wgsl
+++ b/test/tint/builtins/gen/literal/textureSampleLevel/302be4.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/textureSampleLevel/302be4.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureSampleLevel/302be4.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/textureSampleLevel/302be4.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/textureSampleLevel/302be4.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/textureSampleLevel/302be4.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/textureSampleLevel/302be4.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/textureSampleLevel/302be4.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/textureSampleLevel/302be4.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/textureSampleLevel/302be4.wgsl.expected.msl b/test/tint/builtins/gen/literal/textureSampleLevel/302be4.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/textureSampleLevel/302be4.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/textureSampleLevel/302be4.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/textureSampleLevel/302be4.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureSampleLevel/302be4.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/textureSampleLevel/302be4.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/textureSampleLevel/302be4.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/textureSampleLevel/302be4.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/textureSampleLevel/302be4.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/textureSampleLevel/302be4.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/textureSampleLevel/302be4.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/textureSampleLevel/47daa4.wgsl b/test/tint/builtins/gen/literal/textureSampleLevel/47daa4.wgsl
similarity index 97%
rename from test/tint/builtins/gen/textureSampleLevel/47daa4.wgsl
rename to test/tint/builtins/gen/literal/textureSampleLevel/47daa4.wgsl
index b7d0ced426..80138d3211 100644
--- a/test/tint/builtins/gen/textureSampleLevel/47daa4.wgsl
+++ b/test/tint/builtins/gen/literal/textureSampleLevel/47daa4.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/textureSampleLevel/47daa4.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureSampleLevel/47daa4.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/textureSampleLevel/47daa4.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/textureSampleLevel/47daa4.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/textureSampleLevel/47daa4.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/textureSampleLevel/47daa4.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/textureSampleLevel/47daa4.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/textureSampleLevel/47daa4.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/textureSampleLevel/47daa4.wgsl.expected.msl b/test/tint/builtins/gen/literal/textureSampleLevel/47daa4.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/textureSampleLevel/47daa4.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/textureSampleLevel/47daa4.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/textureSampleLevel/47daa4.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureSampleLevel/47daa4.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/textureSampleLevel/47daa4.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/textureSampleLevel/47daa4.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/textureSampleLevel/47daa4.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/textureSampleLevel/47daa4.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/textureSampleLevel/47daa4.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/textureSampleLevel/47daa4.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/textureSampleLevel/690d95.wgsl b/test/tint/builtins/gen/literal/textureSampleLevel/690d95.wgsl
similarity index 97%
rename from test/tint/builtins/gen/textureSampleLevel/690d95.wgsl
rename to test/tint/builtins/gen/literal/textureSampleLevel/690d95.wgsl
index 4d3d865f62..eee0171efb 100644
--- a/test/tint/builtins/gen/textureSampleLevel/690d95.wgsl
+++ b/test/tint/builtins/gen/literal/textureSampleLevel/690d95.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/textureSampleLevel/690d95.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureSampleLevel/690d95.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/textureSampleLevel/690d95.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/textureSampleLevel/690d95.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/textureSampleLevel/690d95.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/textureSampleLevel/690d95.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/textureSampleLevel/690d95.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/textureSampleLevel/690d95.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/textureSampleLevel/690d95.wgsl.expected.msl b/test/tint/builtins/gen/literal/textureSampleLevel/690d95.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/textureSampleLevel/690d95.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/textureSampleLevel/690d95.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/textureSampleLevel/690d95.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureSampleLevel/690d95.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/textureSampleLevel/690d95.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/textureSampleLevel/690d95.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/textureSampleLevel/690d95.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/textureSampleLevel/690d95.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/textureSampleLevel/690d95.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/textureSampleLevel/690d95.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/textureSampleLevel/979816.wgsl b/test/tint/builtins/gen/literal/textureSampleLevel/979816.wgsl
similarity index 97%
rename from test/tint/builtins/gen/textureSampleLevel/979816.wgsl
rename to test/tint/builtins/gen/literal/textureSampleLevel/979816.wgsl
index 17345bb5d1..432061a674 100644
--- a/test/tint/builtins/gen/textureSampleLevel/979816.wgsl
+++ b/test/tint/builtins/gen/literal/textureSampleLevel/979816.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/literal/textureSampleLevel/979816.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureSampleLevel/979816.wgsl.expected.glsl
new file mode 100644
index 0000000000..f23800af51
--- /dev/null
+++ b/test/tint/builtins/gen/literal/textureSampleLevel/979816.wgsl.expected.glsl
@@ -0,0 +1,225 @@
+SKIP: FAILED
+
+#version 310 es
+
+struct GammaTransferParams {
+  float G;
+  float A;
+  float B;
+  float C;
+  float D;
+  float E;
+  float F;
+  uint padding;
+};
+
+struct ExternalTextureParams {
+  uint numPlanes;
+  mat3x4 yuvToRgbConversionMatrix;
+  GammaTransferParams gammaDecodeParams;
+  GammaTransferParams gammaEncodeParams;
+  mat3 gamutConversionMatrix;
+};
+
+layout(binding = 3) uniform ExternalTextureParams_1 {
+  uint numPlanes;
+  mat3x4 yuvToRgbConversionMatrix;
+  GammaTransferParams gammaDecodeParams;
+  GammaTransferParams gammaEncodeParams;
+  mat3 gamutConversionMatrix;
+} ext_tex_params;
+
+vec3 gammaCorrection(vec3 v, GammaTransferParams params) {
+  bvec3 cond = lessThan(abs(v), vec3(params.D));
+  vec3 t = (sign(v) * ((params.C * abs(v)) + params.F));
+  vec3 f = (sign(v) * (pow(((params.A * abs(v)) + params.B), vec3(params.G)) + params.E));
+  return mix(f, t, cond);
+}
+
+
+vec4 textureSampleExternal(highp sampler2D plane0_smp, highp sampler2D plane1_smp, vec2 coord, ExternalTextureParams params) {
+  vec3 color = vec3(0.0f, 0.0f, 0.0f);
+  if ((params.numPlanes == 1u)) {
+    color = textureLod(plane0_smp, coord, 0.0f).rgb;
+  } else {
+    color = (vec4(textureLod(plane0_smp, coord, 0.0f).r, textureLod(plane1_smp, coord, 0.0f).rg, 1.0f) * params.yuvToRgbConversionMatrix);
+  }
+  color = gammaCorrection(color, params.gammaDecodeParams);
+  color = (params.gamutConversionMatrix * color);
+  color = gammaCorrection(color, params.gammaEncodeParams);
+  return vec4(color, 1.0f);
+}
+
+uniform highp sampler2D arg_0_arg_1;
+uniform highp sampler2D ext_tex_plane_1_arg_1;
+void textureSampleLevel_979816() {
+  vec4 res = textureSampleExternal(arg_0_arg_1, ext_tex_plane_1_arg_1, vec2(0.0f), ext_tex_params);
+}
+
+vec4 vertex_main() {
+  textureSampleLevel_979816();
+  return vec4(0.0f);
+}
+
+void main() {
+  gl_PointSize = 1.0;
+  vec4 inner_result = vertex_main();
+  gl_Position = inner_result;
+  gl_Position.y = -(gl_Position.y);
+  gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
+  return;
+}
+Error parsing GLSL shader:
+ERROR: 0:54: 'textureSampleExternal' : no matching overloaded function found 
+ERROR: 0:54: '=' :  cannot convert from ' const float' to ' temp highp 4-component vector of float'
+ERROR: 0:54: '' : compilation terminated 
+ERROR: 3 compilation errors.  No code generated.
+
+
+
+#version 310 es
+precision mediump float;
+
+struct GammaTransferParams {
+  float G;
+  float A;
+  float B;
+  float C;
+  float D;
+  float E;
+  float F;
+  uint padding;
+};
+
+struct ExternalTextureParams {
+  uint numPlanes;
+  mat3x4 yuvToRgbConversionMatrix;
+  GammaTransferParams gammaDecodeParams;
+  GammaTransferParams gammaEncodeParams;
+  mat3 gamutConversionMatrix;
+};
+
+layout(binding = 3) uniform ExternalTextureParams_1 {
+  uint numPlanes;
+  mat3x4 yuvToRgbConversionMatrix;
+  GammaTransferParams gammaDecodeParams;
+  GammaTransferParams gammaEncodeParams;
+  mat3 gamutConversionMatrix;
+} ext_tex_params;
+
+vec3 gammaCorrection(vec3 v, GammaTransferParams params) {
+  bvec3 cond = lessThan(abs(v), vec3(params.D));
+  vec3 t = (sign(v) * ((params.C * abs(v)) + params.F));
+  vec3 f = (sign(v) * (pow(((params.A * abs(v)) + params.B), vec3(params.G)) + params.E));
+  return mix(f, t, cond);
+}
+
+
+vec4 textureSampleExternal(highp sampler2D plane0_smp, highp sampler2D plane1_smp, vec2 coord, ExternalTextureParams params) {
+  vec3 color = vec3(0.0f, 0.0f, 0.0f);
+  if ((params.numPlanes == 1u)) {
+    color = textureLod(plane0_smp, coord, 0.0f).rgb;
+  } else {
+    color = (vec4(textureLod(plane0_smp, coord, 0.0f).r, textureLod(plane1_smp, coord, 0.0f).rg, 1.0f) * params.yuvToRgbConversionMatrix);
+  }
+  color = gammaCorrection(color, params.gammaDecodeParams);
+  color = (params.gamutConversionMatrix * color);
+  color = gammaCorrection(color, params.gammaEncodeParams);
+  return vec4(color, 1.0f);
+}
+
+uniform highp sampler2D arg_0_arg_1;
+uniform highp sampler2D ext_tex_plane_1_arg_1;
+void textureSampleLevel_979816() {
+  vec4 res = textureSampleExternal(arg_0_arg_1, ext_tex_plane_1_arg_1, vec2(0.0f), ext_tex_params);
+}
+
+void fragment_main() {
+  textureSampleLevel_979816();
+}
+
+void main() {
+  fragment_main();
+  return;
+}
+Error parsing GLSL shader:
+ERROR: 0:55: 'textureSampleExternal' : no matching overloaded function found 
+ERROR: 0:55: '=' :  cannot convert from ' const float' to ' temp mediump 4-component vector of float'
+ERROR: 0:55: '' : compilation terminated 
+ERROR: 3 compilation errors.  No code generated.
+
+
+
+#version 310 es
+
+struct GammaTransferParams {
+  float G;
+  float A;
+  float B;
+  float C;
+  float D;
+  float E;
+  float F;
+  uint padding;
+};
+
+struct ExternalTextureParams {
+  uint numPlanes;
+  mat3x4 yuvToRgbConversionMatrix;
+  GammaTransferParams gammaDecodeParams;
+  GammaTransferParams gammaEncodeParams;
+  mat3 gamutConversionMatrix;
+};
+
+layout(binding = 3) uniform ExternalTextureParams_1 {
+  uint numPlanes;
+  mat3x4 yuvToRgbConversionMatrix;
+  GammaTransferParams gammaDecodeParams;
+  GammaTransferParams gammaEncodeParams;
+  mat3 gamutConversionMatrix;
+} ext_tex_params;
+
+vec3 gammaCorrection(vec3 v, GammaTransferParams params) {
+  bvec3 cond = lessThan(abs(v), vec3(params.D));
+  vec3 t = (sign(v) * ((params.C * abs(v)) + params.F));
+  vec3 f = (sign(v) * (pow(((params.A * abs(v)) + params.B), vec3(params.G)) + params.E));
+  return mix(f, t, cond);
+}
+
+
+vec4 textureSampleExternal(highp sampler2D plane0_smp, highp sampler2D plane1_smp, vec2 coord, ExternalTextureParams params) {
+  vec3 color = vec3(0.0f, 0.0f, 0.0f);
+  if ((params.numPlanes == 1u)) {
+    color = textureLod(plane0_smp, coord, 0.0f).rgb;
+  } else {
+    color = (vec4(textureLod(plane0_smp, coord, 0.0f).r, textureLod(plane1_smp, coord, 0.0f).rg, 1.0f) * params.yuvToRgbConversionMatrix);
+  }
+  color = gammaCorrection(color, params.gammaDecodeParams);
+  color = (params.gamutConversionMatrix * color);
+  color = gammaCorrection(color, params.gammaEncodeParams);
+  return vec4(color, 1.0f);
+}
+
+uniform highp sampler2D arg_0_arg_1;
+uniform highp sampler2D ext_tex_plane_1_arg_1;
+void textureSampleLevel_979816() {
+  vec4 res = textureSampleExternal(arg_0_arg_1, ext_tex_plane_1_arg_1, vec2(0.0f), ext_tex_params);
+}
+
+void compute_main() {
+  textureSampleLevel_979816();
+}
+
+layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
+void main() {
+  compute_main();
+  return;
+}
+Error parsing GLSL shader:
+ERROR: 0:54: 'textureSampleExternal' : no matching overloaded function found 
+ERROR: 0:54: '=' :  cannot convert from ' const float' to ' temp highp 4-component vector of float'
+ERROR: 0:54: '' : compilation terminated 
+ERROR: 3 compilation errors.  No code generated.
+
+
+
diff --git a/test/tint/builtins/gen/textureSampleLevel/979816.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/textureSampleLevel/979816.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/textureSampleLevel/979816.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/textureSampleLevel/979816.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/textureSampleLevel/979816.wgsl.expected.msl b/test/tint/builtins/gen/literal/textureSampleLevel/979816.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/textureSampleLevel/979816.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/textureSampleLevel/979816.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/textureSampleLevel/979816.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureSampleLevel/979816.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/textureSampleLevel/979816.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/textureSampleLevel/979816.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/textureSampleLevel/979816.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/textureSampleLevel/979816.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/textureSampleLevel/979816.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/textureSampleLevel/979816.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/textureSampleLevel/9bd37b.wgsl b/test/tint/builtins/gen/literal/textureSampleLevel/9bd37b.wgsl
similarity index 97%
rename from test/tint/builtins/gen/textureSampleLevel/9bd37b.wgsl
rename to test/tint/builtins/gen/literal/textureSampleLevel/9bd37b.wgsl
index 6620b3138b..a49142f143 100644
--- a/test/tint/builtins/gen/textureSampleLevel/9bd37b.wgsl
+++ b/test/tint/builtins/gen/literal/textureSampleLevel/9bd37b.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/textureSampleLevel/9bd37b.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureSampleLevel/9bd37b.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/textureSampleLevel/9bd37b.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/textureSampleLevel/9bd37b.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/textureSampleLevel/9bd37b.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/textureSampleLevel/9bd37b.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/textureSampleLevel/9bd37b.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/textureSampleLevel/9bd37b.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/textureSampleLevel/9bd37b.wgsl.expected.msl b/test/tint/builtins/gen/literal/textureSampleLevel/9bd37b.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/textureSampleLevel/9bd37b.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/textureSampleLevel/9bd37b.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/textureSampleLevel/9bd37b.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureSampleLevel/9bd37b.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/textureSampleLevel/9bd37b.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/textureSampleLevel/9bd37b.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/textureSampleLevel/9bd37b.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/textureSampleLevel/9bd37b.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/textureSampleLevel/9bd37b.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/textureSampleLevel/9bd37b.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/textureSampleLevel/a4af26.wgsl b/test/tint/builtins/gen/literal/textureSampleLevel/a4af26.wgsl
similarity index 97%
rename from test/tint/builtins/gen/textureSampleLevel/a4af26.wgsl
rename to test/tint/builtins/gen/literal/textureSampleLevel/a4af26.wgsl
index dc7ae8cc3e..fee26c2b02 100644
--- a/test/tint/builtins/gen/textureSampleLevel/a4af26.wgsl
+++ b/test/tint/builtins/gen/literal/textureSampleLevel/a4af26.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/textureSampleLevel/a4af26.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureSampleLevel/a4af26.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/textureSampleLevel/a4af26.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/textureSampleLevel/a4af26.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/textureSampleLevel/a4af26.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/textureSampleLevel/a4af26.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/textureSampleLevel/a4af26.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/textureSampleLevel/a4af26.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/textureSampleLevel/a4af26.wgsl.expected.msl b/test/tint/builtins/gen/literal/textureSampleLevel/a4af26.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/textureSampleLevel/a4af26.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/textureSampleLevel/a4af26.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/textureSampleLevel/a4af26.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureSampleLevel/a4af26.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/textureSampleLevel/a4af26.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/textureSampleLevel/a4af26.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/textureSampleLevel/a4af26.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/textureSampleLevel/a4af26.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/textureSampleLevel/a4af26.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/textureSampleLevel/a4af26.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/textureSampleLevel/abfcc0.wgsl b/test/tint/builtins/gen/literal/textureSampleLevel/abfcc0.wgsl
similarity index 97%
rename from test/tint/builtins/gen/textureSampleLevel/abfcc0.wgsl
rename to test/tint/builtins/gen/literal/textureSampleLevel/abfcc0.wgsl
index 1ee0d7a0f0..733ef7b334 100644
--- a/test/tint/builtins/gen/textureSampleLevel/abfcc0.wgsl
+++ b/test/tint/builtins/gen/literal/textureSampleLevel/abfcc0.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/textureSampleLevel/abfcc0.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureSampleLevel/abfcc0.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/textureSampleLevel/abfcc0.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/textureSampleLevel/abfcc0.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/textureSampleLevel/abfcc0.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/textureSampleLevel/abfcc0.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/textureSampleLevel/abfcc0.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/textureSampleLevel/abfcc0.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/textureSampleLevel/abfcc0.wgsl.expected.msl b/test/tint/builtins/gen/literal/textureSampleLevel/abfcc0.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/textureSampleLevel/abfcc0.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/textureSampleLevel/abfcc0.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/textureSampleLevel/abfcc0.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureSampleLevel/abfcc0.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/textureSampleLevel/abfcc0.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/textureSampleLevel/abfcc0.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/textureSampleLevel/abfcc0.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/textureSampleLevel/abfcc0.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/textureSampleLevel/abfcc0.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/textureSampleLevel/abfcc0.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/textureSampleLevel/ae5e39.wgsl b/test/tint/builtins/gen/literal/textureSampleLevel/ae5e39.wgsl
similarity index 97%
rename from test/tint/builtins/gen/textureSampleLevel/ae5e39.wgsl
rename to test/tint/builtins/gen/literal/textureSampleLevel/ae5e39.wgsl
index b5a132353b..ec0c39bc56 100644
--- a/test/tint/builtins/gen/textureSampleLevel/ae5e39.wgsl
+++ b/test/tint/builtins/gen/literal/textureSampleLevel/ae5e39.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/textureSampleLevel/ae5e39.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureSampleLevel/ae5e39.wgsl.expected.glsl
similarity index 97%
rename from test/tint/builtins/gen/textureSampleLevel/ae5e39.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/textureSampleLevel/ae5e39.wgsl.expected.glsl
index 93e68a6ffb..d619a9b8b2 100644
--- a/test/tint/builtins/gen/textureSampleLevel/ae5e39.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureSampleLevel/ae5e39.wgsl.expected.glsl
@@ -10,7 +10,7 @@ void textureSampleLevel_ae5e39() {
 
 vec4 vertex_main() {
   textureSampleLevel_ae5e39();
-  return vec4(0.0f, 0.0f, 0.0f, 0.0f);
+  return vec4(0.0f);
 }
 
 void main() {
diff --git a/test/tint/builtins/gen/textureSampleLevel/ae5e39.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/textureSampleLevel/ae5e39.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/textureSampleLevel/ae5e39.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/textureSampleLevel/ae5e39.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/textureSampleLevel/ae5e39.wgsl.expected.msl b/test/tint/builtins/gen/literal/textureSampleLevel/ae5e39.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/textureSampleLevel/ae5e39.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/textureSampleLevel/ae5e39.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/textureSampleLevel/ae5e39.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureSampleLevel/ae5e39.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/textureSampleLevel/ae5e39.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/textureSampleLevel/ae5e39.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/textureSampleLevel/ae5e39.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/textureSampleLevel/ae5e39.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/textureSampleLevel/ae5e39.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/textureSampleLevel/ae5e39.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/textureSampleLevel/ba93b3.wgsl b/test/tint/builtins/gen/literal/textureSampleLevel/ba93b3.wgsl
similarity index 97%
rename from test/tint/builtins/gen/textureSampleLevel/ba93b3.wgsl
rename to test/tint/builtins/gen/literal/textureSampleLevel/ba93b3.wgsl
index 6c4178e0fd..d7b2a68020 100644
--- a/test/tint/builtins/gen/textureSampleLevel/ba93b3.wgsl
+++ b/test/tint/builtins/gen/literal/textureSampleLevel/ba93b3.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/textureSampleLevel/ba93b3.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureSampleLevel/ba93b3.wgsl.expected.glsl
similarity index 91%
rename from test/tint/builtins/gen/textureSampleLevel/ba93b3.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/textureSampleLevel/ba93b3.wgsl.expected.glsl
index 2cc11f5bf0..033a46add8 100644
--- a/test/tint/builtins/gen/textureSampleLevel/ba93b3.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureSampleLevel/ba93b3.wgsl.expected.glsl
@@ -5,12 +5,12 @@ SKIP: FAILED
 uniform highp sampler2DArrayShadow arg_0_arg_1;
 
 void textureSampleLevel_ba93b3() {
-  float res = textureLodOffset(arg_0_arg_1, vec4(0.0f, 0.0f, float(1), 0.0f), float(0), ivec2(0, 0));
+  float res = textureLodOffset(arg_0_arg_1, vec4(0.0f, 0.0f, float(1), 0.0f), float(0), ivec2(0));
 }
 
 vec4 vertex_main() {
   textureSampleLevel_ba93b3();
-  return vec4(0.0f, 0.0f, 0.0f, 0.0f);
+  return vec4(0.0f);
 }
 
 void main() {
@@ -34,7 +34,7 @@ precision mediump float;
 uniform highp sampler2DArrayShadow arg_0_arg_1;
 
 void textureSampleLevel_ba93b3() {
-  float res = textureLodOffset(arg_0_arg_1, vec4(0.0f, 0.0f, float(1), 0.0f), float(0), ivec2(0, 0));
+  float res = textureLodOffset(arg_0_arg_1, vec4(0.0f, 0.0f, float(1), 0.0f), float(0), ivec2(0));
 }
 
 void fragment_main() {
@@ -57,7 +57,7 @@ ERROR: 2 compilation errors.  No code generated.
 uniform highp sampler2DArrayShadow arg_0_arg_1;
 
 void textureSampleLevel_ba93b3() {
-  float res = textureLodOffset(arg_0_arg_1, vec4(0.0f, 0.0f, float(1), 0.0f), float(0), ivec2(0, 0));
+  float res = textureLodOffset(arg_0_arg_1, vec4(0.0f, 0.0f, float(1), 0.0f), float(0), ivec2(0));
 }
 
 void compute_main() {
diff --git a/test/tint/builtins/gen/textureSampleLevel/ba93b3.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/textureSampleLevel/ba93b3.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/textureSampleLevel/ba93b3.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/textureSampleLevel/ba93b3.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/textureSampleLevel/ba93b3.wgsl.expected.msl b/test/tint/builtins/gen/literal/textureSampleLevel/ba93b3.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/textureSampleLevel/ba93b3.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/textureSampleLevel/ba93b3.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/textureSampleLevel/ba93b3.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureSampleLevel/ba93b3.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/textureSampleLevel/ba93b3.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/textureSampleLevel/ba93b3.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/textureSampleLevel/ba93b3.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/textureSampleLevel/ba93b3.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/textureSampleLevel/ba93b3.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/textureSampleLevel/ba93b3.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/textureSampleLevel/c32df7.wgsl b/test/tint/builtins/gen/literal/textureSampleLevel/c32df7.wgsl
similarity index 97%
rename from test/tint/builtins/gen/textureSampleLevel/c32df7.wgsl
rename to test/tint/builtins/gen/literal/textureSampleLevel/c32df7.wgsl
index 16ef52b815..4b0a19e3bc 100644
--- a/test/tint/builtins/gen/textureSampleLevel/c32df7.wgsl
+++ b/test/tint/builtins/gen/literal/textureSampleLevel/c32df7.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/textureSampleLevel/c32df7.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureSampleLevel/c32df7.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/textureSampleLevel/c32df7.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/textureSampleLevel/c32df7.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/textureSampleLevel/c32df7.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/textureSampleLevel/c32df7.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/textureSampleLevel/c32df7.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/textureSampleLevel/c32df7.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/textureSampleLevel/c32df7.wgsl.expected.msl b/test/tint/builtins/gen/literal/textureSampleLevel/c32df7.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/textureSampleLevel/c32df7.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/textureSampleLevel/c32df7.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/textureSampleLevel/c32df7.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureSampleLevel/c32df7.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/textureSampleLevel/c32df7.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/textureSampleLevel/c32df7.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/textureSampleLevel/c32df7.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/textureSampleLevel/c32df7.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/textureSampleLevel/c32df7.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/textureSampleLevel/c32df7.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/textureSampleLevel/c6aca6.wgsl b/test/tint/builtins/gen/literal/textureSampleLevel/c6aca6.wgsl
similarity index 97%
rename from test/tint/builtins/gen/textureSampleLevel/c6aca6.wgsl
rename to test/tint/builtins/gen/literal/textureSampleLevel/c6aca6.wgsl
index 8a5a47f024..c4cdb2d370 100644
--- a/test/tint/builtins/gen/textureSampleLevel/c6aca6.wgsl
+++ b/test/tint/builtins/gen/literal/textureSampleLevel/c6aca6.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/textureSampleLevel/c6aca6.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureSampleLevel/c6aca6.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/textureSampleLevel/c6aca6.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/textureSampleLevel/c6aca6.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/textureSampleLevel/c6aca6.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/textureSampleLevel/c6aca6.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/textureSampleLevel/c6aca6.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/textureSampleLevel/c6aca6.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/textureSampleLevel/c6aca6.wgsl.expected.msl b/test/tint/builtins/gen/literal/textureSampleLevel/c6aca6.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/textureSampleLevel/c6aca6.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/textureSampleLevel/c6aca6.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/textureSampleLevel/c6aca6.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureSampleLevel/c6aca6.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/textureSampleLevel/c6aca6.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/textureSampleLevel/c6aca6.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/textureSampleLevel/c6aca6.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/textureSampleLevel/c6aca6.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/textureSampleLevel/c6aca6.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/textureSampleLevel/c6aca6.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/textureStore/05ce15.wgsl b/test/tint/builtins/gen/literal/textureStore/05ce15.wgsl
similarity index 97%
rename from test/tint/builtins/gen/textureStore/05ce15.wgsl
rename to test/tint/builtins/gen/literal/textureStore/05ce15.wgsl
index 88fb6bd546..4677d18e90 100644
--- a/test/tint/builtins/gen/textureStore/05ce15.wgsl
+++ b/test/tint/builtins/gen/literal/textureStore/05ce15.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/textureStore/05ce15.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureStore/05ce15.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/textureStore/05ce15.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/textureStore/05ce15.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/textureStore/05ce15.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/textureStore/05ce15.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/textureStore/05ce15.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/textureStore/05ce15.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/textureStore/05ce15.wgsl.expected.msl b/test/tint/builtins/gen/literal/textureStore/05ce15.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/textureStore/05ce15.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/textureStore/05ce15.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/textureStore/05ce15.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureStore/05ce15.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/textureStore/05ce15.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/textureStore/05ce15.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/textureStore/05ce15.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/textureStore/05ce15.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/textureStore/05ce15.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/textureStore/05ce15.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/textureStore/064c7f.wgsl b/test/tint/builtins/gen/literal/textureStore/064c7f.wgsl
similarity index 97%
rename from test/tint/builtins/gen/textureStore/064c7f.wgsl
rename to test/tint/builtins/gen/literal/textureStore/064c7f.wgsl
index 411a952f13..e95908656f 100644
--- a/test/tint/builtins/gen/textureStore/064c7f.wgsl
+++ b/test/tint/builtins/gen/literal/textureStore/064c7f.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/textureStore/064c7f.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureStore/064c7f.wgsl.expected.glsl
similarity index 86%
rename from test/tint/builtins/gen/textureStore/064c7f.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/textureStore/064c7f.wgsl.expected.glsl
index 911c39435e..855df0f55e 100644
--- a/test/tint/builtins/gen/textureStore/064c7f.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureStore/064c7f.wgsl.expected.glsl
@@ -4,12 +4,12 @@ SKIP: FAILED
 
 layout(rg32f) uniform highp writeonly image2D arg_0;
 void textureStore_064c7f() {
-  imageStore(arg_0, ivec2(0, 0), vec4(0.0f, 0.0f, 0.0f, 0.0f));
+  imageStore(arg_0, ivec2(0), vec4(0.0f));
 }
 
 vec4 vertex_main() {
   textureStore_064c7f();
-  return vec4(0.0f, 0.0f, 0.0f, 0.0f);
+  return vec4(0.0f);
 }
 
 void main() {
@@ -32,7 +32,7 @@ precision mediump float;
 
 layout(rg32f) uniform highp writeonly image2D arg_0;
 void textureStore_064c7f() {
-  imageStore(arg_0, ivec2(0, 0), vec4(0.0f, 0.0f, 0.0f, 0.0f));
+  imageStore(arg_0, ivec2(0), vec4(0.0f));
 }
 
 void fragment_main() {
@@ -54,7 +54,7 @@ ERROR: 2 compilation errors.  No code generated.
 
 layout(rg32f) uniform highp writeonly image2D arg_0;
 void textureStore_064c7f() {
-  imageStore(arg_0, ivec2(0, 0), vec4(0.0f, 0.0f, 0.0f, 0.0f));
+  imageStore(arg_0, ivec2(0), vec4(0.0f));
 }
 
 void compute_main() {
diff --git a/test/tint/builtins/gen/textureStore/064c7f.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/textureStore/064c7f.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/textureStore/064c7f.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/textureStore/064c7f.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/textureStore/064c7f.wgsl.expected.msl b/test/tint/builtins/gen/literal/textureStore/064c7f.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/textureStore/064c7f.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/textureStore/064c7f.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/textureStore/064c7f.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureStore/064c7f.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/textureStore/064c7f.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/textureStore/064c7f.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/textureStore/064c7f.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/textureStore/064c7f.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/textureStore/064c7f.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/textureStore/064c7f.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/textureStore/068641.wgsl b/test/tint/builtins/gen/literal/textureStore/068641.wgsl
similarity index 97%
rename from test/tint/builtins/gen/textureStore/068641.wgsl
rename to test/tint/builtins/gen/literal/textureStore/068641.wgsl
index b8b50f4e9b..86edaac1b0 100644
--- a/test/tint/builtins/gen/textureStore/068641.wgsl
+++ b/test/tint/builtins/gen/literal/textureStore/068641.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/textureStore/068641.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureStore/068641.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/textureStore/068641.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/textureStore/068641.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/textureStore/068641.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/textureStore/068641.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/textureStore/068641.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/textureStore/068641.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/textureStore/068641.wgsl.expected.msl b/test/tint/builtins/gen/literal/textureStore/068641.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/textureStore/068641.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/textureStore/068641.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/textureStore/068641.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureStore/068641.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/textureStore/068641.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/textureStore/068641.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/textureStore/068641.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/textureStore/068641.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/textureStore/068641.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/textureStore/068641.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/textureStore/0af6b5.wgsl b/test/tint/builtins/gen/literal/textureStore/0af6b5.wgsl
similarity index 97%
rename from test/tint/builtins/gen/textureStore/0af6b5.wgsl
rename to test/tint/builtins/gen/literal/textureStore/0af6b5.wgsl
index d58fe96ca1..53f97f4f37 100644
--- a/test/tint/builtins/gen/textureStore/0af6b5.wgsl
+++ b/test/tint/builtins/gen/literal/textureStore/0af6b5.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/textureStore/0af6b5.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureStore/0af6b5.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/textureStore/0af6b5.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/textureStore/0af6b5.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/textureStore/0af6b5.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/textureStore/0af6b5.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/textureStore/0af6b5.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/textureStore/0af6b5.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/textureStore/0af6b5.wgsl.expected.msl b/test/tint/builtins/gen/literal/textureStore/0af6b5.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/textureStore/0af6b5.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/textureStore/0af6b5.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/textureStore/0af6b5.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureStore/0af6b5.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/textureStore/0af6b5.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/textureStore/0af6b5.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/textureStore/0af6b5.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/textureStore/0af6b5.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/textureStore/0af6b5.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/textureStore/0af6b5.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/textureStore/0c3dff.wgsl b/test/tint/builtins/gen/literal/textureStore/0c3dff.wgsl
similarity index 97%
rename from test/tint/builtins/gen/textureStore/0c3dff.wgsl
rename to test/tint/builtins/gen/literal/textureStore/0c3dff.wgsl
index 6320997251..f0100ffa2d 100644
--- a/test/tint/builtins/gen/textureStore/0c3dff.wgsl
+++ b/test/tint/builtins/gen/literal/textureStore/0c3dff.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/textureStore/0c3dff.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureStore/0c3dff.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/textureStore/0c3dff.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/textureStore/0c3dff.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/textureStore/0c3dff.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/textureStore/0c3dff.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/textureStore/0c3dff.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/textureStore/0c3dff.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/textureStore/0c3dff.wgsl.expected.msl b/test/tint/builtins/gen/literal/textureStore/0c3dff.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/textureStore/0c3dff.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/textureStore/0c3dff.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/textureStore/0c3dff.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureStore/0c3dff.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/textureStore/0c3dff.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/textureStore/0c3dff.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/textureStore/0c3dff.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/textureStore/0c3dff.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/textureStore/0c3dff.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/textureStore/0c3dff.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/textureStore/102722.wgsl b/test/tint/builtins/gen/literal/textureStore/102722.wgsl
similarity index 97%
rename from test/tint/builtins/gen/textureStore/102722.wgsl
rename to test/tint/builtins/gen/literal/textureStore/102722.wgsl
index 845511824c..4c9a7dc93e 100644
--- a/test/tint/builtins/gen/textureStore/102722.wgsl
+++ b/test/tint/builtins/gen/literal/textureStore/102722.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/textureStore/102722.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureStore/102722.wgsl.expected.glsl
similarity index 89%
rename from test/tint/builtins/gen/textureStore/102722.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/textureStore/102722.wgsl.expected.glsl
index cf61c8d405..0951b51ae2 100644
--- a/test/tint/builtins/gen/textureStore/102722.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureStore/102722.wgsl.expected.glsl
@@ -4,12 +4,12 @@ SKIP: FAILED
 
 layout(r32ui) uniform highp writeonly uimage1D arg_0;
 void textureStore_102722() {
-  imageStore(arg_0, 1, uvec4(0u, 0u, 0u, 0u));
+  imageStore(arg_0, 1, uvec4(0u));
 }
 
 vec4 vertex_main() {
   textureStore_102722();
-  return vec4(0.0f, 0.0f, 0.0f, 0.0f);
+  return vec4(0.0f);
 }
 
 void main() {
@@ -33,7 +33,7 @@ precision mediump float;
 
 layout(r32ui) uniform highp writeonly uimage1D arg_0;
 void textureStore_102722() {
-  imageStore(arg_0, 1, uvec4(0u, 0u, 0u, 0u));
+  imageStore(arg_0, 1, uvec4(0u));
 }
 
 void fragment_main() {
@@ -56,7 +56,7 @@ ERROR: 2 compilation errors.  No code generated.
 
 layout(r32ui) uniform highp writeonly uimage1D arg_0;
 void textureStore_102722() {
-  imageStore(arg_0, 1, uvec4(0u, 0u, 0u, 0u));
+  imageStore(arg_0, 1, uvec4(0u));
 }
 
 void compute_main() {
diff --git a/test/tint/builtins/gen/textureStore/102722.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/textureStore/102722.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/textureStore/102722.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/textureStore/102722.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/textureStore/102722.wgsl.expected.msl b/test/tint/builtins/gen/literal/textureStore/102722.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/textureStore/102722.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/textureStore/102722.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/textureStore/102722.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureStore/102722.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/textureStore/102722.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/textureStore/102722.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/textureStore/102722.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/textureStore/102722.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/textureStore/102722.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/textureStore/102722.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/textureStore/1bbd08.wgsl b/test/tint/builtins/gen/literal/textureStore/1bbd08.wgsl
similarity index 97%
rename from test/tint/builtins/gen/textureStore/1bbd08.wgsl
rename to test/tint/builtins/gen/literal/textureStore/1bbd08.wgsl
index 2537d612d9..b52633a4af 100644
--- a/test/tint/builtins/gen/textureStore/1bbd08.wgsl
+++ b/test/tint/builtins/gen/literal/textureStore/1bbd08.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/textureStore/1bbd08.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureStore/1bbd08.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/textureStore/1bbd08.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/textureStore/1bbd08.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/textureStore/1bbd08.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/textureStore/1bbd08.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/textureStore/1bbd08.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/textureStore/1bbd08.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/textureStore/1bbd08.wgsl.expected.msl b/test/tint/builtins/gen/literal/textureStore/1bbd08.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/textureStore/1bbd08.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/textureStore/1bbd08.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/textureStore/1bbd08.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureStore/1bbd08.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/textureStore/1bbd08.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/textureStore/1bbd08.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/textureStore/1bbd08.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/textureStore/1bbd08.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/textureStore/1bbd08.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/textureStore/1bbd08.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/textureStore/1c02e7.wgsl b/test/tint/builtins/gen/literal/textureStore/1c02e7.wgsl
similarity index 97%
rename from test/tint/builtins/gen/textureStore/1c02e7.wgsl
rename to test/tint/builtins/gen/literal/textureStore/1c02e7.wgsl
index c1dc4146e7..a91041c2dd 100644
--- a/test/tint/builtins/gen/textureStore/1c02e7.wgsl
+++ b/test/tint/builtins/gen/literal/textureStore/1c02e7.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/textureStore/1c02e7.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureStore/1c02e7.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/textureStore/1c02e7.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/textureStore/1c02e7.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/textureStore/1c02e7.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/textureStore/1c02e7.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/textureStore/1c02e7.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/textureStore/1c02e7.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/textureStore/1c02e7.wgsl.expected.msl b/test/tint/builtins/gen/literal/textureStore/1c02e7.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/textureStore/1c02e7.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/textureStore/1c02e7.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/textureStore/1c02e7.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureStore/1c02e7.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/textureStore/1c02e7.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/textureStore/1c02e7.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/textureStore/1c02e7.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/textureStore/1c02e7.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/textureStore/1c02e7.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/textureStore/1c02e7.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/textureStore/22d955.wgsl b/test/tint/builtins/gen/literal/textureStore/22d955.wgsl
similarity index 97%
rename from test/tint/builtins/gen/textureStore/22d955.wgsl
rename to test/tint/builtins/gen/literal/textureStore/22d955.wgsl
index fd3f3ce2fb..5e6f372253 100644
--- a/test/tint/builtins/gen/textureStore/22d955.wgsl
+++ b/test/tint/builtins/gen/literal/textureStore/22d955.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/textureStore/22d955.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureStore/22d955.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/textureStore/22d955.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/textureStore/22d955.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/textureStore/22d955.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/textureStore/22d955.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/textureStore/22d955.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/textureStore/22d955.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/textureStore/22d955.wgsl.expected.msl b/test/tint/builtins/gen/literal/textureStore/22d955.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/textureStore/22d955.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/textureStore/22d955.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/textureStore/22d955.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureStore/22d955.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/textureStore/22d955.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/textureStore/22d955.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/textureStore/22d955.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/textureStore/22d955.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/textureStore/22d955.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/textureStore/22d955.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/textureStore/26bf70.wgsl b/test/tint/builtins/gen/literal/textureStore/26bf70.wgsl
similarity index 97%
rename from test/tint/builtins/gen/textureStore/26bf70.wgsl
rename to test/tint/builtins/gen/literal/textureStore/26bf70.wgsl
index 1610dec258..8cb6f1e431 100644
--- a/test/tint/builtins/gen/textureStore/26bf70.wgsl
+++ b/test/tint/builtins/gen/literal/textureStore/26bf70.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/textureStore/26bf70.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureStore/26bf70.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/textureStore/26bf70.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/textureStore/26bf70.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/textureStore/26bf70.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/textureStore/26bf70.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/textureStore/26bf70.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/textureStore/26bf70.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/textureStore/26bf70.wgsl.expected.msl b/test/tint/builtins/gen/literal/textureStore/26bf70.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/textureStore/26bf70.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/textureStore/26bf70.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/textureStore/26bf70.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureStore/26bf70.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/textureStore/26bf70.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/textureStore/26bf70.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/textureStore/26bf70.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/textureStore/26bf70.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/textureStore/26bf70.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/textureStore/26bf70.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/textureStore/2796b4.wgsl b/test/tint/builtins/gen/literal/textureStore/2796b4.wgsl
similarity index 97%
rename from test/tint/builtins/gen/textureStore/2796b4.wgsl
rename to test/tint/builtins/gen/literal/textureStore/2796b4.wgsl
index f8376a714c..82ce365e16 100644
--- a/test/tint/builtins/gen/textureStore/2796b4.wgsl
+++ b/test/tint/builtins/gen/literal/textureStore/2796b4.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/textureStore/2796b4.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureStore/2796b4.wgsl.expected.glsl
similarity index 87%
rename from test/tint/builtins/gen/textureStore/2796b4.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/textureStore/2796b4.wgsl.expected.glsl
index 6a9ddd4195..7c2a380ada 100644
--- a/test/tint/builtins/gen/textureStore/2796b4.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureStore/2796b4.wgsl.expected.glsl
@@ -4,12 +4,12 @@ SKIP: FAILED
 
 layout(rg32i) uniform highp writeonly iimage3D arg_0;
 void textureStore_2796b4() {
-  imageStore(arg_0, ivec3(0, 0, 0), ivec4(0, 0, 0, 0));
+  imageStore(arg_0, ivec3(0), ivec4(0));
 }
 
 vec4 vertex_main() {
   textureStore_2796b4();
-  return vec4(0.0f, 0.0f, 0.0f, 0.0f);
+  return vec4(0.0f);
 }
 
 void main() {
@@ -32,7 +32,7 @@ precision mediump float;
 
 layout(rg32i) uniform highp writeonly iimage3D arg_0;
 void textureStore_2796b4() {
-  imageStore(arg_0, ivec3(0, 0, 0), ivec4(0, 0, 0, 0));
+  imageStore(arg_0, ivec3(0), ivec4(0));
 }
 
 void fragment_main() {
@@ -54,7 +54,7 @@ ERROR: 2 compilation errors.  No code generated.
 
 layout(rg32i) uniform highp writeonly iimage3D arg_0;
 void textureStore_2796b4() {
-  imageStore(arg_0, ivec3(0, 0, 0), ivec4(0, 0, 0, 0));
+  imageStore(arg_0, ivec3(0), ivec4(0));
 }
 
 void compute_main() {
diff --git a/test/tint/builtins/gen/textureStore/2796b4.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/textureStore/2796b4.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/textureStore/2796b4.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/textureStore/2796b4.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/textureStore/2796b4.wgsl.expected.msl b/test/tint/builtins/gen/literal/textureStore/2796b4.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/textureStore/2796b4.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/textureStore/2796b4.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/textureStore/2796b4.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureStore/2796b4.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/textureStore/2796b4.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/textureStore/2796b4.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/textureStore/2796b4.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/textureStore/2796b4.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/textureStore/2796b4.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/textureStore/2796b4.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/textureStore/2ac6c7.wgsl b/test/tint/builtins/gen/literal/textureStore/2ac6c7.wgsl
similarity index 97%
rename from test/tint/builtins/gen/textureStore/2ac6c7.wgsl
rename to test/tint/builtins/gen/literal/textureStore/2ac6c7.wgsl
index 030b84b39b..39eebf354a 100644
--- a/test/tint/builtins/gen/textureStore/2ac6c7.wgsl
+++ b/test/tint/builtins/gen/literal/textureStore/2ac6c7.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/textureStore/2ac6c7.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureStore/2ac6c7.wgsl.expected.glsl
similarity index 88%
rename from test/tint/builtins/gen/textureStore/2ac6c7.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/textureStore/2ac6c7.wgsl.expected.glsl
index 4ae2c8960c..f2680141cc 100644
--- a/test/tint/builtins/gen/textureStore/2ac6c7.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureStore/2ac6c7.wgsl.expected.glsl
@@ -4,12 +4,12 @@ SKIP: FAILED
 
 layout(r32f) uniform highp writeonly image1D arg_0;
 void textureStore_2ac6c7() {
-  imageStore(arg_0, 1, vec4(0.0f, 0.0f, 0.0f, 0.0f));
+  imageStore(arg_0, 1, vec4(0.0f));
 }
 
 vec4 vertex_main() {
   textureStore_2ac6c7();
-  return vec4(0.0f, 0.0f, 0.0f, 0.0f);
+  return vec4(0.0f);
 }
 
 void main() {
@@ -33,7 +33,7 @@ precision mediump float;
 
 layout(r32f) uniform highp writeonly image1D arg_0;
 void textureStore_2ac6c7() {
-  imageStore(arg_0, 1, vec4(0.0f, 0.0f, 0.0f, 0.0f));
+  imageStore(arg_0, 1, vec4(0.0f));
 }
 
 void fragment_main() {
@@ -56,7 +56,7 @@ ERROR: 2 compilation errors.  No code generated.
 
 layout(r32f) uniform highp writeonly image1D arg_0;
 void textureStore_2ac6c7() {
-  imageStore(arg_0, 1, vec4(0.0f, 0.0f, 0.0f, 0.0f));
+  imageStore(arg_0, 1, vec4(0.0f));
 }
 
 void compute_main() {
diff --git a/test/tint/builtins/gen/textureStore/2ac6c7.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/textureStore/2ac6c7.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/textureStore/2ac6c7.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/textureStore/2ac6c7.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/textureStore/2ac6c7.wgsl.expected.msl b/test/tint/builtins/gen/literal/textureStore/2ac6c7.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/textureStore/2ac6c7.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/textureStore/2ac6c7.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/textureStore/2ac6c7.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureStore/2ac6c7.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/textureStore/2ac6c7.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/textureStore/2ac6c7.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/textureStore/2ac6c7.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/textureStore/2ac6c7.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/textureStore/2ac6c7.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/textureStore/2ac6c7.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/textureStore/2eb2a4.wgsl b/test/tint/builtins/gen/literal/textureStore/2eb2a4.wgsl
similarity index 97%
rename from test/tint/builtins/gen/textureStore/2eb2a4.wgsl
rename to test/tint/builtins/gen/literal/textureStore/2eb2a4.wgsl
index 56d3c7377b..05df4c892f 100644
--- a/test/tint/builtins/gen/textureStore/2eb2a4.wgsl
+++ b/test/tint/builtins/gen/literal/textureStore/2eb2a4.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/textureStore/2eb2a4.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureStore/2eb2a4.wgsl.expected.glsl
similarity index 89%
rename from test/tint/builtins/gen/textureStore/2eb2a4.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/textureStore/2eb2a4.wgsl.expected.glsl
index fb385901a8..2564492430 100644
--- a/test/tint/builtins/gen/textureStore/2eb2a4.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureStore/2eb2a4.wgsl.expected.glsl
@@ -4,12 +4,12 @@ SKIP: FAILED
 
 layout(rgba16ui) uniform highp writeonly uimage1D arg_0;
 void textureStore_2eb2a4() {
-  imageStore(arg_0, 1, uvec4(0u, 0u, 0u, 0u));
+  imageStore(arg_0, 1, uvec4(0u));
 }
 
 vec4 vertex_main() {
   textureStore_2eb2a4();
-  return vec4(0.0f, 0.0f, 0.0f, 0.0f);
+  return vec4(0.0f);
 }
 
 void main() {
@@ -33,7 +33,7 @@ precision mediump float;
 
 layout(rgba16ui) uniform highp writeonly uimage1D arg_0;
 void textureStore_2eb2a4() {
-  imageStore(arg_0, 1, uvec4(0u, 0u, 0u, 0u));
+  imageStore(arg_0, 1, uvec4(0u));
 }
 
 void fragment_main() {
@@ -56,7 +56,7 @@ ERROR: 2 compilation errors.  No code generated.
 
 layout(rgba16ui) uniform highp writeonly uimage1D arg_0;
 void textureStore_2eb2a4() {
-  imageStore(arg_0, 1, uvec4(0u, 0u, 0u, 0u));
+  imageStore(arg_0, 1, uvec4(0u));
 }
 
 void compute_main() {
diff --git a/test/tint/builtins/gen/textureStore/2eb2a4.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/textureStore/2eb2a4.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/textureStore/2eb2a4.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/textureStore/2eb2a4.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/textureStore/2eb2a4.wgsl.expected.msl b/test/tint/builtins/gen/literal/textureStore/2eb2a4.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/textureStore/2eb2a4.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/textureStore/2eb2a4.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/textureStore/2eb2a4.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureStore/2eb2a4.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/textureStore/2eb2a4.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/textureStore/2eb2a4.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/textureStore/2eb2a4.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/textureStore/2eb2a4.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/textureStore/2eb2a4.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/textureStore/2eb2a4.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/textureStore/2ed2a3.wgsl b/test/tint/builtins/gen/literal/textureStore/2ed2a3.wgsl
similarity index 97%
rename from test/tint/builtins/gen/textureStore/2ed2a3.wgsl
rename to test/tint/builtins/gen/literal/textureStore/2ed2a3.wgsl
index f86ec1f322..9520984af6 100644
--- a/test/tint/builtins/gen/textureStore/2ed2a3.wgsl
+++ b/test/tint/builtins/gen/literal/textureStore/2ed2a3.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/textureStore/2ed2a3.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureStore/2ed2a3.wgsl.expected.glsl
similarity index 88%
rename from test/tint/builtins/gen/textureStore/2ed2a3.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/textureStore/2ed2a3.wgsl.expected.glsl
index a6aa8e7af0..2500adfc3b 100644
--- a/test/tint/builtins/gen/textureStore/2ed2a3.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureStore/2ed2a3.wgsl.expected.glsl
@@ -4,12 +4,12 @@ SKIP: FAILED
 
 layout(rgba8_snorm) uniform highp writeonly image1D arg_0;
 void textureStore_2ed2a3() {
-  imageStore(arg_0, 1, vec4(0.0f, 0.0f, 0.0f, 0.0f));
+  imageStore(arg_0, 1, vec4(0.0f));
 }
 
 vec4 vertex_main() {
   textureStore_2ed2a3();
-  return vec4(0.0f, 0.0f, 0.0f, 0.0f);
+  return vec4(0.0f);
 }
 
 void main() {
@@ -33,7 +33,7 @@ precision mediump float;
 
 layout(rgba8_snorm) uniform highp writeonly image1D arg_0;
 void textureStore_2ed2a3() {
-  imageStore(arg_0, 1, vec4(0.0f, 0.0f, 0.0f, 0.0f));
+  imageStore(arg_0, 1, vec4(0.0f));
 }
 
 void fragment_main() {
@@ -56,7 +56,7 @@ ERROR: 2 compilation errors.  No code generated.
 
 layout(rgba8_snorm) uniform highp writeonly image1D arg_0;
 void textureStore_2ed2a3() {
-  imageStore(arg_0, 1, vec4(0.0f, 0.0f, 0.0f, 0.0f));
+  imageStore(arg_0, 1, vec4(0.0f));
 }
 
 void compute_main() {
diff --git a/test/tint/builtins/gen/textureStore/2ed2a3.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/textureStore/2ed2a3.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/textureStore/2ed2a3.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/textureStore/2ed2a3.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/textureStore/2ed2a3.wgsl.expected.msl b/test/tint/builtins/gen/literal/textureStore/2ed2a3.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/textureStore/2ed2a3.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/textureStore/2ed2a3.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/textureStore/2ed2a3.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureStore/2ed2a3.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/textureStore/2ed2a3.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/textureStore/2ed2a3.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/textureStore/2ed2a3.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/textureStore/2ed2a3.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/textureStore/2ed2a3.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/textureStore/2ed2a3.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/textureStore/31745b.wgsl b/test/tint/builtins/gen/literal/textureStore/31745b.wgsl
similarity index 97%
rename from test/tint/builtins/gen/textureStore/31745b.wgsl
rename to test/tint/builtins/gen/literal/textureStore/31745b.wgsl
index 41125fed20..f26b550b83 100644
--- a/test/tint/builtins/gen/textureStore/31745b.wgsl
+++ b/test/tint/builtins/gen/literal/textureStore/31745b.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/textureStore/31745b.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureStore/31745b.wgsl.expected.glsl
similarity index 87%
rename from test/tint/builtins/gen/textureStore/31745b.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/textureStore/31745b.wgsl.expected.glsl
index 58f502feae..a475f2221c 100644
--- a/test/tint/builtins/gen/textureStore/31745b.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureStore/31745b.wgsl.expected.glsl
@@ -4,12 +4,12 @@ SKIP: FAILED
 
 layout(rg32i) uniform highp writeonly iimage2D arg_0;
 void textureStore_31745b() {
-  imageStore(arg_0, ivec2(0, 0), ivec4(0, 0, 0, 0));
+  imageStore(arg_0, ivec2(0), ivec4(0));
 }
 
 vec4 vertex_main() {
   textureStore_31745b();
-  return vec4(0.0f, 0.0f, 0.0f, 0.0f);
+  return vec4(0.0f);
 }
 
 void main() {
@@ -32,7 +32,7 @@ precision mediump float;
 
 layout(rg32i) uniform highp writeonly iimage2D arg_0;
 void textureStore_31745b() {
-  imageStore(arg_0, ivec2(0, 0), ivec4(0, 0, 0, 0));
+  imageStore(arg_0, ivec2(0), ivec4(0));
 }
 
 void fragment_main() {
@@ -54,7 +54,7 @@ ERROR: 2 compilation errors.  No code generated.
 
 layout(rg32i) uniform highp writeonly iimage2D arg_0;
 void textureStore_31745b() {
-  imageStore(arg_0, ivec2(0, 0), ivec4(0, 0, 0, 0));
+  imageStore(arg_0, ivec2(0), ivec4(0));
 }
 
 void compute_main() {
diff --git a/test/tint/builtins/gen/textureStore/31745b.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/textureStore/31745b.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/textureStore/31745b.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/textureStore/31745b.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/textureStore/31745b.wgsl.expected.msl b/test/tint/builtins/gen/literal/textureStore/31745b.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/textureStore/31745b.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/textureStore/31745b.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/textureStore/31745b.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureStore/31745b.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/textureStore/31745b.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/textureStore/31745b.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/textureStore/31745b.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/textureStore/31745b.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/textureStore/31745b.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/textureStore/31745b.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/textureStore/32f368.wgsl b/test/tint/builtins/gen/literal/textureStore/32f368.wgsl
similarity index 97%
rename from test/tint/builtins/gen/textureStore/32f368.wgsl
rename to test/tint/builtins/gen/literal/textureStore/32f368.wgsl
index 5b2aa6bf87..33b9e042a2 100644
--- a/test/tint/builtins/gen/textureStore/32f368.wgsl
+++ b/test/tint/builtins/gen/literal/textureStore/32f368.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/textureStore/32f368.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureStore/32f368.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/textureStore/32f368.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/textureStore/32f368.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/textureStore/32f368.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/textureStore/32f368.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/textureStore/32f368.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/textureStore/32f368.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/textureStore/32f368.wgsl.expected.msl b/test/tint/builtins/gen/literal/textureStore/32f368.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/textureStore/32f368.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/textureStore/32f368.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/textureStore/32f368.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureStore/32f368.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/textureStore/32f368.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/textureStore/32f368.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/textureStore/32f368.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/textureStore/32f368.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/textureStore/32f368.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/textureStore/32f368.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/textureStore/331aee.wgsl b/test/tint/builtins/gen/literal/textureStore/331aee.wgsl
similarity index 97%
rename from test/tint/builtins/gen/textureStore/331aee.wgsl
rename to test/tint/builtins/gen/literal/textureStore/331aee.wgsl
index 115b0b0211..1099995659 100644
--- a/test/tint/builtins/gen/textureStore/331aee.wgsl
+++ b/test/tint/builtins/gen/literal/textureStore/331aee.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/textureStore/331aee.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureStore/331aee.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/textureStore/331aee.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/textureStore/331aee.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/textureStore/331aee.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/textureStore/331aee.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/textureStore/331aee.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/textureStore/331aee.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/textureStore/331aee.wgsl.expected.msl b/test/tint/builtins/gen/literal/textureStore/331aee.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/textureStore/331aee.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/textureStore/331aee.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/textureStore/331aee.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureStore/331aee.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/textureStore/331aee.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/textureStore/331aee.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/textureStore/331aee.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/textureStore/331aee.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/textureStore/331aee.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/textureStore/331aee.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/textureStore/38e8d7.wgsl b/test/tint/builtins/gen/literal/textureStore/38e8d7.wgsl
similarity index 97%
rename from test/tint/builtins/gen/textureStore/38e8d7.wgsl
rename to test/tint/builtins/gen/literal/textureStore/38e8d7.wgsl
index e8fc960497..68b8504fc8 100644
--- a/test/tint/builtins/gen/textureStore/38e8d7.wgsl
+++ b/test/tint/builtins/gen/literal/textureStore/38e8d7.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/textureStore/38e8d7.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureStore/38e8d7.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/textureStore/38e8d7.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/textureStore/38e8d7.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/textureStore/38e8d7.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/textureStore/38e8d7.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/textureStore/38e8d7.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/textureStore/38e8d7.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/textureStore/38e8d7.wgsl.expected.msl b/test/tint/builtins/gen/literal/textureStore/38e8d7.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/textureStore/38e8d7.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/textureStore/38e8d7.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/textureStore/38e8d7.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureStore/38e8d7.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/textureStore/38e8d7.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/textureStore/38e8d7.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/textureStore/38e8d7.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/textureStore/38e8d7.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/textureStore/38e8d7.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/textureStore/38e8d7.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/textureStore/3a52ac.wgsl b/test/tint/builtins/gen/literal/textureStore/3a52ac.wgsl
similarity index 97%
rename from test/tint/builtins/gen/textureStore/3a52ac.wgsl
rename to test/tint/builtins/gen/literal/textureStore/3a52ac.wgsl
index c129d6704e..bce15d4a93 100644
--- a/test/tint/builtins/gen/textureStore/3a52ac.wgsl
+++ b/test/tint/builtins/gen/literal/textureStore/3a52ac.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/textureStore/3a52ac.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureStore/3a52ac.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/textureStore/3a52ac.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/textureStore/3a52ac.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/textureStore/3a52ac.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/textureStore/3a52ac.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/textureStore/3a52ac.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/textureStore/3a52ac.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/textureStore/3a52ac.wgsl.expected.msl b/test/tint/builtins/gen/literal/textureStore/3a52ac.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/textureStore/3a52ac.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/textureStore/3a52ac.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/textureStore/3a52ac.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureStore/3a52ac.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/textureStore/3a52ac.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/textureStore/3a52ac.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/textureStore/3a52ac.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/textureStore/3a52ac.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/textureStore/3a52ac.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/textureStore/3a52ac.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/textureStore/3bb7a1.wgsl b/test/tint/builtins/gen/literal/textureStore/3bb7a1.wgsl
similarity index 97%
rename from test/tint/builtins/gen/textureStore/3bb7a1.wgsl
rename to test/tint/builtins/gen/literal/textureStore/3bb7a1.wgsl
index d1cc97c88f..973de1ba02 100644
--- a/test/tint/builtins/gen/textureStore/3bb7a1.wgsl
+++ b/test/tint/builtins/gen/literal/textureStore/3bb7a1.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/textureStore/3bb7a1.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureStore/3bb7a1.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/textureStore/3bb7a1.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/textureStore/3bb7a1.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/textureStore/3bb7a1.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/textureStore/3bb7a1.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/textureStore/3bb7a1.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/textureStore/3bb7a1.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/textureStore/3bb7a1.wgsl.expected.msl b/test/tint/builtins/gen/literal/textureStore/3bb7a1.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/textureStore/3bb7a1.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/textureStore/3bb7a1.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/textureStore/3bb7a1.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureStore/3bb7a1.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/textureStore/3bb7a1.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/textureStore/3bb7a1.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/textureStore/3bb7a1.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/textureStore/3bb7a1.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/textureStore/3bb7a1.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/textureStore/3bb7a1.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/textureStore/3bec15.wgsl b/test/tint/builtins/gen/literal/textureStore/3bec15.wgsl
similarity index 97%
rename from test/tint/builtins/gen/textureStore/3bec15.wgsl
rename to test/tint/builtins/gen/literal/textureStore/3bec15.wgsl
index 6c2e068a9e..1c7fe6a038 100644
--- a/test/tint/builtins/gen/textureStore/3bec15.wgsl
+++ b/test/tint/builtins/gen/literal/textureStore/3bec15.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/textureStore/3bec15.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureStore/3bec15.wgsl.expected.glsl
similarity index 89%
rename from test/tint/builtins/gen/textureStore/3bec15.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/textureStore/3bec15.wgsl.expected.glsl
index dc8afb237f..8f0f990785 100644
--- a/test/tint/builtins/gen/textureStore/3bec15.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureStore/3bec15.wgsl.expected.glsl
@@ -4,12 +4,12 @@ SKIP: FAILED
 
 layout(rgba8ui) uniform highp writeonly uimage1D arg_0;
 void textureStore_3bec15() {
-  imageStore(arg_0, 1, uvec4(0u, 0u, 0u, 0u));
+  imageStore(arg_0, 1, uvec4(0u));
 }
 
 vec4 vertex_main() {
   textureStore_3bec15();
-  return vec4(0.0f, 0.0f, 0.0f, 0.0f);
+  return vec4(0.0f);
 }
 
 void main() {
@@ -33,7 +33,7 @@ precision mediump float;
 
 layout(rgba8ui) uniform highp writeonly uimage1D arg_0;
 void textureStore_3bec15() {
-  imageStore(arg_0, 1, uvec4(0u, 0u, 0u, 0u));
+  imageStore(arg_0, 1, uvec4(0u));
 }
 
 void fragment_main() {
@@ -56,7 +56,7 @@ ERROR: 2 compilation errors.  No code generated.
 
 layout(rgba8ui) uniform highp writeonly uimage1D arg_0;
 void textureStore_3bec15() {
-  imageStore(arg_0, 1, uvec4(0u, 0u, 0u, 0u));
+  imageStore(arg_0, 1, uvec4(0u));
 }
 
 void compute_main() {
diff --git a/test/tint/builtins/gen/textureStore/3bec15.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/textureStore/3bec15.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/textureStore/3bec15.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/textureStore/3bec15.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/textureStore/3bec15.wgsl.expected.msl b/test/tint/builtins/gen/literal/textureStore/3bec15.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/textureStore/3bec15.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/textureStore/3bec15.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/textureStore/3bec15.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureStore/3bec15.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/textureStore/3bec15.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/textureStore/3bec15.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/textureStore/3bec15.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/textureStore/3bec15.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/textureStore/3bec15.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/textureStore/3bec15.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/textureStore/441ba8.wgsl b/test/tint/builtins/gen/literal/textureStore/441ba8.wgsl
similarity index 97%
rename from test/tint/builtins/gen/textureStore/441ba8.wgsl
rename to test/tint/builtins/gen/literal/textureStore/441ba8.wgsl
index 4082003f96..9669e513d1 100644
--- a/test/tint/builtins/gen/textureStore/441ba8.wgsl
+++ b/test/tint/builtins/gen/literal/textureStore/441ba8.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/textureStore/441ba8.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureStore/441ba8.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/textureStore/441ba8.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/textureStore/441ba8.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/textureStore/441ba8.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/textureStore/441ba8.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/textureStore/441ba8.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/textureStore/441ba8.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/textureStore/441ba8.wgsl.expected.msl b/test/tint/builtins/gen/literal/textureStore/441ba8.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/textureStore/441ba8.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/textureStore/441ba8.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/textureStore/441ba8.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureStore/441ba8.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/textureStore/441ba8.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/textureStore/441ba8.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/textureStore/441ba8.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/textureStore/441ba8.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/textureStore/441ba8.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/textureStore/441ba8.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/textureStore/4fc057.wgsl b/test/tint/builtins/gen/literal/textureStore/4fc057.wgsl
similarity index 97%
rename from test/tint/builtins/gen/textureStore/4fc057.wgsl
rename to test/tint/builtins/gen/literal/textureStore/4fc057.wgsl
index c95a1cfad3..23c58490c9 100644
--- a/test/tint/builtins/gen/textureStore/4fc057.wgsl
+++ b/test/tint/builtins/gen/literal/textureStore/4fc057.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/textureStore/4fc057.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureStore/4fc057.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/textureStore/4fc057.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/textureStore/4fc057.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/textureStore/4fc057.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/textureStore/4fc057.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/textureStore/4fc057.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/textureStore/4fc057.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/textureStore/4fc057.wgsl.expected.msl b/test/tint/builtins/gen/literal/textureStore/4fc057.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/textureStore/4fc057.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/textureStore/4fc057.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/textureStore/4fc057.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureStore/4fc057.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/textureStore/4fc057.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/textureStore/4fc057.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/textureStore/4fc057.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/textureStore/4fc057.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/textureStore/4fc057.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/textureStore/4fc057.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/textureStore/5a2f8f.wgsl b/test/tint/builtins/gen/literal/textureStore/5a2f8f.wgsl
similarity index 97%
rename from test/tint/builtins/gen/textureStore/5a2f8f.wgsl
rename to test/tint/builtins/gen/literal/textureStore/5a2f8f.wgsl
index 6d800c9dde..f0ceb8f192 100644
--- a/test/tint/builtins/gen/textureStore/5a2f8f.wgsl
+++ b/test/tint/builtins/gen/literal/textureStore/5a2f8f.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/textureStore/5a2f8f.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureStore/5a2f8f.wgsl.expected.glsl
similarity index 90%
rename from test/tint/builtins/gen/textureStore/5a2f8f.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/textureStore/5a2f8f.wgsl.expected.glsl
index d94204def8..188004640a 100644
--- a/test/tint/builtins/gen/textureStore/5a2f8f.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureStore/5a2f8f.wgsl.expected.glsl
@@ -4,12 +4,12 @@ SKIP: FAILED
 
 layout(rgba16i) uniform highp writeonly iimage1D arg_0;
 void textureStore_5a2f8f() {
-  imageStore(arg_0, 1, ivec4(0, 0, 0, 0));
+  imageStore(arg_0, 1, ivec4(0));
 }
 
 vec4 vertex_main() {
   textureStore_5a2f8f();
-  return vec4(0.0f, 0.0f, 0.0f, 0.0f);
+  return vec4(0.0f);
 }
 
 void main() {
@@ -33,7 +33,7 @@ precision mediump float;
 
 layout(rgba16i) uniform highp writeonly iimage1D arg_0;
 void textureStore_5a2f8f() {
-  imageStore(arg_0, 1, ivec4(0, 0, 0, 0));
+  imageStore(arg_0, 1, ivec4(0));
 }
 
 void fragment_main() {
@@ -56,7 +56,7 @@ ERROR: 2 compilation errors.  No code generated.
 
 layout(rgba16i) uniform highp writeonly iimage1D arg_0;
 void textureStore_5a2f8f() {
-  imageStore(arg_0, 1, ivec4(0, 0, 0, 0));
+  imageStore(arg_0, 1, ivec4(0));
 }
 
 void compute_main() {
diff --git a/test/tint/builtins/gen/textureStore/5a2f8f.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/textureStore/5a2f8f.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/textureStore/5a2f8f.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/textureStore/5a2f8f.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/textureStore/5a2f8f.wgsl.expected.msl b/test/tint/builtins/gen/literal/textureStore/5a2f8f.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/textureStore/5a2f8f.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/textureStore/5a2f8f.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/textureStore/5a2f8f.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureStore/5a2f8f.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/textureStore/5a2f8f.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/textureStore/5a2f8f.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/textureStore/5a2f8f.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/textureStore/5a2f8f.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/textureStore/5a2f8f.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/textureStore/5a2f8f.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/textureStore/60975f.wgsl b/test/tint/builtins/gen/literal/textureStore/60975f.wgsl
similarity index 97%
rename from test/tint/builtins/gen/textureStore/60975f.wgsl
rename to test/tint/builtins/gen/literal/textureStore/60975f.wgsl
index 6ec404516a..8ad1e46092 100644
--- a/test/tint/builtins/gen/textureStore/60975f.wgsl
+++ b/test/tint/builtins/gen/literal/textureStore/60975f.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/textureStore/60975f.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureStore/60975f.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/textureStore/60975f.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/textureStore/60975f.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/textureStore/60975f.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/textureStore/60975f.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/textureStore/60975f.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/textureStore/60975f.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/textureStore/60975f.wgsl.expected.msl b/test/tint/builtins/gen/literal/textureStore/60975f.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/textureStore/60975f.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/textureStore/60975f.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/textureStore/60975f.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureStore/60975f.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/textureStore/60975f.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/textureStore/60975f.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/textureStore/60975f.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/textureStore/60975f.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/textureStore/60975f.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/textureStore/60975f.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/textureStore/682fd6.wgsl b/test/tint/builtins/gen/literal/textureStore/682fd6.wgsl
similarity index 97%
rename from test/tint/builtins/gen/textureStore/682fd6.wgsl
rename to test/tint/builtins/gen/literal/textureStore/682fd6.wgsl
index 789c05161f..fefa207151 100644
--- a/test/tint/builtins/gen/textureStore/682fd6.wgsl
+++ b/test/tint/builtins/gen/literal/textureStore/682fd6.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/textureStore/682fd6.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureStore/682fd6.wgsl.expected.glsl
similarity index 87%
rename from test/tint/builtins/gen/textureStore/682fd6.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/textureStore/682fd6.wgsl.expected.glsl
index 4b5e6391c0..8b99c50a31 100644
--- a/test/tint/builtins/gen/textureStore/682fd6.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureStore/682fd6.wgsl.expected.glsl
@@ -4,12 +4,12 @@ SKIP: FAILED
 
 layout(rg32ui) uniform highp writeonly uimage2D arg_0;
 void textureStore_682fd6() {
-  imageStore(arg_0, ivec2(0, 0), uvec4(0u, 0u, 0u, 0u));
+  imageStore(arg_0, ivec2(0), uvec4(0u));
 }
 
 vec4 vertex_main() {
   textureStore_682fd6();
-  return vec4(0.0f, 0.0f, 0.0f, 0.0f);
+  return vec4(0.0f);
 }
 
 void main() {
@@ -32,7 +32,7 @@ precision mediump float;
 
 layout(rg32ui) uniform highp writeonly uimage2D arg_0;
 void textureStore_682fd6() {
-  imageStore(arg_0, ivec2(0, 0), uvec4(0u, 0u, 0u, 0u));
+  imageStore(arg_0, ivec2(0), uvec4(0u));
 }
 
 void fragment_main() {
@@ -54,7 +54,7 @@ ERROR: 2 compilation errors.  No code generated.
 
 layout(rg32ui) uniform highp writeonly uimage2D arg_0;
 void textureStore_682fd6() {
-  imageStore(arg_0, ivec2(0, 0), uvec4(0u, 0u, 0u, 0u));
+  imageStore(arg_0, ivec2(0), uvec4(0u));
 }
 
 void compute_main() {
diff --git a/test/tint/builtins/gen/textureStore/682fd6.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/textureStore/682fd6.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/textureStore/682fd6.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/textureStore/682fd6.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/textureStore/682fd6.wgsl.expected.msl b/test/tint/builtins/gen/literal/textureStore/682fd6.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/textureStore/682fd6.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/textureStore/682fd6.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/textureStore/682fd6.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureStore/682fd6.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/textureStore/682fd6.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/textureStore/682fd6.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/textureStore/682fd6.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/textureStore/682fd6.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/textureStore/682fd6.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/textureStore/682fd6.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/textureStore/6b75c3.wgsl b/test/tint/builtins/gen/literal/textureStore/6b75c3.wgsl
similarity index 97%
rename from test/tint/builtins/gen/textureStore/6b75c3.wgsl
rename to test/tint/builtins/gen/literal/textureStore/6b75c3.wgsl
index b6b95b641b..ebceb5517e 100644
--- a/test/tint/builtins/gen/textureStore/6b75c3.wgsl
+++ b/test/tint/builtins/gen/literal/textureStore/6b75c3.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/textureStore/6b75c3.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureStore/6b75c3.wgsl.expected.glsl
similarity index 88%
rename from test/tint/builtins/gen/textureStore/6b75c3.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/textureStore/6b75c3.wgsl.expected.glsl
index 1a9dd67548..8d8e53ffea 100644
--- a/test/tint/builtins/gen/textureStore/6b75c3.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureStore/6b75c3.wgsl.expected.glsl
@@ -4,12 +4,12 @@ SKIP: FAILED
 
 layout(rgba32f) uniform highp writeonly image1D arg_0;
 void textureStore_6b75c3() {
-  imageStore(arg_0, 1, vec4(0.0f, 0.0f, 0.0f, 0.0f));
+  imageStore(arg_0, 1, vec4(0.0f));
 }
 
 vec4 vertex_main() {
   textureStore_6b75c3();
-  return vec4(0.0f, 0.0f, 0.0f, 0.0f);
+  return vec4(0.0f);
 }
 
 void main() {
@@ -33,7 +33,7 @@ precision mediump float;
 
 layout(rgba32f) uniform highp writeonly image1D arg_0;
 void textureStore_6b75c3() {
-  imageStore(arg_0, 1, vec4(0.0f, 0.0f, 0.0f, 0.0f));
+  imageStore(arg_0, 1, vec4(0.0f));
 }
 
 void fragment_main() {
@@ -56,7 +56,7 @@ ERROR: 2 compilation errors.  No code generated.
 
 layout(rgba32f) uniform highp writeonly image1D arg_0;
 void textureStore_6b75c3() {
-  imageStore(arg_0, 1, vec4(0.0f, 0.0f, 0.0f, 0.0f));
+  imageStore(arg_0, 1, vec4(0.0f));
 }
 
 void compute_main() {
diff --git a/test/tint/builtins/gen/textureStore/6b75c3.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/textureStore/6b75c3.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/textureStore/6b75c3.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/textureStore/6b75c3.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/textureStore/6b75c3.wgsl.expected.msl b/test/tint/builtins/gen/literal/textureStore/6b75c3.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/textureStore/6b75c3.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/textureStore/6b75c3.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/textureStore/6b75c3.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureStore/6b75c3.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/textureStore/6b75c3.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/textureStore/6b75c3.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/textureStore/6b75c3.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/textureStore/6b75c3.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/textureStore/6b75c3.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/textureStore/6b75c3.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/textureStore/6b80d2.wgsl b/test/tint/builtins/gen/literal/textureStore/6b80d2.wgsl
similarity index 97%
rename from test/tint/builtins/gen/textureStore/6b80d2.wgsl
rename to test/tint/builtins/gen/literal/textureStore/6b80d2.wgsl
index 9e0850635a..ab22858b3f 100644
--- a/test/tint/builtins/gen/textureStore/6b80d2.wgsl
+++ b/test/tint/builtins/gen/literal/textureStore/6b80d2.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/textureStore/6b80d2.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureStore/6b80d2.wgsl.expected.glsl
similarity index 90%
rename from test/tint/builtins/gen/textureStore/6b80d2.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/textureStore/6b80d2.wgsl.expected.glsl
index beb60b7d5c..74eaa9fe1e 100644
--- a/test/tint/builtins/gen/textureStore/6b80d2.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureStore/6b80d2.wgsl.expected.glsl
@@ -4,12 +4,12 @@ SKIP: FAILED
 
 layout(r32i) uniform highp writeonly iimage1D arg_0;
 void textureStore_6b80d2() {
-  imageStore(arg_0, 1, ivec4(0, 0, 0, 0));
+  imageStore(arg_0, 1, ivec4(0));
 }
 
 vec4 vertex_main() {
   textureStore_6b80d2();
-  return vec4(0.0f, 0.0f, 0.0f, 0.0f);
+  return vec4(0.0f);
 }
 
 void main() {
@@ -33,7 +33,7 @@ precision mediump float;
 
 layout(r32i) uniform highp writeonly iimage1D arg_0;
 void textureStore_6b80d2() {
-  imageStore(arg_0, 1, ivec4(0, 0, 0, 0));
+  imageStore(arg_0, 1, ivec4(0));
 }
 
 void fragment_main() {
@@ -56,7 +56,7 @@ ERROR: 2 compilation errors.  No code generated.
 
 layout(r32i) uniform highp writeonly iimage1D arg_0;
 void textureStore_6b80d2() {
-  imageStore(arg_0, 1, ivec4(0, 0, 0, 0));
+  imageStore(arg_0, 1, ivec4(0));
 }
 
 void compute_main() {
diff --git a/test/tint/builtins/gen/textureStore/6b80d2.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/textureStore/6b80d2.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/textureStore/6b80d2.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/textureStore/6b80d2.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/textureStore/6b80d2.wgsl.expected.msl b/test/tint/builtins/gen/literal/textureStore/6b80d2.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/textureStore/6b80d2.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/textureStore/6b80d2.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/textureStore/6b80d2.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureStore/6b80d2.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/textureStore/6b80d2.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/textureStore/6b80d2.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/textureStore/6b80d2.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/textureStore/6b80d2.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/textureStore/6b80d2.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/textureStore/6b80d2.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/textureStore/6cff2e.wgsl b/test/tint/builtins/gen/literal/textureStore/6cff2e.wgsl
similarity index 97%
rename from test/tint/builtins/gen/textureStore/6cff2e.wgsl
rename to test/tint/builtins/gen/literal/textureStore/6cff2e.wgsl
index 79346c80c6..f00cc003a0 100644
--- a/test/tint/builtins/gen/textureStore/6cff2e.wgsl
+++ b/test/tint/builtins/gen/literal/textureStore/6cff2e.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/textureStore/6cff2e.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureStore/6cff2e.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/textureStore/6cff2e.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/textureStore/6cff2e.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/textureStore/6cff2e.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/textureStore/6cff2e.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/textureStore/6cff2e.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/textureStore/6cff2e.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/textureStore/6cff2e.wgsl.expected.msl b/test/tint/builtins/gen/literal/textureStore/6cff2e.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/textureStore/6cff2e.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/textureStore/6cff2e.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/textureStore/6cff2e.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureStore/6cff2e.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/textureStore/6cff2e.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/textureStore/6cff2e.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/textureStore/6cff2e.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/textureStore/6cff2e.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/textureStore/6cff2e.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/textureStore/6cff2e.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/textureStore/6da692.wgsl b/test/tint/builtins/gen/literal/textureStore/6da692.wgsl
similarity index 97%
rename from test/tint/builtins/gen/textureStore/6da692.wgsl
rename to test/tint/builtins/gen/literal/textureStore/6da692.wgsl
index adad2a6b95..ca7410c9d4 100644
--- a/test/tint/builtins/gen/textureStore/6da692.wgsl
+++ b/test/tint/builtins/gen/literal/textureStore/6da692.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/textureStore/6da692.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureStore/6da692.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/textureStore/6da692.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/textureStore/6da692.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/textureStore/6da692.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/textureStore/6da692.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/textureStore/6da692.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/textureStore/6da692.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/textureStore/6da692.wgsl.expected.msl b/test/tint/builtins/gen/literal/textureStore/6da692.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/textureStore/6da692.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/textureStore/6da692.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/textureStore/6da692.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureStore/6da692.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/textureStore/6da692.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/textureStore/6da692.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/textureStore/6da692.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/textureStore/6da692.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/textureStore/6da692.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/textureStore/6da692.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/textureStore/731349.wgsl b/test/tint/builtins/gen/literal/textureStore/731349.wgsl
similarity index 97%
rename from test/tint/builtins/gen/textureStore/731349.wgsl
rename to test/tint/builtins/gen/literal/textureStore/731349.wgsl
index 82da1b3ed8..c8f81d62ce 100644
--- a/test/tint/builtins/gen/textureStore/731349.wgsl
+++ b/test/tint/builtins/gen/literal/textureStore/731349.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/textureStore/731349.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureStore/731349.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/textureStore/731349.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/textureStore/731349.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/textureStore/731349.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/textureStore/731349.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/textureStore/731349.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/textureStore/731349.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/textureStore/731349.wgsl.expected.msl b/test/tint/builtins/gen/literal/textureStore/731349.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/textureStore/731349.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/textureStore/731349.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/textureStore/731349.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureStore/731349.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/textureStore/731349.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/textureStore/731349.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/textureStore/731349.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/textureStore/731349.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/textureStore/731349.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/textureStore/731349.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/textureStore/752da6.wgsl b/test/tint/builtins/gen/literal/textureStore/752da6.wgsl
similarity index 97%
rename from test/tint/builtins/gen/textureStore/752da6.wgsl
rename to test/tint/builtins/gen/literal/textureStore/752da6.wgsl
index 628b5e38c7..e2b0734486 100644
--- a/test/tint/builtins/gen/textureStore/752da6.wgsl
+++ b/test/tint/builtins/gen/literal/textureStore/752da6.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/textureStore/752da6.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureStore/752da6.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/textureStore/752da6.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/textureStore/752da6.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/textureStore/752da6.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/textureStore/752da6.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/textureStore/752da6.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/textureStore/752da6.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/textureStore/752da6.wgsl.expected.msl b/test/tint/builtins/gen/literal/textureStore/752da6.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/textureStore/752da6.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/textureStore/752da6.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/textureStore/752da6.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureStore/752da6.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/textureStore/752da6.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/textureStore/752da6.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/textureStore/752da6.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/textureStore/752da6.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/textureStore/752da6.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/textureStore/752da6.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/textureStore/77c0ae.wgsl b/test/tint/builtins/gen/literal/textureStore/77c0ae.wgsl
similarity index 97%
rename from test/tint/builtins/gen/textureStore/77c0ae.wgsl
rename to test/tint/builtins/gen/literal/textureStore/77c0ae.wgsl
index fd3e35bb75..a5b9a55759 100644
--- a/test/tint/builtins/gen/textureStore/77c0ae.wgsl
+++ b/test/tint/builtins/gen/literal/textureStore/77c0ae.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/textureStore/77c0ae.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureStore/77c0ae.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/textureStore/77c0ae.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/textureStore/77c0ae.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/textureStore/77c0ae.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/textureStore/77c0ae.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/textureStore/77c0ae.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/textureStore/77c0ae.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/textureStore/77c0ae.wgsl.expected.msl b/test/tint/builtins/gen/literal/textureStore/77c0ae.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/textureStore/77c0ae.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/textureStore/77c0ae.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/textureStore/77c0ae.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureStore/77c0ae.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/textureStore/77c0ae.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/textureStore/77c0ae.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/textureStore/77c0ae.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/textureStore/77c0ae.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/textureStore/77c0ae.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/textureStore/77c0ae.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/textureStore/7cec8d.wgsl b/test/tint/builtins/gen/literal/textureStore/7cec8d.wgsl
similarity index 97%
rename from test/tint/builtins/gen/textureStore/7cec8d.wgsl
rename to test/tint/builtins/gen/literal/textureStore/7cec8d.wgsl
index 33f5538843..282ed90943 100644
--- a/test/tint/builtins/gen/textureStore/7cec8d.wgsl
+++ b/test/tint/builtins/gen/literal/textureStore/7cec8d.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/textureStore/7cec8d.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureStore/7cec8d.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/textureStore/7cec8d.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/textureStore/7cec8d.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/textureStore/7cec8d.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/textureStore/7cec8d.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/textureStore/7cec8d.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/textureStore/7cec8d.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/textureStore/7cec8d.wgsl.expected.msl b/test/tint/builtins/gen/literal/textureStore/7cec8d.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/textureStore/7cec8d.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/textureStore/7cec8d.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/textureStore/7cec8d.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureStore/7cec8d.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/textureStore/7cec8d.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/textureStore/7cec8d.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/textureStore/7cec8d.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/textureStore/7cec8d.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/textureStore/7cec8d.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/textureStore/7cec8d.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/textureStore/7f7fae.wgsl b/test/tint/builtins/gen/literal/textureStore/7f7fae.wgsl
similarity index 97%
rename from test/tint/builtins/gen/textureStore/7f7fae.wgsl
rename to test/tint/builtins/gen/literal/textureStore/7f7fae.wgsl
index e65082e7f6..8b5d0dd6f0 100644
--- a/test/tint/builtins/gen/textureStore/7f7fae.wgsl
+++ b/test/tint/builtins/gen/literal/textureStore/7f7fae.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/textureStore/7f7fae.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureStore/7f7fae.wgsl.expected.glsl
similarity index 88%
rename from test/tint/builtins/gen/textureStore/7f7fae.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/textureStore/7f7fae.wgsl.expected.glsl
index f008dd1016..33a010e985 100644
--- a/test/tint/builtins/gen/textureStore/7f7fae.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureStore/7f7fae.wgsl.expected.glsl
@@ -4,12 +4,12 @@ SKIP: FAILED
 
 layout(rgba8) uniform highp writeonly image1D arg_0;
 void textureStore_7f7fae() {
-  imageStore(arg_0, 1, vec4(0.0f, 0.0f, 0.0f, 0.0f));
+  imageStore(arg_0, 1, vec4(0.0f));
 }
 
 vec4 vertex_main() {
   textureStore_7f7fae();
-  return vec4(0.0f, 0.0f, 0.0f, 0.0f);
+  return vec4(0.0f);
 }
 
 void main() {
@@ -33,7 +33,7 @@ precision mediump float;
 
 layout(rgba8) uniform highp writeonly image1D arg_0;
 void textureStore_7f7fae() {
-  imageStore(arg_0, 1, vec4(0.0f, 0.0f, 0.0f, 0.0f));
+  imageStore(arg_0, 1, vec4(0.0f));
 }
 
 void fragment_main() {
@@ -56,7 +56,7 @@ ERROR: 2 compilation errors.  No code generated.
 
 layout(rgba8) uniform highp writeonly image1D arg_0;
 void textureStore_7f7fae() {
-  imageStore(arg_0, 1, vec4(0.0f, 0.0f, 0.0f, 0.0f));
+  imageStore(arg_0, 1, vec4(0.0f));
 }
 
 void compute_main() {
diff --git a/test/tint/builtins/gen/textureStore/7f7fae.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/textureStore/7f7fae.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/textureStore/7f7fae.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/textureStore/7f7fae.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/textureStore/7f7fae.wgsl.expected.msl b/test/tint/builtins/gen/literal/textureStore/7f7fae.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/textureStore/7f7fae.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/textureStore/7f7fae.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/textureStore/7f7fae.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureStore/7f7fae.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/textureStore/7f7fae.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/textureStore/7f7fae.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/textureStore/7f7fae.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/textureStore/7f7fae.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/textureStore/7f7fae.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/textureStore/7f7fae.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/textureStore/804942.wgsl b/test/tint/builtins/gen/literal/textureStore/804942.wgsl
similarity index 97%
rename from test/tint/builtins/gen/textureStore/804942.wgsl
rename to test/tint/builtins/gen/literal/textureStore/804942.wgsl
index 95ac5506ce..4024631b8f 100644
--- a/test/tint/builtins/gen/textureStore/804942.wgsl
+++ b/test/tint/builtins/gen/literal/textureStore/804942.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/textureStore/804942.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureStore/804942.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/textureStore/804942.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/textureStore/804942.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/textureStore/804942.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/textureStore/804942.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/textureStore/804942.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/textureStore/804942.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/textureStore/804942.wgsl.expected.msl b/test/tint/builtins/gen/literal/textureStore/804942.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/textureStore/804942.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/textureStore/804942.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/textureStore/804942.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureStore/804942.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/textureStore/804942.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/textureStore/804942.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/textureStore/804942.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/textureStore/804942.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/textureStore/804942.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/textureStore/804942.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/textureStore/805dae.wgsl b/test/tint/builtins/gen/literal/textureStore/805dae.wgsl
similarity index 97%
rename from test/tint/builtins/gen/textureStore/805dae.wgsl
rename to test/tint/builtins/gen/literal/textureStore/805dae.wgsl
index 9d96265647..65e44204f5 100644
--- a/test/tint/builtins/gen/textureStore/805dae.wgsl
+++ b/test/tint/builtins/gen/literal/textureStore/805dae.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/textureStore/805dae.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureStore/805dae.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/textureStore/805dae.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/textureStore/805dae.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/textureStore/805dae.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/textureStore/805dae.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/textureStore/805dae.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/textureStore/805dae.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/textureStore/805dae.wgsl.expected.msl b/test/tint/builtins/gen/literal/textureStore/805dae.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/textureStore/805dae.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/textureStore/805dae.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/textureStore/805dae.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureStore/805dae.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/textureStore/805dae.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/textureStore/805dae.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/textureStore/805dae.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/textureStore/805dae.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/textureStore/805dae.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/textureStore/805dae.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/textureStore/83bcc1.wgsl b/test/tint/builtins/gen/literal/textureStore/83bcc1.wgsl
similarity index 97%
rename from test/tint/builtins/gen/textureStore/83bcc1.wgsl
rename to test/tint/builtins/gen/literal/textureStore/83bcc1.wgsl
index fad38173fa..55d29c6633 100644
--- a/test/tint/builtins/gen/textureStore/83bcc1.wgsl
+++ b/test/tint/builtins/gen/literal/textureStore/83bcc1.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/textureStore/83bcc1.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureStore/83bcc1.wgsl.expected.glsl
similarity index 88%
rename from test/tint/builtins/gen/textureStore/83bcc1.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/textureStore/83bcc1.wgsl.expected.glsl
index 18fe898b29..b3342f8bda 100644
--- a/test/tint/builtins/gen/textureStore/83bcc1.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureStore/83bcc1.wgsl.expected.glsl
@@ -4,12 +4,12 @@ SKIP: FAILED
 
 layout(rg32ui) uniform highp writeonly uimage1D arg_0;
 void textureStore_83bcc1() {
-  imageStore(arg_0, 1, uvec4(0u, 0u, 0u, 0u));
+  imageStore(arg_0, 1, uvec4(0u));
 }
 
 vec4 vertex_main() {
   textureStore_83bcc1();
-  return vec4(0.0f, 0.0f, 0.0f, 0.0f);
+  return vec4(0.0f);
 }
 
 void main() {
@@ -32,7 +32,7 @@ precision mediump float;
 
 layout(rg32ui) uniform highp writeonly uimage1D arg_0;
 void textureStore_83bcc1() {
-  imageStore(arg_0, 1, uvec4(0u, 0u, 0u, 0u));
+  imageStore(arg_0, 1, uvec4(0u));
 }
 
 void fragment_main() {
@@ -54,7 +54,7 @@ ERROR: 2 compilation errors.  No code generated.
 
 layout(rg32ui) uniform highp writeonly uimage1D arg_0;
 void textureStore_83bcc1() {
-  imageStore(arg_0, 1, uvec4(0u, 0u, 0u, 0u));
+  imageStore(arg_0, 1, uvec4(0u));
 }
 
 void compute_main() {
diff --git a/test/tint/builtins/gen/textureStore/83bcc1.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/textureStore/83bcc1.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/textureStore/83bcc1.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/textureStore/83bcc1.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/textureStore/83bcc1.wgsl.expected.msl b/test/tint/builtins/gen/literal/textureStore/83bcc1.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/textureStore/83bcc1.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/textureStore/83bcc1.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/textureStore/83bcc1.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureStore/83bcc1.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/textureStore/83bcc1.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/textureStore/83bcc1.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/textureStore/83bcc1.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/textureStore/83bcc1.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/textureStore/83bcc1.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/textureStore/83bcc1.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/textureStore/872747.wgsl b/test/tint/builtins/gen/literal/textureStore/872747.wgsl
similarity index 97%
rename from test/tint/builtins/gen/textureStore/872747.wgsl
rename to test/tint/builtins/gen/literal/textureStore/872747.wgsl
index ebb8f4532a..98cceadede 100644
--- a/test/tint/builtins/gen/textureStore/872747.wgsl
+++ b/test/tint/builtins/gen/literal/textureStore/872747.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/textureStore/872747.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureStore/872747.wgsl.expected.glsl
similarity index 87%
rename from test/tint/builtins/gen/textureStore/872747.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/textureStore/872747.wgsl.expected.glsl
index afd9b08a16..3feee78575 100644
--- a/test/tint/builtins/gen/textureStore/872747.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureStore/872747.wgsl.expected.glsl
@@ -4,12 +4,12 @@ SKIP: FAILED
 
 layout(rg32f) uniform highp writeonly image1D arg_0;
 void textureStore_872747() {
-  imageStore(arg_0, 1, vec4(0.0f, 0.0f, 0.0f, 0.0f));
+  imageStore(arg_0, 1, vec4(0.0f));
 }
 
 vec4 vertex_main() {
   textureStore_872747();
-  return vec4(0.0f, 0.0f, 0.0f, 0.0f);
+  return vec4(0.0f);
 }
 
 void main() {
@@ -32,7 +32,7 @@ precision mediump float;
 
 layout(rg32f) uniform highp writeonly image1D arg_0;
 void textureStore_872747() {
-  imageStore(arg_0, 1, vec4(0.0f, 0.0f, 0.0f, 0.0f));
+  imageStore(arg_0, 1, vec4(0.0f));
 }
 
 void fragment_main() {
@@ -54,7 +54,7 @@ ERROR: 2 compilation errors.  No code generated.
 
 layout(rg32f) uniform highp writeonly image1D arg_0;
 void textureStore_872747() {
-  imageStore(arg_0, 1, vec4(0.0f, 0.0f, 0.0f, 0.0f));
+  imageStore(arg_0, 1, vec4(0.0f));
 }
 
 void compute_main() {
diff --git a/test/tint/builtins/gen/textureStore/872747.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/textureStore/872747.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/textureStore/872747.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/textureStore/872747.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/textureStore/872747.wgsl.expected.msl b/test/tint/builtins/gen/literal/textureStore/872747.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/textureStore/872747.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/textureStore/872747.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/textureStore/872747.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureStore/872747.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/textureStore/872747.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/textureStore/872747.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/textureStore/872747.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/textureStore/872747.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/textureStore/872747.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/textureStore/872747.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/textureStore/8e0479.wgsl b/test/tint/builtins/gen/literal/textureStore/8e0479.wgsl
similarity index 97%
rename from test/tint/builtins/gen/textureStore/8e0479.wgsl
rename to test/tint/builtins/gen/literal/textureStore/8e0479.wgsl
index e948201ff2..271ed67996 100644
--- a/test/tint/builtins/gen/textureStore/8e0479.wgsl
+++ b/test/tint/builtins/gen/literal/textureStore/8e0479.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/textureStore/8e0479.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureStore/8e0479.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/textureStore/8e0479.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/textureStore/8e0479.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/textureStore/8e0479.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/textureStore/8e0479.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/textureStore/8e0479.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/textureStore/8e0479.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/textureStore/8e0479.wgsl.expected.msl b/test/tint/builtins/gen/literal/textureStore/8e0479.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/textureStore/8e0479.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/textureStore/8e0479.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/textureStore/8e0479.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureStore/8e0479.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/textureStore/8e0479.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/textureStore/8e0479.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/textureStore/8e0479.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/textureStore/8e0479.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/textureStore/8e0479.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/textureStore/8e0479.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/textureStore/8f71a1.wgsl b/test/tint/builtins/gen/literal/textureStore/8f71a1.wgsl
similarity index 97%
rename from test/tint/builtins/gen/textureStore/8f71a1.wgsl
rename to test/tint/builtins/gen/literal/textureStore/8f71a1.wgsl
index 4d7c91ee0a..4d840ced71 100644
--- a/test/tint/builtins/gen/textureStore/8f71a1.wgsl
+++ b/test/tint/builtins/gen/literal/textureStore/8f71a1.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/textureStore/8f71a1.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureStore/8f71a1.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/textureStore/8f71a1.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/textureStore/8f71a1.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/textureStore/8f71a1.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/textureStore/8f71a1.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/textureStore/8f71a1.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/textureStore/8f71a1.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/textureStore/8f71a1.wgsl.expected.msl b/test/tint/builtins/gen/literal/textureStore/8f71a1.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/textureStore/8f71a1.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/textureStore/8f71a1.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/textureStore/8f71a1.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureStore/8f71a1.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/textureStore/8f71a1.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/textureStore/8f71a1.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/textureStore/8f71a1.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/textureStore/8f71a1.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/textureStore/8f71a1.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/textureStore/8f71a1.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/textureStore/969534.wgsl b/test/tint/builtins/gen/literal/textureStore/969534.wgsl
similarity index 97%
rename from test/tint/builtins/gen/textureStore/969534.wgsl
rename to test/tint/builtins/gen/literal/textureStore/969534.wgsl
index 5897793dd3..d73a34d575 100644
--- a/test/tint/builtins/gen/textureStore/969534.wgsl
+++ b/test/tint/builtins/gen/literal/textureStore/969534.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/textureStore/969534.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureStore/969534.wgsl.expected.glsl
similarity index 90%
rename from test/tint/builtins/gen/textureStore/969534.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/textureStore/969534.wgsl.expected.glsl
index c9fdae97f9..793221f829 100644
--- a/test/tint/builtins/gen/textureStore/969534.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureStore/969534.wgsl.expected.glsl
@@ -4,12 +4,12 @@ SKIP: FAILED
 
 layout(rgba32i) uniform highp writeonly iimage1D arg_0;
 void textureStore_969534() {
-  imageStore(arg_0, 1, ivec4(0, 0, 0, 0));
+  imageStore(arg_0, 1, ivec4(0));
 }
 
 vec4 vertex_main() {
   textureStore_969534();
-  return vec4(0.0f, 0.0f, 0.0f, 0.0f);
+  return vec4(0.0f);
 }
 
 void main() {
@@ -33,7 +33,7 @@ precision mediump float;
 
 layout(rgba32i) uniform highp writeonly iimage1D arg_0;
 void textureStore_969534() {
-  imageStore(arg_0, 1, ivec4(0, 0, 0, 0));
+  imageStore(arg_0, 1, ivec4(0));
 }
 
 void fragment_main() {
@@ -56,7 +56,7 @@ ERROR: 2 compilation errors.  No code generated.
 
 layout(rgba32i) uniform highp writeonly iimage1D arg_0;
 void textureStore_969534() {
-  imageStore(arg_0, 1, ivec4(0, 0, 0, 0));
+  imageStore(arg_0, 1, ivec4(0));
 }
 
 void compute_main() {
diff --git a/test/tint/builtins/gen/textureStore/969534.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/textureStore/969534.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/textureStore/969534.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/textureStore/969534.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/textureStore/969534.wgsl.expected.msl b/test/tint/builtins/gen/literal/textureStore/969534.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/textureStore/969534.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/textureStore/969534.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/textureStore/969534.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureStore/969534.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/textureStore/969534.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/textureStore/969534.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/textureStore/969534.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/textureStore/969534.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/textureStore/969534.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/textureStore/969534.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/textureStore/9a3ecc.wgsl b/test/tint/builtins/gen/literal/textureStore/9a3ecc.wgsl
similarity index 97%
rename from test/tint/builtins/gen/textureStore/9a3ecc.wgsl
rename to test/tint/builtins/gen/literal/textureStore/9a3ecc.wgsl
index 6fd2d30105..72656e1d40 100644
--- a/test/tint/builtins/gen/textureStore/9a3ecc.wgsl
+++ b/test/tint/builtins/gen/literal/textureStore/9a3ecc.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/textureStore/9a3ecc.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureStore/9a3ecc.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/textureStore/9a3ecc.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/textureStore/9a3ecc.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/textureStore/9a3ecc.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/textureStore/9a3ecc.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/textureStore/9a3ecc.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/textureStore/9a3ecc.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/textureStore/9a3ecc.wgsl.expected.msl b/test/tint/builtins/gen/literal/textureStore/9a3ecc.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/textureStore/9a3ecc.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/textureStore/9a3ecc.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/textureStore/9a3ecc.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureStore/9a3ecc.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/textureStore/9a3ecc.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/textureStore/9a3ecc.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/textureStore/9a3ecc.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/textureStore/9a3ecc.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/textureStore/9a3ecc.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/textureStore/9a3ecc.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/textureStore/9d9cd5.wgsl b/test/tint/builtins/gen/literal/textureStore/9d9cd5.wgsl
similarity index 97%
rename from test/tint/builtins/gen/textureStore/9d9cd5.wgsl
rename to test/tint/builtins/gen/literal/textureStore/9d9cd5.wgsl
index 4c09b3a33a..484a3cd101 100644
--- a/test/tint/builtins/gen/textureStore/9d9cd5.wgsl
+++ b/test/tint/builtins/gen/literal/textureStore/9d9cd5.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/textureStore/9d9cd5.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureStore/9d9cd5.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/textureStore/9d9cd5.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/textureStore/9d9cd5.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/textureStore/9d9cd5.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/textureStore/9d9cd5.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/textureStore/9d9cd5.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/textureStore/9d9cd5.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/textureStore/9d9cd5.wgsl.expected.msl b/test/tint/builtins/gen/literal/textureStore/9d9cd5.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/textureStore/9d9cd5.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/textureStore/9d9cd5.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/textureStore/9d9cd5.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureStore/9d9cd5.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/textureStore/9d9cd5.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/textureStore/9d9cd5.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/textureStore/9d9cd5.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/textureStore/9d9cd5.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/textureStore/9d9cd5.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/textureStore/9d9cd5.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/textureStore/9e3ec5.wgsl b/test/tint/builtins/gen/literal/textureStore/9e3ec5.wgsl
similarity index 97%
rename from test/tint/builtins/gen/textureStore/9e3ec5.wgsl
rename to test/tint/builtins/gen/literal/textureStore/9e3ec5.wgsl
index 72323bd3e2..da9282eb8e 100644
--- a/test/tint/builtins/gen/textureStore/9e3ec5.wgsl
+++ b/test/tint/builtins/gen/literal/textureStore/9e3ec5.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/textureStore/9e3ec5.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureStore/9e3ec5.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/textureStore/9e3ec5.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/textureStore/9e3ec5.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/textureStore/9e3ec5.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/textureStore/9e3ec5.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/textureStore/9e3ec5.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/textureStore/9e3ec5.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/textureStore/9e3ec5.wgsl.expected.msl b/test/tint/builtins/gen/literal/textureStore/9e3ec5.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/textureStore/9e3ec5.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/textureStore/9e3ec5.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/textureStore/9e3ec5.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureStore/9e3ec5.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/textureStore/9e3ec5.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/textureStore/9e3ec5.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/textureStore/9e3ec5.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/textureStore/9e3ec5.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/textureStore/9e3ec5.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/textureStore/9e3ec5.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/textureStore/ac67aa.wgsl b/test/tint/builtins/gen/literal/textureStore/ac67aa.wgsl
similarity index 97%
rename from test/tint/builtins/gen/textureStore/ac67aa.wgsl
rename to test/tint/builtins/gen/literal/textureStore/ac67aa.wgsl
index e9392db438..42d2b3021e 100644
--- a/test/tint/builtins/gen/textureStore/ac67aa.wgsl
+++ b/test/tint/builtins/gen/literal/textureStore/ac67aa.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/textureStore/ac67aa.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureStore/ac67aa.wgsl.expected.glsl
similarity index 86%
rename from test/tint/builtins/gen/textureStore/ac67aa.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/textureStore/ac67aa.wgsl.expected.glsl
index d11d5c13a3..5662bc9e17 100644
--- a/test/tint/builtins/gen/textureStore/ac67aa.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureStore/ac67aa.wgsl.expected.glsl
@@ -4,12 +4,12 @@ SKIP: FAILED
 
 layout(rg32ui) uniform highp writeonly uimage3D arg_0;
 void textureStore_ac67aa() {
-  imageStore(arg_0, ivec3(0, 0, 0), uvec4(0u, 0u, 0u, 0u));
+  imageStore(arg_0, ivec3(0), uvec4(0u));
 }
 
 vec4 vertex_main() {
   textureStore_ac67aa();
-  return vec4(0.0f, 0.0f, 0.0f, 0.0f);
+  return vec4(0.0f);
 }
 
 void main() {
@@ -32,7 +32,7 @@ precision mediump float;
 
 layout(rg32ui) uniform highp writeonly uimage3D arg_0;
 void textureStore_ac67aa() {
-  imageStore(arg_0, ivec3(0, 0, 0), uvec4(0u, 0u, 0u, 0u));
+  imageStore(arg_0, ivec3(0), uvec4(0u));
 }
 
 void fragment_main() {
@@ -54,7 +54,7 @@ ERROR: 2 compilation errors.  No code generated.
 
 layout(rg32ui) uniform highp writeonly uimage3D arg_0;
 void textureStore_ac67aa() {
-  imageStore(arg_0, ivec3(0, 0, 0), uvec4(0u, 0u, 0u, 0u));
+  imageStore(arg_0, ivec3(0), uvec4(0u));
 }
 
 void compute_main() {
diff --git a/test/tint/builtins/gen/textureStore/ac67aa.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/textureStore/ac67aa.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/textureStore/ac67aa.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/textureStore/ac67aa.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/textureStore/ac67aa.wgsl.expected.msl b/test/tint/builtins/gen/literal/textureStore/ac67aa.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/textureStore/ac67aa.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/textureStore/ac67aa.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/textureStore/ac67aa.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureStore/ac67aa.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/textureStore/ac67aa.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/textureStore/ac67aa.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/textureStore/ac67aa.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/textureStore/ac67aa.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/textureStore/ac67aa.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/textureStore/ac67aa.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/textureStore/b706b1.wgsl b/test/tint/builtins/gen/literal/textureStore/b706b1.wgsl
similarity index 97%
rename from test/tint/builtins/gen/textureStore/b706b1.wgsl
rename to test/tint/builtins/gen/literal/textureStore/b706b1.wgsl
index bd55c9efcc..949c9324aa 100644
--- a/test/tint/builtins/gen/textureStore/b706b1.wgsl
+++ b/test/tint/builtins/gen/literal/textureStore/b706b1.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/textureStore/b706b1.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureStore/b706b1.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/textureStore/b706b1.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/textureStore/b706b1.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/textureStore/b706b1.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/textureStore/b706b1.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/textureStore/b706b1.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/textureStore/b706b1.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/textureStore/b706b1.wgsl.expected.msl b/test/tint/builtins/gen/literal/textureStore/b706b1.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/textureStore/b706b1.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/textureStore/b706b1.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/textureStore/b706b1.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureStore/b706b1.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/textureStore/b706b1.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/textureStore/b706b1.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/textureStore/b706b1.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/textureStore/b706b1.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/textureStore/b706b1.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/textureStore/b706b1.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/textureStore/bbcb7f.wgsl b/test/tint/builtins/gen/literal/textureStore/bbcb7f.wgsl
similarity index 97%
rename from test/tint/builtins/gen/textureStore/bbcb7f.wgsl
rename to test/tint/builtins/gen/literal/textureStore/bbcb7f.wgsl
index b220ec5328..ee04924b4d 100644
--- a/test/tint/builtins/gen/textureStore/bbcb7f.wgsl
+++ b/test/tint/builtins/gen/literal/textureStore/bbcb7f.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/textureStore/bbcb7f.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureStore/bbcb7f.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/textureStore/bbcb7f.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/textureStore/bbcb7f.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/textureStore/bbcb7f.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/textureStore/bbcb7f.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/textureStore/bbcb7f.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/textureStore/bbcb7f.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/textureStore/bbcb7f.wgsl.expected.msl b/test/tint/builtins/gen/literal/textureStore/bbcb7f.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/textureStore/bbcb7f.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/textureStore/bbcb7f.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/textureStore/bbcb7f.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureStore/bbcb7f.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/textureStore/bbcb7f.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/textureStore/bbcb7f.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/textureStore/bbcb7f.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/textureStore/bbcb7f.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/textureStore/bbcb7f.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/textureStore/bbcb7f.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/textureStore/be6e30.wgsl b/test/tint/builtins/gen/literal/textureStore/be6e30.wgsl
similarity index 97%
rename from test/tint/builtins/gen/textureStore/be6e30.wgsl
rename to test/tint/builtins/gen/literal/textureStore/be6e30.wgsl
index af203c8a0a..c192581766 100644
--- a/test/tint/builtins/gen/textureStore/be6e30.wgsl
+++ b/test/tint/builtins/gen/literal/textureStore/be6e30.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/textureStore/be6e30.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureStore/be6e30.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/textureStore/be6e30.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/textureStore/be6e30.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/textureStore/be6e30.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/textureStore/be6e30.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/textureStore/be6e30.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/textureStore/be6e30.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/textureStore/be6e30.wgsl.expected.msl b/test/tint/builtins/gen/literal/textureStore/be6e30.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/textureStore/be6e30.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/textureStore/be6e30.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/textureStore/be6e30.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureStore/be6e30.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/textureStore/be6e30.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/textureStore/be6e30.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/textureStore/be6e30.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/textureStore/be6e30.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/textureStore/be6e30.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/textureStore/be6e30.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/textureStore/bf775c.wgsl b/test/tint/builtins/gen/literal/textureStore/bf775c.wgsl
similarity index 97%
rename from test/tint/builtins/gen/textureStore/bf775c.wgsl
rename to test/tint/builtins/gen/literal/textureStore/bf775c.wgsl
index c793b5f986..e8a7f1443f 100644
--- a/test/tint/builtins/gen/textureStore/bf775c.wgsl
+++ b/test/tint/builtins/gen/literal/textureStore/bf775c.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/textureStore/bf775c.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureStore/bf775c.wgsl.expected.glsl
similarity index 90%
rename from test/tint/builtins/gen/textureStore/bf775c.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/textureStore/bf775c.wgsl.expected.glsl
index 38cb0e5625..892ebeab4c 100644
--- a/test/tint/builtins/gen/textureStore/bf775c.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureStore/bf775c.wgsl.expected.glsl
@@ -4,12 +4,12 @@ SKIP: FAILED
 
 layout(rgba8i) uniform highp writeonly iimage1D arg_0;
 void textureStore_bf775c() {
-  imageStore(arg_0, 1, ivec4(0, 0, 0, 0));
+  imageStore(arg_0, 1, ivec4(0));
 }
 
 vec4 vertex_main() {
   textureStore_bf775c();
-  return vec4(0.0f, 0.0f, 0.0f, 0.0f);
+  return vec4(0.0f);
 }
 
 void main() {
@@ -33,7 +33,7 @@ precision mediump float;
 
 layout(rgba8i) uniform highp writeonly iimage1D arg_0;
 void textureStore_bf775c() {
-  imageStore(arg_0, 1, ivec4(0, 0, 0, 0));
+  imageStore(arg_0, 1, ivec4(0));
 }
 
 void fragment_main() {
@@ -56,7 +56,7 @@ ERROR: 2 compilation errors.  No code generated.
 
 layout(rgba8i) uniform highp writeonly iimage1D arg_0;
 void textureStore_bf775c() {
-  imageStore(arg_0, 1, ivec4(0, 0, 0, 0));
+  imageStore(arg_0, 1, ivec4(0));
 }
 
 void compute_main() {
diff --git a/test/tint/builtins/gen/textureStore/bf775c.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/textureStore/bf775c.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/textureStore/bf775c.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/textureStore/bf775c.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/textureStore/bf775c.wgsl.expected.msl b/test/tint/builtins/gen/literal/textureStore/bf775c.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/textureStore/bf775c.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/textureStore/bf775c.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/textureStore/bf775c.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureStore/bf775c.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/textureStore/bf775c.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/textureStore/bf775c.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/textureStore/bf775c.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/textureStore/bf775c.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/textureStore/bf775c.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/textureStore/bf775c.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/textureStore/c5af1e.wgsl b/test/tint/builtins/gen/literal/textureStore/c5af1e.wgsl
similarity index 97%
rename from test/tint/builtins/gen/textureStore/c5af1e.wgsl
rename to test/tint/builtins/gen/literal/textureStore/c5af1e.wgsl
index 8c8a49d24b..716f4917c0 100644
--- a/test/tint/builtins/gen/textureStore/c5af1e.wgsl
+++ b/test/tint/builtins/gen/literal/textureStore/c5af1e.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/textureStore/c5af1e.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureStore/c5af1e.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/textureStore/c5af1e.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/textureStore/c5af1e.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/textureStore/c5af1e.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/textureStore/c5af1e.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/textureStore/c5af1e.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/textureStore/c5af1e.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/textureStore/c5af1e.wgsl.expected.msl b/test/tint/builtins/gen/literal/textureStore/c5af1e.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/textureStore/c5af1e.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/textureStore/c5af1e.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/textureStore/c5af1e.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureStore/c5af1e.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/textureStore/c5af1e.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/textureStore/c5af1e.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/textureStore/c5af1e.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/textureStore/c5af1e.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/textureStore/c5af1e.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/textureStore/c5af1e.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/textureStore/c863be.wgsl b/test/tint/builtins/gen/literal/textureStore/c863be.wgsl
similarity index 97%
rename from test/tint/builtins/gen/textureStore/c863be.wgsl
rename to test/tint/builtins/gen/literal/textureStore/c863be.wgsl
index 2e60dd2656..abb287f903 100644
--- a/test/tint/builtins/gen/textureStore/c863be.wgsl
+++ b/test/tint/builtins/gen/literal/textureStore/c863be.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/textureStore/c863be.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureStore/c863be.wgsl.expected.glsl
similarity index 85%
rename from test/tint/builtins/gen/textureStore/c863be.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/textureStore/c863be.wgsl.expected.glsl
index 57d609def9..fb070a68bb 100644
--- a/test/tint/builtins/gen/textureStore/c863be.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureStore/c863be.wgsl.expected.glsl
@@ -4,12 +4,12 @@ SKIP: FAILED
 
 layout(rg32f) uniform highp writeonly image2DArray arg_0;
 void textureStore_c863be() {
-  imageStore(arg_0, ivec3(0, 0, 1), vec4(0.0f, 0.0f, 0.0f, 0.0f));
+  imageStore(arg_0, ivec3(0, 0, 1), vec4(0.0f));
 }
 
 vec4 vertex_main() {
   textureStore_c863be();
-  return vec4(0.0f, 0.0f, 0.0f, 0.0f);
+  return vec4(0.0f);
 }
 
 void main() {
@@ -32,7 +32,7 @@ precision mediump float;
 
 layout(rg32f) uniform highp writeonly image2DArray arg_0;
 void textureStore_c863be() {
-  imageStore(arg_0, ivec3(0, 0, 1), vec4(0.0f, 0.0f, 0.0f, 0.0f));
+  imageStore(arg_0, ivec3(0, 0, 1), vec4(0.0f));
 }
 
 void fragment_main() {
@@ -54,7 +54,7 @@ ERROR: 2 compilation errors.  No code generated.
 
 layout(rg32f) uniform highp writeonly image2DArray arg_0;
 void textureStore_c863be() {
-  imageStore(arg_0, ivec3(0, 0, 1), vec4(0.0f, 0.0f, 0.0f, 0.0f));
+  imageStore(arg_0, ivec3(0, 0, 1), vec4(0.0f));
 }
 
 void compute_main() {
diff --git a/test/tint/builtins/gen/textureStore/c863be.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/textureStore/c863be.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/textureStore/c863be.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/textureStore/c863be.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/textureStore/c863be.wgsl.expected.msl b/test/tint/builtins/gen/literal/textureStore/c863be.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/textureStore/c863be.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/textureStore/c863be.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/textureStore/c863be.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureStore/c863be.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/textureStore/c863be.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/textureStore/c863be.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/textureStore/c863be.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/textureStore/c863be.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/textureStore/c863be.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/textureStore/c863be.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/textureStore/d73b5c.wgsl b/test/tint/builtins/gen/literal/textureStore/d73b5c.wgsl
similarity index 97%
rename from test/tint/builtins/gen/textureStore/d73b5c.wgsl
rename to test/tint/builtins/gen/literal/textureStore/d73b5c.wgsl
index 21d95b93d3..44468a81cd 100644
--- a/test/tint/builtins/gen/textureStore/d73b5c.wgsl
+++ b/test/tint/builtins/gen/literal/textureStore/d73b5c.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/textureStore/d73b5c.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureStore/d73b5c.wgsl.expected.glsl
similarity index 89%
rename from test/tint/builtins/gen/textureStore/d73b5c.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/textureStore/d73b5c.wgsl.expected.glsl
index 2c8d566585..494b6a21d7 100644
--- a/test/tint/builtins/gen/textureStore/d73b5c.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureStore/d73b5c.wgsl.expected.glsl
@@ -4,12 +4,12 @@ SKIP: FAILED
 
 layout(rg32i) uniform highp writeonly iimage1D arg_0;
 void textureStore_d73b5c() {
-  imageStore(arg_0, 1, ivec4(0, 0, 0, 0));
+  imageStore(arg_0, 1, ivec4(0));
 }
 
 vec4 vertex_main() {
   textureStore_d73b5c();
-  return vec4(0.0f, 0.0f, 0.0f, 0.0f);
+  return vec4(0.0f);
 }
 
 void main() {
@@ -32,7 +32,7 @@ precision mediump float;
 
 layout(rg32i) uniform highp writeonly iimage1D arg_0;
 void textureStore_d73b5c() {
-  imageStore(arg_0, 1, ivec4(0, 0, 0, 0));
+  imageStore(arg_0, 1, ivec4(0));
 }
 
 void fragment_main() {
@@ -54,7 +54,7 @@ ERROR: 2 compilation errors.  No code generated.
 
 layout(rg32i) uniform highp writeonly iimage1D arg_0;
 void textureStore_d73b5c() {
-  imageStore(arg_0, 1, ivec4(0, 0, 0, 0));
+  imageStore(arg_0, 1, ivec4(0));
 }
 
 void compute_main() {
diff --git a/test/tint/builtins/gen/textureStore/d73b5c.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/textureStore/d73b5c.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/textureStore/d73b5c.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/textureStore/d73b5c.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/textureStore/d73b5c.wgsl.expected.msl b/test/tint/builtins/gen/literal/textureStore/d73b5c.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/textureStore/d73b5c.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/textureStore/d73b5c.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/textureStore/d73b5c.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureStore/d73b5c.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/textureStore/d73b5c.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/textureStore/d73b5c.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/textureStore/d73b5c.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/textureStore/d73b5c.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/textureStore/d73b5c.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/textureStore/d73b5c.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/textureStore/dd7d81.wgsl b/test/tint/builtins/gen/literal/textureStore/dd7d81.wgsl
similarity index 97%
rename from test/tint/builtins/gen/textureStore/dd7d81.wgsl
rename to test/tint/builtins/gen/literal/textureStore/dd7d81.wgsl
index 93a30cd113..8ea8125016 100644
--- a/test/tint/builtins/gen/textureStore/dd7d81.wgsl
+++ b/test/tint/builtins/gen/literal/textureStore/dd7d81.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/textureStore/dd7d81.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureStore/dd7d81.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/textureStore/dd7d81.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/textureStore/dd7d81.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/textureStore/dd7d81.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/textureStore/dd7d81.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/textureStore/dd7d81.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/textureStore/dd7d81.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/textureStore/dd7d81.wgsl.expected.msl b/test/tint/builtins/gen/literal/textureStore/dd7d81.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/textureStore/dd7d81.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/textureStore/dd7d81.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/textureStore/dd7d81.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureStore/dd7d81.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/textureStore/dd7d81.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/textureStore/dd7d81.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/textureStore/dd7d81.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/textureStore/dd7d81.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/textureStore/dd7d81.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/textureStore/dd7d81.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/textureStore/dde364.wgsl b/test/tint/builtins/gen/literal/textureStore/dde364.wgsl
similarity index 97%
rename from test/tint/builtins/gen/textureStore/dde364.wgsl
rename to test/tint/builtins/gen/literal/textureStore/dde364.wgsl
index d613cb7391..e09a8e5c01 100644
--- a/test/tint/builtins/gen/textureStore/dde364.wgsl
+++ b/test/tint/builtins/gen/literal/textureStore/dde364.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/textureStore/dde364.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureStore/dde364.wgsl.expected.glsl
similarity index 87%
rename from test/tint/builtins/gen/textureStore/dde364.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/textureStore/dde364.wgsl.expected.glsl
index 43f3727870..cff2439450 100644
--- a/test/tint/builtins/gen/textureStore/dde364.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureStore/dde364.wgsl.expected.glsl
@@ -4,12 +4,12 @@ SKIP: FAILED
 
 layout(rg32ui) uniform highp writeonly uimage2DArray arg_0;
 void textureStore_dde364() {
-  imageStore(arg_0, ivec3(0, 0, 1), uvec4(0u, 0u, 0u, 0u));
+  imageStore(arg_0, ivec3(0, 0, 1), uvec4(0u));
 }
 
 vec4 vertex_main() {
   textureStore_dde364();
-  return vec4(0.0f, 0.0f, 0.0f, 0.0f);
+  return vec4(0.0f);
 }
 
 void main() {
@@ -32,7 +32,7 @@ precision mediump float;
 
 layout(rg32ui) uniform highp writeonly uimage2DArray arg_0;
 void textureStore_dde364() {
-  imageStore(arg_0, ivec3(0, 0, 1), uvec4(0u, 0u, 0u, 0u));
+  imageStore(arg_0, ivec3(0, 0, 1), uvec4(0u));
 }
 
 void fragment_main() {
@@ -54,7 +54,7 @@ ERROR: 2 compilation errors.  No code generated.
 
 layout(rg32ui) uniform highp writeonly uimage2DArray arg_0;
 void textureStore_dde364() {
-  imageStore(arg_0, ivec3(0, 0, 1), uvec4(0u, 0u, 0u, 0u));
+  imageStore(arg_0, ivec3(0, 0, 1), uvec4(0u));
 }
 
 void compute_main() {
diff --git a/test/tint/builtins/gen/textureStore/dde364.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/textureStore/dde364.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/textureStore/dde364.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/textureStore/dde364.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/textureStore/dde364.wgsl.expected.msl b/test/tint/builtins/gen/literal/textureStore/dde364.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/textureStore/dde364.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/textureStore/dde364.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/textureStore/dde364.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureStore/dde364.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/textureStore/dde364.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/textureStore/dde364.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/textureStore/dde364.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/textureStore/dde364.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/textureStore/dde364.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/textureStore/dde364.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/textureStore/e885e8.wgsl b/test/tint/builtins/gen/literal/textureStore/e885e8.wgsl
similarity index 97%
rename from test/tint/builtins/gen/textureStore/e885e8.wgsl
rename to test/tint/builtins/gen/literal/textureStore/e885e8.wgsl
index 025f448c94..a6706d5062 100644
--- a/test/tint/builtins/gen/textureStore/e885e8.wgsl
+++ b/test/tint/builtins/gen/literal/textureStore/e885e8.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/textureStore/e885e8.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureStore/e885e8.wgsl.expected.glsl
similarity index 88%
rename from test/tint/builtins/gen/textureStore/e885e8.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/textureStore/e885e8.wgsl.expected.glsl
index a631fcabf9..b537ea34ff 100644
--- a/test/tint/builtins/gen/textureStore/e885e8.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureStore/e885e8.wgsl.expected.glsl
@@ -4,12 +4,12 @@ SKIP: FAILED
 
 layout(rgba16f) uniform highp writeonly image1D arg_0;
 void textureStore_e885e8() {
-  imageStore(arg_0, 1, vec4(0.0f, 0.0f, 0.0f, 0.0f));
+  imageStore(arg_0, 1, vec4(0.0f));
 }
 
 vec4 vertex_main() {
   textureStore_e885e8();
-  return vec4(0.0f, 0.0f, 0.0f, 0.0f);
+  return vec4(0.0f);
 }
 
 void main() {
@@ -33,7 +33,7 @@ precision mediump float;
 
 layout(rgba16f) uniform highp writeonly image1D arg_0;
 void textureStore_e885e8() {
-  imageStore(arg_0, 1, vec4(0.0f, 0.0f, 0.0f, 0.0f));
+  imageStore(arg_0, 1, vec4(0.0f));
 }
 
 void fragment_main() {
@@ -56,7 +56,7 @@ ERROR: 2 compilation errors.  No code generated.
 
 layout(rgba16f) uniform highp writeonly image1D arg_0;
 void textureStore_e885e8() {
-  imageStore(arg_0, 1, vec4(0.0f, 0.0f, 0.0f, 0.0f));
+  imageStore(arg_0, 1, vec4(0.0f));
 }
 
 void compute_main() {
diff --git a/test/tint/builtins/gen/textureStore/e885e8.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/textureStore/e885e8.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/textureStore/e885e8.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/textureStore/e885e8.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/textureStore/e885e8.wgsl.expected.msl b/test/tint/builtins/gen/literal/textureStore/e885e8.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/textureStore/e885e8.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/textureStore/e885e8.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/textureStore/e885e8.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureStore/e885e8.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/textureStore/e885e8.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/textureStore/e885e8.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/textureStore/e885e8.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/textureStore/e885e8.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/textureStore/e885e8.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/textureStore/e885e8.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/textureStore/eb702f.wgsl b/test/tint/builtins/gen/literal/textureStore/eb702f.wgsl
similarity index 97%
rename from test/tint/builtins/gen/textureStore/eb702f.wgsl
rename to test/tint/builtins/gen/literal/textureStore/eb702f.wgsl
index a188948c2c..916fc32227 100644
--- a/test/tint/builtins/gen/textureStore/eb702f.wgsl
+++ b/test/tint/builtins/gen/literal/textureStore/eb702f.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/textureStore/eb702f.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureStore/eb702f.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/textureStore/eb702f.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/textureStore/eb702f.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/textureStore/eb702f.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/textureStore/eb702f.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/textureStore/eb702f.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/textureStore/eb702f.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/textureStore/eb702f.wgsl.expected.msl b/test/tint/builtins/gen/literal/textureStore/eb702f.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/textureStore/eb702f.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/textureStore/eb702f.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/textureStore/eb702f.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureStore/eb702f.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/textureStore/eb702f.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/textureStore/eb702f.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/textureStore/eb702f.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/textureStore/eb702f.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/textureStore/eb702f.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/textureStore/eb702f.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/textureStore/eb78b9.wgsl b/test/tint/builtins/gen/literal/textureStore/eb78b9.wgsl
similarity index 97%
rename from test/tint/builtins/gen/textureStore/eb78b9.wgsl
rename to test/tint/builtins/gen/literal/textureStore/eb78b9.wgsl
index 5c1857bcd3..6d0e377bab 100644
--- a/test/tint/builtins/gen/textureStore/eb78b9.wgsl
+++ b/test/tint/builtins/gen/literal/textureStore/eb78b9.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/textureStore/eb78b9.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureStore/eb78b9.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/textureStore/eb78b9.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/textureStore/eb78b9.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/textureStore/eb78b9.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/textureStore/eb78b9.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/textureStore/eb78b9.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/textureStore/eb78b9.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/textureStore/eb78b9.wgsl.expected.msl b/test/tint/builtins/gen/literal/textureStore/eb78b9.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/textureStore/eb78b9.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/textureStore/eb78b9.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/textureStore/eb78b9.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureStore/eb78b9.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/textureStore/eb78b9.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/textureStore/eb78b9.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/textureStore/eb78b9.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/textureStore/eb78b9.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/textureStore/eb78b9.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/textureStore/eb78b9.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/textureStore/ee6acc.wgsl b/test/tint/builtins/gen/literal/textureStore/ee6acc.wgsl
similarity index 97%
rename from test/tint/builtins/gen/textureStore/ee6acc.wgsl
rename to test/tint/builtins/gen/literal/textureStore/ee6acc.wgsl
index 43201cc48d..a5b15c1aa2 100644
--- a/test/tint/builtins/gen/textureStore/ee6acc.wgsl
+++ b/test/tint/builtins/gen/literal/textureStore/ee6acc.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/textureStore/ee6acc.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureStore/ee6acc.wgsl.expected.glsl
similarity index 85%
rename from test/tint/builtins/gen/textureStore/ee6acc.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/textureStore/ee6acc.wgsl.expected.glsl
index 793103114b..b22d59687e 100644
--- a/test/tint/builtins/gen/textureStore/ee6acc.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureStore/ee6acc.wgsl.expected.glsl
@@ -4,12 +4,12 @@ SKIP: FAILED
 
 layout(rg32f) uniform highp writeonly image3D arg_0;
 void textureStore_ee6acc() {
-  imageStore(arg_0, ivec3(0, 0, 0), vec4(0.0f, 0.0f, 0.0f, 0.0f));
+  imageStore(arg_0, ivec3(0), vec4(0.0f));
 }
 
 vec4 vertex_main() {
   textureStore_ee6acc();
-  return vec4(0.0f, 0.0f, 0.0f, 0.0f);
+  return vec4(0.0f);
 }
 
 void main() {
@@ -32,7 +32,7 @@ precision mediump float;
 
 layout(rg32f) uniform highp writeonly image3D arg_0;
 void textureStore_ee6acc() {
-  imageStore(arg_0, ivec3(0, 0, 0), vec4(0.0f, 0.0f, 0.0f, 0.0f));
+  imageStore(arg_0, ivec3(0), vec4(0.0f));
 }
 
 void fragment_main() {
@@ -54,7 +54,7 @@ ERROR: 2 compilation errors.  No code generated.
 
 layout(rg32f) uniform highp writeonly image3D arg_0;
 void textureStore_ee6acc() {
-  imageStore(arg_0, ivec3(0, 0, 0), vec4(0.0f, 0.0f, 0.0f, 0.0f));
+  imageStore(arg_0, ivec3(0), vec4(0.0f));
 }
 
 void compute_main() {
diff --git a/test/tint/builtins/gen/textureStore/ee6acc.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/textureStore/ee6acc.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/textureStore/ee6acc.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/textureStore/ee6acc.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/textureStore/ee6acc.wgsl.expected.msl b/test/tint/builtins/gen/literal/textureStore/ee6acc.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/textureStore/ee6acc.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/textureStore/ee6acc.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/textureStore/ee6acc.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureStore/ee6acc.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/textureStore/ee6acc.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/textureStore/ee6acc.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/textureStore/ee6acc.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/textureStore/ee6acc.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/textureStore/ee6acc.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/textureStore/ee6acc.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/textureStore/ef9f2f.wgsl b/test/tint/builtins/gen/literal/textureStore/ef9f2f.wgsl
similarity index 97%
rename from test/tint/builtins/gen/textureStore/ef9f2f.wgsl
rename to test/tint/builtins/gen/literal/textureStore/ef9f2f.wgsl
index 6296d30271..b3effb6bb4 100644
--- a/test/tint/builtins/gen/textureStore/ef9f2f.wgsl
+++ b/test/tint/builtins/gen/literal/textureStore/ef9f2f.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/textureStore/ef9f2f.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureStore/ef9f2f.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/textureStore/ef9f2f.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/textureStore/ef9f2f.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/textureStore/ef9f2f.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/textureStore/ef9f2f.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/textureStore/ef9f2f.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/textureStore/ef9f2f.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/textureStore/ef9f2f.wgsl.expected.msl b/test/tint/builtins/gen/literal/textureStore/ef9f2f.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/textureStore/ef9f2f.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/textureStore/ef9f2f.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/textureStore/ef9f2f.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureStore/ef9f2f.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/textureStore/ef9f2f.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/textureStore/ef9f2f.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/textureStore/ef9f2f.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/textureStore/ef9f2f.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/textureStore/ef9f2f.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/textureStore/ef9f2f.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/textureStore/f8dead.wgsl b/test/tint/builtins/gen/literal/textureStore/f8dead.wgsl
similarity index 97%
rename from test/tint/builtins/gen/textureStore/f8dead.wgsl
rename to test/tint/builtins/gen/literal/textureStore/f8dead.wgsl
index 8954b30af6..b49ebc39fc 100644
--- a/test/tint/builtins/gen/textureStore/f8dead.wgsl
+++ b/test/tint/builtins/gen/literal/textureStore/f8dead.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/textureStore/f8dead.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureStore/f8dead.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/textureStore/f8dead.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/textureStore/f8dead.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/textureStore/f8dead.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/textureStore/f8dead.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/textureStore/f8dead.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/textureStore/f8dead.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/textureStore/f8dead.wgsl.expected.msl b/test/tint/builtins/gen/literal/textureStore/f8dead.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/textureStore/f8dead.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/textureStore/f8dead.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/textureStore/f8dead.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureStore/f8dead.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/textureStore/f8dead.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/textureStore/f8dead.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/textureStore/f8dead.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/textureStore/f8dead.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/textureStore/f8dead.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/textureStore/f8dead.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/textureStore/f9be83.wgsl b/test/tint/builtins/gen/literal/textureStore/f9be83.wgsl
similarity index 97%
rename from test/tint/builtins/gen/textureStore/f9be83.wgsl
rename to test/tint/builtins/gen/literal/textureStore/f9be83.wgsl
index 09830dcaa5..cb34f7a636 100644
--- a/test/tint/builtins/gen/textureStore/f9be83.wgsl
+++ b/test/tint/builtins/gen/literal/textureStore/f9be83.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/textureStore/f9be83.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureStore/f9be83.wgsl.expected.glsl
similarity index 87%
rename from test/tint/builtins/gen/textureStore/f9be83.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/textureStore/f9be83.wgsl.expected.glsl
index 975a5dbbf2..da09edea21 100644
--- a/test/tint/builtins/gen/textureStore/f9be83.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureStore/f9be83.wgsl.expected.glsl
@@ -4,12 +4,12 @@ SKIP: FAILED
 
 layout(rg32i) uniform highp writeonly iimage2DArray arg_0;
 void textureStore_f9be83() {
-  imageStore(arg_0, ivec3(0, 0, 1), ivec4(0, 0, 0, 0));
+  imageStore(arg_0, ivec3(0, 0, 1), ivec4(0));
 }
 
 vec4 vertex_main() {
   textureStore_f9be83();
-  return vec4(0.0f, 0.0f, 0.0f, 0.0f);
+  return vec4(0.0f);
 }
 
 void main() {
@@ -32,7 +32,7 @@ precision mediump float;
 
 layout(rg32i) uniform highp writeonly iimage2DArray arg_0;
 void textureStore_f9be83() {
-  imageStore(arg_0, ivec3(0, 0, 1), ivec4(0, 0, 0, 0));
+  imageStore(arg_0, ivec3(0, 0, 1), ivec4(0));
 }
 
 void fragment_main() {
@@ -54,7 +54,7 @@ ERROR: 2 compilation errors.  No code generated.
 
 layout(rg32i) uniform highp writeonly iimage2DArray arg_0;
 void textureStore_f9be83() {
-  imageStore(arg_0, ivec3(0, 0, 1), ivec4(0, 0, 0, 0));
+  imageStore(arg_0, ivec3(0, 0, 1), ivec4(0));
 }
 
 void compute_main() {
diff --git a/test/tint/builtins/gen/textureStore/f9be83.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/textureStore/f9be83.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/textureStore/f9be83.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/textureStore/f9be83.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/textureStore/f9be83.wgsl.expected.msl b/test/tint/builtins/gen/literal/textureStore/f9be83.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/textureStore/f9be83.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/textureStore/f9be83.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/textureStore/f9be83.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureStore/f9be83.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/textureStore/f9be83.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/textureStore/f9be83.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/textureStore/f9be83.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/textureStore/f9be83.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/textureStore/f9be83.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/textureStore/f9be83.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/textureStore/fb9a8f.wgsl b/test/tint/builtins/gen/literal/textureStore/fb9a8f.wgsl
similarity index 97%
rename from test/tint/builtins/gen/textureStore/fb9a8f.wgsl
rename to test/tint/builtins/gen/literal/textureStore/fb9a8f.wgsl
index 78ac51e16c..fa69110982 100644
--- a/test/tint/builtins/gen/textureStore/fb9a8f.wgsl
+++ b/test/tint/builtins/gen/literal/textureStore/fb9a8f.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/textureStore/fb9a8f.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureStore/fb9a8f.wgsl.expected.glsl
similarity index 89%
rename from test/tint/builtins/gen/textureStore/fb9a8f.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/textureStore/fb9a8f.wgsl.expected.glsl
index b50c0e44bc..958307856f 100644
--- a/test/tint/builtins/gen/textureStore/fb9a8f.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/textureStore/fb9a8f.wgsl.expected.glsl
@@ -4,12 +4,12 @@ SKIP: FAILED
 
 layout(rgba32ui) uniform highp writeonly uimage1D arg_0;
 void textureStore_fb9a8f() {
-  imageStore(arg_0, 1, uvec4(0u, 0u, 0u, 0u));
+  imageStore(arg_0, 1, uvec4(0u));
 }
 
 vec4 vertex_main() {
   textureStore_fb9a8f();
-  return vec4(0.0f, 0.0f, 0.0f, 0.0f);
+  return vec4(0.0f);
 }
 
 void main() {
@@ -33,7 +33,7 @@ precision mediump float;
 
 layout(rgba32ui) uniform highp writeonly uimage1D arg_0;
 void textureStore_fb9a8f() {
-  imageStore(arg_0, 1, uvec4(0u, 0u, 0u, 0u));
+  imageStore(arg_0, 1, uvec4(0u));
 }
 
 void fragment_main() {
@@ -56,7 +56,7 @@ ERROR: 2 compilation errors.  No code generated.
 
 layout(rgba32ui) uniform highp writeonly uimage1D arg_0;
 void textureStore_fb9a8f() {
-  imageStore(arg_0, 1, uvec4(0u, 0u, 0u, 0u));
+  imageStore(arg_0, 1, uvec4(0u));
 }
 
 void compute_main() {
diff --git a/test/tint/builtins/gen/textureStore/fb9a8f.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/textureStore/fb9a8f.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/textureStore/fb9a8f.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/textureStore/fb9a8f.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/textureStore/fb9a8f.wgsl.expected.msl b/test/tint/builtins/gen/literal/textureStore/fb9a8f.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/textureStore/fb9a8f.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/textureStore/fb9a8f.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/textureStore/fb9a8f.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureStore/fb9a8f.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/textureStore/fb9a8f.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/textureStore/fb9a8f.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/textureStore/fb9a8f.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/textureStore/fb9a8f.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/textureStore/fb9a8f.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/textureStore/fb9a8f.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/textureStore/fbf53f.wgsl b/test/tint/builtins/gen/literal/textureStore/fbf53f.wgsl
similarity index 97%
rename from test/tint/builtins/gen/textureStore/fbf53f.wgsl
rename to test/tint/builtins/gen/literal/textureStore/fbf53f.wgsl
index d0d41a13ec..541f45c9b3 100644
--- a/test/tint/builtins/gen/textureStore/fbf53f.wgsl
+++ b/test/tint/builtins/gen/literal/textureStore/fbf53f.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/textureStore/fbf53f.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureStore/fbf53f.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/textureStore/fbf53f.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/textureStore/fbf53f.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/textureStore/fbf53f.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/textureStore/fbf53f.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/textureStore/fbf53f.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/textureStore/fbf53f.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/textureStore/fbf53f.wgsl.expected.msl b/test/tint/builtins/gen/literal/textureStore/fbf53f.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/textureStore/fbf53f.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/textureStore/fbf53f.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/textureStore/fbf53f.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/textureStore/fbf53f.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/textureStore/fbf53f.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/textureStore/fbf53f.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/textureStore/fbf53f.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/textureStore/fbf53f.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/textureStore/fbf53f.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/textureStore/fbf53f.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/transpose/2585cd.wgsl b/test/tint/builtins/gen/literal/transpose/2585cd.wgsl
similarity index 96%
rename from test/tint/builtins/gen/transpose/2585cd.wgsl
rename to test/tint/builtins/gen/literal/transpose/2585cd.wgsl
index f111002e8b..c5684bb161 100644
--- a/test/tint/builtins/gen/transpose/2585cd.wgsl
+++ b/test/tint/builtins/gen/literal/transpose/2585cd.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/transpose/2585cd.wgsl.expected.glsl b/test/tint/builtins/gen/literal/transpose/2585cd.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/transpose/2585cd.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/transpose/2585cd.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/transpose/2585cd.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/transpose/2585cd.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/transpose/2585cd.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/transpose/2585cd.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/transpose/2585cd.wgsl.expected.msl b/test/tint/builtins/gen/literal/transpose/2585cd.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/transpose/2585cd.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/transpose/2585cd.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/transpose/2585cd.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/transpose/2585cd.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/transpose/2585cd.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/transpose/2585cd.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/transpose/2585cd.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/transpose/2585cd.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/transpose/2585cd.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/transpose/2585cd.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/transpose/31d679.wgsl b/test/tint/builtins/gen/literal/transpose/31d679.wgsl
similarity index 96%
rename from test/tint/builtins/gen/transpose/31d679.wgsl
rename to test/tint/builtins/gen/literal/transpose/31d679.wgsl
index 18c1a51a2e..389fd148b6 100644
--- a/test/tint/builtins/gen/transpose/31d679.wgsl
+++ b/test/tint/builtins/gen/literal/transpose/31d679.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/transpose/31d679.wgsl.expected.glsl b/test/tint/builtins/gen/literal/transpose/31d679.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/transpose/31d679.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/transpose/31d679.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/transpose/31d679.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/transpose/31d679.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/transpose/31d679.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/transpose/31d679.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/transpose/31d679.wgsl.expected.msl b/test/tint/builtins/gen/literal/transpose/31d679.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/transpose/31d679.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/transpose/31d679.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/transpose/31d679.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/transpose/31d679.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/transpose/31d679.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/transpose/31d679.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/transpose/31d679.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/transpose/31d679.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/transpose/31d679.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/transpose/31d679.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/transpose/31e37e.wgsl b/test/tint/builtins/gen/literal/transpose/31e37e.wgsl
similarity index 96%
rename from test/tint/builtins/gen/transpose/31e37e.wgsl
rename to test/tint/builtins/gen/literal/transpose/31e37e.wgsl
index 1b411a7ac2..bbce3e962d 100644
--- a/test/tint/builtins/gen/transpose/31e37e.wgsl
+++ b/test/tint/builtins/gen/literal/transpose/31e37e.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/transpose/31e37e.wgsl.expected.glsl b/test/tint/builtins/gen/literal/transpose/31e37e.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/transpose/31e37e.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/transpose/31e37e.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/transpose/31e37e.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/transpose/31e37e.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/transpose/31e37e.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/transpose/31e37e.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/transpose/31e37e.wgsl.expected.msl b/test/tint/builtins/gen/literal/transpose/31e37e.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/transpose/31e37e.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/transpose/31e37e.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/transpose/31e37e.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/transpose/31e37e.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/transpose/31e37e.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/transpose/31e37e.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/transpose/31e37e.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/transpose/31e37e.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/transpose/31e37e.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/transpose/31e37e.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/transpose/4ce359.wgsl b/test/tint/builtins/gen/literal/transpose/4ce359.wgsl
similarity index 96%
rename from test/tint/builtins/gen/transpose/4ce359.wgsl
rename to test/tint/builtins/gen/literal/transpose/4ce359.wgsl
index 947cd87935..40aa959569 100644
--- a/test/tint/builtins/gen/transpose/4ce359.wgsl
+++ b/test/tint/builtins/gen/literal/transpose/4ce359.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/transpose/4ce359.wgsl.expected.glsl b/test/tint/builtins/gen/literal/transpose/4ce359.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/transpose/4ce359.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/transpose/4ce359.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/transpose/4ce359.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/transpose/4ce359.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/transpose/4ce359.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/transpose/4ce359.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/transpose/4ce359.wgsl.expected.msl b/test/tint/builtins/gen/literal/transpose/4ce359.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/transpose/4ce359.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/transpose/4ce359.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/transpose/4ce359.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/transpose/4ce359.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/transpose/4ce359.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/transpose/4ce359.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/transpose/4ce359.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/transpose/4ce359.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/transpose/4ce359.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/transpose/4ce359.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/transpose/4dc9a1.wgsl b/test/tint/builtins/gen/literal/transpose/4dc9a1.wgsl
similarity index 96%
rename from test/tint/builtins/gen/transpose/4dc9a1.wgsl
rename to test/tint/builtins/gen/literal/transpose/4dc9a1.wgsl
index f4d5dc3330..8ff6bb92c3 100644
--- a/test/tint/builtins/gen/transpose/4dc9a1.wgsl
+++ b/test/tint/builtins/gen/literal/transpose/4dc9a1.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/transpose/4dc9a1.wgsl.expected.glsl b/test/tint/builtins/gen/literal/transpose/4dc9a1.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/transpose/4dc9a1.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/transpose/4dc9a1.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/transpose/4dc9a1.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/transpose/4dc9a1.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/transpose/4dc9a1.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/transpose/4dc9a1.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/transpose/4dc9a1.wgsl.expected.msl b/test/tint/builtins/gen/literal/transpose/4dc9a1.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/transpose/4dc9a1.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/transpose/4dc9a1.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/transpose/4dc9a1.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/transpose/4dc9a1.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/transpose/4dc9a1.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/transpose/4dc9a1.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/transpose/4dc9a1.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/transpose/4dc9a1.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/transpose/4dc9a1.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/transpose/4dc9a1.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/transpose/854336.wgsl b/test/tint/builtins/gen/literal/transpose/854336.wgsl
similarity index 96%
rename from test/tint/builtins/gen/transpose/854336.wgsl
rename to test/tint/builtins/gen/literal/transpose/854336.wgsl
index ffb40b7bf5..46949b2617 100644
--- a/test/tint/builtins/gen/transpose/854336.wgsl
+++ b/test/tint/builtins/gen/literal/transpose/854336.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/transpose/854336.wgsl.expected.glsl b/test/tint/builtins/gen/literal/transpose/854336.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/transpose/854336.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/transpose/854336.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/transpose/854336.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/transpose/854336.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/transpose/854336.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/transpose/854336.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/transpose/854336.wgsl.expected.msl b/test/tint/builtins/gen/literal/transpose/854336.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/transpose/854336.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/transpose/854336.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/transpose/854336.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/transpose/854336.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/transpose/854336.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/transpose/854336.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/transpose/854336.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/transpose/854336.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/transpose/854336.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/transpose/854336.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/transpose/c1b600.wgsl b/test/tint/builtins/gen/literal/transpose/c1b600.wgsl
similarity index 96%
rename from test/tint/builtins/gen/transpose/c1b600.wgsl
rename to test/tint/builtins/gen/literal/transpose/c1b600.wgsl
index 7e4683f1a7..4030074d76 100644
--- a/test/tint/builtins/gen/transpose/c1b600.wgsl
+++ b/test/tint/builtins/gen/literal/transpose/c1b600.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/transpose/c1b600.wgsl.expected.glsl b/test/tint/builtins/gen/literal/transpose/c1b600.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/transpose/c1b600.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/transpose/c1b600.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/transpose/c1b600.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/transpose/c1b600.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/transpose/c1b600.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/transpose/c1b600.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/transpose/c1b600.wgsl.expected.msl b/test/tint/builtins/gen/literal/transpose/c1b600.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/transpose/c1b600.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/transpose/c1b600.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/transpose/c1b600.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/transpose/c1b600.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/transpose/c1b600.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/transpose/c1b600.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/transpose/c1b600.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/transpose/c1b600.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/transpose/c1b600.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/transpose/c1b600.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/transpose/d8f8ba.wgsl b/test/tint/builtins/gen/literal/transpose/d8f8ba.wgsl
similarity index 96%
rename from test/tint/builtins/gen/transpose/d8f8ba.wgsl
rename to test/tint/builtins/gen/literal/transpose/d8f8ba.wgsl
index f8ec16ca06..8c75b91764 100644
--- a/test/tint/builtins/gen/transpose/d8f8ba.wgsl
+++ b/test/tint/builtins/gen/literal/transpose/d8f8ba.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/transpose/d8f8ba.wgsl.expected.glsl b/test/tint/builtins/gen/literal/transpose/d8f8ba.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/transpose/d8f8ba.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/transpose/d8f8ba.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/transpose/d8f8ba.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/transpose/d8f8ba.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/transpose/d8f8ba.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/transpose/d8f8ba.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/transpose/d8f8ba.wgsl.expected.msl b/test/tint/builtins/gen/literal/transpose/d8f8ba.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/transpose/d8f8ba.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/transpose/d8f8ba.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/transpose/d8f8ba.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/transpose/d8f8ba.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/transpose/d8f8ba.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/transpose/d8f8ba.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/transpose/d8f8ba.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/transpose/d8f8ba.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/transpose/d8f8ba.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/transpose/d8f8ba.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/transpose/ed4bdc.wgsl b/test/tint/builtins/gen/literal/transpose/ed4bdc.wgsl
similarity index 96%
rename from test/tint/builtins/gen/transpose/ed4bdc.wgsl
rename to test/tint/builtins/gen/literal/transpose/ed4bdc.wgsl
index 9b5fb4bd10..72740224f2 100644
--- a/test/tint/builtins/gen/transpose/ed4bdc.wgsl
+++ b/test/tint/builtins/gen/literal/transpose/ed4bdc.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/transpose/ed4bdc.wgsl.expected.glsl b/test/tint/builtins/gen/literal/transpose/ed4bdc.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/transpose/ed4bdc.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/transpose/ed4bdc.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/transpose/ed4bdc.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/transpose/ed4bdc.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/transpose/ed4bdc.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/transpose/ed4bdc.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/transpose/ed4bdc.wgsl.expected.msl b/test/tint/builtins/gen/literal/transpose/ed4bdc.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/transpose/ed4bdc.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/transpose/ed4bdc.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/transpose/ed4bdc.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/transpose/ed4bdc.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/transpose/ed4bdc.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/transpose/ed4bdc.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/transpose/ed4bdc.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/transpose/ed4bdc.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/transpose/ed4bdc.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/transpose/ed4bdc.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/trunc/562d05.wgsl b/test/tint/builtins/gen/literal/trunc/562d05.wgsl
similarity index 96%
rename from test/tint/builtins/gen/trunc/562d05.wgsl
rename to test/tint/builtins/gen/literal/trunc/562d05.wgsl
index 4aab73d02e..1ee6499f95 100644
--- a/test/tint/builtins/gen/trunc/562d05.wgsl
+++ b/test/tint/builtins/gen/literal/trunc/562d05.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/trunc/562d05.wgsl.expected.glsl b/test/tint/builtins/gen/literal/trunc/562d05.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/trunc/562d05.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/trunc/562d05.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/trunc/562d05.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/trunc/562d05.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/trunc/562d05.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/trunc/562d05.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/trunc/562d05.wgsl.expected.msl b/test/tint/builtins/gen/literal/trunc/562d05.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/trunc/562d05.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/trunc/562d05.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/trunc/562d05.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/trunc/562d05.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/trunc/562d05.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/trunc/562d05.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/trunc/562d05.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/trunc/562d05.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/trunc/562d05.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/trunc/562d05.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/trunc/e183aa.wgsl b/test/tint/builtins/gen/literal/trunc/e183aa.wgsl
similarity index 96%
rename from test/tint/builtins/gen/trunc/e183aa.wgsl
rename to test/tint/builtins/gen/literal/trunc/e183aa.wgsl
index bd01e6f912..a29a53e6a3 100644
--- a/test/tint/builtins/gen/trunc/e183aa.wgsl
+++ b/test/tint/builtins/gen/literal/trunc/e183aa.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/trunc/e183aa.wgsl.expected.glsl b/test/tint/builtins/gen/literal/trunc/e183aa.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/trunc/e183aa.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/trunc/e183aa.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/trunc/e183aa.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/trunc/e183aa.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/trunc/e183aa.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/trunc/e183aa.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/trunc/e183aa.wgsl.expected.msl b/test/tint/builtins/gen/literal/trunc/e183aa.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/trunc/e183aa.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/trunc/e183aa.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/trunc/e183aa.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/trunc/e183aa.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/trunc/e183aa.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/trunc/e183aa.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/trunc/e183aa.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/trunc/e183aa.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/trunc/e183aa.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/trunc/e183aa.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/trunc/eb83df.wgsl b/test/tint/builtins/gen/literal/trunc/eb83df.wgsl
similarity index 96%
rename from test/tint/builtins/gen/trunc/eb83df.wgsl
rename to test/tint/builtins/gen/literal/trunc/eb83df.wgsl
index 406f2a3b51..8297d29ea3 100644
--- a/test/tint/builtins/gen/trunc/eb83df.wgsl
+++ b/test/tint/builtins/gen/literal/trunc/eb83df.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/trunc/eb83df.wgsl.expected.glsl b/test/tint/builtins/gen/literal/trunc/eb83df.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/trunc/eb83df.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/trunc/eb83df.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/trunc/eb83df.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/trunc/eb83df.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/trunc/eb83df.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/trunc/eb83df.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/trunc/eb83df.wgsl.expected.msl b/test/tint/builtins/gen/literal/trunc/eb83df.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/trunc/eb83df.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/trunc/eb83df.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/trunc/eb83df.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/trunc/eb83df.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/trunc/eb83df.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/trunc/eb83df.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/trunc/eb83df.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/trunc/eb83df.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/trunc/eb83df.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/trunc/eb83df.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/trunc/f370d3.wgsl b/test/tint/builtins/gen/literal/trunc/f370d3.wgsl
similarity index 96%
rename from test/tint/builtins/gen/trunc/f370d3.wgsl
rename to test/tint/builtins/gen/literal/trunc/f370d3.wgsl
index cb6e843662..9521b3926d 100644
--- a/test/tint/builtins/gen/trunc/f370d3.wgsl
+++ b/test/tint/builtins/gen/literal/trunc/f370d3.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/trunc/f370d3.wgsl.expected.glsl b/test/tint/builtins/gen/literal/trunc/f370d3.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/trunc/f370d3.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/trunc/f370d3.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/trunc/f370d3.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/trunc/f370d3.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/trunc/f370d3.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/trunc/f370d3.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/trunc/f370d3.wgsl.expected.msl b/test/tint/builtins/gen/literal/trunc/f370d3.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/trunc/f370d3.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/trunc/f370d3.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/trunc/f370d3.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/trunc/f370d3.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/trunc/f370d3.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/trunc/f370d3.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/trunc/f370d3.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/trunc/f370d3.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/trunc/f370d3.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/trunc/f370d3.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/unpack2x16float/32a5cf.wgsl b/test/tint/builtins/gen/literal/unpack2x16float/32a5cf.wgsl
similarity index 96%
rename from test/tint/builtins/gen/unpack2x16float/32a5cf.wgsl
rename to test/tint/builtins/gen/literal/unpack2x16float/32a5cf.wgsl
index c3dbec2291..dd782961e5 100644
--- a/test/tint/builtins/gen/unpack2x16float/32a5cf.wgsl
+++ b/test/tint/builtins/gen/literal/unpack2x16float/32a5cf.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/unpack2x16float/32a5cf.wgsl.expected.glsl b/test/tint/builtins/gen/literal/unpack2x16float/32a5cf.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/unpack2x16float/32a5cf.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/unpack2x16float/32a5cf.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/unpack2x16float/32a5cf.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/unpack2x16float/32a5cf.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/unpack2x16float/32a5cf.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/unpack2x16float/32a5cf.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/unpack2x16float/32a5cf.wgsl.expected.msl b/test/tint/builtins/gen/literal/unpack2x16float/32a5cf.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/unpack2x16float/32a5cf.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/unpack2x16float/32a5cf.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/unpack2x16float/32a5cf.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/unpack2x16float/32a5cf.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/unpack2x16float/32a5cf.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/unpack2x16float/32a5cf.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/unpack2x16float/32a5cf.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/unpack2x16float/32a5cf.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/unpack2x16float/32a5cf.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/unpack2x16float/32a5cf.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/unpack2x16snorm/b4aea6.wgsl b/test/tint/builtins/gen/literal/unpack2x16snorm/b4aea6.wgsl
similarity index 96%
rename from test/tint/builtins/gen/unpack2x16snorm/b4aea6.wgsl
rename to test/tint/builtins/gen/literal/unpack2x16snorm/b4aea6.wgsl
index 3a5952e3bf..a832d27ed4 100644
--- a/test/tint/builtins/gen/unpack2x16snorm/b4aea6.wgsl
+++ b/test/tint/builtins/gen/literal/unpack2x16snorm/b4aea6.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/unpack2x16snorm/b4aea6.wgsl.expected.glsl b/test/tint/builtins/gen/literal/unpack2x16snorm/b4aea6.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/unpack2x16snorm/b4aea6.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/unpack2x16snorm/b4aea6.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/unpack2x16snorm/b4aea6.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/unpack2x16snorm/b4aea6.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/unpack2x16snorm/b4aea6.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/unpack2x16snorm/b4aea6.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/unpack2x16snorm/b4aea6.wgsl.expected.msl b/test/tint/builtins/gen/literal/unpack2x16snorm/b4aea6.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/unpack2x16snorm/b4aea6.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/unpack2x16snorm/b4aea6.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/unpack2x16snorm/b4aea6.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/unpack2x16snorm/b4aea6.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/unpack2x16snorm/b4aea6.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/unpack2x16snorm/b4aea6.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/unpack2x16snorm/b4aea6.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/unpack2x16snorm/b4aea6.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/unpack2x16snorm/b4aea6.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/unpack2x16snorm/b4aea6.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/unpack2x16unorm/7699c0.wgsl b/test/tint/builtins/gen/literal/unpack2x16unorm/7699c0.wgsl
similarity index 96%
rename from test/tint/builtins/gen/unpack2x16unorm/7699c0.wgsl
rename to test/tint/builtins/gen/literal/unpack2x16unorm/7699c0.wgsl
index 82e0ce9e36..73a124e32f 100644
--- a/test/tint/builtins/gen/unpack2x16unorm/7699c0.wgsl
+++ b/test/tint/builtins/gen/literal/unpack2x16unorm/7699c0.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/unpack2x16unorm/7699c0.wgsl.expected.glsl b/test/tint/builtins/gen/literal/unpack2x16unorm/7699c0.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/unpack2x16unorm/7699c0.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/unpack2x16unorm/7699c0.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/unpack2x16unorm/7699c0.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/unpack2x16unorm/7699c0.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/unpack2x16unorm/7699c0.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/unpack2x16unorm/7699c0.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/unpack2x16unorm/7699c0.wgsl.expected.msl b/test/tint/builtins/gen/literal/unpack2x16unorm/7699c0.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/unpack2x16unorm/7699c0.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/unpack2x16unorm/7699c0.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/unpack2x16unorm/7699c0.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/unpack2x16unorm/7699c0.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/unpack2x16unorm/7699c0.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/unpack2x16unorm/7699c0.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/unpack2x16unorm/7699c0.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/unpack2x16unorm/7699c0.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/unpack2x16unorm/7699c0.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/unpack2x16unorm/7699c0.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/unpack4x8snorm/523fb3.wgsl b/test/tint/builtins/gen/literal/unpack4x8snorm/523fb3.wgsl
similarity index 96%
rename from test/tint/builtins/gen/unpack4x8snorm/523fb3.wgsl
rename to test/tint/builtins/gen/literal/unpack4x8snorm/523fb3.wgsl
index 6cabee7c54..a6c458efc5 100644
--- a/test/tint/builtins/gen/unpack4x8snorm/523fb3.wgsl
+++ b/test/tint/builtins/gen/literal/unpack4x8snorm/523fb3.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/unpack4x8snorm/523fb3.wgsl.expected.glsl b/test/tint/builtins/gen/literal/unpack4x8snorm/523fb3.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/unpack4x8snorm/523fb3.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/unpack4x8snorm/523fb3.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/unpack4x8snorm/523fb3.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/unpack4x8snorm/523fb3.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/unpack4x8snorm/523fb3.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/unpack4x8snorm/523fb3.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/unpack4x8snorm/523fb3.wgsl.expected.msl b/test/tint/builtins/gen/literal/unpack4x8snorm/523fb3.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/unpack4x8snorm/523fb3.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/unpack4x8snorm/523fb3.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/unpack4x8snorm/523fb3.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/unpack4x8snorm/523fb3.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/unpack4x8snorm/523fb3.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/unpack4x8snorm/523fb3.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/unpack4x8snorm/523fb3.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/unpack4x8snorm/523fb3.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/unpack4x8snorm/523fb3.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/unpack4x8snorm/523fb3.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/unpack4x8unorm/750c74.wgsl b/test/tint/builtins/gen/literal/unpack4x8unorm/750c74.wgsl
similarity index 96%
rename from test/tint/builtins/gen/unpack4x8unorm/750c74.wgsl
rename to test/tint/builtins/gen/literal/unpack4x8unorm/750c74.wgsl
index cee8f63143..6b3c5e7745 100644
--- a/test/tint/builtins/gen/unpack4x8unorm/750c74.wgsl
+++ b/test/tint/builtins/gen/literal/unpack4x8unorm/750c74.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/unpack4x8unorm/750c74.wgsl.expected.glsl b/test/tint/builtins/gen/literal/unpack4x8unorm/750c74.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/unpack4x8unorm/750c74.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/unpack4x8unorm/750c74.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/unpack4x8unorm/750c74.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/unpack4x8unorm/750c74.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/unpack4x8unorm/750c74.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/unpack4x8unorm/750c74.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/unpack4x8unorm/750c74.wgsl.expected.msl b/test/tint/builtins/gen/literal/unpack4x8unorm/750c74.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/unpack4x8unorm/750c74.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/unpack4x8unorm/750c74.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/unpack4x8unorm/750c74.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/unpack4x8unorm/750c74.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/unpack4x8unorm/750c74.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/unpack4x8unorm/750c74.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/unpack4x8unorm/750c74.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/unpack4x8unorm/750c74.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/unpack4x8unorm/750c74.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/unpack4x8unorm/750c74.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/workgroupBarrier/a17f7f.wgsl b/test/tint/builtins/gen/literal/workgroupBarrier/a17f7f.wgsl
similarity index 96%
rename from test/tint/builtins/gen/workgroupBarrier/a17f7f.wgsl
rename to test/tint/builtins/gen/literal/workgroupBarrier/a17f7f.wgsl
index 2f1d6d6ba3..3b3f3272a3 100644
--- a/test/tint/builtins/gen/workgroupBarrier/a17f7f.wgsl
+++ b/test/tint/builtins/gen/literal/workgroupBarrier/a17f7f.wgsl
@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // File generated by tools/intrinsic-gen
 // using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
+//   test/tint/builtins/gen/gen.wgsl.tmpl
 // and the intrinsic defintion file:
 //   src/tint/intrinsics.def
 //
diff --git a/test/tint/builtins/gen/workgroupBarrier/a17f7f.wgsl.expected.glsl b/test/tint/builtins/gen/literal/workgroupBarrier/a17f7f.wgsl.expected.glsl
similarity index 100%
rename from test/tint/builtins/gen/workgroupBarrier/a17f7f.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/workgroupBarrier/a17f7f.wgsl.expected.glsl
diff --git a/test/tint/builtins/gen/workgroupBarrier/a17f7f.wgsl.expected.hlsl b/test/tint/builtins/gen/literal/workgroupBarrier/a17f7f.wgsl.expected.hlsl
similarity index 100%
rename from test/tint/builtins/gen/workgroupBarrier/a17f7f.wgsl.expected.hlsl
rename to test/tint/builtins/gen/literal/workgroupBarrier/a17f7f.wgsl.expected.hlsl
diff --git a/test/tint/builtins/gen/workgroupBarrier/a17f7f.wgsl.expected.msl b/test/tint/builtins/gen/literal/workgroupBarrier/a17f7f.wgsl.expected.msl
similarity index 100%
rename from test/tint/builtins/gen/workgroupBarrier/a17f7f.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/workgroupBarrier/a17f7f.wgsl.expected.msl
diff --git a/test/tint/builtins/gen/workgroupBarrier/a17f7f.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/workgroupBarrier/a17f7f.wgsl.expected.spvasm
similarity index 100%
rename from test/tint/builtins/gen/workgroupBarrier/a17f7f.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/workgroupBarrier/a17f7f.wgsl.expected.spvasm
diff --git a/test/tint/builtins/gen/workgroupBarrier/a17f7f.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/workgroupBarrier/a17f7f.wgsl.expected.wgsl
similarity index 100%
rename from test/tint/builtins/gen/workgroupBarrier/a17f7f.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/workgroupBarrier/a17f7f.wgsl.expected.wgsl
diff --git a/test/tint/builtins/gen/textureLoad/8acf41.wgsl.expected.glsl b/test/tint/builtins/gen/textureLoad/8acf41.wgsl.expected.glsl
deleted file mode 100644
index db3cd70a3f..0000000000
--- a/test/tint/builtins/gen/textureLoad/8acf41.wgsl.expected.glsl
+++ /dev/null
@@ -1,171 +0,0 @@
-SKIP: FAILED
-
-#version 310 es
-
-struct ExternalTextureParams {
-  uint numPlanes;
-  float vr;
-  float ug;
-  float vg;
-  float ub;
-};
-
-layout(binding = 2) uniform ExternalTextureParams_1 {
-  uint numPlanes;
-  float vr;
-  float ug;
-  float vg;
-  float ub;
-} ext_tex_params;
-
-vec4 textureLoadExternal(highp sampler2D plane0_1, highp sampler2D plane1_1, ivec2 coord, ExternalTextureParams params) {
-  if ((params.numPlanes == 1u)) {
-    return texelFetch(plane0_1, coord, 0);
-  }
-  float y = (texelFetch(plane0_1, coord, 0).r - 0.0625f);
-  vec2 uv = (texelFetch(plane1_1, coord, 0).rg - 0.5f);
-  float u = uv.x;
-  float v = uv.y;
-  float r = ((1.164000034f * y) + (params.vr * v));
-  float g = (((1.164000034f * y) - (params.ug * u)) - (params.vg * v));
-  float b = ((1.164000034f * y) + (params.ub * u));
-  return vec4(r, g, b, 1.0f);
-}
-
-uniform highp sampler2D arg_0_1;
-uniform highp sampler2D ext_tex_plane_1_1;
-void textureLoad_8acf41() {
-  vec4 res = textureLoadExternal(arg_0_1, ext_tex_plane_1_1, ivec2(0, 0), ext_tex_params);
-}
-
-vec4 vertex_main() {
-  textureLoad_8acf41();
-  return vec4(0.0f, 0.0f, 0.0f, 0.0f);
-}
-
-void main() {
-  gl_PointSize = 1.0;
-  vec4 inner_result = vertex_main();
-  gl_Position = inner_result;
-  gl_Position.y = -(gl_Position.y);
-  gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  return;
-}
-Error parsing GLSL shader:
-ERROR: 0:36: 'textureLoadExternal' : no matching overloaded function found 
-ERROR: 0:36: '=' :  cannot convert from ' const float' to ' temp highp 4-component vector of float'
-ERROR: 0:36: '' : compilation terminated 
-ERROR: 3 compilation errors.  No code generated.
-
-
-
-#version 310 es
-precision mediump float;
-
-struct ExternalTextureParams {
-  uint numPlanes;
-  float vr;
-  float ug;
-  float vg;
-  float ub;
-};
-
-layout(binding = 2) uniform ExternalTextureParams_1 {
-  uint numPlanes;
-  float vr;
-  float ug;
-  float vg;
-  float ub;
-} ext_tex_params;
-
-vec4 textureLoadExternal(highp sampler2D plane0_1, highp sampler2D plane1_1, ivec2 coord, ExternalTextureParams params) {
-  if ((params.numPlanes == 1u)) {
-    return texelFetch(plane0_1, coord, 0);
-  }
-  float y = (texelFetch(plane0_1, coord, 0).r - 0.0625f);
-  vec2 uv = (texelFetch(plane1_1, coord, 0).rg - 0.5f);
-  float u = uv.x;
-  float v = uv.y;
-  float r = ((1.164000034f * y) + (params.vr * v));
-  float g = (((1.164000034f * y) - (params.ug * u)) - (params.vg * v));
-  float b = ((1.164000034f * y) + (params.ub * u));
-  return vec4(r, g, b, 1.0f);
-}
-
-uniform highp sampler2D arg_0_1;
-uniform highp sampler2D ext_tex_plane_1_1;
-void textureLoad_8acf41() {
-  vec4 res = textureLoadExternal(arg_0_1, ext_tex_plane_1_1, ivec2(0, 0), ext_tex_params);
-}
-
-void fragment_main() {
-  textureLoad_8acf41();
-}
-
-void main() {
-  fragment_main();
-  return;
-}
-Error parsing GLSL shader:
-ERROR: 0:37: 'textureLoadExternal' : no matching overloaded function found 
-ERROR: 0:37: '=' :  cannot convert from ' const float' to ' temp mediump 4-component vector of float'
-ERROR: 0:37: '' : compilation terminated 
-ERROR: 3 compilation errors.  No code generated.
-
-
-
-#version 310 es
-
-struct ExternalTextureParams {
-  uint numPlanes;
-  float vr;
-  float ug;
-  float vg;
-  float ub;
-};
-
-layout(binding = 2) uniform ExternalTextureParams_1 {
-  uint numPlanes;
-  float vr;
-  float ug;
-  float vg;
-  float ub;
-} ext_tex_params;
-
-vec4 textureLoadExternal(highp sampler2D plane0_1, highp sampler2D plane1_1, ivec2 coord, ExternalTextureParams params) {
-  if ((params.numPlanes == 1u)) {
-    return texelFetch(plane0_1, coord, 0);
-  }
-  float y = (texelFetch(plane0_1, coord, 0).r - 0.0625f);
-  vec2 uv = (texelFetch(plane1_1, coord, 0).rg - 0.5f);
-  float u = uv.x;
-  float v = uv.y;
-  float r = ((1.164000034f * y) + (params.vr * v));
-  float g = (((1.164000034f * y) - (params.ug * u)) - (params.vg * v));
-  float b = ((1.164000034f * y) + (params.ub * u));
-  return vec4(r, g, b, 1.0f);
-}
-
-uniform highp sampler2D arg_0_1;
-uniform highp sampler2D ext_tex_plane_1_1;
-void textureLoad_8acf41() {
-  vec4 res = textureLoadExternal(arg_0_1, ext_tex_plane_1_1, ivec2(0, 0), ext_tex_params);
-}
-
-void compute_main() {
-  textureLoad_8acf41();
-}
-
-layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
-void main() {
-  compute_main();
-  return;
-}
-Error parsing GLSL shader:
-ERROR: 0:36: 'textureLoadExternal' : no matching overloaded function found 
-ERROR: 0:36: '=' :  cannot convert from ' const float' to ' temp highp 4-component vector of float'
-ERROR: 0:36: '' : compilation terminated 
-ERROR: 3 compilation errors.  No code generated.
-
-
-
diff --git a/test/tint/builtins/gen/textureSampleLevel/979816.wgsl.expected.glsl b/test/tint/builtins/gen/textureSampleLevel/979816.wgsl.expected.glsl
deleted file mode 100644
index 0685239655..0000000000
--- a/test/tint/builtins/gen/textureSampleLevel/979816.wgsl.expected.glsl
+++ /dev/null
@@ -1,174 +0,0 @@
-SKIP: FAILED
-
-#version 310 es
-
-struct ExternalTextureParams {
-  uint numPlanes;
-  float vr;
-  float ug;
-  float vg;
-  float ub;
-};
-
-layout(binding = 3) uniform ExternalTextureParams_1 {
-  uint numPlanes;
-  float vr;
-  float ug;
-  float vg;
-  float ub;
-} ext_tex_params;
-
-
-vec4 textureSampleExternal(highp sampler2D plane0_smp, highp sampler2D plane1_smp, vec2 coord, ExternalTextureParams params) {
-  if ((params.numPlanes == 1u)) {
-    return textureLod(plane0_smp, coord, 0.0f);
-  }
-  float y = (textureLod(plane0_smp, coord, 0.0f).r - 0.0625f);
-  vec2 uv = (textureLod(plane1_smp, coord, 0.0f).rg - 0.5f);
-  float u = uv.x;
-  float v = uv.y;
-  float r = ((1.164000034f * y) + (params.vr * v));
-  float g = (((1.164000034f * y) - (params.ug * u)) - (params.vg * v));
-  float b = ((1.164000034f * y) + (params.ub * u));
-  return vec4(r, g, b, 1.0f);
-}
-
-uniform highp sampler2D arg_0_arg_1;
-uniform highp sampler2D ext_tex_plane_1_arg_1;
-void textureSampleLevel_979816() {
-  vec4 res = textureSampleExternal(arg_0_arg_1, ext_tex_plane_1_arg_1, vec2(0.0f, 0.0f), ext_tex_params);
-}
-
-vec4 vertex_main() {
-  textureSampleLevel_979816();
-  return vec4(0.0f, 0.0f, 0.0f, 0.0f);
-}
-
-void main() {
-  gl_PointSize = 1.0;
-  vec4 inner_result = vertex_main();
-  gl_Position = inner_result;
-  gl_Position.y = -(gl_Position.y);
-  gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  return;
-}
-Error parsing GLSL shader:
-ERROR: 0:37: 'textureSampleExternal' : no matching overloaded function found 
-ERROR: 0:37: '=' :  cannot convert from ' const float' to ' temp highp 4-component vector of float'
-ERROR: 0:37: '' : compilation terminated 
-ERROR: 3 compilation errors.  No code generated.
-
-
-
-#version 310 es
-precision mediump float;
-
-struct ExternalTextureParams {
-  uint numPlanes;
-  float vr;
-  float ug;
-  float vg;
-  float ub;
-};
-
-layout(binding = 3) uniform ExternalTextureParams_1 {
-  uint numPlanes;
-  float vr;
-  float ug;
-  float vg;
-  float ub;
-} ext_tex_params;
-
-
-vec4 textureSampleExternal(highp sampler2D plane0_smp, highp sampler2D plane1_smp, vec2 coord, ExternalTextureParams params) {
-  if ((params.numPlanes == 1u)) {
-    return textureLod(plane0_smp, coord, 0.0f);
-  }
-  float y = (textureLod(plane0_smp, coord, 0.0f).r - 0.0625f);
-  vec2 uv = (textureLod(plane1_smp, coord, 0.0f).rg - 0.5f);
-  float u = uv.x;
-  float v = uv.y;
-  float r = ((1.164000034f * y) + (params.vr * v));
-  float g = (((1.164000034f * y) - (params.ug * u)) - (params.vg * v));
-  float b = ((1.164000034f * y) + (params.ub * u));
-  return vec4(r, g, b, 1.0f);
-}
-
-uniform highp sampler2D arg_0_arg_1;
-uniform highp sampler2D ext_tex_plane_1_arg_1;
-void textureSampleLevel_979816() {
-  vec4 res = textureSampleExternal(arg_0_arg_1, ext_tex_plane_1_arg_1, vec2(0.0f, 0.0f), ext_tex_params);
-}
-
-void fragment_main() {
-  textureSampleLevel_979816();
-}
-
-void main() {
-  fragment_main();
-  return;
-}
-Error parsing GLSL shader:
-ERROR: 0:38: 'textureSampleExternal' : no matching overloaded function found 
-ERROR: 0:38: '=' :  cannot convert from ' const float' to ' temp mediump 4-component vector of float'
-ERROR: 0:38: '' : compilation terminated 
-ERROR: 3 compilation errors.  No code generated.
-
-
-
-#version 310 es
-
-struct ExternalTextureParams {
-  uint numPlanes;
-  float vr;
-  float ug;
-  float vg;
-  float ub;
-};
-
-layout(binding = 3) uniform ExternalTextureParams_1 {
-  uint numPlanes;
-  float vr;
-  float ug;
-  float vg;
-  float ub;
-} ext_tex_params;
-
-
-vec4 textureSampleExternal(highp sampler2D plane0_smp, highp sampler2D plane1_smp, vec2 coord, ExternalTextureParams params) {
-  if ((params.numPlanes == 1u)) {
-    return textureLod(plane0_smp, coord, 0.0f);
-  }
-  float y = (textureLod(plane0_smp, coord, 0.0f).r - 0.0625f);
-  vec2 uv = (textureLod(plane1_smp, coord, 0.0f).rg - 0.5f);
-  float u = uv.x;
-  float v = uv.y;
-  float r = ((1.164000034f * y) + (params.vr * v));
-  float g = (((1.164000034f * y) - (params.ug * u)) - (params.vg * v));
-  float b = ((1.164000034f * y) + (params.ub * u));
-  return vec4(r, g, b, 1.0f);
-}
-
-uniform highp sampler2D arg_0_arg_1;
-uniform highp sampler2D ext_tex_plane_1_arg_1;
-void textureSampleLevel_979816() {
-  vec4 res = textureSampleExternal(arg_0_arg_1, ext_tex_plane_1_arg_1, vec2(0.0f, 0.0f), ext_tex_params);
-}
-
-void compute_main() {
-  textureSampleLevel_979816();
-}
-
-layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
-void main() {
-  compute_main();
-  return;
-}
-Error parsing GLSL shader:
-ERROR: 0:37: 'textureSampleExternal' : no matching overloaded function found 
-ERROR: 0:37: '=' :  cannot convert from ' const float' to ' temp highp 4-component vector of float'
-ERROR: 0:37: '' : compilation terminated 
-ERROR: 3 compilation errors.  No code generated.
-
-
-