From c9a1129c95a4295a9e0c4ea2f420da7b1cfb3f3d Mon Sep 17 00:00:00 2001 From: Fernando Sahmkow Date: Mon, 30 Sep 2019 21:59:21 -0400 Subject: Tests: Eliminate old Core Timing Tests --- src/tests/core/core_timing.cpp | 193 ----------------------------------------- 1 file changed, 193 deletions(-) (limited to 'src/tests/core') diff --git a/src/tests/core/core_timing.cpp b/src/tests/core/core_timing.cpp index f8be8fd19..596a2f4aa 100644 --- a/src/tests/core/core_timing.cpp +++ b/src/tests/core/core_timing.cpp @@ -52,196 +52,3 @@ static void AdvanceAndCheck(Core::Timing::CoreTiming& core_timing, u32 idx, int REQUIRE(decltype(callbacks_ran_flags)().set(idx) == callbacks_ran_flags); REQUIRE(downcount == core_timing.GetDowncount()); } - -TEST_CASE("CoreTiming[BasicOrder]", "[core]") { - ScopeInit guard; - auto& core_timing = guard.core_timing; - - Core::Timing::EventType* cb_a = core_timing.RegisterEvent("callbackA", CallbackTemplate<0>); - Core::Timing::EventType* cb_b = core_timing.RegisterEvent("callbackB", CallbackTemplate<1>); - Core::Timing::EventType* cb_c = core_timing.RegisterEvent("callbackC", CallbackTemplate<2>); - Core::Timing::EventType* cb_d = core_timing.RegisterEvent("callbackD", CallbackTemplate<3>); - Core::Timing::EventType* cb_e = core_timing.RegisterEvent("callbackE", CallbackTemplate<4>); - - // Enter slice 0 - core_timing.Advance(); - - // D -> B -> C -> A -> E - core_timing.ScheduleEvent(1000, cb_a, CB_IDS[0]); - REQUIRE(1000 == core_timing.GetDowncount()); - core_timing.ScheduleEvent(500, cb_b, CB_IDS[1]); - REQUIRE(500 == core_timing.GetDowncount()); - core_timing.ScheduleEvent(800, cb_c, CB_IDS[2]); - REQUIRE(500 == core_timing.GetDowncount()); - core_timing.ScheduleEvent(100, cb_d, CB_IDS[3]); - REQUIRE(100 == core_timing.GetDowncount()); - core_timing.ScheduleEvent(1200, cb_e, CB_IDS[4]); - REQUIRE(100 == core_timing.GetDowncount()); - - AdvanceAndCheck(core_timing, 3, 400); - AdvanceAndCheck(core_timing, 1, 300); - AdvanceAndCheck(core_timing, 2, 200); - AdvanceAndCheck(core_timing, 0, 200); - AdvanceAndCheck(core_timing, 4, MAX_SLICE_LENGTH); -} - -TEST_CASE("CoreTiming[Threadsave]", "[core]") { - ScopeInit guard; - auto& core_timing = guard.core_timing; - - Core::Timing::EventType* cb_a = core_timing.RegisterEvent("callbackA", CallbackTemplate<0>); - Core::Timing::EventType* cb_b = core_timing.RegisterEvent("callbackB", CallbackTemplate<1>); - Core::Timing::EventType* cb_c = core_timing.RegisterEvent("callbackC", CallbackTemplate<2>); - Core::Timing::EventType* cb_d = core_timing.RegisterEvent("callbackD", CallbackTemplate<3>); - Core::Timing::EventType* cb_e = core_timing.RegisterEvent("callbackE", CallbackTemplate<4>); - - // Enter slice 0 - core_timing.Advance(); - - // D -> B -> C -> A -> E - core_timing.ScheduleEvent(1000, cb_a, CB_IDS[0]); - // Manually force since ScheduleEvent doesn't call it - core_timing.ForceExceptionCheck(1000); - REQUIRE(1000 == core_timing.GetDowncount()); - core_timing.ScheduleEvent(500, cb_b, CB_IDS[1]); - // Manually force since ScheduleEvent doesn't call it - core_timing.ForceExceptionCheck(500); - REQUIRE(500 == core_timing.GetDowncount()); - core_timing.ScheduleEvent(800, cb_c, CB_IDS[2]); - // Manually force since ScheduleEvent doesn't call it - core_timing.ForceExceptionCheck(800); - REQUIRE(500 == core_timing.GetDowncount()); - core_timing.ScheduleEvent(100, cb_d, CB_IDS[3]); - // Manually force since ScheduleEvent doesn't call it - core_timing.ForceExceptionCheck(100); - REQUIRE(100 == core_timing.GetDowncount()); - core_timing.ScheduleEvent(1200, cb_e, CB_IDS[4]); - // Manually force since ScheduleEvent doesn't call it - core_timing.ForceExceptionCheck(1200); - REQUIRE(100 == core_timing.GetDowncount()); - - AdvanceAndCheck(core_timing, 3, 400); - AdvanceAndCheck(core_timing, 1, 300); - AdvanceAndCheck(core_timing, 2, 200); - AdvanceAndCheck(core_timing, 0, 200); - AdvanceAndCheck(core_timing, 4, MAX_SLICE_LENGTH); -} - -namespace SharedSlotTest { -static unsigned int counter = 0; - -template -void FifoCallback(u64 userdata, s64 cycles_late) { - static_assert(ID < CB_IDS.size(), "ID out of range"); - callbacks_ran_flags.set(ID); - REQUIRE(CB_IDS[ID] == userdata); - REQUIRE(ID == counter); - REQUIRE(lateness == cycles_late); - ++counter; -} -} // namespace SharedSlotTest - -TEST_CASE("CoreTiming[SharedSlot]", "[core]") { - using namespace SharedSlotTest; - - ScopeInit guard; - auto& core_timing = guard.core_timing; - - Core::Timing::EventType* cb_a = core_timing.RegisterEvent("callbackA", FifoCallback<0>); - Core::Timing::EventType* cb_b = core_timing.RegisterEvent("callbackB", FifoCallback<1>); - Core::Timing::EventType* cb_c = core_timing.RegisterEvent("callbackC", FifoCallback<2>); - Core::Timing::EventType* cb_d = core_timing.RegisterEvent("callbackD", FifoCallback<3>); - Core::Timing::EventType* cb_e = core_timing.RegisterEvent("callbackE", FifoCallback<4>); - - core_timing.ScheduleEvent(1000, cb_a, CB_IDS[0]); - core_timing.ScheduleEvent(1000, cb_b, CB_IDS[1]); - core_timing.ScheduleEvent(1000, cb_c, CB_IDS[2]); - core_timing.ScheduleEvent(1000, cb_d, CB_IDS[3]); - core_timing.ScheduleEvent(1000, cb_e, CB_IDS[4]); - - // Enter slice 0 - core_timing.Advance(); - REQUIRE(1000 == core_timing.GetDowncount()); - - callbacks_ran_flags = 0; - counter = 0; - lateness = 0; - core_timing.AddTicks(core_timing.GetDowncount()); - core_timing.Advance(); - REQUIRE(MAX_SLICE_LENGTH == core_timing.GetDowncount()); - REQUIRE(0x1FULL == callbacks_ran_flags.to_ullong()); -} - -TEST_CASE("Core::Timing[PredictableLateness]", "[core]") { - ScopeInit guard; - auto& core_timing = guard.core_timing; - - Core::Timing::EventType* cb_a = core_timing.RegisterEvent("callbackA", CallbackTemplate<0>); - Core::Timing::EventType* cb_b = core_timing.RegisterEvent("callbackB", CallbackTemplate<1>); - - // Enter slice 0 - core_timing.Advance(); - - core_timing.ScheduleEvent(100, cb_a, CB_IDS[0]); - core_timing.ScheduleEvent(200, cb_b, CB_IDS[1]); - - AdvanceAndCheck(core_timing, 0, 90, 10, -10); // (100 - 10) - AdvanceAndCheck(core_timing, 1, MAX_SLICE_LENGTH, 50, -50); -} - -namespace ChainSchedulingTest { -static int reschedules = 0; - -static void RescheduleCallback(Core::Timing::CoreTiming& core_timing, u64 userdata, - s64 cycles_late) { - --reschedules; - REQUIRE(reschedules >= 0); - REQUIRE(lateness == cycles_late); - - if (reschedules > 0) { - core_timing.ScheduleEvent(1000, reinterpret_cast(userdata), - userdata); - } -} -} // namespace ChainSchedulingTest - -TEST_CASE("CoreTiming[ChainScheduling]", "[core]") { - using namespace ChainSchedulingTest; - - ScopeInit guard; - auto& core_timing = guard.core_timing; - - Core::Timing::EventType* cb_a = core_timing.RegisterEvent("callbackA", CallbackTemplate<0>); - Core::Timing::EventType* cb_b = core_timing.RegisterEvent("callbackB", CallbackTemplate<1>); - Core::Timing::EventType* cb_c = core_timing.RegisterEvent("callbackC", CallbackTemplate<2>); - Core::Timing::EventType* cb_rs = core_timing.RegisterEvent( - "callbackReschedule", [&core_timing](u64 userdata, s64 cycles_late) { - RescheduleCallback(core_timing, userdata, cycles_late); - }); - - // Enter slice 0 - core_timing.Advance(); - - core_timing.ScheduleEvent(800, cb_a, CB_IDS[0]); - core_timing.ScheduleEvent(1000, cb_b, CB_IDS[1]); - core_timing.ScheduleEvent(2200, cb_c, CB_IDS[2]); - core_timing.ScheduleEvent(1000, cb_rs, reinterpret_cast(cb_rs)); - REQUIRE(800 == core_timing.GetDowncount()); - - reschedules = 3; - AdvanceAndCheck(core_timing, 0, 200); // cb_a - AdvanceAndCheck(core_timing, 1, 1000); // cb_b, cb_rs - REQUIRE(2 == reschedules); - - core_timing.AddTicks(core_timing.GetDowncount()); - core_timing.Advance(); // cb_rs - REQUIRE(1 == reschedules); - REQUIRE(200 == core_timing.GetDowncount()); - - AdvanceAndCheck(core_timing, 2, 800); // cb_c - - core_timing.AddTicks(core_timing.GetDowncount()); - core_timing.Advance(); // cb_rs - REQUIRE(0 == reschedules); - REQUIRE(MAX_SLICE_LENGTH == core_timing.GetDowncount()); -} -- cgit v1.2.3 From 65aff6930bdfe1ecbf7e3c7eec967c2c6149aaef Mon Sep 17 00:00:00 2001 From: Fernando Sahmkow Date: Tue, 8 Oct 2019 17:18:06 -0400 Subject: Core Timing: General corrections and added tests. --- src/tests/core/core_timing.cpp | 156 ++++++++++++++++++++++++++++++++++++++++- 1 file changed, 153 insertions(+), 3 deletions(-) (limited to 'src/tests/core') diff --git a/src/tests/core/core_timing.cpp b/src/tests/core/core_timing.cpp index 596a2f4aa..467eb4736 100644 --- a/src/tests/core/core_timing.cpp +++ b/src/tests/core/core_timing.cpp @@ -6,6 +6,7 @@ #include #include +#include #include #include "common/file_util.h" #include "core/core.h" @@ -13,7 +14,7 @@ // Numbers are chosen randomly to make sure the correct one is given. static constexpr std::array CB_IDS{{42, 144, 93, 1026, UINT64_C(0xFFFF7FFFF7FFFF)}}; -static constexpr int MAX_SLICE_LENGTH = 20000; // Copied from CoreTiming internals +static constexpr int MAX_SLICE_LENGTH = 10000; // Copied from CoreTiming internals static std::bitset callbacks_ran_flags; static u64 expected_callback = 0; @@ -28,6 +29,12 @@ void CallbackTemplate(u64 userdata, s64 cycles_late) { REQUIRE(lateness == cycles_late); } +static u64 callbacks_done = 0; + +void EmptyCallback(u64 userdata, s64 cycles_late) { + ++callbacks_done; +} + struct ScopeInit final { ScopeInit() { core_timing.Initialize(); @@ -39,16 +46,159 @@ struct ScopeInit final { Core::Timing::CoreTiming core_timing; }; -static void AdvanceAndCheck(Core::Timing::CoreTiming& core_timing, u32 idx, int downcount, +static void AdvanceAndCheck(Core::Timing::CoreTiming& core_timing, u32 idx, u32 context = 0, int expected_lateness = 0, int cpu_downcount = 0) { callbacks_ran_flags = 0; expected_callback = CB_IDS[idx]; lateness = expected_lateness; // Pretend we executed X cycles of instructions. + core_timing.SwitchContext(context); core_timing.AddTicks(core_timing.GetDowncount() - cpu_downcount); core_timing.Advance(); + core_timing.SwitchContext((context + 1) % 4); REQUIRE(decltype(callbacks_ran_flags)().set(idx) == callbacks_ran_flags); - REQUIRE(downcount == core_timing.GetDowncount()); +} + +TEST_CASE("CoreTiming[BasicOrder]", "[core]") { + ScopeInit guard; + auto& core_timing = guard.core_timing; + + Core::Timing::EventType* cb_a = core_timing.RegisterEvent("callbackA", CallbackTemplate<0>); + Core::Timing::EventType* cb_b = core_timing.RegisterEvent("callbackB", CallbackTemplate<1>); + Core::Timing::EventType* cb_c = core_timing.RegisterEvent("callbackC", CallbackTemplate<2>); + Core::Timing::EventType* cb_d = core_timing.RegisterEvent("callbackD", CallbackTemplate<3>); + Core::Timing::EventType* cb_e = core_timing.RegisterEvent("callbackE", CallbackTemplate<4>); + + // Enter slice 0 + core_timing.ResetRun(); + + // D -> B -> C -> A -> E + core_timing.SwitchContext(0); + core_timing.ScheduleEvent(1000, cb_a, CB_IDS[0]); + REQUIRE(1000 == core_timing.GetDowncount()); + core_timing.ScheduleEvent(500, cb_b, CB_IDS[1]); + REQUIRE(500 == core_timing.GetDowncount()); + core_timing.ScheduleEvent(800, cb_c, CB_IDS[2]); + REQUIRE(500 == core_timing.GetDowncount()); + core_timing.ScheduleEvent(100, cb_d, CB_IDS[3]); + REQUIRE(100 == core_timing.GetDowncount()); + core_timing.ScheduleEvent(1200, cb_e, CB_IDS[4]); + REQUIRE(100 == core_timing.GetDowncount()); + + AdvanceAndCheck(core_timing, 3, 0); + AdvanceAndCheck(core_timing, 1, 1); + AdvanceAndCheck(core_timing, 2, 2); + AdvanceAndCheck(core_timing, 0, 3); + AdvanceAndCheck(core_timing, 4, 0); +} + +TEST_CASE("CoreTiming[FairSharing]", "[core]") { + + ScopeInit guard; + auto& core_timing = guard.core_timing; + + Core::Timing::EventType* empty_callback = + core_timing.RegisterEvent("empty_callback", EmptyCallback); + + callbacks_done = 0; + u64 MAX_CALLBACKS = 10; + for (std::size_t i = 0; i < 10; i++) { + core_timing.ScheduleEvent(i * 3333U, empty_callback, 0); + } + + const s64 advances = MAX_SLICE_LENGTH / 10; + core_timing.ResetRun(); + u64 current_time = core_timing.GetTicks(); + bool keep_running{}; + do { + keep_running = false; + for (u32 active_core = 0; active_core < 4; ++active_core) { + core_timing.SwitchContext(active_core); + if (core_timing.CurrentContextCanRun()) { + core_timing.AddTicks(std::min(advances, core_timing.GetDowncount())); + core_timing.Advance(); + } + keep_running |= core_timing.CurrentContextCanRun(); + } + } while (keep_running); + u64 current_time_2 = core_timing.GetTicks(); + + REQUIRE(MAX_CALLBACKS == callbacks_done); + REQUIRE(current_time_2 == current_time + MAX_SLICE_LENGTH * 4); +} + +TEST_CASE("Core::Timing[PredictableLateness]", "[core]") { + ScopeInit guard; + auto& core_timing = guard.core_timing; + + Core::Timing::EventType* cb_a = core_timing.RegisterEvent("callbackA", CallbackTemplate<0>); + Core::Timing::EventType* cb_b = core_timing.RegisterEvent("callbackB", CallbackTemplate<1>); + + // Enter slice 0 + core_timing.ResetRun(); + + core_timing.ScheduleEvent(100, cb_a, CB_IDS[0]); + core_timing.ScheduleEvent(200, cb_b, CB_IDS[1]); + + AdvanceAndCheck(core_timing, 0, 0, 10, -10); // (100 - 10) + AdvanceAndCheck(core_timing, 1, 1, 50, -50); +} + +namespace ChainSchedulingTest { +static int reschedules = 0; + +static void RescheduleCallback(Core::Timing::CoreTiming& core_timing, u64 userdata, + s64 cycles_late) { + --reschedules; + REQUIRE(reschedules >= 0); + REQUIRE(lateness == cycles_late); + + if (reschedules > 0) { + core_timing.ScheduleEvent(1000, reinterpret_cast(userdata), + userdata); + } +} +} // namespace ChainSchedulingTest + +TEST_CASE("CoreTiming[ChainScheduling]", "[core]") { + using namespace ChainSchedulingTest; + + ScopeInit guard; + auto& core_timing = guard.core_timing; + + Core::Timing::EventType* cb_a = core_timing.RegisterEvent("callbackA", CallbackTemplate<0>); + Core::Timing::EventType* cb_b = core_timing.RegisterEvent("callbackB", CallbackTemplate<1>); + Core::Timing::EventType* cb_c = core_timing.RegisterEvent("callbackC", CallbackTemplate<2>); + Core::Timing::EventType* cb_rs = core_timing.RegisterEvent( + "callbackReschedule", [&core_timing](u64 userdata, s64 cycles_late) { + RescheduleCallback(core_timing, userdata, cycles_late); + }); + + // Enter slice 0 + core_timing.ResetRun(); + + core_timing.ScheduleEvent(800, cb_a, CB_IDS[0]); + core_timing.ScheduleEvent(1000, cb_b, CB_IDS[1]); + core_timing.ScheduleEvent(2200, cb_c, CB_IDS[2]); + core_timing.ScheduleEvent(1000, cb_rs, reinterpret_cast(cb_rs)); + REQUIRE(800 == core_timing.GetDowncount()); + + reschedules = 3; + AdvanceAndCheck(core_timing, 0, 0); // cb_a + AdvanceAndCheck(core_timing, 1, 1); // cb_b, cb_rs + REQUIRE(2 == reschedules); + + core_timing.AddTicks(core_timing.GetDowncount()); + core_timing.Advance(); // cb_rs + core_timing.SwitchContext(3); + REQUIRE(1 == reschedules); + REQUIRE(200 == core_timing.GetDowncount()); + + AdvanceAndCheck(core_timing, 2, 3); // cb_c + + core_timing.AddTicks(core_timing.GetDowncount()); + core_timing.Advance(); // cb_rs + REQUIRE(0 == reschedules); } -- cgit v1.2.3 From 91f6333e238eb3be972c4f5e1634948a0e414ba4 Mon Sep 17 00:00:00 2001 From: Fernando Sahmkow Date: Sat, 12 Oct 2019 07:23:08 -0400 Subject: Core_Timing: Fix tests. --- src/tests/core/core_timing.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/tests/core') diff --git a/src/tests/core/core_timing.cpp b/src/tests/core/core_timing.cpp index 467eb4736..3443bf05e 100644 --- a/src/tests/core/core_timing.cpp +++ b/src/tests/core/core_timing.cpp @@ -116,11 +116,11 @@ TEST_CASE("CoreTiming[FairSharing]", "[core]") { keep_running = false; for (u32 active_core = 0; active_core < 4; ++active_core) { core_timing.SwitchContext(active_core); - if (core_timing.CurrentContextCanRun()) { + if (core_timing.CanCurrentContextRun()) { core_timing.AddTicks(std::min(advances, core_timing.GetDowncount())); core_timing.Advance(); } - keep_running |= core_timing.CurrentContextCanRun(); + keep_running |= core_timing.CanCurrentContextRun(); } } while (keep_running); u64 current_time_2 = core_timing.GetTicks(); -- cgit v1.2.3