piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-24 14:49:42 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #12537 from TellowKrinkle/MTLSubgroup

Browse Source 
VideoCommon: More specific subgroup op bugs
This commit is contained in:
Admiral H. Curtiss
2024-05-21 22:17:22 +02:00
committed by GitHub
parent 321dc9b76d b7a451fc87
commit 5c2f73986a
8 changed files with 288 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files

120
Source/Core/VideoCommon/DriverDetails.cpp
View File

@ -6,6 +6,7 @@
#include <map>
#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
@ -130,14 +132,14 @@ constexpr BugInfo m_known_bugs[] = {
-1.0, -1.0, true},
{API_VULKAN, OS_ALL, VENDOR_ARM, DRIVER_ARM, Family::UNKNOWN, BUG_BROKEN_VECTOR_BITWISE_AND,
-1.0, -1.0, true},
{API_VULKAN, OS_OSX, VENDOR_ATI, DRIVER_PORTABILITY, Family::UNKNOWN, BUG_BROKEN_SUBGROUP_OPS,
{API_VULKAN, OS_OSX, VENDOR_ATI, DRIVER_PORTABILITY, Family::UNKNOWN, BUG_INVERTED_IS_HELPER,
-1.0, -1.0, true},
{API_VULKAN, OS_OSX, VENDOR_INTEL, DRIVER_PORTABILITY, Family::UNKNOWN, BUG_BROKEN_SUBGROUP_OPS,
-1.0, -1.0, true},
{API_METAL, OS_OSX, VENDOR_ATI, DRIVER_APPLE, Family::UNKNOWN, BUG_BROKEN_SUBGROUP_OPS, -1.0,
-1.0, true},
{API_METAL, OS_OSX, VENDOR_INTEL, DRIVER_APPLE, Family::UNKNOWN, BUG_BROKEN_SUBGROUP_OPS, -1.0,
{API_METAL, OS_OSX, VENDOR_ATI, DRIVER_APPLE, Family::UNKNOWN, BUG_INVERTED_IS_HELPER, -1.0,
-1.0, true},
{API_VULKAN, OS_OSX, VENDOR_INTEL, DRIVER_PORTABILITY, Family::UNKNOWN,
BUG_BROKEN_SUBGROUP_OPS_WITH_DISCARD, -1.0, -1.0, true},
{API_METAL, OS_OSX, VENDOR_INTEL, DRIVER_APPLE, Family::UNKNOWN,
BUG_BROKEN_SUBGROUP_OPS_WITH_DISCARD, -1.0, -1.0, true},
{API_OPENGL, OS_ANDROID, VENDOR_ALL, DRIVER_ALL, Family::UNKNOWN,
BUG_BROKEN_MULTITHREADED_SHADER_PRECOMPILATION, -1.0, -1.0, true},
{API_VULKAN, OS_ANDROID, VENDOR_ALL, DRIVER_ALL, Family::UNKNOWN,
@ -160,13 +162,15 @@ constexpr BugInfo m_known_bugs[] = {
static std::map<Bug, BugInfo> 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)
{
@ -217,4 +221,106 @@ bool HasBug(Bug bug)
return false;
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)
{
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;
}
}
} // namespace DriverDetails

22
Source/Core/VideoCommon/DriverDetails.h
View File

@ -1,6 +1,7 @@
// Copyright 2013 Dolphin Emulator Project
// SPDX-License-Identifier: GPL-2.0-or-later
#pragma once
#include <string>
#include "Common/CommonTypes.h"
#undef OS // CURL defines that, nobody uses it...
@ -299,14 +300,23 @@ enum Bug
// BUG: Accessing gl_SubgroupInvocationID causes the Metal shader compiler to crash.
// Affected devices: AMD (older macOS)
// BUG: gl_HelperInvocation always returns true, even for non-helper invocations
// Affected devices: AMD (newer macOS)
// Started version: ???
// Ended version: ???
// (Workaround currently disabled, will put it back when someone hits the issue and we can
// find out what devices and OSes it actually affects)
// BUG: Using subgroupMax in a shader that can discard results in garbage data
// (For some reason, this only happens at 4x+ IR on Metal, but 2x+ IR on MoltenVK)
// Affected devices: Intel (macOS)
// Started version: -1
// Ended version: -1
BUG_BROKEN_SUBGROUP_OPS,
BUG_BROKEN_SUBGROUP_OPS_WITH_DISCARD,
// BUG: gl_HelperInvocation is actually !gl_HelperInvocation
// Affected devices: AMD (macOS)
// Started version: -1
// Ended version: -1
BUG_INVERTED_IS_HELPER,
// BUG: Multi-threaded shader pre-compilation sometimes crashes
// Used primarily in Videoconfig.cpp's GetNumAutoShaderPreCompilerThreads()
@ -336,9 +346,13 @@ 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.
bool HasBug(Bug bug);
// Overrides the current state of a bug
void OverrideBug(Bug bug, bool new_value);
} // namespace DriverDetails

2
Source/Core/VideoCommon/PixelShaderGen.cpp
View File

@ -485,7 +485,7 @@ void UpdateBoundingBox(float2 rawpos) {{
int2 pos_tl = pos & ~1; // round down to even
int2 pos_br = pos | 1; // round up to odd
#ifdef SUPPORTS_SUBGROUP_REDUCTION
#if defined(SUPPORTS_SUBGROUP_REDUCTION) && !defined(BROKEN_SUBGROUP_WITH_DISCARD)
if (!IS_HELPER_INVOCATION)
{{
SUBGROUP_MIN(pos_tl);