5g-team
/
srsRAN_4G
mirror of https://github.com/pvnis/srsRAN_4G.git
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix base graph selection and improved PHY LIB logging

Browse Source
master
Xavier Arteaga 4 years ago committed by Xavier Arteaga
parent 808bb3fb94
commit d413c1aaec
1 changed files with 47 additions and 44 deletions
Show Stats Download Patch File Download Diff File

91
lib/src/phy/phch/sch_nr.c
Unescape Escape View File

@ -20,12 +20,15 @@
#include "srslte/phy/utils/debug.h"
#include "srslte/phy/utils/vector.h"
#define SCH_INFO_TX(...) INFO("SCH Tx: " __VA_ARGS__)
#define SCH_INFO_RX(...) INFO("SCH Rx: " __VA_ARGS__)
srslte_basegraph_t srslte_sch_nr_select_basegraph(uint32_t tbs, double R)
{
// if A ≤ 292 , or if A ≤ 3824 and R ≤ 0.67 , or if R ≤ 0 . 25 , LDPC base graph 2 is used;
// otherwise, LDPC base graph 1 is used
srslte_basegraph_t bg = BG1;
if ((tbs <= 292) || (tbs <= 292 && R <= 0.67) || (R <= 0.25)) {
if ((tbs <= 292) || (tbs <= 3824 && R <= 0.67) || (R <= 0.25)) {
bg = BG2;
}
@ -110,10 +113,11 @@ int srslte_dlsch_nr_fill_cfg(srslte_sch_nr_t* q,
// Calculate Nref
uint32_t N_re_lbrm = 156 * sch_nr_n_prb_lbrm(q->carrier.nof_prb);
double R_lbrm = 948.0 / 1024.0;
double TCR_lbrm = 948.0 / 1024.0;
uint32_t Qm_lbrm = (sch_cfg->mcs_table == srslte_mcs_table_256qam) ? 8 : 6;
uint32_t TBS_LRBM = srslte_ra_nr_tbs(N_re_lbrm, 1.0, R_lbrm, Qm_lbrm, q->carrier.max_mimo_layers);
cfg->Nref = ceil(TBS_LRBM / (cbsegm.C * 2.0 / 3.0));
uint32_t TBS_LRBM = srslte_ra_nr_tbs(N_re_lbrm, 1.0, TCR_lbrm, Qm_lbrm, q->carrier.max_mimo_layers);
double R = 2.0 / 3.0;
cfg->Nref = ceil(TBS_LRBM / (cbsegm.C * R));
// Calculate number of code blocks after applying CBGTI... not implemented, activate all CB
for (uint32_t r = 0; r < cbsegm.C; r++) {
@ -406,8 +410,8 @@ int srslte_dlsch_nr_encode(srslte_sch_nr_t* q,
// Calculate TB CRC
uint32_t checksum_tb = srslte_crc_checksum_byte(cfg.crc_tb, data, tb->tbs);
if (SRSLTE_DEBUG_ENABLED && srslte_verbose >= SRSLTE_VERBOSE_INFO && !handler_registered) {
INFO("tb=");
if (SRSLTE_DEBUG_ENABLED && srslte_verbose >= SRSLTE_VERBOSE_DEBUG && !handler_registered) {
DEBUG("tb=");
srslte_vec_fprint_byte(stdout, data, tb->tbs / 8);
}
@ -435,14 +439,14 @@ int srslte_dlsch_nr_encode(srslte_sch_nr_t* q,
// Append TB CRC
uint8_t* ptr = &q->temp_cb[cb_len];
srslte_bit_unpack(checksum_tb, &ptr, cfg.L_tb);
INFO("CB %d: appending TB CRC=%06x\n", r, checksum_tb);
SCH_INFO_TX("CB %d: appending TB CRC=%06x\n", r, checksum_tb);
} else {
// Copy payload
srslte_bit_unpack_vector(input_ptr, q->temp_cb, (int)cb_len);
}
if (SRSLTE_DEBUG_ENABLED && srslte_verbose >= SRSLTE_VERBOSE_INFO && !handler_registered) {
INFO("cb%d=", r);
if (SRSLTE_DEBUG_ENABLED && srslte_verbose >= SRSLTE_VERBOSE_DEBUG && !handler_registered) {
DEBUG("cb%d=", r);
srslte_vec_fprint_byte(stdout, input_ptr, cb_len / 8);
}
@ -451,7 +455,7 @@ int srslte_dlsch_nr_encode(srslte_sch_nr_t* q,
// Attach code block CRC if required
if (cfg.L_cb) {
srslte_crc_attach(&q->crc_cb, q->temp_cb, (int)(cfg.Kp - cfg.L_cb));
INFO("CB %d: CRC=%06x\n", r, (uint32_t)srslte_crc_checksum_get(&q->crc_cb));
SCH_INFO_TX("CB %d: CRC=%06x\n", r, (uint32_t)srslte_crc_checksum_get(&q->crc_cb));
}
// Insert filler bits
@ -462,8 +466,8 @@ int srslte_dlsch_nr_encode(srslte_sch_nr_t* q,
// Encode code block
srslte_ldpc_encoder_encode(cfg.encoder, q->temp_cb, rm_buffer, cfg.Kr);
if (SRSLTE_DEBUG_ENABLED && srslte_verbose >= SRSLTE_VERBOSE_INFO && !handler_registered) {
INFO("encoded=");
if (SRSLTE_DEBUG_ENABLED && srslte_verbose >= SRSLTE_VERBOSE_DEBUG && !handler_registered) {
DEBUG("encoded=");
srslte_vec_fprint_b(stdout, rm_buffer, cfg.encoder->liftN - 2 * cfg.encoder->ls);
}
}
@ -478,15 +482,15 @@ int srslte_dlsch_nr_encode(srslte_sch_nr_t* q,
j++;
// LDPC Rate matching
INFO("RM CB %d: E=%d; F=%d; BG=%d; Z=%d; RV=%d; Qm=%d; Nref=%d;\n",
r,
E,
cfg.F,
cfg.bg == BG1 ? 1 : 2,
cfg.Z,
tb->rv,
cfg.Qm,
cfg.Nref);
SCH_INFO_TX("RM CB %d: E=%d; F=%d; BG=%d; Z=%d; RV=%d; Qm=%d; Nref=%d;\n",
r,
E,
cfg.F,
cfg.bg == BG1 ? 1 : 2,
cfg.Z,
tb->rv,
cfg.Qm,
cfg.Nref);
srslte_ldpc_rm_tx(&q->tx_rm, rm_buffer, output_ptr, E, cfg.bg, cfg.Z, tb->rv, tb->mod, cfg.Nref);
output_ptr += E;
}
@ -548,7 +552,7 @@ int srslte_dlsch_nr_decode(srslte_sch_nr_t* q,
if (decoded) {
cb_ok++;
}
INFO("RM CB %d: Disabled, CRC %s ... Skipping\n", r, decoded ? "OK" : "KO");
SCH_INFO_RX("RM CB %d: Disabled, CRC %s ... Skipping\n", r, decoded ? "OK" : "KO");
continue;
}
@ -558,21 +562,21 @@ int srslte_dlsch_nr_decode(srslte_sch_nr_t* q,
// Skip CB if it has a matched CRC
if (decoded) {
INFO("RM CB %d: CRC OK ... Skipping\n", r);
SCH_INFO_RX("RM CB %d: CRC OK ... Skipping\n", r);
cb_ok++;
continue;
}
// LDPC Rate matching
INFO("RM CB %d: E=%d; F=%d; BG=%d; Z=%d; RV=%d; Qm=%d; Nref=%d;\n",
r,
E,
cfg.F,
cfg.bg == BG1 ? 1 : 2,
cfg.Z,
tb->rv,
cfg.Qm,
cfg.Nref);
SCH_INFO_RX("RM CB %d: E=%d; F=%d; BG=%d; Z=%d; RV=%d; Qm=%d; Nref=%d;\n",
r,
E,
cfg.F,
cfg.bg == BG1 ? 1 : 2,
cfg.Z,
tb->rv,
cfg.Qm,
cfg.Nref);
srslte_ldpc_rm_rx_c(&q->rx_rm, input_ptr, rm_buffer, E, cfg.F, cfg.bg, cfg.Z, tb->rv, tb->mod, cfg.Nref);
// Decode
@ -586,12 +590,12 @@ int srslte_dlsch_nr_decode(srslte_sch_nr_t* q,
uint32_t checksum2 = srslte_bit_pack(&ptr, cfg.L_cb);
tb->softbuffer.rx->cb_crc[r] = (checksum1 == checksum2);
INFO("CB %d/%d: CRC={%06x, %06x} ... %s\n",
r,
cfg.C,
checksum1,
checksum2,
tb->softbuffer.rx->cb_crc[r] ? "OK" : "KO");
SCH_INFO_RX("CB %d/%d: CRC={%06x, %06x} ... %s\n",
r,
cfg.C,
checksum1,
checksum2,
tb->softbuffer.rx->cb_crc[r] ? "OK" : "KO");
} else {
tb->softbuffer.rx->cb_crc[r] = true;
}
@ -621,11 +625,10 @@ int srslte_dlsch_nr_decode(srslte_sch_nr_t* q,
srslte_vec_u8_copy(output_ptr, tb->softbuffer.rx->data[r], cb_len / 8);
output_ptr += cb_len / 8;
if (SRSLTE_DEBUG_ENABLED && srslte_verbose >= SRSLTE_VERBOSE_INFO && !handler_registered) {
printf("CB %d:", r);
if (SRSLTE_DEBUG_ENABLED && srslte_verbose >= SRSLTE_VERBOSE_DEBUG && !handler_registered) {
DEBUG("CB %d:", r);
srslte_vec_fprint_byte(stdout, tb->softbuffer.rx->data[r], cb_len / 8);
}
if (r == cfg.C - 1) {
uint8_t tb_crc_unpacked[24] = {};
uint8_t* tb_crc_unpacked_ptr = tb_crc_unpacked;
@ -638,9 +641,9 @@ int srslte_dlsch_nr_decode(srslte_sch_nr_t* q,
uint32_t checksum1 = srslte_crc_checksum_byte(cfg.crc_tb, data, tb->tbs);
*crc_ok = (checksum1 == checksum2);
INFO("TB: TBS=%d; CRC={%06x, %06x}\n", tb->tbs, checksum1, checksum2);
if (SRSLTE_DEBUG_ENABLED && srslte_verbose >= SRSLTE_VERBOSE_INFO && !handler_registered) {
printf("Decode: ");
SCH_INFO_RX("TB: TBS=%d; CRC={%06x, %06x}\n", tb->tbs, checksum1, checksum2);
if (SRSLTE_DEBUG_ENABLED && srslte_verbose >= SRSLTE_VERBOSE_DEBUG && !handler_registered) {
DEBUG("Decode: ");
srslte_vec_fprint_byte(stdout, data, tb->tbs / 8);
}
} else {

Write Preview
Loading…
Cancel
Save