Skip to content
New issue

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

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

Already on GitHub? # to your account

[build] Add support for ASM files in Make + CMake #2783

Merged
merged 1 commit into from
Sep 17, 2021

Conversation

terrelln
Copy link
Contributor

  • Extract out common portion of lib/Makefile into lib/libzstd.mk.
    Most relevantly, the way we find library files.
  • Use lib/libzstd.mk in the other Makefiles instead of repeating the
    same code.
  • Add a test tests/test-variants.sh that checks that the builds of
    make -C programs allVariants are correct, and run it in Actions.
  • Adds support for ASM files in the CMake build.

The Meson build is not updated because it lists every file in zstd,
and supports ASM off the bat, so the Huffman ASM commit will just add
the ASM file to the list.

The Visual Studios build is not updated because I'm not adding ASM
support to Visual Studios yet.

@terrelln
Copy link
Contributor Author

Looks like some of these changes are triggering a compiler bug in an aarch64 cross compiler :(

@terrelln
Copy link
Contributor Author

I've attempted to move the various cross compile builds to the QEMU matrix in GitHub actions, and am hoping they have a different version of the compiler that doesn't have the bug.

* Extract out common portion of `lib/Makefile` into `lib/libzstd.mk`.
  Most relevantly, the way we find library files.
* Use `lib/libzstd.mk` in the other Makefiles instead of repeating the
  same code.
* Add a test `tests/test-variants.sh` that checks that the builds of
  `make -C programs allVariants` are correct, and run it in Actions.
* Adds support for ASM files in the CMake build.

The Meson build is not updated because it lists every file in zstd,
and supports ASM off the bat, so the Huffman ASM commit will just add
the ASM file to the list.

The Visual Studios build is not updated because I'm not adding ASM
support to Visual Studios yet.
@terrelln
Copy link
Contributor Author

I'm going to disable the aarch64 test for now. I've opened Issue #2785 to track it.

@terrelln terrelln merged commit 6392c38 into facebook:dev Sep 17, 2021
terrelln added a commit to terrelln/zstd that referenced this pull request Dec 1, 2021
This test was disabled in PR facebook#2783 due to triggering an ICE. Re-enable
the test now that it doesn't trigger the same ICE.

Fixes facebook#2785.
terrelln added a commit to terrelln/zstd that referenced this pull request Dec 1, 2021
This test was disabled in PR facebook#2783 due to triggering an ICE. Re-enable
the test now that it doesn't trigger the same ICE.

Fixes facebook#2785.
terrelln added a commit to terrelln/zstd that referenced this pull request Dec 1, 2021
This test was disabled in PR facebook#2783 due to triggering an ICE. Re-enable
the test now that it doesn't trigger the same ICE.

Fixes facebook#2785.
terrelln added a commit to terrelln/zstd that referenced this pull request Dec 1, 2021
This test was disabled in PR facebook#2783 due to triggering an ICE. Re-enable
the test now that it doesn't trigger the same ICE.

Fixes facebook#2785.
# for free to join this conversation on GitHub. Already have an account? # to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants