diff options
Diffstat (limited to 'src/armnn/test')
| -rw-r--r-- | src/armnn/test/ProfilerTests.cpp | 35 | ||||
| -rw-r--r-- | src/armnn/test/ProfilingEventTest.cpp | 12 |
2 files changed, 33 insertions, 14 deletions
diff --git a/src/armnn/test/ProfilerTests.cpp b/src/armnn/test/ProfilerTests.cpp index b27ad5a7a5..8fd97179f1 100644 --- a/src/armnn/test/ProfilerTests.cpp +++ b/src/armnn/test/ProfilerTests.cpp @@ -4,16 +4,13 @@ // #include <armnn/IRuntime.hpp> -#include <armnn/TypesUtils.hpp> -#include <armnn/utility/IgnoreUnused.hpp> #include <doctest/doctest.h> -#include <memory> #include <thread> -#include <ostream> #include <Profiling.hpp> +#include <armnn/Optional.hpp> namespace armnn { @@ -216,7 +213,10 @@ TEST_CASE("WriteEventResults") // Need to directly create a ScopedProfilingEvent as the one created by the macro falls out of scope // immediately causing the Event.Stop() function method to be called immediately after the Event.Start() // function resulting in periodic test failures on the Dent and Smith HiKeys - armnn::ScopedProfilingEvent testEvent(armnn::Compute::CpuAcc, "test", armnn::WallClockTimer()); + armnn::ScopedProfilingEvent testEvent(armnn::Compute::CpuAcc, + armnn::EmptyOptional(), + "test", + armnn::WallClockTimer()); std::this_thread::sleep_for(std::chrono::milliseconds(10)); } @@ -288,18 +288,33 @@ TEST_CASE("ProfilerJsonPrinter") { // Test scoped macro. - ARMNN_SCOPED_PROFILING_EVENT_WITH_INSTRUMENTS(armnn::Compute::CpuAcc, "EnqueueWorkload", TestInstrument()) - ARMNN_SCOPED_PROFILING_EVENT_WITH_INSTRUMENTS(armnn::Compute::CpuAcc, "Level 0", TestInstrument()) + ARMNN_SCOPED_PROFILING_EVENT_WITH_INSTRUMENTS(armnn::Compute::CpuAcc, + armnn::EmptyOptional(), + "EnqueueWorkload", + TestInstrument()) + ARMNN_SCOPED_PROFILING_EVENT_WITH_INSTRUMENTS(armnn::Compute::CpuAcc, + armnn::EmptyOptional(), + "Level 0", + TestInstrument()) { { - ARMNN_SCOPED_PROFILING_EVENT_WITH_INSTRUMENTS(armnn::Compute::CpuAcc, "Level 1A", TestInstrument()) + ARMNN_SCOPED_PROFILING_EVENT_WITH_INSTRUMENTS(armnn::Compute::CpuAcc, + armnn::EmptyOptional(), + "Level 1A", + TestInstrument()) } { - ARMNN_SCOPED_PROFILING_EVENT_WITH_INSTRUMENTS(armnn::Compute::CpuAcc, "Level 1B", TestInstrument()) + ARMNN_SCOPED_PROFILING_EVENT_WITH_INSTRUMENTS(armnn::Compute::CpuAcc, + armnn::EmptyOptional(), + "Level 1B", + TestInstrument()) { - ARMNN_SCOPED_PROFILING_EVENT_WITH_INSTRUMENTS(armnn::Compute::CpuAcc, "Level 2A", TestInstrument()) + ARMNN_SCOPED_PROFILING_EVENT_WITH_INSTRUMENTS(armnn::Compute::CpuAcc, + armnn::EmptyOptional(), + "Level 2A", + TestInstrument()) } } } diff --git a/src/armnn/test/ProfilingEventTest.cpp b/src/armnn/test/ProfilingEventTest.cpp index 1e3d1eac7f..c61f4e2528 100644 --- a/src/armnn/test/ProfilingEventTest.cpp +++ b/src/armnn/test/ProfilingEventTest.cpp @@ -27,7 +27,8 @@ TEST_CASE("ProfilingEventTest") nullptr, nullptr, BackendId(), - std::move(insts1)); + std::move(insts1), + EmptyOptional()); CHECK_EQ(testEvent.GetName(), "EventName"); @@ -50,7 +51,8 @@ TEST_CASE("ProfilingEventTest") profileManager.GetProfiler(), &testEvent, cpuAccBackendId, - std::move(insts2)); + std::move(insts2), + EmptyOptional()); CHECK_EQ(&testEvent, testEvent2.GetParentEvent()); CHECK_EQ(profileManager.GetProfiler(), testEvent2.GetProfiler()); @@ -70,7 +72,8 @@ TEST_CASE("ProfilingEventTestOnGpuAcc") nullptr, nullptr, BackendId(), - std::move(insts1)); + std::move(insts1), + EmptyOptional()); CHECK_EQ(testEvent.GetName(), "GPUEvent"); @@ -93,7 +96,8 @@ TEST_CASE("ProfilingEventTestOnGpuAcc") profileManager.GetProfiler(), &testEvent, gpuAccBackendId, - std::move(insts2)); + std::move(insts2), + EmptyOptional()); CHECK_EQ(&testEvent, testEvent2.GetParentEvent()); CHECK_EQ(profileManager.GetProfiler(), testEvent2.GetProfiler()); |