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

README

@@ -1,6 +1,6 @@
 # StarPU --- Runtime system for heterogeneous multicore architectures.
 #
-# Copyright (C) 2009-2020  Université de Bordeaux, CNRS (LaBRI UMR 5800), Inria
+# Copyright (C) 2009-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
@@ -190,4 +190,4 @@ renamings), use the tools/dev/rename.sh script
 ++=============++
 
 For any questions regarding StarPU, please contact the starpu-devel
-mailing-list at starpu-devel@lists.gforge.inria.fr .
+mailing-list at starpu-devel@inria.fr.

configure.ac

@@ -18,7 +18,7 @@
 #
 # See the GNU Lesser General Public License in COPYING.LGPL for more details.
 #
-AC_INIT([StarPU], [1.3.99], [starpu-devel@lists.gforge.inria.fr], [starpu], [http://gitlab.inria.fr/starpu/starpu])
+AC_INIT([StarPU], [1.3.99], [starpu-devel@inria.fr], [starpu], [http://gitlab.inria.fr/starpu/starpu])
 AC_CONFIG_SRCDIR(include/starpu.h)
 AC_CONFIG_AUX_DIR([build-aux])
 
@@ -87,6 +87,7 @@ AC_PROG_INSTALL
 AC_PROG_MKDIR_P
 AC_CHECK_PROGS(PROG_STAT,gstat stat)
 AC_CHECK_PROGS(PROG_DATE,gdate date)
+AC_PATH_PROGS(PROG_FIND,find)
 
 dnl locate pkg-config
 PKG_PROG_PKG_CONFIG
@@ -779,7 +780,7 @@ AC_PATH_PROGS([STARPU_MS_LIB], [lib])
 AC_ARG_VAR([STARPU_MS_LIB], [Path to Microsoft's Visual Studio `lib' tool])
 AM_CONDITIONAL([STARPU_HAVE_MS_LIB], [test "x$STARPU_MS_LIB" != "x"])
 case "$target" in
-*-*-mingw*|*-*-cygwin*)
+*-*-mingw*|*-*-cygwin*|*-*-msys*)
   starpu_windows=yes
   libext=a
   AC_DEFINE(STARPU_HAVE_WINDOWS, [1], [Define this on windows.])

contrib/ci.inria.fr/job-1-build-windows.sh

@@ -1,7 +1,7 @@
 #!/bin/sh
 # StarPU --- Runtime system for heterogeneous multicore architectures.
 #
-# Copyright (C) 2013-2020  Université de Bordeaux, CNRS (LaBRI UMR 5800), Inria
+# Copyright (C) 2013-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
@@ -18,6 +18,7 @@
 set -e
 
 oldPATH=$PATH
+export PATH=/c/Builds:/usr/bin:/bin:"/c/Program Files (x86)/Microsoft Visual Studio 11.0/VC/bin":"/c/Program Files/Microsoft Visual Studio 11.0/Common7/IDE":$oldPATH
 
 tarball=$(ls -tr starpu*.tar.gz | tail -1)
 if test -z "$tarball" ; then
@@ -28,6 +29,7 @@ fi
 basename=$(basename $tarball .tar.gz)
 test -d $basename && chmod -R u+rwX $basename && rm -rf $basename
 tar xfz $tarball
+touch --date="last hour" $(find $basename)
 version=$(echo $basename | cut -d- -f2)
 winball=starpu-win32-build-${version}
 
@@ -37,20 +39,19 @@ rm -rf ${basename}/build
 mkdir ${basename}/build
 cd ${basename}/build
 
-export PATH=/c/Builds:/c/MinGW/bin/:/c/MinGW/mingw32/bin/:/c/MinGW/msys/1.0/bin:"/c/Program Files (x86)/Microsoft Visual Studio 11.0/VC/bin":"/c/Program Files/Microsoft Visual Studio 11.0/Common7/IDE":$oldPATH
 #export HWLOC=/c/StarPU/hwloc-win32-build-1.11.0
 
 prefix=${PWD}/../../${winball}
 rm -rf $prefix
 
+#--with-hwloc=${HWLOC}
+options="--without-hwloc --enable-quick-check --enable-debug --enable-verbose --enable-native-winthreads"
 day=$(date +%u)
 if test $day -le 5
 then
-#    ../configure --prefix=$prefix --with-hwloc=${HWLOC} --disable-build-examples --enable-quick-check --enable-debug --enable-verbose --enable-native-winthreads
-    ../configure --prefix=$prefix --without-hwloc --disable-build-examples --enable-quick-check --enable-debug --enable-verbose --enable-native-winthreads
+    ../configure --prefix=$prefix $options --disable-build-examples
 else
-#    ../configure --prefix=$prefix --with-hwloc=${HWLOC} --enable-quick-check --enable-debug --enable-verbose --enable-native-winthreads
-    ../configure --prefix=$prefix --without-hwloc --enable-quick-check --enable-debug --enable-verbose --enable-native-winthreads
+    ../configure --prefix=$prefix $options
 fi
 
 make

contrib/ci.inria.fr/job-1-check-windows.bat

@@ -1,6 +1,6 @@
 REM StarPU --- Runtime system for heterogeneous multicore architectures.
 REM
-REM Copyright (C) 2013-2020  Université de Bordeaux, CNRS (LaBRI UMR 5800), Inria
+REM Copyright (C) 2013-2021  Université de Bordeaux, CNRS (LaBRI UMR 5800), Inria
 REM
 REM StarPU is free software; you can redistribute it and/or modify
 REM it under the terms of the GNU Lesser General Public License as published by
@@ -14,9 +14,10 @@ REM
 REM See the GNU Lesser General Public License in COPYING.LGPL for more details.
 REM
 
-set PATH=%PATH%;C:\MinGW\msys\1.0\bin;c:\Program Files (x86)\Microsoft Visual Studio 11.0\Common7\IDE;c:\Program Files (x86)\Microsoft Visual Studio 11.0\VC\bin;C:\Users\Administrator\AppData\Local\Programs\Python\Python37-32
+set oldPATH=%PATH%
+set PATH=C:\MinGW\msys\1.0\bin;c:\MinGW\bin;C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Tools\MSVC\14.28.29333\bin\Hostx64\x64;C:\Users\Administrator\AppData\Local\Programs\Python\Python37-32;%PATH%
 sh -c "./job-1-build-windows.sh"
-set PATH=C:\Windows\SysWOW64;C:\Program Files (x86)\Mozilla Firefox;C:\Windows\system32;C:\Windows;C:\Windows\System32\Wbem;C:\Windows\System32\WindowsPowerShell\v1.0\;C:\Windows\SysWOW64;C:\Program Files\Java\jre7\bin;C:\Users\Administrator\AppData\Local\Programs\Python\Python37-32
+set PATH=%oldPATH%
 set HWLOC=c:\StarPU\hwloc-win32-build-1.11.0
 
 cd starpu_install

doc/doxygen/Makefile.am

@@ -1,6 +1,6 @@
 # StarPU --- Runtime system for heterogeneous multicore architectures.
 #
-# Copyright (C) 2009-2020  Université de Bordeaux, CNRS (LaBRI UMR 5800), Inria
+# Copyright (C) 2009-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
@@ -41,7 +41,7 @@ endif
 DOX_HTML_SRCDIR=$(DOX_HTML_DIR)
 install-exec-hook:
 	$(MKDIR_P) $(DESTDIR)$(docdir)/manual/html
-	(cd $(DOX_HTML_SRCDIR) && find . -type f -exec $(INSTALL) -c -m 644 {} $(DESTDIR)$(docdir)/manual/html \;)
+	(cd $(DOX_HTML_SRCDIR) && $(PROG_FIND) . -type f -exec $(INSTALL_DATA) {} $(DESTDIR)$(docdir)/manual/html \;)
 uninstall-hook:
 	rm -rf $(DESTDIR)$(docdir)/manual/html
 else
@@ -50,7 +50,7 @@ EXTRA_DIST += $(top_srcdir)/doc/doxygen/html
 DOX_HTML_SRCDIR=$(top_srcdir)/doc/doxygen/html
 install-exec-hook:
 	$(MKDIR_P) $(DESTDIR)$(docdir)/manual/html
-	(cd $(DOX_HTML_SRCDIR) && find . -type f -exec $(INSTALL) -c -m 644 {} $(DESTDIR)$(docdir)/manual/html \;)
+	(cd $(DOX_HTML_SRCDIR) && $(PROG_FIND) . -type f -exec $(INSTALL_DATA) {} $(DESTDIR)$(docdir)/manual/html \;)
 uninstall-hook:
 	rm -rf $(DESTDIR)$(docdir)/manual/html
 endif

doc/doxygen_dev/Makefile.am

@@ -1,6 +1,6 @@
 # StarPU --- Runtime system for heterogeneous multicore architectures.
 #
-# Copyright (C) 2009-2020  Université de Bordeaux, CNRS (LaBRI UMR 5800), Inria
+# Copyright (C) 2009-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
@@ -41,7 +41,7 @@ endif
 DOX_HTML_SRCDIR=$(DOX_HTML_DIR)
 install-exec-hook:
 	$(MKDIR_P) $(DESTDIR)$(docdir)/manual/html_dev
-	(cd $(DOX_HTML_SRCDIR) && find . -type f -exec $(INSTALL) -c -m 644 {} $(DESTDIR)$(docdir)/manual/html_dev \;)
+	(cd $(DOX_HTML_SRCDIR) && $(PROG_FIND) . -type f -exec $(INSTALL_DATA) {} $(DESTDIR)$(docdir)/manual/html_dev \;)
 uninstall-hook:
 	rm -rf $(DESTDIR)$(docdir)/manual/html_dev
 else
@@ -50,7 +50,7 @@ EXTRA_DIST += $(top_srcdir)/doc/doxygen_dev/html_dev
 DOX_HTML_SRCDIR=$(top_srcdir)/doc/doxygen_dev/html_dev
 install-exec-hook:
 	$(MKDIR_P) $(DESTDIR)$(docdir)/manual/html_dev
-	(cd $(DOX_HTML_SRCDIR) && find . -type f -exec $(INSTALL) -c -m 644 {} $(DESTDIR)$(docdir)/manual/html_dev \;)
+	(cd $(DOX_HTML_SRCDIR) && $(PROG_FIND) . -type f -exec $(INSTALL_DATA) {} $(DESTDIR)$(docdir)/manual/html_dev \;)
 uninstall-hook:
 	rm -rf $(DESTDIR)$(docdir)/manual/html_dev
 endif

include/fstarpu_mod.f90

@@ -358,7 +358,7 @@ module fstarpu_mod
                 ! int starpu_worker_get_by_devid(enum starpu_worker_archtype type, int devid);
                 function fstarpu_worker_get_by_devid(typeid, devid) bind(C)
                         use iso_c_binding, only: c_int, c_ptr
-                        integer(c_int)              :: fstarpu_worker_get_by_type
+                        integer(c_int)              :: fstarpu_worker_get_by_devid
                         type(c_ptr),value,intent(in) :: typeid ! c_intptr_t expected by C func
                         integer(c_int),value,intent(in) :: devid
                 end function fstarpu_worker_get_by_devid
@@ -2534,10 +2534,17 @@ module fstarpu_mod
                 function fstarpu_int_to_cptr(i) bind(C)
                         use iso_c_binding
                         type(c_ptr) :: fstarpu_int_to_cptr
-                        integer :: i
+                        integer(c_int) :: i
                         fstarpu_int_to_cptr = transfer(int(i,kind=c_intptr_t),C_NULL_PTR)
                 end function fstarpu_int_to_cptr
 
+                function fstarpu_long_to_cptr(i) bind(C)
+                        use iso_c_binding
+                        type(c_ptr) :: fstarpu_long_to_cptr
+                        integer(c_long) :: i
+                        fstarpu_long_to_cptr = transfer(int(i,kind=c_intptr_t),C_NULL_PTR)
+                end function fstarpu_long_to_cptr
+
                 ! Note: do not add binding declarations here in 'CONTAINS'
                 ! section, because the compiler generates empty functions for
                 ! them.

mpi/tests/Makefile.am

@@ -1,6 +1,6 @@
 # StarPU --- Runtime system for heterogeneous multicore architectures.
 #
-# Copyright (C) 2009-2020  Université de Bordeaux, CNRS (LaBRI UMR 5800), Inria
+# Copyright (C) 2009-2021  Université de Bordeaux, CNRS (LaBRI UMR 5800), Inria
 # Copyright (C) 2013       Thibaut Lambert
 #
 # StarPU is free software; you can redistribute it and/or modify
@@ -261,3 +261,5 @@ mpi_earlyrecv2_SOURCES = mpi_earlyrecv2.c
 mpi_earlyrecv2_SOURCES += ../../examples/interface/complex_interface.c
 mpi_earlyrecv2_sync_SOURCES = mpi_earlyrecv2_sync.c
 mpi_earlyrecv2_sync_SOURCES += ../../examples/interface/complex_interface.c
+
+early_stuff_CFLAGS = $(AM_CFLAGS) $(FXT_CFLAGS)

tests/Makefile.am

@@ -1,6 +1,6 @@
 # StarPU --- Runtime system for heterogeneous multicore architectures.
 #
-# Copyright (C) 2009-2020  Université de Bordeaux, CNRS (LaBRI UMR 5800), Inria
+# Copyright (C) 2009-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
@@ -651,6 +651,8 @@ endif
 datawizard_test_arbiter_SOURCES =	\
 	datawizard/test_arbiter.cpp
 
+main_starpu_worker_exists_CFLAGS = $(AM_CFLAGS) $(FXT_CFLAGS)
+
 main_deprecated_func_CFLAGS = $(AM_CFLAGS) -Wno-deprecated-declarations
 
 main_insert_task_where_SOURCES =		\
@@ -828,6 +830,10 @@ helper_starpu_data_dup_ro_SOURCES +=		\
 	main/increment.cu
 endif
 
+datawizard_interfaces_copy_interfaces_CFLAGS = $(AM_CFLAGS) $(FXT_CFLAGS)
+
+datawizard_data_register_CFLAGS = $(AM_CFLAGS) $(FXT_CFLAGS)
+
 ###################
 # Block interface #
 ###################
@@ -835,6 +841,8 @@ datawizard_interfaces_block_block_interface_SOURCES= \
 	datawizard/interfaces/test_interfaces.c  \
 	datawizard/interfaces/block/block_interface.c
 
+datawizard_interfaces_block_block_interface_CFLAGS = $(AM_CFLAGS) $(FXT_CFLAGS)
+
 if STARPU_USE_CUDA
 datawizard_interfaces_block_block_interface_SOURCES+= \
 	datawizard/interfaces/block/block_cuda.cu
@@ -854,6 +862,8 @@ datawizard_interfaces_tensor_tensor_interface_SOURCES= \
 	datawizard/interfaces/test_interfaces.c  \
 	datawizard/interfaces/tensor/tensor_interface.c
 
+datawizard_interfaces_tensor_tensor_interface_CFLAGS = $(AM_CFLAGS) $(FXT_CFLAGS)
+
 if STARPU_USE_CUDA
 datawizard_interfaces_tensor_tensor_interface_SOURCES+= \
 	datawizard/interfaces/tensor/tensor_cuda.cu
@@ -873,6 +883,8 @@ datawizard_interfaces_bcsr_bcsr_interface_SOURCES= \
 	datawizard/interfaces/test_interfaces.c \
 	datawizard/interfaces/bcsr/bcsr_interface.c
 
+datawizard_interfaces_bcsr_bcsr_interface_CFLAGS = $(AM_CFLAGS) $(FXT_CFLAGS)
+
 if STARPU_USE_CUDA
 datawizard_interfaces_bcsr_bcsr_interface_SOURCES+= \
 	datawizard/interfaces/bcsr/bcsr_cuda.cu
@@ -892,6 +904,8 @@ datawizard_interfaces_coo_coo_interface_SOURCES= \
 	datawizard/interfaces/test_interfaces.c \
 	datawizard/interfaces/coo/coo_interface.c
 
+datawizard_interfaces_coo_coo_interface_CFLAGS = $(AM_CFLAGS) $(FXT_CFLAGS)
+
 if STARPU_USE_CUDA
 datawizard_interfaces_coo_coo_interface_SOURCES+= \
 	datawizard/interfaces/coo/coo_cuda.cu
@@ -911,6 +925,8 @@ datawizard_interfaces_csr_csr_interface_SOURCES= \
 	datawizard/interfaces/test_interfaces.c  \
 	datawizard/interfaces/csr/csr_interface.c
 
+datawizard_interfaces_csr_csr_interface_CFLAGS = $(AM_CFLAGS) $(FXT_CFLAGS)
+
 if STARPU_USE_CUDA
 datawizard_interfaces_csr_csr_interface_SOURCES+= \
 	datawizard/interfaces/csr/csr_cuda.cu
@@ -924,10 +940,15 @@ nobase_STARPU_OPENCL_DATA_DATA += \
 endif
 
 
+####################
+# Vector interface #
+####################
 datawizard_interfaces_vector_vector_interface_SOURCES =               \
 	datawizard/interfaces/vector/vector_interface.c               \
 	datawizard/interfaces/test_interfaces.c
 
+datawizard_interfaces_vector_vector_interface_CFLAGS = $(AM_CFLAGS) $(FXT_CFLAGS)
+
 if STARPU_USE_CUDA
 datawizard_interfaces_vector_vector_interface_SOURCES +=               \
 	datawizard/interfaces/vector/vector_cuda.cu
@@ -947,6 +968,8 @@ datawizard_interfaces_matrix_matrix_interface_SOURCES= \
 	datawizard/interfaces/test_interfaces.c        \
 	datawizard/interfaces/matrix/matrix_interface.c
 
+datawizard_interfaces_matrix_matrix_interface_CFLAGS = $(AM_CFLAGS) $(FXT_CFLAGS)
+
 if STARPU_USE_CUDA
 datawizard_interfaces_matrix_matrix_interface_SOURCES+= \
 	datawizard/interfaces/matrix/matrix_cuda.cu
@@ -968,6 +991,8 @@ datawizard_interfaces_multiformat_multiformat_interface_SOURCES =           \
 	datawizard/interfaces/multiformat/multiformat_interface.c           \
 	datawizard/interfaces/multiformat/multiformat_conversion_codelets.c
 
+datawizard_interfaces_multiformat_multiformat_interface_CFLAGS = $(AM_CFLAGS) $(FXT_CFLAGS)
+
 if STARPU_USE_CUDA
 datawizard_interfaces_multiformat_multiformat_interface_SOURCES+=                  \
 	datawizard/interfaces/multiformat/multiformat_cuda.cu                      \
@@ -1004,10 +1029,15 @@ datawizard_interfaces_multiformat_advanced_same_handle_SOURCES= \
 	datawizard/interfaces/multiformat/advanced/same_handle.c
 
 
+######################
+# Variable interface #
+######################
 datawizard_interfaces_variable_variable_interface_SOURCES=   \
 	datawizard/interfaces/test_interfaces.c              \
 	datawizard/interfaces/variable/variable_interface.c
 
+datawizard_interfaces_variable_variable_interface_CFLAGS = $(AM_CFLAGS) $(FXT_CFLAGS)
+
 if STARPU_USE_CUDA
 datawizard_interfaces_variable_variable_interface_SOURCES+= \
 	datawizard/interfaces/variable/variable_cuda.cu
@@ -1027,6 +1057,7 @@ datawizard_interfaces_void_void_interface_SOURCES=\
 	datawizard/interfaces/test_interfaces.c        \
 	datawizard/interfaces/void/void_interface.c
 
+datawizard_interfaces_void_void_interface_CFLAGS = $(AM_CFLAGS) $(FXT_CFLAGS)
 
 overlap_gpu_concurrency_SOURCES=\
 	overlap/gpu_concurrency.c
@@ -1097,6 +1128,7 @@ perfmodels_feed_SOURCES=\
 	perfmodels/feed.c
 
 sched_policies_execute_all_tasks_LDFLAGS = $(AM_LDFLAGS) -lm
+sched_policies_execute_all_tasks_CFLAGS = $(AM_LDFLAGS) $(FXT_CFLAGS)
 
 # Fortran90 tests
 

tests/datawizard/interfaces/multiformat/advanced/multiformat_handle_conversion.c

@@ -1,6 +1,6 @@
 /* StarPU --- Runtime system for heterogeneous multicore architectures.
  *
- * Copyright (C) 2011-2020  Université de Bordeaux, CNRS (LaBRI UMR 5800), Inria
+ * Copyright (C) 2011-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
@@ -35,6 +35,7 @@ extern struct stats global_stats;
 static void
 create_and_submit_tasks(int where, starpu_data_handle_t handles[])
 {
+	int ret;
 	FPRINTF(stderr, "***** Starting Task 1\n");
 	struct starpu_codelet cl =
 	{
@@ -60,7 +61,8 @@ create_and_submit_tasks(int where, starpu_data_handle_t handles[])
 	task->synchronous = SYNCHRONOUS;
 	task->cl = &cl;
 	task->handles[0] = handles[0];
-	assert(starpu_task_submit(task) == 0);
+	ret = starpu_task_submit(task);
+	assert(ret == 0);
 
 #ifdef STARPU_USE_CPU
 	FPRINTF(stderr, "***** Starting Task 2\n");
@@ -76,7 +78,8 @@ create_and_submit_tasks(int where, starpu_data_handle_t handles[])
 	task2->synchronous = SYNCHRONOUS;
 	task2->cl = &cl2;
 	task2->handles[0] = handles[1];
-	assert(starpu_task_submit(task2) == 0);
+	ret = starpu_task_submit(task2);
+	assert(ret == 0);
 #endif /* !STARPU_USE_CPU */
 
 	FPRINTF(stderr, "***** Starting Task 3\n");
@@ -105,9 +108,11 @@ create_and_submit_tasks(int where, starpu_data_handle_t handles[])
 	task3->cl = &cl3;
 	task3->handles[0] = handles[0];
 	task3->handles[1] = handles[1];
-	assert(starpu_task_submit(task3) == 0);
+	ret = starpu_task_submit(task3);
+	assert(ret == 0);
 
-	assert(starpu_task_wait_for_all() == 0);
+	ret = starpu_task_wait_for_all();
+	assert(ret == 0);
 
 	FPRINTF(stderr, "***** End of all tasks\n");
 	return;

tests/datawizard/variable_size.c

@@ -1,6 +1,6 @@
 /* StarPU --- Runtime system for heterogeneous multicore architectures.
  *
- * Copyright (C) 2017-2020  Université de Bordeaux, CNRS (LaBRI UMR 5800), Inria
+ * Copyright (C) 2017-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
@@ -90,7 +90,7 @@ void variable_size_data_register(starpu_data_handle_t *handleptr, unsigned x, un
 	{
 		starpu_interface_variable_size_ops.interfaceid = starpu_data_interface_get_next_id();
 	}
-	struct variable_size_interface interface =
+	struct variable_size_interface vsinterface =
 	{
 		.id = starpu_interface_variable_size_ops.interfaceid,
 		.x = x,
@@ -98,20 +98,19 @@ void variable_size_data_register(starpu_data_handle_t *handleptr, unsigned x, un
 	};
 
 	/* Simulate that tiles close to the diagonal are more dense */
-	interface.size = FULLSIZE * (starpu_lrand48() % 1024 + 1024) / 2048. * (N-sqrt(abs((int)x-(int)y)*N)) / N;
+	vsinterface.size = FULLSIZE * (starpu_lrand48() % 1024 + 1024) / 2048. * (N-sqrt(abs((int)x-(int)y)*N)) / N;
 	/* Round to page size */
-	interface.size -= interface.size & (65536-1);
+	vsinterface.size -= vsinterface.size & (65536-1);
 
-	_starpu_simgrid_data_new(interface.size);
+	_starpu_simgrid_data_new(vsinterface.size);
 
-	starpu_data_register(handleptr, -1, &interface, &starpu_interface_variable_size_ops);
+	starpu_data_register(handleptr, -1, &vsinterface, &starpu_interface_variable_size_ops);
 }
 
 static size_t variable_size_get_size(starpu_data_handle_t handle)
 {
-	struct variable_size_interface *interface =
-		starpu_data_get_interface_on_node(handle, STARPU_MAIN_RAM);
-	return interface->size;
+	struct variable_size_interface *vsinterface = starpu_data_get_interface_on_node(handle, STARPU_MAIN_RAM);
+	return vsinterface->size;
 }
 
 static size_t variable_size_get_max_size(starpu_data_handle_t handle)
@@ -148,8 +147,7 @@ static starpu_ssize_t describe_variable_size(void *data_interface, char *buf, si
 }
 
 /* returns the size of the allocated area */
-static starpu_ssize_t allocate_variable_size_on_node(void *data_interface,
-						   unsigned dst_node)
+static starpu_ssize_t allocate_variable_size_on_node(void *data_interface, unsigned dst_node)
 {
 	struct variable_size_interface *variable_interface = data_interface;
 	variable_interface->ptr = starpu_malloc_on_node_flags(dst_node, variable_interface->size, STARPU_MALLOC_PINNED | STARPU_MALLOC_COUNT | STARPU_MEMORY_OVERFLOW);
@@ -159,8 +157,7 @@ static starpu_ssize_t allocate_variable_size_on_node(void *data_interface,
 	return 0;
 }
 
-static void free_variable_size_on_node(void *data_interface,
-					unsigned node)
+static void free_variable_size_on_node(void *data_interface, unsigned node)
 {
 	struct variable_size_interface *variable_interface = data_interface;
 	starpu_free_on_node(node, variable_interface->ptr, variable_interface->size);
@@ -213,7 +210,6 @@ static struct starpu_data_interface_ops starpu_interface_variable_size_ops =
 };
 
 
-
 static void kernel(void *descr[], void *cl_arg)
 {
 	struct variable_size_interface *variable_interface = descr[0];

tests/microbenchs/bandwidth.c

@@ -1,6 +1,6 @@
 /* StarPU --- Runtime system for heterogeneous multicore architectures.
  *
- * Copyright (C) 2009-2020  Université de Bordeaux, CNRS (LaBRI UMR 5800), Inria
+ * Copyright (C) 2009-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
@@ -318,7 +318,7 @@ int main(int argc, char **argv)
 		}
 		sched = bench(&argc, &argv, n, total_ncpus, 0, SCHED);
 		sched_int = bench(&argc, &argv, n, total_ncpus, 1, SCHED);
-		printf("%d\t%.2f\t%.2f\t%.2f\t%.2f\t%.2f\t%.2f\t%.2f\t%.2f\n",
+		printf("%u\t%.2f\t%.2f\t%.2f\t%.2f\t%.2f\t%.2f\t%.2f\t%.2f\n",
 				n,
 				alone/1000,
 				sched/1000, sched*100/alone,