Skip to content

Commit a83bd10

Browse files
codebotasaezper
authored andcommitted
Update main
# Conflicts: # apps/gnb/adapters/e1ap_adapter.h # include/srsran/cu_cp/cu_up_processor_factory.h # include/srsran/phy/upper/channel_processors/pusch_decoder.h # include/srsran/phy/upper/channel_processors/ulsch_demultiplex.h # include/srsran/phy/upper/channel_processors/ulsch_placeholder_list.h # include/srsran/ran/csi_report/csi_report_wideband_cqi.h # lib/cu_cp/adapters/cu_up_processor_adapters.h # lib/cu_cp/routine_managers/cu_up_processor_routine_manager.cpp # lib/cu_cp/routine_managers/cu_up_processor_routine_manager.h # lib/cu_cp/routines/initial_cu_up_processor_setup_routine.cpp # lib/cu_cp/routines/initial_cu_up_processor_setup_routine.h # lib/e1ap/cu_cp/procedures/cu_cp_e1_setup_procedure.cpp # lib/e1ap/cu_cp/procedures/cu_cp_e1_setup_procedure.h # lib/e2/common/e2_du_metrics_manager.cpp # lib/e2/e2sm/e2sm_kpm_asn1_packer.cpp # lib/e2/e2sm/e2sm_kpm_impl.h # lib/phy/upper/channel_processors/pusch_demodulator_impl.cpp # lib/phy/upper/channel_processors/ulsch_demultiplex_impl.cpp # lib/phy/upper/channel_processors/ulsch_demultiplex_impl.h # lib/ran/csi_report/csi_report_unpacking.cpp # lib/ran/csi_report/csi_report_unpacking_helpers.h # tests/unittests/cu_cp/cu_up_processor/cu_up_processor_routine_manager_test_helpers.cpp # tests/unittests/cu_cp/cu_up_processor/cu_up_processor_routine_manager_test_helpers.h # tests/unittests/cu_cp/cu_up_processor/initial_cu_up_processor_setup_routine_test.cpp # tests/unittests/ofh/compression/ofh_compression_test_data.tar.gz # tests/unittests/phy/generic_functions/dft_processor_test_data.tar.gz # tests/unittests/phy/lower/modulation/ofdm_demodulator_test_data.tar.gz # tests/unittests/phy/lower/modulation/ofdm_modulator_test_data.tar.gz # tests/unittests/phy/lower/modulation/ofdm_prach_demodulator_test_data.tar.gz # tests/unittests/phy/support/resource_grid_mapper_test_doubles.cpp # tests/unittests/phy/upper/channel_coding/ldpc/ldpc_encoder_test_data.tar.gz # tests/unittests/phy/upper/channel_coding/ldpc/ldpc_rate_matcher_test_data.tar.gz # tests/unittests/phy/upper/channel_coding/ldpc/ldpc_segmenter_test_data.tar.gz # tests/unittests/phy/upper/channel_coding/short/short_block_detector_test_data.tar.gz # tests/unittests/phy/upper/channel_coding/short/short_block_encoder_test_data.tar.gz # tests/unittests/phy/upper/channel_modulation/demodulation_mapper_test_data.tar.gz # tests/unittests/phy/upper/channel_modulation/modulation_mapper_test_data.tar.gz # tests/unittests/phy/upper/channel_processors/pbch_encoder_test_data.tar.gz # tests/unittests/phy/upper/channel_processors/pbch_modulator_test_data.tar.gz # tests/unittests/phy/upper/channel_processors/pdcch_encoder_test_data.tar.gz # tests/unittests/phy/upper/channel_processors/pdcch_modulator_test_data.tar.gz # tests/unittests/phy/upper/channel_processors/pdcch_processor_test_data.tar.gz # tests/unittests/phy/upper/channel_processors/pdsch_encoder_test_data.tar.gz # tests/unittests/phy/upper/channel_processors/pdsch_modulator_test_data.tar.gz # tests/unittests/phy/upper/channel_processors/pdsch_processor_test_data.tar.gz # tests/unittests/phy/upper/channel_processors/prach_detector_test_data.tar.gz # tests/unittests/phy/upper/channel_processors/prach_generator_test_data.tar.gz # tests/unittests/phy/upper/channel_processors/pucch_demodulator_format2_test_data.tar.gz # tests/unittests/phy/upper/channel_processors/pucch_detector_test_data.tar.gz # tests/unittests/phy/upper/channel_processors/pucch_processor_format1_test_data.tar.gz # tests/unittests/phy/upper/channel_processors/pucch_processor_format2_test_data.tar.gz # tests/unittests/phy/upper/channel_processors/pusch_decoder_test_data.h # tests/unittests/phy/upper/channel_processors/pusch_decoder_test_doubles.h # tests/unittests/phy/upper/channel_processors/pusch_demodulator_test_data.h # tests/unittests/phy/upper/channel_processors/pusch_demodulator_test_doubles.h # tests/unittests/phy/upper/channel_processors/pusch_processor_test_data.h # tests/unittests/phy/upper/channel_processors/ssb_processor_test_data.tar.gz # tests/unittests/phy/upper/channel_processors/uci_decoder_test_data.tar.gz # tests/unittests/phy/upper/channel_processors/ulsch_demultiplex_test.cpp # tests/unittests/phy/upper/channel_processors/ulsch_demultiplex_test_data.h # tests/unittests/phy/upper/channel_processors/ulsch_demultiplex_test_doubles.h # tests/unittests/phy/upper/equalization/channel_equalizer_test_data.tar.gz # tests/unittests/phy/upper/signal_processors/dmrs_pbch_processor_test_data.tar.gz # tests/unittests/phy/upper/signal_processors/dmrs_pdcch_processor_test_data.tar.gz # tests/unittests/phy/upper/signal_processors/dmrs_pdsch_processor_test_data.tar.gz # tests/unittests/phy/upper/signal_processors/dmrs_pucch_processor_test_data.tar.gz # tests/unittests/phy/upper/signal_processors/dmrs_pusch_estimator_test_data.tar.gz # tests/unittests/phy/upper/signal_processors/nzp_csi_rs_generator_test_data.tar.gz # tests/unittests/phy/upper/signal_processors/port_channel_estimator_test_data.tar.gz # tests/unittests/radio/zmq/radio_zmq_e2e_test.cpp
2 parents 1afd724 + 73c9e72 commit a83bd10

File tree

1,077 files changed

+46197
-18156
lines changed

Some content is hidden

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

1,077 files changed

+46197
-18156
lines changed

.clang-tidy

Lines changed: 20 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -14,26 +14,36 @@ Checks: '*,-fuchsia-*,
1414
-cppcoreguidelines-avoid-magic-numbers,-readability-magic-numbers,
1515
-cppcoreguidelines-pro-bounds-array-to-pointer-decay,-hicpp-no-array-decay,
1616
-cppcoreguidelines-pro-bounds-constant-array-index,-cppcoreguidelines-pro-type-cstyle-cast,
17-
-cppcoreguidelines-pro-type-union-access,
18-
-cppcoreguidelines-pro-type-static-cast-downcast,
17+
-cppcoreguidelines-pro-type-union-access,-cppcoreguidelines-pro-type-static-cast-downcast,
18+
-cppcoreguidelines-macro-usage,
19+
-cppcoreguidelines-avoid-const-or-ref-data-members,
20+
-cppcoreguidelines-non-private-member-variables-in-classes,
21+
-cppcoreguidelines-special-member-functions,
22+
-cppcoreguidelines-avoid-do-while,
1923
-modernize-use-using,-modernize-use-trailing-return-type,
2024
-modernize-use-auto,-hicpp-use-auto,
2125
-llvmlibc-callee-namespace,-llvmlibc-implementation-in-namespace,-llvmlibc-restrict-system-libc-headers,
22-
-llvm-header-guard,
26+
-llvm-header-guard,-llvmlibc-inline-function-decl,
27+
-bugprone-easily-swappable-parameters,
2328
-google-runtime-references,-google-readability-casting,-google-build-using-namespace,
29+
-google-readability-avoid-underscore-in-googletest-name,
2430
google-default-arguments,-cppcoreguidelines-pro-bounds-pointer-arithmetic,
2531
-cert-err58-cpp,
26-
-altera-unroll-loops,
32+
-altera-unroll-loops,-altera-id-dependent-backward-branch,
2733
-readability-function-cognitive-complexity,-readability-isolate-declaration,
2834
-misc-non-private-member-variables-in-classes,-altera-struct-pack-align,-readability-uppercase-literal-suffix,
29-
-cppcoreguidelines-non-private-member-variables-in-classes,
35+
-misc-use-anonymous-namespace,
36+
-hicpp-special-member-functions,
3037
-readability-identifier-length,
3138
readability-identifier-naming'
3239
HeaderFilterRegex: ''
3340
AnalyzeTemporaryDtors: false
3441
CheckOptions:
35-
- { key: readability-identifier-naming.NamespaceCase, value: lower_case }
36-
- { key: readability-identifier-naming.ClassCase, value: lower_case }
37-
- { key: readability-identifier-naming.StructCase, value: lower_case }
38-
- { key: readability-identifier-naming.VariableCase, value: lower_case }
39-
42+
- key: readability-identifier-naming.NamespaceCase
43+
value: lower_case
44+
- key: readability-identifier-naming.ClassCase
45+
value: lower_case
46+
- key: readability-identifier-naming.StructCase
47+
value: lower_case
48+
- key: readability-identifier-naming.VariableCase
49+
value: lower_case

.gitlab-ci.yml

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -25,19 +25,19 @@
2525

2626
include:
2727
- project: softwareradiosystems/ci/tools
28-
ref: "10"
28+
ref: "12"
2929
file: .gitlab/ci-shared/setup/all.yml
3030
- project: softwareradiosystems/ci/tools
31-
ref: "10"
31+
ref: "12"
3232
file: .gitlab/ci-shared/features/all.yml
3333
- project: softwareradiosystems/ci/tools
34-
ref: "10"
34+
ref: "12"
3535
file: .gitlab/ci-shared/tools/python.yml
3636
- project: softwareradiosystems/ci/tools
37-
ref: "10"
37+
ref: "12"
3838
file: .gitlab/ci-shared/tools/test_reporter.yml
3939
- project: softwareradiosystems/ci/tools
40-
ref: "10"
40+
ref: "12"
4141
file: .gitlab/ci-shared/tools/tagger.yml
4242
- local: .gitlab/ci/builders/version.yml
4343
- local: .gitlab/ci/build.yml
@@ -115,7 +115,7 @@ full-code-format:
115115
ANALYZER_ARGS: ""
116116
ARTIFACT_EXTRA_PATH: ""
117117
KUBERNETES_MEMORY_REQUEST: 6Gi
118-
KUBERNETES_CPU_REQUEST: 4
118+
KUBERNETES_CPU_REQUEST: "3.5"
119119
before_script:
120120
- |
121121
echo "
@@ -349,6 +349,7 @@ pages:
349349
rules:
350350
- if: $CI_DESCRIPTION == "Nightly"
351351
when: always # Even if previous stages/required jobs fail
352+
allow_failure: true
352353
image: ${GITLAB_REGISTRY_URI}/${CI_TOOLS_REPO}/doxygen:2.0.0
353354
script:
354355
- mkdir public

.gitlab/ci/build.yml

Lines changed: 58 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020

2121
include:
2222
- project: softwareradiosystems/ci/tools
23-
ref: "10"
23+
ref: "12"
2424
file: .gitlab/ci-shared/setup/all.yml
2525
- project: softwareradiosystems/ci/srsran_project_packaging
2626
ref: "1"
@@ -40,8 +40,6 @@ variables:
4040
description: Computer architecture and supported instruction sets
4141
options:
4242
- "aws-spot-amd64"
43-
- "aws-demand-amd64-avx2"
44-
- "aws-demand-amd64-avx2-avx512"
4543
- "aws-spot-arm64"
4644
- "on-prem-amd64"
4745
- "on-prem-arm64"
@@ -87,12 +85,12 @@ variables:
8785
################
8886

8987
.cache_build_set: &cache_build_set
90-
- key: ${OS}-${COMPILER}
88+
- key: ${OS}-${COMPILER}-${BUILD_TYPE}
9189
paths: [ccache]
9290
policy: push
9391

9492
.cache_build_get: &cache_build_get
95-
- key: ${OS}-${COMPILER}
93+
- key: ${OS}-${COMPILER}-${BUILD_TYPE}
9694
paths: [ccache]
9795
policy: pull
9896

@@ -132,7 +130,6 @@ variables:
132130
- job: trigger builder
133131
optional: true
134132
artifacts: false
135-
resource_group: ${CI_JOB_NAME_SLUG}_${GITLAB_USER_LOGIN}
136133
before_script:
137134
- !reference [.fetch_src_cache, script]
138135
- |
@@ -563,6 +560,7 @@ smoke tsan update cache:
563560
when: never
564561
- if: $CI_DESCRIPTION =~ /Nightly/
565562
interruptible: false
563+
retry: 2
566564
variables:
567565
SAVE_ARTIFACTS: "True"
568566
cache:
@@ -593,15 +591,16 @@ smoke archlinux update cache:
593591

594592
# High priority smoke checks. Some of them save the binary for e2e tests
595593

596-
basic debug:
594+
basic rel with deb info:
597595
extends: .build_and_unit
598596
rules:
599597
- if: $CI_DESCRIPTION =~ /Nightly/
600598
interruptible: false
599+
retry: 2
601600
variables:
602601
OS: ubuntu-22.04
603602
COMPILER: gcc
604-
BUILD_TYPE: Debug
603+
BUILD_TYPE: RelWithDebInfo
605604
ASSERT_LEVEL: PARANOID
606605
TEST_MODE: none
607606
AUTO_DETECT_ISA: "True"
@@ -613,6 +612,7 @@ basic asan:
613612
extends: .build_and_unit
614613
rules:
615614
- if: $CI_DESCRIPTION =~ /Nightly/
615+
retry: 2
616616
interruptible: false
617617
variables:
618618
OS: ubuntu-22.04
@@ -631,6 +631,7 @@ basic valgrind:
631631
rules:
632632
- if: $CI_DESCRIPTION =~ /Nightly/
633633
interruptible: false
634+
retry: 2
634635
variables:
635636
OS: ubuntu-22.04
636637
COMPILER: gcc
@@ -658,7 +659,6 @@ package:
658659
matrix:
659660
- OS_VERSION: "20.04"
660661
- OS_VERSION: "22.04"
661-
- OS_VERSION: "22.10"
662662
- OS_VERSION: "23.04"
663663
needs: []
664664

@@ -677,7 +677,6 @@ install-package:
677677
matrix:
678678
- OS_VERSION: "20.04"
679679
- OS_VERSION: "22.04"
680-
- OS_VERSION: "22.10"
681680
- OS_VERSION: "23.04"
682681
needs:
683682
- package
@@ -997,7 +996,7 @@ debian 11 amd64 avx512:
997996
BUILD_TYPE: Debug
998997
parallel:
999998
matrix:
1000-
- OS: [ubuntu-23.04, ubuntu-22.04, ubuntu-20.04]
999+
- OS: [ubuntu-23.04, ubuntu-22.04] # ubuntu-20.04 disabled due to https://bugs.launchpad.net/ubuntu/+source/gcc-9/+bug/2029910
10011000
SANITIZER: tsan
10021001
COMPILER: [gcc, clang]
10031002
ENABLE_TSAN: "True"
@@ -1024,14 +1023,21 @@ sanitizers amd64 no isa:
10241023
AUTO_DETECT_ISA: "False"
10251024
tags: ["${AMD64_TAG}"]
10261025

1026+
sanitizers amd64 avx2:
1027+
extends: .weekly sanitizers
1028+
variables:
1029+
AUTO_DETECT_ISA: "True"
1030+
ENABLE_AVX512: "False"
1031+
tags: ["${AMD64_AVX2_TAG}"]
1032+
10271033
sanitizers amd64 avx512:
10281034
extends: .weekly sanitizers
10291035
variables:
10301036
AUTO_DETECT_ISA: "True"
10311037
tags: ["${AMD64_AVX512_TAG}"]
10321038
parallel:
10331039
matrix:
1034-
- OS: [ubuntu-23.04, ubuntu-22.04, ubuntu-20.04]
1040+
- OS: [ubuntu-23.04, ubuntu-22.04] # ubuntu-20.04 disabled due to https://bugs.launchpad.net/ubuntu/+source/gcc-9/+bug/2029910
10351041
SANITIZER: tsan
10361042
COMPILER: [gcc, clang]
10371043
ENABLE_TSAN: "True"
@@ -1314,10 +1320,49 @@ rhel-8 arm neon:
13141320
<<: *basic_combinations
13151321
AUTO_DETECT_ISA: "True"
13161322

1323+
#############
1324+
# Run check #
1325+
#############
1326+
1327+
check-affinity-manager-nocpu:
1328+
image: ${CR_REGISTRY_URI}/srsgnb/builder-ubuntu-22.04:${DOCKER_BUILDER_VERSION}
1329+
tags: ["${AMD64_TAG}"]
1330+
stage: build and unit tests
1331+
needs:
1332+
- job: "smoke release update cache"
1333+
artifacts: true
1334+
- job: builder version
1335+
optional: false
1336+
artifacts: true
1337+
rules:
1338+
- if: $CI_DESCRIPTION =~ /Nightly/
1339+
script:
1340+
- cd build/apps/gnb
1341+
- taskset -c 0-2 "./gnb" 2>&1 || true
1342+
- |
1343+
error_found=false
1344+
for (( i=1; i<=8; i++ ))
1345+
do
1346+
echo "Checking for number of CPU = $i"
1347+
output=$(taskset -c 0-$i "./gnb" 2>&1 || true)
1348+
1349+
if [[ "$output" == *"nof_cores_for_non_prio_threads"* ]]; then
1350+
error_found=true
1351+
echo "**********************************************************************************"
1352+
echo $output
1353+
echo "**********************************************************************************"
1354+
echo "Error for number of CPU = $i"
1355+
echo -e "\n\n\n\n\n"
1356+
fi
1357+
done
1358+
1359+
if [ "$error_found" = true ]; then
1360+
exit 1
1361+
fi
1362+
13171363
#######
13181364
# Web #
13191365
#######
1320-
13211366
custom-build:
13221367
extends: .build_and_unit
13231368
rules:

.gitlab/ci/builders.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
include:
22
- project: softwareradiosystems/ci/tools
3-
ref: "10"
3+
ref: "12"
44
file: .gitlab/ci-shared/setup/default.yml
55
- project: softwareradiosystems/ci/tools
6-
ref: "10"
6+
ref: "12"
77
file: .gitlab/ci-shared/setup/workflow.yml
88
- project: softwareradiosystems/ci/tools
9-
ref: "10"
9+
ref: "12"
1010
file: .gitlab/ci-shared/tools/docker.yml
1111
- project: softwareradiosystems/ci/tools
12-
ref: "10"
12+
ref: "12"
1313
file: .gitlab/ci-shared/setup/versions.yml
1414
- local: .gitlab/ci/builders/version.yml
1515
- local: .gitlab/ci/src_cache.yml
@@ -38,7 +38,7 @@ stages:
3838
uhd_version: ""
3939
GIT_STRATEGY: none
4040
KUBERNETES_MEMORY_REQUEST: 7Gi
41-
KUBERNETES_CPU_REQUEST: 4
41+
KUBERNETES_CPU_REQUEST: 3
4242
before_script:
4343
- TZ=Europe/Madrid && ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
4444

@@ -165,7 +165,7 @@ docker-builder-publish [codechecker]:
165165
PLATFORM: amd64
166166
MODE: publish
167167
tags:
168-
- aws-spot-$PLATFORM
168+
- $PLATFORM
169169
rules:
170170
- if: $ON_MR
171171
before_script:

.gitlab/ci/builders/archlinux/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ FROM archlinux:$VERSION
44
ADD install_dependencies.sh /usr/local/bin
55
RUN chmod +x /usr/local/bin/install_dependencies.sh
66

7-
RUN TZ=Europe/Madrid && ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
7+
RUN TZ=Europe/Madrid && ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ >/etc/timezone
88
RUN pacman-key --init \
99
&& pacman -Sy --noconfirm archlinux-keyring \
1010
&& pacman-key --populate archlinux \

0 commit comments

Comments
 (0)