Skip to content

Commit a041e31

Browse files
author
codebot
committed
Update main
2 parents de4477d + 6babd07 commit a041e31

File tree

465 files changed

+47972
-2386
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

465 files changed

+47972
-2386
lines changed

‎.github/workflows/docker.yml‎

Lines changed: 19 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@ jobs:
2020
EXTRA_CMAKE_ARGS: ""
2121
MARCH: ""
2222
PLATFORM: amd64
23-
LIB: ""
24-
LIB_VERSION: ""
23+
UHD_VERSION: ""
24+
DPDK_VERSION: ""
2525
DOCKERFILE: ./docker/metrics_server/Dockerfile
2626
CONTEXT: ./docker/metrics_server
2727
# --> grafana
@@ -30,64 +30,45 @@ jobs:
3030
EXTRA_CMAKE_ARGS: ""
3131
MARCH: ""
3232
PLATFORM: amd64
33-
LIB: ""
34-
LIB_VERSION: ""
33+
UHD_VERSION: ""
34+
DPDK_VERSION: ""
3535
DOCKERFILE: ./docker/grafana/Dockerfile
3636
CONTEXT: ./docker/grafana
37-
# --> split72
37+
# --> gnb
3838
# AMD AVX2
39-
- TAGNAME: split72_release_avx2
39+
- TAGNAME: release_avx2
4040
REPOSITORY: srsran-project
4141
MARCH: x86-64-v3
4242
PLATFORM: amd64
43-
LIB: dpdk
44-
LIB_VERSION: "23.11.1"
43+
UHD_VERSION: "4.7.0.0"
44+
DPDK_VERSION: "23.11.1"
4545
DOCKERFILE: ./docker/Dockerfile
4646
CONTEXT: ./
47-
- TAGNAME: split72_release_with_debug_avx2
47+
- TAGNAME: release_with_debug_avx2
4848
REPOSITORY: srsran-project
4949
EXTRA_CMAKE_ARGS: -DFORCE_DEBUG_INFO=On
5050
MARCH: x86-64-v3
5151
PLATFORM: amd64
52-
LIB: dpdk
53-
LIB_VERSION: "23.11.1"
52+
UHD_VERSION: "4.7.0.0"
53+
DPDK_VERSION: "23.11.1"
5454
DOCKERFILE: ./docker/Dockerfile
5555
CONTEXT: ./
5656
# AMD AVX512
57-
- TAGNAME: split72_release_avx512
57+
- TAGNAME: release_avx512
5858
REPOSITORY: srsran-project
5959
MARCH: x86-64-v4
6060
PLATFORM: amd64
61-
LIB: dpdk
62-
LIB_VERSION: "23.11.1"
61+
UHD_VERSION: "4.7.0.0"
62+
DPDK_VERSION: "23.11.1"
6363
DOCKERFILE: ./docker/Dockerfile
6464
CONTEXT: ./
65-
- TAGNAME: split72_release_with_debug_avx512
65+
- TAGNAME: release_with_debug_avx512
6666
REPOSITORY: srsran-project
6767
EXTRA_CMAKE_ARGS: -DFORCE_DEBUG_INFO=On
6868
MARCH: x86-64-v4
6969
PLATFORM: amd64
70-
LIB: dpdk
71-
LIB_VERSION: "23.11.1"
72-
DOCKERFILE: ./docker/Dockerfile
73-
CONTEXT: ./
74-
# --> split8
75-
# AMD AVX2
76-
- TAGNAME: split8_release_avx2
77-
REPOSITORY: srsran-project
78-
MARCH: x86-64-v3
79-
PLATFORM: amd64
80-
LIB: uhd
81-
LIB_VERSION: "4.7.0.0"
82-
DOCKERFILE: ./docker/Dockerfile
83-
CONTEXT: ./
84-
- TAGNAME: split8_release_with_debug_avx2
85-
REPOSITORY: srsran-project
86-
EXTRA_CMAKE_ARGS: -DFORCE_DEBUG_INFO=On
87-
MARCH: x86-64-v3
88-
PLATFORM: amd64
89-
LIB: uhd
90-
LIB_VERSION: "4.7.0.0"
70+
UHD_VERSION: "4.7.0.0"
71+
DPDK_VERSION: "23.11.1"
9172
DOCKERFILE: ./docker/Dockerfile
9273
CONTEXT: ./
9374
env:
@@ -142,6 +123,6 @@ jobs:
142123
context: ${{ matrix.CONTEXT }}
143124
build-args: |
144125
NAME="${{ env.NAME }}"
145-
LIB=${{ matrix.LIB }}
146-
LIB_VERSION=${{ matrix.LIB_VERSION }}
126+
UHD_VERSION=${{ matrix.UHD_VERSION }}
127+
DPDK_VERSION=${{ matrix.DPDK_VERSION }}
147128
MARCH=${{ matrix.MARCH }}

‎.gitlab/ci-shared/build.yml‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,9 +31,6 @@ variables:
3131
BUILD_ARGS:
3232
description: It will be passed to cmake
3333
value: ""
34-
MAKE_ARGS:
35-
description: It will be passed to make
36-
value: ""
3734
UHD_VERSION:
3835
description: must be one version supported in the specified OS
3936
value: ""
@@ -85,6 +82,7 @@ variables:
8582
ENABLE_FFTW ENABLE_MKL ENABLE_ARMPL \
8683
ENABLE_UHD ENABLE_DPDK ENABLE_ZEROMQ \
8784
ENABLE_ASAN ENABLE_TSAN ENABLE_GCOV \
85+
ENABLE_UBSAN ENABLE_UBSAN_MIN ENABLE_RTSAN \
8886
ENABLE_WERROR FORCE_DEBUG_INFO \
8987
MARCH MTUNE \
9088
; do

‎.gitlab/ci/build.yml‎

Lines changed: 79 additions & 67 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,6 @@ variables:
6666
echo "COMPILER=${COMPILER}"
6767
echo "TEST_MODE=${TEST_MODE}"
6868
echo "BUILD_ARGS=${CMAKE_FLAGS_CMD} ${BUILD_ARGS}"
69-
echo "MAKE_ARGS=${MAKE_ARGS}"
7069
echo "UHD_VERSION=${UHD_VERSION}"
7170
echo "DPDK_VERSION=${DPDK_VERSION}"
7271
echo "SRS_TARGET=${SRS_TARGET}"
@@ -269,17 +268,6 @@ variables:
269268
MARCH: x86-64-v3
270269
INFRASTRUCTURE_TAG: amd64-avx2
271270

272-
.smoke rhel:
273-
extends: .build_and_unit
274-
variables:
275-
OS: rhel-8
276-
COMPILER: gcc
277-
CMAKE_BUILD_TYPE: Release
278-
ASSERT_LEVEL: PARANOID
279-
TEST_MODE: default
280-
MARCH: x86-64-v3
281-
INFRASTRUCTURE_TAG: amd64-avx2
282-
283271
.smoke archlinux:
284272
extends: .build_and_unit
285273
variables:
@@ -397,20 +385,6 @@ smoke tsan cached:
397385
cache:
398386
- *cache_build_get
399387

400-
smoke rhel cached:
401-
extends: .smoke rhel
402-
stage: manual
403-
timeout: 1 hour
404-
rules:
405-
- if: $CI_MERGE_REQUEST_LABELS =~ /ci-no-cache/
406-
when: never
407-
- if: $ON_MR == "true" && $CI_MERGE_REQUEST_APPROVED == "true"
408-
- if: $ON_MR
409-
when: manual
410-
allow_failure: false
411-
cache:
412-
- *cache_build_get
413-
414388
smoke archlinux cached:
415389
extends: .smoke archlinux
416390
stage: manual
@@ -514,11 +488,6 @@ smoke tsan clean:
514488
rules:
515489
- if: $CI_MERGE_REQUEST_LABELS =~ /ci-no-cache/
516490

517-
smoke rhel clean:
518-
extends: .smoke rhel
519-
rules:
520-
- if: $CI_MERGE_REQUEST_LABELS =~ /ci-no-cache/
521-
522491
smoke archlinux clean:
523492
extends: .smoke archlinux
524493
rules:
@@ -681,17 +650,6 @@ smoke tsan update cache:
681650
cache:
682651
- *cache_build_set
683652

684-
smoke rhel update cache:
685-
extends: .smoke rhel
686-
rules:
687-
- if: $CI_DESCRIPTION =~ /Nightly Build Unit Tests Plugin/
688-
when: delayed
689-
start_in: 45 minutes
690-
retry: 2
691-
interruptible: false
692-
cache:
693-
- *cache_build_set
694-
695653
smoke archlinux update cache:
696654
extends: .smoke archlinux
697655
rules:
@@ -996,6 +954,27 @@ ubuntu dpdk:
996954
COMPILER: [gcc, clang]
997955
DPDK_VERSION: ["22.11.6_avx2", "23.11.1_avx2"]
998956

957+
# Nightly Sanitizers
958+
959+
ubsan avx2:
960+
extends: .build_and_unit
961+
rules:
962+
- if: $CI_DESCRIPTION =~ /Nightly Build Unit Tests/
963+
when: delayed
964+
start_in: 45 minutes
965+
variables:
966+
OS: ubuntu-24.10
967+
COMPILER: gcc
968+
CMAKE_BUILD_TYPE: Debug
969+
ASSERT_LEVEL: PARANOID
970+
ENABLE_UBSAN: "True"
971+
TEST_MODE: default
972+
MARCH: x86-64-v3
973+
INFRASTRUCTURE_TAG: amd64-avx2-docker
974+
KUBERNETES_EPHEMERAL_STORAGE_REQUEST: "50G"
975+
KUBERNETES_EPHEMERAL_STORAGE_LIMIT: "50G"
976+
timeout: 2 hours
977+
999978
###################
1000979
# Alternative OSs #
1001980
###################
@@ -1103,28 +1082,6 @@ debian 12 amd64 avx512:
11031082
variables:
11041083
ASSERT_LEVEL: PARANOID
11051084
CMAKE_BUILD_TYPE: Debug
1106-
parallel:
1107-
matrix:
1108-
# ubuntu-22.04 disabled due to https://github.com/google/sanitizers/issues/1259#issuecomment-642312392
1109-
- OS: [ubuntu-24.10, ubuntu-24.04]
1110-
SANITIZER: tsan
1111-
COMPILER: [gcc, clang]
1112-
ENABLE_TSAN: "True"
1113-
TEST_MODE: default
1114-
- OS: [ubuntu-22.04]
1115-
SANITIZER: asan
1116-
COMPILER: [gcc, clang]
1117-
ENABLE_ASAN: "True"
1118-
TEST_MODE: default
1119-
- OS: [ubuntu-24.10, ubuntu-24.04]
1120-
SANITIZER: asan
1121-
COMPILER: clang
1122-
ENABLE_ASAN: "True"
1123-
TEST_MODE: default
1124-
- OS: [ubuntu-24.10, ubuntu-24.04]
1125-
SANITIZER: valgrind
1126-
COMPILER: gcc
1127-
TEST_MODE: valgrind
11281085

11291086
sanitizers amd64 native:
11301087
extends: .weekly sanitizers
@@ -1149,6 +1106,14 @@ sanitizers amd64 native:
11491106
ENABLE_ASAN: "True"
11501107
TEST_MODE: default
11511108
# Valgrind doesn't support AVX512 instruction set
1109+
- OS: [ubuntu-24.10, ubuntu-24.04]
1110+
SANITIZER: ubsan
1111+
COMPILER: [gcc, clang]
1112+
ENABLE_UBSAN: "True"
1113+
TEST_MODE: default
1114+
INFRASTRUCTURE_TAG: amd64-docker
1115+
KUBERNETES_EPHEMERAL_STORAGE_REQUEST: "50G"
1116+
KUBERNETES_EPHEMERAL_STORAGE_LIMIT: "50G"
11521117

11531118
sanitizers amd64 avx2:
11541119
extends: .weekly sanitizers
@@ -1177,6 +1142,14 @@ sanitizers amd64 avx2:
11771142
SANITIZER: valgrind
11781143
COMPILER: gcc
11791144
TEST_MODE: valgrind
1145+
- OS: [ubuntu-24.10, ubuntu-24.04]
1146+
SANITIZER: ubsan
1147+
COMPILER: [gcc, clang]
1148+
ENABLE_UBSAN: "True"
1149+
TEST_MODE: default
1150+
INFRASTRUCTURE_TAG: amd64-avx2-docker
1151+
KUBERNETES_EPHEMERAL_STORAGE_REQUEST: "50G"
1152+
KUBERNETES_EPHEMERAL_STORAGE_LIMIT: "50G"
11801153

11811154
sanitizers amd64 avx512:
11821155
extends: .weekly sanitizers
@@ -1202,17 +1175,54 @@ sanitizers amd64 avx512:
12021175
ENABLE_ASAN: "True"
12031176
TEST_MODE: default
12041177
# Valgrind doesn't support AVX512 instruction set
1178+
- OS: [ubuntu-24.10, ubuntu-24.04]
1179+
SANITIZER: ubsan
1180+
COMPILER: [gcc, clang]
1181+
ENABLE_UBSAN: "True"
1182+
TEST_MODE: default
1183+
INFRASTRUCTURE_TAG: amd64-avx2-avx512-docker
1184+
KUBERNETES_EPHEMERAL_STORAGE_REQUEST: "50G"
1185+
KUBERNETES_EPHEMERAL_STORAGE_LIMIT: "50G"
12051186

12061187
sanitizers arm native:
12071188
extends: .weekly sanitizers
12081189
variables:
12091190
INFRASTRUCTURE_TAG: arm64
1191+
parallel:
1192+
matrix:
1193+
# ubuntu-22.04 disabled due to https://github.com/google/sanitizers/issues/1259#issuecomment-642312392
1194+
- OS: [ubuntu-24.10, ubuntu-24.04]
1195+
SANITIZER: tsan
1196+
COMPILER: [gcc, clang]
1197+
ENABLE_TSAN: "True"
1198+
TEST_MODE: default
1199+
- OS: [ubuntu-22.04]
1200+
SANITIZER: asan
1201+
COMPILER: [gcc, clang]
1202+
ENABLE_ASAN: "True"
1203+
TEST_MODE: default
1204+
- OS: [ubuntu-24.10, ubuntu-24.04]
1205+
SANITIZER: asan
1206+
COMPILER: clang
1207+
ENABLE_ASAN: "True"
1208+
TEST_MODE: default
1209+
- OS: [ubuntu-24.10, ubuntu-24.04]
1210+
SANITIZER: valgrind
1211+
COMPILER: gcc
1212+
TEST_MODE: valgrind
1213+
- OS: [ubuntu-24.10, ubuntu-24.04]
1214+
SANITIZER: ubsan
1215+
COMPILER: [gcc, clang]
1216+
ENABLE_UBSAN: "True"
1217+
TEST_MODE: default
1218+
INFRASTRUCTURE_TAG: arm64-docker
1219+
KUBERNETES_EPHEMERAL_STORAGE_REQUEST: "50G"
1220+
KUBERNETES_EPHEMERAL_STORAGE_LIMIT: "50G"
12101221

12111222
sanitizers arm neon:
1212-
extends: .weekly sanitizers
1223+
extends: sanitizers arm native
12131224
variables:
12141225
MARCH: armv8.2-a+crypto+fp16+dotprod
1215-
INFRASTRUCTURE_TAG: arm64
12161226

12171227
# UHD Alternatives
12181228

@@ -1344,7 +1354,7 @@ ubuntu-24.04 amd64 avx512 TRACE:
13441354
OS: ubuntu-24.04
13451355
MARCH: x86-64-v4
13461356
INFRASTRUCTURE_TAG: amd64-avx2-avx512
1347-
BUILD_ARGS: -DCMAKE_CXX_FLAGS="-D SRSRAN_L2_TRACE -D SRSRAN_L1_TRACE -D SRSRAN_L2_LATE_TRACE -D SRSRAN_OFH_TRACE -D SRSRAN_UP_TRACE"
1357+
CXXFLAGS: -D SRSRAN_L2_TRACE -D SRSRAN_L1_TRACE -D SRSRAN_L2_LATE_TRACE -D SRSRAN_OFH_TRACE -D SRSRAN_UP_TRACE
13481358
parallel:
13491359
matrix:
13501360
- <<: *basic_combinations
@@ -1603,6 +1613,8 @@ ubuntu-24.10 amd64 avx512 dpdk:
16031613
###############
16041614
basic package:
16051615
extends: .deb-package
1616+
tags:
1617+
- ${INFRASTRUCTURE_TAG}
16061618
stage: build and unit tests
16071619
rules:
16081620
- if: $CI_DESCRIPTION =~ /Nightly E2E Tests OpenSource/

0 commit comments

Comments
 (0)