opencl: Search all the same kernel paths when setting kernel

driver-opencl.c

@@ -411,6 +411,7 @@ const char *opencl_get_default_kernel_filename(const enum cl_kernels kern)
 static
 bool _set_kernel(struct cgpu_info * const cgpu, const char *_val)
 {
+	FILE *F;
 	const enum cl_kernels kern = select_kernel(_val);
 	struct opencl_device_data * const data = cgpu->device_data;
 	{
@@ -423,8 +424,10 @@ bool _set_kernel(struct cgpu_info * const cgpu, const char *_val)
 	char filename[knamelen + 3 + 1];
 	sprintf(filename, "%s.cl", _val);
 	
-	if (access(filename, R_OK))
+	F = opencl_open_kernel(filename);
+	if (!F)
 		return false;
+	fclose(F);
 	
 	free(data->kernel_file);
 	data->kernel_file = strdup(_val);

ocl.c

@@ -211,10 +211,9 @@ CL_API_ENTRY cl_int CL_API_CALL
 
 int opt_platform_id = -1;
 
-char *file_contents(const char *filename, int *length)
+FILE *opencl_open_kernel(const char * const filename)
 {
 	char *fullpath = alloca(PATH_MAX);
-	void *buffer;
 	FILE *f;
 
 	/* Try in the optional kernel path or installed prefix first */
@@ -228,9 +227,19 @@ char *file_contents(const char *filename, int *length)
 	/* Finally try opening it directly */
 	if (!f)
 		f = fopen(filename, "rb");
+	
+	return f;
+}
+
+char *file_contents(const char *filename, int *length)
+{
+	void *buffer;
+	FILE *f;
+
+	f = opencl_open_kernel(filename);
 
 	if (!f) {
-		applog(LOG_ERR, "Unable to open %s or %s for reading", filename, fullpath);
+		applog(LOG_ERR, "Unable to open %s for reading", filename);
 		return NULL;
 	}
 

ocl.h

@@ -4,6 +4,8 @@
 #include "config.h"
 
 #include <stdbool.h>
+#include <stdio.h>
+
 #ifdef HAVE_OPENCL
 #include "CL/cl.h"
 
@@ -31,6 +33,7 @@ typedef struct {
 	enum cl_kernels chosen_kernel;
 } _clState;
 
+extern FILE *opencl_open_kernel(const char *filename);
 extern char *file_contents(const char *filename, int *length);
 extern int clDevicesNum(void);
 extern _clState *initCl(unsigned int gpu, char *name, size_t nameSize);