IVGCVSW-6848 Move Process.[ch]pp from armnnUtils to profiling/common
Change-Id: I13353f50293eae565a75ccfda37209350512bbc6
Signed-off-by: Jim Flynn <jim.flynn@arm.com>
diff --git a/Android.mk b/Android.mk
index 29ca965..c884aa6 100644
--- a/Android.mk
+++ b/Android.mk
@@ -113,6 +113,7 @@
profiling/common/src/Logging.cpp \
profiling/common/src/NetworkSockets.cpp \
profiling/common/src/PacketVersionResolver.cpp \
+ profiling/common/src/Processes.cpp \
profiling/common/src/SwTrace.cpp \
profiling/common/src/LabelsAndEventClasses.cpp \
profiling/server/src/timelineDecoder/TimelineCaptureCommandHandler.cpp \
@@ -158,7 +159,6 @@
src/armnnUtils/TensorUtils.cpp \
src/armnnUtils/VerificationHelpers.cpp \
src/armnnUtils/Filesystem.cpp \
- src/armnnUtils/Processes.cpp \
src/armnnUtils/ProfilingOptionsConverter.cpp \
src/armnnUtils/Threads.cpp \
src/armnnUtils/Transpose.cpp \
diff --git a/CMakeLists.txt b/CMakeLists.txt
index c069b05..923bc64 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -105,8 +105,6 @@
src/armnnUtils/ParserHelper.hpp
src/armnnUtils/ParserHelper.cpp
src/armnnUtils/ParserPrototxtFixture.hpp
- src/armnnUtils/Processes.hpp
- src/armnnUtils/Processes.cpp
src/armnnUtils/ProfilingOptionsConverter.hpp
src/armnnUtils/ProfilingOptionsConverter.cpp
src/armnnUtils/PrototxtConversions.hpp
diff --git a/src/armnnUtils/Processes.hpp b/profiling/common/include/Processes.hpp
similarity index 68%
rename from src/armnnUtils/Processes.hpp
rename to profiling/common/include/Processes.hpp
index 8970423..cc59d8b 100644
--- a/src/armnnUtils/Processes.hpp
+++ b/profiling/common/include/Processes.hpp
@@ -5,12 +5,12 @@
#pragma once
-namespace armnnUtils
+namespace arm
{
-namespace Processes
+namespace pipe
{
int GetCurrentId();
-}
-}
+} // namespace arm
+} // namespace pipe
diff --git a/profiling/common/src/CMakeLists.txt b/profiling/common/src/CMakeLists.txt
index 1b47b6c..3932186 100644
--- a/profiling/common/src/CMakeLists.txt
+++ b/profiling/common/src/CMakeLists.txt
@@ -13,6 +13,7 @@
Logging.cpp
NetworkSockets.cpp
PacketVersionResolver.cpp
+ Processes.cpp
SwTrace.cpp
LabelsAndEventClasses.cpp)
diff --git a/src/armnnUtils/Processes.cpp b/profiling/common/src/Processes.cpp
similarity index 86%
rename from src/armnnUtils/Processes.cpp
rename to profiling/common/src/Processes.cpp
index 8b401d4..d6d4ca4 100644
--- a/src/armnnUtils/Processes.cpp
+++ b/profiling/common/src/Processes.cpp
@@ -11,9 +11,9 @@
#include <common/include/WindowsWrapper.hpp>
#endif
-namespace armnnUtils
+namespace arm
{
-namespace Processes
+namespace pipe
{
int GetCurrentId()
@@ -25,5 +25,5 @@
#endif
}
-}
-}
+} // namespace pipe
+} // namespace arm
diff --git a/profiling/server/src/basePipeServer/tests/BasePipeServerTests.cpp b/profiling/server/src/basePipeServer/tests/BasePipeServerTests.cpp
index a0af25f..9993fc7 100644
--- a/profiling/server/src/basePipeServer/tests/BasePipeServerTests.cpp
+++ b/profiling/server/src/basePipeServer/tests/BasePipeServerTests.cpp
@@ -8,7 +8,7 @@
#include <BufferManager.hpp>
#include <SendCounterPacket.hpp>
#include <SocketProfilingConnection.hpp>
-#include <Processes.hpp>
+#include <common/include/Processes.hpp>
#include <doctest/doctest.h>
@@ -57,7 +57,7 @@
bufferManager.MarkRead(packetBuffer);
CHECK(basePipeServer.get()->WaitForStreamMetaData());
- CHECK(basePipeServer.get()->GetStreamMetadataPid() == armnnUtils::Processes::GetCurrentId());
+ CHECK(basePipeServer.get()->GetStreamMetadataPid() == arm::pipe::GetCurrentId());
CHECK(basePipeServer.get()->GetStreamMetadataMaxDataLen() == MAX_METADATA_PACKET_LENGTH);
// Now try a simple PeriodicCounterSelectionPacket
diff --git a/src/armnn/LoadedNetwork.cpp b/src/armnn/LoadedNetwork.cpp
index 46c1ce5..a720769 100644
--- a/src/armnn/LoadedNetwork.cpp
+++ b/src/armnn/LoadedNetwork.cpp
@@ -6,22 +6,26 @@
#include "LoadedNetwork.hpp"
#include "Layer.hpp"
#include "Graph.hpp"
-#include <Processes.hpp>
#include "Profiling.hpp"
#include "HeapProfiling.hpp"
#include "WorkingMemHandle.hpp"
+#include <armnn/BackendHelper.hpp>
#include <armnn/BackendRegistry.hpp>
#include <armnn/Logging.hpp>
-#include <armnn/utility/Assert.hpp>
#include <armnn/backends/TensorHandle.hpp>
#include <armnn/backends/IMemoryManager.hpp>
#include <armnn/backends/MemCopyWorkload.hpp>
-#include <backendsCommon/MemSyncWorkload.hpp>
-#include <armnn/BackendHelper.hpp>
+
#include <armnn/profiling/ArmNNProfiling.hpp>
+#include <armnn/utility/Assert.hpp>
+
+#include <backendsCommon/MemSyncWorkload.hpp>
+
+#include <common/include/Processes.hpp>
+
#include <fmt/format.h>
namespace armnn
@@ -262,7 +266,7 @@
// Mark the network with a start of life event
timelineUtils->RecordEvent(networkGuid, LabelsAndEventClasses::ARMNN_PROFILING_SOL_EVENT_CLASS);
// and with the process ID
- int processID = armnnUtils::Processes::GetCurrentId();
+ int processID = arm::pipe::GetCurrentId();
std::stringstream ss;
ss << processID;
timelineUtils->MarkEntityWithLabel(networkGuid, ss.str(), LabelsAndEventClasses::PROCESS_ID_GUID);
diff --git a/src/armnn/test/RuntimeTests.cpp b/src/armnn/test/RuntimeTests.cpp
index 89a8719..fc16dbb 100644
--- a/src/armnn/test/RuntimeTests.cpp
+++ b/src/armnn/test/RuntimeTests.cpp
@@ -3,17 +3,20 @@
// SPDX-License-Identifier: MIT
//
+#include <ArmNNProfilingServiceInitialiser.hpp>
+#include <ProfilingOptionsConverter.hpp>
+#include <Runtime.hpp>
+
#include <armnn/Descriptors.hpp>
#include <armnn/IRuntime.hpp>
#include <armnn/INetwork.hpp>
-#include <armnn/profiling/ArmNNProfiling.hpp>
-#include <ArmNNProfilingServiceInitialiser.hpp>
-#include <ProfilingOptionsConverter.hpp>
-#include <Processes.hpp>
-#include <Runtime.hpp>
#include <armnn/TypesUtils.hpp>
+#include <armnn/profiling/ArmNNProfiling.hpp>
+
#include <common/include/LabelsAndEventClasses.hpp>
+#include <common/include/Processes.hpp>
+
#include <test/ProfilingTestUtils.hpp>
#include <HeapProfiling.hpp>
@@ -733,7 +736,7 @@
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/SendCounterPacket.cpp b/src/profiling/SendCounterPacket.cpp
index 4586d9a..d354d40 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 @@
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 1459ae5..7fb8e65 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 a6ec66d..2cd20b4 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 @@
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 4ae2c55..abd4cee 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 @@
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;