diff options
| author | Pablo Tello <pablo.tello@arm.com> | 2019-01-22 12:59:26 +0000 |
|---|---|---|
| committer | Pablo Marquez <pablo.tello@arm.com> | 2019-02-01 17:01:34 +0000 |
| commit | b7c308a1ad32af4198dcc7eaa73f44fef27dc8fc (patch) | |
| tree | 91e72925dcdaa8354be1b4a7e9cf2c0b16a43934 /tests | |
| parent | f8b652052960e19d2d2d858600780b594d108cc8 (diff) | |
| download | ComputeLibrary-b7c308a1ad32af4198dcc7eaa73f44fef27dc8fc.tar.gz | |
COMPMID-1887: Fixed segfault in validation tests.
Added the option to initialise the CLScheduler with an external
cl::Context. This allows more control over the order of destruction
of the static members which caused the suite to segfault.
Change-Id: I0a90f12cc39daf1fd5ab842a5584986785694b35
Reviewed-on: https://review.mlplatform.org/550
Tested-by: Arm Jenkins <bsgcomp@arm.com>
Reviewed-by: Giuseppe Rossini <giuseppe.rossini@arm.com>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/benchmark_examples/RunExample.cpp | 17 | ||||
| -rw-r--r-- | tests/main.cpp | 11 |
2 files changed, 20 insertions, 8 deletions
diff --git a/tests/benchmark_examples/RunExample.cpp b/tests/benchmark_examples/RunExample.cpp index 9bc0e4380a..a7a8be01cc 100644 --- a/tests/benchmark_examples/RunExample.cpp +++ b/tests/benchmark_examples/RunExample.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018 ARM Limited. + * Copyright (c) 2018-2019 ARM Limited. * * SPDX-License-Identifier: MIT * @@ -35,6 +35,7 @@ #include "utils/command_line/CommandLineParser.h" #ifdef ARM_COMPUTE_CL +#include "arm_compute/runtime/CL/CLHelpers.h" #include "arm_compute/runtime/CL/CLScheduler.h" #endif /* ARM_COMPUTE_CL */ #ifdef ARM_COMPUTE_GC @@ -126,6 +127,16 @@ int run_example(int argc, char **argv, std::unique_ptr<Example> example) } } +#ifdef ARM_COMPUTE_CL + if(opencl_is_available()) + { + 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)); + } +#endif /* ARM_COMPUTE_CL */ + if(options.log_level->value() >= framework::LogLevel::CONFIG) { for(auto &p : printers) @@ -135,10 +146,6 @@ int run_example(int argc, char **argv, std::unique_ptr<Example> example) #ifdef ARM_COMPUTE_CL if(opencl_is_available()) { - if(!CLScheduler::get().is_initialised()) - { - CLScheduler::get().default_init(); - } p->print_entry("CL_DEVICE_VERSION", CLKernelLibrary::get().get_device_version()); } else diff --git a/tests/main.cpp b/tests/main.cpp index 617faaf5a9..b02c9f87e5 100644 --- a/tests/main.cpp +++ b/tests/main.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017-2018 ARM Limited. + * Copyright (c) 2017-2019 ARM Limited. * * SPDX-License-Identifier: MIT * @@ -35,8 +35,11 @@ #include "utils/command_line/CommandLineParser.h" #ifdef ARM_COMPUTE_CL +#include "arm_compute/core/CL/OpenCL.h" +#include "arm_compute/runtime/CL/CLHelpers.h" #include "arm_compute/runtime/CL/CLScheduler.h" #include "arm_compute/runtime/CL/CLTuner.h" + #endif /* ARM_COMPUTE_CL */ #ifdef ARM_COMPUTE_GC #include "arm_compute/runtime/GLES_COMPUTE/GCScheduler.h" @@ -90,7 +93,10 @@ int main(int argc, char **argv) CLTuner cl_tuner(false); if(opencl_is_available()) { - CLScheduler::get().default_init(&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); } #endif /* ARM_COMPUTE_CL */ @@ -287,6 +293,5 @@ int main(int argc, char **argv) return 1; } - return 0; } |