From 3ae32b3152d508ca9252d7c83982f2d38970ba7b Mon Sep 17 00:00:00 2001 From: Olaf Bernstein Date: Sun, 27 Oct 2024 20:22:10 +0100 Subject: [PATCH] fix CI --- .github/workflows/rv32-run.sh | 12 ++++++------ .github/workflows/rv64-run.sh | 12 ++++++------ bench/LUT4.c | 2 +- bench/LUT6.c | 2 +- run.sh | 4 ++-- 5 files changed, 16 insertions(+), 16 deletions(-) diff --git a/.github/workflows/rv32-run.sh b/.github/workflows/rv32-run.sh index 91a3031..2d2a4d7 100755 --- a/.github/workflows/rv32-run.sh +++ b/.github/workflows/rv32-run.sh @@ -1,9 +1,9 @@ #!/bin/sh -qemu-riscv32-static -cpu rv32,zve32f=on,vext_spec=v1.0,vlen=128,rvv_ta_all_1s=on,rvv_ma_all_1s=on,zfh=true,x-zvfh=true $@ && \ -qemu-riscv32-static -cpu rv32,zve32f=on,vext_spec=v1.0,vlen=256,rvv_ta_all_1s=on,rvv_ma_all_1s=on,zfh=true,x-zvfh=true $@ && \ -qemu-riscv32-static -cpu rv32,zve32f=on,vext_spec=v1.0,vlen=512,rvv_ta_all_1s=on,rvv_ma_all_1s=on,zfh=true,x-zvfh=true $@ && \ -qemu-riscv32-static -cpu rv32,zve32f=on,vext_spec=v1.0,vlen=1024,rvv_ta_all_1s=on,rvv_ma_all_1s=on,zfh=true,x-zvfh=true $@ &&\ -qemu-riscv32-static -cpu rv32,zve32f=on,vext_spec=v1.0,vlen=128,rvv_ta_all_1s=off,rvv_ma_all_1s=off,zfh=true,x-zvfh=true $@ && \ -qemu-riscv32-static -cpu rv32,zve32f=on,vext_spec=v1.0,vlen=1024,rvv_ta_all_1s=off,rvv_ma_all_1s=off,zfh=true,x-zvfh=true $@ +qemu-riscv32-static -cpu rv32,zve32f=on,vext_spec=v1.0,vlen=128,rvv_ta_all_1s=on,rvv_ma_all_1s=on,zfh=true,zvfh=true $@ && \ +qemu-riscv32-static -cpu rv32,zve32f=on,vext_spec=v1.0,vlen=256,rvv_ta_all_1s=on,rvv_ma_all_1s=on,zfh=true,zvfh=true $@ && \ +qemu-riscv32-static -cpu rv32,zve32f=on,vext_spec=v1.0,vlen=512,rvv_ta_all_1s=on,rvv_ma_all_1s=on,zfh=true,zvfh=true $@ && \ +qemu-riscv32-static -cpu rv32,zve32f=on,vext_spec=v1.0,vlen=1024,rvv_ta_all_1s=on,rvv_ma_all_1s=on,zfh=true,zvfh=true $@ &&\ +qemu-riscv32-static -cpu rv32,zve32f=on,vext_spec=v1.0,vlen=128,rvv_ta_all_1s=off,rvv_ma_all_1s=off,zfh=true,zvfh=true $@ && \ +qemu-riscv32-static -cpu rv32,zve32f=on,vext_spec=v1.0,vlen=1024,rvv_ta_all_1s=off,rvv_ma_all_1s=off,zfh=true,zvfh=true $@ diff --git a/.github/workflows/rv64-run.sh b/.github/workflows/rv64-run.sh index c94eb38..c70b1ac 100755 --- a/.github/workflows/rv64-run.sh +++ b/.github/workflows/rv64-run.sh @@ -1,8 +1,8 @@ #!/bin/sh -qemu-riscv64-static -cpu rv64,v=on,vext_spec=v1.0,vlen=128,rvv_ta_all_1s=on,rvv_ma_all_1s=on,zfh=true,x-zvfh=true $@ && \ -qemu-riscv64-static -cpu rv64,v=on,vext_spec=v1.0,vlen=256,rvv_ta_all_1s=on,rvv_ma_all_1s=on,zfh=true,x-zvfh=true $@ && \ -qemu-riscv64-static -cpu rv64,v=on,vext_spec=v1.0,vlen=512,rvv_ta_all_1s=on,rvv_ma_all_1s=on,zfh=true,x-zvfh=true $@ && \ -qemu-riscv64-static -cpu rv64,v=on,vext_spec=v1.0,vlen=1024,rvv_ta_all_1s=on,rvv_ma_all_1s=on,zfh=true,x-zvfh=true $@ && \ -qemu-riscv64-static -cpu rv64,v=on,vext_spec=v1.0,vlen=128,rvv_ta_all_1s=off,rvv_ma_all_1s=off,zfh=true,x-zvfh=true $@ && \ -qemu-riscv64-static -cpu rv64,v=on,vext_spec=v1.0,vlen=1024,rvv_ta_all_1s=off,rvv_ma_all_1s=off,zfh=true,x-zvfh=true $@ +qemu-riscv64-static -cpu rv64,v=on,vext_spec=v1.0,vlen=128,rvv_ta_all_1s=on,rvv_ma_all_1s=on,zfh=true,zvfh=true $@ && \ +qemu-riscv64-static -cpu rv64,v=on,vext_spec=v1.0,vlen=256,rvv_ta_all_1s=on,rvv_ma_all_1s=on,zfh=true,zvfh=true $@ && \ +qemu-riscv64-static -cpu rv64,v=on,vext_spec=v1.0,vlen=512,rvv_ta_all_1s=on,rvv_ma_all_1s=on,zfh=true,zvfh=true $@ && \ +qemu-riscv64-static -cpu rv64,v=on,vext_spec=v1.0,vlen=1024,rvv_ta_all_1s=on,rvv_ma_all_1s=on,zfh=true,zvfh=true $@ && \ +qemu-riscv64-static -cpu rv64,v=on,vext_spec=v1.0,vlen=128,rvv_ta_all_1s=off,rvv_ma_all_1s=off,zfh=true,zvfh=true $@ && \ +qemu-riscv64-static -cpu rv64,v=on,vext_spec=v1.0,vlen=1024,rvv_ta_all_1s=off,rvv_ma_all_1s=off,zfh=true,zvfh=true $@ diff --git a/bench/LUT4.c b/bench/LUT4.c index 34b3615..dd9c055 100644 --- a/bench/LUT4.c +++ b/bench/LUT4.c @@ -8,7 +8,7 @@ LUT4_scalar(uint8_t lut[16], uint8_t *ptr, size_t n) } void -LUT4_scalar_autovec(uint8_t lut[16], uint8_t *ptr, size_t n) +LUT4_scalar_autovec(uint8_t lut[restrict 16], uint8_t *restrict ptr, size_t n) { for (; n--; ++ptr) *ptr = lut[*ptr & 0xF]; diff --git a/bench/LUT6.c b/bench/LUT6.c index 074ef39..b0a5620 100644 --- a/bench/LUT6.c +++ b/bench/LUT6.c @@ -8,7 +8,7 @@ LUT6_scalar(uint8_t lut[64], uint8_t *ptr, size_t n) } void -LUT6_scalar_autovec(uint8_t lut[64], uint8_t *ptr, size_t n) +LUT6_scalar_autovec(uint8_t lut[restrict 64], uint8_t *restrict ptr, size_t n) { for (; n--; ++ptr) *ptr = lut[*ptr & 63]; diff --git a/run.sh b/run.sh index 0b4585f..3885db9 100755 --- a/run.sh +++ b/run.sh @@ -6,5 +6,5 @@ #./$@ # using qemu -qemu-riscv64-static -cpu rv64,v=on,vext_spec=v1.0,vlen=256,rvv_ta_all_1s=on,rvv_ma_all_1s=on,zfh=true,x-zvfh=true $@ -#qemu-riscv32-static -cpu rv32,zve32f=on,vext_spec=v1.0,vlen=256,rvv_ta_all_1s=on,rvv_ma_all_1s=on,zfh=true,x-zvfh=true $@ +qemu-riscv64-static -cpu rv64,v=on,vext_spec=v1.0,vlen=256,rvv_ta_all_1s=on,rvv_ma_all_1s=on,zfh=true,zvfh=true $@ +#qemu-riscv32-static -cpu rv32,zve32f=on,vext_spec=v1.0,vlen=256,rvv_ta_all_1s=on,rvv_ma_all_1s=on,zfh=true,zvfh=true $@