Quellcode durchsuchen

better feedback on failed assertion

Samuel Thibault vor 12 Jahren
Ursprung
Commit
d369a0f059

+ 1 - 1
src/core/dependencies/tags.c

@@ -276,7 +276,7 @@ void starpu_tag_restart(starpu_tag_t id)
 	struct _starpu_tag *tag = gettag_struct(id);
 
 	_starpu_spin_lock(&tag->lock);
-	STARPU_ASSERT_MSG(tag->state == STARPU_DONE, "Only completed tags can be restarted");
+	STARPU_ASSERT_MSG(tag->state == STARPU_DONE, "Only completed tags can be restarted (was %d)", tag->state);
 	tag->state = STARPU_BLOCKED;
 	_starpu_spin_unlock(&tag->lock);
 }

+ 3 - 3
src/core/dependencies/task_deps.c

@@ -66,9 +66,9 @@ void _starpu_task_declare_deps_array(struct starpu_task *task, unsigned ndeps, s
 	job = _starpu_get_job_associated_to_task(task);
 
 	if (check)
-		STARPU_ASSERT_MSG(!job->submitted || !task->destroy || task->detach, "Task dependencies have to be set before submission");
+		STARPU_ASSERT_MSG(!job->submitted || !task->destroy || task->detach, "Task dependencies have to be set before submission (submitted %u destroy %d detach %d)", job->submitted, task->destroy, task->detach);
 	else
-		STARPU_ASSERT_MSG(job->terminated <= 1, "Task dependencies have to be set before termination");
+		STARPU_ASSERT_MSG(job->terminated <= 1, "Task dependencies have to be set before termination (terminated %u)", job->terminated);
 
 	struct _starpu_cg *cg = create_cg_task(ndeps, job);
 
@@ -86,7 +86,7 @@ void _starpu_task_declare_deps_array(struct starpu_task *task, unsigned ndeps, s
 			STARPU_ASSERT_MSG(dep_job->submitted != 2, "For resubmited tasks, dependencies have to be set before first re-submission");
 			STARPU_ASSERT_MSG(!dep_job->submitted || !dep_job->task->regenerate, "For regenerated tasks, dependencies have to be set before first submission");
 		} else
-			STARPU_ASSERT_MSG(dep_job->terminated <= 1, "Task dependencies have to be set before termination");
+			STARPU_ASSERT_MSG(dep_job->terminated <= 1, "Task dependencies have to be set before termination (terminated %u)", dep_job->terminated);
 
 		_STARPU_TRACE_TASK_DEPS(dep_job, job);
 		_starpu_bound_task_dep(job, dep_job);

+ 1 - 1
src/core/jobs.c

@@ -239,7 +239,7 @@ void _starpu_handle_job_termination(struct _starpu_job *j)
 
 	if (regenerate)
 	{
-		STARPU_ASSERT_MSG(detach && !destroy && !task->synchronous, "Regenerated task must be detached, and not have detroy=1 or synchronous=1");
+		STARPU_ASSERT_MSG(detach && !destroy && !task->synchronous, "Regenerated task must be detached (was %d), and not have detroy=1 (was %d) or synchronous=1 (was %d)", detach, destroy, task->synchronous);
 
 #ifdef HAVE_AYUDAME_H
 		if (AYU_event) {

+ 2 - 2
src/core/perfmodel/perfmodel_history.c

@@ -476,7 +476,7 @@ static void dump_model_file(FILE *f, struct starpu_perfmodel *model)
 		}
 		else
 		{
-			STARPU_ASSERT_MSG(0, "Unknown history-based performance model");
+			STARPU_ASSERT_MSG(0, "Unknown history-based performance model %d", model->type);
 		}
 	}
 
@@ -540,7 +540,7 @@ static void dump_model_file(FILE *f, struct starpu_perfmodel *model)
 					max_impl = nimpl + 1;
 		}
 		else
-			STARPU_ASSERT_MSG(0, "Unknown history-based performance model");
+			STARPU_ASSERT_MSG(0, "Unknown history-based performance model %u", arch);
 
 		if (arch >= my_narch + arch_base)
 			continue;

+ 1 - 1
src/core/workers.c

@@ -181,7 +181,7 @@ static int _starpu_can_use_nth_implementation(enum starpu_archtype arch, struct
 		return func != 0;
 	}
 	default:
-		STARPU_ASSERT_MSG(0, "Unknown arch type");
+		STARPU_ASSERT_MSG(0, "Unknown arch type %d", arch);
 	}
 	return 0;
 }