From d727e85363aa7666e3fceb6967b668a3ac8d146e Mon Sep 17 00:00:00 2001 From: Anthony Barbier Date: Fri, 20 Apr 2018 11:05:29 +0100 Subject: COMPMID-855: Get the library to work on non Mali GPUs Change-Id: Ia6a7b7a9d8b10ebf6b3c6a0fffa10bdf5dd8d8ef Reviewed-on: https://eu-gerrit-1.euhpc.arm.com/128381 Reviewed-by: Pablo Tello Tested-by: Jenkins Reviewed-by: Georgios Pinitas --- src/core/CL/CLHelpers.cpp | 8 ++++---- src/core/CL/CLKernelLibrary.cpp | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) (limited to 'src') diff --git a/src/core/CL/CLHelpers.cpp b/src/core/CL/CLHelpers.cpp index 71679bcdf0..9842d4d0ab 100644 --- a/src/core/CL/CLHelpers.cpp +++ b/src/core/CL/CLHelpers.cpp @@ -227,8 +227,8 @@ GPUTarget get_target_from_name(const std::string &device_name) } else { - ARM_COMPUTE_LOG_INFO_MSG_CORE("Mali GPU unknown. Target is set to the default one."); - return GPUTarget::UNKNOWN; + ARM_COMPUTE_LOG_INFO_MSG_CORE("Mali GPU unknown. Target is set to the default one. (BIFROST)"); + return GPUTarget::BIFROST; } } @@ -245,12 +245,12 @@ GPUTarget get_arch_from_target(GPUTarget target) return (target & GPUTarget::GPU_ARCH_MASK); } -bool non_uniform_workgroup_support(const cl::Device &device) +bool arm_non_uniform_workgroup_supported(const cl::Device &device) { return device_supports_extension(device, "cl_arm_non_uniform_work_group_size"); } -bool fp16_support(const cl::Device &device) +bool fp16_supported(const cl::Device &device) { return device_supports_extension(device, "cl_khr_fp16"); } diff --git a/src/core/CL/CLKernelLibrary.cpp b/src/core/CL/CLKernelLibrary.cpp index 59be956ad8..db0e51bb48 100644 --- a/src/core/CL/CLKernelLibrary.cpp +++ b/src/core/CL/CLKernelLibrary.cpp @@ -726,7 +726,7 @@ Kernel CLKernelLibrary::create_kernel(const std::string &kernel_name, const Stri } std::string concat_str; - if(fp16_support(_device)) + if(fp16_supported(_device)) { concat_str += " -DARM_COMPUTE_OPENCL_FP16_ENABLED=1 "; } @@ -735,7 +735,7 @@ Kernel CLKernelLibrary::create_kernel(const std::string &kernel_name, const Stri { concat_str += " -cl-std=CL2.0 "; } - else if(non_uniform_workgroup_support(_device)) + else if(arm_non_uniform_workgroup_supported(_device)) { concat_str += " -cl-arm-non-uniform-work-group-size "; } -- cgit v1.2.1