Merge branch 'integration_2023_w48' into 'develop'

See merge request oai/openairinterface5g!2459

* !2419 chore(ci): running 5G RF simulator scenarios with address sanitizer
* !2455 Remove mac_LogicalChannelConfig from RLC (handled at MAC)
* !2456 Setting uniform periodicity for CSI-RS and measurement report
* !2429 LDPC encoding/decoding offload to the T2 card
* !2447 E2 agent: build in CI, fix slice support, add gNB-DU and gNB-CU-UP IDs
* !2452 Include sample advance option in UE tutorial
* !2430 bugfix: nr-ue: set first_tx=1 at first transmission of a harq process
* !2457 Fix scaling for FR2

.clang-format

@@ -61,6 +61,7 @@ ForEachMacros:
   - Q_FOREACH
   - BOOST_FOREACH
   - RB_FOREACH
+  - UE_iterator
 IncludeBlocks:   Preserve
 IncludeCategories:
   - Regex:           '^<ext/.*\.h>'

CMakeLists.txt

@@ -494,20 +494,21 @@ target_link_libraries(shlib_loader PRIVATE CONFIG_LIB)
 
 ##########################################################
 
-# LDPC offload library
+# LDPC offload library - AMD T2 Accelerator Card
 ##########################################################
 
-add_boolean_option(ENABLE_LDPC_T1 OFF "Build support for LDPC Offload to T1 library" OFF)
-if (ENABLE_LDPC_T1)
-  pkg_check_modules(LIBDPDK_T1 REQUIRED libdpdk=20.05.0)
-  find_library(T1 NAMES rte_pmd_hpac_sdfec_pmd REQUIRED)
-  if (NOT T1)
-    message(FATAL_ERROR "Library rte_pmd_hpac_sdfec_pmd for T1 offload not found")
+add_boolean_option(ENABLE_LDPC_T2 OFF "Build support for LDPC Offload to T2 library" OFF)
+set(ENV{PKG_CONFIG_PATH} "$ENV{PKG_CONFIG_PATH}:/usr/local/lib/x86_64-linux-gnu/pkgconfig")
+if (ENABLE_LDPC_T2)
+  pkg_check_modules(LIBDPDK_T2 REQUIRED libdpdk=20.11.7)
+  find_library(PMD_T2 NAMES rte_baseband_accl_ldpc HINTS "/opt/dpdk-t2/lib/x86_64-linux-gnu/")
+  if (NOT PMD_T2)
+    message(FATAL_ERROR "could not find PMD T2")
   endif()
-  add_library(ldpc_t1 MODULE ${OPENAIR1_DIR}/PHY/CODING/nrLDPC_decoder/nrLDPC_decoder_offload.c)
-  set_target_properties(ldpc_t1 PROPERTIES COMPILE_FLAGS "-DALLOW_EXPERIMENTAL_API")
-  target_compile_options(ldpc_t1 PRIVATE ${LIBDPDK_T1_CFLAGS})
-  target_link_libraries(ldpc_t1 ${LIBDPDK_T1_LDFLAGS} ${T1})
+  message(STATUS "T2 build: use ${PMD_T2}")
+  add_library(ldpc_t2 MODULE ${OPENAIR1_DIR}/PHY/CODING/nrLDPC_decoder/nrLDPC_decoder_offload.c)
+  set_target_properties(ldpc_t2 PROPERTIES COMPILE_FLAGS "-DALLOW_EXPERIMENTAL_API")
+  target_link_libraries(ldpc_t2 ${LIBDPDK_T2_LDFLAGS} ${PMD_T2})
 endif()
 
 ##########################################################
@@ -819,19 +820,30 @@ set(PHY_LDPC_ORIG_SRC
   ${OPENAIR1_DIR}/PHY/CODING/nrLDPC_decoder/nrLDPC_decoder.c
   ${OPENAIR1_DIR}/PHY/CODING/nrLDPC_encoder/ldpc_encoder.c
 )
+add_library(ldpc_orig MODULE ${PHY_LDPC_ORIG_SRC} )
+target_link_libraries(ldpc_orig PRIVATE ldpc_gen_HEADERS)
 
 set(PHY_LDPC_OPTIM_SRC
   ${OPENAIR1_DIR}/PHY/CODING/nrLDPC_decoder/nrLDPC_decoder.c
   ${OPENAIR1_DIR}/PHY/CODING/nrLDPC_encoder/ldpc_encoder_optim.c
-)
+  )
+add_library(ldpc_optim MODULE ${PHY_LDPC_OPTIM_SRC} )
+target_link_libraries(ldpc_optim PRIVATE ldpc_gen_HEADERS)
+
 set(PHY_LDPC_OPTIM8SEG_SRC
   ${OPENAIR1_DIR}/PHY/CODING/nrLDPC_decoder/nrLDPC_decoder.c
   ${OPENAIR1_DIR}/PHY/CODING/nrLDPC_encoder/ldpc_encoder_optim8seg.c
 )
+add_library(ldpc_optim8seg MODULE ${PHY_LDPC_OPTIM8SEG_SRC} )
+target_link_libraries(ldpc_optim8seg PRIVATE ldpc_gen_HEADERS)
+
 set(PHY_LDPC_OPTIM8SEGMULTI_SRC
   ${OPENAIR1_DIR}/PHY/CODING/nrLDPC_decoder/nrLDPC_decoder.c
   ${OPENAIR1_DIR}/PHY/CODING/nrLDPC_encoder/ldpc_encoder_optim8segmulti.c
-)
+  )
+add_library(ldpc MODULE ${PHY_LDPC_OPTIM8SEGMULTI_SRC} )
+target_link_libraries(ldpc PRIVATE ldpc_gen_HEADERS)
+
 set(PHY_LDPC_CUDA_SRC
   ${OPENAIR1_DIR}/PHY/CODING/nrLDPC_decoder_LYC/nrLDPC_decoder_LYC.cu
   ${OPENAIR1_DIR}/PHY/CODING/nrLDPC_encoder/ldpc_encoder_optim8segmulti.c
@@ -845,21 +857,13 @@ add_custom_target( nrLDPC_decoder_kernels_CL
                    COMMAND gcc ${OPENAIR1_DIR}/PHY/CODING/nrLDPC_decoder/nrLDPC_decoder_CL.c -dD -DNRLDPC_KERNEL_SOURCE -E -o ${CMAKE_CURRENT_BINARY_DIR}/nrLDPC_decoder_kernels_CL.clc
                    SOURCES ${OPENAIR1_DIR}/PHY/CODING/nrLDPC_decoder/nrLDPC_decoder_CL.c
 )
-
-set(PHY_NR_CODINGIF
-  ${OPENAIR1_DIR}/PHY/CODING/nrLDPC_load.c;
-)
-
-add_library(ldpc_orig MODULE ${PHY_LDPC_ORIG_SRC} )
-target_link_libraries(ldpc_orig PRIVATE ldpc_gen_HEADERS)
-add_library(ldpc_optim MODULE ${PHY_LDPC_OPTIM_SRC} )
-target_link_libraries(ldpc_optim PRIVATE ldpc_gen_HEADERS)
-add_library(ldpc_optim8seg MODULE ${PHY_LDPC_OPTIM8SEG_SRC} )
-target_link_libraries(ldpc_optim8seg PRIVATE ldpc_gen_HEADERS)
 add_library(ldpc_cl MODULE ${PHY_LDPC_CL_SRC} )
 target_link_libraries(ldpc_cl OpenCL)
 add_dependencies(ldpc_cl nrLDPC_decoder_kernels_CL)
 
+set(PHY_NR_CODINGIF
+  ${OPENAIR1_DIR}/PHY/CODING/nrLDPC_load.c
+)
 
 ##############################################
 # Base CUDA setting
@@ -877,13 +881,6 @@ if (ENABLE_LDPC_CUDA)
   endif()
 endif()
 
-add_library(ldpc MODULE ${PHY_LDPC_OPTIM8SEGMULTI_SRC} )
-target_link_libraries(ldpc PRIVATE ldpc_gen_HEADERS)
-
-add_library(ldpc_parityCheck MODULE ${PHY_LDPC_OPTIM8SEGMULTI_SRC} )
-target_compile_definitions(ldpc_parityCheck PUBLIC NR_LDPC_ENABLE_PARITY_CHECK)
-target_link_libraries(ldpc_parityCheck  PRIVATE ldpc_gen_HEADERS)
-
 add_library(coding MODULE ${PHY_TURBOSRC} )
 
 add_library(dfts MODULE ${OPENAIR1_DIR}/PHY/TOOLS/oai_dfts.c ${OPENAIR1_DIR}/PHY/TOOLS/oai_dfts_neon.c)
@@ -2090,8 +2087,8 @@ endif()
 
 add_dependencies(nr-softmodem ldpc_orig ldpc_optim ldpc_optim8seg ldpc)
 
-if (ENABLE_LDPC_T1)
-  add_dependencies(nr-softmodem ldpc_t1)
+if (ENABLE_LDPC_T2)
+  add_dependencies(nr-softmodem ldpc_t2)
 endif()
 
 # force the generation of ASN.1 so that we don't need to wait during the build
@@ -2212,12 +2209,12 @@ add_executable(ldpctest
    ${OPENAIR1_DIR}/PHY/CODING/TESTBENCH/ldpctest.c
    )
 
-add_dependencies( ldpctest ldpc_orig ldpc_optim ldpc_optim8seg ldpc ldpc_parityCheck)
+add_dependencies(ldpctest ldpc_orig ldpc_optim ldpc_optim8seg ldpc)
 if (ENABLE_LDPC_CUDA)
   add_dependencies(ldpctest ldpc_cuda)
 endif()
 target_link_libraries(ldpctest PRIVATE
-  -Wl,--start-group UTIL SIMU PHY_NR PHY_COMMON PHY_NR_COMMON -Wl,--end-group
+  -Wl,--start-group UTIL SIMU PHY_COMMON PHY_NR_COMMON -Wl,--end-group
   m pthread dl shlib_loader ${T_LIB}
   )
 
@@ -2307,8 +2304,8 @@ add_executable(nr_ulsim
   ${PHY_INTERFACE_DIR}/queue_t.c
   )
 
-if (ENABLE_LDPC_T1)
-  add_dependencies(nr_ulsim ldpc_t1)
+if (ENABLE_LDPC_T2)
+  add_dependencies(nr_ulsim ldpc_t2)
 endif()
 
 target_link_libraries(nr_ulsim PRIVATE
@@ -2376,7 +2373,7 @@ if (${T_TRACER})
         PHY_COMMON PHY PHY_UE PHY_NR PHY_NR_COMMON PHY_NR_UE PHY_RU PHY_MEX
         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 SIMU_ETH OPENAIR0_LIB
-        ldpc_orig ldpc_optim ldpc_optim8seg ldpc dfts config_internals)
+        ldpc_orig ldpc_optim ldpc_optim8seg ldpc_t2 ldpc_cl ldpc_cuda ldpc dfts config_internals)
     if (TARGET ${i})
       add_dependencies(${i} generate_T)
     endif()

ci-scripts/cls_containerize.py

@@ -58,7 +58,7 @@ import cls_oaicitest
 # Helper functions used here and in other classes
 # (e.g., cls_cluster.py)
 #-----------------------------------------------------------
-IMAGES = ['oai-enb', 'oai-lte-ru', 'oai-lte-ue', 'oai-gnb', 'oai-nr-cuup', 'oai-gnb-aw2s', 'oai-nr-ue']
+IMAGES = ['oai-enb', 'oai-lte-ru', 'oai-lte-ue', 'oai-gnb', 'oai-nr-cuup', 'oai-gnb-aw2s', 'oai-nr-ue', 'oai-gnb-asan', 'oai-nr-ue-asan', 'oai-nr-cuup-asan']
 
 def CreateWorkspace(sshSession, sourcePath, ranRepository, ranCommitID, ranTargetBranch, ranAllowMerge):
 	if ranCommitID == '':
@@ -364,25 +364,30 @@ class Containerize():
 			self.cliBuildOptions = '--no-cache --disable-compression'
 
 		# we always build the ran-build image with all targets
-		imageNames = [('ran-build', 'build')]
+		# Creating a tupple with the imageName, the DockerFile prefix pattern, targetName and sanitized option
+		imageNames = [('ran-build', 'build', 'ran-build', '')]
 		result = re.search('eNB', self.imageKind)
-		# Creating a tupple with the imageName and the DockerFile prefix pattern on obelix
 		if result is not None:
-			imageNames.append(('oai-enb', 'eNB'))
+			imageNames.append(('oai-enb', 'eNB', 'oai-enb', ''))
 		result = re.search('gNB', self.imageKind)
 		if result is not None:
-			imageNames.append(('oai-gnb', 'gNB'))
+			imageNames.append(('oai-gnb', 'gNB', 'oai-gnb', ''))
 		result = re.search('all', self.imageKind)
 		if result is not None:
-			imageNames.append(('oai-enb', 'eNB'))
-			imageNames.append(('oai-gnb', 'gNB'))
-			imageNames.append(('oai-nr-cuup', 'nr-cuup'))
-			imageNames.append(('oai-lte-ue', 'lteUE'))
-			imageNames.append(('oai-nr-ue', 'nrUE'))
+			imageNames.append(('oai-enb', 'eNB', 'oai-enb', ''))
+			imageNames.append(('oai-gnb', 'gNB', 'oai-gnb', ''))
+			imageNames.append(('oai-nr-cuup', 'nr-cuup', 'oai-nr-cuup', ''))
+			imageNames.append(('oai-lte-ue', 'lteUE', 'oai-lte-ue', ''))
+			imageNames.append(('oai-nr-ue', 'nrUE', 'oai-nr-ue', ''))
 			if self.host == 'Red Hat':
-				imageNames.append(('oai-physim', 'phySim'))
+				imageNames.append(('oai-physim', 'phySim', 'oai-physim', ''))
 			if self.host == 'Ubuntu':
-				imageNames.append(('oai-lte-ru', 'lteRU'))
+				imageNames.append(('oai-lte-ru', 'lteRU', 'oai-lte-ru', ''))
+				# Building again the 5G images with Address Sanitizer
+				imageNames.append(('ran-build', 'build', 'ran-build-asan', '--build-arg "BUILD_OPTION=--sanitize"'))
+				imageNames.append(('oai-gnb', 'gNB', 'oai-gnb-asan', '--build-arg "BUILD_OPTION=--sanitize"'))
+				imageNames.append(('oai-nr-ue', 'nrUE', 'oai-nr-ue-asan', '--build-arg "BUILD_OPTION=--sanitize"'))
+				imageNames.append(('oai-nr-cuup', 'nr-cuup', 'oai-nr-cuup-asan', '--build-arg "BUILD_OPTION=--sanitize"'))
 		result = re.search('build_cross_arm64', self.imageKind)
 		if result is not None:
 			self.dockerfileprefix = '.ubuntu20.cross-arm64'
@@ -421,8 +426,8 @@ class Containerize():
 		cmd.run(f"{self.cli} image prune --force")
 		if forceBaseImageBuild:
 			cmd.run(f"{self.cli} image rm {baseImage}:{baseTag}")
-		for image,pattern in imageNames:
-			cmd.run(f"{self.cli} image rm {image}:{imageTag}")
+		for image,pattern,name,option in imageNames:
+			cmd.run(f"{self.cli} image rm {name}:{imageTag}")
 
 		# Build the base image only on Push Events (not on Merge Requests)
 		# On when the base image docker file is being modified.
@@ -460,46 +465,50 @@ class Containerize():
 		# Build the target image(s)
 		status = True
 		attemptedImages = ['ran-base']
-		for image,pattern in imageNames:
-			attemptedImages += [image]
+		for image,pattern,name,option in imageNames:
+			attemptedImages += [name]
 			# the archived Dockerfiles have "ran-base:latest" as base image
 			# we need to update them with proper tag
+			cmd.run(f'git checkout -- docker/Dockerfile.{pattern}{self.dockerfileprefix}')
 			cmd.run(f'sed -i -e "s#{baseImage}:latest#{baseImage}:{baseTag}#" docker/Dockerfile.{pattern}{self.dockerfileprefix}')
-			if image != 'ran-build':
+			# target images should use the proper ran-build image
+			if image != 'ran-build' and "-asan" in name:
+				cmd.run(f'sed -i -e "s#ran-build:latest#ran-build-asan:{imageTag}#" docker/Dockerfile.{pattern}{self.dockerfileprefix}')
+			elif image != 'ran-build':
 				cmd.run(f'sed -i -e "s#ran-build:latest#ran-build:{imageTag}#" docker/Dockerfile.{pattern}{self.dockerfileprefix}')
-			ret = cmd.run(f'{self.cli} build {self.cliBuildOptions} --target {image} --tag {image}:{imageTag} --file docker/Dockerfile.{pattern}{self.dockerfileprefix} . > cmake_targets/log/{image}.log 2>&1', timeout=1200)
+			ret = cmd.run(f'{self.cli} build {self.cliBuildOptions} --target {image} --tag {name}:{imageTag} --file docker/Dockerfile.{pattern}{self.dockerfileprefix} {option} . > cmake_targets/log/{name}.log 2>&1', timeout=1200)
 			if image == 'ran-build' and ret.returncode == 0:
-				cmd.run(f"docker run --name test-log -d {image}:{imageTag} /bin/true")
-				cmd.run(f"docker cp test-log:/oai-ran/cmake_targets/log/ cmake_targets/log/{image}/")
+				cmd.run(f"docker run --name test-log -d {name}:{imageTag} /bin/true")
+				cmd.run(f"docker cp test-log:/oai-ran/cmake_targets/log/ cmake_targets/log/{name}/")
 				cmd.run(f"docker rm -f test-log")
 			else:
-				cmd.run(f"mkdir -p cmake_targets/log/{image}")
+				cmd.run(f"mkdir -p cmake_targets/log/{name}")
 			# check the status of the build
-			ret = cmd.run(f"{self.cli} image inspect --format=\'Size = {{{{.Size}}}} bytes\' {image}:{imageTag}")
+			ret = cmd.run(f"{self.cli} image inspect --format=\'Size = {{{{.Size}}}} bytes\' {name}:{imageTag}")
 			if ret.returncode != 0:
-				logging.error('\u001B[1m Could not build properly ' + image + '\u001B[0m')
+				logging.error('\u001B[1m Could not build properly ' + name + '\u001B[0m')
 				status = False
 				# Here we should check if the last container corresponds to a failed command and destroy it
 				cmd.run(f"{self.cli} ps --quiet --filter \"status=exited\" -n1 | xargs --no-run-if-empty {self.cli} rm -f")
-				allImagesSize[image] = 'N/A -- Build Failed'
+				allImagesSize[name] = 'N/A -- Build Failed'
 				break
 			else:
 				result = re.search('Size *= *(?P<size>[0-9\-]+) *bytes', cmd.getBefore())
 				if result is not None:
 					size = float(result.group("size")) / 1000000 # convert to MB
 					imageSizeStr = f'{size:.1f}'
-					logging.debug(f'\u001B[1m   {image} size is {imageSizeStr} Mbytes\u001B[0m')
-					allImagesSize[image] = f'{imageSizeStr} Mbytes'
+					logging.debug(f'\u001B[1m   {name} size is {imageSizeStr} Mbytes\u001B[0m')
+					allImagesSize[name] = f'{imageSizeStr} Mbytes'
 				else:
-					logging.debug(f'{image} size is unknown')
-					allImagesSize[image] = 'unknown'
+					logging.debug(f'{name} size is unknown')
+					allImagesSize[name] = 'unknown'
 			# Now pruning dangling images in between target builds
 			cmd.run(f"{self.cli} image prune --force")
 
 		# Remove all intermediate build images and clean up
 		if self.ranAllowMerge and forceBaseImageBuild:
 			cmd.run(f"{self.cli} image rm {baseImage}:{baseTag}")
-		cmd.run(f"{self.cli} image rm ran-build:{imageTag}")
+		cmd.run(f"{self.cli} image rm ran-build:{imageTag} ran-build-asan:{imageTag}")
 		cmd.run(f"{self.cli} volume prune --force")
 
 		# create a zip with all logs
@@ -698,10 +707,11 @@ class Containerize():
 		orgTag = 'develop'
 		if self.ranAllowMerge:
 			orgTag = 'ci-temp'
-		imageNames = ['oai-enb', 'oai-gnb', 'oai-lte-ue', 'oai-nr-ue', 'oai-lte-ru', 'oai-nr-cuup']
-		for image in imageNames:
+		for image in IMAGES:
 			tagToUse = ImageTagToUse(image, self.ranCommitID, self.ranBranch, self.ranAllowMerge)
 			mySSH.command(f'docker image tag {image}:{orgTag} {imagePrefix}/{tagToUse}', '\$', 5)
+			if re.search('Error response from daemon: No such image:', mySSH.getBefore()) is not None:
+				continue
 			mySSH.command(f'docker push {imagePrefix}/{tagToUse}', '\$', 120)
 			if re.search(': digest:', mySSH.getBefore()) is None:
 				logging.debug(mySSH.getBefore())
@@ -1061,6 +1071,16 @@ class Containerize():
 		imageNames = ['oai-enb', 'oai-gnb', 'oai-lte-ue', 'oai-nr-ue', 'oai-lte-ru', 'oai-nr-cuup']
 		for image in imageNames:
 			tagToUse = ImageTagToUse(image, self.ranCommitID, self.ranBranch, self.ranAllowMerge)
+			# In the scenario, for 5G images, we have the choice of either pulling normal images
+			# or -asan images. We need to detect which kind we did pull.
+			if image == 'oai-gnb' or image == 'oai-nr-ue' or image == 'oai-nr-cuup':
+				ret = myCmd.run(f'docker image inspect oai-ci/{tagToUse}', reportNonZero=False, silent=self.displayedNewTags)
+				if ret.returncode != 0:
+					tagToUse = tagToUse.replace('oai-gnb', 'oai-gnb-asan')
+					tagToUse = tagToUse.replace('oai-nr-ue', 'oai-nr-ue-asan')
+					tagToUse = tagToUse.replace('oai-nr-cuup', 'oai-nr-cuup-asan')
+					if not self.displayedNewTags:
+						logging.debug(f'\u001B[1m Using sanitized version of {image} with {tagToUse}\u001B[0m')
 			cmd = f'sed -i -e "s@oaisoftwarealliance/{image}:develop@oai-ci/{tagToUse}@" docker-compose-ci.yml'
 			myCmd.run(cmd, silent=self.displayedNewTags)
 		self.displayedNewTags = True
@@ -1199,12 +1219,7 @@ class Containerize():
 		logPath = '../cmake_targets/log/' + ymlPath[1]
 		myCmd = cls_cmd.LocalCmd(d = self.yamlPath[0])
 		cmd = 'cp docker-compose.y*ml docker-compose-ci.yml'
-		myCmd.run(cmd, silent=self.displayedNewTags)
-		for image in IMAGES:
-			tagToUse = ImageTagToUse(image, self.ranCommitID, self.ranBranch, self.ranAllowMerge)
-			cmd = f'sed -i -e "s@oaisoftwarealliance/{image}:develop@oai-ci/{tagToUse}@" docker-compose-ci.yml'
-			myCmd.run(cmd, silent=self.displayedNewTags)
-		self.displayedNewTags = True
+		myCmd.run(cmd)
 
 		# check which containers are running for log recovery later
 		cmd = 'docker-compose -f docker-compose-ci.yml ps --all'

ci-scripts/conf_files/gnb-cuup.sa.f1.conf

@@ -8,6 +8,7 @@ gNBs =
  {
     ////////// Identification parameters:
     gNB_ID = 0xe00;
+    gNB_CU_UP_ID = 0xe00;
 
 #     cell_type =  "CELL_MACRO_GNB";
 

ci-scripts/conf_files/gnb-cuup.sa.f1.quectel.conf

@@ -8,6 +8,7 @@ gNBs =
  {
     ////////// Identification parameters:
     gNB_ID = 0xe00;
+    gNB_CU_UP_ID = 0xe00;
 
 #     cell_type =  "CELL_MACRO_GNB";
 

ci-scripts/conf_files/gnb-du.band78.106prb.rfsim.conf

@@ -7,6 +7,7 @@ gNBs =
  {
     ////////// Identification parameters:
     gNB_ID = 0xe00;
+    gNB_DU_ID = 0xe00;
 
 #     cell_type =  "CELL_MACRO_GNB";
 

ci-scripts/conf_files/gnb-du.sa.band78.106prb.rfsim.conf

@@ -7,6 +7,7 @@ gNBs =
  {
     ////////// Identification parameters:
     gNB_ID = 0xe00;
+    gNB_DU_ID = 0xe00;
 
 #     cell_type =  "CELL_MACRO_GNB";
 

ci-scripts/conf_files/gnb-du.sa.band78.106prb.usrpb200.conf

@@ -7,6 +7,7 @@ gNBs =
  {
     ////////// Identification parameters:
     gNB_ID = 0xe00;
+    gNB_DU_ID = 0xe00;
 
 #     cell_type =  "CELL_MACRO_GNB";
 

ci-scripts/xml_files/container_5g_e1_rfsim.xml

@@ -43,7 +43,7 @@
                 <class>Pull_Local_Registry</class>
                 <desc>Pull Images from Local Registry</desc>
                 <test_svr_id>0</test_svr_id>
-                <images_to_pull>oai-gnb oai-nr-cuup oai-nr-ue</images_to_pull>
+                <images_to_pull>oai-gnb-asan oai-nr-cuup-asan oai-nr-ue-asan</images_to_pull>
         </testCase>
 
         <testCase id="000020">

ci-scripts/xml_files/container_5g_f1_rfsim.xml

@@ -42,7 +42,7 @@
                 <class>Pull_Local_Registry</class>
                 <desc>Pull Images from Local Registry</desc>
                 <test_svr_id>0</test_svr_id>
-                <images_to_pull>oai-gnb oai-nr-ue</images_to_pull>
+                <images_to_pull>oai-gnb-asan oai-nr-ue-asan</images_to_pull>
         </testCase>
 
         <testCase id="000020">

ci-scripts/xml_files/container_5g_fdd_rfsim.xml

@@ -44,7 +44,7 @@
                 <class>Pull_Local_Registry</class>
                 <desc>Pull Images from Local Registry</desc>
                 <test_svr_id>0</test_svr_id>
-                <images_to_pull>oai-gnb oai-nr-ue</images_to_pull>
+                <images_to_pull>oai-gnb-asan oai-nr-ue-asan</images_to_pull>
         </testCase>
 
         <testCase id="000010">

ci-scripts/xml_files/container_5g_l2sim_tdd.xml

@@ -45,7 +45,7 @@
                 <class>Pull_Local_Registry</class>
                 <desc>Pull Images from Local Registry</desc>
                 <test_svr_id>0</test_svr_id>
-                <images_to_pull>oai-gnb oai-nr-ue</images_to_pull>
+                <images_to_pull>oai-gnb-asan oai-nr-ue-asan</images_to_pull>
         </testCase>
 
         <testCase id="000000">

ci-scripts/xml_files/container_5g_rfsim.xml

@@ -58,7 +58,7 @@
                 <class>Pull_Local_Registry</class>
                 <desc>Pull Images from Local Registry</desc>
                 <test_svr_id>0</test_svr_id>
-                <images_to_pull>oai-gnb oai-nr-ue</images_to_pull>
+                <images_to_pull>oai-gnb-asan oai-nr-ue-asan</images_to_pull>
         </testCase>
 
         <testCase id="000000">

ci-scripts/xml_files/container_5g_rfsim_24prb.xml

@@ -44,7 +44,7 @@
                 <class>Pull_Local_Registry</class>
                 <desc>Pull Images from Local Registry</desc>
                 <test_svr_id>0</test_svr_id>
-                <images_to_pull>oai-gnb oai-nr-ue</images_to_pull>
+                <images_to_pull>oai-gnb-asan oai-nr-ue-asan</images_to_pull>
         </testCase>
 
         <testCase id="000000">

ci-scripts/xml_files/container_5g_rfsim_2x2.xml

@@ -44,7 +44,7 @@
                 <class>Pull_Local_Registry</class>
                 <desc>Pull Images from Local Registry</desc>
                 <test_svr_id>0</test_svr_id>
-                <images_to_pull>oai-gnb oai-nr-ue</images_to_pull>
+                <images_to_pull>oai-gnb-asan oai-nr-ue-asan</images_to_pull>
         </testCase>
 
         <testCase id="000000">

ci-scripts/xml_files/container_5g_rfsim_fdd_phytest.xml

@@ -43,7 +43,7 @@
                 <class>Pull_Local_Registry</class>
                 <desc>Pull Images from Local Registry</desc>
                 <test_svr_id>0</test_svr_id>
-                <images_to_pull>oai-gnb oai-nr-ue</images_to_pull>
+                <images_to_pull>oai-gnb-asan oai-nr-ue-asan</images_to_pull>
         </testCase>
 
         <testCase id="004000">

ci-scripts/xml_files/container_5g_rfsim_fr2_32prb.xml

@@ -41,7 +41,7 @@
                 <class>Pull_Local_Registry</class>
                 <desc>Pull Images from Local Registry</desc>
                 <test_svr_id>0</test_svr_id>
-                <images_to_pull>oai-gnb oai-nr-ue</images_to_pull>
+                <images_to_pull>oai-gnb-asan oai-nr-ue-asan</images_to_pull>
         </testCase>
 
 	<testCase id="004000">

ci-scripts/xml_files/container_5g_rfsim_tdd_dora.xml

@@ -41,7 +41,7 @@
                 <class>Pull_Local_Registry</class>
                 <desc>Pull Images from Local Registry</desc>
                 <test_svr_id>0</test_svr_id>
-                <images_to_pull>oai-gnb oai-nr-ue</images_to_pull>
+                <images_to_pull>oai-gnb-asan oai-nr-ue-asan</images_to_pull>
         </testCase>
 
         <testCase id="004000">

ci-scripts/xml_files/container_5g_rfsim_u0_25prb.xml

@@ -44,7 +44,7 @@
                 <class>Pull_Local_Registry</class>
                 <desc>Pull Images from Local Registry</desc>
                 <test_svr_id>0</test_svr_id>
-                <images_to_pull>oai-gnb oai-nr-ue</images_to_pull>
+                <images_to_pull>oai-gnb-asan oai-nr-ue-asan</images_to_pull>
         </testCase>
 
         <testCase id="000000">

ci-scripts/xml_files/gnb_usrp_build.xml

@@ -35,7 +35,7 @@
 		<mode>TesteNB</mode>	
 		<class>Build_eNB</class>
 		<desc>Build gNB (USRP)</desc>
-		<Build_eNB_args>--gNB -w USRP --ninja -c -P --build-lib "ldpc_cuda ldpc_t1" --cmake-opt -DASN1C_EXEC=/opt/asn1c/bin/asn1c</Build_eNB_args>
+		<Build_eNB_args>--gNB -w USRP --ninja -c -P --build-lib "ldpc_cuda" --cmake-opt -DASN1C_EXEC=/opt/asn1c/bin/asn1c</Build_eNB_args>
 		<forced_workspace_cleanup>True</forced_workspace_cleanup>
 	</testCase>
 

ci-scripts/xml_files/t1_offload_test.xml

-<!--
- 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
--->
-
-<testCaseList>
-	<htmlTabRef>test-t1-offload</htmlTabRef>
-	<htmlTabName>Test T1 Offload</htmlTabName>
-	<htmlTabIcon>tasks</htmlTabIcon>
-	<repeatCount>1</repeatCount>
-	<TestCaseRequestedList>000111 000112 000121 000122 000131 000132 000211 000212 000221 000222 000231 000232</TestCaseRequestedList>
-	<TestCaseExclusionList></TestCaseExclusionList>
-
-	<testCase id="000111">
-		<class>Run_LDPCt1Test</class>
-		<desc>Run nr_ulsim with CPU</desc>
-		<physim_run_args>-n100 -s30 -m5 -r106 -R106 -C10 -P</physim_run_args>
-	</testCase>
-
-	<testCase id="000112">
-		<class>Run_LDPCt1Test</class>
-		<desc>Run nr_ulsim with T1 LDPC offload</desc>
-		<physim_run_args>-n100 -s30 -m5 -r106 -R106 -o -P</physim_run_args>
-	</testCase>
-
-	<testCase id="000121">
-		<class>Run_LDPCt1Test</class>
-		<desc>Run nr_ulsim with CPU</desc>
-		<physim_run_args>-n100 -s30 -m15 -r106 -R106 -C10 -P</physim_run_args>
-	</testCase>
-
-	<testCase id="000122">
-		<class>Run_LDPCt1Test</class>
-		<desc>Run nr_ulsim with T1 LDPC offload</desc>
-		<physim_run_args>-n100 -s30 -m15 -r106 -R106 -o -P</physim_run_args>
-	</testCase>
-
-	<testCase id="000131">
-                <class>Run_LDPCt1Test</class>
-                <desc>Run nr_ulsim with CPU</desc>
-                <physim_run_args>-n100 -s30 -m25 -r106 -R106 -C10 -P</physim_run_args>
-        </testCase>
-
-        <testCase id="000132">
-                <class>Run_LDPCt1Test</class>
-                <desc>Run nr_ulsim with T1 LDPC offload</desc>
-                <physim_run_args>-n100 -s30 -m25 -r106 -R106 -o -P</physim_run_args>
-        </testCase>
-
-        <testCase id="000211">
-                <class>Run_LDPCt1Test</class>
-                <desc>Run nr_ulsim with CPU</desc>
-                <physim_run_args>-n100 -s30 -m5 -r273 -R273 -C10 -P</physim_run_args>
-        </testCase>
-
-        <testCase id="000212">
-                <class>Run_LDPCt1Test</class>
-                <desc>Run nr_ulsim with T1 LDPC offload</desc>
-                <physim_run_args>-n100 -s30 -m5 -r273 -R273 -o -P</physim_run_args>
-	</testCase>
-
-	<testCase id="000221">
-                <class>Run_LDPCt1Test</class>
-                <desc>Run nr_ulsim with CPU</desc>
-                <physim_run_args>-n100 -s30 -m15 -r273 -R273 -C10 -P</physim_run_args>
-        </testCase>
-
-        <testCase id="000222">
-                <class>Run_LDPCt1Test</class>
-                <desc>Run nr_ulsim with T1 LDPC offload</desc>
-                <physim_run_args>-n100 -s30 -m15 -r273 -R273 -o -P</physim_run_args>
-        </testCase>
-
-        <testCase id="000231">
-                <class>Run_LDPCt1Test</class>
-                <desc>Run nr_ulsim with CPU</desc>
-                <physim_run_args>-n100 -s30 -m25 -r273 -R273 -C10 -P</physim_run_args>
-        </testCase>
-
-        <testCase id="000232">
-                <class>Run_LDPCt1Test</class>
-                <desc>Run nr_ulsim with T1 LDPC offload</desc>
-                <physim_run_args>-n100 -s30 -m25 -r273 -R273 -o -P</physim_run_args>
-        </testCase>
-
-</testCaseList>

ci-scripts/yaml_files/5g_f1_rfsimulator/docker-compose.yaml

@@ -168,6 +168,7 @@ services:
         container_name: rfsim5g-oai-cu
         environment: 
             USE_ADDITIONAL_OPTIONS: --sa --rfsim --log_config.global_log_options level,nocolor,time
+            ASAN_OPTIONS: detect_leaks=0
         depends_on:
             - oai-ext-dn
         networks:
@@ -186,6 +187,7 @@ services:
         container_name: rfsim5g-oai-du
         environment: 
             USE_ADDITIONAL_OPTIONS: --sa --rfsim --log_config.global_log_options level,nocolor,time
+            ASAN_OPTIONS: detect_leaks=0
         depends_on:
             - oai-cu
         networks:
@@ -203,7 +205,8 @@ services:
         privileged: true
         container_name: rfsim5g-oai-du2
         environment:
-            USE_ADDITIONAL_OPTIONS: --sa --rfsim --gNBs.[0].gNB_ID 0xe01 --gNBs.[0].nr_cellid 87654321 --gNBs.[0].servingCellConfigCommon.[0].physCellId 1 --MACRLCs.[0].local_n_address 192.168.71.143 --log_config.global_log_options level,nocolor,time
+            USE_ADDITIONAL_OPTIONS: --sa --rfsim --gNBs.[0].gNB_DU_ID 0xe01 --gNBs.[0].nr_cellid 87654321 --gNBs.[0].servingCellConfigCommon.[0].physCellId 1 --MACRLCs.[0].local_n_address 192.168.71.143 --log_config.global_log_options level,nocolor,time
+            ASAN_OPTIONS: detect_leaks=0
         depends_on:
             - oai-cu
         networks:
@@ -221,7 +224,8 @@ services:
         privileged: true
         container_name: rfsim5g-oai-du3
         environment:
-            USE_ADDITIONAL_OPTIONS: --sa --rfsim --gNBs.[0].gNB_ID 0xe02 --gNBs.[0].nr_cellid 11111111 --gNBs.[0].servingCellConfigCommon.[0].physCellId 2 --MACRLCs.[0].local_n_address 192.168.71.144 --log_config.global_log_options level,nocolor,time
+            USE_ADDITIONAL_OPTIONS: --sa --rfsim --gNBs.[0].gNB_DU_ID 0xe02 --gNBs.[0].nr_cellid 11111111 --gNBs.[0].servingCellConfigCommon.[0].physCellId 2 --MACRLCs.[0].local_n_address 192.168.71.144 --log_config.global_log_options level,nocolor,time
+            ASAN_OPTIONS: detect_leaks=0
         depends_on:
             - oai-cu
         networks:
@@ -240,6 +244,7 @@ services:
         container_name: rfsim5g-oai-nr-ue
         environment: 
             USE_ADDITIONAL_OPTIONS: --sa --rfsim -r 106 --numerology 1 --uicc0.imsi 208990100001100 -C 3619200000 --rfsimulator.serveraddr 192.168.71.142 --log_config.global_log_options level,nocolor,time
+            ASAN_OPTIONS: detect_leaks=0
         depends_on:
             - oai-du
         networks:
@@ -258,6 +263,7 @@ services:
         container_name: rfsim5g-oai-nr-ue2
         environment:
             USE_ADDITIONAL_OPTIONS: --sa --rfsim -r 106 --numerology 1 --uicc0.imsi 208990100001101 -C 3619200000 --rfsimulator.serveraddr 192.168.71.143 --log_config.global_log_options level,nocolor,time
+            ASAN_OPTIONS: detect_leaks=0
         depends_on:
             - oai-du2
         networks:
@@ -276,6 +282,7 @@ services:
         container_name: rfsim5g-oai-nr-ue3
         environment:
             USE_ADDITIONAL_OPTIONS: --sa --rfsim -r 106 --numerology 1 --uicc0.imsi 208990100001102 -C 3619200000 --rfsimulator.serveraddr 192.168.71.144 --log_config.global_log_options level,nocolor,time
+            ASAN_OPTIONS: detect_leaks=0
         depends_on:
             - oai-du3
         networks:

ci-scripts/yaml_files/5g_fdd_rfsimulator/docker-compose.yaml

@@ -168,6 +168,7 @@ services:
         container_name: rfsim5g-oai-gnb
         environment: 
             USE_ADDITIONAL_OPTIONS: --sa -E --rfsim --log_config.global_log_options level,nocolor,time
+            ASAN_OPTIONS: detect_leaks=0
         depends_on:
             - oai-ext-dn
         networks:
@@ -186,6 +187,7 @@ services:
         container_name: rfsim5g-oai-nr-ue
         environment: 
             USE_ADDITIONAL_OPTIONS: -E --sa --rfsim -r 106 --numerology 1 --uicc0.imsi 208990100001100 --band 66 -C 2169090000 --CO -400000000 --ssb 378 --rfsimulator.serveraddr 192.168.71.140 --log_config.global_log_options level,nocolor,time
+            ASAN_OPTIONS: detect_leaks=0
         depends_on:
             - oai-gnb
         networks:

ci-scripts/yaml_files/5g_l2sim_tdd/docker-compose.yaml

@@ -170,6 +170,7 @@ services:
         environment:
             TZ: Europe/Paris
             USE_ADDITIONAL_OPTIONS: --sa --nfapi VNF --emulate-l1 --log_config.global_log_options level,time,thread_id,nocolor
+            ASAN_OPTIONS: detect_leaks=0
         depends_on:
             - oai-spgwu
             - oai-amf
@@ -206,6 +207,7 @@ services:
             TZ: Europe/Paris
             OPENAIR_DIR: /opt/oai-nr-ue
             USE_ADDITIONAL_OPTIONS: --nfapi STANDALONE_PNF --node-number 2 --sa --emulate-l1 --log_config.global_log_options level,time,thread_id,nocolor
+            ASAN_OPTIONS: detect_leaks=0
         volumes:
             - ../../conf_files/nrue.band78.106prb.l2sim.conf:/opt/oai-nr-ue/etc/nr-ue.conf
             - ../../../openair1/SIMULATION/LTE_PHY/BLER_SIMULATIONS/AWGN/AWGN_results:/opt/oai-nr-ue/openair1/SIMULATION/LTE_PHY/BLER_SIMULATIONS/AWGN/AWGN_results

ci-scripts/yaml_files/5g_rfsimulator/docker-compose.yaml

@@ -168,6 +168,7 @@ services:
         container_name: rfsim5g-oai-gnb
         environment:
             USE_ADDITIONAL_OPTIONS: --sa -E --rfsim --log_config.global_log_options level,nocolor,time
+            ASAN_OPTIONS: detect_leaks=0
         depends_on:
             - oai-ext-dn
         networks:
@@ -186,6 +187,7 @@ services:
         container_name: rfsim5g-oai-nr-ue
         environment:
             USE_ADDITIONAL_OPTIONS: -E --sa --rfsim -r 106 --numerology 1 --uicc0.imsi 208990100001100 -C 3619200000 --rfsimulator.serveraddr 192.168.71.140 --log_config.global_log_options level,nocolor,time
+            ASAN_OPTIONS: detect_leaks=0
         depends_on:
             - oai-gnb
         networks:
@@ -204,6 +206,7 @@ services:
         container_name: rfsim5g-oai-nr-ue2
         environment:
             USE_ADDITIONAL_OPTIONS: -E --sa --rfsim -r 106 --numerology 1 --uicc0.imsi 208990100001101 -C 3619200000 --rfsimulator.serveraddr 192.168.71.140 --log_config.global_log_options level,nocolor,time
+            ASAN_OPTIONS: detect_leaks=0
         depends_on:
             - oai-gnb
         networks:
@@ -222,6 +225,7 @@ services:
         container_name: rfsim5g-oai-nr-ue3
         environment:
             USE_ADDITIONAL_OPTIONS: -E --sa --rfsim -r 106 --numerology 1 --uicc0.imsi 208990100001102 -C 3619200000 --rfsimulator.serveraddr 192.168.71.140 --log_config.global_log_options level,nocolor,time
+            ASAN_OPTIONS: detect_leaks=0
         depends_on:
             - oai-gnb
         networks:
@@ -240,6 +244,7 @@ services:
         container_name: rfsim5g-oai-nr-ue4
         environment:
             USE_ADDITIONAL_OPTIONS: -E --sa --rfsim -r 106 --numerology 1 --uicc0.imsi 208990100001103 -C 3619200000 --rfsimulator.serveraddr 192.168.71.140 --log_config.global_log_options level,nocolor,time
+            ASAN_OPTIONS: detect_leaks=0
         depends_on:
             - oai-gnb
         networks:
@@ -258,6 +263,7 @@ services:
         container_name: rfsim5g-oai-nr-ue5
         environment:
             USE_ADDITIONAL_OPTIONS: -E --sa --rfsim -r 106 --numerology 1 --uicc0.imsi 208990100001104 -C 3619200000 --rfsimulator.serveraddr 192.168.71.140 --log_config.global_log_options level,nocolor,time
+            ASAN_OPTIONS: detect_leaks=0
         depends_on:
             - oai-gnb
         networks:
@@ -276,6 +282,7 @@ services:
         container_name: rfsim5g-oai-nr-ue6
         environment:
             USE_ADDITIONAL_OPTIONS: -E --sa --rfsim -r 106 --numerology 1 --uicc0.imsi 208990100001105 -C 3619200000 --rfsimulator.serveraddr 192.168.71.140 --log_config.global_log_options level,nocolor,time
+            ASAN_OPTIONS: detect_leaks=0
         depends_on:
             - oai-gnb
         networks:
@@ -294,6 +301,7 @@ services:
         container_name: rfsim5g-oai-nr-ue7
         environment:
             USE_ADDITIONAL_OPTIONS: -E --sa --rfsim -r 106 --numerology 1 --uicc0.imsi 208990100001106 -C 3619200000 --rfsimulator.serveraddr 192.168.71.140 --log_config.global_log_options level,nocolor,time
+            ASAN_OPTIONS: detect_leaks=0
         depends_on:
             - oai-gnb
         networks:
@@ -312,6 +320,7 @@ services:
         container_name: rfsim5g-oai-nr-ue8
         environment:
             USE_ADDITIONAL_OPTIONS: -E --sa --rfsim -r 106 --numerology 1 --uicc0.imsi 208990100001107 -C 3619200000 --rfsimulator.serveraddr 192.168.71.140 --log_config.global_log_options level,nocolor,time
+            ASAN_OPTIONS: detect_leaks=0
         depends_on:
             - oai-gnb
         networks:
@@ -330,6 +339,7 @@ services:
         container_name: rfsim5g-oai-nr-ue9
         environment:
             USE_ADDITIONAL_OPTIONS: -E --sa --rfsim -r 106 --numerology 1 --uicc0.imsi 208990100001108 -C 3619200000 --rfsimulator.serveraddr 192.168.71.140 --log_config.global_log_options level,nocolor,time
+            ASAN_OPTIONS: detect_leaks=0
         depends_on:
             - oai-gnb
         networks:
@@ -348,6 +358,7 @@ services:
         container_name: rfsim5g-oai-nr-ue10
         environment:
             USE_ADDITIONAL_OPTIONS: -E --sa --rfsim -r 106 --numerology 1 --uicc0.imsi 208990100001109 -C 3619200000 --rfsimulator.serveraddr 192.168.71.140 --log_config.global_log_options level,nocolor,time
+            ASAN_OPTIONS: detect_leaks=0
         depends_on:
             - oai-gnb
         networks:

ci-scripts/yaml_files/5g_rfsimulator_24prb/docker-compose.yaml

@@ -168,6 +168,7 @@ services:
         container_name: rfsim5g-oai-gnb
         environment:
             USE_ADDITIONAL_OPTIONS: --sa --rfsim --log_config.global_log_options level,nocolor,time
+            ASAN_OPTIONS: detect_leaks=0
         depends_on:
             - oai-ext-dn
         networks:
@@ -186,6 +187,7 @@ services:
         container_name: rfsim5g-oai-nr-ue
         environment:
             USE_ADDITIONAL_OPTIONS: --sa --rfsim -r 24 --ssb 24 --numerology 1 -C 3604800000 --uicc0.imsi 208990100001100 --rfsimulator.serveraddr 192.168.71.140 --log_config.global_log_options level,nocolor,time
+            ASAN_OPTIONS: detect_leaks=0
         depends_on:
             - oai-gnb
         networks:

ci-scripts/yaml_files/5g_rfsimulator_2x2/docker-compose.yaml

@@ -168,6 +168,7 @@ services:
         container_name: rfsim5g-oai-gnb
         environment:
             USE_ADDITIONAL_OPTIONS: --sa --rfsim --log_config.global_log_options level,nocolor,time
+            ASAN_OPTIONS: detect_leaks=0
         depends_on:
             - oai-ext-dn
         networks:
@@ -187,6 +188,7 @@ services:
         container_name: rfsim5g-oai-nr-ue
         environment:
             USE_ADDITIONAL_OPTIONS: --sa --rfsim -r 106 --numerology 1 --band 78 -C 3319680000 --ue-nb-ant-tx 2 --uicc0.imsi 208990100001100 --ue-nb-ant-rx 2 --uecap_file /opt/oai-nr-ue/etc/uecap.xml --rfsimulator.serveraddr 192.168.71.140 --log_config.global_log_options level,nocolor,time
+            ASAN_OPTIONS: detect_leaks=0
         depends_on:
             - oai-gnb
         networks:

ci-scripts/yaml_files/5g_rfsimulator_e1/docker-compose.yaml

@@ -170,6 +170,7 @@ services:
         container_name: rfsim5g-oai-cucp
         environment:
             USE_ADDITIONAL_OPTIONS: --sa --rfsim --log_config.global_log_options level,nocolor,time
+            ASAN_OPTIONS: detect_leaks=0
         depends_on:
             - oai-ext-dn
         networks:
@@ -190,8 +191,8 @@ services:
         privileged: true
         container_name: rfsim5g-oai-cuup
         environment:
-            USE_ADDITIONAL_OPTIONS: --sa --rfsim
-            #--log_config.global_log_options level,nocolor,time
+            USE_ADDITIONAL_OPTIONS: --sa --rfsim --log_config.global_log_options level,nocolor,time
+            ASAN_OPTIONS: detect_leaks=0
         depends_on:
             - oai-cucp
         networks:
@@ -213,6 +214,7 @@ services:
         container_name: rfsim5g-oai-du
         environment:
             USE_ADDITIONAL_OPTIONS: --sa --rfsim --log_config.global_log_options level,nocolor,time
+            ASAN_OPTIONS: detect_leaks=0
         networks:
             ran_net:
                 ipv4_address: 192.168.72.142
@@ -230,6 +232,7 @@ services:
         container_name: rfsim5g-oai-nr-ue
         environment:
             USE_ADDITIONAL_OPTIONS: --sa --rfsim -r 106 --numerology 1 -C 3619200000 --rfsimulator.serveraddr 192.168.72.142 --log_config.global_log_options level,nocolor,time
+            ASAN_OPTIONS: detect_leaks=0
         depends_on:
             - oai-du
         networks:

ci-scripts/yaml_files/5g_rfsimulator_fdd_phytest/docker-compose.yaml

@@ -6,6 +6,7 @@ services:
         container_name: rfsim5g-oai-gnb
         environment:
             USE_ADDITIONAL_OPTIONS: --phy-test --rfsim --rfsimulator.wait_timeout 20 --noS1 --log_config.global_log_options level,nocolor,time
+            ASAN_OPTIONS: detect_leaks=0
         networks:
             public_net:
                 ipv4_address: 192.168.71.140
@@ -24,6 +25,7 @@ services:
         container_name: rfsim5g-oai-nr-ue
         environment:
             USE_ADDITIONAL_OPTIONS: --phy-test --rfsim --noS1 --reconfig-file etc/rrc/reconfig.raw --rbconfig-file etc/rrc/rbconfig.raw --rfsimulator.serveraddr 192.168.71.140 --log_config.global_log_options level,nocolor,time
+            ASAN_OPTIONS: detect_leaks=0
         volumes:
             - ../../conf_files/nrue.uicc.conf:/opt/oai-nr-ue/etc/nr-ue.conf
             - rrc.config:/opt/oai-nr-ue/etc/rrc/

ci-scripts/yaml_files/5g_rfsimulator_fr2_32prb/docker-compose.yaml

@@ -6,6 +6,7 @@ services:
         container_name: rfsim5g-oai-gnb
         environment:
             USE_ADDITIONAL_OPTIONS: --do-ra --rfsim --rfsimulator.wait_timeout 20 --noS1 --log_config.global_log_options level,nocolor,time
+            ASAN_OPTIONS: detect_leaks=0
         networks:
             public_net:
                 ipv4_address: 192.168.71.140
@@ -24,6 +25,7 @@ services:
         container_name: rfsim5g-oai-nr-ue
         environment:
             USE_ADDITIONAL_OPTIONS: --do-ra --rfsim --noS1 --reconfig-file etc/rrc/reconfig.raw --rbconfig-file etc/rrc/rbconfig.raw --rfsimulator.serveraddr 192.168.71.140 --log_config.global_log_options level,nocolor,time
+            ASAN_OPTIONS: detect_leaks=0
         volumes:
             - ../../conf_files/nrue.uicc.conf:/opt/oai-nr-ue/etc/nr-ue.conf
             - rrc.config:/opt/oai-nr-ue/etc/rrc/

ci-scripts/yaml_files/5g_rfsimulator_tdd_dora/docker-compose.yaml

@@ -6,6 +6,7 @@ services:
         container_name: rfsim5g-oai-gnb
         environment:
             USE_ADDITIONAL_OPTIONS: --do-ra --rfsim --rfsimulator.wait_timeout 20 --noS1 --log_config.global_log_options level,nocolor,time
+            ASAN_OPTIONS: detect_leaks=0
         networks:
             public_net:
                 ipv4_address: 192.168.71.140
@@ -24,6 +25,7 @@ services:
         container_name: rfsim5g-oai-nr-ue
         environment:
             USE_ADDITIONAL_OPTIONS: --do-ra --rfsim --noS1 --reconfig-file etc/rrc/reconfig.raw --rbconfig-file etc/rrc/rbconfig.raw --rfsimulator.serveraddr 192.168.71.140 --log_config.global_log_options level,nocolor,time
+            ASAN_OPTIONS: detect_leaks=0
         volumes:
             - ../../conf_files/nrue.uicc.conf:/opt/oai-nr-ue/etc/nr-ue.conf
             - rrc.config:/opt/oai-nr-ue/etc/rrc/

ci-scripts/yaml_files/5g_rfsimulator_u0_25prb/docker-compose.yaml

@@ -168,6 +168,7 @@ services:
         container_name: rfsim5g-oai-gnb
         environment:
             USE_ADDITIONAL_OPTIONS: --sa --rfsim --log_config.global_log_options level,nocolor,time
+            ASAN_OPTIONS: detect_leaks=0
         depends_on:
             - oai-ext-dn
         networks:
@@ -187,6 +188,7 @@ services:
         container_name: rfsim5g-oai-nr-ue
         environment:
             USE_ADDITIONAL_OPTIONS: --sa --rfsim -r 25 --numerology 0 --uicc0.imsi 208990100001100 --band 66 -C 2152260000 --CO -400000000 --ssb 76 --rfsimulator.serveraddr 192.168.71.140 --log_config.global_log_options level,nocolor,time
+            ASAN_OPTIONS: detect_leaks=0
         depends_on:
             - oai-gnb
         networks:

cmake_targets/build_oai

@@ -46,7 +46,7 @@ BUILD_DOXYGEN=0
 DISABLE_HARDWARE_DEPENDENCY="False"
 CMAKE_BUILD_TYPE="RelWithDebInfo"
 CMAKE_CMD="$CMAKE"
-OPTIONAL_LIBRARIES="telnetsrv enbscope uescope nrscope nrqtscope ldpc_cuda ldpc_t1 websrv oai_iqplayer"
+OPTIONAL_LIBRARIES="telnetsrv enbscope uescope nrscope nrqtscope ldpc_cuda ldpc_t2 websrv oai_iqplayer"
 TARGET_LIST=""
 
 function print_help() {

doc/BUILD.md

@@ -183,7 +183,6 @@ Some libraries have further dependencies and might not build on every system:
 - `enbscope`, `uescope`, `nrscope`: libforms/X
 - `nrqtscope`: Qt5
 - `ldpc_cuda`: CUDA
-- `ldpc_t1`: DPDK and VVDN T1
 - `websrv`: npm and others
 
 # Running `cmake` directly

doc/F1-design.md

@@ -116,6 +116,14 @@ sudo cmake_targets/ran_build/build/nr-softmodem --sa -O ci-scripts/conf_files/gn
 These files are tested in the CI, and are configured for use in docker,
 see [this `docker-compose` file](../ci-scripts/yaml_files/5g_f1_rfsimulator/docker-compose.yaml).
 
+The rules to decide if a config triggers a start of a DU, CU, or monolithic
+gNB, are, in order:
+1. If the `MACRLCs` section lists `f1` as northbound transport preference
+   (`tr_n_preference`), it is a DU.
+2. If the `gNBs` section lists `f1` as a southound transport preference
+   (`tr_s_preference`), it is a CU.
+3. It is a (monolithic) gNB.
+
 ## Configuration of F1 IP/port information
 
 For a local deployment, you should update the following fields.

doc/LDPC_T2_OFFLOAD_SETUP.md

+<table style="border-collapse: collapse; border: none;">
+  <tr style="border-collapse: collapse; border: none;">
+    <td style="border-collapse: collapse; border: none;">
+      <a href="http://www.openairinterface.org/">
+         <img src="./images/oai_final_logo.png" alt="" border=3 height=50 width=150>
+         </img>
+      </a>
+    </td>
+    <td style="border-collapse: collapse; border: none; vertical-align: center;">
+      <b><font size = "5">OAI T1/T2 LDPC offload</font></b>
+    </td>
+  </tr>
+</table>
+
+**Table of Contents**
+
+[[_TOC_]]
+
+This documentation aims to provide a tutorial for AMD Xilinx T2 Telco card integration into OAI and its usage.
+
+# Requirements
+
+ - bitstream image and PMD driver for the T2 card provided by AccelerComm
+ - DPDK 20.11.7 with patch from Accelercomm (also tested with DPDK 20.11.3)
+ - tested on RHEL7.9, RHEL9.2, Ubuntu 20.04, Ubuntu 22.04
+
+# DPDK setup
+## DPDK installation
+```
+# Get DPDK source code
+git clone https://github.com/DPDK/dpdk-stable.git ~/dpdk-stable
+cd ~/dpdk-stable
+git checkout v20.11.7
+git apply ~/ACL_BBDEV_DPDK20.11.3_xxx.patch
+```
+Replace `~/ACL_BBDEV_DPDK20.11.3_xxx.patch` by patch file provided by
+Accelercomm.
+```
+cd ~/dpdk-stable
+meson setup build
+# meson setup --prefix=/opt/dpdk-t2 build for installation with non-default installation prefix
+cd build
+ninja
+sudo ninja install
+sudo ldconfig
+```
+## DPDK configuration
+ - load required kernel module
+```
+sudo modprobe igb_uio
+sudo insmod ~/dpdk-stable/kernel/linux/igb_uio/igb_uio.ko
+```
+ - check presence of the card and its PCI addres on the host machine
+```
+lspci | grep "Xilinx"
+```
+ - bind the card with igb_uio driver
+```
+sudo python3 ~/dpdk-stable/usertools/dpdk-devbind.py -b igb_uio 41:00.0
+```
+Replace PCI address of the card *41:00.0* by address detected by *lspci | grep "Xilinx"* command
+ - hugepages setup (10 x 1GB hugepages)
+```
+sudo python3 ~/dpdk-stable/usertools/dpdk-hugepages.py -p 1G --setup 10G`
+```
+
+*Note: device binding and hugepages setup has to be done after every reboot of
+the host machine*
+
+# Modifications in the OAI code
+## PMD path specification
+Path to the PMD for operating the card is specified in `CMakeLists.txt` file in
+*LDPC OFFLOAD library* section. Modify following line based on the location of
+the PMD on your system. By deafult, path to the PMD is set to `/opt/dpdk-t2/lib/x86_64-linux-gnu/`.
+```
+find_library(PMD_T2 NAMES rte_baseband_accl_ldpc HINTS "/opt/dpdk-t2/lib/x86_64-linux-gnu/")
+```
+
+## T2 card DPDK initialization
+Following lines in `openair1/PHY/CODING/nrLDPC_decoder/nrLDPC_decoder_offload.c` file has to be
+modified based on your system requirements. By default, PCI address of the T2 card is set to 41:00.0 and cores 14 and 15 are assigned to the DPDK.
+```
+ char *dpdk_dev = "41:00.0"; //PCI address of the card
+ char *argv_re[] = {"bbdev", "-a", dpdk_dev, "-l", "14-15", "--file-prefix=b6", "--"};
+```
+For the DPDK EAL initialization, device is specified by `-a` option and list
+of cores to run the DPDK application on is selected by `-l` option. PCI adress of
+the T2 card can be detected by `lspci | grep "Xilinx"` command.
+
+# OAI Build
+OTA deployment is precisely described in the following tutorial:
+- [NR_SA_Tutorial_COTS_UE](https://gitlab.eurecom.fr/oai/openairinterface5g/-/blob/develop/doc/NR_SA_Tutorial_COTS_UE.md)
+Instead of section *3.2 Build OAI gNB* from the tutorial, run following commands:
+
+```
+# Get openairinterface5g source code
+git clone https://gitlab.eurecom.fr/oai/openairinterface5g.git ~/openairinterface5g
+cd ~/openairinterface5g
+git checkout develop
+
+# Install OAI dependencies
+cd ~/openairinterface5g/cmake_targets
+./build_oai -I
+
+# Build OAI gNB
+cd ~/openairinterface5g
+source oaienv
+cd cmake_targets
+./build_oai -w USRP --ninja --gNB -P -C --build-lib "ldpc_t2"
+```
+Shared object file *libldpc_t2.so* is created during the compilation. This object is conditionally compiled. Selection of the library to compile is done using *--build-lib ldpc_t2*.
+
+*Required poll mode driver has to be present on the host machine and required DPDK version has to be installed on the host, prior to the build of OAI*
+
+# 5G PHY simulators
+## nr_ulsim test
+Offload of the channel decoding to the T2 card is in nr_ulsim specified by *-o* option. Example command for running nr_ulsim with LDPC decoding offload to the T2 card:
+```
+cd ~/openairinterface5g
+source oaienv
+cd cmake_targets/ran_build/build
+sudo ./nr_ulsim -n100 -s20 -m20 -r273 -R273 -o
+```
+## nr_dlsim test
+Offload of the channel encoding to the AMD Xilinx T2 card is in nr_dlsim specified by *-c* option. Example command for running nr_dlsim with LDPC encoding offload to the T2 card:
+```
+cd ~/openairinterface5g
+source oaienv
+cd cmake_targets/ran_build/build
+sudo ./nr_dlsim -n300 -s30 -R 106 -e 27 -c
+```
+
+# OTA test
+Offload of the channel encoding and decoding to the AMD Xilinx T2 card is enabled by *--ldpc-offload-enable 1* option.
+
+## Run OAI gNB with USRP B210
+```
+cd ~/openairinterface5g
+source oaienv
+cd cmake_targets/ran_build/build
+sudo ./nr-softmodem --sa -O ../../../targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band78.fr1.106PRB.usrpb210.conf --ldpc-offload-enable 1
+```
+
+# Limitations
+## AMD Xilinx T2 card
+ - offload of the LDPC encoding implemented for MCS > 2, OAI CPU encoder is used for MCS =< 2
+ - functionality of the LDPC encoding and decoding offload verified in OTA SISO setup with USRP N310 and Quectel RM500Q, blocking of the card reported for MIMO setup (2 layers)
+
+*Note: AMD Xilinx T1 Telco card is not supported anymore.*

doc/NR_SA_Tutorial_OAI_nrUE.md

@@ -207,3 +207,8 @@ sudo ethtool -G enp1s0f0 tx 4096 rx 4096
 
 ## 6.3 Uplink issues related with noise on the DC carriers
 - There is noise on the DC carriers on N300 and especially the X300 in UL. To avoid their use or shift them away from the center to use more UL spectrum, use the `--tune-offset <Hz>` command line switch, where `<Hz>` is ideally half the bandwidth, or possibly less.
+
+## 6.4 Timing-related Problems
+- Sometimes, the nrUE would keep repeating RA procedure because of Msg3 failure at the gNB. If it happens, add the `-A` option at the nrUE and/or gNB side, e.g., `-A 45`. This modifies the timing advance (in samples). Adjust +/-5 if the issue persists.
+- This can be necessary since certain USRPs have larger signal delays than others; it is therefore specific to the used USRP model.
+- The x310 and B210 are found to work with the default configuration; N310 and x410 can benefit from setting this timing advance.

docker/Dockerfile.build.ubuntu20

@@ -26,6 +26,7 @@
 #---------------------------------------------------------------------
 
 FROM ran-base:latest as ran-build
+ARG BUILD_OPTION
 
 RUN rm -Rf /oai-ran
 WORKDIR /oai-ran
@@ -35,4 +36,12 @@ COPY . .
 RUN /bin/sh oaienv && \
     cd cmake_targets && \
     mkdir -p log && \
-    ./build_oai --eNB --gNB --RU --UE --nrUE --ninja --build-lib "telnetsrv enbscope uescope nrscope nrqtscope" -w USRP -t Ethernet --noavx512 -c --cmake-opt -DCMAKE_C_FLAGS=-Werror --cmake-opt -DCMAKE_CXX_FLAGS=-Werror
+    ./build_oai -c --ninja \
+      --eNB --gNB --RU --UE --nrUE \
+      --build-lib "telnetsrv enbscope uescope nrscope nrqtscope" \
+      -w USRP -t Ethernet \
+      --build-e2 --cmake-opt -DXAPP_MULTILANGUAGE=OFF \
+      --noavx512 \
+      --cmake-opt -DCMAKE_C_FLAGS=-Werror --cmake-opt -DCMAKE_CXX_FLAGS=-Werror $BUILD_OPTION && \
+    # Mainly to see if the sanitize option was perfectly executed
+    ldd ran_build/build/nr-softmodem

docker/Dockerfile.eNB.ubuntu20

@@ -32,6 +32,7 @@ FROM ran-build:latest AS enb-build
 
 #start from scratch for target executable
 FROM ubuntu:focal as oai-enb
+ARG BUILD_OPTION
 ENV DEBIAN_FRONTEND=noninteractive
 ENV TZ=Europe/Paris
 
@@ -57,6 +58,11 @@ RUN apt-get update && \
         python3-six \
         python3-requests \
         libusb-1.0-0 && \
+# if the --sanitize option was used to build, additional packages are required
+    /bin/bash -c 'if [[ "$BUILD_OPTION" = "--sanitize" ]]; then DEBIAN_FRONTEND=noninteractive apt-get install --yes \
+        libasan5 \
+        libubsan1 \
+        liblapacke; fi' && \
     rm -rf /var/lib/apt/lists/*
 
 WORKDIR /opt/oai-enb/bin
@@ -93,8 +99,8 @@ COPY --from=enb-base \
 
 RUN /bin/bash -c "ln -s /usr/local/lib/liboai_usrpdevif.so /usr/local/lib/liboai_device.so" && \
     /bin/bash -c "ln -s /usr/local/lib/liboai_eth_transpro.so /usr/local/lib/liboai_transpro.so" && \
-    ldconfig
-
+    ldconfig && \
+    ldd /opt/oai-enb/bin/lte-softmodem
 
 WORKDIR /opt/oai-enb
 

docker/Dockerfile.gNB.ubuntu20

@@ -32,6 +32,7 @@ FROM ran-build:latest AS gnb-build
 
 #start from scratch for target executable
 FROM ubuntu:focal as oai-gnb
+ARG BUILD_OPTION
 ENV DEBIAN_FRONTEND=noninteractive
 ENV TZ=Europe
 
@@ -56,6 +57,11 @@ RUN apt-get update && \
         python3-six \
         python3-requests \
         libusb-1.0-0 && \
+# if the --sanitize option was used to build, additional packages are required
+    /bin/bash -c 'if [[ "$BUILD_OPTION" = "--sanitize" ]]; then DEBIAN_FRONTEND=noninteractive apt-get install --yes \
+        libasan5 \
+        libubsan1 \
+        liblapacke; fi' && \
     rm -rf /var/lib/apt/lists/*
 
 WORKDIR /opt/oai-gnb/bin
@@ -91,7 +97,8 @@ COPY --from=gnb-base \
     /usr/lib/x86_64-linux-gnu/
 
 RUN /bin/bash -c "ln -s /usr/local/lib/liboai_usrpdevif.so /usr/local/lib/liboai_device.so" && \
-    ldconfig
+    ldconfig && \
+    ldd /opt/oai-gnb/bin/nr-softmodem
 
 WORKDIR /opt/oai-gnb
 #EXPOSE 2152/udp  # S1U, GTP/UDP

docker/Dockerfile.lteUE.ubuntu20

@@ -32,6 +32,7 @@ FROM ran-build:latest AS lte-ue-build
 
 #start from scratch for target executable
 FROM ubuntu:focal as oai-lte-ue
+ARG BUILD_OPTION
 ENV DEBIAN_FRONTEND=noninteractive
 ENV TZ=Europe/Paris
 
@@ -56,6 +57,11 @@ RUN apt-get update && \
         iputils-ping \
         iproute2 \
         iperf && \
+# if the --sanitize option was used to build, additional packages are required
+    /bin/bash -c 'if [[ "$BUILD_OPTION" = "--sanitize" ]]; then DEBIAN_FRONTEND=noninteractive apt-get install --yes \
+        libasan5 \
+        libubsan1 \
+        liblapacke; fi' && \
     rm -rf /var/lib/apt/lists/*
 
 WORKDIR /opt/oai-lte-ue/bin
@@ -94,7 +100,8 @@ COPY --from=lte-ue-base \
     /usr/lib/x86_64-linux-gnu/
 
 RUN /bin/bash -c "ln -s /usr/local/lib/liboai_usrpdevif.so /usr/local/lib/liboai_device.so" && \
-    ldconfig
+    ldconfig && \
+    ldd /opt/oai-lte-ue/bin/lte-uesoftmodem
 
 WORKDIR /opt/oai-lte-ue
 CMD ["/opt/oai-lte-ue/bin/lte-uesoftmodem"]

docker/Dockerfile.nr-cuup.ubuntu20

@@ -31,6 +31,7 @@ FROM ran-build:latest AS gnb-build
 
 
 FROM ubuntu:focal as oai-nr-cuup
+ARG BUILD_OPTION
 ENV DEBIAN_FRONTEND=noninteractive
 ENV TZ=Europe
 
@@ -40,6 +41,11 @@ RUN apt-get update && \
         libsctp1 \
         libconfig9 \
         openssl && \
+# if the --sanitize option was used to build, additional packages are required
+    /bin/bash -c 'if [[ "$BUILD_OPTION" = "--sanitize" ]]; then DEBIAN_FRONTEND=noninteractive apt-get install --yes \
+        libasan5 \
+        libubsan1 \
+        liblapacke; fi' && \
     rm -rf /var/lib/apt/lists/*
 
 WORKDIR /opt/oai-gnb/bin

docker/Dockerfile.nrUE.ubuntu20

@@ -32,6 +32,7 @@ FROM ran-build:latest AS nr-ue-build
 
 #start from scratch for target executable
 FROM ubuntu:focal as oai-nr-ue
+ARG BUILD_OPTION
 ENV DEBIAN_FRONTEND=noninteractive
 ENV TZ=Europe/Paris
 
@@ -56,6 +57,10 @@ RUN apt-get update && \
         iputils-ping \
         iproute2 \
         iperf && \
+# if the --sanitize option was used to build, additional packages are required
+    /bin/bash -c 'if [[ "$BUILD_OPTION" = "--sanitize" ]]; then DEBIAN_FRONTEND=noninteractive apt-get install --yes \
+        libasan5 \
+        libubsan1; fi' && \
     rm -rf /var/lib/apt/lists/*
 
 WORKDIR /opt/oai-nr-ue/bin
@@ -95,7 +100,8 @@ COPY --from=nr-ue-base \
     /usr/lib/x86_64-linux-gnu/
 
 RUN /bin/bash -c "ln -s /usr/local/lib/liboai_usrpdevif.so /usr/local/lib/liboai_device.so" && \
-    ldconfig
+    ldconfig && \
+    ldd /opt/oai-nr-ue/bin/nr-uesoftmodem
 
 WORKDIR /opt/oai-nr-ue
 CMD ["/opt/oai-nr-ue/bin/nr-uesoftmodem", "-O", "/opt/oai-nr-ue/etc/nr-ue.conf"]

docker/README.md

@@ -46,16 +46,15 @@ For all platforms, the strategy for building docker/podman images is the same:
    -  Some tools (such as `ping`, `ifconfig`)
 
 Note that on every push to develop (i.e., typically after integrating merge
-requests), we build all images and push them to [Docker
-Hub](https://hub.docker.com/u/oaisoftwarealliance). To pull them, do
+requests), we build all images and push them to [Docker Hub](https://hub.docker.com/u/oaisoftwarealliance). To pull them, do
+
 ```
 docker pull oaisoftwarealliance/oai-gnb:develop
 docker pull oaisoftwarealliance/oai-nr-ue:develop
 docker pull oaisoftwarealliance/oai-enb:develop
 docker pull oaisoftwarealliance/oai-lte-ue:develop
 ```
-Have a look at [this
-README](../ci-scripts/yaml_files/5g_rfsimulator/README.md) to get some
+Have a look at [this README](../ci-scripts/yaml_files/5g_rfsimulator/README.md) to get some
 information on how to use the images.
 
 # 2. File organization #
@@ -114,6 +113,34 @@ ran-base            latest              5c9c02a5b4a8        1 minute ago
 
 Note that the steps are identical for `rocky-linux`.
 
+### 3.2.1. Additional build otions
+
+This is only available for the Ubuntu-20 version.
+
+You can, for example, create a `sanitizer` version of the ran-build image.
+
+```bash
+docker build --target ran-build --tag ran-build:latest --file docker/Dockerfile.build.ubuntu20 --build-arg "BUILD_OPTION=--sanitize" .
+```
+
+Currently the `--sanitize` option for `build_oai` enables:
+
+* [Address Sanitizer](https://github.com/google/sanitizers/wiki/AddressSanitizer)
+* [Undefined Behavior Sanitizer](https://clang.llvm.org/docs/UndefinedBehaviorSanitizer.html)
+
+After building:
+
+```bash
+docker image ls
+REPOSITORY          TAG                 IMAGE ID            CREATED             SIZE
+ran-build           latest              f2633a7f5102        1 minute ago        8.78GB
+...
+```
+
+Note that the image is much bigger.
+
+You can also use this docker build arguments to pass any available option(s) on the `build-oai` script.
+
 ## 3.3. Building any target image ##
 
 For example, the eNB:
@@ -141,6 +168,14 @@ docker image prune --force
 
 Note that the steps are identical for `rocky-linux`.
 
+If you have used the sanitizer option, then you should also pass it when building the target image:
+
+```bash
+docker build --target oai-gnb --tag oai-gnb:latest --file docker/Dockerfile.gNB.ubuntu20 --build-arg "BUILD_OPTION=--sanitize" .
+```
+
+Normally the target image will be around 200 Mbytes bigger.
+
 # 4. Building using `podman` under Red Hat Entreprise Linux 8.2 #
 
 Analogous to the above steps:

executables/nr-cuup.c

@@ -130,7 +130,8 @@ int main(int argc, char **argv)
   AssertFatal(rc >= 0, "Create task for CUUP E1 failed\n");
   nr_pdcp_layer_init(true);
   cu_init_f1_ue_data(); // for CU-UP/CP mapping: we use the same
-  MessageDef *msg = RCconfig_NR_CU_E1(true);
+  E1_t e1type = UPtype;
+  MessageDef *msg = RCconfig_NR_CU_E1(&e1type);
   AssertFatal(msg != NULL, "Send init to task for E1AP UP failed\n");
   itti_send_msg_to_task(TASK_CUUP_E1, 0, msg);
 

executables/nr-softmodem-common.h

@@ -98,7 +98,7 @@
 #define CONFIG_HLP_WORKER_CMD    "two option for worker 'WORKER_DISABLE' or 'WORKER_ENABLE'\n"
 #define CONFIG_HLP_USRP_THREAD   "having extra thead for usrp tx\n"
 #define CONFIG_HLP_DISABLNBIOT   "disable nb-iot, even if defined in config\n"
-#define CONFIG_HLP_LDPC_OFFLOAD  "enable LDPC offload\n"
+#define CONFIG_HLP_LDPC_OFFLOAD  "enable LDPC offload to AMD Xilinx T2 card\n"
 #define CONFIG_HLP_USRP_ARGS     "set the arguments to identify USRP (same syntax as in UHD)\n"
 #define CONFIG_HLP_TX_SUBDEV     "set the arguments to select tx_subdev (same syntax as in UHD)\n"
 #define CONFIG_HLP_RX_SUBDEV     "set the arguments to select rx_subdev (same syntax as in UHD)\n"

executables/nr-softmodem.c

@@ -402,9 +402,9 @@ static int create_gNB_tasks(ngran_node_t node_type, configmodule_interface_t *cf
 
     // If CU
     if (node_type == ngran_gNB_CU || node_type == ngran_gNB) {
-      MessageDef *msg = RCconfig_NR_CU_E1(false);
+      MessageDef *msg = RCconfig_NR_CU_E1(NULL);
       instance_t inst = 0;
-      createE1inst(UPtype, inst, &E1AP_REGISTER_REQ(msg).net_config, NULL);
+      createE1inst(UPtype, inst, E1AP_REGISTER_REQ(msg).gnb_id, &E1AP_REGISTER_REQ(msg).net_config, NULL);
       cuup_init_n3(inst);
       RC.nrrrc[gnb_id_start]->e1_inst = inst; // stupid instance !!!*/
 
@@ -571,6 +571,53 @@ void init_pdcp(void) {
   }
 }
 
+#ifdef E2_AGENT
+#include "openair2/LAYER2/NR_MAC_gNB/nr_mac_gNB.h" // need to get info from MAC
+static void initialize_agent(ngran_node_t node_type, e2_agent_args_t oai_args)
+{
+  AssertFatal(oai_args.sm_dir != NULL , "Please, specify the directory where the SMs are located in the config file, i.e., add in config file the next line: e2_agent = {near_ric_ip_addr = \"127.0.0.1\"; sm_dir = \"/usr/local/lib/flexric/\");} ");
+  AssertFatal(oai_args.ip != NULL , "Please, specify the IP address of the nearRT-RIC in the config file, i.e., e2_agent = {near_ric_ip_addr = \"127.0.0.1\"; sm_dir = \"/usr/local/lib/flexric/\"");
+
+  printf("After RCconfig_NR_E2agent %s %s \n",oai_args.sm_dir, oai_args.ip  );
+
+  fr_args_t args = { .ip = oai_args.ip }; // init_fr_args(0, NULL);
+  memcpy(args.libs_dir, oai_args.sm_dir, 128);
+
+  sleep(1);
+  const gNB_RRC_INST* rrc = RC.nrrrc[0];
+  assert(rrc != NULL && "rrc cannot be NULL");
+
+  const int mcc = rrc->configuration.mcc[0];
+  const int mnc = rrc->configuration.mnc[0];
+  const int mnc_digit_len = rrc->configuration.mnc_digit_length[0];
+  // const ngran_node_t node_type = rrc->node_type;
+  int nb_id = 0;
+  int cu_du_id = 0;
+  if (node_type == ngran_gNB) {
+    nb_id = rrc->node_id;
+  } else if (node_type == ngran_gNB_DU) {
+    const gNB_MAC_INST* mac = RC.nrmac[0];
+    AssertFatal(mac != NULL, "MAC not initialized\n");
+    cu_du_id = mac->f1_config.gnb_id;
+    nb_id = mac->f1_config.setup_req->gNB_DU_id;
+  } else if (node_type == ngran_gNB_CU) {
+    // agent buggy: the CU has no second ID, it is the CU-UP ID
+    // however, that is not a problem her for us, so put the same ID twice
+    nb_id = rrc->node_id;
+    cu_du_id = rrc->node_id;
+  } else {
+    LOG_E(NR_RRC, "not supported ran type detect\n");
+  }
+
+  printf("[E2 NODE]: mcc = %d mnc = %d mnc_digit = %d nb_id = %d \n", mcc, mnc, mnc_digit_len, nb_id);
+
+  printf("[E2 NODE]: Args %s %s \n", args.ip, args.libs_dir);
+
+  sm_io_ag_ran_t io = init_ran_func_ag();
+  init_agent_api(mcc, mnc, mnc_digit_len, nb_id, cu_du_id, node_type, io, &args);
+}
+#endif
+
 configmodule_interface_t *uniqCfg = NULL;
 int main( int argc, char **argv ) {
   int ru_id, CC_id = 0;
@@ -689,54 +736,18 @@ int main( int argc, char **argv ) {
   config_sync_var=0;
 
 
-
-
 #ifdef E2_AGENT
 
 //////////////////////////////////
 //////////////////////////////////
 //// Init the E2 Agent
 
-  sm_io_ag_ran_t io = init_ran_func_ag();
-  
   // OAI Wrapper 
   e2_agent_args_t oai_args = RCconfig_NR_E2agent();
-  AssertFatal(oai_args.sm_dir != NULL , "Please, specify the directory where the SMs are located in the config file, i.e., add in config file the next line: e2_agent = {near_ric_ip_addr = \"127.0.0.1\"; sm_dir = \"/usr/local/lib/flexric/\");} ");
-
-  AssertFatal(oai_args.ip != NULL , "Please, specify the IP address of the nearRT-RIC in the config file, i.e., e2_agent = {near_ric_ip_addr = \"127.0.0.1\"; sm_dir = \"/usr/local/lib/flexric/\"");
 
-  printf("After RCconfig_NR_E2agent %s %s \n",oai_args.sm_dir, oai_args.ip  );
-
-  fr_args_t args = { .ip = oai_args.ip }; // init_fr_args(0, NULL);
-  memcpy(args.libs_dir, oai_args.sm_dir, 128);
-
-  sleep(1);
-  const gNB_RRC_INST* rrc = RC.nrrrc[0];
-  assert(rrc != NULL && "rrc cannot be NULL");
-
-  const int mcc = rrc->configuration.mcc[0];
-  const int mnc = rrc->configuration.mnc[0];
-  const int mnc_digit_len = rrc->configuration.mnc_digit_length[0];
-  // const ngran_node_t node_type = rrc->node_type;
-  int nb_id = 0;
-  int cu_du_id = 0;
-  if (node_type == ngran_gNB) {
-    nb_id = rrc->configuration.cell_identity;
-  } else if (node_type == ngran_gNB_DU) {
-    cu_du_id = rrc->node_id + 1; // Hack to avoid been 0
-    nb_id = rrc->configuration.cell_identity;
-  } else if (node_type == ngran_gNB_CU) {
-    cu_du_id = rrc->node_id + 1;
-    nb_id = rrc->configuration.cell_identity;
-  } else {
-    LOG_E(NR_RRC, "not supported ran type detect\n");
+  if (oai_args.enabled) {
+    initialize_agent(node_type, oai_args);
   }
-     
-  printf("[E2 NODE]: mcc = %d mnc = %d mnc_digit = %d nb_id = %d \n", mcc, mnc, mnc_digit_len, nb_id);
-
-  printf("[E2 NODE]: Args %s %s \n", args.ip, args.libs_dir);
-  init_agent_api(mcc, mnc, mnc_digit_len, nb_id, cu_du_id, node_type, io, &args);
-//   }
 
 #endif // E2_AGENT
 

executables/nr-uesoftmodem.c

@@ -428,6 +428,9 @@ static void get_channel_model_mode(configmodule_interface_t *cfg)
 int NB_UE_INST = 1;
 configmodule_interface_t *uniqCfg = NULL;
 
+// A global var to reduce the changes size
+ldpc_interface_t ldpc_interface = {0}, ldpc_interface_offload = {0};
+
 int main( int argc, char **argv ) {
   int set_exe_prio = 1;
   if (checkIfFedoraDistribution())
@@ -465,8 +468,8 @@ int main( int argc, char **argv ) {
   itti_init(TASK_MAX, tasks_info);
 
   init_opt() ;
-  load_nrLDPClib(NULL);
- 
+  load_LDPClib(NULL, &ldpc_interface);
+
   if (ouput_vcd) {
     vcd_signal_dumper_init("/tmp/openair_dump_nrUE.vcd");
   }

openair1/PHY/CODING/nrLDPC_decoder/nrLDPC_decoder.c

@@ -133,14 +133,24 @@
 #include "bnProc128/nrLDPC_bnProc_BG2_R23_128.h"
 #endif
 
-//#define NR_LDPC_ENABLE_PARITY_CHECK
 //#define NR_LDPC_PROFILER_DETAIL(a) a
 #define NR_LDPC_PROFILER_DETAIL(a)
 
+#include "openair1/PHY/CODING/nrLDPC_extern.h"
+
 #ifdef NR_LDPC_DEBUG_MODE
 #include "nrLDPC_tools/nrLDPC_debug.h"
 #endif
 
+// decoder interface
+/**
+   \brief LDPC decoder API type definition
+   \param p_decParams LDPC decoder parameters
+   \param p_llr Input LLRs
+   \param p_llrOut Output vector
+   \param p_profiler LDPC profiler statistics
+*/
+
 static inline uint32_t nrLDPC_decoder_core(int8_t* p_llr,
                                            int8_t* p_out,
                                            uint32_t numLLR,
@@ -148,13 +158,25 @@ static inline uint32_t nrLDPC_decoder_core(int8_t* p_llr,
                                            t_nrLDPC_dec_params* p_decParams,
                                            t_nrLDPC_time_stats* p_profiler,
                                            decode_abort_t* ab);
-void nrLDPC_initcall(t_nrLDPC_dec_params* p_decParams, int8_t* p_llr, int8_t* p_out) {
+
+int32_t LDPCinit()
+{
+  return 0;
+}
+
+int32_t LDPCshutdown()
+{
+  return 0;
 }
-int32_t nrLDPC_decod(t_nrLDPC_dec_params* p_decParams,
-                     int8_t* p_llr,
-                     int8_t* p_out,
-                     t_nrLDPC_time_stats* p_profiler,
-                     decode_abort_t* ab)
+
+int32_t LDPCdecoder(t_nrLDPC_dec_params* p_decParams,
+                    uint8_t harq_pid,
+                    uint8_t ulsch_id,
+                    uint8_t C,
+                    int8_t* p_llr,
+                    int8_t* p_out,
+                    t_nrLDPC_time_stats* p_profiler,
+                    decode_abort_t* ab)
 {
   uint32_t numLLR;
   t_nrLDPC_lut lut;
@@ -817,31 +839,30 @@ static inline uint32_t nrLDPC_decoder_core(int8_t* p_llr,
 #endif
 
    // Parity Check
-#ifdef NR_LDPC_ENABLE_PARITY_CHECK
-        NR_LDPC_PROFILER_DETAIL(start_meas(&p_profiler->cnProcPc));
-        if (BG == 1)
-          pcRes = nrLDPC_cnProcPc_BG1(p_lut, cnProcBuf, cnProcBufRes, Z);
-        else
-          pcRes = nrLDPC_cnProcPc_BG2(p_lut, cnProcBuf, cnProcBufRes, Z);
-        NR_LDPC_PROFILER_DETAIL(stop_meas(&p_profiler->cnProcPc));
-#else
-        if (numIter > 2) {
-          int8_t llrOut[NR_LDPC_MAX_NUM_LLR] __attribute__((aligned(64))) = {0};
-          int8_t* p_llrOut = outMode == nrLDPC_outMode_LLRINT8 ? p_out : llrOut;
-          nrLDPC_llrRes2llrOut(p_lut, p_llrOut, llrRes, Z, BG);
-          if (outMode == nrLDPC_outMode_BIT)
-            nrLDPC_llr2bitPacked(p_out, p_llrOut, numLLR);
-          else // if (outMode == nrLDPC_outMode_BITINT8)
-            nrLDPC_llr2bit(p_out, p_llrOut, numLLR);
-          if (check_crc((uint8_t*)p_out, p_decParams->block_length, p_decParams->crc_type)) {
-            LOG_D(PHY, "Segment CRC OK, exiting LDPC decoder\n");
-            break;
+        if (!p_decParams->check_crc) {
+          NR_LDPC_PROFILER_DETAIL(start_meas(&p_profiler->cnProcPc));
+          if (BG == 1)
+            pcRes = nrLDPC_cnProcPc_BG1(p_lut, cnProcBuf, cnProcBufRes, Z);
+          else
+            pcRes = nrLDPC_cnProcPc_BG2(p_lut, cnProcBuf, cnProcBufRes, Z);
+          NR_LDPC_PROFILER_DETAIL(stop_meas(&p_profiler->cnProcPc));
+        } else {
+          if (numIter > 2) {
+            int8_t llrOut[NR_LDPC_MAX_NUM_LLR] __attribute__((aligned(64))) = {0};
+            int8_t* p_llrOut = outMode == nrLDPC_outMode_LLRINT8 ? p_out : llrOut;
+            nrLDPC_llrRes2llrOut(p_lut, p_llrOut, llrRes, Z, BG);
+            if (outMode == nrLDPC_outMode_BIT)
+              nrLDPC_llr2bitPacked(p_out, p_llrOut, numLLR);
+            else // if (outMode == nrLDPC_outMode_BITINT8)
+              nrLDPC_llr2bit(p_out, p_llrOut, numLLR);
+            if (p_decParams->check_crc((uint8_t*)p_out, p_decParams->E, p_decParams->crc_type)) {
+              LOG_D(PHY, "Segment CRC OK, exiting LDPC decoder\n");
+              break;
+            }
           }
         }
-#endif
     }
-#ifdef NR_LDPC_ENABLE_PARITY_CHECK
-    {
+    if (!p_decParams->check_crc) {
       int8_t llrOut[NR_LDPC_MAX_NUM_LLR] __attribute__((aligned(64))) = {0};
       int8_t* p_llrOut = outMode == nrLDPC_outMode_LLRINT8 ? p_out : llrOut;
       // Assign results from processing buffer to output
@@ -856,7 +877,6 @@ static inline uint32_t nrLDPC_decoder_core(int8_t* p_llr,
         nrLDPC_llr2bit(p_out, p_llrOut, numLLR);
       NR_LDPC_PROFILER_DETAIL(stop_meas(&p_profiler->llr2bit));
     }
-#endif
     return numIter;
 }
 

openair1/PHY/CODING/nrLDPC_decoder/nrLDPC_decoder_CL.c

@@ -47,8 +47,7 @@ typedef struct{
 #include <unistd.h>
 #include <sys/stat.h>
 #include <CL/opencl.h>
-#include "PHY/CODING/nrLDPC_decoder/nrLDPC_types.h"
-#include "PHY/CODING/nrLDPC_decoder/nrLDPCdecoder_defs.h"
+#include "openair1/PHY/CODING/nrLDPC_extern.h"
 #include "assertions.h"
 #include "common/utils/LOG/log.h"
 
@@ -135,9 +134,9 @@ void set_compact_BG(int Zc,short BG){
 	}
 	printf("\nZc = %d BG = %d\n",Zc,BG);
     ocl.runtime[0].dev_h_compact1 = clCreateBuffer(ocl.runtime[0].context, CL_MEM_READ_ONLY|CL_MEM_HOST_WRITE_ONLY, memorySize_h_compact1, NULL, (cl_int *)&rt);
-    AssertFatal(rt == CL_SUCCESS, "Error %d creating buffer dev_h_compact1 for platform %i \n" , (int)rt, 0);	
+    AssertFatal(rt == CL_SUCCESS, "Error %d creating buffer dev_h_compact1 for platform %i \n" , (int)rt, 0);
     ocl.runtime[0].dev_h_compact2 = clCreateBuffer(ocl.runtime[0].context, CL_MEM_READ_ONLY|CL_MEM_HOST_WRITE_ONLY, memorySize_h_compact2, NULL, (cl_int *)&rt);
-    AssertFatal(rt == CL_SUCCESS, "Error %d creating buffer dev_h_compact2 for platform %i \n" , (int)rt, 0);  
+    AssertFatal(rt == CL_SUCCESS, "Error %d creating buffer dev_h_compact2 for platform %i \n" , (int)rt, 0);
     h_element *h1;
     h_element *h2; 
 	switch(lift_index){
@@ -328,18 +327,25 @@ int ldpc_autoinit(void) {   // called by the library loader
   return 0;  
 }
 
+int32_t LDPCshutdown()
+{
+  return 0;
+}
 
-void nrLDPC_initcall(t_nrLDPC_dec_params* p_decParams, int8_t* p_llr, int8_t* p_out) {
-	set_compact_BG(p_decParams->Z,p_decParams->BG);
-//	init_LLR_DMA(p_decParams, p_llr,  p_out);
+int32_t LDPCinit()
+{
+  //	init_LLR_DMA(p_decParams, p_llr,  p_out);
+  return 0;
 }
 
-int32_t nrLDPC_decod(t_nrLDPC_dec_params *p_decParams,
-                     int8_t *p_llr,
-                     int8_t *p_out,
-                     t_nrLDPC_procBuf *p_procBuf,
-                     t_nrLDPC_time_stats *time_decoder,
-                     decode_abort_t *ab)
+int32_t LDPCdecoder(t_nrLDPC_dec_params *p_decParams,
+                    uint8_t harq_pid,
+                    uint8_t ulsch_id,
+                    uint8_t C,
+                    int8_t *p_llr,
+                    int8_t *p_out,
+                    t_nrLDPC_time_stats *time_decoder,
+                    decode_abort_t *ab)
 {
     uint16_t Zc          = p_decParams->Z;
     uint8_t  BG         = p_decParams->BG;
@@ -362,12 +368,14 @@ int32_t nrLDPC_decod(t_nrLDPC_dec_params *p_decParams,
 	int memorySize_llr = col * Zc * sizeof(char) * MC;
 //	cudaCheck( cudaMemcpyToSymbol(dev_const_llr, p_llr, memorySize_llr_cuda) );
 //	cudaCheck( cudaMemcpyToSymbol(dev_llr, p_llr, memorySize_llr_cuda) );
-    int rt = clEnqueueWriteBuffer(ocl.runtime[0].queue[0], ocl.runtime[0].dev_const_llr, CL_TRUE, 0,
-                               memorySize_llr, p_llr, 0, NULL, NULL);
-	AssertFatal(rt == CL_SUCCESS, "Error %d moving p_llr data to  read only memory in pltf %i dev %i\n" , (int)rt, 0,0); 
+  set_compact_BG(p_decParams->Z, p_decParams->BG);
+
+  int rt =
+      clEnqueueWriteBuffer(ocl.runtime[0].queue[0], ocl.runtime[0].dev_const_llr, CL_TRUE, 0, memorySize_llr, p_llr, 0, NULL, NULL);
+  AssertFatal(rt == CL_SUCCESS, "Error %d moving p_llr data to  read only memory in pltf %i dev %i\n" , (int)rt, 0,0);
     rt = clEnqueueWriteBuffer(ocl.runtime[0].queue[0], ocl.runtime[0].dev_llr, CL_TRUE, 0,
                                memorySize_llr, p_llr, 0, NULL, NULL);
-	AssertFatal(rt == CL_SUCCESS, "Error %d moving p_llr data to  read-write memory in pltf %i dev %i\n" , (int)rt, 0,0); 	
+	AssertFatal(rt == CL_SUCCESS, "Error %d moving p_llr data to  read-write memory in pltf %i dev %i\n" , (int)rt, 0,0);
 // Define CUDA kernel dimension
 //	int blockSizeX = Zc;
 //	dim3 dimGridKernel1(row, MC, 1); 	// dim of the thread blocks

openair1/PHY/CODING/nrLDPC_decoder/nrLDPC_types.h

@@ -85,24 +85,27 @@ typedef struct nrLDPC_dec_params {
     uint8_t BG; /**< Base graph */
     uint16_t Z; /**< Lifting size */
     uint8_t R; /**< Decoding rate: Format 15,13,... for code rates 1/5, 1/3,... */
+    uint16_t F; /**< Filler bits */
+    uint8_t Qm; /**< Modulation */
+    uint8_t rv;
     uint8_t numMaxIter; /**< Maximum number of iterations */
-    int block_length;
+    int E;
     e_nrLDPC_outMode outMode; /**< Output format */
     int crc_type;
+    int (*check_crc)(uint8_t* decoded_bytes, uint32_t n, uint8_t crc_type);
+    uint8_t setCombIn;
 } t_nrLDPC_dec_params;
 
-/**
-   Structure containing LDPC decoder parameters.
- */
 typedef struct nrLDPCoffload_params {
     uint8_t BG; /**< Base graph */
-    uint16_t Z; 
-    uint16_t Kr;  
+    uint16_t Z;
+    uint16_t Kr;
     uint8_t rv;
     uint32_t E;
     uint16_t n_cb;
     uint16_t F; /**< Filler bits */
     uint8_t Qm; /**< Modulation */
+    uint8_t setCombIn;
 } t_nrLDPCoffload_params;
 
 /**

openair1/PHY/INIT/nr_init_ue.c

@@ -615,7 +615,6 @@ void nr_init_ul_harq_processes(NR_UL_UE_HARQ_t harq_list[NR_MAX_ULSCH_HARQ_PROCE
     DevAssert(harq_list[i].f);
     bzero(harq_list[i].f,14*num_rb*12*16);
 
-    harq_list[i].first_tx = 1;
     harq_list[i].round = 0;
   }
 }
@@ -642,7 +641,6 @@ void clean_UE_harq(PHY_VARS_NR_UE *UE)
     ul_harq_process->tx_status = NEW_TRANSMISSION_HARQ;
     ul_harq_process->status = SCH_IDLE;
     ul_harq_process->round = 0;
-    ul_harq_process->first_tx = 1;
   }
 }