Skip to content

IBM Z (s390x) fixes #1325

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
JohanMabille merged 1 commit into from
Apr 24, 2026
Merged

IBM Z (s390x) fixes #1325

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
17 changes: 12 additions & 5 deletions .github/workflows/cross-s390x.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:
strategy:
matrix:
target:
- { platform: 's390x', dir: 's390x-linux-gnu', flags: '-mzvector -march=z14', full: 'OFF' }
- { platform: 's390x', dir: 's390x-linux-gnu', full: 'OFF' }
sys:
- { compiler: 'gcc', version: '14' }
steps:
Expand All @@ -34,15 +34,22 @@ jobs:
uses: actions/checkout@v6
- name: Setup
run: |
cmake -B _build \
cmake -B build/ \
-DBUILD_TESTS=ON -DDOWNLOAD_DOCTEST=ON \
-DBUILD_BENCHMARK=${{ matrix.target.full }} -DBUILD_EXAMPLES=${{ matrix.target.full }} \
-DCMAKE_BUILD_TYPE=Release \
-DCMAKE_C_FLAGS="${{ matrix.target.flags }}" \
-DCMAKE_CXX_FLAGS="${{ matrix.target.flags }}" \
-DCMAKE_TOOLCHAIN_FILE=${{ github.workspace }}/.github/toolchains/${{ matrix.sys.compiler }}-${{ matrix.target.dir }}.cmake
- name: Build
run: cmake --build _build --verbose -j1
run: cmake --build build/ --verbose -j1
Copy link
Copy Markdown
Contributor

@serge-sans-paille serge-sans-paille Apr 24, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm curious: why this change?

Copy link
Copy Markdown
Contributor Author

@Andreas-Krebbel Andreas-Krebbel Apr 24, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is how cross-ppc.yml does it and I thought it would make sense to keep the two files as close as possible.

- name: Testing xsimd
run: qemu-${{ matrix.target.platform }} -L /usr/${{ matrix.target.dir}}/ ./test/test_xsimd
working-directory: ${{ github.workspace }}/_build
run: |
# Set CPU feature test expectations, 0 is explicit absence of the feature
export XSIMD_TEST_CPU_ASSUME_SSE4_2="0"
export XSIMD_TEST_CPU_ASSUME_NEON64="0"
export XSIMD_TEST_CPU_ASSUME_RVV="0"
export XSIMD_TEST_CPU_ASSUME_VSX="0"
export XSIMD_TEST_CPU_ASSUME_VXE="1"

qemu-${{ matrix.target.platform }} -L /usr/${{ matrix.target.dir}}/ ./build/test/test_xsimd
1 change: 1 addition & 0 deletions .github/workflows/linux.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,6 +124,7 @@ jobs:
export XSIMD_TEST_CPU_ASSUME_NEON64="0"
export XSIMD_TEST_CPU_ASSUME_RVV="0"
export XSIMD_TEST_CPU_ASSUME_VSX="0"
export XSIMD_TEST_CPU_ASSUME_VXE="0"
cd _build/test
if echo '${{ matrix.sys.flags }}' | grep -q 'avx512' ; then
# Running with emulation, must have AVX512, lower tier are checked by implications in tests
Expand Down
1 change: 1 addition & 0 deletions include/xsimd/config/xsimd_arch.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -181,6 +181,7 @@ namespace xsimd
using arm_arch = typename detail::supported<all_arm_architectures>::type::best;
using power_arch = typename detail::supported<all_power_architectures>::type::best;
using riscv_arch = typename detail::supported<all_riscv_architectures>::type::best;
using s390x_arch = typename detail::supported<all_s390x_architectures>::type::best;
using best_arch = typename supported_architectures::best;

#ifdef XSIMD_DEFAULT_ARCH
Expand Down
2 changes: 1 addition & 1 deletion include/xsimd/config/xsimd_config.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -538,7 +538,7 @@
+ * Set to 1 if s390x VXE is available at compile-time, to 0 otherwise.
+ * Float vectors have been introduced with VXE included with IBM z14.
+ */
#if defined(__VEC__) && __VEC__ == 10305 && __ARCH__ >= 12
#if defined(__VEC__) && __VEC__ >= 10304 && __ARCH__ >= 12
#define XSIMD_WITH_VXE 1
#else
#define XSIMD_WITH_VXE 0
Expand Down
3 changes: 2 additions & 1 deletion include/xsimd/config/xsimd_cpu_features.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,8 @@ namespace xsimd
* @see xsimd::dispatch
* @see xsimd::available_architectures
*/
class cpu_features : public ppc_cpu_features,
class cpu_features : public s390x_cpu_features,
public ppc_cpu_features,
public riscv_cpu_features,
public arm_cpu_features,
public x86_cpu_features
Expand Down
2 changes: 2 additions & 0 deletions include/xsimd/config/xsimd_cpuid.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,8 @@ namespace xsimd

const auto cpu = xsimd::cpu_features();

vxe = cpu.vxe();

vsx = cpu.vsx();

rvv128 = cpu.rvv() && (cpu.rvv_size_bytes() >= (128 / 8));
Expand Down
7 changes: 7 additions & 0 deletions test/test_cpu_features.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -176,3 +176,10 @@ TEST_CASE("[cpu_features] ppc features from environment")

CHECK_ENV_FEATURE("XSIMD_TEST_CPU_ASSUME_VSX", cpu.vsx());
}

TEST_CASE("[cpu_features] IBM Z (s390x) features from environment")
{
xsimd::cpu_features cpu;

CHECK_ENV_FEATURE("XSIMD_TEST_CPU_ASSUME_VXE", cpu.vxe());
}
Loading