Subgroup Operations by Lichtso · Pull Request #5301 · gfx-rs/wgpu

Lichtso · 2024-02-25T09:22:18Z

Additional PR for code review as requested in #4190 (comment).

Resolves #4428

…sl-out TODO: metal out, figure out what needs to be done in validation

SPIR-V OpControlBarrier with execution scope Subgroup has implementation defined behavior when executed nonuniformly. OpenCL SPIR-V execution spec say nonuniform execution is UB. Vulkan SPIR-V execution spec says nothing :).

…erMode.

…eUp, GatherMode::ShuffleXor.

supported operations and stages subgroup operations are supported on can be passed to the validator after creating it operations are grouped to follow vulkan: - basic: elect, barrier - vote: any, all - arithmetic: reductions, scan - ballot: ballot, broadcasts, - shuffle: shuffles, - shuffle relative: shuffle up, down

wgpu-types/src/lib.rs

wgpu-hal/src/vulkan/adapter.rs

Lichtso · 2024-04-09T13:46:02Z

I fiddled with the Vulkan backend since yesterday and it is still complaining that:

Validation Error: Validation Error: [ VUID-VkPipelineShaderStageCreateInfo-flags-02784 ] | MessageID = 0xd65f4ec3 | vkCreateGraphicsPipelines(): pCreateInfos[0].pStages[0].flags includes VK_PIPELINE_SHADER_STAGE_CREATE_ALLOW_VARYING_SUBGROUP_SIZE_BIT_EXT, but the subgroupSizeControl feature was not enabled. The Vulkan spec states: If flags has the VK_PIPELINE_SHADER_STAGE_CREATE_ALLOW_VARYING_SUBGROUP_SIZE_BIT flag set, the subgroupSizeControl feature must be enabled (https://vulkan.lunarg.com/doc/view/1.3.268.0/linux/1.3-extensions/vkspec.html#VUID-VkPipelineShaderStageCreateInfo-flags-02784)

Even though I coupled the setting of PipelineShaderStageCreateFlags directly to the presence of the feature flag:

subgroup_size_control: phd_features
     .subgroup_size_control
     .map_or(false, |ext| ext.subgroup_size_control == vk::TRUE),

if self.shared.private_caps.subgroup_size_control {
     flags |= vk::PipelineShaderStageCreateFlags::ALLOW_VARYING_SUBGROUP_SIZE;
}

@teoxoy Ideas?

teoxoy · 2024-04-09T14:01:45Z

Ah yes, we need to explicitly enable it when creating the device.

I think the only thing missing is actually pushing the struct.

wgpu/wgpu-hal/src/vulkan/adapter.rs

Line 150 in 82dead0

}

wgpu-hal/src/vulkan/adapter.rs

…_ALLOW_VARYING_SUBGROUP_SIZE_BIT_EXT.

teoxoy · 2024-04-09T16:27:12Z

I think the last remaining thing is #5301 (comment).

naga/src/valid/interface.rs

atlv24 · 2024-04-15T02:26:20Z

Merge conflicts and compile errors fixed here: https://github.com/Lichtso/wgpu/pull/1

…ingError::InvalidMultiDimensionalSubgroupBuiltIn.

teoxoy

I think it's time 🎉

Thank you for this substantial contribution!

teoxoy · 2024-04-15T17:25:46Z

@cwfitzgerald do you want to give this another look? Since you've previously requested changes.

cwfitzgerald

Amazing work everyone!

Lichtso · 2024-04-17T20:07:44Z

@exrook We did it! The subgroup feature is merged.

@teoxoy You might want to adjust the CHANGELOG, I think we accidentally categorized it as "Bug fix" not "New features".

cwfitzgerald · 2024-04-17T20:17:29Z

I can touch up the changelog, there is a merge conlfict on trunk between this and #5508 that I'm fixing

teoxoy · 2024-04-18T11:33:31Z

I put together a new issue to track the differences between our implementation and the WebGPU proposal #5555.

exrook and others added 30 commits October 25, 2023 13:55

subgroup: Implement subgroupBallot for wgsl-in, wgsl-out, spv-out, hl…

14f6be2

…sl-out TODO: metal out, figure out what needs to be done in validation

subgroup: subgroupBallot metal out

e969f09

subgroup: require GroupNonUnifomBallot capability

05feb88

subgroup: Add subgroup invocation id and subgroup size builtins

2ff8809

subgroup: SubgroupInvocationId is only valid in compute stages

8cbf423

subgroup: add statement for rest of subgroup ops

44f6929

subgroup: fix doc error on SubgroupBroadcast

b5be66e

subgroup: wgsl-in and spv-out for subgroup operations

a277ec5

subgroup: add optional predicate for subgroupBallot

dd49f99

Renames SubgroupBroadcast => SubgroupGather and BroadcastMode => Gath…

18ceb01

…erMode.

General fixes.

7c911ba

Adds BuiltIn::NumSubgroups, BuiltIn::SubgroupId.

f5c4ad7

Adds GatherMode::Shuffle, GatherMode::ShuffleDown, GatherMode::Shuffl…

f931a47

…eUp, GatherMode::ShuffleXor.

Implements all frontends and backends.

d8e17e7

Adjusts metal backend test_stack_size().

43133d0

Adds test and snapshots.

275a5a5

subgroup: fix spv-in

f04b71d

subgroup: Add 0 arg subgroupBallot to tests and fix wgsl-out whitespace

7a5bf0f

subgroup: Add spv-in test

2aaf0a0

subgroup: resolve fixmes & fix typo

fb1e3f9

subgroup: Add subgroup capability

209225a

subgroup: Treat subgroup operation results as non-uniform

77d33b9

subgroup: refactor wgsl subgroup gather parsing

1e51650

subgroup: doc comments for subgroup Statements and Expressions

68fc4d5

Add feature for subgroup operations in fragment and compute shaders

6f6f789

Adds feature detection for Vulkan.

7d2e273

Adds feature detection for Metal.

55e21e8

Adds feature detection for DirectX 12.

2e44fb1

raphlinus reviewed Apr 8, 2024

View reviewed changes

wgpu-types/src/lib.rs Outdated Show resolved Hide resolved

teoxoy requested changes Apr 9, 2024

View reviewed changes

wgpu-hal/src/vulkan/adapter.rs Outdated Show resolved Hide resolved

wgpu-hal/src/vulkan/adapter.rs Show resolved Hide resolved

wgpu-hal/src/vulkan/adapter.rs Show resolved Hide resolved

teoxoy reviewed Apr 9, 2024

View reviewed changes

wgpu-hal/src/vulkan/adapter.rs Outdated Show resolved Hide resolved

Lichtso added 2 commits April 9, 2024 17:45

Adds VK_EXT_subgroup_size_control and VK_PIPELINE_SHADER_STAGE_CREATE…

96649e6

…_ALLOW_VARYING_SUBGROUP_SIZE_BIT_EXT.

Adds min_subgroup_size and max_subgroup_size device limits.

98df726

Adds EntryPointError::InvalidMultiDimensionalSubgroupBuiltIn

271297c

teoxoy reviewed Apr 10, 2024

View reviewed changes

naga/src/valid/interface.rs Outdated Show resolved Hide resolved

Lichtso and others added 3 commits April 15, 2024 11:51

Moves EntryPointError::InvalidMultiDimensionalSubgroupBuiltIn => Vary…

b66bfeb

…ingError::InvalidMultiDimensionalSubgroupBuiltIn.

Merge official/trunk into subgroup_feature

22d30c3

Fix after merge.

41ec41b

teoxoy approved these changes Apr 15, 2024

View reviewed changes

FL33TW00D mentioned this pull request Apr 16, 2024

Subgroups 🏎️ huggingface/ratchet#167

Closed

JMS55 mentioned this pull request Apr 17, 2024

Meshlet single pass depth downsampling (SPD) bevyengine/bevy#13003

Merged

cwfitzgerald approved these changes Apr 17, 2024

View reviewed changes

cwfitzgerald merged commit ea77d56 into gfx-rs:trunk Apr 17, 2024

Lichtso deleted the subgroup_feature branch April 17, 2024 19:59

cwfitzgerald mentioned this pull request Apr 17, 2024

Fix Merge Issues Between #5301 and #5508 #5549

Merged

cwfitzgerald added a commit that referenced this pull request Apr 17, 2024

Fix Merge Issues Between #5301 and #5508 (#5549)

c1291bd

teoxoy mentioned this pull request Apr 18, 2024

Subgroup Implementation Tracking Issue #5555

Open

13 tasks

FL33TW00D mentioned this pull request Jun 20, 2024

Multidimensional workgroups + subgroups #5849

Closed

This comment was marked as off-topic.

Sign in to view

Conversation

Lichtso commented Feb 25, 2024 • edited by teoxoy Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Lichtso commented Apr 9, 2024

Uh oh!

teoxoy commented Apr 9, 2024

Uh oh!

Uh oh!

teoxoy commented Apr 9, 2024

Uh oh!

Uh oh!

atlv24 commented Apr 15, 2024

Uh oh!

teoxoy left a comment

Choose a reason for hiding this comment

Uh oh!

teoxoy commented Apr 15, 2024

Uh oh!

cwfitzgerald left a comment

Choose a reason for hiding this comment

Uh oh!

Lichtso commented Apr 17, 2024

Uh oh!

cwfitzgerald commented Apr 17, 2024

Uh oh!

teoxoy commented Apr 18, 2024

Uh oh!

This comment was marked as off-topic.

This comment was marked as off-topic.

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

10 participants

Lichtso commented Feb 25, 2024 •

edited by teoxoy

Loading