diff options
| author | Georgios Pinitas <georgios.pinitas@arm.com> | 2019-11-18 14:25:45 +0000 |
|---|---|---|
| committer | Georgios Pinitas <georgios.pinitas@arm.com> | 2019-11-20 14:52:40 +0000 |
| commit | c9f163bd3cb21cf18d28d00670803969f2745b75 (patch) | |
| tree | c81993764d438e06f0e743942c70b25df9c74ef7 | |
| parent | 6011f2444eacd8e549c74bdbb10e1c3cd2b29e77 (diff) | |
| download | ComputeLibrary-c9f163bd3cb21cf18d28d00670803969f2745b75.tar.gz | |
COMPMID-2929: Resolve segfault at end of benchmark suite execution.
Disable usage of RuntimeContext for CL in the test and benchmark suite
as ordering of construction/destruction has been altered causing issues.
Change-Id: I86702350fdabeb6d3a9547c405ee82358255d574
Signed-off-by: Georgios Pinitas <georgios.pinitas@arm.com>
Reviewed-on: https://review.mlplatform.org/c/2314
Tested-by: Arm Jenkins <bsgcomp@arm.com>
Reviewed-by: Giuseppe Rossini <giuseppe.rossini@arm.com>
Comments-Addressed: Arm Jenkins <bsgcomp@arm.com>
| -rw-r--r-- | tests/framework/Framework.cpp | 21 | ||||
| -rw-r--r-- | tests/main.cpp | 16 |
2 files changed, 13 insertions, 24 deletions
diff --git a/tests/framework/Framework.cpp b/tests/framework/Framework.cpp index 0b2ded8a3c..44887a9125 100644 --- a/tests/framework/Framework.cpp +++ b/tests/framework/Framework.cpp @@ -564,20 +564,15 @@ 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(); - 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_cl_ctx(std::move(cl_ctx)); - } + CLScheduler::get().set_context(new_ctx); + CLScheduler::get().set_queue(new_queue); } #endif // ARM_COMPUTE_CL diff --git a/tests/main.cpp b/tests/main.cpp index 5757249188..604a51fc0f 100644 --- a/tests/main.cpp +++ b/tests/main.cpp @@ -185,18 +185,12 @@ int main(int argc, char **argv) #ifdef ARM_COMPUTE_CL CLTuner cl_tuner(false); - // Create GPU context - auto cl_ctx = support::cpp14::make_unique<CLRuntimeContext>(); - assert(cl_ctx != nullptr); - CLScheduler *gpu_scheduler = cl_ctx->gpu_scheduler(); - assert(gpu_scheduler != nullptr); - const auto device_version = cl_ctx->kernel_library().get_device_version(); + if(opencl_is_available()) { - // 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(), &cl_tuner); + auto ctx_dev_err = create_opencl_context_and_device(); + ARM_COMPUTE_ERROR_ON_MSG(std::get<2>(ctx_dev_err) != CL_SUCCESS, "Failed to create OpenCL context"); + CLScheduler::get().default_init_with_context(std::get<1>(ctx_dev_err), std::get<0>(ctx_dev_err), &cl_tuner); } - parameters->set_cl_ctx(std::move(cl_ctx)); if(enable_tuner->is_set()) { @@ -235,7 +229,7 @@ int main(int argc, char **argv) #ifdef ARM_COMPUTE_CL if(opencl_is_available()) { - p->print_entry("CL_DEVICE_VERSION", device_version); + p->print_entry("CL_DEVICE_VERSION", CLKernelLibrary::get().get_device_version()); } else { |