From de3461c8eeddaec2c02e4a2845fa6f8ec66bb877 Mon Sep 17 00:00:00 2001 From: Florian Kaltenberger Date: Thu, 31 Jan 2019 09:57:37 +0100 Subject: [PATCH 1/4] fixing dlsim and adding it to build_oai --- cmake_targets/build_oai | 2 +- openair1/SIMULATION/NR_PHY/dlsim.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/cmake_targets/build_oai b/cmake_targets/build_oai index f018e8c422..01ab01f0a7 100755 --- a/cmake_targets/build_oai +++ b/cmake_targets/build_oai @@ -696,7 +696,7 @@ function main() { echo_info "Compiling unitary tests simulators" # TODO: fix: dlsim_tm4 pucchsim prachsim pdcchsim pbchsim mbmssim #simlist="dlsim_tm4 dlsim ulsim pucchsim prachsim pdcchsim pbchsim mbmssim" - simlist="dlsim ulsim polartest ldpctest nr_pbchsim nr_dlschsim" + simlist="dlsim ulsim polartest ldpctest nr_pbchsim nr_dlschsim nr_dlsim" for f in $simlist ; do compilations \ phy_simulators $f \ diff --git a/openair1/SIMULATION/NR_PHY/dlsim.c b/openair1/SIMULATION/NR_PHY/dlsim.c index f3a3219d71..1d440c5d0d 100644 --- a/openair1/SIMULATION/NR_PHY/dlsim.c +++ b/openair1/SIMULATION/NR_PHY/dlsim.c @@ -395,7 +395,7 @@ int main(int argc, char **argv) frame_parms->N_RB_UL = N_RB_DL; // stub to configure frame_parms - nr_phy_config_request_sim(gNB,N_RB_DL,N_RB_DL,mu); + nr_phy_config_request_sim(gNB,N_RB_DL,N_RB_DL,mu,Nid_cell); // call MAC to configure common parameters phy_init_nr_gNB(gNB,0,0); From 89529d601a72af9be58e9b4ba126ce0fc2fbd4e0 Mon Sep 17 00:00:00 2001 From: Florian Kaltenberger Date: Thu, 31 Jan 2019 09:59:18 +0100 Subject: [PATCH 2/4] chaning SNR computation in nr_pbchsim and changing test_case_list.xml accordingly --- cmake_targets/autotests/test_case_list.xml | 12 ++++++------ openair1/SIMULATION/NR_PHY/pbchsim.c | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/cmake_targets/autotests/test_case_list.xml b/cmake_targets/autotests/test_case_list.xml index c54c3e3322..a26191e710 100644 --- a/cmake_targets/autotests/test_case_list.xml +++ b/cmake_targets/autotests/test_case_list.xml @@ -1065,12 +1065,12 @@ $OPENAIR_DIR/cmake_targets/autotests/tools/free_mem.bash $OPENAIR_DIR/targets/bin/nr_pbchsim.Rel15 - -s-11 -S-10 -n1000 -R106 - -s-11 -S-10 -n10 -I -R106 - -s-11 -S-10 -n1000 -R217 -N10 - -s-11 -S-10 -n10 -I -R217 -N10 - -s-11 -S-10 -n1000 -R273 -N20 - -s-11 -S-10 -n10 -I -R273 -N20 + -s0 -S1 -n1000 -R106 + -s0 -S1 -n10 -I -R106 + -s0 -S1 -n1000 -R217 -N10 + -s0 -S1 -n10 -I -R217 -N10 + -s0 -S1 -n1000 -R273 -N20 + -s0 -S1 -n10 -I -R273 -N20 nr_pbchsim.test1 nr_pbchsim.test2 PBCH test OK segmentation fault|assertion|exiting|fatal diff --git a/openair1/SIMULATION/NR_PHY/pbchsim.c b/openair1/SIMULATION/NR_PHY/pbchsim.c index f71cb7d147..595fc52b73 100644 --- a/openair1/SIMULATION/NR_PHY/pbchsim.c +++ b/openair1/SIMULATION/NR_PHY/pbchsim.c @@ -510,9 +510,9 @@ int main(int argc, char **argv) //multipath_channel(gNB2UE,s_re,s_im,r_re,r_im,frame_length_complex_samples,0); //AWGN - sigma2_dB = 10*log10((double)txlev)-SNR; + sigma2_dB = 20*log10((double)AMP/4)-SNR; sigma2 = pow(10,sigma2_dB/10); - // printf("sigma2 %f (%f dB)\n",sigma2,sigma2_dB); + //printf("sigma2 %f (%f dB), tx_lev %f (%f dB)\n",sigma2,sigma2_dB,txlev,10*log10((double)txlev)); for (i=0; isamples_per_subframe; i++) { for (aa=0; aanb_antennas_rx; aa++) { From cfa2f794c1429d381b251a07ad89125452af444f Mon Sep 17 00:00:00 2001 From: Raphael Defosseux Date: Mon, 4 Feb 2019 11:56:16 +0100 Subject: [PATCH 3/4] CI: adding new lib to phy-sim build check Signed-off-by: Raphael Defosseux --- ci-scripts/oai-ci-vm-tool | 4 ++-- ci-scripts/waitBuildOnVM.sh | 6 +++++- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/ci-scripts/oai-ci-vm-tool b/ci-scripts/oai-ci-vm-tool index dda71d2606..1375fb6194 100755 --- a/ci-scripts/oai-ci-vm-tool +++ b/ci-scripts/oai-ci-vm-tool @@ -252,7 +252,7 @@ case $key in VM_NAME=ci-phy-sim ARCHIVES_LOC=phy_sim LOG_PATTERN=.Rel15.txt - NB_PATTERN_FILES=7 + NB_PATTERN_FILES=8 BUILD_OPTIONS="--phy_simulators" RUN_OPTIONS="./run_exec_autotests.bash -g \"01510*\" -q -np -b" NBARGS=$[$NBARGS+256] @@ -330,7 +330,7 @@ case $key in VM_NAME=ci-phy-sim ARCHIVES_LOC=phy_sim LOG_PATTERN=.Rel15.txt - NB_PATTERN_FILES=7 + NB_PATTERN_FILES=8 BUILD_OPTIONS="--phy_simulators" RUN_OPTIONS="./run_exec_autotests.bash -g \"01510*\" -q -np -b" NBARGS=$[$NBARGS+256] diff --git a/ci-scripts/waitBuildOnVM.sh b/ci-scripts/waitBuildOnVM.sh index a6f4edace8..208bf06318 100755 --- a/ci-scripts/waitBuildOnVM.sh +++ b/ci-scripts/waitBuildOnVM.sh @@ -165,6 +165,10 @@ function check_on_vm_build { fi done - if [ $NB_PATTERN_FILES -ne $NB_FOUND_FILES ]; then STATUS=-1; fi + if [ $NB_PATTERN_FILES -ne $NB_FOUND_FILES ] + then + echo "Expecting $NB_PATTERN_FILES log files and found $NB_FOUND_FILES" + STATUS=-1 + fi } From 10ec0d353adc9f04555e41644ad81e673285b02c Mon Sep 17 00:00:00 2001 From: Florian Kaltenberger Date: Mon, 4 Feb 2019 15:15:28 +0100 Subject: [PATCH 4/4] N_id_cell also initialized for UE --- openair1/SIMULATION/NR_PHY/pbchsim.c | 1 + 1 file changed, 1 insertion(+) diff --git a/openair1/SIMULATION/NR_PHY/pbchsim.c b/openair1/SIMULATION/NR_PHY/pbchsim.c index 595fc52b73..956c8ecd1f 100644 --- a/openair1/SIMULATION/NR_PHY/pbchsim.c +++ b/openair1/SIMULATION/NR_PHY/pbchsim.c @@ -356,6 +356,7 @@ int main(int argc, char **argv) frame_parms->nb_antennas_rx = n_rx; frame_parms->N_RB_DL = N_RB_DL; frame_parms->N_RB_UL = N_RB_DL; + frame_parms->Nid_cell = Nid_cell; nr_phy_config_request_sim(gNB,N_RB_DL,N_RB_DL,mu,Nid_cell); phy_init_nr_gNB(gNB,0,0);