Skip to content

Commit db9f89b

Browse files
MatiasEloMatiasElo
authored
Merge ODP v1.46.0.0
Merge ODP linux-generic v1.46.0.0 into linux-dpdk.
2 parents 9c41b3b + 600b4d4 commit db9f89b

File tree

168 files changed

+5541
-8612
lines changed

Some content is hidden

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

168 files changed

+5541
-8612
lines changed

‎.github/workflows/ci-pipeline-arm64.yml

Lines changed: 42 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
name: CI arm64
22

33
# github.repository has been used to ensure CI is only run on the repo where
4-
# self-hosted runners are installed. This will prevent [self-hosted, ARM64] CI failing on forks
4+
# self-hosted runners are installed. This will prevent CI failing on forks.
55

66
on: [push, pull_request, merge_group]
77
env:
@@ -13,7 +13,7 @@ env:
1313
jobs:
1414
Build_gcc:
1515
if: ${{ github.repository == 'OpenDataPlane/odp-dpdk' }}
16-
runs-on: [self-hosted, ARM64]
16+
runs-on: ah-ubuntu_22_04-c7g_2x-50
1717
strategy:
1818
fail-fast: false
1919
matrix:
@@ -30,13 +30,13 @@ jobs:
3030
- uses: OpenDataPlane/action-clean-up@main
3131
- uses: actions/checkout@v4
3232
- run: sudo docker run -i -v `pwd`:/odp --privileged --shm-size 8g -e CC=gcc
33-
-e CONF="${{matrix.conf}}" $CONTAINER_NAMESPACE/odp-ci-${OS}-${ARCH}-native /odp/scripts/ci/build_${ARCH}.sh
33+
-e CONF="${{matrix.conf}}" $CONTAINER_NAMESPACE/odp-ci-${OS}-${ARCH}-graviton3 /odp/scripts/ci/build_${ARCH}.sh
3434
- if: ${{ failure() }}
3535
uses: ./.github/actions/build-failure-log
3636

3737
Build_clang:
3838
if: ${{ github.repository == 'OpenDataPlane/odp-dpdk' }}
39-
runs-on: [self-hosted, ARM64]
39+
runs-on: ah-ubuntu_22_04-c7g_2x-50
4040
strategy:
4141
fail-fast: false
4242
matrix:
@@ -53,32 +53,32 @@ jobs:
5353
- uses: OpenDataPlane/action-clean-up@main
5454
- uses: actions/checkout@v4
5555
- run: sudo docker run -i -v `pwd`:/odp --privileged --shm-size 8g -e CC=clang
56-
-e CONF="${{matrix.conf}}" $CONTAINER_NAMESPACE/odp-ci-${OS}-${ARCH}-native /odp/scripts/ci/build_${ARCH}.sh
56+
-e CONF="${{matrix.conf}}" $CONTAINER_NAMESPACE/odp-ci-${OS}-${ARCH}-graviton3 /odp/scripts/ci/build_${ARCH}.sh
5757
- if: ${{ failure() }}
5858
uses: ./.github/actions/build-failure-log
5959

60-
Build_static_u22:
60+
Build_static_u24:
6161
if: ${{ github.repository == 'OpenDataPlane/odp-dpdk' }}
62-
runs-on: [self-hosted, ARM64]
62+
runs-on: ah-ubuntu_22_04-c7g_2x-50
6363
env:
64-
OS: ubuntu_22.04
64+
OS: ubuntu_24.04
6565
CONF: "--disable-shared --without-openssl --without-pcap"
6666
strategy:
6767
fail-fast: false
6868
matrix:
69-
cc_ver: [10, 11, 12]
69+
cc_ver: [10, 14]
7070
conf: ['', '--enable-lto']
7171
steps:
7272
- uses: OpenDataPlane/action-clean-up@main
7373
- uses: actions/checkout@v4
7474
- run: sudo docker run -i -v `pwd`:/odp --privileged --shm-size 8g -e CC="gcc-${{matrix.cc_ver}}" -e CXX="g++-${{matrix.cc_ver}}"
75-
-e CONF="${CONF} ${{matrix.conf}}" $CONTAINER_NAMESPACE/odp-ci-${OS}-${ARCH}-native /odp/scripts/ci/build_static.sh
75+
-e CONF="${CONF} ${{matrix.conf}}" $CONTAINER_NAMESPACE/odp-ci-${OS}-${ARCH}-graviton3 /odp/scripts/ci/build_static.sh
7676
- if: ${{ failure() }}
7777
uses: ./.github/actions/build-failure-log
7878

7979
Build_OS:
8080
if: ${{ github.repository == 'OpenDataPlane/odp-dpdk' }}
81-
runs-on: [self-hosted, ARM64]
81+
runs-on: ah-ubuntu_22_04-c7g_2x-50
8282
strategy:
8383
fail-fast: false
8484
matrix:
@@ -88,42 +88,42 @@ jobs:
8888
- uses: OpenDataPlane/action-clean-up@main
8989
- uses: actions/checkout@v4
9090
- run: sudo docker run -i -v `pwd`:/odp --privileged --shm-size 8g -e CC="${{matrix.cc}}"
91-
-e CONF="${CONF}" $CONTAINER_NAMESPACE/odp-ci-${{matrix.os}}-${ARCH}-native /odp/scripts/ci/build_${ARCH}.sh
91+
-e CONF="${CONF}" $CONTAINER_NAMESPACE/odp-ci-${{matrix.os}}-${ARCH}-graviton3 /odp/scripts/ci/build_${ARCH}.sh
9292
- if: ${{ failure() }}
9393
uses: ./.github/actions/build-failure-log
9494

95-
Build_gcc_u22:
95+
Build_gcc_u24:
9696
if: ${{ github.repository == 'OpenDataPlane/odp-dpdk' }}
97-
runs-on: [self-hosted, ARM64]
97+
runs-on: ah-ubuntu_22_04-c7g_2x-50
9898
env:
99-
OS: ubuntu_22.04
99+
OS: ubuntu_24.04
100100
strategy:
101101
fail-fast: false
102102
matrix:
103-
cc_ver: [10, 11, 12, 13]
103+
cc_ver: [10, 11, 12, 13, 14]
104104
conf: ['', '--enable-abi-compat']
105105
steps:
106106
- uses: OpenDataPlane/action-clean-up@main
107107
- uses: actions/checkout@v4
108108
- run: sudo docker run -i -v `pwd`:/odp --privileged --shm-size 8g -e CC="gcc-${{matrix.cc_ver}}" -e CXX="g++-${{matrix.cc_ver}}"
109-
-e CONF="${{matrix.conf}}" $CONTAINER_NAMESPACE/odp-ci-${OS}-${ARCH}-native /odp/scripts/ci/build_${ARCH}.sh
109+
-e CONF="${{matrix.conf}}" $CONTAINER_NAMESPACE/odp-ci-${OS}-${ARCH}-graviton3 /odp/scripts/ci/build_${ARCH}.sh
110110
- if: ${{ failure() }}
111111
uses: ./.github/actions/build-failure-log
112112

113113
Build_out-of-tree:
114114
if: ${{ github.repository == 'OpenDataPlane/odp-dpdk' }}
115-
runs-on: [self-hosted, ARM64]
115+
runs-on: ah-ubuntu_22_04-c7g_2x-50
116116
steps:
117117
- uses: OpenDataPlane/action-clean-up@main
118118
- uses: actions/checkout@v4
119119
- run: sudo docker run -i -v `pwd`:/odp --privileged --shm-size 8g -e CC="${CC}"
120-
-e CONF="${CONF}" $CONTAINER_NAMESPACE/odp-ci-${OS}-${ARCH}-native /odp/scripts/ci/out_of_tree.sh
120+
-e CONF="${CONF}" $CONTAINER_NAMESPACE/odp-ci-${OS}-${ARCH}-graviton3 /odp/scripts/ci/out_of_tree.sh
121121
- if: ${{ failure() }}
122122
uses: ./.github/actions/build-failure-log
123123

124124
Run_distcheck:
125125
if: ${{ github.repository == 'OpenDataPlane/odp-dpdk' }}
126-
runs-on: [self-hosted, ARM64]
126+
runs-on: ah-ubuntu_22_04-c7g_2x-50
127127
strategy:
128128
fail-fast: false
129129
matrix:
@@ -133,13 +133,13 @@ jobs:
133133
- uses: actions/checkout@v4
134134
# Ignore distcheck failure (caused by the first 'make check' run unmounting huge pages)
135135
- run: sudo docker run -i -v `pwd`:/odp --privileged --shm-size 8g -e CC="${{matrix.cc}}"
136-
-e CONF="${{matrix.conf}}" $CONTAINER_NAMESPACE/odp-ci-${OS}-${ARCH}-native /odp/scripts/ci/distcheck.sh || true
136+
-e CONF="${{matrix.conf}}" $CONTAINER_NAMESPACE/odp-ci-${OS}-${ARCH}-graviton3 /odp/scripts/ci/distcheck.sh || true
137137
- if: ${{ failure() }}
138138
uses: ./.github/actions/run-failure-log
139139

140140
Run_gcc:
141141
if: ${{ github.repository == 'OpenDataPlane/odp-dpdk' }}
142-
runs-on: [self-hosted, ARM64]
142+
runs-on: ah-ubuntu_22_04-c7g_2x-50
143143
strategy:
144144
fail-fast: false
145145
matrix:
@@ -155,15 +155,15 @@ jobs:
155155
- uses: OpenDataPlane/action-clean-up@main
156156
- uses: actions/checkout@v4
157157
- run: sudo docker run -i -v `pwd`:/odp --privileged --shm-size 8g -e CC=gcc -e ARCH="${ARCH}"
158-
-e CONF="${{matrix.conf}}" $CONTAINER_NAMESPACE/odp-ci-${OS}-${ARCH}-native /odp/scripts/ci/check.sh
158+
-e CONF="${{matrix.conf}}" $CONTAINER_NAMESPACE/odp-ci-${OS}-${ARCH}-graviton3 /odp/scripts/ci/check.sh
159159
- if: ${{ failure() }}
160160
uses: ./.github/actions/run-failure-log
161161
- if: ${{ success() }}
162162
uses: ./.github/actions/dump-log
163163

164164
Run_clang:
165165
if: ${{ github.repository == 'OpenDataPlane/odp-dpdk' }}
166-
runs-on: [self-hosted, ARM64]
166+
runs-on: ah-ubuntu_22_04-c7g_2x-50
167167
strategy:
168168
fail-fast: false
169169
matrix:
@@ -177,29 +177,29 @@ jobs:
177177
- uses: OpenDataPlane/action-clean-up@main
178178
- uses: actions/checkout@v4
179179
- run: sudo docker run -i -v `pwd`:/odp --privileged --shm-size 8g -e CC=clang -e ARCH="${ARCH}"
180-
-e CONF="${{matrix.conf}}" $CONTAINER_NAMESPACE/odp-ci-${OS}-${ARCH}-native /odp/scripts/ci/check.sh
180+
-e CONF="${{matrix.conf}}" $CONTAINER_NAMESPACE/odp-ci-${OS}-${ARCH}-graviton3 /odp/scripts/ci/check.sh
181181
- if: ${{ failure() }}
182182
uses: ./.github/actions/run-failure-log
183183

184184
Run_CFLAGS:
185185
if: ${{ github.repository == 'OpenDataPlane/odp-dpdk' }}
186-
runs-on: [self-hosted, ARM64]
186+
runs-on: ah-ubuntu_22_04-c7g_2x-50
187187
strategy:
188188
fail-fast: false
189189
matrix:
190190
cc: [gcc, clang]
191-
cflags: ['-march=armv8.2-a -O2', '-march=armv8.2-a+crypto -O2']
191+
cflags: ['-march=armv8.4-a -O2', '-march=armv8.4-a+crypto -O2']
192192
steps:
193193
- uses: OpenDataPlane/action-clean-up@main
194194
- uses: actions/checkout@v4
195195
- run: sudo docker run -i -v `pwd`:/odp --privileged --shm-size 8g -e CC="${{matrix.cc}}" -e ARCH="${ARCH}"
196-
-e CXX=g++-10 -e CFLAGS="${{matrix.cflags}}" $CONTAINER_NAMESPACE/odp-ci-${OS}-${ARCH}-native /odp/scripts/ci/check.sh
196+
-e CXX=g++-10 -e CFLAGS="${{matrix.cflags}}" $CONTAINER_NAMESPACE/odp-ci-${OS}-${ARCH}-graviton3 /odp/scripts/ci/check.sh
197197
- if: ${{ failure() }}
198198
uses: ./.github/actions/run-failure-log
199199

200200
Run_OS:
201201
if: ${{ github.repository == 'OpenDataPlane/odp-dpdk' }}
202-
runs-on: [self-hosted, ARM64]
202+
runs-on: ah-ubuntu_22_04-c7g_2x-50
203203
strategy:
204204
fail-fast: false
205205
matrix:
@@ -208,73 +208,73 @@ jobs:
208208
- uses: OpenDataPlane/action-clean-up@main
209209
- uses: actions/checkout@v4
210210
- run: sudo docker run -i -v `pwd`:/odp --privileged --shm-size 8g -e CC="${CC}" -e ARCH="${ARCH}"
211-
-e CONF="${CONF}" $CONTAINER_NAMESPACE/odp-ci-${{matrix.os}}-${ARCH}-native /odp/scripts/ci/check.sh
211+
-e CONF="${CONF}" $CONTAINER_NAMESPACE/odp-ci-${{matrix.os}}-${ARCH}-graviton3 /odp/scripts/ci/check.sh
212212
- if: ${{ failure() }}
213213
uses: ./.github/actions/run-failure-log
214214

215215
Run_sched_config:
216216
if: ${{ github.repository == 'OpenDataPlane/odp-dpdk' }}
217-
runs-on: [self-hosted, ARM64]
217+
runs-on: ah-ubuntu_22_04-c7g_2x-50
218218
steps:
219219
- uses: OpenDataPlane/action-clean-up@main
220220
- uses: actions/checkout@v4
221221
- run: sudo docker run -i -v `pwd`:/odp --privileged --shm-size 8g -e CC="${CC}" -e ARCH="${ARCH}"
222-
-e CONF="${CONF}" -e ODP_CONFIG_FILE=/odp/platform/linux-dpdk/test/sched-basic.conf $CONTAINER_NAMESPACE/odp-ci-${OS}-${ARCH}-native /odp/scripts/ci/check.sh
222+
-e CONF="${CONF}" -e ODP_CONFIG_FILE=/odp/platform/linux-dpdk/test/sched-basic.conf $CONTAINER_NAMESPACE/odp-ci-${OS}-${ARCH}-graviton3 /odp/scripts/ci/check.sh
223223
- if: ${{ failure() }}
224224
uses: ./.github/actions/run-failure-log
225225

226226
Run_stash_config:
227227
if: ${{ github.repository == 'OpenDataPlane/odp-dpdk' }}
228-
runs-on: [self-hosted, ARM64]
228+
runs-on: ah-ubuntu_22_04-c7g_2x-50
229229
steps:
230230
- uses: OpenDataPlane/action-clean-up@main
231231
- uses: actions/checkout@v4
232232
- run: sudo docker run -i -v `pwd`:/odp --privileged --shm-size 8g -e CC="${CC}" -e ARCH="${ARCH}"
233-
-e CONF="${CONF}" -e ODP_CONFIG_FILE=/odp/platform/linux-dpdk/test/stash-custom.conf $CONTAINER_NAMESPACE/odp-ci-${OS}-${ARCH}-native /odp/scripts/ci/check.sh
233+
-e CONF="${CONF}" -e ODP_CONFIG_FILE=/odp/platform/linux-dpdk/test/stash-custom.conf $CONTAINER_NAMESPACE/odp-ci-${OS}-${ARCH}-graviton3 /odp/scripts/ci/check.sh
234234
- if: ${{ failure() }}
235235
uses: ./.github/actions/run-failure-log
236236

237237
Run_scheduler_sp:
238238
if: ${{ github.repository == 'OpenDataPlane/odp-dpdk' }}
239-
runs-on: [self-hosted, ARM64]
239+
runs-on: ah-ubuntu_22_04-c7g_2x-50
240240
steps:
241241
- uses: OpenDataPlane/action-clean-up@main
242242
- uses: actions/checkout@v4
243243
- run: sudo docker run -i -v `pwd`:/odp --privileged --shm-size 8g -e CC="${CC}" -e ARCH="${ARCH}"
244-
-e CONF="${CONF}" -e ODP_SCHEDULER=sp $CONTAINER_NAMESPACE/odp-ci-${OS}-${ARCH}-native /odp/scripts/ci/check.sh
244+
-e CONF="${CONF}" -e ODP_SCHEDULER=sp $CONTAINER_NAMESPACE/odp-ci-${OS}-${ARCH}-graviton3 /odp/scripts/ci/check.sh
245245
- if: ${{ failure() }}
246246
uses: ./.github/actions/run-failure-log
247247

248248
Run_process_mode:
249249
if: ${{ github.repository == 'OpenDataPlane/odp-dpdk' }}
250-
runs-on: [self-hosted, ARM64]
250+
runs-on: ah-ubuntu_22_04-c7g_2x-50
251251
steps:
252252
- uses: OpenDataPlane/action-clean-up@main
253253
- uses: actions/checkout@v4
254254
- run: sudo docker run -i -v `pwd`:/odp --privileged --shm-size 8g -e CC="${CC}" -e ARCH="${ARCH}"
255255
-e CONF="${CONF}" -e ODP_CONFIG_FILE=/odp/platform/linux-dpdk/test/process-mode.conf
256-
-e ODPH_PROC_MODE=1 $CONTAINER_NAMESPACE/odp-ci-${OS}-${ARCH}-native /odp/scripts/ci/check.sh
256+
-e ODPH_PROC_MODE=1 $CONTAINER_NAMESPACE/odp-ci-${OS}-${ARCH}-graviton3 /odp/scripts/ci/check.sh
257257
- if: ${{ failure() }}
258258
uses: ./.github/actions/run-failure-log
259259

260260
Run_dpdk-21_11:
261261
if: ${{ github.repository == 'OpenDataPlane/odp-dpdk' }}
262-
runs-on: [self-hosted, ARM64]
262+
runs-on: ah-ubuntu_22_04-c7g_2x-50
263263
steps:
264264
- uses: OpenDataPlane/action-clean-up@main
265265
- uses: actions/checkout@v4
266266
- run: sudo docker run -i -v `pwd`:/odp --privileged --shm-size 8g -e CC="${CC}" -e ARCH="${ARCH}"
267-
-e CONF="${CONF}" $CONTAINER_NAMESPACE/odp-ci-${OS}-${ARCH}-native-dpdk_21.11 /odp/scripts/ci/check.sh
267+
-e CONF="${CONF}" $CONTAINER_NAMESPACE/odp-ci-${OS}-${ARCH}-graviton3-dpdk_21.11 /odp/scripts/ci/check.sh
268268
- if: ${{ failure() }}
269269
uses: ./.github/actions/run-failure-log
270270

271271
Run_dpdk-23_11:
272272
if: ${{ github.repository == 'OpenDataPlane/odp-dpdk' }}
273-
runs-on: [self-hosted, ARM64]
273+
runs-on: ah-ubuntu_22_04-c7g_2x-50
274274
steps:
275275
- uses: OpenDataPlane/action-clean-up@main
276276
- uses: actions/checkout@v4
277277
- run: sudo docker run -i -v `pwd`:/odp --privileged --shm-size 8g -e CC="${CC}" -e ARCH="${ARCH}"
278-
-e CONF="${CONF}" $CONTAINER_NAMESPACE/odp-ci-${OS}-${ARCH}-native-dpdk_23.11 /odp/scripts/ci/check.sh
278+
-e CONF="${CONF}" $CONTAINER_NAMESPACE/odp-ci-${OS}-${ARCH}-graviton3-dpdk_23.11 /odp/scripts/ci/check.sh
279279
- if: ${{ failure() }}
280280
uses: ./.github/actions/run-failure-log

0 commit comments

Comments
 (0)