Specify individual capabilities for each snapshot test (#8688)

andyleiserson · web-flow · commit ab8f9ad517e8 · 2025-12-08T18:34:04.000-05:00
diff --git a/naga-test/src/lib.rs b/naga-test/src/lib.rs
@@ -190,8 +190,10 @@ pub struct FragmentModule {
 #[derive(Default, serde::Deserialize)]
 #[serde(default)]
 pub struct Parameters {
-    // -- GOD MODE --
-    pub god_mode: bool,
+    // -- validation options --
+    //
+    // Capabilities to enable. Defaults to `Capabilities::default()`.
+    pub capabilities: Option<naga::valid::Capabilities>,
 
     // -- wgsl-in options --
     #[serde(rename = "wgsl-in")]
diff --git a/naga/src/valid/mod.rs b/naga/src/valid/mod.rs
@@ -571,11 +571,13 @@ impl Validator {
         }
     }
 
+    // TODO(https://github.com/gfx-rs/wgpu/issues/8207): Consider removing this
     pub fn subgroup_stages(&mut self, stages: ShaderStages) -> &mut Self {
         self.subgroup_stages = stages;
         self
     }
 
+    // TODO(https://github.com/gfx-rs/wgpu/issues/8207): Consider removing this
     pub fn subgroup_operations(&mut self, operations: SubgroupOperationSet) -> &mut Self {
         self.subgroup_operations = operations;
         self
diff --git a/naga/tests/in/glsl/800-out-of-bounds-panic.toml b/naga/tests/in/glsl/800-out-of-bounds-panic.toml
@@ -1 +1 @@
-god_mode = true
+capabilities = "IMMEDIATES"
diff --git a/naga/tests/in/glsl/896-push-constant.toml b/naga/tests/in/glsl/896-push-constant.toml
@@ -1 +1 @@
-god_mode = true
+capabilities = "IMMEDIATES"
diff --git a/naga/tests/in/glsl/bits.toml b/naga/tests/in/glsl/bits.toml
@@ -1,2 +1 @@
-# TODO(https://github.com/gfx-rs/wgpu/issues/8154): enable only `F16_IN_F32` capability
-god_mode = true
+capabilities = "SHADER_FLOAT16_IN_FLOAT32"
diff --git a/naga/tests/in/glsl/double-math-functions.toml b/naga/tests/in/glsl/double-math-functions.toml
@@ -1 +1 @@
-god_mode = true
+capabilities = "FLOAT64"
diff --git a/naga/tests/in/glsl/dual-source-blending.toml b/naga/tests/in/glsl/dual-source-blending.toml
@@ -1,2 +1,2 @@
 # TODO(https://github.com/gfx-rs/wgpu/issues/8154): enable only `DUAL_SOURCE_BLENDING` capability
-god_mode = true
+capabilities = "DUAL_SOURCE_BLENDING"
diff --git a/naga/tests/in/glsl/f16-glsl.toml b/naga/tests/in/glsl/f16-glsl.toml
@@ -1 +1 @@
-god_mode = true
+capabilities = "SHADER_FLOAT16"
diff --git a/naga/tests/in/glsl/vector-functions.toml b/naga/tests/in/glsl/vector-functions.toml
@@ -1 +1 @@
-god_mode = true
+capabilities = "FLOAT64"
diff --git a/naga/tests/in/spv/binding-arrays.dynamic.toml b/naga/tests/in/spv/binding-arrays.dynamic.toml
@@ -1,4 +1,4 @@
-god_mode = true
+capabilities = "TEXTURE_AND_SAMPLER_BINDING_ARRAY"
 
 [spv-in]
 adjust_coordinate_space = true
diff --git a/naga/tests/in/spv/binding-arrays.runtime.toml b/naga/tests/in/spv/binding-arrays.runtime.toml
@@ -1,4 +1,7 @@
-god_mode = true
+capabilities = """
+  TEXTURE_AND_SAMPLER_BINDING_ARRAY
+  | TEXTURE_AND_SAMPLER_BINDING_ARRAY_NON_UNIFORM_INDEXING
+"""
 
 [spv-in]
 adjust_coordinate_space = true
diff --git a/naga/tests/in/spv/binding-arrays.static.toml b/naga/tests/in/spv/binding-arrays.static.toml
@@ -1,4 +1,4 @@
-god_mode = true
+capabilities = "TEXTURE_AND_SAMPLER_BINDING_ARRAY"
 
 [spv-in]
 adjust_coordinate_space = true
diff --git a/naga/tests/in/spv/f16-spv.toml b/naga/tests/in/spv/f16-spv.toml
@@ -1 +1 @@
-god_mode = true
+capabilities = "SHADER_FLOAT16"
diff --git a/naga/tests/in/spv/gather-cmp.toml b/naga/tests/in/spv/gather-cmp.toml
@@ -1,4 +1,3 @@
-god_mode = true
 
 [spv-in]
 adjust_coordinate_space = true
diff --git a/naga/tests/in/spv/gather.toml b/naga/tests/in/spv/gather.toml
@@ -1,4 +1,3 @@
-god_mode = true
 
 [spv-in]
 adjust_coordinate_space = true
diff --git a/naga/tests/in/spv/load-ms-texture.toml b/naga/tests/in/spv/load-ms-texture.toml
@@ -1,4 +1,3 @@
-god_mode = true
 
 [spv-in]
 adjust_coordinate_space = true
diff --git a/naga/tests/in/spv/subgroup-barrier.toml b/naga/tests/in/spv/subgroup-barrier.toml
@@ -1,4 +1,4 @@
-god_mode = true
+capabilities = "SUBGROUP | SUBGROUP_BARRIER"
 targets = "WGSL | SPIRV | GLSL | METAL"
 
 [msl]
diff --git a/naga/tests/in/spv/subgroup-operations-s.toml b/naga/tests/in/spv/subgroup-operations-s.toml
@@ -1,4 +1,4 @@
-god_mode = true
+capabilities = "SUBGROUP"
 targets = "METAL | GLSL | HLSL | WGSL"
 
 [msl]
diff --git a/naga/tests/in/wgsl/aliased-ray-query.toml b/naga/tests/in/wgsl/aliased-ray-query.toml
@@ -1,4 +1,4 @@
-god_mode = true
+capabilities = "RAY_QUERY"
 targets = "SPIRV | METAL | HLSL"
 
 [msl]
diff --git a/naga/tests/in/wgsl/atomicCompareExchange-int64.toml b/naga/tests/in/wgsl/atomicCompareExchange-int64.toml
@@ -1,4 +1,4 @@
-god_mode = true
+capabilities = "SHADER_INT64 | SHADER_INT64_ATOMIC_ALL_OPS"
 targets = "SPIRV | HLSL | WGSL"
 
 [hlsl]
diff --git a/naga/tests/in/wgsl/atomicOps-float32.toml b/naga/tests/in/wgsl/atomicOps-float32.toml
@@ -1,4 +1,4 @@
-god_mode = true
+capabilities = "SHADER_FLOAT32_ATOMIC"
 targets = "SPIRV | METAL | WGSL"
 
 [msl]
diff --git a/naga/tests/in/wgsl/atomicOps-int64-min-max.toml b/naga/tests/in/wgsl/atomicOps-int64-min-max.toml
@@ -1,4 +1,4 @@
-god_mode = true
+capabilities = "SHADER_INT64 | SHADER_INT64_ATOMIC_MIN_MAX"
 targets = "SPIRV | METAL | HLSL | WGSL"
 
 [msl]
diff --git a/naga/tests/in/wgsl/atomicOps-int64.toml b/naga/tests/in/wgsl/atomicOps-int64.toml
@@ -1,4 +1,4 @@
-god_mode = true
+capabilities = "SHADER_INT64 | SHADER_INT64_ATOMIC_ALL_OPS"
 targets = "SPIRV | HLSL | WGSL"
 
 [hlsl]
diff --git a/naga/tests/in/wgsl/atomicTexture-int64.toml b/naga/tests/in/wgsl/atomicTexture-int64.toml
@@ -1,4 +1,4 @@
-god_mode = true
+capabilities = "SHADER_INT64 | TEXTURE_INT64_ATOMIC"
 targets = "SPIRV | METAL | HLSL | WGSL"
 
 [msl]
diff --git a/naga/tests/in/wgsl/atomicTexture.toml b/naga/tests/in/wgsl/atomicTexture.toml
@@ -1,4 +1,4 @@
-god_mode = true
+capabilities = "TEXTURE_ATOMIC"
 
 [msl]
 fake_missing_bindings = true
diff --git a/naga/tests/in/wgsl/barycentrics.toml b/naga/tests/in/wgsl/barycentrics.toml
@@ -1,4 +1,4 @@
-god_mode = true
+capabilities = "SHADER_BARYCENTRICS"
 
 [msl]
 lang_version = [2, 3]
diff --git a/naga/tests/in/wgsl/binding-arrays.toml b/naga/tests/in/wgsl/binding-arrays.toml
@@ -1,4 +1,9 @@
-god_mode = true
+capabilities = """
+  TEXTURE_AND_SAMPLER_BINDING_ARRAY
+  | STORAGE_TEXTURE_BINDING_ARRAY
+  | TEXTURE_AND_SAMPLER_BINDING_ARRAY_NON_UNIFORM_INDEXING
+  | STORAGE_TEXTURE_BINDING_ARRAY_NON_UNIFORM_INDEXING
+"""
 targets = "WGSL | HLSL | METAL | SPIRV"
 
 [bounds_check_policies]
diff --git a/naga/tests/in/wgsl/binding-buffer-arrays.toml b/naga/tests/in/wgsl/binding-buffer-arrays.toml
@@ -1,5 +1,8 @@
 targets = "WGSL | SPIRV"
-god_mode = true
+capabilities = """
+  STORAGE_BUFFER_BINDING_ARRAY
+  | STORAGE_BUFFER_BINDING_ARRAY_NON_UNIFORM_INDEXING
+"""
 
 [bounds_check_policies]
 index = "ReadZeroSkipWrite"
diff --git a/naga/tests/in/wgsl/bits-optimized-msl.toml b/naga/tests/in/wgsl/bits-optimized-msl.toml
@@ -1,5 +1,4 @@
-# TODO(https://github.com/gfx-rs/wgpu/issues/8154): enable only `F16_IN_F32` capability
-god_mode = true
+capabilities = "SHADER_FLOAT16_IN_FLOAT32"
 targets = "METAL"
 
 [msl]
diff --git a/naga/tests/in/wgsl/bits.toml b/naga/tests/in/wgsl/bits.toml
@@ -1,5 +1,5 @@
 # TODO(https://github.com/gfx-rs/wgpu/issues/8154): enable only `F16_IN_F32` capability
-god_mode = true
+capabilities = "SHADER_FLOAT16_IN_FLOAT32"
 
 [msl]
 fake_missing_bindings = false
diff --git a/naga/tests/in/wgsl/clip-distances.toml b/naga/tests/in/wgsl/clip-distances.toml
@@ -1,4 +1,4 @@
-god_mode = true
+capabilities = "CLIP_DISTANCE"
 targets = "SPIRV | GLSL | WGSL"
 
 [glsl]
diff --git a/naga/tests/in/wgsl/conversion-float-to-int-no-f64.toml b/naga/tests/in/wgsl/conversion-float-to-int-no-f64.toml
@@ -1,4 +1,4 @@
 # Other backends are tested by conversion-float-to-int.wgsl which is a
 # superset of this test.
 targets = "METAL"
-god_mode = true
+capabilities = "SHADER_FLOAT16 | SHADER_INT64"
diff --git a/naga/tests/in/wgsl/conversion-float-to-int.toml b/naga/tests/in/wgsl/conversion-float-to-int.toml
@@ -2,7 +2,7 @@
 # conversion specially there anyway.
 # MSL does not support f64. See conversion-float-to-int-no-f64.wgsl.
 targets = "SPIRV | HLSL | WGSL"
-god_mode = true
+capabilities = "SHADER_FLOAT16 | FLOAT64 | SHADER_INT64"
 
 [hlsl]
 shader_model = "V6_0"
diff --git a/naga/tests/in/wgsl/dualsource.toml b/naga/tests/in/wgsl/dualsource.toml
@@ -1,4 +1,4 @@
-god_mode = true
+capabilities = "DUAL_SOURCE_BLENDING"
 
 [msl]
 fake_missing_bindings = false
diff --git a/naga/tests/in/wgsl/early-depth-test-conservative.toml b/naga/tests/in/wgsl/early-depth-test-conservative.toml
@@ -1,4 +1,4 @@
-god_mode = true
+capabilities = "EARLY_DEPTH_TEST"
 targets = "SPIRV | GLSL"
 
 [glsl]
diff --git a/naga/tests/in/wgsl/early-depth-test-force.toml b/naga/tests/in/wgsl/early-depth-test-force.toml
@@ -1,2 +1,2 @@
-god_mode = true
+capabilities = "EARLY_DEPTH_TEST"
 targets = "SPIRV | GLSL"
diff --git a/naga/tests/in/wgsl/extra.toml b/naga/tests/in/wgsl/extra.toml
@@ -1,4 +1,4 @@
-god_mode = true
+capabilities = "IMMEDIATES | PRIMITIVE_INDEX"
 targets = "SPIRV | METAL | WGSL"
 
 [msl]
diff --git a/naga/tests/in/wgsl/f16-native.toml b/naga/tests/in/wgsl/f16-native.toml
@@ -1,5 +1,5 @@
 targets = "SPIRV"
-god_mode = true
+capabilities = "SHADER_FLOAT16"
 
 [spv]
 debug = true
diff --git a/naga/tests/in/wgsl/f16-polyfill.toml b/naga/tests/in/wgsl/f16-polyfill.toml
@@ -1,5 +1,5 @@
 targets = "SPIRV"
-god_mode = true
+capabilities = "SHADER_FLOAT16"
 
 [spv]
 debug = true
diff --git a/naga/tests/in/wgsl/f16.toml b/naga/tests/in/wgsl/f16.toml
@@ -1,6 +1,6 @@
 # No GLSL support for f16
 targets = "SPIRV | METAL | HLSL | WGSL"
-god_mode = true
+capabilities = "SHADER_FLOAT16"
 
 [spv]
 version = [1, 0]
diff --git a/naga/tests/in/wgsl/f64.toml b/naga/tests/in/wgsl/f64.toml
@@ -1,4 +1,4 @@
-god_mode = true
+capabilities = "FLOAT64"
 targets = "SPIRV | GLSL | HLSL | WGSL"
 
 [glsl]
diff --git a/naga/tests/in/wgsl/int64.toml b/naga/tests/in/wgsl/int64.toml
@@ -1,4 +1,4 @@
-god_mode = true
+capabilities = "SHADER_INT64"
 targets = "SPIRV | HLSL | WGSL | METAL"
 
 [msl]
diff --git a/naga/tests/in/wgsl/math-functions.toml b/naga/tests/in/wgsl/math-functions.toml
@@ -1,2 +1 @@
-# TODO(https://github.com/gfx-rs/wgpu/issues/8154): enable only `F16_IN_F32` capability
-god_mode = true
+capabilities = "SHADER_FLOAT16_IN_FLOAT32"
diff --git a/naga/tests/in/wgsl/mesh-shader-empty.toml b/naga/tests/in/wgsl/mesh-shader-empty.toml
@@ -1,2 +1,2 @@
-god_mode = true
+capabilities = "MESH_SHADER"
 targets = "IR | ANALYSIS"
diff --git a/naga/tests/in/wgsl/mesh-shader-lines.toml b/naga/tests/in/wgsl/mesh-shader-lines.toml
@@ -1,2 +1,2 @@
-god_mode = true
+capabilities = "MESH_SHADER"
 targets = "IR | ANALYSIS"
diff --git a/naga/tests/in/wgsl/mesh-shader-points.toml b/naga/tests/in/wgsl/mesh-shader-points.toml
@@ -1,2 +1,2 @@
-god_mode = true
+capabilities = "MESH_SHADER | MESH_SHADER_POINT_TOPOLOGY"
 targets = "IR | ANALYSIS"
diff --git a/naga/tests/in/wgsl/mesh-shader.toml b/naga/tests/in/wgsl/mesh-shader.toml
@@ -1,2 +1,2 @@
-god_mode = true
+capabilities = "MESH_SHADER"
 targets = "IR | ANALYSIS"
diff --git a/naga/tests/in/wgsl/multiview.toml b/naga/tests/in/wgsl/multiview.toml
@@ -1,5 +1,5 @@
 glsl_multiview = 2
-god_mode = true
+capabilities = "MULTIVIEW"
 
 [msl]
 lang_version = [2, 3]
diff --git a/naga/tests/in/wgsl/multiview_webgl.toml b/naga/tests/in/wgsl/multiview_webgl.toml
@@ -1,5 +1,5 @@
 glsl_multiview = 2
-god_mode = true
+capabilities = "MULTIVIEW"
 targets = "GLSL"
 
 [glsl]
diff --git a/naga/tests/in/wgsl/overrides-ray-query.toml b/naga/tests/in/wgsl/overrides-ray-query.toml
@@ -1,4 +1,4 @@
-god_mode = true
+capabilities = "RAY_QUERY"
 pipeline_constants = { o = 2.0 }
 targets = "IR | SPIRV | METAL"
 
diff --git a/naga/tests/in/wgsl/push-constants.toml b/naga/tests/in/wgsl/push-constants.toml
@@ -1,4 +1,4 @@
-god_mode = true
+capabilities = "IMMEDIATES"
 targets = "GLSL | HLSL"
 
 [hlsl]
diff --git a/naga/tests/in/wgsl/ray-query-no-init-tracking.toml b/naga/tests/in/wgsl/ray-query-no-init-tracking.toml
@@ -1,4 +1,4 @@
-god_mode = true
+capabilities = "RAY_QUERY"
 targets = "SPIRV | METAL | HLSL"
 
 [msl]
diff --git a/naga/tests/in/wgsl/ray-query.toml b/naga/tests/in/wgsl/ray-query.toml
@@ -1,4 +1,4 @@
-god_mode = true
+capabilities = "RAY_QUERY"
 targets = "SPIRV | METAL | HLSL"
 
 [msl]
diff --git a/naga/tests/in/wgsl/resource-binding-map.toml b/naga/tests/in/wgsl/resource-binding-map.toml
@@ -1,4 +1,3 @@
-god_mode = true
 targets = "METAL"
 
 [bounds_check_policies]
diff --git a/naga/tests/in/wgsl/subgroup-operations.toml b/naga/tests/in/wgsl/subgroup-operations.toml
@@ -1,4 +1,4 @@
-god_mode = true
+capabilities = "SUBGROUP | SUBGROUP_BARRIER"
 
 [msl]
 fake_missing_bindings = false
diff --git a/naga/tests/in/wgsl/texture-external.toml b/naga/tests/in/wgsl/texture-external.toml
@@ -1,4 +1,4 @@
-god_mode = true
+capabilities = "TEXTURE_EXTERNAL"
 targets = "HLSL | IR | METAL | WGSL"
 
 [msl.per_entry_point_map.compute_main]
diff --git a/naga/tests/naga/snapshots.rs b/naga/tests/naga/snapshots.rs
@@ -11,19 +11,7 @@ fn check_targets(input: &Input, module: &mut naga::Module, source_code: Option<&
 
     let targets = params.targets.unwrap();
 
-    let (capabilities, subgroup_stages, subgroup_operations) = if params.god_mode {
-        (
-            naga::valid::Capabilities::all(),
-            naga::valid::ShaderStages::all(),
-            naga::valid::SubgroupOperationSet::all(),
-        )
-    } else {
-        (
-            naga::valid::Capabilities::default(),
-            naga::valid::ShaderStages::empty(),
-            naga::valid::SubgroupOperationSet::empty(),
-        )
-    };
+    let capabilities = params.capabilities.unwrap_or_default();
 
     {
         if targets.contains(Targets::IR) {
@@ -40,8 +28,6 @@ fn check_targets(input: &Input, module: &mut naga::Module, source_code: Option<&
     };
 
     let info = naga::valid::Validator::new(validation_flags, capabilities)
-        .subgroup_stages(subgroup_stages)
-        .subgroup_operations(subgroup_operations)
         .validate(module)
         .unwrap_or_else(|err| {
             panic!("Naga module validation failed on test `{name}`:\n{err:?}");
@@ -65,8 +51,6 @@ fn check_targets(input: &Input, module: &mut naga::Module, source_code: Option<&
         }
 
         naga::valid::Validator::new(validation_flags, capabilities)
-            .subgroup_stages(subgroup_stages)
-            .subgroup_operations(subgroup_operations)
             .validate(module)
             .unwrap_or_else(|err| {
                 panic!("Post-compaction module validation failed on test '{name}':\n<{err:?}")

Original file line number	Diff line number	Diff line change
`@@ -571,11 +571,13 @@ impl Validator {`
`571`	`571`	`}`
`572`	`572`	`}`
`573`	`573`
	`574`	`+ // TODO(https://github.com/gfx-rs/wgpu/issues/8207): Consider removing this`
`574`	`575`	`pub fn subgroup_stages(&mut self, stages: ShaderStages) -> &mut Self {`
`575`	`576`	`self.subgroup_stages = stages;`
`576`	`577`	`self`
`577`	`578`	`}`
`578`	`579`
	`580`	`+ // TODO(https://github.com/gfx-rs/wgpu/issues/8207): Consider removing this`
`579`	`581`	`pub fn subgroup_operations(&mut self, operations: SubgroupOperationSet) -> &mut Self {`
`580`	`582`	`self.subgroup_operations = operations;`
`581`	`583`	`self`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-god_mode = true`
	`1`	`+capabilities = "IMMEDIATES"`
Original file line number	Diff line number	Diff line change
`@@ -1,2 +1 @@`
`1`		-# TODO(https://github.com/gfx-rs/wgpu/issues/8154): enable only `F16_IN_F32` capability
`2`		`-god_mode = true`
	`1`	`+capabilities = "SHADER_FLOAT16_IN_FLOAT32"`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-god_mode = true`
	`1`	`+capabilities = "FLOAT64"`
Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`	`1`	# TODO(https://github.com/gfx-rs/wgpu/issues/8154): enable only `DUAL_SOURCE_BLENDING` capability
`2`		`-god_mode = true`
	`2`	`+capabilities = "DUAL_SOURCE_BLENDING"`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-god_mode = true`
	`1`	`+capabilities = "SHADER_FLOAT16"`