Skip to content

Commit

Permalink
Merge pull request #1283 from msimberg/clang-19-ci
Browse files Browse the repository at this point in the history
Add clang 19 CI configuration
  • Loading branch information
msimberg authored Oct 31, 2024
2 parents 5ce752b + accda74 commit bfa0be5
Show file tree
Hide file tree
Showing 4 changed files with 60 additions and 42 deletions.
58 changes: 58 additions & 0 deletions .gitlab/includes/clang19_pipeline.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,58 @@
# Copyright (c) 2023 ETH Zurich
#
# SPDX-License-Identifier: BSL-1.0
# Distributed under the Boost Software License, Version 1.0. (See accompanying
# file BOOST_LICENSE_1_0.rst or copy at http://www.boost.org/LICENSE_1_0.txt)

include:
- local: '.gitlab/includes/common_pipeline.yml'
- local: '.gitlab/includes/common_spack_pipeline.yml'

.variables_clang19_config:
variables:
SPACK_ARCH: linux-ubuntu22.04-zen2
COMPILER: [email protected]
CXXSTD: 23
SPACK_SPEC: "pika@main arch=$SPACK_ARCH %${COMPILER} \
cxxflags=-stdlib=libc++ cxxflags=-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_DEBUG \
malloc=system \
cxxstd=$CXXSTD +stdexec ^[email protected] ^[email protected] \
^fmt cxxflags=-stdlib=libc++ cxxflags=-DLIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_DEBUG \
^spdlog cxxflags=-stdlib=libc++ cxxflags=-DLIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_DEBUG \
^[email protected]"
CMAKE_FLAGS: "-DPIKA_WITH_CXX_STANDARD=$CXXSTD \
-DCMAKE_CXX_FLAGS='-stdlib=libc++ -D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_DEBUG' \
-DPIKA_WITH_MALLOC=system -DPIKA_WITH_SPINLOCK_DEADLOCK_DETECTION=ON \
-DPIKA_WITH_STDEXEC=ON"

clang19_spack_compiler_image:
extends:
- .variables_clang19_config
- .compiler_image_template_rosa

clang19_spack_image:
needs: [clang19_spack_compiler_image]
extends:
- .variables_clang19_config
- .dependencies_image_template_rosa

clang19_build:
needs: [clang19_spack_image]
extends:
- .variables_clang19_config
- .build_template_rosa

.clang19_test_common:
needs: [clang19_build]
extends:
- .variables_clang19_config
- .test_common_eiger_mc
- .test_template

clang19_test_release:
extends: [.clang19_test_common]
image: $PERSIST_IMAGE_NAME_RELEASE

clang19_test_debug:
extends: [.clang19_test_common]
image: $PERSIST_IMAGE_NAME_DEBUG
2 changes: 1 addition & 1 deletion .gitlab/includes/common_spack_pipeline.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ include:
- local: '.gitlab/includes/common_pipeline.yml'

variables:
SPACK_COMMIT: develop-2024-09-15
SPACK_COMMIT: develop-2024-10-06

.base_spack_image:
timeout: 1 hours
Expand Down
1 change: 1 addition & 0 deletions .gitlab/pipelines_on_merge.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,4 +21,5 @@ include:
- local: '.gitlab/includes/clang16_pipeline.yml'
- local: '.gitlab/includes/clang17_pipeline.yml'
- local: '.gitlab/includes/clang18_pipeline.yml'
- local: '.gitlab/includes/clang19_pipeline.yml'
- local: '.gitlab/includes/nvhpc24_7_pipeline.yml'
41 changes: 0 additions & 41 deletions libs/pika/concurrency/include/pika/concurrency/deque.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -123,47 +123,6 @@ namespace pika::concurrency::detail {

pair lrs(std::memory_order mo = std::memory_order_acquire) const { return pair_.load(mo); }

node* left(std::memory_order mo = std::memory_order_acquire) const
{
return pair_.load(mo).get_left_ptr();
}

node* right(std::memory_order mo = std::memory_order_acquire) const
{
return pair_.load(mo).get_right_ptr();
}

tag_t status(std::memory_order mo = std::memory_order_acquire) const
{
return pair_.load(mo).get_left_tag();
}

tag_t tag(std::memory_order mo = std::memory_order_acquire) const
{
return pair_.load(mo).get_right_tag();
}

bool cas(deque_anchor& expected, deque_anchor const& desired,
std::memory_order mo = std::memory_order_acq_rel)
{
return pair_.compare_exchange_strong(expected.load(std::memory_order_acquire),
desired.load(std::memory_order_acquire), mo);
}

bool cas(pair& expected, deque_anchor const& desired,
std::memory_order mo = std::memory_order_acq_rel)
{
return pair_.compare_exchange_strong(
expected, desired.load(std::memory_order_acquire), mo);
}

bool cas(deque_anchor& expected, pair const& desired,
std::memory_order mo = std::memory_order_acq_rel)
{
return pair_.compare_exchange_strong(
expected.load(std::memory_order_acquire), desired, mo);
}

bool cas(
pair& expected, pair const& desired, std::memory_order mo = std::memory_order_acq_rel)
{
Expand Down

0 comments on commit bfa0be5

Please sign in to comment.