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 <pablo.tello@arm.com>
Tested-by: Jenkins <bsgcomp@arm.com>
Reviewed-by: Georgios Pinitas <georgios.pinitas@arm.com>

5 files changed, 10 insertions, 10 deletions

diff --git a/arm_compute/core/CL/CLHelpers.h b/arm_compute/core/CL/CLHelpers.h
index c7182656df..fe2d833148 100644
--- a/arm_compute/core/CL/CLHelpers.h
+++ b/arm_compute/core/CL/CLHelpers.h
@@ -150,14 +150,14 @@ bool device_supports_extension(const cl::Device &device, const char *extension_n
  *
  * @return True if the extension is supported
  */
-bool fp16_support(const cl::Device &device);
+bool fp16_supported(const cl::Device &device);
 /** Helper function to check whether the arm_non_uniform_work_group_size extension is supported
  *
  * @param[in] device A CL device
  *
  * @return True if the extension is supported
  */
-bool non_uniform_workgroup_support(const cl::Device &device);
+bool arm_non_uniform_workgroup_supported(const cl::Device &device);
 /** Helper function to check whether a gpu target is equal to the provided targets
  *
  * @param[in] target_to_check gpu target to check
diff --git a/arm_compute/core/CL/CLTypes.h b/arm_compute/core/CL/CLTypes.h
index 14c31fa396..ca487814a7 100644
--- a/arm_compute/core/CL/CLTypes.h
+++ b/arm_compute/core/CL/CLTypes.h
@@ -34,7 +34,7 @@ static const std::string default_config_id = "no_config_id";
 /** Available GPU Targets */
 enum class GPUTarget
 {
-    UNKNOWN       = 0x000,
+    UNKNOWN       = 0x101,
     GPU_ARCH_MASK = 0xF00,
     MIDGARD       = 0x100,
     BIFROST       = 0x200,
diff --git a/arm_compute/core/CL/ICLKernel.h b/arm_compute/core/CL/ICLKernel.h
index e6700cd61e..2d7081956b 100644
--- a/arm_compute/core/CL/ICLKernel.h
+++ b/arm_compute/core/CL/ICLKernel.h
@@ -193,7 +193,7 @@ public:
      *
      * @param[in] lws_hint Local-Workgroup-Size to use
      */
-    void set_lws_hint(cl::NDRange &lws_hint)
+    void set_lws_hint(const cl::NDRange &lws_hint)
     {
         _lws_hint = lws_hint;
     }
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 ";
     }