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

doc/doxygen/chapters/440_fpga_support.doxy

@@ -1,6 +1,6 @@
 /* StarPU --- Runtime system for heterogeneous multicore architectures.
  *
- * Copyright (C) 2019-2020  Université de Bordeaux, CNRS (LaBRI UMR 5800), Inria
+ * Copyright (C) 2019-2021  Université de Bordeaux, CNRS (LaBRI UMR 5800), Inria
  *
  * 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
@@ -268,6 +268,9 @@ In the <c>main</c> function, there are four important steps:
 The rest of the application (data registration, task submission, etc.)
 is as usual with StarPU.
 
+The design load can also be delegated to StarPU by specifying an array of load
+specifications in <c>starpu_conf::fpga_load</c>.
+
 Complete examples are available in <c>tests/fpga/*.c</c>
 
 \subsection FPGADataTransfers Data Transfers in StarPU/FPGA Applications

src/core/topology.c

@@ -1709,7 +1709,7 @@ static int _starpu_init_machine_config(struct _starpu_machine_config *config, in
 #endif
 			unsigned already_busy_cpus = mpi_ms_busy_cpus
 				+ cuda_busy_cpus
-				+ topology->ndevices[STARPU_OPENCL_WORKER];
+				+ topology->ndevices[STARPU_OPENCL_WORKER]
 				+ topology->ndevices[STARPU_FPGA_WORKER];
 
 			long avail_cpus = (long) topology->nhwworker[STARPU_CPU_WORKER][0] - (long) already_busy_cpus;

src/drivers/max/driver_fpga.c

@@ -157,10 +157,6 @@ static size_t _starpu_fpga_get_global_mem_size(unsigned devid)
 	return global_mem[devid];
 }
 
-static void init_fpga_worker_context(unsigned workerid)
-{
-}
-
 static void init_device_context(unsigned devid)
 {
 	struct starpu_max_load *load = _starpu_config.conf.fpga_load;
@@ -386,7 +382,7 @@ int _starpu_fpga_driver_deinit(struct _starpu_worker *fpga_worker)
 	_STARPU_TRACE_WORKER_DEINIT_START;
 
 	unsigned memnode = fpga_worker->memory_node;
-	_starpu_handle_all_pending_node_data_requests(memnode);
+	_starpu_datawizard_handle_all_pending_node_data_requests(memnode);
 
 	/* In case there remains some memory that was automatically
 	 * allocated by StarPU, we release it now. Note that data