From 584938d8f3fcf577a450f02bd7ec002bcabf6f8b Mon Sep 17 00:00:00 2001 From: niko1point0 Date: Tue, 30 Aug 2022 09:58:43 -0400 Subject: [PATCH] Renable Nvidia Multithreaded Pipeline compile after driver 515 (#91) --- .../Vulkan/VulkanPipelineStableCache.cpp | 11 ++++++---- .../Latte/Renderer/Vulkan/VulkanRenderer.cpp | 22 ++++++++++++++++++- .../HW/Latte/Renderer/Vulkan/VulkanRenderer.h | 6 +++-- 3 files changed, 32 insertions(+), 7 deletions(-) diff --git a/src/Cafe/HW/Latte/Renderer/Vulkan/VulkanPipelineStableCache.cpp b/src/Cafe/HW/Latte/Renderer/Vulkan/VulkanPipelineStableCache.cpp index 4fab241b..50d5a256 100644 --- a/src/Cafe/HW/Latte/Renderer/Vulkan/VulkanPipelineStableCache.cpp +++ b/src/Cafe/HW/Latte/Renderer/Vulkan/VulkanPipelineStableCache.cpp @@ -34,26 +34,29 @@ uint32 VulkanPipelineStableCache::BeginLoading(uint64 cacheTitleId) std::error_code ec; fs::create_directories(ActiveSettings::GetPath("shaderCache/transferable"), ec); const auto pathCacheFile = ActiveSettings::GetPath("shaderCache/transferable/{:016x}_vkpipeline.bin", cacheTitleId); + // init cache loader state g_vkCacheState.pipelineLoadIndex = 0; g_vkCacheState.pipelineMaxFileIndex = 0; g_vkCacheState.pipelinesLoaded = 0; g_vkCacheState.pipelinesQueued = 0; + // start async compilation threads m_compilationCount.store(0); m_compilationQueue.clear(); + + // get core count uint32 cpuCoreCount = GetPhysicalCoreCount(); m_numCompilationThreads = std::clamp(cpuCoreCount, 1u, 8u); - if (g_renderer->GetVendor() == GfxVendor::Nvidia) - { - forceLog_printf("Disable multi-threaded pipeline loading due to an issue with Nvidia drivers"); + if (VulkanRenderer::GetInstance()->GetDisableMultithreadedCompilation()) m_numCompilationThreads = 1; - } + for (uint32 i = 0; i < m_numCompilationThreads; i++) { std::thread compileThread(&VulkanPipelineStableCache::CompilerThread, this); compileThread.detach(); } + // open cache file or create it cemu_assert_debug(s_cache == nullptr); const uint32 cacheFileVersion = 1; diff --git a/src/Cafe/HW/Latte/Renderer/Vulkan/VulkanRenderer.cpp b/src/Cafe/HW/Latte/Renderer/Vulkan/VulkanRenderer.cpp index 5e6119fa..e35ef6fd 100644 --- a/src/Cafe/HW/Latte/Renderer/Vulkan/VulkanRenderer.cpp +++ b/src/Cafe/HW/Latte/Renderer/Vulkan/VulkanRenderer.cpp @@ -12,6 +12,7 @@ #include "Cafe/CafeSystem.h" #include "util/helpers/helpers.h" +#include "util/helpers/StringHelpers.h" #include "config/ActiveSettings.h" #include "config/CemuConfig.h" @@ -194,10 +195,29 @@ void VulkanRenderer::DetermineVendor() m_vendor = GfxVendor::Mesa; forceLog_printf("Using GPU: %s", properties.properties.deviceName); + if (m_featureControl.deviceExtensions.driver_properties) - forceLog_printf("Driver version: %s", driverProperties.driverInfo) + { + forceLog_printf("Driver version: %s", driverProperties.driverInfo); + + if(m_vendor == GfxVendor::Nvidia) + { + // multithreaded pipelines on nvidia (requires 515 or higher) + m_featureControl.disableMultithreadedCompilation = (StringHelpers::ToInt(std::string(driverProperties.driverInfo)) < 515); + } + } + else + { forceLog_printf("Driver version (as stored in device info): %08X", properties.properties.driverVersion); + + if(m_vendor == GfxVendor::Nvidia) + { + // if the driver does not support the extension, + // it is assumed the driver is under version 515 + m_featureControl.disableMultithreadedCompilation = true; + } + } } void VulkanRenderer::GetDeviceFeatures() diff --git a/src/Cafe/HW/Latte/Renderer/Vulkan/VulkanRenderer.h b/src/Cafe/HW/Latte/Renderer/Vulkan/VulkanRenderer.h index b77bfa53..6b6abf7a 100644 --- a/src/Cafe/HW/Latte/Renderer/Vulkan/VulkanRenderer.h +++ b/src/Cafe/HW/Latte/Renderer/Vulkan/VulkanRenderer.h @@ -547,7 +547,8 @@ private: uint32 nonCoherentAtomSize = 256; }limits; - bool debugMarkersSupported = false; // frame debugger is attached + bool debugMarkersSupported = false; // frame debugger is attached + bool disableMultithreadedCompilation = false; // for old nvidia drivers }m_featureControl{}; static bool CheckDeviceExtensionSupport(const VkPhysicalDevice device, FeatureControl& info); @@ -1012,7 +1013,8 @@ private: public: - bool useTFViaSSBO() { return m_featureControl.mode.useTFEmulationViaSSBO; }; + bool GetDisableMultithreadedCompilation() { return m_featureControl.disableMultithreadedCompilation; } + bool useTFViaSSBO() { return m_featureControl.mode.useTFEmulationViaSSBO; } bool IsDebugUtilsEnabled() const { return m_featureControl.debugMarkersSupported && m_featureControl.instanceExtensions.debug_utils;