Merge branch 'fpga' of gitlab.inria.fr:starpu/starpu into fpga

tests/fpga/max_fpga_advanced_static.c

@@ -192,9 +192,6 @@ static struct starpu_codelet cl3 =
 
 int main(int argc, char **argv)
 {
-	/* Enable profiling */
-	starpu_profiling_status_set(1);
-
 	struct starpu_conf conf;
 	starpu_data_handle_t handle_a, handle_b, handle_ct1, handle_ct2, handle_c;
 	int ret;
@@ -213,6 +210,9 @@ int main(int argc, char **argv)
 	if (ret == -ENODEV) return STARPU_TEST_SKIPPED;
 	STARPU_CHECK_RETURN_VALUE(ret, "starpu_init");
 
+	/* Enable profiling */
+	starpu_profiling_status_set(STARPU_PROFILING_ENABLE);
+
 	int32_t a[SIZE];
 	int32_t b[SIZE];
 	int32_t c[SIZE];

tests/fpga/max_fpga_basic_static.c

@@ -148,9 +148,6 @@ static struct starpu_codelet cl3 =
 
 int main(int argc, char **argv)
 {
-	/* Enable profiling */
-	starpu_profiling_status_set(1);
-
 	struct starpu_conf conf;
 	starpu_data_handle_t handle_a, handle_b, handle_ct1, handle_ct2, handle_c;
 	int ret;
@@ -163,6 +160,9 @@ int main(int argc, char **argv)
 	if (ret == -ENODEV) return STARPU_TEST_SKIPPED;
 	STARPU_CHECK_RETURN_VALUE(ret, "starpu_init");
 
+	/* Enable profiling */
+	starpu_profiling_status_set(STARPU_PROFILING_ENABLE);
+
 	int32_t a[SIZE];
 	int32_t b[SIZE];
 	int32_t c[SIZE];

tests/fpga/max_fpga_dynamic.c

@@ -170,9 +170,6 @@ static struct starpu_codelet cl3 =
 
 int main(int argc, char **argv)
 {
-	/* Enable profiling */
-	starpu_profiling_status_set(1);
-
 	struct starpu_conf conf;
 	starpu_data_handle_t handle_a, handle_b, handle_ct1, handle_ct2, handle_c;
 	int ret;
@@ -193,6 +190,9 @@ int main(int argc, char **argv)
 	if (ret == -ENODEV) return STARPU_TEST_SKIPPED;
 	STARPU_CHECK_RETURN_VALUE(ret, "starpu_init");
 
+	/* Enable profiling */
+	starpu_profiling_status_set(STARPU_PROFILING_ENABLE);
+
 	int32_t a[SIZE];
 	int32_t b[SIZE];
 	int32_t c[SIZE];

tests/fpga/max_fpga_mux.c

@@ -124,7 +124,7 @@ static struct starpu_codelet cl1 =
 	.nbuffers = 3,
 	.modes = {STARPU_R, STARPU_R, STARPU_W},
 	.specific_nodes = 1,
-	.nodes = {STARPU_SPECIFIC_NODE_CPU, STARPU_SPECIFIC_NODE_CPU, STARPU_SPECIFIC_NODE_LOCAL},
+	.nodes = {STARPU_SPECIFIC_NODE_CPU, STARPU_SPECIFIC_NODE_CPU, STARPU_SPECIFIC_NODE_CPU},
 };
 
 void fpga_impl2(void *buffers[], void *cl_arg)
@@ -172,8 +172,10 @@ static struct starpu_codelet cl2 =
 {
  	.fpga_funcs = {fpga_impl2},
 	.nbuffers = 3,
-	.modes = {STARPU_R, STARPU_R, STARPU_W}
+	.modes = {STARPU_R, STARPU_R, STARPU_W},
 	/* local by default */
+	.specific_nodes = 1,
+	.nodes = {STARPU_SPECIFIC_NODE_CPU, STARPU_SPECIFIC_NODE_CPU, STARPU_SPECIFIC_NODE_CPU},
 };
 
 void fpga_impl3(void *buffers[], void *cl_arg)
@@ -223,14 +225,11 @@ static struct starpu_codelet cl3 =
 	.nbuffers = 3,
 	.modes = {STARPU_R, STARPU_R, STARPU_W},
 	.specific_nodes = 1,
-	.nodes = {STARPU_SPECIFIC_NODE_LOCAL, STARPU_SPECIFIC_NODE_LOCAL, STARPU_SPECIFIC_NODE_CPU},
+	.nodes = {STARPU_SPECIFIC_NODE_CPU, STARPU_SPECIFIC_NODE_CPU, STARPU_SPECIFIC_NODE_CPU},
 };
 
 int main(int argc, char **argv)
 {
-	/* Enable profiling */
-	starpu_profiling_status_set(1);
-
 	struct starpu_conf conf;
 	starpu_data_handle_t handle_a, handle_b, handle_ct1, handle_ct2, handle_c;
 	int ret;
@@ -251,6 +250,9 @@ int main(int argc, char **argv)
 	if (ret == -ENODEV) return STARPU_TEST_SKIPPED;
 	STARPU_CHECK_RETURN_VALUE(ret, "starpu_init");
 
+	/* Enable profiling */
+	starpu_profiling_status_set(STARPU_PROFILING_ENABLE);
+
 	int32_t a[SIZE];
 	int32_t b[SIZE];
 	int32_t c[SIZE];