Use STARPU_ATTRIBUTE_* macros

doc/doxygen/chapters/code/vector_scal_cpu.c

@@ -57,7 +57,7 @@ void scal_sse_func(void *buffers[], void *cl_arg)
     unsigned int n_iterations = n/4;
 
     __m128 *VECTOR = (__m128*) vector;
-    __m128 FACTOR __attribute__((aligned(16)));
+    __m128 FACTOR STARPU_ATTRIBUTE_ALIGNED(16);
     float factor = *(float *) cl_arg;
     FACTOR = _mm_set1_ps(factor);
 

doc/tutorial/vector_scal_plugin.c

@@ -55,7 +55,7 @@ vector_scal_sse (unsigned int size, float vector[size], float factor)
   unsigned int n_iterations = size / 4;
 
   __m128 *VECTOR = (__m128 *) vector;
-  __m128 _FACTOR __attribute__ ((aligned (16)));
+  __m128 _FACTOR STARPU_ATTRIBUTE_ALIGNED(16);
   _FACTOR = _mm_set1_ps (factor);
 
   unsigned int i;

examples/audio/starpu_audio_processing.c

@@ -164,7 +164,7 @@ typedef struct
 static fft_plan_cache plans[STARPU_NMAXWORKERS];
 
 #ifdef STARPU_USE_CUDA
-static void band_filter_kernel_gpu(void *descr[], __attribute__((unused)) void *arg)
+static void band_filter_kernel_gpu(void *descr[], STARPU_ATTRIBUTE_UNUSED void *arg)
 {
 	cufftResult cures;
 
@@ -217,7 +217,7 @@ static void band_filter_kernel_gpu(void *descr[], __attribute__((unused)) void *
 
 static starpu_pthread_mutex_t fftw_mutex = PTHREAD_MUTEX_INITIALIZER;
 
-static void band_filter_kernel_cpu(void *descr[], __attribute__((unused)) void *arg)
+static void band_filter_kernel_cpu(void *descr[], STARPU_ATTRIBUTE_UNUSED void *arg)
 {
 	float *localA = (float *)STARPU_VECTOR_GET_PTR(descr[0]);
 

examples/axpy/axpy.c

@@ -48,7 +48,7 @@ TYPE _alpha = 3.41;
 /* descriptors for StarPU */
 starpu_data_handle_t _handle_y, _handle_x;
 
-void axpy_cpu(void *descr[], __attribute__((unused)) void *arg)
+void axpy_cpu(void *descr[], STARPU_ATTRIBUTE_UNUSED void *arg)
 {
 	TYPE alpha = *((TYPE *)arg);
 
@@ -61,7 +61,7 @@ void axpy_cpu(void *descr[], __attribute__((unused)) void *arg)
 }
 
 #ifdef STARPU_USE_CUDA
-void axpy_gpu(void *descr[], __attribute__((unused)) void *arg)
+void axpy_gpu(void *descr[], STARPU_ATTRIBUTE_UNUSED void *arg)
 {
 	TYPE alpha = *((TYPE *)arg);
 

examples/basic_examples/mult.c

@@ -77,7 +77,7 @@ static unsigned zdim = 512;
  * registered data with the "matrix" data interface, we use the matrix macros.
  */
 
-void cpu_mult(void *descr[], __attribute__((unused))  void *arg)
+void cpu_mult(void *descr[], STARPU_ATTRIBUTE_UNUSED  void *arg)
 {
 	float *subA, *subB, *subC;
 	uint32_t nxC, nyC, nyA;
@@ -335,8 +335,8 @@ static int launch_tasks(void)
 	return 0;
 }
 
-int main(__attribute__ ((unused)) int argc, 
-	 __attribute__ ((unused)) char **argv)
+int main(STARPU_ATTRIBUTE_UNUSED int argc, 
+	 STARPU_ATTRIBUTE_UNUSED char **argv)
 {
 	int ret;
 

examples/basic_examples/variable.c

@@ -21,14 +21,14 @@
 
 static unsigned niter = 50000;
 
-extern void cpu_codelet(void *descr[], __attribute__ ((unused)) void *_args);
+extern void cpu_codelet(void *descr[], STARPU_ATTRIBUTE_UNUSED void *_args);
 
 #ifdef STARPU_USE_CUDA
-extern void cuda_codelet(void *descr[], __attribute__ ((unused)) void *_args);
+extern void cuda_codelet(void *descr[], STARPU_ATTRIBUTE_UNUSED void *_args);
 #endif
 
 #ifdef STARPU_USE_OPENCL
-extern void opencl_codelet(void *descr[], __attribute__ ((unused)) void *_args);
+extern void opencl_codelet(void *descr[], STARPU_ATTRIBUTE_UNUSED void *_args);
 struct starpu_opencl_program opencl_program;
 #endif
 

examples/basic_examples/variable_kernels_cpu.c

@@ -17,7 +17,7 @@
 
 #include <starpu.h>
 
-void cpu_codelet(void *descr[], __attribute__ ((unused)) void *_args)
+void cpu_codelet(void *descr[], STARPU_ATTRIBUTE_UNUSED void *_args)
 {
 	float *val = (float *)STARPU_VARIABLE_GET_PTR(descr[0]);
 

examples/basic_examples/vector_scal_cpu_template.h

@@ -68,7 +68,7 @@ void func_name(void *buffers[], void *cl_arg)                                  \
 	unsigned int n_iterations = n/4;                                       \
                                                                                \
 	__m128 *VECTOR = (__m128*) vector;                                     \
-	__m128 FACTOR __attribute__((aligned(16)));                            \
+	__m128 FACTOR STARPU_ATTRIBUTE_ALIGNED(16);                            \
 	float factor = *(float *) cl_arg;                                      \
 	FACTOR = _mm_set1_ps(factor);                                          \
                                                                                \

examples/binary/binary.c

@@ -1,6 +1,6 @@
 /* StarPU --- Runtime system for heterogeneous multicore architectures.
  *
- * Copyright (C) 2009, 2010-2011  Université de Bordeaux 1
+ * Copyright (C) 2009, 2010-2011, 2013  Université de Bordeaux 1
  * Copyright (C) 2010, 2011, 2012, 2013  Centre National de la Recherche Scientifique
  *
  * StarPU is free software; you can redistribute it and/or modify
@@ -21,7 +21,7 @@
 #define FPRINTF(ofile, fmt, ...) do { if (!getenv("STARPU_SSILENT")) {fprintf(ofile, fmt, ## __VA_ARGS__); }} while(0)
 
 #ifdef STARPU_USE_OPENCL
-extern void opencl_codelet(void *descr[], __attribute__ ((unused)) void *_args);
+extern void opencl_codelet(void *descr[], STARPU_ATTRIBUTE_UNUSED void *_args);
 struct starpu_opencl_program opencl_program;
 #endif
 
@@ -36,7 +36,7 @@ struct starpu_codelet cl =
 
 int compute(char *file_name, int load_as_file)
 {
-	float float_array[4] __attribute__ ((aligned (16))) = { 0.0f, 0.0f, 0.0f, 0.0f};
+	float float_array[4] STARPU_ATTRIBUTE_ALIGNED(16) = { 0.0f, 0.0f, 0.0f, 0.0f};
 	starpu_data_handle_t float_array_handle;
 	unsigned i;
 	int ret = 0;

examples/callback/callback.c

@@ -22,7 +22,7 @@
 
 starpu_data_handle_t handle;
 
-void cpu_codelet(void *descr[], __attribute__ ((unused)) void *_args)
+void cpu_codelet(void *descr[], STARPU_ATTRIBUTE_UNUSED void *_args)
 {
 	int *val = (int *)STARPU_VARIABLE_GET_PTR(descr[0]);
 

examples/cholesky/cholesky.h

@@ -142,7 +142,7 @@ extern struct starpu_perfmodel chol_model_11;
 extern struct starpu_perfmodel chol_model_21;
 extern struct starpu_perfmodel chol_model_22;
 
-static void __attribute__((unused)) parse_args(int argc, char **argv)
+static void STARPU_ATTRIBUTE_UNUSED parse_args(int argc, char **argv)
 {
 	int i;
 	for (i = 1; i < argc; i++)

examples/cholesky/cholesky_implicit.c

@@ -70,7 +70,7 @@ static struct starpu_codelet cl22 =
  *	and construct the DAG
  */
 
-static void callback_turn_spmd_on(void *arg __attribute__ ((unused)))
+static void callback_turn_spmd_on(void *arg STARPU_ATTRIBUTE_UNUSED)
 {
 	cl22.type = STARPU_SPMD;
 }

examples/cholesky/cholesky_kernels.c

@@ -27,7 +27,7 @@
  *   U22 
  */
 
-static inline void chol_common_cpu_codelet_update_u22(void *descr[], int s, __attribute__((unused)) void *_args)
+static inline void chol_common_cpu_codelet_update_u22(void *descr[], int s, STARPU_ATTRIBUTE_UNUSED void *_args)
 {
 	/* printf("22\n"); */
 	float *left 	= (float *)STARPU_MATRIX_GET_PTR(descr[0]);
@@ -96,7 +96,7 @@ void chol_cublas_codelet_update_u22(void *descr[], void *_args)
  * U21
  */
 
-static inline void chol_common_codelet_update_u21(void *descr[], int s, __attribute__((unused)) void *_args)
+static inline void chol_common_codelet_update_u21(void *descr[], int s, STARPU_ATTRIBUTE_UNUSED void *_args)
 {
 /*	printf("21\n"); */
 	float *sub11;
@@ -144,7 +144,7 @@ void chol_cublas_codelet_update_u21(void *descr[], void *_args)
  *	U11
  */
 
-static inline void chol_common_codelet_update_u11(void *descr[], int s, __attribute__((unused)) void *_args) 
+static inline void chol_common_codelet_update_u11(void *descr[], int s, STARPU_ATTRIBUTE_UNUSED void *_args) 
 {
 /*	printf("11\n"); */
 	float *sub11;

examples/heat/dw_factolu.h

@@ -49,7 +49,7 @@ typedef struct
 } cl_args;
 
 #ifdef CHECK_RESULTS
-static void __attribute__ ((unused)) compare_A_LU(float *A, float *LU,
+static void STARPU_ATTRIBUTE_UNUSED compare_A_LU(float *A, float *LU,
 				unsigned size, unsigned ld)
 {
 	unsigned i,j;

examples/heat/dw_factolu_kernels.c

@@ -103,7 +103,7 @@ void display_stat_heat(void)
  *   U22 
  */
 
-static inline void dw_common_cpu_codelet_update_u22(void *descr[], int s, __attribute__((unused)) void *_args)
+static inline void dw_common_cpu_codelet_update_u22(void *descr[], int s, STARPU_ATTRIBUTE_UNUSED void *_args)
 {
 	float *left 	= (float *)STARPU_MATRIX_GET_PTR(descr[0]);
 	float *right 	= (float *)STARPU_MATRIX_GET_PTR(descr[1]);
@@ -169,7 +169,7 @@ void dw_cublas_codelet_update_u22(void *descr[], void *_args)
  * U12
  */
 
-static inline void dw_common_codelet_update_u12(void *descr[], int s, __attribute__((unused)) void *_args)
+static inline void dw_common_codelet_update_u12(void *descr[], int s, STARPU_ATTRIBUTE_UNUSED void *_args)
 {
 	float *sub11;
 	float *sub12;
@@ -234,7 +234,7 @@ void dw_cublas_codelet_update_u12(void *descr[], void *_args)
  * U21
  */
 
-static inline void dw_common_codelet_update_u21(void *descr[], int s, __attribute__((unused)) void *_args)
+static inline void dw_common_codelet_update_u21(void *descr[], int s, STARPU_ATTRIBUTE_UNUSED void *_args)
 {
 	float *sub11;
 	float *sub21;
@@ -311,7 +311,7 @@ static inline void debug_print(float *tab, unsigned ld, unsigned n)
 	FPRINTF(stderr, "\n");
 }
 
-static inline void dw_common_codelet_update_u11(void *descr[], int s, __attribute__((unused)) void *_args) 
+static inline void dw_common_codelet_update_u11(void *descr[], int s, STARPU_ATTRIBUTE_UNUSED void *_args) 
 {
 	float *sub11;
 

examples/heat/dw_sparse_cg.h

@@ -67,7 +67,7 @@ struct cg_problem
 };
 
 /* some useful functions */
-static void __attribute__((unused)) parse_args(int argc, char **argv)
+static void STARPU_ATTRIBUTE_UNUSED parse_args(int argc, char **argv)
 {
 	int i;
 	for (i = 1; i < argc; i++)
@@ -98,7 +98,7 @@ static void __attribute__((unused)) parse_args(int argc, char **argv)
 }
 
 
-static void __attribute__ ((unused)) print_results(float *result, unsigned size)
+static void STARPU_ATTRIBUTE_UNUSED print_results(float *result, unsigned size)
 {
 	printf("**** RESULTS **** \n");
 	unsigned i;

examples/heat/dw_sparse_cg_kernels.c

@@ -51,7 +51,7 @@
  *		descr[0] = A, descr[1] = x, descr [2] = r, descr[3] = b
  */
 
-void cpu_codelet_func_1(void *descr[], __attribute__((unused)) void *arg)
+void cpu_codelet_func_1(void *descr[], STARPU_ATTRIBUTE_UNUSED void *arg)
 {
 	float *nzval = (float *)STARPU_CSR_GET_NZVAL(descr[0]);
 	uint32_t *colind = STARPU_CSR_GET_COLIND(descr[0]);
@@ -93,7 +93,7 @@ void cpu_codelet_func_1(void *descr[], __attribute__((unused)) void *arg)
  *	compute d = r
  *		descr[0] = d, descr[1] = r
  */
-void cpu_codelet_func_2(void *descr[], __attribute__((unused)) void *arg)
+void cpu_codelet_func_2(void *descr[], STARPU_ATTRIBUTE_UNUSED void *arg)
 {
 	/* simply copy r into d */
 	uint32_t nx = STARPU_VECTOR_GET_NX(descr[0]);
@@ -160,7 +160,7 @@ void cublas_codelet_func_3(void *descr[], void *arg)
  *		descr[0] = A, descr[1] = d, descr [2] = q
  */
 
-void cpu_codelet_func_4(void *descr[], __attribute__((unused)) void *arg)
+void cpu_codelet_func_4(void *descr[], STARPU_ATTRIBUTE_UNUSED void *arg)
 {
 	float *nzval = (float *)STARPU_CSR_GET_NZVAL(descr[0]);
 	uint32_t *colind = STARPU_CSR_GET_COLIND(descr[0]);

examples/heat/heat_display.c

@@ -143,7 +143,7 @@ static void display(void)
 }
 
 
-static void pressKey(unsigned char key, int x __attribute__ ((unused)), int y  __attribute__ ((unused)))
+static void pressKey(unsigned char key, int x STARPU_ATTRIBUTE_UNUSED, int y  STARPU_ATTRIBUTE_UNUSED)
 {
 	switch (key)
 	{

examples/incrementer/incrementer.c

@@ -22,15 +22,15 @@ static unsigned niter = 50000;
 #define FPRINTF(ofile, fmt, ...) do { if (!getenv("STARPU_SSILENT")) {fprintf(ofile, fmt, ## __VA_ARGS__); }} while(0)
 
 #ifdef STARPU_USE_CUDA
-extern void cuda_codelet(void *descr[], __attribute__ ((unused)) void *_args);
+extern void cuda_codelet(void *descr[], STARPU_ATTRIBUTE_UNUSED void *_args);
 #endif
 
 #ifdef STARPU_USE_OPENCL
-extern void opencl_codelet(void *descr[], __attribute__ ((unused)) void *_args);
+extern void opencl_codelet(void *descr[], STARPU_ATTRIBUTE_UNUSED void *_args);
 struct starpu_opencl_program opencl_program;
 #endif
 
-void cpu_codelet(void *descr[], __attribute__ ((unused)) void *_args)
+void cpu_codelet(void *descr[], STARPU_ATTRIBUTE_UNUSED void *_args)
 {
 	float *val = (float *)STARPU_VECTOR_GET_PTR(descr[0]);
 
@@ -52,7 +52,7 @@ int main(int argc, char **argv)
 	if (argc == 2)
 		niter = atoi(argv[1]);
 
-	float float_array[4] __attribute__ ((aligned (16))) = { 0.0f, 0.0f, 0.0f, 0.0f};
+	float float_array[4] STARPU_ATTRIBUTE_ALIGNED(16) = { 0.0f, 0.0f, 0.0f, 0.0f};
 
 	starpu_data_handle_t float_array_handle;
 	starpu_vector_data_register(&float_array_handle, 0 /* home node */,

examples/interface/complex.c

@@ -45,7 +45,7 @@ static int can_execute(unsigned workerid, struct starpu_task *task, unsigned nim
 }
 
 #ifdef STARPU_USE_CUDA
-extern void copy_complex_codelet_cuda(void *descr[], __attribute__ ((unused)) void *_args);
+extern void copy_complex_codelet_cuda(void *descr[], STARPU_ATTRIBUTE_UNUSED void *_args);
 #endif
 #ifdef STARPU_USE_OPENCL
 extern void copy_complex_codelet_opencl(void *buffers[], void *args);

examples/interface/complex_kernels.cu

@@ -28,7 +28,7 @@ static __global__ void complex_copy_cuda(double *o_real, double *o_imaginary, do
 	}
 }
 
-extern "C" void copy_complex_codelet_cuda(void *descr[], __attribute__ ((unused)) void *_args)
+extern "C" void copy_complex_codelet_cuda(void *descr[], STARPU_ATTRIBUTE_UNUSED void *_args)
 {
 	(void)_args;
 

examples/lu/xlu.h

@@ -28,7 +28,7 @@
         (2*((uint64_t)n1)*((uint64_t)n2)*((uint64_t)n3))
 
 #ifdef CHECK_RESULTS
-static void __attribute__ ((unused)) compare_A_LU(float *A, float *LU,
+static void STARPU_ATTRIBUTE_UNUSED compare_A_LU(float *A, float *LU,
 				unsigned size, unsigned ld)
 {
 	unsigned i,j;

examples/lu/xlu_implicit_pivot.c

@@ -193,7 +193,7 @@ static int dw_codelet_facto_pivot(starpu_data_handle_t *dataAp,
 }
 
 starpu_data_handle_t get_block_with_striding(starpu_data_handle_t *dataAp,
-			unsigned nblocks __attribute__((unused)), unsigned j, unsigned i)
+			unsigned nblocks STARPU_ATTRIBUTE_UNUSED, unsigned j, unsigned i)
 {
 	/* we use filters */
 	return starpu_data_get_sub_data(*dataAp, 2, j, i);

examples/lu/xlu_kernels.c

@@ -32,7 +32,7 @@ static const TYPE m1 = -1.0f;
  */
 
 static inline void STARPU_LU(common_u22)(void *descr[],
-				int s, __attribute__((unused)) void *_args)
+				int s, STARPU_ATTRIBUTE_UNUSED void *_args)
 {
 	TYPE *right 	= (TYPE *)STARPU_MATRIX_GET_PTR(descr[0]);
 	TYPE *left 	= (TYPE *)STARPU_MATRIX_GET_PTR(descr[1]);
@@ -145,7 +145,7 @@ struct starpu_codelet cl22 =
  */
 
 static inline void STARPU_LU(common_u12)(void *descr[],
-				int s, __attribute__((unused)) void *_args)
+				int s, STARPU_ATTRIBUTE_UNUSED void *_args)
 {
 	TYPE *sub11;
 	TYPE *sub12;
@@ -233,7 +233,7 @@ struct starpu_codelet cl12 =
  */
 
 static inline void STARPU_LU(common_u21)(void *descr[],
-				int s, __attribute__((unused)) void *_args)
+				int s, STARPU_ATTRIBUTE_UNUSED void *_args)
 {
 	TYPE *sub11;
 	TYPE *sub21;
@@ -318,7 +318,7 @@ struct starpu_codelet cl21 =
  */
 
 static inline void STARPU_LU(common_u11)(void *descr[],
-				int s, __attribute__((unused)) void *_args)
+				int s, STARPU_ATTRIBUTE_UNUSED void *_args)
 {
 	TYPE *sub11;
 

examples/lu/xlu_pivot.c

@@ -325,7 +325,7 @@ static int dw_codelet_facto_pivot(starpu_data_handle_t *dataAp,
 }
 
 starpu_data_handle_t get_block_with_striding(starpu_data_handle_t *dataAp,
-			unsigned nblocks __attribute__((unused)), unsigned j, unsigned i)
+			unsigned nblocks STARPU_ATTRIBUTE_UNUSED, unsigned j, unsigned i)
 {
 	/* we use filters */
 	return starpu_data_get_sub_data(*dataAp, 2, j, i);

examples/matvecmult/matvecmult.c

@@ -22,7 +22,7 @@
 
 #ifdef STARPU_USE_OPENCL
 struct starpu_opencl_program opencl_code;
-void opencl_codelet(void *descr[], __attribute__ ((unused)) void *_args)
+void opencl_codelet(void *descr[], STARPU_ATTRIBUTE_UNUSED void *_args)
 {
 	cl_kernel kernel;
 	cl_command_queue queue;

examples/mult/xgemm.c

@@ -183,13 +183,13 @@ static void mult_kernel_common(void *descr[], int type)
 }
 
 #ifdef STARPU_USE_CUDA
-static void cublas_mult(void *descr[], __attribute__((unused)) void *arg)
+static void cublas_mult(void *descr[], STARPU_ATTRIBUTE_UNUSED void *arg)
 {
 	mult_kernel_common(descr, STARPU_CUDA);
 }
 #endif
 
-static void cpu_mult(void *descr[], __attribute__((unused))  void *arg)
+static void cpu_mult(void *descr[], STARPU_ATTRIBUTE_UNUSED  void *arg)
 {
 	mult_kernel_common(descr, STARPU_CPU);
 }

examples/pi/pi_redux.c

@@ -54,7 +54,7 @@ static unsigned short xsubi[STARPU_NMAXWORKERS*PADDING];
 static starpu_drand48_data randbuffer[STARPU_NMAXWORKERS*PADDING];
 
 /* Function to initialize the random number generator in the current worker */
-static void init_rng(void *arg __attribute__((unused)))
+static void init_rng(void *arg STARPU_ATTRIBUTE_UNUSED)
 {
 #ifdef STARPU_HAVE_CURAND
 	curandStatus_t res;
@@ -138,7 +138,7 @@ static void parse_args(int argc, char **argv)
  *	Monte-carlo kernel
  */
 
-void pi_func_cpu(void *descr[], void *cl_arg __attribute__ ((unused)))
+void pi_func_cpu(void *descr[], void *cl_arg STARPU_ATTRIBUTE_UNUSED)
 {
 	int workerid = starpu_worker_get_id();
 
@@ -175,7 +175,7 @@ void pi_func_cpu(void *descr[], void *cl_arg __attribute__ ((unused)))
 extern void pi_redux_cuda_kernel(float *x, float *y, unsigned n, unsigned long *shot_cnt);
 
 #ifdef STARPU_HAVE_CURAND
-static void pi_func_cuda(void *descr[], void *cl_arg __attribute__ ((unused)))
+static void pi_func_cuda(void *descr[], void *cl_arg STARPU_ATTRIBUTE_UNUSED)
 {
 	curandStatus_t res;
 

examples/ppm_downscaler/yuv_downscaler.c

@@ -52,7 +52,7 @@ void parse_args(int argc, char **argv)
 #define FRAMESIZE	sizeof(struct yuv_frame)
 #define NEW_FRAMESIZE	sizeof(struct yuv_new_frame)
 
-void ds_kernel_cpu(void *descr[], __attribute__((unused)) void *arg)
+void ds_kernel_cpu(void *descr[], STARPU_ATTRIBUTE_UNUSED void *arg)
 {
 	uint8_t *input = (uint8_t *)STARPU_MATRIX_GET_PTR(descr[0]);
 	const unsigned input_ld = STARPU_MATRIX_GET_LD(descr[0]);

examples/profiling/profiling.c

@@ -23,8 +23,8 @@
 
 static unsigned niter = 500;
 
-void sleep_codelet(__attribute__ ((unused)) void *descr[],
-			__attribute__ ((unused)) void *_args)
+void sleep_codelet(STARPU_ATTRIBUTE_UNUSED void *descr[],
+			STARPU_ATTRIBUTE_UNUSED void *_args)
 {
 	usleep(1000);
 }

examples/sched_ctx/parallel_code.c

@@ -26,7 +26,7 @@
 int tasks_executed = 0;
 starpu_pthread_mutex_t mut;
 
-static void sched_ctx_func(void *descr[] __attribute__ ((unused)), void *arg __attribute__ ((unused)))
+static void sched_ctx_func(void *descr[] STARPU_ATTRIBUTE_UNUSED, void *arg STARPU_ATTRIBUTE_UNUSED)
 {
 	starpu_pthread_mutex_lock(&mut);
 	tasks_executed++;

examples/sched_ctx/sched_ctx.c

@@ -26,7 +26,7 @@
 int tasks_executed = 0;
 starpu_pthread_mutex_t mut;
 
-static void sched_ctx_func(void *descr[] __attribute__ ((unused)), void *arg __attribute__ ((unused)))
+static void sched_ctx_func(void *descr[] STARPU_ATTRIBUTE_UNUSED, void *arg STARPU_ATTRIBUTE_UNUSED)
 {
 	starpu_pthread_mutex_lock(&mut);
 	tasks_executed++;

examples/scheduler/dummy_sched.c

@@ -129,7 +129,7 @@ static struct starpu_sched_policy dummy_sched_policy =
 	.policy_description = "dummy scheduling strategy"
 };
 
-static void dummy_func(void *descr[] __attribute__ ((unused)), void *arg __attribute__ ((unused)))
+static void dummy_func(void *descr[] STARPU_ATTRIBUTE_UNUSED, void *arg STARPU_ATTRIBUTE_UNUSED)
 {
 }
 

examples/spmv/dw_block_spmv.c

@@ -105,12 +105,12 @@ void init_problem_callback(void *arg)
 	}
 }
 
-unsigned get_bcsr_nchildren(__attribute__((unused)) struct starpu_data_filter *f, starpu_data_handle_t handle)
+unsigned get_bcsr_nchildren(STARPU_ATTRIBUTE_UNUSED struct starpu_data_filter *f, starpu_data_handle_t handle)
 {
   return (unsigned)starpu_bcsr_get_nnz(handle);
 }
 
-struct starpu_data_interface_ops *get_bcsr_child_ops(__attribute__((unused)) struct starpu_data_filter *f, __attribute__((unused)) unsigned child) 
+struct starpu_data_interface_ops *get_bcsr_child_ops(STARPU_ATTRIBUTE_UNUSED struct starpu_data_filter *f, STARPU_ATTRIBUTE_UNUSED unsigned child) 
 {
   return &starpu_interface_matrix_ops;
 }
@@ -277,8 +277,8 @@ void print_results(void)
 	}
 }
 
-int main(__attribute__ ((unused)) int argc,
-	__attribute__ ((unused)) char **argv)
+int main(STARPU_ATTRIBUTE_UNUSED int argc,
+	STARPU_ATTRIBUTE_UNUSED char **argv)
 {
 	int ret;
 

examples/spmv/dw_block_spmv_kernels.c

@@ -21,7 +21,7 @@
  *   U22 
  */
 
-static inline void common_block_spmv(void *descr[], int s, __attribute__((unused)) void *_args)
+static inline void common_block_spmv(void *descr[], int s, STARPU_ATTRIBUTE_UNUSED void *_args)
 {
 	/* printf("22\n"); */
 	float *block 	= (float *)STARPU_MATRIX_GET_PTR(descr[0]);

examples/spmv/matrix_market/mmio.c

@@ -277,8 +277,8 @@ int mm_write_mtx_array_size(FILE *f, int M, int N)
 /* use when I[], J[], and val[]J, and val[] are already allocated */
 /******************************************************************/
 
-int mm_read_mtx_crd_data(FILE *f, int M __attribute__ ((unused)) , 
-				 int N __attribute__ ((unused)) , int nz, int I[], int J[],
+int mm_read_mtx_crd_data(FILE *f, int M STARPU_ATTRIBUTE_UNUSED , 
+				 int N STARPU_ATTRIBUTE_UNUSED , int nz, int I[], int J[],
         double val[], MM_typecode matcode)
 {
     int i;

examples/spmv/spmv_kernels.c

@@ -113,7 +113,7 @@ void compile_spmv_opencl_kernel(void)
 }
 #endif
 
-void spmv_kernel_cpu(void *descr[], __attribute__((unused))  void *arg)
+void spmv_kernel_cpu(void *descr[], STARPU_ATTRIBUTE_UNUSED  void *arg)
 {
 	float *nzval = (float *)STARPU_CSR_GET_NZVAL(descr[0]);
 	uint32_t *colind = STARPU_CSR_GET_COLIND(descr[0]);

examples/stencil/stencil-kernels.c

@@ -542,7 +542,7 @@ unsigned top_per_worker[STARPU_NMAXWORKERS];
 unsigned bottom_per_worker[STARPU_NMAXWORKERS];
 
 /* top save, CPU version */
-void dummy_func_top_cpu(void *descr[] __attribute__((unused)), void *arg)
+void dummy_func_top_cpu(void *descr[] STARPU_ATTRIBUTE_UNUSED, void *arg)
 {
 	struct block_description *block = (struct block_description *) arg;
 	int workerid = starpu_worker_get_id();
@@ -558,7 +558,7 @@ void dummy_func_top_cpu(void *descr[] __attribute__((unused)), void *arg)
 }
 
 /* bottom save, CPU version */
-void dummy_func_bottom_cpu(void *descr[] __attribute__((unused)), void *arg)
+void dummy_func_bottom_cpu(void *descr[] STARPU_ATTRIBUTE_UNUSED, void *arg)
 {
 	struct block_description *block = (struct block_description *) arg;
 	int workerid = starpu_worker_get_id();
@@ -572,7 +572,7 @@ void dummy_func_bottom_cpu(void *descr[] __attribute__((unused)), void *arg)
 
 /* top save, CUDA version */
 #ifdef STARPU_USE_CUDA
-static void dummy_func_top_cuda(void *descr[] __attribute__((unused)), void *arg)
+static void dummy_func_top_cuda(void *descr[] STARPU_ATTRIBUTE_UNUSED, void *arg)
 {
 	struct block_description *block = (struct block_description *) arg;
 	int workerid = starpu_worker_get_id();
@@ -589,7 +589,7 @@ static void dummy_func_top_cuda(void *descr[] __attribute__((unused)), void *arg
 }
 
 /* bottom save, CUDA version */
-static void dummy_func_bottom_cuda(void *descr[] __attribute__((unused)), void *arg)
+static void dummy_func_bottom_cuda(void *descr[] STARPU_ATTRIBUTE_UNUSED, void *arg)
 {
 	struct block_description *block = (struct block_description *) arg;
 	int workerid = starpu_worker_get_id();
@@ -605,7 +605,7 @@ static void dummy_func_bottom_cuda(void *descr[] __attribute__((unused)), void *
 
 /* top save, OpenCL version */
 #ifdef STARPU_USE_OPENCL
-static void dummy_func_top_opencl(void *descr[] __attribute__((unused)), void *arg)
+static void dummy_func_top_opencl(void *descr[] STARPU_ATTRIBUTE_UNUSED, void *arg)
 {
 	struct block_description *block = (struct block_description *) arg;
 	int workerid = starpu_worker_get_id();
@@ -625,7 +625,7 @@ static void dummy_func_top_opencl(void *descr[] __attribute__((unused)), void *a
 }
 
 /* bottom save, OPENCL version */
-static void dummy_func_bottom_opencl(void *descr[] __attribute__((unused)), void *arg)
+static void dummy_func_bottom_opencl(void *descr[] STARPU_ATTRIBUTE_UNUSED, void *arg)
 {
 	struct block_description *block = (struct block_description *) arg;
 	int workerid = starpu_worker_get_id();

examples/stencil/stencil-tasks.c

@@ -213,7 +213,7 @@ void create_task_update(unsigned iter, unsigned z, int local_rank)
 }
 
 /* Dummy empty codelet taking one buffer */
-void null_func(void *descr[] __attribute__((unused)), void *arg __attribute__((unused))) { }
+void null_func(void *descr[] STARPU_ATTRIBUTE_UNUSED, void *arg STARPU_ATTRIBUTE_UNUSED) { }
 static struct starpu_codelet null =
 {
 	.modes = { STARPU_W, STARPU_W },

examples/tag_example/tag_example.c

@@ -149,7 +149,7 @@ static int create_task_grid(unsigned piter)
 }
 
 
-void callback_cpu(void *argcb __attribute__ ((unused)))
+void callback_cpu(void *argcb STARPU_ATTRIBUTE_UNUSED)
 {
 	unsigned newcnt = STARPU_ATOMIC_ADD(&callback_cnt, -1);	
 
@@ -167,8 +167,8 @@ void callback_cpu(void *argcb __attribute__ ((unused)))
 	}
 }
 
-void cpu_codelet(void *descr[] __attribute__((unused)),
-			void *_args __attribute__ ((unused)))
+void cpu_codelet(void *descr[] STARPU_ATTRIBUTE_UNUSED,
+			void *_args STARPU_ATTRIBUTE_UNUSED)
 {
 /*	printf("execute task\n"); */
 }
@@ -205,7 +205,7 @@ static void express_deps(unsigned i, unsigned j, unsigned piter)
 	}
 }
 
-int main(int argc __attribute__((unused)) , char **argv __attribute__((unused)))
+int main(int argc STARPU_ATTRIBUTE_UNUSED , char **argv STARPU_ATTRIBUTE_UNUSED)
 {
 	int ret;
 

examples/tag_example/tag_example2.c

@@ -101,11 +101,11 @@ static int create_task_grid(unsigned iter)
 	return 0;
 }
 
-void cpu_codelet(void *descr[] __attribute__ ((unused)), void *_args __attribute__ ((unused)))
+void cpu_codelet(void *descr[] STARPU_ATTRIBUTE_UNUSED, void *_args STARPU_ATTRIBUTE_UNUSED)
 {
 }
 
-int main(int argc __attribute__((unused)) , char **argv __attribute__((unused)))
+int main(int argc STARPU_ATTRIBUTE_UNUSED , char **argv STARPU_ATTRIBUTE_UNUSED)
 {
 	unsigned i;
 	int ret;

examples/tag_example/tag_example3.c

@@ -103,11 +103,11 @@ static int create_task_grid(unsigned iter)
 	return 0;
 }
 
-void cpu_codelet(void *descr[] __attribute__ ((unused)), void *_args __attribute__ ((unused)))
+void cpu_codelet(void *descr[] STARPU_ATTRIBUTE_UNUSED, void *_args STARPU_ATTRIBUTE_UNUSED)
 {
 }
 
-int main(int argc __attribute__((unused)) , char **argv __attribute__((unused)))
+int main(int argc STARPU_ATTRIBUTE_UNUSED , char **argv STARPU_ATTRIBUTE_UNUSED)
 {
 	unsigned i;
 	int ret;

examples/tag_example/tag_example4.c

@@ -86,7 +86,7 @@ static void parse_args(int argc, char **argv)
 	}
 }
 
-int main(int argc __attribute__((unused)) , char **argv __attribute__((unused)))
+int main(int argc STARPU_ATTRIBUTE_UNUSED , char **argv STARPU_ATTRIBUTE_UNUSED)
 {
 	unsigned i, j;
 	int ret;

examples/tag_example/tag_restartable.c

@@ -105,7 +105,7 @@ static int start_task_grid(unsigned iter)
 	return 0;
 }
 
-void cpu_codelet(void *descr[] __attribute__((unused)), void *_args __attribute__((unused)))
+void cpu_codelet(void *descr[] STARPU_ATTRIBUTE_UNUSED, void *_args STARPU_ATTRIBUTE_UNUSED)
 {
 /*	int i = (uintptr_t) _args;
 	printf("doing %x\n", i);
@@ -114,7 +114,7 @@ void cpu_codelet(void *descr[] __attribute__((unused)), void *_args __attribute_
 */
 }
 
-int main(int argc __attribute__((unused)) , char **argv __attribute__((unused)))
+int main(int argc STARPU_ATTRIBUTE_UNUSED , char **argv STARPU_ATTRIBUTE_UNUSED)
 {
 	unsigned i, j;
 	int ret;

include/starpu_task.h

@@ -22,6 +22,7 @@
 
 #include <starpu.h>
 #include <starpu_data.h>
+#include <starpu_util.h>
 #include <starpu_task_bundle.h>
 #include <errno.h>
 

include/starpu_util.h

@@ -22,7 +22,8 @@
 #include <stdlib.h>
 #include <string.h>
 #include <assert.h>
-#include <starpu.h>
+
+#include <starpu_config.h>
 
 #ifdef __cplusplus
 extern "C"
@@ -43,11 +44,19 @@ extern "C"
 #  define STARPU_LIKELY(expr)            (__builtin_expect(!!(expr),1))
 #  define STARPU_ATTRIBUTE_UNUSED                  __attribute__((unused))
 #  define STARPU_ATTRIBUTE_INTERNAL      __attribute__ ((visibility ("internal")))
+#  define STARPU_ATTRIBUTE_MALLOC                  __attribute__((malloc))
+#  define STARPU_ATTRIBUTE_WARN_UNUSED_RESULT      __attribute__((warn_unused_result))
+#  define STARPU_ATTRIBUTE_PURE                    __attribute__((pure))
+#  define STARPU_ATTRIBUTE_ALIGNED(size)           __attribute__((aligned(size)))
 #else
 #  define STARPU_UNLIKELY(expr)          (expr)
 #  define STARPU_LIKELY(expr)            (expr)
 #  define STARPU_ATTRIBUTE_UNUSED
 #  define STARPU_ATTRIBUTE_INTERNAL
+#  define STARPU_ATTRIBUTE_MALLOC
+#  define STARPU_ATTRIBUTE_WARN_UNUSED_RESULT
+#  define STARPU_ATTRIBUTE_PURE
+#  define STARPU_ATTRIBUTE_ALIGNED(size)
 #endif
 
 #if STARPU_GNUC_PREREQ(3, 1) && !defined(BUILDING_STARPU) && !defined(STARPU_USE_DEPRECATED_API) && !defined(STARPU_USE_DEPRECATED_ONE_ZERO_API)

mpi/examples/complex/mpi_complex.c

@@ -18,7 +18,7 @@
 #include <interface/complex_interface.h>
 #include <interface/complex_codelet.h>
 
-void display_foo_codelet(void *descr[], __attribute__ ((unused)) void *_args)
+void display_foo_codelet(void *descr[], STARPU_ATTRIBUTE_UNUSED void *_args)
 {
 	int *foo = (int *)STARPU_VARIABLE_GET_PTR(descr[0]);
 	fprintf(stderr, "foo = %d\n", *foo);

mpi/examples/matrix_decomposition/mpi_cholesky_kernels.c

@@ -33,7 +33,7 @@
  * U22
  */
 
-static inline void chol_common_cpu_codelet_update_u22(void *descr[], int s, __attribute__((unused)) void *_args)
+static inline void chol_common_cpu_codelet_update_u22(void *descr[], int s, STARPU_ATTRIBUTE_UNUSED void *_args)
 {
 	//printf("22\n");
 	float *left 	= (float *)STARPU_MATRIX_GET_PTR(descr[0]);
@@ -93,7 +93,7 @@ void chol_cublas_codelet_update_u22(void *descr[], void *_args)
  * U21
  */
 
-static inline void chol_common_codelet_update_u21(void *descr[], int s, __attribute__((unused)) void *_args)
+static inline void chol_common_codelet_update_u21(void *descr[], int s, STARPU_ATTRIBUTE_UNUSED void *_args)
 {
 //	printf("21\n");
 	float *sub11;
@@ -141,7 +141,7 @@ void chol_cublas_codelet_update_u21(void *descr[], void *_args)
  *	U11
  */
 
-static inline void chol_common_codelet_update_u11(void *descr[], int s, __attribute__((unused)) void *_args)
+static inline void chol_common_codelet_update_u11(void *descr[], int s, STARPU_ATTRIBUTE_UNUSED void *_args)
 {
 //	printf("11\n");
 	float *sub11;

mpi/examples/mpi_lu/pxlu_kernels.c

@@ -26,7 +26,7 @@
  */
 
 static inline void STARPU_PLU(common_u22)(void *descr[],
-				int s, __attribute__((unused)) void *_args)
+				int s, STARPU_ATTRIBUTE_UNUSED void *_args)
 {
 	TYPE *right 	= (TYPE *)STARPU_MATRIX_GET_PTR(descr[0]);
 	TYPE *left 	= (TYPE *)STARPU_MATRIX_GET_PTR(descr[1]);
@@ -124,7 +124,7 @@ struct starpu_codelet STARPU_PLU(cl22) = {
  */
 
 static inline void STARPU_PLU(common_u12)(void *descr[],
-				int s, __attribute__((unused)) void *_args)
+				int s, STARPU_ATTRIBUTE_UNUSED void *_args)
 {
 	TYPE *sub11;
 	TYPE *sub12;
@@ -232,7 +232,7 @@ struct starpu_codelet STARPU_PLU(cl12) = {
  */
 
 static inline void STARPU_PLU(common_u21)(void *descr[],
-				int s, __attribute__((unused)) void *_args)
+				int s, STARPU_ATTRIBUTE_UNUSED void *_args)
 {
 	TYPE *sub11;
 	TYPE *sub21;
@@ -341,7 +341,7 @@ struct starpu_codelet STARPU_PLU(cl21) = {
  */
 
 static inline void STARPU_PLU(common_u11)(void *descr[],
-				int s, __attribute__((unused)) void *_args)
+				int s, STARPU_ATTRIBUTE_UNUSED void *_args)
 {
 	TYPE *sub11;
 

mpi/examples/stencil/stencil5.c

@@ -17,7 +17,7 @@
 #include <starpu_mpi.h>
 #include <math.h>
 
-void stencil5_cpu(void *descr[], __attribute__ ((unused)) void *_args)
+void stencil5_cpu(void *descr[], STARPU_ATTRIBUTE_UNUSED void *_args)
 {
 	unsigned *xy = (unsigned *)STARPU_VARIABLE_GET_PTR(descr[0]);
 	unsigned *xm1y = (unsigned *)STARPU_VARIABLE_GET_PTR(descr[1]);

mpi/src/starpu_mpi.c

@@ -865,7 +865,7 @@ static void _starpu_mpi_submit_new_mpi_request(void *arg)
 }
 
 #ifdef STARPU_MPI_ACTIVITY
-static unsigned _starpu_mpi_progression_hook_func(void *arg __attribute__((unused)))
+static unsigned _starpu_mpi_progression_hook_func(void *arg STARPU_ATTRIBUTE_UNUSED)
 {
 	unsigned may_block = 1;
 

mpi/tests/insert_task.c

@@ -18,7 +18,7 @@
 #include <math.h>
 #include "helper.h"
 
-void func_cpu(void *descr[], __attribute__ ((unused)) void *_args)
+void func_cpu(void *descr[], STARPU_ATTRIBUTE_UNUSED void *_args)
 {
 	unsigned *x = (unsigned *)STARPU_VARIABLE_GET_PTR(descr[0]);
 	unsigned *y = (unsigned *)STARPU_VARIABLE_GET_PTR(descr[1]);

mpi/tests/insert_task_block.c

@@ -18,7 +18,7 @@
 #include <math.h>
 #include "helper.h"
 
-void func_cpu(void *descr[], __attribute__ ((unused)) void *_args)
+void func_cpu(void *descr[], STARPU_ATTRIBUTE_UNUSED void *_args)
 {
 	unsigned *matrix = (unsigned *)STARPU_MATRIX_GET_PTR(descr[0]);
 	int nx = (int)STARPU_MATRIX_GET_NX(descr[0]);

mpi/tests/insert_task_cache.c

@@ -27,7 +27,7 @@ int main(int argc, char **argv)
 }
 #else
 
-void func_cpu(__attribute__ ((unused)) void *descr[], __attribute__ ((unused)) void *_args)
+void func_cpu(STARPU_ATTRIBUTE_UNUSED void *descr[], STARPU_ATTRIBUTE_UNUSED void *_args)
 {
 }
 

mpi/tests/insert_task_owner.c

@@ -18,7 +18,7 @@
 #include <math.h>
 #include "helper.h"
 
-void func_cpu(void *descr[], __attribute__ ((unused)) void *_args)
+void func_cpu(void *descr[], STARPU_ATTRIBUTE_UNUSED void *_args)
 {
 	int node;
 	int rank;

mpi/tests/insert_task_owner2.c

@@ -18,7 +18,7 @@
 #include <math.h>
 #include "helper.h"
 
-void func_cpu(void *descr[], __attribute__ ((unused)) void *_args)
+void func_cpu(void *descr[], STARPU_ATTRIBUTE_UNUSED void *_args)
 {
 	int *x0 = (int *)STARPU_VARIABLE_GET_PTR(descr[0]);
 	int *x1 = (int *)STARPU_VARIABLE_GET_PTR(descr[1]);

mpi/tests/insert_task_owner_data.c

@@ -18,7 +18,7 @@
 #include <math.h>
 #include "helper.h"
 
-void func_cpu(void *descr[], __attribute__ ((unused)) void *_args)
+void func_cpu(void *descr[], STARPU_ATTRIBUTE_UNUSED void *_args)
 {
 	int *x0 = (int *)STARPU_VARIABLE_GET_PTR(descr[0]);
 	int *x1 = (int *)STARPU_VARIABLE_GET_PTR(descr[1]);

mpi/tests/mpi_irecv_detached.c

@@ -32,7 +32,7 @@ starpu_data_handle_t tab_handle;
 static starpu_pthread_mutex_t mutex = STARPU_PTHREAD_MUTEX_INITIALIZER;
 static starpu_pthread_cond_t cond = STARPU_PTHREAD_COND_INITIALIZER;
 
-void callback(void *arg __attribute__((unused)))
+void callback(void *arg STARPU_ATTRIBUTE_UNUSED)
 {
 	unsigned *received = arg;
 

mpi/tests/mpi_scatter_gather.c

@@ -53,13 +53,13 @@ static struct starpu_codelet cl =
 	.modes = {STARPU_RW},
 };
 
-void scallback(void *arg __attribute__((unused)))
+void scallback(void *arg STARPU_ATTRIBUTE_UNUSED)
 {
 	char *msg = arg;
 	fprintf(stderr, "Sending completed for <%s>\n", msg);
 }
 
-void rcallback(void *arg __attribute__((unused)))
+void rcallback(void *arg STARPU_ATTRIBUTE_UNUSED)
 {
 	char *msg = arg;
 	fprintf(stderr, "Reception completed for <%s>\n", msg);

mpi/tests/ring.c

@@ -28,10 +28,10 @@ int token = 42;
 starpu_data_handle_t token_handle;
 
 #ifdef STARPU_USE_CUDA
-extern void increment_cuda(void *descr[], __attribute__ ((unused)) void *_args);
+extern void increment_cuda(void *descr[], STARPU_ATTRIBUTE_UNUSED void *_args);
 #endif
 
-void increment_cpu(void *descr[], __attribute__ ((unused)) void *_args)
+void increment_cpu(void *descr[], STARPU_ATTRIBUTE_UNUSED void *_args)
 {
 	int *tokenptr = (int *)STARPU_VECTOR_GET_PTR(descr[0]);
 	(*tokenptr)++;

mpi/tests/ring_async.c

@@ -28,10 +28,10 @@ int token = 42;
 starpu_data_handle_t token_handle;
 
 #ifdef STARPU_USE_CUDA
-extern void increment_cuda(void *descr[], __attribute__ ((unused)) void *_args);
+extern void increment_cuda(void *descr[], STARPU_ATTRIBUTE_UNUSED void *_args);
 #endif
 
-void increment_cpu(void *descr[], __attribute__ ((unused)) void *_args)
+void increment_cpu(void *descr[], STARPU_ATTRIBUTE_UNUSED void *_args)
 {
 	int *tokenptr = (int *)STARPU_VECTOR_GET_PTR(descr[0]);
 	(*tokenptr)++;

mpi/tests/ring_async_implicit.c

@@ -28,10 +28,10 @@ int token = 42;
 starpu_data_handle_t token_handle;
 
 #ifdef STARPU_USE_CUDA
-extern void increment_cuda(void *descr[], __attribute__ ((unused)) void *_args);
+extern void increment_cuda(void *descr[], STARPU_ATTRIBUTE_UNUSED void *_args);
 #endif
 
-void increment_cpu(void *descr[], __attribute__ ((unused)) void *_args)
+void increment_cpu(void *descr[], STARPU_ATTRIBUTE_UNUSED void *_args)
 {
 	int *tokenptr = (int *)STARPU_VECTOR_GET_PTR(descr[0]);
 	(*tokenptr)++;

sc_hypervisor/examples/cholesky/cholesky.h

@@ -83,7 +83,7 @@ extern struct starpu_perfmodel chol_model_11;
 extern struct starpu_perfmodel chol_model_21;
 extern struct starpu_perfmodel chol_model_22;
 
-static void __attribute__((unused)) parse_args(int argc, char **argv)
+static void STARPU_ATTRIBUTE_UNUSED parse_args(int argc, char **argv)
 {
 	int i;
 	for (i = 1; i < argc; i++)

sc_hypervisor/examples/cholesky/cholesky_implicit.c

@@ -65,7 +65,7 @@ static struct starpu_codelet cl22 =
  *	and construct the DAG
  */
 
-static void callback_turn_spmd_on(void *arg __attribute__ ((unused)))
+static void callback_turn_spmd_on(void *arg STARPU_ATTRIBUTE_UNUSED)
 {
 	cl22.type = STARPU_SPMD;
 }

sc_hypervisor/examples/cholesky/cholesky_kernels.c

@@ -30,7 +30,7 @@
  *   U22 
  */
 
-static inline void chol_common_cpu_codelet_update_u22(void *descr[], int s, __attribute__((unused)) void *_args)
+static inline void chol_common_cpu_codelet_update_u22(void *descr[], int s, STARPU_ATTRIBUTE_UNUSED void *_args)
 {
 	/* printf("22\n"); */
 	float *left 	= (float *)STARPU_MATRIX_GET_PTR(descr[0]);
@@ -99,7 +99,7 @@ void chol_cublas_codelet_update_u22(void *descr[], void *_args)
  * U21
  */
 
-static inline void chol_common_codelet_update_u21(void *descr[], int s, __attribute__((unused)) void *_args)
+static inline void chol_common_codelet_update_u21(void *descr[], int s, STARPU_ATTRIBUTE_UNUSED void *_args)
 {
 /*	printf("21\n"); */
 	float *sub11;
@@ -147,7 +147,7 @@ void chol_cublas_codelet_update_u21(void *descr[], void *_args)
  *	U11
  */
 
-static inline void chol_common_codelet_update_u11(void *descr[], int s, __attribute__((unused)) void *_args) 
+static inline void chol_common_codelet_update_u11(void *descr[], int s, STARPU_ATTRIBUTE_UNUSED void *_args) 
 {
 /*	printf("11\n"); */
 	float *sub11;

src/common/hash.c

@@ -15,13 +15,14 @@
  * See the GNU Lesser General Public License in COPYING.LGPL for more details.
  */
 
+#include <starpu.h>
 #include <starpu_hash.h>
 #include <stdlib.h>
 #include <string.h>
 
 #define _STARPU_CRC32C_POLY_BE 0x1EDC6F41
 
-static inline uint32_t __attribute__ ((pure)) starpu_crc32c_be_8(uint8_t inputbyte, uint32_t inputcrc)
+static inline uint32_t STARPU_ATTRIBUTE_PURE starpu_crc32c_be_8(uint8_t inputbyte, uint32_t inputcrc)
 {
 	unsigned i;
 	uint32_t crc;

src/common/list.h

@@ -160,7 +160,7 @@
       ENAME##_list_erase(l, e); return e; } \
   /** @internal */static inline struct ENAME *ENAME##_list_begin(struct ENAME##_list *l) \
     { return l->_head; } \
-  /** @internal */static inline struct ENAME *ENAME##_list_end(struct ENAME##_list *l __attribute__ ((unused))) \
+  /** @internal */static inline struct ENAME *ENAME##_list_end(struct ENAME##_list *l STARPU_ATTRIBUTE_UNUSED) \
     { return NULL; } \
   /** @internal */static inline struct ENAME *ENAME##_list_next(struct ENAME *i) \
     { return i->_next; } \

src/common/starpu_spinlock.h

@@ -34,7 +34,7 @@ struct _starpu_spinlock
 	_starpu_pthread_spinlock_t lock;
 #else
 	/* we only have a trivial implementation yet ! */
-	uint32_t taken __attribute__ ((aligned(16)));
+	uint32_t taken STARPU_ATTRIBUTE_ALIGNED(16);
 #endif
 #ifdef STARPU_SPINLOCK_CHECK
 	const char *last_taker;

src/core/dependencies/tags.c

@@ -108,7 +108,7 @@ static void _starpu_tag_free(void *_tag)
 			struct _starpu_cg *cg = tag->tag_successors.succ[succ];
 
 			unsigned ntags = STARPU_ATOMIC_ADD(&cg->ntags, -1);
-			unsigned remaining __attribute__ ((unused)) = STARPU_ATOMIC_ADD(&cg->remaining, -1);
+			unsigned remaining STARPU_ATTRIBUTE_UNUSED = STARPU_ATOMIC_ADD(&cg->remaining, -1);
 
 			if (!ntags && (cg->cg_type == STARPU_CG_TAG))
 				/* Last tag this cg depends on, cg becomes unreferenced */

src/core/jobs.c

@@ -41,7 +41,7 @@ void _starpu_exclude_task_from_dag(struct starpu_task *task)
 }
 
 /* create an internal struct _starpu_job structure to encapsulate the task */
-struct _starpu_job* __attribute__((malloc)) _starpu_job_create(struct starpu_task *task)
+struct _starpu_job* STARPU_ATTRIBUTE_MALLOC _starpu_job_create(struct starpu_task *task)
 {
 	struct _starpu_job *job;
         _STARPU_LOG_IN();

src/core/jobs.h

@@ -146,7 +146,7 @@ LIST_TYPE(_starpu_job,
 )
 
 /* Create an internal struct _starpu_job *structure to encapsulate the task. */
-struct _starpu_job* __attribute__((malloc)) _starpu_job_create(struct starpu_task *task);
+struct _starpu_job* STARPU_ATTRIBUTE_MALLOC _starpu_job_create(struct starpu_task *task);
 
 /* Destroy the data structure associated to the job structure */
 void _starpu_job_destroy(struct _starpu_job *j);

src/core/task.c

@@ -121,7 +121,7 @@ void starpu_task_clean(struct starpu_task *task)
 	}
 }
 
-struct starpu_task * __attribute__((malloc)) starpu_task_create(void)
+struct starpu_task * STARPU_ATTRIBUTE_MALLOC starpu_task_create(void)
 {
 	struct starpu_task *task;
 

src/core/topology.c

@@ -1322,7 +1322,7 @@ _starpu_build_topology (struct _starpu_machine_config *config, int no_mp_config)
 
 void
 _starpu_destroy_topology (
-	struct _starpu_machine_config *config __attribute__ ((unused)))
+	struct _starpu_machine_config *config STARPU_ATTRIBUTE_UNUSED)
 {
 #ifdef STARPU_USE_MIC
 	_starpu_deinit_mp_config(config);

src/datawizard/coherency.h

@@ -243,7 +243,7 @@ uint32_t _starpu_data_get_footprint(starpu_data_handle_t handle);
 
 void _starpu_push_task_output(struct _starpu_job *j, uint32_t mask);
 
-__attribute__((warn_unused_result))
+STARPU_ATTRIBUTE_WARN_UNUSED_RESULT
 int _starpu_fetch_task_input(struct _starpu_job *j, uint32_t mask);
 
 unsigned _starpu_is_data_present_or_requested(struct _starpu_data_state *state, unsigned node);

src/datawizard/copy_driver.c

@@ -406,7 +406,7 @@ static int copy_data_1_to_1_generic(starpu_data_handle_t handle,
 #endif /* !SIMGRID */
 }
 
-int __attribute__((warn_unused_result)) _starpu_driver_copy_data_1_to_1(starpu_data_handle_t handle,
+int STARPU_ATTRIBUTE_WARN_UNUSED_RESULT _starpu_driver_copy_data_1_to_1(starpu_data_handle_t handle,
 									struct _starpu_data_replicate *src_replicate,
 									struct _starpu_data_replicate *dst_replicate,
 									unsigned donotread,

src/datawizard/datastats.c

@@ -26,14 +26,14 @@ static unsigned hit_cnt[STARPU_MAXNODES];
 static unsigned miss_cnt[STARPU_MAXNODES];
 #endif
 
-void _starpu_msi_cache_hit(unsigned node __attribute__ ((unused)))
+void _starpu_msi_cache_hit(unsigned node STARPU_ATTRIBUTE_UNUSED)
 {
 #ifdef STARPU_ENABLE_STATS
 	hit_cnt[node]++;
 #endif
 }
 
-void _starpu_msi_cache_miss(unsigned node __attribute__ ((unused)))
+void _starpu_msi_cache_miss(unsigned node STARPU_ATTRIBUTE_UNUSED)
 {
 #ifdef STARPU_ENABLE_STATS
 	miss_cnt[node]++;
@@ -78,14 +78,14 @@ static unsigned alloc_cnt[STARPU_MAXNODES];
 static unsigned alloc_cache_hit_cnt[STARPU_MAXNODES];
 #endif
 
-void _starpu_allocation_cache_hit(unsigned node __attribute__ ((unused)))
+void _starpu_allocation_cache_hit(unsigned node STARPU_ATTRIBUTE_UNUSED)
 {
 #ifdef STARPU_ENABLE_STATS
 	alloc_cache_hit_cnt[node]++;
 #endif
 }
 
-void _starpu_data_allocation_inc_stats(unsigned node __attribute__ ((unused)))
+void _starpu_data_allocation_inc_stats(unsigned node STARPU_ATTRIBUTE_UNUSED)
 {
 #ifdef STARPU_ENABLE_STATS
 	alloc_cnt[node]++;
@@ -119,7 +119,7 @@ void _starpu_display_alloc_cache_stats(void)
 static size_t comm_amount[STARPU_MAXNODES][STARPU_MAXNODES];
 #endif /* STARPU_ENABLE_STATS */
 
-void _starpu_comm_amounts_inc(unsigned src  __attribute__ ((unused)), unsigned dst  __attribute__ ((unused)), size_t size  __attribute__ ((unused)))
+void _starpu_comm_amounts_inc(unsigned src  STARPU_ATTRIBUTE_UNUSED, unsigned dst  STARPU_ATTRIBUTE_UNUSED, size_t size  STARPU_ATTRIBUTE_UNUSED)
 {
 #ifdef STARPU_ENABLE_STATS
 	comm_amount[src][dst] += size;

src/datawizard/datastats.h

@@ -28,8 +28,8 @@ void _starpu_msi_cache_miss(unsigned node);
 
 void _starpu_display_msi_stats(void);
 
-void _starpu_allocation_cache_hit(unsigned node __attribute__ ((unused)));
-void _starpu_data_allocation_inc_stats(unsigned node __attribute__ ((unused)));
+void _starpu_allocation_cache_hit(unsigned node STARPU_ATTRIBUTE_UNUSED);
+void _starpu_data_allocation_inc_stats(unsigned node STARPU_ATTRIBUTE_UNUSED);
 
 void _starpu_comm_amounts_inc(unsigned src, unsigned dst, size_t size);
 void _starpu_display_comm_amounts(void);

src/datawizard/interfaces/multiformat_interface.c

@@ -352,8 +352,8 @@ static void free_multiformat_buffer_on_node(void *data_interface, unsigned node)
 /*
  * Copy methods
  */
-static int copy_ram_to_ram(void *src_interface, unsigned src_node __attribute__ ((unused)),
-			   void *dst_interface, unsigned dst_node __attribute__ ((unused)))
+static int copy_ram_to_ram(void *src_interface, unsigned src_node STARPU_ATTRIBUTE_UNUSED,
+			   void *dst_interface, unsigned dst_node STARPU_ATTRIBUTE_UNUSED)
 {
 	struct starpu_multiformat_interface *src_multiformat;
 	struct starpu_multiformat_interface *dst_multiformat;
@@ -372,8 +372,8 @@ static int copy_ram_to_ram(void *src_interface, unsigned src_node __attribute__
 }
 
 #ifdef STARPU_USE_CUDA
-static int copy_cuda_common(void *src_interface, unsigned src_node __attribute__ ((unused)),
-			    void *dst_interface, unsigned dst_node __attribute__ ((unused)),
+static int copy_cuda_common(void *src_interface, unsigned src_node STARPU_ATTRIBUTE_UNUSED,
+			    void *dst_interface, unsigned dst_node STARPU_ATTRIBUTE_UNUSED,
 			    enum cudaMemcpyKind kind)
 {
 	struct starpu_multiformat_interface *src_multiformat;
@@ -438,8 +438,8 @@ static int copy_cuda_to_ram(void *src_interface, unsigned src_node STARPU_ATTRIB
 	return copy_cuda_common(src_interface, src_node, dst_interface, dst_node, cudaMemcpyDeviceToHost);
 }
 
-static int copy_cuda_common_async(void *src_interface, unsigned src_node __attribute__ ((unused)),
-				  void *dst_interface, unsigned dst_node __attribute__ ((unused)),
+static int copy_cuda_common_async(void *src_interface, unsigned src_node STARPU_ATTRIBUTE_UNUSED,
+				  void *dst_interface, unsigned dst_node STARPU_ATTRIBUTE_UNUSED,
 				  cudaStream_t stream, enum cudaMemcpyKind kind)
 {
 	struct starpu_multiformat_interface *src_multiformat;

src/drivers/mp_common/mp_common.c

@@ -30,7 +30,7 @@
 /* Allocate and initialize the sink structure, when the function returns
  * all the pointer of functions are linked to the right ones.
  */
-struct _starpu_mp_node * __attribute__((malloc))
+struct _starpu_mp_node * STARPU_ATTRIBUTE_MALLOC
     _starpu_mp_common_node_create(enum _starpu_mp_node_kind node_kind,
 				  int peer_id)
 {

src/profiling/bound.c

@@ -1030,7 +1030,7 @@ static glp_prob *_starpu_bound_glp_resolve(int integer)
 #endif /* STARPU_HAVE_GLPK_H */
 
 /* Print the computed bound as well as the optimized distribution of tasks */
-void starpu_bound_print(FILE *output, int integer __attribute__ ((unused)))
+void starpu_bound_print(FILE *output, int integer STARPU_ATTRIBUTE_UNUSED)
 {
 #ifdef STARPU_HAVE_GLPK_H
 	if (recorddeps)
@@ -1081,7 +1081,7 @@ void starpu_bound_print(FILE *output, int integer __attribute__ ((unused)))
 }
 
 /* Compute and return the bound */
-void starpu_bound_compute(double *res, double *integer_res __attribute__ ((unused)), int integer __attribute__ ((unused)))
+void starpu_bound_compute(double *res, double *integer_res STARPU_ATTRIBUTE_UNUSED, int integer STARPU_ATTRIBUTE_UNUSED)
 {
 #ifdef STARPU_HAVE_GLPK_H
 	double ret;

src/sched_policies/stack_queues.c

@@ -74,7 +74,7 @@ void _starpu_stack_push_task(struct _starpu_stack_jobq *stack_queue, starpu_pthr
 	STARPU_PTHREAD_MUTEX_UNLOCK(sched_mutex);
 }
 
-struct _starpu_job *_starpu_stack_pop_task(struct _starpu_stack_jobq *stack_queue, starpu_pthread_mutex_t *sched_mutex, int workerid __attribute__ ((unused)))
+struct _starpu_job *_starpu_stack_pop_task(struct _starpu_stack_jobq *stack_queue, starpu_pthread_mutex_t *sched_mutex, int workerid STARPU_ATTRIBUTE_UNUSED)
 {
 	struct _starpu_job *j = NULL;
 

src/util/execute_on_all.c

@@ -26,7 +26,7 @@ struct wrapper_func_args
 	void *arg;
 };
 
-static void wrapper_func(void *buffers[] __attribute__ ((unused)), void *_args)
+static void wrapper_func(void *buffers[] STARPU_ATTRIBUTE_UNUSED, void *_args)
 {
 	struct wrapper_func_args *args = (struct wrapper_func_args *) _args;
 	args->func(args->arg);

src/util/starpu_task_list_inline.h

@@ -16,7 +16,8 @@
 
 #ifndef __STARPU_TASK_LIST_INLINE_H
 #define __STARPU_TASK_LIST_INLINE_H
-#include <starpu.h>
+
+#include <starpu_task.h>
 
 #ifndef STARPU_INLINE
 #ifdef __GNUC_GNU_INLINE__
@@ -144,7 +145,7 @@ struct starpu_task *starpu_task_list_begin(struct starpu_task_list *list)
 }
 
 STARPU_INLINE
-struct starpu_task *starpu_task_list_end(struct starpu_task_list *list __attribute__ ((unused)))
+struct starpu_task *starpu_task_list_end(struct starpu_task_list *list STARPU_ATTRIBUTE_UNUSED)
 {
 	return NULL;
 }

tests/datawizard/acquire_cb.c

@@ -20,7 +20,7 @@
 unsigned token = 0;
 starpu_data_handle_t token_handle;
 
-void callback(void *arg __attribute__ ((unused)))
+void callback(void *arg STARPU_ATTRIBUTE_UNUSED)
 {
 	token = 42;
         starpu_data_release(token_handle);

tests/datawizard/acquire_release.c

@@ -26,13 +26,13 @@ static unsigned ntasks = 10000;
 #endif
 
 #ifdef STARPU_USE_CUDA
-extern void increment_cuda(void *descr[], __attribute__ ((unused)) void *_args);
+extern void increment_cuda(void *descr[], STARPU_ATTRIBUTE_UNUSED void *_args);
 #endif
 #ifdef STARPU_USE_OPENCL
 extern void increment_opencl(void *buffers[], void *args);
 #endif
 
-void increment_cpu(void *descr[], __attribute__ ((unused)) void *_args)
+void increment_cpu(void *descr[], STARPU_ATTRIBUTE_UNUSED void *_args)
 {
 	STARPU_SKIP_IF_VALGRIND;
 
@@ -68,7 +68,7 @@ int increment_token(void)
 	return ret;
 }
 
-void callback(void *arg __attribute__ ((unused)))
+void callback(void *arg STARPU_ATTRIBUTE_UNUSED)
 {
         starpu_data_release(token_handle);
 }

tests/datawizard/acquire_release2.c

@@ -26,13 +26,13 @@ static unsigned ntasks = 40000;
 #endif
 
 #ifdef STARPU_USE_CUDA
-extern void increment_cuda(void *descr[], __attribute__ ((unused)) void *_args);
+extern void increment_cuda(void *descr[], STARPU_ATTRIBUTE_UNUSED void *_args);
 #endif
 #ifdef STARPU_USE_OPENCL
 extern void increment_opencl(void *buffers[], void *args);
 #endif
 
-void increment_cpu(void *descr[], __attribute__ ((unused)) void *_args)
+void increment_cpu(void *descr[], STARPU_ATTRIBUTE_UNUSED void *_args)
 {
 	STARPU_SKIP_IF_VALGRIND;
 
@@ -66,7 +66,7 @@ int increment_token(int synchronous)
 	return starpu_task_submit(task);
 }
 
-void callback(void *arg __attribute__ ((unused)))
+void callback(void *arg STARPU_ATTRIBUTE_UNUSED)
 {
         starpu_data_release(token_handle);
 }

tests/datawizard/commute.c

@@ -18,7 +18,7 @@
 #include <starpu.h>
 #include "../helper.h"
 
-void begin(void *descr[], void *_args __attribute__((unused)))
+void begin(void *descr[], void *_args STARPU_ATTRIBUTE_UNUSED)
 {
 	int *x = (int *)STARPU_VARIABLE_GET_PTR(descr[0]);
 
@@ -34,7 +34,7 @@ static struct starpu_codelet codelet_begin =
 
 
 
-void commute1(void *descr[], void *_args __attribute__((unused)))
+void commute1(void *descr[], void *_args STARPU_ATTRIBUTE_UNUSED)
 {
 	int *x = (int *)STARPU_VARIABLE_GET_PTR(descr[0]);
 
@@ -51,7 +51,7 @@ static struct starpu_codelet codelet_commute1 =
 
 
 
-void commute2(void *descr[], void *_args __attribute__((unused)))
+void commute2(void *descr[], void *_args STARPU_ATTRIBUTE_UNUSED)
 {
 	int *x = (int *)STARPU_VARIABLE_GET_PTR(descr[0]);
 
@@ -66,7 +66,7 @@ static struct starpu_codelet codelet_commute2 =
 	.modes = {STARPU_W | STARPU_COMMUTE}
 };
 
-void commute3(void *descr[] __attribute__((unused)), void *_args __attribute__((unused)))
+void commute3(void *descr[] STARPU_ATTRIBUTE_UNUSED, void *_args STARPU_ATTRIBUTE_UNUSED)
 {
 }
 
@@ -81,7 +81,7 @@ static struct starpu_codelet codelet_commute3 =
 
 
 static struct starpu_codelet codelet_end;
-void end(void *descr[], void *_args __attribute__((unused)))
+void end(void *descr[], void *_args STARPU_ATTRIBUTE_UNUSED)
 {
 	int *x = (int *)STARPU_VARIABLE_GET_PTR(descr[0]);
 

tests/datawizard/copy.c

@@ -24,7 +24,7 @@ static unsigned nloops = 10;
 static unsigned nloops = 1000;
 #endif
 
-void dummy_func(void *descr[] __attribute__ ((unused)), void *arg __attribute__ ((unused)))
+void dummy_func(void *descr[] STARPU_ATTRIBUTE_UNUSED, void *arg STARPU_ATTRIBUTE_UNUSED)
 {
 }
 

tests/datawizard/critical_section_with_void_interface.c

@@ -27,7 +27,7 @@ starpu_data_handle_t void_handle;
 
 int critical_var;
 
-static void critical_section(void *descr[], __attribute__ ((unused)) void *_args)
+static void critical_section(void *descr[], STARPU_ATTRIBUTE_UNUSED void *_args)
 {
 	STARPU_SKIP_IF_VALGRIND;
 

tests/datawizard/data_implicit_deps.c

@@ -31,7 +31,7 @@ starpu_data_handle_t A_handle, B_handle, C_handle, D_handle;
 static unsigned var = 0;
 starpu_data_handle_t var_handle;
 
-void f(void *descr[] __attribute__ ((unused)), void *_args __attribute__ ((unused)))
+void f(void *descr[] STARPU_ATTRIBUTE_UNUSED, void *_args STARPU_ATTRIBUTE_UNUSED)
 {
 	STARPU_SKIP_IF_VALGRIND;
 
@@ -48,7 +48,7 @@ static struct starpu_codelet cl_f =
 	.nbuffers = 3,
 };
 
-void g(void *descr[], __attribute__ ((unused)) void *_args)
+void g(void *descr[], STARPU_ATTRIBUTE_UNUSED void *_args)
 {
 	STARPU_SKIP_IF_VALGRIND;
 
@@ -59,7 +59,7 @@ void g(void *descr[], __attribute__ ((unused)) void *_args)
 }
 
 #ifdef STARPU_USE_CUDA
-void g_cuda(void *descr[], __attribute__ ((unused)) void *_args)
+void g_cuda(void *descr[], STARPU_ATTRIBUTE_UNUSED void *_args)
 {
 	STARPU_SKIP_IF_VALGRIND;
 
@@ -84,7 +84,7 @@ static struct starpu_codelet cl_g =
 	.nbuffers = 3,
 };
 
-void h(void *descr[], __attribute__ ((unused)) void *_args)
+void h(void *descr[], STARPU_ATTRIBUTE_UNUSED void *_args)
 {
 	STARPU_SKIP_IF_VALGRIND;
 
@@ -95,7 +95,7 @@ void h(void *descr[], __attribute__ ((unused)) void *_args)
 }
 
 #ifdef STARPU_USE_CUDA
-void h_cuda(void *descr[], __attribute__ ((unused)) void *_args)
+void h_cuda(void *descr[], STARPU_ATTRIBUTE_UNUSED void *_args)
 {
 	STARPU_SKIP_IF_VALGRIND;
 

tests/datawizard/data_invalidation.c

@@ -37,7 +37,7 @@ static starpu_data_handle_t v_handle;
  */
 
 #ifdef STARPU_USE_CUDA
-static void cuda_memset_codelet(void *descr[], __attribute__ ((unused)) void *_args)
+static void cuda_memset_codelet(void *descr[], STARPU_ATTRIBUTE_UNUSED void *_args)
 {
 	STARPU_SKIP_IF_VALGRIND;
 
@@ -78,7 +78,7 @@ static void opencl_memset_codelet(void *buffers[], void *args)
 }
 #endif /* !STARPU_USE_OPENCL */
 
-void cpu_memset_codelet(void *descr[], __attribute__ ((unused)) void *_args)
+void cpu_memset_codelet(void *descr[], STARPU_ATTRIBUTE_UNUSED void *_args)
 {
 	STARPU_SKIP_IF_VALGRIND;
 
@@ -106,7 +106,7 @@ static struct starpu_codelet memset_cl =
  *	Check content
  */
 
-void cpu_check_content_codelet(void *descr[], __attribute__ ((unused)) void *_args)
+void cpu_check_content_codelet(void *descr[], STARPU_ATTRIBUTE_UNUSED void *_args)
 {
 	STARPU_SKIP_IF_VALGRIND;
 

tests/datawizard/double_parameter.c

@@ -18,7 +18,7 @@
 #include <starpu.h>
 #include "../helper.h"
 
-void dummy_func(void *descr[] __attribute__ ((unused)), void *arg __attribute__ ((unused)))
+void dummy_func(void *descr[] STARPU_ATTRIBUTE_UNUSED, void *arg STARPU_ATTRIBUTE_UNUSED)
 {
 }
 

tests/datawizard/dsm_stress.c

@@ -57,15 +57,15 @@ static void callback(void *arg)
 
 
 
-static void cuda_codelet_null(void *descr[], __attribute__ ((unused)) void *_args)
+static void cuda_codelet_null(void *descr[], STARPU_ATTRIBUTE_UNUSED void *_args)
 {
 }
 
-static void opencl_codelet_null(void *descr[], __attribute__ ((unused)) void *_args)
+static void opencl_codelet_null(void *descr[], STARPU_ATTRIBUTE_UNUSED void *_args)
 {
 }
 
-void cpu_codelet_null(void *descr[], __attribute__ ((unused)) void *_args)
+void cpu_codelet_null(void *descr[], STARPU_ATTRIBUTE_UNUSED void *_args)
 {
 }
 

tests/datawizard/increment_redux.c

@@ -151,7 +151,7 @@ static struct starpu_codelet neutral_cl =
 
 #ifdef STARPU_USE_OPENCL
 /* dummy OpenCL implementation */
-static void increment_opencl_kernel(void *descr[], void *cl_arg __attribute__((unused)))
+static void increment_opencl_kernel(void *descr[], void *cl_arg STARPU_ATTRIBUTE_UNUSED)
 {
 	STARPU_SKIP_IF_VALGRIND;
 

tests/datawizard/increment_redux_lazy.c

@@ -137,7 +137,7 @@ static struct starpu_codelet neutral_cl =
 
 #ifdef STARPU_USE_OPENCL
 /* dummy OpenCL implementation */
-static void increment_opencl_kernel(void *descr[], void *cl_arg __attribute__((unused)))
+static void increment_opencl_kernel(void *descr[], void *cl_arg STARPU_ATTRIBUTE_UNUSED)
 {
 	cl_mem d_token = (cl_mem)STARPU_VARIABLE_GET_PTR(descr[0]);
 	unsigned h_token;

tests/datawizard/increment_redux_v2.c

@@ -150,7 +150,7 @@ static struct starpu_codelet neutral_cl =
 
 #ifdef STARPU_USE_OPENCL
 /* dummy OpenCL implementation */
-static void increment_opencl_kernel(void *descr[], void *cl_arg __attribute__((unused)))
+static void increment_opencl_kernel(void *descr[], void *cl_arg STARPU_ATTRIBUTE_UNUSED)
 {
 	STARPU_SKIP_IF_VALGRIND;
 

tests/datawizard/lazy_allocation.c

@@ -32,7 +32,7 @@ static starpu_data_handle_t v_handle;
  */
 
 #ifdef STARPU_USE_CUDA
-static void cuda_memset_codelet(void *descr[], __attribute__ ((unused)) void *_args)
+static void cuda_memset_codelet(void *descr[], STARPU_ATTRIBUTE_UNUSED void *_args)
 {
 	STARPU_SKIP_IF_VALGRIND;
 
@@ -73,7 +73,7 @@ static void opencl_memset_codelet(void *buffers[], void *args)
 }
 #endif
 
-void cpu_memset_codelet(void *descr[], __attribute__ ((unused)) void *_args)
+void cpu_memset_codelet(void *descr[], STARPU_ATTRIBUTE_UNUSED void *_args)
 {
 	STARPU_SKIP_IF_VALGRIND;
 
@@ -101,7 +101,7 @@ static struct starpu_codelet memset_cl =
  *	Check content
  */
 
-void cpu_check_content_codelet(void *descr[], __attribute__ ((unused)) void *_args)
+void cpu_check_content_codelet(void *descr[], STARPU_ATTRIBUTE_UNUSED void *_args)
 {
 	STARPU_SKIP_IF_VALGRIND;
 
@@ -120,7 +120,7 @@ void cpu_check_content_codelet(void *descr[], __attribute__ ((unused)) void *_ar
 }
 
 #ifdef STARPU_USE_CUDA
-static void cuda_check_content_codelet(void *descr[], __attribute__ ((unused)) void *_args)
+static void cuda_check_content_codelet(void *descr[], STARPU_ATTRIBUTE_UNUSED void *_args)
 {
 	STARPU_SKIP_IF_VALGRIND;
 

tests/datawizard/manual_reduction.c

@@ -29,7 +29,7 @@ static uintptr_t per_worker[STARPU_NMAXWORKERS];
 static starpu_data_handle_t per_worker_handle[STARPU_NMAXWORKERS];
 
 /* Create per-worker handles */
-static void initialize_per_worker_handle(void *arg __attribute__((unused)))
+static void initialize_per_worker_handle(void *arg STARPU_ATTRIBUTE_UNUSED)
 {
 	int workerid = starpu_worker_get_id();
 
@@ -75,7 +75,7 @@ static void initialize_per_worker_handle(void *arg __attribute__((unused)))
  *	Implement reduction method
  */
 
-static void cpu_redux_func(void *descr[], void *cl_arg __attribute__((unused)))
+static void cpu_redux_func(void *descr[], void *cl_arg STARPU_ATTRIBUTE_UNUSED)
 {
 	STARPU_SKIP_IF_VALGRIND;
 
@@ -100,7 +100,7 @@ static struct starpu_codelet reduction_codelet =
  *	Use per-worker local copy
  */
 
-static void cpu_func_incr(void *descr[], void *cl_arg __attribute__((unused)))
+static void cpu_func_incr(void *descr[], void *cl_arg STARPU_ATTRIBUTE_UNUSED)
 {
 	STARPU_SKIP_IF_VALGRIND;
 
@@ -110,7 +110,7 @@ static void cpu_func_incr(void *descr[], void *cl_arg __attribute__((unused)))
 
 #ifdef STARPU_USE_CUDA
 /* dummy CUDA implementation */
-static void cuda_func_incr(void *descr[], void *cl_arg __attribute__((unused)))
+static void cuda_func_incr(void *descr[], void *cl_arg STARPU_ATTRIBUTE_UNUSED)
 {
 	STARPU_SKIP_IF_VALGRIND;
 
@@ -127,7 +127,7 @@ static void cuda_func_incr(void *descr[], void *cl_arg __attribute__((unused)))
 
 #ifdef STARPU_USE_OPENCL
 /* dummy OpenCL implementation */
-static void opencl_func_incr(void *descr[], void *cl_arg __attribute__((unused)))
+static void opencl_func_incr(void *descr[], void *cl_arg STARPU_ATTRIBUTE_UNUSED)
 {
 	STARPU_SKIP_IF_VALGRIND;
 

tests/datawizard/mpi_like.c

@@ -47,13 +47,13 @@ static struct thread_data problem_data[NTHREADS];
  * data from its neighbour and increment it before transmitting it to its
  * successor. */
 #ifdef STARPU_USE_CUDA
-void cuda_codelet_unsigned_inc(void *descr[], __attribute__ ((unused)) void *cl_arg);
+void cuda_codelet_unsigned_inc(void *descr[], STARPU_ATTRIBUTE_UNUSED void *cl_arg);
 #endif
 #ifdef STARPU_USE_OPENCL
 void opencl_codelet_unsigned_inc(void *buffers[], void *args);
 #endif
 
-void increment_handle_cpu_kernel(void *descr[], void *cl_arg __attribute__((unused)))
+void increment_handle_cpu_kernel(void *descr[], void *cl_arg STARPU_ATTRIBUTE_UNUSED)
 {
 	STARPU_SKIP_IF_VALGRIND;