BUG: Correct ambiguous logic for s390x CPU feature detection
#29697
+2
−2
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
s390x CPU feature detection
|
Hi @jorenham, This PR refines the s390x CPU feature detection by replacing ambiguous VXE and VXE2 regex patterns with precise word-boundary matches. All tests pass, and there are no changes to compiler flags or feature hierarchy. Could you please review when you have a moment? Thanks! |
|
Thanks @Sanjaykumar030 . |
|
I'm am curious about the change to lower case. Is the match independent of case? |
s390x CPU feature detections390x CPU feature detection
|
Thanks for the question, @charris. The new regex patterns are case-sensitive, chosen to align with the lowercase feature strings reported on s390x. This keeps the behavior consistent with the existing build logic and avoids any breaking changes. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This PR continues the work from #29678 to improve CPU feature detection in the Meson build system, specifically for the
s390xarchitecture.Problem:
The current detection for
VXEandVXE2is ambiguous:These ambiguities may cause NumPy to compile with unsupported CPU instructions, risking Illegal Instruction crashes or performance issues.
Solution:
This PR replaces the fragile patterns with precise regular expressions using word boundaries (
\b):VXE → '\\bvxe\\b'VXE2 → '\\bvxe2\\b'No changes are made to the feature hierarchy, compiler flags, or test code.