From c93bfc54e8c4995ecb5af800e2c8df825f310f0d Mon Sep 17 00:00:00 2001 From: fanquake Date: Fri, 2 Jun 2023 15:50:48 +0100 Subject: [PATCH 1/2] ci: use LLVM 16.0.5 in MSAN jobs --- ci/test/01_base_install.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/test/01_base_install.sh b/ci/test/01_base_install.sh index 43a76c3d56b..459e9947ff9 100755 --- a/ci/test/01_base_install.sh +++ b/ci/test/01_base_install.sh @@ -42,7 +42,7 @@ if [ -n "$PIP_PACKAGES" ]; then fi if [[ ${USE_MEMORY_SANITIZER} == "true" ]]; then - git clone --depth=1 https://github.com/llvm/llvm-project -b llvmorg-16.0.4 "${BASE_SCRATCH_DIR}"/msan/llvm-project + git clone --depth=1 https://github.com/llvm/llvm-project -b llvmorg-16.0.5 "${BASE_SCRATCH_DIR}"/msan/llvm-project cmake -G Ninja -B "${BASE_SCRATCH_DIR}"/msan/clang_build/ -DLLVM_ENABLE_PROJECTS="clang" \ -DCMAKE_BUILD_TYPE=Release \ From 2ebeb421dd21a69344a32c681ccbfcf5e5c6dab9 Mon Sep 17 00:00:00 2001 From: fanquake Date: Fri, 2 Jun 2023 15:52:48 +0100 Subject: [PATCH 2/2] ci: enable AArch64 target in MSAN jobs Use Native. --- ci/test/01_base_install.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ci/test/01_base_install.sh b/ci/test/01_base_install.sh index 459e9947ff9..230288bc6c7 100755 --- a/ci/test/01_base_install.sh +++ b/ci/test/01_base_install.sh @@ -46,7 +46,7 @@ if [[ ${USE_MEMORY_SANITIZER} == "true" ]]; then cmake -G Ninja -B "${BASE_SCRATCH_DIR}"/msan/clang_build/ -DLLVM_ENABLE_PROJECTS="clang" \ -DCMAKE_BUILD_TYPE=Release \ - -DLLVM_TARGETS_TO_BUILD=X86 \ + -DLLVM_TARGETS_TO_BUILD=Native \ -DLLVM_ENABLE_RUNTIMES="compiler-rt;libcxx;libcxxabi;libunwind" \ -S "${BASE_SCRATCH_DIR}"/msan/llvm-project/llvm @@ -61,7 +61,7 @@ if [[ ${USE_MEMORY_SANITIZER} == "true" ]]; then -DLLVM_USE_SANITIZER=MemoryWithOrigins \ -DCMAKE_C_COMPILER=clang \ -DCMAKE_CXX_COMPILER=clang++ \ - -DLLVM_TARGETS_TO_BUILD=X86 \ + -DLLVM_TARGETS_TO_BUILD=Native \ -DLLVM_ENABLE_PER_TARGET_RUNTIME_DIR=OFF \ -DLIBCXX_ENABLE_DEBUG_MODE=ON \ -DLIBCXX_ENABLE_ASSERTIONS=ON \