Skip to content

Commit e6a2983

Browse files
committed
ci,libs: build alternative uhd and dpdk with specific flags
1 parent 468b0da commit e6a2983

File tree

5 files changed

+162
-69
lines changed

5 files changed

+162
-69
lines changed

.gitlab/ci/build.yml

Lines changed: 15 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -417,9 +417,9 @@ variables:
417417
ENABLE_DPDK: "True"
418418
ASSERT_LEVEL: PARANOID
419419
AUTO_DETECT_ISA: "False"
420-
DPDK_VERSION: "23.11"
420+
DPDK_VERSION: "23.11_avx2"
421421
BUILD_ARGS: -DCMAKE_CXX_FLAGS="-march=x86-64-v3"
422-
tags: ["${AMD64_TAG}"]
422+
tags: ["${AMD64_AVX2_TAG}"]
423423

424424
.smoke valgrind:
425425
extends: .build_and_unit
@@ -1144,18 +1144,18 @@ ubuntu dpdk:
11441144
ASSERT_LEVEL: PARANOID
11451145
AUTO_DETECT_ISA: "True"
11461146
ENABLE_AVX512: "False"
1147-
tags: ["${AMD64_TAG}"]
1147+
tags: ["${AMD64_AVX2_TAG}"]
11481148
parallel:
11491149
matrix:
11501150
- OS: ubuntu-24.04
11511151
COMPILER: [gcc, clang]
1152-
DPDK_VERSION: ["23.11"]
1152+
DPDK_VERSION: ["23.11_avx2"]
11531153
- OS: ubuntu-23.10
11541154
COMPILER: [gcc, clang]
1155-
DPDK_VERSION: ["22.11.3", "23.11"]
1155+
DPDK_VERSION: ["22.11.3_avx2", "23.11_avx2"]
11561156
- OS: ubuntu-22.04
11571157
COMPILER: [gcc, clang]
1158-
DPDK_VERSION: ["22.11.3", "23.11"]
1158+
DPDK_VERSION: ["22.11.3_avx2", "23.11_avx2"]
11591159
- OS: ubuntu-20.04
11601160
COMPILER: [gcc, clang]
11611161
DPDK_VERSION: ["22.11.3", "23.11"]
@@ -1397,7 +1397,7 @@ build uhd alt:
13971397
TEST_MODE: none
13981398
ASSERT_LEVEL: PARANOID
13991399
AUTO_DETECT_ISA: "False"
1400-
tags: ["${AMD64_TAG}"]
1400+
tags: ["${AMD64_AVX2_TAG}"]
14011401
parallel:
14021402
matrix:
14031403
- OS: ubuntu-24.04
@@ -1723,7 +1723,6 @@ rhel-8 arm neon:
17231723
ENABLE_ZEROMQ: "False"
17241724
ENABLE_DPDK: "True"
17251725
COMPILER: [gcc, clang]
1726-
DPDK_VERSION: ["22.11.3", "23.11"]
17271726

17281727
ubuntu-20.04 amd64 avx2 dpdk:
17291728
extends: .build_and_unit
@@ -1737,6 +1736,7 @@ ubuntu-20.04 amd64 avx2 dpdk:
17371736
matrix:
17381737
- OS: ubuntu-20.04
17391738
<<: *basic_combinations_dpdk
1739+
DPDK_VERSION: ["22.11.3", "23.11"]
17401740
AUTO_DETECT_ISA: "True"
17411741
ENABLE_AVX512: "False"
17421742

@@ -1752,6 +1752,7 @@ ubuntu-20.04 amd64 avx512 dpdk:
17521752
matrix:
17531753
- OS: ubuntu-20.04
17541754
<<: *basic_combinations_dpdk
1755+
DPDK_VERSION: ["22.11.3", "23.11"]
17551756
AUTO_DETECT_ISA: "True"
17561757
ENABLE_AVX512: "True"
17571758

@@ -1767,6 +1768,7 @@ ubuntu-22.04 amd64 avx2 dpdk:
17671768
matrix:
17681769
- OS: ubuntu-22.04
17691770
<<: *basic_combinations_dpdk
1771+
DPDK_VERSION: ["22.11.3_avx2", "23.11_avx2"]
17701772
AUTO_DETECT_ISA: "True"
17711773
ENABLE_AVX512: "False"
17721774

@@ -1782,6 +1784,7 @@ ubuntu-22.04 amd64 avx512 dpdk:
17821784
matrix:
17831785
- OS: ubuntu-22.04
17841786
<<: *basic_combinations_dpdk
1787+
DPDK_VERSION: ["22.11.3_avx512", "23.11_avx512"]
17851788
AUTO_DETECT_ISA: "True"
17861789
ENABLE_AVX512: "True"
17871790

@@ -1797,6 +1800,7 @@ ubuntu-23.10 amd64 avx2 dpdk:
17971800
matrix:
17981801
- OS: ubuntu-23.10
17991802
<<: *basic_combinations_dpdk
1803+
DPDK_VERSION: ["22.11.3_avx2", "23.11_avx2"]
18001804
AUTO_DETECT_ISA: "True"
18011805
ENABLE_AVX512: "False"
18021806

@@ -1812,6 +1816,7 @@ ubuntu-23.10 amd64 avx512 dpdk:
18121816
matrix:
18131817
- OS: ubuntu-23.10
18141818
<<: *basic_combinations_dpdk
1819+
DPDK_VERSION: ["22.11.3_avx512", "23.11_avx512"]
18151820
AUTO_DETECT_ISA: "True"
18161821
ENABLE_AVX512: "True"
18171822

@@ -1827,7 +1832,7 @@ ubuntu-24.04 amd64 avx2 dpdk:
18271832
matrix:
18281833
- OS: ubuntu-24.04
18291834
<<: *basic_combinations_dpdk
1830-
DPDK_VERSION: "23.11"
1835+
DPDK_VERSION: "23.11_avx2"
18311836
AUTO_DETECT_ISA: "True"
18321837
ENABLE_AVX512: "False"
18331838

@@ -1843,7 +1848,7 @@ ubuntu-24.04 amd64 avx512 dpdk:
18431848
matrix:
18441849
- OS: ubuntu-24.04
18451850
<<: *basic_combinations_dpdk
1846-
DPDK_VERSION: "23.11"
1851+
DPDK_VERSION: "23.11_avx512"
18471852
AUTO_DETECT_ISA: "True"
18481853
ENABLE_AVX512: "True"
18491854

0 commit comments

Comments
 (0)