Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -46,8 +46,8 @@ jobs:
image: ubuntu-2404:edge
resource_class: arm.medium
environment:
CC: clang-19
CXX: clang++-19
CC: clang-20
CXX: clang++-20
steps:
- run: |
export REPO_HTTPS=`echo "$CIRCLE_REPOSITORY_URL" | sed "s|git@github.com:|https://github.com/|g"`
Expand All @@ -58,8 +58,8 @@ jobs:
sudo apt-get install -y cmake
sudo apt-get install -y hwloc libhwloc-dev
wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key | sudo apt-key add -
sudo apt-add-repository -y 'deb https://apt.llvm.org/jammy/ llvm-toolchain-jammy-19 main'
sudo apt-get install -y clang-19
sudo apt-add-repository -y 'deb https://apt.llvm.org/noble/ llvm-toolchain-noble-20 main'
sudo apt-get install -y clang-20
- run: |
mkdir build
pushd build
Expand All @@ -85,8 +85,8 @@ jobs:
image: ubuntu-2404:edge
resource_class: arm.medium
environment:
CC: clang-19
CXX: clang++-19
CC: clang-20
CXX: clang++-20
CFLAGS: "-fsanitize=<< parameters.sanitizer >> -fno-sanitize-recover=all"
CXXFLAGS: "-fsanitize=<< parameters.sanitizer >> -fno-sanitize-recover=all"
LDFLAGS: "-fsanitize=<< parameters.sanitizer >> -fno-sanitize-recover=all"
Expand All @@ -102,8 +102,8 @@ jobs:
sudo apt-get install -y cmake
sudo apt-get install -y hwloc libhwloc-dev
wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key | sudo apt-key add -
sudo apt-add-repository -y 'deb https://apt.llvm.org/jammy/ llvm-toolchain-jammy-19 main'
sudo apt-get install -y clang-19
sudo apt-add-repository -y 'deb https://apt.llvm.org/noble/ llvm-toolchain-noble-20 main'
sudo apt-get install -y clang-20
- run: |
mkdir build
pushd build
Expand Down
26 changes: 13 additions & 13 deletions .cirrus.yml
Original file line number Diff line number Diff line change
Expand Up @@ -113,28 +113,28 @@ arm_linux_clang_task:
timeout_in: 5m
matrix:
env:
CC: clang-19
CXX: clang++-19
CC: clang-20
CXX: clang++-20
QTHREADS_SCHEDULER: nemesis
QTHREADS_TOPOLOGY: no
env:
CC: clang-19
CXX: clang++-19
CC: clang-20
CXX: clang++-20
QTHREADS_SCHEDULER: nemesis
QTHREADS_TOPOLOGY: hwloc
env:
CC: clang-19
CXX: clang++-19
CC: clang-20
CXX: clang++-20
QTHREADS_SCHEDULER: nemesis
QTHREADS_TOPOLOGY: binders
env:
CC: clang-19
CXX: clang++-19
CC: clang-20
CXX: clang++-20
QTHREADS_SCHEDULER: sherwood
QTHREADS_TOPOLOGY: no
env:
CC: clang-19
CXX: clang++-19
CC: clang-20
CXX: clang++-20
QTHREADS_SCHEDULER: distrib
QTHREADS_TOPOLOGY: no
install_deps_script: |
Expand All @@ -145,9 +145,9 @@ arm_linux_clang_task:
gpg --no-default-keyring --keyring ./tmp.gpg --export --output llvm-snapshot.gpg
rm tmp.gpg
cp llvm-snapshot.gpg /etc/apt/trusted.gpg.d/llvm-snapshot.gpg # This is for CI so no need to do something more complicated to restrict key use to a specific repo.
apt-add-repository -y 'deb https://apt.llvm.org/bookworm/ llvm-toolchain-bookworm-19 main'
apt-add-repository -y 'deb https://apt.llvm.org/bookworm/ llvm-toolchain-bookworm-19 main' # Something's buggy upstream but running this twice fixes it.
apt-get install -y clang-19
apt-add-repository -y 'deb https://apt.llvm.org/bookworm/ llvm-toolchain-bookworm-20 main'
apt-add-repository -y 'deb https://apt.llvm.org/bookworm/ llvm-toolchain-bookworm-20 main' # Something's buggy upstream but running this twice fixes it.
apt-get install -y clang-20
apt-get install -y cmake
apt-get install -y hwloc libhwloc-dev
build_script: |
Expand Down
1 change: 1 addition & 0 deletions .git-blame-ignore-revs
Original file line number Diff line number Diff line change
Expand Up @@ -2,3 +2,4 @@
3ddc9da40f8b34565c90d17ef83a9ef95a9deb18
d1196d946c6551b205791f47ee952412e1a3e9bc
2368ba6baaeb986a16d7444edf412e3ef74296b4
163756c0337619255bb4b30a0b8ef21d17824aab
32 changes: 17 additions & 15 deletions .github/workflows/CI.yml
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ jobs:
continue-on-error: true
strategy:
matrix:
clang_version: [14, 15, 16, 17, 18]
clang_version: [14, 15, 16, 17, 18, 19]
scheduler: [nemesis, sherwood, distrib]
topology: [hwloc, binders, no]
include:
Expand All @@ -61,6 +61,8 @@ jobs:
gcc_version: 13
- clang_version: 18
gcc_version: 13
- clang_version: 19
gcc_version: 14
env:
CC: clang-${{ matrix.clang_version }}
CXX: clang++-${{ matrix.clang_version }}
Expand Down Expand Up @@ -278,8 +280,8 @@ jobs:
- sanitizer: thread
topology: binders
env:
CC: clang-19
CXX: clang++-19
CC: clang-20
CXX: clang++-20
CFLAGS: "-fsanitize=${{ matrix.sanitizer }} -fno-sanitize-recover=all"
CXXFLAGS: ${{ matrix.use_libcxx && format('-stdlib=libc++ -fsanitize={0} -fno-sanitize-recover=all', matrix.sanitizer) || format('-fsanitize={0} -fno-sanitize-recover=all', matrix.sanitizer) }}
LDFLAGS: "-fsanitize=${{ matrix.sanitizer }} -fno-sanitize-recover=all"
Expand All @@ -293,10 +295,10 @@ jobs:
- name: install compiler
run: |
wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key | sudo apt-key add - && break || sleep 1
sudo apt-add-repository 'deb https://apt.llvm.org/jammy/ llvm-toolchain-jammy-19 main' && break || sleep 1
sudo apt-get install clang-19
sudo apt-add-repository 'deb https://apt.llvm.org/noble/ llvm-toolchain-noble-20 main' && break || sleep 1
sudo apt-get install clang-20
- if: ${{ matrix.use_libcxx }}
run: sudo apt-get install libc++-19-dev libc++abi-19-dev
run: sudo apt-get install libc++-20-dev libc++abi-20-dev
- if: ${{ matrix.topology != 'no' }}
run: |
sudo apt-get install hwloc libhwloc-dev
Expand Down Expand Up @@ -330,8 +332,8 @@ jobs:
- compiler: gcc
use_libcxx: true
env:
CC: ${{ matrix.compiler == 'gcc' && 'gcc-14' || 'clang-19' }}
CXX: ${{ matrix.compiler == 'gcc' && 'g++-14' || 'clang++-19' }}
CC: ${{ matrix.compiler == 'gcc' && 'gcc-14' || 'clang-20' }}
CXX: ${{ matrix.compiler == 'gcc' && 'g++-14' || 'clang++-20' }}
CXXFLAGS: ${{ matrix.use_libcxx && '-stdlib=libc++' || '' }}
QTHREADS_ENABLE_ASSERTS: ${{ matrix.use_asserts && '--enable-asserts' || '' }}
steps:
Expand All @@ -341,10 +343,10 @@ jobs:
- if: ${{ matrix.compiler == 'clang' }}
run: |
wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key | sudo apt-key add - && break || sleep 1
sudo apt-add-repository 'deb https://apt.llvm.org/jammy/ llvm-toolchain-jammy-19 main' && break || sleep 1
sudo apt-get install clang-19
sudo apt-add-repository 'deb https://apt.llvm.org/noble/ llvm-toolchain-noble-20 main' && break || sleep 1
sudo apt-get install clang-20
- if: ${{ matrix.use_libcxx }}
run: sudo apt-get install libc++-19-dev libc++abi-19-dev
run: sudo apt-get install libc++-20-dev libc++abi-20-dev
- if: ${{ matrix.topology != 'no' }}
run: |
sudo apt-get install hwloc libhwloc-dev
Expand All @@ -367,14 +369,14 @@ jobs:
runs-on: ubuntu-24.04
continue-on-error: true
env:
CC: 'clang-19'
CXX: 'clang++-19'
CC: 'clang-20'
CXX: 'clang++-20'
steps:
- uses: actions/checkout@v4
- run: |
wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key | sudo apt-key add - && break || sleep 1
sudo apt-add-repository 'deb https://apt.llvm.org/jammy/ llvm-toolchain-jammy-19 main' && break || sleep 1
sudo apt-get install clang-format-19
sudo apt-add-repository 'deb https://apt.llvm.org/noble/ llvm-toolchain-noble-20 main' && break || sleep 1
sudo apt-get install clang-format-20
- name: check formatting
run: |
clang-format --version
Expand Down
2 changes: 1 addition & 1 deletion clang-format.sh
Original file line number Diff line number Diff line change
@@ -1 +1 @@
find -iname *.h -or -iname *.c -or -iname *.hpp -or -iname *.cpp | xargs clang-format-19 -i
find -iname *.h -or -iname *.c -or -iname *.hpp -or -iname *.cpp | xargs clang-format-20 -i
4 changes: 2 additions & 2 deletions test/benchmarks/sc12/log.h
Original file line number Diff line number Diff line change
Expand Up @@ -32,13 +32,13 @@
double es = (1.0 / (1.0 - q * m)); \
fprintf(stdout, " q: %f\n", q); \
fprintf(stdout, " m: %d\n", m); \
fprintf(stdout, " E(n): %f\n", q *m); \
fprintf(stdout, " E(n): %f\n", q * m); \
fprintf(stdout, " E(s): %.2f\n", es); \
} \
if (tree_type == HYBRID) { \
fprintf(stdout, \
" Root-to-depth: %d\n", \
(int)ceil(shift_depth *tree_depth)); \
(int)ceil(shift_depth * tree_depth)); \
} \
if (tree_type == BALANCED) { \
fprintf(stdout, " Gen mx: %d\n", tree_depth); \
Expand Down
Loading