[ocl-icd] 01/03: Imported Upstream version 2.2.5

Vincent Danjean vdanjean at debian.org
Sat Jun 6 18:47:45 UTC 2015


This is an automated email from the git hooks/post-receive script.

vdanjean pushed a commit to branch master
in repository ocl-icd.

commit b736a8ac645be1ab92e7759bdda9628ee152c3c7
Author: Vincent Danjean <Vincent.Danjean at ens-lyon.org>
Date:   Sat Jun 6 18:26:44 2015 +0200

    Imported Upstream version 2.2.5
---
 NEWS                | 16 +++++++++++
 configure           | 20 ++++++-------
 configure.ac        |  2 +-
 doc/libOpenCL.7.txt | 12 ++++----
 icd_generator.rb    | 34 +++++++++++++---------
 libdummy_icd.c      | 32 +++++++++++++++++++++
 ocl_icd_loader.c    | 81 ++++++++++++++++++++++++++++++++++++++++++-----------
 tests/package.m4    |  4 +--
 tests/testsuite     | 12 ++++----
 9 files changed, 158 insertions(+), 55 deletions(-)

diff --git a/NEWS b/NEWS
index a74c412..bca7b71 100644
--- a/NEWS
+++ b/NEWS
@@ -1,4 +1,20 @@
 
+Version 2.2.5
+=============
+
+Giuseppe Bilotta (5):
+      Fix a few typos
+      Whitespace cleanup
+      Remove useless vendor_icd.first_platform
+      Count GPU, CPU and ALL devices on newly inserted platforms
+      Sort platforms by number of GPU, CPU and ALL devices
+
+Vincent Danjean (4):
+      Sort platforms in one pass
+      Correctly handle clGetDeviceIDs in generator and tests
+      [BUG] call the function when the return type is void
+      Release 2.2.5
+
 Version 2.2.4
 =============
 
diff --git a/configure b/configure
index 5e7525b..b3b2f78 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for OpenCL ICD Loader 2.2.4.
+# Generated by GNU Autoconf 2.69 for OpenCL ICD Loader 2.2.5.
 #
 # Report bugs to <ocl-icd-devel at lists.forge.imag.fr>.
 #
@@ -590,8 +590,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='OpenCL ICD Loader'
 PACKAGE_TARNAME='ocl-icd'
-PACKAGE_VERSION='2.2.4'
-PACKAGE_STRING='OpenCL ICD Loader 2.2.4'
+PACKAGE_VERSION='2.2.5'
+PACKAGE_STRING='OpenCL ICD Loader 2.2.5'
 PACKAGE_BUGREPORT='ocl-icd-devel at lists.forge.imag.fr'
 PACKAGE_URL=''
 
@@ -1330,7 +1330,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures OpenCL ICD Loader 2.2.4 to adapt to many kinds of systems.
+\`configure' configures OpenCL ICD Loader 2.2.5 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1400,7 +1400,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of OpenCL ICD Loader 2.2.4:";;
+     short | recursive ) echo "Configuration of OpenCL ICD Loader 2.2.5:";;
    esac
   cat <<\_ACEOF
 
@@ -1517,7 +1517,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-OpenCL ICD Loader configure 2.2.4
+OpenCL ICD Loader configure 2.2.5
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -1940,7 +1940,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by OpenCL ICD Loader $as_me 2.2.4, which was
+It was created by OpenCL ICD Loader $as_me 2.2.5, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -2807,7 +2807,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='ocl-icd'
- VERSION='2.2.4'
+ VERSION='2.2.5'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -13553,7 +13553,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by OpenCL ICD Loader $as_me 2.2.4, which was
+This file was extended by OpenCL ICD Loader $as_me 2.2.5, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -13619,7 +13619,7 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-OpenCL ICD Loader config.status 2.2.4
+OpenCL ICD Loader config.status 2.2.5
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 
diff --git a/configure.ac b/configure.ac
index a957044..2288071 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2,7 +2,7 @@
 # Process this file with autoconf to produce a configure script.
 
 AC_PREREQ([2.67])
-AC_INIT([OpenCL ICD Loader], [2.2.4], [ocl-icd-devel at lists.forge.imag.fr], [ocl-icd])
+AC_INIT([OpenCL ICD Loader], [2.2.5], [ocl-icd-devel at lists.forge.imag.fr], [ocl-icd])
 AC_CONFIG_SRCDIR([ocl_icd_loader.c])
 AC_CONFIG_AUX_DIR([build-aux])
 AC_CONFIG_HEADERS([config.h])
diff --git a/doc/libOpenCL.7.txt b/doc/libOpenCL.7.txt
index eb7594a..bf6a047 100644
--- a/doc/libOpenCL.7.txt
+++ b/doc/libOpenCL.7.txt
@@ -17,7 +17,7 @@ any OpenCL implementation itself, but merly act as a dispatcher to real OpenCL
 implementations provided as OpenCL Installable Client Driver (ICD).
 An ICD loader should be able to load ICDs provided by any vendors.
 
-According to OpenCL specifications from Khronos (see [Kronos]), the ICD Loader
+According to OpenCL specifications from Khronos (see [Khronos]), the ICD Loader
 looks for files into '`/etc/OpenCL/vendors/`' directory and, for each file
 whose name ends with '`.icd`', the ICD Loader loads with **dlopen**(3) the
 shared library whose name is on the first line of the '`.icd`' file.
@@ -26,14 +26,14 @@ Shared library name in ".icd" files can have its path, or it can be a plain
 filename. In the latter case, the ICD shared library will be look for into the
 standard dynamic loader paths.
 
-ENVIRONNEMENT
+ENVIRONMENT
 -------------
 Some environment variables can be used modify the default behavior of
 libOpenCL.
 
 *OCL_ICD_VENDORS*::
 This variable allows one to change the way ICD are searched on the system.
-Several cases are considerated:
+Several cases are considered:
 
 a. if *$OCL_ICD_VENDORS* is a directory path, then this path replaces the
   "/etc/OpenCL/vendors" path in the standard behavior: the loader will use the
@@ -50,9 +50,9 @@ c. else libOpenCL.so will try to load *$OCL_ICD_VENDORS* as the ICD shared
   library itself (i.e. to load it directly with **dlopen**(3)).
 
 *OCL_ICD_ASSUME_ICD_EXTENSION*::
-  If set, contrary the the Kronos specification, the loader will not check that
+  If set, contrary the Khronos specification, the loader will not check that
   the loaded ICDs declare the `cl_khr_icd` extension. You may need to define
-  this environment variable if you are using the Intel ICD toguether with
+  this environment variable if you are using the Intel ICD together with
   *optirun*(1). Else, a bug into the Intel ICD will make the application crash.
 
 *OCL_ICD_DEBUG*::
@@ -74,4 +74,4 @@ development.
 
 SEE ALSO
 --------
-http://www.khronos.org/registry/cl/[Kronos OpenCL registry website]
+http://www.khronos.org/registry/cl/[Khronos OpenCL registry website]
diff --git a/icd_generator.rb b/icd_generator.rb
index 4fb4a05..3c3f0a8 100644
--- a/icd_generator.rb
+++ b/icd_generator.rb
@@ -30,12 +30,12 @@ module IcdGenerator
   $api_entries = {}
   $api_entries_array = []
   $cl_objects = ["platform_id", "device_id", "context", "command_queue", "mem", "program", "kernel", "event", "sampler"]
-  $know_entries = { 1 => "clGetPlatformInfo", 0 => "clGetPlatformIDs" }
-  $use_name_in_test = { 1 => "clGetPlatformInfo", 0 => "clGetPlatformIDs" }
+  $know_entries = { 1 => "clGetPlatformInfo", 0 => "clGetPlatformIDs", 2 => "clGetDeviceIDs" }
+  $use_name_in_test = { 1 => "clGetPlatformInfo", 0 => "clGetPlatformIDs", 2 => "clGetDeviceIDs" }
   # do not call these functions when trying to discover the mapping
   $forbidden_funcs = ["clGetExtensionFunctionAddress", "clGetPlatformIDs",
     "clGetPlatformInfo", "clGetGLContextInfoKHR", "clUnloadCompiler",
-    "clSetCommandQueueProperty"]
+    "clSetCommandQueueProperty", "clGetDeviceIDs"]
   $windows_funcs = ["clGetDeviceIDsFromD3D10KHR", "clCreateFromD3D10BufferKHR",
     "clCreateFromD3D10Texture2DKHR", "clCreateFromD3D10Texture3DKHR",
     "clEnqueueAcquireD3D10ObjectsKHR", "clEnqueueReleaseD3D10ObjectsKHR",
@@ -244,6 +244,8 @@ EOF
          run_dummy_icd += "  #{func_name}(1,(cl_event*)&chosen_platform);\n"
        elsif func_name == "clGetExtensionFunctionAddressForPlatform" then
          run_dummy_icd += "  #{func_name}((cl_platform_id)chosen_platform, \"clIcdGetPlatformIDsKHR\");\n"
+       elsif func_name == "clGetDeviceIDs" then
+         run_dummy_icd += "  #{func_name}((cl_platform_id)chosen_platform,0,0,NULL,NULL);\n"
        else
          run_dummy_icd += "  oclFuncPtr = (oclFuncPtr_fn)" + func_name + ";\n"
          run_dummy_icd += "  oclFuncPtr(chosen_platform);\n"
@@ -263,16 +265,16 @@ EOF
 #include <dlfcn.h>
 
 #define F(f) \\
-__attribute__((weak)) int f (void* arg, void* arg2) { \\
-  void (* p)(void*, void*)=NULL; \\
+__attribute__((weak)) int f (void* arg, int arg2, int arg3, void* arg4, void* arg5) { \\
+  void (* p)(void*, int, int, void*, void*)=NULL; \\
   p=dlsym(RTLD_NEXT, #f); \\
   if (p) { \\
-    (*p)(arg, arg2); \\
+    (*p)(arg, arg2, arg3, arg4, arg5); \\
   } else { \\
     printf("-1 : "); \\
   } \\
   return 0; \\
-} 
+}
 
 EOF
     $api_entries.each_key { |func_name|
@@ -363,15 +365,18 @@ typedef __typeof__(clGetExtensionFunctionAddress) *clGetExtensionFunctionAddress
 extern const struct func_desc function_description[];
 struct vendor_icd {
   cl_uint	num_platforms;
-  cl_uint	first_platform;
   void *	dl_handle;
   clGetExtensionFunctionAddress_fn ext_fn_ptr;
 };
+
 struct platform_icd {
-  char *	 extension_suffix;
-  char *	 version;
+  char *	extension_suffix;
+  char *	version;
   struct vendor_icd *vicd;
   cl_platform_id pid;
+  cl_uint	ngpus; /* number of GPU devices */
+  cl_uint	ncpus; /* number of CPU devices */
+  cl_uint	ndevs; /* total number of devices, of all types */
 };
 
 EOF
@@ -575,12 +580,13 @@ EOF
       error_handler.call
       ocl_icd_loader_gen_source += "  }\n"
       if return_type != "void" then
-        ocl_icd_loader_gen_source += "  RETURN(((struct _#{fps[0]} *)#{fps[1]})->dispatch->#{func_name}("
-        ocl_icd_loader_gen_source += ps.join(", ")
-        ocl_icd_loader_gen_source += "));\n"
+        return_debug="RETURN"
       else
-        ocl_icd_loader_gen_source += "  return;"
+        return_debug="return"
       end
+      ocl_icd_loader_gen_source += "  #{return_debug}(((struct _#{fps[0]} *)#{fps[1]})->dispatch->#{func_name}("
+      ocl_icd_loader_gen_source += ps.join(", ")
+      ocl_icd_loader_gen_source += "));\n"
       ocl_icd_loader_gen_source += "}\n\n"
     }
     ocl_icd_loader_gen_source += "#pragma GCC visibility push(hidden)\n\n"
diff --git a/libdummy_icd.c b/libdummy_icd.c
index 151d58b..1ee3a91 100644
--- a/libdummy_icd.c
+++ b/libdummy_icd.c
@@ -188,5 +188,37 @@ CL_API_ENTRY cl_int CL_API_CALL INTclGetPlatformInfo(
 }
 SYMB(clGetPlatformInfo);
 
+CL_API_ENTRY cl_int CL_API_CALL
+INTclGetDeviceIDs(cl_platform_id   pid /* platform */,
+                  cl_device_type   ctype /* device_type */,
+                  cl_uint          num /* num_entries */,
+                  cl_device_id *   devid /* devices */,
+                  cl_uint *        res /* num_devices */) CL_API_SUFFIX__VERSION_1_0
+{
+	char* ENVNAME=NULL;
+	if (res == NULL) { return CL_SUCCESS; }
+	switch (ctype) {
+	case CL_DEVICE_TYPE_GPU:
+		ENVNAME="NB_GPU";
+		break;
+	case CL_DEVICE_TYPE_CPU:
+		ENVNAME="NB_CPU";
+		break;
+	case CL_DEVICE_TYPE_ALL:
+		ENVNAME="NB_ALL";
+		break;
+	}
+	if (ENVNAME==NULL) {
+		*res=0;
+	} else {
+		char* strnb=getenv(ENVNAME);
+		if (strnb) {
+			*res=atoi(getenv(ENVNAME));
+		} else {
+			*res=0;
+		}
+	}
+	return CL_SUCCESS;
+}
 #pragma GCC visibility pop
 
diff --git a/ocl_icd_loader.c b/ocl_icd_loader.c
index 2bb7605..9628ace 100644
--- a/ocl_icd_loader.c
+++ b/ocl_icd_loader.c
@@ -2,16 +2,16 @@
 Copyright (c) 2012, Brice Videau <brice.videau at imag.fr>
 Copyright (c) 2012, Vincent Danjean <Vincent.Danjean at ens-lyon.org>
 All rights reserved.
-      
+
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions are met:
-    
+
 1. Redistributions of source code must retain the above copyright notice, this
    list of conditions and the following disclaimer.
 2. Redistributions in binary form must reproduce the above copyright notice,
    this list of conditions and the following disclaimer in the documentation
    and/or other materials provided with the distribution.
-        
+
 THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
 ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
 WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
@@ -56,8 +56,8 @@ int debug_ocl_icd_mask=0;
 typedef __typeof__(clGetPlatformInfo) *clGetPlatformInfo_fn;
 
 inline void dump_vendor_icd(const char* info, const struct vendor_icd *v) {
-  debug(D_DUMP, "%s %p={ num=%i, first=%i, handle=%p, f=%p}\n", info,
-	v, v->num_platforms, v->first_platform, v->dl_handle, v->ext_fn_ptr);
+  debug(D_DUMP, "%s %p={ num=%i, handle=%p, f=%p}\n", info,
+	v, v->num_platforms, v->dl_handle, v->ext_fn_ptr);
 }
 
 struct vendor_icd *_icds=NULL;
@@ -213,7 +213,7 @@ static inline unsigned int _open_driver(unsigned int num_icds,
   if (f==NULL) {
     RETURN(num_icds);
   }
-  
+
   fseek(f, 0, SEEK_END);
   lib_path_length = ftell(f)+1;
   fseek(f, 0, SEEK_SET);
@@ -232,7 +232,7 @@ static inline unsigned int _open_driver(unsigned int num_icds,
   }
 
   lib_path_length = strnlen(lib_path, lib_path_length);
-  
+
   if( lib_path[lib_path_length-1] == '\n' )
     lib_path[lib_path_length-1] = '\0';
 
@@ -319,6 +319,54 @@ static char* _malloc_clGetPlatformInfo(clGetPlatformInfo_fn plt_info_ptr,
   RETURN_STR(param_value);
 }
 
+static void _count_devices(struct platform_icd *p) {
+  cl_int error;
+
+  /* Ensure they are 0 in case of errors */
+  p->ngpus = p->ncpus = p->ndevs = 0;
+
+  error = clGetDeviceIDs(p->pid, CL_DEVICE_TYPE_GPU, 0, NULL, &(p->ngpus));
+  if (error != CL_SUCCESS && error != CL_DEVICE_NOT_FOUND){
+    debug(D_WARN, "Error %s while counting GPU devices in platform %p",
+	  _clerror2string(error), p->pid);
+  }
+
+  error = clGetDeviceIDs(p->pid, CL_DEVICE_TYPE_CPU, 0, NULL, &(p->ncpus));
+  if (error != CL_SUCCESS && error != CL_DEVICE_NOT_FOUND){
+    debug(D_WARN, "Error %s while counting CPU devices in platform %p",
+	  _clerror2string(error), p->pid);
+  }
+
+  error = clGetDeviceIDs(p->pid, CL_DEVICE_TYPE_ALL, 0, NULL, &(p->ndevs));
+  if (error != CL_SUCCESS && error != CL_DEVICE_NOT_FOUND){
+    debug(D_WARN, "Error %s while counting ALL devices in platform %p",
+	  _clerror2string(error), p->pid);
+  }
+
+}
+
+static int _cmp_platforms(const void *_a, const void *_b) {
+	const struct platform_icd *a=(const struct platform_icd *)_a;
+	const struct platform_icd *b=(const struct platform_icd *)_b;
+
+	/* sort first platforms handling max gpu */
+	if (a->ngpus > b->ngpus) return -1;
+	if (a->ngpus < b->ngpus) return 1;
+	/* sort next platforms handling max cpu */
+	if (a->ncpus > b->ncpus) return -1;
+	if (a->ncpus < b->ncpus) return 1;
+	/* sort then platforms handling max devices */
+	if (a->ndevs > b->ndevs) return -1;
+	if (a->ndevs < b->ndevs) return 1;
+	/* else consider platforms equal */
+	return 0;
+}
+
+static void _sort_platforms(struct platform_icd *picds, int npicds) {
+	qsort(picds, npicds, sizeof(*picds),
+		&_cmp_platforms);
+}
+
 static inline void _find_and_check_platforms(cl_uint num_icds) {
   cl_uint i;
   _num_icds = 0;
@@ -328,9 +376,9 @@ static inline void _find_and_check_platforms(cl_uint num_icds) {
     struct vendor_icd *picd = &_icds[i];
     void* dlh = _icds[i].dl_handle;
     picd->ext_fn_ptr = _get_function_addr(dlh, NULL, "clGetExtensionFunctionAddress");
-    clIcdGetPlatformIDsKHR_fn plt_fn_ptr = 
+    clIcdGetPlatformIDsKHR_fn plt_fn_ptr =
       _get_function_addr(dlh, picd->ext_fn_ptr, "clIcdGetPlatformIDsKHR");
-    clGetPlatformInfo_fn plt_info_ptr = 
+    clGetPlatformInfo_fn plt_info_ptr =
       _get_function_addr(dlh, picd->ext_fn_ptr,	"clGetPlatformInfo");
     if( picd->ext_fn_ptr == NULL
 	|| plt_fn_ptr == NULL
@@ -354,7 +402,7 @@ static inline void _find_and_check_platforms(cl_uint num_icds) {
     }
     cl_uint num_valid_platforms=0;
     cl_uint j;
-    debug(D_LOG, "Try to load %d plateforms", num_platforms);
+    debug(D_LOG, "Try to load %d platforms", num_platforms);
     if (_allocate_platforms(num_platforms) < num_platforms) {
       free(platforms);
       debug(D_WARN, "Not enought platform allocated. Skipping ICD");
@@ -388,7 +436,7 @@ static inline void _find_and_check_platforms(cl_uint num_icds) {
 		      }
 		      debug(D_DUMP, "Supported extensions: %s", param_value);
 		      if( strstr(param_value, "cl_khr_icd") == NULL){
-			      free(param_value); 
+			      free(param_value);
 			      debug(D_WARN, "Missing khr extension in platform %i, skipping it", j);
 			      continue;
 		      }
@@ -425,6 +473,7 @@ static inline void _find_and_check_platforms(cl_uint num_icds) {
 	free(param_value);
       }
 #endif
+      _count_devices(p);
       num_valid_platforms++;
       _num_picds++;
     }
@@ -435,12 +484,12 @@ static inline void _find_and_check_platforms(cl_uint num_icds) {
       dump_vendor_icd("after looking for platforms", &_icds[_num_icds]);
       _num_icds++;
       picd->num_platforms = num_valid_platforms;
-      _icds[i].first_platform = _num_picds - num_valid_platforms;
     } else {
       dlclose(dlh);
     }
     free(platforms);
   }
+  _sort_platforms(&_picds[0], _num_picds);
 }
 
 static void __initClIcd( void ) {
@@ -464,7 +513,7 @@ static void __initClIcd( void ) {
       is_dir=1;
     }
   }
-  
+
   if (!is_dir) {
     debug(D_LOG,"Only loading '%s' as an ICD", dir_path);
     num_icds = 1;
@@ -475,7 +524,7 @@ static void __initClIcd( void ) {
     if(dir == NULL) {
       if (errno == ENOTDIR) {
         debug(D_DUMP, "%s is not a directory, trying to use it as a ICD libname",
-  	dir_path);
+	  dir_path);
       }
       goto abort;
     }
@@ -490,7 +539,7 @@ static void __initClIcd( void ) {
   if (_icds == NULL) {
     goto abort;
   }
-  
+
   if (!is_dir) {
     if (_string_end_with_icd(dir_path)) {
       num_icds = 0;
@@ -629,7 +678,7 @@ typedef enum {
 
 static cl_int clGetICDLoaderInfoOCLICD(
   cl_icdl_info     param_name,
-  size_t           param_value_size, 
+  size_t           param_value_size,
   void *           param_value,
   size_t *         param_value_size_ret)
 {
diff --git a/tests/package.m4 b/tests/package.m4
index ca57648..aa94e7c 100644
--- a/tests/package.m4
+++ b/tests/package.m4
@@ -4,9 +4,9 @@ m4_define([AT_PACKAGE_NAME],
 m4_define([AT_PACKAGE_TARNAME],
   [ocl-icd])
 m4_define([AT_PACKAGE_VERSION],
-  [2.2.4])
+  [2.2.5])
 m4_define([AT_PACKAGE_STRING],
-  [OpenCL ICD Loader 2.2.4])
+  [OpenCL ICD Loader 2.2.5])
 m4_define([AT_PACKAGE_BUGREPORT],
   [ocl-icd-devel at lists.forge.imag.fr])
 m4_define([AT_PACKAGE_URL],
diff --git a/tests/testsuite b/tests/testsuite
index b69aa46..beb3eaa 100755
--- a/tests/testsuite
+++ b/tests/testsuite
@@ -920,7 +920,7 @@ fi
 # List of tests.
 if $at_list_p; then
   cat <<_ATEOF || at_write_fail=1
-OpenCL ICD Loader 2.2.4 test suite test groups:
+OpenCL ICD Loader 2.2.5 test suite test groups:
 
  NUM: FILE-NAME:LINE     TEST-GROUP-NAME
       KEYWORDS
@@ -961,7 +961,7 @@ _ATEOF
   exit $at_write_fail
 fi
 if $at_version_p; then
-  $as_echo "$as_me (OpenCL ICD Loader 2.2.4)" &&
+  $as_echo "$as_me (OpenCL ICD Loader 2.2.5)" &&
   cat <<\_ATEOF || at_write_fail=1
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -1147,11 +1147,11 @@ exec 5>>"$at_suite_log"
 
 # Banners and logs.
 $as_echo "## ----------------------------------- ##
-## OpenCL ICD Loader 2.2.4 test suite. ##
+## OpenCL ICD Loader 2.2.5 test suite. ##
 ## ----------------------------------- ##"
 {
   $as_echo "## ----------------------------------- ##
-## OpenCL ICD Loader 2.2.4 test suite. ##
+## OpenCL ICD Loader 2.2.5 test suite. ##
 ## ----------------------------------- ##"
   echo
 
@@ -1995,7 +1995,7 @@ _ASBOX
   $as_echo "Please send $at_msg and all information you think might help:
 
    To: <ocl-icd-devel at lists.forge.imag.fr>
-   Subject: [OpenCL ICD Loader 2.2.4] $as_me: $at_fail_list${at_fail_list:+ failed${at_xpass_list:+, }}$at_xpass_list${at_xpass_list:+ passed unexpectedly}
+   Subject: [OpenCL ICD Loader 2.2.5] $as_me: $at_fail_list${at_fail_list:+ failed${at_xpass_list:+, }}$at_xpass_list${at_xpass_list:+ passed unexpectedly}
 
 You may investigate any problem if you feel able to do so, in which
 case the test suite provides a good starting point.  Its output may
@@ -2360,7 +2360,7 @@ at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 echo >>"$at_stdout"; $as_echo "ocl_version: OpenCL 1.2
-version: 2.2.4
+version: 2.2.5
 name: OpenCL ICD Loader
 vendor: OCL Icd free software
 " | \

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/collab-maint/ocl-icd.git



More information about the Pkg-opencl-commits mailing list