Merge pull request aya-rs#20 from vadorovsky/llvm-15

Bump llvm-sys and aya-rustc-llvm-proxy

Author: dave-tucker

.github/workflows/build-test.yml

@@ -18,11 +18,10 @@ jobs:
       fail-fast: false
       matrix:
         rust:
-          - "1.58.1"
-          - "1.57"
+          - "1.63.0"
           - "beta"
           - "nightly"
-        llvm: ["14", "rustc"]
+        llvm: ["15", "rustc"]
     name: "rustc: ${{ matrix.rust }}, llvm: ${{ matrix.llvm }}"
 
     env:
@@ -62,7 +61,7 @@ jobs:
           rm -rf build
           echo -e 'profile = "user"\nchangelog-seen = 2\n\n[llvm]\ndownload-ci-llvm = true' > config.toml
           ./x.py clean
-          ./x.py build -i --stage 1 --host x86_64-unknown-linux-gnu --target bpfel-unknown-none --target x86_64-unknown-linux-gnu library/std src/tools/rustdoc
+          ./x.py build -i --stage 1 --host x86_64-unknown-linux-gnu --target bpfel-unknown-none --target x86_64-unknown-linux-gnu library src/tools/rustdoc
           rustup toolchain link stage1 build/x86_64-unknown-linux-gnu/stage1
           popd
           rustup override set stage1

Cargo.lock

@@ -21,8 +21,8 @@ libc = "0.2"
 thiserror = { version = "1.0", optional = true }
 ar = { version = "0.8", optional = true }
 log = { version = "0.4", optional = true }
-llvm-sys = { version = "140", optional = true }
-aya-rustc-llvm-proxy = { version = "0.4.0", optional = true }
+llvm-sys = { version = "150", optional = true }
+aya-rustc-llvm-proxy = { version = "0.5.0", optional = true }
 
 [dev-dependencies]
 compiletest_rs = { version = "0.5", path = "third-party/compiletest-rs" }

Cargo.toml

@@ -14,7 +14,7 @@ files with embedded bitcode (.o), optionally stored inside ar archives (.a).
 
 ## Installation
 
-The linker requires LLVM 14. It can use the same LLVM used by the rust compiler,
+The linker requires LLVM 15. It can use the same LLVM used by the rust compiler,
 or it can use an external LLVM installation.
 
 If your target is `aarch64-unknown-linux-gnu` (i.e. Linux on Apple Silicon) you 
@@ -30,14 +30,14 @@ cargo install bpf-linker
 
 ### Using external LLVM
 
-On Debian based distributions you need to install the `llvm-14-dev` and
-`libclang-14-dev` packages. If your distro doesn't have them you can get them
+On Debian based distributions you need to install the `llvm-15-dev` and
+`libclang-15-dev` packages. If your distro doesn't have them you can get them
 from the official LLVM repo at https://apt.llvm.org.
 
 On rpm based distribution you need the `llvm-devel` and `clang-devel` packages.
 If your distro doesn't have them you can get them from Fedora Rawhide.
 
-Once you have installed LLVM 14 you can install the linker running:
+Once you have installed LLVM 15 you can install the linker running:
 
 ```sh
 cargo install --git https://github.com/aya-rs/bpf-linker  --tag v0.9.4 --no-default-features --features system-llvm -- bpf-linker

README.md

@@ -13,14 +13,14 @@ extern crate loop_panic_handler;
 
 #[inline(never)]
 fn actually_inlined(a: u64) -> u64 {
-    a + 1
+    a + 42
 }
 
 #[no_mangle]
 #[link_section = "uprobe/fun"]
 pub extern "C" fn fun(a: u64) -> u64 {
     // CHECK-LABEL: fun:
     actually_inlined(a)
-    // CHECK-NEXT: r0 = r1
-    // CHECK-NEXT: r0 += 1
+    // CHECK-NEXT: r{{[0-9]}} = r{{[0-9]}}
+    // CHECK-NEXT: r{{[0-9]}} += 42
 }

tests/assembly/ignore-inline-never.rs

@@ -1,7 +1,7 @@
+// ignore-test
 // assembly-output: bpf-linker
 // compile-flags: --crate-type cdylib -C link-arg=--unroll-loops -C link-arg=-O3
 #![no_std]
-
 // Recent kernels starting from 5.2 support some bounded loops. Older kernels need all loops to be
 // unrolled. The linker provides the --unroll-loops flag to aggressively try and unroll.