diff options
author | Matthew Bentham <matthew.bentham@arm.com> | 2020-03-05 23:37:48 +0000 |
---|---|---|
committer | Michele Di Giorgio <michele.digiorgio@arm.com> | 2020-03-10 18:41:04 +0000 |
commit | 758b5ba3e6d22509d4deab3d8b0b9c2f03418130 (patch) | |
tree | c16734e12b105819a919e8015a4d281dffd8817c /arm_compute | |
parent | 6b3865ad038d60a126fe1f90df815a480527a29f (diff) | |
download | ComputeLibrary-758b5ba3e6d22509d4deab3d8b0b9c2f03418130.tar.gz |
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>
Diffstat (limited to 'arm_compute')
-rw-r--r-- | arm_compute/core/CL/CLHelpers.h | 3 | ||||
-rw-r--r-- | arm_compute/core/GLES_COMPUTE/GCHelpers.h | 3 | ||||
-rw-r--r-- | arm_compute/core/Helpers.h | 3 | ||||
-rw-r--r-- | arm_compute/core/Size2D.h | 9 | ||||
-rw-r--r-- | arm_compute/core/utils/logging/Helpers.h | 3 | ||||
-rw-r--r-- | arm_compute/graph/TensorDescriptor.h | 3 | ||||
-rw-r--r-- | arm_compute/graph/backends/BackendRegistry.h | 4 | ||||
-rw-r--r-- | arm_compute/runtime/Array.h | 4 | ||||
-rw-r--r-- | arm_compute/runtime/GLES_COMPUTE/GCRuntimeContext.h | 4 | ||||
-rw-r--r-- | arm_compute/runtime/MemoryRegion.h | 2 |
10 files changed, 15 insertions, 23 deletions
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> diff --git a/arm_compute/graph/TensorDescriptor.h b/arm_compute/graph/TensorDescriptor.h index 4441e0f7d3..0cd892b935 100644 --- a/arm_compute/graph/TensorDescriptor.h +++ b/arm_compute/graph/TensorDescriptor.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018-2019 ARM Limited. + * Copyright (c) 2018-2020 ARM Limited. * * SPDX-License-Identifier: MIT * @@ -27,6 +27,7 @@ #include "arm_compute/graph/Types.h" #include "arm_compute/core/utils/misc/ICloneable.h" +#include "support/MemorySupport.h" #include <memory> diff --git a/arm_compute/graph/backends/BackendRegistry.h b/arm_compute/graph/backends/BackendRegistry.h index 163938b617..c9e84bdcca 100644 --- a/arm_compute/graph/backends/BackendRegistry.h +++ b/arm_compute/graph/backends/BackendRegistry.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018-2019 ARM Limited. + * Copyright (c) 2018-2020 ARM Limited. * * SPDX-License-Identifier: MIT * @@ -26,7 +26,7 @@ #include "arm_compute/graph/IDeviceBackend.h" #include "arm_compute/graph/Types.h" -#include "support/ToolchainSupport.h" +#include "support/MemorySupport.h" #include <map> #include <memory> diff --git a/arm_compute/runtime/Array.h b/arm_compute/runtime/Array.h index 743fc4b1ac..bbf23955d4 100644 --- a/arm_compute/runtime/Array.h +++ b/arm_compute/runtime/Array.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2019 ARM Limited. + * Copyright (c) 2016-2020 ARM Limited. * * SPDX-License-Identifier: MIT * @@ -26,7 +26,7 @@ #include "arm_compute/core/IArray.h" #include "arm_compute/core/Types.h" -#include "support/ToolchainSupport.h" +#include "support/MemorySupport.h" #include <memory> diff --git a/arm_compute/runtime/GLES_COMPUTE/GCRuntimeContext.h b/arm_compute/runtime/GLES_COMPUTE/GCRuntimeContext.h index bc465a8b99..1b7514ff34 100644 --- a/arm_compute/runtime/GLES_COMPUTE/GCRuntimeContext.h +++ b/arm_compute/runtime/GLES_COMPUTE/GCRuntimeContext.h @@ -43,12 +43,8 @@ public: ~GCRuntimeContext() = default; /** Prevent instances of this class from being copied (As this class contains pointers) */ GCRuntimeContext(const GCRuntimeContext &) = delete; - /** Default move constructor */ - GCRuntimeContext(GCRuntimeContext &&) = default; /** Prevent instances of this class from being copied (As this class contains pointers) */ GCRuntimeContext &operator=(const GCRuntimeContext &) = delete; - /** Default move assignment operator */ - GCRuntimeContext &operator=(GCRuntimeContext &&) = default; /** CPU Scheduler setter */ void set_gpu_scheduler(GCScheduler *scheduler); diff --git a/arm_compute/runtime/MemoryRegion.h b/arm_compute/runtime/MemoryRegion.h index 83e9245efa..1b645be4a2 100644 --- a/arm_compute/runtime/MemoryRegion.h +++ b/arm_compute/runtime/MemoryRegion.h @@ -27,7 +27,7 @@ #include "arm_compute/runtime/IMemoryRegion.h" #include "arm_compute/core/Error.h" -#include "support/ToolchainSupport.h" +#include "support/MemorySupport.h" #include <cstddef> |