From 0c1a1ea7e710d41a288c9e96b5bd1c7dd03c888d Mon Sep 17 00:00:00 2001 From: Bruce Forstall Date: Thu, 7 Sep 2023 10:55:38 -0700 Subject: [PATCH] Try llvmorg-16.0.6 --- coredistools.yml | 2 +- doc/building-coredistools.md | 20 +++++++++----------- 2 files changed, 10 insertions(+), 12 deletions(-) diff --git a/coredistools.yml b/coredistools.yml index 0439b178..58e386d3 100644 --- a/coredistools.yml +++ b/coredistools.yml @@ -50,7 +50,7 @@ resources: variables: LLVMRepositoryUri: https://github.com/llvm/llvm-project.git LLVMSourceBundle: llvm-project.bundle - LLVMSourceVersion: llvmorg-16.0.3 + LLVMSourceVersion: llvmorg-16.0.6 jobs: diff --git a/doc/building-coredistools.md b/doc/building-coredistools.md index 844fcd3f..b8896d0f 100644 --- a/doc/building-coredistools.md +++ b/doc/building-coredistools.md @@ -10,7 +10,7 @@ cd jitutils 2. Checkout the LLVM project repository into a subdirectory named src/llvm-project: ``` -git clone --depth 1 --branch llvmorg-16.0.1 https://github.com/llvm/llvm-project.git src\llvm-project +git clone --depth 1 --branch llvmorg-16.0.6 https://github.com/llvm/llvm-project.git src\llvm-project ``` 3. Build `llvm-tblgen.exe`: @@ -63,24 +63,24 @@ cd jitutils 2. Checkout the LLVM project repository: ``` -git clone --depth 1 --branch llvmorg-16.0.1 https://github.com/llvm/llvm-project.git src/llvm-project +git clone --depth 1 --branch llvmorg-16.0.6 https://github.com/llvm/llvm-project.git src/llvm-project ``` 3. Download LLVM release from GitHub: ``` -python3 eng/download-llvm-release.py -release llvmorg-16.0.1 -os linux +python3 eng/download-llvm-release.py -release llvmorg-16.0.6 -os linux ``` 4. Locate under the current directory file `llvm-tblgen` ``` find -name llvm-tblgen -./clang+llvm-16.0.1-x86_64-linux-gnu-ubuntu-18.04/bin/llvm-tblgen +./clang+llvm-16.0.6-x86_64-linux-gnu-ubuntu-18.04/bin/llvm-tblgen ``` and add its parent directory location to the `PATH`: ``` -export PATH=$(pwd)/clang+llvm-16.0.1-x86_64-linux-gnu-ubuntu-18.04/bin:$PATH +export PATH=$(pwd)/clang+llvm-16.0.6-x86_64-linux-gnu-ubuntu-18.04/bin:$PATH ``` 5. Build `libcoredistools.so` for Linux x64: @@ -97,17 +97,15 @@ find ./artifacts -name libcoredistools.so 6. Build `libcoredistools.so` for Linux arm64 under Docker: -TODO: update these Docker images with CBL-Mariner images. - ``` -docker run -it --rm --entrypoint /bin/bash -v ~/git/jitutils:/opt/code -w /opt/code -u $(id -u):$(id -g) mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-18.04-cross-arm64-20220312201346-b2c2436 -export PATH=$(pwd)/clang+llvm-16.0.1-x86_64-linux-gnu-ubuntu-18.04/bin:$PATH +docker run -it --rm --entrypoint /bin/bash -v ~/git/jitutils:/opt/code -w /opt/code -u $(id -u):$(id -g) mcr.microsoft.com/dotnet-buildtools/prereqs:cbl-mariner-2.0-cross-arm64 +export PATH=$(pwd)/clang+llvm-16.0.6-x86_64-linux-gnu-ubuntu-18.04/bin:$PATH ./build-coredistools.sh linux-arm64 /crossrootfs/arm64 ``` 7. Build `libcoredistools.so` for Linux arm under Docker: ``` -docker run -it --rm --entrypoint /bin/bash -v ~/git/jitutils:/opt/code -w /opt/code -u $(id -u):$(id -g) mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-18.04-cross-20220312201346-b9de666 -export PATH=$(pwd)/clang+llvm-16.0.1-x86_64-linux-gnu-ubuntu-18.04/bin:$PATH +docker run -it --rm --entrypoint /bin/bash -v ~/git/jitutils:/opt/code -w /opt/code -u $(id -u):$(id -g) mcr.microsoft.com/dotnet-buildtools/prereqs:cbl-mariner-2.0-cross-arm +export PATH=$(pwd)/clang+llvm-16.0.6-x86_64-linux-gnu-ubuntu-18.04/bin:$PATH ./build-coredistools.sh linux-arm /crossrootfs/arm ```