Skip to content

IBM Z (s390x) fixes#1325

Merged
JohanMabille merged 1 commit intoxtensor-stack:masterfrom
Andreas-Krebbel:s390x-fixes
Apr 24, 2026
Merged

IBM Z (s390x) fixes#1325
JohanMabille merged 1 commit intoxtensor-stack:masterfrom
Andreas-Krebbel:s390x-fixes

Conversation

@Andreas-Krebbel
Copy link
Copy Markdown
Contributor

  • Fix an issue which so far prevented the full set of tests being compiled in when running in the github workflow.
  • While doing this, align cross-s390x.yml with the latest cross-ppc.yml changes.
  • Add a cpu_feature testcase for s390x VXE and add a few pieces which were still missing.

Tested with GCC and Clang on IBM z17. Workflow tested locally. It runs all the tests now successfully.

-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

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

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.

Comment thread .github/workflows/cross-s390x.yml Outdated
matrix:
target:
- { platform: 's390x', dir: 's390x-linux-gnu', flags: '-mzvector -march=z14', full: 'OFF' }
- { platform: 's390x', dir: 's390x-linux-gnu', flags: '', full: 'OFF' }
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

remove flags then? Or keep it so that we can update in one place in the future? Up to you.

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

The flags have been redundant since I already had it in test/CMakeLists.txt so they appeared twice on the command line in the github workflow:

    elseif(${CMAKE_SYSTEM_PROCESSOR} MATCHES "s390x")
        set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -march=z14 -mzvector")

Power seems to do it the other way around.

I'll remove flags from cross-s390x.yml then I guess.

@JohanMabille JohanMabille merged commit 4f6601b into xtensor-stack:master Apr 24, 2026
88 of 89 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants