From 758b5ba3e6d22509d4deab3d8b0b9c2f03418130 Mon Sep 17 00:00:00 2001
From: Matthew Bentham <matthew.bentham@arm.com>
Date: Thu, 5 Mar 2020 23:37:48 +0000
Subject: COMPMID-3069: Improve build time by splitting up ToolchainSupport.h

Split out the parts of ToolchainSupport coming from <memory> and
the parts coming from <string> into their own new header files.
This accounts for 99% of uses of ToolchainSupport, which means that
expensive header files such as arm_neon.h don't need to be included
everywhere.

Knocks about 10% of compilation time off kernel files.

Signed-off-by: Matthew Bentham <matthew.bentham@arm.com>
Change-Id: I2ae718fe766b5ff28608812b0f686f30eeac1b21
Reviewed-on: https://review.mlplatform.org/c/ml/ComputeLibrary/+/2852
Tested-by: Arm Jenkins <bsgcomp@arm.com>
Reviewed-by: Michele Di Giorgio <michele.digiorgio@arm.com>
---
 arm_compute/core/CL/CLHelpers.h           | 3 ---
 arm_compute/core/GLES_COMPUTE/GCHelpers.h | 3 +--
 arm_compute/core/Helpers.h                | 3 ++-
 arm_compute/core/Size2D.h                 | 9 +++------
 arm_compute/core/utils/logging/Helpers.h  | 3 ++-
 5 files changed, 8 insertions(+), 13 deletions(-)

(limited to 'arm_compute/core')

diff --git a/arm_compute/core/CL/CLHelpers.h b/arm_compute/core/CL/CLHelpers.h
index 4b9ca4d253..453384e14e 100644
--- a/arm_compute/core/CL/CLHelpers.h
+++ b/arm_compute/core/CL/CLHelpers.h
@@ -26,9 +26,6 @@
 
 #include "arm_compute/core/CL/CLTypes.h"
 #include "arm_compute/core/CL/OpenCL.h"
-#include "arm_compute/core/GPUTarget.h"
-#include "arm_compute/core/Helpers.h"
-#include "support/ToolchainSupport.h"
 
 #include <string>
 
diff --git a/arm_compute/core/GLES_COMPUTE/GCHelpers.h b/arm_compute/core/GLES_COMPUTE/GCHelpers.h
index 7dedfdf179..b1a9ab32be 100644
--- a/arm_compute/core/GLES_COMPUTE/GCHelpers.h
+++ b/arm_compute/core/GLES_COMPUTE/GCHelpers.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017-2019 ARM Limited.
+ * Copyright (c) 2017-2020 ARM Limited.
  *
  * SPDX-License-Identifier: MIT
  *
@@ -28,7 +28,6 @@
 #include "arm_compute/core/GLES_COMPUTE/OpenGLES.h"
 #include "arm_compute/core/GPUTarget.h"
 #include "arm_compute/core/Helpers.h"
-#include "support/ToolchainSupport.h"
 
 #include <set>
 #include <string>
diff --git a/arm_compute/core/Helpers.h b/arm_compute/core/Helpers.h
index efd28f8bbe..34e4e6f885 100644
--- a/arm_compute/core/Helpers.h
+++ b/arm_compute/core/Helpers.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2019 ARM Limited.
+ * Copyright (c) 2016-2020 ARM Limited.
  *
  * SPDX-License-Identifier: MIT
  *
@@ -32,6 +32,7 @@
 #include "arm_compute/core/TensorShape.h"
 #include "arm_compute/core/Types.h"
 #include "arm_compute/core/Window.h"
+#include "support/MemorySupport.h"
 
 #include <array>
 #include <cstddef>
diff --git a/arm_compute/core/Size2D.h b/arm_compute/core/Size2D.h
index 18190a450b..722d7450f6 100644
--- a/arm_compute/core/Size2D.h
+++ b/arm_compute/core/Size2D.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2019 ARM Limited.
+ * Copyright (c) 2016-2020 ARM Limited.
  *
  * SPDX-License-Identifier: MIT
  *
@@ -24,8 +24,8 @@
 #ifndef ARM_COMPUTE_SIZE2D_H
 #define ARM_COMPUTE_SIZE2D_H
 
-#include "support/ToolchainSupport.h"
 #include <cstddef>
+#include <string>
 #include <utility>
 
 namespace arm_compute
@@ -65,10 +65,7 @@ public:
         return !(*this == other);
     }
 
-    std::string to_string() const
-    {
-        return support::cpp11::to_string(width) + std::string("x") + support::cpp11::to_string(height);
-    }
+    std::string to_string() const;
 
     /** Semantic accessor for width as x.
      *
diff --git a/arm_compute/core/utils/logging/Helpers.h b/arm_compute/core/utils/logging/Helpers.h
index 0e2a839f64..341f944ddc 100644
--- a/arm_compute/core/utils/logging/Helpers.h
+++ b/arm_compute/core/utils/logging/Helpers.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017-2019 ARM Limited.
+ * Copyright (c) 2017-2020 ARM Limited.
  *
  * SPDX-License-Identifier: MIT
  *
@@ -25,6 +25,7 @@
 #define ARM_COMPUTE_LOGGING_HELPERS_H
 
 #include "arm_compute/core/utils/logging/Types.h"
+#include "support/MemorySupport.h"
 #include "support/ToolchainSupport.h"
 
 #include <cstddef>
-- 
cgit v1.2.1