diff --git a/src/common/fxt.h b/src/common/fxt.h index aeb88dae8a..f0aaffc5a4 100644 --- a/src/common/fxt.h +++ b/src/common/fxt.h @@ -869,11 +869,11 @@ do { \ } \ } while(0) -#define _STARPU_TRACE_START_EXECUTING() \ - FUT_FULL_PROBE1(_STARPU_FUT_KEYMASK_WORKER_VERBOSE, _STARPU_FUT_START_EXECUTING, _starpu_gettid()); +#define _STARPU_TRACE_START_EXECUTING(job) \ + FUT_FULL_PROBE2(_STARPU_FUT_KEYMASK_WORKER_VERBOSE, _STARPU_FUT_START_EXECUTING, _starpu_gettid(), (job)->job_id); -#define _STARPU_TRACE_END_EXECUTING() \ - FUT_FULL_PROBE1(_STARPU_FUT_KEYMASK_WORKER_VERBOSE, _STARPU_FUT_END_EXECUTING, _starpu_gettid()); +#define _STARPU_TRACE_END_EXECUTING(job) \ + FUT_FULL_PROBE2(_STARPU_FUT_KEYMASK_WORKER_VERBOSE, _STARPU_FUT_END_EXECUTING, _starpu_gettid(), (job)->job_id); #define _STARPU_TRACE_START_CALLBACK(job) \ FUT_FULL_PROBE2(_STARPU_FUT_KEYMASK_WORKER_VERBOSE, _STARPU_FUT_START_CALLBACK, job, _starpu_gettid()); @@ -1431,8 +1431,8 @@ do { \ #define _STARPU_TRACE_WORKER_INIT_END(workerid) do {(void)(workerid);} while(0) #define _STARPU_TRACE_START_CODELET_BODY(job, nimpl, perf_arch, workerid) do {(void)(job); (void)(nimpl); (void)(perf_arch); (void)(workerid);} while(0) #define _STARPU_TRACE_END_CODELET_BODY(job, nimpl, perf_arch, workerid) do {(void)(job); (void)(nimpl); (void)(perf_arch); (void)(workerid);} while(0) -#define _STARPU_TRACE_START_EXECUTING() do {} while(0) -#define _STARPU_TRACE_END_EXECUTING() do {} while(0) +#define _STARPU_TRACE_START_EXECUTING(job) do {(void)(job);} while(0) +#define _STARPU_TRACE_END_EXECUTING(job) do {(void)(job);} while(0) #define _STARPU_TRACE_START_CALLBACK(job) do {(void)(job);} while(0) #define _STARPU_TRACE_END_CALLBACK(job) do {(void)(job);} while(0) #define _STARPU_TRACE_JOB_PUSH(task, prio) do {(void)(task); (void)(prio);} while(0) diff --git a/src/debug/traces/starpu_fxt.c b/src/debug/traces/starpu_fxt.c index 7ce0cb73e4..93b7d217f5 100644 --- a/src/debug/traces/starpu_fxt.c +++ b/src/debug/traces/starpu_fxt.c @@ -969,7 +969,7 @@ static void worker_pop_state(double time, const char *prefix, long unsigned int #endif } -static void thread_set_state(double time, const char *prefix, long unsigned int threadid, const char *name) +static void thread_set_state(double time, const char *prefix, long unsigned int threadid, const char *name, long job_id) { if (find_sync(prefixTOnodeid(prefix), threadid)) /* Unless using worker sets, collapse thread and worker */ @@ -980,7 +980,14 @@ static void thread_set_state(double time, const char *prefix, long unsigned int #ifdef STARPU_HAVE_POTI char container[STARPU_POTI_STR_LEN]; thread_container_alias(container, STARPU_POTI_STR_LEN, prefix, threadid); - poti_SetState(time, container, "S", name); + if (job_id >= 0) + { + char jobid_str[STARPU_POTI_STR_LEN]; + snprintf(jobid_str, sizeof(jobid_str), "%s%lu", prefix, job_id); + poti_user_SetState(_starpu_poti_JobState, time, container, "S", name, 1, jobid_str); + } + else + poti_SetState(time, container, "S", name); #else fprintf(out_paje_file, "10 %.9f %st%lu S %s\n", time, prefix, threadid, name); #endif @@ -1258,10 +1265,10 @@ static void do_worker_set_state(double time, const char *prefix, int workerid, c recfmt_worker_set_state(time, workerid, name, type); } -static void do_thread_set_state(double time, const char *prefix, long unsigned int threadid, const char *name, const char *type) +static void do_thread_set_state(double time, const char *prefix, long unsigned int threadid, const char *name, const char *type, long job_id) { if (out_paje_file) - thread_set_state(time, prefix, threadid, name); + thread_set_state(time, prefix, threadid, name, job_id); if (trace_file) recfmt_thread_set_state(time, prefixTOnodeid(prefix), threadid, name, type); } @@ -1500,7 +1507,7 @@ static void handle_worker_init_start(struct fxt_ev_64 *ev, struct starpu_fxt_opt } /* start initialization */ - do_thread_set_state(now, prefix, threadid, "In", "Runtime"); + do_thread_set_state(now, prefix, threadid, "In", "Runtime", -1); if (activity_file) fprintf(activity_file, "name\t%d\t%s %d\n", workerid, kindstr, devid); @@ -1523,7 +1530,7 @@ static void handle_worker_init_end(struct fxt_ev_64 *ev, struct starpu_fxt_optio else worker = ev->param[1]; - do_thread_set_state(get_event_time_stamp(ev, options), prefix, ev->param[0], "B", "Runtime"); + do_thread_set_state(get_event_time_stamp(ev, options), prefix, ev->param[0], "B", "Runtime", -1); do_worker_set_state(get_event_time_stamp(ev, options), prefix, worker, "I", "Other"); @@ -1538,7 +1545,7 @@ static void handle_worker_deinit_start(struct fxt_ev_64 *ev, struct starpu_fxt_o char *prefix = options->file_prefix; long unsigned int threadid = ev->param[0]; - do_thread_set_state(get_event_time_stamp(ev, options), prefix, threadid, "D", "Runtime"); + do_thread_set_state(get_event_time_stamp(ev, options), prefix, threadid, "D", "Runtime", -1); } static void handle_worker_deinit_end(struct fxt_ev_64 *ev, struct starpu_fxt_options *options) @@ -2055,9 +2062,10 @@ static void handle_start_executing(struct fxt_ev_64 *ev, struct starpu_fxt_optio { char *prefix = options->file_prefix; long unsigned int threadid = ev->param[0]; + long job_id = ev->param[1]; if (!find_sync(prefixTOnodeid(prefix), threadid)) - do_thread_set_state(get_event_time_stamp(ev, options), prefix, threadid, "E", "Runtime"); + do_thread_set_state(get_event_time_stamp(ev, options), prefix, threadid, "E", "Runtime", job_id); } static void handle_end_executing(struct fxt_ev_64 *ev, struct starpu_fxt_options *options) @@ -2066,7 +2074,7 @@ static void handle_end_executing(struct fxt_ev_64 *ev, struct starpu_fxt_options long unsigned int threadid = ev->param[0]; if (!find_sync(prefixTOnodeid(prefix), threadid)) - do_thread_set_state(get_event_time_stamp(ev, options), prefix, threadid, "B", "Runtime"); + do_thread_set_state(get_event_time_stamp(ev, options), prefix, threadid, "B", "Runtime", -1); } static void handle_user_event(struct fxt_ev_64 *ev, struct starpu_fxt_options *options) @@ -2132,7 +2140,7 @@ static void handle_worker_status_on_tid(struct fxt_ev_64 *ev, struct starpu_fxt_ if (find_worker_id(prefixTOnodeid(prefix), ev->param[1]) < 0) return; - do_thread_set_state(get_event_time_stamp(ev, options), prefix, ev->param[1], newstatus, "Runtime"); + do_thread_set_state(get_event_time_stamp(ev, options), prefix, ev->param[1], newstatus, "Runtime", -1); } static void handle_worker_status(struct fxt_ev_64 *ev, struct starpu_fxt_options *options, const char *newstatus) @@ -2153,7 +2161,7 @@ static void handle_worker_scheduling_start(struct fxt_ev_64 *ev, struct starpu_f if (find_worker_id(prefixTOnodeid(prefix), ev->param[0]) < 0) return; - do_thread_set_state(get_event_time_stamp(ev, options), prefix, ev->param[0], "Sc", "Runtime"); + do_thread_set_state(get_event_time_stamp(ev, options), prefix, ev->param[0], "Sc", "Runtime", -1); } static void handle_worker_scheduling_end(struct fxt_ev_64 *ev, struct starpu_fxt_options *options) @@ -2162,7 +2170,7 @@ static void handle_worker_scheduling_end(struct fxt_ev_64 *ev, struct starpu_fxt if (find_worker_id(prefixTOnodeid(prefix), ev->param[0]) < 0) return; - do_thread_set_state(get_event_time_stamp(ev, options), prefix, ev->param[0], "B", "Runtime"); + do_thread_set_state(get_event_time_stamp(ev, options), prefix, ev->param[0], "B", "Runtime", -1); } static void handle_worker_scheduling_push(struct fxt_ev_64 *ev, struct starpu_fxt_options *options) @@ -2185,7 +2193,7 @@ static void handle_worker_sleep_start(struct fxt_ev_64 *ev, struct starpu_fxt_op double start_sleep_time = get_event_time_stamp(ev, options); last_sleep_start[worker] = start_sleep_time; - do_thread_set_state(get_event_time_stamp(ev, options), prefix, ev->param[0], "Sl", "Other"); + do_thread_set_state(get_event_time_stamp(ev, options), prefix, ev->param[0], "Sl", "Other", -1); } static void handle_worker_sleep_end(struct fxt_ev_64 *ev, struct starpu_fxt_options *options) @@ -2197,7 +2205,7 @@ static void handle_worker_sleep_end(struct fxt_ev_64 *ev, struct starpu_fxt_opti double end_sleep_timestamp = get_event_time_stamp(ev, options); - do_thread_set_state(end_sleep_timestamp, prefix, ev->param[0], "B", "Runtime"); + do_thread_set_state(end_sleep_timestamp, prefix, ev->param[0], "B", "Runtime", -1); double sleep_length = end_sleep_timestamp - last_sleep_start[worker]; @@ -2370,7 +2378,8 @@ static void handle_checkpoint_begin(struct fxt_ev_64 *ev, struct starpu_fxt_opti #ifdef STARPU_HAVE_POTI char container[STARPU_POTI_STR_LEN]; snprintf(container, sizeof(container), "%sp", options->file_prefix); - poti_NewEvent(get_event_time_stamp(ev, options), container, "prog_event", event); + poti_user_NewEvent(_starpu_poti_checkPointState, get_event_time_stamp(ev, options), container, "prog_event", "checkpoint_begin", + 2, ev->param[0], ev->param[1]); #else fprintf(out_paje_file, "25 %.9f checkpoint_begin %sp 0 %lu %lu\n", get_event_time_stamp(ev, options), options->file_prefix, ev->param[0], ev->param[1]); @@ -2386,7 +2395,8 @@ static void handle_checkpoint_end(struct fxt_ev_64 *ev, struct starpu_fxt_option #ifdef STARPU_HAVE_POTI char container[STARPU_POTI_STR_LEN]; snprintf(container, sizeof(container), "%sp", options->file_prefix); - poti_NewEvent(get_event_time_stamp(ev, options), container, "prog_event", event); + poti_user_NewEvent(_starpu_poti_checkPointState, get_event_time_stamp(ev, options), container, "prog_event", "checkpoint_end", + 2, ev->param[0], ev->param[1]); #else fprintf(out_paje_file, "25 %.9f checkpoint_end %sp 0 %lu %lu\n", get_event_time_stamp(ev, options), options->file_prefix, ev->param[0], ev->param[1]); diff --git a/src/debug/traces/starpu_fxt.h b/src/debug/traces/starpu_fxt.h index 9aae8e8956..be26a5e0d9 100644 --- a/src/debug/traces/starpu_fxt.h +++ b/src/debug/traces/starpu_fxt.h @@ -89,6 +89,8 @@ extern int _starpu_poti_semiExtendedSetState; extern int _starpu_poti_MemoryEvent; extern int _starpu_poti_CommLinkStart; extern int _starpu_poti_MpiLinkStart; +extern int _starpu_poti_checkPointState; +extern int _starpu_poti_JobState; /* * Animation diff --git a/src/debug/traces/starpu_paje.c b/src/debug/traces/starpu_paje.c index 3b69373075..523bcff643 100644 --- a/src/debug/traces/starpu_paje.c +++ b/src/debug/traces/starpu_paje.c @@ -75,6 +75,8 @@ void _starpu_fxt_write_paje_header(FILE *file STARPU_ATTRIBUTE_UNUSED, struct st "Dest string"); } _starpu_poti_MpiLinkStart = poti_header_DeclareEvent(PAJE_StartLink, 5, "MPITAG string", "MPIType string", "Priority string", "Handle string", "HName string", "X string", "Y string"); + _starpu_poti_checkPointState = poti_header_DeclareEvent(PAJE_NewEvent, 2, "CheckpointInstance string", "CheckpointDomain string"); + _starpu_poti_JobState = poti_header_DeclareEvent(PAJE_NewEvent, 1, "JobId string"); #endif #else poti_header(1,1); @@ -262,6 +264,13 @@ void _starpu_fxt_write_paje_header(FILE *file STARPU_ATTRIBUTE_UNUSED, struct st fprintf(file, "%% CheckpointInstance string\n"); fprintf(file, "%% CheckpointDomain string\n"); fprintf(file, "%%EndEventDef\n"); + fprintf(file, "%%EventDef PajeNewEvent 26\n"); + fprintf(file, "%% Time date\n"); + fprintf(file, "%% Type string\n"); + fprintf(file, "%% Container string\n"); + fprintf(file, "%% Value string\n"); + fprintf(file, "%% JobId string\n"); + fprintf(file, "%%EndEventDef\n"); #endif #ifdef STARPU_HAVE_POTI diff --git a/src/drivers/cpu/driver_cpu.c b/src/drivers/cpu/driver_cpu.c index f53aedbac7..f879c82a91 100644 --- a/src/drivers/cpu/driver_cpu.c +++ b/src/drivers/cpu/driver_cpu.c @@ -367,7 +367,7 @@ static int execute_job_on_cpu(struct _starpu_job *j, struct starpu_task *worker_ STARPU_ASSERT_MSG(func, "when STARPU_CPU is defined in 'where', cpu_func or cpu_funcs has to be defined"); if (_starpu_get_disable_kernels() <= 0) { - _STARPU_TRACE_START_EXECUTING(); + _STARPU_TRACE_START_EXECUTING(j); #ifdef STARPU_PROF_TOOL pi = _starpu_prof_tool_get_info(starpu_prof_tool_event_start_cpu_exec, devid, worker_task->workerid, starpu_prof_tool_driver_cpu, -1, (void*)func); starpu_prof_tool_callbacks.starpu_prof_tool_event_start_cpu_exec(&pi, NULL, NULL); @@ -401,7 +401,7 @@ static int execute_job_on_cpu(struct _starpu_job *j, struct starpu_task *worker_ pi = _starpu_prof_tool_get_info(starpu_prof_tool_event_end_cpu_exec, devid, worker_task->workerid, starpu_prof_tool_driver_cpu, -1, (void*)func); starpu_prof_tool_callbacks.starpu_prof_tool_event_end_cpu_exec(&pi, NULL, NULL); #endif - _STARPU_TRACE_END_EXECUTING(); + _STARPU_TRACE_END_EXECUTING(j); } if (is_parallel_task && cl->type == STARPU_FORKJOIN) /* rebind to single CPU */ @@ -413,7 +413,7 @@ static int execute_job_on_cpu(struct _starpu_job *j, struct starpu_task *worker_ pi = _starpu_prof_tool_get_info(starpu_prof_tool_event_end_cpu_exec, devid, worker_task->workerid, starpu_prof_tool_driver_cpu, -1, (void*)func); starpu_prof_tool_callbacks.starpu_prof_tool_event_end_cpu_exec(&pi, NULL, NULL); #endif - _STARPU_TRACE_START_EXECUTING(); + _STARPU_TRACE_START_EXECUTING(j); } if (is_parallel_task) @@ -425,7 +425,7 @@ static int execute_job_on_cpu(struct _starpu_job *j, struct starpu_task *worker_ pi = _starpu_prof_tool_get_info(starpu_prof_tool_event_end_cpu_exec, devid, worker_task->workerid, starpu_prof_tool_driver_cpu, -1, (void*)func); starpu_prof_tool_callbacks.starpu_prof_tool_event_end_cpu_exec(&pi, NULL, NULL); #endif - _STARPU_TRACE_END_EXECUTING(); + _STARPU_TRACE_END_EXECUTING(j); } } diff --git a/src/drivers/cuda/driver_cuda.c b/src/drivers/cuda/driver_cuda.c index ce491c86b5..047273478e 100644 --- a/src/drivers/cuda/driver_cuda.c +++ b/src/drivers/cuda/driver_cuda.c @@ -1948,7 +1948,7 @@ static void start_job_on_cuda(struct _starpu_job *j, struct _starpu_worker *work if (_starpu_get_disable_kernels() <= 0) { - _STARPU_TRACE_START_EXECUTING(); + _STARPU_TRACE_START_EXECUTING(j); #ifdef STARPU_SIMGRID int async = task->cl->cuda_flags[j->nimpl] & STARPU_CUDA_ASYNC; unsigned workerid = worker->workerid; @@ -1991,7 +1991,7 @@ static void start_job_on_cuda(struct _starpu_job *j, struct _starpu_worker *work #endif #endif - _STARPU_TRACE_END_EXECUTING(); + _STARPU_TRACE_END_EXECUTING(j); } } @@ -2036,7 +2036,7 @@ static void execute_job_on_cuda(struct starpu_task *task, struct _starpu_worker if (STARPU_UNLIKELY(cures)) STARPU_CUDA_REPORT_ERROR(cures); #endif -#ifdef STARPU_USE_FXT +#if 0 //def STARPU_USE_FXT if (fut_active) { int k; @@ -2241,7 +2241,7 @@ int _starpu_cuda_driver_run_once(struct _starpu_worker *worker) /* Data for next task didn't have time to finish transferring :/ */ _STARPU_TRACE_WORKER_START_FETCH_INPUT(NULL, workerid); } -#ifdef STARPU_USE_FXT +#if 0 //def STARPU_USE_FXT if (fut_active) { int k; diff --git a/src/drivers/cuda/driver_cuda0.c b/src/drivers/cuda/driver_cuda0.c index a0ea924666..68f005b84d 100644 --- a/src/drivers/cuda/driver_cuda0.c +++ b/src/drivers/cuda/driver_cuda0.c @@ -618,9 +618,9 @@ static int start_job_on_cuda(struct _starpu_job *j, struct _starpu_worker *worke if (_starpu_get_disable_kernels() <= 0) { - _STARPU_TRACE_START_EXECUTING(); + _STARPU_TRACE_START_EXECUTING(j); func(_STARPU_TASK_GET_INTERFACES(task), task->cl_arg); - _STARPU_TRACE_END_EXECUTING(); + _STARPU_TRACE_END_EXECUTING(j); } return 0; diff --git a/src/drivers/cuda/driver_cuda1.c b/src/drivers/cuda/driver_cuda1.c index aa418b0538..07ea01dc43 100644 --- a/src/drivers/cuda/driver_cuda1.c +++ b/src/drivers/cuda/driver_cuda1.c @@ -1080,9 +1080,9 @@ static void start_job_on_cuda(struct _starpu_job *j, struct _starpu_worker *work if (_starpu_get_disable_kernels() <= 0) { - _STARPU_TRACE_START_EXECUTING(); + _STARPU_TRACE_START_EXECUTING(j); func(_STARPU_TASK_GET_INTERFACES(task), task->cl_arg); - _STARPU_TRACE_END_EXECUTING(); + _STARPU_TRACE_END_EXECUTING(j); } } @@ -1109,8 +1109,8 @@ static void execute_job_on_cuda(struct starpu_task *task, struct _starpu_worker cudaError_t cures = cudaEventRecord(task_events[workerid], starpu_cuda_get_local_stream()); if (STARPU_UNLIKELY(cures)) STARPU_CUDA_REPORT_ERROR(cures); -#ifdef STARPU_USE_FXT - _STARPU_TRACE_START_EXECUTING(); +#if 0 //def STARPU_USE_FXT + _STARPU_TRACE_START_EXECUTING(j); #endif } else @@ -1207,8 +1207,8 @@ int _starpu_cuda_driver_run_once(struct _starpu_worker *worker) _STARPU_TRACE_END_PROGRESS(memnode); /* Asynchronous task completed! */ finish_job_on_cuda(_starpu_get_job_associated_to_task(task), worker); -#ifdef STARPU_USE_FXT - _STARPU_TRACE_END_EXECUTING() +#if 0 //def STARPU_USE_FXT + _STARPU_TRACE_END_EXECUTING(_starpu_get_job_associated_to_task(task)); #endif _STARPU_TRACE_START_PROGRESS(memnode); } diff --git a/src/drivers/hip/driver_hip.c b/src/drivers/hip/driver_hip.c index 489790bdae..14f7d9cb8d 100644 --- a/src/drivers/hip/driver_hip.c +++ b/src/drivers/hip/driver_hip.c @@ -1280,7 +1280,7 @@ static void start_job_on_hip(struct _starpu_job *j, struct _starpu_worker *worke if (_starpu_get_disable_kernels() <= 0) { - _STARPU_TRACE_START_EXECUTING(); + _STARPU_TRACE_START_EXECUTING(j); #ifdef STARPU_PROF_TOOL pi = _starpu_prof_tool_get_info(starpu_prof_tool_event_start_gpu_exec, worker->devid, worker->workerid, starpu_prof_tool_driver_gpu, -1, (void*)func); starpu_prof_tool_callbacks.starpu_prof_tool_event_start_gpu_exec(&pi, NULL, NULL); @@ -1292,7 +1292,7 @@ static void start_job_on_hip(struct _starpu_job *j, struct _starpu_worker *worke pi = _starpu_prof_tool_get_info(starpu_prof_tool_event_end_gpu_exec, worker->devid, worker->workerid, starpu_prof_tool_driver_gpu, -1, (void*)func); starpu_prof_tool_callbacks.starpu_prof_tool_event_end_gpu_exec(&pi, NULL, NULL); #endif - _STARPU_TRACE_END_EXECUTING(); + _STARPU_TRACE_END_EXECUTING(j); } } @@ -1329,7 +1329,7 @@ static void execute_job_on_hip(struct starpu_task *task, struct _starpu_worker * hipError_t hipres = hipEventRecord(task_events[workerid][pipeline_idx], starpu_hip_get_local_stream()); if (STARPU_UNLIKELY(hipres)) STARPU_HIP_REPORT_ERROR(hipres); -#ifdef STARPU_USE_FXT +#if 0 //def STARPU_USE_FXT if (fut_active) { int k; @@ -1501,7 +1501,7 @@ int _starpu_hip_driver_run_once(struct _starpu_worker *worker) /* Data for next task didn't have time to finish transferring :/ */ _STARPU_TRACE_WORKER_START_FETCH_INPUT(NULL, workerid); } -#ifdef STARPU_USE_FXT +#if 0 //def STARPU_USE_FXT if (fut_active) { int k; diff --git a/src/drivers/max/driver_max_fpga.c b/src/drivers/max/driver_max_fpga.c index d5816c35a0..497a94643a 100644 --- a/src/drivers/max/driver_max_fpga.c +++ b/src/drivers/max/driver_max_fpga.c @@ -562,9 +562,9 @@ static int execute_job_on_fpga(struct _starpu_job *j, struct starpu_task *worker STARPU_ASSERT_MSG(func, "when STARPU_MAX_FPGA is defined in 'where', fpga_func or max_fpga_funcs has to be defined"); if (_starpu_get_disable_kernels() <= 0) { - _STARPU_TRACE_START_EXECUTING(); + _STARPU_TRACE_START_EXECUTING(j); func(_STARPU_TASK_GET_INTERFACES(task), task->cl_arg); - _STARPU_TRACE_END_EXECUTING(); + _STARPU_TRACE_END_EXECUTING(j); } } diff --git a/src/drivers/opencl/driver_opencl.c b/src/drivers/opencl/driver_opencl.c index af489ab50c..79f76282a4 100644 --- a/src/drivers/opencl/driver_opencl.c +++ b/src/drivers/opencl/driver_opencl.c @@ -1262,7 +1262,7 @@ static int _starpu_opencl_start_job(struct _starpu_job *j, struct _starpu_worker if (_starpu_get_disable_kernels() <= 0) { - _STARPU_TRACE_START_EXECUTING(); + _STARPU_TRACE_START_EXECUTING(j); #ifdef STARPU_SIMGRID double length = NAN; double energy = NAN; @@ -1327,7 +1327,7 @@ static int _starpu_opencl_start_job(struct _starpu_job *j, struct _starpu_worker cl_command_queue queue; starpu_opencl_get_queue(worker->devid, &queue); #endif - _STARPU_TRACE_END_EXECUTING(); + _STARPU_TRACE_END_EXECUTING(j); } return 0; } @@ -1392,7 +1392,7 @@ static void _starpu_opencl_execute_job(struct starpu_task *task, struct _starpu_ _STARPU_OPENCL_CHECK_AND_REPORT_ERROR(err); clFlush(queue); #endif - _STARPU_TRACE_START_EXECUTING(); + //_STARPU_TRACE_START_EXECUTING(); } } else