minor changes in cnProc generator

Conflicts:
	openair2/RRC/NR/rrc_gNB.c

openair1/PHY/CODING/nrLDPC_decoder/nrLDPC_decoder.c

@@ -112,7 +112,7 @@
 
 
 #define NR_LDPC_ENABLE_PARITY_CHECK
-//#define NR_LDPC_PROFILER_DETAIL
+#define NR_LDPC_PROFILER_DETAIL
 
 #ifdef NR_LDPC_DEBUG_MODE
 #include "nrLDPC_tools/nrLDPC_debug.h"

openair1/PHY/CODING/nrLDPC_decoder/nrLDPC_tools/generator_cnProc_avx512/cnProc_gen_BG1_avx512.c

@@ -23,6 +23,7 @@
 #include <stdint.h>
 #include <stdlib.h>
 #include "../../nrLDPCdecoder_defs.h"
+#define AVOID_MAXLLR 1
 
 void nrLDPC_cnProc_BG1_generator_AVX512(const char *dir, int R)
 {
@@ -120,7 +121,9 @@ void nrLDPC_cnProc_BG1_generator_AVX512(const char *dir, int R)
 
       // Store result
       //                min = _mm512_min_epu8(min, *maxLLR); // 128 in epi8 is -127
+#ifndef AVOID_MAXLLR
       fprintf(fd, "                min = _mm512_min_epu8(min, maxLLR);\n");
+#endif
       //                *p_cnProcBufResBit = _mm512_sign_epi8(min, sgn);
       //                p_cnProcBufResBit++;
       fprintf(fd, "                ((__m512i*)cnProcBufRes)[%d+i] = conditional_negate(min, sgn,zeros);\n", (lut_startAddrCnGroups[0] >> 6) + (j * bitOffsetInGroup));
@@ -167,7 +170,9 @@ void nrLDPC_cnProc_BG1_generator_AVX512(const char *dir, int R)
 
       // Store result
       //                min = _mm512_min_epu8(min, maxLLR); // 128 in epi8 is -127
+#ifndef AVOID_MAXLLR
       fprintf(fd, "                min = _mm512_min_epu8(min, maxLLR);\n");
+#endif
       //                *p_cnProcBufResBit = _mm512_sign_epi8(min, sgn);
       //                p_cnProcBufResBit++;
       fprintf(fd, "                ((__m512i*)cnProcBufRes)[%d+i] = conditional_negate(min, sgn,zeros);\n", (lut_startAddrCnGroups[1] >> 6) + (j * bitOffsetInGroup));
@@ -213,8 +218,9 @@ void nrLDPC_cnProc_BG1_generator_AVX512(const char *dir, int R)
 
       // Store result
       //                min = _mm512_min_epu8(min, maxLLR); // 128 in epi8 is -127
+#ifndef AVOID_MAXLLR
       fprintf(fd, "                min = _mm512_min_epu8(min, maxLLR);\n");
-
+#endif
       fprintf(fd, "                ((__m512i*)cnProcBufRes)[%d+i] = conditional_negate(min, sgn,zeros);\n", (lut_startAddrCnGroups[2] >> 6) + (j * bitOffsetInGroup));
       fprintf(fd, "           }\n");
     }
@@ -259,7 +265,9 @@ void nrLDPC_cnProc_BG1_generator_AVX512(const char *dir, int R)
 
       // Store result
       //                min = _mm512_min_epu8(min, maxLLR); // 128 in epi8 is -127
+#ifndef AVOID_MAXLLR
       fprintf(fd, "                min = _mm512_min_epu8(min, maxLLR);\n");
+#endif
 
       fprintf(fd, "                ((__m512i*)cnProcBufRes)[%d+i] = conditional_negate(min, sgn,zeros);\n", (lut_startAddrCnGroups[3] >> 6) + (j * bitOffsetInGroup));
       fprintf(fd, "            }\n");
@@ -313,8 +321,9 @@ void nrLDPC_cnProc_BG1_generator_AVX512(const char *dir, int R)
 
       // Store result
       //                min = _mm512_min_epu8(min, maxLLR); // 128 in epi8 is -127
+#ifndef AVOID_MAXLLR
       fprintf(fd, "                min = _mm512_min_epu8(min, maxLLR);\n");
-
+#endif
       fprintf(fd, "                ((__m512i*)cnProcBufRes)[%d+i] = conditional_negate(min, sgn,zeros);\n", (lut_startAddrCnGroups[4] >> 6) + (j * bitOffsetInGroup));
       fprintf(fd, "            }\n");
     }
@@ -368,8 +377,9 @@ void nrLDPC_cnProc_BG1_generator_AVX512(const char *dir, int R)
 
       // Store result
       //                min = _mm512_min_epu8(min, maxLLR); // 128 in epi8 is -127
+#ifndef AVOID_MAXLLR
       fprintf(fd, "                min = _mm512_min_epu8(min, maxLLR);\n");
-
+#endif
       fprintf(fd, "                ((__m512i*)cnProcBufRes)[%d+i] = conditional_negate(min, sgn,zeros);\n", (lut_startAddrCnGroups[5] >> 6) + (j * bitOffsetInGroup));
       fprintf(fd, "              }\n");
     }
@@ -425,8 +435,9 @@ void nrLDPC_cnProc_BG1_generator_AVX512(const char *dir, int R)
 
       // Store result
       //                min = _mm512_min_epu8(min, maxLLR); // 128 in epi8 is -127
+#ifndef AVOID_MAXLLR
       fprintf(fd, "                min = _mm512_min_epu8(min, maxLLR);\n");
-
+#endif
       fprintf(fd, "                ((__m512i*)cnProcBufRes)[%d+i] = conditional_negate(min, sgn,zeros);\n", (lut_startAddrCnGroups[6] >> 6) + (j * bitOffsetInGroup));
       fprintf(fd, "              }\n");
     }
@@ -482,8 +493,9 @@ void nrLDPC_cnProc_BG1_generator_AVX512(const char *dir, int R)
 
       // Store result
       //                min = _mm512_min_epu8(min, maxLLR); // 128 in epi8 is -127
+#ifndef AVOID_MAXLLR
       fprintf(fd, "                min = _mm512_min_epu8(min, maxLLR);\n");
-
+#endif
       fprintf(fd, "                ((__m512i*)cnProcBufRes)[%d+i] = conditional_negate(min,sgn,zeros);\n", (lut_startAddrCnGroups[7] >> 6) + (j * bitOffsetInGroup));
       fprintf(fd, "            }\n");
     }
@@ -548,8 +560,9 @@ void nrLDPC_cnProc_BG1_generator_AVX512(const char *dir, int R)
 
       // Store result
       //                min = _mm512_min_epu8(min, maxLLR); // 128 in epi8 is -127
+#ifndef AVOID_MAXLLR
       fprintf(fd, "                min = _mm512_min_epu8(min, maxLLR);\n");
-
+#endif
       fprintf(fd, "                ((__m512i*)cnProcBufRes)[%d+i] = conditional_negate(min, sgn,zeros);\n", (lut_startAddrCnGroups[8] >> 6) + (j * bitOffsetInGroup));
       fprintf(fd, "            }\n");
     }

openair2/LAYER2/nr_pdcp/nr_pdcp_entity.c

@@ -126,7 +126,7 @@ static void nr_pdcp_entity_recv_pdu(nr_pdcp_entity_t *entity,
 
   if (rcvd_count < entity->rx_deliv
       || nr_pdcp_sdu_in_list(entity->rx_list, rcvd_count)) {
-    LOG_W(PDCP, "discard NR PDU rcvd_count=%d, entity->rx_deliv %d,sdu_in_list %d\n", rcvd_count,entity->rx_deliv,nr_pdcp_sdu_in_list(entity->rx_list,rcvd_count));
+    LOG_D(PDCP, "discard NR PDU rcvd_count=%d, entity->rx_deliv %d,sdu_in_list %d\n", rcvd_count,entity->rx_deliv,nr_pdcp_sdu_in_list(entity->rx_list,rcvd_count));
     entity->stats.rxpdu_dd_pkts++;
     entity->stats.rxpdu_dd_bytes += size;
 

openair2/RRC/NR/MESSAGES/asn1_msg.c

@@ -1594,7 +1594,7 @@ int16_t do_RRCReconfiguration(
                                     (void *)&dl_dcch_msg,
                                     buffer,
                                     buffer_size);
-
+    LOG_W(NR_RRC,"do_RRCReconfiguration enc_rval.encoded %d\n",enc_rval.encoded);
     if(enc_rval.encoded == -1) {
         LOG_I(NR_RRC, "[gNB AssertFatal]ASN1 message encoding failed (%s, %lu)!\n",
             enc_rval.failed_type->name, enc_rval.encoded);

openair2/RRC/NR/rrc_gNB.c

@@ -642,7 +642,7 @@ rrc_gNB_generate_defaultRRCReconfiguration(
                                 NULL,
                                 ue_p->masterCellGroup);
   AssertFatal(size > 0, "cannot encode RRCReconfiguration in %s()\n", __func__);
-  LOG_W(RRC, "do_RRCReconfiguration(): size %d\n", size);
+  LOG_W(NR_RRC, "do_RRCReconfiguration(): size %d\n", size);
 
   if (LOG_DEBUGFLAG(DEBUG_ASN1)) {
     xer_fprint(stdout, &asn_DEF_NR_CellGroupConfig, ue_p->masterCellGroup);