diff options
author | steniu01 <steven.niu@arm.com> | 2017-07-11 09:22:58 +0100 |
---|---|---|
committer | Anthony Barbier <anthony.barbier@arm.com> | 2018-09-17 14:15:39 +0100 |
commit | 34702479adcf3559e8ebe27915179af509b070d2 (patch) | |
tree | 683b6d81396a6515281f0575f9761efc50d538e8 /src/core/CL/CLKernelLibrary.cpp | |
parent | bb4a79b1667eaf9bdb30853c595e6d22d2589f82 (diff) | |
download | ComputeLibrary-34702479adcf3559e8ebe27915179af509b070d2.tar.gz |
COMPMID-417 Checking CL non uniform support at runtime.
What have been done in the ticket are:
1. Add support to check whether cl-non-unform-workgroup is supported at
runtime
2. Add helper function to check the CL version at runtime
3. Add boolen to check whether CLSecheduler's init has been called.
Change-Id: I6e6df8eb5cebfac7229aa406242bb183477fd191
Reviewed-on: http://mpd-gerrit.cambridge.arm.com/80265
Tested-by: Kaizen <jeremy.johnson+kaizengerrit@arm.com>
Reviewed-by: Anthony Barbier <anthony.barbier@arm.com>
Diffstat (limited to 'src/core/CL/CLKernelLibrary.cpp')
-rw-r--r-- | src/core/CL/CLKernelLibrary.cpp | 23 |
1 files changed, 20 insertions, 3 deletions
diff --git a/src/core/CL/CLKernelLibrary.cpp b/src/core/CL/CLKernelLibrary.cpp index 72230435d8..769d50992d 100644 --- a/src/core/CL/CLKernelLibrary.cpp +++ b/src/core/CL/CLKernelLibrary.cpp @@ -23,6 +23,7 @@ */ #include "arm_compute/core/CL/CLKernelLibrary.h" +#include "arm_compute/core/CL/CLHelpers.h" #include "arm_compute/core/Error.h" #include "arm_compute/core/Utils.h" @@ -514,9 +515,25 @@ Kernel CLKernelLibrary::create_kernel(const std::string &kernel_name, const Stri ARM_COMPUTE_ERROR("Kernel %s not found in the CLKernelLibrary", kernel_name.c_str()); } + std::string concat_str; + + if(non_uniform_workgroup_support(_device)) + { + concat_str += " -cl-arm-non-uniform-work-group-size "; + } + else if(get_cl_version(_device) == CLVersion::CL20) + { + concat_str += " -cl-std=CL2.0 "; + } + else + { + ARM_COMPUTE_ERROR("Non uniform workgroup size is not supported!!"); + } + // Check if the program has been built before with same build options. - const std::string program_name = kernel_program_it->second; - const std::string build_options = stringify_set(build_options_set); + const std::string program_name = kernel_program_it->second; + const std::string build_options = stringify_set(build_options_set) + concat_str; + const std::string built_program_name = program_name + "_" + build_options; auto built_program_it = _built_programs_map.find(built_program_name); @@ -591,7 +608,7 @@ const Program &CLKernelLibrary::load_program(const std::string &program_name) co std::string CLKernelLibrary::stringify_set(const StringSet &s) const { - std::string concat_set = "-cl-arm-non-uniform-work-group-size "; + std::string concat_set; #ifndef EMBEDDED_KERNELS concat_set += "-I" + _kernel_path + " "; |