diff options
| author | 2020-05-14 14:10:49 -0400 | |
|---|---|---|
| committer | 2020-06-18 16:29:28 -0400 | |
| commit | 45d29436b32bbee1bdf1344e3dc3db365dc42937 (patch) | |
| tree | 22c1c2ab550fc0147e8bd9c5525c9ec0d324065f /src | |
| parent | Common/Fiber: Address Feedback and Correct Memory leaks. (diff) | |
| download | yuzu-45d29436b32bbee1bdf1344e3dc3db365dc42937.tar.gz yuzu-45d29436b32bbee1bdf1344e3dc3db365dc42937.tar.xz yuzu-45d29436b32bbee1bdf1344e3dc3db365dc42937.zip | |
Tests/HostTiming: Correct GCC Compile error.
Diffstat (limited to 'src')
| -rw-r--r-- | src/tests/core/host_timing.cpp | 29 |
1 files changed, 14 insertions, 15 deletions
diff --git a/src/tests/core/host_timing.cpp b/src/tests/core/host_timing.cpp index ed060be55..556254098 100644 --- a/src/tests/core/host_timing.cpp +++ b/src/tests/core/host_timing.cpp | |||
| @@ -22,7 +22,6 @@ static std::array<s64, 5> delays{}; | |||
| 22 | 22 | ||
| 23 | static std::bitset<CB_IDS.size()> callbacks_ran_flags; | 23 | static std::bitset<CB_IDS.size()> callbacks_ran_flags; |
| 24 | static u64 expected_callback = 0; | 24 | static u64 expected_callback = 0; |
| 25 | static s64 lateness = 0; | ||
| 26 | 25 | ||
| 27 | template <unsigned int IDX> | 26 | template <unsigned int IDX> |
| 28 | void HostCallbackTemplate(u64 userdata, s64 nanoseconds_late) { | 27 | void HostCallbackTemplate(u64 userdata, s64 nanoseconds_late) { |
| @@ -34,8 +33,6 @@ void HostCallbackTemplate(u64 userdata, s64 nanoseconds_late) { | |||
| 34 | ++expected_callback; | 33 | ++expected_callback; |
| 35 | } | 34 | } |
| 36 | 35 | ||
| 37 | static u64 callbacks_done = 0; | ||
| 38 | |||
| 39 | struct ScopeInit final { | 36 | struct ScopeInit final { |
| 40 | ScopeInit() { | 37 | ScopeInit() { |
| 41 | core_timing.Initialize(); | 38 | core_timing.Initialize(); |
| @@ -47,6 +44,20 @@ struct ScopeInit final { | |||
| 47 | Core::HostTiming::CoreTiming core_timing; | 44 | Core::HostTiming::CoreTiming core_timing; |
| 48 | }; | 45 | }; |
| 49 | 46 | ||
| 47 | #pragma optimize("", off) | ||
| 48 | |||
| 49 | static u64 TestTimerSpeed(Core::HostTiming::CoreTiming& core_timing) { | ||
| 50 | u64 start = core_timing.GetGlobalTimeNs().count(); | ||
| 51 | u64 placebo = 0; | ||
| 52 | for (std::size_t i = 0; i < 1000; i++) { | ||
| 53 | placebo += core_timing.GetGlobalTimeNs().count(); | ||
| 54 | } | ||
| 55 | u64 end = core_timing.GetGlobalTimeNs().count(); | ||
| 56 | return (end - start); | ||
| 57 | } | ||
| 58 | |||
| 59 | #pragma optimize("", on) | ||
| 60 | |||
| 50 | TEST_CASE("HostTiming[BasicOrder]", "[core]") { | 61 | TEST_CASE("HostTiming[BasicOrder]", "[core]") { |
| 51 | ScopeInit guard; | 62 | ScopeInit guard; |
| 52 | auto& core_timing = guard.core_timing; | 63 | auto& core_timing = guard.core_timing; |
| @@ -85,18 +96,6 @@ TEST_CASE("HostTiming[BasicOrder]", "[core]") { | |||
| 85 | } | 96 | } |
| 86 | } | 97 | } |
| 87 | 98 | ||
| 88 | #pragma optimize("", off) | ||
| 89 | u64 TestTimerSpeed(Core::HostTiming::CoreTiming& core_timing) { | ||
| 90 | u64 start = core_timing.GetGlobalTimeNs().count(); | ||
| 91 | u64 placebo = 0; | ||
| 92 | for (std::size_t i = 0; i < 1000; i++) { | ||
| 93 | placebo += core_timing.GetGlobalTimeNs().count(); | ||
| 94 | } | ||
| 95 | u64 end = core_timing.GetGlobalTimeNs().count(); | ||
| 96 | return (end - start); | ||
| 97 | } | ||
| 98 | #pragma optimize("", on) | ||
| 99 | |||
| 100 | TEST_CASE("HostTiming[BasicOrderNoPausing]", "[core]") { | 99 | TEST_CASE("HostTiming[BasicOrderNoPausing]", "[core]") { |
| 101 | ScopeInit guard; | 100 | ScopeInit guard; |
| 102 | auto& core_timing = guard.core_timing; | 101 | auto& core_timing = guard.core_timing; |