diff options
| author | Moritz Pflanzer <moritz.pflanzer@arm.com> | 2017-06-29 14:51:57 +0100 |
|---|---|---|
| committer | Anthony Barbier <anthony.barbier@arm.com> | 2018-09-17 14:15:39 +0100 |
| commit | d0ae8b8ac8a371fd552c46d4b3be3db8628a5ade (patch) | |
| tree | e4b035d01add61c37fcbeaf38a6a54e550235d8f /tests/benchmark | |
| parent | 5cb4c42cb5d781a44409ebc97a408e1379ce182d (diff) | |
| download | ComputeLibrary-d0ae8b8ac8a371fd552c46d4b3be3db8628a5ade.tar.gz | |
COMPMID-417: Extract common toolchain support file
The support file is needed as Android toolchains are missing some C++11
functions. It further includes functions that have been introduced in
C++14 but which we already need.
Eventually the support file might become unnecessary if the Android
compilers improve and we switch to C++14.
Change-Id: Ib5ec506f1a17c78149c315ab2096b901b852c180
Reviewed-on: http://mpd-gerrit.cambridge.arm.com/79247
Reviewed-by: Georgios Pinitas <georgios.pinitas@arm.com>
Tested-by: Kaizen <jeremy.johnson+kaizengerrit@arm.com>
Reviewed-by: Pablo Tello <pablo.tello@arm.com>
Diffstat (limited to 'tests/benchmark')
| -rw-r--r-- | tests/benchmark/PMUCounter.cpp | 3 | ||||
| -rw-r--r-- | tests/benchmark/WallClockTimer.cpp | 3 | ||||
| -rw-r--r-- | tests/benchmark/main.cpp | 5 |
3 files changed, 7 insertions, 4 deletions
diff --git a/tests/benchmark/PMUCounter.cpp b/tests/benchmark/PMUCounter.cpp index e87dae82e6..6d59dae65d 100644 --- a/tests/benchmark/PMUCounter.cpp +++ b/tests/benchmark/PMUCounter.cpp @@ -24,6 +24,7 @@ #include "PMUCounter.h" #include "Utils.h" +#include "support/ToolchainSupport.h" #define _GNU_SOURCE 1 #include <asm/unistd.h> @@ -89,7 +90,7 @@ void CycleCounter::stop() std::unique_ptr<Instrument::IMeasurement> CycleCounter::get_measurement() const { - return ::arm_compute::test::cpp14::make_unique<Instrument::Measurement<long long>>(_cycles); + return support::cpp14::make_unique<Instrument::Measurement<long long>>(_cycles); } InstructionCounter::InstructionCounter() diff --git a/tests/benchmark/WallClockTimer.cpp b/tests/benchmark/WallClockTimer.cpp index 9ab53d0b3c..717fe04b31 100644 --- a/tests/benchmark/WallClockTimer.cpp +++ b/tests/benchmark/WallClockTimer.cpp @@ -24,6 +24,7 @@ #include "WallClockTimer.h" #include "Utils.h" +#include "support/ToolchainSupport.h" namespace arm_compute { @@ -49,7 +50,7 @@ void WallClockTimer::stop() std::unique_ptr<Instrument::IMeasurement> WallClockTimer::get_measurement() const { const std::chrono::duration<float, std::milli> delta = _stop - _start; - return ::arm_compute::test::cpp14::make_unique<Instrument::Measurement<float>>(delta.count()); + return support::cpp14::make_unique<Instrument::Measurement<float>>(delta.count()); } } // namespace benchmark } // namespace test diff --git a/tests/benchmark/main.cpp b/tests/benchmark/main.cpp index 7ce6a26acd..1b6bafb3a1 100644 --- a/tests/benchmark/main.cpp +++ b/tests/benchmark/main.cpp @@ -30,6 +30,7 @@ #include "WallClockTimer.h" #include "benchmark/benchmark_api.h" +#include "support/ToolchainSupport.h" #ifdef OPENCL #include "arm_compute/runtime/CL/CLScheduler.h" @@ -78,11 +79,11 @@ int main(int argc, char **argv) if(user_config.seed.is_set()) { - library = cpp14::make_unique<TensorLibrary>(user_config.path.get(), user_config.seed); + library = arm_compute::support::cpp14::make_unique<TensorLibrary>(user_config.path.get(), user_config.seed); } else { - library = cpp14::make_unique<TensorLibrary>(user_config.path.get()); + library = arm_compute::support::cpp14::make_unique<TensorLibrary>(user_config.path.get()); } #ifdef OPENCL |