Skip to content

Commit 00b7bb4

Browse files
committed
[RISCV] Use RVA22S64/RVA23S64 for the qemu CPU for recently added RISC-V builders
rva22u64/rva23u64 (user-mode) profiles are fine for the compilation flags, but as with these builders we're running qemu-system we might as wel specify the profile that includes the supervisior level requirements for the QEMU CPU.
1 parent 50ca334 commit 00b7bb4

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

zorg/buildbot/builders/annotated/rise-riscv-build.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,21 +40,21 @@ case "$BUILDBOT_BUILDERNAME" in
4040
"clang-riscv-rva23-zvl512b-2stage")
4141
TARGET_CFLAGS="-march=rva23u64_zvl512b"
4242
export BB_IMG_DIR=$(pwd)/..
43-
export BB_QEMU_CPU="rva23u64,vlen=512,rvv_ta_all_1s=true,rvv_ma_all_1s=true,rvv_vl_half_avl=true"
43+
export BB_QEMU_CPU="rva23s64,vlen=512,rvv_ta_all_1s=true,rvv_ma_all_1s=true,rvv_vl_half_avl=true"
4444
export BB_QEMU_SMP=32
4545
export BB_QEMU_MEM="64G"
4646
;;
4747
"clang-riscv-rva23-zvl1024b-2stage")
4848
TARGET_CFLAGS="-march=rva23u64_zvl1024b"
4949
export BB_IMG_DIR=$(pwd)/..
50-
export BB_QEMU_CPU="rva23u64,vlen=1024,rvv_ta_all_1s=true,rvv_ma_all_1s=true,rvv_vl_half_avl=true"
50+
export BB_QEMU_CPU="rva23s64,vlen=1024,rvv_ta_all_1s=true,rvv_ma_all_1s=true,rvv_vl_half_avl=true"
5151
export BB_QEMU_SMP=32
5252
export BB_QEMU_MEM="64G"
5353
;;
5454
"clang-riscv-x60-mrvv-vec-bits-2stage")
5555
TARGET_CFLAGS="-mcpu=spacemit-x60 -mrvv-vector-bits=zvl"
5656
export BB_IMG_DIR=$(pwd)/..
57-
export BB_QEMU_CPU="rva22u64,v=true,zbc=true,zbkc=true,zfh=true,zicond=true,zvkt=true,vlen=256,rvv_ta_all_1s=true,rvv_ma_all_1s=true,rvv_vl_half_avl=true"
57+
export BB_QEMU_CPU="rva22s64,v=true,zbc=true,zbkc=true,zfh=true,zicond=true,zvkt=true,vlen=256,rvv_ta_all_1s=true,rvv_ma_all_1s=true,rvv_vl_half_avl=true"
5858
export BB_QEMU_SMP=32
5959
export BB_QEMU_MEM="64G"
6060
;;

0 commit comments

Comments
 (0)