diff --git a/executables/nr-gnb.c b/executables/nr-gnb.c index 74b6835e3f..04dcef34a4 100644 --- a/executables/nr-gnb.c +++ b/executables/nr-gnb.c @@ -311,6 +311,7 @@ void init_gNB_Tpool(int inst) gNB_L1_proc_t *proc = &gNB->proc; // PUSCH symbols per thread need to be calculated by how many threads we have gNB->num_pusch_symbols_per_thread = 1; + gNB->num_pdsch_symbols_per_thread = 1; // ULSCH decoding threadpool initTpool(get_softmodem_params()->threadPoolConfig, &gNB->threadPool, cpumeas(CPUMEAS_GETSTATE)); diff --git a/openair1/PHY/NR_TRANSPORT/nr_dlsch.c b/openair1/PHY/NR_TRANSPORT/nr_dlsch.c index 73ba4be4af..52bfedf86c 100644 --- a/openair1/PHY/NR_TRANSPORT/nr_dlsch.c +++ b/openair1/PHY/NR_TRANSPORT/nr_dlsch.c @@ -311,22 +311,22 @@ static inline void neg_dmrs(c16_t *in, c16_t *out, int sz) *out++ = i % 2 ? (c16_t){-in[i].r, -in[i].i} : in[i]; } -static inline int do_onelayer(NR_DL_FRAME_PARMS *frame_parms, - int slot, - const nfapi_nr_dl_tti_pdsch_pdu_rel15_t *rel15, - int layer, - c16_t *output, - c16_t *txl_start, - int start_sc, - int symbol_sz, - int l_symbol, - uint16_t dlPtrsSymPos, - int n_ptrs, - int amp, - int16_t amp_dmrs, - int l_prime, - nfapi_nr_dmrs_type_e dmrs_Type, - c16_t *dmrs_start) +static inline void do_onelayer(NR_DL_FRAME_PARMS *frame_parms, + int slot, + const nfapi_nr_dl_tti_pdsch_pdu_rel15_t *rel15, + int layer, + c16_t *output, + c16_t *txl_start, + int start_sc, + int symbol_sz, + int l_symbol, + uint16_t dlPtrsSymPos, + int n_ptrs, + int amp, + int16_t amp_dmrs, + int l_prime, + nfapi_nr_dmrs_type_e dmrs_Type, + c16_t *dmrs_start) { c16_t *txl = txl_start; const uint sz = rel15->rbSize * NR_NB_SC_PER_RB; @@ -408,7 +408,7 @@ static inline int do_onelayer(NR_DL_FRAME_PARMS *frame_parms, } else { // no PTRS or DMRS in this symbol txl += no_ptrs_dmrs_case(output + start_sc, txl, amp, sz); } // no DMRS/PTRS in symbol - return txl - txl_start; + return; } static inline void do_txdataF(c16_t **txdataF, @@ -472,28 +472,145 @@ static inline void do_txdataF(c16_t **txdataF, } // RB loop: while(rb < rel15->rbSize) } +typedef struct pdschSymbolProc_s { + PHY_VARS_gNB *gNB; + NR_DL_FRAME_PARMS *frame_parms; + const nfapi_nr_dl_tti_pdsch_pdu_rel15_t *rel15; + unsigned int slot; + unsigned int startSymbol; + unsigned int numSymbols; + task_ans_t *ans; + unsigned int layerSz2; + unsigned int dlPtrsSymPos; + unsigned int n_ptrs; + unsigned int beam_nb; + unsigned int re_beginning_of_symbol[14]; + c16_t *tx_layers[4]; +} pdschSymbolProc_t; + +static void nr_pdsch_symbol_processing(void *arg) +{ + pdschSymbolProc_t *rdata = (pdschSymbolProc_t *)arg; + + PHY_VARS_gNB *gNB = rdata->gNB; + NR_DL_FRAME_PARMS *frame_parms = rdata->frame_parms; + const nfapi_nr_dl_tti_pdsch_pdu_rel15_t *rel15 = rdata->rel15; + int slot = rdata->slot; + c16_t *tx_layers[rel15->nrOfLayers]; + for (int l = 0; l < rel15->nrOfLayers; l++) + tx_layers[l] = rdata->tx_layers[l]; + const int nb_re_dmrs = rel15->numDmrsCdmGrpsNoData * (rel15->dmrsConfigType == NFAPI_NR_DMRS_TYPE1 ? 6 : 4); + const int n_dmrs = (rel15->BWPStart + rel15->rbStart + rel15->rbSize) * nb_re_dmrs; + // Loop Over OFDM symbols: + c16_t mod_dmrs[(n_dmrs + 63) & ~63] __attribute__((aligned(64))); + const int symbol_sz = frame_parms->ofdm_symbol_size; + + c16_t **txdataF = gNB->common_vars.txdataF[rdata->beam_nb]; + uint16_t start_sc = (rel15->rbStart + rel15->BWPStart) * NR_NB_SC_PER_RB; + +#ifdef DEBUG_DLSCH_MAPPING + printf("slot %d PDSCH resource mapping started (start SC %d\tstart symbol %d\tnum symbols %d\tN_PRB %d,nb_layers %d)\n", + rdata->slot, + start_sc, + rdata->startSymbol, + rdata->numSymbols, + rel15->rbSize, + rel15->nrOfLayers); +#endif + for (int l_symbol = rdata->startSymbol; l_symbol < rdata->startSymbol + rdata->numSymbols; l_symbol++) { + start_meas(&gNB->dlsch_resource_mapping_stats); + int l_prime = 0; // single symbol layer 0 + int l_overline = get_l0(rel15->dlDmrsSymbPos); + +#ifdef DEBUG_DLSCH_MAPPING + printf("PDSCH resource mapping symbol %d\n", l_symbol); +#endif + /// DMRS QPSK modulation + if ((rel15->dlDmrsSymbPos & (1 << l_symbol))) { // DMRS time occasion + // The reference point for is subcarrier -1 of the lowest-numbered resource block in CORESET 0 if the corresponding + // PDCCH is associated with CORESET -1 and Type0-PDCCH common search space and is addressed to SI-RNTI + // 2GPP TS 38.211 V15.8.0 Section 7.4.1.1.2 Mapping to physical resources + if (l_symbol == (l_overline + 1)) // take into account the double DMRS symbols + l_prime = 1; + else if (l_symbol > (l_overline + 1)) { // new DMRS pair + l_overline = l_symbol; + l_prime = 0; + } +#ifdef DEBUG_DLSCH_MAPPING + printf("dlDmrsScramblingId %d, SCID %d slot %d l_symbol %d\n", rel15->dlDmrsScramblingId, rel15->SCID, slot, l_symbol); +#endif + const uint32_t *gold = nr_gold_pdsch(frame_parms->N_RB_DL, + frame_parms->symbols_per_slot, + rel15->dlDmrsScramblingId, + rel15->SCID, + slot, + l_symbol); + // Qm = 1 as DMRS is QPSK modulated + nr_modulation(gold, n_dmrs * DMRS_MOD_ORDER, DMRS_MOD_ORDER, (int16_t *)mod_dmrs); + +#ifdef DEBUG_DLSCH_MAPPING + printf("DMRS modulation (symbol %d, %d symbols, type %d):\n", l_symbol, n_dmrs, dmrs_Type); + for (int i = 0; i < n_dmrs / 2; i += 8) { + for (int j = 0; j < 8; j++) { + printf("%d %d\t", mod_dmrs[i + j].r, mod_dmrs[i + j].i); + } + printf("\n"); + } +#endif + } + uint32_t dmrs_idx = rel15->rbStart; + if (rel15->refPoint == 0) + dmrs_idx += rel15->BWPStart; + dmrs_idx *= rel15->dmrsConfigType == NFAPI_NR_DMRS_TYPE1 ? 6 : 4; + c16_t txdataF_precoding[rel15->nrOfLayers][symbol_sz] __attribute__((aligned(64))); + for (int layer = 0; layer < rel15->nrOfLayers; layer++) { + do_onelayer(frame_parms, + slot, + rel15, + layer, + txdataF_precoding[layer], + tx_layers[layer] + rdata->re_beginning_of_symbol[l_symbol], + start_sc, + symbol_sz, + l_symbol, + rdata->dlPtrsSymPos, + rdata->n_ptrs, + gNB->TX_AMP, + min((double)gNB->TX_AMP * sqrt(rel15->numDmrsCdmGrpsNoData), INT16_MAX), + l_prime, + rel15->dmrsConfigType, + mod_dmrs + dmrs_idx); + } // layer loop + stop_meas(&gNB->dlsch_resource_mapping_stats); + + start_meas(&gNB->dlsch_precoding_stats); + for (int ant = 0; ant < frame_parms->nb_antennas_tx; ant++) { + const size_t txdataF_offset_per_symbol = l_symbol * symbol_sz; + do_txdataF(txdataF, symbol_sz, txdataF_precoding, gNB, rel15, ant, start_sc, txdataF_offset_per_symbol); + } + stop_meas(&gNB->dlsch_precoding_stats); + } + // Task running in // completed + completed_task_ans(rdata->ans); +} + static int do_one_dlsch(unsigned char *input_ptr, PHY_VARS_gNB *gNB, NR_gNB_DLSCH_t *dlsch, int slot) { - const int16_t amp = gNB->TX_AMP; NR_DL_FRAME_PARMS *frame_parms = &gNB->frame_parms; time_stats_t *dlsch_scrambling_stats = &gNB->dlsch_scrambling_stats; time_stats_t *dlsch_modulation_stats = &gNB->dlsch_modulation_stats; const nfapi_nr_dl_tti_pdsch_pdu_rel15_t *rel15 = &dlsch->pdsch_pdu->pdsch_pdu_rel15; const int layerSz = frame_parms->N_RB_DL * frame_parms->symbols_per_slot * NR_NB_SC_PER_RB; - const int symbol_sz=frame_parms->ofdm_symbol_size; - const int dmrs_Type = rel15->dmrsConfigType; const int nb_re_dmrs = rel15->numDmrsCdmGrpsNoData * (rel15->dmrsConfigType == NFAPI_NR_DMRS_TYPE1 ? 6 : 4); - const int16_t amp_dmrs = min((double)amp * sqrt(rel15->numDmrsCdmGrpsNoData), INT16_MAX); // 3GPP TS 38.214 Section 4.1: Table 4.1-1 LOG_D(PHY, "pdsch: BWPStart %d, BWPSize %d, rbStart %d, rbsize %d\n", rel15->BWPStart, rel15->BWPSize, rel15->rbStart, rel15->rbSize); - const int n_dmrs = (rel15->BWPStart + rel15->rbStart + rel15->rbSize) * nb_re_dmrs; + const int n_dmrs = rel15->rbSize * nb_re_dmrs; - const int dmrs_symbol_map = rel15->dlDmrsSymbPos; // single DMRS: 010000100 Double DMRS 110001100 const int xOverhead = 0; const int nb_re = (12 * rel15->NrOfSymbols - nb_re_dmrs * get_num_dmrs(rel15->dlDmrsSymbPos) - xOverhead) * rel15->rbSize * rel15->nrOfLayers; @@ -567,21 +684,9 @@ static int do_one_dlsch(unsigned char *input_ptr, PHY_VARS_gNB *gNB, NR_gNB_DLSC start_meas(&gNB->dlsch_pdsch_generation_stats); /// Resource mapping // Non interleaved VRB to PRB mapping - uint16_t start_sc = (rel15->rbStart + rel15->BWPStart) * NR_NB_SC_PER_RB; - -#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", - start_sc, - rel15->StartSymbolIndex, - rel15->rbSize, - nb_re, - rel15->nrOfLayers); -#endif AssertFatal(n_dmrs, "n_dmrs can't be 0\n"); // make a large enough tail to process all re with SIMD regardless a garbadge filler - c16_t mod_dmrs[(n_dmrs+63)&~63] __attribute__((aligned(64))); - unsigned int re_beginning_of_symbol = 0; start_meas(&gNB->dlsch_layer_mapping_stats); int layerSz2 = (layerSz + 63) & ~63; @@ -605,85 +710,54 @@ static int do_one_dlsch(unsigned char *input_ptr, PHY_VARS_gNB *gNB, NR_gNB_DLSC slot, frame_parms->symbols_per_slot, bitmap); - - c16_t **txdataF = gNB->common_vars.txdataF[beam_nb]; stop_meas(&gNB->dlsch_layer_mapping_stats); - // Loop Over OFDM symbols: - for (int l_symbol = rel15->StartSymbolIndex; l_symbol < rel15->StartSymbolIndex + rel15->NrOfSymbols; l_symbol++) { - start_meas(&gNB->dlsch_resource_mapping_stats); - int l_prime = 0; // single symbol layer 0 - int l_overline = get_l0(rel15->dlDmrsSymbPos); -#ifdef DEBUG_DLSCH_MAPPING - printf("PDSCH resource mapping symbol %d\n", l_symbol); -#endif - /// DMRS QPSK modulation - if ((dmrs_symbol_map & (1 << l_symbol))) { // DMRS time occasion - // The reference point for is subcarrier -1 of the lowest-numbered resource block in CORESET 0 if the corresponding - // PDCCH is associated with CORESET -1 and Type0-PDCCH common search space and is addressed to SI-RNTI - // 2GPP TS 38.211 V15.8.0 Section 7.4.1.1.2 Mapping to physical resources - if (l_symbol == (l_overline + 1)) // take into account the double DMRS symbols - l_prime = 1; - else if (l_symbol > (l_overline + 1)) { // new DMRS pair - l_overline = l_symbol; - l_prime = 0; + // spawn symbol threads + + int nb_tasks = rel15->NrOfSymbols / gNB->num_pdsch_symbols_per_thread; + if ((rel15->NrOfSymbols % gNB->num_pdsch_symbols_per_thread) > 0) + nb_tasks++; + pdschSymbolProc_t arr[nb_tasks]; + task_ans_t ans; + init_task_ans(&ans, nb_tasks); + int sz_arr = 0; + unsigned int re_beginning_of_symbol = 0; + int res = 0; + for (int l_symbol = rel15->StartSymbolIndex; l_symbol < rel15->StartSymbolIndex + rel15->NrOfSymbols; + l_symbol += gNB->num_pdsch_symbols_per_thread) { + pdschSymbolProc_t *rdata = &arr[sz_arr]; + rdata->ans = &ans; + ++sz_arr; + + rdata->gNB = gNB; + rdata->frame_parms = frame_parms; + rdata->rel15 = rel15; + rdata->slot = slot; + rdata->startSymbol = l_symbol; + res = rel15->NrOfSymbols - (l_symbol - rel15->StartSymbolIndex); + if (res >= gNB->num_pdsch_symbols_per_thread) + rdata->numSymbols = gNB->num_pdsch_symbols_per_thread; + else + rdata->numSymbols = res; + rdata->layerSz2 = layerSz2; + rdata->dlPtrsSymPos = dlPtrsSymPos; + rdata->n_ptrs = n_ptrs; + rdata->beam_nb = beam_nb; + for (int s = 0; s < rdata->numSymbols; s++) { + rdata->re_beginning_of_symbol[l_symbol + s] = re_beginning_of_symbol; + re_beginning_of_symbol += rel15->rbSize * NR_NB_SC_PER_RB; + if (n_ptrs > 0 && is_ptrs_symbol(l_symbol, dlPtrsSymPos)) { + re_beginning_of_symbol -= n_ptrs; + } else if (rel15->dlDmrsSymbPos & (1 << l_symbol)) { + re_beginning_of_symbol -= n_dmrs; } -#ifdef DEBUG_DLSCH_MAPPING - printf("dlDmrsScramblingId %d, SCID %d slot %d l_symbol %d\n", rel15->dlDmrsScramblingId, rel15->SCID, slot, l_symbol); -#endif - const uint32_t *gold = nr_gold_pdsch(frame_parms->N_RB_DL, - frame_parms->symbols_per_slot, - rel15->dlDmrsScramblingId, - rel15->SCID, - slot, - l_symbol); - // Qm = 1 as DMRS is QPSK modulated - nr_modulation(gold, n_dmrs * DMRS_MOD_ORDER, DMRS_MOD_ORDER, (int16_t *)mod_dmrs); - -#ifdef DEBUG_DLSCH_MAPPING - printf("DMRS modulation (symbol %d, %d symbols, type %d):\n", l_symbol, n_dmrs, dmrs_Type); - for (int i = 0; i < n_dmrs / 2; i += 8) { - for (int j = 0; j < 8; j++) { - printf("%d %d\t", mod_dmrs[i + j].r, mod_dmrs[i + j].i); - } - printf("\n"); - } -#endif } - uint32_t dmrs_idx = rel15->rbStart; - if (rel15->refPoint == 0) - dmrs_idx += rel15->BWPStart; - dmrs_idx *= dmrs_Type == NFAPI_NR_DMRS_TYPE1 ? 6 : 4; - c16_t txdataF_precoding[rel15->nrOfLayers][symbol_sz] __attribute__((aligned(64))); - int layer_sz = 0; - for (int layer = 0; layer < rel15->nrOfLayers; layer++) { - layer_sz = do_onelayer(frame_parms, - slot, - rel15, - layer, - txdataF_precoding[layer], - tx_layers[layer] + re_beginning_of_symbol, - start_sc, - symbol_sz, - l_symbol, - dlPtrsSymPos, - n_ptrs, - amp, - amp_dmrs, - l_prime, - dmrs_Type, - mod_dmrs + dmrs_idx); - } // layer loop - re_beginning_of_symbol += layer_sz; - stop_meas(&gNB->dlsch_resource_mapping_stats); - - start_meas(&gNB->dlsch_precoding_stats); - for (int ant = 0; ant < frame_parms->nb_antennas_tx; ant++) { - const size_t txdataF_offset_per_symbol = l_symbol * symbol_sz; - do_txdataF(txdataF, symbol_sz, txdataF_precoding, gNB, rel15, ant, start_sc, txdataF_offset_per_symbol); - } - stop_meas(&gNB->dlsch_precoding_stats); + for (int l = 0; l < rel15->nrOfLayers; l++) + rdata->tx_layers[l] = tx_layers[l]; + task_t t = {.func = &nr_pdsch_symbol_processing, .args = rdata}; + pushTpool(&gNB->threadPool, t); } + join_task_ans(&ans); stop_meas(&gNB->dlsch_pdsch_generation_stats); /* output and its parts for each dlsch should be aligned on 64 bytes (or 8 * 64 bits) * should remain a multiple of 8 * 64 with enough offset to fit each dlsch diff --git a/openair1/PHY/defs_gNB.h b/openair1/PHY/defs_gNB.h index b9d4992d32..a6fb9d8890 100644 --- a/openair1/PHY/defs_gNB.h +++ b/openair1/PHY/defs_gNB.h @@ -485,6 +485,7 @@ typedef struct PHY_VARS_gNB_s { notifiedFIFO_t L1_rx_out; tpool_t threadPool; int num_pusch_symbols_per_thread; + int num_pdsch_symbols_per_thread; int dmrs_num_antennas_per_thread; pthread_t L1_rx_thread; int L1_rx_thread_core; diff --git a/openair1/SIMULATION/NR_PHY/dlsim.c b/openair1/SIMULATION/NR_PHY/dlsim.c index c1fee991b9..c6fc036bf8 100644 --- a/openair1/SIMULATION/NR_PHY/dlsim.c +++ b/openair1/SIMULATION/NR_PHY/dlsim.c @@ -715,6 +715,7 @@ int main(int argc, char **argv) AssertFatal((gNB->if_inst = NR_IF_Module_init(0)) != NULL, "Cannot register interface"); gNB->if_inst->NR_PHY_config_req = nr_phy_config_request; + gNB->num_pdsch_symbols_per_thread = 1; NR_ServingCellConfigCommon_t *scc = calloc(1,sizeof(*scc));; prepare_scc(scc);