PentHertz
/
srsLTE
mirror of https://github.com/PentHertz/srsLTE.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

UE DL: Extended ack test for FDD

This commit is contained in:
Xavier Arteaga 2019-10-11 14:59:53 +02:00 committed by Xavier Arteaga
parent 0b00e6d94a
commit ba6a68825c
2 changed files with 82 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

122
lib/src/phy/ue/test/gen_ack_test.c
View File

@ -29,87 +29,119 @@
#include "srslte/srslte.h" #include "srslte/srslte.h"
#define TESTASSERT(cond) \ #define TESTASSERT(cond) \
{ \ do { \
if (!(cond)) { \ if (!(cond)) { \
printf("[%s][Line %d]. Fail at %s\n", __FUNCTION__, __LINE__, #cond); \ printf("[%s][Line %d]. Fail at %s\n", __FUNCTION__, __LINE__, #cond); \
return -1; \ return -1; \
} \ } \
} } while (false)
int fdd_tests(uint32_t max_cc) int fdd_tests(uint32_t max_cc)
{ {
srslte_ue_dl_t ue_dl; srslte_ue_dl_t ue_dl = {};
srslte_dl_sf_cfg_t sf_cfg_dl; srslte_dl_sf_cfg_t sf_cfg_dl = {}; // This is used for TDD only
srslte_pdsch_ack_t ack_info;
srslte_uci_data_t uci_data;
uint32_t test_cnt = 0; uint32_t test_cnt = 0;
ZERO_OBJECT(ue_dl); // Force FDD
ue_dl.cell.frame_type = SRSLTE_FDD; ue_dl.cell.frame_type = SRSLTE_FDD;
// This is used for TDD only
ZERO_OBJECT(sf_cfg_dl);
for (uint32_t nof_cc = 1; nof_cc <= max_cc; nof_cc++) { for (uint32_t nof_cc = 1; nof_cc <= max_cc; nof_cc++) {
for (uint32_t nof_tb = 1; nof_tb <= SRSLTE_MAX_CODEWORDS; nof_tb++) { for (uint32_t nof_tb = 1; nof_tb <= SRSLTE_MAX_CODEWORDS; nof_tb++) {
for (uint32_t nof_active_cc = 1; nof_active_cc <= nof_cc; nof_active_cc++) { for (uint32_t nof_active_cc = 1; nof_active_cc <= nof_cc; nof_active_cc++) {
for (uint32_t nof_active_tb = 1; nof_active_tb <= nof_tb; nof_active_tb++) { for (uint32_t nof_active_tb = 1; nof_active_tb <= nof_tb; nof_active_tb++) {
srslte_pdsch_ack_t ack_info = {};
ZERO_OBJECT(ack_info); ack_info.nof_cc = nof_cc;
ack_info.nof_cc = nof_cc; ack_info.transmission_mode = nof_tb == 1 ? SRSLTE_TM1 : SRSLTE_TM4;
ack_info.transmission_mode = nof_tb == 1 ? SRSLTE_TM1 : SRSLTE_TM4;
// Check different modes? // Check different modes?
ack_info.ack_nack_feedback_mode = SRSLTE_PUCCH_ACK_NACK_FEEDBACK_MODE_CS; ack_info.ack_nack_feedback_mode = SRSLTE_PUCCH_ACK_NACK_FEEDBACK_MODE_CS;
for (uint32_t cc_idx = 0; cc_idx < nof_cc; cc_idx++) { for (uint32_t cc_idx = 0; cc_idx < nof_cc; cc_idx++) {
ack_info.cc[cc_idx].M = 1; // always 1 in FDD ack_info.cc[cc_idx].M = 1; // always 1 in FDD
ack_info.cc[cc_idx].m[0].present = cc_idx <= nof_active_cc; ack_info.cc[cc_idx].m[0].present = cc_idx < nof_active_cc;
ack_info.cc[cc_idx].m[0].resource.n_cce = cc_idx + 1; ack_info.cc[cc_idx].m[0].resource.n_cce = cc_idx + 1;
if (ack_info.cc[cc_idx].m[0].present) { if (ack_info.cc[cc_idx].m[0].present) {
for (uint32_t j = 0; j < nof_tb; j++) { for (uint32_t j = 0; j < nof_tb; j++) {
ack_info.cc[cc_idx].m[0].value[j] = j < nof_active_tb ? 1 : 2; ack_info.cc[cc_idx].m[0].value[j] = j < nof_active_tb ? 1 : 2;
} }
} else {
memset(ack_info.cc[cc_idx].m[0].value, 2, SRSLTE_MAX_CODEWORDS);
} }
} }
for (uint32_t sr_enabled = 0; sr_enabled < 2; sr_enabled++) { for (uint32_t sr_enabled = 0; sr_enabled < 2; sr_enabled++) { // 0: true, 1: false, otherwise: break
// Generate ACK/NACK bits for (uint8_t cqi_enabled = 0; cqi_enabled < 2; cqi_enabled++) {
srslte_uci_data_reset(&uci_data); for (uint8_t simul_cqi_ack = 0; simul_cqi_ack < cqi_enabled + 1; simul_cqi_ack++) {
uci_data.value.scheduling_request = (sr_enabled > 0); for (uint8_t pusch_enabled = 0; pusch_enabled < 2; pusch_enabled++) {
srslte_uci_data_t uci_data = {};
printf("FDD Test %d: TM=%d, CC=%d, nof_active_tb=%d, nof_active_cc=%d, sr_request=%s\n", ack_info.is_pusch_available = (pusch_enabled > 0);
test_cnt++, ack_info.simul_cqi_ack = (simul_cqi_ack > 0);
ack_info.transmission_mode + 1,
nof_cc,
nof_active_tb,
nof_active_cc,
sr_enabled ? "yes" : "no");
srslte_ue_dl_gen_ack(&ue_dl, &sf_cfg_dl, &ack_info, &uci_data); // Generate ACK/NACK bits
srslte_uci_data_reset(&uci_data);
uci_data.value.scheduling_request = (sr_enabled > 0);
uci_data.cfg.cqi.data_enable = (cqi_enabled > 0);
// Check output printf("FDD Test %d: TM=%d, CC=%d, nof_active_tb=%d, nof_active_cc=%d, sr_request=%s, cqi_data=%s, "
if (nof_cc == 1) { "simul_cqi_ack=%s, is_pusch=%s\n",
TESTASSERT(uci_data.cfg.ack[0].nof_acks == nof_active_tb); test_cnt++,
} else { ack_info.transmission_mode + 1,
if (uci_data.value.scheduling_request) { nof_cc,
TESTASSERT(uci_data.cfg.ack[0].nof_acks == 1); nof_active_tb,
} else { nof_active_cc,
for (int i = 0; i < nof_cc; i++) { sr_enabled ? "yes" : "no",
TESTASSERT(uci_data.cfg.ack[i].nof_acks == nof_tb); cqi_enabled ? "yes" : "no",
simul_cqi_ack ? "yes" : "no",
pusch_enabled ? "yes" : "no");
srslte_ue_dl_gen_ack(&ue_dl, &sf_cfg_dl, &ack_info, &uci_data);
// Check output
if (nof_cc == 1) {
TESTASSERT(uci_data.cfg.ack[0].nof_acks == nof_active_tb);
} else if (uci_data.value.scheduling_request) {
TESTASSERT(uci_data.cfg.ack[0].nof_acks == 1);
} else if (cqi_enabled && !pusch_enabled) {
// No PUSCH, CSI and HARQ ACK collision
if (nof_active_cc == 1 && simul_cqi_ack) {
// CSI shall not be dropped
TESTASSERT(uci_data.cfg.cqi.data_enable);
// Serving cell only HARQ ACK is multiplexed
TESTASSERT(uci_data.cfg.ack[0].nof_acks == nof_active_tb);
// Other serving cells HARQ shall not be multiplexed
for (int i = 1; i < nof_cc; i++) {
TESTASSERT(uci_data.cfg.ack[i].nof_acks == 0);
}
} else {
// CSI shall be dropped
TESTASSERT(!uci_data.cfg.cqi.data_enable);
// Acknowledgments as usual
for (int i = 0; i < nof_cc; i++) {
TESTASSERT(uci_data.cfg.ack[i].nof_acks == nof_tb);
}
}
} else {
for (int i = 0; i < nof_cc; i++) {
TESTASSERT(uci_data.cfg.ack[i].nof_acks == nof_tb);
}
}
uint32_t k = 0;
for (uint32_t i = 0; i < nof_cc; i++) {
TESTASSERT(uci_data.cfg.ack[i].ncce[0] == i + 1);
for (uint32_t j = 0; j < uci_data.cfg.ack[i].nof_acks; j++) {
TESTASSERT(uci_data.value.ack.ack_value[k++]);
}
}
TESTASSERT(k == srslte_uci_cfg_total_ack(&uci_data.cfg));
TESTASSERT(uci_data.value.ack.ack_value[k] == 2);
} }
} }
} }
uint32_t k = 0;
for (uint32_t i = 0; i < nof_cc; i++) {
TESTASSERT(uci_data.cfg.ack[i].ncce[0] == i + 1);
for (uint32_t j = 0; j < uci_data.cfg.ack[i].nof_acks; j++) {
TESTASSERT(uci_data.value.ack.ack_value[k++]);
}
}
TESTASSERT(k == srslte_uci_cfg_total_ack(&uci_data.cfg));
TESTASSERT(uci_data.value.ack.ack_value[k] == 2);
} }
} }
} }

5
lib/src/phy/ue/ue_dl.c
View File

@ -1003,6 +1003,11 @@ static void gen_ack_fdd(srslte_pdsch_ack_t* ack_info, srslte_uci_data_t* uci_dat
} else { } else {
// - otherwise, CSI is dropped // - otherwise, CSI is dropped
uci_data->cfg.cqi.data_enable = false; uci_data->cfg.cqi.data_enable = false;
//
for (int i = 0; i < 2; i++) {
uci_data->cfg.ack[i].nof_acks = (tb_count != 0) ? nof_tb : 0;
}
} }
} else { } else {
// For 2 or more configured cells, report nof_tb per carrier except if there are no HARQ-ACK bits to report, in // For 2 or more configured cells, report nof_tb per carrier except if there are no HARQ-ACK bits to report, in