fix(nrLDPC_coding_segment): move rate matching, interleaving and their...

fix(nrLDPC_coding_segment): move rate matching, interleaving and their counterparts to segment coding implementation

CMakeLists.txt

@@ -807,8 +807,6 @@ set(PHY_SRC_COMMON
   ${OPENAIR1_DIR}/PHY/LTE_REFSIG/lte_dl_mbsfn.c
   ${OPENAIR1_DIR}/PHY/LTE_REFSIG/lte_ul_ref.c
   ${OPENAIR1_DIR}/PHY/CODING/lte_segmentation.c
-  ${OPENAIR1_DIR}/PHY/CODING/nr_segmentation.c
-  ${OPENAIR1_DIR}/PHY/CODING/nr_rate_matching.c
   ${OPENAIR1_DIR}/PHY/CODING/ccoding_byte.c
   ${OPENAIR1_DIR}/PHY/CODING/ccoding_byte_lte.c
   ${OPENAIR1_DIR}/PHY/CODING/3gpplte_sse.c
@@ -919,6 +917,8 @@ set(PHY_SRC_UE
   )
 
   set(PHY_NR_SRC_COMMON
+  ${OPENAIR1_DIR}/PHY/CODING/nr_segmentation.c
+  ${OPENAIR1_DIR}/PHY/NR_TRANSPORT/nr_tbs_tools.c
   ${OPENAIR1_DIR}/PHY/NR_TRANSPORT/nr_prach_common.c
   ${OPENAIR1_DIR}/PHY/nr_phy_common/src/nr_phy_common_csirs.c
   ${OPENAIR1_DIR}/PHY/NR_TRANSPORT/nr_scrambling.c
@@ -942,7 +942,6 @@ set(PHY_SRC_UE
   ${OPENAIR1_DIR}/PHY/NR_TRANSPORT/nr_dlsch_coding.c
   ${OPENAIR1_DIR}/PHY/NR_TRANSPORT/nr_ulsch_decoding.c
   ${OPENAIR1_DIR}/PHY/NR_TRANSPORT/nr_ulsch.c
-  ${OPENAIR1_DIR}/PHY/NR_TRANSPORT/nr_tbs_tools.c
   ${OPENAIR1_DIR}/PHY/NR_TRANSPORT/nr_sch_dmrs.c
   ${OPENAIR1_DIR}/PHY/NR_TRANSPORT/nr_prach.c
   ${OPENAIR1_DIR}/PHY/NR_TRANSPORT/nr_ulsch_llr_computation.c
@@ -990,7 +989,6 @@ set(PHY_SRC_UE
   ${OPENAIR1_DIR}/PHY/NR_UE_TRANSPORT/nr_dlsch_demodulation.c
   ${OPENAIR1_DIR}/PHY/NR_UE_TRANSPORT/nr_ulsch_coding.c
   ${OPENAIR1_DIR}/PHY/NR_UE_TRANSPORT/nr_dlsch_decoding.c
-  ${OPENAIR1_DIR}/PHY/NR_TRANSPORT/nr_tbs_tools.c
   ${OPENAIR1_DIR}/PHY/NR_TRANSPORT/nr_prach_common.c
   ${OPENAIR1_DIR}/PHY/NR_TRANSPORT/nr_sch_dmrs.c
   ${OPENAIR1_DIR}/PHY/NR_UE_TRANSPORT/

openair1/PHY/CODING/nrLDPC_coding/nrLDPC_coding_segment/CMakeLists.txt

@@ -2,6 +2,7 @@ add_library(ldpc MODULE
   nrLDPC_coding_segment_decoder.c
   nrLDPC_coding_segment_encoder.c
   ${PHY_NR_CODINGIF}
+  nr_rate_matching.c
 )
 set_target_properties(ldpc PROPERTIES LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR})
 

openair1/PHY/CODING/nrLDPC_coding/nrLDPC_coding_segment/nrLDPC_coding_segment_decoder.c

@@ -25,6 +25,7 @@
 
 
 // [from gNB coding]
+#include "nr_rate_matching.h"
 #include "PHY/defs_gNB.h"
 #include "PHY/CODING/coding_extern.h"
 #include "PHY/CODING/coding_defs.h"

openair1/PHY/CODING/nrLDPC_coding/nrLDPC_coding_segment/nrLDPC_coding_segment_encoder.c

@@ -23,6 +23,7 @@
 * \brief Top-level routines for implementing LDPC encoding of transport channels
 */
 
+#include "nr_rate_matching.h"
 #include "PHY/defs_gNB.h"
 #include "PHY/CODING/coding_extern.h"
 #include "PHY/CODING/coding_defs.h"

openair1/PHY/CODING/nrLDPC_coding/nrLDPC_coding_segment/nr_rate_matching.h

+/*
+ * Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The OpenAirInterface Software Alliance licenses this file to You under
+ * the OAI Public License, Version 1.1  (the "License"); you may not use this file
+ * except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.openairinterface.org/?page_id=698
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *-------------------------------------------------------------------------------
+ * For more information about the OpenAirInterface (OAI) Software Alliance:
+ *      contact@openairinterface.org
+ */
+
+#ifndef __NR_RATE_MATCHING__H__
+#define __NR_RATE_MATCHING__H__
+
+#include <stdint.h>
+
+#define NR_NULL 2
+
+/**
+ * \brief interleave a code segment after encoding and rate matching
+ * \param E size of the code segment in bits
+ * \param Qm modulation order
+ * \param e input rate matched segment
+ * \param f output interleaved segment
+ */
+void nr_interleaving_ldpc(uint32_t E, uint8_t Qm, uint8_t *e, uint8_t *f);
+
+/**
+ * \brief deinterleave a code segment before RX rate matching and decoding
+ * \param E size of the code segment in bits
+ * \param Qm modulation order
+ * \param e output deinterleaved segment
+ * \param f input llr segment
+ */
+void nr_deinterleaving_ldpc(uint32_t E, uint8_t Qm, int16_t *e, int16_t *f);
+
+/**
+ * \brief rate match a code segment after encoding
+ * \Tbslbrm Transport Block size LBRM
+ * \param BG LDPC base graph number
+ * \param Z segment lifting size
+ * \param d input encoded segment
+ * \param e output rate matched segment
+ * \param C number of segments in the Transport Block
+ * \param F number of filler bits in the segment
+ * \param Foffset offset of the filler bits in the segment
+ * \param rvidx redundancy version index
+ * \param E size of the code segment in bits
+ */
+int nr_rate_matching_ldpc(uint32_t Tbslbrm,
+                          uint8_t BG,
+                          uint16_t Z,
+                          uint8_t *d,
+                          uint8_t *e,
+                          uint8_t C,
+                          uint32_t F,
+                          uint32_t Foffset,
+                          uint8_t rvidx,
+                          uint32_t E);
+
+/**
+ * \brief rate match a code segment before decoding
+ * \Tbslbrm Transport Block size LBRM
+ * \param BG LDPC base graph number
+ * \param Z segment lifting size
+ * \param d output rate matched segment
+ * \param soft_input input deinterleaved segment
+ * \param C number of segments in the Transport Block
+ * \param rvidx redundancy version index
+ * \param clear flag to clear d on the first round of a new HARQ process
+ * \param E size of the code segment in bits
+ * \param F number of filler bits in the segment
+ * \param Foffset offset of the filler bits in the segment
+ */
+int nr_rate_matching_ldpc_rx(uint32_t Tbslbrm,
+                             uint8_t BG,
+                             uint16_t Z,
+                             int16_t *d,
+                             int16_t *soft_input,
+                             uint8_t C,
+                             uint8_t rvidx,
+                             uint8_t clear,
+                             uint32_t E,
+                             uint32_t F,
+                             uint32_t Foffset);
+
+#endif

openair1/PHY/CODING/nrLDPC_coding/nrLDPC_coding_xdma/CMakeLists.txt

@@ -12,7 +12,9 @@ if (ENABLE_LDPC_XDMA)
               nrLDPC_coding_xdma.c
               ../nrLDPC_coding_segment/nrLDPC_coding_segment_encoder.c
               ../../nrLDPC_load.c
+              ../nrLDPC_coding_segment/nr_rate_matching.c
   )
+  target_include_directories(ldpc_xdma PRIVATE ../nrLDPC_coding_segment)
   set_target_properties(ldpc_xdma PROPERTIES LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR})
 
   add_dependencies(nr-softmodem ldpc_xdma)

openair1/PHY/CODING/nrLDPC_coding/nrLDPC_coding_xdma/nrLDPC_coding_xdma.c

@@ -27,6 +27,7 @@
 // [from gNB coding]
 #include <syscall.h>
 
+#include <nr_rate_matching.h>
 #include "PHY/CODING/coding_defs.h"
 #include "PHY/CODING/coding_extern.h"
 #include "PHY/CODING/lte_interleaver_inline.h"

openair1/PHY/CODING/nrLDPC_load.c

@@ -29,7 +29,7 @@
  * \note
  * \warning
  */
-#define _GNU_SOURCE 
+#define _GNU_SOURCE
 #include <sys/types.h>
 #include <stdlib.h>
 #include <malloc.h>
@@ -41,7 +41,7 @@
 
 /* arguments used when called from phy simulators exec's which do not use the config module */
 /* arg is used to initialize the config module so that the loader works as expected */
-char *arg[64]={"ldpctest",NULL};
+char *arg[64] = {"ldpctest", NULL};
 
 int load_LDPClib(char *version, ldpc_interface_t *itf)
 {

openair1/PHY/NR_TRANSPORT/nr_tbs_tools.c

@@ -20,45 +20,74 @@
  */
 
 /*! \file PHY/NR_TRANSPORT/nr_tbs_tools.c
-* \brief Top-level routines for implementing LDPC-coded (DLSCH) transport channels from 38-212, 15.2
-* \author H.Wang
-* \date 2018
-* \version 0.1
-* \company Eurecom
-* \email:
-* \note
-* \warning
-*/
+ * \brief Top-level routines for implementing LDPC-coded (DLSCH) transport channels from 38-212, 15.2
+ * \author H.Wang
+ * \date 2018
+ * \version 0.1
+ * \company Eurecom
+ * \email:
+ * \note
+ * \warning
+ */
 
 #include "nr_transport_common_proto.h"
 #include "PHY/CODING/coding_defs.h"
 #include "PHY/defs_nr_common.h"
 
-uint32_t nr_get_G(uint16_t nb_rb,
-                  uint16_t nb_symb_sch,
-                  uint8_t nb_re_dmrs,
-                  uint16_t length_dmrs,
-                  uint32_t unav_res,
-                  uint8_t Qm,
-                  uint8_t Nl)
+uint32_t
+nr_get_G(uint16_t nb_rb, uint16_t nb_symb_sch, uint8_t nb_re_dmrs, uint16_t length_dmrs, uint32_t unav_res, uint8_t Qm, uint8_t Nl)
 {
   uint32_t G = ((NR_NB_SC_PER_RB * nb_symb_sch) - (nb_re_dmrs * length_dmrs)) * nb_rb * Qm * Nl;
   G -= unav_res * Qm * Nl;
-  return(G);
+  return (G);
 }
 
 uint32_t nr_get_E(uint32_t G, uint8_t C, uint8_t Qm, uint8_t Nl, uint8_t r)
 {
   uint32_t E;
-  uint8_t Cprime = C; //assume CBGTI not present
+  uint8_t Cprime = C; // assume CBGTI not present
 
   AssertFatal(Nl > 0, "Nl is 0\n");
   AssertFatal(Qm > 0, "Qm is 0\n");
   if (r <= Cprime - ((G / (Nl * Qm)) % Cprime) - 1)
-      E = Nl * Qm * (G / (Nl * Qm * Cprime));
+    E = Nl * Qm * (G / (Nl * Qm * Cprime));
   else
-      E = Nl * Qm * ((G / (Nl * Qm * Cprime)) + 1);
+    E = Nl * Qm * ((G / (Nl * Qm * Cprime)) + 1);
 
-  LOG_D(PHY,"nr_get_E : (G %d, C %d, Qm %d, Nl %d, r %d), E %d\n",G, C, Qm, Nl, r, E);
+  LOG_D(PHY, "nr_get_E : (G %d, C %d, Qm %d, Nl %d, r %d), E %d\n", G, C, Qm, Nl, r, E);
   return E;
 }
+
+static const uint8_t index_k0[2][4] = {{0, 17, 33, 56}, {0, 13, 25, 43}};
+
+int nr_get_R_ldpc_decoder(int rvidx, int E, int BG, int Z, int *llrLen, int round)
+{
+  AssertFatal(BG == 1 || BG == 2, "Unknown BG %d\n", BG);
+
+  int Ncb = (BG == 1) ? (66 * Z) : (50 * Z);
+  int infoBits = (index_k0[BG - 1][rvidx] * Z + E);
+
+  if (round == 0)
+    *llrLen = infoBits;
+  if (infoBits > Ncb)
+    infoBits = Ncb;
+  if (infoBits > *llrLen)
+    *llrLen = infoBits;
+
+  int sysBits = (BG == 1) ? (22 * Z) : (10 * Z);
+  float decoderR = (float)sysBits / (infoBits + 2 * Z);
+
+  if (BG == 2)
+    if (decoderR < 0.3333)
+      return 15;
+    else if (decoderR < 0.6667)
+      return 13;
+    else
+      return 23;
+  else if (decoderR < 0.6667)
+    return 13;
+  else if (decoderR < 0.8889)
+    return 23;
+  else
+    return 89;
+}