From bfcf1152981750241178be7bc8baab1e9f14c0a9 Mon Sep 17 00:00:00 2001 From: Robert Schmidt Date: Mon, 21 Nov 2022 13:47:41 +0100 Subject: [PATCH 1/4] Tpool: use condbroadcast() in case multiple waits on the same signal --- common/utils/threadPool/thread-pool.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common/utils/threadPool/thread-pool.h b/common/utils/threadPool/thread-pool.h index 81eef5d7e7..b356599546 100644 --- a/common/utils/threadPool/thread-pool.h +++ b/common/utils/threadPool/thread-pool.h @@ -237,7 +237,7 @@ static inline void abortNotifiedFIFO(notifiedFIFO_t *nf) { if (nf->outF == NULL) nf->inF = NULL; mutexunlock(nf->lockF); - condsignal(nf->notifF); + condbroadcast(nf->notifF); } struct one_thread { From 9604d54edfee0c6129811d7b0143a380f340662a Mon Sep 17 00:00:00 2001 From: Robert Schmidt Date: Mon, 21 Nov 2022 14:30:25 +0100 Subject: [PATCH 2/4] Increase precoding timing measure for N310-based gNB SA test --- ci-scripts/datalog_rt_stats.2x2.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci-scripts/datalog_rt_stats.2x2.yaml b/ci-scripts/datalog_rt_stats.2x2.yaml index 8caf0201aa..1805d8ab2f 100644 --- a/ci-scripts/datalog_rt_stats.2x2.yaml +++ b/ci-scripts/datalog_rt_stats.2x2.yaml @@ -8,7 +8,7 @@ ColNames : - Average vs Reference Deviation (Reference Value; Acceptability Threshold) Ref : feprx : 120.0 - feptx_prec : 16.0 + feptx_prec : 30.0 feptx_ofdm : 50.0 feptx_total : 120.0 L1 Tx processing : 300.0 From 24d42aacd616520c8de254c88615867019ddc509 Mon Sep 17 00:00:00 2001 From: Robert Schmidt Date: Mon, 21 Nov 2022 15:45:14 +0100 Subject: [PATCH 3/4] Tune configs for N310-based SA test --- .../gnb.band78.sa.fr1.106PRB.2x2.usrpn310.conf | 9 ++++----- .../gnb.band78.sa.fr1.106PRB.ddsuu.2x2.usrpn310.conf | 8 ++++---- ci-scripts/xml_files/fr1_sa_quectel.xml | 4 ++-- 3 files changed, 10 insertions(+), 11 deletions(-) diff --git a/ci-scripts/conf_files/gnb.band78.sa.fr1.106PRB.2x2.usrpn310.conf b/ci-scripts/conf_files/gnb.band78.sa.fr1.106PRB.2x2.usrpn310.conf index d9e4ed0f3a..bb9c525772 100644 --- a/ci-scripts/conf_files/gnb.band78.sa.fr1.106PRB.2x2.usrpn310.conf +++ b/ci-scripts/conf_files/gnb.band78.sa.fr1.106PRB.2x2.usrpn310.conf @@ -25,7 +25,6 @@ gNBs = pdsch_AntennaPorts_XP = 2; pusch_AntennaPorts = 2; - ul_prbblacklist = "51,52,53,54" do_SRS = 1; pdcch_ConfigSIB1 = ( @@ -210,8 +209,8 @@ MACRLCs = ( num_cc = 1; tr_s_preference = "local_L1"; tr_n_preference = "local_RRC"; -# pusch_TargetSNRx10 = 200; -# pucch_TargetSNRx10 = 150; + pusch_TargetSNRx10 = 220; + pucch_TargetSNRx10 = 200; ulsch_max_frame_inactivity = 0; } ); @@ -220,7 +219,7 @@ L1s = ( { num_cc = 1; tr_n_preference = "local_mac"; - prach_dtx_threshold = 120; + prach_dtx_threshold = 150; # pucch0_dtx_threshold = 150; } ); @@ -234,7 +233,7 @@ RUs = ( att_rx = 0; bands = [78]; max_pdschReferenceSignalPower = -27; - max_rxgain = 75; + max_rxgain = 68; eNB_instances = [0]; ##beamforming 1x2 matrix: 1 layer x 2 antennas bf_weights = [0x00007fff, 0x0000]; diff --git a/ci-scripts/conf_files/gnb.band78.sa.fr1.106PRB.ddsuu.2x2.usrpn310.conf b/ci-scripts/conf_files/gnb.band78.sa.fr1.106PRB.ddsuu.2x2.usrpn310.conf index b34dc2fbe5..a7c1679593 100644 --- a/ci-scripts/conf_files/gnb.band78.sa.fr1.106PRB.ddsuu.2x2.usrpn310.conf +++ b/ci-scripts/conf_files/gnb.band78.sa.fr1.106PRB.ddsuu.2x2.usrpn310.conf @@ -209,8 +209,8 @@ MACRLCs = ( num_cc = 1; tr_s_preference = "local_L1"; tr_n_preference = "local_RRC"; -# pusch_TargetSNRx10 = 200; -# pucch_TargetSNRx10 = 150; + pusch_TargetSNRx10 = 220; + pucch_TargetSNRx10 = 200; ulsch_max_frame_inactivity = 0; } ); @@ -219,7 +219,7 @@ L1s = ( { num_cc = 1; tr_n_preference = "local_mac"; - prach_dtx_threshold = 120; + prach_dtx_threshold = 150; # pucch0_dtx_threshold = 150; } ); @@ -233,7 +233,7 @@ RUs = ( att_rx = 0; bands = [78]; max_pdschReferenceSignalPower = -27; - max_rxgain = 75; + max_rxgain = 68; eNB_instances = [0]; ##beamforming 1x2 matrix: 1 layer x 2 antennas bf_weights = [0x00007fff, 0x0000]; diff --git a/ci-scripts/xml_files/fr1_sa_quectel.xml b/ci-scripts/xml_files/fr1_sa_quectel.xml index cdae3678f9..0a9d17b63d 100644 --- a/ci-scripts/xml_files/fr1_sa_quectel.xml +++ b/ci-scripts/xml_files/fr1_sa_quectel.xml @@ -119,8 +119,8 @@ Iperf - iperf (UL/3Mbps/UDP)(60 sec)(single-ue profile) - -u -b 3M -t 60 + iperf (UL/7Mbps/UDP)(60 sec)(single-ue profile) + -u -b 7M -t 60 UL nrmodule2_quectel 5 From 1dc4542349d07d07cdb80fc8eb242ef9ab7a8acb Mon Sep 17 00:00:00 2001 From: Robert Schmidt Date: Mon, 21 Nov 2022 16:25:00 +0100 Subject: [PATCH 4/4] CI: Improve ASUE test gNB configuration --- .../gnb.band78.sa.fr1.106PRB.2x2.usrpn310.asue.conf | 4 ++-- ci-scripts/xml_files/fr1_sa_amarisoft_ue_1x.xml | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/ci-scripts/conf_files/gnb.band78.sa.fr1.106PRB.2x2.usrpn310.asue.conf b/ci-scripts/conf_files/gnb.band78.sa.fr1.106PRB.2x2.usrpn310.asue.conf index 78b5d56b73..907b89a274 100644 --- a/ci-scripts/conf_files/gnb.band78.sa.fr1.106PRB.2x2.usrpn310.asue.conf +++ b/ci-scripts/conf_files/gnb.band78.sa.fr1.106PRB.2x2.usrpn310.asue.conf @@ -211,8 +211,8 @@ MACRLCs = ( num_cc = 1; tr_s_preference = "local_L1"; tr_n_preference = "local_RRC"; - pusch_TargetSNRx10 = 250; - pucch_TargetSNRx10 = 250; + pusch_TargetSNRx10 = 220; + pucch_TargetSNRx10 = 220; ulsch_max_frame_inactivity = 10; } ); diff --git a/ci-scripts/xml_files/fr1_sa_amarisoft_ue_1x.xml b/ci-scripts/xml_files/fr1_sa_amarisoft_ue_1x.xml index c5bbf97a1e..4933e63199 100644 --- a/ci-scripts/xml_files/fr1_sa_amarisoft_ue_1x.xml +++ b/ci-scripts/xml_files/fr1_sa_amarisoft_ue_1x.xml @@ -45,7 +45,7 @@ Initialize_eNB Initialize gNB - -O ci-scripts/conf_files/gnb.band78.sa.fr1.106PRB.2x2.usrpn310.asue.conf --sa -q --usrp-tx-thread-config 1 --T_stdout 2 --tune-offset 30000000 --log_config.global_log_options level,nocolor,time + -O ci-scripts/conf_files/gnb.band78.sa.fr1.106PRB.2x2.usrpn310.asue.conf --sa -q --usrp-tx-thread-config 1 --T_stdout 2 --tune-offset 30000000 --thread-pool 1,3,5,7,9,11,13,15 --log_config.global_log_options level,nocolor,time 0 0 nr @@ -53,6 +53,7 @@ yes datalog_rt_stats.2x2.yaml 172.21.19.14 + numactl --cpunodebind=netdev:ens2f0np0 --membind=netdev:ens2f0np0