Test all supported LLVM versions at once

.github/workflows/ci.yml

@@ -10,11 +10,6 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        version:
-          - 1.82.0
-          - stable
-          - beta
-          - nightly 
         target:
           - x86_64-unknown-linux-gnu
           - x86_64-unknown-linux-musl
@@ -23,7 +18,7 @@ jobs:
       - uses: actions/checkout@v2
       - uses: actions-rs/toolchain@v1
         with:
-          toolchain: ${{ matrix.version }}
+          toolchain: "1.90"
           override: true
           components: rustfmt, llvm-tools-preview
       - name: build
@@ -32,17 +27,15 @@ jobs:
           cargo check --all-features
       - name: test
         run: |
-          cargo install cargo-binutils@0.3.6
-          cargo test 
+          # TODO: switch this to a published version after the next release
+          cargo install --git https://github.com/rust-embedded/cargo-binutils/ --rev 7fc23414305df173dc46a5fa4b98ab2bcd3d21e1
+          cargo test --all-features
       - name: check formatting
         run: cargo fmt -- --check
   windows:
     runs-on: windows-latest
     strategy:
       matrix:
-        version:
-          - stable
-          - nightly
         target:
           - x86_64-pc-windows-gnu
           - x86_64-pc-windows-msvc
@@ -51,31 +44,34 @@ jobs:
       - uses: actions/checkout@v2
       - uses: actions-rs/toolchain@v1
         with:
-          toolchain: ${{ matrix.version }}
+          toolchain: "1.90"
           override: true
           components: llvm-tools-preview
       - name: test
         run: |
           cargo install cargo-binutils@0.3.6
+          # NOTE: only tests default features
           cargo test
   mac:
     runs-on: macos-latest
     strategy:
       matrix:
-        version:
-          - stable
-          - nightly
         target:
-          - x86_64-apple-darwin	
+          - x86_64-apple-darwin
+          - aarch64-apple-darwin
       fail-fast: false
     steps:
       - uses: actions/checkout@v2
       - uses: actions-rs/toolchain@v1
         with:
-          toolchain: ${{ matrix.version }}
+          toolchain: "1.90"
           override: true
           components: llvm-tools-preview
       - name: test
         run: |
           cargo install cargo-binutils@0.3.6
+          # NOTE: only tests default features
           cargo test
+          # we run the nightly test here to distribute CPU time away from the linux runner
+          # we only run `profdata` because some ignored tests in `cov` fail
+          cargo test --test profdata -- --ignored

Cargo.toml

@@ -10,13 +10,28 @@ license = "Apache-2.0"
 categories = ["encoding"]
 keywords = ["coverage", "llvm"]
 exclude = ["tests/*", ".github/*", "benches/*"]
-build = "build.rs"
 rust-version = "1.80.0"
 
 [features]
-default = ["cli"]
+default = ["cli", "__llvm_20"]
 cli = ["structopt", "tracing-subscriber"]
 
+# for testing
+# to run all tests, run `cargo test --all-features`.
+# to run a specific version, run `cargo test --no-default-features --featurs __llvm_XX`.
+# by default, only runs tests again llvm 20
+__llvm_11 = []
+__llvm_12 = []
+__llvm_13 = []
+__llvm_14 = []
+__llvm_15 = []
+__llvm_16 = []
+__llvm_17 = []
+__llvm_18 = []
+__llvm_19 = []
+__llvm_20 = []
+__llvm_21 = []
+
 [dependencies]
 anyhow = "1.0.65"
 flate2 = "1.0"

src/bin/profparser.rs

@@ -284,15 +284,12 @@ impl ShowCommand {
             }
         }
         if profile.get_level() == InstrumentationLevel::Ir {
-            // This is just to enable same printout in older versions with llvm 11
-            #[cfg(not(llvm_11))]
             println!(
                 "Instrumentation level: {}  entry_first = {}",
                 profile.get_level(),
+                // NOTE: in llvm 11 this is always false
                 profile.is_entry_first() as usize
             );
-            #[cfg(llvm_11)]
-            println!("Instrumentation level: {}", profile.get_level());
         } else {
             println!("Instrumentation level: {}", profile.get_level());
         }

src/instrumentation_profile/text_profile.rs

@@ -267,7 +267,6 @@ impl InstrProfReader for TextInstrProf {
             } else if check_tag(name, ENTRY_TAG) {
                 entry_first = true;
             } else if !check_tag(name, FE_TAG) {
-                // return Err(Err::Failure(Error::new(bytes, ErrorKind::Tag)));
                 return Err(Err::Failure(VerboseError::from_error_kind(
                     bytes,
                     ErrorKind::Tag,