GerbilSoft/zlib-ng
1
Fork 0
mirror of https://github.com/GerbilSoft/zlib-ng.git synced 2025-06-18 19:45:37 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

Handle ARM64EC as ARM64.

Browse Source 
ARM64EC is a new ARM64 variant introduced in Windows 11 that uses an
ABI similar to AMD64, which allows for better interoperability with
emulated AMD64 applications. When enabled in MSVC, it defines _M_AMD64
and _M_ARM64EC, but not _M_ARM64, so we need to check for _M_ARM64EC.
This commit is contained in:
David Korth 2023-07-15 10:13:20 -04:00 committed by Hans Kristian Rosbach
parent 70da27b86e
commit 8976caa3f0
11 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
arch/arm/arm_features.c
View File

@ -45,7 +45,7 @@ static int arm_has_crc32() {
} }
/* AArch64 has neon. */ /* AArch64 has neon. */
#if !defined(__aarch64__) && !defined(_M_ARM64) #if !defined(__aarch64__) && !defined(_M_ARM64) && !defined(_M_ARM64EC)
static inline int arm_has_neon() { static inline int arm_has_neon() {
#if defined(__linux__) && defined(ARM_AUXV_HAS_NEON) #if defined(__linux__) && defined(ARM_AUXV_HAS_NEON)
# ifdef HWCAP_ARM_NEON # ifdef HWCAP_ARM_NEON
@ -73,7 +73,7 @@ static inline int arm_has_neon() {
#endif #endif
void Z_INTERNAL arm_check_features(struct arm_cpu_features *features) { void Z_INTERNAL arm_check_features(struct arm_cpu_features *features) {
#if defined(__aarch64__) || defined(_M_ARM64) #if defined(__aarch64__) || defined(_M_ARM64) || defined(_M_ARM64EC)
features->has_neon = 1; /* always available */ features->has_neon = 1; /* always available */
#else #else
features->has_neon = arm_has_neon(); features->has_neon = arm_has_neon();

2
arch/arm/chunkset_neon.c
View File

@ -72,7 +72,7 @@ static inline chunk_t GET_CHUNK_MAG(uint8_t *buf, uint32_t *chunk_rem, uint32_t
__msan_unpoison(buf + dist, 16 - dist); __msan_unpoison(buf + dist, 16 - dist);
/* This version of table is only available on aarch64 */ /* This version of table is only available on aarch64 */
#if defined(_M_ARM64) || defined(__aarch64__) #if defined(_M_ARM64) || defined(_M_ARM64EC) || defined(__aarch64__)
uint8x16_t ret_vec = vld1q_u8(buf); uint8x16_t ret_vec = vld1q_u8(buf);
uint8x16_t perm_vec = vld1q_u8(permute_table + lut_rem.idx); uint8x16_t perm_vec = vld1q_u8(permute_table + lut_rem.idx);

2
arch/arm/crc32_acle.c
View File

@ -33,7 +33,7 @@ Z_INTERNAL uint32_t crc32_acle(uint32_t crc, const uint8_t *buf, size_t len) {
buf4 = (const uint32_t *) buf; buf4 = (const uint32_t *) buf;
} }
#if defined(__aarch64__) || defined(_M_ARM64) #if defined(__aarch64__) || defined(_M_ARM64) || defined(_M_ARM64EC)
if ((len >= sizeof(uint32_t)) && ((ptrdiff_t)buf & sizeof(uint32_t))) { if ((len >= sizeof(uint32_t)) && ((ptrdiff_t)buf & sizeof(uint32_t))) {
c = __crc32w(c, *buf4++); c = __crc32w(c, *buf4++);
len -= sizeof(uint32_t); len -= sizeof(uint32_t);

4
arch/arm/neon_intrins.h
View File

@ -1,13 +1,13 @@
#ifndef ARM_NEON_INTRINS_H #ifndef ARM_NEON_INTRINS_H
#define ARM_NEON_INTRINS_H #define ARM_NEON_INTRINS_H
#ifdef _M_ARM64 #if defined(_M_ARM64) || defined(_M_ARM64EC)
# include <arm64_neon.h> # include <arm64_neon.h>
#else #else
# include <arm_neon.h> # include <arm_neon.h>
#endif #endif
#if defined(ARM_NEON) && !defined(__aarch64__) && !defined(_M_ARM64) #if defined(ARM_NEON) && !defined(__aarch64__) && !defined(_M_ARM64) && !defined(_M_ARM64EC)
/* Compatibility shim for the _high family of functions */ /* Compatibility shim for the _high family of functions */
#define vmull_high_u8(a, b) vmull_u8(vget_high_u8(a), vget_high_u8(b)) #define vmull_high_u8(a, b) vmull_u8(vget_high_u8(a), vget_high_u8(b))
#define vmlal_high_u8(a, b, c) vmlal_u8(a, vget_high_u8(b), vget_high_u8(c)) #define vmlal_high_u8(a, b, c) vmlal_u8(a, vget_high_u8(b), vget_high_u8(c))

2
cmake/detect-arch.c
View File

@ -12,7 +12,7 @@
#error archfound i686 #error archfound i686
// ARM // ARM
#elif defined(__aarch64__) || defined(__arm64__) || defined(_M_ARM64) #elif defined(__aarch64__) || defined(__arm64__) || defined(_M_ARM64) || defined(_M_ARM64EC)
#error archfound aarch64 #error archfound aarch64
#elif defined(__arm__) || defined(__arm) || defined(_M_ARM) || defined(__TARGET_ARCH_ARM) #elif defined(__arm__) || defined(__arm) || defined(_M_ARM) || defined(__TARGET_ARCH_ARM)
#if defined(__ARM64_ARCH_8__) || defined(__ARMv8__) || defined(__ARMv8_A__) #if defined(__ARM64_ARCH_8__) || defined(__ARMv8__) || defined(__ARMv8_A__)

2
cmake/detect-arch.cmake
View File

@ -13,7 +13,7 @@ elseif(MSVC)
set(ARCH "x86_64") set(ARCH "x86_64")
elseif("${MSVC_C_ARCHITECTURE_ID}" STREQUAL "ARM" OR "${MSVC_C_ARCHITECTURE_ID}" STREQUAL "ARMV7") elseif("${MSVC_C_ARCHITECTURE_ID}" STREQUAL "ARM" OR "${MSVC_C_ARCHITECTURE_ID}" STREQUAL "ARMV7")
set(ARCH "arm") set(ARCH "arm")
elseif ("${MSVC_C_ARCHITECTURE_ID}" STREQUAL "ARM64") elseif ("${MSVC_C_ARCHITECTURE_ID}" STREQUAL "ARM64" OR "${MSVC_C_ARCHITECTURE_ID}" STREQUAL "ARM64EC")
set(ARCH "aarch64") set(ARCH "aarch64")
endif() endif()
elseif(EMSCRIPTEN) elseif(EMSCRIPTEN)

4
cmake/detect-intrinsics.cmake
View File

@ -176,7 +176,7 @@ macro(check_neon_compiler_flag)
# Check whether compiler supports NEON flag # Check whether compiler supports NEON flag
set(CMAKE_REQUIRED_FLAGS "${NEONFLAG} ${NATIVEFLAG}") set(CMAKE_REQUIRED_FLAGS "${NEONFLAG} ${NATIVEFLAG}")
check_c_source_compiles( check_c_source_compiles(
"#ifdef _M_ARM64 "#if defined(_M_ARM64) || defined(_M_ARM64EC)
# include <arm64_neon.h> # include <arm64_neon.h>
#else #else
# include <arm_neon.h> # include <arm_neon.h>
@ -199,7 +199,7 @@ macro(check_neon_ld4_intrinsics)
# Check whether compiler supports loading 4 neon vecs into a register range # Check whether compiler supports loading 4 neon vecs into a register range
set(CMAKE_REQUIRED_FLAGS "${NEONFLAG}") set(CMAKE_REQUIRED_FLAGS "${NEONFLAG}")
check_c_source_compiles( check_c_source_compiles(
"#ifdef _M_ARM64 "#if defined(_M_ARM64) || defined(_M_ARM64EC)
# include <arm64_neon.h> # include <arm64_neon.h>
#else #else
# include <arm_neon.h> # include <arm_neon.h>

4
configure vendored
View File

@ -1200,7 +1200,7 @@ EOF
check_neon_compiler_flag() { check_neon_compiler_flag() {
# Check whether -mfpu=neon is available on ARM processors. # Check whether -mfpu=neon is available on ARM processors.
cat > $test.c << EOF cat > $test.c << EOF
#ifdef _M_ARM64 #if defined(_M_ARM64) || defined(_M_ARM64EC)
# include <arm64_neon.h> # include <arm64_neon.h>
#else #else
# include <arm_neon.h> # include <arm_neon.h>
@ -1225,7 +1225,7 @@ check_neon_ld4_intrinsics() {
fi fi
fi fi
cat > $test.c << EOF cat > $test.c << EOF
#ifdef _M_ARM64 #if defined(_M_ARM64) || defined(_M_ARM64EC)
# include <arm64_neon.h> # include <arm64_neon.h>
#else #else
# include <arm_neon.h> # include <arm_neon.h>

2
fallback_builtins.h
View File

@ -2,7 +2,7 @@
#define FALLBACK_BUILTINS_H #define FALLBACK_BUILTINS_H
#if defined(_MSC_VER) && !defined(__clang__) #if defined(_MSC_VER) && !defined(__clang__)
#if defined(_M_IX86) || defined(_M_AMD64) || defined(_M_IA64) || defined(_M_ARM) || defined(_M_ARM64) #if defined(_M_IX86) || defined(_M_AMD64) || defined(_M_IA64) || defined(_M_ARM) || defined(_M_ARM64) || defined(_M_ARM64EC)
#include <intrin.h> #include <intrin.h>
#ifdef X86_FEATURES #ifdef X86_FEATURES

2
zbuild.h
View File

@ -221,7 +221,7 @@
# elif defined(__i386__) || defined(__i486__) || defined(__i586__) || \ # elif defined(__i386__) || defined(__i486__) || defined(__i586__) || \
defined(__i686__) || defined(_X86_) || defined(_M_IX86) defined(__i686__) || defined(_X86_) || defined(_M_IX86)
# define UNALIGNED_OK # define UNALIGNED_OK
# elif defined(__aarch64__) || defined(_M_ARM64) # elif defined(__aarch64__) || defined(_M_ARM64) || defined(_M_ARM64EC)
# if (defined(__GNUC__) && defined(__ARM_FEATURE_UNALIGNED)) || !defined(__GNUC__) # if (defined(__GNUC__) && defined(__ARM_FEATURE_UNALIGNED)) || !defined(__GNUC__)
# define UNALIGNED_OK # define UNALIGNED_OK
# define UNALIGNED64_OK # define UNALIGNED64_OK

2
zendian.h
View File

@ -27,7 +27,7 @@
#elif defined(_WIN32) #elif defined(_WIN32)
# define LITTLE_ENDIAN 1234 # define LITTLE_ENDIAN 1234
# define BIG_ENDIAN 4321 # define BIG_ENDIAN 4321
# if defined(_M_IX86) || defined(_M_AMD64) || defined(_M_IA64) || defined (_M_ARM) || defined (_M_ARM64) # if defined(_M_IX86) || defined(_M_AMD64) || defined(_M_IA64) || defined (_M_ARM) || defined (_M_ARM64) || defined (_M_ARM64EC)
# define BYTE_ORDER LITTLE_ENDIAN # define BYTE_ORDER LITTLE_ENDIAN
# else # else
# error Unknown endianness! # error Unknown endianness!