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

Added file option to NR cell search test

This commit is contained in:
Xavier Arteaga 2021-05-17 17:15:53 +02:00 committed by Xavier Arteaga
parent f9aafd00a7
commit 7f853446d3
2 changed files with 104 additions and 75 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
srsue/test/phy/CMakeLists.txt
View File

@ -53,9 +53,9 @@ target_link_libraries(nr_cell_search_test
# Test NR cell search without delay # Test NR cell search without delay
# This test checks the search starts in the configured TTI and the NR PSS is detected correctly inside the SF # This test checks the search starts in the configured TTI and the NR PSS is detected correctly inside the SF
add_nr_test(nr_cell_search_test nr_cell_search_test --duration=1 --ssb_period=20 --meas_period_ms=20 --meas_len_ms=1) add_nr_test(nr_cell_search_test nr_cell_search_test --duration=1 --ssb_period=20 --meas_period_ms=20 --meas_len_ms=1 --simulation_cell_list=500)
# Test NR cell search with up 1000us delay # Test NR cell search with up 1000us delay
# This test checks the search is capable to find a cell with a broad delay # This test checks the search is capable to find a cell with a broad delay
add_nr_test(nr_cell_search_test_delay nr_cell_search_test --duration=1 --ssb_period=20 --meas_period_ms=100 --meas_len_ms=30 --channel.delay_min=0 --channel.delay_max=1000) add_nr_test(nr_cell_search_test_delay nr_cell_search_test --duration=1 --ssb_period=20 --meas_period_ms=100 --meas_len_ms=30 --channel.delay_min=0 --channel.delay_max=1000 --simulation_cell_list=500)

153
srsue/test/phy/nr_cell_search_test.cc
View File

@ -90,7 +90,7 @@ public:
} }
// Configure channel // Configure channel
channel.set_srate(args.srate_hz); channel.set_srate((uint32_t)args.srate_hz);
} }
int work(uint32_t sf_idx, std::vector<cf_t>& baseband_buffer, const srsran::rf_timestamp_t& ts) int work(uint32_t sf_idx, std::vector<cf_t>& baseband_buffer, const srsran::rf_timestamp_t& ts)
@ -129,21 +129,23 @@ public:
}; };
struct args_t { struct args_t {
// Common execution parameters // General
std::string log_level = "warning";
uint32_t duration_s = 1; uint32_t duration_s = 1;
uint32_t nof_prb = 52; double srate_hz = 11.52e6;
std::string log_level = "error";
std::string active_cell_list = "500";
uint32_t meas_len_ms = 1;
uint32_t meas_period_ms = 20;
uint32_t carier_arfcn = 634240; uint32_t carier_arfcn = 634240;
uint32_t ssb_arfcn = 634176; uint32_t ssb_arfcn = 634176;
srsran_subcarrier_spacing_t carrier_scs = srsran_subcarrier_spacing_15kHz; std::string ssb_scs_str = "30";
srsran_subcarrier_spacing_t ssb_scs = srsran_subcarrier_spacing_30kHz;
// Measurement parameters
std::set<uint32_t> pcis_to_meas;
uint32_t meas_len_ms = 1;
uint32_t meas_period_ms = 20;
float thr_snr_db = 5.0f; float thr_snr_db = 5.0f;
srsran_subcarrier_spacing_t ssb_scs = srsran_subcarrier_spacing_30kHz;
// Simulation parameters // Simulation parameters
std::string simulation_cell_list = "500"; std::set<uint32_t> pcis_to_simulate;
uint32_t ssb_period_ms = 20; uint32_t ssb_period_ms = 20;
float channel_delay_min = 0.0f; // Set to non-zero value to stir the delay from zero to this value in usec float channel_delay_min = 0.0f; // Set to non-zero value to stir the delay from zero to this value in usec
float channel_delay_max = 0.0f; // Set to non-zero value to stir the delay from zero to this value in usec float channel_delay_max = 0.0f; // Set to non-zero value to stir the delay from zero to this value in usec
@ -154,9 +156,8 @@ struct args_t {
std::string radio_log_level = "info"; std::string radio_log_level = "info";
float rx_gain = 60.0f; float rx_gain = 60.0f;
// Parsed PCI lists // File parameters
std::set<uint32_t> pcis_to_meas; std::string filename = "";
std::set<uint32_t> pcis_to_simulate;
}; };
class meas_itf_listener : public srsue::scell::intra_measure_base::meas_itf class meas_itf_listener : public srsue::scell::intra_measure_base::meas_itf
@ -177,7 +178,7 @@ public:
void cell_meas_reset(uint32_t cc_idx) override {} void cell_meas_reset(uint32_t cc_idx) override {}
void new_cell_meas(uint32_t cc_idx, const std::vector<srsue::phy_meas_t>& meas) override void new_cell_meas(uint32_t cc_idx, const std::vector<srsue::phy_meas_t>& meas) override
{ {
for (auto& m : meas) { for (const srsue::phy_meas_t& m : meas) {
uint32_t pci = m.pci; uint32_t pci = m.pci;
if (!cells.count(pci)) { if (!cells.count(pci)) {
cells[pci].rsrp_min = m.rsrp; cells[pci].rsrp_min = m.rsrp;
@ -245,6 +246,24 @@ public:
} }
}; };
static void pci_list_parse_helper(std::string& list_str, std::set<uint32_t>& list)
{
if (list_str == "all") {
// Add all possible cells
for (int i = 0; i < SRSRAN_NOF_NID_NR; i++) {
list.insert(i);
}
} else if (list_str == "none") {
list.clear();
} else if (not list_str.empty()) {
// Remove spaces from neightbour cell list
list_str = srsran::string_remove_char(list_str, ' ');
// Add cell to known cells
srsran::string_parse_list(list_str, ',', list);
}
}
// shorten boost program options namespace // shorten boost program options namespace
namespace bpo = boost::program_options; namespace bpo = boost::program_options;
@ -252,21 +271,21 @@ int parse_args(int argc, char** argv, args_t& args)
{ {
int ret = SRSRAN_SUCCESS; int ret = SRSRAN_SUCCESS;
bpo::options_description options; std::string active_cell_list = "500";
bpo::options_description common("Measurement options"); std::string simulation_cell_list = "";
bpo::options_description over_the_air("Over the air options"); std::string ssb_scs = "30";
bpo::options_description simulation("Simulation execution options");
bpo::options_description options("General options");
bpo::options_description measure("Measurement options");
bpo::options_description over_the_air("Mode 1: Over the air options (Default)");
bpo::options_description simulation("Mode 2: Simulation options (enabled if simulation_cell_list is not empty)");
bpo::options_description file("Mode 3: File (enabled if filename is provided)");
// clang-format off // clang-format off
common.add_options() measure.add_options()
("duration", bpo::value<uint32_t>(&args.duration_s)->default_value(args.duration_s), "Duration of the test in seconds")
("nof_prb", bpo::value<uint32_t>(&args.nof_prb)->default_value(args.nof_prb), "Cell Number of PRB")
("log_level", bpo::value<std::string>(&args.log_level)->default_value(args.log_level), "Intra measurement log level (none, warning, info, debug)")
("meas_len_ms", bpo::value<uint32_t>(&args.meas_len_ms)->default_value(args.meas_len_ms), "Measurement length") ("meas_len_ms", bpo::value<uint32_t>(&args.meas_len_ms)->default_value(args.meas_len_ms), "Measurement length")
("meas_period_ms", bpo::value<uint32_t>(&args.meas_period_ms)->default_value(args.meas_period_ms), "Measurement period") ("meas_period_ms", bpo::value<uint32_t>(&args.meas_period_ms)->default_value(args.meas_period_ms), "Measurement period")
("active_cell_list", bpo::value<std::string>(&args.active_cell_list)->default_value(args.active_cell_list), "Comma separated PCI cell list to measure") ("active_cell_list", bpo::value<std::string>(&active_cell_list)->default_value(active_cell_list), "Comma separated PCI cell list to measure")
("carrier_arfcn", bpo::value<std::uint32_t>(&args.carier_arfcn)->default_value(args.carier_arfcn), "Carrier center frequency ARFCN")
("ssb_arfcn", bpo::value<std::uint32_t>(&args.ssb_arfcn)->default_value(args.ssb_arfcn), "SSB center frequency in ARFCN")
("thr_snr_db", bpo::value<float>(&args.thr_snr_db)->default_value(args.thr_snr_db), "Detection threshold for SNR in dB") ("thr_snr_db", bpo::value<float>(&args.thr_snr_db)->default_value(args.thr_snr_db), "Detection threshold for SNR in dB")
; ;
@ -278,14 +297,24 @@ int parse_args(int argc, char** argv, args_t& args)
; ;
simulation.add_options() simulation.add_options()
("simulation_cell_list", bpo::value<std::string>(&args.simulation_cell_list)->default_value(args.simulation_cell_list), "Comma separated PCI cell list to simulate") ("simulation_cell_list", bpo::value<std::string>(&simulation_cell_list)->default_value(simulation_cell_list), "Comma separated PCI cell list to simulate")
("ssb_period", bpo::value<uint32_t>(&args.ssb_period_ms)->default_value(args.ssb_period_ms), "SSB period in ms") ("ssb_period", bpo::value<uint32_t>(&args.ssb_period_ms)->default_value(args.ssb_period_ms), "SSB period in ms")
("channel.delay_min", bpo::value<float>(&args.channel_delay_min)->default_value(args.channel_delay_min), "Channel delay minimum in usec.") ("channel.delay_min", bpo::value<float>(&args.channel_delay_min)->default_value(args.channel_delay_min), "Channel delay minimum in usec.")
("channel.delay_max", bpo::value<float>(&args.channel_delay_max)->default_value(args.channel_delay_max), "Channel delay maximum in usec. Set to 0 to disable, otherwise it will stir the delay for the duration of the simulation") ("channel.delay_max", bpo::value<float>(&args.channel_delay_max)->default_value(args.channel_delay_max), "Channel delay maximum in usec. Set to 0 to disable, otherwise it will steer the delay for the duration of the simulation")
; ;
options.add(common).add(over_the_air).add(simulation).add_options() file.add_options()
("help", "Show this message") ("file.name", bpo::value<std::string>(&args.filename)->default_value(args.filename), "File name providing baseband")
;
options.add(measure).add(over_the_air).add(simulation).add(file).add_options()
("help,h", "Show this message")
("log_level", bpo::value<std::string>(&args.log_level)->default_value(args.log_level), "Intra measurement log level (none, warning, info, debug)")
("duration", bpo::value<uint32_t>(&args.duration_s)->default_value(args.duration_s), "Duration of the test in seconds")
("srate", bpo::value<double>(&args.srate_hz)->default_value(args.srate_hz), "Sampling Rate in Hz")
("carrier_arfcn", bpo::value<uint32_t>(&args.carier_arfcn)->default_value(args.carier_arfcn), "Carrier center frequency ARFCN")
("ssb_arfcn", bpo::value<uint32_t>(&args.ssb_arfcn)->default_value(args.ssb_arfcn), "SSB center frequency in ARFCN")
("ssb_scs", bpo::value<std::string>(&ssb_scs)->default_value(ssb_scs), "SSB subcarrier spacing in kHz")
; ;
// clang-format on // clang-format on
@ -305,27 +334,19 @@ int parse_args(int argc, char** argv, args_t& args)
ret = SRSRAN_ERROR; ret = SRSRAN_ERROR;
} }
// Parse PCI lists
pci_list_parse_helper(active_cell_list, args.pcis_to_meas);
pci_list_parse_helper(simulation_cell_list, args.pcis_to_simulate);
// Parse SSB SCS
args.ssb_scs = srsran_subcarrier_spacing_from_str(ssb_scs.c_str());
if (args.ssb_scs == srsran_subcarrier_spacing_invalid) {
ret = SRSRAN_ERROR;
}
return ret; return ret;
} }
static void pci_list_parse_helper(std::string& list_str, std::set<uint32_t>& list)
{
if (list_str == "all") {
// Add all possible cells
for (int i = 0; i < SRSRAN_NOF_NID_NR; i++) {
list.insert(i);
}
} else if (list_str == "none") {
list.clear();
} else if (not list_str.empty()) {
// Remove spaces from neightbour cell list
list_str = srsran::string_remove_char(list_str, ' ');
// Add cell to known cells
srsran::string_parse_list(list_str, ',', list);
}
}
int main(int argc, char** argv) int main(int argc, char** argv)
{ {
int ret; int ret;
@ -342,8 +363,8 @@ int main(int argc, char** argv)
logger.set_level(srslog::str_to_basic_level(args.log_level)); logger.set_level(srslog::str_to_basic_level(args.log_level));
// Deduce base-band parameters // Deduce base-band parameters
uint32_t sf_len = srsran_min_symbol_sz_rb(args.nof_prb) * SRSRAN_SUBC_SPACING_NR(args.carrier_scs) / 1000U; double srate_hz = args.srate_hz;
double srate_hz = (double)sf_len * 1000.0; uint32_t sf_len = (uint32_t)round(srate_hz / 1000.0);
double center_freq_hz = srsran::srsran_band_helper().nr_arfcn_to_freq(args.carier_arfcn); double center_freq_hz = srsran::srsran_band_helper().nr_arfcn_to_freq(args.carier_arfcn);
double ssb_freq_hz = srsran::srsran_band_helper().nr_arfcn_to_freq(args.ssb_arfcn); double ssb_freq_hz = srsran::srsran_band_helper().nr_arfcn_to_freq(args.ssb_arfcn);
uint16_t band = srsran::srsran_band_helper().get_band_from_dl_freq_Hz(center_freq_hz); uint16_t band = srsran::srsran_band_helper().get_band_from_dl_freq_Hz(center_freq_hz);
@ -392,12 +413,15 @@ int main(int argc, char** argv)
// Over-the-air only // Over-the-air only
std::unique_ptr<srsran::radio> radio = nullptr; std::unique_ptr<srsran::radio> radio = nullptr;
// Parse PCI lists // File read only
pci_list_parse_helper(args.active_cell_list, args.pcis_to_meas); srsran_filesource_t filesource = {};
pci_list_parse_helper(args.simulation_cell_list, args.pcis_to_simulate);
// Setup raio if the list of PCIs to simulate is empty // Setup raio if the list of PCIs to simulate is empty
if (args.pcis_to_simulate.empty()) { if (not args.filename.empty()) {
if (srsran_filesource_init(&filesource, args.filename.c_str(), SRSRAN_COMPLEX_FLOAT) < SRSRAN_SUCCESS) {
return SRSRAN_ERROR;
}
} else if (args.pcis_to_simulate.empty()) {
// Create radio log // Create radio log
auto& radio_logger = srslog::fetch_basic_logger("RF", false); auto& radio_logger = srslog::fetch_basic_logger("RF", false);
radio_logger.set_level(srslog::str_to_basic_level(args.radio_log_level)); radio_logger.set_level(srslog::str_to_basic_level(args.radio_log_level));
@ -440,11 +464,6 @@ int main(int argc, char** argv)
gnb_args.channel.enable = (gnb_args.channel.delay_enable || gnb_args.channel.awgn_enable || gnb_args.channel.enable = (gnb_args.channel.delay_enable || gnb_args.channel.awgn_enable ||
gnb_args.channel.fading_enable || gnb_args.channel.hst_enable); gnb_args.channel.fading_enable || gnb_args.channel.hst_enable);
test_gnb_v.push_back(std::unique_ptr<test_gnb>(new test_gnb(gnb_args))); test_gnb_v.push_back(std::unique_ptr<test_gnb>(new test_gnb(gnb_args)));
// Add cell to known cells
if (args.active_cell_list.empty()) {
args.pcis_to_meas.insert(pci);
}
} }
} }
@ -459,7 +478,13 @@ int main(int argc, char** argv)
// Clean buffer // Clean buffer
srsran_vec_cf_zero(baseband_buffer.data(), sf_len); srsran_vec_cf_zero(baseband_buffer.data(), sf_len);
if (radio) { if (not args.filename.empty()) {
if (srsran_filesource_read(&filesource, baseband_buffer.data(), (int)sf_len) < SRSRAN_SUCCESS) {
ERROR("Error reading from file");
srsran_filesource_free(&filesource);
return SRSRAN_ERROR;
}
} else if (radio) {
// Receive radio // Receive radio
srsran::rf_buffer_t radio_buffer(baseband_buffer.data(), sf_len); srsran::rf_buffer_t radio_buffer(baseband_buffer.data(), sf_len);
radio->rx_now(radio_buffer, ts); radio->rx_now(radio_buffer, ts);
@ -499,12 +524,16 @@ int main(int argc, char** argv)
radio->stop(); radio->stop();
} }
if (not args.filename.empty()) {
srsran_filesource_free(&filesource);
}
srslog::flush(); srslog::flush();
if (ret && radio == nullptr) { if (ret == SRSRAN_SUCCESS) {
printf("Error\n");
} else {
printf("Ok\n"); printf("Ok\n");
} else {
printf("Error\n");
} }
return ret; return ret;