diff options
| author | Jim Flynn <jim.flynn@arm.com> | 2022-03-16 00:27:43 +0000 |
|---|---|---|
| committer | Jim Flynn <jim.flynn@arm.com> | 2022-03-16 14:42:34 +0000 |
| commit | 9c85b41a9fcb3c64d7a686373e7dde75630ccd49 (patch) | |
| tree | 49ec983ec1ba499d5a5a9240b69f8f4bb9ca2082 /profiling/server | |
| parent | 06ccd713391cca68dc8ab53b84bf058723ae55ab (diff) | |
| download | armnn-9c85b41a9fcb3c64d7a686373e7dde75630ccd49.tar.gz | |
IVGCVSW-6852 Break the remaining dependencies on Arm NN in the profiling code
Change-Id: I18b8ca22896567904768170350ee5eb22edd4a22
Signed-off-by: Jim Flynn <jim.flynn@arm.com>
Diffstat (limited to 'profiling/server')
| -rw-r--r-- | profiling/server/src/basePipeServer/tests/BasePipeServerTests.cpp | 4 | ||||
| -rw-r--r-- | profiling/server/src/timelineDecoder/tests/TimelineTests.cpp | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/profiling/server/src/basePipeServer/tests/BasePipeServerTests.cpp b/profiling/server/src/basePipeServer/tests/BasePipeServerTests.cpp index 9993fc7a75..516e648ce4 100644 --- a/profiling/server/src/basePipeServer/tests/BasePipeServerTests.cpp +++ b/profiling/server/src/basePipeServer/tests/BasePipeServerTests.cpp @@ -41,7 +41,7 @@ TEST_CASE("BasePipeServerTest") CHECK(basePipeServer.get()); arm::pipe::BufferManager bufferManager; - arm::pipe::SendCounterPacket sendCounterPacket(bufferManager); + arm::pipe::SendCounterPacket sendCounterPacket(bufferManager, "ArmNN", "Armnn 25.0", ""); // Check that we can receive a StreamMetaDataPacket sendCounterPacket.SendStreamMetaDataPacket(); @@ -57,7 +57,7 @@ TEST_CASE("BasePipeServerTest") bufferManager.MarkRead(packetBuffer); CHECK(basePipeServer.get()->WaitForStreamMetaData()); - CHECK(basePipeServer.get()->GetStreamMetadataPid() == arm::pipe::GetCurrentId()); + CHECK(basePipeServer.get()->GetStreamMetadataPid() == arm::pipe::GetCurrentProcessId()); CHECK(basePipeServer.get()->GetStreamMetadataMaxDataLen() == MAX_METADATA_PACKET_LENGTH); // Now try a simple PeriodicCounterSelectionPacket diff --git a/profiling/server/src/timelineDecoder/tests/TimelineTests.cpp b/profiling/server/src/timelineDecoder/tests/TimelineTests.cpp index 15c5c7e56d..e865c79edc 100644 --- a/profiling/server/src/timelineDecoder/tests/TimelineTests.cpp +++ b/profiling/server/src/timelineDecoder/tests/TimelineTests.cpp @@ -5,12 +5,12 @@ #include <common/include/CommandHandlerFunctor.hpp> #include <common/include/CommonProfilingUtils.hpp> +#include <common/include/Threads.hpp> #include <server/include/timelineDecoder/TimelineCaptureCommandHandler.hpp> #include <server/include/timelineDecoder/TimelineDirectoryCaptureCommandHandler.hpp> #include <server/include/timelineDecoder/TimelineDecoder.hpp> #include <BufferManager.hpp> -#include <armnnUtils/Threads.hpp> #include <ProfilingService.hpp> #include <PacketBuffer.hpp> #include <TimelinePacketWriterFactory.hpp> @@ -172,7 +172,7 @@ TEST_CASE("TimelineCaptureTest") const uint64_t timestamp = 33333u; const uint64_t eventGuid = 44444u; - const int threadId = armnnUtils::Threads::GetCurrentThreadId(); + const int threadId = arm::pipe::GetCurrentThreadId(); // need to do a bit of work here to extract the value from threadId unsigned char* uCharThreadId = new unsigned char[arm::pipe::ThreadIdSize]();; @@ -288,7 +288,7 @@ TEST_CASE("TimelineCaptureTestMultipleStringsInBuffer") const uint64_t timestamp = 33333u; const uint64_t eventGuid = 44444u; - const int threadId = armnnUtils::Threads::GetCurrentThreadId(); + const int threadId = arm::pipe::GetCurrentThreadId(); // need to do a bit of work here to extract the value from threadId unsigned char* uCharThreadId = new unsigned char[arm::pipe::ThreadIdSize](); |