Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
oai
openairinterface5G
Commits
beb30f1e
Commit
beb30f1e
authored
Feb 15, 2019
by
HOAI SON DANG
Browse files
Merge branch 'nr_fix_pucch_dmrs' into develop-nr
Signed-off-by:
HOAI SON DANG
<
sondh8@viettel.com.vn
>
parents
4255f4e4
b4d7c62d
Changes
172
Expand all
Hide whitespace changes
Inline
Side-by-side
ci-scripts/Jenkinsfile-gitlab
View file @
beb30f1e
...
...
@@ -212,7 +212,7 @@ pipeline {
steps
{
gitlabCommitStatus
(
name:
"Build eNb-ethernet"
)
{
timeout
(
time:
20
,
unit:
'MINUTES'
)
{
sh
"./ci-scripts/oai-ci-vm-tool wait --workspace $WORKSPACE --variant enb-ethernet --job-name ${JOB_NAME} --build-id ${BUILD_ID}
--keep-vm-alive
"
sh
"./ci-scripts/oai-ci-vm-tool wait --workspace $WORKSPACE --variant enb-ethernet --job-name ${JOB_NAME} --build-id ${BUILD_ID}"
}
}
}
...
...
@@ -221,7 +221,7 @@ pipeline {
steps
{
gitlabCommitStatus
(
name:
"Build UE-ethernet"
)
{
timeout
(
time:
20
,
unit:
'MINUTES'
)
{
sh
"./ci-scripts/oai-ci-vm-tool wait --workspace $WORKSPACE --variant ue-ethernet --job-name ${JOB_NAME} --build-id ${BUILD_ID}
--keep-vm-alive
"
sh
"./ci-scripts/oai-ci-vm-tool wait --workspace $WORKSPACE --variant ue-ethernet --job-name ${JOB_NAME} --build-id ${BUILD_ID}"
}
}
}
...
...
ci-scripts/conf_files/enb.band7.tm1.100PRB.usrpb210.conf
View file @
beb30f1e
...
...
@@ -197,8 +197,8 @@ MACRLCs = (
tr_s_preference
=
"local_L1"
;
tr_n_preference
=
"local_RRC"
;
phy_test_mode
=
0
;
puSch10xSnr
=
20
0
;
puCch10xSnr
=
20
0
;
puSch10xSnr
=
16
0
;
puCch10xSnr
=
16
0
;
}
);
...
...
@@ -227,7 +227,7 @@ RUs = (
THREAD_STRUCT
= (
{
#three config for level of parallelism "PARALLEL_SINGLE_THREAD", "PARALLEL_RU_L1_SPLIT", or "PARALLEL_RU_L1_TRX_SPLIT"
parallel_config
=
"PARALLEL_
RU_L1_TRX_SPLIT
"
;
parallel_config
=
"PARALLEL_
SINGLE_THREAD
"
;
#two option for worker "WORKER_DISABLE" or "WORKER_ENABLE"
worker_config
=
"WORKER_ENABLE"
;
}
...
...
ci-scripts/conf_files/enb.band7.tm1.25PRB.usrpb210.conf
View file @
beb30f1e
...
...
@@ -197,8 +197,8 @@ MACRLCs = (
tr_s_preference
=
"local_L1"
;
tr_n_preference
=
"local_RRC"
;
phy_test_mode
=
0
;
puSch10xSnr
=
20
0
;
puCch10xSnr
=
20
0
;
puSch10xSnr
=
16
0
;
puCch10xSnr
=
16
0
;
}
);
...
...
@@ -218,7 +218,7 @@ RUs = (
att_rx
=
0
;
bands
= [
7
];
max_pdschReferenceSignalPower
= -
27
;
max_rxgain
=
1
1
5
;
max_rxgain
=
1
2
5
;
eNB_instances
= [
0
];
}
...
...
@@ -227,7 +227,7 @@ RUs = (
THREAD_STRUCT
= (
{
#three config for level of parallelism "PARALLEL_SINGLE_THREAD", "PARALLEL_RU_L1_SPLIT", or "PARALLEL_RU_L1_TRX_SPLIT"
parallel_config
=
"PARALLEL_
RU_L1_TRX_SPLIT
"
;
parallel_config
=
"PARALLEL_
SINGLE_THREAD
"
;
#two option for worker "WORKER_DISABLE" or "WORKER_ENABLE"
worker_config
=
"WORKER_ENABLE"
;
}
...
...
ci-scripts/conf_files/enb.band7.tm1.50PRB.usrpb210.conf
View file @
beb30f1e
...
...
@@ -197,8 +197,8 @@ MACRLCs = (
tr_s_preference
=
"local_L1"
;
tr_n_preference
=
"local_RRC"
;
phy_test_mode
=
0
;
puSch10xSnr
=
20
0
;
puCch10xSnr
=
20
0
;
puSch10xSnr
=
16
0
;
puCch10xSnr
=
16
0
;
}
);
...
...
@@ -218,7 +218,7 @@ RUs = (
att_rx
=
0
;
bands
= [
7
];
max_pdschReferenceSignalPower
= -
27
;
max_rxgain
=
1
15
;
max_rxgain
=
1
20
;
eNB_instances
= [
0
];
}
...
...
@@ -227,7 +227,7 @@ RUs = (
THREAD_STRUCT
= (
{
#three config for level of parallelism "PARALLEL_SINGLE_THREAD", "PARALLEL_RU_L1_SPLIT", or "PARALLEL_RU_L1_TRX_SPLIT"
parallel_config
=
"PARALLEL_
RU_L1_TRX_SPLIT
"
;
parallel_config
=
"PARALLEL_
SINGLE_THREAD
"
;
#two option for worker "WORKER_DISABLE" or "WORKER_ENABLE"
worker_config
=
"WORKER_ENABLE"
;
}
...
...
ci-scripts/conf_files/rcc.band7.tm1.if4p5.lo.100PRB.usrpb210.conf
View file @
beb30f1e
...
...
@@ -200,8 +200,8 @@ MACRLCs = (
tr_s_preference
=
"local_L1"
;
tr_n_preference
=
"local_RRC"
;
phy_test_mode
=
0
;
puSch10xSnr
=
20
0
;
puCch10xSnr
=
20
0
;
puSch10xSnr
=
16
0
;
puCch10xSnr
=
16
0
;
}
);
...
...
@@ -234,7 +234,7 @@ RUs = (
THREAD_STRUCT
= (
{
#three config for level of parallelism "PARALLEL_SINGLE_THREAD", "PARALLEL_RU_L1_SPLIT", or "PARALLEL_RU_L1_TRX_SPLIT"
parallel_config
=
"PARALLEL_
RU_L1_TRX_SPLIT
"
;
parallel_config
=
"PARALLEL_
SINGLE_THREAD
"
;
#two option for worker "WORKER_DISABLE" or "WORKER_ENABLE"
worker_config
=
"WORKER_ENABLE"
;
}
...
...
ci-scripts/conf_files/rcc.band7.tm1.if4p5.lo.25PRB.usrpb210.conf
View file @
beb30f1e
...
...
@@ -200,8 +200,8 @@ MACRLCs = (
tr_s_preference
=
"local_L1"
;
tr_n_preference
=
"local_RRC"
;
phy_test_mode
=
0
;
puSch10xSnr
=
20
0
;
puCch10xSnr
=
20
0
;
puSch10xSnr
=
16
0
;
puCch10xSnr
=
16
0
;
}
);
...
...
@@ -234,7 +234,7 @@ RUs = (
THREAD_STRUCT
= (
{
#three config for level of parallelism "PARALLEL_SINGLE_THREAD", "PARALLEL_RU_L1_SPLIT", or "PARALLEL_RU_L1_TRX_SPLIT"
parallel_config
=
"PARALLEL_
RU_L1_TRX_SPLIT
"
;
parallel_config
=
"PARALLEL_
SINGLE_THREAD
"
;
#two option for worker "WORKER_DISABLE" or "WORKER_ENABLE"
worker_config
=
"WORKER_ENABLE"
;
}
...
...
ci-scripts/conf_files/rcc.band7.tm1.if4p5.lo.50PRB.usrpb210.conf
View file @
beb30f1e
...
...
@@ -200,8 +200,8 @@ MACRLCs = (
tr_s_preference
=
"local_L1"
;
tr_n_preference
=
"local_RRC"
;
phy_test_mode
=
0
;
puSch10xSnr
=
20
0
;
puCch10xSnr
=
20
0
;
puSch10xSnr
=
16
0
;
puCch10xSnr
=
16
0
;
}
);
...
...
@@ -234,7 +234,7 @@ RUs = (
THREAD_STRUCT
= (
{
#three config for level of parallelism "PARALLEL_SINGLE_THREAD", "PARALLEL_RU_L1_SPLIT", or "PARALLEL_RU_L1_TRX_SPLIT"
parallel_config
=
"PARALLEL_
RU_L1_TRX_SPLIT
"
;
parallel_config
=
"PARALLEL_
SINGLE_THREAD
"
;
#two option for worker "WORKER_DISABLE" or "WORKER_ENABLE"
worker_config
=
"WORKER_ENABLE"
;
}
...
...
ci-scripts/conf_files/rru.fdd.band7.conf
View file @
beb30f1e
...
...
@@ -20,7 +20,7 @@ RUs = (
THREAD_STRUCT
= (
{
#three config for level of parallelism "PARALLEL_SINGLE_THREAD", "PARALLEL_RU_L1_SPLIT", or "PARALLEL_RU_L1_TRX_SPLIT"
parallel_config
=
"PARALLEL_
RU_L1_TRX_SPLIT
"
;
parallel_config
=
"PARALLEL_
SINGLE_THREAD
"
;
#two option for worker "WORKER_DISABLE" or "WORKER_ENABLE"
worker_config
=
"WORKER_ENABLE"
;
}
...
...
ci-scripts/main.py
View file @
beb30f1e
...
...
@@ -1504,7 +1504,8 @@ class SSHConnection():
return
ENB_PROCESS_ASSERTION
if
foundRealTimeIssue
:
logging
.
debug
(
'
\u001B
[1;37;41m eNB faced real time issues!
\u001B
[0m'
)
return
ENB_PROCESS_REALTIME_ISSUE
self
.
htmleNBFailureMsg
+=
'eNB faced real time issues!
\n
'
#return ENB_PROCESS_REALTIME_ISSUE
return
0
def
TerminateeNB
(
self
):
...
...
ci-scripts/oai-ci-vm-tool
View file @
beb30f1e
...
...
@@ -252,8 +252,9 @@ case $key in
VM_NAME
=
ci-phy-sim
ARCHIVES_LOC
=
phy_sim
LOG_PATTERN
=
.Rel15.txt
NB_PATTERN_FILES
=
6
NB_PATTERN_FILES
=
8
BUILD_OPTIONS
=
"--phy_simulators"
VM_MEMORY
=
4096
RUN_OPTIONS
=
"./run_exec_autotests.bash -g
\"
01510*
\"
-q -np -b"
NBARGS
=
$[$NBARGS
+256]
shift
...
...
@@ -330,8 +331,9 @@ case $key in
VM_NAME
=
ci-phy-sim
ARCHIVES_LOC
=
phy_sim
LOG_PATTERN
=
.Rel15.txt
NB_PATTERN_FILES
=
6
NB_PATTERN_FILES
=
8
BUILD_OPTIONS
=
"--phy_simulators"
VM_MEMORY
=
4096
RUN_OPTIONS
=
"./run_exec_autotests.bash -g
\"
01510*
\"
-q -np -b"
NBARGS
=
$[$NBARGS
+256]
;;
...
...
ci-scripts/reportBuildLocally.sh
View file @
beb30f1e
...
...
@@ -411,6 +411,10 @@ function report_build {
then
summary_table_row
"PBCH Test - Release 15"
./archives/phy_sim/nr_pbchsim.Rel15.txt
"Built target nr_pbchsim"
./phy_sim_row6.html
fi
if
[
-f
./archives/phy_sim/nr_dlschsim.Rel15.txt
]
then
summary_table_row
"DLSCH Test - Release 15"
./archives/phy_sim/nr_dlschsim.Rel15.txt
"Built target nr_dlschsim"
./phy_sim_row7.html
fi
summary_table_footer
...
...
ci-scripts/waitBuildOnVM.sh
View file @
beb30f1e
...
...
@@ -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
}
cmake_targets/CMakeLists.txt
View file @
beb30f1e
...
...
@@ -290,6 +290,8 @@ set(protobuf_generated_dir ${OPENAIR_BIN_DIR})
add_list2_option
(
RRC_ASN1_VERSION
"Rel15"
"ASN.1 version of RRC interface"
"Rel8"
"Rel10"
"Rel14"
"CBA"
)
Message
(
"RRC_ASN1_VERSION is
${
RRC_ASN1_VERSION
}
"
)
if
(
${
RRC_ASN1_VERSION
}
STREQUAL
"Rel8"
)
make_version
(
RRC_VERSION 8 6 0
)
set
(
RRC_GRAMMAR
${
OPENAIR2_DIR
}
/RRC/LTE/MESSAGES/asn1c/ASN1_files/EUTRA-RRC-Definitions-86.asn
)
...
...
@@ -366,9 +368,9 @@ execute_process(COMMAND mkdir -p ${NR_RRC_FULL_DIR}
OUTPUT_QUIET
ERROR_QUIET
)
if
(
NOT
${
ret
}
STREQUAL 0
)
message
(
FATAL_ERROR
"
${
ret
}
: error"
)
endif
(
NOT
${
ret
}
STREQUAL 0
)
#
if (NOT ${ret} STREQUAL 0)
#
message(FATAL_ERROR "${ret}: error")
#
endif (NOT ${ret} STREQUAL 0)
file
(
GLOB nr_rrc_source
${
NR_RRC_FULL_DIR
}
/*.c
)
file
(
GLOB nr_rrc_h
${
NR_RRC_FULL_DIR
}
/*.h
)
...
...
@@ -961,7 +963,7 @@ set(UTIL_SRC
${
OPENAIR_DIR
}
/common/utils/LOG/log.c
# ${OPENAIR2_DIR}/UTIL/LOG/vcd_signal_dumper.c
${
OPENAIR2_DIR
}
/UTIL/MATH/oml.c
${
OPENAIR2_DIR
}
/UTIL/MEM/mem_block.c
#
${OPENAIR2_DIR}/UTIL/MEM/mem_block.c
# ${OPENAIR2_DIR}/UTIL/OCG/OCG.c
# ${OPENAIR2_DIR}/UTIL/OCG/OCG_create_dir.c
# ${OPENAIR2_DIR}/UTIL/OCG/OCG_detect_file.c
...
...
@@ -1184,6 +1186,7 @@ set(PHY_SRC_COMMON
${
OPENAIR1_DIR
}
/PHY/CODING/lte_segmentation.c
${
OPENAIR1_DIR
}
/PHY/CODING/nr_segmentation.c
${
OPENAIR1_DIR
}
/PHY/CODING/nr_compute_tbs.c
${
OPENAIR1_DIR
}
/PHY/CODING/nr_rate_matching.c
${
OPENAIR1_DIR
}
/PHY/CODING/ccoding_byte.c
${
OPENAIR1_DIR
}
/PHY/CODING/ccoding_byte_lte.c
${
OPENAIR1_DIR
}
/PHY/CODING/3gpplte_sse.c
...
...
@@ -1304,6 +1307,11 @@ set(PHY_SRC_UE
${
OPENAIR1_DIR
}
/PHY/NR_TRANSPORT/nr_pbch.c
${
OPENAIR1_DIR
}
/PHY/NR_TRANSPORT/nr_dci.c
${
OPENAIR1_DIR
}
/PHY/NR_TRANSPORT/nr_dci_tools.c
${
OPENAIR1_DIR
}
/PHY/NR_TRANSPORT/nr_dlsch.c
${
OPENAIR1_DIR
}
/PHY/NR_TRANSPORT/nr_dlsch_tools.c
${
OPENAIR1_DIR
}
/PHY/NR_TRANSPORT/nr_dlsch_coding.c
${
OPENAIR1_DIR
}
/PHY/NR_TRANSPORT/nr_tbs_tools.c
${
OPENAIR1_DIR
}
/PHY/NR_TRANSPORT/nr_sch_dmrs.c
${
OPENAIR1_DIR
}
/PHY/NR_REFSIG/nr_gold.c
${
OPENAIR1_DIR
}
/PHY/TOOLS/file_output.c
${
OPENAIR1_DIR
}
/PHY/TOOLS/cadd_vv.c
...
...
@@ -1333,6 +1341,10 @@ set(PHY_SRC_UE
${
OPENAIR1_DIR
}
/PHY/NR_UE_TRANSPORT/dmrs_nr.c
${
OPENAIR1_DIR
}
/PHY/NR_UE_TRANSPORT/nr_initial_sync.c
${
OPENAIR1_DIR
}
/PHY/NR_UE_TRANSPORT/nr_pbch.c
${
OPENAIR1_DIR
}
/PHY/NR_UE_TRANSPORT/nr_dlsch_demodulation.c
${
OPENAIR1_DIR
}
/PHY/NR_UE_TRANSPORT/nr_dlsch_decoding.c
${
OPENAIR1_DIR
}
/PHY/NR_UE_TRANSPORT/nr_dlsch_llr_computation.c
${
OPENAIR1_DIR
}
/PHY/NR_TRANSPORT/nr_tbs_tools.c
${
OPENAIR1_DIR
}
/PHY/NR_UE_TRANSPORT/
${
OPENAIR1_DIR
}
/PHY/NR_UE_TRANSPORT/nr_prach.c
${
OPENAIR1_DIR
}
/PHY/NR_UE_TRANSPORT/srs_modulation_nr.c
...
...
@@ -1343,6 +1355,7 @@ set(PHY_SRC_UE
${
OPENAIR1_DIR
}
/PHY/NR_REFSIG/nr_dmrs_rx.c
${
OPENAIR1_DIR
}
/PHY/NR_REFSIG/nr_gold_ue.c
${
OPENAIR1_DIR
}
/PHY/NR_UE_ESTIMATION/nr_dl_channel_estimation.c
${
OPENAIR1_DIR
}
/PHY/NR_UE_ESTIMATION/nr_adjust_synch_ue.c
${
OPENAIR1_DIR
}
/PHY/LTE_ESTIMATION/lte_ue_measurements.c
${
OPENAIR1_DIR
}
/PHY/TOOLS/file_output.c
${
OPENAIR1_DIR
}
/PHY/TOOLS/cadd_vv.c
...
...
@@ -1523,14 +1536,6 @@ set(NR_L2_SRC_UE
${
NR_UE_RRC_DIR
}
/L2_interface_ue.c
${
NR_UE_RRC_DIR
}
/main_ue.c
${
NR_UE_RRC_DIR
}
/rrc_UE.c
# ${NR_UE_RRC_DIR}/mac_vars.c
#${RRC_DIR}/rrc_UE.c
)
set
(
L2_NR_SRC_UE
${
NR_UE_RRC_DIR
}
/L2_interface_ue.c
${
NR_UE_RRC_DIR
}
/main_ue.c
${
NR_UE_RRC_DIR
}
/rrc_UE.c
)
set
(
MAC_SRC
...
...
@@ -1636,26 +1641,27 @@ set ( NR_LTE_UE_REUSE_SRC
${
OPENAIR1_DIR
}
/SCHED/phy_procedures_lte_common.c
#${OPENAIR1_DIR}/SCHED_UE/phy_procedures_lte_ue.c
${
OPENAIR1_DIR
}
/PHY/LTE_TRANSPORT/lte_mcs.c
${
OPENAIR1_DIR
}
/PHY/LTE_TRANSPORT/pmch_common.c
#
${OPENAIR1_DIR}/PHY/LTE_TRANSPORT/pmch_common.c
${
OPENAIR1_DIR
}
/PHY/LTE_REFSIG/lte_dl_cell_spec.c
${
OPENAIR1_DIR
}
/PHY/CODING/lte_segmentation.c
${
OPENAIR1_DIR
}
/PHY/LTE_TRANSPORT/prach_common.c
#
${OPENAIR1_DIR}/PHY/LTE_REFSIG/lte_dl_cell_spec.c
#
${OPENAIR1_DIR}/PHY/CODING/lte_segmentation.c
#
${OPENAIR1_DIR}/PHY/LTE_TRANSPORT/prach_common.c
# ${OPENAIR1_DIR}/PHY/INIT/lte_init_ue.c
${
OPENAIR1_DIR
}
/PHY/CODING/crc_byte.c
${
OPENAIR1_DIR
}
/PHY/CODING/viterbi_lte.c
${
OPENAIR1_DIR
}
/PHY/CODING/viterbi.c
${
OPENAIR1_DIR
}
/PHY/LTE_TRANSPORT/phich_common.c
#
${OPENAIR1_DIR}/PHY/LTE_TRANSPORT/phich_common.c
${
OPENAIR1_DIR
}
/PHY/LTE_UE_TRANSPORT/dlsch_llr_computation.c
${
OPENAIR1_DIR
}
/PHY/LTE_TRANSPORT/dci_tools_common.c
${
OPENAIR1_DIR
}
/PHY/CODING/lte_rate_matching.c
# ${OPENAIR1_DIR}/PHY/LTE_TRANSPORT/dci_tools_common.c
# ${OPENAIR1_DIR}/PHY/CODING/lte_rate_matching.c
${
OPENAIR1_DIR
}
/PHY/CODING/ccoding_byte_lte.c
${
OPENAIR1_DIR
}
/PHY/CODING/ccoding_byte.c
${
OPENAIR1_DIR
}
/PHY/LTE_REFSIG/lte_gold.c
${
OPENAIR1_DIR
}
/PHY/LTE_ESTIMATION/lte_est_freq_offset.c
${
OPENAIR1_DIR
}
/PHY/LTE_ESTIMATION/lte_dl_channel_estimation.c
${
OPENAIR1_DIR
}
/PHY/LTE_ESTIMATION/lte_ue_measurements.c
${
OPENAIR1_DIR
}
/PHY/LTE_UE_TRANSPORT/dlsch_demodulation.c
#
${OPENAIR1_DIR}/PHY/LTE_UE_TRANSPORT/dlsch_demodulation.c
#${OPENAIR1_DIR}/PHY/LTE_UE_TRANSPORT/dlsch_llr_computation_avx2.c
)
...
...
@@ -2555,11 +2561,14 @@ target_link_libraries(polartest SIMU PHY PHY_NR PHY_COMMON m ${ATLAS_LIBRARIES})
add_executable
(
ldpctest
${
OPENAIR1_DIR
}
/PHY/CODING/TESTBENCH/ldpctest.c
)
target_link_libraries
(
ldpctest SIMU PHY PHY_NR m
${
ATLAS_LIBRARIES
}
)
add_executable
(
nr_dlschsim
${
OPENAIR1_DIR
}
/SIMULATION/NR_PHY/dlschsim.c
${
T_SOURCE
}
)
target_link_libraries
(
nr_dlschsim -Wl,--start-group UTIL SIMU PHY_COMMON PHY_NR PHY_NR_UE SCHED_NR_LIB CONFIG_LIB -Wl,--end-group m pthread
${
ATLAS_LIBRARIES
}
${
T_LIB
}
dl
)
add_executable
(
nr_pbchsim
${
OPENAIR1_DIR
}
/SIMULATION/NR_PHY/pbchsim.c
${
T_SOURCE
}
)
target_link_libraries
(
nr_pbchsim -Wl,--start-group UTIL SIMU PHY_COMMON PHY_NR PHY_NR_UE SCHED_NR_LIB CONFIG_LIB -Wl,--end-group m pthread
${
ATLAS_LIBRARIES
}
${
T_LIB
}
dl
)
add_executable
(
nr_dlsim
${
OPENAIR1_DIR
}
/SIMULATION/NR_PHY/dlsim.c
${
T_SOURCE
}
)
target_link_libraries
(
nr_dlsim -Wl,--start-group UTIL SIMU PHY_COMMON PHY_NR PHY_NR_UE SCHED_NR_LIB SCHED_NR_UE_LIB MAC_NR MAC_UE_NR CONFIG_LIB -Wl,--end-group m pthread
${
ATLAS_LIBRARIES
}
${
T_LIB
}
dl
)
add_executable
(
nr_dlsim
${
OPENAIR1_DIR
}
/SIMULATION/NR_PHY/dlsim.c
${
T_SOURCE
}
)
target_link_libraries
(
nr_dlsim -Wl,--start-group UTIL SIMU PHY_COMMON PHY_NR PHY_NR_UE SCHED_NR_LIB SCHED_NR_UE_LIB MAC_NR MAC_UE_NR
RRC_LIB NR_RRC_LIB
CONFIG_LIB
L2_NR
-Wl,--end-group m pthread
${
ATLAS_LIBRARIES
}
${
T_LIB
}
dl
)
foreach
(
myExe dlsim dlsim_tm7 ulsim pbchsim scansim mbmssim pdcchsim pucchsim prachsim syncsim
)
...
...
cmake_targets/autotests/test_case_list.xml
View file @
beb30f1e
...
...
@@ -1035,14 +1035,16 @@
<testCase id="015103">
<class>execution</class>
<desc>polartest Test cases. (Test1: PBCH polar test)</desc>
<desc>polartest Test cases. (Test1: PBCH polar test),
(Test2: DCI polar test)</desc>
<pre_compile_prog></pre_compile_prog>
<compile_prog>$OPENAIR_DIR/cmake_targets/build_oai</compile_prog>
<compile_prog_args> --phy_simulators -c </compile_prog_args>
<pre_exec>$OPENAIR_DIR/cmake_targets/autotests/tools/free_mem.bash</pre_exec>
<pre_exec_args></pre_exec_args>
<main_exec> $OPENAIR_DIR/targets/bin/polartest.Rel15</main_exec>
<main_exec_args>-q -s-10 -f0</main_exec_args>
<main_exec_args>-q -s-10 -f0
-q -s-10 -f0 -m1</main_exec_args>
<tags>polartest.test1</tags>
<search_expr_true>BLER= 0.000000</search_expr_true>
<search_expr_false>segmentation fault|assertion|exiting|fatal</search_expr_false>
...
...
@@ -1051,16 +1053,24 @@
<testCase id="015104">
<class>execution</class>
<desc>nr_pbchsim Test cases. (Test1: PBCH-only),
(Test2: PBCH and synchronization)</desc>
<desc>nr_pbchsim Test cases. (Test1: PBCH-only, 106 PRB),
(Test2: PBCH and synchronization, 106PBR),
(Test3: PBCH-only, 217 PRB),
(Test4: PBCH and synchronization, 217 RPB),
(Test5: PBCH-only, 217 PRB),
(Test6: PBCH and synchronization, 217 PRB)</desc>
<pre_compile_prog></pre_compile_prog>
<compile_prog>$OPENAIR_DIR/cmake_targets/build_oai</compile_prog>
<compile_prog_args> --phy_simulators -c </compile_prog_args>
<pre_exec>$OPENAIR_DIR/cmake_targets/autotests/tools/free_mem.bash</pre_exec>
<pre_exec_args></pre_exec_args>
<main_exec> $OPENAIR_DIR/targets/bin/nr_pbchsim.Rel15</main_exec>
<main_exec_args>-s-11 -S-10 -n1000
-s-11 -S-10 -n10 -I</main_exec_args>
<main_exec_args>-s0 -S1 -n1000 -R106
-s0 -S1 -n10 -I -R106
-s0 -S1 -n1000 -R217
-s0 -S1 -n10 -I -R217
-s0 -S1 -n1000 -R273
-s0 -S1 -n10 -I -R273</main_exec_args>
<tags>nr_pbchsim.test1 nr_pbchsim.test2</tags>
<search_expr_true>PBCH test OK</search_expr_true>
<search_expr_false>segmentation fault|assertion|exiting|fatal</search_expr_false>
...
...
cmake_targets/build_oai
View file @
beb30f1e
...
...
@@ -339,6 +339,10 @@ function main() {
FORCE_DEADLINE_SCHEDULER_FLAG_USER
=
"True"
echo_info
"Enabling the usage of deadline scheduler"
shift
1
;;
--enable-cpu-affinity
)
CPU_AFFINITY_FLAG_USER
=
"True"
echo_info
"Enabling CPU Affinity (only valid when not using deadline scheduler)"
shift
1
;;
--disable-cpu-affinity
)
CPU_AFFINITY_FLAG_USER
=
"False"
echo_info
"Disabling CPU Affinity (only valid when not using deadline scheduler)"
...
...
@@ -692,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"
simlist
=
"dlsim ulsim polartest ldpctest nr_pbchsim
nr_dlschsim nr_dlsim
"
for
f
in
$simlist
;
do
compilations
\
phy_simulators
$f
\
...
...
cmake_targets/phy_simulators/CMakeLists.txt
View file @
beb30f1e
...
...
@@ -3,11 +3,11 @@ set(PACKAGE_NAME "unitary_tests_simulators")
set
(
PHYSIM True
)
set
(
RF_BOARD None
)
set
(
XFORMS True
)
set
(
ENABLE_ITTI
Fals
e
)
set
(
ENABLE_ITTI
Tru
e
)
set
(
DEBUG_PHY False
)
set
(
MU_RECIEVER False
)
set
(
NAS_UE False
)
set
(
MESSAGE_CHART_GENERATOR False
)
set
(
RRC_ASN1_VERSION
"Rel1
4
"
)
set
(
RRC_ASN1_VERSION
"Rel1
5
"
)
set
(
T_TRACER True
)
include
(
${
CMAKE_CURRENT_SOURCE_DIR
}
/../CMakeLists.txt
)
common/utils/LOG/vcd_signal_dumper.c
View file @
beb30f1e
...
...
@@ -74,10 +74,10 @@ const char* eurecomVariablesNames[] = {
"frame_number_TX1_RU"
,
"frame_number_RX0_RU"
,
"frame_number_RX1_RU"
,
"
subframe
_number_TX0_RU"
,
"
subframe
_number_TX1_RU"
,
"
subframe
_number_RX0_RU"
,
"
subframe
_number_RX1_RU"
,
"
tti
_number_TX0_RU"
,
"
tti
_number_TX1_RU"
,
"
tti
_number_RX0_RU"
,
"
tti
_number_RX1_RU"
,
"runtime_TX_eNB"
,
"runtime_RX_eNB"
,
"frame_number_TX0_UE"
,
...
...
@@ -196,10 +196,10 @@ const char* eurecomVariablesNames[] = {
"frame_number_TX1_gNB"
,
"frame_number_RX0_gNB"
,
"frame_number_RX1_gNB"
,
"s
ubframe
_number_TX0_gNB"
,
"s
ubframe
_number_TX1_gNB"
,
"s
ubframe
_number_RX0_gNB"
,
"s
ubframe
_number_RX1_gNB"
"s
lot
_number_TX0_gNB"
,
"s
lot
_number_TX1_gNB"
,
"s
lot
_number_RX0_gNB"
,
"s
lot
_number_RX1_gNB"
};
const
char
*
eurecomFunctionsNames
[]
=
{
...
...
common/utils/LOG/vcd_signal_dumper.h
View file @
beb30f1e
...
...
@@ -51,10 +51,10 @@ typedef enum {
VCD_SIGNAL_DUMPER_VARIABLES_FRAME_NUMBER_TX1_RU
,
VCD_SIGNAL_DUMPER_VARIABLES_FRAME_NUMBER_RX0_RU
,
VCD_SIGNAL_DUMPER_VARIABLES_FRAME_NUMBER_RX1_RU
,
VCD_SIGNAL_DUMPER_VARIABLES_
SUBFRAME
_NUMBER_TX0_RU
,
VCD_SIGNAL_DUMPER_VARIABLES_
SUBFRAME
_NUMBER_TX1_RU
,
VCD_SIGNAL_DUMPER_VARIABLES_
SUBFRAME
_NUMBER_RX0_RU
,
VCD_SIGNAL_DUMPER_VARIABLES_
SUBFRAME
_NUMBER_RX1_RU
,
VCD_SIGNAL_DUMPER_VARIABLES_
TTI
_NUMBER_TX0_RU
,
VCD_SIGNAL_DUMPER_VARIABLES_
TTI
_NUMBER_TX1_RU
,
VCD_SIGNAL_DUMPER_VARIABLES_
TTI
_NUMBER_RX0_RU
,
VCD_SIGNAL_DUMPER_VARIABLES_
TTI
_NUMBER_RX1_RU
,
VCD_SIGNAL_DUMPER_VARIABLES_RUNTIME_TX_ENB
,
VCD_SIGNAL_DUMPER_VARIABLES_RUNTIME_RX_ENB
,
VCD_SIGNAL_DUMPER_VARIABLES_FRAME_NUMBER_TX0_UE
,
...
...
@@ -173,10 +173,10 @@ typedef enum {
VCD_SIGNAL_DUMPER_VARIABLES_FRAME_NUMBER_TX1_GNB
,
VCD_SIGNAL_DUMPER_VARIABLES_FRAME_NUMBER_RX0_GNB
,
VCD_SIGNAL_DUMPER_VARIABLES_FRAME_NUMBER_RX1_GNB
,
VCD_SIGNAL_DUMPER_VARIABLES_S
UBFRAME
_NUMBER_TX0_GNB
,
VCD_SIGNAL_DUMPER_VARIABLES_S
UBFRAME
_NUMBER_TX1_GNB
,
VCD_SIGNAL_DUMPER_VARIABLES_S
UBFRAME
_NUMBER_RX0_GNB
,
VCD_SIGNAL_DUMPER_VARIABLES_S
UBFRAME
_NUMBER_RX1_GNB
,
VCD_SIGNAL_DUMPER_VARIABLES_S
LOT
_NUMBER_TX0_GNB
,
VCD_SIGNAL_DUMPER_VARIABLES_S
LOT
_NUMBER_TX1_GNB
,
VCD_SIGNAL_DUMPER_VARIABLES_S
LOT
_NUMBER_RX0_GNB
,
VCD_SIGNAL_DUMPER_VARIABLES_S
LOT
_NUMBER_RX1_GNB
,
VCD_SIGNAL_DUMPER_VARIABLES_END
}
vcd_signal_dump_variables
;
...
...
common/utils/T/T_messages.txt
View file @
beb30f1e
...
...
@@ -1099,26 +1099,26 @@ ID = VCD_VARIABLE_FRAME_NUMBER_RX1_RU
GROUP = ALL:VCD:ENB:VCD_VARIABLE
FORMAT = ulong,value
VCD_NAME = frame_number_RX1_RU
ID = VCD_VARIABLE_
SUBFRAME
_NUMBER_TX0_RU
DESC = VCD variable
SUBFRAME
_NUMBER_TX0_RU
ID = VCD_VARIABLE_
TTI
_NUMBER_TX0_RU
DESC = VCD variable
TTI
_NUMBER_TX0_RU
GROUP = ALL:VCD:ENB:VCD_VARIABLE
FORMAT = ulong,value
VCD_NAME =
subframe
_number_TX0_RU
ID = VCD_VARIABLE_
SUBFRAME
_NUMBER_TX1_RU
DESC = VCD variable
SUBFRAME
_NUMBER_TX1_RU
VCD_NAME =
tti
_number_TX0_RU
ID = VCD_VARIABLE_
TTI
_NUMBER_TX1_RU
DESC = VCD variable
TTI
_NUMBER_TX1_RU
GROUP = ALL:VCD:ENB:VCD_VARIABLE
FORMAT = ulong,value
VCD_NAME =
subframe
_number_TX1_RU
ID = VCD_VARIABLE_
SUBFRAME
_NUMBER_RX0_RU
DESC = VCD variable
SUBFRAME
_NUMBER_RX0_RU
VCD_NAME =
tti
_number_TX1_RU
ID = VCD_VARIABLE_
TTI
_NUMBER_RX0_RU
DESC = VCD variable
TTI
_NUMBER_RX0_RU
GROUP = ALL:VCD:ENB:VCD_VARIABLE
FORMAT = ulong,value
VCD_NAME =
subframe
_number_RX0_RU
ID = VCD_VARIABLE_
SUBFRAME
_NUMBER_RX1_RU
DESC = VCD variable
SUBFRAME
_NUMBER_RX1_RU
VCD_NAME =
tti
_number_RX0_RU
ID = VCD_VARIABLE_
TTI
_NUMBER_RX1_RU
DESC = VCD variable
TTI
_NUMBER_RX1_RU
GROUP = ALL:VCD:ENB:VCD_VARIABLE
FORMAT = ulong,value
VCD_NAME =
subframe
_number_RX1_RU
VCD_NAME =
tti
_number_RX1_RU
ID = VCD_VARIABLE_RUNTIME_TX_ENB
DESC = VCD variable RUNTIME_TX_ENB
GROUP = ALL:VCD:ENB:VCD_VARIABLE
...
...
@@ -1701,26 +1701,26 @@ ID = VCD_VARIABLE_FRAME_NUMBER_RX1_GNB
GROUP = ALL:VCD:ENB:VCD_VARIABLE
FORMAT = ulong,value
VCD_NAME = frame_number_RX1_gNB
ID = VCD_VARIABLE_S
UBFRAME
_NUMBER_TX0_GNB
DESC = VCD variable S
UBFRAME
_NUMBER_TX0_GNB
ID = VCD_VARIABLE_S
LOT
_NUMBER_TX0_GNB
DESC = VCD variable S
LOT
_NUMBER_TX0_GNB
GROUP = ALL:VCD:ENB:VCD_VARIABLE
FORMAT = ulong,value
VCD_NAME = s
ubframe
_number_TX0_gNB
ID = VCD_VARIABLE_S
UBFRAME
_NUMBER_TX1_GNB
DESC = VCD variable S
UBFRAME
_NUMBER_TX1_GNB
VCD_NAME = s
lot
_number_TX0_gNB
ID = VCD_VARIABLE_S
LOT
_NUMBER_TX1_GNB
DESC = VCD variable S
LOT
_NUMBER_TX1_GNB
GROUP = ALL:VCD:ENB:VCD_VARIABLE
FORMAT = ulong,value
VCD_NAME = s
ubframe
_number_TX1_gNB
ID = VCD_VARIABLE_S
UBFRAME
_NUMBER_RX0_GNB
DESC = VCD variable S
UBFRAME
_NUMBER_RX0_GNB
VCD_NAME = s
lot
_number_TX1_gNB
ID = VCD_VARIABLE_S
LOT
_NUMBER_RX0_GNB
DESC = VCD variable S
LOT
_NUMBER_RX0_GNB
GROUP = ALL:VCD:ENB:VCD_VARIABLE
FORMAT = ulong,value
VCD_NAME = s
ubframe
_number_RX0_gNB
ID = VCD_VARIABLE_S
UBFRAME
_NUMBER_RX1_GNB
DESC = VCD variable S
UBFRAME
_NUMBER_RX1_GNB
VCD_NAME = s
lot
_number_RX0_gNB
ID = VCD_VARIABLE_S
LOT
_NUMBER_RX1_GNB
DESC = VCD variable S
LOT
_NUMBER_RX1_GNB
GROUP = ALL:VCD:ENB:VCD_VARIABLE
FORMAT = ulong,value
VCD_NAME = s
ubframe
_number_RX1_gNB
VCD_NAME = s
lot
_number_RX1_gNB
#functions
...
...
nfapi/open-nFAPI/nfapi/public_inc/fapi_nr_ue_interface.h
View file @
beb30f1e
This diff is collapsed.
Click to expand it.
Prev
1
2
3
4
5
…
9
Next
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment