From c3f436d7c60b9ce6ec9cfb3b1ad9a79eceaab169 Mon Sep 17 00:00:00 2001
From: Mathieu Faverge <mathieu.faverge@inria.fr>
Date: Wed, 28 Sep 2022 22:22:06 +0200
Subject: [PATCH] starpu/codelet: fix compilation warnings

---
 runtime/starpu/codelets/codelet_zgeadd.c  |  5 +++--
 runtime/starpu/codelets/codelet_zgemm.c   | 10 ++++++----
 runtime/starpu/codelets/codelet_zgersum.c |  6 ++++--
 runtime/starpu/codelets/codelet_zhemm.c   | 10 ++++++----
 runtime/starpu/codelets/codelet_zher2k.c  |  5 +++--
 runtime/starpu/codelets/codelet_zherk.c   |  5 +++--
 runtime/starpu/codelets/codelet_zlascal.c |  5 +++--
 runtime/starpu/codelets/codelet_zsymm.c   | 10 ++++++----
 runtime/starpu/codelets/codelet_zsyr2k.c  |  5 +++--
 runtime/starpu/codelets/codelet_zsyrk.c   |  5 +++--
 runtime/starpu/codelets/codelet_ztradd.c  |  5 +++--
 11 files changed, 43 insertions(+), 28 deletions(-)

diff --git a/runtime/starpu/codelets/codelet_zgeadd.c b/runtime/starpu/codelets/codelet_zgeadd.c
index 8c652200e..d05ff0b3e 100644
--- a/runtime/starpu/codelets/codelet_zgeadd.c
+++ b/runtime/starpu/codelets/codelet_zgeadd.c
@@ -84,8 +84,9 @@ void INSERT_TASK_zgeadd( const RUNTIME_option_t *options,
                          CHAMELEON_Complex64_t beta,  const CHAM_desc_t *B, int Bm, int Bn )
 {
     if ( alpha == 0. ) {
-        return INSERT_TASK_zlascal( options, ChamUpperLower, m, n, nb,
-                                    beta, B, Bm, Bn );
+        INSERT_TASK_zlascal( options, ChamUpperLower, m, n, nb,
+                             beta, B, Bm, Bn );
+        return;
     }
 
     struct starpu_codelet *codelet = &cl_zgeadd;
diff --git a/runtime/starpu/codelets/codelet_zgemm.c b/runtime/starpu/codelets/codelet_zgemm.c
index 9e1574d7a..726c01f47 100644
--- a/runtime/starpu/codelets/codelet_zgemm.c
+++ b/runtime/starpu/codelets/codelet_zgemm.c
@@ -104,8 +104,9 @@ void INSERT_TASK_zgemm_Astat( const RUNTIME_option_t *options,
                               CHAMELEON_Complex64_t beta,  const CHAM_desc_t *C, int Cm, int Cn )
 {
     if ( alpha == 0. ) {
-        return INSERT_TASK_zlascal( options, ChamUpperLower, m, n, nb,
-                                    beta, C, Cm, Cn );
+        INSERT_TASK_zlascal( options, ChamUpperLower, m, n, nb,
+                             beta, C, Cm, Cn );
+        return;
     }
 
     struct cl_zgemm_args_s  *clargs = NULL;
@@ -191,8 +192,9 @@ void INSERT_TASK_zgemm( const RUNTIME_option_t *options,
                         CHAMELEON_Complex64_t beta,  const CHAM_desc_t *C, int Cm, int Cn )
 {
     if ( alpha == 0. ) {
-        return INSERT_TASK_zlascal( options, ChamUpperLower, m, n, nb,
-                                    beta, C, Cm, Cn );
+        INSERT_TASK_zlascal( options, ChamUpperLower, m, n, nb,
+                             beta, C, Cm, Cn );
+        return;
     }
 
     struct cl_zgemm_args_s  *clargs = NULL;
diff --git a/runtime/starpu/codelets/codelet_zgersum.c b/runtime/starpu/codelets/codelet_zgersum.c
index b3cfebbd9..9682c03fb 100644
--- a/runtime/starpu/codelets/codelet_zgersum.c
+++ b/runtime/starpu/codelets/codelet_zgersum.c
@@ -36,6 +36,7 @@ cl_zgersum_redux_cpu_func( void *descr[], void *cl_arg )
 
     TCORE_zgeadd( ChamNoTrans, tileA->m, tileA->n, 1., tileB, 1., tileA );
 
+    (void)cl_arg;
     return;
 }
 
@@ -59,6 +60,7 @@ cl_zgersum_redux_cuda_func( void *descr[], void *cl_arg )
                  &zone, tileA->mat, tileA->ld,
                  handle );
 
+    (void)cl_arg;
     return;
 }
 #endif /* defined(CHAMELEON_USE_CUDA) */
@@ -67,7 +69,7 @@ cl_zgersum_redux_cuda_func( void *descr[], void *cl_arg )
 /*
  * Codelet definition
  */
-CODELETS( zgersum_redux, cl_zgersum_redux_cpu_func, cl_zgersum_redux_cuda_func, STARPU_CUDA_ASYNC );
+CODELETS( zgersum_redux, cl_zgersum_redux_cpu_func, cl_zgersum_redux_cuda_func, STARPU_CUDA_ASYNC )
 
 #if !defined(CHAMELEON_SIMULATION)
 static void
@@ -103,7 +105,7 @@ cl_zgersum_init_cuda_func( void *descr[], void *cl_arg )
 /*
  * Codelet definition
  */
-CODELETS( zgersum_init, cl_zgersum_init_cpu_func, cl_zgersum_init_cuda_func, STARPU_CUDA_ASYNC );
+CODELETS( zgersum_init, cl_zgersum_init_cpu_func, cl_zgersum_init_cuda_func, STARPU_CUDA_ASYNC )
 
 void
 RUNTIME_zgersum_set_methods( const CHAM_desc_t *A, int Am, int An )
diff --git a/runtime/starpu/codelets/codelet_zhemm.c b/runtime/starpu/codelets/codelet_zhemm.c
index 4451431f4..baf094206 100644
--- a/runtime/starpu/codelets/codelet_zhemm.c
+++ b/runtime/starpu/codelets/codelet_zhemm.c
@@ -101,8 +101,9 @@ void INSERT_TASK_zhemm_Astat( const RUNTIME_option_t *options,
                               CHAMELEON_Complex64_t beta,  const CHAM_desc_t *C, int Cm, int Cn )
 {
     if ( alpha == 0. ) {
-        return INSERT_TASK_zlascal( options, ChamUpperLower, m, n, nb,
-                                    beta, C, Cm, Cn );
+        INSERT_TASK_zlascal( options, ChamUpperLower, m, n, nb,
+                             beta, C, Cm, Cn );
+        return;
     }
 
     struct cl_zhemm_args_s  *clargs = NULL;
@@ -187,8 +188,9 @@ void INSERT_TASK_zhemm( const RUNTIME_option_t *options,
                         CHAMELEON_Complex64_t beta,  const CHAM_desc_t *C, int Cm, int Cn )
 {
     if ( alpha == 0. ) {
-        return INSERT_TASK_zlascal( options, ChamUpperLower, m, n, nb,
-                                    beta, C, Cm, Cn );
+        INSERT_TASK_zlascal( options, ChamUpperLower, m, n, nb,
+                             beta, C, Cm, Cn );
+        return;
     }
 
     struct cl_zhemm_args_s  *clargs = NULL;
diff --git a/runtime/starpu/codelets/codelet_zher2k.c b/runtime/starpu/codelets/codelet_zher2k.c
index 9fa3a1f78..0bd71121a 100644
--- a/runtime/starpu/codelets/codelet_zher2k.c
+++ b/runtime/starpu/codelets/codelet_zher2k.c
@@ -97,8 +97,9 @@ INSERT_TASK_zher2k( const RUNTIME_option_t *options,
                     double beta,                 const CHAM_desc_t *C, int Cm, int Cn )
 {
     if ( alpha == 0. ) {
-        return INSERT_TASK_zlascal( options, uplo, n, n, nb,
-                                    beta, C, Cm, Cn );
+        INSERT_TASK_zlascal( options, uplo, n, n, nb,
+                             beta, C, Cm, Cn );
+        return;
     }
 
     (void)nb;
diff --git a/runtime/starpu/codelets/codelet_zherk.c b/runtime/starpu/codelets/codelet_zherk.c
index a83d212a6..864b492e7 100644
--- a/runtime/starpu/codelets/codelet_zherk.c
+++ b/runtime/starpu/codelets/codelet_zherk.c
@@ -88,8 +88,9 @@ void INSERT_TASK_zherk( const RUNTIME_option_t *options,
                         double beta,  const CHAM_desc_t *C, int Cm, int Cn )
 {
     if ( alpha == 0. ) {
-        return INSERT_TASK_zlascal( options, uplo, n, n, nb,
-                                    beta, C, Cm, Cn );
+        INSERT_TASK_zlascal( options, uplo, n, n, nb,
+                             beta, C, Cm, Cn );
+        return;
     }
 
     struct cl_zherk_args_s *clargs = NULL;
diff --git a/runtime/starpu/codelets/codelet_zlascal.c b/runtime/starpu/codelets/codelet_zlascal.c
index 986292de9..aacfbbb3f 100644
--- a/runtime/starpu/codelets/codelet_zlascal.c
+++ b/runtime/starpu/codelets/codelet_zlascal.c
@@ -57,8 +57,9 @@ void INSERT_TASK_zlascal( const RUNTIME_option_t *options,
                           const CHAM_desc_t *A, int Am, int An )
 {
     if ( alpha == 0. ) {
-        return INSERT_TASK_zlaset( options, uplo, m, n,
-                                   alpha, alpha, A, Am, An );
+        INSERT_TASK_zlaset( options, uplo, m, n,
+                            alpha, alpha, A, Am, An );
+        return;
     }
     else if ( alpha == 1. ) {
         return;
diff --git a/runtime/starpu/codelets/codelet_zsymm.c b/runtime/starpu/codelets/codelet_zsymm.c
index 62b8de470..d641fa8c1 100644
--- a/runtime/starpu/codelets/codelet_zsymm.c
+++ b/runtime/starpu/codelets/codelet_zsymm.c
@@ -101,8 +101,9 @@ void INSERT_TASK_zsymm_Astat( const RUNTIME_option_t *options,
                               CHAMELEON_Complex64_t beta,  const CHAM_desc_t *C, int Cm, int Cn )
 {
     if ( alpha == 0. ) {
-        return INSERT_TASK_zlascal( options, ChamUpperLower, m, n, nb,
-                                    beta, C, Cm, Cn );
+        INSERT_TASK_zlascal( options, ChamUpperLower, m, n, nb,
+                             beta, C, Cm, Cn );
+        return;
     }
 
     struct cl_zsymm_args_s  *clargs = NULL;
@@ -187,8 +188,9 @@ void INSERT_TASK_zsymm( const RUNTIME_option_t *options,
                         CHAMELEON_Complex64_t beta,  const CHAM_desc_t *C, int Cm, int Cn )
 {
     if ( alpha == 0. ) {
-        return INSERT_TASK_zlascal( options, ChamUpperLower, m, n, nb,
-                                    beta, C, Cm, Cn );
+        INSERT_TASK_zlascal( options, ChamUpperLower, m, n, nb,
+                             beta, C, Cm, Cn );
+        return;
     }
 
     struct cl_zsymm_args_s  *clargs = NULL;
diff --git a/runtime/starpu/codelets/codelet_zsyr2k.c b/runtime/starpu/codelets/codelet_zsyr2k.c
index 169936ca9..d4c8686a4 100644
--- a/runtime/starpu/codelets/codelet_zsyr2k.c
+++ b/runtime/starpu/codelets/codelet_zsyr2k.c
@@ -96,8 +96,9 @@ void INSERT_TASK_zsyr2k(const RUNTIME_option_t *options,
                        CHAMELEON_Complex64_t beta, const CHAM_desc_t *C, int Cm, int Cn)
 {
     if ( alpha == 0. ) {
-        return INSERT_TASK_zlascal( options, uplo, n, n, nb,
-                                    beta, C, Cm, Cn );
+        INSERT_TASK_zlascal( options, uplo, n, n, nb,
+                             beta, C, Cm, Cn );
+        return;
     }
 
     (void)nb;
diff --git a/runtime/starpu/codelets/codelet_zsyrk.c b/runtime/starpu/codelets/codelet_zsyrk.c
index 86a95d034..d6fa9a62a 100644
--- a/runtime/starpu/codelets/codelet_zsyrk.c
+++ b/runtime/starpu/codelets/codelet_zsyrk.c
@@ -88,8 +88,9 @@ void INSERT_TASK_zsyrk( const RUNTIME_option_t *options,
                         CHAMELEON_Complex64_t beta,  const CHAM_desc_t *C, int Cm, int Cn )
 {
     if ( alpha == 0. ) {
-        return INSERT_TASK_zlascal( options, uplo, n, n, nb,
-                                    beta, C, Cm, Cn );
+        INSERT_TASK_zlascal( options, uplo, n, n, nb,
+                             beta, C, Cm, Cn );
+        return;
     }
 
     struct cl_zsyrk_args_s *clargs = NULL;
diff --git a/runtime/starpu/codelets/codelet_ztradd.c b/runtime/starpu/codelets/codelet_ztradd.c
index f1522ecc0..6b6d3e34d 100644
--- a/runtime/starpu/codelets/codelet_ztradd.c
+++ b/runtime/starpu/codelets/codelet_ztradd.c
@@ -61,8 +61,9 @@ void INSERT_TASK_ztradd( const RUNTIME_option_t *options,
                          CHAMELEON_Complex64_t beta,  const CHAM_desc_t *B, int Bm, int Bn )
 {
     if ( alpha == 0. ) {
-        return INSERT_TASK_zlascal( options, uplo, m, n, nb,
-                                    beta, B, Bm, Bn );
+        INSERT_TASK_zlascal( options, uplo, m, n, nb,
+                             beta, B, Bm, Bn );
+        return;
     }
 
     struct cl_ztradd_args_s *clargs = NULL;
-- 
GitLab