External/cglm
1
0
Fork 0
mirror of https://github.com/recp/cglm.git synced 2026-01-02 21:59:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

arm: fix checking arm64

Browse Source
This commit is contained in:
Recep Aslantas
2023-03-12 16:43:47 +03:00
parent ba993b3ea9
commit 13ed79a61a
12 changed files with 82 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
include/cglm/simd/arm.h
View File

@@ -10,6 +10,12 @@
#include "intrin.h"
#ifdef CGLM_SIMD_ARM
#if defined(_M_ARM64) || defined(_M_HYBRID_X86_ARM64) || defined(_M_ARM64EC) || defined(__aarch64__)
# define CGLM_ARM64 1
#else
# define CGLM_ARM64 0
#endif
#define glmm_load(p) vld1q_f32(p)
#define glmm_store(p, a) vst1q_f32(p, a)

52
include/cglm/simd/intrin.h
View File

@@ -63,29 +63,43 @@
#endif
/* ARM Neon */
/* TODO: check _M_ARM and compiling should work if there is no ARM64 and NEON */
#if defined(__ARM_NEON) || defined(__ARM_NEON__) \
|| defined(_M_ARM64) || defined(_M_HYBRID_X86_ARM64) || defined(_M_ARM64EC) || defined(__aarch64__)
# include <arm_neon.h>
# ifndef __ARM_NEON
# define __ARM_NEON
#if defined(_WIN32)
/* TODO: non-ARM stuff already inported, will this be better option */
/* # include <intrin.h> */
# if defined(_M_ARM64) || defined(_M_HYBRID_X86_ARM64) || defined(_M_ARM64EC)
# include <arm64intr.h>
# include <arm64_neon.h>
# ifndef CGLM_NEON_FP
# define CGLM_NEON_FP 1
# endif
# ifndef CGLM_SIMD_ARM
# define CGLM_SIMD_ARM
# endif
# elif defined(_M_ARM)
# include <armintr.h>
# include <arm_neon.h>
# if defined(CGLM_NEON_FP) && (defined(__ARM_NEON_FP) || defined(vaddq_f32)) /* vaddq_f32 is defined as macro, we pick it */
# define CGLM_NEON_FP 1
# endif
# ifndef CGLM_SIMD_ARM
# define CGLM_SIMD_ARM
# endif
# endif
# ifndef __ARM_NEON_FP
# define __ARM_NEON_FP 1
# define CGLM_NEON_FP 1
# endif
# ifndef CGLM_ARM64
# define CGLM_ARM64 1
# endif
# ifndef CGLM_SIMD_ARM
# define CGLM_SIMD_ARM
# endif
# ifndef CGLM_SIMD_NEON
# define CGLM_SIMD_NEON 1
#else /* non-windows */
# if defined(__ARM_NEON) || defined(__ARM_NEON__)
# include <arm_neon.h>
# if defined(__ARM_NEON_FP)
# define CGLM_NEON_FP 1
# endif
# ifndef CGLM_SIMD_ARM
# define CGLM_SIMD_ARM
# endif
# endif
#endif
#if defined(CGLM_SIMD_x86) || defined(CGLM_SIMD_NEON)
#if defined(CGLM_SIMD_x86) || defined(CGLM_NEON_FP)
# ifndef CGLM_SIMD
# define CGLM_SIMD
# endif

2
include/cglm/simd/neon/affine.h
View File

@@ -7,7 +7,7 @@
#ifndef cglm_affine_neon_h
#define cglm_affine_neon_h
#if defined(CGLM_SIMD_NEON)
#if defined(CGLM_NEON_FP)
#include "../../common.h"
#include "../intrin.h"

2
include/cglm/simd/neon/mat2.h
View File

@@ -7,7 +7,7 @@
#ifndef cglm_mat2_neon_h
#define cglm_mat2_neon_h
#if defined(CGLM_SIMD_NEON)
#if defined(CGLM_NEON_FP)
#include "../../common.h"
#include "../intrin.h"

2
include/cglm/simd/neon/mat4.h
View File

@@ -7,7 +7,7 @@
#ifndef cglm_mat4_neon_h
#define cglm_mat4_neon_h
#if defined(CGLM_SIMD_NEON)
#if defined(CGLM_NEON_FP)
#include "../../common.h"
#include "../intrin.h"

2
include/cglm/simd/neon/quat.h
View File

@@ -7,7 +7,7 @@
#ifndef cglm_quat_neon_h
#define cglm_quat_neon_h
#if defined(CGLM_SIMD_NEON)
#if defined(CGLM_NEON_FP)
#include "../../common.h"
#include "../intrin.h"