Skip to content

Fix ppcle CI #1299

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
AntoinePrv merged 4 commits into from
Apr 14, 2026
Merged

Fix ppcle CI #1299

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
5077685
Try reduce string ops
AntoinePrv Apr 14, 2026
c9f27de
Fix ppc CI name
AntoinePrv Apr 14, 2026
dfcf2c3
Fix formatting
AntoinePrv Apr 14, 2026
7e5e014
Simplify utilities
AntoinePrv Apr 14, 2026
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
3 changes: 2 additions & 1 deletion .github/workflows/cross-ppc.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,11 @@ on: [push, pull_request]
concurrency:
group: ${{ github.workflow }}-${{ github.job }}-${{ github.ref }}
cancel-in-progress: true

jobs:
build:
runs-on: ubuntu-latest
name: '${{ matrix.target.arch }}, ${{ matrix.sys.compiler }} ${{ matrix.sys.version }}'
name: '${{ matrix.target.platform }}, ${{ matrix.sys.compiler }} ${{ matrix.sys.version }}'
strategy:
matrix:
target:
Expand Down
59 changes: 39 additions & 20 deletions test/test_utils.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -406,28 +406,47 @@ namespace detail
}
}

// Use make_context_info instead of INFO() to avoid MinGW GCC vtable issues
// (see StringContextScope above).
#define CHECK_BATCH_EQ(b1, b2) \
do \
{ \
auto _ctx1 = ::detail::make_context_info(#b1, b1); \
auto _ctx2 = ::detail::make_context_info(#b2, b2); \
CHECK_UNARY(::detail::expect_batch_near(b1, b2)); \
// We use make_context_info instead of INFO() to avoid MinGW GCC vtable issues
// (see StringContextScope above). Unlike INFO(), make_context_info is eager:
// it stringifies its operands at construction. To keep the happy path cheap
// (these macros are called in tight loops and QEMU-emulated CI targets like
// ppc64le blow past wall-clock otherwise), we first evaluate the predicate
// and only build the context when it fails. On failure the predicate is
// re-evaluated inside CHECK_UNARY so doctest records the expression text;
// this requires the operands to be side-effect-free, which holds for all
// call sites here.
#define CHECK_BATCH_EQ(b1, b2) \
do \
{ \
const bool batches_are_near = ::detail::expect_batch_near(b1, b2); \
if (!batches_are_near) \
{ \
auto _ctx1 = ::detail::make_context_info(#b1, b1); \
auto _ctx2 = ::detail::make_context_info(#b2, b2); \
CHECK_UNARY(::detail::expect_batch_near(b1, b2)); \
} \
} while (0)
#define CHECK_SCALAR_EQ(s1, s2) \
do \
{ \
auto _ctx1 = ::detail::make_context_info(#s1, s1); \
auto _ctx2 = ::detail::make_context_info(#s2, s2); \
CHECK_UNARY(::detail::expect_scalar_near(s1, s2)); \
#define CHECK_SCALAR_EQ(s1, s2) \
do \
{ \
const bool scalars_are_near = ::detail::expect_scalar_near(s1, s2); \
if (!scalars_are_near) \
{ \
auto _ctx1 = ::detail::make_context_info(#s1, s1); \
auto _ctx2 = ::detail::make_context_info(#s2, s2); \
CHECK_UNARY(::detail::expect_scalar_near(s1, s2)); \
} \
} while (0)
#define CHECK_VECTOR_EQ(v1, v2) \
do \
{ \
auto _ctx1 = ::detail::make_context_info(#v1, v1); \
auto _ctx2 = ::detail::make_context_info(#v2, v2); \
CHECK_UNARY(::detail::expect_vector_near(v1, v2)); \
#define CHECK_VECTOR_EQ(v1, v2) \
do \
{ \
const bool vectors_are_near = ::detail::expect_vector_near(v1, v2); \
if (!vectors_are_near) \
{ \
auto _ctx1 = ::detail::make_context_info(#v1, v1); \
auto _ctx2 = ::detail::make_context_info(#v2, v2); \
CHECK_UNARY(::detail::expect_vector_near(v1, v2)); \
} \
} while (0)

/***********************
Expand Down
Loading