From c0f2d2447156d43fdd64641a8bedcbe9ff2c471f Mon Sep 17 00:00:00 2001 From: francescomani Date: Fri, 11 Oct 2024 11:07:25 +0200 Subject: [PATCH] L1 beam allocation from symbol bitmap This is required because CSI-RS may not be allocated in consecutive symbols within a slot --- openair1/PHY/NR_TRANSPORT/nr_dci.c | 4 ++-- openair1/PHY/NR_TRANSPORT/nr_dlsch.c | 4 ++-- openair1/PHY/NR_TRANSPORT/nr_prach.c | 8 ++------ openair1/PHY/NR_TRANSPORT/nr_ulsch.c | 8 ++------ openair1/PHY/NR_TRANSPORT/pucch_rx.c | 8 ++------ openair1/PHY/NR_TRANSPORT/srs_rx.c | 8 ++------ openair1/SCHED_NR/phy_procedures_nr_gNB.c | 21 ++++++++++----------- openair1/SCHED_NR/sched_nr.h | 7 +------ 8 files changed, 23 insertions(+), 45 deletions(-) diff --git a/openair1/PHY/NR_TRANSPORT/nr_dci.c b/openair1/PHY/NR_TRANSPORT/nr_dci.c index 6cae31d465..54ca8665c3 100644 --- a/openair1/PHY/NR_TRANSPORT/nr_dci.c +++ b/openair1/PHY/NR_TRANSPORT/nr_dci.c @@ -80,12 +80,12 @@ static void nr_generate_dci(PHY_VARS_gNB *gNB, uint32_t cset_nsymb = pdcch_pdu_rel15->DurationSymbols; int dci_idx = 0; // multi-beam number (for concurrent beams) + int bitmap = SL_to_bitmap(cset_start_symb, pdcch_pdu_rel15->DurationSymbols); int beam_nb = beam_index_allocation(dci_pdu->precodingAndBeamforming.prgs_list[0].dig_bf_interface_list[0].beam_idx, &gNB->common_vars, slot, frame_parms->symbols_per_slot, - cset_start_symb, - pdcch_pdu_rel15->DurationSymbols); + bitmap); LOG_D(NR_PHY_DCI, "pdcch: Coreset rb_offset %d, nb_rb %d BWP Start %d\n", rb_offset, n_rb, pdcch_pdu_rel15->BWPStart); LOG_D(NR_PHY_DCI, diff --git a/openair1/PHY/NR_TRANSPORT/nr_dlsch.c b/openair1/PHY/NR_TRANSPORT/nr_dlsch.c index 321ff3028b..e69e6b2f89 100644 --- a/openair1/PHY/NR_TRANSPORT/nr_dlsch.c +++ b/openair1/PHY/NR_TRANSPORT/nr_dlsch.c @@ -471,12 +471,12 @@ void nr_generate_pdsch(processingData_L1tx_t *msgTx, int frame, int slot) start_meas(&gNB->dlsch_precoding_stats); nfapi_nr_tx_precoding_and_beamforming_t *pb = &rel15->precodingAndBeamforming; // beam number in multi-beam scenario (concurrent beams) + int bitmap = SL_to_bitmap(rel15->StartSymbolIndex, rel15->NrOfSymbols); int beam_nb = beam_index_allocation(pb->prgs_list[0].dig_bf_interface_list[0].beam_idx, &gNB->common_vars, slot, frame_parms->symbols_per_slot, - rel15->StartSymbolIndex, - rel15->NrOfSymbols); + bitmap); c16_t **txdataF = gNB->common_vars.txdataF[beam_nb]; diff --git a/openair1/PHY/NR_TRANSPORT/nr_prach.c b/openair1/PHY/NR_TRANSPORT/nr_prach.c index a043d93500..3f41712f2c 100644 --- a/openair1/PHY/NR_TRANSPORT/nr_prach.c +++ b/openair1/PHY/NR_TRANSPORT/nr_prach.c @@ -85,12 +85,8 @@ void nr_fill_prach(PHY_VARS_gNB *gNB, int SFN, int Slot, nfapi_nr_prach_pdu_t *p int fapi_beam_idx = prach_pdu->beamforming.prgs_list[0].dig_bf_interface_list[0].beam_idx; // TODO no idea how to compute final prach symbol here so for now we go til the end of the slot int temp_nb_symbols = NR_NUMBER_OF_SYMBOLS_PER_SLOT - prach_pdu->prach_start_symbol; - prach->beam_nb = beam_index_allocation(fapi_beam_idx, - &gNB->common_vars, - Slot, - NR_NUMBER_OF_SYMBOLS_PER_SLOT, - prach_pdu->prach_start_symbol, - temp_nb_symbols); + int bitmap = SL_to_bitmap(prach_pdu->prach_start_symbol, temp_nb_symbols); + prach->beam_nb = beam_index_allocation(fapi_beam_idx, &gNB->common_vars, Slot, NR_NUMBER_OF_SYMBOLS_PER_SLOT, bitmap); } LOG_D(NR_PHY,"Copying prach pdu %d bytes to index %d\n", (int)sizeof(*prach_pdu), prach_id); memcpy(&prach->pdu, prach_pdu, sizeof(*prach_pdu)); diff --git a/openair1/PHY/NR_TRANSPORT/nr_ulsch.c b/openair1/PHY/NR_TRANSPORT/nr_ulsch.c index 47a0afc625..982b236b70 100644 --- a/openair1/PHY/NR_TRANSPORT/nr_ulsch.c +++ b/openair1/PHY/NR_TRANSPORT/nr_ulsch.c @@ -75,12 +75,8 @@ void nr_fill_ulsch(PHY_VARS_gNB *gNB, int frame, int slot, nfapi_nr_pusch_pdu_t ulsch->beam_nb = 0; if (gNB->common_vars.beam_id) { int fapi_beam_idx = ulsch_pdu->beamforming.prgs_list[0].dig_bf_interface_list[0].beam_idx; - ulsch->beam_nb = beam_index_allocation(fapi_beam_idx, - &gNB->common_vars, - slot, - NR_NUMBER_OF_SYMBOLS_PER_SLOT, - ulsch_pdu->start_symbol_index, - ulsch_pdu->nr_of_symbols); + int bitmap = SL_to_bitmap(ulsch_pdu->start_symbol_index, ulsch_pdu->nr_of_symbols); + ulsch->beam_nb = beam_index_allocation(fapi_beam_idx, &gNB->common_vars, slot, NR_NUMBER_OF_SYMBOLS_PER_SLOT, bitmap); } ulsch->frame = frame; ulsch->slot = slot; diff --git a/openair1/PHY/NR_TRANSPORT/pucch_rx.c b/openair1/PHY/NR_TRANSPORT/pucch_rx.c index 084046cc38..72cb374470 100644 --- a/openair1/PHY/NR_TRANSPORT/pucch_rx.c +++ b/openair1/PHY/NR_TRANSPORT/pucch_rx.c @@ -75,12 +75,8 @@ void nr_fill_pucch(PHY_VARS_gNB *gNB, pucch->beam_nb = 0; if (gNB->common_vars.beam_id) { int fapi_beam_idx = pucch_pdu->beamforming.prgs_list[0].dig_bf_interface_list[0].beam_idx; - pucch->beam_nb = beam_index_allocation(fapi_beam_idx, - &gNB->common_vars, - slot, - NR_NUMBER_OF_SYMBOLS_PER_SLOT, - pucch_pdu->start_symbol_index, - pucch_pdu->nr_of_symbols); + int bitmap = SL_to_bitmap(pucch_pdu->start_symbol_index, pucch_pdu->nr_of_symbols); + pucch->beam_nb = beam_index_allocation(fapi_beam_idx, &gNB->common_vars, slot, NR_NUMBER_OF_SYMBOLS_PER_SLOT, bitmap); } memcpy((void *)&pucch->pucch_pdu, (void *)pucch_pdu, sizeof(nfapi_nr_pucch_pdu_t)); LOG_D(PHY, diff --git a/openair1/PHY/NR_TRANSPORT/srs_rx.c b/openair1/PHY/NR_TRANSPORT/srs_rx.c index 931bfe21e7..49ae659a06 100644 --- a/openair1/PHY/NR_TRANSPORT/srs_rx.c +++ b/openair1/PHY/NR_TRANSPORT/srs_rx.c @@ -57,13 +57,9 @@ void nr_fill_srs(PHY_VARS_gNB *gNB, frame_t frame, slot_t slot, nfapi_nr_srs_pdu srs->active = true; srs->beam_nb = 0; if (gNB->common_vars.beam_id) { + int bitmap = SL_to_bitmap(srs_pdu->time_start_position, 1 << srs_pdu->num_symbols); int fapi_beam_idx = srs_pdu->beamforming.prgs_list[0].dig_bf_interface_list[0].beam_idx; - srs->beam_nb = beam_index_allocation(fapi_beam_idx, - &gNB->common_vars, - slot, - NR_NUMBER_OF_SYMBOLS_PER_SLOT, - srs_pdu->time_start_position, - 1 << srs_pdu->num_symbols); + srs->beam_nb = beam_index_allocation(fapi_beam_idx, &gNB->common_vars, slot, NR_NUMBER_OF_SYMBOLS_PER_SLOT, bitmap); } memcpy((void *)&srs->srs_pdu, (void *)srs_pdu, sizeof(nfapi_nr_srs_pdu_t)); break; diff --git a/openair1/SCHED_NR/phy_procedures_nr_gNB.c b/openair1/SCHED_NR/phy_procedures_nr_gNB.c index a56c01ce99..3d35ab87e5 100644 --- a/openair1/SCHED_NR/phy_procedures_nr_gNB.c +++ b/openair1/SCHED_NR/phy_procedures_nr_gNB.c @@ -43,19 +43,16 @@ //#define DEBUG_RXDATA //#define SRS_IND_DEBUG -int beam_index_allocation(int fapi_beam_index, - NR_gNB_COMMON *common_vars, - int slot, - int symbols_per_slot, - int start_symbol, - int nb_symbols) +int beam_index_allocation(int fapi_beam_index, NR_gNB_COMMON *common_vars, int slot, int symbols_per_slot, int bitmap_symbols) { if (!common_vars->beam_id) return 0; int idx = -1; for (int j = 0; j < common_vars->num_beams_period; j++) { - for (int i = start_symbol; i < start_symbol + nb_symbols; i++) { + for (int i = 0; i < symbols_per_slot; i++) { + if (((bitmap_symbols >> i) & 0x01) == 0) + continue; int current_beam = common_vars->beam_id[j][slot * symbols_per_slot + i]; if (current_beam == -1 || current_beam == fapi_beam_index) idx = j; @@ -68,8 +65,10 @@ int beam_index_allocation(int fapi_beam_index, break; } AssertFatal(idx >= 0, "Couldn't allocate beam ID %d\n", fapi_beam_index); - for (int j = start_symbol; j < start_symbol + nb_symbols; j++) - common_vars->beam_id[idx][slot * symbols_per_slot + j] = fapi_beam_index; + for (int j = 0; j < symbols_per_slot; j++) { + if (((bitmap_symbols >> j) & 0x01)) + common_vars->beam_id[idx][slot * symbols_per_slot + j] = fapi_beam_index; + } LOG_D(PHY, "Allocating beam %d in slot %d\n", idx, slot); return idx; } @@ -129,12 +128,12 @@ void nr_common_signal_procedures(PHY_VARS_gNB *gNB, int frame, int slot, nfapi_n c16_t ***txdataF = gNB->common_vars.txdataF; int txdataF_offset = slot * fp->samples_per_slot_wCP; // beam number in a scenario with multiple concurrent beams + int bitmap = SL_to_bitmap(ssb_start_symbol, 4); // 4 ssb symbols int beam_nb = beam_index_allocation(pb->prgs_list[0].dig_bf_interface_list[0].beam_idx, &gNB->common_vars, slot, fp->symbols_per_slot, - ssb_start_symbol, - 4); // 4 ssb symbols + bitmap); nr_generate_pss(&txdataF[beam_nb][0][txdataF_offset], gNB->TX_AMP, ssb_start_symbol, cfg, fp); nr_generate_sss(&txdataF[beam_nb][0][txdataF_offset], gNB->TX_AMP, ssb_start_symbol, cfg, fp); diff --git a/openair1/SCHED_NR/sched_nr.h b/openair1/SCHED_NR/sched_nr.h index 6cde0e8614..20028cea9f 100644 --- a/openair1/SCHED_NR/sched_nr.h +++ b/openair1/SCHED_NR/sched_nr.h @@ -47,10 +47,5 @@ void feptx_prec(RU_t *ru,int frame_tx,int tti_tx); int nr_phy_init_RU(RU_t *ru); void nr_phy_free_RU(RU_t *ru); void clear_slot_beamid(PHY_VARS_gNB *gNB, int slot); -int beam_index_allocation(int fapi_beam_index, - NR_gNB_COMMON *common_vars, - int slot, - int symbols_per_slot, - int start_symbol, - int nb_symbols); +int beam_index_allocation(int fapi_beam_index, NR_gNB_COMMON *common_vars, int slot, int symbols_per_slot, int bitmap_symbols); #endif