From ce1fa84f21286ac9c52a5c1783a9a736a050c59c Mon Sep 17 00:00:00 2001 From: Thomas Dettbarn Date: Tue, 21 Jan 2025 10:34:08 +0100 Subject: [PATCH 1/3] improved WMOPS by 5 percent when changing IF to if in ivas_band_cov_fx(). --- lib_enc/ivas_enc_cov_handler.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lib_enc/ivas_enc_cov_handler.c b/lib_enc/ivas_enc_cov_handler.c index 7f0877878..a66182c73 100644 --- a/lib_enc/ivas_enc_cov_handler.c +++ b/lib_enc/ivas_enc_cov_handler.c @@ -536,7 +536,7 @@ static void ivas_band_cov_fx( move16(); FOR( k = 0; k < num_bins; k++ ) { - IF( pV_re_64bit[k] != 0 ) + if( pV_re_64bit[k] != 0 ) { q_shift = s_min( q_shift, W_norm( pV_re_64bit[k] ) ); } @@ -546,7 +546,7 @@ static void ivas_band_cov_fx( pV_re[k] = W_extract_l( W_shl_nosat( pV_re_64bit[k], sub( q_shift, 32 ) ) ); //(q_In_FR[i1] + q_In_FR[j1]) + (q_shift - 32) move32(); /* perform rounding towards lower value for negative results */ - IF( pV_re[k] < 0 ) + if( pV_re[k] < 0 ) { pV_re[k] = L_add( pV_re[k], 1 ); } @@ -595,7 +595,7 @@ static void ivas_band_cov_fx( move16(); FOR( k = start_band; k < end_band; k++ ) { - IF( cov_real_64bit[i][j][k] != 0 ) + if( cov_real_64bit[i][j][k] != 0 ) { q_shift = s_min( q_shift, W_norm( cov_real_64bit[i][j][k] ) ); } -- GitLab From ed51376fa70380621fae6ae443c5a01b93037457 Mon Sep 17 00:00:00 2001 From: Thomas Dettbarn Date: Tue, 21 Jan 2025 13:12:26 +0100 Subject: [PATCH 2/3] applied the formatting patch to comply with the clang check. --- lib_enc/ivas_enc_cov_handler.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lib_enc/ivas_enc_cov_handler.c b/lib_enc/ivas_enc_cov_handler.c index a66182c73..b069a6013 100644 --- a/lib_enc/ivas_enc_cov_handler.c +++ b/lib_enc/ivas_enc_cov_handler.c @@ -536,7 +536,7 @@ static void ivas_band_cov_fx( move16(); FOR( k = 0; k < num_bins; k++ ) { - if( pV_re_64bit[k] != 0 ) + if ( pV_re_64bit[k] != 0 ) { q_shift = s_min( q_shift, W_norm( pV_re_64bit[k] ) ); } @@ -546,7 +546,7 @@ static void ivas_band_cov_fx( pV_re[k] = W_extract_l( W_shl_nosat( pV_re_64bit[k], sub( q_shift, 32 ) ) ); //(q_In_FR[i1] + q_In_FR[j1]) + (q_shift - 32) move32(); /* perform rounding towards lower value for negative results */ - if( pV_re[k] < 0 ) + if ( pV_re[k] < 0 ) { pV_re[k] = L_add( pV_re[k], 1 ); } @@ -595,7 +595,7 @@ static void ivas_band_cov_fx( move16(); FOR( k = start_band; k < end_band; k++ ) { - if( cov_real_64bit[i][j][k] != 0 ) + if ( cov_real_64bit[i][j][k] != 0 ) { q_shift = s_min( q_shift, W_norm( cov_real_64bit[i][j][k] ) ); } -- GitLab From 4f9349436df5dd73588f00162f295c1e8eb30e1f Mon Sep 17 00:00:00 2001 From: Thomas Dettbarn Date: Wed, 22 Jan 2025 09:36:48 +0100 Subject: [PATCH 3/3] revert to IF() instead of if (), due to them being a violation of the STL guidelines. --- lib_enc/ivas_enc_cov_handler.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib_enc/ivas_enc_cov_handler.c b/lib_enc/ivas_enc_cov_handler.c index b069a6013..f736f86ea 100644 --- a/lib_enc/ivas_enc_cov_handler.c +++ b/lib_enc/ivas_enc_cov_handler.c @@ -536,7 +536,7 @@ static void ivas_band_cov_fx( move16(); FOR( k = 0; k < num_bins; k++ ) { - if ( pV_re_64bit[k] != 0 ) + IF( pV_re_64bit[k] != 0 ) { q_shift = s_min( q_shift, W_norm( pV_re_64bit[k] ) ); } @@ -595,7 +595,7 @@ static void ivas_band_cov_fx( move16(); FOR( k = start_band; k < end_band; k++ ) { - if ( cov_real_64bit[i][j][k] != 0 ) + IF( cov_real_64bit[i][j][k] != 0 ) { q_shift = s_min( q_shift, W_norm( cov_real_64bit[i][j][k] ) ); } -- GitLab