1
0
mirror of https://github.com/gnss-sdr/gnss-sdr synced 2025-11-19 16:45:17 +00:00

Fix various linting errors, use clang-format-19

Fix various linting errors, both for cpplint and
then clang-format. For the latter, used
clang-format-19 to quickly fix it all.

Signed-off-by: Marcus Alagar <mvala079@gmail.com>
This commit is contained in:
Marcus Alagar
2025-09-13 15:33:14 -07:00
parent 2e84e5bddb
commit 040262f906
27 changed files with 170 additions and 177 deletions

View File

@@ -796,9 +796,7 @@ static inline void volk_gnsssdr_16ic_16i_rotator_dot_prod_16ic_xn_rvv(lv_16sc_t*
// Initialize pointers of compatible type to track progress as stripmine // Initialize pointers of compatible type to track progress as stripmine
short* outPtr = (short*)result; short* outPtr = (short*)result;
const short* comPtr = (const short*)in_common; const short* comPtr = (const short*)in_common;
const short** inPtrBuf = (const short**) volk_gnsssdr_malloc( const short** inPtrBuf = (const short**)volk_gnsssdr_malloc(num_a_vectors * sizeof(*in_a), volk_gnsssdr_get_alignment());
num_a_vectors * sizeof(*in_a), volk_gnsssdr_get_alignment()
);
for (int n_vec = 0; n_vec < num_a_vectors; n_vec++) for (int n_vec = 0; n_vec < num_a_vectors; n_vec++)
{ {

View File

@@ -726,7 +726,8 @@ static inline void volk_gnsssdr_16ic_x2_dot_prod_16ic_xn_neon_optvma(lv_16sc_t*
#ifdef LV_HAVE_RVV #ifdef LV_HAVE_RVV
#include <riscv_vector.h> #include <riscv_vector.h>
static inline void volk_gnsssdr_16ic_x2_dot_prod_16ic_xn_rvv(lv_16sc_t* result, const lv_16sc_t* in_common, const lv_16sc_t** in_a, int num_a_vectors, unsigned int num_points) { static inline void volk_gnsssdr_16ic_x2_dot_prod_16ic_xn_rvv(lv_16sc_t* result, const lv_16sc_t* in_common, const lv_16sc_t** in_a, int num_a_vectors, unsigned int num_points)
{
int n_vec = num_a_vectors; int n_vec = num_a_vectors;
for (int i = 0; i < n_vec; i++) for (int i = 0; i < n_vec; i++)

View File

@@ -1875,8 +1875,7 @@ static inline void volk_gnsssdr_16ic_x2_rotator_dot_prod_16ic_xn_rvv(lv_16sc_t*
short* outPtr = (short*)result; short* outPtr = (short*)result;
const short* comPtr = (const short*)in_common; const short* comPtr = (const short*)in_common;
const short** inPtrBuf = (const short**)volk_gnsssdr_malloc( const short** inPtrBuf = (const short**)volk_gnsssdr_malloc(
num_a_vectors * sizeof(*in_a), volk_gnsssdr_get_alignment() num_a_vectors * sizeof(*in_a), volk_gnsssdr_get_alignment());
);
for (int n_vec = 0; n_vec < num_a_vectors; n_vec++) for (int n_vec = 0; n_vec < num_a_vectors; n_vec++)
{ {

View File

@@ -843,11 +843,9 @@ static inline void volk_gnsssdr_32f_sincos_32fc_rvv(lv_32fc_t* out, const float*
// outImag[i] = sinSignMask ? -sin[i] : sin[i] // outImag[i] = sinSignMask ? -sin[i] : sin[i]
// outReal[i] = cosSignMask ? cos[i] : -cos[i] // outReal[i] = cosSignMask ? cos[i] : -cos[i]
vfloat32m4_t outImagVal = __riscv_vmerge_vvm_f32m4( vfloat32m4_t outImagVal = __riscv_vmerge_vvm_f32m4(
sinVal, __riscv_vfneg_v_f32m4(sinVal, vl), sinSignMask, vl sinVal, __riscv_vfneg_v_f32m4(sinVal, vl), sinSignMask, vl);
);
vfloat32m4_t outRealVal = __riscv_vmerge_vvm_f32m4( vfloat32m4_t outRealVal = __riscv_vmerge_vvm_f32m4(
__riscv_vfneg_v_f32m4(cosVal, vl), cosVal, cosSignMask, vl __riscv_vfneg_v_f32m4(cosVal, vl), cosVal, cosSignMask, vl);
);
// Store out[0..vl) // Store out[0..vl)
vfloat32m4x2_t outVal = __riscv_vcreate_v_f32m4x2(outRealVal, outImagVal); vfloat32m4x2_t outVal = __riscv_vcreate_v_f32m4x2(outRealVal, outImagVal);

View File

@@ -498,8 +498,7 @@ static inline void volk_gnsssdr_32fc_32f_rotator_dot_prod_32fc_xn_rvv(lv_32fc_t*
float* outPtr = (float*)result; float* outPtr = (float*)result;
const float* comPtr = (const float*)in_common; const float* comPtr = (const float*)in_common;
const float** inPtrBuf = (const float**)volk_gnsssdr_malloc( const float** inPtrBuf = (const float**)volk_gnsssdr_malloc(
num_a_vectors * sizeof(*in_a), volk_gnsssdr_get_alignment() num_a_vectors * sizeof(*in_a), volk_gnsssdr_get_alignment());
);
for (int n_vec = 0; n_vec < num_a_vectors; n_vec++) for (int n_vec = 0; n_vec < num_a_vectors; n_vec++)
{ {

View File

@@ -803,8 +803,7 @@ static inline void volk_gnsssdr_32fc_x2_rotator_dot_prod_32fc_xn_rvv(lv_32fc_t*
float* outPtr = (float*)result; float* outPtr = (float*)result;
const float* comPtr = (const float*)in_common; const float* comPtr = (const float*)in_common;
const float** inPtrBuf = (const float**)volk_gnsssdr_malloc( const float** inPtrBuf = (const float**)volk_gnsssdr_malloc(
num_a_vectors * sizeof(*in_a), volk_gnsssdr_get_alignment() num_a_vectors * sizeof(*in_a), volk_gnsssdr_get_alignment());
);
for (int n_vec = 0; n_vec < num_a_vectors; n_vec++) for (int n_vec = 0; n_vec < num_a_vectors; n_vec++)
{ {

View File

@@ -290,7 +290,8 @@ static inline void volk_gnsssdr_8ic_x2_multiply_8ic_a_sse4_1(lv_8sc_t* cVector,
#ifdef LV_HAVE_RVV #ifdef LV_HAVE_RVV
#include <riscv_vector.h> #include <riscv_vector.h>
static inline void volk_gnsssdr_8ic_x2_multiply_8ic_rvv(lv_8sc_t* cVector, const lv_8sc_t* aVector, const lv_8sc_t* bVector, unsigned int num_points) { static inline void volk_gnsssdr_8ic_x2_multiply_8ic_rvv(lv_8sc_t* cVector, const lv_8sc_t* aVector, const lv_8sc_t* bVector, unsigned int num_points)
{
size_t n = num_points; size_t n = num_points;
// Initialize pointers to track progress as stripmine // Initialize pointers to track progress as stripmine
@@ -300,7 +301,8 @@ static inline void volk_gnsssdr_8ic_x2_multiply_8ic_rvv(lv_8sc_t* cVector, const
const signed char* aPtr = (const signed char*)aVector; const signed char* aPtr = (const signed char*)aVector;
const signed char* bPtr = (const signed char*)bVector; const signed char* bPtr = (const signed char*)bVector;
for (size_t vl; n > 0; n -= vl, cPtr += vl * 2, aPtr += vl * 2, bPtr += vl * 2) { for (size_t vl; n > 0; n -= vl, cPtr += vl * 2, aPtr += vl * 2, bPtr += vl * 2)
{
// Record how many elements will actually be processed // Record how many elements will actually be processed
vl = __riscv_vsetvl_e8m4(n); vl = __riscv_vsetvl_e8m4(n);

View File

@@ -263,7 +263,6 @@ static inline void volk_gnsssdr_8u_x2_multiply_8u_a_avx2(unsigned char* cChar, c
#endif /* LV_HAVE_SSE3 */ #endif /* LV_HAVE_SSE3 */
#ifdef LV_HAVE_RVV #ifdef LV_HAVE_RVV
#include <riscv_vector.h> #include <riscv_vector.h>

View File

@@ -1054,11 +1054,9 @@ static inline void volk_gnsssdr_s32f_sincos_32fc_rvv(lv_32fc_t* out, const float
// outImag[i] = sinSignMask ? -sin[i] : sin[i] // outImag[i] = sinSignMask ? -sin[i] : sin[i]
// outReal[i] = cosSignMask ? cos[i] : -cos[i] // outReal[i] = cosSignMask ? cos[i] : -cos[i]
vfloat32m4_t outImagVal = __riscv_vmerge_vvm_f32m4( vfloat32m4_t outImagVal = __riscv_vmerge_vvm_f32m4(
sinVal, __riscv_vfneg_v_f32m4(sinVal, vl), sinSignMask, vl sinVal, __riscv_vfneg_v_f32m4(sinVal, vl), sinSignMask, vl);
);
vfloat32m4_t outRealVal = __riscv_vmerge_vvm_f32m4( vfloat32m4_t outRealVal = __riscv_vmerge_vvm_f32m4(
__riscv_vfneg_v_f32m4(cosVal, vl), cosVal, cosSignMask, vl __riscv_vfneg_v_f32m4(cosVal, vl), cosVal, cosSignMask, vl);
);
// Store out[0..vl) // Store out[0..vl)
vfloat32m4x2_t outVal = __riscv_vcreate_v_f32m4x2(outRealVal, outImagVal); vfloat32m4x2_t outVal = __riscv_vcreate_v_f32m4x2(outRealVal, outImagVal);