From 52fda1ceaaa62b232c57ad12034249b6bf81a28c Mon Sep 17 00:00:00 2001 From: nihui Date: Thu, 22 Feb 2024 19:34:01 +0800 Subject: [PATCH 1/6] Update ruapu.h --- ruapu.h | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/ruapu.h b/ruapu.h index b8b9711..e476256 100644 --- a/ruapu.h +++ b/ruapu.h @@ -132,7 +132,7 @@ static int ruapu_detect_isa(ruapu_some_inst some_inst) #if defined(__i386__) || defined(__x86_64__) #define RUAPU_INSTCODE(isa, ...) static void ruapu_some_##isa() { asm volatile(".byte " #__VA_ARGS__ : : : ); } -#elif __aarch64__ || __arm__ || __riscv +#elif __aarch64__ || __arm__ || __mips__ || __riscv #define RUAPU_INSTCODE(isa, ...) static void ruapu_some_##isa() { asm volatile(".word " #__VA_ARGS__ : : : ); } #endif @@ -211,6 +211,9 @@ RUAPU_INSTCODE(neon, 0xf2000d40) // vadd.f32 q0,q0,q0 RUAPU_INSTCODE(vfpv4, 0xf3b60600) // vcvt.f16.f32 d0,q0 #endif +#elif __mips__ +RUAPU_INSTCODE(msa, 0x7900001b) // fmadd.w $w0,$w0,$w0 + #elif __riscv RUAPU_INSTCODE(i, 0x00a50533) // add a0,a0,a0 RUAPU_INSTCODE(m, 0x02a50533) // mul a0,a0,a0 @@ -277,6 +280,9 @@ RUAPU_ISAENTRY(edsp) RUAPU_ISAENTRY(neon) RUAPU_ISAENTRY(vfpv4) +#elif __mips__ +RUAPU_ISAENTRY(msa) + #elif __riscv RUAPU_ISAENTRY(i) RUAPU_ISAENTRY(m) From ff910e56d03621057d7e5efc27499a1e52222dd8 Mon Sep 17 00:00:00 2001 From: nihui Date: Thu, 22 Feb 2024 19:34:31 +0800 Subject: [PATCH 2/6] Update main.c --- main.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/main.c b/main.c index dca6518..0b27489 100644 --- a/main.c +++ b/main.c @@ -65,6 +65,9 @@ int main() PRINT_ISA_SUPPORT(neon) PRINT_ISA_SUPPORT(vfpv4) +#elif __mips__ + PRINT_ISA_SUPPORT(msa) + #elif __riscv PRINT_ISA_SUPPORT(i) PRINT_ISA_SUPPORT(m) From 2f5d935e8fd840eef1fd7690f50cf798e23d45f7 Mon Sep 17 00:00:00 2001 From: nihui Date: Thu, 22 Feb 2024 19:35:02 +0800 Subject: [PATCH 3/6] Update README.md --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index b32164f..d4d8007 100644 --- a/README.md +++ b/README.md @@ -6,7 +6,7 @@ Detect CPU ISA features with single-file -
CPU✅ x86, x86-64
✅ arm, aarch64
✅ risc-v		 +
CPU✅ x86, x86-64
✅ arm, aarch64
✅ mips
✅ risc-v		 ```c #define RUAPU_IMPLEMENTATION @@ -220,7 +220,7 @@ _`fma4` on zen1, ISA in hypervisor, etc._ |x86|`mmx` `sse` `sse2` `sse3` `ssse3` `sse41` `sse42` `sse4a` `xop` `avx` `f16c` `fma` `fma4` `avx2` `avx512f` `avx512bw` `avx512cd` `avx512dq` `avx512vl` `avx512vnni` `avx512bf16` `avx512ifma` `avx512vbmi` `avx512vbmi2` `avx512fp16` `avxvnni` `avxvnniint8` `avxifma`| |arm|`edsp` `neon` `vfpv4`| |aarch64|`neon` `vfpv4` `cpuid` `asimdhp` `asimddp` `asimdfhm` `bf16` `i8mm` `sve` `sve2` `svebf16` `svei8mm` `svef32mm`| -|mips|| +|mips|`msa`| |powerpc|| |loongarch|| |risc-v|`i` `m` `a` `f` `d` `c`| From e07251c057bf937554613882908c9c43ef27ee23 Mon Sep 17 00:00:00 2001 From: nihui Date: Thu, 22 Feb 2024 19:41:10 +0800 Subject: [PATCH 4/6] Update ci-qemu.yml --- .github/workflows/ci-qemu.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/ci-qemu.yml b/.github/workflows/ci-qemu.yml index 5a7994d..1c5adfe 100644 --- a/.github/workflows/ci-qemu.yml +++ b/.github/workflows/ci-qemu.yml @@ -55,11 +55,15 @@ jobs: run: | mipsel-linux-gnu-gcc -march=mips32 main.c -o ruapu-mipsel qemu-mipsel-static -L /usr/mipsel-linux-gnu ./ruapu-mipsel + qemu-mipsel-static -L /usr/mipsel-linux-gnu -cpu 34Kf ./ruapu-mipsel + qemu-mipsel-static -L /usr/mipsel-linux-gnu -cpu P5600 ./ruapu-mipsel - name: build-test-mips64el run: | mips64el-linux-gnuabi64-gcc -march=mips64 main.c -o ruapu-mips64el qemu-mips64el-static -L /usr/mips64el-linux-gnuabi64 ./ruapu-mips64el + qemu-mips64el-static -L /usr/mips64el-linux-gnuabi64 -cpu Loongson-2F ./ruapu-mips64el + qemu-mips64el-static -L /usr/mips64el-linux-gnuabi64 -cpu I6400 ./ruapu-mips64el - name: build-test-powerpc run: | From de41903b3b1d4abc94b6261638505da3bd3f80e2 Mon Sep 17 00:00:00 2001 From: nihui Date: Thu, 22 Feb 2024 19:45:59 +0800 Subject: [PATCH 5/6] Update ci-qemu.yml --- .github/workflows/ci-qemu.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/workflows/ci-qemu.yml b/.github/workflows/ci-qemu.yml index 1c5adfe..16c5bf6 100644 --- a/.github/workflows/ci-qemu.yml +++ b/.github/workflows/ci-qemu.yml @@ -56,14 +56,12 @@ jobs: mipsel-linux-gnu-gcc -march=mips32 main.c -o ruapu-mipsel qemu-mipsel-static -L /usr/mipsel-linux-gnu ./ruapu-mipsel qemu-mipsel-static -L /usr/mipsel-linux-gnu -cpu 34Kf ./ruapu-mipsel - qemu-mipsel-static -L /usr/mipsel-linux-gnu -cpu P5600 ./ruapu-mipsel - name: build-test-mips64el run: | mips64el-linux-gnuabi64-gcc -march=mips64 main.c -o ruapu-mips64el qemu-mips64el-static -L /usr/mips64el-linux-gnuabi64 ./ruapu-mips64el qemu-mips64el-static -L /usr/mips64el-linux-gnuabi64 -cpu Loongson-2F ./ruapu-mips64el - qemu-mips64el-static -L /usr/mips64el-linux-gnuabi64 -cpu I6400 ./ruapu-mips64el - name: build-test-powerpc run: | From 1b0f329b58da415faea0dedbb7af7d6a88f4135a Mon Sep 17 00:00:00 2001 From: nihui Date: Thu, 22 Feb 2024 19:49:46 +0800 Subject: [PATCH 6/6] Update ci-qemu.yml --- .github/workflows/ci-qemu.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/workflows/ci-qemu.yml b/.github/workflows/ci-qemu.yml index 16c5bf6..5a7994d 100644 --- a/.github/workflows/ci-qemu.yml +++ b/.github/workflows/ci-qemu.yml @@ -55,13 +55,11 @@ jobs: run: | mipsel-linux-gnu-gcc -march=mips32 main.c -o ruapu-mipsel qemu-mipsel-static -L /usr/mipsel-linux-gnu ./ruapu-mipsel - qemu-mipsel-static -L /usr/mipsel-linux-gnu -cpu 34Kf ./ruapu-mipsel - name: build-test-mips64el run: | mips64el-linux-gnuabi64-gcc -march=mips64 main.c -o ruapu-mips64el qemu-mips64el-static -L /usr/mips64el-linux-gnuabi64 ./ruapu-mips64el - qemu-mips64el-static -L /usr/mips64el-linux-gnuabi64 -cpu Loongson-2F ./ruapu-mips64el - name: build-test-powerpc run: |