Skip to content

Commit

Permalink
llvm: Upgrade to LLVM 17.0.6
Browse files Browse the repository at this point in the history
Fixes for Clang 17 were merged into the Cilium codebase:

b91046955d6b ("datapath: Ignore new debug ELF prefixes")
6e18eb020b68 ("bpf: Fix compatibility with Clang 17 in __lb6_affinity_backend_id")
3740e9db8fef ("bpf: Fix "R2 !read_ok" verifier error with LLVM 17")
c6fe6b8e2546 ("bpf/tests: Fix `conntrack_test.c` in prep for Clang update")
4dd6b0a4f97f ("bpf/tests: Fix undefined behavior in memcmp MAC addresses")
f87b5dc5e0b2 ("bpf/tests: Fix undefined behavior in EXPECTED_DEST_MAC")

and the complexity measurements were performed, so now the LLVM image
can be upgraded.

Signed-off-by: Maxim Mikityanskiy <[email protected]>
  • Loading branch information
gentoo-root authored and borkmann committed Apr 10, 2024
1 parent 827058d commit 6fd8e1b
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 9 deletions.
8 changes: 1 addition & 7 deletions images/llvm/checkout-llvm.sh
Original file line number Diff line number Diff line change
Expand Up @@ -8,19 +8,13 @@ set -o errexit
set -o pipefail
set -o nounset

rev="llvmorg-10.0.0"
rev="llvmorg-17.0.6"

git config --global user.email "[email protected]"
git config --global user.name "Cilium Maintainers"

git clone --branch "${rev}" https://github.com/llvm/llvm-project.git /src/llvm

cd /src/llvm
git cherry-pick 29bc5dd19407c4d7cad1c059dea26ee216ddc7ca
git cherry-pick 13f6c81c5d9a7a34a684363bcaad8eb7c65356fd
git cherry-pick ea72b0319d7b0f0c2fcf41d121afa5d031b319d5
cd -

# curl --fail --show-error --silent --location "https://github.com/llvm/llvm-project/archive/${rev}.tar.gz" --output /tmp/llvm.tgz
#
# mkdir -p /src
Expand Down
4 changes: 2 additions & 2 deletions images/llvm/test/spec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ commandTests:
args: ["--version"]
expectedOutput:
- 'LLVM\ \(http://llvm\.org/\):'
- 'LLVM\ version\ 10\.0\.0'
- 'LLVM\ version\ 17\.0\.6'
- 'Optimized\ build\.'
- 'Registered\ Targets:'
- '(bpf|bpfeb|bpfel)[\ ]+-\ BPF\ \((host|big|little)\ endian\)'
Expand All @@ -24,7 +24,7 @@ commandTests:
command: "clang"
args: ["--version"]
expectedOutput:
- 'clang\ version\ 10\.0\.0\ \(https://github.com/llvm/llvm-project.git\ .*\)'
- 'clang\ version\ 17\.0\.6\ \(https://github.com/llvm/llvm-project.git\ .*\)'
- 'InstalledDir:\ /usr/local/bin'

- name: "clang can compile a simple BPF program"
Expand Down

0 comments on commit 6fd8e1b

Please sign in to comment.