From 433ec234572b59886c156ca426f8581e38927f03 Mon Sep 17 00:00:00 2001 From: Autumn on Tape Date: Fri, 1 Apr 2022 13:03:20 -0700 Subject: [PATCH] lavapipe: enable subgroup shuffle operations Bits flipped in VkPhysicalDeviceSubgroupProperties.supportedOperations: * SUBGROUP_FEATURE_SHUFFLE_BIT * SUBGROUP_FEATURE_SHUFFLE_RELATIVE_BIT Signed-off-by: Autumn on Tape Reviewed-by: Dave Airlie Part-of: --- src/gallium/frontends/lavapipe/lvp_device.c | 4 ++++ src/gallium/frontends/lavapipe/lvp_pipeline.c | 3 +++ src/gallium/frontends/lavapipe/lvp_private.h | 2 ++ src/gallium/frontends/lavapipe/meson.build | 2 +- 4 files changed, 10 insertions(+), 1 deletion(-) diff --git a/src/gallium/frontends/lavapipe/lvp_device.c b/src/gallium/frontends/lavapipe/lvp_device.c index f695104..4b73965 100644 --- a/src/gallium/frontends/lavapipe/lvp_device.c +++ b/src/gallium/frontends/lavapipe/lvp_device.c @@ -1007,6 +1007,10 @@ lvp_get_physical_device_properties_1_1(struct lvp_physical_device *pdevice, p->subgroupSupportedOperations = VK_SUBGROUP_FEATURE_BASIC_BIT | VK_SUBGROUP_FEATURE_VOTE_BIT | VK_SUBGROUP_FEATURE_ARITHMETIC_BIT | VK_SUBGROUP_FEATURE_BALLOT_BIT; p->subgroupQuadOperationsInAllStages = false; +#if LLVM_VERSION_MAJOR >= 10 + p->subgroupSupportedOperations |= VK_SUBGROUP_FEATURE_SHUFFLE_BIT | VK_SUBGROUP_FEATURE_SHUFFLE_RELATIVE_BIT; +#endif + p->pointClippingBehavior = VK_POINT_CLIPPING_BEHAVIOR_ALL_CLIP_PLANES; p->maxMultiviewViewCount = 6; p->maxMultiviewInstanceIndex = INT_MAX; diff --git a/src/gallium/frontends/lavapipe/lvp_pipeline.c b/src/gallium/frontends/lavapipe/lvp_pipeline.c index 1d556ce..018485c 100644 --- a/src/gallium/frontends/lavapipe/lvp_pipeline.c +++ b/src/gallium/frontends/lavapipe/lvp_pipeline.c @@ -849,6 +849,9 @@ lvp_shader_compile_to_ir(struct lvp_pipeline *pipeline, .subgroup_basic = true, .subgroup_ballot = true, .subgroup_quad = true, +#if LLVM_VERSION_MAJOR >= 10 + .subgroup_shuffle = true, +#endif .subgroup_vote = true, .vk_memory_model = true, .vk_memory_model_device_scope = true, diff --git a/src/gallium/frontends/lavapipe/lvp_private.h b/src/gallium/frontends/lavapipe/lvp_private.h index 51957c1..0965bdf 100644 --- a/src/gallium/frontends/lavapipe/lvp_private.h +++ b/src/gallium/frontends/lavapipe/lvp_private.h @@ -29,6 +29,8 @@ #include #include +#include + #include "util/macros.h" #include "util/list.h" #include "util/u_dynarray.h" diff --git a/src/gallium/frontends/lavapipe/meson.build b/src/gallium/frontends/lavapipe/meson.build index 3eba970..a63f322 100644 --- a/src/gallium/frontends/lavapipe/meson.build +++ b/src/gallium/frontends/lavapipe/meson.build @@ -44,6 +44,6 @@ liblavapipe_st = static_library( c_args : [ c_msvc_compat_args, lvp_flags ], gnu_symbol_visibility : 'hidden', include_directories : [ inc_include, inc_src, inc_util, inc_gallium, inc_compiler, inc_gallium_aux ], - dependencies : [ idep_nir, idep_mesautil, idep_vulkan_util, idep_vulkan_wsi, + dependencies : [ dep_llvm, idep_nir, idep_mesautil, idep_vulkan_util, idep_vulkan_wsi, idep_vulkan_runtime, lvp_deps ] ) -- 2.7.4