From 4d891b67bda998281fdab73d8199370a6a019bd6 Mon Sep 17 00:00:00 2001 From: Stuart Brady Date: Thu, 8 Aug 2019 15:22:57 +0100 Subject: [PATCH] Separate out device information functions Signed-off-by: Stuart Brady --- test_common/CMakeLists.txt | 1 + test_common/harness/deviceInfo.cpp | 78 +++++++++++++++++++++++++++++ test_common/harness/deviceInfo.h | 38 ++++++++++++++ test_common/harness/kernelHelpers.c | 61 +--------------------- test_common/harness/kernelHelpers.h | 5 +- 5 files changed, 120 insertions(+), 63 deletions(-) create mode 100644 test_common/harness/deviceInfo.cpp create mode 100644 test_common/harness/deviceInfo.h diff --git a/test_common/CMakeLists.txt b/test_common/CMakeLists.txt index f630cacd..15b2d8be 100644 --- a/test_common/CMakeLists.txt +++ b/test_common/CMakeLists.txt @@ -18,6 +18,7 @@ set(HARNESS_SOURCES harness/genericThread.cpp harness/imageHelpers.cpp harness/kernelHelpers.c + harness/deviceInfo.cpp harness/os_helpers.cpp harness/parseParameters.cpp harness/testHarness.c diff --git a/test_common/harness/deviceInfo.cpp b/test_common/harness/deviceInfo.cpp new file mode 100644 index 00000000..605e326c --- /dev/null +++ b/test_common/harness/deviceInfo.cpp @@ -0,0 +1,78 @@ +// +// Copyright (c) 2017-2019 The Khronos Group Inc. +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. +// +#include "deviceInfo.h" +#include "errorHelpers.h" +#include "typeWrappers.h" + +/* 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 ) +{ + void *buffer; + size_t size = 0; + int err; + + if ((err = clGetDeviceInfo(device, param_name, 0, NULL, &size)) != CL_SUCCESS) + { + 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 NULL; + + 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)) != CL_SUCCESS) + { + 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; +} + +/* Determines 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) + { + /* An error message will have already been printed by alloc_and_get_device_info(), + * so we can just return, here. */ + return 0; + } + + BufferOwningPtr extStringBuf(extString); + + return strstr(extString, extensionName) != NULL; +} + +/* Returns a newly allocated C string containing the supported extensions list for a device. */ +char *alloc_and_get_device_extensions_string(cl_device_id device) +{ + return (char *) alloc_and_get_device_info(device, CL_DEVICE_EXTENSIONS, "extensions string"); +} diff --git a/test_common/harness/deviceInfo.h b/test_common/harness/deviceInfo.h new file mode 100644 index 00000000..c653bd3b --- /dev/null +++ b/test_common/harness/deviceInfo.h @@ -0,0 +1,38 @@ +// +// Copyright (c) 2017-2019 The Khronos Group Inc. +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. +// +#ifndef _deviceInfo_h +#define _deviceInfo_h + +// Configuration +#include "../config.hpp" + +#include + +#ifdef __cplusplus +extern "C" { +#endif // __cplusplus + +/* Determines if an extension is supported by a device. */ +int is_extension_available(cl_device_id device, const char *extensionName); + +/* Returns a newly allocated C string containing the supported extensions list for a device. */ +char *alloc_and_get_device_extensions_string(cl_device_id device); + +#ifdef __cplusplus +} +#endif // __cplusplus + +#endif // _deviceInfo_h diff --git a/test_common/harness/kernelHelpers.c b/test_common/harness/kernelHelpers.c index 36dfaf99..8b7f2662 100644 --- a/test_common/harness/kernelHelpers.c +++ b/test_common/harness/kernelHelpers.c @@ -15,6 +15,7 @@ // #include "crc32.h" #include "kernelHelpers.h" +#include "deviceInfo.h" #include "errorHelpers.h" #include "imageHelpers.h" #include "typeWrappers.h" @@ -1118,66 +1119,6 @@ int get_max_common_3D_work_group_size( cl_context context, cl_kernel kernel, return 0; } -/* 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 ) -{ - void *buffer; - size_t size = 0; - int err; - - if(( err = clGetDeviceInfo(device, param_name, 0, NULL, &size) )) - { - 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 NULL; - - 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 ) - { - /* An error message will have already been printed by alloc_and_get_device_info(), - * so we can just return, here. */ - return 0; - } - - BufferOwningPtr extStringBuf(extString); - - return strstr( extString, extensionName ) != NULL; -} - /* Helper to determine if a device supports an image format */ int is_image_format_supported( cl_context context, cl_mem_flags flags, cl_mem_object_type image_type, const cl_image_format *fmt ) { diff --git a/test_common/harness/kernelHelpers.h b/test_common/harness/kernelHelpers.h index c0aedddf..cb4c299e 100644 --- a/test_common/harness/kernelHelpers.h +++ b/test_common/harness/kernelHelpers.h @@ -37,6 +37,8 @@ #include #endif +#include "deviceInfo.h" + #ifdef __cplusplus extern "C" { #endif // __cplusplus @@ -131,9 +133,6 @@ extern int get_max_allowed_work_group_size( cl_context context, cl_kernel kernel /* Helper to obtain the biggest allowed 1D work group size on a given device */ extern int get_max_allowed_1d_work_group_size_on_device( cl_device_id device, cl_kernel kernel, size_t *outSize ); -/* Helper to determine if an extension is supported by a device */ -extern int is_extension_available( cl_device_id device, const char *extensionName ); - /* Helper to determine if a device supports an image format */ extern int is_image_format_supported( cl_context context, cl_mem_flags flags, cl_mem_object_type image_type, const cl_image_format *fmt );