Commit ff58b5e1 authored by Robert Schmidt's avatar Robert Schmidt
Browse files

Merge branch 'integration_2025_w06' into 'develop' 

Integration: `2025.w06`

See merge request oai/openairinterface5g!3248

* !3202 Simplify usage of the old segment decoding libraries with the slot coding interface
* !3240 Fix typos in NR_SA_Tutorial_OAI_multi_UE.md
* !3242 Period based phytest bitmap
* !3238 Refactor tun_if.h
* !3000 Improvements for NR dlsim and ulsim
* !3239 Remove inexistant SIMD instruction
* !3246 Deadlock avoidance in rfsimulator
* !3251 nFAPI: make 4-layer on 100MHz work
* !3243 Reset E1 UE contexts after E1 Setup Response
* !3245 Added Support of 35Mhz,45Mhz,70Mhz Bandwidth
* !3219 E1AP enc/dec lib improvements
parents 0053a3d0 85949411

CMakeLists.txt

+16 −8
Original line number Diff line number Diff line
@@ -777,6 +777,8 @@ set(PHY_NRLDPC_CODINGIF 


add_library(dfts MODULE ${OPENAIR1_DIR}/PHY/TOOLS/oai_dfts.c ${OPENAIR1_DIR}/PHY/TOOLS/oai_dfts_neon.c)



add_library(crc_byte OBJECT ${OPENAIR1_DIR}/PHY/CODING/crc_byte.c)



set(PHY_SRC_COMMON

  ${OPENAIR1_DIR}/PHY/LTE_TRANSPORT/dci_tools_common.c

  ${OPENAIR1_DIR}/PHY/LTE_TRANSPORT/lte_mcs.c
@@ -802,7 +804,6 @@ set(PHY_SRC_COMMON 
  ${OPENAIR1_DIR}/PHY/CODING/ccoding_byte.c

  ${OPENAIR1_DIR}/PHY/CODING/ccoding_byte_lte.c

  ${OPENAIR1_DIR}/PHY/CODING/3gpplte_sse.c

  ${OPENAIR1_DIR}/PHY/CODING/crc_byte.c

  ${PHY_TURBOIF}

  ${OPENAIR1_DIR}/PHY/CODING/lte_rate_matching.c

  ${OPENAIR1_DIR}/PHY/CODING/viterbi.c
@@ -1019,9 +1020,11 @@ if (${SMBV}) 
endif  (${SMBV})



add_library(PHY_COMMON ${PHY_SRC_COMMON})

target_link_libraries(PHY_COMMON PRIVATE shlib_loader)

target_link_libraries(PHY_COMMON

  PRIVATE shlib_loader asn1_lte_rrc_hdrs crc_byte

  PUBLIC UTIL

)

add_dependencies(PHY_COMMON dfts)

target_link_libraries(PHY_COMMON PRIVATE asn1_lte_rrc_hdrs PUBLIC UTIL)



add_library(PHY ${PHY_SRC})

target_link_libraries(PHY PRIVATE asn1_lte_rrc_hdrs asn1_nr_rrc_hdrs)
@@ -1955,10 +1958,15 @@ target_link_libraries(smallblocktest PRIVATE 


add_executable(ldpctest

  ${OPENAIR1_DIR}/PHY/CODING/TESTBENCH/ldpctest.c

  ${OPENAIR1_DIR}/PHY/CODING/nrLDPC_load.c

)

target_link_libraries(ldpctest PRIVATE

  -Wl,--start-group UTIL SIMU PHY_COMMON PHY_NR_COMMON -Wl,--end-group

  m pthread dl shlib_loader ${T_LIB} nr_coding_segment_utils

  m pthread dl shlib_loader ${T_LIB}

  # link 'check_crc' to make it resolved in the LDPC coding libraries

  # 'check_crc' is not used in ldpctest so it is not linked in the executable by default

  # --whole-archive links 'check_crc' in the executable even though it is note used, see 'man ld'

  -Wl,--whole-archive crc_byte -Wl,--no-whole-archive

)



add_executable(nr_dlschsim
@@ -2113,7 +2121,7 @@ if (${T_TRACER}) 
        PHY_COMMON PHY PHY_UE PHY_NR PHY_NR_COMMON PHY_NR_UE PHY_RU

        L2 L2_LTE L2_NR L2_LTE_NR L2_UE NR_L2_UE L2_UE_LTE_NR MAC_NR_COMMON MAC_UE_NR ngap

        CN_UTILS GTPV1U SCTP_CLIENT MME_APP LIB_NAS_UE NB_IoT SIMU OPENAIR0_LIB

        dfts config_internals nr_common)

        dfts config_internals nr_common crc_byte)

    if (TARGET ${i})

      add_dependencies(${i} generate_T)

    endif()

ci-scripts/xml_files/gnb_phytest_usrp_run.xml

+1 −1
Original line number Diff line number Diff line
@@ -45,7 +45,7 @@ 
	<testCase id="090101">

		<class>Initialize_eNB</class>

		<desc>Initialize gNB USRP</desc>

		<Initialize_eNB_args>-O ci-scripts/conf_files/gnb.band78.106prb.usrpn300.phytest-dora.conf --phy-test -q -U 787200 -T 106 -t 23 -D 130175 -m 28 -M 106 --usrp-tx-thread-config 1 --log_config.global_log_options level,nocolor,time</Initialize_eNB_args>

		<Initialize_eNB_args>-O ci-scripts/conf_files/gnb.band78.106prb.usrpn300.phytest-dora.conf --phy-test -q -U 768 -T 106 -t 23 -D 127 -m 28 -M 106 --usrp-tx-thread-config 1 --log_config.global_log_options level,nocolor,time</Initialize_eNB_args>

    <rt_stats_cfg>datalog_rt_stats.default.yaml</rt_stats_cfg>

		<air_interface>NR</air_interface>

		<USRP_IPAddress>192.168.20.2</USRP_IPAddress>

ci-scripts/xml_files/gnb_phytest_usrp_run_100_2x2.xml

+1 −1
Original line number Diff line number Diff line
@@ -45,7 +45,7 @@ 
  <testCase id="390101">

    <class>Initialize_eNB</class>

    <desc>Initialize gNB USRP</desc>

    <Initialize_eNB_args>-O ci-scripts/conf_files/gnb.band78.273prb.usrpn300.phytest-dora.conf --phy-test -q -U 787200 -T 273 -t 23 -D 130175 -m 23 -M 273 -l 2 --usrp-tx-thread-config 1 --log_config.global_log_options level,nocolor,time</Initialize_eNB_args>

    <Initialize_eNB_args>-O ci-scripts/conf_files/gnb.band78.273prb.usrpn300.phytest-dora.conf --phy-test -q -U 768 -T 273 -t 23 -D 127 -m 23 -M 273 -l 2 --usrp-tx-thread-config 1 --log_config.global_log_options level,nocolor,time</Initialize_eNB_args>

    <rt_stats_cfg>datalog_rt_stats.100.2x2.yaml</rt_stats_cfg>

    <air_interface>NR</air_interface>

    <USRP_IPAddress>192.168.20.2</USRP_IPAddress>

ci-scripts/xml_files/gnb_phytest_usrp_run_60.xml

+1 −1
Original line number Diff line number Diff line
@@ -45,7 +45,7 @@ 
  <testCase id="190101">

    <class>Initialize_eNB</class>

    <desc>Initialize gNB USRP</desc>

    <Initialize_eNB_args>-O ci-scripts/conf_files/gnb.band78.162prb.usrpn300.phytest-dora.conf --phy-test -q -U 787200 -T 162 -t 23 -D 130175 -m 23 -M 162 --usrp-tx-thread-config 1 --log_config.global_log_options level,nocolor,time</Initialize_eNB_args>

    <Initialize_eNB_args>-O ci-scripts/conf_files/gnb.band78.162prb.usrpn300.phytest-dora.conf --phy-test -q -U 768 -T 162 -t 23 -D 127 -m 23 -M 162 --usrp-tx-thread-config 1 --log_config.global_log_options level,nocolor,time</Initialize_eNB_args>

    <rt_stats_cfg>datalog_rt_stats.1x1.60.yaml</rt_stats_cfg>

    <air_interface>NR</air_interface>

    <USRP_IPAddress>192.168.20.2</USRP_IPAddress>

ci-scripts/xml_files/gnb_phytest_usrp_run_60_2x2.xml

+1 −1
Original line number Diff line number Diff line
@@ -45,7 +45,7 @@ 
  <testCase id="290101">

    <class>Initialize_eNB</class>

    <desc>Initialize gNB USRP</desc>

    <Initialize_eNB_args>-O ci-scripts/conf_files/gnb.band78.162prb.usrpn300.phytest-dora.conf --phy-test --gNBs.[0].pdsch_AntennaPorts_XP 2 --RUs.[0].nb_tx 2 --RUs.[0].nb_rx 2 -q -U 787200 -T 162 -t 23 -D 130175 -m 23 -M 162 -l 2 --usrp-tx-thread-config 1 --log_config.global_log_options level,nocolor,time</Initialize_eNB_args>

    <Initialize_eNB_args>-O ci-scripts/conf_files/gnb.band78.162prb.usrpn300.phytest-dora.conf --phy-test --gNBs.[0].pdsch_AntennaPorts_XP 2 --RUs.[0].nb_tx 2 --RUs.[0].nb_rx 2 -q -U 768 -T 162 -t 23 -D 127 -m 23 -M 162 -l 2 --usrp-tx-thread-config 1 --log_config.global_log_options level,nocolor,time</Initialize_eNB_args>

    <rt_stats_cfg>datalog_rt_stats.60.2x2.yaml</rt_stats_cfg>

    <air_interface>NR</air_interface>

    <USRP_IPAddress>192.168.20.2</USRP_IPAddress>