diff --git a/naga/tests/naga/snapshots.rs b/naga/tests/naga/snapshots.rs
index b201776ba8e..e219d81d4c3 100644
--- a/naga/tests/naga/snapshots.rs
+++ b/naga/tests/naga/snapshots.rs
@@ -2,6 +2,8 @@
 // the corresponding warnings aren't helpful.
 #![allow(dead_code, unused_imports)]
 
+use core::fmt::Write;
+
 use std::{
     fs,
     path::{Path, PathBuf},
@@ -167,7 +169,7 @@ struct Input {
     ///
     /// If the subdirectory is omitted, we assume that the output goes
     /// to "wgsl".
-    subdirectory: Option<PathBuf>,
+    subdirectory: PathBuf,
 
     /// The input filename name, without a directory.
     file_name: PathBuf,
@@ -190,9 +192,9 @@ impl Input {
     /// The `input` path is interpreted relative to the `BASE_DIR_IN`
     /// subdirectory of the directory given by the `CARGO_MANIFEST_DIR`
     /// environment variable.
-    fn new(subdirectory: Option<&str>, name: &str, extension: &str) -> Input {
+    fn new(subdirectory: &str, name: &str, extension: &str) -> Input {
         Input {
-            subdirectory: subdirectory.map(PathBuf::from),
+            subdirectory: PathBuf::from(subdirectory),
             // Don't wipe out any extensions on `name`, as
             // `with_extension` would do.
             file_name: PathBuf::from(format!("{name}.{extension}")),
@@ -202,13 +204,11 @@ impl Input {
 
     /// Return an iterator that produces an `Input` for each entry in `subdirectory`.
     fn files_in_dir(
-        subdirectory: Option<&'static str>,
+        subdirectory: &'static str,
         file_extensions: &'static [&'static str],
     ) -> impl Iterator<Item = Input> + 'static {
-        let mut input_directory = Path::new(env!("CARGO_MANIFEST_DIR")).join(BASE_DIR_IN);
-        if let Some(ref subdirectory) = subdirectory {
-            input_directory.push(subdirectory);
-        }
+        let input_directory = Path::new(CRATE_ROOT).join(BASE_DIR_IN).join(subdirectory);
+
         let entries = match std::fs::read_dir(&input_directory) {
             Ok(entries) => entries,
             Err(err) => panic!(
@@ -245,14 +245,12 @@ impl Input {
     /// Return the path to the input directory.
     fn input_directory(&self) -> PathBuf {
         let mut dir = Path::new(CRATE_ROOT).join(BASE_DIR_IN);
-        if let Some(ref subdirectory) = self.subdirectory {
-            dir.push(subdirectory);
-        }
+        dir.push(&self.subdirectory);
         dir
     }
 
     /// Return the path to the output directory.
-    fn output_directory(&self, subdirectory: &str) -> PathBuf {
+    fn output_directory(subdirectory: &str) -> PathBuf {
         let mut dir = Path::new(CRATE_ROOT).join(BASE_DIR_OUT);
         dir.push(subdirectory);
         dir
@@ -266,14 +264,24 @@ impl Input {
     }
 
     fn output_path(&self, subdirectory: &str, extension: &str) -> PathBuf {
-        let mut output = self.output_directory(subdirectory);
+        let mut output = Self::output_directory(subdirectory);
         if self.keep_input_extension {
-            let mut file_name = self.file_name.as_os_str().to_owned();
-            file_name.push(".");
-            file_name.push(extension);
+            let file_name = format!(
+                "{}-{}.{}",
+                self.subdirectory.display(),
+                self.file_name.display(),
+                extension
+            );
+
             output.push(&file_name);
         } else {
-            output.push(&self.file_name);
+            let file_name = format!(
+                "{}-{}",
+                self.subdirectory.display(),
+                self.file_name.display()
+            );
+
+            output.push(&file_name);
             output.set_extension(extension);
         }
         output
@@ -792,7 +800,7 @@ fn write_output_wgsl(
 fn convert_snapshots_wgsl() {
     let _ = env_logger::try_init();
 
-    for input in Input::files_in_dir(Some("wgsl"), &["wgsl"]) {
+    for input in Input::files_in_dir("wgsl", &["wgsl"]) {
         let source = input.read_source();
         // crlf will make the large split output different on different platform
         let source = source.replace('\r', "");
@@ -813,7 +821,7 @@ fn convert_snapshots_spv() {
 
     let _ = env_logger::try_init();
 
-    for input in Input::files_in_dir(Some("spv"), &["spvasm"]) {
+    for input in Input::files_in_dir("spv", &["spvasm"]) {
         println!("Assembling '{}'", input.file_name.display());
 
         let command = Command::new("spirv-as")
@@ -861,7 +869,7 @@ fn convert_snapshots_spv() {
 fn convert_snapshots_glsl() {
     let _ = env_logger::try_init();
 
-    for input in Input::files_in_dir(Some("glsl"), &["vert", "frag", "comp"]) {
+    for input in Input::files_in_dir("glsl", &["vert", "frag", "comp"]) {
         let input = Input {
             keep_input_extension: true,
             ..input
diff --git a/naga/tests/out/analysis/shadow.info.ron b/naga/tests/out/analysis/spv-shadow.info.ron
similarity index 100%
rename from naga/tests/out/analysis/shadow.info.ron
rename to naga/tests/out/analysis/spv-shadow.info.ron
diff --git a/naga/tests/out/analysis/access.info.ron b/naga/tests/out/analysis/wgsl-access.info.ron
similarity index 100%
rename from naga/tests/out/analysis/access.info.ron
rename to naga/tests/out/analysis/wgsl-access.info.ron
diff --git a/naga/tests/out/analysis/collatz.info.ron b/naga/tests/out/analysis/wgsl-collatz.info.ron
similarity index 100%
rename from naga/tests/out/analysis/collatz.info.ron
rename to naga/tests/out/analysis/wgsl-collatz.info.ron
diff --git a/naga/tests/out/analysis/overrides.info.ron b/naga/tests/out/analysis/wgsl-overrides.info.ron
similarity index 100%
rename from naga/tests/out/analysis/overrides.info.ron
rename to naga/tests/out/analysis/wgsl-overrides.info.ron
diff --git a/naga/tests/out/analysis/storage-textures.info.ron b/naga/tests/out/analysis/wgsl-storage-textures.info.ron
similarity index 100%
rename from naga/tests/out/analysis/storage-textures.info.ron
rename to naga/tests/out/analysis/wgsl-storage-textures.info.ron
diff --git a/naga/tests/out/dot/quad.dot b/naga/tests/out/dot/wgsl-quad.dot
similarity index 100%
rename from naga/tests/out/dot/quad.dot
rename to naga/tests/out/dot/wgsl-quad.dot
diff --git a/naga/tests/out/glsl/variations.frag.main.Fragment.glsl b/naga/tests/out/glsl/glsl-variations.frag.main.Fragment.glsl
similarity index 100%
rename from naga/tests/out/glsl/variations.frag.main.Fragment.glsl
rename to naga/tests/out/glsl/glsl-variations.frag.main.Fragment.glsl
diff --git a/naga/tests/out/glsl/do-while.main.Fragment.glsl b/naga/tests/out/glsl/spv-do-while.main.Fragment.glsl
similarity index 100%
rename from naga/tests/out/glsl/do-while.main.Fragment.glsl
rename to naga/tests/out/glsl/spv-do-while.main.Fragment.glsl
diff --git a/naga/tests/out/glsl/quad-vert.main.Vertex.glsl b/naga/tests/out/glsl/spv-quad-vert.main.Vertex.glsl
similarity index 100%
rename from naga/tests/out/glsl/quad-vert.main.Vertex.glsl
rename to naga/tests/out/glsl/spv-quad-vert.main.Vertex.glsl
diff --git a/naga/tests/out/glsl/spec-constants-issue-5598.fragment.Fragment.glsl b/naga/tests/out/glsl/spv-spec-constants-issue-5598.fragment.Fragment.glsl
similarity index 100%
rename from naga/tests/out/glsl/spec-constants-issue-5598.fragment.Fragment.glsl
rename to naga/tests/out/glsl/spv-spec-constants-issue-5598.fragment.Fragment.glsl
diff --git a/naga/tests/out/glsl/spec-constants-issue-5598.vertex.Vertex.glsl b/naga/tests/out/glsl/spv-spec-constants-issue-5598.vertex.Vertex.glsl
similarity index 100%
rename from naga/tests/out/glsl/spec-constants-issue-5598.vertex.Vertex.glsl
rename to naga/tests/out/glsl/spv-spec-constants-issue-5598.vertex.Vertex.glsl
diff --git a/naga/tests/out/glsl/subgroup-operations-s.main.Compute.glsl b/naga/tests/out/glsl/spv-subgroup-operations-s.main.Compute.glsl
similarity index 100%
rename from naga/tests/out/glsl/subgroup-operations-s.main.Compute.glsl
rename to naga/tests/out/glsl/spv-subgroup-operations-s.main.Compute.glsl
diff --git a/naga/tests/out/glsl/unnamed-gl-per-vertex.main.Vertex.glsl b/naga/tests/out/glsl/spv-unnamed-gl-per-vertex.main.Vertex.glsl
similarity index 100%
rename from naga/tests/out/glsl/unnamed-gl-per-vertex.main.Vertex.glsl
rename to naga/tests/out/glsl/spv-unnamed-gl-per-vertex.main.Vertex.glsl
diff --git a/naga/tests/out/glsl/6438-conflicting-idents.fs.Fragment.glsl b/naga/tests/out/glsl/wgsl-6438-conflicting-idents.fs.Fragment.glsl
similarity index 100%
rename from naga/tests/out/glsl/6438-conflicting-idents.fs.Fragment.glsl
rename to naga/tests/out/glsl/wgsl-6438-conflicting-idents.fs.Fragment.glsl
diff --git a/naga/tests/out/glsl/6438-conflicting-idents.vs.Vertex.glsl b/naga/tests/out/glsl/wgsl-6438-conflicting-idents.vs.Vertex.glsl
similarity index 100%
rename from naga/tests/out/glsl/6438-conflicting-idents.vs.Vertex.glsl
rename to naga/tests/out/glsl/wgsl-6438-conflicting-idents.vs.Vertex.glsl
diff --git a/naga/tests/out/glsl/6772-unpack-expr-accesses.main.Compute.glsl b/naga/tests/out/glsl/wgsl-6772-unpack-expr-accesses.main.Compute.glsl
similarity index 100%
rename from naga/tests/out/glsl/6772-unpack-expr-accesses.main.Compute.glsl
rename to naga/tests/out/glsl/wgsl-6772-unpack-expr-accesses.main.Compute.glsl
diff --git a/naga/tests/out/glsl/abstract-types-return.main.Compute.glsl b/naga/tests/out/glsl/wgsl-abstract-types-return.main.Compute.glsl
similarity index 100%
rename from naga/tests/out/glsl/abstract-types-return.main.Compute.glsl
rename to naga/tests/out/glsl/wgsl-abstract-types-return.main.Compute.glsl
diff --git a/naga/tests/out/glsl/access.assign_through_ptr.Compute.glsl b/naga/tests/out/glsl/wgsl-access.assign_through_ptr.Compute.glsl
similarity index 100%
rename from naga/tests/out/glsl/access.assign_through_ptr.Compute.glsl
rename to naga/tests/out/glsl/wgsl-access.assign_through_ptr.Compute.glsl
diff --git a/naga/tests/out/glsl/access.assign_to_ptr_components.Compute.glsl b/naga/tests/out/glsl/wgsl-access.assign_to_ptr_components.Compute.glsl
similarity index 100%
rename from naga/tests/out/glsl/access.assign_to_ptr_components.Compute.glsl
rename to naga/tests/out/glsl/wgsl-access.assign_to_ptr_components.Compute.glsl
diff --git a/naga/tests/out/glsl/access.foo_frag.Fragment.glsl b/naga/tests/out/glsl/wgsl-access.foo_frag.Fragment.glsl
similarity index 100%
rename from naga/tests/out/glsl/access.foo_frag.Fragment.glsl
rename to naga/tests/out/glsl/wgsl-access.foo_frag.Fragment.glsl
diff --git a/naga/tests/out/glsl/access.foo_vert.Vertex.glsl b/naga/tests/out/glsl/wgsl-access.foo_vert.Vertex.glsl
similarity index 100%
rename from naga/tests/out/glsl/access.foo_vert.Vertex.glsl
rename to naga/tests/out/glsl/wgsl-access.foo_vert.Vertex.glsl
diff --git a/naga/tests/out/glsl/array-in-ctor.cs_main.Compute.glsl b/naga/tests/out/glsl/wgsl-array-in-ctor.cs_main.Compute.glsl
similarity index 100%
rename from naga/tests/out/glsl/array-in-ctor.cs_main.Compute.glsl
rename to naga/tests/out/glsl/wgsl-array-in-ctor.cs_main.Compute.glsl
diff --git a/naga/tests/out/glsl/array-in-function-return-type.main.Fragment.glsl b/naga/tests/out/glsl/wgsl-array-in-function-return-type.main.Fragment.glsl
similarity index 100%
rename from naga/tests/out/glsl/array-in-function-return-type.main.Fragment.glsl
rename to naga/tests/out/glsl/wgsl-array-in-function-return-type.main.Fragment.glsl
diff --git a/naga/tests/out/glsl/atomicOps.cs_main.Compute.glsl b/naga/tests/out/glsl/wgsl-atomicOps.cs_main.Compute.glsl
similarity index 100%
rename from naga/tests/out/glsl/atomicOps.cs_main.Compute.glsl
rename to naga/tests/out/glsl/wgsl-atomicOps.cs_main.Compute.glsl
diff --git a/naga/tests/out/glsl/atomicTexture.cs_main.Compute.glsl b/naga/tests/out/glsl/wgsl-atomicTexture.cs_main.Compute.glsl
similarity index 100%
rename from naga/tests/out/glsl/atomicTexture.cs_main.Compute.glsl
rename to naga/tests/out/glsl/wgsl-atomicTexture.cs_main.Compute.glsl
diff --git a/naga/tests/out/glsl/bitcast.main.Compute.glsl b/naga/tests/out/glsl/wgsl-bitcast.main.Compute.glsl
similarity index 100%
rename from naga/tests/out/glsl/bitcast.main.Compute.glsl
rename to naga/tests/out/glsl/wgsl-bitcast.main.Compute.glsl
diff --git a/naga/tests/out/glsl/bits.main.Compute.glsl b/naga/tests/out/glsl/wgsl-bits.main.Compute.glsl
similarity index 100%
rename from naga/tests/out/glsl/bits.main.Compute.glsl
rename to naga/tests/out/glsl/wgsl-bits.main.Compute.glsl
diff --git a/naga/tests/out/glsl/bits_downlevel.main.Fragment.glsl b/naga/tests/out/glsl/wgsl-bits_downlevel.main.Fragment.glsl
similarity index 100%
rename from naga/tests/out/glsl/bits_downlevel.main.Fragment.glsl
rename to naga/tests/out/glsl/wgsl-bits_downlevel.main.Fragment.glsl
diff --git a/naga/tests/out/glsl/bits_downlevel_webgl.main.Fragment.glsl b/naga/tests/out/glsl/wgsl-bits_downlevel_webgl.main.Fragment.glsl
similarity index 100%
rename from naga/tests/out/glsl/bits_downlevel_webgl.main.Fragment.glsl
rename to naga/tests/out/glsl/wgsl-bits_downlevel_webgl.main.Fragment.glsl
diff --git a/naga/tests/out/glsl/boids.main.Compute.glsl b/naga/tests/out/glsl/wgsl-boids.main.Compute.glsl
similarity index 100%
rename from naga/tests/out/glsl/boids.main.Compute.glsl
rename to naga/tests/out/glsl/wgsl-boids.main.Compute.glsl
diff --git a/naga/tests/out/glsl/bounds-check-image-restrict.fragment_shader.Fragment.glsl b/naga/tests/out/glsl/wgsl-bounds-check-image-restrict.fragment_shader.Fragment.glsl
similarity index 100%
rename from naga/tests/out/glsl/bounds-check-image-restrict.fragment_shader.Fragment.glsl
rename to naga/tests/out/glsl/wgsl-bounds-check-image-restrict.fragment_shader.Fragment.glsl
diff --git a/naga/tests/out/glsl/bounds-check-image-rzsw.fragment_shader.Fragment.glsl b/naga/tests/out/glsl/wgsl-bounds-check-image-rzsw.fragment_shader.Fragment.glsl
similarity index 100%
rename from naga/tests/out/glsl/bounds-check-image-rzsw.fragment_shader.Fragment.glsl
rename to naga/tests/out/glsl/wgsl-bounds-check-image-rzsw.fragment_shader.Fragment.glsl
diff --git a/naga/tests/out/glsl/break-if.main.Compute.glsl b/naga/tests/out/glsl/wgsl-break-if.main.Compute.glsl
similarity index 100%
rename from naga/tests/out/glsl/break-if.main.Compute.glsl
rename to naga/tests/out/glsl/wgsl-break-if.main.Compute.glsl
diff --git a/naga/tests/out/glsl/const-exprs.main.Compute.glsl b/naga/tests/out/glsl/wgsl-const-exprs.main.Compute.glsl
similarity index 100%
rename from naga/tests/out/glsl/const-exprs.main.Compute.glsl
rename to naga/tests/out/glsl/wgsl-const-exprs.main.Compute.glsl
diff --git a/naga/tests/out/glsl/constructors.main.Compute.glsl b/naga/tests/out/glsl/wgsl-constructors.main.Compute.glsl
similarity index 100%
rename from naga/tests/out/glsl/constructors.main.Compute.glsl
rename to naga/tests/out/glsl/wgsl-constructors.main.Compute.glsl
diff --git a/naga/tests/out/glsl/control-flow.main.Compute.glsl b/naga/tests/out/glsl/wgsl-control-flow.main.Compute.glsl
similarity index 100%
rename from naga/tests/out/glsl/control-flow.main.Compute.glsl
rename to naga/tests/out/glsl/wgsl-control-flow.main.Compute.glsl
diff --git a/naga/tests/out/glsl/conversions.main.Compute.glsl b/naga/tests/out/glsl/wgsl-conversions.main.Compute.glsl
similarity index 100%
rename from naga/tests/out/glsl/conversions.main.Compute.glsl
rename to naga/tests/out/glsl/wgsl-conversions.main.Compute.glsl
diff --git a/naga/tests/out/glsl/cross.main.Compute.glsl b/naga/tests/out/glsl/wgsl-cross.main.Compute.glsl
similarity index 100%
rename from naga/tests/out/glsl/cross.main.Compute.glsl
rename to naga/tests/out/glsl/wgsl-cross.main.Compute.glsl
diff --git a/naga/tests/out/glsl/cubeArrayShadow.fragment.Fragment.glsl b/naga/tests/out/glsl/wgsl-cubeArrayShadow.fragment.Fragment.glsl
similarity index 100%
rename from naga/tests/out/glsl/cubeArrayShadow.fragment.Fragment.glsl
rename to naga/tests/out/glsl/wgsl-cubeArrayShadow.fragment.Fragment.glsl
diff --git a/naga/tests/out/glsl/dualsource.main.Fragment.glsl b/naga/tests/out/glsl/wgsl-dualsource.main.Fragment.glsl
similarity index 100%
rename from naga/tests/out/glsl/dualsource.main.Fragment.glsl
rename to naga/tests/out/glsl/wgsl-dualsource.main.Fragment.glsl
diff --git a/naga/tests/out/glsl/empty.main.Compute.glsl b/naga/tests/out/glsl/wgsl-empty.main.Compute.glsl
similarity index 100%
rename from naga/tests/out/glsl/empty.main.Compute.glsl
rename to naga/tests/out/glsl/wgsl-empty.main.Compute.glsl
diff --git a/naga/tests/out/glsl/f64.main.Compute.glsl b/naga/tests/out/glsl/wgsl-f64.main.Compute.glsl
similarity index 100%
rename from naga/tests/out/glsl/f64.main.Compute.glsl
rename to naga/tests/out/glsl/wgsl-f64.main.Compute.glsl
diff --git a/naga/tests/out/glsl/force_point_size_vertex_shader_webgl.fs_main.Fragment.glsl b/naga/tests/out/glsl/wgsl-force_point_size_vertex_shader_webgl.fs_main.Fragment.glsl
similarity index 100%
rename from naga/tests/out/glsl/force_point_size_vertex_shader_webgl.fs_main.Fragment.glsl
rename to naga/tests/out/glsl/wgsl-force_point_size_vertex_shader_webgl.fs_main.Fragment.glsl
diff --git a/naga/tests/out/glsl/force_point_size_vertex_shader_webgl.vs_main.Vertex.glsl b/naga/tests/out/glsl/wgsl-force_point_size_vertex_shader_webgl.vs_main.Vertex.glsl
similarity index 100%
rename from naga/tests/out/glsl/force_point_size_vertex_shader_webgl.vs_main.Vertex.glsl
rename to naga/tests/out/glsl/wgsl-force_point_size_vertex_shader_webgl.vs_main.Vertex.glsl
diff --git a/naga/tests/out/glsl/fragment-output.main_vec2scalar.Fragment.glsl b/naga/tests/out/glsl/wgsl-fragment-output.main_vec2scalar.Fragment.glsl
similarity index 100%
rename from naga/tests/out/glsl/fragment-output.main_vec2scalar.Fragment.glsl
rename to naga/tests/out/glsl/wgsl-fragment-output.main_vec2scalar.Fragment.glsl
diff --git a/naga/tests/out/glsl/fragment-output.main_vec4vec3.Fragment.glsl b/naga/tests/out/glsl/wgsl-fragment-output.main_vec4vec3.Fragment.glsl
similarity index 100%
rename from naga/tests/out/glsl/fragment-output.main_vec4vec3.Fragment.glsl
rename to naga/tests/out/glsl/wgsl-fragment-output.main_vec4vec3.Fragment.glsl
diff --git a/naga/tests/out/glsl/functions-webgl.main.Fragment.glsl b/naga/tests/out/glsl/wgsl-functions-webgl.main.Fragment.glsl
similarity index 100%
rename from naga/tests/out/glsl/functions-webgl.main.Fragment.glsl
rename to naga/tests/out/glsl/wgsl-functions-webgl.main.Fragment.glsl
diff --git a/naga/tests/out/glsl/functions.main.Compute.glsl b/naga/tests/out/glsl/wgsl-functions.main.Compute.glsl
similarity index 100%
rename from naga/tests/out/glsl/functions.main.Compute.glsl
rename to naga/tests/out/glsl/wgsl-functions.main.Compute.glsl
diff --git a/naga/tests/out/glsl/globals.main.Compute.glsl b/naga/tests/out/glsl/wgsl-globals.main.Compute.glsl
similarity index 100%
rename from naga/tests/out/glsl/globals.main.Compute.glsl
rename to naga/tests/out/glsl/wgsl-globals.main.Compute.glsl
diff --git a/naga/tests/out/glsl/image.gather.Fragment.glsl b/naga/tests/out/glsl/wgsl-image.gather.Fragment.glsl
similarity index 100%
rename from naga/tests/out/glsl/image.gather.Fragment.glsl
rename to naga/tests/out/glsl/wgsl-image.gather.Fragment.glsl
diff --git a/naga/tests/out/glsl/image.levels_queries.Vertex.glsl b/naga/tests/out/glsl/wgsl-image.levels_queries.Vertex.glsl
similarity index 100%
rename from naga/tests/out/glsl/image.levels_queries.Vertex.glsl
rename to naga/tests/out/glsl/wgsl-image.levels_queries.Vertex.glsl
diff --git a/naga/tests/out/glsl/image.main.Compute.glsl b/naga/tests/out/glsl/wgsl-image.main.Compute.glsl
similarity index 100%
rename from naga/tests/out/glsl/image.main.Compute.glsl
rename to naga/tests/out/glsl/wgsl-image.main.Compute.glsl
diff --git a/naga/tests/out/glsl/image.queries.Vertex.glsl b/naga/tests/out/glsl/wgsl-image.queries.Vertex.glsl
similarity index 100%
rename from naga/tests/out/glsl/image.queries.Vertex.glsl
rename to naga/tests/out/glsl/wgsl-image.queries.Vertex.glsl
diff --git a/naga/tests/out/glsl/image.texture_sample.Fragment.glsl b/naga/tests/out/glsl/wgsl-image.texture_sample.Fragment.glsl
similarity index 100%
rename from naga/tests/out/glsl/image.texture_sample.Fragment.glsl
rename to naga/tests/out/glsl/wgsl-image.texture_sample.Fragment.glsl
diff --git a/naga/tests/out/glsl/image.texture_sample_comparison.Fragment.glsl b/naga/tests/out/glsl/wgsl-image.texture_sample_comparison.Fragment.glsl
similarity index 100%
rename from naga/tests/out/glsl/image.texture_sample_comparison.Fragment.glsl
rename to naga/tests/out/glsl/wgsl-image.texture_sample_comparison.Fragment.glsl
diff --git a/naga/tests/out/glsl/interpolate_compat.frag_main.Fragment.glsl b/naga/tests/out/glsl/wgsl-interpolate_compat.frag_main.Fragment.glsl
similarity index 100%
rename from naga/tests/out/glsl/interpolate_compat.frag_main.Fragment.glsl
rename to naga/tests/out/glsl/wgsl-interpolate_compat.frag_main.Fragment.glsl
diff --git a/naga/tests/out/glsl/interpolate_compat.vert_main.Vertex.glsl b/naga/tests/out/glsl/wgsl-interpolate_compat.vert_main.Vertex.glsl
similarity index 100%
rename from naga/tests/out/glsl/interpolate_compat.vert_main.Vertex.glsl
rename to naga/tests/out/glsl/wgsl-interpolate_compat.vert_main.Vertex.glsl
diff --git a/naga/tests/out/glsl/invariant.fs.Fragment.glsl b/naga/tests/out/glsl/wgsl-invariant.fs.Fragment.glsl
similarity index 100%
rename from naga/tests/out/glsl/invariant.fs.Fragment.glsl
rename to naga/tests/out/glsl/wgsl-invariant.fs.Fragment.glsl
diff --git a/naga/tests/out/glsl/invariant.vs.Vertex.glsl b/naga/tests/out/glsl/wgsl-invariant.vs.Vertex.glsl
similarity index 100%
rename from naga/tests/out/glsl/invariant.vs.Vertex.glsl
rename to naga/tests/out/glsl/wgsl-invariant.vs.Vertex.glsl
diff --git a/naga/tests/out/glsl/math-functions.main.Fragment.glsl b/naga/tests/out/glsl/wgsl-math-functions.main.Fragment.glsl
similarity index 100%
rename from naga/tests/out/glsl/math-functions.main.Fragment.glsl
rename to naga/tests/out/glsl/wgsl-math-functions.main.Fragment.glsl
diff --git a/naga/tests/out/glsl/multiview.main.Fragment.glsl b/naga/tests/out/glsl/wgsl-multiview.main.Fragment.glsl
similarity index 100%
rename from naga/tests/out/glsl/multiview.main.Fragment.glsl
rename to naga/tests/out/glsl/wgsl-multiview.main.Fragment.glsl
diff --git a/naga/tests/out/glsl/multiview_webgl.main.Fragment.glsl b/naga/tests/out/glsl/wgsl-multiview_webgl.main.Fragment.glsl
similarity index 100%
rename from naga/tests/out/glsl/multiview_webgl.main.Fragment.glsl
rename to naga/tests/out/glsl/wgsl-multiview_webgl.main.Fragment.glsl
diff --git a/naga/tests/out/glsl/operators.main.Compute.glsl b/naga/tests/out/glsl/wgsl-operators.main.Compute.glsl
similarity index 100%
rename from naga/tests/out/glsl/operators.main.Compute.glsl
rename to naga/tests/out/glsl/wgsl-operators.main.Compute.glsl
diff --git a/naga/tests/out/glsl/overrides.main.Compute.glsl b/naga/tests/out/glsl/wgsl-overrides.main.Compute.glsl
similarity index 100%
rename from naga/tests/out/glsl/overrides.main.Compute.glsl
rename to naga/tests/out/glsl/wgsl-overrides.main.Compute.glsl
diff --git a/naga/tests/out/glsl/padding.vertex.Vertex.glsl b/naga/tests/out/glsl/wgsl-padding.vertex.Vertex.glsl
similarity index 100%
rename from naga/tests/out/glsl/padding.vertex.Vertex.glsl
rename to naga/tests/out/glsl/wgsl-padding.vertex.Vertex.glsl
diff --git a/naga/tests/out/glsl/phony_assignment.main.Compute.glsl b/naga/tests/out/glsl/wgsl-phony_assignment.main.Compute.glsl
similarity index 100%
rename from naga/tests/out/glsl/phony_assignment.main.Compute.glsl
rename to naga/tests/out/glsl/wgsl-phony_assignment.main.Compute.glsl
diff --git a/naga/tests/out/glsl/push-constants.main.Fragment.glsl b/naga/tests/out/glsl/wgsl-push-constants.main.Fragment.glsl
similarity index 100%
rename from naga/tests/out/glsl/push-constants.main.Fragment.glsl
rename to naga/tests/out/glsl/wgsl-push-constants.main.Fragment.glsl
diff --git a/naga/tests/out/glsl/push-constants.vert_main.Vertex.glsl b/naga/tests/out/glsl/wgsl-push-constants.vert_main.Vertex.glsl
similarity index 100%
rename from naga/tests/out/glsl/push-constants.vert_main.Vertex.glsl
rename to naga/tests/out/glsl/wgsl-push-constants.vert_main.Vertex.glsl
diff --git a/naga/tests/out/glsl/quad.frag_main.Fragment.glsl b/naga/tests/out/glsl/wgsl-quad.frag_main.Fragment.glsl
similarity index 100%
rename from naga/tests/out/glsl/quad.frag_main.Fragment.glsl
rename to naga/tests/out/glsl/wgsl-quad.frag_main.Fragment.glsl
diff --git a/naga/tests/out/glsl/quad.fs_extra.Fragment.glsl b/naga/tests/out/glsl/wgsl-quad.fs_extra.Fragment.glsl
similarity index 100%
rename from naga/tests/out/glsl/quad.fs_extra.Fragment.glsl
rename to naga/tests/out/glsl/wgsl-quad.fs_extra.Fragment.glsl
diff --git a/naga/tests/out/glsl/quad.vert_main.Vertex.glsl b/naga/tests/out/glsl/wgsl-quad.vert_main.Vertex.glsl
similarity index 100%
rename from naga/tests/out/glsl/quad.vert_main.Vertex.glsl
rename to naga/tests/out/glsl/wgsl-quad.vert_main.Vertex.glsl
diff --git a/naga/tests/out/glsl/sample-cube-array-depth-lod.main.Fragment.glsl b/naga/tests/out/glsl/wgsl-sample-cube-array-depth-lod.main.Fragment.glsl
similarity index 100%
rename from naga/tests/out/glsl/sample-cube-array-depth-lod.main.Fragment.glsl
rename to naga/tests/out/glsl/wgsl-sample-cube-array-depth-lod.main.Fragment.glsl
diff --git a/naga/tests/out/glsl/separate-entry-points.compute.Compute.glsl b/naga/tests/out/glsl/wgsl-separate-entry-points.compute.Compute.glsl
similarity index 100%
rename from naga/tests/out/glsl/separate-entry-points.compute.Compute.glsl
rename to naga/tests/out/glsl/wgsl-separate-entry-points.compute.Compute.glsl
diff --git a/naga/tests/out/glsl/separate-entry-points.fragment.Fragment.glsl b/naga/tests/out/glsl/wgsl-separate-entry-points.fragment.Fragment.glsl
similarity index 100%
rename from naga/tests/out/glsl/separate-entry-points.fragment.Fragment.glsl
rename to naga/tests/out/glsl/wgsl-separate-entry-points.fragment.Fragment.glsl
diff --git a/naga/tests/out/glsl/shadow.fs_main.Fragment.glsl b/naga/tests/out/glsl/wgsl-shadow.fs_main.Fragment.glsl
similarity index 100%
rename from naga/tests/out/glsl/shadow.fs_main.Fragment.glsl
rename to naga/tests/out/glsl/wgsl-shadow.fs_main.Fragment.glsl
diff --git a/naga/tests/out/glsl/shadow.fs_main_without_storage.Fragment.glsl b/naga/tests/out/glsl/wgsl-shadow.fs_main_without_storage.Fragment.glsl
similarity index 100%
rename from naga/tests/out/glsl/shadow.fs_main_without_storage.Fragment.glsl
rename to naga/tests/out/glsl/wgsl-shadow.fs_main_without_storage.Fragment.glsl
diff --git a/naga/tests/out/glsl/shadow.vs_main.Vertex.glsl b/naga/tests/out/glsl/wgsl-shadow.vs_main.Vertex.glsl
similarity index 100%
rename from naga/tests/out/glsl/shadow.vs_main.Vertex.glsl
rename to naga/tests/out/glsl/wgsl-shadow.vs_main.Vertex.glsl
diff --git a/naga/tests/out/glsl/skybox.fs_main.Fragment.glsl b/naga/tests/out/glsl/wgsl-skybox.fs_main.Fragment.glsl
similarity index 100%
rename from naga/tests/out/glsl/skybox.fs_main.Fragment.glsl
rename to naga/tests/out/glsl/wgsl-skybox.fs_main.Fragment.glsl
diff --git a/naga/tests/out/glsl/skybox.vs_main.Vertex.glsl b/naga/tests/out/glsl/wgsl-skybox.vs_main.Vertex.glsl
similarity index 100%
rename from naga/tests/out/glsl/skybox.vs_main.Vertex.glsl
rename to naga/tests/out/glsl/wgsl-skybox.vs_main.Vertex.glsl
diff --git a/naga/tests/out/glsl/standard.derivatives.Fragment.glsl b/naga/tests/out/glsl/wgsl-standard.derivatives.Fragment.glsl
similarity index 100%
rename from naga/tests/out/glsl/standard.derivatives.Fragment.glsl
rename to naga/tests/out/glsl/wgsl-standard.derivatives.Fragment.glsl
diff --git a/naga/tests/out/glsl/struct-layout.needs_padding_comp.Compute.glsl b/naga/tests/out/glsl/wgsl-struct-layout.needs_padding_comp.Compute.glsl
similarity index 100%
rename from naga/tests/out/glsl/struct-layout.needs_padding_comp.Compute.glsl
rename to naga/tests/out/glsl/wgsl-struct-layout.needs_padding_comp.Compute.glsl
diff --git a/naga/tests/out/glsl/struct-layout.needs_padding_frag.Fragment.glsl b/naga/tests/out/glsl/wgsl-struct-layout.needs_padding_frag.Fragment.glsl
similarity index 100%
rename from naga/tests/out/glsl/struct-layout.needs_padding_frag.Fragment.glsl
rename to naga/tests/out/glsl/wgsl-struct-layout.needs_padding_frag.Fragment.glsl
diff --git a/naga/tests/out/glsl/struct-layout.needs_padding_vert.Vertex.glsl b/naga/tests/out/glsl/wgsl-struct-layout.needs_padding_vert.Vertex.glsl
similarity index 100%
rename from naga/tests/out/glsl/struct-layout.needs_padding_vert.Vertex.glsl
rename to naga/tests/out/glsl/wgsl-struct-layout.needs_padding_vert.Vertex.glsl
diff --git a/naga/tests/out/glsl/struct-layout.no_padding_comp.Compute.glsl b/naga/tests/out/glsl/wgsl-struct-layout.no_padding_comp.Compute.glsl
similarity index 100%
rename from naga/tests/out/glsl/struct-layout.no_padding_comp.Compute.glsl
rename to naga/tests/out/glsl/wgsl-struct-layout.no_padding_comp.Compute.glsl
diff --git a/naga/tests/out/glsl/struct-layout.no_padding_frag.Fragment.glsl b/naga/tests/out/glsl/wgsl-struct-layout.no_padding_frag.Fragment.glsl
similarity index 100%
rename from naga/tests/out/glsl/struct-layout.no_padding_frag.Fragment.glsl
rename to naga/tests/out/glsl/wgsl-struct-layout.no_padding_frag.Fragment.glsl
diff --git a/naga/tests/out/glsl/struct-layout.no_padding_vert.Vertex.glsl b/naga/tests/out/glsl/wgsl-struct-layout.no_padding_vert.Vertex.glsl
similarity index 100%
rename from naga/tests/out/glsl/struct-layout.no_padding_vert.Vertex.glsl
rename to naga/tests/out/glsl/wgsl-struct-layout.no_padding_vert.Vertex.glsl
diff --git a/naga/tests/out/glsl/subgroup-operations.main.Compute.glsl b/naga/tests/out/glsl/wgsl-subgroup-operations.main.Compute.glsl
similarity index 100%
rename from naga/tests/out/glsl/subgroup-operations.main.Compute.glsl
rename to naga/tests/out/glsl/wgsl-subgroup-operations.main.Compute.glsl
diff --git a/naga/tests/out/glsl/texture-arg.main.Fragment.glsl b/naga/tests/out/glsl/wgsl-texture-arg.main.Fragment.glsl
similarity index 100%
rename from naga/tests/out/glsl/texture-arg.main.Fragment.glsl
rename to naga/tests/out/glsl/wgsl-texture-arg.main.Fragment.glsl
diff --git a/naga/tests/out/glsl/type-inference.main.Compute.glsl b/naga/tests/out/glsl/wgsl-type-inference.main.Compute.glsl
similarity index 100%
rename from naga/tests/out/glsl/type-inference.main.Compute.glsl
rename to naga/tests/out/glsl/wgsl-type-inference.main.Compute.glsl
diff --git a/naga/tests/out/glsl/use-gl-ext-over-grad-workaround-if-instructed.main.Fragment.glsl b/naga/tests/out/glsl/wgsl-use-gl-ext-over-grad-workaround-if-instructed.main.Fragment.glsl
similarity index 100%
rename from naga/tests/out/glsl/use-gl-ext-over-grad-workaround-if-instructed.main.Fragment.glsl
rename to naga/tests/out/glsl/wgsl-use-gl-ext-over-grad-workaround-if-instructed.main.Fragment.glsl
diff --git a/naga/tests/out/glsl/workgroup-uniform-load.test_workgroupUniformLoad.Compute.glsl b/naga/tests/out/glsl/wgsl-workgroup-uniform-load.test_workgroupUniformLoad.Compute.glsl
similarity index 100%
rename from naga/tests/out/glsl/workgroup-uniform-load.test_workgroupUniformLoad.Compute.glsl
rename to naga/tests/out/glsl/wgsl-workgroup-uniform-load.test_workgroupUniformLoad.Compute.glsl
diff --git a/naga/tests/out/glsl/workgroup-var-init.main.Compute.glsl b/naga/tests/out/glsl/wgsl-workgroup-var-init.main.Compute.glsl
similarity index 100%
rename from naga/tests/out/glsl/workgroup-var-init.main.Compute.glsl
rename to naga/tests/out/glsl/wgsl-workgroup-var-init.main.Compute.glsl
diff --git a/naga/tests/out/hlsl/do-while.hlsl b/naga/tests/out/hlsl/spv-do-while.hlsl
similarity index 100%
rename from naga/tests/out/hlsl/do-while.hlsl
rename to naga/tests/out/hlsl/spv-do-while.hlsl
diff --git a/naga/tests/out/hlsl/array-in-function-return-type.ron b/naga/tests/out/hlsl/spv-do-while.ron
similarity index 100%
rename from naga/tests/out/hlsl/array-in-function-return-type.ron
rename to naga/tests/out/hlsl/spv-do-while.ron
diff --git a/naga/tests/out/hlsl/empty-global-name.hlsl b/naga/tests/out/hlsl/spv-empty-global-name.hlsl
similarity index 100%
rename from naga/tests/out/hlsl/empty-global-name.hlsl
rename to naga/tests/out/hlsl/spv-empty-global-name.hlsl
diff --git a/naga/tests/out/hlsl/6772-unpack-expr-accesses.ron b/naga/tests/out/hlsl/spv-empty-global-name.ron
similarity index 100%
rename from naga/tests/out/hlsl/6772-unpack-expr-accesses.ron
rename to naga/tests/out/hlsl/spv-empty-global-name.ron
diff --git a/naga/tests/out/hlsl/fetch_depth.hlsl b/naga/tests/out/hlsl/spv-fetch_depth.hlsl
similarity index 100%
rename from naga/tests/out/hlsl/fetch_depth.hlsl
rename to naga/tests/out/hlsl/spv-fetch_depth.hlsl
diff --git a/naga/tests/out/hlsl/fetch_depth.ron b/naga/tests/out/hlsl/spv-fetch_depth.ron
similarity index 100%
rename from naga/tests/out/hlsl/fetch_depth.ron
rename to naga/tests/out/hlsl/spv-fetch_depth.ron
diff --git a/naga/tests/out/hlsl/inv-hyperbolic-trig-functions.hlsl b/naga/tests/out/hlsl/spv-inv-hyperbolic-trig-functions.hlsl
similarity index 100%
rename from naga/tests/out/hlsl/inv-hyperbolic-trig-functions.hlsl
rename to naga/tests/out/hlsl/spv-inv-hyperbolic-trig-functions.hlsl
diff --git a/naga/tests/out/hlsl/binding-arrays.ron b/naga/tests/out/hlsl/spv-inv-hyperbolic-trig-functions.ron
similarity index 100%
rename from naga/tests/out/hlsl/binding-arrays.ron
rename to naga/tests/out/hlsl/spv-inv-hyperbolic-trig-functions.ron
diff --git a/naga/tests/out/hlsl/quad-vert.hlsl b/naga/tests/out/hlsl/spv-quad-vert.hlsl
similarity index 100%
rename from naga/tests/out/hlsl/quad-vert.hlsl
rename to naga/tests/out/hlsl/spv-quad-vert.hlsl
diff --git a/naga/tests/out/hlsl/quad-vert.ron b/naga/tests/out/hlsl/spv-quad-vert.ron
similarity index 100%
rename from naga/tests/out/hlsl/quad-vert.ron
rename to naga/tests/out/hlsl/spv-quad-vert.ron
diff --git a/naga/tests/out/hlsl/subgroup-operations-s.hlsl b/naga/tests/out/hlsl/spv-subgroup-operations-s.hlsl
similarity index 100%
rename from naga/tests/out/hlsl/subgroup-operations-s.hlsl
rename to naga/tests/out/hlsl/spv-subgroup-operations-s.hlsl
diff --git a/naga/tests/out/hlsl/conversion-float-to-int.ron b/naga/tests/out/hlsl/spv-subgroup-operations-s.ron
similarity index 100%
rename from naga/tests/out/hlsl/conversion-float-to-int.ron
rename to naga/tests/out/hlsl/spv-subgroup-operations-s.ron
diff --git a/naga/tests/out/hlsl/unnamed-gl-per-vertex.hlsl b/naga/tests/out/hlsl/spv-unnamed-gl-per-vertex.hlsl
similarity index 100%
rename from naga/tests/out/hlsl/unnamed-gl-per-vertex.hlsl
rename to naga/tests/out/hlsl/spv-unnamed-gl-per-vertex.hlsl
diff --git a/naga/tests/out/hlsl/unnamed-gl-per-vertex.ron b/naga/tests/out/hlsl/spv-unnamed-gl-per-vertex.ron
similarity index 100%
rename from naga/tests/out/hlsl/unnamed-gl-per-vertex.ron
rename to naga/tests/out/hlsl/spv-unnamed-gl-per-vertex.ron
diff --git a/naga/tests/out/hlsl/6438-conflicting-idents.hlsl b/naga/tests/out/hlsl/wgsl-6438-conflicting-idents.hlsl
similarity index 100%
rename from naga/tests/out/hlsl/6438-conflicting-idents.hlsl
rename to naga/tests/out/hlsl/wgsl-6438-conflicting-idents.hlsl
diff --git a/naga/tests/out/hlsl/6438-conflicting-idents.ron b/naga/tests/out/hlsl/wgsl-6438-conflicting-idents.ron
similarity index 100%
rename from naga/tests/out/hlsl/6438-conflicting-idents.ron
rename to naga/tests/out/hlsl/wgsl-6438-conflicting-idents.ron
diff --git a/naga/tests/out/hlsl/6772-unpack-expr-accesses.hlsl b/naga/tests/out/hlsl/wgsl-6772-unpack-expr-accesses.hlsl
similarity index 100%
rename from naga/tests/out/hlsl/6772-unpack-expr-accesses.hlsl
rename to naga/tests/out/hlsl/wgsl-6772-unpack-expr-accesses.hlsl
diff --git a/naga/tests/out/hlsl/abstract-types-return.ron b/naga/tests/out/hlsl/wgsl-6772-unpack-expr-accesses.ron
similarity index 100%
rename from naga/tests/out/hlsl/abstract-types-return.ron
rename to naga/tests/out/hlsl/wgsl-6772-unpack-expr-accesses.ron
diff --git a/naga/tests/out/hlsl/abstract-types-return.hlsl b/naga/tests/out/hlsl/wgsl-abstract-types-return.hlsl
similarity index 100%
rename from naga/tests/out/hlsl/abstract-types-return.hlsl
rename to naga/tests/out/hlsl/wgsl-abstract-types-return.hlsl
diff --git a/naga/tests/out/hlsl/bitcast.ron b/naga/tests/out/hlsl/wgsl-abstract-types-return.ron
similarity index 100%
rename from naga/tests/out/hlsl/bitcast.ron
rename to naga/tests/out/hlsl/wgsl-abstract-types-return.ron
diff --git a/naga/tests/out/hlsl/access.hlsl b/naga/tests/out/hlsl/wgsl-access.hlsl
similarity index 100%
rename from naga/tests/out/hlsl/access.hlsl
rename to naga/tests/out/hlsl/wgsl-access.hlsl
diff --git a/naga/tests/out/hlsl/access.ron b/naga/tests/out/hlsl/wgsl-access.ron
similarity index 100%
rename from naga/tests/out/hlsl/access.ron
rename to naga/tests/out/hlsl/wgsl-access.ron
diff --git a/naga/tests/out/hlsl/array-in-ctor.hlsl b/naga/tests/out/hlsl/wgsl-array-in-ctor.hlsl
similarity index 100%
rename from naga/tests/out/hlsl/array-in-ctor.hlsl
rename to naga/tests/out/hlsl/wgsl-array-in-ctor.hlsl
diff --git a/naga/tests/out/hlsl/array-in-ctor.ron b/naga/tests/out/hlsl/wgsl-array-in-ctor.ron
similarity index 100%
rename from naga/tests/out/hlsl/array-in-ctor.ron
rename to naga/tests/out/hlsl/wgsl-array-in-ctor.ron
diff --git a/naga/tests/out/hlsl/array-in-function-return-type.hlsl b/naga/tests/out/hlsl/wgsl-array-in-function-return-type.hlsl
similarity index 100%
rename from naga/tests/out/hlsl/array-in-function-return-type.hlsl
rename to naga/tests/out/hlsl/wgsl-array-in-function-return-type.hlsl
diff --git a/naga/tests/out/hlsl/do-while.ron b/naga/tests/out/hlsl/wgsl-array-in-function-return-type.ron
similarity index 100%
rename from naga/tests/out/hlsl/do-while.ron
rename to naga/tests/out/hlsl/wgsl-array-in-function-return-type.ron
diff --git a/naga/tests/out/hlsl/atomicOps-int64-min-max.hlsl b/naga/tests/out/hlsl/wgsl-atomicOps-int64-min-max.hlsl
similarity index 100%
rename from naga/tests/out/hlsl/atomicOps-int64-min-max.hlsl
rename to naga/tests/out/hlsl/wgsl-atomicOps-int64-min-max.hlsl
diff --git a/naga/tests/out/hlsl/atomicOps-int64-min-max.ron b/naga/tests/out/hlsl/wgsl-atomicOps-int64-min-max.ron
similarity index 100%
rename from naga/tests/out/hlsl/atomicOps-int64-min-max.ron
rename to naga/tests/out/hlsl/wgsl-atomicOps-int64-min-max.ron
diff --git a/naga/tests/out/hlsl/atomicOps-int64.hlsl b/naga/tests/out/hlsl/wgsl-atomicOps-int64.hlsl
similarity index 100%
rename from naga/tests/out/hlsl/atomicOps-int64.hlsl
rename to naga/tests/out/hlsl/wgsl-atomicOps-int64.hlsl
diff --git a/naga/tests/out/hlsl/atomicOps-int64.ron b/naga/tests/out/hlsl/wgsl-atomicOps-int64.ron
similarity index 100%
rename from naga/tests/out/hlsl/atomicOps-int64.ron
rename to naga/tests/out/hlsl/wgsl-atomicOps-int64.ron
diff --git a/naga/tests/out/hlsl/atomicOps.hlsl b/naga/tests/out/hlsl/wgsl-atomicOps.hlsl
similarity index 100%
rename from naga/tests/out/hlsl/atomicOps.hlsl
rename to naga/tests/out/hlsl/wgsl-atomicOps.hlsl
diff --git a/naga/tests/out/hlsl/atomicOps.ron b/naga/tests/out/hlsl/wgsl-atomicOps.ron
similarity index 100%
rename from naga/tests/out/hlsl/atomicOps.ron
rename to naga/tests/out/hlsl/wgsl-atomicOps.ron
diff --git a/naga/tests/out/hlsl/atomicTexture-int64.hlsl b/naga/tests/out/hlsl/wgsl-atomicTexture-int64.hlsl
similarity index 100%
rename from naga/tests/out/hlsl/atomicTexture-int64.hlsl
rename to naga/tests/out/hlsl/wgsl-atomicTexture-int64.hlsl
diff --git a/naga/tests/out/hlsl/atomicTexture-int64.ron b/naga/tests/out/hlsl/wgsl-atomicTexture-int64.ron
similarity index 100%
rename from naga/tests/out/hlsl/atomicTexture-int64.ron
rename to naga/tests/out/hlsl/wgsl-atomicTexture-int64.ron
diff --git a/naga/tests/out/hlsl/atomicTexture.hlsl b/naga/tests/out/hlsl/wgsl-atomicTexture.hlsl
similarity index 100%
rename from naga/tests/out/hlsl/atomicTexture.hlsl
rename to naga/tests/out/hlsl/wgsl-atomicTexture.hlsl
diff --git a/naga/tests/out/hlsl/atomicTexture.ron b/naga/tests/out/hlsl/wgsl-atomicTexture.ron
similarity index 100%
rename from naga/tests/out/hlsl/atomicTexture.ron
rename to naga/tests/out/hlsl/wgsl-atomicTexture.ron
diff --git a/naga/tests/out/hlsl/binding-arrays.hlsl b/naga/tests/out/hlsl/wgsl-binding-arrays.hlsl
similarity index 100%
rename from naga/tests/out/hlsl/binding-arrays.hlsl
rename to naga/tests/out/hlsl/wgsl-binding-arrays.hlsl
diff --git a/naga/tests/out/hlsl/dualsource.ron b/naga/tests/out/hlsl/wgsl-binding-arrays.ron
similarity index 100%
rename from naga/tests/out/hlsl/dualsource.ron
rename to naga/tests/out/hlsl/wgsl-binding-arrays.ron
diff --git a/naga/tests/out/hlsl/bitcast.hlsl b/naga/tests/out/hlsl/wgsl-bitcast.hlsl
similarity index 100%
rename from naga/tests/out/hlsl/bitcast.hlsl
rename to naga/tests/out/hlsl/wgsl-bitcast.hlsl
diff --git a/naga/tests/out/hlsl/bits.ron b/naga/tests/out/hlsl/wgsl-bitcast.ron
similarity index 100%
rename from naga/tests/out/hlsl/bits.ron
rename to naga/tests/out/hlsl/wgsl-bitcast.ron
diff --git a/naga/tests/out/hlsl/bits.hlsl b/naga/tests/out/hlsl/wgsl-bits.hlsl
similarity index 100%
rename from naga/tests/out/hlsl/bits.hlsl
rename to naga/tests/out/hlsl/wgsl-bits.hlsl
diff --git a/naga/tests/out/hlsl/boids.ron b/naga/tests/out/hlsl/wgsl-bits.ron
similarity index 100%
rename from naga/tests/out/hlsl/boids.ron
rename to naga/tests/out/hlsl/wgsl-bits.ron
diff --git a/naga/tests/out/hlsl/boids.hlsl b/naga/tests/out/hlsl/wgsl-boids.hlsl
similarity index 100%
rename from naga/tests/out/hlsl/boids.hlsl
rename to naga/tests/out/hlsl/wgsl-boids.hlsl
diff --git a/naga/tests/out/hlsl/bounds-check-dynamic-buffer.ron b/naga/tests/out/hlsl/wgsl-boids.ron
similarity index 100%
rename from naga/tests/out/hlsl/bounds-check-dynamic-buffer.ron
rename to naga/tests/out/hlsl/wgsl-boids.ron
diff --git a/naga/tests/out/hlsl/bounds-check-dynamic-buffer.hlsl b/naga/tests/out/hlsl/wgsl-bounds-check-dynamic-buffer.hlsl
similarity index 100%
rename from naga/tests/out/hlsl/bounds-check-dynamic-buffer.hlsl
rename to naga/tests/out/hlsl/wgsl-bounds-check-dynamic-buffer.hlsl
diff --git a/naga/tests/out/hlsl/break-if.ron b/naga/tests/out/hlsl/wgsl-bounds-check-dynamic-buffer.ron
similarity index 100%
rename from naga/tests/out/hlsl/break-if.ron
rename to naga/tests/out/hlsl/wgsl-bounds-check-dynamic-buffer.ron
diff --git a/naga/tests/out/hlsl/break-if.hlsl b/naga/tests/out/hlsl/wgsl-break-if.hlsl
similarity index 100%
rename from naga/tests/out/hlsl/break-if.hlsl
rename to naga/tests/out/hlsl/wgsl-break-if.hlsl
diff --git a/naga/tests/out/hlsl/collatz.ron b/naga/tests/out/hlsl/wgsl-break-if.ron
similarity index 100%
rename from naga/tests/out/hlsl/collatz.ron
rename to naga/tests/out/hlsl/wgsl-break-if.ron
diff --git a/naga/tests/out/hlsl/collatz.hlsl b/naga/tests/out/hlsl/wgsl-collatz.hlsl
similarity index 100%
rename from naga/tests/out/hlsl/collatz.hlsl
rename to naga/tests/out/hlsl/wgsl-collatz.hlsl
diff --git a/naga/tests/out/hlsl/const-exprs.ron b/naga/tests/out/hlsl/wgsl-collatz.ron
similarity index 100%
rename from naga/tests/out/hlsl/const-exprs.ron
rename to naga/tests/out/hlsl/wgsl-collatz.ron
diff --git a/naga/tests/out/hlsl/const-exprs.hlsl b/naga/tests/out/hlsl/wgsl-const-exprs.hlsl
similarity index 100%
rename from naga/tests/out/hlsl/const-exprs.hlsl
rename to naga/tests/out/hlsl/wgsl-const-exprs.hlsl
diff --git a/naga/tests/out/hlsl/constructors.ron b/naga/tests/out/hlsl/wgsl-const-exprs.ron
similarity index 100%
rename from naga/tests/out/hlsl/constructors.ron
rename to naga/tests/out/hlsl/wgsl-const-exprs.ron
diff --git a/naga/tests/out/hlsl/constructors.hlsl b/naga/tests/out/hlsl/wgsl-constructors.hlsl
similarity index 100%
rename from naga/tests/out/hlsl/constructors.hlsl
rename to naga/tests/out/hlsl/wgsl-constructors.hlsl
diff --git a/naga/tests/out/hlsl/control-flow.ron b/naga/tests/out/hlsl/wgsl-constructors.ron
similarity index 100%
rename from naga/tests/out/hlsl/control-flow.ron
rename to naga/tests/out/hlsl/wgsl-constructors.ron
diff --git a/naga/tests/out/hlsl/control-flow.hlsl b/naga/tests/out/hlsl/wgsl-control-flow.hlsl
similarity index 100%
rename from naga/tests/out/hlsl/control-flow.hlsl
rename to naga/tests/out/hlsl/wgsl-control-flow.hlsl
diff --git a/naga/tests/out/hlsl/conversions.ron b/naga/tests/out/hlsl/wgsl-control-flow.ron
similarity index 100%
rename from naga/tests/out/hlsl/conversions.ron
rename to naga/tests/out/hlsl/wgsl-control-flow.ron
diff --git a/naga/tests/out/hlsl/conversion-float-to-int.hlsl b/naga/tests/out/hlsl/wgsl-conversion-float-to-int.hlsl
similarity index 100%
rename from naga/tests/out/hlsl/conversion-float-to-int.hlsl
rename to naga/tests/out/hlsl/wgsl-conversion-float-to-int.hlsl
diff --git a/naga/tests/out/hlsl/int64.ron b/naga/tests/out/hlsl/wgsl-conversion-float-to-int.ron
similarity index 100%
rename from naga/tests/out/hlsl/int64.ron
rename to naga/tests/out/hlsl/wgsl-conversion-float-to-int.ron
diff --git a/naga/tests/out/hlsl/conversions.hlsl b/naga/tests/out/hlsl/wgsl-conversions.hlsl
similarity index 100%
rename from naga/tests/out/hlsl/conversions.hlsl
rename to naga/tests/out/hlsl/wgsl-conversions.hlsl
diff --git a/naga/tests/out/hlsl/cross.ron b/naga/tests/out/hlsl/wgsl-conversions.ron
similarity index 100%
rename from naga/tests/out/hlsl/cross.ron
rename to naga/tests/out/hlsl/wgsl-conversions.ron
diff --git a/naga/tests/out/hlsl/cross.hlsl b/naga/tests/out/hlsl/wgsl-cross.hlsl
similarity index 100%
rename from naga/tests/out/hlsl/cross.hlsl
rename to naga/tests/out/hlsl/wgsl-cross.hlsl
diff --git a/naga/tests/out/hlsl/empty-global-name.ron b/naga/tests/out/hlsl/wgsl-cross.ron
similarity index 100%
rename from naga/tests/out/hlsl/empty-global-name.ron
rename to naga/tests/out/hlsl/wgsl-cross.ron
diff --git a/naga/tests/out/hlsl/dualsource.hlsl b/naga/tests/out/hlsl/wgsl-dualsource.hlsl
similarity index 100%
rename from naga/tests/out/hlsl/dualsource.hlsl
rename to naga/tests/out/hlsl/wgsl-dualsource.hlsl
diff --git a/naga/tests/out/hlsl/inv-hyperbolic-trig-functions.ron b/naga/tests/out/hlsl/wgsl-dualsource.ron
similarity index 100%
rename from naga/tests/out/hlsl/inv-hyperbolic-trig-functions.ron
rename to naga/tests/out/hlsl/wgsl-dualsource.ron
diff --git a/naga/tests/out/hlsl/empty.hlsl b/naga/tests/out/hlsl/wgsl-empty.hlsl
similarity index 100%
rename from naga/tests/out/hlsl/empty.hlsl
rename to naga/tests/out/hlsl/wgsl-empty.hlsl
diff --git a/naga/tests/out/hlsl/empty.ron b/naga/tests/out/hlsl/wgsl-empty.ron
similarity index 100%
rename from naga/tests/out/hlsl/empty.ron
rename to naga/tests/out/hlsl/wgsl-empty.ron
diff --git a/naga/tests/out/hlsl/f16.hlsl b/naga/tests/out/hlsl/wgsl-f16.hlsl
similarity index 100%
rename from naga/tests/out/hlsl/f16.hlsl
rename to naga/tests/out/hlsl/wgsl-f16.hlsl
diff --git a/naga/tests/out/hlsl/f16.ron b/naga/tests/out/hlsl/wgsl-f16.ron
similarity index 100%
rename from naga/tests/out/hlsl/f16.ron
rename to naga/tests/out/hlsl/wgsl-f16.ron
diff --git a/naga/tests/out/hlsl/f64.hlsl b/naga/tests/out/hlsl/wgsl-f64.hlsl
similarity index 100%
rename from naga/tests/out/hlsl/f64.hlsl
rename to naga/tests/out/hlsl/wgsl-f64.hlsl
diff --git a/naga/tests/out/hlsl/f64.ron b/naga/tests/out/hlsl/wgsl-f64.ron
similarity index 100%
rename from naga/tests/out/hlsl/f64.ron
rename to naga/tests/out/hlsl/wgsl-f64.ron
diff --git a/naga/tests/out/hlsl/fragment-output.hlsl b/naga/tests/out/hlsl/wgsl-fragment-output.hlsl
similarity index 100%
rename from naga/tests/out/hlsl/fragment-output.hlsl
rename to naga/tests/out/hlsl/wgsl-fragment-output.hlsl
diff --git a/naga/tests/out/hlsl/fragment-output.ron b/naga/tests/out/hlsl/wgsl-fragment-output.ron
similarity index 100%
rename from naga/tests/out/hlsl/fragment-output.ron
rename to naga/tests/out/hlsl/wgsl-fragment-output.ron
diff --git a/naga/tests/out/hlsl/functions.hlsl b/naga/tests/out/hlsl/wgsl-functions.hlsl
similarity index 100%
rename from naga/tests/out/hlsl/functions.hlsl
rename to naga/tests/out/hlsl/wgsl-functions.hlsl
diff --git a/naga/tests/out/hlsl/functions.ron b/naga/tests/out/hlsl/wgsl-functions.ron
similarity index 100%
rename from naga/tests/out/hlsl/functions.ron
rename to naga/tests/out/hlsl/wgsl-functions.ron
diff --git a/naga/tests/out/hlsl/globals.hlsl b/naga/tests/out/hlsl/wgsl-globals.hlsl
similarity index 100%
rename from naga/tests/out/hlsl/globals.hlsl
rename to naga/tests/out/hlsl/wgsl-globals.hlsl
diff --git a/naga/tests/out/hlsl/globals.ron b/naga/tests/out/hlsl/wgsl-globals.ron
similarity index 100%
rename from naga/tests/out/hlsl/globals.ron
rename to naga/tests/out/hlsl/wgsl-globals.ron
diff --git a/naga/tests/out/hlsl/hlsl-keyword.hlsl b/naga/tests/out/hlsl/wgsl-hlsl-keyword.hlsl
similarity index 100%
rename from naga/tests/out/hlsl/hlsl-keyword.hlsl
rename to naga/tests/out/hlsl/wgsl-hlsl-keyword.hlsl
diff --git a/naga/tests/out/hlsl/hlsl-keyword.ron b/naga/tests/out/hlsl/wgsl-hlsl-keyword.ron
similarity index 100%
rename from naga/tests/out/hlsl/hlsl-keyword.ron
rename to naga/tests/out/hlsl/wgsl-hlsl-keyword.ron
diff --git a/naga/tests/out/hlsl/image.hlsl b/naga/tests/out/hlsl/wgsl-image.hlsl
similarity index 100%
rename from naga/tests/out/hlsl/image.hlsl
rename to naga/tests/out/hlsl/wgsl-image.hlsl
diff --git a/naga/tests/out/hlsl/image.ron b/naga/tests/out/hlsl/wgsl-image.ron
similarity index 100%
rename from naga/tests/out/hlsl/image.ron
rename to naga/tests/out/hlsl/wgsl-image.ron
diff --git a/naga/tests/out/hlsl/int64.hlsl b/naga/tests/out/hlsl/wgsl-int64.hlsl
similarity index 100%
rename from naga/tests/out/hlsl/int64.hlsl
rename to naga/tests/out/hlsl/wgsl-int64.hlsl
diff --git a/naga/tests/out/hlsl/subgroup-operations-s.ron b/naga/tests/out/hlsl/wgsl-int64.ron
similarity index 100%
rename from naga/tests/out/hlsl/subgroup-operations-s.ron
rename to naga/tests/out/hlsl/wgsl-int64.ron
diff --git a/naga/tests/out/hlsl/interface.hlsl b/naga/tests/out/hlsl/wgsl-interface.hlsl
similarity index 100%
rename from naga/tests/out/hlsl/interface.hlsl
rename to naga/tests/out/hlsl/wgsl-interface.hlsl
diff --git a/naga/tests/out/hlsl/interface.ron b/naga/tests/out/hlsl/wgsl-interface.ron
similarity index 100%
rename from naga/tests/out/hlsl/interface.ron
rename to naga/tests/out/hlsl/wgsl-interface.ron
diff --git a/naga/tests/out/hlsl/interpolate.hlsl b/naga/tests/out/hlsl/wgsl-interpolate.hlsl
similarity index 100%
rename from naga/tests/out/hlsl/interpolate.hlsl
rename to naga/tests/out/hlsl/wgsl-interpolate.hlsl
diff --git a/naga/tests/out/hlsl/interpolate.ron b/naga/tests/out/hlsl/wgsl-interpolate.ron
similarity index 100%
rename from naga/tests/out/hlsl/interpolate.ron
rename to naga/tests/out/hlsl/wgsl-interpolate.ron
diff --git a/naga/tests/out/hlsl/interpolate_compat.hlsl b/naga/tests/out/hlsl/wgsl-interpolate_compat.hlsl
similarity index 100%
rename from naga/tests/out/hlsl/interpolate_compat.hlsl
rename to naga/tests/out/hlsl/wgsl-interpolate_compat.hlsl
diff --git a/naga/tests/out/hlsl/interpolate_compat.ron b/naga/tests/out/hlsl/wgsl-interpolate_compat.ron
similarity index 100%
rename from naga/tests/out/hlsl/interpolate_compat.ron
rename to naga/tests/out/hlsl/wgsl-interpolate_compat.ron
diff --git a/naga/tests/out/hlsl/math-functions.hlsl b/naga/tests/out/hlsl/wgsl-math-functions.hlsl
similarity index 100%
rename from naga/tests/out/hlsl/math-functions.hlsl
rename to naga/tests/out/hlsl/wgsl-math-functions.hlsl
diff --git a/naga/tests/out/hlsl/math-functions.ron b/naga/tests/out/hlsl/wgsl-math-functions.ron
similarity index 100%
rename from naga/tests/out/hlsl/math-functions.ron
rename to naga/tests/out/hlsl/wgsl-math-functions.ron
diff --git a/naga/tests/out/hlsl/operators.hlsl b/naga/tests/out/hlsl/wgsl-operators.hlsl
similarity index 100%
rename from naga/tests/out/hlsl/operators.hlsl
rename to naga/tests/out/hlsl/wgsl-operators.hlsl
diff --git a/naga/tests/out/hlsl/operators.ron b/naga/tests/out/hlsl/wgsl-operators.ron
similarity index 100%
rename from naga/tests/out/hlsl/operators.ron
rename to naga/tests/out/hlsl/wgsl-operators.ron
diff --git a/naga/tests/out/hlsl/overrides.hlsl b/naga/tests/out/hlsl/wgsl-overrides.hlsl
similarity index 100%
rename from naga/tests/out/hlsl/overrides.hlsl
rename to naga/tests/out/hlsl/wgsl-overrides.hlsl
diff --git a/naga/tests/out/hlsl/overrides.ron b/naga/tests/out/hlsl/wgsl-overrides.ron
similarity index 100%
rename from naga/tests/out/hlsl/overrides.ron
rename to naga/tests/out/hlsl/wgsl-overrides.ron
diff --git a/naga/tests/out/hlsl/padding.hlsl b/naga/tests/out/hlsl/wgsl-padding.hlsl
similarity index 100%
rename from naga/tests/out/hlsl/padding.hlsl
rename to naga/tests/out/hlsl/wgsl-padding.hlsl
diff --git a/naga/tests/out/hlsl/padding.ron b/naga/tests/out/hlsl/wgsl-padding.ron
similarity index 100%
rename from naga/tests/out/hlsl/padding.ron
rename to naga/tests/out/hlsl/wgsl-padding.ron
diff --git a/naga/tests/out/hlsl/phony_assignment.hlsl b/naga/tests/out/hlsl/wgsl-phony_assignment.hlsl
similarity index 100%
rename from naga/tests/out/hlsl/phony_assignment.hlsl
rename to naga/tests/out/hlsl/wgsl-phony_assignment.hlsl
diff --git a/naga/tests/out/hlsl/phony_assignment.ron b/naga/tests/out/hlsl/wgsl-phony_assignment.ron
similarity index 100%
rename from naga/tests/out/hlsl/phony_assignment.ron
rename to naga/tests/out/hlsl/wgsl-phony_assignment.ron
diff --git a/naga/tests/out/hlsl/push-constants.hlsl b/naga/tests/out/hlsl/wgsl-push-constants.hlsl
similarity index 100%
rename from naga/tests/out/hlsl/push-constants.hlsl
rename to naga/tests/out/hlsl/wgsl-push-constants.hlsl
diff --git a/naga/tests/out/hlsl/push-constants.ron b/naga/tests/out/hlsl/wgsl-push-constants.ron
similarity index 100%
rename from naga/tests/out/hlsl/push-constants.ron
rename to naga/tests/out/hlsl/wgsl-push-constants.ron
diff --git a/naga/tests/out/hlsl/quad.hlsl b/naga/tests/out/hlsl/wgsl-quad.hlsl
similarity index 100%
rename from naga/tests/out/hlsl/quad.hlsl
rename to naga/tests/out/hlsl/wgsl-quad.hlsl
diff --git a/naga/tests/out/hlsl/quad.ron b/naga/tests/out/hlsl/wgsl-quad.ron
similarity index 100%
rename from naga/tests/out/hlsl/quad.ron
rename to naga/tests/out/hlsl/wgsl-quad.ron
diff --git a/naga/tests/out/hlsl/ray-query.hlsl b/naga/tests/out/hlsl/wgsl-ray-query.hlsl
similarity index 100%
rename from naga/tests/out/hlsl/ray-query.hlsl
rename to naga/tests/out/hlsl/wgsl-ray-query.hlsl
diff --git a/naga/tests/out/hlsl/ray-query.ron b/naga/tests/out/hlsl/wgsl-ray-query.ron
similarity index 100%
rename from naga/tests/out/hlsl/ray-query.ron
rename to naga/tests/out/hlsl/wgsl-ray-query.ron
diff --git a/naga/tests/out/hlsl/shadow.hlsl b/naga/tests/out/hlsl/wgsl-shadow.hlsl
similarity index 100%
rename from naga/tests/out/hlsl/shadow.hlsl
rename to naga/tests/out/hlsl/wgsl-shadow.hlsl
diff --git a/naga/tests/out/hlsl/shadow.ron b/naga/tests/out/hlsl/wgsl-shadow.ron
similarity index 100%
rename from naga/tests/out/hlsl/shadow.ron
rename to naga/tests/out/hlsl/wgsl-shadow.ron
diff --git a/naga/tests/out/hlsl/skybox.hlsl b/naga/tests/out/hlsl/wgsl-skybox.hlsl
similarity index 100%
rename from naga/tests/out/hlsl/skybox.hlsl
rename to naga/tests/out/hlsl/wgsl-skybox.hlsl
diff --git a/naga/tests/out/hlsl/skybox.ron b/naga/tests/out/hlsl/wgsl-skybox.ron
similarity index 100%
rename from naga/tests/out/hlsl/skybox.ron
rename to naga/tests/out/hlsl/wgsl-skybox.ron
diff --git a/naga/tests/out/hlsl/standard.hlsl b/naga/tests/out/hlsl/wgsl-standard.hlsl
similarity index 100%
rename from naga/tests/out/hlsl/standard.hlsl
rename to naga/tests/out/hlsl/wgsl-standard.hlsl
diff --git a/naga/tests/out/hlsl/standard.ron b/naga/tests/out/hlsl/wgsl-standard.ron
similarity index 100%
rename from naga/tests/out/hlsl/standard.ron
rename to naga/tests/out/hlsl/wgsl-standard.ron
diff --git a/naga/tests/out/hlsl/storage-textures.hlsl b/naga/tests/out/hlsl/wgsl-storage-textures.hlsl
similarity index 100%
rename from naga/tests/out/hlsl/storage-textures.hlsl
rename to naga/tests/out/hlsl/wgsl-storage-textures.hlsl
diff --git a/naga/tests/out/hlsl/storage-textures.ron b/naga/tests/out/hlsl/wgsl-storage-textures.ron
similarity index 100%
rename from naga/tests/out/hlsl/storage-textures.ron
rename to naga/tests/out/hlsl/wgsl-storage-textures.ron
diff --git a/naga/tests/out/hlsl/struct-layout.hlsl b/naga/tests/out/hlsl/wgsl-struct-layout.hlsl
similarity index 100%
rename from naga/tests/out/hlsl/struct-layout.hlsl
rename to naga/tests/out/hlsl/wgsl-struct-layout.hlsl
diff --git a/naga/tests/out/hlsl/struct-layout.ron b/naga/tests/out/hlsl/wgsl-struct-layout.ron
similarity index 100%
rename from naga/tests/out/hlsl/struct-layout.ron
rename to naga/tests/out/hlsl/wgsl-struct-layout.ron
diff --git a/naga/tests/out/hlsl/subgroup-operations.hlsl b/naga/tests/out/hlsl/wgsl-subgroup-operations.hlsl
similarity index 100%
rename from naga/tests/out/hlsl/subgroup-operations.hlsl
rename to naga/tests/out/hlsl/wgsl-subgroup-operations.hlsl
diff --git a/naga/tests/out/hlsl/subgroup-operations.ron b/naga/tests/out/hlsl/wgsl-subgroup-operations.ron
similarity index 100%
rename from naga/tests/out/hlsl/subgroup-operations.ron
rename to naga/tests/out/hlsl/wgsl-subgroup-operations.ron
diff --git a/naga/tests/out/hlsl/texture-arg.hlsl b/naga/tests/out/hlsl/wgsl-texture-arg.hlsl
similarity index 100%
rename from naga/tests/out/hlsl/texture-arg.hlsl
rename to naga/tests/out/hlsl/wgsl-texture-arg.hlsl
diff --git a/naga/tests/out/hlsl/texture-arg.ron b/naga/tests/out/hlsl/wgsl-texture-arg.ron
similarity index 100%
rename from naga/tests/out/hlsl/texture-arg.ron
rename to naga/tests/out/hlsl/wgsl-texture-arg.ron
diff --git a/naga/tests/out/hlsl/type-inference.hlsl b/naga/tests/out/hlsl/wgsl-type-inference.hlsl
similarity index 100%
rename from naga/tests/out/hlsl/type-inference.hlsl
rename to naga/tests/out/hlsl/wgsl-type-inference.hlsl
diff --git a/naga/tests/out/hlsl/type-inference.ron b/naga/tests/out/hlsl/wgsl-type-inference.ron
similarity index 100%
rename from naga/tests/out/hlsl/type-inference.ron
rename to naga/tests/out/hlsl/wgsl-type-inference.ron
diff --git a/naga/tests/out/hlsl/unconsumed_vertex_outputs_frag.hlsl b/naga/tests/out/hlsl/wgsl-unconsumed_vertex_outputs_frag.hlsl
similarity index 100%
rename from naga/tests/out/hlsl/unconsumed_vertex_outputs_frag.hlsl
rename to naga/tests/out/hlsl/wgsl-unconsumed_vertex_outputs_frag.hlsl
diff --git a/naga/tests/out/hlsl/unconsumed_vertex_outputs_frag.ron b/naga/tests/out/hlsl/wgsl-unconsumed_vertex_outputs_frag.ron
similarity index 100%
rename from naga/tests/out/hlsl/unconsumed_vertex_outputs_frag.ron
rename to naga/tests/out/hlsl/wgsl-unconsumed_vertex_outputs_frag.ron
diff --git a/naga/tests/out/hlsl/unconsumed_vertex_outputs_vert.hlsl b/naga/tests/out/hlsl/wgsl-unconsumed_vertex_outputs_vert.hlsl
similarity index 100%
rename from naga/tests/out/hlsl/unconsumed_vertex_outputs_vert.hlsl
rename to naga/tests/out/hlsl/wgsl-unconsumed_vertex_outputs_vert.hlsl
diff --git a/naga/tests/out/hlsl/unconsumed_vertex_outputs_vert.ron b/naga/tests/out/hlsl/wgsl-unconsumed_vertex_outputs_vert.ron
similarity index 100%
rename from naga/tests/out/hlsl/unconsumed_vertex_outputs_vert.ron
rename to naga/tests/out/hlsl/wgsl-unconsumed_vertex_outputs_vert.ron
diff --git a/naga/tests/out/hlsl/workgroup-uniform-load.hlsl b/naga/tests/out/hlsl/wgsl-workgroup-uniform-load.hlsl
similarity index 100%
rename from naga/tests/out/hlsl/workgroup-uniform-load.hlsl
rename to naga/tests/out/hlsl/wgsl-workgroup-uniform-load.hlsl
diff --git a/naga/tests/out/hlsl/workgroup-uniform-load.ron b/naga/tests/out/hlsl/wgsl-workgroup-uniform-load.ron
similarity index 100%
rename from naga/tests/out/hlsl/workgroup-uniform-load.ron
rename to naga/tests/out/hlsl/wgsl-workgroup-uniform-load.ron
diff --git a/naga/tests/out/hlsl/workgroup-var-init.hlsl b/naga/tests/out/hlsl/wgsl-workgroup-var-init.hlsl
similarity index 100%
rename from naga/tests/out/hlsl/workgroup-var-init.hlsl
rename to naga/tests/out/hlsl/wgsl-workgroup-var-init.hlsl
diff --git a/naga/tests/out/hlsl/workgroup-var-init.ron b/naga/tests/out/hlsl/wgsl-workgroup-var-init.ron
similarity index 100%
rename from naga/tests/out/hlsl/workgroup-var-init.ron
rename to naga/tests/out/hlsl/wgsl-workgroup-var-init.ron
diff --git a/naga/tests/out/ir/fetch_depth.compact.ron b/naga/tests/out/ir/spv-fetch_depth.compact.ron
similarity index 100%
rename from naga/tests/out/ir/fetch_depth.compact.ron
rename to naga/tests/out/ir/spv-fetch_depth.compact.ron
diff --git a/naga/tests/out/ir/fetch_depth.ron b/naga/tests/out/ir/spv-fetch_depth.ron
similarity index 100%
rename from naga/tests/out/ir/fetch_depth.ron
rename to naga/tests/out/ir/spv-fetch_depth.ron
diff --git a/naga/tests/out/ir/shadow.compact.ron b/naga/tests/out/ir/spv-shadow.compact.ron
similarity index 100%
rename from naga/tests/out/ir/shadow.compact.ron
rename to naga/tests/out/ir/spv-shadow.compact.ron
diff --git a/naga/tests/out/ir/shadow.ron b/naga/tests/out/ir/spv-shadow.ron
similarity index 100%
rename from naga/tests/out/ir/shadow.ron
rename to naga/tests/out/ir/spv-shadow.ron
diff --git a/naga/tests/out/ir/spec-constants.compact.ron b/naga/tests/out/ir/spv-spec-constants.compact.ron
similarity index 100%
rename from naga/tests/out/ir/spec-constants.compact.ron
rename to naga/tests/out/ir/spv-spec-constants.compact.ron
diff --git a/naga/tests/out/ir/spec-constants.ron b/naga/tests/out/ir/spv-spec-constants.ron
similarity index 100%
rename from naga/tests/out/ir/spec-constants.ron
rename to naga/tests/out/ir/spv-spec-constants.ron
diff --git a/naga/tests/out/ir/access.compact.ron b/naga/tests/out/ir/wgsl-access.compact.ron
similarity index 100%
rename from naga/tests/out/ir/access.compact.ron
rename to naga/tests/out/ir/wgsl-access.compact.ron
diff --git a/naga/tests/out/ir/access.ron b/naga/tests/out/ir/wgsl-access.ron
similarity index 100%
rename from naga/tests/out/ir/access.ron
rename to naga/tests/out/ir/wgsl-access.ron
diff --git a/naga/tests/out/ir/collatz.compact.ron b/naga/tests/out/ir/wgsl-collatz.compact.ron
similarity index 100%
rename from naga/tests/out/ir/collatz.compact.ron
rename to naga/tests/out/ir/wgsl-collatz.compact.ron
diff --git a/naga/tests/out/ir/collatz.ron b/naga/tests/out/ir/wgsl-collatz.ron
similarity index 100%
rename from naga/tests/out/ir/collatz.ron
rename to naga/tests/out/ir/wgsl-collatz.ron
diff --git a/naga/tests/out/ir/const_assert.compact.ron b/naga/tests/out/ir/wgsl-const_assert.compact.ron
similarity index 100%
rename from naga/tests/out/ir/const_assert.compact.ron
rename to naga/tests/out/ir/wgsl-const_assert.compact.ron
diff --git a/naga/tests/out/ir/const_assert.ron b/naga/tests/out/ir/wgsl-const_assert.ron
similarity index 100%
rename from naga/tests/out/ir/const_assert.ron
rename to naga/tests/out/ir/wgsl-const_assert.ron
diff --git a/naga/tests/out/ir/diagnostic-filter.compact.ron b/naga/tests/out/ir/wgsl-diagnostic-filter.compact.ron
similarity index 100%
rename from naga/tests/out/ir/diagnostic-filter.compact.ron
rename to naga/tests/out/ir/wgsl-diagnostic-filter.compact.ron
diff --git a/naga/tests/out/ir/diagnostic-filter.ron b/naga/tests/out/ir/wgsl-diagnostic-filter.ron
similarity index 100%
rename from naga/tests/out/ir/diagnostic-filter.ron
rename to naga/tests/out/ir/wgsl-diagnostic-filter.ron
diff --git a/naga/tests/out/ir/index-by-value.compact.ron b/naga/tests/out/ir/wgsl-index-by-value.compact.ron
similarity index 100%
rename from naga/tests/out/ir/index-by-value.compact.ron
rename to naga/tests/out/ir/wgsl-index-by-value.compact.ron
diff --git a/naga/tests/out/ir/index-by-value.ron b/naga/tests/out/ir/wgsl-index-by-value.ron
similarity index 100%
rename from naga/tests/out/ir/index-by-value.ron
rename to naga/tests/out/ir/wgsl-index-by-value.ron
diff --git a/naga/tests/out/ir/local-const.compact.ron b/naga/tests/out/ir/wgsl-local-const.compact.ron
similarity index 100%
rename from naga/tests/out/ir/local-const.compact.ron
rename to naga/tests/out/ir/wgsl-local-const.compact.ron
diff --git a/naga/tests/out/ir/local-const.ron b/naga/tests/out/ir/wgsl-local-const.ron
similarity index 100%
rename from naga/tests/out/ir/local-const.ron
rename to naga/tests/out/ir/wgsl-local-const.ron
diff --git a/naga/tests/out/ir/must-use.compact.ron b/naga/tests/out/ir/wgsl-must-use.compact.ron
similarity index 100%
rename from naga/tests/out/ir/must-use.compact.ron
rename to naga/tests/out/ir/wgsl-must-use.compact.ron
diff --git a/naga/tests/out/ir/must-use.ron b/naga/tests/out/ir/wgsl-must-use.ron
similarity index 100%
rename from naga/tests/out/ir/must-use.ron
rename to naga/tests/out/ir/wgsl-must-use.ron
diff --git a/naga/tests/out/ir/overrides-atomicCompareExchangeWeak.compact.ron b/naga/tests/out/ir/wgsl-overrides-atomicCompareExchangeWeak.compact.ron
similarity index 100%
rename from naga/tests/out/ir/overrides-atomicCompareExchangeWeak.compact.ron
rename to naga/tests/out/ir/wgsl-overrides-atomicCompareExchangeWeak.compact.ron
diff --git a/naga/tests/out/ir/overrides-atomicCompareExchangeWeak.ron b/naga/tests/out/ir/wgsl-overrides-atomicCompareExchangeWeak.ron
similarity index 100%
rename from naga/tests/out/ir/overrides-atomicCompareExchangeWeak.ron
rename to naga/tests/out/ir/wgsl-overrides-atomicCompareExchangeWeak.ron
diff --git a/naga/tests/out/ir/overrides-ray-query.compact.ron b/naga/tests/out/ir/wgsl-overrides-ray-query.compact.ron
similarity index 100%
rename from naga/tests/out/ir/overrides-ray-query.compact.ron
rename to naga/tests/out/ir/wgsl-overrides-ray-query.compact.ron
diff --git a/naga/tests/out/ir/overrides-ray-query.ron b/naga/tests/out/ir/wgsl-overrides-ray-query.ron
similarity index 100%
rename from naga/tests/out/ir/overrides-ray-query.ron
rename to naga/tests/out/ir/wgsl-overrides-ray-query.ron
diff --git a/naga/tests/out/ir/overrides.compact.ron b/naga/tests/out/ir/wgsl-overrides.compact.ron
similarity index 100%
rename from naga/tests/out/ir/overrides.compact.ron
rename to naga/tests/out/ir/wgsl-overrides.compact.ron
diff --git a/naga/tests/out/ir/overrides.ron b/naga/tests/out/ir/wgsl-overrides.ron
similarity index 100%
rename from naga/tests/out/ir/overrides.ron
rename to naga/tests/out/ir/wgsl-overrides.ron
diff --git a/naga/tests/out/ir/storage-textures.compact.ron b/naga/tests/out/ir/wgsl-storage-textures.compact.ron
similarity index 100%
rename from naga/tests/out/ir/storage-textures.compact.ron
rename to naga/tests/out/ir/wgsl-storage-textures.compact.ron
diff --git a/naga/tests/out/ir/storage-textures.ron b/naga/tests/out/ir/wgsl-storage-textures.ron
similarity index 100%
rename from naga/tests/out/ir/storage-textures.ron
rename to naga/tests/out/ir/wgsl-storage-textures.ron
diff --git a/naga/tests/out/ir/template-list-trailing-comma.compact.ron b/naga/tests/out/ir/wgsl-template-list-trailing-comma.compact.ron
similarity index 100%
rename from naga/tests/out/ir/template-list-trailing-comma.compact.ron
rename to naga/tests/out/ir/wgsl-template-list-trailing-comma.compact.ron
diff --git a/naga/tests/out/ir/template-list-trailing-comma.ron b/naga/tests/out/ir/wgsl-template-list-trailing-comma.ron
similarity index 100%
rename from naga/tests/out/ir/template-list-trailing-comma.ron
rename to naga/tests/out/ir/wgsl-template-list-trailing-comma.ron
diff --git a/naga/tests/out/msl/do-while.msl b/naga/tests/out/msl/spv-do-while.msl
similarity index 100%
rename from naga/tests/out/msl/do-while.msl
rename to naga/tests/out/msl/spv-do-while.msl
diff --git a/naga/tests/out/msl/empty-global-name.msl b/naga/tests/out/msl/spv-empty-global-name.msl
similarity index 100%
rename from naga/tests/out/msl/empty-global-name.msl
rename to naga/tests/out/msl/spv-empty-global-name.msl
diff --git a/naga/tests/out/msl/fetch_depth.msl b/naga/tests/out/msl/spv-fetch_depth.msl
similarity index 100%
rename from naga/tests/out/msl/fetch_depth.msl
rename to naga/tests/out/msl/spv-fetch_depth.msl
diff --git a/naga/tests/out/msl/quad-vert.msl b/naga/tests/out/msl/spv-quad-vert.msl
similarity index 100%
rename from naga/tests/out/msl/quad-vert.msl
rename to naga/tests/out/msl/spv-quad-vert.msl
diff --git a/naga/tests/out/msl/subgroup-operations-s.msl b/naga/tests/out/msl/spv-subgroup-operations-s.msl
similarity index 100%
rename from naga/tests/out/msl/subgroup-operations-s.msl
rename to naga/tests/out/msl/spv-subgroup-operations-s.msl
diff --git a/naga/tests/out/msl/unnamed-gl-per-vertex.msl b/naga/tests/out/msl/spv-unnamed-gl-per-vertex.msl
similarity index 100%
rename from naga/tests/out/msl/unnamed-gl-per-vertex.msl
rename to naga/tests/out/msl/spv-unnamed-gl-per-vertex.msl
diff --git a/naga/tests/out/msl/6438-conflicting-idents.msl b/naga/tests/out/msl/wgsl-6438-conflicting-idents.msl
similarity index 100%
rename from naga/tests/out/msl/6438-conflicting-idents.msl
rename to naga/tests/out/msl/wgsl-6438-conflicting-idents.msl
diff --git a/naga/tests/out/msl/6772-unpack-expr-accesses.msl b/naga/tests/out/msl/wgsl-6772-unpack-expr-accesses.msl
similarity index 100%
rename from naga/tests/out/msl/6772-unpack-expr-accesses.msl
rename to naga/tests/out/msl/wgsl-6772-unpack-expr-accesses.msl
diff --git a/naga/tests/out/msl/abstract-types-builtins.msl b/naga/tests/out/msl/wgsl-abstract-types-builtins.msl
similarity index 100%
rename from naga/tests/out/msl/abstract-types-builtins.msl
rename to naga/tests/out/msl/wgsl-abstract-types-builtins.msl
diff --git a/naga/tests/out/msl/abstract-types-const.msl b/naga/tests/out/msl/wgsl-abstract-types-const.msl
similarity index 100%
rename from naga/tests/out/msl/abstract-types-const.msl
rename to naga/tests/out/msl/wgsl-abstract-types-const.msl
diff --git a/naga/tests/out/msl/abstract-types-function-calls.msl b/naga/tests/out/msl/wgsl-abstract-types-function-calls.msl
similarity index 100%
rename from naga/tests/out/msl/abstract-types-function-calls.msl
rename to naga/tests/out/msl/wgsl-abstract-types-function-calls.msl
diff --git a/naga/tests/out/msl/abstract-types-let.msl b/naga/tests/out/msl/wgsl-abstract-types-let.msl
similarity index 100%
rename from naga/tests/out/msl/abstract-types-let.msl
rename to naga/tests/out/msl/wgsl-abstract-types-let.msl
diff --git a/naga/tests/out/msl/abstract-types-operators.msl b/naga/tests/out/msl/wgsl-abstract-types-operators.msl
similarity index 100%
rename from naga/tests/out/msl/abstract-types-operators.msl
rename to naga/tests/out/msl/wgsl-abstract-types-operators.msl
diff --git a/naga/tests/out/msl/abstract-types-return.msl b/naga/tests/out/msl/wgsl-abstract-types-return.msl
similarity index 100%
rename from naga/tests/out/msl/abstract-types-return.msl
rename to naga/tests/out/msl/wgsl-abstract-types-return.msl
diff --git a/naga/tests/out/msl/abstract-types-var.msl b/naga/tests/out/msl/wgsl-abstract-types-var.msl
similarity index 100%
rename from naga/tests/out/msl/abstract-types-var.msl
rename to naga/tests/out/msl/wgsl-abstract-types-var.msl
diff --git a/naga/tests/out/msl/access.msl b/naga/tests/out/msl/wgsl-access.msl
similarity index 100%
rename from naga/tests/out/msl/access.msl
rename to naga/tests/out/msl/wgsl-access.msl
diff --git a/naga/tests/out/msl/array-in-ctor.msl b/naga/tests/out/msl/wgsl-array-in-ctor.msl
similarity index 100%
rename from naga/tests/out/msl/array-in-ctor.msl
rename to naga/tests/out/msl/wgsl-array-in-ctor.msl
diff --git a/naga/tests/out/msl/array-in-function-return-type.msl b/naga/tests/out/msl/wgsl-array-in-function-return-type.msl
similarity index 100%
rename from naga/tests/out/msl/array-in-function-return-type.msl
rename to naga/tests/out/msl/wgsl-array-in-function-return-type.msl
diff --git a/naga/tests/out/msl/atomicCompareExchange.msl b/naga/tests/out/msl/wgsl-atomicCompareExchange.msl
similarity index 100%
rename from naga/tests/out/msl/atomicCompareExchange.msl
rename to naga/tests/out/msl/wgsl-atomicCompareExchange.msl
diff --git a/naga/tests/out/msl/atomicOps-float32.msl b/naga/tests/out/msl/wgsl-atomicOps-float32.msl
similarity index 100%
rename from naga/tests/out/msl/atomicOps-float32.msl
rename to naga/tests/out/msl/wgsl-atomicOps-float32.msl
diff --git a/naga/tests/out/msl/atomicOps-int64-min-max.msl b/naga/tests/out/msl/wgsl-atomicOps-int64-min-max.msl
similarity index 100%
rename from naga/tests/out/msl/atomicOps-int64-min-max.msl
rename to naga/tests/out/msl/wgsl-atomicOps-int64-min-max.msl
diff --git a/naga/tests/out/msl/atomicOps.msl b/naga/tests/out/msl/wgsl-atomicOps.msl
similarity index 100%
rename from naga/tests/out/msl/atomicOps.msl
rename to naga/tests/out/msl/wgsl-atomicOps.msl
diff --git a/naga/tests/out/msl/atomicTexture-int64.msl b/naga/tests/out/msl/wgsl-atomicTexture-int64.msl
similarity index 100%
rename from naga/tests/out/msl/atomicTexture-int64.msl
rename to naga/tests/out/msl/wgsl-atomicTexture-int64.msl
diff --git a/naga/tests/out/msl/atomicTexture.msl b/naga/tests/out/msl/wgsl-atomicTexture.msl
similarity index 100%
rename from naga/tests/out/msl/atomicTexture.msl
rename to naga/tests/out/msl/wgsl-atomicTexture.msl
diff --git a/naga/tests/out/msl/binding-arrays.msl b/naga/tests/out/msl/wgsl-binding-arrays.msl
similarity index 100%
rename from naga/tests/out/msl/binding-arrays.msl
rename to naga/tests/out/msl/wgsl-binding-arrays.msl
diff --git a/naga/tests/out/msl/bitcast.msl b/naga/tests/out/msl/wgsl-bitcast.msl
similarity index 100%
rename from naga/tests/out/msl/bitcast.msl
rename to naga/tests/out/msl/wgsl-bitcast.msl
diff --git a/naga/tests/out/msl/bits.msl b/naga/tests/out/msl/wgsl-bits.msl
similarity index 100%
rename from naga/tests/out/msl/bits.msl
rename to naga/tests/out/msl/wgsl-bits.msl
diff --git a/naga/tests/out/msl/boids.msl b/naga/tests/out/msl/wgsl-boids.msl
similarity index 100%
rename from naga/tests/out/msl/boids.msl
rename to naga/tests/out/msl/wgsl-boids.msl
diff --git a/naga/tests/out/msl/bounds-check-image-restrict.msl b/naga/tests/out/msl/wgsl-bounds-check-image-restrict.msl
similarity index 100%
rename from naga/tests/out/msl/bounds-check-image-restrict.msl
rename to naga/tests/out/msl/wgsl-bounds-check-image-restrict.msl
diff --git a/naga/tests/out/msl/bounds-check-image-rzsw.msl b/naga/tests/out/msl/wgsl-bounds-check-image-rzsw.msl
similarity index 100%
rename from naga/tests/out/msl/bounds-check-image-rzsw.msl
rename to naga/tests/out/msl/wgsl-bounds-check-image-rzsw.msl
diff --git a/naga/tests/out/msl/bounds-check-restrict.msl b/naga/tests/out/msl/wgsl-bounds-check-restrict.msl
similarity index 100%
rename from naga/tests/out/msl/bounds-check-restrict.msl
rename to naga/tests/out/msl/wgsl-bounds-check-restrict.msl
diff --git a/naga/tests/out/msl/bounds-check-zero-atomic.msl b/naga/tests/out/msl/wgsl-bounds-check-zero-atomic.msl
similarity index 100%
rename from naga/tests/out/msl/bounds-check-zero-atomic.msl
rename to naga/tests/out/msl/wgsl-bounds-check-zero-atomic.msl
diff --git a/naga/tests/out/msl/bounds-check-zero.msl b/naga/tests/out/msl/wgsl-bounds-check-zero.msl
similarity index 100%
rename from naga/tests/out/msl/bounds-check-zero.msl
rename to naga/tests/out/msl/wgsl-bounds-check-zero.msl
diff --git a/naga/tests/out/msl/break-if.msl b/naga/tests/out/msl/wgsl-break-if.msl
similarity index 100%
rename from naga/tests/out/msl/break-if.msl
rename to naga/tests/out/msl/wgsl-break-if.msl
diff --git a/naga/tests/out/msl/collatz.msl b/naga/tests/out/msl/wgsl-collatz.msl
similarity index 100%
rename from naga/tests/out/msl/collatz.msl
rename to naga/tests/out/msl/wgsl-collatz.msl
diff --git a/naga/tests/out/msl/const-exprs.msl b/naga/tests/out/msl/wgsl-const-exprs.msl
similarity index 100%
rename from naga/tests/out/msl/const-exprs.msl
rename to naga/tests/out/msl/wgsl-const-exprs.msl
diff --git a/naga/tests/out/msl/constructors.msl b/naga/tests/out/msl/wgsl-constructors.msl
similarity index 100%
rename from naga/tests/out/msl/constructors.msl
rename to naga/tests/out/msl/wgsl-constructors.msl
diff --git a/naga/tests/out/msl/control-flow.msl b/naga/tests/out/msl/wgsl-control-flow.msl
similarity index 100%
rename from naga/tests/out/msl/control-flow.msl
rename to naga/tests/out/msl/wgsl-control-flow.msl
diff --git a/naga/tests/out/msl/conversion-float-to-int-no-f64.msl b/naga/tests/out/msl/wgsl-conversion-float-to-int-no-f64.msl
similarity index 100%
rename from naga/tests/out/msl/conversion-float-to-int-no-f64.msl
rename to naga/tests/out/msl/wgsl-conversion-float-to-int-no-f64.msl
diff --git a/naga/tests/out/msl/conversions.msl b/naga/tests/out/msl/wgsl-conversions.msl
similarity index 100%
rename from naga/tests/out/msl/conversions.msl
rename to naga/tests/out/msl/wgsl-conversions.msl
diff --git a/naga/tests/out/msl/cross.msl b/naga/tests/out/msl/wgsl-cross.msl
similarity index 100%
rename from naga/tests/out/msl/cross.msl
rename to naga/tests/out/msl/wgsl-cross.msl
diff --git a/naga/tests/out/msl/dualsource.msl b/naga/tests/out/msl/wgsl-dualsource.msl
similarity index 100%
rename from naga/tests/out/msl/dualsource.msl
rename to naga/tests/out/msl/wgsl-dualsource.msl
diff --git a/naga/tests/out/msl/empty.msl b/naga/tests/out/msl/wgsl-empty.msl
similarity index 100%
rename from naga/tests/out/msl/empty.msl
rename to naga/tests/out/msl/wgsl-empty.msl
diff --git a/naga/tests/out/msl/extra.msl b/naga/tests/out/msl/wgsl-extra.msl
similarity index 100%
rename from naga/tests/out/msl/extra.msl
rename to naga/tests/out/msl/wgsl-extra.msl
diff --git a/naga/tests/out/msl/f16.msl b/naga/tests/out/msl/wgsl-f16.msl
similarity index 100%
rename from naga/tests/out/msl/f16.msl
rename to naga/tests/out/msl/wgsl-f16.msl
diff --git a/naga/tests/out/msl/fragment-output.msl b/naga/tests/out/msl/wgsl-fragment-output.msl
similarity index 100%
rename from naga/tests/out/msl/fragment-output.msl
rename to naga/tests/out/msl/wgsl-fragment-output.msl
diff --git a/naga/tests/out/msl/functions.msl b/naga/tests/out/msl/wgsl-functions.msl
similarity index 100%
rename from naga/tests/out/msl/functions.msl
rename to naga/tests/out/msl/wgsl-functions.msl
diff --git a/naga/tests/out/msl/globals.msl b/naga/tests/out/msl/wgsl-globals.msl
similarity index 100%
rename from naga/tests/out/msl/globals.msl
rename to naga/tests/out/msl/wgsl-globals.msl
diff --git a/naga/tests/out/msl/image.msl b/naga/tests/out/msl/wgsl-image.msl
similarity index 100%
rename from naga/tests/out/msl/image.msl
rename to naga/tests/out/msl/wgsl-image.msl
diff --git a/naga/tests/out/msl/int64.msl b/naga/tests/out/msl/wgsl-int64.msl
similarity index 100%
rename from naga/tests/out/msl/int64.msl
rename to naga/tests/out/msl/wgsl-int64.msl
diff --git a/naga/tests/out/msl/interface.msl b/naga/tests/out/msl/wgsl-interface.msl
similarity index 100%
rename from naga/tests/out/msl/interface.msl
rename to naga/tests/out/msl/wgsl-interface.msl
diff --git a/naga/tests/out/msl/interpolate.msl b/naga/tests/out/msl/wgsl-interpolate.msl
similarity index 100%
rename from naga/tests/out/msl/interpolate.msl
rename to naga/tests/out/msl/wgsl-interpolate.msl
diff --git a/naga/tests/out/msl/interpolate_compat.msl b/naga/tests/out/msl/wgsl-interpolate_compat.msl
similarity index 100%
rename from naga/tests/out/msl/interpolate_compat.msl
rename to naga/tests/out/msl/wgsl-interpolate_compat.msl
diff --git a/naga/tests/out/msl/math-functions.msl b/naga/tests/out/msl/wgsl-math-functions.msl
similarity index 100%
rename from naga/tests/out/msl/math-functions.msl
rename to naga/tests/out/msl/wgsl-math-functions.msl
diff --git a/naga/tests/out/msl/msl-varyings.msl b/naga/tests/out/msl/wgsl-msl-varyings.msl
similarity index 100%
rename from naga/tests/out/msl/msl-varyings.msl
rename to naga/tests/out/msl/wgsl-msl-varyings.msl
diff --git a/naga/tests/out/msl/operators.msl b/naga/tests/out/msl/wgsl-operators.msl
similarity index 100%
rename from naga/tests/out/msl/operators.msl
rename to naga/tests/out/msl/wgsl-operators.msl
diff --git a/naga/tests/out/msl/overrides-atomicCompareExchangeWeak.msl b/naga/tests/out/msl/wgsl-overrides-atomicCompareExchangeWeak.msl
similarity index 100%
rename from naga/tests/out/msl/overrides-atomicCompareExchangeWeak.msl
rename to naga/tests/out/msl/wgsl-overrides-atomicCompareExchangeWeak.msl
diff --git a/naga/tests/out/msl/overrides-ray-query.msl b/naga/tests/out/msl/wgsl-overrides-ray-query.msl
similarity index 100%
rename from naga/tests/out/msl/overrides-ray-query.msl
rename to naga/tests/out/msl/wgsl-overrides-ray-query.msl
diff --git a/naga/tests/out/msl/overrides.msl b/naga/tests/out/msl/wgsl-overrides.msl
similarity index 100%
rename from naga/tests/out/msl/overrides.msl
rename to naga/tests/out/msl/wgsl-overrides.msl
diff --git a/naga/tests/out/msl/padding.msl b/naga/tests/out/msl/wgsl-padding.msl
similarity index 100%
rename from naga/tests/out/msl/padding.msl
rename to naga/tests/out/msl/wgsl-padding.msl
diff --git a/naga/tests/out/msl/phony_assignment.msl b/naga/tests/out/msl/wgsl-phony_assignment.msl
similarity index 100%
rename from naga/tests/out/msl/phony_assignment.msl
rename to naga/tests/out/msl/wgsl-phony_assignment.msl
diff --git a/naga/tests/out/msl/policy-mix.msl b/naga/tests/out/msl/wgsl-policy-mix.msl
similarity index 100%
rename from naga/tests/out/msl/policy-mix.msl
rename to naga/tests/out/msl/wgsl-policy-mix.msl
diff --git a/naga/tests/out/msl/quad.msl b/naga/tests/out/msl/wgsl-quad.msl
similarity index 100%
rename from naga/tests/out/msl/quad.msl
rename to naga/tests/out/msl/wgsl-quad.msl
diff --git a/naga/tests/out/msl/ray-query.msl b/naga/tests/out/msl/wgsl-ray-query.msl
similarity index 100%
rename from naga/tests/out/msl/ray-query.msl
rename to naga/tests/out/msl/wgsl-ray-query.msl
diff --git a/naga/tests/out/msl/resource-binding-map.msl b/naga/tests/out/msl/wgsl-resource-binding-map.msl
similarity index 100%
rename from naga/tests/out/msl/resource-binding-map.msl
rename to naga/tests/out/msl/wgsl-resource-binding-map.msl
diff --git a/naga/tests/out/msl/shadow.msl b/naga/tests/out/msl/wgsl-shadow.msl
similarity index 100%
rename from naga/tests/out/msl/shadow.msl
rename to naga/tests/out/msl/wgsl-shadow.msl
diff --git a/naga/tests/out/msl/skybox.msl b/naga/tests/out/msl/wgsl-skybox.msl
similarity index 100%
rename from naga/tests/out/msl/skybox.msl
rename to naga/tests/out/msl/wgsl-skybox.msl
diff --git a/naga/tests/out/msl/standard.msl b/naga/tests/out/msl/wgsl-standard.msl
similarity index 100%
rename from naga/tests/out/msl/standard.msl
rename to naga/tests/out/msl/wgsl-standard.msl
diff --git a/naga/tests/out/msl/storage-textures.msl b/naga/tests/out/msl/wgsl-storage-textures.msl
similarity index 100%
rename from naga/tests/out/msl/storage-textures.msl
rename to naga/tests/out/msl/wgsl-storage-textures.msl
diff --git a/naga/tests/out/msl/struct-layout.msl b/naga/tests/out/msl/wgsl-struct-layout.msl
similarity index 100%
rename from naga/tests/out/msl/struct-layout.msl
rename to naga/tests/out/msl/wgsl-struct-layout.msl
diff --git a/naga/tests/out/msl/subgroup-operations.msl b/naga/tests/out/msl/wgsl-subgroup-operations.msl
similarity index 100%
rename from naga/tests/out/msl/subgroup-operations.msl
rename to naga/tests/out/msl/wgsl-subgroup-operations.msl
diff --git a/naga/tests/out/msl/texture-arg.msl b/naga/tests/out/msl/wgsl-texture-arg.msl
similarity index 100%
rename from naga/tests/out/msl/texture-arg.msl
rename to naga/tests/out/msl/wgsl-texture-arg.msl
diff --git a/naga/tests/out/msl/type-inference.msl b/naga/tests/out/msl/wgsl-type-inference.msl
similarity index 100%
rename from naga/tests/out/msl/type-inference.msl
rename to naga/tests/out/msl/wgsl-type-inference.msl
diff --git a/naga/tests/out/msl/vertex-pulling-transform.msl b/naga/tests/out/msl/wgsl-vertex-pulling-transform.msl
similarity index 100%
rename from naga/tests/out/msl/vertex-pulling-transform.msl
rename to naga/tests/out/msl/wgsl-vertex-pulling-transform.msl
diff --git a/naga/tests/out/msl/workgroup-uniform-load.msl b/naga/tests/out/msl/wgsl-workgroup-uniform-load.msl
similarity index 100%
rename from naga/tests/out/msl/workgroup-uniform-load.msl
rename to naga/tests/out/msl/wgsl-workgroup-uniform-load.msl
diff --git a/naga/tests/out/msl/workgroup-var-init.msl b/naga/tests/out/msl/wgsl-workgroup-var-init.msl
similarity index 100%
rename from naga/tests/out/msl/workgroup-var-init.msl
rename to naga/tests/out/msl/wgsl-workgroup-var-init.msl
diff --git a/naga/tests/out/spv/fetch_depth.spvasm b/naga/tests/out/spv/spv-fetch_depth.spvasm
similarity index 100%
rename from naga/tests/out/spv/fetch_depth.spvasm
rename to naga/tests/out/spv/spv-fetch_depth.spvasm
diff --git a/naga/tests/out/spv/6220-break-from-loop.spvasm b/naga/tests/out/spv/wgsl-6220-break-from-loop.spvasm
similarity index 100%
rename from naga/tests/out/spv/6220-break-from-loop.spvasm
rename to naga/tests/out/spv/wgsl-6220-break-from-loop.spvasm
diff --git a/naga/tests/out/spv/6438-conflicting-idents.spvasm b/naga/tests/out/spv/wgsl-6438-conflicting-idents.spvasm
similarity index 100%
rename from naga/tests/out/spv/6438-conflicting-idents.spvasm
rename to naga/tests/out/spv/wgsl-6438-conflicting-idents.spvasm
diff --git a/naga/tests/out/spv/6772-unpack-expr-accesses.spvasm b/naga/tests/out/spv/wgsl-6772-unpack-expr-accesses.spvasm
similarity index 100%
rename from naga/tests/out/spv/6772-unpack-expr-accesses.spvasm
rename to naga/tests/out/spv/wgsl-6772-unpack-expr-accesses.spvasm
diff --git a/naga/tests/out/spv/7048-multiple-dynamic-1.spvasm b/naga/tests/out/spv/wgsl-7048-multiple-dynamic-1.spvasm
similarity index 100%
rename from naga/tests/out/spv/7048-multiple-dynamic-1.spvasm
rename to naga/tests/out/spv/wgsl-7048-multiple-dynamic-1.spvasm
diff --git a/naga/tests/out/spv/7048-multiple-dynamic-2.spvasm b/naga/tests/out/spv/wgsl-7048-multiple-dynamic-2.spvasm
similarity index 100%
rename from naga/tests/out/spv/7048-multiple-dynamic-2.spvasm
rename to naga/tests/out/spv/wgsl-7048-multiple-dynamic-2.spvasm
diff --git a/naga/tests/out/spv/7048-multiple-dynamic-3.spvasm b/naga/tests/out/spv/wgsl-7048-multiple-dynamic-3.spvasm
similarity index 100%
rename from naga/tests/out/spv/7048-multiple-dynamic-3.spvasm
rename to naga/tests/out/spv/wgsl-7048-multiple-dynamic-3.spvasm
diff --git a/naga/tests/out/spv/abstract-types-builtins.spvasm b/naga/tests/out/spv/wgsl-abstract-types-builtins.spvasm
similarity index 100%
rename from naga/tests/out/spv/abstract-types-builtins.spvasm
rename to naga/tests/out/spv/wgsl-abstract-types-builtins.spvasm
diff --git a/naga/tests/out/spv/abstract-types-const.spvasm b/naga/tests/out/spv/wgsl-abstract-types-const.spvasm
similarity index 100%
rename from naga/tests/out/spv/abstract-types-const.spvasm
rename to naga/tests/out/spv/wgsl-abstract-types-const.spvasm
diff --git a/naga/tests/out/spv/abstract-types-function-calls.spvasm b/naga/tests/out/spv/wgsl-abstract-types-function-calls.spvasm
similarity index 100%
rename from naga/tests/out/spv/abstract-types-function-calls.spvasm
rename to naga/tests/out/spv/wgsl-abstract-types-function-calls.spvasm
diff --git a/naga/tests/out/spv/abstract-types-let.spvasm b/naga/tests/out/spv/wgsl-abstract-types-let.spvasm
similarity index 100%
rename from naga/tests/out/spv/abstract-types-let.spvasm
rename to naga/tests/out/spv/wgsl-abstract-types-let.spvasm
diff --git a/naga/tests/out/spv/abstract-types-operators.spvasm b/naga/tests/out/spv/wgsl-abstract-types-operators.spvasm
similarity index 100%
rename from naga/tests/out/spv/abstract-types-operators.spvasm
rename to naga/tests/out/spv/wgsl-abstract-types-operators.spvasm
diff --git a/naga/tests/out/spv/abstract-types-return.spvasm b/naga/tests/out/spv/wgsl-abstract-types-return.spvasm
similarity index 100%
rename from naga/tests/out/spv/abstract-types-return.spvasm
rename to naga/tests/out/spv/wgsl-abstract-types-return.spvasm
diff --git a/naga/tests/out/spv/abstract-types-var.spvasm b/naga/tests/out/spv/wgsl-abstract-types-var.spvasm
similarity index 100%
rename from naga/tests/out/spv/abstract-types-var.spvasm
rename to naga/tests/out/spv/wgsl-abstract-types-var.spvasm
diff --git a/naga/tests/out/spv/access.spvasm b/naga/tests/out/spv/wgsl-access.spvasm
similarity index 100%
rename from naga/tests/out/spv/access.spvasm
rename to naga/tests/out/spv/wgsl-access.spvasm
diff --git a/naga/tests/out/spv/array-in-ctor.spvasm b/naga/tests/out/spv/wgsl-array-in-ctor.spvasm
similarity index 100%
rename from naga/tests/out/spv/array-in-ctor.spvasm
rename to naga/tests/out/spv/wgsl-array-in-ctor.spvasm
diff --git a/naga/tests/out/spv/array-in-function-return-type.spvasm b/naga/tests/out/spv/wgsl-array-in-function-return-type.spvasm
similarity index 100%
rename from naga/tests/out/spv/array-in-function-return-type.spvasm
rename to naga/tests/out/spv/wgsl-array-in-function-return-type.spvasm
diff --git a/naga/tests/out/spv/atomicCompareExchange-int64.spvasm b/naga/tests/out/spv/wgsl-atomicCompareExchange-int64.spvasm
similarity index 100%
rename from naga/tests/out/spv/atomicCompareExchange-int64.spvasm
rename to naga/tests/out/spv/wgsl-atomicCompareExchange-int64.spvasm
diff --git a/naga/tests/out/spv/atomicCompareExchange.spvasm b/naga/tests/out/spv/wgsl-atomicCompareExchange.spvasm
similarity index 100%
rename from naga/tests/out/spv/atomicCompareExchange.spvasm
rename to naga/tests/out/spv/wgsl-atomicCompareExchange.spvasm
diff --git a/naga/tests/out/spv/atomicOps-float32.spvasm b/naga/tests/out/spv/wgsl-atomicOps-float32.spvasm
similarity index 100%
rename from naga/tests/out/spv/atomicOps-float32.spvasm
rename to naga/tests/out/spv/wgsl-atomicOps-float32.spvasm
diff --git a/naga/tests/out/spv/atomicOps-int64-min-max.spvasm b/naga/tests/out/spv/wgsl-atomicOps-int64-min-max.spvasm
similarity index 100%
rename from naga/tests/out/spv/atomicOps-int64-min-max.spvasm
rename to naga/tests/out/spv/wgsl-atomicOps-int64-min-max.spvasm
diff --git a/naga/tests/out/spv/atomicOps-int64.spvasm b/naga/tests/out/spv/wgsl-atomicOps-int64.spvasm
similarity index 100%
rename from naga/tests/out/spv/atomicOps-int64.spvasm
rename to naga/tests/out/spv/wgsl-atomicOps-int64.spvasm
diff --git a/naga/tests/out/spv/atomicOps.spvasm b/naga/tests/out/spv/wgsl-atomicOps.spvasm
similarity index 100%
rename from naga/tests/out/spv/atomicOps.spvasm
rename to naga/tests/out/spv/wgsl-atomicOps.spvasm
diff --git a/naga/tests/out/spv/atomicTexture-int64.spvasm b/naga/tests/out/spv/wgsl-atomicTexture-int64.spvasm
similarity index 100%
rename from naga/tests/out/spv/atomicTexture-int64.spvasm
rename to naga/tests/out/spv/wgsl-atomicTexture-int64.spvasm
diff --git a/naga/tests/out/spv/atomicTexture.spvasm b/naga/tests/out/spv/wgsl-atomicTexture.spvasm
similarity index 100%
rename from naga/tests/out/spv/atomicTexture.spvasm
rename to naga/tests/out/spv/wgsl-atomicTexture.spvasm
diff --git a/naga/tests/out/spv/binding-arrays.spvasm b/naga/tests/out/spv/wgsl-binding-arrays.spvasm
similarity index 100%
rename from naga/tests/out/spv/binding-arrays.spvasm
rename to naga/tests/out/spv/wgsl-binding-arrays.spvasm
diff --git a/naga/tests/out/spv/binding-buffer-arrays.spvasm b/naga/tests/out/spv/wgsl-binding-buffer-arrays.spvasm
similarity index 100%
rename from naga/tests/out/spv/binding-buffer-arrays.spvasm
rename to naga/tests/out/spv/wgsl-binding-buffer-arrays.spvasm
diff --git a/naga/tests/out/spv/bitcast.spvasm b/naga/tests/out/spv/wgsl-bitcast.spvasm
similarity index 100%
rename from naga/tests/out/spv/bitcast.spvasm
rename to naga/tests/out/spv/wgsl-bitcast.spvasm
diff --git a/naga/tests/out/spv/bits.spvasm b/naga/tests/out/spv/wgsl-bits.spvasm
similarity index 100%
rename from naga/tests/out/spv/bits.spvasm
rename to naga/tests/out/spv/wgsl-bits.spvasm
diff --git a/naga/tests/out/spv/boids.spvasm b/naga/tests/out/spv/wgsl-boids.spvasm
similarity index 100%
rename from naga/tests/out/spv/boids.spvasm
rename to naga/tests/out/spv/wgsl-boids.spvasm
diff --git a/naga/tests/out/spv/bounds-check-image-restrict.spvasm b/naga/tests/out/spv/wgsl-bounds-check-image-restrict.spvasm
similarity index 100%
rename from naga/tests/out/spv/bounds-check-image-restrict.spvasm
rename to naga/tests/out/spv/wgsl-bounds-check-image-restrict.spvasm
diff --git a/naga/tests/out/spv/bounds-check-image-rzsw.spvasm b/naga/tests/out/spv/wgsl-bounds-check-image-rzsw.spvasm
similarity index 100%
rename from naga/tests/out/spv/bounds-check-image-rzsw.spvasm
rename to naga/tests/out/spv/wgsl-bounds-check-image-rzsw.spvasm
diff --git a/naga/tests/out/spv/bounds-check-restrict.spvasm b/naga/tests/out/spv/wgsl-bounds-check-restrict.spvasm
similarity index 100%
rename from naga/tests/out/spv/bounds-check-restrict.spvasm
rename to naga/tests/out/spv/wgsl-bounds-check-restrict.spvasm
diff --git a/naga/tests/out/spv/bounds-check-zero.spvasm b/naga/tests/out/spv/wgsl-bounds-check-zero.spvasm
similarity index 100%
rename from naga/tests/out/spv/bounds-check-zero.spvasm
rename to naga/tests/out/spv/wgsl-bounds-check-zero.spvasm
diff --git a/naga/tests/out/spv/break-if.spvasm b/naga/tests/out/spv/wgsl-break-if.spvasm
similarity index 100%
rename from naga/tests/out/spv/break-if.spvasm
rename to naga/tests/out/spv/wgsl-break-if.spvasm
diff --git a/naga/tests/out/spv/collatz.spvasm b/naga/tests/out/spv/wgsl-collatz.spvasm
similarity index 100%
rename from naga/tests/out/spv/collatz.spvasm
rename to naga/tests/out/spv/wgsl-collatz.spvasm
diff --git a/naga/tests/out/spv/const-exprs.spvasm b/naga/tests/out/spv/wgsl-const-exprs.spvasm
similarity index 100%
rename from naga/tests/out/spv/const-exprs.spvasm
rename to naga/tests/out/spv/wgsl-const-exprs.spvasm
diff --git a/naga/tests/out/spv/constructors.spvasm b/naga/tests/out/spv/wgsl-constructors.spvasm
similarity index 100%
rename from naga/tests/out/spv/constructors.spvasm
rename to naga/tests/out/spv/wgsl-constructors.spvasm
diff --git a/naga/tests/out/spv/control-flow.spvasm b/naga/tests/out/spv/wgsl-control-flow.spvasm
similarity index 100%
rename from naga/tests/out/spv/control-flow.spvasm
rename to naga/tests/out/spv/wgsl-control-flow.spvasm
diff --git a/naga/tests/out/spv/conversion-float-to-int.spvasm b/naga/tests/out/spv/wgsl-conversion-float-to-int.spvasm
similarity index 100%
rename from naga/tests/out/spv/conversion-float-to-int.spvasm
rename to naga/tests/out/spv/wgsl-conversion-float-to-int.spvasm
diff --git a/naga/tests/out/spv/conversions.spvasm b/naga/tests/out/spv/wgsl-conversions.spvasm
similarity index 100%
rename from naga/tests/out/spv/conversions.spvasm
rename to naga/tests/out/spv/wgsl-conversions.spvasm
diff --git a/naga/tests/out/spv/cross.spvasm b/naga/tests/out/spv/wgsl-cross.spvasm
similarity index 100%
rename from naga/tests/out/spv/cross.spvasm
rename to naga/tests/out/spv/wgsl-cross.spvasm
diff --git a/naga/tests/out/spv/debug-symbol-large-source.spvasm b/naga/tests/out/spv/wgsl-debug-symbol-large-source.spvasm
similarity index 100%
rename from naga/tests/out/spv/debug-symbol-large-source.spvasm
rename to naga/tests/out/spv/wgsl-debug-symbol-large-source.spvasm
diff --git a/naga/tests/out/spv/debug-symbol-simple.spvasm b/naga/tests/out/spv/wgsl-debug-symbol-simple.spvasm
similarity index 100%
rename from naga/tests/out/spv/debug-symbol-simple.spvasm
rename to naga/tests/out/spv/wgsl-debug-symbol-simple.spvasm
diff --git a/naga/tests/out/spv/debug-symbol-terrain.spvasm b/naga/tests/out/spv/wgsl-debug-symbol-terrain.spvasm
similarity index 100%
rename from naga/tests/out/spv/debug-symbol-terrain.spvasm
rename to naga/tests/out/spv/wgsl-debug-symbol-terrain.spvasm
diff --git a/naga/tests/out/spv/dualsource.spvasm b/naga/tests/out/spv/wgsl-dualsource.spvasm
similarity index 100%
rename from naga/tests/out/spv/dualsource.spvasm
rename to naga/tests/out/spv/wgsl-dualsource.spvasm
diff --git a/naga/tests/out/spv/empty.spvasm b/naga/tests/out/spv/wgsl-empty.spvasm
similarity index 100%
rename from naga/tests/out/spv/empty.spvasm
rename to naga/tests/out/spv/wgsl-empty.spvasm
diff --git a/naga/tests/out/spv/extra.spvasm b/naga/tests/out/spv/wgsl-extra.spvasm
similarity index 100%
rename from naga/tests/out/spv/extra.spvasm
rename to naga/tests/out/spv/wgsl-extra.spvasm
diff --git a/naga/tests/out/spv/f16.spvasm b/naga/tests/out/spv/wgsl-f16.spvasm
similarity index 100%
rename from naga/tests/out/spv/f16.spvasm
rename to naga/tests/out/spv/wgsl-f16.spvasm
diff --git a/naga/tests/out/spv/f64.spvasm b/naga/tests/out/spv/wgsl-f64.spvasm
similarity index 100%
rename from naga/tests/out/spv/f64.spvasm
rename to naga/tests/out/spv/wgsl-f64.spvasm
diff --git a/naga/tests/out/spv/fragment-output.spvasm b/naga/tests/out/spv/wgsl-fragment-output.spvasm
similarity index 100%
rename from naga/tests/out/spv/fragment-output.spvasm
rename to naga/tests/out/spv/wgsl-fragment-output.spvasm
diff --git a/naga/tests/out/spv/functions.spvasm b/naga/tests/out/spv/wgsl-functions.spvasm
similarity index 100%
rename from naga/tests/out/spv/functions.spvasm
rename to naga/tests/out/spv/wgsl-functions.spvasm
diff --git a/naga/tests/out/spv/globals.spvasm b/naga/tests/out/spv/wgsl-globals.spvasm
similarity index 100%
rename from naga/tests/out/spv/globals.spvasm
rename to naga/tests/out/spv/wgsl-globals.spvasm
diff --git a/naga/tests/out/spv/image.spvasm b/naga/tests/out/spv/wgsl-image.spvasm
similarity index 100%
rename from naga/tests/out/spv/image.spvasm
rename to naga/tests/out/spv/wgsl-image.spvasm
diff --git a/naga/tests/out/spv/index-by-value.spvasm b/naga/tests/out/spv/wgsl-index-by-value.spvasm
similarity index 100%
rename from naga/tests/out/spv/index-by-value.spvasm
rename to naga/tests/out/spv/wgsl-index-by-value.spvasm
diff --git a/naga/tests/out/spv/int64.spvasm b/naga/tests/out/spv/wgsl-int64.spvasm
similarity index 100%
rename from naga/tests/out/spv/int64.spvasm
rename to naga/tests/out/spv/wgsl-int64.spvasm
diff --git a/naga/tests/out/spv/interface.compute.spvasm b/naga/tests/out/spv/wgsl-interface.compute.spvasm
similarity index 100%
rename from naga/tests/out/spv/interface.compute.spvasm
rename to naga/tests/out/spv/wgsl-interface.compute.spvasm
diff --git a/naga/tests/out/spv/interface.fragment.spvasm b/naga/tests/out/spv/wgsl-interface.fragment.spvasm
similarity index 100%
rename from naga/tests/out/spv/interface.fragment.spvasm
rename to naga/tests/out/spv/wgsl-interface.fragment.spvasm
diff --git a/naga/tests/out/spv/interface.vertex.spvasm b/naga/tests/out/spv/wgsl-interface.vertex.spvasm
similarity index 100%
rename from naga/tests/out/spv/interface.vertex.spvasm
rename to naga/tests/out/spv/wgsl-interface.vertex.spvasm
diff --git a/naga/tests/out/spv/interface.vertex_two_structs.spvasm b/naga/tests/out/spv/wgsl-interface.vertex_two_structs.spvasm
similarity index 100%
rename from naga/tests/out/spv/interface.vertex_two_structs.spvasm
rename to naga/tests/out/spv/wgsl-interface.vertex_two_structs.spvasm
diff --git a/naga/tests/out/spv/interpolate.spvasm b/naga/tests/out/spv/wgsl-interpolate.spvasm
similarity index 100%
rename from naga/tests/out/spv/interpolate.spvasm
rename to naga/tests/out/spv/wgsl-interpolate.spvasm
diff --git a/naga/tests/out/spv/interpolate_compat.spvasm b/naga/tests/out/spv/wgsl-interpolate_compat.spvasm
similarity index 100%
rename from naga/tests/out/spv/interpolate_compat.spvasm
rename to naga/tests/out/spv/wgsl-interpolate_compat.spvasm
diff --git a/naga/tests/out/spv/math-functions.spvasm b/naga/tests/out/spv/wgsl-math-functions.spvasm
similarity index 100%
rename from naga/tests/out/spv/math-functions.spvasm
rename to naga/tests/out/spv/wgsl-math-functions.spvasm
diff --git a/naga/tests/out/spv/multiview.spvasm b/naga/tests/out/spv/wgsl-multiview.spvasm
similarity index 100%
rename from naga/tests/out/spv/multiview.spvasm
rename to naga/tests/out/spv/wgsl-multiview.spvasm
diff --git a/naga/tests/out/spv/operators.spvasm b/naga/tests/out/spv/wgsl-operators.spvasm
similarity index 100%
rename from naga/tests/out/spv/operators.spvasm
rename to naga/tests/out/spv/wgsl-operators.spvasm
diff --git a/naga/tests/out/spv/overrides-atomicCompareExchangeWeak.f.spvasm b/naga/tests/out/spv/wgsl-overrides-atomicCompareExchangeWeak.f.spvasm
similarity index 100%
rename from naga/tests/out/spv/overrides-atomicCompareExchangeWeak.f.spvasm
rename to naga/tests/out/spv/wgsl-overrides-atomicCompareExchangeWeak.f.spvasm
diff --git a/naga/tests/out/spv/overrides-ray-query.main.spvasm b/naga/tests/out/spv/wgsl-overrides-ray-query.main.spvasm
similarity index 100%
rename from naga/tests/out/spv/overrides-ray-query.main.spvasm
rename to naga/tests/out/spv/wgsl-overrides-ray-query.main.spvasm
diff --git a/naga/tests/out/spv/overrides.main.spvasm b/naga/tests/out/spv/wgsl-overrides.main.spvasm
similarity index 100%
rename from naga/tests/out/spv/overrides.main.spvasm
rename to naga/tests/out/spv/wgsl-overrides.main.spvasm
diff --git a/naga/tests/out/spv/padding.spvasm b/naga/tests/out/spv/wgsl-padding.spvasm
similarity index 100%
rename from naga/tests/out/spv/padding.spvasm
rename to naga/tests/out/spv/wgsl-padding.spvasm
diff --git a/naga/tests/out/spv/phony_assignment.spvasm b/naga/tests/out/spv/wgsl-phony_assignment.spvasm
similarity index 100%
rename from naga/tests/out/spv/phony_assignment.spvasm
rename to naga/tests/out/spv/wgsl-phony_assignment.spvasm
diff --git a/naga/tests/out/spv/pointers.spvasm b/naga/tests/out/spv/wgsl-pointers.spvasm
similarity index 100%
rename from naga/tests/out/spv/pointers.spvasm
rename to naga/tests/out/spv/wgsl-pointers.spvasm
diff --git a/naga/tests/out/spv/policy-mix.spvasm b/naga/tests/out/spv/wgsl-policy-mix.spvasm
similarity index 100%
rename from naga/tests/out/spv/policy-mix.spvasm
rename to naga/tests/out/spv/wgsl-policy-mix.spvasm
diff --git a/naga/tests/out/spv/quad.spvasm b/naga/tests/out/spv/wgsl-quad.spvasm
similarity index 100%
rename from naga/tests/out/spv/quad.spvasm
rename to naga/tests/out/spv/wgsl-quad.spvasm
diff --git a/naga/tests/out/spv/ray-query.spvasm b/naga/tests/out/spv/wgsl-ray-query.spvasm
similarity index 100%
rename from naga/tests/out/spv/ray-query.spvasm
rename to naga/tests/out/spv/wgsl-ray-query.spvasm
diff --git a/naga/tests/out/spv/runtime-array-in-unused-struct.spvasm b/naga/tests/out/spv/wgsl-runtime-array-in-unused-struct.spvasm
similarity index 100%
rename from naga/tests/out/spv/runtime-array-in-unused-struct.spvasm
rename to naga/tests/out/spv/wgsl-runtime-array-in-unused-struct.spvasm
diff --git a/naga/tests/out/spv/separate-entry-points.compute.spvasm b/naga/tests/out/spv/wgsl-separate-entry-points.compute.spvasm
similarity index 100%
rename from naga/tests/out/spv/separate-entry-points.compute.spvasm
rename to naga/tests/out/spv/wgsl-separate-entry-points.compute.spvasm
diff --git a/naga/tests/out/spv/separate-entry-points.fragment.spvasm b/naga/tests/out/spv/wgsl-separate-entry-points.fragment.spvasm
similarity index 100%
rename from naga/tests/out/spv/separate-entry-points.fragment.spvasm
rename to naga/tests/out/spv/wgsl-separate-entry-points.fragment.spvasm
diff --git a/naga/tests/out/spv/shadow.spvasm b/naga/tests/out/spv/wgsl-shadow.spvasm
similarity index 100%
rename from naga/tests/out/spv/shadow.spvasm
rename to naga/tests/out/spv/wgsl-shadow.spvasm
diff --git a/naga/tests/out/spv/skybox.spvasm b/naga/tests/out/spv/wgsl-skybox.spvasm
similarity index 100%
rename from naga/tests/out/spv/skybox.spvasm
rename to naga/tests/out/spv/wgsl-skybox.spvasm
diff --git a/naga/tests/out/spv/sprite.spvasm b/naga/tests/out/spv/wgsl-sprite.spvasm
similarity index 100%
rename from naga/tests/out/spv/sprite.spvasm
rename to naga/tests/out/spv/wgsl-sprite.spvasm
diff --git a/naga/tests/out/spv/standard.spvasm b/naga/tests/out/spv/wgsl-standard.spvasm
similarity index 100%
rename from naga/tests/out/spv/standard.spvasm
rename to naga/tests/out/spv/wgsl-standard.spvasm
diff --git a/naga/tests/out/spv/storage-textures.spvasm b/naga/tests/out/spv/wgsl-storage-textures.spvasm
similarity index 100%
rename from naga/tests/out/spv/storage-textures.spvasm
rename to naga/tests/out/spv/wgsl-storage-textures.spvasm
diff --git a/naga/tests/out/spv/struct-layout.spvasm b/naga/tests/out/spv/wgsl-struct-layout.spvasm
similarity index 100%
rename from naga/tests/out/spv/struct-layout.spvasm
rename to naga/tests/out/spv/wgsl-struct-layout.spvasm
diff --git a/naga/tests/out/spv/subgroup-operations.spvasm b/naga/tests/out/spv/wgsl-subgroup-operations.spvasm
similarity index 100%
rename from naga/tests/out/spv/subgroup-operations.spvasm
rename to naga/tests/out/spv/wgsl-subgroup-operations.spvasm
diff --git a/naga/tests/out/spv/texture-arg.spvasm b/naga/tests/out/spv/wgsl-texture-arg.spvasm
similarity index 100%
rename from naga/tests/out/spv/texture-arg.spvasm
rename to naga/tests/out/spv/wgsl-texture-arg.spvasm
diff --git a/naga/tests/out/spv/type-inference.spvasm b/naga/tests/out/spv/wgsl-type-inference.spvasm
similarity index 100%
rename from naga/tests/out/spv/type-inference.spvasm
rename to naga/tests/out/spv/wgsl-type-inference.spvasm
diff --git a/naga/tests/out/spv/workgroup-uniform-load.spvasm b/naga/tests/out/spv/wgsl-workgroup-uniform-load.spvasm
similarity index 100%
rename from naga/tests/out/spv/workgroup-uniform-load.spvasm
rename to naga/tests/out/spv/wgsl-workgroup-uniform-load.spvasm
diff --git a/naga/tests/out/spv/workgroup-var-init.spvasm b/naga/tests/out/spv/wgsl-workgroup-var-init.spvasm
similarity index 100%
rename from naga/tests/out/spv/workgroup-var-init.spvasm
rename to naga/tests/out/spv/wgsl-workgroup-var-init.spvasm
diff --git a/naga/tests/out/wgsl/210-bevy-2d-shader.frag.wgsl b/naga/tests/out/wgsl/glsl-210-bevy-2d-shader.frag.wgsl
similarity index 100%
rename from naga/tests/out/wgsl/210-bevy-2d-shader.frag.wgsl
rename to naga/tests/out/wgsl/glsl-210-bevy-2d-shader.frag.wgsl
diff --git a/naga/tests/out/wgsl/210-bevy-2d-shader.vert.wgsl b/naga/tests/out/wgsl/glsl-210-bevy-2d-shader.vert.wgsl
similarity index 100%
rename from naga/tests/out/wgsl/210-bevy-2d-shader.vert.wgsl
rename to naga/tests/out/wgsl/glsl-210-bevy-2d-shader.vert.wgsl
diff --git a/naga/tests/out/wgsl/210-bevy-shader.vert.wgsl b/naga/tests/out/wgsl/glsl-210-bevy-shader.vert.wgsl
similarity index 100%
rename from naga/tests/out/wgsl/210-bevy-shader.vert.wgsl
rename to naga/tests/out/wgsl/glsl-210-bevy-shader.vert.wgsl
diff --git a/naga/tests/out/wgsl/246-collatz.comp.wgsl b/naga/tests/out/wgsl/glsl-246-collatz.comp.wgsl
similarity index 100%
rename from naga/tests/out/wgsl/246-collatz.comp.wgsl
rename to naga/tests/out/wgsl/glsl-246-collatz.comp.wgsl
diff --git a/naga/tests/out/wgsl/277-casting.frag.wgsl b/naga/tests/out/wgsl/glsl-277-casting.frag.wgsl
similarity index 100%
rename from naga/tests/out/wgsl/277-casting.frag.wgsl
rename to naga/tests/out/wgsl/glsl-277-casting.frag.wgsl
diff --git a/naga/tests/out/wgsl/280-matrix-cast.frag.wgsl b/naga/tests/out/wgsl/glsl-280-matrix-cast.frag.wgsl
similarity index 100%
rename from naga/tests/out/wgsl/280-matrix-cast.frag.wgsl
rename to naga/tests/out/wgsl/glsl-280-matrix-cast.frag.wgsl
diff --git a/naga/tests/out/wgsl/484-preprocessor-if.frag.wgsl b/naga/tests/out/wgsl/glsl-484-preprocessor-if.frag.wgsl
similarity index 100%
rename from naga/tests/out/wgsl/484-preprocessor-if.frag.wgsl
rename to naga/tests/out/wgsl/glsl-484-preprocessor-if.frag.wgsl
diff --git a/naga/tests/out/wgsl/5246-dual-iteration.frag.wgsl b/naga/tests/out/wgsl/glsl-5246-dual-iteration.frag.wgsl
similarity index 100%
rename from naga/tests/out/wgsl/5246-dual-iteration.frag.wgsl
rename to naga/tests/out/wgsl/glsl-5246-dual-iteration.frag.wgsl
diff --git a/naga/tests/out/wgsl/800-out-of-bounds-panic.vert.wgsl b/naga/tests/out/wgsl/glsl-800-out-of-bounds-panic.vert.wgsl
similarity index 100%
rename from naga/tests/out/wgsl/800-out-of-bounds-panic.vert.wgsl
rename to naga/tests/out/wgsl/glsl-800-out-of-bounds-panic.vert.wgsl
diff --git a/naga/tests/out/wgsl/896-push-constant.frag.wgsl b/naga/tests/out/wgsl/glsl-896-push-constant.frag.wgsl
similarity index 100%
rename from naga/tests/out/wgsl/896-push-constant.frag.wgsl
rename to naga/tests/out/wgsl/glsl-896-push-constant.frag.wgsl
diff --git a/naga/tests/out/wgsl/900-implicit-conversions.frag.wgsl b/naga/tests/out/wgsl/glsl-900-implicit-conversions.frag.wgsl
similarity index 100%
rename from naga/tests/out/wgsl/900-implicit-conversions.frag.wgsl
rename to naga/tests/out/wgsl/glsl-900-implicit-conversions.frag.wgsl
diff --git a/naga/tests/out/wgsl/901-lhs-field-select.frag.wgsl b/naga/tests/out/wgsl/glsl-901-lhs-field-select.frag.wgsl
similarity index 100%
rename from naga/tests/out/wgsl/901-lhs-field-select.frag.wgsl
rename to naga/tests/out/wgsl/glsl-901-lhs-field-select.frag.wgsl
diff --git a/naga/tests/out/wgsl/931-constant-emitting.frag.wgsl b/naga/tests/out/wgsl/glsl-931-constant-emitting.frag.wgsl
similarity index 100%
rename from naga/tests/out/wgsl/931-constant-emitting.frag.wgsl
rename to naga/tests/out/wgsl/glsl-931-constant-emitting.frag.wgsl
diff --git a/naga/tests/out/wgsl/932-for-loop-if.frag.wgsl b/naga/tests/out/wgsl/glsl-932-for-loop-if.frag.wgsl
similarity index 100%
rename from naga/tests/out/wgsl/932-for-loop-if.frag.wgsl
rename to naga/tests/out/wgsl/glsl-932-for-loop-if.frag.wgsl
diff --git a/naga/tests/out/wgsl/anonymous-entry-point-type.frag.wgsl b/naga/tests/out/wgsl/glsl-anonymous-entry-point-type.frag.wgsl
similarity index 100%
rename from naga/tests/out/wgsl/anonymous-entry-point-type.frag.wgsl
rename to naga/tests/out/wgsl/glsl-anonymous-entry-point-type.frag.wgsl
diff --git a/naga/tests/out/wgsl/bevy-pbr.frag.wgsl b/naga/tests/out/wgsl/glsl-bevy-pbr.frag.wgsl
similarity index 100%
rename from naga/tests/out/wgsl/bevy-pbr.frag.wgsl
rename to naga/tests/out/wgsl/glsl-bevy-pbr.frag.wgsl
diff --git a/naga/tests/out/wgsl/bevy-pbr.vert.wgsl b/naga/tests/out/wgsl/glsl-bevy-pbr.vert.wgsl
similarity index 100%
rename from naga/tests/out/wgsl/bevy-pbr.vert.wgsl
rename to naga/tests/out/wgsl/glsl-bevy-pbr.vert.wgsl
diff --git a/naga/tests/out/wgsl/bits_glsl.frag.wgsl b/naga/tests/out/wgsl/glsl-bits_glsl.frag.wgsl
similarity index 100%
rename from naga/tests/out/wgsl/bits_glsl.frag.wgsl
rename to naga/tests/out/wgsl/glsl-bits_glsl.frag.wgsl
diff --git a/naga/tests/out/wgsl/bool-select.frag.wgsl b/naga/tests/out/wgsl/glsl-bool-select.frag.wgsl
similarity index 100%
rename from naga/tests/out/wgsl/bool-select.frag.wgsl
rename to naga/tests/out/wgsl/glsl-bool-select.frag.wgsl
diff --git a/naga/tests/out/wgsl/buffer.frag.wgsl b/naga/tests/out/wgsl/glsl-buffer.frag.wgsl
similarity index 100%
rename from naga/tests/out/wgsl/buffer.frag.wgsl
rename to naga/tests/out/wgsl/glsl-buffer.frag.wgsl
diff --git a/naga/tests/out/wgsl/clamp-splat.vert.wgsl b/naga/tests/out/wgsl/glsl-clamp-splat.vert.wgsl
similarity index 100%
rename from naga/tests/out/wgsl/clamp-splat.vert.wgsl
rename to naga/tests/out/wgsl/glsl-clamp-splat.vert.wgsl
diff --git a/naga/tests/out/wgsl/const-global-swizzle.frag.wgsl b/naga/tests/out/wgsl/glsl-const-global-swizzle.frag.wgsl
similarity index 100%
rename from naga/tests/out/wgsl/const-global-swizzle.frag.wgsl
rename to naga/tests/out/wgsl/glsl-const-global-swizzle.frag.wgsl
diff --git a/naga/tests/out/wgsl/constant-array-size.frag.wgsl b/naga/tests/out/wgsl/glsl-constant-array-size.frag.wgsl
similarity index 100%
rename from naga/tests/out/wgsl/constant-array-size.frag.wgsl
rename to naga/tests/out/wgsl/glsl-constant-array-size.frag.wgsl
diff --git a/naga/tests/out/wgsl/declarations.frag.wgsl b/naga/tests/out/wgsl/glsl-declarations.frag.wgsl
similarity index 100%
rename from naga/tests/out/wgsl/declarations.frag.wgsl
rename to naga/tests/out/wgsl/glsl-declarations.frag.wgsl
diff --git a/naga/tests/out/wgsl/double-math-functions.frag.wgsl b/naga/tests/out/wgsl/glsl-double-math-functions.frag.wgsl
similarity index 100%
rename from naga/tests/out/wgsl/double-math-functions.frag.wgsl
rename to naga/tests/out/wgsl/glsl-double-math-functions.frag.wgsl
diff --git a/naga/tests/out/wgsl/dual-source-blending.frag.wgsl b/naga/tests/out/wgsl/glsl-dual-source-blending.frag.wgsl
similarity index 100%
rename from naga/tests/out/wgsl/dual-source-blending.frag.wgsl
rename to naga/tests/out/wgsl/glsl-dual-source-blending.frag.wgsl
diff --git a/naga/tests/out/wgsl/expressions.frag.wgsl b/naga/tests/out/wgsl/glsl-expressions.frag.wgsl
similarity index 100%
rename from naga/tests/out/wgsl/expressions.frag.wgsl
rename to naga/tests/out/wgsl/glsl-expressions.frag.wgsl
diff --git a/naga/tests/out/wgsl/f16-glsl.comp.wgsl b/naga/tests/out/wgsl/glsl-f16-glsl.comp.wgsl
similarity index 100%
rename from naga/tests/out/wgsl/f16-glsl.comp.wgsl
rename to naga/tests/out/wgsl/glsl-f16-glsl.comp.wgsl
diff --git a/naga/tests/out/wgsl/fma.frag.wgsl b/naga/tests/out/wgsl/glsl-fma.frag.wgsl
similarity index 100%
rename from naga/tests/out/wgsl/fma.frag.wgsl
rename to naga/tests/out/wgsl/glsl-fma.frag.wgsl
diff --git a/naga/tests/out/wgsl/functions_call.frag.wgsl b/naga/tests/out/wgsl/glsl-functions_call.frag.wgsl
similarity index 100%
rename from naga/tests/out/wgsl/functions_call.frag.wgsl
rename to naga/tests/out/wgsl/glsl-functions_call.frag.wgsl
diff --git a/naga/tests/out/wgsl/global-constant-array.frag.wgsl b/naga/tests/out/wgsl/glsl-global-constant-array.frag.wgsl
similarity index 100%
rename from naga/tests/out/wgsl/global-constant-array.frag.wgsl
rename to naga/tests/out/wgsl/glsl-global-constant-array.frag.wgsl
diff --git a/naga/tests/out/wgsl/images.frag.wgsl b/naga/tests/out/wgsl/glsl-images.frag.wgsl
similarity index 100%
rename from naga/tests/out/wgsl/images.frag.wgsl
rename to naga/tests/out/wgsl/glsl-images.frag.wgsl
diff --git a/naga/tests/out/wgsl/inverse-polyfill.frag.wgsl b/naga/tests/out/wgsl/glsl-inverse-polyfill.frag.wgsl
similarity index 100%
rename from naga/tests/out/wgsl/inverse-polyfill.frag.wgsl
rename to naga/tests/out/wgsl/glsl-inverse-polyfill.frag.wgsl
diff --git a/naga/tests/out/wgsl/local-var-init-in-loop.comp.wgsl b/naga/tests/out/wgsl/glsl-local-var-init-in-loop.comp.wgsl
similarity index 100%
rename from naga/tests/out/wgsl/local-var-init-in-loop.comp.wgsl
rename to naga/tests/out/wgsl/glsl-local-var-init-in-loop.comp.wgsl
diff --git a/naga/tests/out/wgsl/long-form-matrix.frag.wgsl b/naga/tests/out/wgsl/glsl-long-form-matrix.frag.wgsl
similarity index 100%
rename from naga/tests/out/wgsl/long-form-matrix.frag.wgsl
rename to naga/tests/out/wgsl/glsl-long-form-matrix.frag.wgsl
diff --git a/naga/tests/out/wgsl/math-functions.frag.wgsl b/naga/tests/out/wgsl/glsl-math-functions.frag.wgsl
similarity index 100%
rename from naga/tests/out/wgsl/math-functions.frag.wgsl
rename to naga/tests/out/wgsl/glsl-math-functions.frag.wgsl
diff --git a/naga/tests/out/wgsl/prepostfix.frag.wgsl b/naga/tests/out/wgsl/glsl-prepostfix.frag.wgsl
similarity index 100%
rename from naga/tests/out/wgsl/prepostfix.frag.wgsl
rename to naga/tests/out/wgsl/glsl-prepostfix.frag.wgsl
diff --git a/naga/tests/out/wgsl/quad_glsl.frag.wgsl b/naga/tests/out/wgsl/glsl-quad_glsl.frag.wgsl
similarity index 100%
rename from naga/tests/out/wgsl/quad_glsl.frag.wgsl
rename to naga/tests/out/wgsl/glsl-quad_glsl.frag.wgsl
diff --git a/naga/tests/out/wgsl/quad_glsl.vert.wgsl b/naga/tests/out/wgsl/glsl-quad_glsl.vert.wgsl
similarity index 100%
rename from naga/tests/out/wgsl/quad_glsl.vert.wgsl
rename to naga/tests/out/wgsl/glsl-quad_glsl.vert.wgsl
diff --git a/naga/tests/out/wgsl/sampler-functions.frag.wgsl b/naga/tests/out/wgsl/glsl-sampler-functions.frag.wgsl
similarity index 100%
rename from naga/tests/out/wgsl/sampler-functions.frag.wgsl
rename to naga/tests/out/wgsl/glsl-sampler-functions.frag.wgsl
diff --git a/naga/tests/out/wgsl/samplers.frag.wgsl b/naga/tests/out/wgsl/glsl-samplers.frag.wgsl
similarity index 100%
rename from naga/tests/out/wgsl/samplers.frag.wgsl
rename to naga/tests/out/wgsl/glsl-samplers.frag.wgsl
diff --git a/naga/tests/out/wgsl/statements.frag.wgsl b/naga/tests/out/wgsl/glsl-statements.frag.wgsl
similarity index 100%
rename from naga/tests/out/wgsl/statements.frag.wgsl
rename to naga/tests/out/wgsl/glsl-statements.frag.wgsl
diff --git a/naga/tests/out/wgsl/vector-functions.frag.wgsl b/naga/tests/out/wgsl/glsl-vector-functions.frag.wgsl
similarity index 100%
rename from naga/tests/out/wgsl/vector-functions.frag.wgsl
rename to naga/tests/out/wgsl/glsl-vector-functions.frag.wgsl
diff --git a/naga/tests/out/wgsl/atomic_compare_exchange.wgsl b/naga/tests/out/wgsl/spv-atomic_compare_exchange.wgsl
similarity index 100%
rename from naga/tests/out/wgsl/atomic_compare_exchange.wgsl
rename to naga/tests/out/wgsl/spv-atomic_compare_exchange.wgsl
diff --git a/naga/tests/out/wgsl/atomic_exchange.wgsl b/naga/tests/out/wgsl/spv-atomic_exchange.wgsl
similarity index 100%
rename from naga/tests/out/wgsl/atomic_exchange.wgsl
rename to naga/tests/out/wgsl/spv-atomic_exchange.wgsl
diff --git a/naga/tests/out/wgsl/atomic_global_struct_field_vertex.wgsl b/naga/tests/out/wgsl/spv-atomic_global_struct_field_vertex.wgsl
similarity index 100%
rename from naga/tests/out/wgsl/atomic_global_struct_field_vertex.wgsl
rename to naga/tests/out/wgsl/spv-atomic_global_struct_field_vertex.wgsl
diff --git a/naga/tests/out/wgsl/atomic_i_add_sub.wgsl b/naga/tests/out/wgsl/spv-atomic_i_add_sub.wgsl
similarity index 100%
rename from naga/tests/out/wgsl/atomic_i_add_sub.wgsl
rename to naga/tests/out/wgsl/spv-atomic_i_add_sub.wgsl
diff --git a/naga/tests/out/wgsl/atomic_i_decrement.wgsl b/naga/tests/out/wgsl/spv-atomic_i_decrement.wgsl
similarity index 100%
rename from naga/tests/out/wgsl/atomic_i_decrement.wgsl
rename to naga/tests/out/wgsl/spv-atomic_i_decrement.wgsl
diff --git a/naga/tests/out/wgsl/atomic_i_increment.wgsl b/naga/tests/out/wgsl/spv-atomic_i_increment.wgsl
similarity index 100%
rename from naga/tests/out/wgsl/atomic_i_increment.wgsl
rename to naga/tests/out/wgsl/spv-atomic_i_increment.wgsl
diff --git a/naga/tests/out/wgsl/atomic_load_and_store.wgsl b/naga/tests/out/wgsl/spv-atomic_load_and_store.wgsl
similarity index 100%
rename from naga/tests/out/wgsl/atomic_load_and_store.wgsl
rename to naga/tests/out/wgsl/spv-atomic_load_and_store.wgsl
diff --git a/naga/tests/out/wgsl/binding-arrays.dynamic.wgsl b/naga/tests/out/wgsl/spv-binding-arrays.dynamic.wgsl
similarity index 100%
rename from naga/tests/out/wgsl/binding-arrays.dynamic.wgsl
rename to naga/tests/out/wgsl/spv-binding-arrays.dynamic.wgsl
diff --git a/naga/tests/out/wgsl/binding-arrays.static.wgsl b/naga/tests/out/wgsl/spv-binding-arrays.static.wgsl
similarity index 100%
rename from naga/tests/out/wgsl/binding-arrays.static.wgsl
rename to naga/tests/out/wgsl/spv-binding-arrays.static.wgsl
diff --git a/naga/tests/out/wgsl/builtin-accessed-outside-entrypoint.wgsl b/naga/tests/out/wgsl/spv-builtin-accessed-outside-entrypoint.wgsl
similarity index 100%
rename from naga/tests/out/wgsl/builtin-accessed-outside-entrypoint.wgsl
rename to naga/tests/out/wgsl/spv-builtin-accessed-outside-entrypoint.wgsl
diff --git a/naga/tests/out/wgsl/do-while.wgsl b/naga/tests/out/wgsl/spv-do-while.wgsl
similarity index 100%
rename from naga/tests/out/wgsl/do-while.wgsl
rename to naga/tests/out/wgsl/spv-do-while.wgsl
diff --git a/naga/tests/out/wgsl/empty-global-name.wgsl b/naga/tests/out/wgsl/spv-empty-global-name.wgsl
similarity index 100%
rename from naga/tests/out/wgsl/empty-global-name.wgsl
rename to naga/tests/out/wgsl/spv-empty-global-name.wgsl
diff --git a/naga/tests/out/wgsl/f16-spv.wgsl b/naga/tests/out/wgsl/spv-f16-spv.wgsl
similarity index 100%
rename from naga/tests/out/wgsl/f16-spv.wgsl
rename to naga/tests/out/wgsl/spv-f16-spv.wgsl
diff --git a/naga/tests/out/wgsl/fetch_depth.wgsl b/naga/tests/out/wgsl/spv-fetch_depth.wgsl
similarity index 100%
rename from naga/tests/out/wgsl/fetch_depth.wgsl
rename to naga/tests/out/wgsl/spv-fetch_depth.wgsl
diff --git a/naga/tests/out/wgsl/inv-hyperbolic-trig-functions.wgsl b/naga/tests/out/wgsl/spv-inv-hyperbolic-trig-functions.wgsl
similarity index 100%
rename from naga/tests/out/wgsl/inv-hyperbolic-trig-functions.wgsl
rename to naga/tests/out/wgsl/spv-inv-hyperbolic-trig-functions.wgsl
diff --git a/naga/tests/out/wgsl/quad-vert.wgsl b/naga/tests/out/wgsl/spv-quad-vert.wgsl
similarity index 100%
rename from naga/tests/out/wgsl/quad-vert.wgsl
rename to naga/tests/out/wgsl/spv-quad-vert.wgsl
diff --git a/naga/tests/out/wgsl/subgroup-operations-s.wgsl b/naga/tests/out/wgsl/spv-subgroup-operations-s.wgsl
similarity index 100%
rename from naga/tests/out/wgsl/subgroup-operations-s.wgsl
rename to naga/tests/out/wgsl/spv-subgroup-operations-s.wgsl
diff --git a/naga/tests/out/wgsl/unnamed-gl-per-vertex.wgsl b/naga/tests/out/wgsl/spv-unnamed-gl-per-vertex.wgsl
similarity index 100%
rename from naga/tests/out/wgsl/unnamed-gl-per-vertex.wgsl
rename to naga/tests/out/wgsl/spv-unnamed-gl-per-vertex.wgsl
diff --git a/naga/tests/out/wgsl/6438-conflicting-idents.wgsl b/naga/tests/out/wgsl/wgsl-6438-conflicting-idents.wgsl
similarity index 100%
rename from naga/tests/out/wgsl/6438-conflicting-idents.wgsl
rename to naga/tests/out/wgsl/wgsl-6438-conflicting-idents.wgsl
diff --git a/naga/tests/out/wgsl/6772-unpack-expr-accesses.wgsl b/naga/tests/out/wgsl/wgsl-6772-unpack-expr-accesses.wgsl
similarity index 100%
rename from naga/tests/out/wgsl/6772-unpack-expr-accesses.wgsl
rename to naga/tests/out/wgsl/wgsl-6772-unpack-expr-accesses.wgsl
diff --git a/naga/tests/out/wgsl/abstract-types-builtins.wgsl b/naga/tests/out/wgsl/wgsl-abstract-types-builtins.wgsl
similarity index 100%
rename from naga/tests/out/wgsl/abstract-types-builtins.wgsl
rename to naga/tests/out/wgsl/wgsl-abstract-types-builtins.wgsl
diff --git a/naga/tests/out/wgsl/abstract-types-const.wgsl b/naga/tests/out/wgsl/wgsl-abstract-types-const.wgsl
similarity index 100%
rename from naga/tests/out/wgsl/abstract-types-const.wgsl
rename to naga/tests/out/wgsl/wgsl-abstract-types-const.wgsl
diff --git a/naga/tests/out/wgsl/abstract-types-function-calls.wgsl b/naga/tests/out/wgsl/wgsl-abstract-types-function-calls.wgsl
similarity index 100%
rename from naga/tests/out/wgsl/abstract-types-function-calls.wgsl
rename to naga/tests/out/wgsl/wgsl-abstract-types-function-calls.wgsl
diff --git a/naga/tests/out/wgsl/abstract-types-let.wgsl b/naga/tests/out/wgsl/wgsl-abstract-types-let.wgsl
similarity index 100%
rename from naga/tests/out/wgsl/abstract-types-let.wgsl
rename to naga/tests/out/wgsl/wgsl-abstract-types-let.wgsl
diff --git a/naga/tests/out/wgsl/abstract-types-operators.wgsl b/naga/tests/out/wgsl/wgsl-abstract-types-operators.wgsl
similarity index 100%
rename from naga/tests/out/wgsl/abstract-types-operators.wgsl
rename to naga/tests/out/wgsl/wgsl-abstract-types-operators.wgsl
diff --git a/naga/tests/out/wgsl/abstract-types-return.wgsl b/naga/tests/out/wgsl/wgsl-abstract-types-return.wgsl
similarity index 100%
rename from naga/tests/out/wgsl/abstract-types-return.wgsl
rename to naga/tests/out/wgsl/wgsl-abstract-types-return.wgsl
diff --git a/naga/tests/out/wgsl/abstract-types-var.wgsl b/naga/tests/out/wgsl/wgsl-abstract-types-var.wgsl
similarity index 100%
rename from naga/tests/out/wgsl/abstract-types-var.wgsl
rename to naga/tests/out/wgsl/wgsl-abstract-types-var.wgsl
diff --git a/naga/tests/out/wgsl/access.wgsl b/naga/tests/out/wgsl/wgsl-access.wgsl
similarity index 100%
rename from naga/tests/out/wgsl/access.wgsl
rename to naga/tests/out/wgsl/wgsl-access.wgsl
diff --git a/naga/tests/out/wgsl/array-in-ctor.wgsl b/naga/tests/out/wgsl/wgsl-array-in-ctor.wgsl
similarity index 100%
rename from naga/tests/out/wgsl/array-in-ctor.wgsl
rename to naga/tests/out/wgsl/wgsl-array-in-ctor.wgsl
diff --git a/naga/tests/out/wgsl/array-in-function-return-type.wgsl b/naga/tests/out/wgsl/wgsl-array-in-function-return-type.wgsl
similarity index 100%
rename from naga/tests/out/wgsl/array-in-function-return-type.wgsl
rename to naga/tests/out/wgsl/wgsl-array-in-function-return-type.wgsl
diff --git a/naga/tests/out/wgsl/atomicCompareExchange-int64.wgsl b/naga/tests/out/wgsl/wgsl-atomicCompareExchange-int64.wgsl
similarity index 100%
rename from naga/tests/out/wgsl/atomicCompareExchange-int64.wgsl
rename to naga/tests/out/wgsl/wgsl-atomicCompareExchange-int64.wgsl
diff --git a/naga/tests/out/wgsl/atomicCompareExchange.wgsl b/naga/tests/out/wgsl/wgsl-atomicCompareExchange.wgsl
similarity index 100%
rename from naga/tests/out/wgsl/atomicCompareExchange.wgsl
rename to naga/tests/out/wgsl/wgsl-atomicCompareExchange.wgsl
diff --git a/naga/tests/out/wgsl/atomicOps-float32.wgsl b/naga/tests/out/wgsl/wgsl-atomicOps-float32.wgsl
similarity index 100%
rename from naga/tests/out/wgsl/atomicOps-float32.wgsl
rename to naga/tests/out/wgsl/wgsl-atomicOps-float32.wgsl
diff --git a/naga/tests/out/wgsl/atomicOps-int64-min-max.wgsl b/naga/tests/out/wgsl/wgsl-atomicOps-int64-min-max.wgsl
similarity index 100%
rename from naga/tests/out/wgsl/atomicOps-int64-min-max.wgsl
rename to naga/tests/out/wgsl/wgsl-atomicOps-int64-min-max.wgsl
diff --git a/naga/tests/out/wgsl/atomicOps-int64.wgsl b/naga/tests/out/wgsl/wgsl-atomicOps-int64.wgsl
similarity index 100%
rename from naga/tests/out/wgsl/atomicOps-int64.wgsl
rename to naga/tests/out/wgsl/wgsl-atomicOps-int64.wgsl
diff --git a/naga/tests/out/wgsl/atomicOps.wgsl b/naga/tests/out/wgsl/wgsl-atomicOps.wgsl
similarity index 100%
rename from naga/tests/out/wgsl/atomicOps.wgsl
rename to naga/tests/out/wgsl/wgsl-atomicOps.wgsl
diff --git a/naga/tests/out/wgsl/atomicTexture-int64.wgsl b/naga/tests/out/wgsl/wgsl-atomicTexture-int64.wgsl
similarity index 100%
rename from naga/tests/out/wgsl/atomicTexture-int64.wgsl
rename to naga/tests/out/wgsl/wgsl-atomicTexture-int64.wgsl
diff --git a/naga/tests/out/wgsl/atomicTexture.wgsl b/naga/tests/out/wgsl/wgsl-atomicTexture.wgsl
similarity index 100%
rename from naga/tests/out/wgsl/atomicTexture.wgsl
rename to naga/tests/out/wgsl/wgsl-atomicTexture.wgsl
diff --git a/naga/tests/out/wgsl/binding-arrays.wgsl b/naga/tests/out/wgsl/wgsl-binding-arrays.wgsl
similarity index 100%
rename from naga/tests/out/wgsl/binding-arrays.wgsl
rename to naga/tests/out/wgsl/wgsl-binding-arrays.wgsl
diff --git a/naga/tests/out/wgsl/binding-buffer-arrays.wgsl b/naga/tests/out/wgsl/wgsl-binding-buffer-arrays.wgsl
similarity index 100%
rename from naga/tests/out/wgsl/binding-buffer-arrays.wgsl
rename to naga/tests/out/wgsl/wgsl-binding-buffer-arrays.wgsl
diff --git a/naga/tests/out/wgsl/bitcast.wgsl b/naga/tests/out/wgsl/wgsl-bitcast.wgsl
similarity index 100%
rename from naga/tests/out/wgsl/bitcast.wgsl
rename to naga/tests/out/wgsl/wgsl-bitcast.wgsl
diff --git a/naga/tests/out/wgsl/bits.wgsl b/naga/tests/out/wgsl/wgsl-bits.wgsl
similarity index 100%
rename from naga/tests/out/wgsl/bits.wgsl
rename to naga/tests/out/wgsl/wgsl-bits.wgsl
diff --git a/naga/tests/out/wgsl/boids.wgsl b/naga/tests/out/wgsl/wgsl-boids.wgsl
similarity index 100%
rename from naga/tests/out/wgsl/boids.wgsl
rename to naga/tests/out/wgsl/wgsl-boids.wgsl
diff --git a/naga/tests/out/wgsl/break-if.wgsl b/naga/tests/out/wgsl/wgsl-break-if.wgsl
similarity index 100%
rename from naga/tests/out/wgsl/break-if.wgsl
rename to naga/tests/out/wgsl/wgsl-break-if.wgsl
diff --git a/naga/tests/out/wgsl/collatz.wgsl b/naga/tests/out/wgsl/wgsl-collatz.wgsl
similarity index 100%
rename from naga/tests/out/wgsl/collatz.wgsl
rename to naga/tests/out/wgsl/wgsl-collatz.wgsl
diff --git a/naga/tests/out/wgsl/const-exprs.wgsl b/naga/tests/out/wgsl/wgsl-const-exprs.wgsl
similarity index 100%
rename from naga/tests/out/wgsl/const-exprs.wgsl
rename to naga/tests/out/wgsl/wgsl-const-exprs.wgsl
diff --git a/naga/tests/out/wgsl/const_assert.wgsl b/naga/tests/out/wgsl/wgsl-const_assert.wgsl
similarity index 100%
rename from naga/tests/out/wgsl/const_assert.wgsl
rename to naga/tests/out/wgsl/wgsl-const_assert.wgsl
diff --git a/naga/tests/out/wgsl/constructors.wgsl b/naga/tests/out/wgsl/wgsl-constructors.wgsl
similarity index 100%
rename from naga/tests/out/wgsl/constructors.wgsl
rename to naga/tests/out/wgsl/wgsl-constructors.wgsl
diff --git a/naga/tests/out/wgsl/control-flow.wgsl b/naga/tests/out/wgsl/wgsl-control-flow.wgsl
similarity index 100%
rename from naga/tests/out/wgsl/control-flow.wgsl
rename to naga/tests/out/wgsl/wgsl-control-flow.wgsl
diff --git a/naga/tests/out/wgsl/conversion-float-to-int.wgsl b/naga/tests/out/wgsl/wgsl-conversion-float-to-int.wgsl
similarity index 100%
rename from naga/tests/out/wgsl/conversion-float-to-int.wgsl
rename to naga/tests/out/wgsl/wgsl-conversion-float-to-int.wgsl
diff --git a/naga/tests/out/wgsl/conversions.wgsl b/naga/tests/out/wgsl/wgsl-conversions.wgsl
similarity index 100%
rename from naga/tests/out/wgsl/conversions.wgsl
rename to naga/tests/out/wgsl/wgsl-conversions.wgsl
diff --git a/naga/tests/out/wgsl/cross.wgsl b/naga/tests/out/wgsl/wgsl-cross.wgsl
similarity index 100%
rename from naga/tests/out/wgsl/cross.wgsl
rename to naga/tests/out/wgsl/wgsl-cross.wgsl
diff --git a/naga/tests/out/wgsl/dualsource.wgsl b/naga/tests/out/wgsl/wgsl-dualsource.wgsl
similarity index 100%
rename from naga/tests/out/wgsl/dualsource.wgsl
rename to naga/tests/out/wgsl/wgsl-dualsource.wgsl
diff --git a/naga/tests/out/wgsl/empty.wgsl b/naga/tests/out/wgsl/wgsl-empty.wgsl
similarity index 100%
rename from naga/tests/out/wgsl/empty.wgsl
rename to naga/tests/out/wgsl/wgsl-empty.wgsl
diff --git a/naga/tests/out/wgsl/extra.wgsl b/naga/tests/out/wgsl/wgsl-extra.wgsl
similarity index 100%
rename from naga/tests/out/wgsl/extra.wgsl
rename to naga/tests/out/wgsl/wgsl-extra.wgsl
diff --git a/naga/tests/out/wgsl/f16.wgsl b/naga/tests/out/wgsl/wgsl-f16.wgsl
similarity index 100%
rename from naga/tests/out/wgsl/f16.wgsl
rename to naga/tests/out/wgsl/wgsl-f16.wgsl
diff --git a/naga/tests/out/wgsl/f64.wgsl b/naga/tests/out/wgsl/wgsl-f64.wgsl
similarity index 100%
rename from naga/tests/out/wgsl/f64.wgsl
rename to naga/tests/out/wgsl/wgsl-f64.wgsl
diff --git a/naga/tests/out/wgsl/fragment-output.wgsl b/naga/tests/out/wgsl/wgsl-fragment-output.wgsl
similarity index 100%
rename from naga/tests/out/wgsl/fragment-output.wgsl
rename to naga/tests/out/wgsl/wgsl-fragment-output.wgsl
diff --git a/naga/tests/out/wgsl/functions.wgsl b/naga/tests/out/wgsl/wgsl-functions.wgsl
similarity index 100%
rename from naga/tests/out/wgsl/functions.wgsl
rename to naga/tests/out/wgsl/wgsl-functions.wgsl
diff --git a/naga/tests/out/wgsl/globals.wgsl b/naga/tests/out/wgsl/wgsl-globals.wgsl
similarity index 100%
rename from naga/tests/out/wgsl/globals.wgsl
rename to naga/tests/out/wgsl/wgsl-globals.wgsl
diff --git a/naga/tests/out/wgsl/image.wgsl b/naga/tests/out/wgsl/wgsl-image.wgsl
similarity index 100%
rename from naga/tests/out/wgsl/image.wgsl
rename to naga/tests/out/wgsl/wgsl-image.wgsl
diff --git a/naga/tests/out/wgsl/int64.wgsl b/naga/tests/out/wgsl/wgsl-int64.wgsl
similarity index 100%
rename from naga/tests/out/wgsl/int64.wgsl
rename to naga/tests/out/wgsl/wgsl-int64.wgsl
diff --git a/naga/tests/out/wgsl/interface.wgsl b/naga/tests/out/wgsl/wgsl-interface.wgsl
similarity index 100%
rename from naga/tests/out/wgsl/interface.wgsl
rename to naga/tests/out/wgsl/wgsl-interface.wgsl
diff --git a/naga/tests/out/wgsl/interpolate.wgsl b/naga/tests/out/wgsl/wgsl-interpolate.wgsl
similarity index 100%
rename from naga/tests/out/wgsl/interpolate.wgsl
rename to naga/tests/out/wgsl/wgsl-interpolate.wgsl
diff --git a/naga/tests/out/wgsl/interpolate_compat.wgsl b/naga/tests/out/wgsl/wgsl-interpolate_compat.wgsl
similarity index 100%
rename from naga/tests/out/wgsl/interpolate_compat.wgsl
rename to naga/tests/out/wgsl/wgsl-interpolate_compat.wgsl
diff --git a/naga/tests/out/wgsl/lexical-scopes.wgsl b/naga/tests/out/wgsl/wgsl-lexical-scopes.wgsl
similarity index 100%
rename from naga/tests/out/wgsl/lexical-scopes.wgsl
rename to naga/tests/out/wgsl/wgsl-lexical-scopes.wgsl
diff --git a/naga/tests/out/wgsl/local-const.wgsl b/naga/tests/out/wgsl/wgsl-local-const.wgsl
similarity index 100%
rename from naga/tests/out/wgsl/local-const.wgsl
rename to naga/tests/out/wgsl/wgsl-local-const.wgsl
diff --git a/naga/tests/out/wgsl/math-functions.wgsl b/naga/tests/out/wgsl/wgsl-math-functions.wgsl
similarity index 100%
rename from naga/tests/out/wgsl/math-functions.wgsl
rename to naga/tests/out/wgsl/wgsl-math-functions.wgsl
diff --git a/naga/tests/out/wgsl/module-scope.wgsl b/naga/tests/out/wgsl/wgsl-module-scope.wgsl
similarity index 100%
rename from naga/tests/out/wgsl/module-scope.wgsl
rename to naga/tests/out/wgsl/wgsl-module-scope.wgsl
diff --git a/naga/tests/out/wgsl/multiview.wgsl b/naga/tests/out/wgsl/wgsl-multiview.wgsl
similarity index 100%
rename from naga/tests/out/wgsl/multiview.wgsl
rename to naga/tests/out/wgsl/wgsl-multiview.wgsl
diff --git a/naga/tests/out/wgsl/operators.wgsl b/naga/tests/out/wgsl/wgsl-operators.wgsl
similarity index 100%
rename from naga/tests/out/wgsl/operators.wgsl
rename to naga/tests/out/wgsl/wgsl-operators.wgsl
diff --git a/naga/tests/out/wgsl/padding.wgsl b/naga/tests/out/wgsl/wgsl-padding.wgsl
similarity index 100%
rename from naga/tests/out/wgsl/padding.wgsl
rename to naga/tests/out/wgsl/wgsl-padding.wgsl
diff --git a/naga/tests/out/wgsl/phony_assignment.wgsl b/naga/tests/out/wgsl/wgsl-phony_assignment.wgsl
similarity index 100%
rename from naga/tests/out/wgsl/phony_assignment.wgsl
rename to naga/tests/out/wgsl/wgsl-phony_assignment.wgsl
diff --git a/naga/tests/out/wgsl/pointers.wgsl b/naga/tests/out/wgsl/wgsl-pointers.wgsl
similarity index 100%
rename from naga/tests/out/wgsl/pointers.wgsl
rename to naga/tests/out/wgsl/wgsl-pointers.wgsl
diff --git a/naga/tests/out/wgsl/quad.wgsl b/naga/tests/out/wgsl/wgsl-quad.wgsl
similarity index 100%
rename from naga/tests/out/wgsl/quad.wgsl
rename to naga/tests/out/wgsl/wgsl-quad.wgsl
diff --git a/naga/tests/out/wgsl/shadow.wgsl b/naga/tests/out/wgsl/wgsl-shadow.wgsl
similarity index 100%
rename from naga/tests/out/wgsl/shadow.wgsl
rename to naga/tests/out/wgsl/wgsl-shadow.wgsl
diff --git a/naga/tests/out/wgsl/skybox.wgsl b/naga/tests/out/wgsl/wgsl-skybox.wgsl
similarity index 100%
rename from naga/tests/out/wgsl/skybox.wgsl
rename to naga/tests/out/wgsl/wgsl-skybox.wgsl
diff --git a/naga/tests/out/wgsl/standard.wgsl b/naga/tests/out/wgsl/wgsl-standard.wgsl
similarity index 100%
rename from naga/tests/out/wgsl/standard.wgsl
rename to naga/tests/out/wgsl/wgsl-standard.wgsl
diff --git a/naga/tests/out/wgsl/struct-layout.wgsl b/naga/tests/out/wgsl/wgsl-struct-layout.wgsl
similarity index 100%
rename from naga/tests/out/wgsl/struct-layout.wgsl
rename to naga/tests/out/wgsl/wgsl-struct-layout.wgsl
diff --git a/naga/tests/out/wgsl/subgroup-operations.wgsl b/naga/tests/out/wgsl/wgsl-subgroup-operations.wgsl
similarity index 100%
rename from naga/tests/out/wgsl/subgroup-operations.wgsl
rename to naga/tests/out/wgsl/wgsl-subgroup-operations.wgsl
diff --git a/naga/tests/out/wgsl/texture-arg.wgsl b/naga/tests/out/wgsl/wgsl-texture-arg.wgsl
similarity index 100%
rename from naga/tests/out/wgsl/texture-arg.wgsl
rename to naga/tests/out/wgsl/wgsl-texture-arg.wgsl
diff --git a/naga/tests/out/wgsl/type-alias.wgsl b/naga/tests/out/wgsl/wgsl-type-alias.wgsl
similarity index 100%
rename from naga/tests/out/wgsl/type-alias.wgsl
rename to naga/tests/out/wgsl/wgsl-type-alias.wgsl
diff --git a/naga/tests/out/wgsl/type-inference.wgsl b/naga/tests/out/wgsl/wgsl-type-inference.wgsl
similarity index 100%
rename from naga/tests/out/wgsl/type-inference.wgsl
rename to naga/tests/out/wgsl/wgsl-type-inference.wgsl
diff --git a/naga/tests/out/wgsl/workgroup-uniform-load.wgsl b/naga/tests/out/wgsl/wgsl-workgroup-uniform-load.wgsl
similarity index 100%
rename from naga/tests/out/wgsl/workgroup-uniform-load.wgsl
rename to naga/tests/out/wgsl/wgsl-workgroup-uniform-load.wgsl
diff --git a/naga/tests/out/wgsl/workgroup-var-init.wgsl b/naga/tests/out/wgsl/wgsl-workgroup-var-init.wgsl
similarity index 100%
rename from naga/tests/out/wgsl/workgroup-var-init.wgsl
rename to naga/tests/out/wgsl/wgsl-workgroup-var-init.wgsl