diff options
author | Pablo Tello <pablo.tello@arm.com> | 2019-09-24 11:03:47 +0100 |
---|---|---|
committer | Pablo Marquez <pablo.tello@arm.com> | 2019-10-15 14:05:55 +0000 |
commit | db8485ac24135f17e9882c76196924435abc064f (patch) | |
tree | dfe4ff6a50012ac93c6b1cf3fb29c099a7592522 /tests/framework | |
parent | a046e164b96a8441b2fa14ef578f7db46a0e97da (diff) | |
download | ComputeLibrary-db8485ac24135f17e9882c76196924435abc064f.tar.gz |
COMPMID-2205: CL runtime context.
CL Interfaces implemented.
Concrete classes implemented.
One test (ActivationLayer) ported to the new interface.
Change-Id: I283808bec36ccfc2f13fe048c45cbbee698ce525
Signed-off-by: Pablo Tello <pablo.tello@arm.com>
Reviewed-on: https://review.mlplatform.org/c/1998
Tested-by: Arm Jenkins <bsgcomp@arm.com>
Reviewed-by: Georgios Pinitas <georgios.pinitas@arm.com>
Comments-Addressed: Arm Jenkins <bsgcomp@arm.com>
Diffstat (limited to 'tests/framework')
-rw-r--r-- | tests/framework/Framework.cpp | 28 | ||||
-rw-r--r-- | tests/framework/ParametersLibrary.cpp | 54 | ||||
-rw-r--r-- | tests/framework/ParametersLibrary.h | 105 |
3 files changed, 179 insertions, 8 deletions
diff --git a/tests/framework/Framework.cpp b/tests/framework/Framework.cpp index fbc2456047..5d1600e083 100644 --- a/tests/framework/Framework.cpp +++ b/tests/framework/Framework.cpp @@ -25,8 +25,12 @@ #include "arm_compute/runtime/Scheduler.h" #include "support/ToolchainSupport.h" +#include "tests/framework/ParametersLibrary.h" + #ifdef ARM_COMPUTE_CL +#include "arm_compute/runtime/CL/CLRuntimeContext.h" #include "arm_compute/runtime/CL/CLScheduler.h" + #endif /* ARM_COMPUTE_CL */ #include <chrono> @@ -38,6 +42,8 @@ namespace arm_compute { namespace test { +std::unique_ptr<ParametersLibrary> parameters; + namespace framework { std::unique_ptr<InstrumentsInfo> instruments_info; @@ -558,17 +564,23 @@ bool Framework::run() // Every 100 tests, reset the OpenCL context to release the allocated memory if(opencl_is_available() && (id_run_test % 100) == 0) { - auto ctx_properties = CLScheduler::get().context().getInfo<CL_CONTEXT_PROPERTIES>(nullptr); - auto queue_properties = CLScheduler::get().queue().getInfo<CL_QUEUE_PROPERTIES>(nullptr); - - cl::Context new_ctx = cl::Context(CL_DEVICE_TYPE_DEFAULT, ctx_properties.data()); - cl::CommandQueue new_queue = cl::CommandQueue(new_ctx, CLKernelLibrary::get().get_device(), queue_properties); - CLKernelLibrary::get().clear_programs_cache(); - CLScheduler::get().set_context(new_ctx); - CLScheduler::get().set_queue(new_queue); + auto cl_ctx = support::cpp14::make_unique<CLRuntimeContext>(); + assert(cl_ctx != nullptr); + CLScheduler *gpu_scheduler = cl_ctx->gpu_scheduler(); + assert(gpu_scheduler != nullptr); + { + // Legacy singletons API: This has been deprecated and the singletons will be removed + // Setup singleton for backward compatibility + CLScheduler::get().init(gpu_scheduler->context(), gpu_scheduler->queue(), cl_ctx->kernel_library().get_device()); + } + if(parameters) + { + parameters->set_gpu_ctx(std::move(cl_ctx)); + } } #endif // ARM_COMPUTE_CL + run_test(test_info, *test_factory); ++id_run_test; diff --git a/tests/framework/ParametersLibrary.cpp b/tests/framework/ParametersLibrary.cpp new file mode 100644 index 0000000000..65a09eeb64 --- /dev/null +++ b/tests/framework/ParametersLibrary.cpp @@ -0,0 +1,54 @@ +/* + * 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. + */ +#include "tests/framework/ParametersLibrary.h" + +namespace arm_compute +{ +namespace test +{ +void ParametersLibrary::set_cpu_ctx(std::unique_ptr<IRuntimeContext> cpu_ctx) +{ + _cpu_ctx = std::move(cpu_ctx); +} + +void ParametersLibrary::set_gpu_ctx(std::unique_ptr<IRuntimeContext> gpu_ctx) +{ + _gpu_ctx = std::move(gpu_ctx); +} + +template <> +typename ContextType<Tensor>::type *ParametersLibrary::get_ctx<Tensor>() +{ + return _cpu_ctx.get(); +} + +#if ARM_COMPUTE_CL +template <> +typename ContextType<CLTensor>::type *ParametersLibrary::get_ctx<CLTensor>() +{ + return static_cast<typename ContextType<CLTensor>::type *>(_gpu_ctx.get()); +} +#endif /* ARM_COMPUTE_CL */ +} // namespace test +} // namespace arm_compute diff --git a/tests/framework/ParametersLibrary.h b/tests/framework/ParametersLibrary.h new file mode 100644 index 0000000000..4079ab25b9 --- /dev/null +++ b/tests/framework/ParametersLibrary.h @@ -0,0 +1,105 @@ +/* + * 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_TEST_PARAMETERS_LIBRARY_H__ +#define __ARM_COMPUTE_TEST_PARAMETERS_LIBRARY_H__ + +#include "arm_compute/runtime/IRuntimeContext.h" +#include "arm_compute/runtime/Tensor.h" +#if ARM_COMPUTE_CL +#include "arm_compute/runtime/CL/CLRuntimeContext.h" +#include "arm_compute/runtime/CL/CLTensor.h" +#endif /* ARM_COMPUTE_CL */ +#ifdef ARM_COMPUTE_GC +#include "arm_compute/runtime/GLES_COMPUTE/GCTensor.h" +#endif /* ARM_COMPUTE_GC */ + +#include <memory> + +namespace arm_compute +{ +namespace test +{ +// Return type trait helper +template <class T> +struct ContextType +{ + using type = void; +}; +template <> +struct ContextType<Tensor> +{ + using type = IRuntimeContext; +}; + +#if ARM_COMPUTE_CL +template <> +struct ContextType<CLTensor> +{ + using type = CLRuntimeContext; +}; +#endif /* ARM_COMPUTE_CL */ + +#ifdef ARM_COMPUTE_GC +template <> +struct ContextType<GCTensor> +{ + using type = IRuntimeContext; +}; +#endif /* ARM_COMPUTE_GC */ + +/** Class that contains all the global parameters used by the tests */ +class ParametersLibrary final +{ +public: + /** Default constructor */ + ParametersLibrary() = default; + /** Set cpu context to be used by the tests + * + * @param[in] cpu_ctx CPU context to use + */ + void set_cpu_ctx(std::unique_ptr<IRuntimeContext> cpu_ctx); + /** Set gpu context to be used by the tests + * + * @param[in] gpu_ctx GPU context to use + */ + void set_gpu_ctx(std::unique_ptr<IRuntimeContext> gpu_ctx); + /** Get context given a tensor type + * + * @tparam TensorType + * + * @return Pointer to the context + */ + template <typename TensorType> + typename ContextType<TensorType>::type *get_ctx() + { + return nullptr; + } + +private: + std::unique_ptr<IRuntimeContext> _cpu_ctx{ nullptr }; + std::unique_ptr<IRuntimeContext> _gpu_ctx{ nullptr }; +}; +} // namespace test +} // namespace arm_compute +#endif //__ARM_COMPUTE_TEST_PARAMETERS_LIBRARY_H__ |