From e4cf3190b70c3aa7e842c4b5d2e59a1d30c71985 Mon Sep 17 00:00:00 2001
From: Stuart Brady <stuart.brady@arm.com>
Date: Wed, 3 Jul 2019 19:32:49 +0100
Subject: [PATCH] Refactor is_extension_available()

This change splits up is_extension_available() so that the bulk of it
can be reused for fetching other items of variable-length device
information, such as CL_DEVICE_VERSION.
---
 test_common/harness/kernelHelpers.c | 62 +++++++++++++++++++----------
 1 file changed, 42 insertions(+), 20 deletions(-)

diff --git a/test_common/harness/kernelHelpers.c b/test_common/harness/kernelHelpers.c
index 5521ab69..16ebb28d 100644
--- a/test_common/harness/kernelHelpers.c
+++ b/test_common/harness/kernelHelpers.c
@@ -881,42 +881,64 @@ int get_max_common_3D_work_group_size( cl_context context, cl_kernel kernel,
     return 0;
 }
 
-/* Helper to determine if an extension is supported by a device */
-int is_extension_available( cl_device_id device, const char *extensionName )
+/* Helper to allocate and return a buffer containing device information for the specified device info parameter */
+static void *alloc_and_get_device_info( cl_device_id device, cl_device_info param_name, const char *param_description )
 {
-    char *extString;
+    void *buffer;
     size_t size = 0;
     int err;
-    int result = 0;
 
-    if(( err = clGetDeviceInfo(device, CL_DEVICE_EXTENSIONS, 0, NULL, &size) ))
+    if(( err = clGetDeviceInfo(device, param_name, 0, NULL, &size) ))
     {
-        log_error( "Error: failed to determine size of device extensions string at %s:%d (err = %d)\n", __FILE__, __LINE__, err );
-        return 0;
+        log_error( "Error: failed to determine size of device %s at %s:%d (err = %d)\n",
+                   param_description, __FILE__, __LINE__, err );
+        return NULL;
     }
 
     if( 0 == size )
-        return 0;
+        return NULL;
 
-    extString = (char*) malloc( size );
+    buffer = malloc( size );
+
+    if( NULL == buffer )
+    {
+        log_error( "Error: unable to allocate %zu byte buffer for device %s at %s:%d (err = %d)\n",
+                   size, param_description, __FILE__, __LINE__,  err );
+        return NULL;
+    }
+
+    if(( err = clGetDeviceInfo(device, param_name, size, buffer, NULL) ))
+    {
+        free(buffer);
+        log_error( "Error: failed to obtain device %s at %s:%d (err = %d)\n",
+                   param_description, __FILE__, __LINE__, err );
+        return NULL;
+    }
+
+    return buffer;
+}
+
+/* Helper to return a newly allocated C string containing the supported extensions list for a device */
+static char *alloc_and_get_device_extensions_string( cl_device_id device )
+{
+    return (char *) alloc_and_get_device_info( device, CL_DEVICE_EXTENSIONS, "extensions string" );
+}
+
+/* Helper to determine if an extension is supported by a device */
+int is_extension_available( cl_device_id device, const char *extensionName )
+{
+    char *extString = alloc_and_get_device_extensions_string( device );
 
     if( NULL == extString )
     {
-        log_error( "Error: unable to allocate %ld byte buffer for extension string at %s:%d (err = %d)\n", size, __FILE__, __LINE__,  err );
+        /* An error message will have already been printed by alloc_and_get_device_info(),
+         * so we can just return, here. */
         return 0;
     }
+
     BufferOwningPtr<char> extStringBuf(extString);
 
-    if(( err = clGetDeviceInfo(device, CL_DEVICE_EXTENSIONS, size, extString, NULL) ))
-    {
-        log_error( "Error: failed to obtain device extensions string at %s:%d (err = %d)\n", __FILE__, __LINE__, err );
-        return 0;
-    }
-
-    if( strstr( extString, extensionName ) )
-        result = 1;
-
-    return result;
+    return strstr( extString, extensionName ) != NULL;
 }
 
 /* Helper to determine if a device supports an image format */