Skip to content

vulkan: Fix shaders that assume 32 wide warps when running on hardware with natively 16 wide warps like Intel #745

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
ah- wants to merge 1 commit into from
+15 −5
Closed

vulkan: Fix shaders that assume 32 wide warps when running on hardware with natively 16 wide warps like Intel #745

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions src/shader_recompiler/shader_info.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -382,6 +382,12 @@ struct Info {
/// and storage buffer words (see EvaluateHandleProgram), evaluated for each draw.
std::vector<std::vector<u32>> handle_programs;
ImageDescriptors image_descriptors;

/// Whether the shader uses warp-level operations, which observe the subgroup size.
[[nodiscard]] bool UsesWarpOps() const noexcept {
return uses_subgroup_vote || uses_subgroup_invocation_id || uses_subgroup_shuffles ||
uses_subgroup_mask || uses_quad_shuffles || uses_fswzadd;
}
};

template <typename Descriptors>
Expand Down
4 changes: 1 addition & 3 deletions src/video_core/renderer_vulkan/vk_compute_pipeline.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,9 +90,7 @@ ComputePipeline::ComputePipeline(const Device& device_, Scheduler& scheduler, vk
};
// Only warp-level ops observe the subgroup size. Forcing 32 on other shaders makes Intel
// compile SIMD32, which can spill a register-heavy kernel for minutes (Mario Kart World).
const bool uses_warp_ops = info.uses_subgroup_vote || info.uses_subgroup_invocation_id ||
info.uses_subgroup_shuffles || info.uses_subgroup_mask ||
info.uses_quad_shuffles || info.uses_fswzadd;
const bool uses_warp_ops = info.UsesWarpOps();
VkPipelineCreateFlags flags{};
if (device.IsKhrPipelineExecutablePropertiesEnabled() && Settings::values.renderer_debug.GetValue()) {
flags |= VK_PIPELINE_CREATE_CAPTURE_STATISTICS_BIT_KHR;
Expand Down
10 changes: 8 additions & 2 deletions src/video_core/renderer_vulkan/vk_graphics_pipeline.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1184,7 +1184,7 @@ void GraphicsPipeline::MakePipeline(VkRenderPass render_pass) {
.dynamicStateCount = static_cast<u32>(dynamic_states.size()),
.pDynamicStates = dynamic_states.data(),
};
[[maybe_unused]] const VkPipelineShaderStageRequiredSubgroupSizeCreateInfoEXT subgroup_size_ci{
const VkPipelineShaderStageRequiredSubgroupSizeCreateInfoEXT subgroup_size_ci{
.sType = VK_STRUCTURE_TYPE_PIPELINE_SHADER_STAGE_REQUIRED_SUBGROUP_SIZE_CREATE_INFO_EXT,
.pNext = nullptr,
.requiredSubgroupSize = GuestWarpSize,
Expand All @@ -1194,7 +1194,7 @@ void GraphicsPipeline::MakePipeline(VkRenderPass render_pass) {
if (!spv_modules[stage]) {
continue;
}
[[maybe_unused]] auto& stage_ci =
auto& stage_ci =
shader_stages.emplace_back(VkPipelineShaderStageCreateInfo{
.sType = VK_STRUCTURE_TYPE_PIPELINE_SHADER_STAGE_CREATE_INFO,
.pNext = nullptr,
Expand All @@ -1205,6 +1205,12 @@ void GraphicsPipeline::MakePipeline(VkRenderPass render_pass) {
.pName = "main",
.pSpecializationInfo = nullptr,
});
if ((stage_ci.stage == VK_SHADER_STAGE_MESH_BIT_EXT ||
stage_ci.stage == VK_SHADER_STAGE_TASK_BIT_EXT) &&
stage_infos[stage].UsesWarpOps() && device.IsExtSubgroupSizeControlSupported() &&
device.IsGuestWarpSizeSupported(stage_ci.stage)) {
stage_ci.pNext = &subgroup_size_ci;
}
}
VkPipelineCreateFlags flags{};
if (device.IsKhrPipelineExecutablePropertiesEnabled() && Settings::values.renderer_debug.GetValue()) {
Expand Down