Module: Mesa Branch: main Commit: 71e486d1cf5ec2ef4c3b35a300869fe7841f5ce3 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=71e486d1cf5ec2ef4c3b35a300869fe7841f5ce3
Author: Tatsuyuki Ishi <ishitatsuy...@gmail.com> Date: Tue Jan 9 22:36:58 2024 +0900 radv: Add layer to skip UnmapMemory for Quantic Dream Engine Detroit: Become Human has an optimization issue where the same BO is mapped and unmapped on a per-frame basis, which leads to massive overhead in the kernel, both creating the mapping and taking page faults. Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/26942> --- src/amd/vulkan/layers/radv_quantic_dream.c | 36 ++++++++++++++++++++++++++++++ src/amd/vulkan/meson.build | 2 ++ src/amd/vulkan/radv_device.c | 2 ++ src/util/00-radv-defaults.conf | 1 + 4 files changed, 41 insertions(+) diff --git a/src/amd/vulkan/layers/radv_quantic_dream.c b/src/amd/vulkan/layers/radv_quantic_dream.c new file mode 100644 index 00000000000..f00a57742b5 --- /dev/null +++ b/src/amd/vulkan/layers/radv_quantic_dream.c @@ -0,0 +1,36 @@ +/* + * Copyright © 2024 Valve Corporation + * + * Permission is hereby granted, free of charge, to any person obtaining a + * copy of this software and associated documentation files (the "Software"), + * to deal in the Software without restriction, including without limitation + * the rights to use, copy, modify, merge, publish, distribute, sublicense, + * and/or sell copies of the Software, and to permit persons to whom the + * Software is furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice (including the next + * paragraph) shall be included in all copies or substantial portions of the + * Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL + * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS + * IN THE SOFTWARE. + */ + +#include "radv_private.h" + +VKAPI_ATTR VkResult VKAPI_CALL +quantic_dream_UnmapMemory2KHR(VkDevice _device, const VkMemoryUnmapInfoKHR *pMemoryUnmapInfo) +{ + /* Detroit: Become Human repeatedly calls vkMapMemory and vkUnmapMemory on the same buffer. + * This creates high overhead in the kernel due to mapping operation and page fault costs. + * + * Simply skip the unmap call to workaround it. Mapping an already-mapped region is UB in Vulkan, + * but will correctly return the mapped pointer on RADV. + */ + return VK_SUCCESS; +} diff --git a/src/amd/vulkan/meson.build b/src/amd/vulkan/meson.build index 09f8b9de066..7aa8501d3d1 100644 --- a/src/amd/vulkan/meson.build +++ b/src/amd/vulkan/meson.build @@ -36,6 +36,7 @@ radv_entrypoints_gen_command += [ # Application layer entrypoints '--device-prefix', 'metro_exodus', '--device-prefix', 'rage2', + '--device-prefix', 'quantic_dream', ] radv_entrypoints = custom_target( @@ -50,6 +51,7 @@ libradv_files = files( 'bvh/bvh.h', 'layers/radv_metro_exodus.c', 'layers/radv_rage2.c', + 'layers/radv_quantic_dream.c', 'layers/radv_rmv_layer.c', 'layers/radv_rra_layer.c', 'layers/radv_sqtt_layer.c', diff --git a/src/amd/vulkan/radv_device.c b/src/amd/vulkan/radv_device.c index e582c709ade..dd5ced88935 100644 --- a/src/amd/vulkan/radv_device.c +++ b/src/amd/vulkan/radv_device.c @@ -599,6 +599,8 @@ init_dispatch_tables(struct radv_device *device, struct radv_physical_device *ph add_entrypoints(&b, &metro_exodus_device_entrypoints, RADV_APP_DISPATCH_TABLE); } else if (!strcmp(physical_device->instance->app_layer, "rage2")) { add_entrypoints(&b, &rage2_device_entrypoints, RADV_APP_DISPATCH_TABLE); + } else if (!strcmp(physical_device->instance->app_layer, "quanticdream")) { + add_entrypoints(&b, &quantic_dream_device_entrypoints, RADV_APP_DISPATCH_TABLE); } if (physical_device->instance->vk.trace_mode & RADV_TRACE_MODE_RGP) diff --git a/src/util/00-radv-defaults.conf b/src/util/00-radv-defaults.conf index f71cfb887e8..d58c86c1909 100644 --- a/src/util/00-radv-defaults.conf +++ b/src/util/00-radv-defaults.conf @@ -56,6 +56,7 @@ Application bugs worked around in this file: <option name="radv_zero_vram" value="true" /> <option name="radv_lower_discard_to_demote" value="true" /> <option name="radv_disable_tc_compat_htile_general" value="true" /> + <option name="radv_app_layer" value="quanticdream" /> </engine> <engine engine_name_match="^UnrealEngine"> <!-- UE4/5 Vulkan RHI -->
