Update main

# Conflicts: # lib/hal/dpdk/dpdk_eal.cpp # lib/hal/dpdk/mbuf_pool.cpp # lib/phy/upper/uplink_processor_concurrent.h # tests/unittests/phy/upper/channel_processors/pusch/pusch_decoder_test.cpp
srsran · Dec 22, 2023 · dcd905c · dcd905c
2 parents 60811de + 5efe741
commit dcd905c
Show file tree

Hide file tree

Showing 416 changed files with 11,111 additions and 3,900 deletions.
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -85,7 +85,8 @@ trigger docker:
       changes:
         paths:
           - .gitlab/ci/docker.yml
-          - docker/**/*
+          - docker/**/*.{yml,env,json,toml,py,sh,csv}
+          - docker/**/Dockerfile
   trigger:
     include: .gitlab/ci/docker.yml
     strategy: depend

diff --git a/.gitlab/ci/build.yml b/.gitlab/ci/build.yml
@@ -33,10 +33,10 @@ variables:
   INFRASTRUCTURE_TAG:
     description: Computer architecture and supported instruction sets
     options:
-      - "aws-spot-amd64"
-      - "aws-spot-arm64"
       - "on-prem-amd64"
       - "on-prem-arm64"
+      - "aws-spot-amd64"
+      - "aws-spot-arm64"
     value: "aws-spot-amd64"
   OS:
     description: Operating system
@@ -74,6 +74,9 @@ variables:
   UHD_VERSION:
     description: must be one version supported in the specified OS
     value: ""
+  DPDK_VERSION:
+    description: must be one version supported in the specified OS
+    value: ""
 
 ################
 # Build caches #
@@ -738,6 +741,32 @@ basic asan:
     <<: *build_artifacts
     expire_in: 1 day
 
+basic avx512 dpdk:
+  extends: .build_and_unit
+  rules:
+    - if: $CI_DESCRIPTION =~ /Nightly/
+      when: delayed
+      start_in: 30 minutes
+  retry: 2
+  interruptible: false
+  variables:
+    OS: ubuntu-22.04
+    COMPILER: gcc
+    BUILD_TYPE: RelWithDebInfo
+    TEST_MODE: default
+    ASSERT_LEVEL: PARANOID
+    ENABLE_UHD: "False"
+    ENABLE_ZEROMQ: "False"
+    ENABLE_DPDK: "True"
+    DPDK_VERSION: "23.07"
+    AUTO_DETECT_ISA: "True"
+    ENABLE_AVX512: "True"
+    SAVE_ARTIFACTS: "True"
+  tags: ["${AMD64_AVX512_TAG}"]
+  artifacts:
+    <<: *build_artifacts
+    expire_in: 1 day
+
 # Packaging
 
 package:

diff --git a/.gitlab/ci/e2e.yml b/.gitlab/ci/e2e.yml
@@ -36,6 +36,7 @@ variables:
       - "android_b200"
       - "android_n300"
       - "android_x300"
+      - "viavi"
       - "none"
     value: "zmq"
   MARKERS:
@@ -312,11 +313,13 @@ rf-asan:
     - job: "basic asan"
       artifacts: true
     - *retina-needs
+  allow_failure: true
 
 rf-b200-config:
   extends: .rf
   variables:
     MARKERS: "rf_b200"
+  allow_failure: true
 
 rf-n300-config:
   extends: .rf
@@ -363,6 +366,29 @@ android-n300:
   variables:
     TESTBED: "android_n300"
 
+################################################################################
+# VIAVI
+###############################################################################
+
+viavi:
+  extends: .e2e-run
+  rules:
+    - if: $CI_DESCRIPTION =~ /Nightly/
+      when: manual
+      allow_failure: true
+      # when: delayed
+      # start_in: 7 hours
+  variables:
+    GROUP: "viavi"
+    TESTBED: "viavi"
+    MARKERS: "viavi"
+    E2E_LOG_LEVEL: "warning"
+    KUBECONFIG_VAR_NAME: "RETINA_NAMESPACE_KUBECONFIG"
+  needs:
+    - job: "basic avx512 dpdk"
+      artifacts: true
+    - *retina-needs
+
 ################################################################################
 # Garbage collector
 ################################################################################

diff --git a/.gitlab/ci/e2e/.env b/.gitlab/ci/e2e/.env
@@ -1,8 +1,9 @@
 SRSGNB_REGISTRY_URI=registry.gitlab.com/softwareradiosystems/srsgnb
 RETINA_REGISTRY_PREFIX=registry.gitlab.com/softwareradiosystems/ci/retina
-RETINA_VERSION=0.37.13
+RETINA_VERSION=0.38.0
 AMARISOFT_VERSION=2023-03-17
 SRSUE_VERSION=23.11
 OPEN5GS_VERSION=2.5.6
 PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
-METRICS_SERVER_VERSION=1.4.0
+METRICS_SERVER_VERSION=1.5.0
+DPDK_VERSION=23.07
diff --git a/.gitlab/ci/e2e/retina_request_android_b200.yml b/.gitlab/ci/e2e/retina_request_android_b200.yml
@@ -18,8 +18,8 @@
       requests: "2G"
       limits: "2G"
     ephemeral-storage:
-      requests: "3G"
-      limit: "3G"
+      requests: "6G"
+      limits: "6G"
   resources:
     - type: android
       model: one-plus-9-pro
@@ -36,8 +36,8 @@
       requests: "10G"
       limits: "10G"
     ephemeral-storage:
-      requests: "3G"
-      limit: "3G"
+      requests: "6G"
+      limits: "6G"
   resources:
     - type: sdr
       model: b200
@@ -60,23 +60,5 @@
       requests: "4G"
       limits: "4G"
     ephemeral-storage:
-      requests: "3G"
-      limit: "3G"
-
-- name: metrics-server
-  type: generic
-  requirements:
-    arch: amd64
-    cpu:
-      requests: 1
-    memory:
-      requests: "500Mi"
-    ephemeral-storage:
-      requests: "1G"
-  environment:
-    - URL: ${RETINA_METRICS_SERVER_URL}
-    - ORG: ${RETINA_METRICS_SERVER_ORG}
-    - BUCKET: ${RETINA_METRICS_SERVER_BUCKET}
-    - TESTBED: ${RETINA_METRICS_SERVER_TESTBED}
-    - TOKEN: ${RETINA_METRICS_SERVER_TOKEN}
-  image: ${SRSGNB_REGISTRY_URI}/metrics_server:${METRICS_SERVER_VERSION}
+      requests: "6G"
+      limits: "6G"
diff --git a/.gitlab/ci/e2e/retina_request_android_n300.yml b/.gitlab/ci/e2e/retina_request_android_n300.yml
@@ -18,8 +18,8 @@
       requests: "2G"
       limits: "2G"
     ephemeral-storage:
-      requests: "3G"
-      limit: "3G"
+      requests: "6G"
+      limits: "6G"
   resources:
     - type: android
       model: one-plus-9-pro
@@ -36,8 +36,8 @@
       requests: "24G"
       limits: "24G"
     ephemeral-storage:
-      requests: "3G"
-      limit: "3G"
+      requests: "6G"
+      limits: "6G"
   taints: ["retina"]
   resources:
     - type: sdr
@@ -61,23 +61,5 @@
       requests: "4G"
       limits: "4G"
     ephemeral-storage:
-      requests: "3G"
-      limit: "3G"
-
-- name: metrics-server
-  type: generic
-  requirements:
-    arch: amd64
-    cpu:
-      requests: 1
-    memory:
-      requests: "500Mi"
-    ephemeral-storage:
-      requests: "1G"
-  environment:
-    - URL: ${RETINA_METRICS_SERVER_URL}
-    - ORG: ${RETINA_METRICS_SERVER_ORG}
-    - BUCKET: ${RETINA_METRICS_SERVER_BUCKET}
-    - TESTBED: ${RETINA_METRICS_SERVER_TESTBED}
-    - TOKEN: ${RETINA_METRICS_SERVER_TOKEN}
-  image: ${SRSGNB_REGISTRY_URI}/metrics_server:${METRICS_SERVER_VERSION}
+      requests: "6G"
+      limits: "6G"
diff --git a/.gitlab/ci/e2e/retina_request_android_x300.yml b/.gitlab/ci/e2e/retina_request_android_x300.yml
@@ -18,8 +18,8 @@
       requests: "2G"
       limits: "2G"
     ephemeral-storage:
-      requests: "3G"
-      limit: "3G"
+      requests: "6G"
+      limits: "6G"
   resources:
     - type: android
       model: one-plus-9-pro
@@ -36,8 +36,8 @@
       requests: "24G"
       limits: "24G"
     ephemeral-storage:
-      requests: "3G"
-      limit: "3G"
+      requests: "6G"
+      limits: "6G"
   taints: ["retina"]
   resources:
     - type: sdr
@@ -61,23 +61,5 @@
       requests: "4G"
       limits: "4G"
     ephemeral-storage:
-      requests: "3G"
-      limit: "3G"
-
-- name: metrics-server
-  type: generic
-  requirements:
-    arch: amd64
-    cpu:
-      requests: 1
-    memory:
-      requests: "500Mi"
-    ephemeral-storage:
-      requests: "1G"
-  environment:
-    - URL: ${RETINA_METRICS_SERVER_URL}
-    - ORG: ${RETINA_METRICS_SERVER_ORG}
-    - BUCKET: ${RETINA_METRICS_SERVER_BUCKET}
-    - TESTBED: ${RETINA_METRICS_SERVER_TESTBED}
-    - TOKEN: ${RETINA_METRICS_SERVER_TOKEN}
-  image: ${SRSGNB_REGISTRY_URI}/metrics_server:${METRICS_SERVER_VERSION}
+      requests: "6G"
+      limits: "6G"
diff --git a/.gitlab/ci/e2e/retina_request_rf_b200.yml b/.gitlab/ci/e2e/retina_request_rf_b200.yml
@@ -31,8 +31,8 @@
       requests: "12G"
       limits: "12G"
     ephemeral-storage:
-      requests: "3G"
-      limit: "3G"
+      requests: "6G"
+      limits: "6G"
   resources:
     - type: sdr
       model: b200
@@ -52,7 +52,7 @@
       limits: "12G"
     ephemeral-storage:
       requests: "9G"
-      limit: "9G"
+      limits: "9G"
   resources:
     - type: sdr
       model: b200
@@ -75,5 +75,5 @@
       requests: "4G"
       limits: "4G"
     ephemeral-storage:
-      requests: "3G"
-      limit: "3G"
+      requests: "6G"
+      limits: "6G"
diff --git a/.gitlab/ci/e2e/retina_request_viavi.yml b/.gitlab/ci/e2e/retina_request_viavi.yml
@@ -0,0 +1,56 @@
+#
+# Copyright 2013-2023 Software Radio Systems Limited
+#
+# By using this file, you agree to the terms and conditions set
+# forth in the LICENSE file which can be found at the top level of
+# the distribution.
+#
+
+- name: srs-gnb
+  type: gnb
+  image: ${RETINA_REGISTRY_PREFIX}/srsgnb:${RETINA_VERSION}
+  requirements:
+    arch: amd64
+    cpu:
+      requests: 22
+      limits: 22
+    memory:
+      requests: "64G"
+      limits: "64G"
+    hugepages-1Gi:
+      requests: 2Gi
+      limits: 2Gi
+    ephemeral-storage:
+      requests: "9G"
+      limits: "9G"
+  taints: ["ci-amd64-avx512-onprem"]
+  resources:
+    - type: emulator
+      model: viavi
+    - type: ru
+      model: viavi
+  environment:
+    - PATH: ${PATH}:/builds/softwareradiosystems/srsgnb/build/apps/gnb
+    - LD_LIBRARY_PATH: /opt/dpdk/${DPDK_VERSION}/lib/x86_64-linux-gnu/
+  shared_files:
+    - local_path: ../../build/apps/gnb/gnb
+      remote_path: /usr/local/bin
+      is_executable: true
+
+- name: metrics-server
+  type: generic
+  requirements:
+    arch: amd64
+    cpu:
+      requests: 1
+    memory:
+      requests: "500Mi"
+    ephemeral-storage:
+      requests: "1G"
+  environment:
+    - URL: ${RETINA_METRICS_SERVER_URL}
+    - ORG: ${RETINA_METRICS_SERVER_ORG}
+    - BUCKET: ${RETINA_METRICS_SERVER_BUCKET}
+    - TESTBED: ${RETINA_METRICS_SERVER_TESTBED}
+    - TOKEN: ${RETINA_METRICS_SERVER_TOKEN}
+  image: ${SRSGNB_REGISTRY_URI}/metrics_server:${METRICS_SERVER_VERSION}
diff --git a/.gitlab/ci/e2e/retina_request_zmq.yml b/.gitlab/ci/e2e/retina_request_zmq.yml
@@ -29,8 +29,8 @@
     memory:
       requests: "8G"
     ephemeral-storage:
-      requests: "3G"
-      limit: "3G"
+      requests: "6G"
+      limits: "6G"
   resources:
     - type: zmq
     - type: license
@@ -49,10 +49,10 @@
       requests: 1
     memory:
       requests: "8G"
-      limit: "8G"
+      limits: "8G"
     ephemeral-storage:
-      requests: "3G"
-      limit: "3G"
+      requests: "6G"
+      limits: "6G"
   resources:
     - type: zmq
   environment:
@@ -71,6 +71,6 @@
     memory:
       requests: "4G"
     ephemeral-storage:
-      requests: "3G"
-      limit: "3G"
+      requests: "6G"
+      limits: "6G"
   image: ${RETINA_REGISTRY_PREFIX}/open5gs:${OPEN5GS_VERSION}_${RETINA_VERSION}