fix: Add arm_neon.h include on Windows ARM64 with clang-cl #4691
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
Signed-off-by: Anthony Roberts <[email protected]>
|
|
lgritz
reviewed
Apr 4, 2025
Collaborator
lgritz
left a comment
lgritz
left a comment
There was a problem hiding this comment.
This is great. Can you do the CLA signing so I can merge it?
Contributor
Author
|
Yes - just waiting on the relevant person at our company to check it all off for me on the EasyCLA dashboard! |
Collaborator
|
Any luck, @anthony-linaro ? (No rush, just letting you know we have not forgotten about you.) |
lgritz
added
build / testing / port / CI
Contributor
Author
|
Not yet, sorry! Chasing with management chain |
Collaborator
|
@anthony-linaro Checking in. Still no rush, just making sure neither of us forgets completely about it. |
Contributor
Author
|
Sorry no progress :( apparently they're having some sort of issues with the corporate CLA portal |
Contributor
Author
|
@lgritz The CLA issue is now resolved, apologies for the delay! |
lgritz
merged commit 1516226
into
AcademySoftwareFoundation:main
27 of 28 checks passed
lgritz
pushed a commit
to lgritz/OpenImageIO
that referenced
this pull request
Jun 20, 2025
…SoftwareFoundation#4691) On Windows ARM64, when building with clang-cl, LLVM can sometimes use it's own built-in intrin.h file, located in `<LLVM INSTALL PATH>\lib\clang\20\include`. This file, as opposed to the built-in one that ships with the Windows SDK that MSVC uses, doesn't have an inclusion of arm_neon.h. This PR adds a small check to the simd.h file to include this header. I didn't add an extra check to specifically only do this for clang, as it seemed a little messy - I can do this, but it's relatively harmless for MSVC given intrin.h includes it anyway for that compiler. This change has already been in place for some time in Blender, this is just an upstreaming PR for that change: https://projects.blender.org/blender/blender/src/commit/ea604b6b80e49adb51d12df4e4edd5af1c51f446/build_files/build_environment/patches/oiio_windows_arm64.diff
zachlewis
pushed a commit
to zachlewis/OpenImageIO
that referenced
this pull request
Aug 1, 2025
…SoftwareFoundation#4691) On Windows ARM64, when building with clang-cl, LLVM can sometimes use it's own built-in intrin.h file, located in `<LLVM INSTALL PATH>\lib\clang\20\include`. This file, as opposed to the built-in one that ships with the Windows SDK that MSVC uses, doesn't have an inclusion of arm_neon.h. This PR adds a small check to the simd.h file to include this header. I didn't add an extra check to specifically only do this for clang, as it seemed a little messy - I can do this, but it's relatively harmless for MSVC given intrin.h includes it anyway for that compiler. This change has already been in place for some time in Blender, this is just an upstreaming PR for that change: https://projects.blender.org/blender/blender/src/commit/ea604b6b80e49adb51d12df4e4edd5af1c51f446/build_files/build_environment/patches/oiio_windows_arm64.diff
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
Description
On Windows ARM64, when building with
clang-cl, LLVM can sometimes use it's own built-inintrin.hfile, located in<LLVM INSTALL PATH>\lib\clang\20\include.This file, as opposed to the built-in one that ships with the Windows SDK that MSVC uses, doesn't have an inclusion of
arm_neon.h. This PR adds a small check to thesimd.hfile to include this header.I didn't add an extra check to specifically only do this for clang, as it seemed a little messy - I can do this, but it's relatively harmless for MSVC given
intrin.hincludes it anyway for that compiler.This change has already been in place for some time in Blender, this is just an upstreaming PR for that change: https://projects.blender.org/blender/blender/src/commit/ea604b6b80e49adb51d12df4e4edd5af1c51f446/build_files/build_environment/patches/oiio_windows_arm64.diff
Tests
n/a
Checklist:
[ ] I have updated the documentation, if applicable. (Check if there is noneed to update the documentation, for example if this is a bug fix that
doesn't change the API.)
[ ] I have ensured that the change is tested somewhere in the testsuite(adding new test cases if necessary).
[ ] If I added or modified a C++ API call, I have also amended thecorresponding Python bindings (and if altering ImageBufAlgo functions, also
exposed the new functionality as oiiotool options).
already run clang-format before submitting, I definitely will look at the CI
test that runs clang-format and fix anything that it highlights as being
nonconforming.