From db8485ac24135f17e9882c76196924435abc064f Mon Sep 17 00:00:00 2001 From: Pablo Tello Date: Tue, 24 Sep 2019 11:03:47 +0100 Subject: 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 Reviewed-on: https://review.mlplatform.org/c/1998 Tested-by: Arm Jenkins Reviewed-by: Georgios Pinitas Comments-Addressed: Arm Jenkins --- tests/framework/Framework.cpp | 28 ++++++++++++++++++++-------- 1 file changed, 20 insertions(+), 8 deletions(-) (limited to 'tests/framework/Framework.cpp') 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 @@ -38,6 +42,8 @@ namespace arm_compute { namespace test { +std::unique_ptr parameters; + namespace framework { std::unique_ptr 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(nullptr); - auto queue_properties = CLScheduler::get().queue().getInfo(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(); + 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; -- cgit v1.2.1