From 482e9f3002b1ff43a285a792ff923db5dddf786f Mon Sep 17 00:00:00 2001 From: Samuel Pitoiset Date: Fri, 5 Jun 2026 10:38:58 +0200 Subject: [PATCH] util/drirc_gen: add heap_memory_percent to common VK options Signed-off-by: Samuel Pitoiset Part-of: --- src/amd/vulkan/radv_drirc_gen.py | 3 ++- src/freedreno/vulkan/tu_drirc_gen.py | 6 ++---- src/intel/vulkan/anv_drirc_gen.py | 4 +++- src/util/drirc_gen.py | 9 ++++++++- 4 files changed, 15 insertions(+), 7 deletions(-) diff --git a/src/amd/vulkan/radv_drirc_gen.py b/src/amd/vulkan/radv_drirc_gen.py index 4ee2ad4b6ef..24e3311290f 100644 --- a/src/amd/vulkan/radv_drirc_gen.py +++ b/src/amd/vulkan/radv_drirc_gen.py @@ -144,7 +144,8 @@ def declare_options(): c_name="override_ray_tracing_shader_version"), ] - drirc_gen.add_common_vk_options(debug_options, features_options, valid_options=VALID_COMMON_VK_OPTIONS) + drirc_gen.add_common_vk_options(debug_options, features_options, misc_options, + valid_options=VALID_COMMON_VK_OPTIONS) drirc_gen.add_common_vk_wsi_options(debug_options, performance_options) return [ diff --git a/src/freedreno/vulkan/tu_drirc_gen.py b/src/freedreno/vulkan/tu_drirc_gen.py index 92ec5cf2359..18938eb1a40 100644 --- a/src/freedreno/vulkan/tu_drirc_gen.py +++ b/src/freedreno/vulkan/tu_drirc_gen.py @@ -7,6 +7,7 @@ import sys VALID_COMMON_VK_OPTIONS = { "force_vk_vendor", + "heap_memory_percent", } def declare_options(): @@ -101,9 +102,6 @@ def declare_options(): "Provide a second queue for applications that require it, like the Android framework", c_name="emulate_second_queue"), - F("heap_memory_percent", 0.0, 0.0, 1.0, "Percentage of total system memory to report as gpu heap memory (0 = driver default)", - c_name="heap_memory_percent"), - I("tu_override_graphics_shader_version", 0, 0, 255, "Override graphics shader version to force recompilation when TU_BUILD_ID_OVERRIDE is enabled.", c_name="override_graphics_shader_version"), @@ -114,7 +112,7 @@ def declare_options(): features_options = [] - drirc_gen.add_common_vk_options(debug_options, features_options, valid_options=VALID_COMMON_VK_OPTIONS) + drirc_gen.add_common_vk_options(debug_options, features_options, misc_options, valid_options=VALID_COMMON_VK_OPTIONS) drirc_gen.add_common_vk_wsi_options(debug_options, perf_options) return [drirc_gen.DrircSection("Debugging", debug_options, c_name="debug"), diff --git a/src/intel/vulkan/anv_drirc_gen.py b/src/intel/vulkan/anv_drirc_gen.py index b2ddd4f7b64..63b93deb15a 100644 --- a/src/intel/vulkan/anv_drirc_gen.py +++ b/src/intel/vulkan/anv_drirc_gen.py @@ -228,7 +228,9 @@ def declare_options(android_version): c_name="compression_control_enabled"), ] - drirc_gen.add_common_vk_options(debug_options, feature_options, + misc_options = [] + + drirc_gen.add_common_vk_options(debug_options, feature_options, misc_options, valid_options=VALID_COMMON_VK_OPTIONS, defaults={"vk_require_astc": android_version >= 34}) drirc_gen.add_common_vk_wsi_options(debug_options, perf_options) diff --git a/src/util/drirc_gen.py b/src/util/drirc_gen.py index d5aef5a43b1..f9e5c1c8ae0 100644 --- a/src/util/drirc_gen.py +++ b/src/util/drirc_gen.py @@ -265,9 +265,10 @@ def drirc_generate(cpath, hpath, driver_prefix, sections): print(exceptions.text_error_template().render(), file=sys.stderr) sys.exit(1) -def add_common_vk_options(debug_options, features_options, valid_options, defaults=None): +def add_common_vk_options(debug_options, features_options, misc_options, valid_options, defaults=None): B = DrircBool I = DrircInt + F = DrircFloat if defaults is None: defaults = {} @@ -293,6 +294,12 @@ def add_common_vk_options(debug_options, features_options, valid_options, defaul c_name="require_astc"), ] if opt.name in valid_options]) + misc_options.extend([opt for opt in [ + F("heap_memory_percent", defaults.get("heap_memory_percent", 0.0), 0.0, 1.0, + "Percentage of total system memory to report as gpu heap memory (0 = driver default)", + c_name="heap_memory_percent"), + ] if opt.name in valid_options]) + def add_common_vk_wsi_options(debug_options, performance_options): B = DrircBool I = DrircInt