Browse Source

fix bug when using unpartitioned data initially registered with NULL pointer

Nathalie Furmento 6 years ago
parent
commit
f5b95e54ca
3 changed files with 119 additions and 2 deletions
  1. 20 2
      src/datawizard/filters.c
  2. 1 0
      tests/Makefile.am
  3. 98 0
      tests/datawizard/partition_init.c

+ 20 - 2
src/datawizard/filters.c

@@ -539,18 +539,36 @@ void starpu_data_unpartition(starpu_data_handle_t root_handle, unsigned gatherin
 
 
 	for (node = 0; node < STARPU_MAXNODES; node++)
 	for (node = 0; node < STARPU_MAXNODES; node++)
 	{
 	{
-		root_handle->per_node[node].state =
-			still_valid[node]?newstate:STARPU_INVALID;
+		root_handle->per_node[node].state = still_valid[node]?newstate:STARPU_INVALID;
 	}
 	}
 
 
+	root_handle->initialized=1;
 	for (child = 0; child < root_handle->nchildren; child++)
 	for (child = 0; child < root_handle->nchildren; child++)
 	{
 	{
 		starpu_data_handle_t child_handle = starpu_data_get_child(root_handle, child);
 		starpu_data_handle_t child_handle = starpu_data_get_child(root_handle, child);
+		if (!child_handle->initialized) root_handle->initialized=0;
 		_starpu_data_free_interfaces(child_handle);
 		_starpu_data_free_interfaces(child_handle);
 		_starpu_spin_unlock(&child_handle->header_lock);
 		_starpu_spin_unlock(&child_handle->header_lock);
 		_starpu_spin_destroy(&child_handle->header_lock);
 		_starpu_spin_destroy(&child_handle->header_lock);
 	}
 	}
 
 
+	if (root_handle->initialized)
+	{
+		starpu_data_handle_t child = &root_handle->children[0];
+		for (node = 0; node < STARPU_MAXNODES; node++)
+		{
+			struct _starpu_data_replicate *root_replicate;
+			struct _starpu_data_replicate *child_replicate;
+
+			root_replicate = &root_handle->per_node[node];
+			child_replicate = &child->per_node[node];
+
+			root_replicate->state = child_replicate->state;
+			root_replicate->allocated = child_replicate->allocated;
+			root_replicate->initialized = child_replicate->initialized;
+		}
+	}
+
 	for (child = 0; child < root_handle->nchildren; child++)
 	for (child = 0; child < root_handle->nchildren; child++)
 	{
 	{
 		starpu_data_handle_t child_handle = starpu_data_get_child(root_handle, child);
 		starpu_data_handle_t child_handle = starpu_data_get_child(root_handle, child);

+ 1 - 0
tests/Makefile.am

@@ -313,6 +313,7 @@ myPROGRAMS +=				\
 	datawizard/in_place_partition   	\
 	datawizard/in_place_partition   	\
 	datawizard/partition_dep   		\
 	datawizard/partition_dep   		\
 	datawizard/partition_lazy		\
 	datawizard/partition_lazy		\
+	datawizard/partition_init		\
 	datawizard/gpu_register   		\
 	datawizard/gpu_register   		\
 	datawizard/gpu_ptr_register   		\
 	datawizard/gpu_ptr_register   		\
 	datawizard/variable_parameters		\
 	datawizard/variable_parameters		\

+ 98 - 0
tests/datawizard/partition_init.c

@@ -0,0 +1,98 @@
+/* StarPU --- Runtime system for heterogeneous multicore architectures.
+ *
+ * Copyright (C) 2019                                     CNRS
+ *
+ * StarPU is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; either version 2.1 of the License, or (at
+ * your option) any later version.
+ *
+ * StarPU is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ *
+ * See the GNU Lesser General Public License in COPYING.LGPL for more details.
+ */
+
+#include <stdio.h>
+#include <starpu.h>
+#include "../helper.h"
+
+void my_func(void *buffers[], void *cl_arg)
+{
+	unsigned nb = STARPU_VECTOR_GET_NX(buffers[0]);
+        int *v = (int *)STARPU_VECTOR_GET_PTR(buffers[0]);
+
+	unsigned i;
+	for(i=0 ; i<nb ; i++)
+	{
+		v[i] = i+42;
+		FPRINTF(stderr, "setting v[%d] to %d\n",i, v[i]);
+	}
+}
+
+struct starpu_codelet my_codelet =
+{
+	.cpu_funcs = {my_func},
+	.nbuffers = 1,
+	.modes = {STARPU_W}
+};
+
+void display_func(void *buffers[], void *cl_arg)
+{
+	unsigned nb = STARPU_VECTOR_GET_NX(buffers[0]);
+        int *v = (int *)STARPU_VECTOR_GET_PTR(buffers[0]);
+
+	unsigned i;
+	for(i=0 ; i<nb ; i++) FPRINTF(stderr, "v[%d] = %d\n", i, v[i]);
+}
+
+struct starpu_codelet display_codelet =
+{
+	.cpu_funcs = {display_func},
+	.nbuffers = 1,
+	.modes = {STARPU_R}
+};
+
+int main(int argc, char **argv)
+{
+	int ret = starpu_initialize(NULL, &argc, &argv);
+	if (ret == -ENODEV) return STARPU_TEST_SKIPPED;
+	STARPU_CHECK_RETURN_VALUE(ret, "starpu_init");
+
+	if (starpu_cpu_worker_get_count() == 0)
+	{
+		FPRINTF(stderr, "The test needs at least 1 CPU worker\n");
+		starpu_shutdown();
+		return STARPU_TEST_SKIPPED;
+	}
+
+	struct starpu_data_filter f =
+	{
+	 	.filter_func = starpu_vector_filter_block,
+		.nchildren = starpu_cpu_worker_get_count()
+	};
+
+	starpu_data_handle_t array_handle;
+	starpu_vector_data_register(&array_handle, -1, (uintptr_t)NULL, f.nchildren*2, sizeof(int));
+	starpu_data_partition(array_handle, &f);
+
+	int i;
+	for(i=0 ; i<starpu_data_get_nb_children(array_handle) ; i++)
+	{
+		starpu_data_handle_t sub_handle = starpu_data_get_sub_data(array_handle, 1, i);
+		ret = starpu_task_insert(&my_codelet,
+					 STARPU_W, sub_handle,
+					 0);
+		STARPU_CHECK_RETURN_VALUE(ret, "starpu_task_insert");
+	}
+	starpu_data_unpartition(array_handle, STARPU_MAIN_RAM);
+
+	ret = starpu_task_insert(&display_codelet,
+				 STARPU_R, array_handle,
+				 0);
+	STARPU_CHECK_RETURN_VALUE(ret, "starpu_task_insert");
+
+	starpu_data_unregister(array_handle);
+	starpu_shutdown();
+}