diff options
author | Jim Flynn <jim.flynn@arm.com> | 2022-03-13 20:53:35 +0000 |
---|---|---|
committer | Jim Flynn <jim.flynn@arm.com> | 2022-03-13 22:50:47 +0000 |
commit | 77b284e6988b9a131d6abb3140ec6663c2ae84ae (patch) | |
tree | 72e74d3e5cde875b4f891b81ba47b0c5cc54d081 /src/profiling | |
parent | 4a96211d72002d39df0444b6f2cb56917accb80a (diff) | |
download | armnn-77b284e6988b9a131d6abb3140ec6663c2ae84ae.tar.gz |
IVGCVSW-6848 Move Process.[ch]pp from armnnUtils to profiling/common
Change-Id: I13353f50293eae565a75ccfda37209350512bbc6
Signed-off-by: Jim Flynn <jim.flynn@arm.com>
Diffstat (limited to 'src/profiling')
-rw-r--r-- | src/profiling/SendCounterPacket.cpp | 5 | ||||
-rw-r--r-- | src/profiling/SendThread.cpp | 3 | ||||
-rw-r--r-- | src/profiling/test/ProfilingTestUtils.cpp | 4 | ||||
-rw-r--r-- | src/profiling/test/SendCounterPacketTests.cpp | 4 |
4 files changed, 6 insertions, 10 deletions
diff --git a/src/profiling/SendCounterPacket.cpp b/src/profiling/SendCounterPacket.cpp index 4586d9acb8..d354d40aca 100644 --- a/src/profiling/SendCounterPacket.cpp +++ b/src/profiling/SendCounterPacket.cpp @@ -9,11 +9,10 @@ #include <common/include/Conversion.hpp> #include <common/include/Constants.hpp> #include <common/include/EncodeVersion.hpp> +#include <common/include/Processes.hpp> #include <common/include/ProfilingException.hpp> #include <common/include/SwTrace.hpp> -#include <Processes.hpp> - #include <fmt/format.h> #include <cstring> @@ -110,7 +109,7 @@ void SendCounterPacket::SendStreamMetaDataPacket() offset += sizeUint32; WriteUint32(writeBuffer, offset, MAX_METADATA_PACKET_LENGTH); // max_data_length offset += sizeUint32; - int pid = armnnUtils::Processes::GetCurrentId(); + int pid = arm::pipe::GetCurrentId(); WriteUint32(writeBuffer, offset, arm::pipe::numeric_cast<uint32_t>(pid)); // pid offset += sizeUint32; uint32_t poolOffset = bodySize; diff --git a/src/profiling/SendThread.cpp b/src/profiling/SendThread.cpp index 1459ae5499..7fb8e659f5 100644 --- a/src/profiling/SendThread.cpp +++ b/src/profiling/SendThread.cpp @@ -7,11 +7,8 @@ #include "ProfilingUtils.hpp" #include <common/include/NumericCast.hpp> - #include <common/include/ProfilingException.hpp> -#include <Processes.hpp> - #include <cstring> namespace arm diff --git a/src/profiling/test/ProfilingTestUtils.cpp b/src/profiling/test/ProfilingTestUtils.cpp index a6ec66da2f..2cd20b4716 100644 --- a/src/profiling/test/ProfilingTestUtils.cpp +++ b/src/profiling/test/ProfilingTestUtils.cpp @@ -11,13 +11,13 @@ #include <armnn/Descriptors.hpp> #include <armnn/profiling/ArmNNProfiling.hpp> -#include <Processes.hpp> #include <ProfilingService.hpp> #include <armnnUtils/Threads.hpp> #include <common/include/Assert.hpp> #include <common/include/LabelsAndEventClasses.hpp> #include <common/include/NumericCast.hpp> +#include <common/include/Processes.hpp> #include <TestUtils.hpp> @@ -492,7 +492,7 @@ void VerifyPostOptimisationStructureTestImpl(armnn::BackendId backendId) offset); // Process ID Label - int processID = armnnUtils::Processes::GetCurrentId(); + int processID = arm::pipe::GetCurrentId(); std::stringstream ss; ss << processID; std::string processIdLabel = ss.str(); diff --git a/src/profiling/test/SendCounterPacketTests.cpp b/src/profiling/test/SendCounterPacketTests.cpp index 4ae2c5562b..abd4cee600 100644 --- a/src/profiling/test/SendCounterPacketTests.cpp +++ b/src/profiling/test/SendCounterPacketTests.cpp @@ -11,7 +11,6 @@ #include <CounterDirectory.hpp> #include <ProfilingUtils.hpp> #include <SendCounterPacket.hpp> -#include <Processes.hpp> #include <armnn/Utils.hpp> @@ -20,6 +19,7 @@ #include <common/include/Constants.hpp> #include <common/include/EncodeVersion.hpp> #include <common/include/NumericCast.hpp> +#include <common/include/Processes.hpp> #include <common/include/ProfilingException.hpp> #include <doctest/doctest.h> @@ -365,7 +365,7 @@ TEST_CASE("SendStreamMetaDataPacketTest") offset += sizeUint32; CHECK(ReadUint32(readBuffer2, offset) == MAX_METADATA_PACKET_LENGTH); // max_data_len offset += sizeUint32; - int pid = armnnUtils::Processes::GetCurrentId(); + int pid = arm::pipe::GetCurrentId(); CHECK(ReadUint32(readBuffer2, offset) == arm::pipe::numeric_cast<uint32_t>(pid)); offset += sizeUint32; uint32_t poolOffset = 10 * sizeUint32; |