fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-05 05:18:08 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

rusticl: properly check for subgroup support

Browse source 
Reviewed-by: Alyssa Rosenzweig <alyssa.rosenzweig@intel.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/38015>
This commit is contained in:
Karol Herbst 2025-09-03 21:55:48 +02:00 • committed by Marge Bot
parent 2e2b86c64f
commit 2466c5a94e
1 changed files with 29 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
src/gallium/frontends/rusticl/core/device.rs
View file

@ -740,17 +740,22 @@ impl DeviceBase {
}
if self.subgroups_supported() {
add_cap(SpvCapability::SpvCapabilityGroupNonUniformShuffle);
add_cap(SpvCapability::SpvCapabilityGroupNonUniformShuffleRelative);
add_cap(SpvCapability::SpvCapabilityGroups);
add_cap(SpvCapability::SpvCapabilitySubgroupDispatch);
// requires CL_DEVICE_SUB_GROUP_INDEPENDENT_FORWARD_PROGRESS
//add_ext(1, 0, 0, "cl_khr_subgroups");
add_feat(1, 0, 0, "__opencl_c_subgroups");
// we have lowering in `nir_lower_subgroups`, drivers can just use that
add_ext(1, 0, 0, "cl_khr_subgroup_shuffle");
add_ext(1, 0, 0, "cl_khr_subgroup_shuffle_relative");
if self.subgroup_shuffle_supported() {
add_cap(SpvCapability::SpvCapabilityGroupNonUniformShuffle);
add_ext(1, 0, 0, "cl_khr_subgroup_shuffle");
}
if self.subgroup_shuffle_relative_supported() {
add_cap(SpvCapability::SpvCapabilityGroupNonUniformShuffleRelative);
add_ext(1, 0, 0, "cl_khr_subgroup_shuffle_relative");
}
if self.intel_subgroups_supported() {
// add_cap(SpvCapability::SpvCapabilitySubgroupBufferBlockIOINTEL);
// add_cap(SpvCapability::SpvCapabilitySubgroupImageBlockIOINTEL);
@ -1173,6 +1178,23 @@ impl DeviceBase {
// supported, doing it without shareable shaders isn't practical
self.max_subgroups() > 0
&& (subgroup_sizes == 1 || (subgroup_sizes > 1 && self.shareable_shaders()))
&& self.screen().caps().shader_subgroup_supported_features
& PIPE_SHADER_SUBGROUP_FEATURE_BASIC
!= 0
}
pub fn subgroup_shuffle_supported(&self) -> bool {
self.subgroups_supported()
&& self.screen().caps().shader_subgroup_supported_features
& PIPE_SHADER_SUBGROUP_FEATURE_SHUFFLE
!= 0
}
pub fn subgroup_shuffle_relative_supported(&self) -> bool {
self.subgroups_supported()
&& self.screen().caps().shader_subgroup_supported_features
& PIPE_SHADER_SUBGROUP_FEATURE_SHUFFLE_RELATIVE
!= 0
}
pub fn system_svm_supported(&self) -> bool {
@ -1255,8 +1277,8 @@ impl DeviceBase {
intel_subgroups: self.intel_subgroups_supported(),
kernel_clock: self.kernel_clock_supported(),
subgroups: subgroups_supported,
subgroups_shuffle: subgroups_supported,
subgroups_shuffle_relative: subgroups_supported,
subgroups_shuffle: self.subgroup_shuffle_supported(),
subgroups_shuffle_relative: self.subgroup_shuffle_relative_supported(),
..Default::default()
}
}