From 9a1e107b97a81a5a8874b835a5f90422b27e2b57 Mon Sep 17 00:00:00 2001 From: Wentao Zhang Date: Mon, 12 Aug 2024 13:48:46 -0500 Subject: [PATCH] all: more renaming as trunk is 20.0.0git now and 19.1.0 is coming soon --- .../workflows/{llvm-19.yml => llvm-trunk.yml} | 4 ++-- ci/2_pull_source.sh | 2 +- docs/measure-kernel-mcdc.md | 20 +++++++++---------- 3 files changed, 13 insertions(+), 13 deletions(-) rename .github/workflows/{llvm-19.yml => llvm-trunk.yml} (98%) diff --git a/.github/workflows/llvm-19.yml b/.github/workflows/llvm-trunk.yml similarity index 98% rename from .github/workflows/llvm-19.yml rename to .github/workflows/llvm-trunk.yml index 5d74801..3265c57 100644 --- a/.github/workflows/llvm-19.yml +++ b/.github/workflows/llvm-trunk.yml @@ -1,9 +1,9 @@ -name: Test workflow with LLVM trunk (old) +name: Test workflow with LLVM trunk on: push: branches: - - llvm19 + - llvm-trunk workflow_dispatch: # Allow at most one run from any workflow in this repo at the same time, as most diff --git a/ci/2_pull_source.sh b/ci/2_pull_source.sh index 40daed6..79f0544 100755 --- a/ci/2_pull_source.sh +++ b/ci/2_pull_source.sh @@ -3,7 +3,7 @@ cd $MCDC_HOME # This meta repository -git clone https://github.com/xlab-uiuc/linux-mcdc.git --branch llvm19 +git clone https://github.com/xlab-uiuc/linux-mcdc.git --branch llvm-trunk # LLVM if we want to build it from source (optional) git clone https://github.com/llvm/llvm-project.git --depth 5 # Linux kernel diff --git a/docs/measure-kernel-mcdc.md b/docs/measure-kernel-mcdc.md index 342898e..29222c4 100644 --- a/docs/measure-kernel-mcdc.md +++ b/docs/measure-kernel-mcdc.md @@ -2,8 +2,8 @@ > [!NOTE] > -> The following instructions use **LLVM 19** and patch >= v0.5. The differences -> between LLVM 18 and 19 can be found [here](https://github.com/xlab-uiuc/linux-mcdc/compare/public-approved...llvm19). +> The following instructions use LLVM >= 19 and patch >= v0.5. The differences +> between LLVM 18 and >= 19 can be found [here](https://github.com/xlab-uiuc/linux-mcdc/compare/llvm-18...llvm-trunk). ## 0. Prerequisites @@ -63,7 +63,7 @@ cd /path/to/our/workdir export MCDC_HOME=$(realpath .) # This meta repository -git clone https://github.com/xlab-uiuc/linux-mcdc.git --branch llvm19 +git clone https://github.com/xlab-uiuc/linux-mcdc.git --branch llvm-trunk # LLVM if we want to build it from source (optional) git clone https://github.com/llvm/llvm-project.git --branch main --depth 5 # Linux kernel @@ -110,16 +110,16 @@ wget https://apt.llvm.org/llvm.sh chmod +x llvm.sh ``` -Install LLVM 19: +Install LLVM 20: ```shell -sudo ./llvm.sh 19 +sudo ./llvm.sh 20 ``` After installation, set $PATH up: ```shell -export PATH="/usr/lib/llvm-19/bin:$PATH" +export PATH="/usr/lib/llvm-20/bin:$PATH" ``` ## 4. Build the kernel @@ -241,8 +241,8 @@ to verify the sections for counters and bitmaps are indeed included. + difference between our kernel patch v0.5 and v0.6. Since we don't have + >= 19 releases yet. Point to the latest documentation. --> ## 5. Boot the kernel and collect coverage @@ -307,8 +307,8 @@ which should contain three pseudo files: `profraw`, `cnts_reset` and `bits_reset - Writing to `bits_reset` will clear the in-memory bitmaps - Reading `profraw` will serialize the in-memory counters and bitmaps in a [proper format](https://llvm.org/docs/InstrProfileFormat.html) - + that is recognized by LLVM tools. Let's copy the profile to current directory, which is [shared with host