diff --git a/common/utils/load_module_shlib.c b/common/utils/load_module_shlib.c index 3a47dca782a374ee9db5dd194fa36f3d976747b8..fe7356de9d16f9e784845fc59d53b86d61ee3aac 100644 --- a/common/utils/load_module_shlib.c +++ b/common/utils/load_module_shlib.c @@ -154,8 +154,7 @@ int load_module_version_shlib(char *modname, char *version, loader_shlibfunc_t * lib_idx = loader_data.numshlibs; ++loader_data.numshlibs; if (loader_data.numshlibs > loader_data.maxshlibs) { - fprintf(stderr, "[LOADER] can not load more than %d shlibs\n", - loader_data.maxshlibs); + fprintf(stderr, "[LOADER] can not load more than %u shlibs\n", loader_data.maxshlibs); ret = -1; goto load_module_shlib_exit; } diff --git a/executables/lte-uesoftmodem.c b/executables/lte-uesoftmodem.c index 7e6f77909574a8544a6f4bbb39e3dca14fe6da0d..a28c26814863e2112298f93860820631c325408e 100644 --- a/executables/lte-uesoftmodem.c +++ b/executables/lte-uesoftmodem.c @@ -746,7 +746,7 @@ void init_bler_table(void) for (unsigned int i = 0; i < NUM_MCS; i++) { char fName[1024]; - snprintf(fName, sizeof(fName), "%s/openair1/SIMULATION/LTE_PHY/BLER_SIMULATIONS/AWGN/AWGN_results/bler_tx1_chan18_nrx1_mcs%d.csv", openair_dir, i); + snprintf(fName, sizeof(fName), "%s/openair1/SIMULATION/LTE_PHY/BLER_SIMULATIONS/AWGN/AWGN_results/bler_tx1_chan18_nrx1_mcs%u.csv", openair_dir, i); FILE *pFile = fopen(fName, "r"); if (!pFile) { diff --git a/executables/nr-uesoftmodem.c b/executables/nr-uesoftmodem.c index 8bf0f6efec0a074c3edd83c8ff3c4dd4360096b8..231084e5291f270919b1b08cfd3bb5eb29a2386b 100644 --- a/executables/nr-uesoftmodem.c +++ b/executables/nr-uesoftmodem.c @@ -596,7 +596,7 @@ static void init_bler_table(char *env_string) { for (unsigned int i = 0; i < NR_NUM_MCS; i++) { char fName[1024]; - snprintf(fName, sizeof(fName), "%s/mcs%d_awgn_5G.csv", awgn_results_dir, i); + snprintf(fName, sizeof(fName), "%s/mcs%u_awgn_5G.csv", awgn_results_dir, i); FILE *pFile = fopen(fName, "r"); if (!pFile) { LOG_E(NR_MAC, "%s: open %s: %s\n", __func__, fName, strerror(errno)); diff --git a/nfapi/oai_integration/nfapi_pnf.c b/nfapi/oai_integration/nfapi_pnf.c index b431c9b37ac0acb59888c253531f9e78d0157474..3de07bd0be63318dbd5f9602eb63462bd6867dc1 100644 --- a/nfapi/oai_integration/nfapi_pnf.c +++ b/nfapi/oai_integration/nfapi_pnf.c @@ -2149,10 +2149,13 @@ void configure_nr_nfapi_pnf(char *vnf_ip_addr, int vnf_p5_port, char *pnf_ip_add pnf.phys[0].udp.tx_port = vnf_p7_port; strcpy(pnf.phys[0].udp.tx_addr, vnf_ip_addr); strcpy(pnf.phys[0].local_addr, pnf_ip_addr); - printf("%s() VNF:%s:%d PNF_PHY[addr:%s UDP:tx_addr:%s:%d rx:%d]\n", - __FUNCTION__,config->vnf_ip_addr, config->vnf_p5_port, + printf("%s() VNF:%s:%d PNF_PHY[addr:%s UDP:tx_addr:%s:%u rx:%u]\n", + __FUNCTION__, + config->vnf_ip_addr, + config->vnf_p5_port, pnf.phys[0].local_addr, - pnf.phys[0].udp.tx_addr, pnf.phys[0].udp.tx_port, + pnf.phys[0].udp.tx_addr, + pnf.phys[0].udp.tx_port, pnf.phys[0].udp.rx_port); config->cell_search_req = &cell_search_request; @@ -2200,11 +2203,13 @@ void configure_nfapi_pnf(char *vnf_ip_addr, int vnf_p5_port, char *pnf_ip_addr, pnf.phys[0].udp.tx_port = vnf_p7_port; strcpy(pnf.phys[0].udp.tx_addr, vnf_ip_addr); strcpy(pnf.phys[0].local_addr, pnf_ip_addr); - printf("%s() VNF:%s:%d PNF_PHY[addr:%s UDP:tx_addr:%s:%d rx:%d]\n", + printf("%s() VNF:%s:%d PNF_PHY[addr:%s UDP:tx_addr:%s:%u rx:%u]\n", __FUNCTION__, - config->vnf_ip_addr, config->vnf_p5_port, + config->vnf_ip_addr, + config->vnf_p5_port, pnf.phys[0].local_addr, - pnf.phys[0].udp.tx_addr, pnf.phys[0].udp.tx_port, + pnf.phys[0].udp.tx_addr, + pnf.phys[0].udp.tx_port, pnf.phys[0].udp.rx_port); config->pnf_param_req = &pnf_param_request; config->pnf_config_req = &pnf_config_request; diff --git a/nfapi/open-nFAPI/vnf_sim/src/mac.cpp b/nfapi/open-nFAPI/vnf_sim/src/mac.cpp index 88898afc744133966b9eb079235b4537d2be453d..63bb877f1d632a12d247d73e49e6e72d4151797c 100644 --- a/nfapi/open-nFAPI/vnf_sim/src/mac.cpp +++ b/nfapi/open-nFAPI/vnf_sim/src/mac.cpp @@ -1106,7 +1106,7 @@ extern "C" if(instance->mac->tick == 1000) { if(instance->mac->byte_count > 0) { - printf("[MAC] Rx rate %d bytes/sec\n", instance->mac->byte_count); + printf("[MAC] Rx rate %u bytes/sec\n", instance->mac->byte_count); instance->mac->byte_count = 0; } diff --git a/openair1/PHY/CODING/3gpplte.c b/openair1/PHY/CODING/3gpplte.c index 52090d8ec11713f7e77c711f96921efd3d15e00c..49740487acc18b31ff4d9e3eefe456cbc352123e 100644 --- a/openair1/PHY/CODING/3gpplte.c +++ b/openair1/PHY/CODING/3gpplte.c @@ -62,7 +62,7 @@ inline uint16_t threegpplte_interleaver(uint16_t f1, threegpplte_interleaver_output-=K; */ #ifdef DEBUG_TURBO_ENCODER - printf("pi(i) %d : 2*f2 * i = %d, f1 %d f2 %d, K %d, pi(i-1) %d \n",threegpplte_interleaver_output,threegpplte_interleaver_tmp,f1,f2,K,threegpplte_interleaver_output); + printf("pi(i) %u : 2*f2 * i = %u, f1 %u f2 %u, K %u, pi(i-1) %u \n",threegpplte_interleaver_output,threegpplte_interleaver_tmp,f1,f2,K,threegpplte_interleaver_output); #endif return(threegpplte_interleaver_output); } diff --git a/openair1/PHY/CODING/3gpplte_turbo_decoder_avx2_16bit.c b/openair1/PHY/CODING/3gpplte_turbo_decoder_avx2_16bit.c index 082dfb94c647fa096d0dc38520b310353a8afa3b..3941b94d5ec6871e00fe7d5d9cac402b284f9ffc 100644 --- a/openair1/PHY/CODING/3gpplte_turbo_decoder_avx2_16bit.c +++ b/openair1/PHY/CODING/3gpplte_turbo_decoder_avx2_16bit.c @@ -1009,8 +1009,8 @@ unsigned char phy_threegpplte_turbo_decoder16avx2(int16_t *y, yp1[(n<<1)+i+8] = *yp_cw2; yp_cw2++; #ifdef DEBUG_LOGMAP - fprintf(fdavx2,"Term 1 (%d): %d %d\n",n+i,s[(n<<1)+i],yp1[(n<<1)+i]); - fprintf(fdavx2b,"Term 1 (%d): %d %d\n",n+i,s[(n<<1)+i+8],yp1[(n<<1)+i+8]); + fprintf(fdavx2,"Term 1 (%u): %d %d\n",n+i,s[(n<<1)+i],yp1[(n<<1)+i]); + fprintf(fdavx2b,"Term 1 (%u): %d %d\n",n+i,s[(n<<1)+i+8],yp1[(n<<1)+i+8]); #endif //DEBUG_LOGMAP } @@ -1029,8 +1029,8 @@ unsigned char phy_threegpplte_turbo_decoder16avx2(int16_t *y, yp2[(n<<1)+i-16+8] = *yp_cw2; yp_cw2++; #ifdef DEBUG_LOGMAP - fprintf(fdavx2,"Term 2 (%d): %d %d\n",n+i-3-8,s[(n<<1)+i],yp2[(n<<1)+i-16]); - fprintf(fdavx2b,"Term 2 (%d): %d %d\n",n+i-3-8,s[(n<<1)+i+8],yp2[(n<<1)+i-16+8]); + fprintf(fdavx2,"Term 2 (%u): %d %d\n",n+i-3-8,s[(n<<1)+i],yp2[(n<<1)+i-16]); + fprintf(fdavx2b,"Term 2 (%u): %d %d\n",n+i-3-8,s[(n<<1)+i+8],yp2[(n<<1)+i-16+8]); #endif //DEBUG_LOGMAP } @@ -1144,8 +1144,8 @@ unsigned char phy_threegpplte_turbo_decoder16avx2(int16_t *y, decoded_bytes2[i]=(uint8_t)(db>>16)&0xff; #ifdef DEBUG_LOGMAP print_shorts("tmp",(int16_t*)&tmp); - fprintf(fdavx2,"decoded_bytes[%d] %x (%x)\n",i,decoded_bytes[i],db); - fprintf(fdavx2b,"decoded_bytes[%d] %x (%x)\n",i,decoded_bytes2[i],db); + fprintf(fdavx2,"decoded_bytes[%u] %x (%x)\n",i,decoded_bytes[i],db); + fprintf(fdavx2b,"decoded_bytes[%u] %x (%x)\n",i,decoded_bytes2[i],db); #endif } } diff --git a/openair1/PHY/CODING/3gpplte_turbo_decoder_sse_16bit.c b/openair1/PHY/CODING/3gpplte_turbo_decoder_sse_16bit.c index 12ecc959c649304af14b77733beb881fcca9e3af..896e69a4b1fdad8c52ff9e16a081429cb038c345 100644 --- a/openair1/PHY/CODING/3gpplte_turbo_decoder_sse_16bit.c +++ b/openair1/PHY/CODING/3gpplte_turbo_decoder_sse_16bit.c @@ -1075,14 +1075,14 @@ uint8_t phy_threegpplte_turbo_decoder16(int16_t *y, yp1[j] = _mm_extract_epi16(tmpe,1); yp2[j] = _mm_extract_epi16(tmpe,2); #ifdef DEBUG_LOGMAP - fprintf(fdsse4,"init0: j %d, s[j] %d yp1[j] %d yp2[j] %d\n",j,s[j],yp1[j],yp2[j]); + fprintf(fdsse4,"init0: j %u, s[j] %d yp1[j] %d yp2[j] %d\n",j,s[j],yp1[j],yp2[j]); #endif j=pi2_p[1]; s[j] = _mm_extract_epi16(tmpe,3); yp1[j] = _mm_extract_epi16(tmpe,4); yp2[j] = _mm_extract_epi16(tmpe,5); #ifdef DEBUG_LOGMAP - fprintf(fdsse4,"init1: j %d, s[j] %d yp1[j] %d yp2[j] %d\n",j,s[j],yp1[j],yp2[j]); + fprintf(fdsse4,"init1: j %u, s[j] %d yp1[j] %d yp2[j] %d\n",j,s[j],yp1[j],yp2[j]); #endif j=pi2_p[2]; s[j] = _mm_extract_epi16(tmpe,6); @@ -1090,21 +1090,21 @@ uint8_t phy_threegpplte_turbo_decoder16(int16_t *y, tmpe = _mm_load_si128(&yp128[1]); yp2[j] = _mm_extract_epi16(tmpe,0); #ifdef DEBUG_LOGMAP - fprintf(fdsse4,"init2: j %d, s[j] %d yp1[j] %d yp2[j] %d\n",j,s[j],yp1[j],yp2[j]); + fprintf(fdsse4,"init2: j %u, s[j] %d yp1[j] %d yp2[j] %d\n",j,s[j],yp1[j],yp2[j]); #endif j=pi2_p[3]; s[j] = _mm_extract_epi16(tmpe,1); yp1[j] = _mm_extract_epi16(tmpe,2); yp2[j] = _mm_extract_epi16(tmpe,3); #ifdef DEBUG_LOGMAP - fprintf(fdsse4,"init3: j %d, s[j] %d yp1[j] %d yp2[j] %d\n",j,s[j],yp1[j],yp2[j]); + fprintf(fdsse4,"init3: j %u, s[j] %d yp1[j] %d yp2[j] %d\n",j,s[j],yp1[j],yp2[j]); #endif j=pi2_p[4]; s[j] = _mm_extract_epi16(tmpe,4); yp1[j] = _mm_extract_epi16(tmpe,5); yp2[j] = _mm_extract_epi16(tmpe,6); #ifdef DEBUG_LOGMAP - fprintf(fdsse4,"init4: j %d, s[j] %d yp1[j] %d yp2[j] %d\n",j,s[j],yp1[j],yp2[j]); + fprintf(fdsse4,"init4: j %u, s[j] %d yp1[j] %d yp2[j] %d\n",j,s[j],yp1[j],yp2[j]); #endif j=pi2_p[5]; s[j] = _mm_extract_epi16(tmpe,7); @@ -1112,21 +1112,21 @@ uint8_t phy_threegpplte_turbo_decoder16(int16_t *y, yp1[j] = _mm_extract_epi16(tmpe,0); yp2[j] = _mm_extract_epi16(tmpe,1); #ifdef DEBUG_LOGMAP - fprintf(fdsse4,"init5: j %d, s[j] %d yp1[j] %d yp2[j] %d\n",j,s[j],yp1[j],yp2[j]); + fprintf(fdsse4,"init5: j %u, s[j] %d yp1[j] %d yp2[j] %d\n",j,s[j],yp1[j],yp2[j]); #endif j=pi2_p[6]; s[j] = _mm_extract_epi16(tmpe,2); yp1[j] = _mm_extract_epi16(tmpe,3); yp2[j] = _mm_extract_epi16(tmpe,4); #ifdef DEBUG_LOGMAP - fprintf(fdsse4,"init6: j %d, s[j] %d yp1[j] %d yp2[j] %d\n",j,s[j],yp1[j],yp2[j]); + fprintf(fdsse4,"init6: j %u, s[j] %d yp1[j] %d yp2[j] %d\n",j,s[j],yp1[j],yp2[j]); #endif j=pi2_p[7]; s[j] = _mm_extract_epi16(tmpe,5); yp1[j] = _mm_extract_epi16(tmpe,6); yp2[j] = _mm_extract_epi16(tmpe,7); #ifdef DEBUG_LOGMAP - fprintf(fdsse4,"init7: j %d, s[j] %d yp1[j] %d yp2[j] %d\n",j,s[j],yp1[j],yp2[j]); + fprintf(fdsse4,"init7: j %u, s[j] %d yp1[j] %d yp2[j] %d\n",j,s[j],yp1[j],yp2[j]); #endif #elif defined(__arm__) || defined(__aarch64__) s[j] = vgetq_lane_s16(yp128[0],0); diff --git a/openair1/PHY/CODING/TESTBENCH/ldpctest.c b/openair1/PHY/CODING/TESTBENCH/ldpctest.c index 411d62a5ac8cf24c1b8e1ffc7b7413196b84cfe7..66cd8ffde7d6f7553034f24c985108a7fdaf08ca 100644 --- a/openair1/PHY/CODING/TESTBENCH/ldpctest.c +++ b/openair1/PHY/CODING/TESTBENCH/ldpctest.c @@ -298,7 +298,7 @@ int test_ldpc(short max_iterations, for (int j=0;j<n_segments;j++) for (int i = 0; i < block_length+(nrows-no_punctured_columns) * Zc - removed_bit; i++) if (channel_input[j][i]!=channel_input_optim[j][i]) { - printf("differ in seg %u pos %u (%u,%u)\n", j, i, channel_input[j][i], channel_input_optim[j][i]); + printf("differ in seg %d pos %d (%u,%u)\n", j, i, channel_input[j][i], channel_input_optim[j][i]); return (-1); } //else{ @@ -317,7 +317,7 @@ int test_ldpc(short max_iterations, for (int i = 2*Zc; i < (Kb+nrows-no_punctured_columns) * Zc-removed_bit; i++) { #ifdef DEBUG_CODER if ((i&0xf)==0) - printf("\ne %u..%u: ",i,i+15); + printf("\ne %d..%d: ",i,i+15); #endif if (channel_input_optim[j][i-2*Zc]==0) diff --git a/openair1/PHY/CODING/ccoding_byte_lte.c b/openair1/PHY/CODING/ccoding_byte_lte.c index 046bf182c5044900532089ff4fdc3f0b25da6c2f..5329dd42fbac596bc936a24a524ccbf9d265cfee 100644 --- a/openair1/PHY/CODING/ccoding_byte_lte.c +++ b/openair1/PHY/CODING/ccoding_byte_lte.c @@ -101,7 +101,7 @@ ccodelte_encode (int32_t numbits, state |= (1<<shiftbit); #ifdef DEBUG_CCODE - printf("shiftbit %d, %d -> %d \n",shiftbit,c&(1<<(7-first_bit-shiftbit)),state); + printf("shiftbit %d, %d -> %u \n",shiftbit,c&(1<<(7-first_bit-shiftbit)),state); dummy+=3; #endif } @@ -119,7 +119,7 @@ ccodelte_encode (int32_t numbits, state |= 64; #ifdef DEBUG_CCODE - printf("shiftbit %d, %d: %d -> %d \n",shiftbit,state>>6,dummy,state); + printf("shiftbit %d, %u: %u -> %u \n",shiftbit,state>>6,dummy,state); dummy+=3; #endif } @@ -128,7 +128,7 @@ ccodelte_encode (int32_t numbits, state = state & 0x3f; // true initial state of Tail-biting CCode state<<=1; // because of loop structure in CCode #ifdef DEBUG_CCODE - printf("Initial state %d\n",state); + printf("Initial state %u\n",state); dummy = 0; #endif //DEBUG_CCODE /* Do not increment inPtr until we read the next octet */ @@ -152,7 +152,7 @@ ccodelte_encode (int32_t numbits, *outPtr++ = (out>>1)&1; *outPtr++ = (out>>2)&1; #ifdef DEBUG_CCODE - printf("numbits %d, input %d, outbit %d: %d -> %d (%d%d%d)\n",numbits,state>>6,dummy,state,out,out&1,(out>>1)&1,(out>>2)&1); + printf("numbits %d, input %u, outbit %u: %u -> %d (%d%d%d)\n",numbits,state>>6,dummy,state,out,out&1,(out>>1)&1,(out>>2)&1); dummy+=3; #endif //DEBUG_CCODE } @@ -175,7 +175,7 @@ ccodelte_encode (int32_t numbits, *outPtr++ = (out>>1)&1; *outPtr++ = (out>>2)&1; #ifdef DEBUG_CCODE - printf("crc bit %d input %d, outbit %d: %d -> %d (%u)\n",shiftbit,state>>6,dummy,state,out,ccodelte_table[state]); + printf("crc bit %d input %u, outbit %u: %u -> %d (%u)\n",shiftbit,state>>6,dummy,state,out,ccodelte_table[state]); dummy+=3; #endif //DEBUG_CCODE } @@ -198,7 +198,7 @@ ccodelte_encode (int32_t numbits, *outPtr++ = (out>>1)&1; *outPtr++ = (out>>2)&1; #ifdef DEBUG_CCODE - printf("crc bit %d input %d, outbit %d: %d -> %d (%u)\n",shiftbit,state>>6,dummy,state,out,ccodelte_table[state]); + printf("crc bit %d input %u, outbit %u: %u -> %d (%u)\n",shiftbit,state>>6,dummy,state,out,ccodelte_table[state]); dummy+=3; #endif //DEBUG_CCODE } diff --git a/openair1/PHY/CODING/lte_rate_matching.c b/openair1/PHY/CODING/lte_rate_matching.c index 0cb7740b1a9525b0e1e2abf44a1baeab30067b03..8a1ca3047411aa166202942bd4158bf84cc69c70 100644 --- a/openair1/PHY/CODING/lte_rate_matching.c +++ b/openair1/PHY/CODING/lte_rate_matching.c @@ -61,8 +61,8 @@ uint32_t sub_block_interleaving_turbo(uint32_t D, uint8_t *d,uint8_t *w) { // Kpi3 = Kpi*3; ND = Kpi - D; #ifdef RM_DEBUG - printf("sub_block_interleaving_turbo : D = %d (%d)\n",D,D*3); - printf("RTC = %d, Kpi=%d, ND=%d\n",RTC,Kpi,ND); + printf("sub_block_interleaving_turbo : D = %u (%u)\n",D,D*3); + printf("RTC = %u, Kpi=%u, ND=%u\n",RTC,Kpi,ND); #endif ND3 = ND*3; // copy d02 to dD2 (for mod Kpi operation from clause (4), p.16 of 36.212 @@ -75,7 +75,7 @@ uint32_t sub_block_interleaving_turbo(uint32_t D, uint8_t *d,uint8_t *w) { for (col=0; col<32; col++) { #ifdef RM_DEBUG - printf("Col %d\n",col); + printf("Col %u\n",col); #endif index3 = bitrev_x3[col];//3*index; @@ -84,7 +84,7 @@ uint32_t sub_block_interleaving_turbo(uint32_t D, uint8_t *d,uint8_t *w) { w[Kpi+k2] = d2[index3];//d[index3-ND3+1]; w[Kpi+1+k2] = d3[index3];//d[index3-ND3+5]; #ifdef RM_DEBUG - printf("row %d, index %d, index-Nd %d index-Nd+1 %d (k,Kpi+2k,Kpi+2k+1) (%d,%d,%d) w(%d,%d,%d)\n",row,index,index-ND,((index+1)%Kpi)-ND,k,Kpi+(k<<1),Kpi+(k<<1)+1,w[k],w[Kpi+(k<<1)],w[Kpi+1+(k<<1)]); + printf("row %u, index %d, index-Nd %d index-Nd+1 %d (k,Kpi+2k,Kpi+2k+1) (%u,%u,%u) w(%d,%d,%d)\n",row,index,index-ND,((index+1)%Kpi)-ND,k,Kpi+(k<<1),Kpi+(k<<1)+1,w[k],w[Kpi+(k<<1)],w[Kpi+1+(k<<1)]); if (w[k]== LTE_NULL) nulled++; @@ -108,11 +108,11 @@ uint32_t sub_block_interleaving_turbo(uint32_t D, uint8_t *d,uint8_t *w) { #ifdef RM_DEBUG if (ND>0) { - printf("RM_TX: Nulled last component in pos %d\n",Kpi-1+k2); + printf("RM_TX: Nulled last component in pos %u\n",Kpi-1+k2); nulled++; } - printf("RM_TX: Nulled %d\n",nulled); + printf("RM_TX: Nulled %u\n",nulled); #endif return(RTC); } @@ -133,15 +133,15 @@ uint32_t sub_block_interleaving_cc(uint32_t D, uint8_t *d,uint8_t *w) { // Kpi3 = Kpi*3; ND = Kpi - D; #ifdef RM_DEBUG_CC - printf("sub_block_interleaving_cc : D = %d (%d), d %p, w %p\n",D,D*3,d,w); - printf("RCC = %d, Kpi=%d, ND=%d\n",RCC,Kpi,ND); + printf("sub_block_interleaving_cc : D = %u (%u), d %p, w %p\n",D,D*3,d,w); + printf("RCC = %u, Kpi=%u, ND=%u\n",RCC,Kpi,ND); #endif ND3 = ND*3; k=0; for (col=0; col<32; col++) { #ifdef RM_DEBUG_CC - printf("Col %d\n",col); + printf("Col %u\n",col); #endif index = bitrev_cc[col]; index3 = 3*index; @@ -151,7 +151,7 @@ uint32_t sub_block_interleaving_cc(uint32_t D, uint8_t *d,uint8_t *w) { w[Kpi+k] = d[(int32_t)index3-(int32_t)ND3+1]; w[(Kpi<<1)+k] = d[(int32_t)index3-(int32_t)ND3+2]; #ifdef RM_DEBUG_CC - printf("row %d, index %d k %d w(%d,%d,%d)\n",row,index,k,w[k],w[Kpi+k],w[(Kpi<<1)+k]); + printf("row %u, index %u k %u w(%u,%d,%d)\n",row,index,k,w[k],w[Kpi+k],w[(Kpi<<1)+k]); if (w[k]== LTE_NULL) nulled++; @@ -170,7 +170,7 @@ uint32_t sub_block_interleaving_cc(uint32_t D, uint8_t *d,uint8_t *w) { } #ifdef RM_DEBUG_CC - printf("RM_TX: Nulled %d\n",nulled); + printf("RM_TX: Nulled %u\n",nulled); #endif return(RCC); } @@ -188,8 +188,8 @@ void sub_block_deinterleaving_turbo(uint32_t D,int16_t *d,int16_t *w) { // Kpi3 = Kpi*3; ND = Kpi - D; #ifdef RM_DEBUG2 - printf("sub_block_interleaving_turbo : D = %d (%d)\n",D,D*3); - printf("RTC = %d, Kpi=%d, ND=%d\n",RTC,Kpi,ND); + printf("sub_block_interleaving_turbo : D = %u (%u)\n",D,D*3); + printf("RTC = %u, Kpi=%u, ND=%u\n",RTC,Kpi,ND); #endif ND3 = ND*3; // copy d02 to dD2 (for mod Kpi operation from clause (4), p.16 of 36.212 @@ -201,7 +201,7 @@ void sub_block_deinterleaving_turbo(uint32_t D,int16_t *d,int16_t *w) { for (col=0; col<32; col++) { #ifdef RM_DEBUG2 - printf("Col %d\n",col); + printf("Col %u\n",col); #endif index3 = bitrev_x3[col];//3*index; @@ -236,15 +236,15 @@ void sub_block_deinterleaving_cc(uint32_t D,int8_t *d,int8_t *w) { // Kpi3 = Kpi*3; ND = Kpi - D; #ifdef RM_DEBUG2 - printf("sub_block_interleaving_cc : D = %d (%d), d %p, w %p\n",D,D*3,d,w); - printf("RCC = %d, Kpi=%d, ND=%ld\n",RCC,Kpi,(long)ND); + printf("sub_block_interleaving_cc : D = %u (%u), d %p, w %p\n",D,D*3,d,w); + printf("RCC = %u, Kpi=%u, ND=%ld\n",RCC,Kpi,(long)ND); #endif ND3 = ND*3; k=0; for (col=0; col<32; col++) { #ifdef RM_DEBUG2 - printf("Col %d\n",col); + printf("Col %u\n",col); #endif index = bitrev_cc[col]; index3 = 3*index; @@ -254,7 +254,7 @@ void sub_block_deinterleaving_cc(uint32_t D,int8_t *d,int8_t *w) { d[index3-ND3+1] = w[Kpi+k]; d[index3-ND3+2] = w[(Kpi<<1)+k]; #ifdef RM_DEBUG2 - printf("row %d, index %d k %d index3-ND3 %ld w(%d,%d,%d)\n", + printf("row %u, index %u k %u index3-ND3 %ld w(%d,%d,%d)\n", row,index,k,(long)(index3-ND3),w[k],w[Kpi+k],w[(Kpi<<1)+k]); #endif index3+=96; @@ -280,8 +280,8 @@ uint32_t generate_dummy_w(uint32_t D, uint8_t *w,uint8_t F) { // Kpi3 = Kpi*3; ND = Kpi - D; #ifdef RM_DEBUG - printf("dummy sub_block_interleaving_turbo : D = %d (%d)\n",D,D*3); - printf("RTC = %d, Kpi=%d, ND=%d, F=%d (Nulled %d)\n",RTC,Kpi,ND,F,(2*F + 3*ND)); + printf("dummy sub_block_interleaving_turbo : D = %u (%u)\n",D,D*3); + printf("RTC = %u, Kpi=%u, ND=%u, F=%d (Nulled %u)\n",RTC,Kpi,ND,F,(2*F + 3*ND)); #endif k=0; k2=0; @@ -292,7 +292,7 @@ uint32_t generate_dummy_w(uint32_t D, uint8_t *w,uint8_t F) { for (col=0; col<32; col++) { #ifdef RM_DEBUG - printf("Col %d\n",col); + printf("Col %u\n",col); #endif index = bitrev[col]; @@ -329,7 +329,7 @@ uint32_t generate_dummy_w(uint32_t D, uint8_t *w,uint8_t F) { } #ifdef RM_DEBUG - printf("k %d w (%d,%d,%d) w+1 (%d,%d,%d), index %d index-ND-F %d index+32-ND-F %d\n",k,w[k],w[Kpi+(k<<1)],w[Kpi+1+(k<<1)],w[k+1],w[2+Kpi+(k<<1)],w[2+Kpi+1+(k<<1)],index,index-ND-F,index+32-ND-F); + printf("k %d w (%d,%d,%d) w+1 (%d,%d,%d), index %u index-ND-F %u index+32-ND-F %u\n",k,w[k],w[Kpi+(k<<1)],w[Kpi+1+(k<<1)],w[k+1],w[2+Kpi+(k<<1)],w[2+Kpi+1+(k<<1)],index,index-ND-F,index+32-ND-F); #endif k+=RTC; k2=k<<1; @@ -346,7 +346,7 @@ uint32_t generate_dummy_w(uint32_t D, uint8_t *w,uint8_t F) { printf("dummy_w: Nulled final position %d\n",(3*Kpi)-1); } - printf("Nulled = %d\n",nulled); + printf("Nulled = %u\n",nulled); #endif return(RTC); } @@ -366,8 +366,8 @@ uint32_t generate_dummy_w_cc(uint32_t D, uint8_t *w) { // Kpi3 = Kpi*3; ND = Kpi - D; #ifdef RM_DEBUG_CC - printf("dummy sub_block_interleaving_cc : D = %d (%d)\n",D,D*3); - printf("RCC = %d, Kpi=%d, ND=%d, (Nulled %d)\n",RCC,Kpi,ND,3*ND); + printf("dummy sub_block_interleaving_cc : D = %u (%u)\n",D,D*3); + printf("RCC = %u, Kpi=%u, ND=%u, (Nulled %u)\n",RCC,Kpi,ND,3*ND); #endif // ND3 = ND*3; // copy d02 to dD2 (for mod Kpi operation from clause (4), p.16 of 36.212 @@ -375,7 +375,7 @@ uint32_t generate_dummy_w_cc(uint32_t D, uint8_t *w) { for (col=0; col<32; col++) { #ifdef RM_DEBUG_CC - printf("Col %d\n",col); + printf("Col %u\n",col); #endif index = bitrev_cc[col]; @@ -416,13 +416,13 @@ uint32_t generate_dummy_w_cc(uint32_t D, uint8_t *w) { } */ #ifdef RM_DEBUG_CC - printf("k %d w (%d,%d,%d), index-ND %d index+32-ND %d\n",k,w[k],w[Kpi+k],w[(Kpi<<1)+k],index-ND,index+32-ND); + printf("k %d w (%d,%d,%d), index-ND %u index+32-ND %u\n",k,w[k],w[Kpi+k],w[(Kpi<<1)+k],index-ND,index+32-ND); #endif k+=RCC; } #ifdef RM_DEBUG_CC - printf("Nulled = %d\n",nulled); + printf("Nulled = %u\n",nulled); #endif return(RCC); } @@ -503,7 +503,7 @@ uint32_t lte_rate_matching_turbo(uint32_t RTC, Ncbmod = Ncb%(RTC<<3); ind = RTC * (2+(rvidx*(((Ncbmod==0)?0:1) + (Ncb/(RTC<<3)))*2)); #ifdef RM_DEBUG_TX - printf("lte_rate_matching_turbo: E %d, k0 %d, Ncbmod %d, Ncb/(RTC<<3) %d\n",E,ind,Ncbmod,Ncb/(RTC<<3)); + printf("lte_rate_matching_turbo: E %u, k0 %u, Ncbmod %u, Ncb/(RTC<<3) %u\n",E,ind,Ncbmod,Ncb/(RTC<<3)); #endif //e2=e+(r*E); e2 = e; @@ -512,7 +512,7 @@ uint32_t lte_rate_matching_turbo(uint32_t RTC, for (; (ind<Ncb)&&(k<E); ind++) { // e2[k]=w[ind]; #ifdef RM_DEBUG_TX - printf("RM_TX k%d Ind: %d (%d)\n",k,ind,w[ind]); + printf("RM_TX k%u Ind: %u (%d)\n",k,ind,w[ind]); #endif if (w[ind] != LTE_NULL) e2[k++]=w[ind]; @@ -522,7 +522,7 @@ uint32_t lte_rate_matching_turbo(uint32_t RTC, for (ind=0; (ind<Ncb)&&(k<E); ind++) { // e2[k] = w[ind]; #ifdef RM_DEBUG_TX - printf("RM_TX k%d Ind: %d (%d)\n",k,ind,w[ind]); + printf("RM_TX k%u Ind: %u (%d)\n",k,ind,w[ind]); #endif if (w[ind] != LTE_NULL) e2[k++]=w[ind]; @@ -613,7 +613,7 @@ uint32_t lte_rate_matching_cc(uint32_t RCC, while(w[ind] == LTE_NULL) { #ifdef RM_DEBUG_CC nulled++; - printf("RM_TX_CC : ind %d, NULL\n",ind); + printf("RM_TX_CC : ind %u, NULL\n",ind); #endif ind++; @@ -624,7 +624,7 @@ uint32_t lte_rate_matching_cc(uint32_t RCC, e[k] = w[ind]; #ifdef RM_DEBUG_CC // printf("k %d ind %d, w %c(%d)\n",k,ind,w[ind],w[ind]); - printf("RM_TX_CC %d Ind: %d (%d)\n",k,ind,e[k]); + printf("RM_TX_CC %u Ind: %u (%d)\n",k,ind,e[k]); #endif ind++; @@ -633,7 +633,7 @@ uint32_t lte_rate_matching_cc(uint32_t RCC, } #ifdef RM_DEBUG_CC - printf("nulled %d\n",nulled); + printf("nulled %u\n",nulled); #endif return(E); } @@ -688,7 +688,7 @@ int lte_rate_matching_turbo_rx(uint32_t RTC, Ncbmod = Ncb%(RTC<<3); ind = RTC * (2+(rvidx*(((Ncbmod==0)?0:1) + (Ncb/(RTC<<3)))*2)); #ifdef RM_DEBUG - printf("lte_rate_matching_turbo_rx: Clear %d, E %d, Ncb %d, Kw %d, rvidx %d, G %d, Qm %d, Nl%d, r %d\n",clear,E,Ncb,3*(RTC<<5),rvidx, G, Qm,Nl,r); + printf("lte_rate_matching_turbo_rx: Clear %d, E %u, Ncb %u, Kw %u, rvidx %d, G %u, Qm %d, Nl%d, r %d\n",clear,E,Ncb,3*(RTC<<5),rvidx, G, Qm,Nl,r); #endif if (clear==1) @@ -705,13 +705,13 @@ int lte_rate_matching_turbo_rx(uint32_t RTC, printf("ind %d: w %d => soft_in %d\n",ind,w[ind],soft_input2[k]);*/ w[ind] += soft_input2[k++]; #ifdef RM_DEBUG - printf("RM_RX k%d Ind: %d (%d)\n",k-1,ind,w[ind]); + printf("RM_RX k%u Ind: %u (%d)\n",k-1,ind,w[ind]); #endif } #ifdef RM_DEBUG else { - printf("RM_RX Ind: %d NULL %d\n",ind,nulled); + printf("RM_RX Ind: %u NULL %d\n",ind,nulled); nulled++; } @@ -723,13 +723,13 @@ int lte_rate_matching_turbo_rx(uint32_t RTC, if (dummy_w[ind] != LTE_NULL) { w[ind] += soft_input2[k++]; #ifdef RM_DEBUG - printf("RM_RX k%d Ind: %d (%d)(soft in %d)\n",k-1,ind,w[ind],soft_input2[k-1]); + printf("RM_RX k%u Ind: %u (%d)(soft in %d)\n",k-1,ind,w[ind],soft_input2[k-1]); #endif } #ifdef RM_DEBUG else { - printf("RM_RX Ind: %d NULL %d\n",ind,nulled); + printf("RM_RX Ind: %u NULL %d\n",ind,nulled); nulled++; } @@ -797,7 +797,7 @@ void lte_rate_matching_cc_rx(uint32_t RCC, int16_t w16[Kw]; #ifdef RM_DEBUG_CC uint32_t nulled=0; - printf("lte_rate_matching_cc_rx: Kw %d, E %d, w %p, soft_input %p\n",3*(RCC<<5),E,w,soft_input); + printf("lte_rate_matching_cc_rx: Kw %u, E %d, w %p, soft_input %p\n",3*(RCC<<5),E,w,soft_input); #endif memset(w,0,Kw); memset(w16,0,Kw*sizeof(int16_t)); @@ -806,7 +806,7 @@ void lte_rate_matching_cc_rx(uint32_t RCC, while(dummy_w[ind] == LTE_NULL) { #ifdef RM_DEBUG_CC nulled++; - printf("RM_RX : ind %d, NULL\n",ind); + printf("RM_RX : ind %u, NULL\n",ind); #endif ind++; @@ -820,7 +820,7 @@ void lte_rate_matching_cc_rx(uint32_t RCC, */ // Maximum-ratio combining of repeated bits and retransmissions #ifdef RM_DEBUG_CC - printf("RM_RX_CC k %d (%d) ind: %d (%d)\n",k,soft_input[k],ind,w16[ind]); + printf("RM_RX_CC k %u (%d) ind: %u (%d)\n",k,soft_input[k],ind,w16[ind]); #endif w16[ind] += soft_input[k]; ind++; @@ -843,7 +843,7 @@ void lte_rate_matching_cc_rx(uint32_t RCC, } #ifdef RM_DEBUG_CC - printf("Nulled %d\n",nulled); + printf("Nulled %u\n",nulled); #endif } diff --git a/openair1/PHY/CODING/lte_segmentation.c b/openair1/PHY/CODING/lte_segmentation.c index 5fda1b94904dc528af58789da0ffd59c07c335dc..9a0d79f463dfa334589c1516a7e8310d354b96a0 100644 --- a/openair1/PHY/CODING/lte_segmentation.c +++ b/openair1/PHY/CODING/lte_segmentation.c @@ -173,7 +173,7 @@ main() { for (Bbytes=5; Bbytes<2*768; Bbytes++) { lte_segmentation(0,0,Bbytes<<3,&C,&Cplus,&Cminus,&Kplus,&Kminus,&F); - printf("Bbytes %d : C %d, Cplus %d, Cminus %d, Kplus %d, Kminus %d, F %d\n", + printf("Bbytes %u : C %u, Cplus %u, Cminus %u, Kplus %u, Kminus %u, F %u\n", Bbytes, C, Cplus, Cminus, Kplus, Kminus, F); } } diff --git a/openair1/PHY/CODING/nrLDPC_decoder/nrLDPC_decoder_offload.c b/openair1/PHY/CODING/nrLDPC_decoder/nrLDPC_decoder_offload.c index 33c00263149f295c6c37e839aa3ecea627cecc48..38b3ca85e0166b41c2f2e5bd71d6db4b23cdacff 100644 --- a/openair1/PHY/CODING/nrLDPC_decoder/nrLDPC_decoder_offload.c +++ b/openair1/PHY/CODING/nrLDPC_decoder/nrLDPC_decoder_offload.c @@ -311,7 +311,7 @@ create_mempools(struct active_device *ad, int socket_id, mp = rte_bbdev_op_pool_create(pool_name, op_type, ops_pool_size, OPS_CACHE_SIZE, socket_id); TEST_ASSERT_NOT_NULL(mp, - "ERROR Failed to create %u items ops pool for dev %u on socket %u.", + "ERROR Failed to create %u items ops pool for dev %u on socket %d.", ops_pool_size, ad->dev_id, socket_id); @@ -328,7 +328,7 @@ create_mempools(struct active_device *ad, int socket_id, mp = create_mbuf_pool(p_offloadParams->E, ad->dev_id, socket_id, mbuf_pool_size, "in"); TEST_ASSERT_NOT_NULL(mp, - "ERROR Failed to create %u items input pktmbuf pool for dev %u on socket %u.", + "ERROR Failed to create %u items input pktmbuf pool for dev %u on socket %d.", mbuf_pool_size, ad->dev_id, socket_id); @@ -342,7 +342,7 @@ create_mempools(struct active_device *ad, int socket_id, mbuf_pool_size, "hard_out"); TEST_ASSERT_NOT_NULL(mp, - "ERROR Failed to create %u items hard output pktmbuf pool for dev %u on socket %u.", + "ERROR Failed to create %u items hard output pktmbuf pool for dev %u on socket %d.", mbuf_pool_size, ad->dev_id, socket_id); @@ -634,7 +634,7 @@ init_op_data_objs(struct rte_bbdev_op_data *bufs, * Special case when DPDK mbuf cannot handle * the required input size */ - printf("Warning: Larger input size than DPDK mbuf %d\n", + printf("Warning: Larger input size than DPDK mbuf %u\n", data_len); large_input = true; } @@ -684,7 +684,7 @@ init_op_data_objs(struct rte_bbdev_op_data *bufs, struct rte_mbuf *m_tail = rte_pktmbuf_alloc(mbuf_pool); TEST_ASSERT_NOT_NULL(m_tail, - "Not enough mbufs in %d data type mbuf pool (needed %u, available %u)", + "Not enough mbufs in %d data type mbuf pool (needed %d, available %u)", op_type, n * nb_segments, mbuf_pool->size); @@ -1554,7 +1554,7 @@ int32_t nrLDPC_decod_offload(t_nrLDPC_dec_params* p_decParams, uint8_t harq_pid, m_head[type] = rte_pktmbuf_alloc(mbuf_pools[type]); TEST_ASSERT_NOT_NULL(m_head[type], - "Not enough mbufs in %d data type mbuf pool (needed %u, available %u)", + "Not enough mbufs in %d data type mbuf pool (needed %d, available %u)", op_type, 1, mbuf_pools[type]->size); diff --git a/openair1/PHY/CODING/nrLDPC_decoder/nrLDPC_tools/generator_bnProc/bnProcPc_gen_BG1_avx2.c b/openair1/PHY/CODING/nrLDPC_decoder/nrLDPC_tools/generator_bnProc/bnProcPc_gen_BG1_avx2.c index e53d7d4d640e71077ef9b2b7e6e8310324627c7c..fd24c4236e5325efab68dfb53ea59b6bdb3bbbc3 100644 --- a/openair1/PHY/CODING/nrLDPC_decoder/nrLDPC_tools/generator_bnProc/bnProcPc_gen_BG1_avx2.c +++ b/openair1/PHY/CODING/nrLDPC_decoder/nrLDPC_tools/generator_bnProc/bnProcPc_gen_BG1_avx2.c @@ -160,7 +160,7 @@ fprintf(fd, "// Process group with 2 CNs \n"); cnOffsetInGroup = (lut_numBnInBnGroups[1]*NR_LDPC_ZMAX)>>4; // Set pointers to start of group 2 - fprintf(fd," p_bnProcBuf = (__m128i*) &bnProcBuf [%d];\n",lut_startAddrBnGroups[idxBnGroup]); + fprintf(fd," p_bnProcBuf = (__m128i*) &bnProcBuf [%u];\n",lut_startAddrBnGroups[idxBnGroup]); fprintf(fd," p_llrProcBuf = (__m128i*) &llrProcBuf [%d];\n",lut_startAddrBnGroupsLlr[idxBnGroup]); fprintf(fd," p_llrRes = (__m256i*) &llrRes [%d];\n",lut_startAddrBnGroupsLlr[idxBnGroup]); @@ -173,10 +173,10 @@ fprintf(fd, "// Process group with 2 CNs \n"); // Loop over CNs for (k=1; k<2; k++) { - fprintf(fd," ymm0 = simde_mm256_cvtepi8_epi16(p_bnProcBuf[%d + j]);\n", k*cnOffsetInGroup); + fprintf(fd," ymm0 = simde_mm256_cvtepi8_epi16(p_bnProcBuf[%u + j]);\n", k*cnOffsetInGroup); fprintf(fd," ymmRes0 = simde_mm256_adds_epi16(ymmRes0, ymm0);\n"); - fprintf(fd," ymm1 = simde_mm256_cvtepi8_epi16(p_bnProcBuf[%d + j +1]);\n", k*cnOffsetInGroup); + fprintf(fd," ymm1 = simde_mm256_cvtepi8_epi16(p_bnProcBuf[%u + j +1]);\n", k*cnOffsetInGroup); fprintf(fd, " ymmRes1 = simde_mm256_adds_epi16(ymmRes1, ymm1); \n"); } @@ -218,7 +218,7 @@ fprintf(fd, "// Process group with 3 CNs \n"); cnOffsetInGroup = (lut_numBnInBnGroups[2]*NR_LDPC_ZMAX)>>4; // Set pointers to start of group 2 - fprintf(fd," p_bnProcBuf = (__m128i*) &bnProcBuf [%d];\n",lut_startAddrBnGroups[idxBnGroup]); + fprintf(fd," p_bnProcBuf = (__m128i*) &bnProcBuf [%u];\n",lut_startAddrBnGroups[idxBnGroup]); fprintf(fd," p_llrProcBuf = (__m128i*) &llrProcBuf [%d];\n",lut_startAddrBnGroupsLlr[idxBnGroup]); fprintf(fd," p_llrRes = (__m256i*) &llrRes [%d];\n",lut_startAddrBnGroupsLlr[idxBnGroup]); // Loop over BNs @@ -230,10 +230,10 @@ fprintf(fd, "// Process group with 3 CNs \n"); // Loop over CNs for (k=1; k<3; k++) { - fprintf(fd," ymm0 = simde_mm256_cvtepi8_epi16(p_bnProcBuf[%d + j]);\n", k*cnOffsetInGroup); + fprintf(fd," ymm0 = simde_mm256_cvtepi8_epi16(p_bnProcBuf[%u + j]);\n", k*cnOffsetInGroup); fprintf(fd," ymmRes0 = simde_mm256_adds_epi16(ymmRes0, ymm0);\n"); - fprintf(fd," ymm1 = simde_mm256_cvtepi8_epi16(p_bnProcBuf[%d + j +1]);\n", k*cnOffsetInGroup); + fprintf(fd," ymm1 = simde_mm256_cvtepi8_epi16(p_bnProcBuf[%u + j +1]);\n", k*cnOffsetInGroup); fprintf(fd," ymmRes1 = simde_mm256_adds_epi16(ymmRes1, ymm1); \n"); } @@ -274,7 +274,7 @@ fprintf(fd, "// Process group with 4 CNs \n"); cnOffsetInGroup = (lut_numBnInBnGroups[3]*NR_LDPC_ZMAX)>>4; // Set pointers to start of group 2 - fprintf(fd," p_bnProcBuf = (__m128i*) &bnProcBuf [%d];\n",lut_startAddrBnGroups[idxBnGroup]); + fprintf(fd," p_bnProcBuf = (__m128i*) &bnProcBuf [%u];\n",lut_startAddrBnGroups[idxBnGroup]); fprintf(fd," p_llrProcBuf = (__m128i*) &llrProcBuf [%d];\n",lut_startAddrBnGroupsLlr[idxBnGroup]); fprintf(fd," p_llrRes = (__m256i*) &llrRes [%d];\n",lut_startAddrBnGroupsLlr[idxBnGroup]); @@ -287,10 +287,10 @@ fprintf(fd, "// Process group with 4 CNs \n"); // Loop over CNs for (k=1; k<4; k++) { - fprintf(fd," ymm0 = simde_mm256_cvtepi8_epi16(p_bnProcBuf[%d + j]);\n", k*cnOffsetInGroup); + fprintf(fd," ymm0 = simde_mm256_cvtepi8_epi16(p_bnProcBuf[%u + j]);\n", k*cnOffsetInGroup); fprintf(fd," ymmRes0 = simde_mm256_adds_epi16(ymmRes0, ymm0);\n"); - fprintf(fd," ymm1 = simde_mm256_cvtepi8_epi16(p_bnProcBuf[%d + j +1]);\n", k*cnOffsetInGroup); + fprintf(fd," ymm1 = simde_mm256_cvtepi8_epi16(p_bnProcBuf[%u + j +1]);\n", k*cnOffsetInGroup); fprintf(fd, " ymmRes1 = simde_mm256_adds_epi16(ymmRes1, ymm1); \n"); } @@ -331,7 +331,7 @@ fprintf(fd, "// Process group with 5 CNs \n"); cnOffsetInGroup = (lut_numBnInBnGroups[4]*NR_LDPC_ZMAX)>>4; // Set pointers to start of group 2 - fprintf(fd," p_bnProcBuf = (__m128i*) &bnProcBuf [%d];\n",lut_startAddrBnGroups[idxBnGroup]); + fprintf(fd," p_bnProcBuf = (__m128i*) &bnProcBuf [%u];\n",lut_startAddrBnGroups[idxBnGroup]); fprintf(fd," p_llrProcBuf = (__m128i*) &llrProcBuf [%d];\n",lut_startAddrBnGroupsLlr[idxBnGroup]); fprintf(fd," p_llrRes = (__m256i*) &llrRes [%d];\n",lut_startAddrBnGroupsLlr[idxBnGroup]); // Loop over BNs @@ -343,10 +343,10 @@ fprintf(fd, "// Process group with 5 CNs \n"); // Loop over CNs for (k=1; k<5; k++) { - fprintf(fd," ymm0 = simde_mm256_cvtepi8_epi16(p_bnProcBuf[%d + j]);\n", k*cnOffsetInGroup); + fprintf(fd," ymm0 = simde_mm256_cvtepi8_epi16(p_bnProcBuf[%u + j]);\n", k*cnOffsetInGroup); fprintf(fd," ymmRes0 = simde_mm256_adds_epi16(ymmRes0, ymm0);\n"); - fprintf(fd," ymm1 = simde_mm256_cvtepi8_epi16(p_bnProcBuf[%d + j +1]);\n", k*cnOffsetInGroup); + fprintf(fd," ymm1 = simde_mm256_cvtepi8_epi16(p_bnProcBuf[%u + j +1]);\n", k*cnOffsetInGroup); fprintf(fd, " ymmRes1 = simde_mm256_adds_epi16(ymmRes1, ymm1); \n"); } @@ -388,7 +388,7 @@ fprintf(fd, "// Process group with 6 CNs \n"); cnOffsetInGroup = (lut_numBnInBnGroups[5]*NR_LDPC_ZMAX)>>4; // Set pointers to start of group 2 - fprintf(fd," p_bnProcBuf = (__m128i*) &bnProcBuf [%d];\n",lut_startAddrBnGroups[idxBnGroup]); + fprintf(fd," p_bnProcBuf = (__m128i*) &bnProcBuf [%u];\n",lut_startAddrBnGroups[idxBnGroup]); fprintf(fd," p_llrProcBuf = (__m128i*) &llrProcBuf [%d];\n",lut_startAddrBnGroupsLlr[idxBnGroup]); fprintf(fd," p_llrRes = (__m256i*) &llrRes [%d];\n",lut_startAddrBnGroupsLlr[idxBnGroup]); // Loop over BNs @@ -400,10 +400,10 @@ fprintf(fd, "// Process group with 6 CNs \n"); // Loop over CNs for (k=1; k<6; k++) { - fprintf(fd," ymm0 = simde_mm256_cvtepi8_epi16(p_bnProcBuf[%d + j]);\n", k*cnOffsetInGroup); + fprintf(fd," ymm0 = simde_mm256_cvtepi8_epi16(p_bnProcBuf[%u + j]);\n", k*cnOffsetInGroup); fprintf(fd," ymmRes0 = simde_mm256_adds_epi16(ymmRes0, ymm0);\n"); - fprintf(fd," ymm1 = simde_mm256_cvtepi8_epi16(p_bnProcBuf[%d + j +1]);\n", k*cnOffsetInGroup); + fprintf(fd," ymm1 = simde_mm256_cvtepi8_epi16(p_bnProcBuf[%u + j +1]);\n", k*cnOffsetInGroup); fprintf(fd, " ymmRes1 = simde_mm256_adds_epi16(ymmRes1, ymm1); \n"); } @@ -444,7 +444,7 @@ fprintf(fd, "// Process group with 7 CNs \n"); cnOffsetInGroup = (lut_numBnInBnGroups[6]*NR_LDPC_ZMAX)>>4; // Set pointers to start of group 2 - fprintf(fd," p_bnProcBuf = (__m128i*) &bnProcBuf [%d];\n",lut_startAddrBnGroups[idxBnGroup]); + fprintf(fd," p_bnProcBuf = (__m128i*) &bnProcBuf [%u];\n",lut_startAddrBnGroups[idxBnGroup]); fprintf(fd," p_llrProcBuf = (__m128i*) &llrProcBuf [%d];\n",lut_startAddrBnGroupsLlr[idxBnGroup]); fprintf(fd," p_llrRes = (__m256i*) &llrRes [%d];\n",lut_startAddrBnGroupsLlr[idxBnGroup]); // Loop over BNs @@ -456,10 +456,10 @@ fprintf(fd, "// Process group with 7 CNs \n"); // Loop over CNs for (k=1; k<7; k++) { - fprintf(fd," ymm0 = simde_mm256_cvtepi8_epi16(p_bnProcBuf[%d + j]);\n", k*cnOffsetInGroup); + fprintf(fd," ymm0 = simde_mm256_cvtepi8_epi16(p_bnProcBuf[%u + j]);\n", k*cnOffsetInGroup); fprintf(fd," ymmRes0 = simde_mm256_adds_epi16(ymmRes0, ymm0);\n"); - fprintf(fd," ymm1 = simde_mm256_cvtepi8_epi16(p_bnProcBuf[%d + j +1]);\n", k*cnOffsetInGroup); + fprintf(fd," ymm1 = simde_mm256_cvtepi8_epi16(p_bnProcBuf[%u + j +1]);\n", k*cnOffsetInGroup); fprintf(fd, " ymmRes1 = simde_mm256_adds_epi16(ymmRes1, ymm1); \n"); } @@ -501,7 +501,7 @@ fprintf(fd, "// Process group with 8 CNs \n"); cnOffsetInGroup = (lut_numBnInBnGroups[7]*NR_LDPC_ZMAX)>>4; // Set pointers to start of group 2 - fprintf(fd," p_bnProcBuf = (__m128i*) &bnProcBuf [%d];\n",lut_startAddrBnGroups[idxBnGroup]); + fprintf(fd," p_bnProcBuf = (__m128i*) &bnProcBuf [%u];\n",lut_startAddrBnGroups[idxBnGroup]); fprintf(fd," p_llrProcBuf = (__m128i*) &llrProcBuf [%d];\n",lut_startAddrBnGroupsLlr[idxBnGroup]); fprintf(fd," p_llrRes = (__m256i*) &llrRes [%d];\n",lut_startAddrBnGroupsLlr[idxBnGroup]); // Loop over BNs @@ -513,10 +513,10 @@ fprintf(fd, "// Process group with 8 CNs \n"); // Loop over CNs for (k=1; k<8; k++) { - fprintf(fd," ymm0 = simde_mm256_cvtepi8_epi16(p_bnProcBuf[%d + j]);\n", k*cnOffsetInGroup); + fprintf(fd," ymm0 = simde_mm256_cvtepi8_epi16(p_bnProcBuf[%u + j]);\n", k*cnOffsetInGroup); fprintf(fd," ymmRes0 = simde_mm256_adds_epi16(ymmRes0, ymm0);\n"); - fprintf(fd," ymm1 = simde_mm256_cvtepi8_epi16(p_bnProcBuf[%d + j +1]);\n", k*cnOffsetInGroup); + fprintf(fd," ymm1 = simde_mm256_cvtepi8_epi16(p_bnProcBuf[%u + j +1]);\n", k*cnOffsetInGroup); fprintf(fd, " ymmRes1 = simde_mm256_adds_epi16(ymmRes1, ymm1); \n"); } @@ -558,7 +558,7 @@ fprintf(fd, "// Process group with 9 CNs \n"); cnOffsetInGroup = (lut_numBnInBnGroups[8]*NR_LDPC_ZMAX)>>4; // Set pointers to start of group 2 - fprintf(fd," p_bnProcBuf = (__m128i*) &bnProcBuf [%d];\n",lut_startAddrBnGroups[idxBnGroup]); + fprintf(fd," p_bnProcBuf = (__m128i*) &bnProcBuf [%u];\n",lut_startAddrBnGroups[idxBnGroup]); fprintf(fd," p_llrProcBuf = (__m128i*) &llrProcBuf [%d];\n",lut_startAddrBnGroupsLlr[idxBnGroup]); fprintf(fd," p_llrRes = (__m256i*) &llrRes [%d];\n",lut_startAddrBnGroupsLlr[idxBnGroup]); // Loop over BNs @@ -570,10 +570,10 @@ fprintf(fd, "// Process group with 9 CNs \n"); // Loop over CNs for (k=1; k<9; k++) { - fprintf(fd," ymm0 = simde_mm256_cvtepi8_epi16(p_bnProcBuf[%d + j]);\n", k*cnOffsetInGroup); + fprintf(fd," ymm0 = simde_mm256_cvtepi8_epi16(p_bnProcBuf[%u + j]);\n", k*cnOffsetInGroup); fprintf(fd," ymmRes0 = simde_mm256_adds_epi16(ymmRes0, ymm0);\n"); - fprintf(fd," ymm1 = simde_mm256_cvtepi8_epi16(p_bnProcBuf[%d + j +1]);\n", k*cnOffsetInGroup); + fprintf(fd," ymm1 = simde_mm256_cvtepi8_epi16(p_bnProcBuf[%u + j +1]);\n", k*cnOffsetInGroup); fprintf(fd, " ymmRes1 = simde_mm256_adds_epi16(ymmRes1, ymm1); \n"); } @@ -615,7 +615,7 @@ fprintf(fd, "// Process group with 10 CNs \n"); cnOffsetInGroup = (lut_numBnInBnGroups[9]*NR_LDPC_ZMAX)>>4; // Set pointers to start of group 2 - fprintf(fd," p_bnProcBuf = (__m128i*) &bnProcBuf [%d];\n",lut_startAddrBnGroups[idxBnGroup]); + fprintf(fd," p_bnProcBuf = (__m128i*) &bnProcBuf [%u];\n",lut_startAddrBnGroups[idxBnGroup]); fprintf(fd," p_llrProcBuf = (__m128i*) &llrProcBuf [%d];\n",lut_startAddrBnGroupsLlr[idxBnGroup]); fprintf(fd," p_llrRes = (__m256i*) &llrRes [%d];\n",lut_startAddrBnGroupsLlr[idxBnGroup]); // Loop over BNs @@ -627,10 +627,10 @@ fprintf(fd, "// Process group with 10 CNs \n"); // Loop over CNs for (k=1; k<10; k++) { - fprintf(fd," ymm0 = simde_mm256_cvtepi8_epi16(p_bnProcBuf[%d + j]);\n", k*cnOffsetInGroup); + fprintf(fd," ymm0 = simde_mm256_cvtepi8_epi16(p_bnProcBuf[%u + j]);\n", k*cnOffsetInGroup); fprintf(fd," ymmRes0 = simde_mm256_adds_epi16(ymmRes0, ymm0);\n"); - fprintf(fd," ymm1 = simde_mm256_cvtepi8_epi16(p_bnProcBuf[%d + j +1]);\n", k*cnOffsetInGroup); + fprintf(fd," ymm1 = simde_mm256_cvtepi8_epi16(p_bnProcBuf[%u + j +1]);\n", k*cnOffsetInGroup); fprintf(fd, " ymmRes1 = simde_mm256_adds_epi16(ymmRes1, ymm1); \n"); } @@ -673,7 +673,7 @@ fprintf(fd, "// Process group with 11 CNs \n"); cnOffsetInGroup = (lut_numBnInBnGroups[10]*NR_LDPC_ZMAX)>>4; // Set pointers to start of group 2 - fprintf(fd," p_bnProcBuf = (__m128i*) &bnProcBuf [%d];\n",lut_startAddrBnGroups[idxBnGroup]); + fprintf(fd," p_bnProcBuf = (__m128i*) &bnProcBuf [%u];\n",lut_startAddrBnGroups[idxBnGroup]); fprintf(fd," p_llrProcBuf = (__m128i*) &llrProcBuf [%d];\n",lut_startAddrBnGroupsLlr[idxBnGroup]); fprintf(fd," p_llrRes = (__m256i*) &llrRes [%d];\n",lut_startAddrBnGroupsLlr[idxBnGroup]); // Loop over BNs @@ -685,10 +685,10 @@ fprintf(fd, "// Process group with 11 CNs \n"); // Loop over CNs for (k=1; k<11; k++) { - fprintf(fd," ymm0 = simde_mm256_cvtepi8_epi16(p_bnProcBuf[%d + j]);\n", k*cnOffsetInGroup); + fprintf(fd," ymm0 = simde_mm256_cvtepi8_epi16(p_bnProcBuf[%u + j]);\n", k*cnOffsetInGroup); fprintf(fd," ymmRes0 = simde_mm256_adds_epi16(ymmRes0, ymm0);\n"); - fprintf(fd," ymm1 = simde_mm256_cvtepi8_epi16(p_bnProcBuf[%d + j +1]);\n", k*cnOffsetInGroup); + fprintf(fd," ymm1 = simde_mm256_cvtepi8_epi16(p_bnProcBuf[%u + j +1]);\n", k*cnOffsetInGroup); fprintf(fd, " ymmRes1 = simde_mm256_adds_epi16(ymmRes1, ymm1); \n"); } @@ -728,7 +728,7 @@ fprintf(fd, "// Process group with 12 CNs \n"); cnOffsetInGroup = (lut_numBnInBnGroups[11]*NR_LDPC_ZMAX)>>4; // Set pointers to start of group 2 - fprintf(fd," p_bnProcBuf = (__m128i*) &bnProcBuf [%d];\n",lut_startAddrBnGroups[idxBnGroup]); + fprintf(fd," p_bnProcBuf = (__m128i*) &bnProcBuf [%u];\n",lut_startAddrBnGroups[idxBnGroup]); fprintf(fd," p_llrProcBuf = (__m128i*) &llrProcBuf [%d];\n",lut_startAddrBnGroupsLlr[idxBnGroup]); fprintf(fd," p_llrRes = (__m256i*) &llrRes [%d];\n",lut_startAddrBnGroupsLlr[idxBnGroup]); // Loop over BNs @@ -740,10 +740,10 @@ fprintf(fd, "// Process group with 12 CNs \n"); // Loop over CNs for (k=1; k<12; k++) { - fprintf(fd," ymm0 = simde_mm256_cvtepi8_epi16(p_bnProcBuf[%d + j]);\n", k*cnOffsetInGroup); + fprintf(fd," ymm0 = simde_mm256_cvtepi8_epi16(p_bnProcBuf[%u + j]);\n", k*cnOffsetInGroup); fprintf(fd," ymmRes0 = simde_mm256_adds_epi16(ymmRes0, ymm0);\n"); - fprintf(fd," ymm1 = simde_mm256_cvtepi8_epi16(p_bnProcBuf[%d + j +1]);\n", k*cnOffsetInGroup); + fprintf(fd," ymm1 = simde_mm256_cvtepi8_epi16(p_bnProcBuf[%u + j +1]);\n", k*cnOffsetInGroup); fprintf(fd, " ymmRes1 = simde_mm256_adds_epi16(ymmRes1, ymm1); \n"); } @@ -784,7 +784,7 @@ fprintf(fd, "// Process group with 13 CNs \n"); cnOffsetInGroup = (lut_numBnInBnGroups[12]*NR_LDPC_ZMAX)>>4; // Set pointers to start of group 2 - fprintf(fd," p_bnProcBuf = (__m128i*) &bnProcBuf [%d];\n",lut_startAddrBnGroups[idxBnGroup]); + fprintf(fd," p_bnProcBuf = (__m128i*) &bnProcBuf [%u];\n",lut_startAddrBnGroups[idxBnGroup]); fprintf(fd," p_llrProcBuf = (__m128i*) &llrProcBuf [%d];\n",lut_startAddrBnGroupsLlr[idxBnGroup]); fprintf(fd," p_llrRes = (__m256i*) &llrRes [%d];\n",lut_startAddrBnGroupsLlr[idxBnGroup]); // Loop over BNs @@ -796,10 +796,10 @@ fprintf(fd, "// Process group with 13 CNs \n"); // Loop over CNs for (k=1; k<13; k++) { - fprintf(fd," ymm0 = simde_mm256_cvtepi8_epi16(p_bnProcBuf[%d + j]);\n", k*cnOffsetInGroup); + fprintf(fd," ymm0 = simde_mm256_cvtepi8_epi16(p_bnProcBuf[%u + j]);\n", k*cnOffsetInGroup); fprintf(fd," ymmRes0 = simde_mm256_adds_epi16(ymmRes0, ymm0);\n"); - fprintf(fd," ymm1 = simde_mm256_cvtepi8_epi16(p_bnProcBuf[%d + j +1]);\n", k*cnOffsetInGroup); + fprintf(fd," ymm1 = simde_mm256_cvtepi8_epi16(p_bnProcBuf[%u + j +1]);\n", k*cnOffsetInGroup); fprintf(fd," ymmRes1 = simde_mm256_adds_epi16(ymmRes1, ymm1); \n"); } @@ -841,7 +841,7 @@ fprintf(fd, "// Process group with 14 CNs \n"); cnOffsetInGroup = (lut_numBnInBnGroups[13]*NR_LDPC_ZMAX)>>4; // Set pointers to start of group 2 - fprintf(fd," p_bnProcBuf = (__m128i*) &bnProcBuf [%d];\n",lut_startAddrBnGroups[idxBnGroup]); + fprintf(fd," p_bnProcBuf = (__m128i*) &bnProcBuf [%u];\n",lut_startAddrBnGroups[idxBnGroup]); fprintf(fd," p_llrProcBuf = (__m128i*) &llrProcBuf [%d];\n",lut_startAddrBnGroupsLlr[idxBnGroup]); fprintf(fd," p_llrRes = (__m256i*) &llrRes [%d];\n",lut_startAddrBnGroupsLlr[idxBnGroup]); // Loop over BNs @@ -853,10 +853,10 @@ fprintf(fd, "// Process group with 14 CNs \n"); // Loop over CNs for (k=1; k<14; k++) { - fprintf(fd," ymm0 = simde_mm256_cvtepi8_epi16(p_bnProcBuf[%d + j]);\n", k*cnOffsetInGroup); + fprintf(fd," ymm0 = simde_mm256_cvtepi8_epi16(p_bnProcBuf[%u + j]);\n", k*cnOffsetInGroup); fprintf(fd," ymmRes0 = simde_mm256_adds_epi16(ymmRes0, ymm0);\n"); - fprintf(fd," ymm1 = simde_mm256_cvtepi8_epi16(p_bnProcBuf[%d + j +1]);\n", k*cnOffsetInGroup); + fprintf(fd," ymm1 = simde_mm256_cvtepi8_epi16(p_bnProcBuf[%u + j +1]);\n", k*cnOffsetInGroup); fprintf(fd, " ymmRes1 = simde_mm256_adds_epi16(ymmRes1, ymm1); \n"); } @@ -897,7 +897,7 @@ fprintf(fd, "// Process group with 15 CNs \n"); cnOffsetInGroup = (lut_numBnInBnGroups[14]*NR_LDPC_ZMAX)>>4; // Set pointers to start of group 2 - fprintf(fd," p_bnProcBuf = (__m128i*) &bnProcBuf [%d];\n",lut_startAddrBnGroups[idxBnGroup]); + fprintf(fd," p_bnProcBuf = (__m128i*) &bnProcBuf [%u];\n",lut_startAddrBnGroups[idxBnGroup]); fprintf(fd," p_llrProcBuf = (__m128i*) &llrProcBuf [%d];\n",lut_startAddrBnGroupsLlr[idxBnGroup]); fprintf(fd," p_llrRes = (__m256i*) &llrRes [%d];\n",lut_startAddrBnGroupsLlr[idxBnGroup]); // Loop over BNs @@ -909,10 +909,10 @@ fprintf(fd, "// Process group with 15 CNs \n"); // Loop over CNs for (k=1; k<15; k++) { - fprintf(fd," ymm0 = simde_mm256_cvtepi8_epi16(p_bnProcBuf[%d + j]);\n", k*cnOffsetInGroup); + fprintf(fd," ymm0 = simde_mm256_cvtepi8_epi16(p_bnProcBuf[%u + j]);\n", k*cnOffsetInGroup); fprintf(fd," ymmRes0 = simde_mm256_adds_epi16(ymmRes0, ymm0);\n"); - fprintf(fd," ymm1 = simde_mm256_cvtepi8_epi16(p_bnProcBuf[%d + j +1]);\n", k*cnOffsetInGroup); + fprintf(fd," ymm1 = simde_mm256_cvtepi8_epi16(p_bnProcBuf[%u + j +1]);\n", k*cnOffsetInGroup); fprintf(fd, " ymmRes1 = simde_mm256_adds_epi16(ymmRes1, ymm1); \n"); } @@ -954,7 +954,7 @@ fprintf(fd, "// Process group with 16 CNs \n"); cnOffsetInGroup = (lut_numBnInBnGroups[15]*NR_LDPC_ZMAX)>>4; // Set pointers to start of group 2 - fprintf(fd," p_bnProcBuf = (__m128i*) &bnProcBuf [%d];\n",lut_startAddrBnGroups[idxBnGroup]); + fprintf(fd," p_bnProcBuf = (__m128i*) &bnProcBuf [%u];\n",lut_startAddrBnGroups[idxBnGroup]); fprintf(fd," p_llrProcBuf = (__m128i*) &llrProcBuf [%d];\n",lut_startAddrBnGroupsLlr[idxBnGroup]); fprintf(fd," p_llrRes = (__m256i*) &llrRes [%d];\n",lut_startAddrBnGroupsLlr[idxBnGroup]); // Loop over BNs @@ -966,10 +966,10 @@ fprintf(fd, "// Process group with 16 CNs \n"); // Loop over CNs for (k=1; k<16; k++) { - fprintf(fd," ymm0 = simde_mm256_cvtepi8_epi16(p_bnProcBuf[%d + j]);\n", k*cnOffsetInGroup); + fprintf(fd," ymm0 = simde_mm256_cvtepi8_epi16(p_bnProcBuf[%u + j]);\n", k*cnOffsetInGroup); fprintf(fd," ymmRes0 = simde_mm256_adds_epi16(ymmRes0, ymm0);\n"); - fprintf(fd," ymm1 = simde_mm256_cvtepi8_epi16(p_bnProcBuf[%d + j +1]);\n", k*cnOffsetInGroup); + fprintf(fd," ymm1 = simde_mm256_cvtepi8_epi16(p_bnProcBuf[%u + j +1]);\n", k*cnOffsetInGroup); fprintf(fd, " ymmRes1 = simde_mm256_adds_epi16(ymmRes1, ymm1); \n"); } @@ -1010,7 +1010,7 @@ fprintf(fd, "// Process group with 17 CNs \n"); cnOffsetInGroup = (lut_numBnInBnGroups[16]*NR_LDPC_ZMAX)>>4; // Set pointers to start of group 2 - fprintf(fd," p_bnProcBuf = (__m128i*) &bnProcBuf [%d];\n",lut_startAddrBnGroups[idxBnGroup]); + fprintf(fd," p_bnProcBuf = (__m128i*) &bnProcBuf [%u];\n",lut_startAddrBnGroups[idxBnGroup]); fprintf(fd," p_llrProcBuf = (__m128i*) &llrProcBuf [%d];\n",lut_startAddrBnGroupsLlr[idxBnGroup]); fprintf(fd," p_llrRes = (__m256i*) &llrRes [%d];\n",lut_startAddrBnGroupsLlr[idxBnGroup]); // Loop over BNs @@ -1022,10 +1022,10 @@ fprintf(fd, "// Process group with 17 CNs \n"); // Loop over CNs for (k=1; k<17; k++) { - fprintf(fd," ymm0 = simde_mm256_cvtepi8_epi16(p_bnProcBuf[%d + j]);\n", k*cnOffsetInGroup); + fprintf(fd," ymm0 = simde_mm256_cvtepi8_epi16(p_bnProcBuf[%u + j]);\n", k*cnOffsetInGroup); fprintf(fd," ymmRes0 = simde_mm256_adds_epi16(ymmRes0, ymm0);\n"); - fprintf(fd," ymm1 = simde_mm256_cvtepi8_epi16(p_bnProcBuf[%d + j +1]);\n", k*cnOffsetInGroup); + fprintf(fd," ymm1 = simde_mm256_cvtepi8_epi16(p_bnProcBuf[%u + j +1]);\n", k*cnOffsetInGroup); fprintf(fd, " ymmRes1 = simde_mm256_adds_epi16(ymmRes1, ymm1); \n"); } @@ -1066,7 +1066,7 @@ fprintf(fd, "// Process group with 18 CNs \n"); cnOffsetInGroup = (lut_numBnInBnGroups[17]*NR_LDPC_ZMAX)>>4; // Set pointers to start of group 2 - fprintf(fd," p_bnProcBuf = (__m128i*) &bnProcBuf [%d];\n",lut_startAddrBnGroups[idxBnGroup]); + fprintf(fd," p_bnProcBuf = (__m128i*) &bnProcBuf [%u];\n",lut_startAddrBnGroups[idxBnGroup]); fprintf(fd," p_llrProcBuf = (__m128i*) &llrProcBuf [%d];\n",lut_startAddrBnGroupsLlr[idxBnGroup]); fprintf(fd," p_llrRes = (__m256i*) &llrRes [%d];\n",lut_startAddrBnGroupsLlr[idxBnGroup]); // Loop over BNs @@ -1078,10 +1078,10 @@ fprintf(fd, "// Process group with 18 CNs \n"); // Loop over CNs for (k=1; k<18; k++) { - fprintf(fd," ymm0 = simde_mm256_cvtepi8_epi16(p_bnProcBuf[%d + j]);\n", k*cnOffsetInGroup); + fprintf(fd," ymm0 = simde_mm256_cvtepi8_epi16(p_bnProcBuf[%u + j]);\n", k*cnOffsetInGroup); fprintf(fd," ymmRes0 = simde_mm256_adds_epi16(ymmRes0, ymm0);\n"); - fprintf(fd," ymm1 = simde_mm256_cvtepi8_epi16(p_bnProcBuf[%d + j +1]);\n", k*cnOffsetInGroup); + fprintf(fd," ymm1 = simde_mm256_cvtepi8_epi16(p_bnProcBuf[%u + j +1]);\n", k*cnOffsetInGroup); fprintf(fd, " ymmRes1 = simde_mm256_adds_epi16(ymmRes1, ymm1); \n"); } @@ -1121,7 +1121,7 @@ fprintf(fd, "// Process group with 19 CNs \n"); cnOffsetInGroup = (lut_numBnInBnGroups[18]*NR_LDPC_ZMAX)>>4; // Set pointers to start of group 2 - fprintf(fd," p_bnProcBuf = (__m128i*) &bnProcBuf [%d];\n",lut_startAddrBnGroups[idxBnGroup]); + fprintf(fd," p_bnProcBuf = (__m128i*) &bnProcBuf [%u];\n",lut_startAddrBnGroups[idxBnGroup]); fprintf(fd," p_llrProcBuf = (__m128i*) &llrProcBuf [%d];\n",lut_startAddrBnGroupsLlr[idxBnGroup]); fprintf(fd," p_llrRes = (__m256i*) &llrRes [%d];\n",lut_startAddrBnGroupsLlr[idxBnGroup]); // Loop over BNs @@ -1133,10 +1133,10 @@ fprintf(fd, "// Process group with 19 CNs \n"); // Loop over CNs for (k=1; k<19; k++) { - fprintf(fd," ymm0 = simde_mm256_cvtepi8_epi16(p_bnProcBuf[%d + j]);\n", k*cnOffsetInGroup); + fprintf(fd," ymm0 = simde_mm256_cvtepi8_epi16(p_bnProcBuf[%u + j]);\n", k*cnOffsetInGroup); fprintf(fd," ymmRes0 = simde_mm256_adds_epi16(ymmRes0, ymm0);\n"); - fprintf(fd," ymm1 = simde_mm256_cvtepi8_epi16(p_bnProcBuf[%d + j +1]);\n", k*cnOffsetInGroup); + fprintf(fd," ymm1 = simde_mm256_cvtepi8_epi16(p_bnProcBuf[%u + j +1]);\n", k*cnOffsetInGroup); fprintf(fd, " ymmRes1 = simde_mm256_adds_epi16(ymmRes1, ymm1); \n"); } @@ -1177,7 +1177,7 @@ fprintf(fd, "// Process group with 20 CNs \n"); cnOffsetInGroup = (lut_numBnInBnGroups[19]*NR_LDPC_ZMAX)>>4; // Set pointers to start of group 2 - fprintf(fd," p_bnProcBuf = (__m128i*) &bnProcBuf [%d];\n",lut_startAddrBnGroups[idxBnGroup]); + fprintf(fd," p_bnProcBuf = (__m128i*) &bnProcBuf [%u];\n",lut_startAddrBnGroups[idxBnGroup]); fprintf(fd," p_llrProcBuf = (__m128i*) &llrProcBuf [%d];\n",lut_startAddrBnGroupsLlr[idxBnGroup]); fprintf(fd," p_llrRes = (__m256i*) &llrRes [%d];\n",lut_startAddrBnGroupsLlr[idxBnGroup]); // Loop over BNs @@ -1189,10 +1189,10 @@ fprintf(fd, "// Process group with 20 CNs \n"); // Loop over CNs for (k=1; k<20; k++) { - fprintf(fd," ymm0 = simde_mm256_cvtepi8_epi16(p_bnProcBuf[%d + j]);\n", k*cnOffsetInGroup); + fprintf(fd," ymm0 = simde_mm256_cvtepi8_epi16(p_bnProcBuf[%u + j]);\n", k*cnOffsetInGroup); fprintf(fd," ymmRes0 = simde_mm256_adds_epi16(ymmRes0, ymm0);\n"); - fprintf(fd," ymm1 = simde_mm256_cvtepi8_epi16(p_bnProcBuf[%d + j +1]);\n", k*cnOffsetInGroup); + fprintf(fd," ymm1 = simde_mm256_cvtepi8_epi16(p_bnProcBuf[%u + j +1]);\n", k*cnOffsetInGroup); fprintf(fd, " ymmRes1 = simde_mm256_adds_epi16(ymmRes1, ymm1); \n"); } @@ -1237,7 +1237,7 @@ fprintf(fd, "// Process group with 21 CNs \n"); cnOffsetInGroup = (lut_numBnInBnGroups[20]*NR_LDPC_ZMAX)>>4; // Set pointers to start of group 2 - fprintf(fd," p_bnProcBuf = (__m128i*) &bnProcBuf [%d];\n",lut_startAddrBnGroups[idxBnGroup]); + fprintf(fd," p_bnProcBuf = (__m128i*) &bnProcBuf [%u];\n",lut_startAddrBnGroups[idxBnGroup]); fprintf(fd," p_llrProcBuf = (__m128i*) &llrProcBuf [%d];\n",lut_startAddrBnGroupsLlr[idxBnGroup]); fprintf(fd," p_llrRes = (__m256i*) &llrRes [%d];\n",lut_startAddrBnGroupsLlr[idxBnGroup]); // Loop over BNs @@ -1249,10 +1249,10 @@ fprintf(fd, "// Process group with 21 CNs \n"); // Loop over CNs for (k=1; k<21; k++) { - fprintf(fd," ymm0 = simde_mm256_cvtepi8_epi16(p_bnProcBuf[%d + j]);\n", k*cnOffsetInGroup); + fprintf(fd," ymm0 = simde_mm256_cvtepi8_epi16(p_bnProcBuf[%u + j]);\n", k*cnOffsetInGroup); fprintf(fd," ymmRes0 = simde_mm256_adds_epi16(ymmRes0, ymm0);\n"); - fprintf(fd," ymm1 = simde_mm256_cvtepi8_epi16(p_bnProcBuf[%d + j +1]);\n", k*cnOffsetInGroup); + fprintf(fd," ymm1 = simde_mm256_cvtepi8_epi16(p_bnProcBuf[%u + j +1]);\n", k*cnOffsetInGroup); fprintf(fd, " ymmRes1 = simde_mm256_adds_epi16(ymmRes1, ymm1); \n"); } @@ -1292,7 +1292,7 @@ fprintf(fd, "// Process group with 22 CNs \n"); cnOffsetInGroup = (lut_numBnInBnGroups[21]*NR_LDPC_ZMAX)>>4; // Set pointers to start of group 2 - fprintf(fd," p_bnProcBuf = (__m128i*) &bnProcBuf [%d];\n",lut_startAddrBnGroups[idxBnGroup]); + fprintf(fd," p_bnProcBuf = (__m128i*) &bnProcBuf [%u];\n",lut_startAddrBnGroups[idxBnGroup]); fprintf(fd," p_llrProcBuf = (__m128i*) &llrProcBuf [%d];\n",lut_startAddrBnGroupsLlr[idxBnGroup]); fprintf(fd," p_llrRes = (__m256i*) &llrRes [%d];\n",lut_startAddrBnGroupsLlr[idxBnGroup]); // Loop over BNs @@ -1304,10 +1304,10 @@ fprintf(fd, "// Process group with 22 CNs \n"); // Loop over CNs for (k=1; k<22; k++) { - fprintf(fd," ymm0 = simde_mm256_cvtepi8_epi16(p_bnProcBuf[%d + j]);\n", k*cnOffsetInGroup); + fprintf(fd," ymm0 = simde_mm256_cvtepi8_epi16(p_bnProcBuf[%u + j]);\n", k*cnOffsetInGroup); fprintf(fd," ymmRes0 = simde_mm256_adds_epi16(ymmRes0, ymm0);\n"); - fprintf(fd," ymm1 = simde_mm256_cvtepi8_epi16(p_bnProcBuf[%d + j +1]);\n", k*cnOffsetInGroup); + fprintf(fd," ymm1 = simde_mm256_cvtepi8_epi16(p_bnProcBuf[%u + j +1]);\n", k*cnOffsetInGroup); fprintf(fd, " ymmRes1 = simde_mm256_adds_epi16(ymmRes1, ymm1); \n"); } @@ -1348,7 +1348,7 @@ fprintf(fd, "// Process group with <23 CNs \n"); cnOffsetInGroup = (lut_numBnInBnGroups[22]*NR_LDPC_ZMAX)>>4; // Set pointers to start of group 2 - fprintf(fd," p_bnProcBuf = (__m128i*) &bnProcBuf [%d];\n",lut_startAddrBnGroups[idxBnGroup]); + fprintf(fd," p_bnProcBuf = (__m128i*) &bnProcBuf [%u];\n",lut_startAddrBnGroups[idxBnGroup]); fprintf(fd," p_llrProcBuf = (__m128i*) &llrProcBuf [%d];\n",lut_startAddrBnGroupsLlr[idxBnGroup]); fprintf(fd," p_llrRes = (__m256i*) &llrRes [%d];\n",lut_startAddrBnGroupsLlr[idxBnGroup]); // Loop over BNs @@ -1360,10 +1360,10 @@ fprintf(fd, "// Process group with <23 CNs \n"); // Loop over CNs for (k=1; k<23; k++) { - fprintf(fd," ymm0 = simde_mm256_cvtepi8_epi16(p_bnProcBuf[%d + j]);\n", k*cnOffsetInGroup); + fprintf(fd," ymm0 = simde_mm256_cvtepi8_epi16(p_bnProcBuf[%u + j]);\n", k*cnOffsetInGroup); fprintf(fd," ymmRes0 = simde_mm256_adds_epi16(ymmRes0, ymm0);\n"); - fprintf(fd," ymm1 = simde_mm256_cvtepi8_epi16(p_bnProcBuf[%d + j +1]);\n", k*cnOffsetInGroup); + fprintf(fd," ymm1 = simde_mm256_cvtepi8_epi16(p_bnProcBuf[%u + j +1]);\n", k*cnOffsetInGroup); fprintf(fd," ymmRes1 = simde_mm256_adds_epi16(ymmRes1, ymm1); \n"); } @@ -1405,7 +1405,7 @@ fprintf(fd, "// Process group with 24 CNs \n"); cnOffsetInGroup = (lut_numBnInBnGroups[23]*NR_LDPC_ZMAX)>>4; // Set pointers to start of group 2 - fprintf(fd," p_bnProcBuf = (__m128i*) &bnProcBuf [%d];\n",lut_startAddrBnGroups[idxBnGroup]); + fprintf(fd," p_bnProcBuf = (__m128i*) &bnProcBuf [%u];\n",lut_startAddrBnGroups[idxBnGroup]); fprintf(fd," p_llrProcBuf = (__m128i*) &llrProcBuf [%d];\n",lut_startAddrBnGroupsLlr[idxBnGroup]); fprintf(fd," p_llrRes = (__m256i*) &llrRes [%d];\n",lut_startAddrBnGroupsLlr[idxBnGroup]); // Loop over BNs @@ -1417,10 +1417,10 @@ fprintf(fd, "// Process group with 24 CNs \n"); // Loop over CNs for (k=1; k<24; k++) { - fprintf(fd," ymm0 = simde_mm256_cvtepi8_epi16(p_bnProcBuf[%d + j]);\n", k*cnOffsetInGroup); + fprintf(fd," ymm0 = simde_mm256_cvtepi8_epi16(p_bnProcBuf[%u + j]);\n", k*cnOffsetInGroup); fprintf(fd," ymmRes0 = simde_mm256_adds_epi16(ymmRes0, ymm0);\n"); - fprintf(fd," ymm1 = simde_mm256_cvtepi8_epi16(p_bnProcBuf[%d + j +1]);\n", k*cnOffsetInGroup); + fprintf(fd," ymm1 = simde_mm256_cvtepi8_epi16(p_bnProcBuf[%u + j +1]);\n", k*cnOffsetInGroup); fprintf(fd, " ymmRes1 = simde_mm256_adds_epi16(ymmRes1, ymm1); \n"); } @@ -1461,7 +1461,7 @@ fprintf(fd, "// Process group with 25 CNs \n"); cnOffsetInGroup = (lut_numBnInBnGroups[24]*NR_LDPC_ZMAX)>>4; // Set pointers to start of group 2 - fprintf(fd," p_bnProcBuf = (__m128i*) &bnProcBuf [%d];\n",lut_startAddrBnGroups[idxBnGroup]); + fprintf(fd," p_bnProcBuf = (__m128i*) &bnProcBuf [%u];\n",lut_startAddrBnGroups[idxBnGroup]); fprintf(fd," p_llrProcBuf = (__m128i*) &llrProcBuf [%d];\n",lut_startAddrBnGroupsLlr[idxBnGroup]); fprintf(fd," p_llrRes = (__m256i*) &llrRes [%d];\n",lut_startAddrBnGroupsLlr[idxBnGroup]); // Loop over BNs @@ -1473,10 +1473,10 @@ fprintf(fd, "// Process group with 25 CNs \n"); // Loop over CNs for (k=1; k<25; k++) { - fprintf(fd," ymm0 = simde_mm256_cvtepi8_epi16(p_bnProcBuf[%d + j]);\n", k*cnOffsetInGroup); + fprintf(fd," ymm0 = simde_mm256_cvtepi8_epi16(p_bnProcBuf[%u + j]);\n", k*cnOffsetInGroup); fprintf(fd," ymmRes0 = simde_mm256_adds_epi16(ymmRes0, ymm0);\n"); - fprintf(fd," ymm1 = simde_mm256_cvtepi8_epi16(p_bnProcBuf[%d + j +1]);\n", k*cnOffsetInGroup); + fprintf(fd," ymm1 = simde_mm256_cvtepi8_epi16(p_bnProcBuf[%u + j +1]);\n", k*cnOffsetInGroup); fprintf(fd, " ymmRes1 = simde_mm256_adds_epi16(ymmRes1, ymm1); \n"); } @@ -1518,7 +1518,7 @@ fprintf(fd, "// Process group with 26 CNs \n"); cnOffsetInGroup = (lut_numBnInBnGroups[25]*NR_LDPC_ZMAX)>>4; // Set pointers to start of group 2 - fprintf(fd," p_bnProcBuf = (__m128i*) &bnProcBuf [%d];\n",lut_startAddrBnGroups[idxBnGroup]); + fprintf(fd," p_bnProcBuf = (__m128i*) &bnProcBuf [%u];\n",lut_startAddrBnGroups[idxBnGroup]); fprintf(fd," p_llrProcBuf = (__m128i*) &llrProcBuf [%d];\n",lut_startAddrBnGroupsLlr[idxBnGroup]); fprintf(fd," p_llrRes = (__m256i*) &llrRes [%d];\n",lut_startAddrBnGroupsLlr[idxBnGroup]); // Loop over BNs @@ -1530,10 +1530,10 @@ fprintf(fd, "// Process group with 26 CNs \n"); // Loop over CNs for (k=1; k<26; k++) { - fprintf(fd," ymm0 = simde_mm256_cvtepi8_epi16(p_bnProcBuf[%d + j]);\n", k*cnOffsetInGroup); + fprintf(fd," ymm0 = simde_mm256_cvtepi8_epi16(p_bnProcBuf[%u + j]);\n", k*cnOffsetInGroup); fprintf(fd," ymmRes0 = simde_mm256_adds_epi16(ymmRes0, ymm0);\n"); - fprintf(fd," ymm1 = simde_mm256_cvtepi8_epi16(p_bnProcBuf[%d + j +1]);\n", k*cnOffsetInGroup); + fprintf(fd," ymm1 = simde_mm256_cvtepi8_epi16(p_bnProcBuf[%u + j +1]);\n", k*cnOffsetInGroup); fprintf(fd, " ymmRes1 = simde_mm256_adds_epi16(ymmRes1, ymm1); \n"); } @@ -1574,7 +1574,7 @@ fprintf(fd, "// Process group with 27 CNs \n"); cnOffsetInGroup = (lut_numBnInBnGroups[26]*NR_LDPC_ZMAX)>>4; // Set pointers to start of group 2 - fprintf(fd," p_bnProcBuf = (__m128i*) &bnProcBuf [%d];\n",lut_startAddrBnGroups[idxBnGroup]); + fprintf(fd," p_bnProcBuf = (__m128i*) &bnProcBuf [%u];\n",lut_startAddrBnGroups[idxBnGroup]); fprintf(fd," p_llrProcBuf = (__m128i*) &llrProcBuf [%d];\n",lut_startAddrBnGroupsLlr[idxBnGroup]); fprintf(fd," p_llrRes = (__m256i*) &llrRes [%d];\n",lut_startAddrBnGroupsLlr[idxBnGroup]); // Loop over BNs @@ -1586,10 +1586,10 @@ fprintf(fd, "// Process group with 27 CNs \n"); // Loop over CNs for (k=1; k<27; k++) { - fprintf(fd," ymm0 = simde_mm256_cvtepi8_epi16(p_bnProcBuf[%d + j]);\n", k*cnOffsetInGroup); + fprintf(fd," ymm0 = simde_mm256_cvtepi8_epi16(p_bnProcBuf[%u + j]);\n", k*cnOffsetInGroup); fprintf(fd," ymmRes0 = simde_mm256_adds_epi16(ymmRes0, ymm0);\n"); - fprintf(fd," ymm1 = simde_mm256_cvtepi8_epi16(p_bnProcBuf[%d + j +1]);\n", k*cnOffsetInGroup); + fprintf(fd," ymm1 = simde_mm256_cvtepi8_epi16(p_bnProcBuf[%u + j +1]);\n", k*cnOffsetInGroup); fprintf(fd, " ymmRes1 = simde_mm256_adds_epi16(ymmRes1, ymm1); \n"); } @@ -1630,7 +1630,7 @@ fprintf(fd, "// Process group with 28 CNs \n"); cnOffsetInGroup = (lut_numBnInBnGroups[27]*NR_LDPC_ZMAX)>>4; // Set pointers to start of group 2 - fprintf(fd," p_bnProcBuf = (__m128i*) &bnProcBuf [%d];\n",lut_startAddrBnGroups[idxBnGroup]); + fprintf(fd," p_bnProcBuf = (__m128i*) &bnProcBuf [%u];\n",lut_startAddrBnGroups[idxBnGroup]); fprintf(fd," p_llrProcBuf = (__m128i*) &llrProcBuf [%d];\n",lut_startAddrBnGroupsLlr[idxBnGroup]); fprintf(fd," p_llrRes = (__m256i*) &llrRes [%d];\n",lut_startAddrBnGroupsLlr[idxBnGroup]); // Loop over BNs @@ -1642,10 +1642,10 @@ fprintf(fd, "// Process group with 28 CNs \n"); // Loop over CNs for (k=1; k<28; k++) { - fprintf(fd," ymm0 = simde_mm256_cvtepi8_epi16(p_bnProcBuf[%d + j]);\n", k*cnOffsetInGroup); + fprintf(fd," ymm0 = simde_mm256_cvtepi8_epi16(p_bnProcBuf[%u + j]);\n", k*cnOffsetInGroup); fprintf(fd," ymmRes0 = simde_mm256_adds_epi16(ymmRes0, ymm0);\n"); - fprintf(fd," ymm1 = simde_mm256_cvtepi8_epi16(p_bnProcBuf[%d + j +1]);\n", k*cnOffsetInGroup); + fprintf(fd," ymm1 = simde_mm256_cvtepi8_epi16(p_bnProcBuf[%u + j +1]);\n", k*cnOffsetInGroup); fprintf(fd, " ymmRes1 = simde_mm256_adds_epi16(ymmRes1, ymm1); \n"); } @@ -1685,7 +1685,7 @@ fprintf(fd, "// Process group with 29 CNs \n"); cnOffsetInGroup = (lut_numBnInBnGroups[28]*NR_LDPC_ZMAX)>>4; // Set pointers to start of group 2 - fprintf(fd," p_bnProcBuf = (__m128i*) &bnProcBuf [%d];\n",lut_startAddrBnGroups[idxBnGroup]); + fprintf(fd," p_bnProcBuf = (__m128i*) &bnProcBuf [%u];\n",lut_startAddrBnGroups[idxBnGroup]); fprintf(fd," p_llrProcBuf = (__m128i*) &llrProcBuf [%d];\n",lut_startAddrBnGroupsLlr[idxBnGroup]); fprintf(fd," p_llrRes = (__m256i*) &llrRes [%d];\n",lut_startAddrBnGroupsLlr[idxBnGroup]); // Loop over BNs @@ -1697,10 +1697,10 @@ fprintf(fd, "// Process group with 29 CNs \n"); // Loop over CNs for (k=1; k<29; k++) { - fprintf(fd," ymm0 = simde_mm256_cvtepi8_epi16(p_bnProcBuf[%d + j]);\n", k*cnOffsetInGroup); + fprintf(fd," ymm0 = simde_mm256_cvtepi8_epi16(p_bnProcBuf[%u + j]);\n", k*cnOffsetInGroup); fprintf(fd," ymmRes0 = simde_mm256_adds_epi16(ymmRes0, ymm0);\n"); - fprintf(fd," ymm1 = simde_mm256_cvtepi8_epi16(p_bnProcBuf[%d + j +1]);\n", k*cnOffsetInGroup); + fprintf(fd," ymm1 = simde_mm256_cvtepi8_epi16(p_bnProcBuf[%u + j +1]);\n", k*cnOffsetInGroup); fprintf(fd, " ymmRes1 = simde_mm256_adds_epi16(ymmRes1, ymm1); \n"); } @@ -1741,7 +1741,7 @@ fprintf(fd, "// Process group with 30 CNs \n"); cnOffsetInGroup = (lut_numBnInBnGroups[29]*NR_LDPC_ZMAX)>>4; // Set pointers to start of group 2 - fprintf(fd," p_bnProcBuf = (__m128i*) &bnProcBuf [%d];\n",lut_startAddrBnGroups[idxBnGroup]); + fprintf(fd," p_bnProcBuf = (__m128i*) &bnProcBuf [%u];\n",lut_startAddrBnGroups[idxBnGroup]); fprintf(fd," p_llrProcBuf = (__m128i*) &llrProcBuf [%d];\n",lut_startAddrBnGroupsLlr[idxBnGroup]); fprintf(fd," p_llrRes = (__m256i*) &llrRes [%d];\n",lut_startAddrBnGroupsLlr[idxBnGroup]); // Loop over BNs @@ -1753,10 +1753,10 @@ fprintf(fd, "// Process group with 30 CNs \n"); // Loop over CNs for (k=1; k<30; k++) { - fprintf(fd," ymm0 = simde_mm256_cvtepi8_epi16(p_bnProcBuf[%d + j]);\n", k*cnOffsetInGroup); + fprintf(fd," ymm0 = simde_mm256_cvtepi8_epi16(p_bnProcBuf[%u + j]);\n", k*cnOffsetInGroup); fprintf(fd," ymmRes0 = simde_mm256_adds_epi16(ymmRes0, ymm0);\n"); - fprintf(fd," ymm1 = simde_mm256_cvtepi8_epi16(p_bnProcBuf[%d + j +1]);\n", k*cnOffsetInGroup); + fprintf(fd," ymm1 = simde_mm256_cvtepi8_epi16(p_bnProcBuf[%u + j +1]);\n", k*cnOffsetInGroup); fprintf(fd, " ymmRes1 = simde_mm256_adds_epi16(ymmRes1, ymm1); \n"); } diff --git a/openair1/PHY/CODING/nrLDPC_decoder/nrLDPC_tools/generator_bnProc/bnProcPc_gen_BG2_avx2.c b/openair1/PHY/CODING/nrLDPC_decoder/nrLDPC_tools/generator_bnProc/bnProcPc_gen_BG2_avx2.c index 049cca34bef5cce93c3cbd9cf700aea6b1d95ed7..a7b724494443668f12bc458ee10b999d76011598 100644 --- a/openair1/PHY/CODING/nrLDPC_decoder/nrLDPC_tools/generator_bnProc/bnProcPc_gen_BG2_avx2.c +++ b/openair1/PHY/CODING/nrLDPC_decoder/nrLDPC_tools/generator_bnProc/bnProcPc_gen_BG2_avx2.c @@ -159,7 +159,7 @@ fprintf(fd, "// Process group with 2 CNs \n"); cnOffsetInGroup = (lut_numBnInBnGroups[1]*NR_LDPC_ZMAX)>>4; // Set pointers to start of group 2 - fprintf(fd," p_bnProcBuf = (__m128i*) &bnProcBuf [%d];\n",lut_startAddrBnGroups[idxBnGroup]); + fprintf(fd," p_bnProcBuf = (__m128i*) &bnProcBuf [%u];\n",lut_startAddrBnGroups[idxBnGroup]); fprintf(fd," p_llrProcBuf = (__m128i*) &llrProcBuf [%d];\n",lut_startAddrBnGroupsLlr[idxBnGroup]); fprintf(fd," p_llrRes = (__m256i*) &llrRes [%d];\n",lut_startAddrBnGroupsLlr[idxBnGroup]); @@ -172,10 +172,10 @@ fprintf(fd, "// Process group with 2 CNs \n"); // Loop over CNs for (k=1; k<2; k++) { - fprintf(fd," ymm0 = simde_mm256_cvtepi8_epi16(p_bnProcBuf[%d + j]);\n", k*cnOffsetInGroup); + fprintf(fd," ymm0 = simde_mm256_cvtepi8_epi16(p_bnProcBuf[%u + j]);\n", k*cnOffsetInGroup); fprintf(fd," ymmRes0 = simde_mm256_adds_epi16(ymmRes0, ymm0);\n"); - fprintf(fd," ymm1 = simde_mm256_cvtepi8_epi16(p_bnProcBuf[%d + j +1]);\n", k*cnOffsetInGroup); + fprintf(fd," ymm1 = simde_mm256_cvtepi8_epi16(p_bnProcBuf[%u + j +1]);\n", k*cnOffsetInGroup); fprintf(fd, " ymmRes1 = simde_mm256_adds_epi16(ymmRes1, ymm1); \n"); } @@ -217,7 +217,7 @@ fprintf(fd, "// Process group with 3 CNs \n"); cnOffsetInGroup = (lut_numBnInBnGroups[2]*NR_LDPC_ZMAX)>>4; // Set pointers to start of group 2 - fprintf(fd," p_bnProcBuf = (__m128i*) &bnProcBuf [%d];\n",lut_startAddrBnGroups[idxBnGroup]); + fprintf(fd," p_bnProcBuf = (__m128i*) &bnProcBuf [%u];\n",lut_startAddrBnGroups[idxBnGroup]); fprintf(fd," p_llrProcBuf = (__m128i*) &llrProcBuf [%d];\n",lut_startAddrBnGroupsLlr[idxBnGroup]); fprintf(fd," p_llrRes = (__m256i*) &llrRes [%d];\n",lut_startAddrBnGroupsLlr[idxBnGroup]); // Loop over BNs @@ -229,10 +229,10 @@ fprintf(fd, "// Process group with 3 CNs \n"); // Loop over CNs for (k=1; k<3; k++) { - fprintf(fd," ymm0 = simde_mm256_cvtepi8_epi16(p_bnProcBuf[%d + j]);\n", k*cnOffsetInGroup); + fprintf(fd," ymm0 = simde_mm256_cvtepi8_epi16(p_bnProcBuf[%u + j]);\n", k*cnOffsetInGroup); fprintf(fd," ymmRes0 = simde_mm256_adds_epi16(ymmRes0, ymm0);\n"); - fprintf(fd," ymm1 = simde_mm256_cvtepi8_epi16(p_bnProcBuf[%d + j +1]);\n", k*cnOffsetInGroup); + fprintf(fd," ymm1 = simde_mm256_cvtepi8_epi16(p_bnProcBuf[%u + j +1]);\n", k*cnOffsetInGroup); fprintf(fd," ymmRes1 = simde_mm256_adds_epi16(ymmRes1, ymm1); \n"); } @@ -273,7 +273,7 @@ fprintf(fd, "// Process group with 4 CNs \n"); cnOffsetInGroup = (lut_numBnInBnGroups[3]*NR_LDPC_ZMAX)>>4; // Set pointers to start of group 2 - fprintf(fd," p_bnProcBuf = (__m128i*) &bnProcBuf [%d];\n",lut_startAddrBnGroups[idxBnGroup]); + fprintf(fd," p_bnProcBuf = (__m128i*) &bnProcBuf [%u];\n",lut_startAddrBnGroups[idxBnGroup]); fprintf(fd," p_llrProcBuf = (__m128i*) &llrProcBuf [%d];\n",lut_startAddrBnGroupsLlr[idxBnGroup]); fprintf(fd," p_llrRes = (__m256i*) &llrRes [%d];\n",lut_startAddrBnGroupsLlr[idxBnGroup]); @@ -286,10 +286,10 @@ fprintf(fd, "// Process group with 4 CNs \n"); // Loop over CNs for (k=1; k<4; k++) { - fprintf(fd," ymm0 = simde_mm256_cvtepi8_epi16(p_bnProcBuf[%d + j]);\n", k*cnOffsetInGroup); + fprintf(fd," ymm0 = simde_mm256_cvtepi8_epi16(p_bnProcBuf[%u + j]);\n", k*cnOffsetInGroup); fprintf(fd," ymmRes0 = simde_mm256_adds_epi16(ymmRes0, ymm0);\n"); - fprintf(fd," ymm1 = simde_mm256_cvtepi8_epi16(p_bnProcBuf[%d + j +1]);\n", k*cnOffsetInGroup); + fprintf(fd," ymm1 = simde_mm256_cvtepi8_epi16(p_bnProcBuf[%u + j +1]);\n", k*cnOffsetInGroup); fprintf(fd, " ymmRes1 = simde_mm256_adds_epi16(ymmRes1, ymm1); \n"); } @@ -330,7 +330,7 @@ fprintf(fd, "// Process group with 5 CNs \n"); cnOffsetInGroup = (lut_numBnInBnGroups[4]*NR_LDPC_ZMAX)>>4; // Set pointers to start of group 2 - fprintf(fd," p_bnProcBuf = (__m128i*) &bnProcBuf [%d];\n",lut_startAddrBnGroups[idxBnGroup]); + fprintf(fd," p_bnProcBuf = (__m128i*) &bnProcBuf [%u];\n",lut_startAddrBnGroups[idxBnGroup]); fprintf(fd," p_llrProcBuf = (__m128i*) &llrProcBuf [%d];\n",lut_startAddrBnGroupsLlr[idxBnGroup]); fprintf(fd," p_llrRes = (__m256i*) &llrRes [%d];\n",lut_startAddrBnGroupsLlr[idxBnGroup]); // Loop over BNs @@ -342,10 +342,10 @@ fprintf(fd, "// Process group with 5 CNs \n"); // Loop over CNs for (k=1; k<5; k++) { - fprintf(fd," ymm0 = simde_mm256_cvtepi8_epi16(p_bnProcBuf[%d + j]);\n", k*cnOffsetInGroup); + fprintf(fd," ymm0 = simde_mm256_cvtepi8_epi16(p_bnProcBuf[%u + j]);\n", k*cnOffsetInGroup); fprintf(fd," ymmRes0 = simde_mm256_adds_epi16(ymmRes0, ymm0);\n"); - fprintf(fd," ymm1 = simde_mm256_cvtepi8_epi16(p_bnProcBuf[%d + j +1]);\n", k*cnOffsetInGroup); + fprintf(fd," ymm1 = simde_mm256_cvtepi8_epi16(p_bnProcBuf[%u + j +1]);\n", k*cnOffsetInGroup); fprintf(fd, " ymmRes1 = simde_mm256_adds_epi16(ymmRes1, ymm1); \n"); } @@ -387,7 +387,7 @@ fprintf(fd, "// Process group with 6 CNs \n"); cnOffsetInGroup = (lut_numBnInBnGroups[5]*NR_LDPC_ZMAX)>>4; // Set pointers to start of group 2 - fprintf(fd," p_bnProcBuf = (__m128i*) &bnProcBuf [%d];\n",lut_startAddrBnGroups[idxBnGroup]); + fprintf(fd," p_bnProcBuf = (__m128i*) &bnProcBuf [%u];\n",lut_startAddrBnGroups[idxBnGroup]); fprintf(fd," p_llrProcBuf = (__m128i*) &llrProcBuf [%d];\n",lut_startAddrBnGroupsLlr[idxBnGroup]); fprintf(fd," p_llrRes = (__m256i*) &llrRes [%d];\n",lut_startAddrBnGroupsLlr[idxBnGroup]); // Loop over BNs @@ -399,10 +399,10 @@ fprintf(fd, "// Process group with 6 CNs \n"); // Loop over CNs for (k=1; k<6; k++) { - fprintf(fd," ymm0 = simde_mm256_cvtepi8_epi16(p_bnProcBuf[%d + j]);\n", k*cnOffsetInGroup); + fprintf(fd," ymm0 = simde_mm256_cvtepi8_epi16(p_bnProcBuf[%u + j]);\n", k*cnOffsetInGroup); fprintf(fd," ymmRes0 = simde_mm256_adds_epi16(ymmRes0, ymm0);\n"); - fprintf(fd," ymm1 = simde_mm256_cvtepi8_epi16(p_bnProcBuf[%d + j +1]);\n", k*cnOffsetInGroup); + fprintf(fd," ymm1 = simde_mm256_cvtepi8_epi16(p_bnProcBuf[%u + j +1]);\n", k*cnOffsetInGroup); fprintf(fd, " ymmRes1 = simde_mm256_adds_epi16(ymmRes1, ymm1); \n"); } @@ -443,7 +443,7 @@ fprintf(fd, "// Process group with 7 CNs \n"); cnOffsetInGroup = (lut_numBnInBnGroups[6]*NR_LDPC_ZMAX)>>4; // Set pointers to start of group 2 - fprintf(fd," p_bnProcBuf = (__m128i*) &bnProcBuf [%d];\n",lut_startAddrBnGroups[idxBnGroup]); + fprintf(fd," p_bnProcBuf = (__m128i*) &bnProcBuf [%u];\n",lut_startAddrBnGroups[idxBnGroup]); fprintf(fd," p_llrProcBuf = (__m128i*) &llrProcBuf [%d];\n",lut_startAddrBnGroupsLlr[idxBnGroup]); fprintf(fd," p_llrRes = (__m256i*) &llrRes [%d];\n",lut_startAddrBnGroupsLlr[idxBnGroup]); // Loop over BNs @@ -455,10 +455,10 @@ fprintf(fd, "// Process group with 7 CNs \n"); // Loop over CNs for (k=1; k<7; k++) { - fprintf(fd," ymm0 = simde_mm256_cvtepi8_epi16(p_bnProcBuf[%d + j]);\n", k*cnOffsetInGroup); + fprintf(fd," ymm0 = simde_mm256_cvtepi8_epi16(p_bnProcBuf[%u + j]);\n", k*cnOffsetInGroup); fprintf(fd," ymmRes0 = simde_mm256_adds_epi16(ymmRes0, ymm0);\n"); - fprintf(fd," ymm1 = simde_mm256_cvtepi8_epi16(p_bnProcBuf[%d + j +1]);\n", k*cnOffsetInGroup); + fprintf(fd," ymm1 = simde_mm256_cvtepi8_epi16(p_bnProcBuf[%u + j +1]);\n", k*cnOffsetInGroup); fprintf(fd, " ymmRes1 = simde_mm256_adds_epi16(ymmRes1, ymm1); \n"); } @@ -500,7 +500,7 @@ fprintf(fd, "// Process group with 8 CNs \n"); cnOffsetInGroup = (lut_numBnInBnGroups[7]*NR_LDPC_ZMAX)>>4; // Set pointers to start of group 2 - fprintf(fd," p_bnProcBuf = (__m128i*) &bnProcBuf [%d];\n",lut_startAddrBnGroups[idxBnGroup]); + fprintf(fd," p_bnProcBuf = (__m128i*) &bnProcBuf [%u];\n",lut_startAddrBnGroups[idxBnGroup]); fprintf(fd," p_llrProcBuf = (__m128i*) &llrProcBuf [%d];\n",lut_startAddrBnGroupsLlr[idxBnGroup]); fprintf(fd," p_llrRes = (__m256i*) &llrRes [%d];\n",lut_startAddrBnGroupsLlr[idxBnGroup]); // Loop over BNs @@ -512,10 +512,10 @@ fprintf(fd, "// Process group with 8 CNs \n"); // Loop over CNs for (k=1; k<8; k++) { - fprintf(fd," ymm0 = simde_mm256_cvtepi8_epi16(p_bnProcBuf[%d + j]);\n", k*cnOffsetInGroup); + fprintf(fd," ymm0 = simde_mm256_cvtepi8_epi16(p_bnProcBuf[%u + j]);\n", k*cnOffsetInGroup); fprintf(fd," ymmRes0 = simde_mm256_adds_epi16(ymmRes0, ymm0);\n"); - fprintf(fd," ymm1 = simde_mm256_cvtepi8_epi16(p_bnProcBuf[%d + j +1]);\n", k*cnOffsetInGroup); + fprintf(fd," ymm1 = simde_mm256_cvtepi8_epi16(p_bnProcBuf[%u + j +1]);\n", k*cnOffsetInGroup); fprintf(fd, " ymmRes1 = simde_mm256_adds_epi16(ymmRes1, ymm1); \n"); } @@ -557,7 +557,7 @@ fprintf(fd, "// Process group with 9 CNs \n"); cnOffsetInGroup = (lut_numBnInBnGroups[8]*NR_LDPC_ZMAX)>>4; // Set pointers to start of group 2 - fprintf(fd," p_bnProcBuf = (__m128i*) &bnProcBuf [%d];\n",lut_startAddrBnGroups[idxBnGroup]); + fprintf(fd," p_bnProcBuf = (__m128i*) &bnProcBuf [%u];\n",lut_startAddrBnGroups[idxBnGroup]); fprintf(fd," p_llrProcBuf = (__m128i*) &llrProcBuf [%d];\n",lut_startAddrBnGroupsLlr[idxBnGroup]); fprintf(fd," p_llrRes = (__m256i*) &llrRes [%d];\n",lut_startAddrBnGroupsLlr[idxBnGroup]); // Loop over BNs @@ -569,10 +569,10 @@ fprintf(fd, "// Process group with 9 CNs \n"); // Loop over CNs for (k=1; k<9; k++) { - fprintf(fd," ymm0 = simde_mm256_cvtepi8_epi16(p_bnProcBuf[%d + j]);\n", k*cnOffsetInGroup); + fprintf(fd," ymm0 = simde_mm256_cvtepi8_epi16(p_bnProcBuf[%u + j]);\n", k*cnOffsetInGroup); fprintf(fd," ymmRes0 = simde_mm256_adds_epi16(ymmRes0, ymm0);\n"); - fprintf(fd," ymm1 = simde_mm256_cvtepi8_epi16(p_bnProcBuf[%d + j +1]);\n", k*cnOffsetInGroup); + fprintf(fd," ymm1 = simde_mm256_cvtepi8_epi16(p_bnProcBuf[%u + j +1]);\n", k*cnOffsetInGroup); fprintf(fd, " ymmRes1 = simde_mm256_adds_epi16(ymmRes1, ymm1); \n"); } @@ -614,7 +614,7 @@ fprintf(fd, "// Process group with 10 CNs \n"); cnOffsetInGroup = (lut_numBnInBnGroups[9]*NR_LDPC_ZMAX)>>4; // Set pointers to start of group 2 - fprintf(fd," p_bnProcBuf = (__m128i*) &bnProcBuf [%d];\n",lut_startAddrBnGroups[idxBnGroup]); + fprintf(fd," p_bnProcBuf = (__m128i*) &bnProcBuf [%u];\n",lut_startAddrBnGroups[idxBnGroup]); fprintf(fd," p_llrProcBuf = (__m128i*) &llrProcBuf [%d];\n",lut_startAddrBnGroupsLlr[idxBnGroup]); fprintf(fd," p_llrRes = (__m256i*) &llrRes [%d];\n",lut_startAddrBnGroupsLlr[idxBnGroup]); // Loop over BNs @@ -626,10 +626,10 @@ fprintf(fd, "// Process group with 10 CNs \n"); // Loop over CNs for (k=1; k<10; k++) { - fprintf(fd," ymm0 = simde_mm256_cvtepi8_epi16(p_bnProcBuf[%d + j]);\n", k*cnOffsetInGroup); + fprintf(fd," ymm0 = simde_mm256_cvtepi8_epi16(p_bnProcBuf[%u + j]);\n", k*cnOffsetInGroup); fprintf(fd," ymmRes0 = simde_mm256_adds_epi16(ymmRes0, ymm0);\n"); - fprintf(fd," ymm1 = simde_mm256_cvtepi8_epi16(p_bnProcBuf[%d + j +1]);\n", k*cnOffsetInGroup); + fprintf(fd," ymm1 = simde_mm256_cvtepi8_epi16(p_bnProcBuf[%u + j +1]);\n", k*cnOffsetInGroup); fprintf(fd, " ymmRes1 = simde_mm256_adds_epi16(ymmRes1, ymm1); \n"); } @@ -672,7 +672,7 @@ fprintf(fd, "// Process group with 11 CNs \n"); cnOffsetInGroup = (lut_numBnInBnGroups[10]*NR_LDPC_ZMAX)>>4; // Set pointers to start of group 2 - fprintf(fd," p_bnProcBuf = (__m128i*) &bnProcBuf [%d];\n",lut_startAddrBnGroups[idxBnGroup]); + fprintf(fd," p_bnProcBuf = (__m128i*) &bnProcBuf [%u];\n",lut_startAddrBnGroups[idxBnGroup]); fprintf(fd," p_llrProcBuf = (__m128i*) &llrProcBuf [%d];\n",lut_startAddrBnGroupsLlr[idxBnGroup]); fprintf(fd," p_llrRes = (__m256i*) &llrRes [%d];\n",lut_startAddrBnGroupsLlr[idxBnGroup]); // Loop over BNs @@ -684,10 +684,10 @@ fprintf(fd, "// Process group with 11 CNs \n"); // Loop over CNs for (k=1; k<11; k++) { - fprintf(fd," ymm0 = simde_mm256_cvtepi8_epi16(p_bnProcBuf[%d + j]);\n", k*cnOffsetInGroup); + fprintf(fd," ymm0 = simde_mm256_cvtepi8_epi16(p_bnProcBuf[%u + j]);\n", k*cnOffsetInGroup); fprintf(fd," ymmRes0 = simde_mm256_adds_epi16(ymmRes0, ymm0);\n"); - fprintf(fd," ymm1 = simde_mm256_cvtepi8_epi16(p_bnProcBuf[%d + j +1]);\n", k*cnOffsetInGroup); + fprintf(fd," ymm1 = simde_mm256_cvtepi8_epi16(p_bnProcBuf[%u + j +1]);\n", k*cnOffsetInGroup); fprintf(fd, " ymmRes1 = simde_mm256_adds_epi16(ymmRes1, ymm1); \n"); } @@ -727,7 +727,7 @@ fprintf(fd, "// Process group with 12 CNs \n"); cnOffsetInGroup = (lut_numBnInBnGroups[11]*NR_LDPC_ZMAX)>>4; // Set pointers to start of group 2 - fprintf(fd," p_bnProcBuf = (__m128i*) &bnProcBuf [%d];\n",lut_startAddrBnGroups[idxBnGroup]); + fprintf(fd," p_bnProcBuf = (__m128i*) &bnProcBuf [%u];\n",lut_startAddrBnGroups[idxBnGroup]); fprintf(fd," p_llrProcBuf = (__m128i*) &llrProcBuf [%d];\n",lut_startAddrBnGroupsLlr[idxBnGroup]); fprintf(fd," p_llrRes = (__m256i*) &llrRes [%d];\n",lut_startAddrBnGroupsLlr[idxBnGroup]); // Loop over BNs @@ -739,10 +739,10 @@ fprintf(fd, "// Process group with 12 CNs \n"); // Loop over CNs for (k=1; k<12; k++) { - fprintf(fd," ymm0 = simde_mm256_cvtepi8_epi16(p_bnProcBuf[%d + j]);\n", k*cnOffsetInGroup); + fprintf(fd," ymm0 = simde_mm256_cvtepi8_epi16(p_bnProcBuf[%u + j]);\n", k*cnOffsetInGroup); fprintf(fd," ymmRes0 = simde_mm256_adds_epi16(ymmRes0, ymm0);\n"); - fprintf(fd," ymm1 = simde_mm256_cvtepi8_epi16(p_bnProcBuf[%d + j +1]);\n", k*cnOffsetInGroup); + fprintf(fd," ymm1 = simde_mm256_cvtepi8_epi16(p_bnProcBuf[%u + j +1]);\n", k*cnOffsetInGroup); fprintf(fd, " ymmRes1 = simde_mm256_adds_epi16(ymmRes1, ymm1); \n"); } @@ -783,7 +783,7 @@ fprintf(fd, "// Process group with 13 CNs \n"); cnOffsetInGroup = (lut_numBnInBnGroups[12]*NR_LDPC_ZMAX)>>4; // Set pointers to start of group 2 - fprintf(fd," p_bnProcBuf = (__m128i*) &bnProcBuf [%d];\n",lut_startAddrBnGroups[idxBnGroup]); + fprintf(fd," p_bnProcBuf = (__m128i*) &bnProcBuf [%u];\n",lut_startAddrBnGroups[idxBnGroup]); fprintf(fd," p_llrProcBuf = (__m128i*) &llrProcBuf [%d];\n",lut_startAddrBnGroupsLlr[idxBnGroup]); fprintf(fd," p_llrRes = (__m256i*) &llrRes [%d];\n",lut_startAddrBnGroupsLlr[idxBnGroup]); // Loop over BNs @@ -795,10 +795,10 @@ fprintf(fd, "// Process group with 13 CNs \n"); // Loop over CNs for (k=1; k<13; k++) { - fprintf(fd," ymm0 = simde_mm256_cvtepi8_epi16(p_bnProcBuf[%d + j]);\n", k*cnOffsetInGroup); + fprintf(fd," ymm0 = simde_mm256_cvtepi8_epi16(p_bnProcBuf[%u + j]);\n", k*cnOffsetInGroup); fprintf(fd," ymmRes0 = simde_mm256_adds_epi16(ymmRes0, ymm0);\n"); - fprintf(fd," ymm1 = simde_mm256_cvtepi8_epi16(p_bnProcBuf[%d + j +1]);\n", k*cnOffsetInGroup); + fprintf(fd," ymm1 = simde_mm256_cvtepi8_epi16(p_bnProcBuf[%u + j +1]);\n", k*cnOffsetInGroup); fprintf(fd," ymmRes1 = simde_mm256_adds_epi16(ymmRes1, ymm1); \n"); } @@ -840,7 +840,7 @@ fprintf(fd, "// Process group with 14 CNs \n"); cnOffsetInGroup = (lut_numBnInBnGroups[13]*NR_LDPC_ZMAX)>>4; // Set pointers to start of group 2 - fprintf(fd," p_bnProcBuf = (__m128i*) &bnProcBuf [%d];\n",lut_startAddrBnGroups[idxBnGroup]); + fprintf(fd," p_bnProcBuf = (__m128i*) &bnProcBuf [%u];\n",lut_startAddrBnGroups[idxBnGroup]); fprintf(fd," p_llrProcBuf = (__m128i*) &llrProcBuf [%d];\n",lut_startAddrBnGroupsLlr[idxBnGroup]); fprintf(fd," p_llrRes = (__m256i*) &llrRes [%d];\n",lut_startAddrBnGroupsLlr[idxBnGroup]); // Loop over BNs @@ -852,10 +852,10 @@ fprintf(fd, "// Process group with 14 CNs \n"); // Loop over CNs for (k=1; k<14; k++) { - fprintf(fd," ymm0 = simde_mm256_cvtepi8_epi16(p_bnProcBuf[%d + j]);\n", k*cnOffsetInGroup); + fprintf(fd," ymm0 = simde_mm256_cvtepi8_epi16(p_bnProcBuf[%u + j]);\n", k*cnOffsetInGroup); fprintf(fd," ymmRes0 = simde_mm256_adds_epi16(ymmRes0, ymm0);\n"); - fprintf(fd," ymm1 = simde_mm256_cvtepi8_epi16(p_bnProcBuf[%d + j +1]);\n", k*cnOffsetInGroup); + fprintf(fd," ymm1 = simde_mm256_cvtepi8_epi16(p_bnProcBuf[%u + j +1]);\n", k*cnOffsetInGroup); fprintf(fd, " ymmRes1 = simde_mm256_adds_epi16(ymmRes1, ymm1); \n"); } @@ -896,9 +896,9 @@ fprintf(fd, "// Process group with 15 CNs \n"); cnOffsetInGroup = (lut_numBnInBnGroups[14]*NR_LDPC_ZMAX)>>4; // Set pointers to start of group 2 - fprintf(fd," p_bnProcBuf = (__m128i*) &bnProcBuf [%d];\n",lut_startAddrBnGroups[idxBnGroup]); + fprintf(fd," p_bnProcBuf = (__m128i*) &bnProcBuf [%u];\n",lut_startAddrBnGroups[idxBnGroup]); fprintf(fd," p_llrProcBuf = (__m128i*) &llrProcBuf [%d];\n",lut_startAddrBnGroupsLlr[idxBnGroup]); - fprintf(fd," p_llrRes = (__m256i*) &llrRes [%d];\n",lut_startAddrBnGroupsLlr[idxBnGroup]); + fprintf(fd," p_llrRes = (__m256i*) &llrRes [%u];\n",lut_startAddrBnGroupsLlr[idxBnGroup]); // Loop over BNs fprintf(fd," for (int i=0,j=0;i<M;i++,j+=2) {\n"); // First 16 LLRs of first CN @@ -908,10 +908,10 @@ fprintf(fd, "// Process group with 15 CNs \n"); // Loop over CNs for (k=1; k<15; k++) { - fprintf(fd," ymm0 = simde_mm256_cvtepi8_epi16(p_bnProcBuf[%d + j]);\n", k*cnOffsetInGroup); + fprintf(fd," ymm0 = simde_mm256_cvtepi8_epi16(p_bnProcBuf[%u + j]);\n", k*cnOffsetInGroup); fprintf(fd," ymmRes0 = simde_mm256_adds_epi16(ymmRes0, ymm0);\n"); - fprintf(fd," ymm1 = simde_mm256_cvtepi8_epi16(p_bnProcBuf[%d + j +1]);\n", k*cnOffsetInGroup); + fprintf(fd," ymm1 = simde_mm256_cvtepi8_epi16(p_bnProcBuf[%u + j +1]);\n", k*cnOffsetInGroup); fprintf(fd, " ymmRes1 = simde_mm256_adds_epi16(ymmRes1, ymm1); \n"); } @@ -953,7 +953,7 @@ fprintf(fd, "// Process group with 16 CNs \n"); cnOffsetInGroup = (lut_numBnInBnGroups[15]*NR_LDPC_ZMAX)>>4; // Set pointers to start of group 2 - fprintf(fd," p_bnProcBuf = (__m128i*) &bnProcBuf [%d];\n",lut_startAddrBnGroups[idxBnGroup]); + fprintf(fd," p_bnProcBuf = (__m128i*) &bnProcBuf [%u];\n",lut_startAddrBnGroups[idxBnGroup]); fprintf(fd," p_llrProcBuf = (__m128i*) &llrProcBuf [%d];\n",lut_startAddrBnGroupsLlr[idxBnGroup]); fprintf(fd," p_llrRes = (__m256i*) &llrRes [%d];\n",lut_startAddrBnGroupsLlr[idxBnGroup]); // Loop over BNs @@ -965,10 +965,10 @@ fprintf(fd, "// Process group with 16 CNs \n"); // Loop over CNs for (k=1; k<16; k++) { - fprintf(fd," ymm0 = simde_mm256_cvtepi8_epi16(p_bnProcBuf[%d + j]);\n", k*cnOffsetInGroup); + fprintf(fd," ymm0 = simde_mm256_cvtepi8_epi16(p_bnProcBuf[%u + j]);\n", k*cnOffsetInGroup); fprintf(fd," ymmRes0 = simde_mm256_adds_epi16(ymmRes0, ymm0);\n"); - fprintf(fd," ymm1 = simde_mm256_cvtepi8_epi16(p_bnProcBuf[%d + j +1]);\n", k*cnOffsetInGroup); + fprintf(fd," ymm1 = simde_mm256_cvtepi8_epi16(p_bnProcBuf[%u + j +1]);\n", k*cnOffsetInGroup); fprintf(fd, " ymmRes1 = simde_mm256_adds_epi16(ymmRes1, ymm1); \n"); } @@ -1009,7 +1009,7 @@ fprintf(fd, "// Process group with 17 CNs \n"); cnOffsetInGroup = (lut_numBnInBnGroups[16]*NR_LDPC_ZMAX)>>4; // Set pointers to start of group 2 - fprintf(fd," p_bnProcBuf = (__m128i*) &bnProcBuf [%d];\n",lut_startAddrBnGroups[idxBnGroup]); + fprintf(fd," p_bnProcBuf = (__m128i*) &bnProcBuf [%u];\n",lut_startAddrBnGroups[idxBnGroup]); fprintf(fd," p_llrProcBuf = (__m128i*) &llrProcBuf [%d];\n",lut_startAddrBnGroupsLlr[idxBnGroup]); fprintf(fd," p_llrRes = (__m256i*) &llrRes [%d];\n",lut_startAddrBnGroupsLlr[idxBnGroup]); // Loop over BNs @@ -1021,10 +1021,10 @@ fprintf(fd, "// Process group with 17 CNs \n"); // Loop over CNs for (k=1; k<17; k++) { - fprintf(fd," ymm0 = simde_mm256_cvtepi8_epi16(p_bnProcBuf[%d + j]);\n", k*cnOffsetInGroup); + fprintf(fd," ymm0 = simde_mm256_cvtepi8_epi16(p_bnProcBuf[%u + j]);\n", k*cnOffsetInGroup); fprintf(fd," ymmRes0 = simde_mm256_adds_epi16(ymmRes0, ymm0);\n"); - fprintf(fd," ymm1 = simde_mm256_cvtepi8_epi16(p_bnProcBuf[%d + j +1]);\n", k*cnOffsetInGroup); + fprintf(fd," ymm1 = simde_mm256_cvtepi8_epi16(p_bnProcBuf[%u + j +1]);\n", k*cnOffsetInGroup); fprintf(fd, " ymmRes1 = simde_mm256_adds_epi16(ymmRes1, ymm1); \n"); } @@ -1065,7 +1065,7 @@ fprintf(fd, "// Process group with 18 CNs \n"); cnOffsetInGroup = (lut_numBnInBnGroups[17]*NR_LDPC_ZMAX)>>4; // Set pointers to start of group 2 - fprintf(fd," p_bnProcBuf = (__m128i*) &bnProcBuf [%d];\n",lut_startAddrBnGroups[idxBnGroup]); + fprintf(fd," p_bnProcBuf = (__m128i*) &bnProcBuf [%u];\n",lut_startAddrBnGroups[idxBnGroup]); fprintf(fd," p_llrProcBuf = (__m128i*) &llrProcBuf [%d];\n",lut_startAddrBnGroupsLlr[idxBnGroup]); fprintf(fd," p_llrRes = (__m256i*) &llrRes [%d];\n",lut_startAddrBnGroupsLlr[idxBnGroup]); // Loop over BNs @@ -1077,10 +1077,10 @@ fprintf(fd, "// Process group with 18 CNs \n"); // Loop over CNs for (k=1; k<18; k++) { - fprintf(fd," ymm0 = simde_mm256_cvtepi8_epi16(p_bnProcBuf[%d + j]);\n", k*cnOffsetInGroup); + fprintf(fd," ymm0 = simde_mm256_cvtepi8_epi16(p_bnProcBuf[%u + j]);\n", k*cnOffsetInGroup); fprintf(fd," ymmRes0 = simde_mm256_adds_epi16(ymmRes0, ymm0);\n"); - fprintf(fd," ymm1 = simde_mm256_cvtepi8_epi16(p_bnProcBuf[%d + j +1]);\n", k*cnOffsetInGroup); + fprintf(fd," ymm1 = simde_mm256_cvtepi8_epi16(p_bnProcBuf[%u + j +1]);\n", k*cnOffsetInGroup); fprintf(fd, " ymmRes1 = simde_mm256_adds_epi16(ymmRes1, ymm1); \n"); } @@ -1120,7 +1120,7 @@ fprintf(fd, "// Process group with 19 CNs \n"); cnOffsetInGroup = (lut_numBnInBnGroups[18]*NR_LDPC_ZMAX)>>4; // Set pointers to start of group 2 - fprintf(fd," p_bnProcBuf = (__m128i*) &bnProcBuf [%d];\n",lut_startAddrBnGroups[idxBnGroup]); + fprintf(fd," p_bnProcBuf = (__m128i*) &bnProcBuf [%u];\n",lut_startAddrBnGroups[idxBnGroup]); fprintf(fd," p_llrProcBuf = (__m128i*) &llrProcBuf [%d];\n",lut_startAddrBnGroupsLlr[idxBnGroup]); fprintf(fd," p_llrRes = (__m256i*) &llrRes [%d];\n",lut_startAddrBnGroupsLlr[idxBnGroup]); // Loop over BNs @@ -1132,10 +1132,10 @@ fprintf(fd, "// Process group with 19 CNs \n"); // Loop over CNs for (k=1; k<19; k++) { - fprintf(fd," ymm0 = simde_mm256_cvtepi8_epi16(p_bnProcBuf[%d + j]);\n", k*cnOffsetInGroup); + fprintf(fd," ymm0 = simde_mm256_cvtepi8_epi16(p_bnProcBuf[%u + j]);\n", k*cnOffsetInGroup); fprintf(fd," ymmRes0 = simde_mm256_adds_epi16(ymmRes0, ymm0);\n"); - fprintf(fd," ymm1 = simde_mm256_cvtepi8_epi16(p_bnProcBuf[%d + j +1]);\n", k*cnOffsetInGroup); + fprintf(fd," ymm1 = simde_mm256_cvtepi8_epi16(p_bnProcBuf[%u + j +1]);\n", k*cnOffsetInGroup); fprintf(fd, " ymmRes1 = simde_mm256_adds_epi16(ymmRes1, ymm1); \n"); } @@ -1176,7 +1176,7 @@ fprintf(fd, "// Process group with 20 CNs \n"); cnOffsetInGroup = (lut_numBnInBnGroups[19]*NR_LDPC_ZMAX)>>4; // Set pointers to start of group 2 - fprintf(fd," p_bnProcBuf = (__m128i*) &bnProcBuf [%d];\n",lut_startAddrBnGroups[idxBnGroup]); + fprintf(fd," p_bnProcBuf = (__m128i*) &bnProcBuf [%u];\n",lut_startAddrBnGroups[idxBnGroup]); fprintf(fd," p_llrProcBuf = (__m128i*) &llrProcBuf [%d];\n",lut_startAddrBnGroupsLlr[idxBnGroup]); fprintf(fd," p_llrRes = (__m256i*) &llrRes [%d];\n",lut_startAddrBnGroupsLlr[idxBnGroup]); // Loop over BNs @@ -1188,10 +1188,10 @@ fprintf(fd, "// Process group with 20 CNs \n"); // Loop over CNs for (k=1; k<20; k++) { - fprintf(fd," ymm0 = simde_mm256_cvtepi8_epi16(p_bnProcBuf[%d + j]);\n", k*cnOffsetInGroup); + fprintf(fd," ymm0 = simde_mm256_cvtepi8_epi16(p_bnProcBuf[%u + j]);\n", k*cnOffsetInGroup); fprintf(fd," ymmRes0 = simde_mm256_adds_epi16(ymmRes0, ymm0);\n"); - fprintf(fd," ymm1 = simde_mm256_cvtepi8_epi16(p_bnProcBuf[%d + j +1]);\n", k*cnOffsetInGroup); + fprintf(fd," ymm1 = simde_mm256_cvtepi8_epi16(p_bnProcBuf[%u + j +1]);\n", k*cnOffsetInGroup); fprintf(fd, " ymmRes1 = simde_mm256_adds_epi16(ymmRes1, ymm1); \n"); } @@ -1236,7 +1236,7 @@ fprintf(fd, "// Process group with 21 CNs \n"); cnOffsetInGroup = (lut_numBnInBnGroups[20]*NR_LDPC_ZMAX)>>4; // Set pointers to start of group 2 - fprintf(fd," p_bnProcBuf = (__m128i*) &bnProcBuf [%d];\n",lut_startAddrBnGroups[idxBnGroup]); + fprintf(fd," p_bnProcBuf = (__m128i*) &bnProcBuf [%u];\n",lut_startAddrBnGroups[idxBnGroup]); fprintf(fd," p_llrProcBuf = (__m128i*) &llrProcBuf [%d];\n",lut_startAddrBnGroupsLlr[idxBnGroup]); fprintf(fd," p_llrRes = (__m256i*) &llrRes [%d];\n",lut_startAddrBnGroupsLlr[idxBnGroup]); // Loop over BNs @@ -1248,10 +1248,10 @@ fprintf(fd, "// Process group with 21 CNs \n"); // Loop over CNs for (k=1; k<21; k++) { - fprintf(fd," ymm0 = simde_mm256_cvtepi8_epi16(p_bnProcBuf[%d + j]);\n", k*cnOffsetInGroup); + fprintf(fd," ymm0 = simde_mm256_cvtepi8_epi16(p_bnProcBuf[%u + j]);\n", k*cnOffsetInGroup); fprintf(fd," ymmRes0 = simde_mm256_adds_epi16(ymmRes0, ymm0);\n"); - fprintf(fd," ymm1 = simde_mm256_cvtepi8_epi16(p_bnProcBuf[%d + j +1]);\n", k*cnOffsetInGroup); + fprintf(fd," ymm1 = simde_mm256_cvtepi8_epi16(p_bnProcBuf[%u + j +1]);\n", k*cnOffsetInGroup); fprintf(fd, " ymmRes1 = simde_mm256_adds_epi16(ymmRes1, ymm1); \n"); } @@ -1291,7 +1291,7 @@ fprintf(fd, "// Process group with 22 CNs \n"); cnOffsetInGroup = (lut_numBnInBnGroups[21]*NR_LDPC_ZMAX)>>4; // Set pointers to start of group 2 - fprintf(fd," p_bnProcBuf = (__m128i*) &bnProcBuf [%d];\n",lut_startAddrBnGroups[idxBnGroup]); + fprintf(fd," p_bnProcBuf = (__m128i*) &bnProcBuf [%u];\n",lut_startAddrBnGroups[idxBnGroup]); fprintf(fd," p_llrProcBuf = (__m128i*) &llrProcBuf [%d];\n",lut_startAddrBnGroupsLlr[idxBnGroup]); fprintf(fd," p_llrRes = (__m256i*) &llrRes [%d];\n",lut_startAddrBnGroupsLlr[idxBnGroup]); // Loop over BNs @@ -1303,10 +1303,10 @@ fprintf(fd, "// Process group with 22 CNs \n"); // Loop over CNs for (k=1; k<22; k++) { - fprintf(fd," ymm0 = simde_mm256_cvtepi8_epi16(p_bnProcBuf[%d + j]);\n", k*cnOffsetInGroup); + fprintf(fd," ymm0 = simde_mm256_cvtepi8_epi16(p_bnProcBuf[%u + j]);\n", k*cnOffsetInGroup); fprintf(fd," ymmRes0 = simde_mm256_adds_epi16(ymmRes0, ymm0);\n"); - fprintf(fd," ymm1 = simde_mm256_cvtepi8_epi16(p_bnProcBuf[%d + j +1]);\n", k*cnOffsetInGroup); + fprintf(fd," ymm1 = simde_mm256_cvtepi8_epi16(p_bnProcBuf[%u + j +1]);\n", k*cnOffsetInGroup); fprintf(fd, " ymmRes1 = simde_mm256_adds_epi16(ymmRes1, ymm1); \n"); } @@ -1347,7 +1347,7 @@ fprintf(fd, "// Process group with <23 CNs \n"); cnOffsetInGroup = (lut_numBnInBnGroups[22]*NR_LDPC_ZMAX)>>4; // Set pointers to start of group 2 - fprintf(fd," p_bnProcBuf = (__m128i*) &bnProcBuf [%d];\n",lut_startAddrBnGroups[idxBnGroup]); + fprintf(fd," p_bnProcBuf = (__m128i*) &bnProcBuf [%u];\n",lut_startAddrBnGroups[idxBnGroup]); fprintf(fd," p_llrProcBuf = (__m128i*) &llrProcBuf [%d];\n",lut_startAddrBnGroupsLlr[idxBnGroup]); fprintf(fd," p_llrRes = (__m256i*) &llrRes [%d];\n",lut_startAddrBnGroupsLlr[idxBnGroup]); // Loop over BNs @@ -1359,10 +1359,10 @@ fprintf(fd, "// Process group with <23 CNs \n"); // Loop over CNs for (k=1; k<23; k++) { - fprintf(fd," ymm0 = simde_mm256_cvtepi8_epi16(p_bnProcBuf[%d + j]);\n", k*cnOffsetInGroup); + fprintf(fd," ymm0 = simde_mm256_cvtepi8_epi16(p_bnProcBuf[%u + j]);\n", k*cnOffsetInGroup); fprintf(fd," ymmRes0 = simde_mm256_adds_epi16(ymmRes0, ymm0);\n"); - fprintf(fd," ymm1 = simde_mm256_cvtepi8_epi16(p_bnProcBuf[%d + j +1]);\n", k*cnOffsetInGroup); + fprintf(fd," ymm1 = simde_mm256_cvtepi8_epi16(p_bnProcBuf[%u + j +1]);\n", k*cnOffsetInGroup); fprintf(fd," ymmRes1 = simde_mm256_adds_epi16(ymmRes1, ymm1); \n"); } @@ -1404,7 +1404,7 @@ fprintf(fd, "// Process group with 24 CNs \n"); cnOffsetInGroup = (lut_numBnInBnGroups[23]*NR_LDPC_ZMAX)>>4; // Set pointers to start of group 2 - fprintf(fd," p_bnProcBuf = (__m128i*) &bnProcBuf [%d];\n",lut_startAddrBnGroups[idxBnGroup]); + fprintf(fd," p_bnProcBuf = (__m128i*) &bnProcBuf [%u];\n",lut_startAddrBnGroups[idxBnGroup]); fprintf(fd," p_llrProcBuf = (__m128i*) &llrProcBuf [%d];\n",lut_startAddrBnGroupsLlr[idxBnGroup]); fprintf(fd," p_llrRes = (__m256i*) &llrRes [%d];\n",lut_startAddrBnGroupsLlr[idxBnGroup]); // Loop over BNs @@ -1416,10 +1416,10 @@ fprintf(fd, "// Process group with 24 CNs \n"); // Loop over CNs for (k=1; k<24; k++) { - fprintf(fd," ymm0 = simde_mm256_cvtepi8_epi16(p_bnProcBuf[%d + j]);\n", k*cnOffsetInGroup); + fprintf(fd," ymm0 = simde_mm256_cvtepi8_epi16(p_bnProcBuf[%u + j]);\n", k*cnOffsetInGroup); fprintf(fd," ymmRes0 = simde_mm256_adds_epi16(ymmRes0, ymm0);\n"); - fprintf(fd," ymm1 = simde_mm256_cvtepi8_epi16(p_bnProcBuf[%d + j +1]);\n", k*cnOffsetInGroup); + fprintf(fd," ymm1 = simde_mm256_cvtepi8_epi16(p_bnProcBuf[%u + j +1]);\n", k*cnOffsetInGroup); fprintf(fd, " ymmRes1 = simde_mm256_adds_epi16(ymmRes1, ymm1); \n"); } @@ -1460,7 +1460,7 @@ fprintf(fd, "// Process group with 25 CNs \n"); cnOffsetInGroup = (lut_numBnInBnGroups[24]*NR_LDPC_ZMAX)>>4; // Set pointers to start of group 2 - fprintf(fd," p_bnProcBuf = (__m128i*) &bnProcBuf [%d];\n",lut_startAddrBnGroups[idxBnGroup]); + fprintf(fd," p_bnProcBuf = (__m128i*) &bnProcBuf [%u];\n",lut_startAddrBnGroups[idxBnGroup]); fprintf(fd," p_llrProcBuf = (__m128i*) &llrProcBuf [%d];\n",lut_startAddrBnGroupsLlr[idxBnGroup]); fprintf(fd," p_llrRes = (__m256i*) &llrRes [%d];\n",lut_startAddrBnGroupsLlr[idxBnGroup]); // Loop over BNs @@ -1472,10 +1472,10 @@ fprintf(fd, "// Process group with 25 CNs \n"); // Loop over CNs for (k=1; k<25; k++) { - fprintf(fd," ymm0 = simde_mm256_cvtepi8_epi16(p_bnProcBuf[%d + j]);\n", k*cnOffsetInGroup); + fprintf(fd," ymm0 = simde_mm256_cvtepi8_epi16(p_bnProcBuf[%u + j]);\n", k*cnOffsetInGroup); fprintf(fd," ymmRes0 = simde_mm256_adds_epi16(ymmRes0, ymm0);\n"); - fprintf(fd," ymm1 = simde_mm256_cvtepi8_epi16(p_bnProcBuf[%d + j +1]);\n", k*cnOffsetInGroup); + fprintf(fd," ymm1 = simde_mm256_cvtepi8_epi16(p_bnProcBuf[%u + j +1]);\n", k*cnOffsetInGroup); fprintf(fd, " ymmRes1 = simde_mm256_adds_epi16(ymmRes1, ymm1); \n"); } @@ -1517,7 +1517,7 @@ fprintf(fd, "// Process group with 26 CNs \n"); cnOffsetInGroup = (lut_numBnInBnGroups[25]*NR_LDPC_ZMAX)>>4; // Set pointers to start of group 2 - fprintf(fd," p_bnProcBuf = (__m128i*) &bnProcBuf [%d];\n",lut_startAddrBnGroups[idxBnGroup]); + fprintf(fd," p_bnProcBuf = (__m128i*) &bnProcBuf [%u];\n",lut_startAddrBnGroups[idxBnGroup]); fprintf(fd," p_llrProcBuf = (__m128i*) &llrProcBuf [%d];\n",lut_startAddrBnGroupsLlr[idxBnGroup]); fprintf(fd," p_llrRes = (__m256i*) &llrRes [%d];\n",lut_startAddrBnGroupsLlr[idxBnGroup]); // Loop over BNs @@ -1529,10 +1529,10 @@ fprintf(fd, "// Process group with 26 CNs \n"); // Loop over CNs for (k=1; k<26; k++) { - fprintf(fd," ymm0 = simde_mm256_cvtepi8_epi16(p_bnProcBuf[%d + j]);\n", k*cnOffsetInGroup); + fprintf(fd," ymm0 = simde_mm256_cvtepi8_epi16(p_bnProcBuf[%u + j]);\n", k*cnOffsetInGroup); fprintf(fd," ymmRes0 = simde_mm256_adds_epi16(ymmRes0, ymm0);\n"); - fprintf(fd," ymm1 = simde_mm256_cvtepi8_epi16(p_bnProcBuf[%d + j +1]);\n", k*cnOffsetInGroup); + fprintf(fd," ymm1 = simde_mm256_cvtepi8_epi16(p_bnProcBuf[%u + j +1]);\n", k*cnOffsetInGroup); fprintf(fd, " ymmRes1 = simde_mm256_adds_epi16(ymmRes1, ymm1); \n"); } @@ -1573,7 +1573,7 @@ fprintf(fd, "// Process group with 27 CNs \n"); cnOffsetInGroup = (lut_numBnInBnGroups[26]*NR_LDPC_ZMAX)>>4; // Set pointers to start of group 2 - fprintf(fd," p_bnProcBuf = (__m128i*) &bnProcBuf [%d];\n",lut_startAddrBnGroups[idxBnGroup]); + fprintf(fd," p_bnProcBuf = (__m128i*) &bnProcBuf [%u];\n",lut_startAddrBnGroups[idxBnGroup]); fprintf(fd," p_llrProcBuf = (__m128i*) &llrProcBuf [%d];\n",lut_startAddrBnGroupsLlr[idxBnGroup]); fprintf(fd," p_llrRes = (__m256i*) &llrRes [%d];\n",lut_startAddrBnGroupsLlr[idxBnGroup]); // Loop over BNs @@ -1585,10 +1585,10 @@ fprintf(fd, "// Process group with 27 CNs \n"); // Loop over CNs for (k=1; k<27; k++) { - fprintf(fd," ymm0 = simde_mm256_cvtepi8_epi16(p_bnProcBuf[%d + j]);\n", k*cnOffsetInGroup); + fprintf(fd," ymm0 = simde_mm256_cvtepi8_epi16(p_bnProcBuf[%u + j]);\n", k*cnOffsetInGroup); fprintf(fd," ymmRes0 = simde_mm256_adds_epi16(ymmRes0, ymm0);\n"); - fprintf(fd," ymm1 = simde_mm256_cvtepi8_epi16(p_bnProcBuf[%d + j +1]);\n", k*cnOffsetInGroup); + fprintf(fd," ymm1 = simde_mm256_cvtepi8_epi16(p_bnProcBuf[%u + j +1]);\n", k*cnOffsetInGroup); fprintf(fd, " ymmRes1 = simde_mm256_adds_epi16(ymmRes1, ymm1); \n"); } @@ -1629,7 +1629,7 @@ fprintf(fd, "// Process group with 28 CNs \n"); cnOffsetInGroup = (lut_numBnInBnGroups[27]*NR_LDPC_ZMAX)>>4; // Set pointers to start of group 2 - fprintf(fd," p_bnProcBuf = (__m128i*) &bnProcBuf [%d];\n",lut_startAddrBnGroups[idxBnGroup]); + fprintf(fd," p_bnProcBuf = (__m128i*) &bnProcBuf [%u];\n",lut_startAddrBnGroups[idxBnGroup]); fprintf(fd," p_llrProcBuf = (__m128i*) &llrProcBuf [%d];\n",lut_startAddrBnGroupsLlr[idxBnGroup]); fprintf(fd," p_llrRes = (__m256i*) &llrRes [%d];\n",lut_startAddrBnGroupsLlr[idxBnGroup]); // Loop over BNs @@ -1641,10 +1641,10 @@ fprintf(fd, "// Process group with 28 CNs \n"); // Loop over CNs for (k=1; k<28; k++) { - fprintf(fd," ymm0 = simde_mm256_cvtepi8_epi16(p_bnProcBuf[%d + j]);\n", k*cnOffsetInGroup); + fprintf(fd," ymm0 = simde_mm256_cvtepi8_epi16(p_bnProcBuf[%u + j]);\n", k*cnOffsetInGroup); fprintf(fd," ymmRes0 = simde_mm256_adds_epi16(ymmRes0, ymm0);\n"); - fprintf(fd," ymm1 = simde_mm256_cvtepi8_epi16(p_bnProcBuf[%d + j +1]);\n", k*cnOffsetInGroup); + fprintf(fd," ymm1 = simde_mm256_cvtepi8_epi16(p_bnProcBuf[%u + j +1]);\n", k*cnOffsetInGroup); fprintf(fd, " ymmRes1 = simde_mm256_adds_epi16(ymmRes1, ymm1); \n"); } @@ -1684,7 +1684,7 @@ fprintf(fd, "// Process group with 29 CNs \n"); cnOffsetInGroup = (lut_numBnInBnGroups[28]*NR_LDPC_ZMAX)>>4; // Set pointers to start of group 2 - fprintf(fd," p_bnProcBuf = (__m128i*) &bnProcBuf [%d];\n",lut_startAddrBnGroups[idxBnGroup]); + fprintf(fd," p_bnProcBuf = (__m128i*) &bnProcBuf [%u];\n",lut_startAddrBnGroups[idxBnGroup]); fprintf(fd," p_llrProcBuf = (__m128i*) &llrProcBuf [%d];\n",lut_startAddrBnGroupsLlr[idxBnGroup]); fprintf(fd," p_llrRes = (__m256i*) &llrRes [%d];\n",lut_startAddrBnGroupsLlr[idxBnGroup]); // Loop over BNs @@ -1696,10 +1696,10 @@ fprintf(fd, "// Process group with 29 CNs \n"); // Loop over CNs for (k=1; k<29; k++) { - fprintf(fd," ymm0 = simde_mm256_cvtepi8_epi16(p_bnProcBuf[%d + j]);\n", k*cnOffsetInGroup); + fprintf(fd," ymm0 = simde_mm256_cvtepi8_epi16(p_bnProcBuf[%u + j]);\n", k*cnOffsetInGroup); fprintf(fd," ymmRes0 = simde_mm256_adds_epi16(ymmRes0, ymm0);\n"); - fprintf(fd," ymm1 = simde_mm256_cvtepi8_epi16(p_bnProcBuf[%d + j +1]);\n", k*cnOffsetInGroup); + fprintf(fd," ymm1 = simde_mm256_cvtepi8_epi16(p_bnProcBuf[%u + j +1]);\n", k*cnOffsetInGroup); fprintf(fd, " ymmRes1 = simde_mm256_adds_epi16(ymmRes1, ymm1); \n"); } @@ -1740,7 +1740,7 @@ fprintf(fd, "// Process group with 30 CNs \n"); cnOffsetInGroup = (lut_numBnInBnGroups[29]*NR_LDPC_ZMAX)>>4; // Set pointers to start of group 2 - fprintf(fd," p_bnProcBuf = (__m128i*) &bnProcBuf [%d];\n",lut_startAddrBnGroups[idxBnGroup]); + fprintf(fd," p_bnProcBuf = (__m128i*) &bnProcBuf [%u];\n",lut_startAddrBnGroups[idxBnGroup]); fprintf(fd," p_llrProcBuf = (__m128i*) &llrProcBuf [%d];\n",lut_startAddrBnGroupsLlr[idxBnGroup]); fprintf(fd," p_llrRes = (__m256i*) &llrRes [%d];\n",lut_startAddrBnGroupsLlr[idxBnGroup]); // Loop over BNs @@ -1752,10 +1752,10 @@ fprintf(fd, "// Process group with 30 CNs \n"); // Loop over CNs for (k=1; k<30; k++) { - fprintf(fd," ymm0 = simde_mm256_cvtepi8_epi16(p_bnProcBuf[%d + j]);\n", k*cnOffsetInGroup); + fprintf(fd," ymm0 = simde_mm256_cvtepi8_epi16(p_bnProcBuf[%u + j]);\n", k*cnOffsetInGroup); fprintf(fd," ymmRes0 = simde_mm256_adds_epi16(ymmRes0, ymm0);\n"); - fprintf(fd," ymm1 = simde_mm256_cvtepi8_epi16(p_bnProcBuf[%d + j +1]);\n", k*cnOffsetInGroup); + fprintf(fd," ymm1 = simde_mm256_cvtepi8_epi16(p_bnProcBuf[%u + j +1]);\n", k*cnOffsetInGroup); fprintf(fd, " ymmRes1 = simde_mm256_adds_epi16(ymmRes1, ymm1); \n"); } diff --git a/openair1/PHY/CODING/nrLDPC_decoder/nrLDPC_tools/generator_bnProc_avx512/bnProcPc_gen_BG1_avx512.c b/openair1/PHY/CODING/nrLDPC_decoder/nrLDPC_tools/generator_bnProc_avx512/bnProcPc_gen_BG1_avx512.c index 49b01926094f4c317de4a62e52ace326b18c98ca..e4a7fb67ebaffd0e8e6326642d585b691cd779b5 100644 --- a/openair1/PHY/CODING/nrLDPC_decoder/nrLDPC_tools/generator_bnProc_avx512/bnProcPc_gen_BG1_avx512.c +++ b/openair1/PHY/CODING/nrLDPC_decoder/nrLDPC_tools/generator_bnProc_avx512/bnProcPc_gen_BG1_avx512.c @@ -106,7 +106,7 @@ fprintf(fd, "// Process group with 1 CNs \n"); cnOffsetInGroup = (lut_numBnInBnGroups[0]*NR_LDPC_ZMAX)>>5; // Set pointers to start of group 2 - fprintf(fd," p_bnProcBuf = (__m256i*) &bnProcBuf [%d];\n",lut_startAddrBnGroups[idxBnGroup]); + fprintf(fd," p_bnProcBuf = (__m256i*) &bnProcBuf [%u];\n",lut_startAddrBnGroups[idxBnGroup]); fprintf(fd," p_llrProcBuf = (__m256i*) &llrProcBuf [%d];\n",lut_startAddrBnGroupsLlr[idxBnGroup]); fprintf(fd," p_llrRes = (__m512i*) &llrRes [%d];\n",lut_startAddrBnGroupsLlr[idxBnGroup]); @@ -119,10 +119,10 @@ fprintf(fd, "// Process group with 1 CNs \n"); // Loop over CNs for (k=1; k<1; k++) { - fprintf(fd," zmm0 = _mm512_cvtepi8_epi16(p_bnProcBuf[%d + j]);\n", k*cnOffsetInGroup); + fprintf(fd," zmm0 = _mm512_cvtepi8_epi16(p_bnProcBuf[%u + j]);\n", k*cnOffsetInGroup); fprintf(fd," zmmRes0 = _mm512_adds_epi16(zmmRes0, zmm0);\n"); - fprintf(fd," zmm1 = _mm512_cvtepi8_epi16(p_bnProcBuf[%d + j +1]);\n", k*cnOffsetInGroup); + fprintf(fd," zmm1 = _mm512_cvtepi8_epi16(p_bnProcBuf[%u + j +1]);\n", k*cnOffsetInGroup); fprintf(fd, " zmmRes1 = _mm512_adds_epi16(zmmRes1, zmm1); \n"); } @@ -163,7 +163,7 @@ fprintf(fd, "// Process group with 2 CNs \n"); cnOffsetInGroup = (lut_numBnInBnGroups[1]*NR_LDPC_ZMAX)>>5; // Set pointers to start of group 2 - fprintf(fd," p_bnProcBuf = (__m256i*) &bnProcBuf [%d];\n",lut_startAddrBnGroups[idxBnGroup]); + fprintf(fd," p_bnProcBuf = (__m256i*) &bnProcBuf [%u];\n",lut_startAddrBnGroups[idxBnGroup]); fprintf(fd," p_llrProcBuf = (__m256i*) &llrProcBuf [%d];\n",lut_startAddrBnGroupsLlr[idxBnGroup]); fprintf(fd," p_llrRes = (__m512i*) &llrRes [%d];\n",lut_startAddrBnGroupsLlr[idxBnGroup]); @@ -176,10 +176,10 @@ fprintf(fd, "// Process group with 2 CNs \n"); // Loop over CNs for (k=1; k<2; k++) { - fprintf(fd," zmm0 = _mm512_cvtepi8_epi16(p_bnProcBuf[%d + j]);\n", k*cnOffsetInGroup); + fprintf(fd," zmm0 = _mm512_cvtepi8_epi16(p_bnProcBuf[%u + j]);\n", k*cnOffsetInGroup); fprintf(fd," zmmRes0 = _mm512_adds_epi16(zmmRes0, zmm0);\n"); - fprintf(fd," zmm1 = _mm512_cvtepi8_epi16(p_bnProcBuf[%d + j +1]);\n", k*cnOffsetInGroup); + fprintf(fd," zmm1 = _mm512_cvtepi8_epi16(p_bnProcBuf[%u + j +1]);\n", k*cnOffsetInGroup); fprintf(fd, " zmmRes1 = _mm512_adds_epi16(zmmRes1, zmm1); \n"); } @@ -221,7 +221,7 @@ fprintf(fd, "// Process group with 3 CNs \n"); cnOffsetInGroup = (lut_numBnInBnGroups[2]*NR_LDPC_ZMAX)>>5; // Set pointers to start of group 2 - fprintf(fd," p_bnProcBuf = (__m256i*) &bnProcBuf [%d];\n",lut_startAddrBnGroups[idxBnGroup]); + fprintf(fd," p_bnProcBuf = (__m256i*) &bnProcBuf [%u];\n",lut_startAddrBnGroups[idxBnGroup]); fprintf(fd," p_llrProcBuf = (__m256i*) &llrProcBuf [%d];\n",lut_startAddrBnGroupsLlr[idxBnGroup]); fprintf(fd," p_llrRes = (__m512i*) &llrRes [%d];\n",lut_startAddrBnGroupsLlr[idxBnGroup]); // Loop over BNs @@ -233,10 +233,10 @@ fprintf(fd, "// Process group with 3 CNs \n"); // Loop over CNs for (k=1; k<3; k++) { - fprintf(fd," zmm0 = _mm512_cvtepi8_epi16(p_bnProcBuf[%d + j]);\n", k*cnOffsetInGroup); + fprintf(fd," zmm0 = _mm512_cvtepi8_epi16(p_bnProcBuf[%u + j]);\n", k*cnOffsetInGroup); fprintf(fd," zmmRes0 = _mm512_adds_epi16(zmmRes0, zmm0);\n"); - fprintf(fd," zmm1 = _mm512_cvtepi8_epi16(p_bnProcBuf[%d + j +1]);\n", k*cnOffsetInGroup); + fprintf(fd," zmm1 = _mm512_cvtepi8_epi16(p_bnProcBuf[%u + j +1]);\n", k*cnOffsetInGroup); fprintf(fd," zmmRes1 = _mm512_adds_epi16(zmmRes1, zmm1); \n"); } @@ -277,7 +277,7 @@ fprintf(fd, "// Process group with 4 CNs \n"); cnOffsetInGroup = (lut_numBnInBnGroups[3]*NR_LDPC_ZMAX)>>5; // Set pointers to start of group 2 - fprintf(fd," p_bnProcBuf = (__m256i*) &bnProcBuf [%d];\n",lut_startAddrBnGroups[idxBnGroup]); + fprintf(fd," p_bnProcBuf = (__m256i*) &bnProcBuf [%u];\n",lut_startAddrBnGroups[idxBnGroup]); fprintf(fd," p_llrProcBuf = (__m256i*) &llrProcBuf [%d];\n",lut_startAddrBnGroupsLlr[idxBnGroup]); fprintf(fd," p_llrRes = (__m512i*) &llrRes [%d];\n",lut_startAddrBnGroupsLlr[idxBnGroup]); @@ -290,10 +290,10 @@ fprintf(fd, "// Process group with 4 CNs \n"); // Loop over CNs for (k=1; k<4; k++) { - fprintf(fd," zmm0 = _mm512_cvtepi8_epi16(p_bnProcBuf[%d + j]);\n", k*cnOffsetInGroup); + fprintf(fd," zmm0 = _mm512_cvtepi8_epi16(p_bnProcBuf[%u + j]);\n", k*cnOffsetInGroup); fprintf(fd," zmmRes0 = _mm512_adds_epi16(zmmRes0, zmm0);\n"); - fprintf(fd," zmm1 = _mm512_cvtepi8_epi16(p_bnProcBuf[%d + j +1]);\n", k*cnOffsetInGroup); + fprintf(fd," zmm1 = _mm512_cvtepi8_epi16(p_bnProcBuf[%u + j +1]);\n", k*cnOffsetInGroup); fprintf(fd, " zmmRes1 = _mm512_adds_epi16(zmmRes1, zmm1); \n"); } @@ -334,7 +334,7 @@ fprintf(fd, "// Process group with 5 CNs \n"); cnOffsetInGroup = (lut_numBnInBnGroups[4]*NR_LDPC_ZMAX)>>5; // Set pointers to start of group 2 - fprintf(fd," p_bnProcBuf = (__m256i*) &bnProcBuf [%d];\n",lut_startAddrBnGroups[idxBnGroup]); + fprintf(fd," p_bnProcBuf = (__m256i*) &bnProcBuf [%u];\n",lut_startAddrBnGroups[idxBnGroup]); fprintf(fd," p_llrProcBuf = (__m256i*) &llrProcBuf [%d];\n",lut_startAddrBnGroupsLlr[idxBnGroup]); fprintf(fd," p_llrRes = (__m512i*) &llrRes [%d];\n",lut_startAddrBnGroupsLlr[idxBnGroup]); // Loop over BNs @@ -346,10 +346,10 @@ fprintf(fd, "// Process group with 5 CNs \n"); // Loop over CNs for (k=1; k<5; k++) { - fprintf(fd," zmm0 = _mm512_cvtepi8_epi16(p_bnProcBuf[%d + j]);\n", k*cnOffsetInGroup); + fprintf(fd," zmm0 = _mm512_cvtepi8_epi16(p_bnProcBuf[%u + j]);\n", k*cnOffsetInGroup); fprintf(fd," zmmRes0 = _mm512_adds_epi16(zmmRes0, zmm0);\n"); - fprintf(fd," zmm1 = _mm512_cvtepi8_epi16(p_bnProcBuf[%d + j +1]);\n", k*cnOffsetInGroup); + fprintf(fd," zmm1 = _mm512_cvtepi8_epi16(p_bnProcBuf[%u + j +1]);\n", k*cnOffsetInGroup); fprintf(fd, " zmmRes1 = _mm512_adds_epi16(zmmRes1, zmm1); \n"); } @@ -391,7 +391,7 @@ fprintf(fd, "// Process group with 6 CNs \n"); cnOffsetInGroup = (lut_numBnInBnGroups[5]*NR_LDPC_ZMAX)>>5; // Set pointers to start of group 2 - fprintf(fd," p_bnProcBuf = (__m256i*) &bnProcBuf [%d];\n",lut_startAddrBnGroups[idxBnGroup]); + fprintf(fd," p_bnProcBuf = (__m256i*) &bnProcBuf [%u];\n",lut_startAddrBnGroups[idxBnGroup]); fprintf(fd," p_llrProcBuf = (__m256i*) &llrProcBuf [%d];\n",lut_startAddrBnGroupsLlr[idxBnGroup]); fprintf(fd," p_llrRes = (__m512i*) &llrRes [%d];\n",lut_startAddrBnGroupsLlr[idxBnGroup]); // Loop over BNs @@ -403,10 +403,10 @@ fprintf(fd, "// Process group with 6 CNs \n"); // Loop over CNs for (k=1; k<6; k++) { - fprintf(fd," zmm0 = _mm512_cvtepi8_epi16(p_bnProcBuf[%d + j]);\n", k*cnOffsetInGroup); + fprintf(fd," zmm0 = _mm512_cvtepi8_epi16(p_bnProcBuf[%u + j]);\n", k*cnOffsetInGroup); fprintf(fd," zmmRes0 = _mm512_adds_epi16(zmmRes0, zmm0);\n"); - fprintf(fd," zmm1 = _mm512_cvtepi8_epi16(p_bnProcBuf[%d + j +1]);\n", k*cnOffsetInGroup); + fprintf(fd," zmm1 = _mm512_cvtepi8_epi16(p_bnProcBuf[%u + j +1]);\n", k*cnOffsetInGroup); fprintf(fd, " zmmRes1 = _mm512_adds_epi16(zmmRes1, zmm1); \n"); } @@ -447,7 +447,7 @@ fprintf(fd, "// Process group with 7 CNs \n"); cnOffsetInGroup = (lut_numBnInBnGroups[6]*NR_LDPC_ZMAX)>>5; // Set pointers to start of group 2 - fprintf(fd," p_bnProcBuf = (__m256i*) &bnProcBuf [%d];\n",lut_startAddrBnGroups[idxBnGroup]); + fprintf(fd," p_bnProcBuf = (__m256i*) &bnProcBuf [%u];\n",lut_startAddrBnGroups[idxBnGroup]); fprintf(fd," p_llrProcBuf = (__m256i*) &llrProcBuf [%d];\n",lut_startAddrBnGroupsLlr[idxBnGroup]); fprintf(fd," p_llrRes = (__m512i*) &llrRes [%d];\n",lut_startAddrBnGroupsLlr[idxBnGroup]); // Loop over BNs @@ -459,10 +459,10 @@ fprintf(fd, "// Process group with 7 CNs \n"); // Loop over CNs for (k=1; k<7; k++) { - fprintf(fd," zmm0 = _mm512_cvtepi8_epi16(p_bnProcBuf[%d + j]);\n", k*cnOffsetInGroup); + fprintf(fd," zmm0 = _mm512_cvtepi8_epi16(p_bnProcBuf[%u + j]);\n", k*cnOffsetInGroup); fprintf(fd," zmmRes0 = _mm512_adds_epi16(zmmRes0, zmm0);\n"); - fprintf(fd," zmm1 = _mm512_cvtepi8_epi16(p_bnProcBuf[%d + j +1]);\n", k*cnOffsetInGroup); + fprintf(fd," zmm1 = _mm512_cvtepi8_epi16(p_bnProcBuf[%u + j +1]);\n", k*cnOffsetInGroup); fprintf(fd, " zmmRes1 = _mm512_adds_epi16(zmmRes1, zmm1); \n"); } @@ -504,7 +504,7 @@ fprintf(fd, "// Process group with 8 CNs \n"); cnOffsetInGroup = (lut_numBnInBnGroups[7]*NR_LDPC_ZMAX)>>5; // Set pointers to start of group 2 - fprintf(fd," p_bnProcBuf = (__m256i*) &bnProcBuf [%d];\n",lut_startAddrBnGroups[idxBnGroup]); + fprintf(fd," p_bnProcBuf = (__m256i*) &bnProcBuf [%u];\n",lut_startAddrBnGroups[idxBnGroup]); fprintf(fd," p_llrProcBuf = (__m256i*) &llrProcBuf [%d];\n",lut_startAddrBnGroupsLlr[idxBnGroup]); fprintf(fd," p_llrRes = (__m512i*) &llrRes [%d];\n",lut_startAddrBnGroupsLlr[idxBnGroup]); // Loop over BNs @@ -516,10 +516,10 @@ fprintf(fd, "// Process group with 8 CNs \n"); // Loop over CNs for (k=1; k<8; k++) { - fprintf(fd," zmm0 = _mm512_cvtepi8_epi16(p_bnProcBuf[%d + j]);\n", k*cnOffsetInGroup); + fprintf(fd," zmm0 = _mm512_cvtepi8_epi16(p_bnProcBuf[%u + j]);\n", k*cnOffsetInGroup); fprintf(fd," zmmRes0 = _mm512_adds_epi16(zmmRes0, zmm0);\n"); - fprintf(fd," zmm1 = _mm512_cvtepi8_epi16(p_bnProcBuf[%d + j +1]);\n", k*cnOffsetInGroup); + fprintf(fd," zmm1 = _mm512_cvtepi8_epi16(p_bnProcBuf[%u + j +1]);\n", k*cnOffsetInGroup); fprintf(fd, " zmmRes1 = _mm512_adds_epi16(zmmRes1, zmm1); \n"); } @@ -561,7 +561,7 @@ fprintf(fd, "// Process group with 9 CNs \n"); cnOffsetInGroup = (lut_numBnInBnGroups[8]*NR_LDPC_ZMAX)>>5; // Set pointers to start of group 2 - fprintf(fd," p_bnProcBuf = (__m256i*) &bnProcBuf [%d];\n",lut_startAddrBnGroups[idxBnGroup]); + fprintf(fd," p_bnProcBuf = (__m256i*) &bnProcBuf [%u];\n",lut_startAddrBnGroups[idxBnGroup]); fprintf(fd," p_llrProcBuf = (__m256i*) &llrProcBuf [%d];\n",lut_startAddrBnGroupsLlr[idxBnGroup]); fprintf(fd," p_llrRes = (__m512i*) &llrRes [%d];\n",lut_startAddrBnGroupsLlr[idxBnGroup]); // Loop over BNs @@ -573,10 +573,10 @@ fprintf(fd, "// Process group with 9 CNs \n"); // Loop over CNs for (k=1; k<9; k++) { - fprintf(fd," zmm0 = _mm512_cvtepi8_epi16(p_bnProcBuf[%d + j]);\n", k*cnOffsetInGroup); + fprintf(fd," zmm0 = _mm512_cvtepi8_epi16(p_bnProcBuf[%u + j]);\n", k*cnOffsetInGroup); fprintf(fd," zmmRes0 = _mm512_adds_epi16(zmmRes0, zmm0);\n"); - fprintf(fd," zmm1 = _mm512_cvtepi8_epi16(p_bnProcBuf[%d + j +1]);\n", k*cnOffsetInGroup); + fprintf(fd," zmm1 = _mm512_cvtepi8_epi16(p_bnProcBuf[%u + j +1]);\n", k*cnOffsetInGroup); fprintf(fd, " zmmRes1 = _mm512_adds_epi16(zmmRes1, zmm1); \n"); } @@ -618,7 +618,7 @@ fprintf(fd, "// Process group with 10 CNs \n"); cnOffsetInGroup = (lut_numBnInBnGroups[9]*NR_LDPC_ZMAX)>>5; // Set pointers to start of group 2 - fprintf(fd," p_bnProcBuf = (__m256i*) &bnProcBuf [%d];\n",lut_startAddrBnGroups[idxBnGroup]); + fprintf(fd," p_bnProcBuf = (__m256i*) &bnProcBuf [%u];\n",lut_startAddrBnGroups[idxBnGroup]); fprintf(fd," p_llrProcBuf = (__m256i*) &llrProcBuf [%d];\n",lut_startAddrBnGroupsLlr[idxBnGroup]); fprintf(fd," p_llrRes = (__m512i*) &llrRes [%d];\n",lut_startAddrBnGroupsLlr[idxBnGroup]); // Loop over BNs @@ -630,10 +630,10 @@ fprintf(fd, "// Process group with 10 CNs \n"); // Loop over CNs for (k=1; k<10; k++) { - fprintf(fd," zmm0 = _mm512_cvtepi8_epi16(p_bnProcBuf[%d + j]);\n", k*cnOffsetInGroup); + fprintf(fd," zmm0 = _mm512_cvtepi8_epi16(p_bnProcBuf[%u + j]);\n", k*cnOffsetInGroup); fprintf(fd," zmmRes0 = _mm512_adds_epi16(zmmRes0, zmm0);\n"); - fprintf(fd," zmm1 = _mm512_cvtepi8_epi16(p_bnProcBuf[%d + j +1]);\n", k*cnOffsetInGroup); + fprintf(fd," zmm1 = _mm512_cvtepi8_epi16(p_bnProcBuf[%u + j +1]);\n", k*cnOffsetInGroup); fprintf(fd, " zmmRes1 = _mm512_adds_epi16(zmmRes1, zmm1); \n"); } @@ -676,7 +676,7 @@ fprintf(fd, "// Process group with 11 CNs \n"); cnOffsetInGroup = (lut_numBnInBnGroups[10]*NR_LDPC_ZMAX)>>5; // Set pointers to start of group 2 - fprintf(fd," p_bnProcBuf = (__m256i*) &bnProcBuf [%d];\n",lut_startAddrBnGroups[idxBnGroup]); + fprintf(fd," p_bnProcBuf = (__m256i*) &bnProcBuf [%u];\n",lut_startAddrBnGroups[idxBnGroup]); fprintf(fd," p_llrProcBuf = (__m256i*) &llrProcBuf [%d];\n",lut_startAddrBnGroupsLlr[idxBnGroup]); fprintf(fd," p_llrRes = (__m512i*) &llrRes [%d];\n",lut_startAddrBnGroupsLlr[idxBnGroup]); // Loop over BNs @@ -688,10 +688,10 @@ fprintf(fd, "// Process group with 11 CNs \n"); // Loop over CNs for (k=1; k<11; k++) { - fprintf(fd," zmm0 = _mm512_cvtepi8_epi16(p_bnProcBuf[%d + j]);\n", k*cnOffsetInGroup); + fprintf(fd," zmm0 = _mm512_cvtepi8_epi16(p_bnProcBuf[%u + j]);\n", k*cnOffsetInGroup); fprintf(fd," zmmRes0 = _mm512_adds_epi16(zmmRes0, zmm0);\n"); - fprintf(fd," zmm1 = _mm512_cvtepi8_epi16(p_bnProcBuf[%d + j +1]);\n", k*cnOffsetInGroup); + fprintf(fd," zmm1 = _mm512_cvtepi8_epi16(p_bnProcBuf[%u + j +1]);\n", k*cnOffsetInGroup); fprintf(fd, " zmmRes1 = _mm512_adds_epi16(zmmRes1, zmm1); \n"); } @@ -731,7 +731,7 @@ fprintf(fd, "// Process group with 12 CNs \n"); cnOffsetInGroup = (lut_numBnInBnGroups[11]*NR_LDPC_ZMAX)>>5; // Set pointers to start of group 2 - fprintf(fd," p_bnProcBuf = (__m256i*) &bnProcBuf [%d];\n",lut_startAddrBnGroups[idxBnGroup]); + fprintf(fd," p_bnProcBuf = (__m256i*) &bnProcBuf [%u];\n",lut_startAddrBnGroups[idxBnGroup]); fprintf(fd," p_llrProcBuf = (__m256i*) &llrProcBuf [%d];\n",lut_startAddrBnGroupsLlr[idxBnGroup]); fprintf(fd," p_llrRes = (__m512i*) &llrRes [%d];\n",lut_startAddrBnGroupsLlr[idxBnGroup]); // Loop over BNs @@ -743,10 +743,10 @@ fprintf(fd, "// Process group with 12 CNs \n"); // Loop over CNs for (k=1; k<12; k++) { - fprintf(fd," zmm0 = _mm512_cvtepi8_epi16(p_bnProcBuf[%d + j]);\n", k*cnOffsetInGroup); + fprintf(fd," zmm0 = _mm512_cvtepi8_epi16(p_bnProcBuf[%u + j]);\n", k*cnOffsetInGroup); fprintf(fd," zmmRes0 = _mm512_adds_epi16(zmmRes0, zmm0);\n"); - fprintf(fd," zmm1 = _mm512_cvtepi8_epi16(p_bnProcBuf[%d + j +1]);\n", k*cnOffsetInGroup); + fprintf(fd," zmm1 = _mm512_cvtepi8_epi16(p_bnProcBuf[%u + j +1]);\n", k*cnOffsetInGroup); fprintf(fd, " zmmRes1 = _mm512_adds_epi16(zmmRes1, zmm1); \n"); } @@ -787,7 +787,7 @@ fprintf(fd, "// Process group with 13 CNs \n"); cnOffsetInGroup = (lut_numBnInBnGroups[12]*NR_LDPC_ZMAX)>>5; // Set pointers to start of group 2 - fprintf(fd," p_bnProcBuf = (__m256i*) &bnProcBuf [%d];\n",lut_startAddrBnGroups[idxBnGroup]); + fprintf(fd," p_bnProcBuf = (__m256i*) &bnProcBuf [%u];\n",lut_startAddrBnGroups[idxBnGroup]); fprintf(fd," p_llrProcBuf = (__m256i*) &llrProcBuf [%d];\n",lut_startAddrBnGroupsLlr[idxBnGroup]); fprintf(fd," p_llrRes = (__m512i*) &llrRes [%d];\n",lut_startAddrBnGroupsLlr[idxBnGroup]); // Loop over BNs @@ -799,10 +799,10 @@ fprintf(fd, "// Process group with 13 CNs \n"); // Loop over CNs for (k=1; k<13; k++) { - fprintf(fd," zmm0 = _mm512_cvtepi8_epi16(p_bnProcBuf[%d + j]);\n", k*cnOffsetInGroup); + fprintf(fd," zmm0 = _mm512_cvtepi8_epi16(p_bnProcBuf[%u + j]);\n", k*cnOffsetInGroup); fprintf(fd," zmmRes0 = _mm512_adds_epi16(zmmRes0, zmm0);\n"); - fprintf(fd," zmm1 = _mm512_cvtepi8_epi16(p_bnProcBuf[%d + j +1]);\n", k*cnOffsetInGroup); + fprintf(fd," zmm1 = _mm512_cvtepi8_epi16(p_bnProcBuf[%u + j +1]);\n", k*cnOffsetInGroup); fprintf(fd," zmmRes1 = _mm512_adds_epi16(zmmRes1, zmm1); \n"); } @@ -844,7 +844,7 @@ fprintf(fd, "// Process group with 14 CNs \n"); cnOffsetInGroup = (lut_numBnInBnGroups[13]*NR_LDPC_ZMAX)>>5; // Set pointers to start of group 2 - fprintf(fd," p_bnProcBuf = (__m256i*) &bnProcBuf [%d];\n",lut_startAddrBnGroups[idxBnGroup]); + fprintf(fd," p_bnProcBuf = (__m256i*) &bnProcBuf [%u];\n",lut_startAddrBnGroups[idxBnGroup]); fprintf(fd," p_llrProcBuf = (__m256i*) &llrProcBuf [%d];\n",lut_startAddrBnGroupsLlr[idxBnGroup]); fprintf(fd," p_llrRes = (__m512i*) &llrRes [%d];\n",lut_startAddrBnGroupsLlr[idxBnGroup]); // Loop over BNs @@ -856,10 +856,10 @@ fprintf(fd, "// Process group with 14 CNs \n"); // Loop over CNs for (k=1; k<14; k++) { - fprintf(fd," zmm0 = _mm512_cvtepi8_epi16(p_bnProcBuf[%d + j]);\n", k*cnOffsetInGroup); + fprintf(fd," zmm0 = _mm512_cvtepi8_epi16(p_bnProcBuf[%u + j]);\n", k*cnOffsetInGroup); fprintf(fd," zmmRes0 = _mm512_adds_epi16(zmmRes0, zmm0);\n"); - fprintf(fd," zmm1 = _mm512_cvtepi8_epi16(p_bnProcBuf[%d + j +1]);\n", k*cnOffsetInGroup); + fprintf(fd," zmm1 = _mm512_cvtepi8_epi16(p_bnProcBuf[%u + j +1]);\n", k*cnOffsetInGroup); fprintf(fd, " zmmRes1 = _mm512_adds_epi16(zmmRes1, zmm1); \n"); } @@ -900,7 +900,7 @@ fprintf(fd, "// Process group with 15 CNs \n"); cnOffsetInGroup = (lut_numBnInBnGroups[14]*NR_LDPC_ZMAX)>>5; // Set pointers to start of group 2 - fprintf(fd," p_bnProcBuf = (__m256i*) &bnProcBuf [%d];\n",lut_startAddrBnGroups[idxBnGroup]); + fprintf(fd," p_bnProcBuf = (__m256i*) &bnProcBuf [%u];\n",lut_startAddrBnGroups[idxBnGroup]); fprintf(fd," p_llrProcBuf = (__m256i*) &llrProcBuf [%d];\n",lut_startAddrBnGroupsLlr[idxBnGroup]); fprintf(fd," p_llrRes = (__m512i*) &llrRes [%d];\n",lut_startAddrBnGroupsLlr[idxBnGroup]); // Loop over BNs @@ -912,10 +912,10 @@ fprintf(fd, "// Process group with 15 CNs \n"); // Loop over CNs for (k=1; k<15; k++) { - fprintf(fd," zmm0 = _mm512_cvtepi8_epi16(p_bnProcBuf[%d + j]);\n", k*cnOffsetInGroup); + fprintf(fd," zmm0 = _mm512_cvtepi8_epi16(p_bnProcBuf[%u + j]);\n", k*cnOffsetInGroup); fprintf(fd," zmmRes0 = _mm512_adds_epi16(zmmRes0, zmm0);\n"); - fprintf(fd," zmm1 = _mm512_cvtepi8_epi16(p_bnProcBuf[%d + j +1]);\n", k*cnOffsetInGroup); + fprintf(fd," zmm1 = _mm512_cvtepi8_epi16(p_bnProcBuf[%u + j +1]);\n", k*cnOffsetInGroup); fprintf(fd, " zmmRes1 = _mm512_adds_epi16(zmmRes1, zmm1); \n"); } @@ -957,7 +957,7 @@ fprintf(fd, "// Process group with 16 CNs \n"); cnOffsetInGroup = (lut_numBnInBnGroups[15]*NR_LDPC_ZMAX)>>5; // Set pointers to start of group 2 - fprintf(fd," p_bnProcBuf = (__m256i*) &bnProcBuf [%d];\n",lut_startAddrBnGroups[idxBnGroup]); + fprintf(fd," p_bnProcBuf = (__m256i*) &bnProcBuf [%u];\n",lut_startAddrBnGroups[idxBnGroup]); fprintf(fd," p_llrProcBuf = (__m256i*) &llrProcBuf [%d];\n",lut_startAddrBnGroupsLlr[idxBnGroup]); fprintf(fd," p_llrRes = (__m512i*) &llrRes [%d];\n",lut_startAddrBnGroupsLlr[idxBnGroup]); // Loop over BNs @@ -969,10 +969,10 @@ fprintf(fd, "// Process group with 16 CNs \n"); // Loop over CNs for (k=1; k<16; k++) { - fprintf(fd," zmm0 = _mm512_cvtepi8_epi16(p_bnProcBuf[%d + j]);\n", k*cnOffsetInGroup); + fprintf(fd," zmm0 = _mm512_cvtepi8_epi16(p_bnProcBuf[%u + j]);\n", k*cnOffsetInGroup); fprintf(fd," zmmRes0 = _mm512_adds_epi16(zmmRes0, zmm0);\n"); - fprintf(fd," zmm1 = _mm512_cvtepi8_epi16(p_bnProcBuf[%d + j +1]);\n", k*cnOffsetInGroup); + fprintf(fd," zmm1 = _mm512_cvtepi8_epi16(p_bnProcBuf[%u + j +1]);\n", k*cnOffsetInGroup); fprintf(fd, " zmmRes1 = _mm512_adds_epi16(zmmRes1, zmm1); \n"); } @@ -1013,7 +1013,7 @@ fprintf(fd, "// Process group with 17 CNs \n"); cnOffsetInGroup = (lut_numBnInBnGroups[16]*NR_LDPC_ZMAX)>>5; // Set pointers to start of group 2 - fprintf(fd," p_bnProcBuf = (__m256i*) &bnProcBuf [%d];\n",lut_startAddrBnGroups[idxBnGroup]); + fprintf(fd," p_bnProcBuf = (__m256i*) &bnProcBuf [%u];\n",lut_startAddrBnGroups[idxBnGroup]); fprintf(fd," p_llrProcBuf = (__m256i*) &llrProcBuf [%d];\n",lut_startAddrBnGroupsLlr[idxBnGroup]); fprintf(fd," p_llrRes = (__m512i*) &llrRes [%d];\n",lut_startAddrBnGroupsLlr[idxBnGroup]); // Loop over BNs @@ -1025,10 +1025,10 @@ fprintf(fd, "// Process group with 17 CNs \n"); // Loop over CNs for (k=1; k<17; k++) { - fprintf(fd," zmm0 = _mm512_cvtepi8_epi16(p_bnProcBuf[%d + j]);\n", k*cnOffsetInGroup); + fprintf(fd," zmm0 = _mm512_cvtepi8_epi16(p_bnProcBuf[%u + j]);\n", k*cnOffsetInGroup); fprintf(fd," zmmRes0 = _mm512_adds_epi16(zmmRes0, zmm0);\n"); - fprintf(fd," zmm1 = _mm512_cvtepi8_epi16(p_bnProcBuf[%d + j +1]);\n", k*cnOffsetInGroup); + fprintf(fd," zmm1 = _mm512_cvtepi8_epi16(p_bnProcBuf[%u + j +1]);\n", k*cnOffsetInGroup); fprintf(fd, " zmmRes1 = _mm512_adds_epi16(zmmRes1, zmm1); \n"); } @@ -1069,7 +1069,7 @@ fprintf(fd, "// Process group with 18 CNs \n"); cnOffsetInGroup = (lut_numBnInBnGroups[17]*NR_LDPC_ZMAX)>>5; // Set pointers to start of group 2 - fprintf(fd," p_bnProcBuf = (__m256i*) &bnProcBuf [%d];\n",lut_startAddrBnGroups[idxBnGroup]); + fprintf(fd," p_bnProcBuf = (__m256i*) &bnProcBuf [%u];\n",lut_startAddrBnGroups[idxBnGroup]); fprintf(fd," p_llrProcBuf = (__m256i*) &llrProcBuf [%d];\n",lut_startAddrBnGroupsLlr[idxBnGroup]); fprintf(fd," p_llrRes = (__m512i*) &llrRes [%d];\n",lut_startAddrBnGroupsLlr[idxBnGroup]); // Loop over BNs @@ -1081,10 +1081,10 @@ fprintf(fd, "// Process group with 18 CNs \n"); // Loop over CNs for (k=1; k<18; k++) { - fprintf(fd," zmm0 = _mm512_cvtepi8_epi16(p_bnProcBuf[%d + j]);\n", k*cnOffsetInGroup); + fprintf(fd," zmm0 = _mm512_cvtepi8_epi16(p_bnProcBuf[%u + j]);\n", k*cnOffsetInGroup); fprintf(fd," zmmRes0 = _mm512_adds_epi16(zmmRes0, zmm0);\n"); - fprintf(fd," zmm1 = _mm512_cvtepi8_epi16(p_bnProcBuf[%d + j +1]);\n", k*cnOffsetInGroup); + fprintf(fd," zmm1 = _mm512_cvtepi8_epi16(p_bnProcBuf[%u + j +1]);\n", k*cnOffsetInGroup); fprintf(fd, " zmmRes1 = _mm512_adds_epi16(zmmRes1, zmm1); \n"); } @@ -1124,7 +1124,7 @@ fprintf(fd, "// Process group with 19 CNs \n"); cnOffsetInGroup = (lut_numBnInBnGroups[18]*NR_LDPC_ZMAX)>>5; // Set pointers to start of group 2 - fprintf(fd," p_bnProcBuf = (__m256i*) &bnProcBuf [%d];\n",lut_startAddrBnGroups[idxBnGroup]); + fprintf(fd," p_bnProcBuf = (__m256i*) &bnProcBuf [%u];\n",lut_startAddrBnGroups[idxBnGroup]); fprintf(fd," p_llrProcBuf = (__m256i*) &llrProcBuf [%d];\n",lut_startAddrBnGroupsLlr[idxBnGroup]); fprintf(fd," p_llrRes = (__m512i*) &llrRes [%d];\n",lut_startAddrBnGroupsLlr[idxBnGroup]); // Loop over BNs @@ -1136,10 +1136,10 @@ fprintf(fd, "// Process group with 19 CNs \n"); // Loop over CNs for (k=1; k<19; k++) { - fprintf(fd," zmm0 = _mm512_cvtepi8_epi16(p_bnProcBuf[%d + j]);\n", k*cnOffsetInGroup); + fprintf(fd," zmm0 = _mm512_cvtepi8_epi16(p_bnProcBuf[%u + j]);\n", k*cnOffsetInGroup); fprintf(fd," zmmRes0 = _mm512_adds_epi16(zmmRes0, zmm0);\n"); - fprintf(fd," zmm1 = _mm512_cvtepi8_epi16(p_bnProcBuf[%d + j +1]);\n", k*cnOffsetInGroup); + fprintf(fd," zmm1 = _mm512_cvtepi8_epi16(p_bnProcBuf[%u + j +1]);\n", k*cnOffsetInGroup); fprintf(fd, " zmmRes1 = _mm512_adds_epi16(zmmRes1, zmm1); \n"); } @@ -1180,7 +1180,7 @@ fprintf(fd, "// Process group with 20 CNs \n"); cnOffsetInGroup = (lut_numBnInBnGroups[19]*NR_LDPC_ZMAX)>>5; // Set pointers to start of group 2 - fprintf(fd," p_bnProcBuf = (__m256i*) &bnProcBuf [%d];\n",lut_startAddrBnGroups[idxBnGroup]); + fprintf(fd," p_bnProcBuf = (__m256i*) &bnProcBuf [%u];\n",lut_startAddrBnGroups[idxBnGroup]); fprintf(fd," p_llrProcBuf = (__m256i*) &llrProcBuf [%d];\n",lut_startAddrBnGroupsLlr[idxBnGroup]); fprintf(fd," p_llrRes = (__m512i*) &llrRes [%d];\n",lut_startAddrBnGroupsLlr[idxBnGroup]); // Loop over BNs @@ -1192,10 +1192,10 @@ fprintf(fd, "// Process group with 20 CNs \n"); // Loop over CNs for (k=1; k<20; k++) { - fprintf(fd," zmm0 = _mm512_cvtepi8_epi16(p_bnProcBuf[%d + j]);\n", k*cnOffsetInGroup); + fprintf(fd," zmm0 = _mm512_cvtepi8_epi16(p_bnProcBuf[%u + j]);\n", k*cnOffsetInGroup); fprintf(fd," zmmRes0 = _mm512_adds_epi16(zmmRes0, zmm0);\n"); - fprintf(fd," zmm1 = _mm512_cvtepi8_epi16(p_bnProcBuf[%d + j +1]);\n", k*cnOffsetInGroup); + fprintf(fd," zmm1 = _mm512_cvtepi8_epi16(p_bnProcBuf[%u + j +1]);\n", k*cnOffsetInGroup); fprintf(fd, " zmmRes1 = _mm512_adds_epi16(zmmRes1, zmm1); \n"); } @@ -1240,7 +1240,7 @@ fprintf(fd, "// Process group with 21 CNs \n"); cnOffsetInGroup = (lut_numBnInBnGroups[20]*NR_LDPC_ZMAX)>>5; // Set pointers to start of group 2 - fprintf(fd," p_bnProcBuf = (__m256i*) &bnProcBuf [%d];\n",lut_startAddrBnGroups[idxBnGroup]); + fprintf(fd," p_bnProcBuf = (__m256i*) &bnProcBuf [%u];\n",lut_startAddrBnGroups[idxBnGroup]); fprintf(fd," p_llrProcBuf = (__m256i*) &llrProcBuf [%d];\n",lut_startAddrBnGroupsLlr[idxBnGroup]); fprintf(fd," p_llrRes = (__m512i*) &llrRes [%d];\n",lut_startAddrBnGroupsLlr[idxBnGroup]); // Loop over BNs @@ -1252,10 +1252,10 @@ fprintf(fd, "// Process group with 21 CNs \n"); // Loop over CNs for (k=1; k<21; k++) { - fprintf(fd," zmm0 = _mm512_cvtepi8_epi16(p_bnProcBuf[%d + j]);\n", k*cnOffsetInGroup); + fprintf(fd," zmm0 = _mm512_cvtepi8_epi16(p_bnProcBuf[%u + j]);\n", k*cnOffsetInGroup); fprintf(fd," zmmRes0 = _mm512_adds_epi16(zmmRes0, zmm0);\n"); - fprintf(fd," zmm1 = _mm512_cvtepi8_epi16(p_bnProcBuf[%d + j +1]);\n", k*cnOffsetInGroup); + fprintf(fd," zmm1 = _mm512_cvtepi8_epi16(p_bnProcBuf[%u + j +1]);\n", k*cnOffsetInGroup); fprintf(fd, " zmmRes1 = _mm512_adds_epi16(zmmRes1, zmm1); \n"); } @@ -1295,7 +1295,7 @@ fprintf(fd, "// Process group with 22 CNs \n"); cnOffsetInGroup = (lut_numBnInBnGroups[21]*NR_LDPC_ZMAX)>>5; // Set pointers to start of group 2 - fprintf(fd," p_bnProcBuf = (__m256i*) &bnProcBuf [%d];\n",lut_startAddrBnGroups[idxBnGroup]); + fprintf(fd," p_bnProcBuf = (__m256i*) &bnProcBuf [%u];\n",lut_startAddrBnGroups[idxBnGroup]); fprintf(fd," p_llrProcBuf = (__m256i*) &llrProcBuf [%d];\n",lut_startAddrBnGroupsLlr[idxBnGroup]); fprintf(fd," p_llrRes = (__m512i*) &llrRes [%d];\n",lut_startAddrBnGroupsLlr[idxBnGroup]); // Loop over BNs @@ -1307,10 +1307,10 @@ fprintf(fd, "// Process group with 22 CNs \n"); // Loop over CNs for (k=1; k<22; k++) { - fprintf(fd," zmm0 = _mm512_cvtepi8_epi16(p_bnProcBuf[%d + j]);\n", k*cnOffsetInGroup); + fprintf(fd," zmm0 = _mm512_cvtepi8_epi16(p_bnProcBuf[%u + j]);\n", k*cnOffsetInGroup); fprintf(fd," zmmRes0 = _mm512_adds_epi16(zmmRes0, zmm0);\n"); - fprintf(fd," zmm1 = _mm512_cvtepi8_epi16(p_bnProcBuf[%d + j +1]);\n", k*cnOffsetInGroup); + fprintf(fd," zmm1 = _mm512_cvtepi8_epi16(p_bnProcBuf[%u + j +1]);\n", k*cnOffsetInGroup); fprintf(fd, " zmmRes1 = _mm512_adds_epi16(zmmRes1, zmm1); \n"); } @@ -1351,7 +1351,7 @@ fprintf(fd, "// Process group with <23 CNs \n"); cnOffsetInGroup = (lut_numBnInBnGroups[22]*NR_LDPC_ZMAX)>>5; // Set pointers to start of group 2 - fprintf(fd," p_bnProcBuf = (__m256i*) &bnProcBuf [%d];\n",lut_startAddrBnGroups[idxBnGroup]); + fprintf(fd," p_bnProcBuf = (__m256i*) &bnProcBuf [%u];\n",lut_startAddrBnGroups[idxBnGroup]); fprintf(fd," p_llrProcBuf = (__m256i*) &llrProcBuf [%d];\n",lut_startAddrBnGroupsLlr[idxBnGroup]); fprintf(fd," p_llrRes = (__m512i*) &llrRes [%d];\n",lut_startAddrBnGroupsLlr[idxBnGroup]); // Loop over BNs @@ -1363,10 +1363,10 @@ fprintf(fd, "// Process group with <23 CNs \n"); // Loop over CNs for (k=1; k<23; k++) { - fprintf(fd," zmm0 = _mm512_cvtepi8_epi16(p_bnProcBuf[%d + j]);\n", k*cnOffsetInGroup); + fprintf(fd," zmm0 = _mm512_cvtepi8_epi16(p_bnProcBuf[%u + j]);\n", k*cnOffsetInGroup); fprintf(fd," zmmRes0 = _mm512_adds_epi16(zmmRes0, zmm0);\n"); - fprintf(fd," zmm1 = _mm512_cvtepi8_epi16(p_bnProcBuf[%d + j +1]);\n", k*cnOffsetInGroup); + fprintf(fd," zmm1 = _mm512_cvtepi8_epi16(p_bnProcBuf[%u + j +1]);\n", k*cnOffsetInGroup); fprintf(fd," zmmRes1 = _mm512_adds_epi16(zmmRes1, zmm1); \n"); } @@ -1408,7 +1408,7 @@ fprintf(fd, "// Process group with 24 CNs \n"); cnOffsetInGroup = (lut_numBnInBnGroups[23]*NR_LDPC_ZMAX)>>5; // Set pointers to start of group 2 - fprintf(fd," p_bnProcBuf = (__m256i*) &bnProcBuf [%d];\n",lut_startAddrBnGroups[idxBnGroup]); + fprintf(fd," p_bnProcBuf = (__m256i*) &bnProcBuf [%u];\n",lut_startAddrBnGroups[idxBnGroup]); fprintf(fd," p_llrProcBuf = (__m256i*) &llrProcBuf [%d];\n",lut_startAddrBnGroupsLlr[idxBnGroup]); fprintf(fd," p_llrRes = (__m512i*) &llrRes [%d];\n",lut_startAddrBnGroupsLlr[idxBnGroup]); // Loop over BNs @@ -1420,10 +1420,10 @@ fprintf(fd, "// Process group with 24 CNs \n"); // Loop over CNs for (k=1; k<24; k++) { - fprintf(fd," zmm0 = _mm512_cvtepi8_epi16(p_bnProcBuf[%d + j]);\n", k*cnOffsetInGroup); + fprintf(fd," zmm0 = _mm512_cvtepi8_epi16(p_bnProcBuf[%u + j]);\n", k*cnOffsetInGroup); fprintf(fd," zmmRes0 = _mm512_adds_epi16(zmmRes0, zmm0);\n"); - fprintf(fd," zmm1 = _mm512_cvtepi8_epi16(p_bnProcBuf[%d + j +1]);\n", k*cnOffsetInGroup); + fprintf(fd," zmm1 = _mm512_cvtepi8_epi16(p_bnProcBuf[%u + j +1]);\n", k*cnOffsetInGroup); fprintf(fd, " zmmRes1 = _mm512_adds_epi16(zmmRes1, zmm1); \n"); } @@ -1464,7 +1464,7 @@ fprintf(fd, "// Process group with 25 CNs \n"); cnOffsetInGroup = (lut_numBnInBnGroups[24]*NR_LDPC_ZMAX)>>5; // Set pointers to start of group 2 - fprintf(fd," p_bnProcBuf = (__m256i*) &bnProcBuf [%d];\n",lut_startAddrBnGroups[idxBnGroup]); + fprintf(fd," p_bnProcBuf = (__m256i*) &bnProcBuf [%u];\n",lut_startAddrBnGroups[idxBnGroup]); fprintf(fd," p_llrProcBuf = (__m256i*) &llrProcBuf [%d];\n",lut_startAddrBnGroupsLlr[idxBnGroup]); fprintf(fd," p_llrRes = (__m512i*) &llrRes [%d];\n",lut_startAddrBnGroupsLlr[idxBnGroup]); // Loop over BNs @@ -1476,10 +1476,10 @@ fprintf(fd, "// Process group with 25 CNs \n"); // Loop over CNs for (k=1; k<25; k++) { - fprintf(fd," zmm0 = _mm512_cvtepi8_epi16(p_bnProcBuf[%d + j]);\n", k*cnOffsetInGroup); + fprintf(fd," zmm0 = _mm512_cvtepi8_epi16(p_bnProcBuf[%u + j]);\n", k*cnOffsetInGroup); fprintf(fd," zmmRes0 = _mm512_adds_epi16(zmmRes0, zmm0);\n"); - fprintf(fd," zmm1 = _mm512_cvtepi8_epi16(p_bnProcBuf[%d + j +1]);\n", k*cnOffsetInGroup); + fprintf(fd," zmm1 = _mm512_cvtepi8_epi16(p_bnProcBuf[%u + j +1]);\n", k*cnOffsetInGroup); fprintf(fd, " zmmRes1 = _mm512_adds_epi16(zmmRes1, zmm1); \n"); } @@ -1521,7 +1521,7 @@ fprintf(fd, "// Process group with 26 CNs \n"); cnOffsetInGroup = (lut_numBnInBnGroups[25]*NR_LDPC_ZMAX)>>5; // Set pointers to start of group 2 - fprintf(fd," p_bnProcBuf = (__m256i*) &bnProcBuf [%d];\n",lut_startAddrBnGroups[idxBnGroup]); + fprintf(fd," p_bnProcBuf = (__m256i*) &bnProcBuf [%u];\n",lut_startAddrBnGroups[idxBnGroup]); fprintf(fd," p_llrProcBuf = (__m256i*) &llrProcBuf [%d];\n",lut_startAddrBnGroupsLlr[idxBnGroup]); fprintf(fd," p_llrRes = (__m512i*) &llrRes [%d];\n",lut_startAddrBnGroupsLlr[idxBnGroup]); // Loop over BNs @@ -1533,10 +1533,10 @@ fprintf(fd, "// Process group with 26 CNs \n"); // Loop over CNs for (k=1; k<26; k++) { - fprintf(fd," zmm0 = _mm512_cvtepi8_epi16(p_bnProcBuf[%d + j]);\n", k*cnOffsetInGroup); + fprintf(fd," zmm0 = _mm512_cvtepi8_epi16(p_bnProcBuf[%u + j]);\n", k*cnOffsetInGroup); fprintf(fd," zmmRes0 = _mm512_adds_epi16(zmmRes0, zmm0);\n"); - fprintf(fd," zmm1 = _mm512_cvtepi8_epi16(p_bnProcBuf[%d + j +1]);\n", k*cnOffsetInGroup); + fprintf(fd," zmm1 = _mm512_cvtepi8_epi16(p_bnProcBuf[%u + j +1]);\n", k*cnOffsetInGroup); fprintf(fd, " zmmRes1 = _mm512_adds_epi16(zmmRes1, zmm1); \n"); } @@ -1577,7 +1577,7 @@ fprintf(fd, "// Process group with 27 CNs \n"); cnOffsetInGroup = (lut_numBnInBnGroups[26]*NR_LDPC_ZMAX)>>5; // Set pointers to start of group 2 - fprintf(fd," p_bnProcBuf = (__m256i*) &bnProcBuf [%d];\n",lut_startAddrBnGroups[idxBnGroup]); + fprintf(fd," p_bnProcBuf = (__m256i*) &bnProcBuf [%u];\n",lut_startAddrBnGroups[idxBnGroup]); fprintf(fd," p_llrProcBuf = (__m256i*) &llrProcBuf [%d];\n",lut_startAddrBnGroupsLlr[idxBnGroup]); fprintf(fd," p_llrRes = (__m512i*) &llrRes [%d];\n",lut_startAddrBnGroupsLlr[idxBnGroup]); // Loop over BNs @@ -1589,10 +1589,10 @@ fprintf(fd, "// Process group with 27 CNs \n"); // Loop over CNs for (k=1; k<27; k++) { - fprintf(fd," zmm0 = _mm512_cvtepi8_epi16(p_bnProcBuf[%d + j]);\n", k*cnOffsetInGroup); + fprintf(fd," zmm0 = _mm512_cvtepi8_epi16(p_bnProcBuf[%u + j]);\n", k*cnOffsetInGroup); fprintf(fd," zmmRes0 = _mm512_adds_epi16(zmmRes0, zmm0);\n"); - fprintf(fd," zmm1 = _mm512_cvtepi8_epi16(p_bnProcBuf[%d + j +1]);\n", k*cnOffsetInGroup); + fprintf(fd," zmm1 = _mm512_cvtepi8_epi16(p_bnProcBuf[%u + j +1]);\n", k*cnOffsetInGroup); fprintf(fd, " zmmRes1 = _mm512_adds_epi16(zmmRes1, zmm1); \n"); } @@ -1633,7 +1633,7 @@ fprintf(fd, "// Process group with 28 CNs \n"); cnOffsetInGroup = (lut_numBnInBnGroups[27]*NR_LDPC_ZMAX)>>5; // Set pointers to start of group 2 - fprintf(fd," p_bnProcBuf = (__m256i*) &bnProcBuf [%d];\n",lut_startAddrBnGroups[idxBnGroup]); + fprintf(fd," p_bnProcBuf = (__m256i*) &bnProcBuf [%u];\n",lut_startAddrBnGroups[idxBnGroup]); fprintf(fd," p_llrProcBuf = (__m256i*) &llrProcBuf [%d];\n",lut_startAddrBnGroupsLlr[idxBnGroup]); fprintf(fd," p_llrRes = (__m512i*) &llrRes [%d];\n",lut_startAddrBnGroupsLlr[idxBnGroup]); // Loop over BNs @@ -1645,10 +1645,10 @@ fprintf(fd, "// Process group with 28 CNs \n"); // Loop over CNs for (k=1; k<28; k++) { - fprintf(fd," zmm0 = _mm512_cvtepi8_epi16(p_bnProcBuf[%d + j]);\n", k*cnOffsetInGroup); + fprintf(fd," zmm0 = _mm512_cvtepi8_epi16(p_bnProcBuf[%u + j]);\n", k*cnOffsetInGroup); fprintf(fd," zmmRes0 = _mm512_adds_epi16(zmmRes0, zmm0);\n"); - fprintf(fd," zmm1 = _mm512_cvtepi8_epi16(p_bnProcBuf[%d + j +1]);\n", k*cnOffsetInGroup); + fprintf(fd," zmm1 = _mm512_cvtepi8_epi16(p_bnProcBuf[%u + j +1]);\n", k*cnOffsetInGroup); fprintf(fd, " zmmRes1 = _mm512_adds_epi16(zmmRes1, zmm1); \n"); } @@ -1688,7 +1688,7 @@ fprintf(fd, "// Process group with 29 CNs \n"); cnOffsetInGroup = (lut_numBnInBnGroups[28]*NR_LDPC_ZMAX)>>5; // Set pointers to start of group 2 - fprintf(fd," p_bnProcBuf = (__m256i*) &bnProcBuf [%d];\n",lut_startAddrBnGroups[idxBnGroup]); + fprintf(fd," p_bnProcBuf = (__m256i*) &bnProcBuf [%u];\n",lut_startAddrBnGroups[idxBnGroup]); fprintf(fd," p_llrProcBuf = (__m256i*) &llrProcBuf [%d];\n",lut_startAddrBnGroupsLlr[idxBnGroup]); fprintf(fd," p_llrRes = (__m512i*) &llrRes [%d];\n",lut_startAddrBnGroupsLlr[idxBnGroup]); // Loop over BNs @@ -1700,10 +1700,10 @@ fprintf(fd, "// Process group with 29 CNs \n"); // Loop over CNs for (k=1; k<29; k++) { - fprintf(fd," zmm0 = _mm512_cvtepi8_epi16(p_bnProcBuf[%d + j]);\n", k*cnOffsetInGroup); + fprintf(fd," zmm0 = _mm512_cvtepi8_epi16(p_bnProcBuf[%u + j]);\n", k*cnOffsetInGroup); fprintf(fd," zmmRes0 = _mm512_adds_epi16(zmmRes0, zmm0);\n"); - fprintf(fd," zmm1 = _mm512_cvtepi8_epi16(p_bnProcBuf[%d + j +1]);\n", k*cnOffsetInGroup); + fprintf(fd," zmm1 = _mm512_cvtepi8_epi16(p_bnProcBuf[%u + j +1]);\n", k*cnOffsetInGroup); fprintf(fd, " zmmRes1 = _mm512_adds_epi16(zmmRes1, zmm1); \n"); } @@ -1744,7 +1744,7 @@ fprintf(fd, "// Process group with 30 CNs \n"); cnOffsetInGroup = (lut_numBnInBnGroups[29]*NR_LDPC_ZMAX)>>5; // Set pointers to start of group 2 - fprintf(fd," p_bnProcBuf = (__m256i*) &bnProcBuf [%d];\n",lut_startAddrBnGroups[idxBnGroup]); + fprintf(fd," p_bnProcBuf = (__m256i*) &bnProcBuf [%u];\n",lut_startAddrBnGroups[idxBnGroup]); fprintf(fd," p_llrProcBuf = (__m256i*) &llrProcBuf [%d];\n",lut_startAddrBnGroupsLlr[idxBnGroup]); fprintf(fd," p_llrRes = (__m512i*) &llrRes [%d];\n",lut_startAddrBnGroupsLlr[idxBnGroup]); // Loop over BNs @@ -1756,10 +1756,10 @@ fprintf(fd, "// Process group with 30 CNs \n"); // Loop over CNs for (k=1; k<30; k++) { - fprintf(fd," zmm0 = _mm512_cvtepi8_epi16(p_bnProcBuf[%d + j]);\n", k*cnOffsetInGroup); + fprintf(fd," zmm0 = _mm512_cvtepi8_epi16(p_bnProcBuf[%u + j]);\n", k*cnOffsetInGroup); fprintf(fd," zmmRes0 = _mm512_adds_epi16(zmmRes0, zmm0);\n"); - fprintf(fd," zmm1 = _mm512_cvtepi8_epi16(p_bnProcBuf[%d + j +1]);\n", k*cnOffsetInGroup); + fprintf(fd," zmm1 = _mm512_cvtepi8_epi16(p_bnProcBuf[%u + j +1]);\n", k*cnOffsetInGroup); fprintf(fd, " zmmRes1 = _mm512_adds_epi16(zmmRes1, zmm1); \n"); } diff --git a/openair1/PHY/CODING/nrLDPC_decoder/nrLDPC_tools/generator_bnProc_avx512/bnProcPc_gen_BG2_avx512.c b/openair1/PHY/CODING/nrLDPC_decoder/nrLDPC_tools/generator_bnProc_avx512/bnProcPc_gen_BG2_avx512.c index b63c1ced8b991a50e39b059b801501d441728e2e..93584246e822abd07db84f53681d13e89bb9cbaf 100644 --- a/openair1/PHY/CODING/nrLDPC_decoder/nrLDPC_tools/generator_bnProc_avx512/bnProcPc_gen_BG2_avx512.c +++ b/openair1/PHY/CODING/nrLDPC_decoder/nrLDPC_tools/generator_bnProc_avx512/bnProcPc_gen_BG2_avx512.c @@ -105,7 +105,7 @@ fprintf(fd, "// Process group with 1 CNs \n"); cnOffsetInGroup = (lut_numBnInBnGroups[0]*NR_LDPC_ZMAX)>>5; // Set pointers to start of group 2 - fprintf(fd," p_bnProcBuf = (__m256i*) &bnProcBuf [%d];\n",lut_startAddrBnGroups[idxBnGroup]); + fprintf(fd," p_bnProcBuf = (__m256i*) &bnProcBuf [%u];\n",lut_startAddrBnGroups[idxBnGroup]); fprintf(fd," p_llrProcBuf = (__m256i*) &llrProcBuf [%d];\n",lut_startAddrBnGroupsLlr[idxBnGroup]); fprintf(fd," p_llrRes = (__m512i*) &llrRes [%d];\n",lut_startAddrBnGroupsLlr[idxBnGroup]); @@ -162,7 +162,7 @@ fprintf(fd, "// Process group with 2 CNs \n"); cnOffsetInGroup = (lut_numBnInBnGroups[1]*NR_LDPC_ZMAX)>>5; // Set pointers to start of group 2 - fprintf(fd," p_bnProcBuf = (__m256i*) &bnProcBuf [%d];\n",lut_startAddrBnGroups[idxBnGroup]); + fprintf(fd," p_bnProcBuf = (__m256i*) &bnProcBuf [%u];\n",lut_startAddrBnGroups[idxBnGroup]); fprintf(fd," p_llrProcBuf = (__m256i*) &llrProcBuf [%d];\n",lut_startAddrBnGroupsLlr[idxBnGroup]); fprintf(fd," p_llrRes = (__m512i*) &llrRes [%d];\n",lut_startAddrBnGroupsLlr[idxBnGroup]); @@ -175,10 +175,10 @@ fprintf(fd, "// Process group with 2 CNs \n"); // Loop over CNs for (k=1; k<2; k++) { - fprintf(fd," zmm0 = _mm512_cvtepi8_epi16(p_bnProcBuf[%d + j]);\n", k*cnOffsetInGroup); + fprintf(fd," zmm0 = _mm512_cvtepi8_epi16(p_bnProcBuf[%u + j]);\n", k*cnOffsetInGroup); fprintf(fd," zmmRes0 = _mm512_adds_epi16(zmmRes0,zmm0);\n"); - fprintf(fd," zmm1 = _mm512_cvtepi8_epi16(p_bnProcBuf[%d + j +1]);\n", k*cnOffsetInGroup); + fprintf(fd," zmm1 = _mm512_cvtepi8_epi16(p_bnProcBuf[%u + j +1]);\n", k*cnOffsetInGroup); fprintf(fd, " zmmRes1 = _mm512_adds_epi16(zmmRes1,zmm1); \n"); } @@ -220,7 +220,7 @@ fprintf(fd, "// Process group with 3 CNs \n"); cnOffsetInGroup = (lut_numBnInBnGroups[2]*NR_LDPC_ZMAX)>>5; // Set pointers to start of group 2 - fprintf(fd," p_bnProcBuf = (__m256i*) &bnProcBuf [%d];\n",lut_startAddrBnGroups[idxBnGroup]); + fprintf(fd," p_bnProcBuf = (__m256i*) &bnProcBuf [%u];\n",lut_startAddrBnGroups[idxBnGroup]); fprintf(fd," p_llrProcBuf = (__m256i*) &llrProcBuf [%d];\n",lut_startAddrBnGroupsLlr[idxBnGroup]); fprintf(fd," p_llrRes = (__m512i*) &llrRes [%d];\n",lut_startAddrBnGroupsLlr[idxBnGroup]); // Loop over BNs @@ -232,10 +232,10 @@ fprintf(fd, "// Process group with 3 CNs \n"); // Loop over CNs for (k=1; k<3; k++) { - fprintf(fd," zmm0 = _mm512_cvtepi8_epi16(p_bnProcBuf[%d + j]);\n", k*cnOffsetInGroup); + fprintf(fd," zmm0 = _mm512_cvtepi8_epi16(p_bnProcBuf[%u + j]);\n", k*cnOffsetInGroup); fprintf(fd," zmmRes0 = _mm512_adds_epi16(zmmRes0,zmm0);\n"); - fprintf(fd," zmm1 = _mm512_cvtepi8_epi16(p_bnProcBuf[%d + j +1]);\n", k*cnOffsetInGroup); + fprintf(fd," zmm1 = _mm512_cvtepi8_epi16(p_bnProcBuf[%u + j +1]);\n", k*cnOffsetInGroup); fprintf(fd," zmmRes1 = _mm512_adds_epi16(zmmRes1,zmm1); \n"); } @@ -276,7 +276,7 @@ fprintf(fd, "// Process group with 4 CNs \n"); cnOffsetInGroup = (lut_numBnInBnGroups[3]*NR_LDPC_ZMAX)>>5; // Set pointers to start of group 2 - fprintf(fd," p_bnProcBuf = (__m256i*) &bnProcBuf [%d];\n",lut_startAddrBnGroups[idxBnGroup]); + fprintf(fd," p_bnProcBuf = (__m256i*) &bnProcBuf [%u];\n",lut_startAddrBnGroups[idxBnGroup]); fprintf(fd," p_llrProcBuf = (__m256i*) &llrProcBuf [%d];\n",lut_startAddrBnGroupsLlr[idxBnGroup]); fprintf(fd," p_llrRes = (__m512i*) &llrRes [%d];\n",lut_startAddrBnGroupsLlr[idxBnGroup]); @@ -289,10 +289,10 @@ fprintf(fd, "// Process group with 4 CNs \n"); // Loop over CNs for (k=1; k<4; k++) { - fprintf(fd," zmm0 = _mm512_cvtepi8_epi16(p_bnProcBuf[%d + j]);\n", k*cnOffsetInGroup); + fprintf(fd," zmm0 = _mm512_cvtepi8_epi16(p_bnProcBuf[%u + j]);\n", k*cnOffsetInGroup); fprintf(fd," zmmRes0 = _mm512_adds_epi16(zmmRes0,zmm0);\n"); - fprintf(fd," zmm1 = _mm512_cvtepi8_epi16(p_bnProcBuf[%d + j +1]);\n", k*cnOffsetInGroup); + fprintf(fd," zmm1 = _mm512_cvtepi8_epi16(p_bnProcBuf[%u + j +1]);\n", k*cnOffsetInGroup); fprintf(fd, " zmmRes1 = _mm512_adds_epi16(zmmRes1,zmm1); \n"); } @@ -333,7 +333,7 @@ fprintf(fd, "// Process group with 5 CNs \n"); cnOffsetInGroup = (lut_numBnInBnGroups[4]*NR_LDPC_ZMAX)>>5; // Set pointers to start of group 2 - fprintf(fd," p_bnProcBuf = (__m256i*) &bnProcBuf [%d];\n",lut_startAddrBnGroups[idxBnGroup]); + fprintf(fd," p_bnProcBuf = (__m256i*) &bnProcBuf [%u];\n",lut_startAddrBnGroups[idxBnGroup]); fprintf(fd," p_llrProcBuf = (__m256i*) &llrProcBuf [%d];\n",lut_startAddrBnGroupsLlr[idxBnGroup]); fprintf(fd," p_llrRes = (__m512i*) &llrRes [%d];\n",lut_startAddrBnGroupsLlr[idxBnGroup]); // Loop over BNs @@ -345,10 +345,10 @@ fprintf(fd, "// Process group with 5 CNs \n"); // Loop over CNs for (k=1; k<5; k++) { - fprintf(fd," zmm0 = _mm512_cvtepi8_epi16(p_bnProcBuf[%d + j]);\n", k*cnOffsetInGroup); + fprintf(fd," zmm0 = _mm512_cvtepi8_epi16(p_bnProcBuf[%u + j]);\n", k*cnOffsetInGroup); fprintf(fd," zmmRes0 = _mm512_adds_epi16(zmmRes0,zmm0);\n"); - fprintf(fd," zmm1 = _mm512_cvtepi8_epi16(p_bnProcBuf[%d + j +1]);\n", k*cnOffsetInGroup); + fprintf(fd," zmm1 = _mm512_cvtepi8_epi16(p_bnProcBuf[%u + j +1]);\n", k*cnOffsetInGroup); fprintf(fd, " zmmRes1 = _mm512_adds_epi16(zmmRes1,zmm1); \n"); } @@ -390,7 +390,7 @@ fprintf(fd, "// Process group with 6 CNs \n"); cnOffsetInGroup = (lut_numBnInBnGroups[5]*NR_LDPC_ZMAX)>>5; // Set pointers to start of group 2 - fprintf(fd," p_bnProcBuf = (__m256i*) &bnProcBuf [%d];\n",lut_startAddrBnGroups[idxBnGroup]); + fprintf(fd," p_bnProcBuf = (__m256i*) &bnProcBuf [%u];\n",lut_startAddrBnGroups[idxBnGroup]); fprintf(fd," p_llrProcBuf = (__m256i*) &llrProcBuf [%d];\n",lut_startAddrBnGroupsLlr[idxBnGroup]); fprintf(fd," p_llrRes = (__m512i*) &llrRes [%d];\n",lut_startAddrBnGroupsLlr[idxBnGroup]); // Loop over BNs @@ -402,10 +402,10 @@ fprintf(fd, "// Process group with 6 CNs \n"); // Loop over CNs for (k=1; k<6; k++) { - fprintf(fd," zmm0 = _mm512_cvtepi8_epi16(p_bnProcBuf[%d + j]);\n", k*cnOffsetInGroup); + fprintf(fd," zmm0 = _mm512_cvtepi8_epi16(p_bnProcBuf[%u + j]);\n", k*cnOffsetInGroup); fprintf(fd," zmmRes0 = _mm512_adds_epi16(zmmRes0,zmm0);\n"); - fprintf(fd," zmm1 = _mm512_cvtepi8_epi16(p_bnProcBuf[%d + j +1]);\n", k*cnOffsetInGroup); + fprintf(fd," zmm1 = _mm512_cvtepi8_epi16(p_bnProcBuf[%u + j +1]);\n", k*cnOffsetInGroup); fprintf(fd, " zmmRes1 = _mm512_adds_epi16(zmmRes1,zmm1); \n"); } @@ -446,7 +446,7 @@ fprintf(fd, "// Process group with 7 CNs \n"); cnOffsetInGroup = (lut_numBnInBnGroups[6]*NR_LDPC_ZMAX)>>5; // Set pointers to start of group 2 - fprintf(fd," p_bnProcBuf = (__m256i*) &bnProcBuf [%d];\n",lut_startAddrBnGroups[idxBnGroup]); + fprintf(fd," p_bnProcBuf = (__m256i*) &bnProcBuf [%u];\n",lut_startAddrBnGroups[idxBnGroup]); fprintf(fd," p_llrProcBuf = (__m256i*) &llrProcBuf [%d];\n",lut_startAddrBnGroupsLlr[idxBnGroup]); fprintf(fd," p_llrRes = (__m512i*) &llrRes [%d];\n",lut_startAddrBnGroupsLlr[idxBnGroup]); // Loop over BNs @@ -458,10 +458,10 @@ fprintf(fd, "// Process group with 7 CNs \n"); // Loop over CNs for (k=1; k<7; k++) { - fprintf(fd," zmm0 = _mm512_cvtepi8_epi16(p_bnProcBuf[%d + j]);\n", k*cnOffsetInGroup); + fprintf(fd," zmm0 = _mm512_cvtepi8_epi16(p_bnProcBuf[%u + j]);\n", k*cnOffsetInGroup); fprintf(fd," zmmRes0 = _mm512_adds_epi16(zmmRes0,zmm0);\n"); - fprintf(fd," zmm1 = _mm512_cvtepi8_epi16(p_bnProcBuf[%d + j +1]);\n", k*cnOffsetInGroup); + fprintf(fd," zmm1 = _mm512_cvtepi8_epi16(p_bnProcBuf[%u + j +1]);\n", k*cnOffsetInGroup); fprintf(fd, " zmmRes1 = _mm512_adds_epi16(zmmRes1,zmm1); \n"); } @@ -503,7 +503,7 @@ fprintf(fd, "// Process group with 8 CNs \n"); cnOffsetInGroup = (lut_numBnInBnGroups[7]*NR_LDPC_ZMAX)>>5; // Set pointers to start of group 2 - fprintf(fd," p_bnProcBuf = (__m256i*) &bnProcBuf [%d];\n",lut_startAddrBnGroups[idxBnGroup]); + fprintf(fd," p_bnProcBuf = (__m256i*) &bnProcBuf [%u];\n",lut_startAddrBnGroups[idxBnGroup]); fprintf(fd," p_llrProcBuf = (__m256i*) &llrProcBuf [%d];\n",lut_startAddrBnGroupsLlr[idxBnGroup]); fprintf(fd," p_llrRes = (__m512i*) &llrRes [%d];\n",lut_startAddrBnGroupsLlr[idxBnGroup]); // Loop over BNs @@ -515,10 +515,10 @@ fprintf(fd, "// Process group with 8 CNs \n"); // Loop over CNs for (k=1; k<8; k++) { - fprintf(fd," zmm0 = _mm512_cvtepi8_epi16(p_bnProcBuf[%d + j]);\n", k*cnOffsetInGroup); + fprintf(fd," zmm0 = _mm512_cvtepi8_epi16(p_bnProcBuf[%u + j]);\n", k*cnOffsetInGroup); fprintf(fd," zmmRes0 = _mm512_adds_epi16(zmmRes0,zmm0);\n"); - fprintf(fd," zmm1 = _mm512_cvtepi8_epi16(p_bnProcBuf[%d + j +1]);\n", k*cnOffsetInGroup); + fprintf(fd," zmm1 = _mm512_cvtepi8_epi16(p_bnProcBuf[%u + j +1]);\n", k*cnOffsetInGroup); fprintf(fd, " zmmRes1 = _mm512_adds_epi16(zmmRes1,zmm1); \n"); } @@ -560,7 +560,7 @@ fprintf(fd, "// Process group with 9 CNs \n"); cnOffsetInGroup = (lut_numBnInBnGroups[8]*NR_LDPC_ZMAX)>>5; // Set pointers to start of group 2 - fprintf(fd," p_bnProcBuf = (__m256i*) &bnProcBuf [%d];\n",lut_startAddrBnGroups[idxBnGroup]); + fprintf(fd," p_bnProcBuf = (__m256i*) &bnProcBuf [%u];\n",lut_startAddrBnGroups[idxBnGroup]); fprintf(fd," p_llrProcBuf = (__m256i*) &llrProcBuf [%d];\n",lut_startAddrBnGroupsLlr[idxBnGroup]); fprintf(fd," p_llrRes = (__m512i*) &llrRes [%d];\n",lut_startAddrBnGroupsLlr[idxBnGroup]); // Loop over BNs @@ -572,10 +572,10 @@ fprintf(fd, "// Process group with 9 CNs \n"); // Loop over CNs for (k=1; k<9; k++) { - fprintf(fd," zmm0 = _mm512_cvtepi8_epi16(p_bnProcBuf[%d + j]);\n", k*cnOffsetInGroup); + fprintf(fd," zmm0 = _mm512_cvtepi8_epi16(p_bnProcBuf[%u + j]);\n", k*cnOffsetInGroup); fprintf(fd," zmmRes0 = _mm512_adds_epi16(zmmRes0,zmm0);\n"); - fprintf(fd," zmm1 = _mm512_cvtepi8_epi16(p_bnProcBuf[%d + j +1]);\n", k*cnOffsetInGroup); + fprintf(fd," zmm1 = _mm512_cvtepi8_epi16(p_bnProcBuf[%u + j +1]);\n", k*cnOffsetInGroup); fprintf(fd, " zmmRes1 = _mm512_adds_epi16(zmmRes1,zmm1); \n"); } @@ -617,7 +617,7 @@ fprintf(fd, "// Process group with 10 CNs \n"); cnOffsetInGroup = (lut_numBnInBnGroups[9]*NR_LDPC_ZMAX)>>5; // Set pointers to start of group 2 - fprintf(fd," p_bnProcBuf = (__m256i*) &bnProcBuf [%d];\n",lut_startAddrBnGroups[idxBnGroup]); + fprintf(fd," p_bnProcBuf = (__m256i*) &bnProcBuf [%u];\n",lut_startAddrBnGroups[idxBnGroup]); fprintf(fd," p_llrProcBuf = (__m256i*) &llrProcBuf [%d];\n",lut_startAddrBnGroupsLlr[idxBnGroup]); fprintf(fd," p_llrRes = (__m512i*) &llrRes [%d];\n",lut_startAddrBnGroupsLlr[idxBnGroup]); // Loop over BNs @@ -629,10 +629,10 @@ fprintf(fd, "// Process group with 10 CNs \n"); // Loop over CNs for (k=1; k<10; k++) { - fprintf(fd," zmm0 = _mm512_cvtepi8_epi16(p_bnProcBuf[%d + j]);\n", k*cnOffsetInGroup); + fprintf(fd," zmm0 = _mm512_cvtepi8_epi16(p_bnProcBuf[%u + j]);\n", k*cnOffsetInGroup); fprintf(fd," zmmRes0 = _mm512_adds_epi16(zmmRes0,zmm0);\n"); - fprintf(fd," zmm1 = _mm512_cvtepi8_epi16(p_bnProcBuf[%d + j +1]);\n", k*cnOffsetInGroup); + fprintf(fd," zmm1 = _mm512_cvtepi8_epi16(p_bnProcBuf[%u + j +1]);\n", k*cnOffsetInGroup); fprintf(fd, " zmmRes1 = _mm512_adds_epi16(zmmRes1,zmm1); \n"); } @@ -675,7 +675,7 @@ fprintf(fd, "// Process group with 11 CNs \n"); cnOffsetInGroup = (lut_numBnInBnGroups[10]*NR_LDPC_ZMAX)>>5; // Set pointers to start of group 2 - fprintf(fd," p_bnProcBuf = (__m256i*) &bnProcBuf [%d];\n",lut_startAddrBnGroups[idxBnGroup]); + fprintf(fd," p_bnProcBuf = (__m256i*) &bnProcBuf [%u];\n",lut_startAddrBnGroups[idxBnGroup]); fprintf(fd," p_llrProcBuf = (__m256i*) &llrProcBuf [%d];\n",lut_startAddrBnGroupsLlr[idxBnGroup]); fprintf(fd," p_llrRes = (__m512i*) &llrRes [%d];\n",lut_startAddrBnGroupsLlr[idxBnGroup]); // Loop over BNs @@ -687,10 +687,10 @@ fprintf(fd, "// Process group with 11 CNs \n"); // Loop over CNs for (k=1; k<11; k++) { - fprintf(fd," zmm0 = _mm512_cvtepi8_epi16(p_bnProcBuf[%d + j]);\n", k*cnOffsetInGroup); + fprintf(fd," zmm0 = _mm512_cvtepi8_epi16(p_bnProcBuf[%u + j]);\n", k*cnOffsetInGroup); fprintf(fd," zmmRes0 = _mm512_adds_epi16(zmmRes0,zmm0);\n"); - fprintf(fd," zmm1 = _mm512_cvtepi8_epi16(p_bnProcBuf[%d + j +1]);\n", k*cnOffsetInGroup); + fprintf(fd," zmm1 = _mm512_cvtepi8_epi16(p_bnProcBuf[%u + j +1]);\n", k*cnOffsetInGroup); fprintf(fd, " zmmRes1 = _mm512_adds_epi16(zmmRes1,zmm1); \n"); } @@ -730,7 +730,7 @@ fprintf(fd, "// Process group with 12 CNs \n"); cnOffsetInGroup = (lut_numBnInBnGroups[11]*NR_LDPC_ZMAX)>>5; // Set pointers to start of group 2 - fprintf(fd," p_bnProcBuf = (__m256i*) &bnProcBuf [%d];\n",lut_startAddrBnGroups[idxBnGroup]); + fprintf(fd," p_bnProcBuf = (__m256i*) &bnProcBuf [%u];\n",lut_startAddrBnGroups[idxBnGroup]); fprintf(fd," p_llrProcBuf = (__m256i*) &llrProcBuf [%d];\n",lut_startAddrBnGroupsLlr[idxBnGroup]); fprintf(fd," p_llrRes = (__m512i*) &llrRes [%d];\n",lut_startAddrBnGroupsLlr[idxBnGroup]); // Loop over BNs @@ -742,10 +742,10 @@ fprintf(fd, "// Process group with 12 CNs \n"); // Loop over CNs for (k=1; k<12; k++) { - fprintf(fd," zmm0 = _mm512_cvtepi8_epi16(p_bnProcBuf[%d + j]);\n", k*cnOffsetInGroup); + fprintf(fd," zmm0 = _mm512_cvtepi8_epi16(p_bnProcBuf[%u + j]);\n", k*cnOffsetInGroup); fprintf(fd," zmmRes0 = _mm512_adds_epi16(zmmRes0,zmm0);\n"); - fprintf(fd," zmm1 = _mm512_cvtepi8_epi16(p_bnProcBuf[%d + j +1]);\n", k*cnOffsetInGroup); + fprintf(fd," zmm1 = _mm512_cvtepi8_epi16(p_bnProcBuf[%u + j +1]);\n", k*cnOffsetInGroup); fprintf(fd, " zmmRes1 = _mm512_adds_epi16(zmmRes1,zmm1); \n"); } @@ -786,7 +786,7 @@ fprintf(fd, "// Process group with 13 CNs \n"); cnOffsetInGroup = (lut_numBnInBnGroups[12]*NR_LDPC_ZMAX)>>5; // Set pointers to start of group 2 - fprintf(fd," p_bnProcBuf = (__m256i*) &bnProcBuf [%d];\n",lut_startAddrBnGroups[idxBnGroup]); + fprintf(fd," p_bnProcBuf = (__m256i*) &bnProcBuf [%u];\n",lut_startAddrBnGroups[idxBnGroup]); fprintf(fd," p_llrProcBuf = (__m256i*) &llrProcBuf [%d];\n",lut_startAddrBnGroupsLlr[idxBnGroup]); fprintf(fd," p_llrRes = (__m512i*) &llrRes [%d];\n",lut_startAddrBnGroupsLlr[idxBnGroup]); // Loop over BNs @@ -798,10 +798,10 @@ fprintf(fd, "// Process group with 13 CNs \n"); // Loop over CNs for (k=1; k<13; k++) { - fprintf(fd," zmm0 = _mm512_cvtepi8_epi16(p_bnProcBuf[%d + j]);\n", k*cnOffsetInGroup); + fprintf(fd," zmm0 = _mm512_cvtepi8_epi16(p_bnProcBuf[%u + j]);\n", k*cnOffsetInGroup); fprintf(fd," zmmRes0 = _mm512_adds_epi16(zmmRes0,zmm0);\n"); - fprintf(fd," zmm1 = _mm512_cvtepi8_epi16(p_bnProcBuf[%d + j +1]);\n", k*cnOffsetInGroup); + fprintf(fd," zmm1 = _mm512_cvtepi8_epi16(p_bnProcBuf[%u + j +1]);\n", k*cnOffsetInGroup); fprintf(fd," zmmRes1 = _mm512_adds_epi16(zmmRes1,zmm1); \n"); } @@ -843,7 +843,7 @@ fprintf(fd, "// Process group with 14 CNs \n"); cnOffsetInGroup = (lut_numBnInBnGroups[13]*NR_LDPC_ZMAX)>>5; // Set pointers to start of group 2 - fprintf(fd," p_bnProcBuf = (__m256i*) &bnProcBuf [%d];\n",lut_startAddrBnGroups[idxBnGroup]); + fprintf(fd," p_bnProcBuf = (__m256i*) &bnProcBuf [%u];\n",lut_startAddrBnGroups[idxBnGroup]); fprintf(fd," p_llrProcBuf = (__m256i*) &llrProcBuf [%d];\n",lut_startAddrBnGroupsLlr[idxBnGroup]); fprintf(fd," p_llrRes = (__m512i*) &llrRes [%d];\n",lut_startAddrBnGroupsLlr[idxBnGroup]); // Loop over BNs @@ -855,10 +855,10 @@ fprintf(fd, "// Process group with 14 CNs \n"); // Loop over CNs for (k=1; k<14; k++) { - fprintf(fd," zmm0 = _mm512_cvtepi8_epi16(p_bnProcBuf[%d + j]);\n", k*cnOffsetInGroup); + fprintf(fd," zmm0 = _mm512_cvtepi8_epi16(p_bnProcBuf[%u + j]);\n", k*cnOffsetInGroup); fprintf(fd," zmmRes0 = _mm512_adds_epi16(zmmRes0,zmm0);\n"); - fprintf(fd," zmm1 = _mm512_cvtepi8_epi16(p_bnProcBuf[%d + j +1]);\n", k*cnOffsetInGroup); + fprintf(fd," zmm1 = _mm512_cvtepi8_epi16(p_bnProcBuf[%u + j +1]);\n", k*cnOffsetInGroup); fprintf(fd, " zmmRes1 = _mm512_adds_epi16(zmmRes1,zmm1); \n"); } @@ -899,7 +899,7 @@ fprintf(fd, "// Process group with 15 CNs \n"); cnOffsetInGroup = (lut_numBnInBnGroups[14]*NR_LDPC_ZMAX)>>5; // Set pointers to start of group 2 - fprintf(fd," p_bnProcBuf = (__m256i*) &bnProcBuf [%d];\n",lut_startAddrBnGroups[idxBnGroup]); + fprintf(fd," p_bnProcBuf = (__m256i*) &bnProcBuf [%u];\n",lut_startAddrBnGroups[idxBnGroup]); fprintf(fd," p_llrProcBuf = (__m256i*) &llrProcBuf [%d];\n",lut_startAddrBnGroupsLlr[idxBnGroup]); fprintf(fd," p_llrRes = (__m512i*) &llrRes [%d];\n",lut_startAddrBnGroupsLlr[idxBnGroup]); // Loop over BNs @@ -911,10 +911,10 @@ fprintf(fd, "// Process group with 15 CNs \n"); // Loop over CNs for (k=1; k<15; k++) { - fprintf(fd," zmm0 = _mm512_cvtepi8_epi16(p_bnProcBuf[%d + j]);\n", k*cnOffsetInGroup); + fprintf(fd," zmm0 = _mm512_cvtepi8_epi16(p_bnProcBuf[%u + j]);\n", k*cnOffsetInGroup); fprintf(fd," zmmRes0 = _mm512_adds_epi16(zmmRes0,zmm0);\n"); - fprintf(fd," zmm1 = _mm512_cvtepi8_epi16(p_bnProcBuf[%d + j +1]);\n", k*cnOffsetInGroup); + fprintf(fd," zmm1 = _mm512_cvtepi8_epi16(p_bnProcBuf[%u + j +1]);\n", k*cnOffsetInGroup); fprintf(fd, " zmmRes1 = _mm512_adds_epi16(zmmRes1,zmm1); \n"); } @@ -956,7 +956,7 @@ fprintf(fd, "// Process group with 16 CNs \n"); cnOffsetInGroup = (lut_numBnInBnGroups[15]*NR_LDPC_ZMAX)>>5; // Set pointers to start of group 2 - fprintf(fd," p_bnProcBuf = (__m256i*) &bnProcBuf [%d];\n",lut_startAddrBnGroups[idxBnGroup]); + fprintf(fd," p_bnProcBuf = (__m256i*) &bnProcBuf [%u];\n",lut_startAddrBnGroups[idxBnGroup]); fprintf(fd," p_llrProcBuf = (__m256i*) &llrProcBuf [%d];\n",lut_startAddrBnGroupsLlr[idxBnGroup]); fprintf(fd," p_llrRes = (__m512i*) &llrRes [%d];\n",lut_startAddrBnGroupsLlr[idxBnGroup]); // Loop over BNs @@ -968,10 +968,10 @@ fprintf(fd, "// Process group with 16 CNs \n"); // Loop over CNs for (k=1; k<16; k++) { - fprintf(fd," zmm0 = _mm512_cvtepi8_epi16(p_bnProcBuf[%d + j]);\n", k*cnOffsetInGroup); + fprintf(fd," zmm0 = _mm512_cvtepi8_epi16(p_bnProcBuf[%u + j]);\n", k*cnOffsetInGroup); fprintf(fd," zmmRes0 = _mm512_adds_epi16(zmmRes0,zmm0);\n"); - fprintf(fd," zmm1 = _mm512_cvtepi8_epi16(p_bnProcBuf[%d + j +1]);\n", k*cnOffsetInGroup); + fprintf(fd," zmm1 = _mm512_cvtepi8_epi16(p_bnProcBuf[%u + j +1]);\n", k*cnOffsetInGroup); fprintf(fd, " zmmRes1 = _mm512_adds_epi16(zmmRes1,zmm1); \n"); } @@ -1012,7 +1012,7 @@ fprintf(fd, "// Process group with 17 CNs \n"); cnOffsetInGroup = (lut_numBnInBnGroups[16]*NR_LDPC_ZMAX)>>5; // Set pointers to start of group 2 - fprintf(fd," p_bnProcBuf = (__m256i*) &bnProcBuf [%d];\n",lut_startAddrBnGroups[idxBnGroup]); + fprintf(fd," p_bnProcBuf = (__m256i*) &bnProcBuf [%u];\n",lut_startAddrBnGroups[idxBnGroup]); fprintf(fd," p_llrProcBuf = (__m256i*) &llrProcBuf [%d];\n",lut_startAddrBnGroupsLlr[idxBnGroup]); fprintf(fd," p_llrRes = (__m512i*) &llrRes [%d];\n",lut_startAddrBnGroupsLlr[idxBnGroup]); // Loop over BNs @@ -1024,10 +1024,10 @@ fprintf(fd, "// Process group with 17 CNs \n"); // Loop over CNs for (k=1; k<17; k++) { - fprintf(fd," zmm0 = _mm512_cvtepi8_epi16(p_bnProcBuf[%d + j]);\n", k*cnOffsetInGroup); + fprintf(fd," zmm0 = _mm512_cvtepi8_epi16(p_bnProcBuf[%u + j]);\n", k*cnOffsetInGroup); fprintf(fd," zmmRes0 = _mm512_adds_epi16(zmmRes0,zmm0);\n"); - fprintf(fd," zmm1 = _mm512_cvtepi8_epi16(p_bnProcBuf[%d + j +1]);\n", k*cnOffsetInGroup); + fprintf(fd," zmm1 = _mm512_cvtepi8_epi16(p_bnProcBuf[%u + j +1]);\n", k*cnOffsetInGroup); fprintf(fd, " zmmRes1 = _mm512_adds_epi16(zmmRes1,zmm1); \n"); } @@ -1068,7 +1068,7 @@ fprintf(fd, "// Process group with 18 CNs \n"); cnOffsetInGroup = (lut_numBnInBnGroups[17]*NR_LDPC_ZMAX)>>5; // Set pointers to start of group 2 - fprintf(fd," p_bnProcBuf = (__m256i*) &bnProcBuf [%d];\n",lut_startAddrBnGroups[idxBnGroup]); + fprintf(fd," p_bnProcBuf = (__m256i*) &bnProcBuf [%u];\n",lut_startAddrBnGroups[idxBnGroup]); fprintf(fd," p_llrProcBuf = (__m256i*) &llrProcBuf [%d];\n",lut_startAddrBnGroupsLlr[idxBnGroup]); fprintf(fd," p_llrRes = (__m512i*) &llrRes [%d];\n",lut_startAddrBnGroupsLlr[idxBnGroup]); // Loop over BNs @@ -1080,10 +1080,10 @@ fprintf(fd, "// Process group with 18 CNs \n"); // Loop over CNs for (k=1; k<18; k++) { - fprintf(fd," zmm0 = _mm512_cvtepi8_epi16(p_bnProcBuf[%d + j]);\n", k*cnOffsetInGroup); + fprintf(fd," zmm0 = _mm512_cvtepi8_epi16(p_bnProcBuf[%u + j]);\n", k*cnOffsetInGroup); fprintf(fd," zmmRes0 = _mm512_adds_epi16(zmmRes0,zmm0);\n"); - fprintf(fd," zmm1 = _mm512_cvtepi8_epi16(p_bnProcBuf[%d + j +1]);\n", k*cnOffsetInGroup); + fprintf(fd," zmm1 = _mm512_cvtepi8_epi16(p_bnProcBuf[%u + j +1]);\n", k*cnOffsetInGroup); fprintf(fd, " zmmRes1 = _mm512_adds_epi16(zmmRes1,zmm1); \n"); } @@ -1123,7 +1123,7 @@ fprintf(fd, "// Process group with 19 CNs \n"); cnOffsetInGroup = (lut_numBnInBnGroups[18]*NR_LDPC_ZMAX)>>5; // Set pointers to start of group 2 - fprintf(fd," p_bnProcBuf = (__m256i*) &bnProcBuf [%d];\n",lut_startAddrBnGroups[idxBnGroup]); + fprintf(fd," p_bnProcBuf = (__m256i*) &bnProcBuf [%u];\n",lut_startAddrBnGroups[idxBnGroup]); fprintf(fd," p_llrProcBuf = (__m256i*) &llrProcBuf [%d];\n",lut_startAddrBnGroupsLlr[idxBnGroup]); fprintf(fd," p_llrRes = (__m512i*) &llrRes [%d];\n",lut_startAddrBnGroupsLlr[idxBnGroup]); // Loop over BNs @@ -1135,10 +1135,10 @@ fprintf(fd, "// Process group with 19 CNs \n"); // Loop over CNs for (k=1; k<19; k++) { - fprintf(fd," zmm0 = _mm512_cvtepi8_epi16(p_bnProcBuf[%d + j]);\n", k*cnOffsetInGroup); + fprintf(fd," zmm0 = _mm512_cvtepi8_epi16(p_bnProcBuf[%u + j]);\n", k*cnOffsetInGroup); fprintf(fd," zmmRes0 = _mm512_adds_epi16(zmmRes0,zmm0);\n"); - fprintf(fd," zmm1 = _mm512_cvtepi8_epi16(p_bnProcBuf[%d + j +1]);\n", k*cnOffsetInGroup); + fprintf(fd," zmm1 = _mm512_cvtepi8_epi16(p_bnProcBuf[%u + j +1]);\n", k*cnOffsetInGroup); fprintf(fd, " zmmRes1 = _mm512_adds_epi16(zmmRes1,zmm1); \n"); } @@ -1179,7 +1179,7 @@ fprintf(fd, "// Process group with 20 CNs \n"); cnOffsetInGroup = (lut_numBnInBnGroups[19]*NR_LDPC_ZMAX)>>5; // Set pointers to start of group 2 - fprintf(fd," p_bnProcBuf = (__m256i*) &bnProcBuf [%d];\n",lut_startAddrBnGroups[idxBnGroup]); + fprintf(fd," p_bnProcBuf = (__m256i*) &bnProcBuf [%u];\n",lut_startAddrBnGroups[idxBnGroup]); fprintf(fd," p_llrProcBuf = (__m256i*) &llrProcBuf [%d];\n",lut_startAddrBnGroupsLlr[idxBnGroup]); fprintf(fd," p_llrRes = (__m512i*) &llrRes [%d];\n",lut_startAddrBnGroupsLlr[idxBnGroup]); // Loop over BNs @@ -1191,10 +1191,10 @@ fprintf(fd, "// Process group with 20 CNs \n"); // Loop over CNs for (k=1; k<20; k++) { - fprintf(fd," zmm0 = _mm512_cvtepi8_epi16(p_bnProcBuf[%d + j]);\n", k*cnOffsetInGroup); + fprintf(fd," zmm0 = _mm512_cvtepi8_epi16(p_bnProcBuf[%u + j]);\n", k*cnOffsetInGroup); fprintf(fd," zmmRes0 = _mm512_adds_epi16(zmmRes0,zmm0);\n"); - fprintf(fd," zmm1 = _mm512_cvtepi8_epi16(p_bnProcBuf[%d + j +1]);\n", k*cnOffsetInGroup); + fprintf(fd," zmm1 = _mm512_cvtepi8_epi16(p_bnProcBuf[%u + j +1]);\n", k*cnOffsetInGroup); fprintf(fd, " zmmRes1 = _mm512_adds_epi16(zmmRes1,zmm1); \n"); } @@ -1239,7 +1239,7 @@ fprintf(fd, "// Process group with 21 CNs \n"); cnOffsetInGroup = (lut_numBnInBnGroups[20]*NR_LDPC_ZMAX)>>5; // Set pointers to start of group 2 - fprintf(fd," p_bnProcBuf = (__m256i*) &bnProcBuf [%d];\n",lut_startAddrBnGroups[idxBnGroup]); + fprintf(fd," p_bnProcBuf = (__m256i*) &bnProcBuf [%u];\n",lut_startAddrBnGroups[idxBnGroup]); fprintf(fd," p_llrProcBuf = (__m256i*) &llrProcBuf [%d];\n",lut_startAddrBnGroupsLlr[idxBnGroup]); fprintf(fd," p_llrRes = (__m512i*) &llrRes [%d];\n",lut_startAddrBnGroupsLlr[idxBnGroup]); // Loop over BNs @@ -1251,10 +1251,10 @@ fprintf(fd, "// Process group with 21 CNs \n"); // Loop over CNs for (k=1; k<21; k++) { - fprintf(fd," zmm0 = _mm512_cvtepi8_epi16(p_bnProcBuf[%d + j]);\n", k*cnOffsetInGroup); + fprintf(fd," zmm0 = _mm512_cvtepi8_epi16(p_bnProcBuf[%u + j]);\n", k*cnOffsetInGroup); fprintf(fd," zmmRes0 = _mm512_adds_epi16(zmmRes0,zmm0);\n"); - fprintf(fd," zmm1 = _mm512_cvtepi8_epi16(p_bnProcBuf[%d + j +1]);\n", k*cnOffsetInGroup); + fprintf(fd," zmm1 = _mm512_cvtepi8_epi16(p_bnProcBuf[%u + j +1]);\n", k*cnOffsetInGroup); fprintf(fd, " zmmRes1 = _mm512_adds_epi16(zmmRes1,zmm1); \n"); } @@ -1294,7 +1294,7 @@ fprintf(fd, "// Process group with 22 CNs \n"); cnOffsetInGroup = (lut_numBnInBnGroups[21]*NR_LDPC_ZMAX)>>5; // Set pointers to start of group 2 - fprintf(fd," p_bnProcBuf = (__m256i*) &bnProcBuf [%d];\n",lut_startAddrBnGroups[idxBnGroup]); + fprintf(fd," p_bnProcBuf = (__m256i*) &bnProcBuf [%u];\n",lut_startAddrBnGroups[idxBnGroup]); fprintf(fd," p_llrProcBuf = (__m256i*) &llrProcBuf [%d];\n",lut_startAddrBnGroupsLlr[idxBnGroup]); fprintf(fd," p_llrRes = (__m512i*) &llrRes [%d];\n",lut_startAddrBnGroupsLlr[idxBnGroup]); // Loop over BNs @@ -1306,10 +1306,10 @@ fprintf(fd, "// Process group with 22 CNs \n"); // Loop over CNs for (k=1; k<22; k++) { - fprintf(fd," zmm0 = _mm512_cvtepi8_epi16(p_bnProcBuf[%d + j]);\n", k*cnOffsetInGroup); + fprintf(fd," zmm0 = _mm512_cvtepi8_epi16(p_bnProcBuf[%u + j]);\n", k*cnOffsetInGroup); fprintf(fd," zmmRes0 = _mm512_adds_epi16(zmmRes0,zmm0);\n"); - fprintf(fd," zmm1 = _mm512_cvtepi8_epi16(p_bnProcBuf[%d + j +1]);\n", k*cnOffsetInGroup); + fprintf(fd," zmm1 = _mm512_cvtepi8_epi16(p_bnProcBuf[%u + j +1]);\n", k*cnOffsetInGroup); fprintf(fd, " zmmRes1 = _mm512_adds_epi16(zmmRes1,zmm1); \n"); } @@ -1350,7 +1350,7 @@ fprintf(fd, "// Process group with <23 CNs \n"); cnOffsetInGroup = (lut_numBnInBnGroups[22]*NR_LDPC_ZMAX)>>5; // Set pointers to start of group 2 - fprintf(fd," p_bnProcBuf = (__m256i*) &bnProcBuf [%d];\n",lut_startAddrBnGroups[idxBnGroup]); + fprintf(fd," p_bnProcBuf = (__m256i*) &bnProcBuf [%u];\n",lut_startAddrBnGroups[idxBnGroup]); fprintf(fd," p_llrProcBuf = (__m256i*) &llrProcBuf [%d];\n",lut_startAddrBnGroupsLlr[idxBnGroup]); fprintf(fd," p_llrRes = (__m512i*) &llrRes [%d];\n",lut_startAddrBnGroupsLlr[idxBnGroup]); // Loop over BNs @@ -1362,10 +1362,10 @@ fprintf(fd, "// Process group with <23 CNs \n"); // Loop over CNs for (k=1; k<23; k++) { - fprintf(fd," zmm0 = _mm512_cvtepi8_epi16(p_bnProcBuf[%d + j]);\n", k*cnOffsetInGroup); + fprintf(fd," zmm0 = _mm512_cvtepi8_epi16(p_bnProcBuf[%u + j]);\n", k*cnOffsetInGroup); fprintf(fd," zmmRes0 = _mm512_adds_epi16(zmmRes0,zmm0);\n"); - fprintf(fd," zmm1 = _mm512_cvtepi8_epi16(p_bnProcBuf[%d + j +1]);\n", k*cnOffsetInGroup); + fprintf(fd," zmm1 = _mm512_cvtepi8_epi16(p_bnProcBuf[%u + j +1]);\n", k*cnOffsetInGroup); fprintf(fd," zmmRes1 = _mm512_adds_epi16(zmmRes1,zmm1); \n"); } @@ -1407,7 +1407,7 @@ fprintf(fd, "// Process group with 24 CNs \n"); cnOffsetInGroup = (lut_numBnInBnGroups[23]*NR_LDPC_ZMAX)>>5; // Set pointers to start of group 2 - fprintf(fd," p_bnProcBuf = (__m256i*) &bnProcBuf [%d];\n",lut_startAddrBnGroups[idxBnGroup]); + fprintf(fd," p_bnProcBuf = (__m256i*) &bnProcBuf [%u];\n",lut_startAddrBnGroups[idxBnGroup]); fprintf(fd," p_llrProcBuf = (__m256i*) &llrProcBuf [%d];\n",lut_startAddrBnGroupsLlr[idxBnGroup]); fprintf(fd," p_llrRes = (__m512i*) &llrRes [%d];\n",lut_startAddrBnGroupsLlr[idxBnGroup]); // Loop over BNs @@ -1419,10 +1419,10 @@ fprintf(fd, "// Process group with 24 CNs \n"); // Loop over CNs for (k=1; k<24; k++) { - fprintf(fd," zmm0 = _mm512_cvtepi8_epi16(p_bnProcBuf[%d + j]);\n", k*cnOffsetInGroup); + fprintf(fd," zmm0 = _mm512_cvtepi8_epi16(p_bnProcBuf[%u + j]);\n", k*cnOffsetInGroup); fprintf(fd," zmmRes0 = _mm512_adds_epi16(zmmRes0,zmm0);\n"); - fprintf(fd," zmm1 = _mm512_cvtepi8_epi16(p_bnProcBuf[%d + j +1]);\n", k*cnOffsetInGroup); + fprintf(fd," zmm1 = _mm512_cvtepi8_epi16(p_bnProcBuf[%u + j +1]);\n", k*cnOffsetInGroup); fprintf(fd, " zmmRes1 = _mm512_adds_epi16(zmmRes1,zmm1); \n"); } @@ -1463,7 +1463,7 @@ fprintf(fd, "// Process group with 25 CNs \n"); cnOffsetInGroup = (lut_numBnInBnGroups[24]*NR_LDPC_ZMAX)>>5; // Set pointers to start of group 2 - fprintf(fd," p_bnProcBuf = (__m256i*) &bnProcBuf [%d];\n",lut_startAddrBnGroups[idxBnGroup]); + fprintf(fd," p_bnProcBuf = (__m256i*) &bnProcBuf [%u];\n",lut_startAddrBnGroups[idxBnGroup]); fprintf(fd," p_llrProcBuf = (__m256i*) &llrProcBuf [%d];\n",lut_startAddrBnGroupsLlr[idxBnGroup]); fprintf(fd," p_llrRes = (__m512i*) &llrRes [%d];\n",lut_startAddrBnGroupsLlr[idxBnGroup]); // Loop over BNs @@ -1475,10 +1475,10 @@ fprintf(fd, "// Process group with 25 CNs \n"); // Loop over CNs for (k=1; k<25; k++) { - fprintf(fd," zmm0 = _mm512_cvtepi8_epi16(p_bnProcBuf[%d + j]);\n", k*cnOffsetInGroup); + fprintf(fd," zmm0 = _mm512_cvtepi8_epi16(p_bnProcBuf[%u + j]);\n", k*cnOffsetInGroup); fprintf(fd," zmmRes0 = _mm512_adds_epi16(zmmRes0,zmm0);\n"); - fprintf(fd," zmm1 = _mm512_cvtepi8_epi16(p_bnProcBuf[%d + j +1]);\n", k*cnOffsetInGroup); + fprintf(fd," zmm1 = _mm512_cvtepi8_epi16(p_bnProcBuf[%u + j +1]);\n", k*cnOffsetInGroup); fprintf(fd, " zmmRes1 = _mm512_adds_epi16(zmmRes1,zmm1); \n"); } @@ -1520,7 +1520,7 @@ fprintf(fd, "// Process group with 26 CNs \n"); cnOffsetInGroup = (lut_numBnInBnGroups[25]*NR_LDPC_ZMAX)>>5; // Set pointers to start of group 2 - fprintf(fd," p_bnProcBuf = (__m256i*) &bnProcBuf [%d];\n",lut_startAddrBnGroups[idxBnGroup]); + fprintf(fd," p_bnProcBuf = (__m256i*) &bnProcBuf [%u];\n",lut_startAddrBnGroups[idxBnGroup]); fprintf(fd," p_llrProcBuf = (__m256i*) &llrProcBuf [%d];\n",lut_startAddrBnGroupsLlr[idxBnGroup]); fprintf(fd," p_llrRes = (__m512i*) &llrRes [%d];\n",lut_startAddrBnGroupsLlr[idxBnGroup]); // Loop over BNs @@ -1532,10 +1532,10 @@ fprintf(fd, "// Process group with 26 CNs \n"); // Loop over CNs for (k=1; k<26; k++) { - fprintf(fd," zmm0 = _mm512_cvtepi8_epi16(p_bnProcBuf[%d + j]);\n", k*cnOffsetInGroup); + fprintf(fd," zmm0 = _mm512_cvtepi8_epi16(p_bnProcBuf[%u + j]);\n", k*cnOffsetInGroup); fprintf(fd," zmmRes0 = _mm512_adds_epi16(zmmRes0,zmm0);\n"); - fprintf(fd," zmm1 = _mm512_cvtepi8_epi16(p_bnProcBuf[%d + j +1]);\n", k*cnOffsetInGroup); + fprintf(fd," zmm1 = _mm512_cvtepi8_epi16(p_bnProcBuf[%u + j +1]);\n", k*cnOffsetInGroup); fprintf(fd, " zmmRes1 = _mm512_adds_epi16(zmmRes1,zmm1); \n"); } @@ -1576,7 +1576,7 @@ fprintf(fd, "// Process group with 27 CNs \n"); cnOffsetInGroup = (lut_numBnInBnGroups[26]*NR_LDPC_ZMAX)>>5; // Set pointers to start of group 2 - fprintf(fd," p_bnProcBuf = (__m256i*) &bnProcBuf [%d];\n",lut_startAddrBnGroups[idxBnGroup]); + fprintf(fd," p_bnProcBuf = (__m256i*) &bnProcBuf [%u];\n",lut_startAddrBnGroups[idxBnGroup]); fprintf(fd," p_llrProcBuf = (__m256i*) &llrProcBuf [%d];\n",lut_startAddrBnGroupsLlr[idxBnGroup]); fprintf(fd," p_llrRes = (__m512i*) &llrRes [%d];\n",lut_startAddrBnGroupsLlr[idxBnGroup]); // Loop over BNs @@ -1588,10 +1588,10 @@ fprintf(fd, "// Process group with 27 CNs \n"); // Loop over CNs for (k=1; k<27; k++) { - fprintf(fd," zmm0 = _mm512_cvtepi8_epi16(p_bnProcBuf[%d + j]);\n", k*cnOffsetInGroup); + fprintf(fd," zmm0 = _mm512_cvtepi8_epi16(p_bnProcBuf[%u + j]);\n", k*cnOffsetInGroup); fprintf(fd," zmmRes0 = _mm512_adds_epi16(zmmRes0,zmm0);\n"); - fprintf(fd," zmm1 = _mm512_cvtepi8_epi16(p_bnProcBuf[%d + j +1]);\n", k*cnOffsetInGroup); + fprintf(fd," zmm1 = _mm512_cvtepi8_epi16(p_bnProcBuf[%u + j +1]);\n", k*cnOffsetInGroup); fprintf(fd, " zmmRes1 = _mm512_adds_epi16(zmmRes1,zmm1); \n"); } @@ -1632,7 +1632,7 @@ fprintf(fd, "// Process group with 28 CNs \n"); cnOffsetInGroup = (lut_numBnInBnGroups[27]*NR_LDPC_ZMAX)>>5; // Set pointers to start of group 2 - fprintf(fd," p_bnProcBuf = (__m256i*) &bnProcBuf [%d];\n",lut_startAddrBnGroups[idxBnGroup]); + fprintf(fd," p_bnProcBuf = (__m256i*) &bnProcBuf [%u];\n",lut_startAddrBnGroups[idxBnGroup]); fprintf(fd," p_llrProcBuf = (__m256i*) &llrProcBuf [%d];\n",lut_startAddrBnGroupsLlr[idxBnGroup]); fprintf(fd," p_llrRes = (__m512i*) &llrRes [%d];\n",lut_startAddrBnGroupsLlr[idxBnGroup]); // Loop over BNs @@ -1644,10 +1644,10 @@ fprintf(fd, "// Process group with 28 CNs \n"); // Loop over CNs for (k=1; k<28; k++) { - fprintf(fd," zmm0 = _mm512_cvtepi8_epi16(p_bnProcBuf[%d + j]);\n", k*cnOffsetInGroup); + fprintf(fd," zmm0 = _mm512_cvtepi8_epi16(p_bnProcBuf[%u + j]);\n", k*cnOffsetInGroup); fprintf(fd," zmmRes0 = _mm512_adds_epi16(zmmRes0,zmm0);\n"); - fprintf(fd," zmm1 = _mm512_cvtepi8_epi16(p_bnProcBuf[%d + j +1]);\n", k*cnOffsetInGroup); + fprintf(fd," zmm1 = _mm512_cvtepi8_epi16(p_bnProcBuf[%u + j +1]);\n", k*cnOffsetInGroup); fprintf(fd, " zmmRes1 = _mm512_adds_epi16(zmmRes1,zmm1); \n"); } @@ -1687,7 +1687,7 @@ fprintf(fd, "// Process group with 29 CNs \n"); cnOffsetInGroup = (lut_numBnInBnGroups[28]*NR_LDPC_ZMAX)>>5; // Set pointers to start of group 2 - fprintf(fd," p_bnProcBuf = (__m256i*) &bnProcBuf [%d];\n",lut_startAddrBnGroups[idxBnGroup]); + fprintf(fd," p_bnProcBuf = (__m256i*) &bnProcBuf [%u];\n",lut_startAddrBnGroups[idxBnGroup]); fprintf(fd," p_llrProcBuf = (__m256i*) &llrProcBuf [%d];\n",lut_startAddrBnGroupsLlr[idxBnGroup]); fprintf(fd," p_llrRes = (__m512i*) &llrRes [%d];\n",lut_startAddrBnGroupsLlr[idxBnGroup]); // Loop over BNs @@ -1699,10 +1699,10 @@ fprintf(fd, "// Process group with 29 CNs \n"); // Loop over CNs for (k=1; k<29; k++) { - fprintf(fd," zmm0 = _mm512_cvtepi8_epi16(p_bnProcBuf[%d + j]);\n", k*cnOffsetInGroup); + fprintf(fd," zmm0 = _mm512_cvtepi8_epi16(p_bnProcBuf[%u + j]);\n", k*cnOffsetInGroup); fprintf(fd," zmmRes0 = _mm512_adds_epi16(zmmRes0,zmm0);\n"); - fprintf(fd," zmm1 = _mm512_cvtepi8_epi16(p_bnProcBuf[%d + j +1]);\n", k*cnOffsetInGroup); + fprintf(fd," zmm1 = _mm512_cvtepi8_epi16(p_bnProcBuf[%u + j +1]);\n", k*cnOffsetInGroup); fprintf(fd, " zmmRes1 = _mm512_adds_epi16(zmmRes1,zmm1); \n"); } @@ -1743,7 +1743,7 @@ fprintf(fd, "// Process group with 30 CNs \n"); cnOffsetInGroup = (lut_numBnInBnGroups[29]*NR_LDPC_ZMAX)>>5; // Set pointers to start of group 2 - fprintf(fd," p_bnProcBuf = (__m256i*) &bnProcBuf [%d];\n",lut_startAddrBnGroups[idxBnGroup]); + fprintf(fd," p_bnProcBuf = (__m256i*) &bnProcBuf [%u];\n",lut_startAddrBnGroups[idxBnGroup]); fprintf(fd," p_llrProcBuf = (__m256i*) &llrProcBuf [%d];\n",lut_startAddrBnGroupsLlr[idxBnGroup]); fprintf(fd," p_llrRes = (__m512i*) &llrRes [%d];\n",lut_startAddrBnGroupsLlr[idxBnGroup]); // Loop over BNs @@ -1755,10 +1755,10 @@ fprintf(fd, "// Process group with 30 CNs \n"); // Loop over CNs for (k=1; k<30; k++) { - fprintf(fd," zmm0 = _mm512_cvtepi8_epi16(p_bnProcBuf[%d + j]);\n", k*cnOffsetInGroup); + fprintf(fd," zmm0 = _mm512_cvtepi8_epi16(p_bnProcBuf[%u + j]);\n", k*cnOffsetInGroup); fprintf(fd," zmmRes0 = _mm512_adds_epi16(zmmRes0,zmm0);\n"); - fprintf(fd," zmm1 = _mm512_cvtepi8_epi16(p_bnProcBuf[%d + j +1]);\n", k*cnOffsetInGroup); + fprintf(fd," zmm1 = _mm512_cvtepi8_epi16(p_bnProcBuf[%u + j +1]);\n", k*cnOffsetInGroup); fprintf(fd, " zmmRes1 = _mm512_adds_epi16(zmmRes1,zmm1); \n"); } diff --git a/openair1/PHY/CODING/nrPolar_tools/nr_polar_encoder.c b/openair1/PHY/CODING/nrPolar_tools/nr_polar_encoder.c index ad77a61a023f1f7a91f145a399d2fba39cc2dd8d..9242e574c7e677ca70e5aee37c2cd99baf62eae8 100644 --- a/openair1/PHY/CODING/nrPolar_tools/nr_polar_encoder.c +++ b/openair1/PHY/CODING/nrPolar_tools/nr_polar_encoder.c @@ -80,7 +80,7 @@ void polar_encoder(uint32_t *in, for (int i = 0; i<polarParams->K; i++) B2 = B2 | ((uint64_t)polarParams->nr_polar_B[i] << i); - printf("polar_B %llx\n",B2); + printf("polar_B %lx\n",B2); for (int i=0; i< polarParams->payloadBits; i++) printf("a[%d]=%d\n", i, polarParams->nr_polar_A[i]); for (int i=0; i< polarParams->K; i++) printf("b[%d]=%d\n", i, polarParams->nr_polar_B[i]); #endif @@ -103,10 +103,10 @@ void polar_encoder(uint32_t *in, for (int i = 0; i<polarParams->K; i++) { Cprime = Cprime | ((uint64_t)polarParams->nr_polar_CPrime[i] << i); - if (polarParams->nr_polar_CPrime[i] == 1) printf("pos %d : %llx\n",i,Cprime); + if (polarParams->nr_polar_CPrime[i] == 1) printf("pos %d : %lx\n",i,Cprime); } - printf("polar_Cprime %llx\n",Cprime); + printf("polar_Cprime %lx\n",Cprime); #endif //Bit insertion (c' to u) nr_polar_bit_insertion(polarParams->nr_polar_CPrime, @@ -569,7 +569,7 @@ void polar_encoder_fast(uint64_t *A, printf("Polar encoder: (N,K) : (%d,%d)\n",polarParams->N,polarParams->K); if (polarParams->K<65) - printf("A %llx B %llx Cprime %llx (payload bits %d,crc %x)\n", + printf("A %llx B %llx Cprime %llx (payload bits %d,crc %lx)\n", (unsigned long long)(A[0]&(((uint64_t)1<<bitlen)-1)), (unsigned long long)(B[0]), (unsigned long long)(Cprime[0]), @@ -577,7 +577,7 @@ void polar_encoder_fast(uint64_t *A, tcrc); else if (polarParams->K<129) { if (bitlen<64) - printf("A %llx B %llx|%llx Cprime %llx|%llx (payload bits %d,crc %x)\n", + printf("A %llx B %llx|%llx Cprime %llx|%llx (payload bits %d,crc %lx)\n", (unsigned long long)(A[0]&(((uint64_t)1<<bitlen)-1)), (unsigned long long)(B[1]),(unsigned long long)(B[0]), (unsigned long long)(Cprime[1]),(unsigned long long)(Cprime[0]), @@ -697,7 +697,7 @@ void polar_encoder_fast(uint64_t *A, Cprime_i = -((Cprime[j]>>i)&1); // this converts bit 0 as, 0 => 0000x00, 1 => 1111x11 #ifdef DEBUG_POLAR_ENCODER - printf("%llx Cprime_%d (%d+%d) (%llx) G %llx,%llx\n", + printf("%lx Cprime_%d (%d+%d) (%llx) G %llx,%llx\n", Cprime_i,off+i,off,i,(Cprime[j]>>i) &1, polarParams->G_N_tab[off+i][0], polarParams->G_N_tab[off+i][1]); diff --git a/openair1/PHY/CODING/nr_rate_matching.c b/openair1/PHY/CODING/nr_rate_matching.c index f915d81ec0c708de0a04c677f7250228d220f13d..03c7beb77138da34ee6597242cde3b47ed4f65fc 100644 --- a/openair1/PHY/CODING/nr_rate_matching.c +++ b/openair1/PHY/CODING/nr_rate_matching.c @@ -452,7 +452,7 @@ int nr_rate_matching_ldpc(uint32_t Tbslbrm, ind = (index_k0[BG-1][rvidx]*Ncb/N)*Z; #ifdef RM_DEBUG - printf("nr_rate_matching_ldpc: E %d, F %d, Foffset %d, k0 %d, Ncb %d, rvidx %d, Tbslbrm %d\n", E, F, Foffset,ind, Ncb, rvidx, Tbslbrm); + printf("nr_rate_matching_ldpc: E %u, F %u, Foffset %u, k0 %u, Ncb %u, rvidx %d, Tbslbrm %u\n", E, F, Foffset,ind, Ncb, rvidx, Tbslbrm); #endif if (Foffset > E) { @@ -493,7 +493,7 @@ int nr_rate_matching_ldpc(uint32_t Tbslbrm, for (ind=0; (ind<Ncb)&&(k<E); ind++) { #ifdef RM_DEBUG - printf("RM_TX k%d Ind: %d (%d)\n",k,ind,w[ind]); + printf("RM_TX k%u Ind: %u (%d)\n",k,ind,w[ind]); #endif if (w[ind] != NR_NULL) e[k++]=w[ind]; @@ -548,7 +548,7 @@ int nr_rate_matching_ldpc_rx(uint32_t Tbslbrm, } #ifdef RM_DEBUG - printf("nr_rate_matching_ldpc_rx: Clear %d, E %d, k0 %d, Ncb %d, rvidx %d, Tbslbrm %d\n", clear, E, ind, Ncb, rvidx, Tbslbrm); + printf("nr_rate_matching_ldpc_rx: Clear %d, E %u, k0 %u, Ncb %u, rvidx %d, Tbslbrm %u\n", clear, E, ind, Ncb, rvidx, Tbslbrm); #endif if (clear==1) memset(w,0,Ncb*sizeof(int16_t)); @@ -558,7 +558,7 @@ int nr_rate_matching_ldpc_rx(uint32_t Tbslbrm, if (ind < Foffset) for (; (ind<Foffset)&&(k<E); ind++) { #ifdef RM_DEBUG - printf("RM_RX k%d Ind %d(before filler): %d (%d)=>",k,ind,w[ind],soft_input[k]); + printf("RM_RX k%u Ind %u(before filler): %d (%d)=>",k,ind,w[ind],soft_input[k]); #endif w[ind]+=soft_input[k++]; #ifdef RM_DEBUG @@ -569,7 +569,7 @@ int nr_rate_matching_ldpc_rx(uint32_t Tbslbrm, for (; (ind<Ncb)&&(k<E); ind++) { #ifdef RM_DEBUG - printf("RM_RX k%d Ind %d(after filler) %d (%d)=>",k,ind,w[ind],soft_input[k]); + printf("RM_RX k%u Ind %u(after filler) %d (%d)=>",k,ind,w[ind],soft_input[k]); #endif w[ind] += soft_input[k++]; #ifdef RM_DEBUG @@ -580,7 +580,7 @@ int nr_rate_matching_ldpc_rx(uint32_t Tbslbrm, while(k<E) { for (ind=0; (ind<Foffset)&&(k<E); ind++) { #ifdef RM_DEBUG - printf("RM_RX k%d Ind %d(before filler) %d(%d)=>",k,ind,w[ind],soft_input[k]); + printf("RM_RX k%u Ind %u(before filler) %d(%d)=>",k,ind,w[ind],soft_input[k]); #endif w[ind]+=soft_input[k++]; #ifdef RM_DEBUG @@ -589,7 +589,7 @@ int nr_rate_matching_ldpc_rx(uint32_t Tbslbrm, } for (ind=Foffset+F; (ind<Ncb)&&(k<E); ind++) { #ifdef RM_DEBUG - printf("RM_RX (after filler) k%d Ind: %d (%d)(soft in %d)=>",k,ind,w[ind],soft_input[k]); + printf("RM_RX (after filler) k%u Ind: %u (%d)(soft in %d)=>",k,ind,w[ind],soft_input[k]); #endif w[ind] += soft_input[k++]; #ifdef RM_DEBUG diff --git a/openair1/PHY/CODING/nr_segmentation.c b/openair1/PHY/CODING/nr_segmentation.c index f43813a6ca1f7b0f872308c6d8263dd91f4a1291..8db12fd3c07ea8578466f088b642ee5c0a211e75 100644 --- a/openair1/PHY/CODING/nr_segmentation.c +++ b/openair1/PHY/CODING/nr_segmentation.c @@ -189,7 +189,7 @@ main() for (Bbytes=5; Bbytes<8; Bbytes++) { nr_segmentation(0,0,Bbytes<<3,&C,&K,&Zout, &F); - printf("Bbytes %d : C %d, K %d, F %d\n", + printf("Bbytes %u : C %u, K %u, F %u\n", Bbytes, C, K, F); } } diff --git a/openair1/PHY/CODING/viterbi_lte.c b/openair1/PHY/CODING/viterbi_lte.c index bebb5417bfba9bf62e5a69ecf6715442cc642c2c..ecb5f2271c3c9f4d09bb164af08a6842de0b0992 100644 --- a/openair1/PHY/CODING/viterbi_lte.c +++ b/openair1/PHY/CODING/viterbi_lte.c @@ -449,7 +449,7 @@ int test_viterbi(uint8_t dabflag) printf("Optimized Viterbi :"); for (i =0 ; i<8 ; i++) - printf("input %d : %x => %x\n",i,inPtr[i],decoded_output[i]); + printf("input %u : %x => %x\n",i,inPtr[i],decoded_output[i]); } diff --git a/openair1/PHY/LTE_TRANSPORT/dci.c b/openair1/PHY/LTE_TRANSPORT/dci.c index c3dffffd466d9302a93a3f311ef47fa79f890a01..d2ad87f717fc2593b570fcbfcefd5bfc5411577e 100644 --- a/openair1/PHY/LTE_TRANSPORT/dci.c +++ b/openair1/PHY/LTE_TRANSPORT/dci.c @@ -84,7 +84,7 @@ void dci_encoding(uint8_t *a, RCC = sub_block_interleaving_cc(D,d+96,w); #ifdef DEBUG_DCI_ENCODING - if (E>1000) printf("Doing DCI rate matching for %d channel bits, RCC %d, e %p\n",E,RCC,e); + if (E>1000) printf("Doing DCI rate matching for %d channel bits, RCC %u, e %p\n",E,RCC,e); #endif lte_rate_matching_cc(RCC,E,w,e); @@ -339,7 +339,7 @@ uint8_t generate_dci_top(uint8_t num_pdcch_symbols, e_ptr = e; #ifdef DEBUG_DCI_ENCODING - printf(" PDCCH Modulation, Msymb %d, Msymb2 %d,gain_lin_QPSK %d\n",Msymb,Msymb2,gain_lin_QPSK); + printf(" PDCCH Modulation, Msymb %u, Msymb2 %d,gain_lin_QPSK %u\n",Msymb,Msymb2,gain_lin_QPSK); #endif //LOG_D(PHY,"%s() Msymb2:%d\n", __FUNCTION__, Msymb2); @@ -360,7 +360,7 @@ uint8_t generate_dci_top(uint8_t num_pdcch_symbols, } else { //ALAMOUTI for (i=0; i<Msymb2; i+=2) { #ifdef DEBUG_DCI_ENCODING - printf(" PDCCH Modulation (TX diversity): REG %d\n",i>>2); + printf(" PDCCH Modulation (TX diversity): REG %u\n",i>>2); #endif // first antenna position n -> x0 ((int16_t *)&y[0][i])[0] = (*e_ptr==2) ? 0 : (*e_ptr == 1) ? -gain_lin_QPSK : gain_lin_QPSK; @@ -418,7 +418,7 @@ uint8_t generate_dci_top(uint8_t num_pdcch_symbols, // if REG is allocated to PHICH, skip it if (check_phich_reg(frame_parms,kprime,lprime,mi) == 1) { #ifdef DEBUG_DCI_ENCODING - printf("generate_dci: skipping REG %d (kprime %d, lprime %d)\n",(lprime==0)?(kprime/6) : (kprime>>2),kprime,lprime); + printf("generate_dci: skipping REG %d (kprime %u, lprime %u)\n",(lprime==0)?(kprime/6) : (kprime>>2),kprime,lprime); #endif } else { // Copy REG to TX buffer @@ -437,7 +437,7 @@ uint8_t generate_dci_top(uint8_t num_pdcch_symbols, txdataF[1][tti_offset+i] = wbar[1][mprime]; #ifdef DEBUG_DCI_ENCODING - printf(" PDCCH mapping mprime %d => %d (symbol %d re %d) -> (%d,%d)\n",mprime,tti_offset,symbol_offset,re_offset+i,*(short *)&wbar[0][mprime],*(1+(short *)&wbar[0][mprime])); + printf(" PDCCH mapping mprime %u => %u (symbol %u re %u) -> (%d,%d)\n",mprime,tti_offset,symbol_offset,re_offset+i,*(short *)&wbar[0][mprime],*(1+(short *)&wbar[0][mprime])); #endif mprime++; } @@ -467,7 +467,7 @@ uint8_t generate_dci_top(uint8_t num_pdcch_symbols, txdataF[1][tti_offset+0] = wbar[1][mprime]; #ifdef DEBUG_DCI_ENCODING - printf(" PDCCH mapping mprime %d => %d (symbol %d re %d) -> (%d,%d)\n",mprime,tti_offset,symbol_offset,re_offset,*(short *)&wbar[0][mprime],*(1+(short *)&wbar[0][mprime])); + printf(" PDCCH mapping mprime %u => %u (symbol %u re %d) -> (%d,%d)\n",mprime,tti_offset,symbol_offset,re_offset,*(short *)&wbar[0][mprime],*(1+(short *)&wbar[0][mprime])); #endif mprime++; txdataF[0][tti_offset+1] = wbar[0][mprime]; @@ -476,7 +476,7 @@ uint8_t generate_dci_top(uint8_t num_pdcch_symbols, txdataF[1][tti_offset+1] = wbar[1][mprime]; #ifdef DEBUG_DCI_ENCODING - printf("PDCCH mapping mprime %d => %d (symbol %d re %d) -> (%d,%d)\n",mprime,tti_offset,symbol_offset,re_offset+1,*(short *)&wbar[0][mprime],*(1+(short *)&wbar[0][mprime])); + printf("PDCCH mapping mprime %u => %u (symbol %u re %d) -> (%d,%d)\n",mprime,tti_offset,symbol_offset,re_offset+1,*(short *)&wbar[0][mprime],*(1+(short *)&wbar[0][mprime])); #endif mprime++; txdataF[0][tti_offset-frame_parms->ofdm_symbol_size+3] = wbar[0][mprime]; @@ -485,7 +485,7 @@ uint8_t generate_dci_top(uint8_t num_pdcch_symbols, txdataF[1][tti_offset-frame_parms->ofdm_symbol_size+3] = wbar[1][mprime]; #ifdef DEBUG_DCI_ENCODING - printf(" PDCCH mapping mprime %d => %d (symbol %d re %d) -> (%d,%d)\n",mprime,tti_offset,symbol_offset,re_offset-frame_parms->ofdm_symbol_size+3,*(short *)&wbar[0][mprime], + printf(" PDCCH mapping mprime %u => %u (symbol %u re %d) -> (%d,%d)\n",mprime,tti_offset,symbol_offset,re_offset-frame_parms->ofdm_symbol_size+3,*(short *)&wbar[0][mprime], *(1+(short *)&wbar[0][mprime])); #endif mprime++; @@ -495,7 +495,7 @@ uint8_t generate_dci_top(uint8_t num_pdcch_symbols, txdataF[1][tti_offset-frame_parms->ofdm_symbol_size+4] = wbar[1][mprime]; #ifdef DEBUG_DCI_ENCODING - printf(" PDCCH mapping mprime %d => %d (symbol %d re %d) -> (%d,%d)\n",mprime,tti_offset,symbol_offset,re_offset-frame_parms->ofdm_symbol_size+4,*(short *)&wbar[0][mprime], + printf(" PDCCH mapping mprime %u => %u (symbol %u re %d) -> (%d,%d)\n",mprime,tti_offset,symbol_offset,re_offset-frame_parms->ofdm_symbol_size+4,*(short *)&wbar[0][mprime], *(1+(short *)&wbar[0][mprime])); #endif mprime++; diff --git a/openair1/PHY/LTE_TRANSPORT/dci_tools_common.c b/openair1/PHY/LTE_TRANSPORT/dci_tools_common.c index 3c3177739209049be1d863ab9877b66b34ccfe30..524839359acb82c8b7b8f8d8e9b090a453bfbcf9 100644 --- a/openair1/PHY/LTE_TRANSPORT/dci_tools_common.c +++ b/openair1/PHY/LTE_TRANSPORT/dci_tools_common.c @@ -933,7 +933,7 @@ uint8_t subframe2harq_pid(LTE_DL_FRAME_PARMS *frame_parms,uint32_t frame,uint8_t } } - AssertFatal(ret != 255, "invalid harq_pid(%d) at SFN/SF = %d/%d\n", (int8_t)ret, frame, subframe); + AssertFatal(ret != 255, "invalid harq_pid(%u) at SFN/SF = %u/%u\n", ret, frame, subframe); return ret; } diff --git a/openair1/PHY/LTE_TRANSPORT/dlsch_scrambling.c b/openair1/PHY/LTE_TRANSPORT/dlsch_scrambling.c index 7075b74fe12ed266e16ce3ea4248af05ccd7d0e0..e1fd9b505b09daf25115e3cd516b7278c58a5947 100644 --- a/openair1/PHY/LTE_TRANSPORT/dlsch_scrambling.c +++ b/openair1/PHY/LTE_TRANSPORT/dlsch_scrambling.c @@ -118,7 +118,7 @@ void dlsch_scrambling(LTE_DL_FRAME_PARMS *frame_parms, for (n=0; n<(1+(G>>5)); n++) { #ifdef DEBUG_SCRAMBLING - for (int k=0; k<32; k++) printf("scrambling %d : %x xor %x = %d\n",k+(n<<5),e[k],(s>>k)&1,e[k]^((s>>k)&1)); + for (int k=0; k<32; k++) printf("scrambling %d : %x xor %x = %u\n",k+(n<<5),e[k],(s>>k)&1,e[k]^((s>>k)&1)); #endif e[0] = (e[0]) ^ (s&1); diff --git a/openair1/PHY/LTE_TRANSPORT/pucch.c b/openair1/PHY/LTE_TRANSPORT/pucch.c index 527e12e263d569e09fc5a5f35d622c25d6910267..2173fffa7d9f26f7c519b3a3a841a42bc28dd431 100644 --- a/openair1/PHY/LTE_TRANSPORT/pucch.c +++ b/openair1/PHY/LTE_TRANSPORT/pucch.c @@ -1123,7 +1123,7 @@ uint32_t rx_pucch(PHY_VARS_eNB *eNB, zptr[n<<1] = (tmp_re*W_re - tmp_im*W_im)>>15; zptr[1+(n<<1)] = -(tmp_re*W_im + tmp_im*W_re)>>15; #ifdef DEBUG_PUCCH_RX - printf("[eNB] PUCCH subframe %d z(%d,%d) => %d,%d, alpha(%d) => %d,%d\n",subframe,l,n,zptr[n<<1],zptr[(n<<1)+1], + printf("[eNB] PUCCH subframe %d z(%d,%u) => %d,%d, alpha(%d) => %d,%d\n",subframe,l,n,zptr[n<<1],zptr[(n<<1)+1], alpha_ind,alpha_re[alpha_ind],alpha_im[alpha_ind]); #endif alpha_ind = (alpha_ind + n_cs)%12; @@ -1249,7 +1249,7 @@ uint32_t rx_pucch(PHY_VARS_eNB *eNB, stat_max /= 12; #ifdef DEBUG_PUCCH_RX - printf("[eNB] PUCCH: stat %d, stat_max %d, phase_max %d\n", stat,stat_max,phase_max); + printf("[eNB] PUCCH: stat %d, stat_max %u, phase_max %d\n", stat,stat_max,phase_max); #endif #ifdef DEBUG_PUCCH_RX LOG_I(PHY,"[eNB] PUCCH fmt1: stat_max : %d, sigma2_dB %d (%d, %d), phase_max : %d\n",dB_fixed(stat_max),sigma2_dB,eNB->measurements.n0_subband_power_tot_dBm[6],pucch1_thres,phase_max); @@ -1358,7 +1358,7 @@ uint32_t rx_pucch(PHY_VARS_eNB *eNB, } #ifdef DEBUG_PUCCH_RX - printf("aa%d re %d : phase %d : stat %d\n",aa,re,phase,stat); + printf("aa%u re %d : phase %d : stat %d\n",aa,re,phase,stat); #endif stat1[aa] += ((((stat1_re[aa]*stat1_re[aa])) + ((stat1_im[aa]*stat1_im[aa])) + ((stat1_ref_re[aa]*stat1_ref_re[aa])) + ((stat1_ref_im[aa]*stat1_ref_im[aa])))/nsymb); @@ -1433,7 +1433,7 @@ uint32_t rx_pucch(PHY_VARS_eNB *eNB, for (re=0; re<12; re++) { #ifdef DEBUG_PUCCH_RX - printf("[eNB] PUCCH subframe %d chest0[%d][%d] => (%d,%d)\n",subframe,aa,re, + printf("[eNB] PUCCH subframe %d chest0[%u][%d] => (%d,%d)\n",subframe,aa,re, chest0_re[aa][re],chest0_im[aa][re]); #endif @@ -1472,7 +1472,7 @@ uint32_t rx_pucch(PHY_VARS_eNB *eNB, } #ifdef DEBUG_PUCCH_RX - printf("[eNB] PUCCH subframe %d chest1[%d][%d] => (%d,%d)\n",subframe,aa,re, + printf("[eNB] PUCCH subframe %d chest1[%u][%d] => (%d,%d)\n",subframe,aa,re, chest0_re[aa][re],chest0_im[aa][re]); #endif @@ -1511,7 +1511,7 @@ uint32_t rx_pucch(PHY_VARS_eNB *eNB, } #ifdef DEBUG_PUCCH_RX - printf("aa%d re %d : stat %d,%d\n",aa,re,stat_re,stat_im); + printf("aa%u re %d : stat %d,%d\n",aa,re,stat_re,stat_im); #endif } //re stat_re+=stat0_re[aa]+stat1_re[aa]; diff --git a/openair1/PHY/LTE_TRANSPORT/pucch_common.c b/openair1/PHY/LTE_TRANSPORT/pucch_common.c index 8f1fb547c2fccac07a88ab16be70ec783eeb726b..932d30ed7038ed1bd0aa165e1439e1c7f648bc0c 100644 --- a/openair1/PHY/LTE_TRANSPORT/pucch_common.c +++ b/openair1/PHY/LTE_TRANSPORT/pucch_common.c @@ -65,7 +65,7 @@ void init_ncs_cell(LTE_DL_FRAME_PARMS *frame_parms,uint8_t ncs_cell[20][7]) } #ifdef DEBUG_PUCCH_TX - printf("[PHY] PUCCH ncs_cell init (j %d): Ns %d, l %d => ncs_cell %d\n",j,ns,l,ncs_cell[ns][l]); + printf("[PHY] PUCCH ncs_cell init (j %u): Ns %d, l %d => ncs_cell %d\n",j,ns,l,ncs_cell[ns][l]); #endif } diff --git a/openair1/PHY/LTE_UE_TRANSPORT/dci_tools_ue.c b/openair1/PHY/LTE_UE_TRANSPORT/dci_tools_ue.c index 608e9ebb18db85dadb26b002f19f75db471d327c..d0f3a9da755e6df2ba013a1ad1b5dc6f7f9d7730 100644 --- a/openair1/PHY/LTE_UE_TRANSPORT/dci_tools_ue.c +++ b/openair1/PHY/LTE_UE_TRANSPORT/dci_tools_ue.c @@ -2899,7 +2899,7 @@ uint16_t quantize_subband_pmi(PHY_MEASUREMENTS *meas,uint8_t eNB_id,int nb_rb) } #ifdef DEBUG_HARQ - printf( "quantize_subband_pmi pmivect %d \n", pmivect); + printf( "quantize_subband_pmi pmivect %u \n", pmivect); #endif return(pmivect); } diff --git a/openair1/PHY/LTE_UE_TRANSPORT/dci_ue.c b/openair1/PHY/LTE_UE_TRANSPORT/dci_ue.c index 2a003019c71d563d8ef5356a36e829438e305613..78c0dd2a15dae62dee24d9217f3dddba3c87545b 100644 --- a/openair1/PHY/LTE_UE_TRANSPORT/dci_ue.c +++ b/openair1/PHY/LTE_UE_TRANSPORT/dci_ue.c @@ -1873,7 +1873,7 @@ void dci_decoding_procedure0(LTE_UE_PDCCH **pdcch_vars, CCEmap = CCEmap2; else { AssertFatal(1==0, - "Illegal CCEind %d (Yk %d, m %d, nCCE %d, L2 %d\n",CCEind,Yk,m,nCCE,L2); + "Illegal CCEind %u (Yk %u, m %u, nCCE %u, L2 %d\n",CCEind,Yk,m,nCCE,L2); } switch (L2) { diff --git a/openair1/PHY/LTE_UE_TRANSPORT/dlsch_demodulation.c b/openair1/PHY/LTE_UE_TRANSPORT/dlsch_demodulation.c index 54633fbc1812877ed19211355ae1792c4916a9fe..fb0484a5f9c32b1511dce39201ad97a87fe988b5 100644 --- a/openair1/PHY/LTE_UE_TRANSPORT/dlsch_demodulation.c +++ b/openair1/PHY/LTE_UE_TRANSPORT/dlsch_demodulation.c @@ -2239,7 +2239,7 @@ void dlsch_channel_compensation_TM56(int **rxdataF_ext, for (rb=0; rb<nb_rb; rb++) { #ifdef DEBUG_DLSCH_DEMOD - printf("mode 6 prec: rb %d, pmi->%u\n",rb,pmi_ext[rb]); + printf("mode 6 prec: rb %u, pmi->%u\n",rb,pmi_ext[rb]); #endif prec2A_TM56_128(pmi_ext[rb],&dl_ch0_128b[0],&dl_ch1_128b[0]); prec2A_TM56_128(pmi_ext[rb],&dl_ch0_128b[1],&dl_ch1_128b[1]); diff --git a/openair1/PHY/LTE_UE_TRANSPORT/drs_modulation.c b/openair1/PHY/LTE_UE_TRANSPORT/drs_modulation.c index 9de01688edc3d294df8d765e41284e8ea3f2cdb5..dc2df52bf44a3cc6b8a8e9fe9cfdf45c6eb08d7c 100644 --- a/openair1/PHY/LTE_UE_TRANSPORT/drs_modulation.c +++ b/openair1/PHY/LTE_UE_TRANSPORT/drs_modulation.c @@ -104,7 +104,7 @@ int generate_drs_pusch(PHY_VARS_UE *ue, drs_offset = 0; #ifdef DEBUG_DRS - printf("drs_modulation: Msc_RS = %d, Msc_RS_idx = %d, u=%d,v=%d\n",Msc_RS, Msc_RS_idx,u,v); + printf("drs_modulation: Msc_RS = %d, Msc_RS_idx = %d, u=%u,v=%u\n",Msc_RS, Msc_RS_idx,u,v); #endif @@ -143,7 +143,7 @@ int generate_drs_pusch(PHY_VARS_UE *ue, alpha_ind-=12; #ifdef DEBUG_DRS - printf("symbol_offset %d, alpha_ind %d , re_offset %d : (%d,%d)\n", + printf("symbol_offset %d, alpha_ind %u , re_offset %d : (%d,%d)\n", symbol_offset, alpha_ind, re_offset, diff --git a/openair1/PHY/LTE_UE_TRANSPORT/pucch_ue.c b/openair1/PHY/LTE_UE_TRANSPORT/pucch_ue.c index 6df56d6c53022de81fd392fa0e85bdc7a6462d81..8db7549b369a068b4299ba448020d1d3c328133f 100644 --- a/openair1/PHY/LTE_UE_TRANSPORT/pucch_ue.c +++ b/openair1/PHY/LTE_UE_TRANSPORT/pucch_ue.c @@ -281,7 +281,7 @@ void generate_pucch1x(int32_t **txdataF, } #ifdef DEBUG_PUCCH_TX - printf("[PHY] PUCCH subframe %d z(%d,%d) => %d,%d, alpha(%d) => %d,%d\n",subframe,l,n,((int16_t *)&zptr[n])[0],((int16_t *)&zptr[n])[1], + printf("[PHY] PUCCH subframe %d z(%d,%u) => %d,%d, alpha(%d) => %d,%d\n",subframe,l,n,((int16_t *)&zptr[n])[0],((int16_t *)&zptr[n])[1], alpha_ind,alpha_re[alpha_ind],alpha_im[alpha_ind]); #endif alpha_ind = (alpha_ind + n_cs)%12; diff --git a/openair1/PHY/LTE_UE_TRANSPORT/ulsch_coding.c b/openair1/PHY/LTE_UE_TRANSPORT/ulsch_coding.c index 293ebc2a4fca4d92f44788cd2bc71b7f7efa2c22..435a83bf8e32a92708ef9a9d807bd955e6108b36 100644 --- a/openair1/PHY/LTE_UE_TRANSPORT/ulsch_coding.c +++ b/openair1/PHY/LTE_UE_TRANSPORT/ulsch_coding.c @@ -308,9 +308,9 @@ uint32_t ulsch_encoding(uint8_t *a, Kr_bytes = Kr>>3; #ifdef DEBUG_ULSCH_CODING - printf("Generating Code Segment %d (%d bits)\n",r,Kr); + printf("Generating Code Segment %u (%u bits)\n",r,Kr); // generate codewords - printf("bits_per_codeword (Kr)= %d\n",Kr); + printf("bits_per_codeword (Kr)= %u\n",Kr); printf("N_RB = %d\n",ulsch->harq_processes[harq_pid]->nb_rb); printf("Ncp %d\n",frame_parms->Ncp); printf("Qm %d\n",Q_m); @@ -469,7 +469,7 @@ uint32_t ulsch_encoding(uint8_t *a, for (r=0; r<ulsch->harq_processes[harq_pid]->C; r++) { #ifdef DEBUG_ULSCH_CODING - printf("Rate Matching, Code segment %d (coded bits (G) %d,unpunctured/repeated bits per code segment %d,mod_order %d, nb_rb %d)...\n", + printf("Rate Matching, Code segment %u (coded bits (G) %u,unpunctured/repeated bits per code segment %u,mod_order %d, nb_rb %d)...\n", r, G, Kr*3, @@ -567,7 +567,7 @@ uint32_t ulsch_encoding(uint8_t *a, // Do ACK coding, Section 5.2.2.6 36.213 (p.23-24 in v8.6) wACK_idx = (ulsch->bundling==0) ? 4 : ((Nbundled-1)&3); #ifdef DEBUG_ULSCH_CODING - printf("ulsch_coding.c: Bundling %d, Nbundled %d, wACK_idx %d\n", + printf("ulsch_coding.c: Bundling %d, Nbundled %d, wACK_idx %u\n", ulsch->bundling,Nbundled,wACK_idx); #endif @@ -784,7 +784,7 @@ uint32_t ulsch_encoding(uint8_t *a, for (q=0; q<Q_m; q++) { y[q+(Q_m*((r*Cmux) + columnset[j]))] = ulsch->q_ACK[(q+(Q_m*i))%len_ACK]; #ifdef DEBUG_ULSCH_CODING - printf("ulsch_coding.c: ACK %d => y[%d]=%d (i %d, r*Cmux %d, columnset %d)\n",q+(Q_m*i), + printf("ulsch_coding.c: ACK %u => y[%u]=%d (i %d, r*Cmux %u, columnset %d)\n",q+(Q_m*i), q+(Q_m*((r*Cmux) + columnset[j])),ulsch->q_ACK[(q+(Q_m*i))%len_ACK], i,r*Cmux,columnset[j]); #endif diff --git a/openair1/PHY/LTE_UE_TRANSPORT/ulsch_modulation.c b/openair1/PHY/LTE_UE_TRANSPORT/ulsch_modulation.c index 838da362892340642a9565b4d3c3196216f826c9..521bbe6babef1b4ccd5e36d4bbc3b6803796fe2a 100644 --- a/openair1/PHY/LTE_UE_TRANSPORT/ulsch_modulation.c +++ b/openair1/PHY/LTE_UE_TRANSPORT/ulsch_modulation.c @@ -417,12 +417,12 @@ void ulsch_modulation(int32_t **txdataF, nb_rb = ulsch->harq_processes[harq_pid]->nb_rb; if (nb_rb == 0) { - printf("ulsch_modulation.c: Frame %d, Subframe %d Illegal nb_rb %d\n",frame,subframe,nb_rb); + printf("ulsch_modulation.c: Frame %u, Subframe %u Illegal nb_rb %d\n",frame,subframe,nb_rb); return; } if (first_rb > frame_parms->N_RB_UL) { - printf("ulsch_modulation.c: Frame %d, Subframe %d Illegal first_rb %d\n",frame,subframe,first_rb); + printf("ulsch_modulation.c: Frame %u, Subframe %u Illegal first_rb %d\n",frame,subframe,first_rb); return; } @@ -707,7 +707,7 @@ void ulsch_modulation(int32_t **txdataF, re_offset = re_offset0; symbol_offset = (uint32_t)frame_parms->ofdm_symbol_size*(l+(subframe*nsymb)); #ifdef DEBUG_ULSCH_MODULATION - printf("ulsch_mod (SC-FDMA) symbol %d (subframe %d): symbol_offset %d\n",l,subframe,symbol_offset); + printf("ulsch_mod (SC-FDMA) symbol %d (subframe %u): symbol_offset %u\n",l,subframe,symbol_offset); #endif txptr = &txdataF[0][symbol_offset]; diff --git a/openair1/PHY/NR_ESTIMATION/nr_ul_channel_estimation.c b/openair1/PHY/NR_ESTIMATION/nr_ul_channel_estimation.c index a66c7ea24742623273dd2d2d8cfd7c9c79ac33ab..d3a80842572d42d477d32fe47a0cf8d721622072 100644 --- a/openair1/PHY/NR_ESTIMATION/nr_ul_channel_estimation.c +++ b/openair1/PHY/NR_ESTIMATION/nr_ul_channel_estimation.c @@ -257,7 +257,8 @@ int nr_pusch_channel_estimation(PHY_VARS_gNB *gNB, #ifdef DEBUG_PUSCH re_offset = (k0 + (n << 2) + (k_line << 1)) % symbolSize; c16_t *rxF = &rxdataF[soffset + re_offset]; - printf("ch -> (%4d,%4d), ch_delay_comp -> (%4d,%4d)\n", ul_ls_est[k].r, ul_ls_est[k].i, ch16.r, ch16.i); + printf("pilot %4d: pil -> (%6d,%6d), rxF -> (%4d,%4d), ch -> (%4d,%4d)\n", + pilot_cnt, pil->r, pil->i, rxF->r, rxF->i, ch.r, ch.i); #endif if (pilot_cnt == 0) { diff --git a/openair1/PHY/NR_TRANSPORT/nr_dci.c b/openair1/PHY/NR_TRANSPORT/nr_dci.c index 81d7ebe5619ee9c4d0cc1678588de370b193bedd..6f1a1126694c9092401353336bcd1b53b9460c61 100644 --- a/openair1/PHY/NR_TRANSPORT/nr_dci.c +++ b/openair1/PHY/NR_TRANSPORT/nr_dci.c @@ -145,7 +145,7 @@ void nr_generate_dci(PHY_VARS_gNB *gNB, printf("polar rnti %x,length %d, L %d\n",n_RNTI, dci_pdu->PayloadSizeBits,pdcch_pdu_rel15->dci_pdu->AggregationLevel); printf("DCI PDU: [0]->0x%lx \t [1]->0x%lx\n", ((uint64_t*)dci_pdu->Payload)[0], ((uint64_t*)dci_pdu->Payload)[1]); - printf("Encoded Payload (length:%d dwords):\n", encoded_length>>5); + printf("Encoded Payload (length:%u dwords):\n", encoded_length>>5); for (int i=0; i<encoded_length>>5; i++) printf("[%d]->0x%08x \t", i,encoder_output[i]); diff --git a/openair1/PHY/NR_TRANSPORT/nr_dlsch.c b/openair1/PHY/NR_TRANSPORT/nr_dlsch.c index fe9ef9e3562d1bc35fa46236060561961fdf1964..30359a25a956d0f908d1525919e6528a0697de0d 100644 --- a/openair1/PHY/NR_TRANSPORT/nr_dlsch.c +++ b/openair1/PHY/NR_TRANSPORT/nr_dlsch.c @@ -188,7 +188,7 @@ void nr_generate_pdsch(processingData_L1tx_t *msgTx, VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME(VCD_SIGNAL_DUMPER_FUNCTIONS_gNB_PDSCH_MODULATION, 0); stop_meas(dlsch_modulation_stats); #ifdef DEBUG_DLSCH - printf("PDSCH Modulation: Qm %d(%d)\n", Qm, nb_re); + printf("PDSCH Modulation: Qm %d(%u)\n", Qm, nb_re); for (int i=0; i<nb_re>>3; i++) { for (int j=0; j<8; j++) { printf("%d %d\t", mod_symbs[0][((i<<3)+j)<<1], mod_symbs[0][(((i<<3)+j)<<1)+1]); @@ -231,7 +231,7 @@ void nr_generate_pdsch(processingData_L1tx_t *msgTx, txdataF_precoding[layer] = (int16_t *)malloc16(2*14*frame_parms->ofdm_symbol_size*sizeof(int16_t)); #ifdef DEBUG_DLSCH_MAPPING - printf("PDSCH resource mapping started (start SC %d\tstart symbol %d\tN_PRB %d\tnb_re %d,nb_layers %d)\n", + printf("PDSCH resource mapping started (start SC %d\tstart symbol %d\tN_PRB %d\tnb_re %u,nb_layers %d)\n", start_sc, rel15->StartSymbolIndex, rel15->rbSize, nb_re,rel15->nrOfLayers); #endif @@ -337,7 +337,7 @@ void nr_generate_pdsch(processingData_L1tx_t *msgTx, txdataF_precoding[nl][((l*frame_parms->ofdm_symbol_size + k)<<1) ] = (Wt[l_prime]*Wf[k_prime]*amp*mod_dmrs[dmrs_idx<<1]) >> 15; txdataF_precoding[nl][((l*frame_parms->ofdm_symbol_size + k)<<1) + 1 ] = (Wt[l_prime]*Wf[k_prime]*amp*mod_dmrs[(dmrs_idx<<1) + 1]) >> 15; #ifdef DEBUG_DLSCH_MAPPING - printf("dmrs_idx %d\t l %d \t k %d \t k_prime %d \t n %d \t txdataF: %d %d\n", + printf("dmrs_idx %u\t l %d \t k %d \t k_prime %d \t n %d \t txdataF: %d %d\n", dmrs_idx, l, k, k_prime, n, txdataF_precoding[nl][((l*frame_parms->ofdm_symbol_size + k)<<1)], txdataF_precoding[nl][((l*frame_parms->ofdm_symbol_size + k)<<1) + 1]); #endif @@ -362,7 +362,7 @@ void nr_generate_pdsch(processingData_L1tx_t *msgTx, txdataF_precoding[nl][((l*frame_parms->ofdm_symbol_size + k)<<1) ] = (amp * tx_layers[nl][m<<1]) >> 15; txdataF_precoding[nl][((l*frame_parms->ofdm_symbol_size + k)<<1) + 1] = (amp * tx_layers[nl][(m<<1) + 1]) >> 15; #ifdef DEBUG_DLSCH_MAPPING - printf("m %d\t l %d \t k %d \t txdataF: %d %d\n", + printf("m %u\t l %d \t k %d \t txdataF: %d %d\n", m, l, k, txdataF_precoding[nl][((l*frame_parms->ofdm_symbol_size + k)<<1)], txdataF_precoding[nl][((l*frame_parms->ofdm_symbol_size + k)<<1) + 1]); #endif @@ -414,12 +414,9 @@ void nr_generate_pdsch(processingData_L1tx_t *msgTx, _mm_storeu_si128(txF + i, _mm_mulhrs_epi16(amp64, txL)); #ifdef DEBUG_DLSCH_MAPPING if ((i&1) > 0) - printf("m %d\t l %d \t k %d \t txdataF: %d %d\n", - m, - l, - start_sc + (i >> 1), - txdataF_precoding[nl][((l * frame_parms->ofdm_symbol_size + start_sc + (i >> 1)) << 1)], - txdataF_precoding[nl][((l * frame_parms->ofdm_symbol_size + start_sc + (i >> 1)) << 1) + 1]); + printf("m %u\t l %d \t k %d \t txdataF: %d %d\n", + m, l, start_sc+(i>>1), txdataF_precoding[nl][((l*frame_parms->ofdm_symbol_size + start_sc+(i>>1))<<1)], + txdataF_precoding[nl][((l*frame_parms->ofdm_symbol_size + start_sc+(i>>1))<<1) + 1]); #endif /* handle this, mute RE */ /*else { @@ -444,13 +441,10 @@ void nr_generate_pdsch(processingData_L1tx_t *msgTx, const __m128i txL = _mm_loadu_si128(txl + i); _mm_storeu_si128(txF + i, _mm_mulhrs_epi16(amp64, txL)); #ifdef DEBUG_DLSCH_MAPPING - if ((i & 1) > 0) - printf("m %d\t l %d \t k %d \t txdataF: %d %d\n", - m, - l, - i >> 1, - txdataF_precoding[nl][((l * frame_parms->ofdm_symbol_size + (i >> 1)) << 1)], - txdataF_precoding[nl][((l * frame_parms->ofdm_symbol_size + (i >> 1)) << 1) + 1]); + if ((i&1) > 0) + printf("m %u\t l %d \t k %d \t txdataF: %d %d\n", + m, l, i>>1, txdataF_precoding[nl][((l*frame_parms->ofdm_symbol_size + (i>>1))<<1) ], + txdataF_precoding[nl][((l*frame_parms->ofdm_symbol_size + (i>>1))<<1) + 1]); #endif /* handle this, mute RE */ /*else { diff --git a/openair1/PHY/NR_TRANSPORT/nr_pbch.c b/openair1/PHY/NR_TRANSPORT/nr_pbch.c index e34102e0c7316516e9a771d21b1011b7c434170c..692776b8cbd3ca611d5425c3611a8ad35a0635d4 100644 --- a/openair1/PHY/NR_TRANSPORT/nr_pbch.c +++ b/openair1/PHY/NR_TRANSPORT/nr_pbch.c @@ -66,7 +66,7 @@ int nr_generate_pbch_dmrs(uint32_t *gold_pbch_dmrs, mod_dmrs[m<<1] = nr_qpsk_mod_table[idx<<1]; mod_dmrs[(m<<1)+1] = nr_qpsk_mod_table[(idx<<1) + 1]; #ifdef DEBUG_PBCH_DMRS - printf("m %d idx %d gold seq %d b0-b1 %d-%d mod_dmrs %d %d\n", m, idx, gold_pbch_dmrs[(m<<1)>>5], (((gold_pbch_dmrs[(m<<1)>>5])>>((m<<1)&0x1f))&1), + printf("m %d idx %d gold seq %u b0-b1 %d-%d mod_dmrs %d %d\n", m, idx, gold_pbch_dmrs[(m<<1)>>5], (((gold_pbch_dmrs[(m<<1)>>5])>>((m<<1)&0x1f))&1), (((gold_pbch_dmrs[((m<<1)+1)>>5])>>(((m<<1)+1)&0x1f))&1), mod_dmrs[(m<<1)], mod_dmrs[(m<<1)+1]); #endif } diff --git a/openair1/PHY/NR_TRANSPORT/nr_ulsch_demodulation.c b/openair1/PHY/NR_TRANSPORT/nr_ulsch_demodulation.c index 8cf4226922ee791dbd864bca14b3ed3034a3ad21..84baea984458a2deef80419927112dfc26fd4e87 100644 --- a/openair1/PHY/NR_TRANSPORT/nr_ulsch_demodulation.c +++ b/openair1/PHY/NR_TRANSPORT/nr_ulsch_demodulation.c @@ -383,7 +383,7 @@ void nr_ulsch_extract_rbs(c16_t **rxdataF, ul_ch0_ext_index++; #ifdef DEBUG_RB_EXT - printf("dmrs symb %d: rxF_ext[%d] = (%d,%d), ul_ch0_ext[%d] = (%d,%d)\n", + printf("dmrs symb %d: rxF_ext[%u] = (%d,%d), ul_ch0_ext[%u] = (%d,%d)\n", is_dmrs_symbol,rxF_ext_index>>1, rxF_ext[rxF_ext_index],rxF_ext[rxF_ext_index+1], ul_ch0_ext_index, ((int16_t*)&ul_ch0_ext[ul_ch0_ext_index])[0], ((int16_t*)&ul_ch0_ext[ul_ch0_ext_index])[1]); #endif diff --git a/openair1/PHY/NR_TRANSPORT/pucch_rx.c b/openair1/PHY/NR_TRANSPORT/pucch_rx.c index 1cbd458c8727fa5830f0c0c7cdb345a8257862ec..71142c120c38c663b8199869584a7e1284554fae 100644 --- a/openair1/PHY/NR_TRANSPORT/pucch_rx.c +++ b/openair1/PHY/NR_TRANSPORT/pucch_rx.c @@ -1541,7 +1541,7 @@ void nr_decode_pucch2(PHY_VARS_gNB *gNB, corr_re = ( corr32_re[symb][group][aa]+((int16_t*)(&prod_re[aa]))[0]+((int16_t*)(&prod_re[aa]))[8]); corr_im = ( corr32_im[symb][group][aa]+((int16_t*)(&prod_im[aa]))[0]+((int16_t*)(&prod_im[aa]))[8]); #ifdef DEBUG_NR_PUCCH_RX - printf("pucch2 cw %d group %d aa %d: (%d,%d)+(%d,%d) = (%d,%d)\n",cw,group,aa, + printf("pucch2 cw %d group %d aa %d: (%d,%d)+(%d,%d) = (%ld,%ld)\n",cw,group,aa, corr32_re[symb][group][aa],corr32_im[symb][group][aa], ((int16_t*)(&prod_re[aa]))[0]+((int16_t*)(&prod_re[aa]))[8], ((int16_t*)(&prod_im[aa]))[0]+((int16_t*)(&prod_im[aa]))[8], @@ -1558,7 +1558,7 @@ void nr_decode_pucch2(PHY_VARS_gNB *gNB, corr = corr_tmp; cw_ML=cw; #ifdef DEBUG_NR_PUCCH_RX - printf("slot %d PUCCH2 cw_ML %d, corr %llu\n",slot,cw_ML,corr); + printf("slot %d PUCCH2 cw_ML %d, corr %lu\n",slot,cw_ML,corr); #endif } } // cw loop diff --git a/openair1/PHY/NR_UE_ESTIMATION/nr_dl_channel_estimation.c b/openair1/PHY/NR_UE_ESTIMATION/nr_dl_channel_estimation.c index c75bb799dcf1a2a0fab5698b305777c0b8675361..9a98d3dc50cbfb3adca063a66ed58c319f8655f3 100644 --- a/openair1/PHY/NR_UE_ESTIMATION/nr_dl_channel_estimation.c +++ b/openair1/PHY/NR_UE_ESTIMATION/nr_dl_channel_estimation.c @@ -1203,7 +1203,7 @@ void nr_pdcch_channel_estimation(PHY_VARS_NR_UE *ue, rxF = (int16_t *)&rxdataF[aarx][(symbol_offset+k+1)]; } #ifdef DEBUG_PDCCH - printf("pilot[%d] = (%d, %d)\trxF[%d] = (%d, %d)\n", pilot_cnt, pil[0], pil[1], k+1, rxF[0], rxF[1]); + printf("pilot[%u] = (%d, %d)\trxF[%d] = (%d, %d)\n", pilot_cnt, pil[0], pil[1], k+1, rxF[0], rxF[1]); #endif ch_sum[0] += (int16_t)(((int32_t)pil[0]*rxF[0] - (int32_t)pil[1]*rxF[1])>>15); ch_sum[1] += (int16_t)(((int32_t)pil[0]*rxF[1] + (int32_t)pil[1]*rxF[0])>>15); @@ -1281,7 +1281,7 @@ void NFAPI_NR_DMRS_TYPE1_linear_interp(NR_DL_FRAME_PARMS *frame_parms, } #ifdef DEBUG_PDSCH - printf("pilot %3u: pil -> (%6d,%6d), rxF -> (%4d,%4d), ch -> (%4d,%4d) \n", pilot_cnt, pil->r, pil->i, rxF[re_offset].r, rxF[re_offset].i, ch.r, ch.i); + printf("pilot %3d: pil -> (%6d,%6d), rxF -> (%4d,%4d), ch -> (%4d,%4d) \n", pilot_cnt, pil->r, pil->i, rxF[re_offset].r, rxF[re_offset].i, ch.r, ch.i); #endif if (pilot_cnt == 0) { // Treat first pilot @@ -1441,13 +1441,13 @@ void NFAPI_NR_DMRS_TYPE2_linear_interp(NR_DL_FRAME_PARMS *frame_parms, for (int pilot_cnt = 0; pilot_cnt < 4 * nb_rb_pdsch; pilot_cnt += 2) { ch_l = c16mulShift(*pil, rxF[re_offset], 15); #ifdef DEBUG_PDSCH - printf("pilot %3u: pil -> (%6d,%6d), rxF -> (%4d,%4d), ch -> (%4d,%4d) \n", pilot_cnt, pil->r, pil->i, rxF[re_offset].r, rxF[re_offset].i, ch_l.r, ch_l.i); + printf("pilot %3d: pil -> (%6d,%6d), rxF -> (%4d,%4d), ch -> (%4d,%4d) \n", pilot_cnt, pil->r, pil->i, rxF[re_offset].r, rxF[re_offset].i, ch_l.r, ch_l.i); #endif pil++; re_offset = (re_offset + 1) % frame_parms->ofdm_symbol_size; ch_r = c16mulShift(*pil, rxF[re_offset], 15); #ifdef DEBUG_PDSCH - printf("pilot %3u: pil -> (%6d,%6d), rxF -> (%4d,%4d), ch -> (%4d,%4d) \n", pilot_cnt, pil->r, pil->i, rxF[re_offset].r, rxF[re_offset].i, ch_r.r, ch_r.i); + printf("pilot %3d: pil -> (%6d,%6d), rxF -> (%4d,%4d), ch -> (%4d,%4d) \n", pilot_cnt, pil->r, pil->i, rxF[re_offset].r, rxF[re_offset].i, ch_r.r, ch_r.i); #endif ch = c16addShift(ch_l, ch_r, 1); if (pilot_cnt == 1) { diff --git a/openair1/PHY/NR_UE_TRANSPORT/dci_nr.c b/openair1/PHY/NR_UE_TRANSPORT/dci_nr.c index 494e8a7de0d8e9e8dc98b96bea65bc9e0f223e38..89532612c513f2998233bcac6e38f57b13a4b9ea 100644 --- a/openair1/PHY/NR_UE_TRANSPORT/dci_nr.c +++ b/openair1/PHY/NR_UE_TRANSPORT/dci_nr.c @@ -777,7 +777,7 @@ int32_t nr_rx_pdcch(PHY_VARS_NR_UE *ue, #endif #ifdef DEBUG_DCI_DECODING - printf("demapping: slot %d, mi %d\n",slot,get_mi(frame_parms,slot)); + printf("demapping: slot %u, mi %d\n",slot,get_mi(frame_parms,slot)); #endif } diff --git a/openair1/PHY/NR_UE_TRANSPORT/nr_ulsch_coding.c b/openair1/PHY/NR_UE_TRANSPORT/nr_ulsch_coding.c index d74ad1372e9074cdaee70885523fd146e278ff63..7bf7d8c48629ae620a1ea780a5d3b84741de778f 100644 --- a/openair1/PHY/NR_UE_TRANSPORT/nr_ulsch_coding.c +++ b/openair1/PHY/NR_UE_TRANSPORT/nr_ulsch_coding.c @@ -267,7 +267,7 @@ int nr_ulsch_encoding(PHY_VARS_NR_UE *ue, #ifdef DEBUG_ULSCH_CODING for (int i =0; i<16; i++) - printf("output ratematching e[%d]= %d r_offset %d\n", i,harq_process->e[i+r_offset], r_offset); + printf("output ratematching e[%d]= %d r_offset %u\n", i,harq_process->e[i+r_offset], r_offset); #endif /////////// @@ -295,7 +295,7 @@ int nr_ulsch_encoding(PHY_VARS_NR_UE *ue, #ifdef DEBUG_ULSCH_CODING for (int i =0; i<16; i++) - printf("output interleaving f[%d]= %d r_offset %d\n", i,harq_process->f[i+r_offset], r_offset); + printf("output interleaving f[%d]= %d r_offset %u\n", i,harq_process->f[i+r_offset], r_offset); if (r==harq_process->C-1) write_output("enc_output.m","enc",harq_process->f,G,1,4); diff --git a/openair1/PHY/NR_UE_TRANSPORT/nr_ulsch_ue.c b/openair1/PHY/NR_UE_TRANSPORT/nr_ulsch_ue.c index 1d21987e8a48083c1c87613591b1c3070f76118a..1a52d3edd96a506a3e31d0b9bf2dc61d9058eecc 100644 --- a/openair1/PHY/NR_UE_TRANSPORT/nr_ulsch_ue.c +++ b/openair1/PHY/NR_UE_TRANSPORT/nr_ulsch_ue.c @@ -312,7 +312,7 @@ void nr_ue_ulsch_procedures(PHY_VARS_NR_UE *UE, LOG_D(PHY,"Transform precoding being done on data- symbol: %d, nb_re_pusch: %d, y_offset: %d\n", l, nb_re_pusch, y_offset); #ifdef DEBUG_PUSCH_MAPPING - printf("NR_ULSCH_UE: y_offset %d\t nb_re_pusch %d \t Symbol %d \t nb_rb %d \n", + printf("NR_ULSCH_UE: y_offset %u\t nb_re_pusch %u \t Symbol %d \t nb_rb %d \n", y_offset, nb_re_pusch, l, nb_rb); #endif } @@ -320,7 +320,7 @@ void nr_ue_ulsch_procedures(PHY_VARS_NR_UE *UE, #ifdef DEBUG_DFT_IDFT int32_t debug_symbols[MAX_NUM_NR_RE] __attribute__ ((aligned(16))); int offset = 0; - printf("NR_ULSCH_UE: available_bits: %d, mod_order: %d", available_bits,mod_order); + printf("NR_ULSCH_UE: available_bits: %u, mod_order: %d", available_bits,mod_order); for (int ll = 0; ll < (available_bits/mod_order); ll++) { debug_symbols[ll] = ulsch_ue->y[ll]; diff --git a/openair1/PHY/NR_UE_TRANSPORT/pucch_nr.c b/openair1/PHY/NR_UE_TRANSPORT/pucch_nr.c index b443c4dfbf6fc99fdc0f5ff813932faaf8344c50..d88c0d4a5259ce40af1c86b22a05da4aff2704b5 100644 --- a/openair1/PHY/NR_UE_TRANSPORT/pucch_nr.c +++ b/openair1/PHY/NR_UE_TRANSPORT/pucch_nr.c @@ -146,7 +146,7 @@ void nr_generate_pucch0(PHY_VARS_NR_UE *ue, //txptr = &txdataF[0][re_offset]; #ifdef DEBUG_NR_PUCCH_TX - printf("\t [nr_generate_pucch0] symbol %d PRB %d (%d)\n",l,prb_offset[l],re_offset); + printf("\t [nr_generate_pucch0] symbol %d PRB %d (%u)\n",l,prb_offset[l],re_offset); #endif for (int n=0; n<12; n++) { diff --git a/openair1/SIMULATION/LTE_PHY/dlsim_tm7.c b/openair1/SIMULATION/LTE_PHY/dlsim_tm7.c index 7092fd9d1e524757458e58d12715308bdc69a97e..030a6b6cc65dd505e49670bd367668a8d3a16540 100644 --- a/openair1/SIMULATION/LTE_PHY/dlsim_tm7.c +++ b/openair1/SIMULATION/LTE_PHY/dlsim_tm7.c @@ -631,9 +631,9 @@ int main(int argc, char **argv) { SCM_A, SCM_B, SCM_C, SCM_D, EPA, EVA, ETU, Rayleigh8, Rayleigh1, Rayleigh1_corr, Rayleigh1_anticorr, Rice1, Rice8); if(transmission_mode==5) - sprintf(bler_fname,"bler_tm%d_chan%d_perfce%d_ntx%d_nrx%d_mcs%d_mcsi%d_u%d_imod%d.csv",transmission_mode,channel_model,perfect_ce,n_tx_phy,n_rx,mcs1,mcs_i,dual_stream_UE,i_mod); + sprintf(bler_fname,"bler_tm%d_chan%d_perfce%u_ntx%d_nrx%d_mcs%d_mcsi%d_u%d_imod%d.csv",transmission_mode,channel_model,perfect_ce,n_tx_phy,n_rx,mcs1,mcs_i,dual_stream_UE,i_mod); else - sprintf(bler_fname,"bler_tm%d_chan%d_perfce%d_ntx%d_nrx%d_mcs%d.csv",transmission_mode,channel_model,perfect_ce,n_tx_phy,n_rx,mcs1); + sprintf(bler_fname,"bler_tm%d_chan%d_perfce%u_ntx%d_nrx%d_mcs%d.csv",transmission_mode,channel_model,perfect_ce,n_tx_phy,n_rx,mcs1); bler_fd = fopen(bler_fname,"w"); diff --git a/openair1/SIMULATION/LTE_PHY/pbchsim.c b/openair1/SIMULATION/LTE_PHY/pbchsim.c index 7d8d8e88f51167bfdd5e45b23e7346b02f5faf0e..799008c1213af4473522d04ee861a4379acbc416 100644 --- a/openair1/SIMULATION/LTE_PHY/pbchsim.c +++ b/openair1/SIMULATION/LTE_PHY/pbchsim.c @@ -362,7 +362,7 @@ int main(int argc, char **argv) { r_re2 = malloc(2*sizeof(double *)); r_im2 = malloc(2*sizeof(double *)); nsymb = (frame_parms->Ncp == 0) ? 14 : 12; - printf("FFT Size %d, Extended Prefix %d, Samples per subframe %d, Symbols per subframe %d, interf (%d,%d)\n",NUMBER_OF_OFDM_CARRIERS, + printf("FFT Size %d, Extended Prefix %d, Samples per subframe %d, Symbols per subframe %u, interf (%d,%d)\n",NUMBER_OF_OFDM_CARRIERS, frame_parms->Ncp,frame_parms->samples_per_tti,nsymb,interf1,interf2); printf("eNB1->common_vars.txdataF[0][0] = %p\n", eNB1->common_vars.txdataF[0][0]); diff --git a/openair1/SIMULATION/LTE_PHY/pdcchsim.c b/openair1/SIMULATION/LTE_PHY/pdcchsim.c index 494c9bbde6e0a95dfa549739e2e09ef6152b7df0..540911134de22af939202f9aa50ebffffd484843 100644 --- a/openair1/SIMULATION/LTE_PHY/pdcchsim.c +++ b/openair1/SIMULATION/LTE_PHY/pdcchsim.c @@ -697,7 +697,7 @@ int main(int argc, char **argv) { get_dci(frame_parms, log2L, log2Lcommon, format_selector, num_dci, n_rnti); txdata = eNB->common_vars.txdata[eNb_id]; nsymb = (eNB->frame_parms.Ncp == 0) ? 14 : 12; - printf("Subframe %d, FFT Size %d, Extended Prefix %d, Samples per subframe %d, Symbols per subframe %d\n", + printf("Subframe %d, FFT Size %d, Extended Prefix %d, Samples per subframe %d, Symbols per subframe %u\n", subframe,NUMBER_OF_OFDM_CARRIERS, eNB->frame_parms.Ncp,eNB->frame_parms.samples_per_tti,nsymb); eNB2UE = new_channel_desc_scm(eNB->frame_parms.nb_antennas_tx, @@ -804,7 +804,7 @@ int main(int argc, char **argv) { numCCE = get_nCCE(num_pdcch_symbols,&eNB->frame_parms,get_mi(&eNB->frame_parms,subframe)); if (n_frames==1) { - printf("num_dci %d, num_pddch_symbols %d, nCCE %d\n", + printf("num_dci %d, num_pddch_symbols %u, nCCE %d\n", DCI_pdu.Num_dci, num_pdcch_symbols,numCCE); } @@ -858,7 +858,7 @@ int main(int argc, char **argv) { subframe); if (n_frames==1) - printf("num_pdcch_symbols at TX %d\n",num_pdcch_symbols); + printf("num_pdcch_symbols at TX %u\n",num_pdcch_symbols); if (is_phich_subframe(&eNB->frame_parms,subframe)) { if (n_frames==1) @@ -960,7 +960,7 @@ int main(int argc, char **argv) { sigma2_dB = (double)tx_lev_dB +10*log10((double)eNB->frame_parms.ofdm_symbol_size/(double)(12*eNB->frame_parms.N_RB_DL)) - SNR; if (n_frames==1) - printf("sigma2_dB %f (SNR %f dB) tx_lev_dB %d\n",sigma2_dB,SNR,tx_lev_dB); + printf("sigma2_dB %f (SNR %f dB) tx_lev_dB %u\n",sigma2_dB,SNR,tx_lev_dB); //AWGN sigma2 = pow(10,sigma2_dB/10); @@ -1130,11 +1130,11 @@ int main(int argc, char **argv) { #endif } //trials - if (common_active) printf("SNR %f : n_errors_common = %d/%d (%e)\n", SNR,n_errors_common,n_trials_common,(double)n_errors_common/n_trials_common); + if (common_active) printf("SNR %f : n_errors_common = %d/%u (%e)\n", SNR,n_errors_common,n_trials_common,(double)n_errors_common/n_trials_common); - if (ul_active==1) printf("SNR %f : n_errors_ul = %d/%d (%e)\n", SNR,n_errors_ul,n_trials_ul,(double)n_errors_ul/n_trials_ul); + if (ul_active==1) printf("SNR %f : n_errors_ul = %d/%u (%e)\n", SNR,n_errors_ul,n_trials_ul,(double)n_errors_ul/n_trials_ul); - if (dl_active==1) printf("SNR %f : n_errors_dl = %d/%d (%e)\n", SNR,n_errors_dl,n_trials_dl,(double)n_errors_dl/n_trials_dl); + if (dl_active==1) printf("SNR %f : n_errors_dl = %d/%u (%e)\n", SNR,n_errors_dl,n_trials_dl,(double)n_errors_dl/n_trials_dl); printf("SNR %f : n_errors_cfi = %d/%d (%e)\n", SNR,n_errors_cfi,trial,(double)n_errors_cfi/trial); printf("SNR %f : n_errors_hi = %d/%d (%e)\n", SNR,n_errors_hi,trial,(double)n_errors_hi/trial); diff --git a/openair1/SIMULATION/LTE_PHY/prachsim.c b/openair1/SIMULATION/LTE_PHY/prachsim.c index 45c867db18dbd07d3e46514e653c2f30aa32c3ff..5b7c6ddeffc53900da8af3e8d11a75c3654dfb3a 100644 --- a/openair1/SIMULATION/LTE_PHY/prachsim.c +++ b/openair1/SIMULATION/LTE_PHY/prachsim.c @@ -329,7 +329,7 @@ int main(int argc, char **argv) { r_re = malloc(2*sizeof(double *)); r_im = malloc(2*sizeof(double *)); nsymb = (frame_parms->Ncp == 0) ? 14 : 12; - printf("FFT Size %d, Extended Prefix %d, Samples per subframe %d, Symbols per subframe %d\n",NUMBER_OF_OFDM_CARRIERS, + printf("FFT Size %d, Extended Prefix %d, Samples per subframe %d, Symbols per subframe %u\n",NUMBER_OF_OFDM_CARRIERS, frame_parms->Ncp,frame_parms->samples_per_tti,nsymb); msg("[SIM] Using SCM/101\n"); UE2eNB = new_channel_desc_scm(UE->frame_parms.nb_antennas_tx, @@ -493,7 +493,7 @@ int main(int argc, char **argv) { } } - printf("SNR %f dB, UE Speed %f km/h: errors %d/%d (delay %f)\n",SNR,ue_speed,prach_errors,n_frames,delay_avg/(double)(n_frames-prach_errors)); + printf("SNR %f dB, UE Speed %f km/h: errors %u/%d (delay %f)\n",SNR,ue_speed,prach_errors,n_frames,delay_avg/(double)(n_frames-prach_errors)); //printf("(%f,%f)\n",ue_speed,(double)prach_errors/(double)n_frames); } // UE Speed loop diff --git a/openair1/SIMULATION/LTE_PHY/pucchsim.c b/openair1/SIMULATION/LTE_PHY/pucchsim.c index fd0e0e44aa3a01c81be4a151fe9a0a38ef22225e..f88934d380952d7aa8d5ef48545f857e42494558 100644 --- a/openair1/SIMULATION/LTE_PHY/pucchsim.c +++ b/openair1/SIMULATION/LTE_PHY/pucchsim.c @@ -312,7 +312,7 @@ int main(int argc, char **argv) { frame_parms = &eNB->frame_parms; txdata = eNB->common_vars.txdata[eNB_id]; nsymb = (frame_parms->Ncp == 0) ? 14 : 12; - printf("FFT Size %d, Extended Prefix %d, Samples per subframe %d, Symbols per subframe %d\n",NUMBER_OF_OFDM_CARRIERS, + printf("FFT Size %d, Extended Prefix %d, Samples per subframe %d, Symbols per subframe %u\n",NUMBER_OF_OFDM_CARRIERS, frame_parms->Ncp,frame_parms->samples_per_tti,nsymb); printf("[SIM] Using SCM/101\n"); UE2eNB = new_channel_desc_scm(eNB->frame_parms.nb_antennas_tx, @@ -548,14 +548,14 @@ int main(int argc, char **argv) { } if (pucch_format==pucch_format1) - printf("pucch_trials %d : pucch1_false %d,pucch1_missed %d, N0 %d dB, stat_no_sig %f dB, stat_sig %f dB\n",pucch_tx,pucch1_false,pucch1_missed,eNB->measurements[0].n0_power_tot_dB, + printf("pucch_trials %u : pucch1_false %u,pucch1_missed %u, N0 %d dB, stat_no_sig %f dB, stat_sig %f dB\n",pucch_tx,pucch1_false,pucch1_missed,eNB->measurements[0].n0_power_tot_dB, 10*log10(stat_no_sig),10*log10(stat_sig)); else if (pucch_format==pucch_format1a) - printf("pucch_trials %d : pucch1a_errors %d\n",pucch_tx,pucch1_false); + printf("pucch_trials %u : pucch1a_errors %u\n",pucch_tx,pucch1_false); else if (pucch_format==pucch_format1b) - printf("pucch_trials %d : pucch1b_errors %d\n",pucch_tx,pucch1_false); + printf("pucch_trials %u : pucch1b_errors %u\n",pucch_tx,pucch1_false); else if (pucch_format==pucch_format3) - printf("pucch_trials %d : pucch3_errors %d\n",pucch_tx,pucch3_false); + printf("pucch_trials %u : pucch3_errors %u\n",pucch_tx,pucch3_false); } if (n_frames==1) { diff --git a/openair1/SIMULATION/LTE_PHY/scansim.c b/openair1/SIMULATION/LTE_PHY/scansim.c index 9660e2343e19a9338d3199d40afaed02d6421900..a473370f022bf045f15709b1dca5510090103f50 100644 --- a/openair1/SIMULATION/LTE_PHY/scansim.c +++ b/openair1/SIMULATION/LTE_PHY/scansim.c @@ -311,7 +311,7 @@ int main(int argc, char **argv) { r_re2 = malloc(2*sizeof(double *)); r_im2 = malloc(2*sizeof(double *)); nsymb = (frame_parms->Ncp == 0) ? 14 : 12; - printf("FFT Size %d, Extended Prefix %d, Samples per subframe %d, Symbols per subframe %d\n",NUMBER_OF_OFDM_CARRIERS, + printf("FFT Size %d, Extended Prefix %d, Samples per subframe %d, Symbols per subframe %u\n",NUMBER_OF_OFDM_CARRIERS, frame_parms->Ncp,frame_parms->samples_per_tti,nsymb); printf("PHY_vars_eNB1->lte_eNB_common_vars.txdataF[0][0] = %p\n", PHY_vars_eNB1->lte_eNB_common_vars.txdataF[0][0]); diff --git a/openair1/SIMULATION/LTE_PHY/syncsim.c b/openair1/SIMULATION/LTE_PHY/syncsim.c index 02f6f0a63b04b2c76ef5ae565ed4f9a55ee8796d..39952f6ab96694ce06b2e0f70885357e9bcc8c23 100644 --- a/openair1/SIMULATION/LTE_PHY/syncsim.c +++ b/openair1/SIMULATION/LTE_PHY/syncsim.c @@ -713,7 +713,7 @@ int main(int argc, char **argv) { r_re2 = malloc(2*sizeof(double *)); r_im2 = malloc(2*sizeof(double *)); nsymb = (frame_parms->Ncp == 0) ? 14 : 12; - printf("FFT Size %d, Extended Prefix %d, Samples per subframe %d, Symbols per subframe %d\n",NUMBER_OF_OFDM_CARRIERS, + printf("FFT Size %d, Extended Prefix %d, Samples per subframe %d, Symbols per subframe %u\n",NUMBER_OF_OFDM_CARRIERS, frame_parms->Ncp,frame_parms->samples_per_tti,nsymb); eNB2UE = new_channel_desc_scm(PHY_vars_eNB->lte_frame_parms.nb_antennas_tx, PHY_vars_UE[0]->lte_frame_parms.nb_antennas_rx, diff --git a/openair1/SIMULATION/NR_PHY/prachsim.c b/openair1/SIMULATION/NR_PHY/prachsim.c index 15ef6a16947840f9d64f410c1f54d4e0d84004aa..f4072b495a8321216e1e01aa59afe31bf2017e69 100644 --- a/openair1/SIMULATION/NR_PHY/prachsim.c +++ b/openair1/SIMULATION/NR_PHY/prachsim.c @@ -811,7 +811,7 @@ int main(int argc, char **argv){ } } - printf("SNR %f dB, UE Speed %f km/h: errors %d/%d (delay %f)\n", SNR, ue_speed, prach_errors, n_frames, delay_avg/(double)(n_frames-prach_errors)); + printf("SNR %f dB, UE Speed %f km/h: errors %u/%d (delay %f)\n", SNR, ue_speed, prach_errors, n_frames, delay_avg/(double)(n_frames-prach_errors)); if (input_fd) break; if (prach_errors) diff --git a/openair1/SIMULATION/NR_PHY/pucchsim.c b/openair1/SIMULATION/NR_PHY/pucchsim.c index f773b201fdf917eed2232c7eb46fdedce6d56f7d..fa49008adba1eb80f54c3d0395e7a248e8942bba 100644 --- a/openair1/SIMULATION/NR_PHY/pucchsim.c +++ b/openair1/SIMULATION/NR_PHY/pucchsim.c @@ -403,7 +403,7 @@ int main(int argc, char **argv) } actual_payload &= nr_bit < 64 ? (1UL << nr_bit) - 1: 0xffffffffffffffff; - printf("Transmitted payload is %ld, do_DTX = %d\n",actual_payload,do_DTX); + printf("Transmitted payload is %lu, do_DTX = %d\n",actual_payload,do_DTX); RC.gNB = calloc(1, sizeof(PHY_VARS_gNB *)); RC.gNB[0] = calloc(1,sizeof(PHY_VARS_gNB)); diff --git a/openair1/SIMULATION/TOOLS/random_channel.c b/openair1/SIMULATION/TOOLS/random_channel.c index 1aa39a3ef9feaa3789e289835a4feeb5f7150099..2804e88cceb657511c6831c7bf70f7c9a5175d83 100644 --- a/openair1/SIMULATION/TOOLS/random_channel.c +++ b/openair1/SIMULATION/TOOLS/random_channel.c @@ -497,7 +497,7 @@ void get_cexp_doppler(struct complexd *cexp_doppler, channel_desc_t *chan_desc, cexp_doppler[t_idx].i = cimag(tmp_cexp_doppler); #ifdef DOPPLER_DEBUG - printf("(%2i) t_us = %f, cos_theta = %f, fs = %f, cexp_doppler = (%f, %f)\n", t_idx, t * 1e6, cos_theta[t_idx], fs[t_idx], cexp_doppler[t_idx].r, cexp_doppler[t_idx].i); + printf("(%2u) t_us = %f, cos_theta = %f, fs = %f, cexp_doppler = (%f, %f)\n", t_idx, t * 1e6, cos_theta[t_idx], fs[t_idx], cexp_doppler[t_idx].r, cexp_doppler[t_idx].i); #endif } } diff --git a/openair1/SIMULATION/TOOLS/rangen_double.c b/openair1/SIMULATION/TOOLS/rangen_double.c index ddc453de9c0ffa6591ad1050cd653f6e55bf9d52..9c10275c17af56568489d25deb57cc9ffb4da20d 100644 --- a/openair1/SIMULATION/TOOLS/rangen_double.c +++ b/openair1/SIMULATION/TOOLS/rangen_double.c @@ -55,7 +55,7 @@ void randominit(unsigned long seed_init) unsigned long seed = seed_init; if (seed_init == 0) fill_random(&seed, sizeof(seed)); - printf("Initializing random number generator, seed %ld\n", seed); + printf("Initializing random number generator, seed %lu\n", seed); // initialize uniformrandom RNG urseed = (unsigned int) seed; diff --git a/openair2/E1AP/e1ap_setup.c b/openair2/E1AP/e1ap_setup.c index 76f8029b64502a33c2ece5551f6d7fef3056fbd6..da643636fc4888afdc63d28421d38ba9e6cbe367 100644 --- a/openair2/E1AP/e1ap_setup.c +++ b/openair2/E1AP/e1ap_setup.c @@ -84,7 +84,7 @@ MessageDef *RCconfig_NR_CU_E1(bool separate_CUUP_process) if (num_gnbs > 0) { config_getlist(&GNBParamList, GNBParams, sizeofArray(GNBParams), NULL); paramdef_t *gnbParms = GNBParamList.paramarray[0]; - AssertFatal(gnbParms[GNB_GNB_ID_IDX].uptr != NULL, "gNB id %u is not defined in configuration file\n", 0); + AssertFatal(gnbParms[GNB_GNB_ID_IDX].uptr != NULL, "gNB id %d is not defined in configuration file\n", 0); e1ap_setup_req_t *e1Setup = &E1AP_SETUP_REQ(msgConfig); msgConfig->ittiMsgHeader.destinationInstance = 0; e1Setup->gNB_cu_up_id = *(gnbParms[GNB_GNB_ID_IDX].uptr); diff --git a/openair2/ENB_APP/RRC_config_tools.c b/openair2/ENB_APP/RRC_config_tools.c index 210266ca3a660b2adeac81243b21d0c9a50bb00b..2dc00ba6ec475718ff1d9af565d03b32bcee7853 100644 --- a/openair2/ENB_APP/RRC_config_tools.c +++ b/openair2/ENB_APP/RRC_config_tools.c @@ -108,7 +108,7 @@ int config_check_band_frequencies( int ind, "enb %d uplink frequency %u too high (%u) for band %d!", ind, uplink_frequency, eutra_bands[band_index].ul_max, band); AssertError (eutra_bands[band_index].frame_type == frame_type, errors ++, - "enb %d invalid frame type (%d/%d) for band %d!", + "enb %d invalid frame type (%u/%u) for band %d!", ind, eutra_bands[band_index].frame_type, frame_type, band); } } diff --git a/openair2/ENB_APP/enb_config.c b/openair2/ENB_APP/enb_config.c index 888c567fc4f5ce080b0aeb333b57fb1663a8d59c..b817f3fabd6af461c65f0ce5c19ae07c0f905df2 100644 --- a/openair2/ENB_APP/enb_config.c +++ b/openair2/ENB_APP/enb_config.c @@ -1935,7 +1935,7 @@ int RCconfig_M2(MessageDef *msg_p, uint32_t i) { M2AP_REGISTER_ENB_REQ (msg_p).cell_type = CELL_HOME_ENB; } else { AssertFatal (0, - "Failed to parse eNB configuration file %s, enb %d unknown value \"%s\" for cell_type choice: CELL_MACRO_ENB or CELL_HOME_ENB !\n", + "Failed to parse eNB configuration file %s, enb %u unknown value \"%s\" for cell_type choice: CELL_MACRO_ENB or CELL_HOME_ENB !\n", RC.config_file_name, i, *(ENBParamList.paramarray[k][ENB_CELL_TYPE_IDX].strptr)); } diff --git a/openair2/GNB_APP/gnb_app.c b/openair2/GNB_APP/gnb_app.c index 84cbf0d424dbea1258790b97af0367e9479ba308..337f907a20698bac71d83472b1e198b5d4af392c 100644 --- a/openair2/GNB_APP/gnb_app.c +++ b/openair2/GNB_APP/gnb_app.c @@ -74,7 +74,7 @@ void configure_nr_rrc(uint32_t gnb_id) itti_send_msg_to_task (TASK_RRC_GNB, GNB_MODULE_ID_TO_INSTANCE(gnb_id), msg_p); } - else AssertFatal(0,"NRRRC context for gNB %d not allocated\n",gnb_id); + else AssertFatal(0,"NRRRC context for gNB %u not allocated\n",gnb_id); } /*------------------------------------------------------------------------------*/ diff --git a/openair2/GNB_APP/gnb_config.c b/openair2/GNB_APP/gnb_config.c index b59aa6e8232bfd7d5d12ed840dc29af221814822..60dd3c1f77adaa1eb4e2b86cd3b883228276c04a 100644 --- a/openair2/GNB_APP/gnb_config.c +++ b/openair2/GNB_APP/gnb_config.c @@ -1102,7 +1102,7 @@ void RCconfig_NRRRC(MessageDef *msg_p, uint32_t i, gNB_RRC_INST *rrc) { config_get( GNBSParams,sizeof(GNBSParams)/sizeof(paramdef_t),NULL); num_gnbs = GNBSParams[GNB_ACTIVE_GNBS_IDX].numelt; - AssertFatal (i<num_gnbs,"Failed to parse config file no %ith element in %s \n",i, GNB_CONFIG_STRING_ACTIVE_GNBS); + AssertFatal (i<num_gnbs,"Failed to parse config file no %uth element in %s \n",i, GNB_CONFIG_STRING_ACTIVE_GNBS); if (num_gnbs>0) { @@ -1158,7 +1158,7 @@ void RCconfig_NRRRC(MessageDef *msg_p, uint32_t i, gNB_RRC_INST *rrc) { } fix_scd(scd); - printf("NRRRC %d: Southbound Transport %s\n",i,*(GNBParamList.paramarray[i][GNB_TRANSPORT_S_PREFERENCE_IDX].strptr)); + printf("NRRRC %u: Southbound Transport %s\n",i,*(GNBParamList.paramarray[i][GNB_TRANSPORT_S_PREFERENCE_IDX].strptr)); rrc->node_type = get_node_type(); if (NODE_IS_CU(rrc->node_type)) { @@ -1363,7 +1363,7 @@ int RCconfig_NR_NG(MessageDef *msg_p, uint32_t i) { NGAP_REGISTER_GNB_REQ (msg_p).cell_type = CELL_HOME_ENB; } else { AssertFatal (0, - "Failed to parse gNB configuration file %s, gnb %d unknown value \"%s\" for cell_type choice: CELL_MACRO_GNB or CELL_HOME_GNB !\n", + "Failed to parse gNB configuration file %s, gnb %u unknown value \"%s\" for cell_type choice: CELL_MACRO_GNB or CELL_HOME_GNB !\n", RC.config_file_name, i, *(GNBParamList.paramarray[k][GNB_CELL_TYPE_IDX].strptr)); } @@ -1640,7 +1640,7 @@ int RCconfig_NR_X2(MessageDef *msg_p, uint32_t i) { X2AP_REGISTER_ENB_REQ (msg_p).cell_type = CELL_MACRO_GNB; }else { AssertFatal (0, - "Failed to parse eNB configuration file %s, enb %d unknown value \"%s\" for cell_type choice: CELL_MACRO_ENB or CELL_HOME_ENB !\n", + "Failed to parse eNB configuration file %s, enb %u unknown value \"%s\" for cell_type choice: CELL_MACRO_ENB or CELL_HOME_ENB !\n", RC.config_file_name, i, *(GNBParamList.paramarray[k][GNB_CELL_TYPE_IDX].strptr)); } @@ -2237,7 +2237,7 @@ void nr_read_config_and_init(void) { if (RC.nb_nr_L1_inst>0) AssertFatal(l1_north_init_gNB()==0,"could not initialize L1 north interface\n"); AssertFatal (gnb_nb <= RC.nb_nr_inst, - "Number of gNB is greater than gNB defined in configuration file (%d/%d)!", + "Number of gNB is greater than gNB defined in configuration file (%u/%u)!", gnb_nb, RC.nb_nr_inst); LOG_I(GNB_APP,"Allocating gNB_RRC_INST for %d instances\n",RC.nb_nr_inst); diff --git a/openair2/LAYER2/MAC/main.c b/openair2/LAYER2/MAC/main.c index 36f258d06cdee00fdde13fafd1cddc68fdf6d410..48fb32de8d8cb483ef5073ea9cf9b752068be01f 100644 --- a/openair2/LAYER2/MAC/main.c +++ b/openair2/LAYER2/MAC/main.c @@ -62,8 +62,8 @@ void lte_dump_mac_stats(eNB_MAC_INST *mac, FILE *fd) total_bler = (double)UE_scheduling_control->pusch_rx_error_num[CC_id] / (double)(UE_scheduling_control->pusch_rx_error_num[CC_id] + UE_scheduling_control->pusch_rx_num[CC_id]) * 100; } fprintf(fd, - "MAC UE rnti %x : %s, PHR %d DLCQI %d PUSCH %d PUCCH %d RLC disc %d UL-stat rcv %lu err %lu bler %lf (%lf/%lf) total_bler %lf mcsoff %d pre_allocated nb_rb %d, mcs %d, bsr %u sched %u " - "tbs %lu cnt %u , DL-stat tbs %lu cnt %u rb %u buf %u 1st %u ret %u ri %d inactivity timer %d\n", + "MAC UE rnti %x : %s, PHR %d DLCQI %d PUSCH %d PUCCH %d RLC disc %u UL-stat rcv %lu err %lu bler %lf (%lf/%lf) total_bler %lf mcsoff %d pre_allocated nb_rb %d, mcs %d, bsr %d sched %d " + "tbs %lu cnt %u , DL-stat tbs %lu cnt %u rb %u buf %d 1st %u ret %u ri %d inactivity timer %d\n", rnti, UE_scheduling_control->ul_out_of_sync == 0 ? "in synch" : "out of sync", UE_info->UE_template[CC_id][UE_id].phr_info, diff --git a/openair2/MCE_APP/mce_config.c b/openair2/MCE_APP/mce_config.c index bcc6b4f71b4ea23177a6a06d71953254ce52439e..ec192582a8a55c9ffb2b3b43170c57a887838a39 100644 --- a/openair2/MCE_APP/mce_config.c +++ b/openair2/MCE_APP/mce_config.c @@ -315,7 +315,7 @@ int RCconfig_m2_scheduling( m2ap_mbms_scheduling_information_t * m2ap_mbms_sche char mcepath2[MAX_OPTNAME_SIZE*2 + 8]; paramdef_t PMCH_Params[] = MCE_MBMS_PMCH_CONFIGURATION_LIST_PARAMS_DESC; paramlist_def_t PMCH_ParamList = {MCE_CONFIG_STRING_PMCH_CONFIGURATION_LIST,NULL,0}; - sprintf(mcepath2,"%s.[%i].%s.%s.[%i]","MCEs",i,MCE_CONFIG_STRING_MBMS_SCHEDULING_INFO,MCE_CONFIG_STRING_MBMS_AREA_CONFIGURATION_LIST,l); + sprintf(mcepath2,"%s.[%u].%s.%s.[%i]","MCEs",i,MCE_CONFIG_STRING_MBMS_SCHEDULING_INFO,MCE_CONFIG_STRING_MBMS_AREA_CONFIGURATION_LIST,l); //LOG_E(MCE_APP,"%s\n",mcepath2); config_getlist(&PMCH_ParamList,PMCH_Params,sizeof(PMCH_Params)/sizeof(paramdef_t),mcepath2); AssertFatal(PMCH_ParamList.numelt <= 8, "File wrong parsed\n"); @@ -327,7 +327,7 @@ int RCconfig_m2_scheduling( m2ap_mbms_scheduling_information_t * m2ap_mbms_sche char mcepath3[MAX_OPTNAME_SIZE*2 + 8]; paramdef_t MBMS_SESSION_LIST_Params[] = MCE_MBMS_MBMS_SESSION_LIST_DESC; paramlist_def_t MBMS_SESSION_LIST_ParamList = {MCE_CONFIG_STRING_MBMS_SESSION_LIST,NULL,0}; - sprintf(mcepath3,"%s.[%i].%s.%s.[%i].%s.[%i]","MCEs",i,MCE_CONFIG_STRING_MBMS_SCHEDULING_INFO,MCE_CONFIG_STRING_MBMS_AREA_CONFIGURATION_LIST,l,MCE_CONFIG_STRING_PMCH_CONFIGURATION_LIST,j); + sprintf(mcepath3,"%s.[%u].%s.%s.[%i].%s.[%i]","MCEs",i,MCE_CONFIG_STRING_MBMS_SCHEDULING_INFO,MCE_CONFIG_STRING_MBMS_AREA_CONFIGURATION_LIST,l,MCE_CONFIG_STRING_PMCH_CONFIGURATION_LIST,j); config_getlist(&MBMS_SESSION_LIST_ParamList,MBMS_SESSION_LIST_Params,sizeof(MBMS_SESSION_LIST_Params)/sizeof(paramdef_t),mcepath3); //LOG_E(MCE_APP,"%s ---- %d\n",mcepath3, MBMS_SESSION_LIST_ParamList.numelt); AssertFatal(MBMS_SESSION_LIST_ParamList.numelt <= 8, "File wrong parsed\n"); @@ -354,7 +354,7 @@ int RCconfig_m2_scheduling( m2ap_mbms_scheduling_information_t * m2ap_mbms_sche char mcepath5[MAX_OPTNAME_SIZE*8 + 8]; paramdef_t PLNMParams[] = MCE_PLMN_PARAMS_DESC; - sprintf(mcepath5,"%s.[%i].%s.%s.[%i].%s.[%i].%s.[%i].%s","MCEs",i,MCE_CONFIG_STRING_MBMS_SCHEDULING_INFO,MCE_CONFIG_STRING_MBMS_AREA_CONFIGURATION_LIST,l,MCE_CONFIG_STRING_PMCH_CONFIGURATION_LIST,j,MCE_CONFIG_STRING_MBMS_SESSION_LIST,k,MCE_CONFIG_STRING_PLMN); + sprintf(mcepath5,"%s.[%u].%s.%s.[%i].%s.[%i].%s.[%i].%s","MCEs",i,MCE_CONFIG_STRING_MBMS_SCHEDULING_INFO,MCE_CONFIG_STRING_MBMS_AREA_CONFIGURATION_LIST,l,MCE_CONFIG_STRING_PMCH_CONFIGURATION_LIST,j,MCE_CONFIG_STRING_MBMS_SESSION_LIST,k,MCE_CONFIG_STRING_PLMN); config_get(PLNMParams,sizeof(PLNMParams)/sizeof(paramdef_t),mcepath5); //LOG_E(MCE_APP,"PLNM %d\n",*(PLNMParams[MCE_CONFIG_STRING_MNC_LENGTH_IDX].uptr)); m2ap_mbms_scheduling_information->mbms_area_config_list[l].pmch_config_list[j].mbms_session_list[k].mcc = *(PLNMParams[MCE_CONFIG_STRING_MCC_IDX].uptr); @@ -377,7 +377,7 @@ int RCconfig_m2_scheduling( m2ap_mbms_scheduling_information_t * m2ap_mbms_sche } paramdef_t MBSFN_SF_Params[] = MCE_MBMS_MBMS_SF_CONFIGURATION_LIST_PARAMS_DESC; paramlist_def_t MBSFN_SF_ParamList = {MCE_CONFIG_STRING_MBMS_SF_CONFIGURATION_LIST,NULL,0}; - sprintf(mcepath2,"%s.[%i].%s.%s.[%i]","MCEs",i,MCE_CONFIG_STRING_MBMS_SCHEDULING_INFO,MCE_CONFIG_STRING_MBMS_AREA_CONFIGURATION_LIST,l); + sprintf(mcepath2,"%s.[%u].%s.%s.[%i]","MCEs",i,MCE_CONFIG_STRING_MBMS_SCHEDULING_INFO,MCE_CONFIG_STRING_MBMS_AREA_CONFIGURATION_LIST,l); //LOG_E(MCE_APP,"%s\n",mcepath2); config_getlist(&MBSFN_SF_ParamList,MBSFN_SF_Params,sizeof(MBSFN_SF_Params)/sizeof(paramdef_t),mcepath2); AssertFatal(MBSFN_SF_ParamList.numelt <= 8, "File wrong parsed\n"); @@ -423,7 +423,7 @@ int RCconfig_M2_SCHEDULING(MessageDef *msg_p, uint32_t i) { char mcepath2[MAX_OPTNAME_SIZE*2 + 8]; paramdef_t PMCH_Params[] = MCE_MBMS_PMCH_CONFIGURATION_LIST_PARAMS_DESC; paramlist_def_t PMCH_ParamList = {MCE_CONFIG_STRING_PMCH_CONFIGURATION_LIST,NULL,0}; - sprintf(mcepath2,"%s.[%i].%s.%s.[%i]","MCEs",i,MCE_CONFIG_STRING_MBMS_SCHEDULING_INFO,MCE_CONFIG_STRING_MBMS_AREA_CONFIGURATION_LIST,l); + sprintf(mcepath2,"%s.[%u].%s.%s.[%i]","MCEs",i,MCE_CONFIG_STRING_MBMS_SCHEDULING_INFO,MCE_CONFIG_STRING_MBMS_AREA_CONFIGURATION_LIST,l); //LOG_E(MCE_APP,"%s\n",mcepath2); config_getlist(&PMCH_ParamList,PMCH_Params,sizeof(PMCH_Params)/sizeof(paramdef_t),mcepath2); AssertFatal(PMCH_ParamList.numelt <= 8, "File wrong parsed\n"); @@ -435,7 +435,7 @@ int RCconfig_M2_SCHEDULING(MessageDef *msg_p, uint32_t i) { char mcepath3[MAX_OPTNAME_SIZE*2 + 8]; paramdef_t MBMS_SESSION_LIST_Params[] = MCE_MBMS_MBMS_SESSION_LIST_DESC; paramlist_def_t MBMS_SESSION_LIST_ParamList = {MCE_CONFIG_STRING_MBMS_SESSION_LIST,NULL,0}; - sprintf(mcepath3,"%s.[%i].%s.%s.[%i].%s.[%i]","MCEs",i,MCE_CONFIG_STRING_MBMS_SCHEDULING_INFO,MCE_CONFIG_STRING_MBMS_AREA_CONFIGURATION_LIST,l,MCE_CONFIG_STRING_PMCH_CONFIGURATION_LIST,j); + sprintf(mcepath3,"%s.[%u].%s.%s.[%i].%s.[%i]","MCEs",i,MCE_CONFIG_STRING_MBMS_SCHEDULING_INFO,MCE_CONFIG_STRING_MBMS_AREA_CONFIGURATION_LIST,l,MCE_CONFIG_STRING_PMCH_CONFIGURATION_LIST,j); config_getlist(&MBMS_SESSION_LIST_ParamList,MBMS_SESSION_LIST_Params,sizeof(MBMS_SESSION_LIST_Params)/sizeof(paramdef_t),mcepath3); //LOG_E(MCE_APP,"%s ---- %d\n",mcepath3, MBMS_SESSION_LIST_ParamList.numelt); AssertFatal(MBMS_SESSION_LIST_ParamList.numelt <= 8, "File wrong parsed\n"); @@ -462,7 +462,7 @@ int RCconfig_M2_SCHEDULING(MessageDef *msg_p, uint32_t i) { char mcepath5[MAX_OPTNAME_SIZE*8 + 8]; paramdef_t PLNMParams[] = MCE_PLMN_PARAMS_DESC; - sprintf(mcepath5,"%s.[%i].%s.%s.[%i].%s.[%i].%s.[%i].%s","MCEs",i,MCE_CONFIG_STRING_MBMS_SCHEDULING_INFO,MCE_CONFIG_STRING_MBMS_AREA_CONFIGURATION_LIST,l,MCE_CONFIG_STRING_PMCH_CONFIGURATION_LIST,j,MCE_CONFIG_STRING_MBMS_SESSION_LIST,k,MCE_CONFIG_STRING_PLMN); + sprintf(mcepath5,"%s.[%u].%s.%s.[%i].%s.[%i].%s.[%i].%s","MCEs",i,MCE_CONFIG_STRING_MBMS_SCHEDULING_INFO,MCE_CONFIG_STRING_MBMS_AREA_CONFIGURATION_LIST,l,MCE_CONFIG_STRING_PMCH_CONFIGURATION_LIST,j,MCE_CONFIG_STRING_MBMS_SESSION_LIST,k,MCE_CONFIG_STRING_PLMN); config_get(PLNMParams,sizeof(PLNMParams)/sizeof(paramdef_t),mcepath5); //LOG_E(MCE_APP,"PLNM %d\n",*(PLNMParams[MCE_CONFIG_STRING_MNC_LENGTH_IDX].uptr)); M2AP_MBMS_SCHEDULING_INFORMATION(msg_p).mbms_area_config_list[l].pmch_config_list[j].mbms_session_list[k].mcc = *(PLNMParams[MCE_CONFIG_STRING_MCC_IDX].uptr); @@ -485,7 +485,7 @@ int RCconfig_M2_SCHEDULING(MessageDef *msg_p, uint32_t i) { } paramdef_t MBSFN_SF_Params[] = MCE_MBMS_MBMS_SF_CONFIGURATION_LIST_PARAMS_DESC; paramlist_def_t MBSFN_SF_ParamList = {MCE_CONFIG_STRING_MBMS_SF_CONFIGURATION_LIST,NULL,0}; - sprintf(mcepath2,"%s.[%i].%s.%s.[%i]","MCEs",i,MCE_CONFIG_STRING_MBMS_SCHEDULING_INFO,MCE_CONFIG_STRING_MBMS_AREA_CONFIGURATION_LIST,l); + sprintf(mcepath2,"%s.[%u].%s.%s.[%i]","MCEs",i,MCE_CONFIG_STRING_MBMS_SCHEDULING_INFO,MCE_CONFIG_STRING_MBMS_AREA_CONFIGURATION_LIST,l); //LOG_E(MCE_APP,"%s\n",mcepath2); config_getlist(&MBSFN_SF_ParamList,MBSFN_SF_Params,sizeof(MBSFN_SF_Params)/sizeof(paramdef_t),mcepath2); AssertFatal(MBSFN_SF_ParamList.numelt <= 8, "File wrong parsed\n"); diff --git a/openair2/RRC/LTE/rrc_eNB.c b/openair2/RRC/LTE/rrc_eNB.c index 348e1a9fd44538bb13a4c3c452b9ab3b5ac1c886..b6fdbc3d4c5f78b1acdf61ee2b57532dd8a7c463 100644 --- a/openair2/RRC/LTE/rrc_eNB.c +++ b/openair2/RRC/LTE/rrc_eNB.c @@ -7214,12 +7214,12 @@ void rrc_subframe_process(protocol_ctxt_t *const ctxt_pP, const int CC_id) { if ((ctxt_pP->frame&127) == 0 && ctxt_pP->subframe ==0) { if (fd) { if (ue_context_p->ue_context.Initialue_identity_s_TMSI.presence == true) { - fprintf(fd,"RRC UE rnti %x: S-TMSI %x failure timer %d/8\n", + fprintf(fd,"RRC UE rnti %x: S-TMSI %x failure timer %u/8\n", ue_context_p->ue_context.rnti, ue_context_p->ue_context.Initialue_identity_s_TMSI.m_tmsi, ue_context_p->ue_context.ul_failure_timer); } else { - fprintf(fd,"RRC UE rnti %x failure timer %d/8\n", + fprintf(fd,"RRC UE rnti %x failure timer %u/8\n", ue_context_p->ue_context.rnti, ue_context_p->ue_context.ul_failure_timer); } diff --git a/openair2/RRC/NR_UE/rrc_UE.c b/openair2/RRC/NR_UE/rrc_UE.c index 028807530a3d9f5eff59b5786ead8d78b3ceff63..0c4ab5e942713ce35436b4717d6f9484e94cb7b3 100644 --- a/openair2/RRC/NR_UE/rrc_UE.c +++ b/openair2/RRC/NR_UE/rrc_UE.c @@ -2678,7 +2678,7 @@ void process_lte_nsa_msg(nsa_msg_t *msg, int msg_len) uint32_t nr_RadioBearer_size = hdr.RadioBearer_size; uint32_t nr_SecondaryCellGroup_size = hdr.SecondaryCellGroup_size; AssertFatal(sizeof(hdr) + nr_RadioBearer_size + nr_SecondaryCellGroup_size <= msg_len, - "nr_RadioBearerConfig1_r15 size %d nr_SecondaryCellGroupConfig_r15 size %d sizeof(hdr) %zu, msg_len = %d\n", + "nr_RadioBearerConfig1_r15 size %u nr_SecondaryCellGroupConfig_r15 size %u sizeof(hdr) %zu, msg_len = %d\n", nr_RadioBearer_size, nr_SecondaryCellGroup_size, sizeof(hdr), msg_len); diff --git a/openair2/UTIL/OTG/otg_rx.c b/openair2/UTIL/OTG/otg_rx.c index eb123e7216676ad2bdf8b402b9c4a8c921cbc338..a14cdbf7d692b7e364c5505c85ff21e6220cef8f 100644 --- a/openair2/UTIL/OTG/otg_rx.c +++ b/openair2/UTIL/OTG/otg_rx.c @@ -447,12 +447,12 @@ int rx_check_loss( int lost_packet=0; if (seq_num==*seq_num_rx) { - LOG_D(OTG,"check_packet :: (src=%d,dst=%d, flag=0x%x) packet seq_num TX=%d, seq_num RX=%d \n",src,dst,flag, seq_num, *seq_num_rx); + LOG_D(OTG,"check_packet :: (src=%d,dst=%d, flag=0x%x) packet seq_num TX=%d, seq_num RX=%u \n",src,dst,flag, seq_num, *seq_num_rx); *seq_num_rx+=1; } /* (2) Receieved packet with a sequence number higher than the expected sequence number (there is a gap): packet loss */ else if (seq_num>*seq_num_rx) { // out of sequence packet: previous packet lost - LOG_D(OTG,"check_packet :: (src=%d,dst=%d, flag=0x%x) :: out of sequence :: packet seq_num TX=%d > seq_num RX=%d \n",src,dst,flag, seq_num, *seq_num_rx); + LOG_D(OTG,"check_packet :: (src=%d,dst=%d, flag=0x%x) :: out of sequence :: packet seq_num TX=%d > seq_num RX=%u \n",src,dst,flag, seq_num, *seq_num_rx); *nb_loss_pkts+=seq_num-(*seq_num_rx); *seq_num_rx=seq_num+1; lost_packet=1; @@ -460,9 +460,9 @@ int rx_check_loss( /* (3) Receieved packet with a sequence number less than the expected sequence number: recovery after loss/out of sequence */ else if (seq_num< *seq_num_rx) { //the received packet arrived late *nb_loss_pkts-=1; - LOG_D(OTG,"check_packet :: (src=%d,dst=%d, flag=0x%x) :: recovery after loss or out of sequence :: packet seq_num TX=%d < seq_num RX=%d \n",src,dst,flag, seq_num, *seq_num_rx); + LOG_D(OTG,"check_packet :: (src=%d,dst=%d, flag=0x%x) :: recovery after loss or out of sequence :: packet seq_num TX=%d < seq_num RX=%u \n",src,dst,flag, seq_num, *seq_num_rx); } else { - LOG_D(OTG,"check_packet :: (src=%d,dst=%d, flag=0x%x) :: packet seq_num TX=%d , seq_num RX=%d (ERROR)\n",src,dst,flag, seq_num, *seq_num_rx); + LOG_D(OTG,"check_packet :: (src=%d,dst=%d, flag=0x%x) :: packet seq_num TX=%d , seq_num RX=%u (ERROR)\n",src,dst,flag, seq_num, *seq_num_rx); lost_packet=1; } diff --git a/openair3/NAS/COMMON/API/NETWORK/nas_message.c b/openair3/NAS/COMMON/API/NETWORK/nas_message.c index 44c730038cfe35fb6c5fec11b490413ad277c72e..c5a304b84bbb9ba36daba72dec779d6e1164c377 100644 --- a/openair3/NAS/COMMON/API/NETWORK/nas_message.c +++ b/openair3/NAS/COMMON/API/NETWORK/nas_message.c @@ -1329,7 +1329,7 @@ static uint32_t _nas_message_get_mac( fprintf(stderr, "\n[NAS]\t"); for (i=0; i < length; i++) { - fprintf(stderr, "%.2hx ", (const unsigned char) buffer[i]); + fprintf(stderr, "%.2hhx ", (const unsigned char) buffer[i]); /* Add new line when the number of displayed bytes exceeds * the line's size */ diff --git a/openair3/NAS/COMMON/IES/TrackingAreaIdentityList.c b/openair3/NAS/COMMON/IES/TrackingAreaIdentityList.c index 2e700abbee24fe3cc7de36cffd9cfe521acc1d19..d68ed72a21ff6caac032f80809389be1ee7444d4 100644 --- a/openair3/NAS/COMMON/IES/TrackingAreaIdentityList.c +++ b/openair3/NAS/COMMON/IES/TrackingAreaIdentityList.c @@ -106,7 +106,7 @@ void dump_tracking_area_identity_list_xml(TrackingAreaIdentityList *trackingarea printf(" <Type of list>%u</Type of list>\n", trackingareaidentitylist->typeoflist); /* LW: number of elements is coded as N-1 (0 -> 1 element, 1 -> 2 elements...), * see 3GPP TS 24.301, section 9.9.3.33.1 */ - printf(" <Number of elements>%u</Number of elements>\n", trackingareaidentitylist->numberofelements + 1); + printf(" <Number of elements>%d</Number of elements>\n", trackingareaidentitylist->numberofelements + 1); printf(" <MCC digit 2>%u</MCC digit 2>\n", trackingareaidentitylist->mccdigit2); printf(" <MCC digit 1>%u</MCC digit 1>\n", trackingareaidentitylist->mccdigit1); printf(" <MNC digit 3>%u</MNC digit 3>\n", trackingareaidentitylist->mncdigit3); diff --git a/openair3/NAS/COMMON/UTIL/OctetString.c b/openair3/NAS/COMMON/UTIL/OctetString.c index 30830685851bea158e4b822e6b377eeae22e953e..2f1b7b2c32d1bc1d19b9c95050c9aa36f2806a06 100644 --- a/openair3/NAS/COMMON/UTIL/OctetString.c +++ b/openair3/NAS/COMMON/UTIL/OctetString.c @@ -60,7 +60,7 @@ int encode_octet_string(OctetString *octetstring, uint8_t *buffer, uint32_t bufl { if (octetstring != NULL) { if ((octetstring->value != NULL) && (octetstring->length > 0)) { - CHECK_PDU_POINTER_AND_LENGTH_ENCODER(buffer, octetstring->length, buflen); + CHECK_PDU_POINTER_AND_LENGTH_ENCODER(buffer, (int)octetstring->length, buflen); memcpy((void*)buffer, (void*)octetstring->value, octetstring->length); return octetstring->length; } else { diff --git a/openair3/NAS/COMMON/UTIL/TLVDecoder.h b/openair3/NAS/COMMON/UTIL/TLVDecoder.h index 941cbd850b22d60f39359566c511f2dd9f44fb3a..5e3210f6967f17ba9faaf43a057caeae8dcd6210 100644 --- a/openair3/NAS/COMMON/UTIL/TLVDecoder.h +++ b/openair3/NAS/COMMON/UTIL/TLVDecoder.h @@ -103,7 +103,7 @@ void tlv_decode_perror(void); } \ if (lENGTH < mINIMUMlENGTH) \ { \ - printf("(%s:%d) Expecting at least %d bytes, got %d\n", \ + printf("(%s:%d) Expecting at least %d bytes, got %u\n", \ __FILE__, __LINE__, mINIMUMlENGTH, lENGTH); \ errorCodeDecoder = TLV_DECODE_BUFFER_TOO_SHORT; \ LOG_FUNC_RETURN(TLV_DECODE_BUFFER_TOO_SHORT); \ diff --git a/openair3/NAS/COMMON/UTIL/TLVEncoder.h b/openair3/NAS/COMMON/UTIL/TLVEncoder.h index a46de3fbba2a3b5433125b2f53f86aa7935d65b0..cd63a3d315d5dfc80bc0cc6ad23a79436640b921 100644 --- a/openair3/NAS/COMMON/UTIL/TLVEncoder.h +++ b/openair3/NAS/COMMON/UTIL/TLVEncoder.h @@ -83,7 +83,7 @@ void tlv_encode_perror(void); } \ if (lENGTH < mINIMUMlENGTH) \ { \ - printf("(%s:%d) Expecting at least %d bytes, got %d\n", \ + printf("(%s:%d) Expecting at least %d bytes, got %u\n", \ __FILE__, __LINE__, mINIMUMlENGTH, lENGTH); \ errorCodeEncoder = TLV_ENCODE_BUFFER_TOO_SHORT; \ return TLV_ENCODE_BUFFER_TOO_SHORT; \ diff --git a/openair3/NAS/TEST/AS_SIMULATOR/as_process.c b/openair3/NAS/TEST/AS_SIMULATOR/as_process.c index 9a9b4da5bb61b261f4c5581d6cdbbc4fdddb8b0f..20b7a7ce35c1bd437ee11fb21514de09794c072d 100644 --- a/openair3/NAS/TEST/AS_SIMULATOR/as_process.c +++ b/openair3/NAS/TEST/AS_SIMULATOR/as_process.c @@ -518,7 +518,7 @@ static int _process_dump(char* buffer, int len, const char* msg, int size) len - index, "\\n"); index += snprintf(buffer + index, len - index, - " %.2hx", (unsigned char)(msg[i])); + " %.2hhx", (unsigned char)msg[i]); } buffer[index] = '\0'; diff --git a/openair3/NAS/TEST/AS_SIMULATOR/nas_data.c b/openair3/NAS/TEST/AS_SIMULATOR/nas_data.c index 990a856a9d751c2b8ed8a98547dfd7289b30e87f..ff5421c89240e0ac779819b2b04c353c8ed4b723 100644 --- a/openair3/NAS/TEST/AS_SIMULATOR/nas_data.c +++ b/openair3/NAS/TEST/AS_SIMULATOR/nas_data.c @@ -628,7 +628,7 @@ ssize_t authenticationParameter(char* buffer, size_t len, const OctetString* par int index = 0; for (int i = 0; i < param->length; i++) { - index += snprintf(buffer + index, len - index, "%.2hx", + index += snprintf(buffer + index, len - index, "%.2hhx", (unsigned char)(param->value[i])); } diff --git a/openair3/NAS/UE/API/USER/at_response.c b/openair3/NAS/UE/API/USER/at_response.c index c0ebe514ad33d6951b7b6308a47d1c6cade5af87..60a8918f828e580c401d75120d4d0fd7274ad82d 100644 --- a/openair3/NAS/UE/API/USER/at_response.c +++ b/openair3/NAS/UE/API/USER/at_response.c @@ -1067,32 +1067,32 @@ static int _at_response_encode_cgpaddr(char* buffer, const at_response_t* data) if (cgpaddr->PDP_addr_1[i] != NULL) { /* IPv4 address */ - offset += sprintf(buffer+offset, ",%hhu.%hhu.%hhu.%hhu", - (unsigned char)cgpaddr->PDP_addr_1[i][0], - (unsigned char)cgpaddr->PDP_addr_1[i][1], - (unsigned char)cgpaddr->PDP_addr_1[i][2], - (unsigned char)cgpaddr->PDP_addr_1[i][3]); + offset += sprintf(buffer+offset, ",%c.%c.%c.%c", + cgpaddr->PDP_addr_1[i][0], + cgpaddr->PDP_addr_1[i][1], + cgpaddr->PDP_addr_1[i][2], + cgpaddr->PDP_addr_1[i][3]); } if (cgpaddr->PDP_addr_2[i] != NULL) { /* IPv6 Link-local address prefixe */ offset += sprintf(buffer+offset, - ",%hhu.%hhu.%hhu.%hhu.%hhu.%hhu.%hhu.%hhu", - (unsigned char)0xfe, (unsigned char)0x80, - (unsigned char)0, (unsigned char)0, - (unsigned char)0, (unsigned char)0, - (unsigned char)0, (unsigned char)0); + ",%u.%u.%u.%u.%u.%u.%u.%u", + 0xfeU, 0x80U, + 0U, 0U, + 0U, 0U, + 0U, 0U); /* IPv6 Link-local address */ offset += sprintf(buffer+offset, - ".%hhu.%hhu.%hhu.%hhu.%hhu.%hhu.%hhu.%hhu", - (unsigned char)cgpaddr->PDP_addr_2[i][0], - (unsigned char)cgpaddr->PDP_addr_2[i][1], - (unsigned char)cgpaddr->PDP_addr_2[i][2], - (unsigned char)cgpaddr->PDP_addr_2[i][3], - (unsigned char)cgpaddr->PDP_addr_2[i][4], - (unsigned char)cgpaddr->PDP_addr_2[i][5], - (unsigned char)cgpaddr->PDP_addr_2[i][6], - (unsigned char)cgpaddr->PDP_addr_2[i][7]); + ".%c.%c.%c.%c.%c.%c.%c.%c", + cgpaddr->PDP_addr_2[i][0], + cgpaddr->PDP_addr_2[i][1], + cgpaddr->PDP_addr_2[i][2], + cgpaddr->PDP_addr_2[i][3], + cgpaddr->PDP_addr_2[i][4], + cgpaddr->PDP_addr_2[i][5], + cgpaddr->PDP_addr_2[i][6], + cgpaddr->PDP_addr_2[i][7]); } offset += sprintf(buffer+offset, "\r\n"); diff --git a/openair3/NGAP/ngap_gNB_handlers.c b/openair3/NGAP/ngap_gNB_handlers.c index f3fd9e84e735ad6ebcf6132a01904ff29a80cb96..64b29247aa636dbeab7206b52d8ef156e7556029 100644 --- a/openair3/NGAP/ngap_gNB_handlers.c +++ b/openair3/NGAP/ngap_gNB_handlers.c @@ -117,12 +117,12 @@ int ngap_gNB_handle_ng_setup_failure(uint32_t assoc_id, /* S1 Setup Failure == Non UE-related procedure -> stream 0 */ if (stream != 0) { - NGAP_WARN("[SCTP %d] Received s1 setup failure on stream != 0 (%d)\n", + NGAP_WARN("[SCTP %u] Received s1 setup failure on stream != 0 (%u)\n", assoc_id, stream); } if ((amf_desc_p = ngap_gNB_get_AMF(NULL, assoc_id, 0)) == NULL) { - NGAP_ERROR("[SCTP %d] Received S1 setup response for non existing " + NGAP_ERROR("[SCTP %u] Received S1 setup response for non existing " "AMF context\n", assoc_id); return -1; } @@ -155,13 +155,13 @@ int ngap_gNB_handle_ng_setup_response(uint32_t assoc_id, /* NG Setup Response == Non UE-related procedure -> stream 0 */ if (stream != 0) { - NGAP_ERROR("[SCTP %d] Received ng setup response on stream != 0 (%d)\n", + NGAP_ERROR("[SCTP %u] Received ng setup response on stream != 0 (%u)\n", assoc_id, stream); return -1; } if ((amf_desc_p = ngap_gNB_get_AMF(NULL, assoc_id, 0)) == NULL) { - NGAP_ERROR("[SCTP %d] Received NG setup response for non existing " + NGAP_ERROR("[SCTP %u] Received NG setup response for non existing " "AMF context\n", assoc_id); return -1; } @@ -313,12 +313,12 @@ int ngap_gNB_handle_error_indication(uint32_t assoc_id, /* NG Setup Failure == Non UE-related procedure -> stream 0 */ if (stream != 0) { - NGAP_WARN("[SCTP %d] Received ng Error indication on stream != 0 (%d)\n", + NGAP_WARN("[SCTP %u] Received ng Error indication on stream != 0 (%u)\n", assoc_id, stream); } if ((amf_desc_p = ngap_gNB_get_AMF(NULL, assoc_id, 0)) == NULL) { - NGAP_ERROR("[SCTP %d] Received ng Error indication for non existing " + NGAP_ERROR("[SCTP %u] Received ng Error indication for non existing " "AMF context\n", assoc_id); return -1; } @@ -689,7 +689,7 @@ static int ngap_gNB_handle_initial_context_request(uint32_t assoc_id, uint32_t s container = &pdu->choice.initiatingMessage->value.choice.InitialContextSetupRequest; if ((amf_desc_p = ngap_gNB_get_AMF(NULL, assoc_id, 0)) == NULL) { - NGAP_ERROR("[SCTP %d] Received initial context setup request for non " + NGAP_ERROR("[SCTP %u] Received initial context setup request for non " "existing AMF context\n", assoc_id); return -1; } @@ -708,7 +708,7 @@ static int ngap_gNB_handle_initial_context_request(uint32_t assoc_id, uint32_t s ngap_gNB_ue_context_t *ue_desc_p = ngap_get_ue_context(ran_ue_ngap_id); if (!ue_desc_p) { NGAP_ERROR( - "[SCTP %d] Received initial context setup request for non " + "[SCTP %u] Received initial context setup request for non " "existing UE context 0x%06lx\n", assoc_id, ran_ue_ngap_id); @@ -850,7 +850,7 @@ int ngap_gNB_handle_ue_context_release_command(uint32_t assoc_id, container = &pdu->choice.initiatingMessage->value.choice.UEContextReleaseCommand; if ((amf_desc_p = ngap_gNB_get_AMF(NULL, assoc_id, 0)) == NULL) { - NGAP_ERROR("[SCTP %d] Received UE context release command for non " + NGAP_ERROR("[SCTP %u] Received UE context release command for non " "existing AMF context\n", assoc_id); return -1; } @@ -865,7 +865,7 @@ int ngap_gNB_handle_ue_context_release_command(uint32_t assoc_id, ngap_gNB_ue_context_t *ue_desc_p = ngap_get_ue_context(gnb_ue_ngap_id); if (!ue_desc_p) { NGAP_ERROR( - "[SCTP %d] Received UE context release command for non " + "[SCTP %u] Received UE context release command for non " "existing UE context 0x%06lx\n", assoc_id, gnb_ue_ngap_id); @@ -919,7 +919,7 @@ int ngap_gNB_handle_pdusession_setup_request(uint32_t assoc_id, container = &pdu->choice.initiatingMessage->value.choice.PDUSessionResourceSetupRequest; if ((amf_desc_p = ngap_gNB_get_AMF(NULL, assoc_id, 0)) == NULL) { - NGAP_ERROR("[SCTP %d] Received pdu session resource setup request for non " + NGAP_ERROR("[SCTP %u] Received pdu session resource setup request for non " "existing AMF context\n", assoc_id); return -1; } @@ -934,7 +934,7 @@ int ngap_gNB_handle_pdusession_setup_request(uint32_t assoc_id, ngap_gNB_ue_context_t *ue_desc_p = ngap_get_ue_context(ran_ue_ngap_id); if (!ue_desc_p) { - NGAP_ERROR("[SCTP %d] Received pdu session resource setup request for non " + NGAP_ERROR("[SCTP %u] Received pdu session resource setup request for non " "existing UE context 0x%06lx\n", assoc_id, ran_ue_ngap_id); return -1; @@ -1000,7 +1000,7 @@ int ngap_gNB_handle_paging(uint32_t assoc_id, DevAssert(pdu != NULL); container = &pdu->choice.initiatingMessage->value.choice.Paging; // received Paging Message from AMF - NGAP_DEBUG("[SCTP %d] Received Paging Message From AMF\n",assoc_id); + NGAP_DEBUG("[SCTP %u] Received Paging Message From AMF\n",assoc_id); /* Paging procedure -> stream != 0 */ if (stream == 0) { @@ -1010,7 +1010,7 @@ int ngap_gNB_handle_paging(uint32_t assoc_id, } if ((amf_desc_p = ngap_gNB_get_AMF(NULL, assoc_id, 0)) == NULL) { - NGAP_ERROR("[SCTP %d] Received Paging for non " + NGAP_ERROR("[SCTP %u] Received Paging for non " "existing AMF context\n", assoc_id); return -1; } @@ -1018,7 +1018,7 @@ int ngap_gNB_handle_paging(uint32_t assoc_id, ngap_gNB_instance = amf_desc_p->ngap_gNB_instance; if (ngap_gNB_instance == NULL) { - NGAP_ERROR("[SCTP %d] Received Paging for non existing AMF context : ngap_gNB_instance is NULL\n", + NGAP_ERROR("[SCTP %u] Received Paging for non existing AMF context : ngap_gNB_instance is NULL\n", assoc_id); return -1; } @@ -1036,7 +1036,7 @@ int ngap_gNB_handle_paging(uint32_t assoc_id, OCTET_STRING_TO_INT8(&fiveG_S_TMSI->aMFPointer, msg->ue_paging_identity.s_tmsi.amf_pointer); OCTET_STRING_TO_INT32(&fiveG_S_TMSI->fiveG_TMSI, msg->ue_paging_identity.s_tmsi.m_tmsi); - NGAP_DEBUG("[SCTP %d] Received Paging Identity amf_set_id %d, amf_pointer %d, m_tmsi %d\n", + NGAP_DEBUG("[SCTP %u] Received Paging Identity amf_set_id %d, amf_pointer %d, m_tmsi %d\n", assoc_id, msg->ue_paging_identity.s_tmsi.amf_set_id, msg->ue_paging_identity.s_tmsi.amf_pointer, @@ -1057,7 +1057,7 @@ int ngap_gNB_handle_paging(uint32_t assoc_id, NGAP_FIND_PROTOCOLIE_BY_ID(NGAP_PagingIEs_t, ie, container, NGAP_ProtocolIE_ID_id_TAIListForPaging, true); - NGAP_INFO("[SCTP %d] Received Paging taiList For Paging: count %d\n", assoc_id, ie->value.choice.TAIListForPaging.list.count); + NGAP_INFO("[SCTP %u] Received Paging taiList For Paging: count %d\n", assoc_id, ie->value.choice.TAIListForPaging.list.count); for (int i = 0; i < ie->value.choice.TAIListForPaging.list.count; i++) { NGAP_TAIListForPagingItem_t *item_p; @@ -1065,11 +1065,11 @@ int ngap_gNB_handle_paging(uint32_t assoc_id, TBCD_TO_MCC_MNC(&(item_p->tAI.pLMNIdentity), msg->plmn_identity[i].mcc, msg->plmn_identity[i].mnc, msg->plmn_identity[i].mnc_digit_length); OCTET_STRING_TO_INT16(&(item_p->tAI.tAC), msg->tac[i]); msg->tai_size++; - NGAP_DEBUG("[SCTP %d] Received Paging: MCC %d, MNC %d, TAC %d\n", assoc_id, msg->plmn_identity[i].mcc, msg->plmn_identity[i].mnc, msg->tac[i]); + NGAP_DEBUG("[SCTP %u] Received Paging: MCC %d, MNC %d, TAC %d\n", assoc_id, msg->plmn_identity[i].mcc, msg->plmn_identity[i].mnc, msg->tac[i]); } //paging parameter values - NGAP_DEBUG("[SCTP %d] Received Paging parameters: Paging Identity amf_set_id %d amf_pointer %d m_tmsi %d paging_drx %d paging_priority %d\n",assoc_id, + NGAP_DEBUG("[SCTP %u] Received Paging parameters: Paging Identity amf_set_id %d amf_pointer %d m_tmsi %d paging_drx %d paging_priority %d\n",assoc_id, msg->ue_paging_identity.s_tmsi.amf_set_id, msg->ue_paging_identity.s_tmsi.amf_pointer, msg->ue_paging_identity.s_tmsi.m_tmsi, @@ -1091,7 +1091,7 @@ static int ngap_gNB_handle_pdusession_modify_request(uint32_t assoc_id, uint32_t container = &pdu->choice.initiatingMessage->value.choice.PDUSessionResourceModifyRequest; if ((amf_desc_p = ngap_gNB_get_AMF(NULL, assoc_id, 0)) == NULL) { - NGAP_ERROR("[SCTP %d] Received PDUSession Resource modify request for non " + NGAP_ERROR("[SCTP %u] Received PDUSession Resource modify request for non " "existing AMF context\n", assoc_id); return -1; } @@ -1114,7 +1114,7 @@ static int ngap_gNB_handle_pdusession_modify_request(uint32_t assoc_id, uint32_t ngap_gNB_ue_context_t *ue_desc_p = ngap_get_ue_context(gnb_ue_ngap_id); if (!ue_desc_p) { NGAP_ERROR( - "[SCTP %d] Received PDUSession Resource modify request for non " + "[SCTP %u] Received PDUSession Resource modify request for non " "existing UE context 0x%08lx\n", assoc_id, gnb_ue_ngap_id); @@ -1126,7 +1126,7 @@ static int ngap_gNB_handle_pdusession_modify_request(uint32_t assoc_id, uint32_t NGAP_FIND_PROTOCOLIE_BY_ID(NGAP_PDUSessionResourceModifyRequestIEs_t, ie, container, NGAP_ProtocolIE_ID_id_PDUSessionResourceModifyListModReq, true); if (ue_desc_p->amf_ue_ngap_id != amf_ue_ngap_id) { - NGAP_WARN("UE context amf_ue_ngap_id is different form that of the message (%ld != %ld)", + NGAP_WARN("UE context amf_ue_ngap_id is different form that of the message (%lu != %lu)", (uint64_t)ue_desc_p->amf_ue_ngap_id, amf_ue_ngap_id); MessageDef *message_p = itti_alloc_new_message (TASK_RRC_GNB, 0, NGAP_PDUSESSION_MODIFY_RESP); ngap_pdusession_modify_resp_t* msg=&NGAP_PDUSESSION_MODIFY_RESP(message_p); @@ -1189,7 +1189,7 @@ int ngap_gNB_handle_pdusession_release_command(uint32_t assoc_id, container = &pdu->choice.initiatingMessage->value.choice.PDUSessionResourceReleaseCommand; if ((amf_desc_p = ngap_gNB_get_AMF(NULL, assoc_id, 0)) == NULL) { - NGAP_ERROR("[SCTP %d] Received pdu session release command for non existing AMF context\n", assoc_id); + NGAP_ERROR("[SCTP %u] Received pdu session release command for non existing AMF context\n", assoc_id); return -1; } @@ -1216,7 +1216,7 @@ int ngap_gNB_handle_pdusession_release_command(uint32_t assoc_id, ngap_gNB_ue_context_t *ue_desc_p = ngap_get_ue_context(gnb_ue_ngap_id); if (!ue_desc_p) { - NGAP_ERROR("[SCTP %d] Received PDUSession Resource release command for non existing UE context 0x%08lx\n", assoc_id, + NGAP_ERROR("[SCTP %u] Received PDUSession Resource release command for non existing UE context 0x%08lx\n", assoc_id, ie->value.choice.RAN_UE_NGAP_ID); return -1; } @@ -1228,7 +1228,7 @@ int ngap_gNB_handle_pdusession_release_command(uint32_t assoc_id, (uint64_t)ue_desc_p->amf_ue_ngap_id, amf_ue_ngap_id); } - NGAP_DEBUG("[SCTP %d] Received pdu session release command for gNB_UE_NGAP_ID %lu amf_ue_ngap_id %lu\n", + NGAP_DEBUG("[SCTP %u] Received pdu session release command for gNB_UE_NGAP_ID %lu amf_ue_ngap_id %lu\n", assoc_id, gnb_ue_ngap_id, amf_ue_ngap_id); MessageDef * message_p = itti_alloc_new_message(TASK_NGAP, 0, NGAP_PDUSESSION_RELEASE_COMMAND); ngap_pdusession_release_command_t * msg=&NGAP_PDUSESSION_RELEASE_COMMAND(message_p); @@ -1359,7 +1359,7 @@ int ngap_gNB_handle_message(uint32_t assoc_id, int32_t stream, const uint8_t *co /* Checking procedure Code and direction of message */ if (pdu.choice.initiatingMessage->procedureCode >= sizeof(ngap_messages_callback) / (3 * sizeof(ngap_message_decoded_callback)) || (pdu.present > NGAP_NGAP_PDU_PR_unsuccessfulOutcome)) { - NGAP_ERROR("[SCTP %d] Either procedureCode %ld or direction %d exceed expected\n", assoc_id, pdu.choice.initiatingMessage->procedureCode, pdu.present); + NGAP_ERROR("[SCTP %u] Either procedureCode %ld or direction %d exceed expected\n", assoc_id, pdu.choice.initiatingMessage->procedureCode, pdu.present); ASN_STRUCT_FREE_CONTENTS_ONLY(asn_DEF_NGAP_NGAP_PDU, &pdu); return -1; } @@ -1368,7 +1368,7 @@ int ngap_gNB_handle_message(uint32_t assoc_id, int32_t stream, const uint8_t *co * This can mean not implemented or no procedure for gNB (wrong direction). */ if (ngap_messages_callback[pdu.choice.initiatingMessage->procedureCode][pdu.present - 1] == NULL) { - NGAP_ERROR("[SCTP %d] No handler for procedureCode %ld in %s\n", assoc_id, pdu.choice.initiatingMessage->procedureCode, ngap_direction2String(pdu.present - 1)); + NGAP_ERROR("[SCTP %u] No handler for procedureCode %ld in %s\n", assoc_id, pdu.choice.initiatingMessage->procedureCode, ngap_direction2String(pdu.present - 1)); ASN_STRUCT_FREE_CONTENTS_ONLY(asn_DEF_NGAP_NGAP_PDU, &pdu); return -1; } diff --git a/openair3/NGAP/ngap_gNB_nas_procedures.c b/openair3/NGAP/ngap_gNB_nas_procedures.c index 15f4b4b37654dce04a70867b24695f37b7fe82c9..f9c70410064adc942fbe3ee2a6451d709e1c14a5 100644 --- a/openair3/NGAP/ngap_gNB_nas_procedures.c +++ b/openair3/NGAP/ngap_gNB_nas_procedures.c @@ -315,7 +315,7 @@ int ngap_gNB_handle_nas_downlink(uint32_t assoc_id, // } if ((amf_desc_p = ngap_gNB_get_AMF(NULL, assoc_id, 0)) == NULL) { - NGAP_ERROR("[SCTP %d] Received NAS downlink message for non existing AMF context\n", assoc_id); + NGAP_ERROR("[SCTP %u] Received NAS downlink message for non existing AMF context\n", assoc_id); return -1; } @@ -332,7 +332,7 @@ int ngap_gNB_handle_nas_downlink(uint32_t assoc_id, gnb_ue_ngap_id = ie->value.choice.RAN_UE_NGAP_ID; if ((ue_desc_p = ngap_get_ue_context(gnb_ue_ngap_id)) == NULL) { - NGAP_ERROR("[SCTP %d] Received NAS downlink message for non existing UE context gNB_UE_NGAP_ID: 0x%lx\n", + NGAP_ERROR("[SCTP %u] Received NAS downlink message for non existing UE context gNB_UE_NGAP_ID: 0x%lx\n", assoc_id, gnb_ue_ngap_id); return -1; @@ -341,7 +341,7 @@ int ngap_gNB_handle_nas_downlink(uint32_t assoc_id, if (0 == ue_desc_p->rx_stream) { ue_desc_p->rx_stream = stream; } else if (stream != ue_desc_p->rx_stream) { - NGAP_ERROR("[SCTP %d] Received UE-related procedure on stream %u, expecting %u\n", + NGAP_ERROR("[SCTP %u] Received UE-related procedure on stream %u, expecting %d\n", assoc_id, stream, ue_desc_p->rx_stream); return -1; } diff --git a/openair3/S1AP/s1ap_eNB.c b/openair3/S1AP/s1ap_eNB.c index adfeb69cb4463df12d15431e6c105635aa2befe1..700148f05e32754ed3f27100abb5e4fe5f23b54e 100644 --- a/openair3/S1AP/s1ap_eNB.c +++ b/openair3/S1AP/s1ap_eNB.c @@ -694,7 +694,7 @@ static int s1ap_eNB_generate_s1_setup_request( ie->value.choice.Global_ENB_ID.eNB_ID.present = S1AP_ENB_ID_PR_macroENB_ID; MACRO_ENB_ID_TO_BIT_STRING(instance_p->eNB_id, &ie->value.choice.Global_ENB_ID.eNB_ID.choice.macroENB_ID); - S1AP_INFO("%d -> %02x%02x%02x\n", instance_p->eNB_id, + S1AP_INFO("%u -> %02x%02x%02x\n", instance_p->eNB_id, ie->value.choice.Global_ENB_ID.eNB_ID.choice.macroENB_ID.buf[0], ie->value.choice.Global_ENB_ID.eNB_ID.choice.macroENB_ID.buf[1], ie->value.choice.Global_ENB_ID.eNB_ID.choice.macroENB_ID.buf[2]); diff --git a/openair3/S1AP/s1ap_eNB_handlers.c b/openair3/S1AP/s1ap_eNB_handlers.c index e19b17154fe18f07fe3dca71baf9eac9f5d8112d..6bad1ce45510229589754e4e86f0f159343ae2c2 100644 --- a/openair3/S1AP/s1ap_eNB_handlers.c +++ b/openair3/S1AP/s1ap_eNB_handlers.c @@ -244,7 +244,7 @@ int s1ap_eNB_handle_message(uint32_t assoc_id, int32_t stream, if (pdu.choice.initiatingMessage.procedureCode >= sizeof(messages_callback) / (3 * sizeof( s1ap_message_decoded_callback)) || (pdu.present > S1AP_S1AP_PDU_PR_unsuccessfulOutcome)) { - S1AP_ERROR("[SCTP %d] Either procedureCode %ld or direction %d exceed expected\n", + S1AP_ERROR("[SCTP %u] Either procedureCode %ld or direction %d exceed expected\n", assoc_id, pdu.choice.initiatingMessage.procedureCode, pdu.present); ASN_STRUCT_FREE_CONTENTS_ONLY(asn_DEF_S1AP_S1AP_PDU, &pdu); return -1; @@ -254,7 +254,7 @@ int s1ap_eNB_handle_message(uint32_t assoc_id, int32_t stream, * This can mean not implemented or no procedure for eNB (wrong direction). */ if (messages_callback[pdu.choice.initiatingMessage.procedureCode][pdu.present - 1] == NULL) { - S1AP_ERROR("[SCTP %d] No handler for procedureCode %ld in %s\n", + S1AP_ERROR("[SCTP %u] No handler for procedureCode %ld in %s\n", assoc_id, pdu.choice.initiatingMessage.procedureCode, s1ap_direction2String(pdu.present - 1)); ASN_STRUCT_FREE_CONTENTS_ONLY(asn_DEF_S1AP_S1AP_PDU, &pdu); @@ -284,12 +284,12 @@ int s1ap_eNB_handle_s1_setup_failure(uint32_t assoc_id, /* S1 Setup Failure == Non UE-related procedure -> stream 0 */ if (stream != 0) { - S1AP_WARN("[SCTP %d] Received s1 setup failure on stream != 0 (%d)\n", + S1AP_WARN("[SCTP %u] Received s1 setup failure on stream != 0 (%u)\n", assoc_id, stream); } if ((mme_desc_p = s1ap_eNB_get_MME(NULL, assoc_id, 0)) == NULL) { - S1AP_ERROR("[SCTP %d] Received S1 setup failure for non existing " + S1AP_ERROR("[SCTP %u] Received S1 setup failure for non existing " "MME context\n", assoc_id); return -1; } @@ -374,13 +374,13 @@ int s1ap_eNB_handle_s1_setup_response(uint32_t assoc_id, /* S1 Setup Response == Non UE-related procedure -> stream 0 */ if (stream != 0) { - S1AP_ERROR("[SCTP %d] Received s1 setup response on stream != 0 (%d)\n", + S1AP_ERROR("[SCTP %u] Received s1 setup response on stream != 0 (%u)\n", assoc_id, stream); return -1; } if ((mme_desc_p = s1ap_eNB_get_MME(NULL, assoc_id, 0)) == NULL) { - S1AP_ERROR("[SCTP %d] Received S1 setup response for non existing " + S1AP_ERROR("[SCTP %u] Received S1 setup response for non existing " "MME context\n", assoc_id); return -1; } @@ -491,12 +491,12 @@ int s1ap_eNB_handle_error_indication(uint32_t assoc_id, /* S1 Setup Failure == Non UE-related procedure -> stream 0 */ if (stream != 0) { - S1AP_WARN("[SCTP %d] Received s1 Error indication on stream != 0 (%d)\n", + S1AP_WARN("[SCTP %u] Received s1 Error indication on stream != 0 (%u)\n", assoc_id, stream); } if ((mme_desc_p = s1ap_eNB_get_MME(NULL, assoc_id, 0)) == NULL) { - S1AP_ERROR("[SCTP %d] Received S1 Error indication for non existing " + S1AP_ERROR("[SCTP %u] Received S1 Error indication for non existing " "MME context\n", assoc_id); return -1; } @@ -834,7 +834,7 @@ int s1ap_eNB_handle_initial_context_request(uint32_t assoc_id, container = &pdu->choice.initiatingMessage.value.choice.InitialContextSetupRequest; if ((mme_desc_p = s1ap_eNB_get_MME(NULL, assoc_id, 0)) == NULL) { - S1AP_ERROR("[SCTP %d] Received initial context setup request for non " + S1AP_ERROR("[SCTP %u] Received initial context setup request for non " "existing MME context\n", assoc_id); return -1; } @@ -858,7 +858,7 @@ int s1ap_eNB_handle_initial_context_request(uint32_t assoc_id, if ((ue_desc_p = s1ap_eNB_get_ue_context(mme_desc_p->s1ap_eNB_instance, enb_ue_s1ap_id)) == NULL) { - S1AP_ERROR("[SCTP %d] Received initial context setup request for non " + S1AP_ERROR("[SCTP %u] Received initial context setup request for non " "existing UE context 0x%06lx\n", assoc_id, enb_ue_s1ap_id); return -1; @@ -869,7 +869,7 @@ int s1ap_eNB_handle_initial_context_request(uint32_t assoc_id, /* Initial context request = UE-related procedure -> stream != 0 */ if (stream == 0) { - S1AP_ERROR("[SCTP %d] Received UE-related procedure on stream (%d)\n", + S1AP_ERROR("[SCTP %u] Received UE-related procedure on stream (%u)\n", assoc_id, stream); return -1; } @@ -1003,7 +1003,7 @@ int s1ap_eNB_handle_ue_context_release_command(uint32_t assoc_id, container = &pdu->choice.initiatingMessage.value.choice.UEContextReleaseCommand; if ((mme_desc_p = s1ap_eNB_get_MME(NULL, assoc_id, 0)) == NULL) { - S1AP_ERROR("[SCTP %d] Received UE context release command for non " + S1AP_ERROR("[SCTP %u] Received UE context release command for non " "existing MME context\n", assoc_id); return -1; } @@ -1026,7 +1026,7 @@ int s1ap_eNB_handle_ue_context_release_command(uint32_t assoc_id, if ((ue_desc_p = s1ap_eNB_get_ue_context(mme_desc_p->s1ap_eNB_instance, enb_ue_s1ap_id)) == NULL) { - S1AP_ERROR("[SCTP %d] Received UE context release command for non " + S1AP_ERROR("[SCTP %u] Received UE context release command for non " "existing UE context 0x%06lx\n", assoc_id, enb_ue_s1ap_id); @@ -1063,7 +1063,7 @@ int s1ap_eNB_handle_ue_context_release_command(uint32_t assoc_id, return 0; } } - S1AP_ERROR("[SCTP %d] Received UE context release command(mME_UE_S1AP_ID) for non " + S1AP_ERROR("[SCTP %u] Received UE context release command(mME_UE_S1AP_ID) for non " "existing UE context 0x%06lx\n", assoc_id, mme_ue_s1ap_id); @@ -1097,7 +1097,7 @@ int s1ap_eNB_handle_e_rab_setup_request(uint32_t assoc_id, container = &pdu->choice.initiatingMessage.value.choice.E_RABSetupRequest; if ((mme_desc_p = s1ap_eNB_get_MME(NULL, assoc_id, 0)) == NULL) { - S1AP_ERROR("[SCTP %d] Received E-RAB setup request for non " + S1AP_ERROR("[SCTP %u] Received E-RAB setup request for non " "existing MME context\n", assoc_id); return -1; } @@ -1124,7 +1124,7 @@ int s1ap_eNB_handle_e_rab_setup_request(uint32_t assoc_id, if ((ue_desc_p = s1ap_eNB_get_ue_context(mme_desc_p->s1ap_eNB_instance, enb_ue_s1ap_id)) == NULL) { - S1AP_ERROR("[SCTP %d] Received E-RAB setup request for non " + S1AP_ERROR("[SCTP %u] Received E-RAB setup request for non " "existing UE context 0x%06lx\n", assoc_id, enb_ue_s1ap_id); return -1; @@ -1132,7 +1132,7 @@ int s1ap_eNB_handle_e_rab_setup_request(uint32_t assoc_id, /* Initial context request = UE-related procedure -> stream != 0 */ if (stream == 0) { - S1AP_ERROR("[SCTP %d] Received UE-related procedure on stream (%d)\n", + S1AP_ERROR("[SCTP %u] Received UE-related procedure on stream (%u)\n", assoc_id, stream); return -1; } @@ -1140,7 +1140,7 @@ int s1ap_eNB_handle_e_rab_setup_request(uint32_t assoc_id, ue_desc_p->rx_stream = stream; if ( ue_desc_p->mme_ue_s1ap_id != mme_ue_s1ap_id) { - S1AP_WARN("UE context mme_ue_s1ap_id is different form that of the message (%d != %ld)", + S1AP_WARN("UE context mme_ue_s1ap_id is different form that of the message (%u != %ld)", ue_desc_p->mme_ue_s1ap_id, mme_ue_s1ap_id); } @@ -1216,10 +1216,10 @@ int s1ap_eNB_handle_paging(uint32_t assoc_id, DevAssert(pdu != NULL); container = &pdu->choice.initiatingMessage.value.choice.Paging; // received Paging Message from MME - S1AP_DEBUG("[SCTP %d] Received Paging Message From MME\n",assoc_id); + S1AP_DEBUG("[SCTP %u] Received Paging Message From MME\n",assoc_id); if ((mme_desc_p = s1ap_eNB_get_MME(NULL, assoc_id, 0)) == NULL) { - S1AP_ERROR("[SCTP %d] Received Paging for non " + S1AP_ERROR("[SCTP %u] Received Paging for non " "existing MME context\n", assoc_id); return -1; } @@ -1227,7 +1227,7 @@ int s1ap_eNB_handle_paging(uint32_t assoc_id, s1ap_eNB_instance = mme_desc_p->s1ap_eNB_instance; if (s1ap_eNB_instance == NULL) { - S1AP_ERROR("[SCTP %d] Received Paging for non existing MME context : s1ap_eNB_instance is NULL\n", + S1AP_ERROR("[SCTP %u] Received Paging for non existing MME context : s1ap_eNB_instance is NULL\n", assoc_id); return -1; } @@ -1240,7 +1240,7 @@ int s1ap_eNB_handle_paging(uint32_t assoc_id, if (ie != NULL) { /* checked by macro but cppcheck doesn't see it */ S1AP_PAGING_IND(message_p).ue_index_value = BIT_STRING_to_uint32(&ie->value.choice.UEIdentityIndexValue); - S1AP_DEBUG("[SCTP %d] Received Paging ue_index_value (%d)\n", + S1AP_DEBUG("[SCTP %u] Received Paging ue_index_value (%u)\n", assoc_id,(uint32_t)S1AP_PAGING_IND(message_p).ue_index_value); S1AP_PAGING_IND(message_p).ue_paging_identity.choice.s_tmsi.mme_code = 0; S1AP_PAGING_IND(message_p).ue_paging_identity.choice.s_tmsi.m_tmsi = 0; @@ -1272,7 +1272,7 @@ int s1ap_eNB_handle_paging(uint32_t assoc_id, if (S1AP_PAGING_IND(message_p).ue_paging_identity.choice.imsi.buffer[2*i+1] == 0x0F) { if(i != ie->value.choice.UEPagingID.choice.iMSI.size - 1) { /* invalid paging_p->uePagingID.choise.iMSI.buffer */ - S1AP_ERROR("[SCTP %d] Received Paging : uePagingID.choise.iMSI error(i %d 0x0F)\n", assoc_id,i); + S1AP_ERROR("[SCTP %u] Received Paging : uePagingID.choise.iMSI error(i %d 0x0F)\n", assoc_id,i); itti_free(ITTI_MSG_ORIGIN_ID(message_p), message_p); return -1; } @@ -1283,13 +1283,13 @@ int s1ap_eNB_handle_paging(uint32_t assoc_id, if (S1AP_PAGING_IND(message_p).ue_paging_identity.choice.imsi.length >= S1AP_IMSI_LENGTH) { /* invalid paging_p->uePagingID.choise.iMSI.size */ - S1AP_ERROR("[SCTP %d] Received Paging : uePagingID.choise.iMSI.size(%d) is over IMSI length(%d)\n", assoc_id, S1AP_PAGING_IND(message_p).ue_paging_identity.choice.imsi.length, S1AP_IMSI_LENGTH); + S1AP_ERROR("[SCTP %u] Received Paging : uePagingID.choise.iMSI.size(%d) is over IMSI length(%d)\n", assoc_id, S1AP_PAGING_IND(message_p).ue_paging_identity.choice.imsi.length, S1AP_IMSI_LENGTH); itti_free(ITTI_MSG_ORIGIN_ID(message_p), message_p); return -1; } } else { /* of if (ie->value.choice.UEPagingID.present == S1AP_UEPagingID_PR_iMSI) */ /* invalid paging_p->uePagingID.present */ - S1AP_ERROR("[SCTP %d] Received Paging : uePagingID.present(%d) is unknown\n", assoc_id, ie->value.choice.UEPagingID.present); + S1AP_ERROR("[SCTP %u] Received Paging : uePagingID.present(%d) is unknown\n", assoc_id, ie->value.choice.UEPagingID.present); itti_free(ITTI_MSG_ORIGIN_ID(message_p), message_p); return -1; } @@ -1322,7 +1322,7 @@ int s1ap_eNB_handle_paging(uint32_t assoc_id, S1AP_PAGING_IND(message_p).cn_domain = CN_DOMAIN_CS; } else { /* invalid paging_p->cnDomain */ - S1AP_ERROR("[SCTP %d] Received Paging : cnDomain(%ld) is unknown\n", assoc_id, ie->value.choice.CNDomain); + S1AP_ERROR("[SCTP %u] Received Paging : cnDomain(%ld) is unknown\n", assoc_id, ie->value.choice.CNDomain); itti_free (ITTI_MSG_ORIGIN_ID(message_p), message_p); return -1; } @@ -1339,7 +1339,7 @@ int s1ap_eNB_handle_paging(uint32_t assoc_id, S1AP_ProtocolIE_ID_id_TAIList, true); if (ie != NULL) { /* checked by macro but cppcheck doesn't see it */ - S1AP_INFO("[SCTP %d] Received Paging taiList: count %d\n", assoc_id, ie->value.choice.TAIList.list.count); + S1AP_INFO("[SCTP %u] Received Paging taiList: count %d\n", assoc_id, ie->value.choice.TAIList.list.count); for (int i = 0; i < ie->value.choice.TAIList.list.count; i++) { S1AP_TAIItem_t *item_p; @@ -1349,7 +1349,7 @@ int s1ap_eNB_handle_paging(uint32_t assoc_id, S1AP_PAGING_IND(message_p).plmn_identity[i].mnc_digit_length); OCTET_STRING_TO_INT16(&(item_p->tAI.tAC), S1AP_PAGING_IND(message_p).tac[i]); S1AP_PAGING_IND(message_p).tai_size++; - S1AP_DEBUG("[SCTP %d] Received Paging: MCC %d, MNC %d, TAC %d\n", assoc_id, + S1AP_DEBUG("[SCTP %u] Received Paging: MCC %d, MNC %d, TAC %d\n", assoc_id, S1AP_PAGING_IND(message_p).plmn_identity[i].mcc, S1AP_PAGING_IND(message_p).plmn_identity[i].mnc, S1AP_PAGING_IND(message_p).tac[i]); @@ -1360,10 +1360,10 @@ int s1ap_eNB_handle_paging(uint32_t assoc_id, } //paging parameter values - S1AP_DEBUG("[SCTP %d] Received Paging parameters: ue_index_value %d cn_domain %d paging_drx %d paging_priority %d\n",assoc_id, + S1AP_DEBUG("[SCTP %u] Received Paging parameters: ue_index_value %d cn_domain %d paging_drx %d paging_priority %d\n",assoc_id, S1AP_PAGING_IND(message_p).ue_index_value, S1AP_PAGING_IND(message_p).cn_domain, S1AP_PAGING_IND(message_p).paging_drx, S1AP_PAGING_IND(message_p).paging_priority); - S1AP_DEBUG("[SCTP %d] Received Paging parameters(ue): presenceMask %d s_tmsi.m_tmsi %d s_tmsi.mme_code %d IMSI length %d (0-5) %d%d%d%d%d%d\n",assoc_id, + S1AP_DEBUG("[SCTP %u] Received Paging parameters(ue): presenceMask %d s_tmsi.m_tmsi %d s_tmsi.mme_code %d IMSI length %d (0-5) %d%d%d%d%d%d\n",assoc_id, S1AP_PAGING_IND(message_p).ue_paging_identity.presenceMask, S1AP_PAGING_IND(message_p).ue_paging_identity.choice.s_tmsi.m_tmsi, S1AP_PAGING_IND(message_p).ue_paging_identity.choice.s_tmsi.mme_code, S1AP_PAGING_IND(message_p).ue_paging_identity.choice.imsi.length, S1AP_PAGING_IND(message_p).ue_paging_identity.choice.imsi.buffer[0], S1AP_PAGING_IND(message_p).ue_paging_identity.choice.imsi.buffer[1], @@ -1390,7 +1390,7 @@ int s1ap_eNB_handle_e_rab_modify_request(uint32_t assoc_id, container = &pdu->choice.initiatingMessage.value.choice.E_RABModifyRequest; if ((mme_desc_p = s1ap_eNB_get_MME(NULL, assoc_id, 0)) == NULL) { - S1AP_ERROR("[SCTP %d] Received E-RAB modify request for non " + S1AP_ERROR("[SCTP %u] Received E-RAB modify request for non " "existing MME context\n", assoc_id); return -1; } @@ -1417,7 +1417,7 @@ int s1ap_eNB_handle_e_rab_modify_request(uint32_t assoc_id, if ((ue_desc_p = s1ap_eNB_get_ue_context(mme_desc_p->s1ap_eNB_instance, enb_ue_s1ap_id)) == NULL) { - S1AP_ERROR("[SCTP %d] Received E-RAB modify request for non " + S1AP_ERROR("[SCTP %u] Received E-RAB modify request for non " "existing UE context 0x%06lx\n", assoc_id, enb_ue_s1ap_id); return -1; @@ -1425,7 +1425,7 @@ int s1ap_eNB_handle_e_rab_modify_request(uint32_t assoc_id, /* E-RAB modify request = UE-related procedure -> stream != 0 */ if (stream == 0) { - S1AP_ERROR("[SCTP %d] Received UE-related procedure on stream (%d)\n", + S1AP_ERROR("[SCTP %u] Received UE-related procedure on stream (%u)\n", assoc_id, stream); return -1; } @@ -1433,7 +1433,7 @@ int s1ap_eNB_handle_e_rab_modify_request(uint32_t assoc_id, ue_desc_p->rx_stream = stream; if (ue_desc_p->mme_ue_s1ap_id != mme_ue_s1ap_id) { - S1AP_WARN("UE context mme_ue_s1ap_id is different form that of the message (%d != %ld)", + S1AP_WARN("UE context mme_ue_s1ap_id is different form that of the message (%u != %ld)", ue_desc_p->mme_ue_s1ap_id, mme_ue_s1ap_id); message_p = itti_alloc_new_message (TASK_RRC_ENB, 0, S1AP_E_RAB_MODIFY_RESP); S1AP_E_RAB_MODIFY_RESP (message_p).eNB_ue_s1ap_id = enb_ue_s1ap_id; @@ -1526,7 +1526,7 @@ int s1ap_eNB_handle_e_rab_release_command(uint32_t assoc_id, container = &pdu->choice.initiatingMessage.value.choice.E_RABReleaseCommand; if ((mme_desc_p = s1ap_eNB_get_MME(NULL, assoc_id, 0)) == NULL) { - S1AP_ERROR("[SCTP %d] Received E-RAB release command for non existing MME context\n", assoc_id); + S1AP_ERROR("[SCTP %u] Received E-RAB release command for non existing MME context\n", assoc_id); return -1; } @@ -1553,14 +1553,14 @@ int s1ap_eNB_handle_e_rab_release_command(uint32_t assoc_id, if ((ue_desc_p = s1ap_eNB_get_ue_context(mme_desc_p->s1ap_eNB_instance, enb_ue_s1ap_id)) == NULL) { - S1AP_ERROR("[SCTP %d] Received E-RAB release command for non existing UE context 0x%06lx\n", assoc_id, + S1AP_ERROR("[SCTP %u] Received E-RAB release command for non existing UE context 0x%06lx\n", assoc_id, ie->value.choice.ENB_UE_S1AP_ID); return -1; } /* Initial context request = UE-related procedure -> stream != 0 */ if (stream == 0) { - S1AP_ERROR("[SCTP %d] Received UE-related procedure on stream (%d)\n", + S1AP_ERROR("[SCTP %u] Received UE-related procedure on stream (%u)\n", assoc_id, stream); return -1; } @@ -1568,11 +1568,11 @@ int s1ap_eNB_handle_e_rab_release_command(uint32_t assoc_id, ue_desc_p->rx_stream = stream; if (ue_desc_p->mme_ue_s1ap_id != mme_ue_s1ap_id) { - S1AP_WARN("UE context mme_ue_s1ap_id is different form that of the message (%d != %ld)", + S1AP_WARN("UE context mme_ue_s1ap_id is different form that of the message (%u != %ld)", ue_desc_p->mme_ue_s1ap_id, mme_ue_s1ap_id); } - S1AP_DEBUG("[SCTP %d] Received E-RAB release command for eNB_UE_S1AP_ID %ld mme_ue_s1ap_id %ld\n", + S1AP_DEBUG("[SCTP %u] Received E-RAB release command for eNB_UE_S1AP_ID %ld mme_ue_s1ap_id %ld\n", assoc_id, enb_ue_s1ap_id, mme_ue_s1ap_id); message_p = itti_alloc_new_message(TASK_S1AP, 0, S1AP_E_RAB_RELEASE_COMMAND); S1AP_E_RAB_RELEASE_COMMAND(message_p).eNB_ue_s1ap_id = enb_ue_s1ap_id; @@ -1632,12 +1632,12 @@ int s1ap_eNB_handle_s1_path_switch_request_ack(uint32_t assoc_id, /* Path Switch request == UE-related procedure -> stream !=0 */ if (stream == 0) { - S1AP_ERROR("[SCTP %d] Received s1 path switch request ack on stream (%d)\n", + S1AP_ERROR("[SCTP %u] Received s1 path switch request ack on stream (%u)\n", assoc_id, stream); } if ((mme_desc_p = s1ap_eNB_get_MME(NULL, assoc_id, 0)) == NULL) { - S1AP_ERROR("[SCTP %d] Received S1 path switch request ack for non existing " + S1AP_ERROR("[SCTP %u] Received S1 path switch request ack for non existing " "MME context\n", assoc_id); return -1; } @@ -1648,7 +1648,7 @@ int s1ap_eNB_handle_s1_path_switch_request_ack(uint32_t assoc_id, S1AP_FIND_PROTOCOLIE_BY_ID(S1AP_PathSwitchRequestAcknowledgeIEs_t, ie, pathSwitchRequestAcknowledge, S1AP_ProtocolIE_ID_id_eNB_UE_S1AP_ID, true); if (ie == NULL) { - S1AP_ERROR("[SCTP %d] Received path switch request ack for non " + S1AP_ERROR("[SCTP %u] Received path switch request ack for non " "ie context is NULL\n", assoc_id); itti_free(ITTI_MSG_ORIGIN_ID(message_p), message_p); return -1; @@ -1658,7 +1658,7 @@ int s1ap_eNB_handle_s1_path_switch_request_ack(uint32_t assoc_id, if ((ue_desc_p = s1ap_eNB_get_ue_context(mme_desc_p->s1ap_eNB_instance, ie->value.choice.ENB_UE_S1AP_ID)) == NULL) { - S1AP_ERROR("[SCTP %d] Received path switch request ack for non " + S1AP_ERROR("[SCTP %u] Received path switch request ack for non " "existing UE context 0x%06lx\n", assoc_id, ie->value.choice.ENB_UE_S1AP_ID); itti_free(ITTI_MSG_ORIGIN_ID(message_p), message_p); @@ -1671,7 +1671,7 @@ int s1ap_eNB_handle_s1_path_switch_request_ack(uint32_t assoc_id, S1AP_ProtocolIE_ID_id_MME_UE_S1AP_ID, true); if (ie == NULL) { - S1AP_ERROR("[SCTP %d] Received path switch request ack for non " + S1AP_ERROR("[SCTP %u] Received path switch request ack for non " "ie context is NULL\n", assoc_id); itti_free(ITTI_MSG_ORIGIN_ID(message_p), message_p); return -1; @@ -1680,7 +1680,7 @@ int s1ap_eNB_handle_s1_path_switch_request_ack(uint32_t assoc_id, S1AP_PATH_SWITCH_REQ_ACK(message_p).mme_ue_s1ap_id = ie->value.choice.MME_UE_S1AP_ID; if ( ue_desc_p->mme_ue_s1ap_id != ie->value.choice.MME_UE_S1AP_ID) { - S1AP_WARN("UE context mme_ue_s1ap_id is different form that of the message (%d != %ld)", + S1AP_WARN("UE context mme_ue_s1ap_id is different form that of the message (%u != %ld)", ue_desc_p->mme_ue_s1ap_id, ie->value.choice.MME_UE_S1AP_ID); } @@ -1689,7 +1689,7 @@ int s1ap_eNB_handle_s1_path_switch_request_ack(uint32_t assoc_id, S1AP_ProtocolIE_ID_id_SecurityContext, true); if (ie == NULL) { - S1AP_ERROR("[SCTP %d] Received path switch request ack for non " + S1AP_ERROR("[SCTP %u] Received path switch request ack for non " "ie context is NULL\n", assoc_id); itti_free(ITTI_MSG_ORIGIN_ID(message_p), message_p); return -1; @@ -1787,12 +1787,12 @@ int s1ap_eNB_handle_s1_path_switch_request_failure(uint32_t assoc_ pathSwitchRequestFailure = &pdu->choice.unsuccessfulOutcome.value.choice.PathSwitchRequestFailure; if (stream != 0) { - S1AP_WARN("[SCTP %d] Received s1 path switch request failure on stream != 0 (%d)\n", + S1AP_WARN("[SCTP %u] Received s1 path switch request failure on stream != 0 (%u)\n", assoc_id, stream); } if ((mme_desc_p = s1ap_eNB_get_MME(NULL, assoc_id, 0)) == NULL) { - S1AP_ERROR("[SCTP %d] Received S1 path switch request failure for non existing " + S1AP_ERROR("[SCTP %u] Received S1 path switch request failure for non existing " "MME context\n", assoc_id); return -1; } @@ -1801,7 +1801,7 @@ int s1ap_eNB_handle_s1_path_switch_request_failure(uint32_t assoc_ S1AP_ProtocolIE_ID_id_Cause, true); if (ie == NULL) { - S1AP_ERROR("[SCTP %d] Received S1 path switch request failure for non existing " + S1AP_ERROR("[SCTP %u] Received S1 path switch request failure for non existing " "ie context is NULL\n", assoc_id); return -1; } @@ -1893,7 +1893,7 @@ static int s1ap_eNB_snd_s1_setup_request( ie->value.choice.Global_ENB_ID.eNB_ID.present = S1AP_ENB_ID_PR_macroENB_ID; MACRO_ENB_ID_TO_BIT_STRING(instance_p->eNB_id, &ie->value.choice.Global_ENB_ID.eNB_ID.choice.macroENB_ID); - S1AP_INFO("%d -> %02x%02x%02x\n", instance_p->eNB_id, + S1AP_INFO("%u -> %02x%02x%02x\n", instance_p->eNB_id, ie->value.choice.Global_ENB_ID.eNB_ID.choice.macroENB_ID.buf[0], ie->value.choice.Global_ENB_ID.eNB_ID.choice.macroENB_ID.buf[1], ie->value.choice.Global_ENB_ID.eNB_ID.choice.macroENB_ID.buf[2]); diff --git a/openair3/S1AP/s1ap_eNB_nas_procedures.c b/openair3/S1AP/s1ap_eNB_nas_procedures.c index 69730cb83a2d65c2fb39067656b1d3a9819d2536..d1eefc8b21b96b44c31b45d4dbafb03eae46e815 100644 --- a/openair3/S1AP/s1ap_eNB_nas_procedures.c +++ b/openair3/S1AP/s1ap_eNB_nas_procedures.c @@ -332,14 +332,14 @@ int s1ap_eNB_handle_nas_downlink(uint32_t assoc_id, /* UE-related procedure -> stream != 0 */ if (stream == 0) { - S1AP_ERROR("[SCTP %d] Received UE-related procedure on stream == 0\n", + S1AP_ERROR("[SCTP %u] Received UE-related procedure on stream == 0\n", assoc_id); return -1; } if ((mme_desc_p = s1ap_eNB_get_MME(NULL, assoc_id, 0)) == NULL) { S1AP_ERROR( - "[SCTP %d] Received NAS downlink message for non existing MME context\n", + "[SCTP %u] Received NAS downlink message for non existing MME context\n", assoc_id); return -1; } @@ -365,7 +365,7 @@ int s1ap_eNB_handle_nas_downlink(uint32_t assoc_id, if ((ue_desc_p = s1ap_eNB_get_ue_context(s1ap_eNB_instance, enb_ue_s1ap_id)) == NULL) { - S1AP_ERROR("[SCTP %d] Received NAS downlink message for non existing UE context eNB_UE_S1AP_ID: 0x%lx\n", + S1AP_ERROR("[SCTP %u] Received NAS downlink message for non existing UE context eNB_UE_S1AP_ID: 0x%lx\n", assoc_id, enb_ue_s1ap_id); return -1; @@ -374,7 +374,7 @@ int s1ap_eNB_handle_nas_downlink(uint32_t assoc_id, if (0 == ue_desc_p->rx_stream) { ue_desc_p->rx_stream = stream; } else if (stream != ue_desc_p->rx_stream) { - S1AP_ERROR("[SCTP %d] Received UE-related procedure on stream %u, expecting %u\n", + S1AP_ERROR("[SCTP %u] Received UE-related procedure on stream %u, expecting %d\n", assoc_id, stream, ue_desc_p->rx_stream); return -1; } @@ -1305,7 +1305,7 @@ int s1ap_eNB_e_rab_release_resp(instance_t instance, s1ap_eNB_itti_send_sctp_data_req(s1ap_eNB_instance_p->instance, ue_context_p->mme_ref->assoc_id, buffer, length, ue_context_p->tx_stream); - S1AP_INFO("e_rab_release_response sended eNB_UE_S1AP_ID %d mme_ue_s1ap_id %d nb_of_e_rabs_released %d nb_of_e_rabs_failed %d\n", + S1AP_INFO("e_rab_release_response sended eNB_UE_S1AP_ID %d mme_ue_s1ap_id %u nb_of_e_rabs_released %d nb_of_e_rabs_failed %d\n", e_rab_release_resp_p->eNB_ue_s1ap_id, ue_context_p->mme_ue_s1ap_id,e_rab_release_resp_p->nb_of_e_rabs_released,e_rab_release_resp_p->nb_of_e_rabs_failed); return 0; } @@ -1842,7 +1842,7 @@ int s1ap_eNB_generate_E_RAB_Modification_Indication( } // Non UE-Associated signalling -> stream = 0 - S1AP_INFO("Size of encoded message: %d \n", len); + S1AP_INFO("Size of encoded message: %u \n", len); s1ap_eNB_itti_send_sctp_data_req(s1ap_eNB_instance_p->instance, ue_context_p->mme_ref->assoc_id, buffer, len, ue_context_p->tx_stream); diff --git a/openair3/S1AP/s1ap_eNB_overload.c b/openair3/S1AP/s1ap_eNB_overload.c index 64d3fcdf65943c3b8f8d939f2072b943df3ef272..4266a7090cc34bdbac8f4668d1e35de381bbb8e5 100644 --- a/openair3/S1AP/s1ap_eNB_overload.c +++ b/openair3/S1AP/s1ap_eNB_overload.c @@ -68,7 +68,7 @@ int s1ap_eNB_handle_overload_start(uint32_t assoc_id, } /* Non UE-associated signalling -> stream 0 */ if (stream != 0) { - S1AP_ERROR("[SCTP %d] Received s1 overload start on stream != 0 (%d)\n", + S1AP_ERROR("[SCTP %u] Received s1 overload start on stream != 0 (%u)\n", assoc_id, stream); return -1; } @@ -102,7 +102,7 @@ int s1ap_eNB_handle_overload_stop(uint32_t assoc_id, /* Non UE-associated signalling -> stream 0 */ if (stream != 0) { - S1AP_ERROR("[SCTP %d] Received s1 overload stop on stream != 0 (%d)\n", + S1AP_ERROR("[SCTP %u] Received s1 overload stop on stream != 0 (%u)\n", assoc_id, stream); return -1; } diff --git a/openair3/SCTP/sctp_eNB_task.c b/openair3/SCTP/sctp_eNB_task.c index 7706137b2e73fb2cc53383bb17689377a25bba3e..35a2692bd4d2d1d9d00a60b29c84584b971a2c08 100644 --- a/openair3/SCTP/sctp_eNB_task.c +++ b/openair3/SCTP/sctp_eNB_task.c @@ -651,7 +651,7 @@ static void sctp_send_data(sctp_data_req_t *sctp_data_req_p) return; } free(sctp_data_req_p->buffer); // assuming it has been malloced - SCTP_DEBUG("Successfully sent %u bytes on stream %d for assoc_id %u\n", + SCTP_DEBUG("Successfully sent %u bytes on stream %d for assoc_id %d\n", sctp_data_req_p->buffer_length, sctp_data_req_p->stream, sctp_cnx->assoc_id); } @@ -673,7 +673,7 @@ static int sctp_close_association(sctp_close_association_t *close_association_p) } else { close(sctp_cnx->sd); STAILQ_REMOVE(&sctp_cnx_list, sctp_cnx, sctp_cnx_list_elm_s, entries); - SCTP_DEBUG("Removed assoc_id %u (closed socket %u)\n", + SCTP_DEBUG("Removed assoc_id %d (closed socket %u)\n", sctp_cnx->assoc_id, (unsigned int)sctp_cnx->sd); } diff --git a/openair3/TEST/test_s1ap.c b/openair3/TEST/test_s1ap.c index a040822155daadefdd241cc6a117239286068b41..8e61c338acfc57ea01031cbec6c71f59aac92580 100644 --- a/openair3/TEST/test_s1ap.c +++ b/openair3/TEST/test_s1ap.c @@ -132,7 +132,7 @@ static int compare_buffer(uint8_t *buffer, uint32_t length_buffer, int i; if (length_buffer != length_pattern) { - printf("Length mismatch, expecting %d bytes, got %d bytes\n", length_pattern, + printf("Length mismatch, expecting %u bytes, got %u bytes\n", length_pattern, length_buffer); hexprint(buffer, length_buffer); return -1; diff --git a/radio/AW2SORI/oaiori.c b/radio/AW2SORI/oaiori.c index b9368bb22bc1d9c33c127bc069fecbbaa3c43e34..8665abc86a36bc44d8494c9de3058bc220eec3d2 100644 --- a/radio/AW2SORI/oaiori.c +++ b/radio/AW2SORI/oaiori.c @@ -124,7 +124,7 @@ uint32_t to_earfcn_DL_aw2s(int eutra_bandP, long long int dl_CarrierFreq, uint32 printf("Band %d, bw %u : DL carrier frequency %u .1MHz > %d\n", eutra_bandtable[i].band, bw, dl_CarrierFreq_by_100k, eutra_bandtable[i].dl_max - bw); i++;continue; } - printf("AW2S: dl_CarrierFreq_by_100k %d, dl_min %d\n",dl_CarrierFreq_by_100k,eutra_bandtable[i].dl_min); + printf("AW2S: dl_CarrierFreq_by_100k %u, dl_min %d\n",dl_CarrierFreq_by_100k,eutra_bandtable[i].dl_min); return (dl_CarrierFreq_by_100k - eutra_bandtable[i].dl_min + (eutra_bandtable[i].N_OFFs_DL / 10)); @@ -690,7 +690,7 @@ int aw2s_oriinit(openair0_device *device) { rxParams.RxEUtraTDD.chanBW = txParams.TxEUtraTDD.chanBW; rxParams.RxEUtraTDD.earfcn = txParams.TxEUtraTDD.earfcn; - printf("AW2S: Creating RX0 for EARFCN %d\n",rxParams.RxEUtraTDD.earfcn); + printf("AW2S: Creating RX0 for EARFCN %u\n",rxParams.RxEUtraTDD.earfcn); result = ORI_ObjectCreation(ori, rxTypeRef, rxParams, rxParamList, num_rxparams, rxParamResult, &rx0, &RE_result); @@ -702,7 +702,7 @@ int aw2s_oriinit(openair0_device *device) { rxParams.RxNRTDD.chanBW = txParams.TxNRTDD.chanBW; rxParams.RxNRTDD.AWS_arfcn = txParams.TxNRTDD.AWS_arfcn; - printf("AW2S: Creating RX0 for NRARFCN %d\n",rxParams.RxNRTDD.AWS_arfcn); + printf("AW2S: Creating RX0 for NRARFCN %u\n",rxParams.RxNRTDD.AWS_arfcn); result = ORI_ObjectCreation(ori, rxTypeRef, rxParams, rxParamList, num_rxparams, rxParamResult, &rx0, &RE_result); diff --git a/radio/LMSSDR/USERSPACE/LIB/sodera_lib.cpp b/radio/LMSSDR/USERSPACE/LIB/sodera_lib.cpp index d1e46c9d88267e3ef51ecf117f86808ee15a34f7..7c3690a9d6110ab82609a0a5e069b159ef949b39 100644 --- a/radio/LMSSDR/USERSPACE/LIB/sodera_lib.cpp +++ b/radio/LMSSDR/USERSPACE/LIB/sodera_lib.cpp @@ -307,7 +307,7 @@ static int trx_sodera_read(openair0_device *device, openair0_timestamp *ptimesta else { // check the timestamp if (i==0) { if ((s->rx_timestamp + ind) != p->counter) { - printf("Error, RX timestamp error, got %llu, should be %llu\n",p->counter,s->rx_timestamp+ind); + printf("Error, RX timestamp error, got %lu, should be %llu\n",p->counter,s->rx_timestamp+ind); return(ind); } }