Merge branch '448-ldpc-decoder-optimizations' into 'develop-nr'

Resolve "LDPC Decoder Optimizations"

See merge request oai/openairinterface5g!680

common/utils/LOG/vcd_signal_dumper.c

@@ -622,6 +622,10 @@ inline static uint32_t vcd_get_write_index(void)
   return write_index;
 }
 
+#if defined(ENABLE_ITTI)
+int signal_mask(void);
+#endif
+
 void *vcd_dumper_thread_rt(void *args)
 {
   vcd_queue_user_data_t *data;

openair1/PHY/CODING/nrLDPC_decoder/doc/nrLDPC_doxyCfg

@@ -771,7 +771,7 @@ WARN_LOGFILE           =
 # spaces. See also FILE_PATTERNS and EXTENSION_MAPPING
 # Note: If this tag is empty the current directory is searched.
 
-INPUT                  = ../nrLDPC_defs.h ../nrLDPC_types.h ../nrLDPC_init.h ../nrLDPC_cnProc.h ../nrLDPC_bnProc.h ../nrLDPC_mPass.h ../nrLDPC_decoder.h ../nrLDPC_decoder.c ../nrLDPC_lut/nrLDPC_lut.h
+INPUT                  = ../nrLDPC_defs.h ../nrLDPC_types.h ../nrLDPC_init.h ../nrLDPC_cnProc.h ../nrLDPC_bnProc.h ../nrLDPC_mPass.h ../nrLDPC_decoder.h ../nrLDPC_decoder.c ../nrLDPC_lut.h
 
 # This tag can be used to specify the character encoding of the source files
 # that doxygen parses. Internally doxygen uses the UTF-8 encoding. Doxygen uses

openair1/PHY/CODING/nrLDPC_decoder/nrLDPC_cnProc.h

@@ -22,7 +22,7 @@
 /*!\file nrLDPC_cnProc.h
  * \brief Defines the functions for check node processing
  * \author Sebastian Wagner (TCL Communications) Email: <mailto:sebastian.wagner@tcl.com>
- * \date 27-03-2018
+ * \date 30-09-2019
  * \version 1.0
  * \note
  * \warning
@@ -34,6 +34,7 @@
 /**
    \brief Performs CN processing for BG2 on the CN processing buffer and stores the results in the CN processing results buffer.
    \param p_lut Pointer to decoder LUTs
+   \param p_procBuf Pointer to processing buffers
    \param Z Lifting size
 */
 static inline void nrLDPC_cnProc_BG2(t_nrLDPC_lut* p_lut, t_nrLDPC_procBuf* p_procBuf, uint16_t Z)

openair1/PHY/CODING/nrLDPC_decoder/nrLDPC_decoder.c

@@ -22,8 +22,8 @@
 /*!\file nrLDPC_decoder.c
  * \brief Defines the LDPC decoder
  * \author Sebastian Wagner (TCL Communications) Email: <mailto:sebastian.wagner@tcl.com>
- * \date 27-03-2018
- * \version 1.0
+ * \date 30-09-2019
+ * \version 2.0
  * \note
  * \warning
  */
@@ -96,6 +96,8 @@ static inline uint32_t nrLDPC_decoder_core(int8_t* p_llr, int8_t* p_out, t_nrLDP
     {
         // Use LLR processing buffer as temporary output buffer
         p_llrOut = p_procBuf->llrProcBuf;
+        // Clear llrProcBuf
+        memset(p_llrOut,0, NR_LDPC_MAX_NUM_LLR*sizeof(int8_t));
     }
 
 
@@ -116,7 +118,14 @@ static inline uint32_t nrLDPC_decoder_core(int8_t* p_llr, int8_t* p_out, t_nrLDP
 #ifdef NR_LDPC_PROFILER_DETAIL
     start_meas(&p_profiler->llr2CnProcBuf);
 #endif
-    nrLDPC_llr2CnProcBuf(p_lut, p_llr, p_procBuf, numLLR, Z, BG);
+    if (BG == 1)
+    {
+        nrLDPC_llr2CnProcBuf_BG1(p_lut, p_llr, p_procBuf, Z);
+    }
+    else
+    {
+        nrLDPC_llr2CnProcBuf_BG2(p_lut, p_llr, p_procBuf, Z);
+    }
 #ifdef NR_LDPC_PROFILER_DETAIL
     stop_meas(&p_profiler->llr2CnProcBuf);
 #endif
@@ -158,7 +167,7 @@ static inline uint32_t nrLDPC_decoder_core(int8_t* p_llr, int8_t* p_out, t_nrLDP
     }
     else
     {
-        nrLDPC_cn2bnProcBuf(p_lut, p_procBuf, Z);
+        nrLDPC_cn2bnProcBuf_BG2(p_lut, p_procBuf, Z);
     }
 #ifdef NR_LDPC_PROFILER_DETAIL
     stop_meas(&p_profiler->cn2bnProcBuf);
@@ -206,7 +215,7 @@ static inline uint32_t nrLDPC_decoder_core(int8_t* p_llr, int8_t* p_out, t_nrLDP
     }
     else
     {
-        nrLDPC_bn2cnProcBuf(p_lut, p_procBuf, Z);
+        nrLDPC_bn2cnProcBuf_BG2(p_lut, p_procBuf, Z);
     }
 #ifdef NR_LDPC_PROFILER_DETAIL
     stop_meas(&p_profiler->bn2cnProcBuf);
@@ -257,7 +266,7 @@ static inline uint32_t nrLDPC_decoder_core(int8_t* p_llr, int8_t* p_out, t_nrLDP
         }
         else
         {
-            nrLDPC_cn2bnProcBuf(p_lut, p_procBuf, Z);
+            nrLDPC_cn2bnProcBuf_BG2(p_lut, p_procBuf, Z);
         }
 #ifdef NR_LDPC_PROFILER_DETAIL
         stop_meas(&p_profiler->cn2bnProcBuf);
@@ -302,7 +311,7 @@ static inline uint32_t nrLDPC_decoder_core(int8_t* p_llr, int8_t* p_out, t_nrLDP
         }
         else
         {
-            nrLDPC_bn2cnProcBuf(p_lut, p_procBuf, Z);
+            nrLDPC_bn2cnProcBuf_BG2(p_lut, p_procBuf, Z);
         }
 #ifdef NR_LDPC_PROFILER_DETAIL
         stop_meas(&p_profiler->bn2cnProcBuf);
@@ -329,7 +338,6 @@ static inline uint32_t nrLDPC_decoder_core(int8_t* p_llr, int8_t* p_out, t_nrLDP
         stop_meas(&p_profiler->cnProcPc);
 #endif
 #endif
-
     }
 
     // Last iteration
@@ -368,7 +376,7 @@ static inline uint32_t nrLDPC_decoder_core(int8_t* p_llr, int8_t* p_out, t_nrLDP
         }
         else
         {
-            nrLDPC_cn2bnProcBuf(p_lut, p_procBuf, Z);
+            nrLDPC_cn2bnProcBuf_BG2(p_lut, p_procBuf, Z);
         }
 #ifdef NR_LDPC_PROFILER_DETAIL
         stop_meas(&p_profiler->cn2bnProcBuf);
@@ -416,7 +424,7 @@ static inline uint32_t nrLDPC_decoder_core(int8_t* p_llr, int8_t* p_out, t_nrLDP
         }
         else
         {
-            nrLDPC_bn2cnProcBuf(p_lut, p_procBuf, Z);
+            nrLDPC_bn2cnProcBuf_BG2(p_lut, p_procBuf, Z);
         }
 #ifdef NR_LDPC_PROFILER_DETAIL
         stop_meas(&p_profiler->bn2cnProcBuf);
@@ -444,19 +452,21 @@ static inline uint32_t nrLDPC_decoder_core(int8_t* p_llr, int8_t* p_out, t_nrLDP
 #endif
     }
 
-
     // If maximum number of iterations reached an PC still fails increase number of iterations
     // Thus, i > numMaxIter indicates that PC has failed
+
+#ifdef NR_LDPC_ENABLE_PARITY_CHECK
     if (pcRes != 0)
     {
         i++;
     }
+#endif
 
     // Assign results from processing buffer to output
 #ifdef NR_LDPC_PROFILER_DETAIL
     start_meas(&p_profiler->llrRes2llrOut);
 #endif
-    nrLDPC_llrRes2llrOut(p_lut, p_llrOut, p_procBuf, numLLR);
+    nrLDPC_llrRes2llrOut(p_lut, p_llrOut, p_procBuf, Z, BG);
 #ifdef NR_LDPC_PROFILER_DETAIL
     stop_meas(&p_profiler->llrRes2llrOut);
 #endif

openair1/PHY/CODING/nrLDPC_decoder/nrLDPC_lut/lut_cn2bnProcBuf_BG1_Z10_R23.h

-static const uint32_t lut_cn2bnProcBuf_BG1_Z10_R23[1440] = {52227, 52228, 52229, 52230, 52231, 52232, 52233, 52224, 52225, 52226, 47621, 47622, 47623, 47624, 47625, 47616, 47617, 47618, 47619, 47620, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 53378, 53379, 53380, 53381, 53382, 53383, 53384, 53385, 53376, 53377, 49540, 49541, 49542, 49543, 49544, 49545, 49536, 49537, 49538, 49539, 54921, 54912, 54913, 54914, 54915, 54916, 54917, 54918, 54919, 54920, 48392, 48393, 48384, 48385, 48386, 48387, 48388, 48389, 48390, 48391, 13440, 13441, 13442, 13443, 13444, 13445, 13446, 13447, 13448, 13449, 50309, 50310, 50311, 50312, 50313, 50304, 50305, 50306, 50307, 50308, 22673, 22674, 22675, 22666, 22667, 22668, 22669, 22670, 22671, 22672, 25355, 25356, 25357, 25358, 25359, 25360, 25361, 25362, 25363, 25354, 43401, 43392, 43393, 43394, 43395, 43396, 43397, 43398, 43399, 43400, 22676, 22677, 22678, 22679, 22680, 22681, 22682, 22683, 22684, 22685, 25369, 25370, 25371, 25372, 25373, 25364, 25365, 25366, 25367, 25368, 43410, 43411, 43402, 43403, 43404, 43405, 43406, 43407, 43408, 43409, 22691, 22692, 22693, 22694, 22695, 22686, 22687, 22688, 22689, 22690, 25375, 25376, 25377, 25378, 25379, 25380, 25381, 25382, 25383, 25374, 43427, 43428, 43429, 43430, 43431, 43422, 43423, 43424, 43425, 43426, 22702, 22703, 22704, 22705, 22696, 22697, 22698, 22699, 22700, 22701, 25385, 25386, 25387