diff options
| -rw-r--r-- | arm_compute/core/CPP/CPPTypes.h | 51 | ||||
| -rw-r--r-- | arm_compute/core/CPP/ICPPKernel.h | 13 | ||||
| -rw-r--r-- | arm_compute/runtime/CPP/CPPScheduler.h | 15 | ||||
| -rw-r--r-- | src/runtime/CPP/CPPScheduler.cpp | 23 |
4 files changed, 96 insertions, 6 deletions
diff --git a/arm_compute/core/CPP/CPPTypes.h b/arm_compute/core/CPP/CPPTypes.h new file mode 100644 index 0000000000..4e156ea78e --- /dev/null +++ b/arm_compute/core/CPP/CPPTypes.h @@ -0,0 +1,51 @@ +/* + * Copyright (c) 2017 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_CPP_TYPES_H__ +#define __ARM_COMPUTE_CPP_TYPES_H__ + +namespace arm_compute +{ +/** Available CPU Targets */ +enum class CPUTarget +{ + ARCH_MASK = 0x0F00, + CPU_MODEL = 0x00FF, + INTRINSICS = 0x0100, + ARMV7 = 0x0200, + ARMV8 = 0x0300, + ARMV8_2 = 0x0400, + A7x = 0x0070, + A5x = 0x0050, + DOT = 0x1000, + + A53 = (ARMV8 | A7x | 0x3), + A55 = (ARMV8_2 | A5x | 0x5), + A55_DOT = (A55 | DOT), + A72 = (ARMV8 | A7x | 0x2), + A73 = (ARMV8 | A7x | 0x3), + A75 = (ARMV8_2 | A7x | 0x5), + A75_DOT = (A75 | DOT), +}; +} +#endif /* __ARM_COMPUTE_CPP_TYPES_H__ */ diff --git a/arm_compute/core/CPP/ICPPKernel.h b/arm_compute/core/CPP/ICPPKernel.h index 99ae68f2e5..9684408987 100644 --- a/arm_compute/core/CPP/ICPPKernel.h +++ b/arm_compute/core/CPP/ICPPKernel.h @@ -24,6 +24,7 @@ #ifndef __ARM_COMPUTE_ICPPKERNEL_H__ #define __ARM_COMPUTE_ICPPKERNEL_H__ +#include "arm_compute/core/CPP/CPPTypes.h" #include "arm_compute/core/IKernel.h" namespace arm_compute @@ -48,6 +49,18 @@ public: * @param[in] window Region on which to execute the kernel. (Must be a region of the window returned by window()) */ virtual void run(const Window &window) = 0; + + /** Sets the target CPU architecture. + * + * @param[in] target CPU target. + */ + void set_target(CPUTarget target) + { + _target = target; + } + +protected: + CPUTarget _target{ CPUTarget::INTRINSICS }; }; } #endif /*__ARM_COMPUTE_ICPPKERNEL_H__ */ diff --git a/arm_compute/runtime/CPP/CPPScheduler.h b/arm_compute/runtime/CPP/CPPScheduler.h index 7a37e5ec21..341537a390 100644 --- a/arm_compute/runtime/CPP/CPPScheduler.h +++ b/arm_compute/runtime/CPP/CPPScheduler.h @@ -24,6 +24,7 @@ #ifndef __ARM_COMPUTE_CPPSCHEDULER_H__ #define __ARM_COMPUTE_CPPSCHEDULER_H__ +#include "arm_compute/core/CPP/CPPTypes.h" #include "arm_compute/runtime/IScheduler.h" #include <memory> @@ -46,6 +47,19 @@ public: * @return Number of threads available in CPPScheduler. */ unsigned int num_threads() const override; + + /** Sets the target CPU architecture. + * + * @param[in] target Target CPU. + */ + void set_target(CPUTarget target); + + /** Return the current CPU target. + * + * @return Target CPU. + */ + CPUTarget target() const; + /** Access the scheduler singleton * * @return The scheduler @@ -68,6 +82,7 @@ private: unsigned int _num_threads; std::unique_ptr<Thread[], void (*)(Thread *)> _threads; + CPUTarget _target; }; } #endif /* __ARM_COMPUTE_CPPSCHEDULER_H__ */ diff --git a/src/runtime/CPP/CPPScheduler.cpp b/src/runtime/CPP/CPPScheduler.cpp index 886933074d..2a321a1101 100644 --- a/src/runtime/CPP/CPPScheduler.cpp +++ b/src/runtime/CPP/CPPScheduler.cpp @@ -161,14 +161,10 @@ CPPScheduler &CPPScheduler::get() return scheduler; } -unsigned int CPPScheduler::num_threads() const -{ - return _num_threads; -} - CPPScheduler::CPPScheduler() : _num_threads(std::thread::hardware_concurrency()), - _threads(std::unique_ptr<Thread[], void(*)(Thread *)>(new Thread[std::thread::hardware_concurrency() - 1], delete_threads)) + _threads(std::unique_ptr<Thread[], void(*)(Thread *)>(new Thread[std::thread::hardware_concurrency() - 1], delete_threads)), + _target(CPUTarget::INTRINSICS) { } @@ -178,6 +174,21 @@ void CPPScheduler::set_num_threads(unsigned int num_threads) _num_threads = num_threads == 0 ? num_cores : num_threads; } +unsigned int CPPScheduler::num_threads() const +{ + return _num_threads; +} + +void CPPScheduler::set_target(CPUTarget target) +{ + _target = target; +} + +CPUTarget CPPScheduler::target() const +{ + return _target; +} + void CPPScheduler::schedule(ICPPKernel *kernel, unsigned int split_dimension) { ARM_COMPUTE_ERROR_ON_MSG(!kernel, "The child class didn't set the kernel"); |