From 77b284e6988b9a131d6abb3140ec6663c2ae84ae Mon Sep 17 00:00:00 2001
From: Jim Flynn <jim.flynn@arm.com>
Date: Sun, 13 Mar 2022 20:53:35 +0000
Subject: IVGCVSW-6848 Move Process.[ch]pp from armnnUtils to profiling/common

Change-Id: I13353f50293eae565a75ccfda37209350512bbc6
Signed-off-by: Jim Flynn <jim.flynn@arm.com>
---
 src/armnn/LoadedNetwork.cpp                   | 14 ++++++++-----
 src/armnn/test/RuntimeTests.cpp               | 15 ++++++++------
 src/armnnUtils/Processes.cpp                  | 29 ---------------------------
 src/armnnUtils/Processes.hpp                  | 16 ---------------
 src/profiling/SendCounterPacket.cpp           |  5 ++---
 src/profiling/SendThread.cpp                  |  3 ---
 src/profiling/test/ProfilingTestUtils.cpp     |  4 ++--
 src/profiling/test/SendCounterPacketTests.cpp |  4 ++--
 8 files changed, 24 insertions(+), 66 deletions(-)
 delete mode 100644 src/armnnUtils/Processes.cpp
 delete mode 100644 src/armnnUtils/Processes.hpp

(limited to 'src')

diff --git a/src/armnn/LoadedNetwork.cpp b/src/armnn/LoadedNetwork.cpp
index 46c1ce58aa..a720769873 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 @@ LoadedNetwork::LoadedNetwork(std::unique_ptr<IOptimizedNetwork> net,
         // 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 89a87197bd..fc16dbbad9 100644
--- a/src/armnn/test/RuntimeTests.cpp
+++ b/src/armnn/test/RuntimeTests.cpp
@@ -3,17 +3,20 @@
 // SPDX-License-Identifier: MIT
 //
 
-#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/Descriptors.hpp>
+#include <armnn/IRuntime.hpp>
+#include <armnn/INetwork.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 @@ TEST_CASE("ProfilingEnableCpuRef")
                                                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/armnnUtils/Processes.cpp b/src/armnnUtils/Processes.cpp
deleted file mode 100644
index 8b401d4145..0000000000
--- a/src/armnnUtils/Processes.cpp
+++ /dev/null
@@ -1,29 +0,0 @@
-//
-// Copyright © 2020 Arm Ltd and Contributors. All rights reserved.
-// SPDX-License-Identifier: MIT
-//
-
-#include "Processes.hpp"
-
-#if defined(__unix__) || defined(__APPLE__)
-#include <unistd.h>
-#elif defined(_MSC_VER)
-#include <common/include/WindowsWrapper.hpp>
-#endif
-
-namespace armnnUtils
-{
-namespace Processes
-{
-
-int GetCurrentId()
-{
-#if defined(__unix__) || defined(__APPLE__)
-    return getpid();
-#elif defined(_MSC_VER)
-    return ::GetCurrentProcessId();
-#endif
-}
-
-}
-}
diff --git a/src/armnnUtils/Processes.hpp b/src/armnnUtils/Processes.hpp
deleted file mode 100644
index 89704237db..0000000000
--- a/src/armnnUtils/Processes.hpp
+++ /dev/null
@@ -1,16 +0,0 @@
-//
-// Copyright © 2020 Arm Ltd and Contributors. All rights reserved.
-// SPDX-License-Identifier: MIT
-//
-
-#pragma once
-
-namespace armnnUtils
-{
-namespace Processes
-{
-
-int GetCurrentId();
-
-}
-}
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;
-- 
cgit v1.2.1