diff options
| author | 2020-04-23 12:58:41 -0400 | |
|---|---|---|
| committer | 2020-06-27 11:36:11 -0400 | |
| commit | 71f1c0f9f9aa92200fbc6c173a3305fcb5a0c85d (patch) | |
| tree | f97dfc365975933a79bd7e06510942270931f9fe /src/tests | |
| parent | Core: Split Microprofile Dynarmic timing per Core (diff) | |
| download | yuzu-71f1c0f9f9aa92200fbc6c173a3305fcb5a0c85d.tar.gz yuzu-71f1c0f9f9aa92200fbc6c173a3305fcb5a0c85d.tar.xz yuzu-71f1c0f9f9aa92200fbc6c173a3305fcb5a0c85d.zip | |
CoreTiming: Correct rebase bugs and other miscellaneous things.
Diffstat (limited to 'src/tests')
| -rw-r--r-- | src/tests/core/core_timing.cpp | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/src/tests/core/core_timing.cpp b/src/tests/core/core_timing.cpp index 21a5840fb..5aa339731 100644 --- a/src/tests/core/core_timing.cpp +++ b/src/tests/core/core_timing.cpp | |||
| @@ -16,10 +16,10 @@ | |||
| 16 | 16 | ||
| 17 | namespace { | 17 | namespace { |
| 18 | // Numbers are chosen randomly to make sure the correct one is given. | 18 | // Numbers are chosen randomly to make sure the correct one is given. |
| 19 | static constexpr std::array<u64, 5> CB_IDS{{42, 144, 93, 1026, UINT64_C(0xFFFF7FFFF7FFFF)}}; | 19 | constexpr std::array<u64, 5> CB_IDS{{42, 144, 93, 1026, UINT64_C(0xFFFF7FFFF7FFFF)}}; |
| 20 | static constexpr int MAX_SLICE_LENGTH = 10000; // Copied from CoreTiming internals | 20 | constexpr int MAX_SLICE_LENGTH = 10000; // Copied from CoreTiming internals |
| 21 | static constexpr std::array<u64, 5> calls_order{{2, 0, 1, 4, 3}}; | 21 | constexpr std::array<u64, 5> calls_order{{2, 0, 1, 4, 3}}; |
| 22 | static std::array<s64, 5> delays{}; | 22 | std::array<s64, 5> delays{}; |
| 23 | 23 | ||
| 24 | std::bitset<CB_IDS.size()> callbacks_ran_flags; | 24 | std::bitset<CB_IDS.size()> callbacks_ran_flags; |
| 25 | u64 expected_callback = 0; | 25 | u64 expected_callback = 0; |
| @@ -49,6 +49,8 @@ struct ScopeInit final { | |||
| 49 | Core::Timing::CoreTiming core_timing; | 49 | Core::Timing::CoreTiming core_timing; |
| 50 | }; | 50 | }; |
| 51 | 51 | ||
| 52 | } // Anonymous namespace | ||
| 53 | |||
| 52 | TEST_CASE("CoreTiming[BasicOrder]", "[core]") { | 54 | TEST_CASE("CoreTiming[BasicOrder]", "[core]") { |
| 53 | ScopeInit guard; | 55 | ScopeInit guard; |
| 54 | auto& core_timing = guard.core_timing; | 56 | auto& core_timing = guard.core_timing; |