opencl: fix for #11066

src/common/darktable.c

@@ -493,6 +493,7 @@ int dt_init(int argc, char *argv[], const int init_gui, lua_State *L)
 
 #ifdef HAVE_OPENCL
   gboolean exclude_opencl = FALSE;
+  gboolean print_statistics = strcmp(argv[0], "darktable-cltest");
 #endif
 
 #ifdef USE_LUA
@@ -897,7 +898,7 @@ int dt_init(int argc, char *argv[], const int init_gui, lua_State *L)
 
   darktable.opencl = (dt_opencl_t *)calloc(1, sizeof(dt_opencl_t));
 #ifdef HAVE_OPENCL
-  dt_opencl_init(darktable.opencl, exclude_opencl);
+  dt_opencl_init(darktable.opencl, exclude_opencl, print_statistics);
 #endif
 
   darktable.blendop = (dt_blendop_t *)calloc(1, sizeof(dt_blendop_t));

src/common/opencl.c

@@ -50,14 +50,15 @@ static void dt_opencl_priority_parse(dt_opencl_t *cl, char *configstr, int *prio
 /** parse a complete priority string */
 static void dt_opencl_priorities_parse(dt_opencl_t *cl, const char *configstr);
 
-void dt_opencl_init(dt_opencl_t *cl, const gboolean exclude_opencl)
+void dt_opencl_init(dt_opencl_t *cl, const gboolean exclude_opencl, const gboolean print_statistics)
 {
   char *str;
   dt_pthread_mutex_init(&cl->lock, NULL);
   cl->inited = 0;
   cl->enabled = 0;
   cl->stopped = 0;
   cl->error_count = 0;
+  cl->print_statistics = print_statistics;
 
   // work-around to fix a bug in some AMD OpenCL compilers, which would fail parsing certain numerical
   // constants if locale is different from "C".
@@ -624,7 +625,7 @@ void dt_opencl_cleanup(dt_opencl_t *cl)
         if(cl->dev[i].program_used[k]) (cl->dlocl->symbols->dt_clReleaseProgram)(cl->dev[i].program[k]);
       (cl->dlocl->symbols->dt_clReleaseCommandQueue)(cl->dev[i].cmd_queue);
       (cl->dlocl->symbols->dt_clReleaseContext)(cl->dev[i].context);
-      if(cl->use_events)
+      if(cl->print_statistics && cl->use_events)
       {
         if(cl->dev[i].totalevents)
         {
@@ -637,6 +638,9 @@ void dt_opencl_cleanup(dt_opencl_t *cl)
           dt_print(DT_DEBUG_OPENCL, "[opencl_summary_statistics] device '%s': NOT utilized\n",
                    cl->dev[i].name);
         }
+      }
+      if(cl->use_events)
+      {
         dt_opencl_events_reset(i);
 
         free(cl->dev[i].eventlist);

src/common/opencl.h

@@ -109,6 +109,7 @@ typedef struct dt_opencl_t
   int use_events;
   int async_pixelpipe;
   int number_event_handles;
+  int print_statistics;
   int synch_cache;
   int micro_nap;
   int enabled;
@@ -134,7 +135,7 @@ typedef struct dt_opencl_t
 } dt_opencl_t;
 
 /** inits the opencl subsystem. */
-void dt_opencl_init(dt_opencl_t *cl, const gboolean exclude_opencl);
+void dt_opencl_init(dt_opencl_t *cl, const gboolean exclude_opencl, const gboolean print_statistics);
 
 /** cleans up the opencl subsystem. */
 void dt_opencl_cleanup(dt_opencl_t *cl);
@@ -316,7 +317,7 @@ typedef struct dt_opencl_t
   int stopped;
   int error_count;
 } dt_opencl_t;
-static inline void dt_opencl_init(dt_opencl_t *cl, const int argc, char *argv[])
+static inline void dt_opencl_init(dt_opencl_t *cl, const gboolean exclude_opencl, const gboolean print_statistics)
 {
   cl->inited = 0;
   cl->enabled = 0;