From fdd903e6e41c76440dad47b110313d18dcbc8570 Mon Sep 17 00:00:00 2001 From: Inner Daemons <85136135+inner-daemons@users.noreply.github.com> Date: Mon, 23 Feb 2026 07:44:20 -0600 Subject: [PATCH] Add supported caps info to naga backends (#9068) * Initial commit * 3/5 done I think * Updated naga bin to use new caps * Made clippy shut up * Tried to fix dota2 validation error * HLSL list made, also formatted Cargo.toml * Made stuff work with snapshots * Added changelog and GLSL list * Updated message --- CHANGELOG.md | 1 + Cargo.lock | 1 + naga-cli/src/bin/naga.rs | 28 ++++--- naga/src/back/glsl/mod.rs | 26 ++++++ naga/src/back/hlsl/mod.rs | 44 ++++++++++ naga/src/back/msl/mod.rs | 44 ++++++++++ naga/src/back/spv/mod.rs | 45 +++++++++++ naga/src/back/wgsl/mod.rs | 6 ++ naga/tests/in/wgsl/subgroup-barrier.toml | 21 +++++ naga/tests/in/wgsl/subgroup-barrier.wgsl | 4 + naga/tests/in/wgsl/subgroup-operations.toml | 2 +- naga/tests/in/wgsl/subgroup-operations.wgsl | 2 - naga/tests/naga/snapshots.rs | 31 ++++++- ...wgsl-subgroup-operations.main.Compute.glsl | 2 - .../tests/out/msl/wgsl-subgroup-barrier.metal | 12 +++ .../out/msl/wgsl-subgroup-operations.metal | 1 - .../out/spv/wgsl-subgroup-barrier.spvasm | 21 +++++ .../out/spv/wgsl-subgroup-operations.spvasm | 80 +++++++++---------- .../tests/out/wgsl/wgsl-subgroup-barrier.wgsl | 5 ++ .../out/wgsl/wgsl-subgroup-operations.wgsl | 1 - tests/Cargo.toml | 7 ++ tests/tests/wgpu-gpu/main.rs | 2 + tests/tests/wgpu-gpu/naga_capabilities.rs | 35 ++++++++ wgpu-types/src/features.rs | 18 +++++ 24 files changed, 377 insertions(+), 62 deletions(-) create mode 100644 naga/tests/in/wgsl/subgroup-barrier.toml create mode 100644 naga/tests/in/wgsl/subgroup-barrier.wgsl create mode 100644 naga/tests/out/msl/wgsl-subgroup-barrier.metal create mode 100644 naga/tests/out/spv/wgsl-subgroup-barrier.spvasm create mode 100644 naga/tests/out/wgsl/wgsl-subgroup-barrier.wgsl create mode 100644 tests/tests/wgpu-gpu/naga_capabilities.rs diff --git a/CHANGELOG.md b/CHANGELOG.md index 61eb7abe7..a04e2fecc 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -107,6 +107,7 @@ By @cwfitzgerald in [#8999](https://github.com/gfx-rs/wgpu/pull/8999). #### naga - Added support for dual-source blending in SPIR-V shaders. By @andyleiserson in [#8865](https://github.com/gfx-rs/wgpu/pull/8865). +- Added `supported_capabilities` to all backends. By @inner-daemons in [#9068](https://github.com/gfx-rs/wgpu/pull/9068). ### Bug Fixes diff --git a/Cargo.lock b/Cargo.lock index d9a76417e..b2a0005b8 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -5027,6 +5027,7 @@ dependencies = [ "js-sys", "libtest-mimic", "log", + "naga", "nanorand", "nv-flip", "parking_lot", diff --git a/naga-cli/src/bin/naga.rs b/naga-cli/src/bin/naga.rs index a7653bb72..1a9b6814a 100644 --- a/naga-cli/src/bin/naga.rs +++ b/naga-cli/src/bin/naga.rs @@ -628,19 +628,21 @@ fn run() -> anyhow::Result<()> { let output_paths = files; // Decide which capabilities our output formats can support. - let validation_caps = - output_paths - .clone() - .fold(naga::valid::Capabilities::all(), |caps, path| { - use naga::valid::Capabilities as C; - let missing = match Path::new(path).extension().and_then(|ex| ex.to_str()) { - Some("wgsl") => C::CLIP_DISTANCE | C::CULL_DISTANCE, - Some("metal") => C::CULL_DISTANCE, - Some("hlsl") => C::empty(), - _ => C::TEXTURE_EXTERNAL, - }; - caps & !missing - }); + let validation_caps = output_paths + .clone() + .fold(params.capabilities, |caps, path| { + use naga::valid::Capabilities as C; + let allowed = match Path::new(path).extension().and_then(|ex| ex.to_str()) { + Some("wgsl") => naga::back::wgsl::supported_capabilities(), + Some("metal") => naga::back::msl::supported_capabilities(), + Some("hlsl") => naga::back::hlsl::supported_capabilities(), + Some("spv") | Some("spirv") => naga::back::spv::supported_capabilities(), + Some("glsl") | Some("frag") | Some("vert") | Some("comp") | Some("task") + | Some("mesh") => naga::back::glsl::supported_capabilities(), + _ => C::all() - C::TEXTURE_EXTERNAL, + }; + caps & allowed + }); // Validate the IR before compaction. let info = match naga::valid::Validator::new(params.validation_flags, validation_caps) diff --git a/naga/src/back/glsl/mod.rs b/naga/src/back/glsl/mod.rs index bb4ef4525..0d0893b3a 100644 --- a/naga/src/back/glsl/mod.rs +++ b/naga/src/back/glsl/mod.rs @@ -616,3 +616,29 @@ fn is_value_init_supported(module: &crate::Module, ty: Handle) -> b _ => false, } } + +pub fn supported_capabilities() -> valid::Capabilities { + use valid::Capabilities as Caps; + + // Lots of these aren't supported on GLES in general, but naga is able to write them without panicking. + + Caps::IMMEDIATES + | Caps::FLOAT64 + | Caps::PRIMITIVE_INDEX + | Caps::CLIP_DISTANCE + | Caps::MULTIVIEW + | Caps::EARLY_DEPTH_TEST + | Caps::MULTISAMPLED_SHADING + | Caps::DUAL_SOURCE_BLENDING + | Caps::CUBE_ARRAY_TEXTURES + | Caps::SHADER_INT64 + | Caps::SHADER_INT64_ATOMIC_ALL_OPS + | Caps::TEXTURE_ATOMIC + | Caps::TEXTURE_INT64_ATOMIC + | Caps::SUBGROUP + | Caps::SUBGROUP_BARRIER + | Caps::SHADER_FLOAT16 + | Caps::SHADER_FLOAT16_IN_FLOAT32 + | Caps::SHADER_BARYCENTRICS + | Caps::DRAW_INDEX +} diff --git a/naga/src/back/hlsl/mod.rs b/naga/src/back/hlsl/mod.rs index 17d276364..f4c60121f 100644 --- a/naga/src/back/hlsl/mod.rs +++ b/naga/src/back/hlsl/mod.rs @@ -760,3 +760,47 @@ pub struct Writer<'a, W> { temp_access_chain: Vec, need_bake_expressions: back::NeedBakeExpressions, } + +pub fn supported_capabilities() -> crate::valid::Capabilities { + use crate::valid::Capabilities as Caps; + Caps::IMMEDIATES + | Caps::FLOAT64 // Unsupported by wgpu but supported by naga + | Caps::PRIMITIVE_INDEX + | Caps::TEXTURE_AND_SAMPLER_BINDING_ARRAY + // No BUFFER_BINDING_ARRAY + | Caps::STORAGE_TEXTURE_BINDING_ARRAY + // No STORAGE_BUFFER_BINDING_ARRAY + // No CLIP_DISTANCE + // No CULL_DISTANCE + | Caps::STORAGE_TEXTURE_16BIT_NORM_FORMATS + | Caps::MULTIVIEW + // No EARLY_DEPTH_TEST + | Caps::MULTISAMPLED_SHADING + | Caps::RAY_QUERY + | Caps::DUAL_SOURCE_BLENDING + | Caps::CUBE_ARRAY_TEXTURES + | Caps::SHADER_INT64 + | Caps::SUBGROUP + // No SUBGROUP_BARRIER + // No SUBGROUP_VERTEX_STAGE + | Caps::SHADER_INT64_ATOMIC_MIN_MAX + | Caps::SHADER_INT64_ATOMIC_ALL_OPS + // No SHADER_FLOAT32_ATOMIC + | Caps::TEXTURE_ATOMIC + | Caps::TEXTURE_INT64_ATOMIC + // No RAY_HIT_VERTEX_POSITION + | Caps::SHADER_FLOAT16 + | Caps::TEXTURE_EXTERNAL + | Caps::SHADER_FLOAT16_IN_FLOAT32 + | Caps::SHADER_BARYCENTRICS + // No MESH_SHADER + // No MESH_SHADER_POINT_TOPOLOGY + | Caps::TEXTURE_AND_SAMPLER_BINDING_ARRAY_NON_UNIFORM_INDEXING + // No BUFFER_BINDING_ARRAY_NON_UNIFORM_INDEXING + | Caps::STORAGE_TEXTURE_BINDING_ARRAY_NON_UNIFORM_INDEXING + | Caps::STORAGE_BUFFER_BINDING_ARRAY_NON_UNIFORM_INDEXING + // No COOPERATIVE_MATRIX + // No PER_VERTEX + // No RAY_TRACING_PIPELINE + // No DRAW_INDEX +} diff --git a/naga/src/back/msl/mod.rs b/naga/src/back/msl/mod.rs index 627706d36..2bc2ce8e5 100644 --- a/naga/src/back/msl/mod.rs +++ b/naga/src/back/msl/mod.rs @@ -832,6 +832,50 @@ pub fn write_string( Ok((w.finish(), info)) } +pub fn supported_capabilities() -> crate::valid::Capabilities { + use crate::valid::Capabilities as Caps; + Caps::IMMEDIATES + // No FLOAT64 + | Caps::PRIMITIVE_INDEX + | Caps::TEXTURE_AND_SAMPLER_BINDING_ARRAY + // No BUFFER_BINDING_ARRAY + | Caps::STORAGE_TEXTURE_BINDING_ARRAY + | Caps::STORAGE_BUFFER_BINDING_ARRAY + | Caps::CLIP_DISTANCE // CLIP_DISTANCE isn't supported by metal backend? But is supported by MSL writer + // No CULL_DISTANCE + | Caps::STORAGE_TEXTURE_16BIT_NORM_FORMATS + | Caps::MULTIVIEW + // No EARLY_DEPTH_TEST + | Caps::MULTISAMPLED_SHADING + | Caps::RAY_QUERY + | Caps::DUAL_SOURCE_BLENDING + | Caps::CUBE_ARRAY_TEXTURES + | Caps::SHADER_INT64 + | Caps::SUBGROUP + | Caps::SUBGROUP_BARRIER + // No SUBGROUP_VERTEX_STAGE + | Caps::SHADER_INT64_ATOMIC_MIN_MAX + // No SHADER_INT64_ATOMIC_ALL_OPS + | Caps::SHADER_FLOAT32_ATOMIC + | Caps::TEXTURE_ATOMIC + | Caps::TEXTURE_INT64_ATOMIC + // No RAY_HIT_VERTEX_POSITION + | Caps::SHADER_FLOAT16 + | Caps::TEXTURE_EXTERNAL + | Caps::SHADER_FLOAT16_IN_FLOAT32 + | Caps::SHADER_BARYCENTRICS + // No MESH_SHADER + // No MESH_SHADER_POINT_TOPOLOGY + | Caps::TEXTURE_AND_SAMPLER_BINDING_ARRAY_NON_UNIFORM_INDEXING + // No BUFFER_BINDING_ARRAY_NON_UNIFORM_INDEXING + | Caps::STORAGE_TEXTURE_BINDING_ARRAY_NON_UNIFORM_INDEXING + | Caps::STORAGE_BUFFER_BINDING_ARRAY_NON_UNIFORM_INDEXING + | Caps::COOPERATIVE_MATRIX + // No PER_VERTEX + // No RAY_TRACING_PIPELINE + // No DRAW_INDEX +} + #[test] fn test_error_size() { assert_eq!(size_of::(), 40); diff --git a/naga/src/back/spv/mod.rs b/naga/src/back/spv/mod.rs index 7eeb39e13..bbb17d38a 100644 --- a/naga/src/back/spv/mod.rs +++ b/naga/src/back/spv/mod.rs @@ -1146,3 +1146,48 @@ pub fn write_vec( )?; Ok(words) } + +pub fn supported_capabilities() -> crate::valid::Capabilities { + use crate::valid::Capabilities as Caps; + + Caps::IMMEDIATES + | Caps::FLOAT64 + | Caps::PRIMITIVE_INDEX + | Caps::TEXTURE_AND_SAMPLER_BINDING_ARRAY + | Caps::BUFFER_BINDING_ARRAY + | Caps::STORAGE_TEXTURE_BINDING_ARRAY + | Caps::STORAGE_BUFFER_BINDING_ARRAY + | Caps::CLIP_DISTANCE + // No cull distance + | Caps::STORAGE_TEXTURE_16BIT_NORM_FORMATS + | Caps::MULTIVIEW + | Caps::EARLY_DEPTH_TEST + | Caps::MULTISAMPLED_SHADING + | Caps::RAY_QUERY + | Caps::DUAL_SOURCE_BLENDING + | Caps::CUBE_ARRAY_TEXTURES + | Caps::SHADER_INT64 + | Caps::SUBGROUP + | Caps::SUBGROUP_BARRIER + | Caps::SUBGROUP_VERTEX_STAGE + | Caps::SHADER_INT64_ATOMIC_MIN_MAX + | Caps::SHADER_INT64_ATOMIC_ALL_OPS + | Caps::SHADER_FLOAT32_ATOMIC + | Caps::TEXTURE_ATOMIC + | Caps::TEXTURE_INT64_ATOMIC + | Caps::RAY_HIT_VERTEX_POSITION + | Caps::SHADER_FLOAT16 + // No TEXTURE_EXTERNAL + | Caps::SHADER_FLOAT16_IN_FLOAT32 + | Caps::SHADER_BARYCENTRICS + | Caps::MESH_SHADER + | Caps::MESH_SHADER_POINT_TOPOLOGY + | Caps::TEXTURE_AND_SAMPLER_BINDING_ARRAY_NON_UNIFORM_INDEXING + // No BUFFER_BINDING_ARRAY_NON_UNIFORM_INDEXING + | Caps::STORAGE_TEXTURE_BINDING_ARRAY_NON_UNIFORM_INDEXING + | Caps::STORAGE_BUFFER_BINDING_ARRAY_NON_UNIFORM_INDEXING + | Caps::COOPERATIVE_MATRIX + | Caps::PER_VERTEX + // No RAY_TRACING_PIPELINE + | Caps::DRAW_INDEX +} diff --git a/naga/src/back/wgsl/mod.rs b/naga/src/back/wgsl/mod.rs index 9430460da..74c438aa8 100644 --- a/naga/src/back/wgsl/mod.rs +++ b/naga/src/back/wgsl/mod.rs @@ -88,3 +88,9 @@ impl crate::AtomicFunction { } } } + +pub const fn supported_capabilities() -> crate::valid::Capabilities { + // WGSL regurgitation supports almost everything, though browser webgpu can't parse most of these. + use crate::valid::Capabilities as Caps; + Caps::all() +} diff --git a/naga/tests/in/wgsl/subgroup-barrier.toml b/naga/tests/in/wgsl/subgroup-barrier.toml new file mode 100644 index 000000000..cb303ee33 --- /dev/null +++ b/naga/tests/in/wgsl/subgroup-barrier.toml @@ -0,0 +1,21 @@ +capabilities = "SUBGROUP | SUBGROUP_BARRIER" +targets = "WGSL | SPIRV | METAL" + +[msl] +fake_missing_bindings = false +lang_version = [2, 4] +spirv_cross_compatibility = false +zero_initialize_workgroup_memory = true + +[hlsl] +shader_model = "V6_0" +fake_missing_bindings = true +restrict_indexing = true +zero_initialize_workgroup_memory = true + +[glsl] +version.Desktop = 430 +zero_initialize_workgroup_memory = true + +[spv] +version = [1, 3] diff --git a/naga/tests/in/wgsl/subgroup-barrier.wgsl b/naga/tests/in/wgsl/subgroup-barrier.wgsl new file mode 100644 index 000000000..670045558 --- /dev/null +++ b/naga/tests/in/wgsl/subgroup-barrier.wgsl @@ -0,0 +1,4 @@ +@compute @workgroup_size(1) +fn main() { + subgroupBarrier(); +} diff --git a/naga/tests/in/wgsl/subgroup-operations.toml b/naga/tests/in/wgsl/subgroup-operations.toml index 1e81059fe..74a4380fc 100644 --- a/naga/tests/in/wgsl/subgroup-operations.toml +++ b/naga/tests/in/wgsl/subgroup-operations.toml @@ -1,4 +1,4 @@ -capabilities = "SUBGROUP | SUBGROUP_BARRIER" +capabilities = "SUBGROUP" [msl] fake_missing_bindings = false diff --git a/naga/tests/in/wgsl/subgroup-operations.wgsl b/naga/tests/in/wgsl/subgroup-operations.wgsl index fae0197f5..2038db8d5 100644 --- a/naga/tests/in/wgsl/subgroup-operations.wgsl +++ b/naga/tests/in/wgsl/subgroup-operations.wgsl @@ -9,8 +9,6 @@ fn main( @builtin(subgroup_id) subgroup_id: u32, @builtin(subgroup_invocation_id) subgroup_invocation_id: u32, ) { - subgroupBarrier(); - _ = subgroupBallot((subgroup_invocation_id & 1u) == 1u); _ = subgroupBallot(); diff --git a/naga/tests/naga/snapshots.rs b/naga/tests/naga/snapshots.rs index a2a6a5466..7e745bf91 100644 --- a/naga/tests/naga/snapshots.rs +++ b/naga/tests/naga/snapshots.rs @@ -11,7 +11,36 @@ fn check_targets(input: &Input, module: &mut naga::Module, source_code: Option<& let targets = params.targets.unwrap(); - let capabilities = params.capabilities.unwrap_or_default(); + let mut capabilities = params.capabilities.unwrap_or_default(); + { + let mut allowed_capabilities = naga::valid::Capabilities::all(); + if targets.contains(Targets::GLSL) { + allowed_capabilities &= naga::back::glsl::supported_capabilities(); + } + if targets.contains(Targets::HLSL) { + allowed_capabilities &= naga::back::hlsl::supported_capabilities(); + } + if targets.contains(Targets::SPIRV) { + allowed_capabilities &= naga::back::spv::supported_capabilities(); + } + if targets.contains(Targets::WGSL) { + allowed_capabilities &= naga::back::wgsl::supported_capabilities(); + } + if targets.contains(Targets::METAL) { + allowed_capabilities &= naga::back::msl::supported_capabilities(); + } + if capabilities == naga::valid::Capabilities::all() { + capabilities = allowed_capabilities; + } else { + let diff = capabilities - allowed_capabilities; + if !diff.is_empty() { + panic!( + "Invalid capabilities for backends on shader {name}: used {diff:?} which aren't supported by one of the targets. +Note: this is an issue with snapshot configuration, not code. If you added a new capability, add it to `supported_capabilities()` in each backend where it is supported" + ); + } + } + } { if targets.contains(Targets::IR) { diff --git a/naga/tests/out/glsl/wgsl-subgroup-operations.main.Compute.glsl b/naga/tests/out/glsl/wgsl-subgroup-operations.main.Compute.glsl index 6eba8cf01..6f4cf1b52 100644 --- a/naga/tests/out/glsl/wgsl-subgroup-operations.main.Compute.glsl +++ b/naga/tests/out/glsl/wgsl-subgroup-operations.main.Compute.glsl @@ -18,8 +18,6 @@ void main() { Structure sizes = Structure(gl_NumSubgroups, gl_SubgroupSize); uint subgroup_id = gl_SubgroupID; uint subgroup_invocation_id = gl_SubgroupInvocationID; - subgroupMemoryBarrier(); - barrier(); uvec4 _e7 = subgroupBallot(((subgroup_invocation_id & 1u) == 1u)); uvec4 _e8 = subgroupBallot(true); bool _e11 = subgroupAll((subgroup_invocation_id != 0u)); diff --git a/naga/tests/out/msl/wgsl-subgroup-barrier.metal b/naga/tests/out/msl/wgsl-subgroup-barrier.metal new file mode 100644 index 000000000..5a5452640 --- /dev/null +++ b/naga/tests/out/msl/wgsl-subgroup-barrier.metal @@ -0,0 +1,12 @@ +// language: metal2.4 +#include +#include + +using metal::uint; + + +kernel void main_( +) { + metal::simdgroup_barrier(metal::mem_flags::mem_threadgroup); + return; +} diff --git a/naga/tests/out/msl/wgsl-subgroup-operations.metal b/naga/tests/out/msl/wgsl-subgroup-operations.metal index 4245c20b0..3ce2f0fe5 100644 --- a/naga/tests/out/msl/wgsl-subgroup-operations.metal +++ b/naga/tests/out/msl/wgsl-subgroup-operations.metal @@ -18,7 +18,6 @@ kernel void main_( , uint subgroup_invocation_id [[thread_index_in_simdgroup]] ) { const Structure sizes = { num_subgroups, subgroup_size }; - metal::simdgroup_barrier(metal::mem_flags::mem_threadgroup); metal::uint4 unnamed = metal::uint4((uint64_t)metal::simd_ballot((subgroup_invocation_id & 1u) == 1u), 0, 0, 0); metal::uint4 unnamed_1 = metal::uint4((uint64_t)metal::simd_ballot(true), 0, 0, 0); bool unnamed_2 = metal::simd_all(subgroup_invocation_id != 0u); diff --git a/naga/tests/out/spv/wgsl-subgroup-barrier.spvasm b/naga/tests/out/spv/wgsl-subgroup-barrier.spvasm new file mode 100644 index 000000000..3b4794a12 --- /dev/null +++ b/naga/tests/out/spv/wgsl-subgroup-barrier.spvasm @@ -0,0 +1,21 @@ +; SPIR-V +; Version: 1.3 +; Generator: rspirv +; Bound: 10 +OpCapability Shader +%1 = OpExtInstImport "GLSL.std.450" +OpMemoryModel Logical GLSL450 +OpEntryPoint GLCompute %4 "main" +OpExecutionMode %4 LocalSize 1 1 1 +%2 = OpTypeVoid +%5 = OpTypeFunction %2 +%8 = OpTypeInt 32 0 +%7 = OpConstant %8 3 +%9 = OpConstant %8 136 +%4 = OpFunction %2 None %5 +%3 = OpLabel +OpBranch %6 +%6 = OpLabel +OpControlBarrier %7 %7 %9 +OpReturn +OpFunctionEnd \ No newline at end of file diff --git a/naga/tests/out/spv/wgsl-subgroup-operations.spvasm b/naga/tests/out/spv/wgsl-subgroup-operations.spvasm index b36eb95a8..4b5e3f49a 100644 --- a/naga/tests/out/spv/wgsl-subgroup-operations.spvasm +++ b/naga/tests/out/spv/wgsl-subgroup-operations.spvasm @@ -1,7 +1,7 @@ ; SPIR-V ; Version: 1.3 ; Generator: rspirv -; Bound: 62 +; Bound: 61 OpCapability Shader OpCapability GroupNonUniform OpCapability GroupNonUniformBallot @@ -33,11 +33,10 @@ OpDecorate %15 BuiltIn SubgroupLocalInvocationId %19 = OpConstant %3 1 %20 = OpConstant %3 0 %21 = OpConstant %3 4 -%23 = OpConstant %3 3 -%24 = OpConstant %3 136 -%27 = OpTypeVector %3 4 -%29 = OpConstantTrue %5 -%61 = OpConstant %3 2 +%25 = OpTypeVector %3 4 +%26 = OpConstant %3 3 +%28 = OpConstantTrue %5 +%60 = OpConstant %3 2 %17 = OpFunction %2 None %18 %6 = OpLabel %10 = OpLoad %3 %8 @@ -47,40 +46,39 @@ OpDecorate %15 BuiltIn SubgroupLocalInvocationId %16 = OpLoad %3 %15 OpBranch %22 %22 = OpLabel -OpControlBarrier %23 %23 %24 -%25 = OpBitwiseAnd %3 %16 %19 -%26 = OpIEqual %5 %25 %19 -%28 = OpGroupNonUniformBallot %27 %23 %26 -%30 = OpGroupNonUniformBallot %27 %23 %29 -%31 = OpINotEqual %5 %16 %20 -%32 = OpGroupNonUniformAll %5 %23 %31 -%33 = OpIEqual %5 %16 %20 -%34 = OpGroupNonUniformAny %5 %23 %33 -%35 = OpGroupNonUniformIAdd %3 %23 Reduce %16 -%36 = OpGroupNonUniformIMul %3 %23 Reduce %16 -%37 = OpGroupNonUniformUMin %3 %23 Reduce %16 -%38 = OpGroupNonUniformUMax %3 %23 Reduce %16 -%39 = OpGroupNonUniformBitwiseAnd %3 %23 Reduce %16 -%40 = OpGroupNonUniformBitwiseOr %3 %23 Reduce %16 -%41 = OpGroupNonUniformBitwiseXor %3 %23 Reduce %16 -%42 = OpGroupNonUniformIAdd %3 %23 ExclusiveScan %16 -%43 = OpGroupNonUniformIMul %3 %23 ExclusiveScan %16 -%44 = OpGroupNonUniformIAdd %3 %23 InclusiveScan %16 -%45 = OpGroupNonUniformIMul %3 %23 InclusiveScan %16 -%46 = OpGroupNonUniformBroadcastFirst %3 %23 %16 -%47 = OpGroupNonUniformShuffle %3 %23 %16 %21 -%48 = OpCompositeExtract %3 %7 1 -%49 = OpISub %3 %48 %19 -%50 = OpISub %3 %49 %16 -%51 = OpGroupNonUniformShuffle %3 %23 %16 %50 -%52 = OpGroupNonUniformShuffleDown %3 %23 %16 %19 -%53 = OpGroupNonUniformShuffleUp %3 %23 %16 %19 -%54 = OpCompositeExtract %3 %7 1 -%55 = OpISub %3 %54 %19 -%56 = OpGroupNonUniformShuffleXor %3 %23 %16 %55 -%57 = OpGroupNonUniformQuadBroadcast %3 %23 %16 %21 -%58 = OpGroupNonUniformQuadSwap %3 %23 %16 %20 -%59 = OpGroupNonUniformQuadSwap %3 %23 %16 %19 -%60 = OpGroupNonUniformQuadSwap %3 %23 %16 %61 +%23 = OpBitwiseAnd %3 %16 %19 +%24 = OpIEqual %5 %23 %19 +%27 = OpGroupNonUniformBallot %25 %26 %24 +%29 = OpGroupNonUniformBallot %25 %26 %28 +%30 = OpINotEqual %5 %16 %20 +%31 = OpGroupNonUniformAll %5 %26 %30 +%32 = OpIEqual %5 %16 %20 +%33 = OpGroupNonUniformAny %5 %26 %32 +%34 = OpGroupNonUniformIAdd %3 %26 Reduce %16 +%35 = OpGroupNonUniformIMul %3 %26 Reduce %16 +%36 = OpGroupNonUniformUMin %3 %26 Reduce %16 +%37 = OpGroupNonUniformUMax %3 %26 Reduce %16 +%38 = OpGroupNonUniformBitwiseAnd %3 %26 Reduce %16 +%39 = OpGroupNonUniformBitwiseOr %3 %26 Reduce %16 +%40 = OpGroupNonUniformBitwiseXor %3 %26 Reduce %16 +%41 = OpGroupNonUniformIAdd %3 %26 ExclusiveScan %16 +%42 = OpGroupNonUniformIMul %3 %26 ExclusiveScan %16 +%43 = OpGroupNonUniformIAdd %3 %26 InclusiveScan %16 +%44 = OpGroupNonUniformIMul %3 %26 InclusiveScan %16 +%45 = OpGroupNonUniformBroadcastFirst %3 %26 %16 +%46 = OpGroupNonUniformShuffle %3 %26 %16 %21 +%47 = OpCompositeExtract %3 %7 1 +%48 = OpISub %3 %47 %19 +%49 = OpISub %3 %48 %16 +%50 = OpGroupNonUniformShuffle %3 %26 %16 %49 +%51 = OpGroupNonUniformShuffleDown %3 %26 %16 %19 +%52 = OpGroupNonUniformShuffleUp %3 %26 %16 %19 +%53 = OpCompositeExtract %3 %7 1 +%54 = OpISub %3 %53 %19 +%55 = OpGroupNonUniformShuffleXor %3 %26 %16 %54 +%56 = OpGroupNonUniformQuadBroadcast %3 %26 %16 %21 +%57 = OpGroupNonUniformQuadSwap %3 %26 %16 %20 +%58 = OpGroupNonUniformQuadSwap %3 %26 %16 %19 +%59 = OpGroupNonUniformQuadSwap %3 %26 %16 %60 OpReturn OpFunctionEnd \ No newline at end of file diff --git a/naga/tests/out/wgsl/wgsl-subgroup-barrier.wgsl b/naga/tests/out/wgsl/wgsl-subgroup-barrier.wgsl new file mode 100644 index 000000000..5081dfc92 --- /dev/null +++ b/naga/tests/out/wgsl/wgsl-subgroup-barrier.wgsl @@ -0,0 +1,5 @@ +@compute @workgroup_size(1, 1, 1) +fn main() { + subgroupBarrier(); + return; +} diff --git a/naga/tests/out/wgsl/wgsl-subgroup-operations.wgsl b/naga/tests/out/wgsl/wgsl-subgroup-operations.wgsl index d7bfbc1d7..a47a9b66b 100644 --- a/naga/tests/out/wgsl/wgsl-subgroup-operations.wgsl +++ b/naga/tests/out/wgsl/wgsl-subgroup-operations.wgsl @@ -5,7 +5,6 @@ struct Structure { @compute @workgroup_size(1, 1, 1) fn main(sizes: Structure, @builtin(subgroup_id) subgroup_id: u32, @builtin(subgroup_invocation_id) subgroup_invocation_id: u32) { - subgroupBarrier(); let _e7 = subgroupBallot(((subgroup_invocation_id & 1u) == 1u)); let _e8 = subgroupBallot(); let _e11 = subgroupAll((subgroup_invocation_id != 0u)); diff --git a/tests/Cargo.toml b/tests/Cargo.toml index aeec237e3..f8279fca2 100644 --- a/tests/Cargo.toml +++ b/tests/Cargo.toml @@ -47,6 +47,13 @@ wgpu-core = { workspace = true, features = ["trace"] } wgpu-hal = { workspace = true, features = ["validation_canary"] } wgpu-macros.workspace = true wgpu-types.workspace = true +naga = { workspace = true, features = [ + "spv-out", + "wgsl-out", + "hlsl-out", + "msl-out", + "glsl-out", +] } anyhow.workspace = true arrayvec.workspace = true diff --git a/tests/tests/wgpu-gpu/main.rs b/tests/tests/wgpu-gpu/main.rs index de4994ace..6d6fcbd5d 100644 --- a/tests/tests/wgpu-gpu/main.rs +++ b/tests/tests/wgpu-gpu/main.rs @@ -39,6 +39,7 @@ mod life_cycle; mod mem_leaks; mod mesh_shader; mod multiview; +mod naga_capabilities; mod occlusion_query; mod oob_indexing; mod oom; @@ -157,6 +158,7 @@ fn all_tests() -> Vec { vertex_state::all_tests(&mut tests); write_texture::all_tests(&mut tests); zero_init_texture_after_discard::all_tests(&mut tests); + naga_capabilities::all_tests(&mut tests); tests } diff --git a/tests/tests/wgpu-gpu/naga_capabilities.rs b/tests/tests/wgpu-gpu/naga_capabilities.rs new file mode 100644 index 000000000..16ee84319 --- /dev/null +++ b/tests/tests/wgpu-gpu/naga_capabilities.rs @@ -0,0 +1,35 @@ +use wgpu_test::{ + gpu_test, GpuTestConfiguration, GpuTestInitializer, TestParameters, TestingContext, +}; + +pub fn all_tests(vec: &mut Vec) { + vec.push(VALIDATE_CAPABILITIES); +} + +pub fn validate_capabilities(ctx: TestingContext) { + use naga::valid::Capabilities as Caps; + let device_caps = wgpu_core::device::features_to_naga_capabilities( + ctx.adapter.features(), + ctx.adapter.get_downlevel_capabilities().flags, + ); + let max_caps = match ctx.adapter.get_info().backend { + wgpu::Backend::Vulkan => naga::back::spv::supported_capabilities(), + // TODO: when mesh shaders land, change this + wgpu::Backend::Dx12 => naga::back::hlsl::supported_capabilities() | Caps::MESH_SHADER, + wgpu::Backend::Metal => naga::back::msl::supported_capabilities() | Caps::MESH_SHADER, + wgpu::Backend::Gl => naga::back::glsl::supported_capabilities(), + wgpu::Backend::BrowserWebGpu => naga::back::wgsl::supported_capabilities(), + wgpu::Backend::Noop => Caps::all(), + }; + let diff = device_caps - max_caps; + assert_eq!(diff, Caps::empty()); +} + +#[gpu_test] +static VALIDATE_CAPABILITIES: GpuTestConfiguration = GpuTestConfiguration::new() + .parameters( + TestParameters::default() + .downlevel_flags(wgpu::DownlevelFlags::empty()) + .limits(wgpu::Limits::downlevel_defaults()), + ) + .run_sync(validate_capabilities); diff --git a/wgpu-types/src/features.rs b/wgpu-types/src/features.rs index 7b902748c..fedf82d19 100644 --- a/wgpu-types/src/features.rs +++ b/wgpu-types/src/features.rs @@ -1332,6 +1332,7 @@ bitflags_array! { /// Supported platforms: /// - desktops /// - some mobile chips + /// - WebGPU /// /// This is a web and native feature. const DEPTH_CLIP_CONTROL = WEBGPU_FEATURE_DEPTH_CLIP_CONTROL; @@ -1343,6 +1344,7 @@ bitflags_array! { /// - DX12 /// - Metal /// - OpenGL + /// - WebGPU /// /// This is a web and native feature. /// @@ -1363,6 +1365,7 @@ bitflags_array! { /// Supported Platforms: /// - desktops /// - Mobile (All Apple9 and some Apple7 and Apple8 devices) + /// - WebGPU /// /// This is a web and native feature. const TEXTURE_COMPRESSION_BC = WEBGPU_FEATURE_TEXTURE_COMPRESSION_BC; @@ -1376,6 +1379,7 @@ bitflags_array! { /// Supported Platforms: /// - desktops /// - Mobile (All Apple9 and some Apple7 and Apple8 devices) + /// - WebGPU /// /// This is a web and native feature. const TEXTURE_COMPRESSION_BC_SLICED_3D = WEBGPU_FEATURE_TEXTURE_COMPRESSION_BC_SLICED_3D; @@ -1392,6 +1396,7 @@ bitflags_array! { /// Supported Platforms: /// - Vulkan on Intel /// - Mobile (some) + /// - WebGPU /// /// This is a web and native feature. const TEXTURE_COMPRESSION_ETC2 = WEBGPU_FEATURE_TEXTURE_COMPRESSION_ETC2; @@ -1411,6 +1416,7 @@ bitflags_array! { /// Supported Platforms: /// - Vulkan on Intel /// - Mobile (some) + /// - WebGPU /// /// This is a web and native feature. const TEXTURE_COMPRESSION_ASTC = WEBGPU_FEATURE_TEXTURE_COMPRESSION_ASTC; @@ -1425,6 +1431,7 @@ bitflags_array! { /// - Vulkan (some) /// - Metal on Apple3+ /// - OpenGL/WebGL (some) + /// - WebGPU /// /// Not Supported: /// - DX12 @@ -1452,6 +1459,7 @@ bitflags_array! { /// - Vulkan /// - DX12 /// - Metal + /// - WebGPU /// /// This is a web and native feature. /// @@ -1473,6 +1481,7 @@ bitflags_array! { /// - DX12 /// - Metal on Apple3+ or Mac1+ /// - OpenGL (Desktop 4.2+ with ARB_shader_draw_parameters only) + /// - WebGPU /// /// Not Supported: /// - OpenGL ES / WebGL @@ -1490,6 +1499,7 @@ bitflags_array! { /// - Vulkan /// - Metal /// - DX12 + /// - WebGPU /// /// This is a web and native feature. const SHADER_F16 = WEBGPU_FEATURE_SHADER_F16; @@ -1500,6 +1510,7 @@ bitflags_array! { /// - Vulkan /// - DX12 /// - Metal + /// - WebGPU /// /// This is a web and native feature. /// @@ -1512,6 +1523,7 @@ bitflags_array! { /// - Vulkan /// - DX12 /// - Metal + /// - WebGPU /// /// This is a web and native feature. /// @@ -1527,6 +1539,7 @@ bitflags_array! { /// - DX12 /// - Metal on macOS or Apple9+ GPUs, optional on iOS/iPadOS with Apple7/8 GPUs /// - GL with one of `GL_ARB_color_buffer_float`/`GL_EXT_color_buffer_float`/`OES_texture_float_linear` + /// - WebGPU /// /// This is a web and native feature. const FLOAT32_FILTERABLE = WEBGPU_FEATURE_FLOAT32_FILTERABLE; @@ -1535,6 +1548,7 @@ bitflags_array! { /// /// Supported Platforms: /// - Vulkan + /// - WebGPU const FLOAT32_BLENDABLE = WEBGPU_FEATURE_FLOAT32_BLENDABLE; /// Allows two outputs from a shader to be used for blending. @@ -1547,6 +1561,7 @@ bitflags_array! { /// - Metal (with MSL 1.2+) /// - Vulkan (with dualSrcBlend) /// - DX12 + /// - WebGPU /// /// This is a web and native feature. const DUAL_SOURCE_BLENDING = WEBGPU_FEATURE_DUAL_SOURCE_BLENDING; @@ -1555,7 +1570,9 @@ bitflags_array! { /// /// Supported platforms: /// - Vulkan (mainly on Desktop GPUs) + /// - Metal /// - GL (Desktop or `GL_EXT_clip_cull_distance`) + /// - WebGPU /// /// This is a web and native feature. const CLIP_DISTANCES = WEBGPU_FEATURE_CLIP_DISTANCES; @@ -1580,6 +1597,7 @@ bitflags_array! { /// - Vulkan /// - Metal /// - OpenGL (emulated with uniforms) + /// - WebGPU /// /// WebGPU support is currently a proposal and will be available in browsers in the future. ///