Make SIMD configure tests work for MacOS multiarch builds #1587
Conversation
This file contains 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
MacOS multiarch binaries compile source code for each architecture and then join them together using 'lipo'. This means architecture specific code both in the actual source and configure tests need to be compilable on both architectures. Switch the configure tests and hts_probe_cc.sh so that they check if a given flag is needed to compile the test code instead of just testing to see if the flag works. By adding #ifdef __x86_64__ guards around the test code, compilation will work on non-x86_64 returning the result that no special compiler flag is needed. Similar #ifdef guards are added to the source files so that the SIMD-specific code only gets compiled for x86_64. The htscodecs submodule is updated to pull in these source file changes. The SIMD parts of built-in htscodecs are now compiled unconditionally. Tests for NEON have also been removed as they weren't really doing anything. The configure and hts_probe_cc.sh are adjusted to exactly match those used by htscodecs' configure, for ease of maintenance.
daviesrob
force-pushed
the
fat_binaries3
branch
from
7ccda7a to
d4c0859
Compare
|
MacOS CI tests have been updated to add the |
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.
MacOS multiarch binaries compile source code for each architecture and then join them together using 'lipo'. This means architecture specific code both in the actual source and configure tests need to be compilable on both architectures.
This pulls in htscodecs changes needed, and makes changes to HTSlib's Makefile, configure and hts_probe_cc.sh scripts so that multiarch compilation works. It also makes the MacOS CI tests build a multiarch library.
See also samtools/htscodecs#76 and samtools/htscodecs#78.