From 59552167478dbd2b9e6abfbcc0cc8f3b19d90e5f Mon Sep 17 00:00:00 2001
From: Mathieu Faverge <mathieu.faverge@inria.fr>
Date: Mon, 11 Oct 2021 19:43:42 +0200
Subject: [PATCH] gcc: silent compilation warnings
---
compute/pzlatms.c | 1 +
control/descriptor.c | 1 +
control/descriptor_rec.c | 2 +-
runtime/starpu/codelets/codelet_zlantr.c | 4 +++-
runtime/starpu/control/runtime_descriptor.c | 2 +-
runtime/starpu/interface/cham_tile_interface.c | 6 +++++-
testing/testing_zcesca.c | 1 +
testing/testing_zgram.c | 1 +
testing/testing_zhemm.c | 2 +-
testing/testing_zprint.c | 1 +
testing/testing_zsymm.c | 2 +-
testing/testing_ztrmm.c | 2 +-
testing/testing_zunmlq.c | 2 +-
testing/testing_zunmlq_hqr.c | 2 +-
testing/testing_zunmqr.c | 2 +-
testing/testing_zunmqr_hqr.c | 2 +-
16 files changed, 22 insertions(+), 11 deletions(-)
diff --git a/compute/pzlatms.c b/compute/pzlatms.c
index bb76c3021..7a1334d9d 100644
--- a/compute/pzlatms.c
+++ b/compute/pzlatms.c
@@ -63,6 +63,7 @@ zlaset_diag( const CHAM_desc_t *descA,
A += lda + 1;
}
+ (void)uplo;
return 0;
}
diff --git a/control/descriptor.c b/control/descriptor.c
index 7bb2f2ff1..a24164cd6 100644
--- a/control/descriptor.c
+++ b/control/descriptor.c
@@ -304,6 +304,7 @@ int chameleon_desc_init_internal( CHAM_desc_t *desc, const char *name, void *mat
break;
}
/* Otherwise we switch back to the full allocation */
+ chameleon_attr_fallthrough;
case (intptr_t)CHAMELEON_MAT_ALLOC_GLOBAL:
rc = chameleon_desc_mat_alloc( desc );
diff --git a/control/descriptor_rec.c b/control/descriptor_rec.c
index 78634600e..1bc506b65 100644
--- a/control/descriptor_rec.c
+++ b/control/descriptor_rec.c
@@ -51,7 +51,7 @@ chameleon_recdesc_create( const char *name, CHAM_desc_t **descptr, void *mat, ch
/* Create the current layer descriptor */
desc = (CHAM_desc_t*)malloc(sizeof(CHAM_desc_t));
rc = chameleon_desc_init_internal( desc, name, mat, dtyp, mb[0], nb[0],
- lm, ln, m, n, 1, 1,
+ lm, ln, m, n, p, q,
get_blkaddr, get_blkldd, get_rankof );
*descptr = desc;
diff --git a/runtime/starpu/codelets/codelet_zlantr.c b/runtime/starpu/codelets/codelet_zlantr.c
index c299fb82a..b45ca0d12 100644
--- a/runtime/starpu/codelets/codelet_zlantr.c
+++ b/runtime/starpu/codelets/codelet_zlantr.c
@@ -29,7 +29,9 @@
static void cl_zlantr_cpu_func(void *descr[], void *cl_arg)
{
CHAM_tile_t *tilenormA;
- cham_normtype_t norm, uplo, diag;
+ cham_normtype_t norm;
+ cham_uplo_t uplo;
+ cham_diag_t diag;
int M, N;
CHAM_tile_t *tileA;
CHAM_tile_t *tilework;
diff --git a/runtime/starpu/control/runtime_descriptor.c b/runtime/starpu/control/runtime_descriptor.c
index 9b802391a..8d20b3afa 100644
--- a/runtime/starpu/control/runtime_descriptor.c
+++ b/runtime/starpu/control/runtime_descriptor.c
@@ -210,7 +210,7 @@ void RUNTIME_desc_create( CHAM_desc_t *desc )
chameleon_fatal_error("RUNTIME_desc_create", "Too many tiles in the descriptor for MPI tags");
return;
}
- assert( (lmt*lnt) <= (1UL<<tag_sep) );
+ assert( ((uintptr_t)(lnt*lmt)) <= ((uintptr_t)(1UL<<tag_sep)) );
if ( ((uintptr_t)desc->id) >= (uintptr_t)(1UL<<(tag_width-tag_sep)) ) {
chameleon_fatal_error("RUNTIME_desc_create", "Number of descriptor available in MPI mode out of stock");
diff --git a/runtime/starpu/interface/cham_tile_interface.c b/runtime/starpu/interface/cham_tile_interface.c
index 92d2d4203..c95bf0b85 100644
--- a/runtime/starpu/interface/cham_tile_interface.c
+++ b/runtime/starpu/interface/cham_tile_interface.c
@@ -186,7 +186,7 @@ cti_free_data_on_node( void *data_interface, unsigned node )
else
#endif
{
- assert( (intptr_t)(cham_tile_interface->tile.mat) == cham_tile_interface->dev_handle );
+ assert( (uintptr_t)(cham_tile_interface->tile.mat) == cham_tile_interface->dev_handle );
}
starpu_free_on_node( node, cham_tile_interface->dev_handle, cham_tile_interface->allocsize );
@@ -334,6 +334,8 @@ cti_pack_data_hmat( starpu_cham_tile_interface_t *cham_tile_interface,
{
#if !defined(CHAMELEON_USE_HMAT)
assert( 0 );
+ (void)cham_tile_interface;
+ (void)ptr;
#else
hmat_matrix_t *mat = cham_tile_interface->tile.mat;
STARPU_ASSERT_MSG( mat != NULL, "cti_pack_data_hmat: Try to pack a NULL pointer\n" );
@@ -433,6 +435,8 @@ cti_unpack_data_hmat( starpu_cham_tile_interface_t *cham_tile_interface,
assert( cham_tile_interface->tile.format & CHAMELEON_TILE_HMAT );
#if !defined(CHAMELEON_USE_HMAT)
assert( 0 );
+ (void)cham_tile_interface;
+ (void)ptr;
#else
hmat_matrix_t *mat = NULL;
switch( cham_tile_interface->flttype ) {
diff --git a/testing/testing_zcesca.c b/testing/testing_zcesca.c
index 8fdcd8394..4bc57a46f 100644
--- a/testing/testing_zcesca.c
+++ b/testing/testing_zcesca.c
@@ -87,6 +87,7 @@ testing_zcesca( run_arg_list_t *args, int check )
CHAMELEON_Desc_Destroy( &descA );
+ (void)check;
return hres;
}
diff --git a/testing/testing_zgram.c b/testing/testing_zgram.c
index edacb306a..eca6b24f0 100644
--- a/testing/testing_zgram.c
+++ b/testing/testing_zgram.c
@@ -87,6 +87,7 @@ testing_zgram( run_arg_list_t *args, int check )
CHAMELEON_Desc_Destroy( &descA );
+ (void)check;
return hres;
}
diff --git a/testing/testing_zhemm.c b/testing/testing_zhemm.c
index ae396c1aa..c592e8cee 100644
--- a/testing/testing_zhemm.c
+++ b/testing/testing_zhemm.c
@@ -33,7 +33,7 @@ testing_zhemm( run_arg_list_t *args, int check )
intptr_t mtxfmt = parameters_getvalue_int( "mtxfmt" );
int nb = run_arg_get_int( args, "nb", 320 );
int P = parameters_getvalue_int( "P" );
- cham_side_t side = run_arg_get_uplo( args, "side", ChamLeft );
+ cham_side_t side = run_arg_get_side( args, "side", ChamLeft );
cham_uplo_t uplo = run_arg_get_uplo( args, "uplo", ChamUpper );
int N = run_arg_get_int( args, "N", 1000 );
int M = run_arg_get_int( args, "M", N );
diff --git a/testing/testing_zprint.c b/testing/testing_zprint.c
index 9b571e359..a73d7b7a6 100644
--- a/testing/testing_zprint.c
+++ b/testing/testing_zprint.c
@@ -128,6 +128,7 @@ testing_zprint( run_arg_list_t *args, int check )
run_arg_add_fixdbl( args, "time", 1. );
run_arg_add_fixdbl( args, "gflops", 1. );
+ (void)check;
return hres;
}
diff --git a/testing/testing_zsymm.c b/testing/testing_zsymm.c
index c37aec490..e4437d418 100644
--- a/testing/testing_zsymm.c
+++ b/testing/testing_zsymm.c
@@ -33,7 +33,7 @@ testing_zsymm( run_arg_list_t *args, int check )
intptr_t mtxfmt = parameters_getvalue_int( "mtxfmt" );
int nb = run_arg_get_int( args, "nb", 320 );
int P = parameters_getvalue_int( "P" );
- cham_side_t side = run_arg_get_uplo( args, "side", ChamLeft );
+ cham_side_t side = run_arg_get_side( args, "side", ChamLeft );
cham_uplo_t uplo = run_arg_get_uplo( args, "uplo", ChamUpper );
int N = run_arg_get_int( args, "N", 1000 );
int M = run_arg_get_int( args, "M", N );
diff --git a/testing/testing_ztrmm.c b/testing/testing_ztrmm.c
index 24a342fd7..bd226288f 100644
--- a/testing/testing_ztrmm.c
+++ b/testing/testing_ztrmm.c
@@ -34,7 +34,7 @@ testing_ztrmm( run_arg_list_t *args, int check )
int nb = run_arg_get_int( args, "nb", 320 );
int P = parameters_getvalue_int( "P" );
cham_trans_t trans = run_arg_get_trans( args, "trans", ChamNoTrans );
- cham_side_t side = run_arg_get_uplo( args, "side", ChamLeft );
+ cham_side_t side = run_arg_get_side( args, "side", ChamLeft );
cham_uplo_t uplo = run_arg_get_uplo( args, "uplo", ChamUpper );
cham_diag_t diag = run_arg_get_diag( args, "diag", ChamNonUnit );
int N = run_arg_get_int( args, "N", 1000 );
diff --git a/testing/testing_zunmlq.c b/testing/testing_zunmlq.c
index 8e811f900..f2708fa7e 100644
--- a/testing/testing_zunmlq.c
+++ b/testing/testing_zunmlq.c
@@ -34,7 +34,7 @@ testing_zunmlq( run_arg_list_t *args, int check )
int nb = run_arg_get_int( args, "nb", 320 );
int ib = run_arg_get_int( args, "ib", 48 );
int P = parameters_getvalue_int( "P" );
- cham_side_t side = run_arg_get_uplo( args, "side", ChamLeft );
+ cham_side_t side = run_arg_get_side( args, "side", ChamLeft );
cham_trans_t trans = run_arg_get_trans( args, "trans", ChamNoTrans );
int N = run_arg_get_int( args, "N", 1000 );
int M = run_arg_get_int( args, "M", N );
diff --git a/testing/testing_zunmlq_hqr.c b/testing/testing_zunmlq_hqr.c
index 156bb5140..d657648bd 100644
--- a/testing/testing_zunmlq_hqr.c
+++ b/testing/testing_zunmlq_hqr.c
@@ -34,7 +34,7 @@ testing_zunmlq_hqr( run_arg_list_t *args, int check )
int nb = run_arg_get_int( args, "nb", 320 );
int ib = run_arg_get_int( args, "ib", 48 );
int P = parameters_getvalue_int( "P" );
- cham_side_t side = run_arg_get_uplo( args, "side", ChamLeft );
+ cham_side_t side = run_arg_get_side( args, "side", ChamLeft );
cham_trans_t trans = run_arg_get_trans( args, "trans", ChamNoTrans );
int N = run_arg_get_int( args, "N", 1000 );
int M = run_arg_get_int( args, "M", N );
diff --git a/testing/testing_zunmqr.c b/testing/testing_zunmqr.c
index f95424680..34fe5bc9a 100644
--- a/testing/testing_zunmqr.c
+++ b/testing/testing_zunmqr.c
@@ -34,7 +34,7 @@ testing_zunmqr( run_arg_list_t *args, int check )
int nb = run_arg_get_int( args, "nb", 320 );
int ib = run_arg_get_int( args, "ib", 48 );
int P = parameters_getvalue_int( "P" );
- cham_side_t side = run_arg_get_uplo( args, "side", ChamLeft );
+ cham_side_t side = run_arg_get_side( args, "side", ChamLeft );
cham_trans_t trans = run_arg_get_trans( args, "trans", ChamNoTrans );
int N = run_arg_get_int( args, "N", 1000 );
int M = run_arg_get_int( args, "M", N );
diff --git a/testing/testing_zunmqr_hqr.c b/testing/testing_zunmqr_hqr.c
index 0c8748290..e4f5e62b2 100644
--- a/testing/testing_zunmqr_hqr.c
+++ b/testing/testing_zunmqr_hqr.c
@@ -34,7 +34,7 @@ testing_zunmqr_hqr( run_arg_list_t *args, int check )
int nb = run_arg_get_int( args, "nb", 320 );
int ib = run_arg_get_int( args, "ib", 48 );
int P = parameters_getvalue_int( "P" );
- cham_side_t side = run_arg_get_uplo( args, "side", ChamLeft );
+ cham_side_t side = run_arg_get_side( args, "side", ChamLeft );
cham_trans_t trans = run_arg_get_trans( args, "trans", ChamNoTrans );
int N = run_arg_get_int( args, "N", 1000 );
int M = run_arg_get_int( args, "M", N );
--
GitLab