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

Merge branch 'integration_2024_w48' into 'develop' 

Integration: `2024.w48`

See merge request oai/openairinterface5g!3134

* !2951 Integrate Tracy with NR UE
* !2985 E1AP Bearer Context Setup encoding/decoding library and unit tests
* !3115 T2: minor fix for 4x4 processing
* !3117 F1AP lib: minor fixes
* !3126 NR MSG3 scheduling improvements
* !3128 NR UE RRC T304 in phy-test mode
* !3132 Run the last job of gNB pusch channel estimation inline
* !3133 NR UL HARQ handling improvements
* !3091 Update NR UE threading model
* !3030 Imscope updates
* !3131 FAPI P7 Refactoring and unitary test creation
* !3033 Increase the number of UE supported at gNB by having more than 1 PUCCH2 frequency occasion per slot
parents 03946cd4 fb0a9b64

CMakeLists.txt

+24 −16
Original line number Diff line number Diff line
@@ -271,6 +271,11 @@ add_boolean_option(UE_AUTOTEST_TRACE False "Activate UE autotest specific logs 
add_boolean_option(UE_DEBUG_TRACE      False "Activate UE debug trace" ON)

add_boolean_option(UE_TIMING_TRACE     False "Activate UE timing trace" ON)



add_boolean_option(TRACY_ENABLE OFF "Enable tracy instrumentation" ON)

if (TRACY_ENABLE)

  CPMAddPackage("gh:wolfpld/tracy#v0.11.1")

endif()



set (OCP_ITTI ${OPENAIR_DIR}/common/utils/ocp_itti)

add_library(ITTI ${OCP_ITTI}/intertask_interface.cpp)

target_link_libraries(ITTI PRIVATE asn1_lte_rrc_hdrs asn1_nr_rrc_hdrs)
@@ -636,7 +641,8 @@ if (cap_FOUND) 
  target_link_libraries(UTIL PRIVATE cap)

  target_compile_definitions(UTIL PRIVATE HAVE_LIB_CAP)

endif()

target_link_libraries(UTIL PUBLIC ${T_LIB} pthread LOG thread-pool utils)

target_link_libraries(UTIL PUBLIC ${T_LIB} pthread LOG thread-pool utils barrier actor)

target_link_libraries(UTIL PUBLIC instrumentation)



set(SECURITY_SRC

  ${OPENAIR3_DIR}/SECU/secu_defs.c
@@ -677,7 +683,7 @@ set(SCHED_NR_SRC 
  ${OPENAIR1_DIR}/SCHED_NR/phy_frame_config_nr.c

)

add_library(SCHED_NR_LIB ${SCHED_NR_SRC})

target_link_libraries(SCHED_NR_LIB PRIVATE asn1_nr_rrc_hdrs)

target_link_libraries(SCHED_NR_LIB PRIVATE asn1_nr_rrc_hdrs UTIL)



set(SCHED_SRC_RU

  ${OPENAIR1_DIR}/SCHED/ru_procedures.c
@@ -695,7 +701,7 @@ set(SCHED_SRC_UE 
  ${OPENAIR1_DIR}/SCHED_UE/srs_pc.c

)

add_library(SCHED_UE_LIB ${SCHED_SRC_UE})

target_link_libraries(SCHED_UE_LIB PRIVATE asn1_lte_rrc_hdrs asn1_nr_rrc_hdrs)

target_link_libraries(SCHED_UE_LIB PRIVATE asn1_lte_rrc_hdrs asn1_nr_rrc_hdrs UTIL)



set(SCHED_SRC_NR_UE

  ${OPENAIR1_DIR}/SCHED_NR_UE/phy_procedures_nr_ue.c
@@ -706,7 +712,7 @@ set(SCHED_SRC_NR_UE 
  ${OPENAIR1_DIR}/SCHED_NR_UE/pucch_uci_ue_nr.c

)

add_library(SCHED_NR_UE_LIB ${SCHED_SRC_NR_UE})

target_link_libraries(SCHED_NR_UE_LIB PRIVATE asn1_lte_rrc_hdrs asn1_nr_rrc_hdrs)

target_link_libraries(SCHED_NR_UE_LIB PRIVATE asn1_lte_rrc_hdrs asn1_nr_rrc_hdrs UTIL)



# nFAPI

#################################
@@ -717,7 +723,7 @@ set(NFAPI_SRC 
)

add_library(NFAPI_LIB ${NFAPI_SRC})

target_link_libraries(NFAPI_LIB PUBLIC nfapi_common)

target_link_libraries(NFAPI_LIB PUBLIC nr_fapi_p5)

target_link_libraries(NFAPI_LIB PUBLIC nr_fapi_p5 nr_fapi_p7)



include_directories(${NFAPI_DIR}/nfapi/public_inc)

include_directories(${NFAPI_DIR}/nfapi/inc)
@@ -742,7 +748,7 @@ set(NFAPI_VNF_SRC 
)

add_library(NFAPI_VNF_LIB ${NFAPI_VNF_SRC})

target_link_libraries(NFAPI_VNF_LIB PRIVATE asn1_lte_rrc_hdrs asn1_nr_rrc_hdrs)

target_link_libraries(NFAPI_VNF_LIB PRIVATE nr_fapi_p5)

target_link_libraries(NFAPI_VNF_LIB PRIVATE nr_fapi_p5 nr_fapi_p7)

if(OAI_AERIAL)

  target_compile_definitions(NFAPI_VNF_LIB PRIVATE ENABLE_AERIAL)

endif()
@@ -758,7 +764,8 @@ set(NFAPI_USER_SRC 
  ${NFAPI_USER_DIR}/gnb_ind_vars.c

)

add_library(NFAPI_USER_LIB ${NFAPI_USER_SRC})

target_link_libraries(NFAPI_USER_LIB PRIVATE asn1_lte_rrc_hdrs asn1_nr_rrc_hdrs)

target_link_libraries(NFAPI_USER_LIB PRIVATE asn1_lte_rrc_hdrs asn1_nr_rrc_hdrs UTIL)

target_link_libraries(NFAPI_USER_LIB PRIVATE nr_fapi_p7)

include_directories(${NFAPI_USER_DIR})



# Layer 1
@@ -1118,7 +1125,7 @@ set(PHY_SRC_UE ${PHY_SRC_UE} ${OPENAIR1_DIR}/PHY/LTE_UE_TRANSPORT/dlsch_llr_comp 
add_library(PHY_COMMON ${PHY_SRC_COMMON})

target_link_libraries(PHY_COMMON PRIVATE shlib_loader)

add_dependencies(PHY_COMMON dfts)

target_link_libraries(PHY_COMMON PRIVATE asn1_lte_rrc_hdrs)

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)
@@ -1127,7 +1134,7 @@ pkg_check_modules(blas REQUIRED blas) 
pkg_check_modules(lapacke REQUIRED lapacke)



add_library(PHY_UE ${PHY_SRC_UE})

target_link_libraries(PHY_UE PRIVATE asn1_lte_rrc_hdrs asn1_nr_rrc_hdrs)

target_link_libraries(PHY_UE PRIVATE asn1_lte_rrc_hdrs asn1_nr_rrc_hdrs UTIL)

# RHEL needs also cblas, but Ubuntu does not have it. So `cblas_LIBRARIES` will

# be empty for Ubuntu, a no-op

pkg_check_modules(cblas cblas)
@@ -1135,6 +1142,7 @@ target_link_libraries(PHY_UE PRIVATE ${blas_LIBRARIES} ${cblas_LIBRARIES} ${lapa 
target_include_directories(PHY_UE PRIVATE ${blas_INCLUDE_DIRS} ${lapacke_INCLUDE_DIRS})



add_library(PHY_NR_COMMON ${PHY_NR_SRC_COMMON})

target_link_libraries(PHY_NR_COMMON PUBLIC UTIL)



add_library(PHY_NR ${PHY_NR_SRC})

target_link_libraries(PHY_NR nr_phy_common nr_common)
@@ -1144,10 +1152,10 @@ target_link_libraries(PHY_NR_NO_AVX_256 nr_phy_common nr_common) 
target_compile_definitions(PHY_NR_NO_AVX_256 PUBLIC USE_128BIT)



add_library(PHY_NR_UE ${PHY_NR_UE_SRC})

target_link_libraries(PHY_NR_UE PRIVATE asn1_nr_rrc_hdrs nr_phy_common nr_common)

target_link_libraries(PHY_NR_UE PRIVATE asn1_nr_rrc_hdrs nr_phy_common nr_common UTIL)



add_library(PHY_RU ${PHY_SRC_RU})

target_link_libraries(PHY_RU PRIVATE asn1_lte_rrc_hdrs)

target_link_libraries(PHY_RU PRIVATE asn1_lte_rrc_hdrs UTIL)



#Library for mex functions

#########################3

common/CMakeLists.txt

+6 −0
Original line number Diff line number Diff line
@@ -2,3 +2,9 @@ add_subdirectory(utils) 
add_subdirectory(config/yaml)



configure_file(oai_version.h.in oai_version.h @ONLY)



add_library(instrumentation INTERFACE instrumentation.h)

target_include_directories(instrumentation INTERFACE .)

if (TRACY_ENABLE)

  target_link_libraries(instrumentation INTERFACE Tracy::TracyClient)

endif()

common/instrumentation.h

0 → 100644
+42 −0
Original line number Diff line number Diff line 
/*

 * Licensed to the OpenAirInterface (OAI) Software Alliance under one or more

 * contributor license agreements.  See the NOTICE file distributed with

 * this work for additional information regarding copyright ownership.

 * The OpenAirInterface Software Alliance licenses this file to You under

 * the OAI Public License, Version 1.1  (the "License"); you may not use this file

 * except in compliance with the License.

 * You may obtain a copy of the License at

 *

 *      http://www.openairinterface.org/?page_id=698

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 *-------------------------------------------------------------------------------

 * For more information about the OpenAirInterface (OAI) Software Alliance:

 *      contact@openairinterface.org

 */



#ifndef INSTRUMENTATION_H

#define INSTRUMENTATION_H



#ifdef TRACY_ENABLE

#include "tracy/TracyC.h"

#endif



#ifndef TracyCZone

#define TracyCZone(...)

#endif

#ifndef TracyCZoneEnd

#define TracyCZoneEnd(...)

#endif

#ifndef TracyCFrameMark

#define TracyCFrameMark

#endif

#ifndef TracyCPlot

#define TracyCPlot(...)

#endif



#endif

common/utils/CMakeLists.txt

+2 −0
Original line number Diff line number Diff line
@@ -19,3 +19,5 @@ target_link_libraries(utils PRIVATE ${T_LIB}) 
if (ENABLE_TESTS)

  add_subdirectory(hashtable/tests)

endif()

add_subdirectory(barrier)

add_subdirectory(actor)

common/utils/actor/CMakeLists.txt

0 → 100644
+6 −0
Original line number Diff line number Diff line 
add_library(actor actor.c)

target_include_directories(actor PUBLIC ./)

target_link_libraries(actor PUBLIC thread-pool)

if (ENABLE_TESTS)

  add_subdirectory(tests)

endif()