Vulkan: Increase Fence Wait Time

Our current fence wait time is triggering timeouts while running with SwiftShader. However, it's possible for a 'real' application to hit a timeout also with a large enough workload. This change increases the timeout to something large enough for us to avoid most timeouts and instead rely on the OS's detection and recovery mechanism (e.g., Windows TDR). We will continue to investigate improving ANGLE's command timeout handling mechanism. Bug: angleproject:4043 Test: CQ Change-Id: I3a32174d1d794806fef1971806797683b6b3f0b2 Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/1897648 Commit-Queue: Jamie Madill <jmadill@chromium.org> Reviewed-by: Jamie Madill <jmadill@chromium.org>

Vulkan: Increase Fence Wait Time
5cbb7773 · Tim Van Patten · Commit Bot · 28b0c453 · 5cbb7773
Commit 5cbb7773 authored Nov 04, 2019 by Tim Van Patten Committed by Commit Bot Nov 04, 2019
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 7 deletions

RendererVk.cpp src/libANGLE/renderer/vulkan/RendererVk.cpp +1 -7

No files found.
--- a/src/libANGLE/renderer/vulkan/RendererVk.cpp
+++ b/src/libANGLE/renderer/vulkan/RendererVk.cpp
@@ -1761,15 +1761,9 @@ std::string RendererVk::getAndClearLastValidationMessage(uint32_t *countSinceLas
 uint64_t RendererVk::getMaxFenceWaitTimeNs() const
 {
-    // Wait a maximum of 10s.  If that times out, we declare it a failure.
+    constexpr uint64_t kMaxFenceWaitTimeNs = 120'000'000'000llu;
-    constexpr uint64_t kMaxFenceWaitTimeNs = 10'000'000'000llu;
-#if defined(NDEBUG)
    return kMaxFenceWaitTimeNs;
-#else
-    // More time in debug builds (e.g. SwiftShader debug needs more time)
-    return kMaxFenceWaitTimeNs * 100;
-#endif
 }
 void RendererVk::onCompletedSerial(Serial serial)