From b7a451fc8775848eaf09aad02a3f8d9022fbde8e Mon Sep 17 00:00:00 2001 From: TellowKrinkle Date: Sat, 27 Jan 2024 17:39:12 -0600 Subject: [PATCH] VideoCommon: Post to analytics when bug is overridden --- Source/Core/Core/DolphinAnalytics.h | 3 + Source/Core/VideoBackends/Metal/MTLUtil.mm | 11 ++- Source/Core/VideoBackends/OGL/OGLConfig.cpp | 3 +- .../VideoBackends/Vulkan/VulkanContext.cpp | 2 +- Source/Core/VideoCommon/DriverDetails.cpp | 99 ++++++++++++++++++- Source/Core/VideoCommon/DriverDetails.h | 4 +- 6 files changed, 112 insertions(+), 10 deletions(-) diff --git a/Source/Core/Core/DolphinAnalytics.h b/Source/Core/Core/DolphinAnalytics.h index 76e69f49c2..72c7538ddb 100644 --- a/Source/Core/Core/DolphinAnalytics.h +++ b/Source/Core/Core/DolphinAnalytics.h @@ -125,6 +125,9 @@ public: // to once per game run. void ReportGameQuirk(GameQuirk quirk); + // Get the base builder for building a report + const Common::AnalyticsReportBuilder& BaseBuilder() const { return m_base_builder; } + struct PerformanceSample { double speed_ratio; // See SystemTimers::GetEstimatedEmulationPerformance(). diff --git a/Source/Core/VideoBackends/Metal/MTLUtil.mm b/Source/Core/VideoBackends/Metal/MTLUtil.mm index 5870cc5ad5..1ef951c52a 100644 --- a/Source/Core/VideoBackends/Metal/MTLUtil.mm +++ b/Source/Core/VideoBackends/Metal/MTLUtil.mm @@ -240,18 +240,19 @@ void Metal::Util::PopulateBackendInfoFeatures(VideoConfig* config, id { // Initialize DriverDetails first so we can use it later DriverDetails::Vendor vendor = DriverDetails::VENDOR_UNKNOWN; - if ([[device name] containsString:@"NVIDIA"]) + std::string name = [[device name] UTF8String]; + if (name.find("NVIDIA") != std::string::npos) vendor = DriverDetails::VENDOR_NVIDIA; - else if ([[device name] containsString:@"AMD"]) + else if (name.find("AMD") != std::string::npos) vendor = DriverDetails::VENDOR_ATI; - else if ([[device name] containsString:@"Intel"]) + else if (name.find("Intel") != std::string::npos) vendor = DriverDetails::VENDOR_INTEL; - else if ([[device name] containsString:@"Apple"]) + else if (name.find("Apple") != std::string::npos) vendor = DriverDetails::VENDOR_APPLE; const NSOperatingSystemVersion cocoa_ver = [[NSProcessInfo processInfo] operatingSystemVersion]; double version = cocoa_ver.majorVersion * 100 + cocoa_ver.minorVersion; DriverDetails::Init(DriverDetails::API_METAL, vendor, DriverDetails::DRIVER_APPLE, version, - DriverDetails::Family::UNKNOWN); + DriverDetails::Family::UNKNOWN, std::move(name)); #if TARGET_OS_OSX config->backend_info.bSupportsDepthClamp = true; diff --git a/Source/Core/VideoBackends/OGL/OGLConfig.cpp b/Source/Core/VideoBackends/OGL/OGLConfig.cpp index 8b662dc03f..7fef1f458c 100644 --- a/Source/Core/VideoBackends/OGL/OGLConfig.cpp +++ b/Source/Core/VideoBackends/OGL/OGLConfig.cpp @@ -211,7 +211,8 @@ void InitDriverInfo() default: break; } - DriverDetails::Init(DriverDetails::API_OPENGL, vendor, driver, version, family); + DriverDetails::Init(DriverDetails::API_OPENGL, vendor, driver, version, family, + std::string(srenderer)); } bool PopulateConfig(GLContext* m_main_gl_context) diff --git a/Source/Core/VideoBackends/Vulkan/VulkanContext.cpp b/Source/Core/VideoBackends/Vulkan/VulkanContext.cpp index 318f8f9103..db6d8b99d4 100644 --- a/Source/Core/VideoBackends/Vulkan/VulkanContext.cpp +++ b/Source/Core/VideoBackends/Vulkan/VulkanContext.cpp @@ -967,7 +967,7 @@ void VulkanContext::InitDriverDetails() DriverDetails::Init(DriverDetails::API_VULKAN, vendor, driver, static_cast(m_device_properties.driverVersion), - DriverDetails::Family::UNKNOWN); + DriverDetails::Family::UNKNOWN, std::move(device_name)); } void VulkanContext::PopulateShaderSubgroupSupport() diff --git a/Source/Core/VideoCommon/DriverDetails.cpp b/Source/Core/VideoCommon/DriverDetails.cpp index 14594a489c..037c5c0439 100644 --- a/Source/Core/VideoCommon/DriverDetails.cpp +++ b/Source/Core/VideoCommon/DriverDetails.cpp @@ -6,6 +6,7 @@ #include #include "Common/Logging/LogManager.h" +#include "Core/DolphinAnalytics.h" namespace DriverDetails { @@ -46,6 +47,7 @@ static Vendor m_vendor = VENDOR_UNKNOWN; static Driver m_driver = DRIVER_UNKNOWN; static Family m_family = Family::UNKNOWN; static double m_version = 0.0; +static std::string m_name; // This is a list of all known bugs for each vendor // We use this to check if the device and driver has a issue @@ -160,13 +162,15 @@ constexpr BugInfo m_known_bugs[] = { static std::map m_bugs; -void Init(API api, Vendor vendor, Driver driver, const double version, const Family family) +void Init(API api, Vendor vendor, Driver driver, const double version, const Family family, + std::string name) { m_api = api; m_vendor = vendor; m_driver = driver; m_version = version; m_family = family; + m_name = std::move(name); if (driver == DRIVER_UNKNOWN) { @@ -218,13 +222,104 @@ bool HasBug(Bug bug) return it->second.m_hasbug; } +#ifdef __clang__ +// Make sure we handle all these switch cases +#pragma clang diagnostic error "-Wswitch" +#pragma clang diagnostic error "-Wcovered-switch-default" +#endif + +// clang-format off + +static const char* to_string(API api) +{ + switch (api) + { + case API_OPENGL: return "OpenGL"; + case API_VULKAN: return "Vulkan"; + case API_METAL: return "Metal"; + } + return "Unknown"; +} + +static const char* to_string(Driver driver) +{ + switch (driver) + { + case DRIVER_ALL: return "All"; + case DRIVER_NVIDIA: return "Nvidia"; + case DRIVER_NOUVEAU: return "Nouveau"; + case DRIVER_ATI: return "ATI"; + case DRIVER_R600: return "R600"; + case DRIVER_INTEL: return "Intel"; + case DRIVER_I965: return "I965"; + case DRIVER_ARM: return "ARM"; + case DRIVER_LIMA: return "Lima"; + case DRIVER_QUALCOMM: return "Qualcomm"; + case DRIVER_FREEDRENO: return "Freedreno"; + case DRIVER_IMGTEC: return "Imgtech"; + case DRIVER_VIVANTE: return "Vivante"; + case DRIVER_PORTABILITY: return "Portability"; + case DRIVER_APPLE: return "Apple"; + case DRIVER_UNKNOWN: return "Unknown"; + } + return "Unknown"; +} + +static const char* to_string(Bug bug) +{ + switch (bug) + { + case BUG_BROKEN_UBO: return "broken-ubo"; + case BUG_BROKEN_PINNED_MEMORY: return "broken-pinned-memory"; + case BUG_BROKEN_BUFFER_STREAM: return "broken-buffer-stream"; + case BUG_BROKEN_BUFFER_STORAGE: return "broken-buffer-storage"; + case BUG_PRIMITIVE_RESTART: return "primitive-restart"; + case BUG_BROKEN_UNSYNC_MAPPING: return "broken-unsync-mapping"; + case BUG_INTEL_BROKEN_BUFFER_STORAGE: return "intel-broken-buffer-storage"; + case BUG_BROKEN_NEGATED_BOOLEAN: return "broken-negated-boolean"; + case BUG_BROKEN_COPYIMAGE: return "broken-copyimage"; + case BUG_BROKEN_VSYNC: return "broken-vsync"; + case BUG_BROKEN_GEOMETRY_SHADERS: return "broken-geometry-shaders"; + case BUG_SLOW_GETBUFFERSUBDATA: return "slow-getBufferSubData"; + case BUG_BROKEN_CLIP_DISTANCE: return "broken-clip-distance"; + case BUG_BROKEN_DUAL_SOURCE_BLENDING: return "broken-dual-source-blending"; + case BUG_BROKEN_BITWISE_OP_NEGATION: return "broken-bitwise-op-negation"; + case BUG_SHARED_CONTEXT_SHADER_COMPILATION: return "shared-context-shader-compilation"; + case BUG_BROKEN_MSAA_CLEAR: return "broken-msaa-clear"; + case BUG_BROKEN_CLEAR_LOADOP_RENDERPASS: return "broken-clear-loadop-renderpass"; + case BUG_BROKEN_D32F_CLEAR: return "broken-d32f-clear"; + case BUG_BROKEN_REVERSED_DEPTH_RANGE: return "broken-reversed-depth-range"; + case BUG_SLOW_CACHED_READBACK_MEMORY: return "slow-cached-readback-memory"; + case BUG_BROKEN_VECTOR_BITWISE_AND: return "broken-vector-bitwise-and"; + case BUG_BROKEN_SUBGROUP_OPS_WITH_DISCARD: return "broken-subgroup-ops-with-discard"; + case BUG_INVERTED_IS_HELPER: return "inverted-is-helper"; + case BUG_BROKEN_MULTITHREADED_SHADER_PRECOMPILATION: return "broken-multithreaded-shader-precompilation"; + case BUG_BROKEN_DISCARD_WITH_EARLY_Z: return "broken-discard-with-early-z"; + case BUG_BROKEN_DYNAMIC_SAMPLER_INDEXING: return "broken-dynamic-sampler-indexing"; + case BUG_SLOW_OPTIMAL_IMAGE_TO_BUFFER_COPY: return "slow-optimal-image-to-buffer-copy"; + } + return "Unknown"; +} + +// clang-format on + void OverrideBug(Bug bug, bool new_value) { const auto [it, added] = m_bugs.try_emplace( bug, BugInfo{m_api, m_os, m_vendor, m_driver, m_family, bug, -1, -1, false}); if (it->second.m_hasbug != new_value) { - // TODO: Report to DolphinAnalytics? + DolphinAnalytics& analytics = DolphinAnalytics::Instance(); + Common::AnalyticsReportBuilder builder(analytics.BaseBuilder()); + builder.AddData("type", "gpu-bug-override"); + builder.AddData("bug", to_string(bug)); + builder.AddData("value", new_value); + builder.AddData("gpu", m_name); + builder.AddData("api", to_string(m_api)); + builder.AddData("driver", to_string(m_driver)); + builder.AddData("version", std::to_string(m_version)); + analytics.Send(builder); + it->second.m_hasbug = new_value; } } diff --git a/Source/Core/VideoCommon/DriverDetails.h b/Source/Core/VideoCommon/DriverDetails.h index 5b0f2bfcea..5d45da43a3 100644 --- a/Source/Core/VideoCommon/DriverDetails.h +++ b/Source/Core/VideoCommon/DriverDetails.h @@ -1,6 +1,7 @@ // Copyright 2013 Dolphin Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later #pragma once +#include #include "Common/CommonTypes.h" #undef OS // CURL defines that, nobody uses it... @@ -345,7 +346,8 @@ enum Bug }; // Initializes our internal vendor, device family, and driver version -void Init(API api, Vendor vendor, Driver driver, const double version, const Family family); +void Init(API api, Vendor vendor, Driver driver, const double version, const Family family, + std::string name); // Once Vendor and driver version is set, this will return if it has the applicable bug passed to // it.