From 08302c17cd57356b35d46e17dc8d8f76672da5cf Mon Sep 17 00:00:00 2001 From: Georgios Pinitas Date: Wed, 9 Jun 2021 10:08:27 +0100 Subject: Add CPU discovery capabilities. Resolves: COMPMID-4500 Signed-off-by: Georgios Pinitas Change-Id: I008c51934ef813fb1f489b531288c4419e701955 Reviewed-on: https://review.mlplatform.org/c/ml/ComputeLibrary/+/5799 Reviewed-by: Michele Di Giorgio Tested-by: Arm Jenkins Comments-Addressed: Arm Jenkins --- arm_compute/core/CPP/CPPTypes.h | 169 ++++++--------------------------- arm_compute/runtime/DeviceProperties.h | 41 -------- arm_compute/runtime/IRuntimeContext.h | 8 +- arm_compute/runtime/IScheduler.h | 9 +- arm_compute/runtime/RuntimeContext.h | 9 +- 5 files changed, 36 insertions(+), 200 deletions(-) delete mode 100644 arm_compute/runtime/DeviceProperties.h (limited to 'arm_compute') diff --git a/arm_compute/core/CPP/CPPTypes.h b/arm_compute/core/CPP/CPPTypes.h index bc4464e7c9..11891937d1 100644 --- a/arm_compute/core/CPP/CPPTypes.h +++ b/arm_compute/core/CPP/CPPTypes.h @@ -26,103 +26,40 @@ #include "arm_compute/core/Error.h" -#include -#include -#include +#include namespace arm_compute { -/** CPU models - we only need to detect CPUs we have - * microarchitecture-specific code for. +#define ARM_COMPUTE_CPU_MODEL_LIST \ + X(GENERIC) \ + X(GENERIC_FP16) \ + X(GENERIC_FP16_DOT) \ + X(A35) \ + X(A53) \ + X(A55r0) \ + X(A55r1) \ + X(A73) \ + X(KLEIN) \ + X(X1) + +/** CPU models types * - * Architecture features are detected via HWCAPs. + * @note We only need to detect CPUs we have microarchitecture-specific code for. + * @note Architecture features are detected via HWCAPs. */ enum class CPUModel { - GENERIC, - GENERIC_FP16, - GENERIC_FP16_DOT, - A35, - A53, - A55r0, - A55r1, - KLEIN, - X1, - A73 +#define X(model) model, + ARM_COMPUTE_CPU_MODEL_LIST +#undef X }; -/** Global memory policy. - * The functions in the runtime will use different strategies based on the policy currently set. - * - * MINIMIZE will try to reduce the amount allocated by the functions at the expense of performance normally. - * NORMAL won't try to save any memory and will favor speed over memory consumption - * - */ -enum class MemoryPolicy -{ - MINIMIZE, - NORMAL -}; - -/** Convert a cpumodel value to a string - * - * @param val CPUModel value to be converted - * - * @return String representing the corresponding CPUModel. - */ -inline std::string cpu_model_to_string(CPUModel val) -{ - switch(val) - { - case CPUModel::GENERIC: - { - return std::string("GENERIC"); - } - case CPUModel::KLEIN: - { - return std::string("KLEIN"); - } - case CPUModel::GENERIC_FP16: - { - return std::string("GENERIC_FP16"); - } - case CPUModel::GENERIC_FP16_DOT: - { - return std::string("GENERIC_FP16_DOT"); - } - case CPUModel::A53: - { - return std::string("A53"); - } - case CPUModel::A55r0: - { - return std::string("A55r0"); - } - case CPUModel::A55r1: - { - return std::string("A55r1"); - } - case CPUModel::X1: - { - return std::string("X1"); - } - case CPUModel::A73: - { - return std::string("A73"); - } - default: - { - ARM_COMPUTE_ERROR("Invalid CPUModel."); - return std::string("GENERIC"); - } - } -} - class CPUInfo final { public: /** Constructor */ CPUInfo(); + ~CPUInfo(); /** Disable copy constructor and assignment operator to avoid copying the vector of CPUs each time * CPUInfo is initialized once in the IScheduler and ThreadInfo will get a pointer to it. @@ -137,6 +74,11 @@ public: * @return true of the cpu supports fp16, false otherwise */ bool has_fp16() const; + /** Checks if the cpu model supports bf16. + * + * @return true of the cpu supports bf16, false otherwise + */ + bool has_bf16() const; /** Checks if the cpu model supports dot product. * * @return true of the cpu supports dot product, false otherwise @@ -169,16 +111,6 @@ public: * @return the size of the L1 cache */ unsigned int get_L2_cache_size() const; - /** Set the L1 cache size - * - * @param[in] size the new size to be set. - */ - void set_L1_cache_size(unsigned int size); - /** Set the L2 cache size - * - * @param[in] size the new size to be set. - */ - void set_L2_cache_size(unsigned int size); /** Set fp16 support * * @param[in] fp16 whether the cpu supports fp16. @@ -189,22 +121,6 @@ public: * @param[in] dotprod whether the cpu supports dot product. */ void set_dotprod(const bool dotprod); - /** Set sve support - * - * @param[in] sve whether the cpu supports sve. - */ - void set_sve(const bool sve); - /** Set the cpumodel for a given cpu core - * - * @param[in] cpuid the id of the core to be set. - * @param[in] model the @ref CPUModel to be set. - */ - void set_cpu_model(unsigned int cpuid, CPUModel model); - /** Set max number of cpus - * - * @param[in] cpu_count the number of CPUs in the system. - */ - void set_cpu_num(unsigned int cpu_count); /** Return the maximum number of CPUs present * @@ -213,39 +129,8 @@ public: unsigned int get_cpu_num() const; private: - std::vector _percpu = {}; - bool _fp16 = false; - bool _dotprod = false; - bool _sve = false; - unsigned int _L1_cache_size = 32768; - unsigned int _L2_cache_size = 262144; -}; - -class MEMInfo final -{ -public: - MEMInfo(); - - /** Return the total amount of RAM memory in the system expressed in KB. - * - * @return Total memory - */ - size_t get_total_in_kb() const; - - static void set_policy(MemoryPolicy policy); - static MemoryPolicy get_policy(); - - /** Common memory sizes expressed in Kb to avoid having them - * duplicated throughout the code. - */ - static const size_t ONE_GB_IN_KB = { 1035842 }; - static const size_t TWO_GB_IN_KB = { ONE_GB_IN_KB * 2 }; - -private: - size_t _total; - size_t _free; - size_t _buffer; - static MemoryPolicy _policy; + struct Impl; + std::unique_ptr _impl; }; /** Information about executing thread and CPU. */ diff --git a/arm_compute/runtime/DeviceProperties.h b/arm_compute/runtime/DeviceProperties.h deleted file mode 100644 index 807b53eae4..0000000000 --- a/arm_compute/runtime/DeviceProperties.h +++ /dev/null @@ -1,41 +0,0 @@ -/* - * Copyright (c) 2019 Arm Limited. - * - * SPDX-License-Identifier: MIT - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to - * deal in the Software without restriction, including without limitation the - * rights to use, copy, modify, merge, publish, distribute, sublicense, and/or - * sell copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - */ -#ifndef ARM_COMPUTE_DEVICE_PROPERTIES_H -#define ARM_COMPUTE_DEVICE_PROPERTIES_H - -#include "arm_compute/core/CPP/CPPTypes.h" - -namespace arm_compute -{ -/** Device properties */ -struct DeviceProperties -{ - std::string name{ "unknown" }; - CPUInfo cpu_info{}; // initialised upon creating in the constructor - - DeviceProperties(); -}; - -} // namespace arm_compute -#endif /*ARM_COMPUTE_DEVICE_PROPERTIES_H */ diff --git a/arm_compute/runtime/IRuntimeContext.h b/arm_compute/runtime/IRuntimeContext.h index 4751fc2ddc..8e61cfb8a8 100644 --- a/arm_compute/runtime/IRuntimeContext.h +++ b/arm_compute/runtime/IRuntimeContext.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019 Arm Limited. + * Copyright (c) 2019, 2021 Arm Limited. * * SPDX-License-Identifier: MIT * @@ -29,7 +29,6 @@ namespace arm_compute // Forward declarations class IScheduler; class IAssetManager; -struct DeviceProperties; /** Context interface */ class IRuntimeContext @@ -51,11 +50,6 @@ public: * @return The asset manager registered to the context */ virtual IAssetManager *asset_manager() = 0; - /** Device propertied accessor - * - * @return Device properties - */ - virtual const DeviceProperties &properties() = 0; }; } // namespace arm_compute #endif /*ARM_COMPUTE_IRUNTIME_CONTEXT_H */ diff --git a/arm_compute/runtime/IScheduler.h b/arm_compute/runtime/IScheduler.h index d3ba86a67b..417c62cc9c 100644 --- a/arm_compute/runtime/IScheduler.h +++ b/arm_compute/runtime/IScheduler.h @@ -127,9 +127,9 @@ public: } private: - unsigned int _split_dimension; - StrategyHint _strategy; - int _threshold; + unsigned int _split_dimension{}; + StrategyHint _strategy{}; + int _threshold{}; }; /** Signature for the workloads to execute */ using Workload = std::function; @@ -205,7 +205,6 @@ protected: * @param[in] workloads Array of workloads to run */ virtual void run_workloads(std::vector &workloads) = 0; - CPUInfo _cpu_info; /** Common scheduler logic to execute the given kernel * @@ -216,6 +215,8 @@ protected: */ void schedule_common(ICPPKernel *kernel, const Hints &hints, const Window &window, ITensorPack &tensors); + CPUInfo _cpu_info{}; + private: unsigned int _num_threads_hint = {}; }; diff --git a/arm_compute/runtime/RuntimeContext.h b/arm_compute/runtime/RuntimeContext.h index 31e2d6939a..23bd267375 100644 --- a/arm_compute/runtime/RuntimeContext.h +++ b/arm_compute/runtime/RuntimeContext.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019 Arm Limited. + * Copyright (c) 2019, 2021 Arm Limited. * * SPDX-License-Identifier: MIT * @@ -24,7 +24,6 @@ #ifndef ARM_COMPUTE_RUNTIME_CONTEXT_H #define ARM_COMPUTE_RUNTIME_CONTEXT_H -#include "arm_compute/runtime/DeviceProperties.h" #include "arm_compute/runtime/IRuntimeContext.h" #include @@ -51,14 +50,12 @@ public: void set_scheduler(IScheduler *scheduler); // Inherited overridden methods - IScheduler *scheduler() override; - IAssetManager *asset_manager() override; - const DeviceProperties &properties() override; + IScheduler *scheduler() override; + IAssetManager *asset_manager() override; private: std::unique_ptr _owned_scheduler{ nullptr }; IScheduler *_scheduler{ nullptr }; - DeviceProperties _device_props{}; }; } // namespace arm_compute #endif /*ARM_COMPUTE_RUNTIME_CONTEXT_H */ -- cgit v1.2.1