From ecc008eb15e1bb47216051117e2f1485d046758a Mon Sep 17 00:00:00 2001 From: nihui Date: Fri, 23 Feb 2024 11:38:01 +0800 Subject: [PATCH] s390x support (#29) --- README.md | 3 ++- main.c | 3 +++ ruapu.h | 8 +++++++- 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 2b15f87..d24d28a 100644 --- a/README.md +++ b/README.md @@ -6,7 +6,7 @@ Detect CPU ISA features with single-file -
CPU✅ x86, x86-64
✅ arm, aarch64
✅ mips
✅ powerpc
✅ risc-v		 +
CPU✅ x86, x86-64
✅ arm, aarch64
✅ mips
✅ powerpc
✅ s390x
✅ risc-v		 ```c #define RUAPU_IMPLEMENTATION @@ -222,6 +222,7 @@ _`fma4` on zen1, ISA in hypervisor, etc._ |aarch64|`neon` `vfpv4` `cpuid` `asimdhp` `asimddp` `asimdfhm` `bf16` `i8mm` `sve` `sve2` `svebf16` `svei8mm` `svef32mm` `sha3` `sha512` `sm3` `sm4`| |mips|`msa`| |powerpc|`vsx`| +|s390x|`zvector`| |loongarch|| |risc-v|`i` `m` `a` `f` `d` `c`| diff --git a/main.c b/main.c index e531c1b..8bb7afc 100644 --- a/main.c +++ b/main.c @@ -75,6 +75,9 @@ int main() #elif __powerpc__ PRINT_ISA_SUPPORT(vsx) +#elif __s390x__ + PRINT_ISA_SUPPORT(zvector) + #elif __riscv PRINT_ISA_SUPPORT(i) PRINT_ISA_SUPPORT(m) diff --git a/ruapu.h b/ruapu.h index 444c734..7d92933 100644 --- a/ruapu.h +++ b/ruapu.h @@ -134,7 +134,7 @@ static int ruapu_detect_isa(ruapu_some_inst some_inst) return g_ruapu_sigill_caught ? 0 : 1; } -#if defined(__i386__) || defined(__x86_64__) +#if defined(__i386__) || defined(__x86_64__) || __s390x__ #define RUAPU_INSTCODE(isa, ...) static void ruapu_some_##isa() { asm volatile(".byte " #__VA_ARGS__ : : : ); } #elif __aarch64__ || __arm__ || __mips__ || __riscv #define RUAPU_INSTCODE(isa, ...) static void ruapu_some_##isa() { asm volatile(".word " #__VA_ARGS__ : : : ); } @@ -228,6 +228,9 @@ RUAPU_INSTCODE(msa, 0x7900001b) // fmadd.w $w0,$w0,$w0 #elif __powerpc__ RUAPU_INSTCODE(vsx, 0x104210c0) // vaddudm v2,v2,v2 +#elif __s390x__ +RUAPU_INSTCODE(zvector, 0xe7, 0x00, 0x02, 0x00, 0x00, 0x8f) // vfmasb v0,v0,v0,v0 + #elif __riscv RUAPU_INSTCODE(i, 0x00a50533) // add a0,a0,a0 RUAPU_INSTCODE(m, 0x02a50533) // mul a0,a0,a0 @@ -304,6 +307,9 @@ RUAPU_ISAENTRY(msa) #elif __powerpc__ RUAPU_ISAENTRY(vsx) +#elif __s390x__ +RUAPU_ISAENTRY(zvector) + #elif __riscv RUAPU_ISAENTRY(i) RUAPU_ISAENTRY(m)