Skip to content

Commit de6d9d7

Browse files
committed
OpenCL: Add color to error output.
1 parent 9aa4ea4 commit de6d9d7

File tree

2 files changed

+5
-8
lines changed

2 files changed

+5
-8
lines changed

src/opencl_autotune.h

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -156,10 +156,7 @@ static void autotune_run_extra(struct fmt_main *self, unsigned int rounds,
156156

157157
default:
158158
if (cfg_lws < 0) {
159-
fprintf(stderr,
160-
"Error: AutotuneLWS must be a positive number (now set to %d)\n",
161-
cfg_lws);
162-
error();
159+
error_msg("Error: AutotuneLWS must be a positive number (now set to %d)\n", cfg_lws);
163160
}
164161
if (cpu(device_info[gpu_id]))
165162
local_work_size =

src/opencl_common.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -250,10 +250,10 @@ void opencl_process_event(void);
250250
do { cl_int __err = (cl_error); \
251251
if (__err != CL_SUCCESS) { \
252252
if (!ocl_autotune_running || options.verbosity >= VERB_MAX) \
253-
fprintf(stderr, "%u: OpenCL %s error in %s:%d - %s\n", \
253+
fprintf_color(color_error, stderr, "%u: OpenCL %s error in %s:%d - %s\n", \
254254
NODE, get_error_name(__err), __FILE__, __LINE__, message); \
255255
else if (options.verbosity > VERB_LEGACY) \
256-
fprintf(stderr, " %u: %s\n", NODE, get_error_name(__err)); \
256+
fprintf_color(color_error, stderr, " %u: %s\n", NODE, get_error_name(__err)); \
257257
if (ocl_autotune_running) \
258258
return -1; \
259259
else if (bench_or_test_running) \
@@ -267,7 +267,7 @@ void opencl_process_event(void);
267267
#define HANDLE_CLERROR(cl_error, message) \
268268
do { cl_int __err = (cl_error); \
269269
if (__err != CL_SUCCESS) { \
270-
fprintf(stderr, "%u: OpenCL %s error in %s:%d - %s\n", \
270+
fprintf_color(color_error, stderr, "%u: OpenCL %s error in %s:%d - %s\n", \
271271
NODE, get_error_name(__err), __FILE__, __LINE__, (message)); \
272272
error(); \
273273
} \
@@ -277,7 +277,7 @@ void opencl_process_event(void);
277277
#define SOFT_CLERROR(cl_error, message) \
278278
do { cl_int __err = (cl_error); \
279279
if (__err != CL_SUCCESS) { \
280-
fprintf(stderr, "%u: OpenCL %s error in %s:%d - %s\n", \
280+
fprintf_color(color_error, stderr, "%u: OpenCL %s error in %s:%d - %s\n", \
281281
NODE, get_error_name(__err), __FILE__, __LINE__, (message)); \
282282
} \
283283
} while (0)

0 commit comments

Comments
 (0)