Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 9 additions & 1 deletion .github/workflows/windows.yml
Original file line number Diff line number Diff line change
Expand Up @@ -136,10 +136,15 @@ jobs:
run: ./_build/test/test_xsimd

build-windows-arm64:
name: 'MSVC arm64'
name: 'MSVC arm64 ${{ matrix.abi.name }}'
defaults:
run:
shell: bash {0}
strategy:
matrix:
abi:
- { name: "native", cflags: "" }
- { name: "arm64ec", cflags: " /arm64EC" }
runs-on: windows-11-arm
steps:
- name: Setup compiler
Expand All @@ -154,6 +159,9 @@ jobs:
uses: actions/checkout@v6
- name: Setup
run: cmake -B _build -DBUILD_TESTS=ON -DDOWNLOAD_DOCTEST=ON -DBUILD_BENCHMARK=ON -DBUILD_EXAMPLES=ON -DCMAKE_BUILD_TYPE=Release -G Ninja
env:
CFLAGS: ${{ matrix.abi.cflags }}
CXXFLAGS: ${{ matrix.abi.cflags }}
- name: Build
run: cmake --build _build
- name: Testing xsimd

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.

This is not testing the x86 emulation part, but I think it's ok, not our business to check that.

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.

IMO it would be our business to test the x64 intrinsics in arm64ec mode, but I've disabled them on purpose. On arm64ec, I think we should only allow to generate the native neon intrinsics instead.

Expand Down
2 changes: 1 addition & 1 deletion benchmark/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ endif()
if(MSVC)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /EHsc /MP /bigobj")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /arch:AVX2")
set(CMAKE_EXE_LINKER_FLAGS /MANIFEST:NO)
set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /MANIFEST:NO")
foreach(flag_var
CMAKE_CXX_FLAGS CMAKE_CXX_FLAGS_DEBUG CMAKE_CXX_FLAGS_RELEASE
CMAKE_CXX_FLAGS_MINSIZEREL CMAKE_CXX_FLAGS_RELWITHDEBINFO)
Expand Down
4 changes: 2 additions & 2 deletions include/xsimd/config/xsimd_config.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@
*
* Set to 1 if the target is the x86 architecture family.
*/
#if defined(__x86_64__) || defined(__i386__) || defined(_M_AMD64) || defined(_M_IX86)
#if (defined(__x86_64__) || defined(__i386__) || defined(_M_AMD64) || defined(_M_IX86)) && !defined(_M_ARM64EC)
#define XSIMD_TARGET_X86 1
#else
#define XSIMD_TARGET_X86 0
Expand Down Expand Up @@ -422,7 +422,7 @@
*
* Set to 1 if the target is in the ARM architecture family in 64 bits, to 0 otherwise
*/
#if defined(__aarch64__) || defined(_M_ARM64)
#if defined(__aarch64__) || defined(_M_ARM64) || defined(_M_ARM64EC)
#define XSIMD_TARGET_ARM64 1
#else
#define XSIMD_TARGET_ARM64 0
Expand Down
4 changes: 2 additions & 2 deletions test/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -113,12 +113,12 @@ endif()
if(CMAKE_CXX_COMPILER_ID MATCHES MSVC)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /EHsc /MP /bigobj")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /wd4244 /wd4267 /wd4005 /wd4146 /wd4800")
set(CMAKE_EXE_LINKER_FLAGS /MANIFEST:NO)
set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /MANIFEST:NO")
endif()

if(CMAKE_CXX_COMPILER_ID MATCHES Clang AND MSVC AND WIN32) # We are using clang-cl
add_compile_options(/EHsc /bigobj)
set(CMAKE_EXE_LINKER_FLAGS /MANIFEST:NO)
set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /MANIFEST:NO")
endif()

set(XSIMD_TESTS
Expand Down
Loading