Skip to content

Commit 5ba2b6b

Browse files
committed
Update vector test combinations.
This adds VLEN=64,ELEN={32,64} to the vector suite while removing VLEN=512,ELEN=32. VLEN=64 is not included in the full Vector extension which requires VLEN>=128, and provides an uncovered test combination. The removed combination of (512,32) took around 6 hours and sometimes tripped over Github CI's max execution limit of 6 hours, causing unreliable builds.
1 parent 222fbdd commit 5ba2b6b

3 files changed

Lines changed: 17 additions & 5 deletions

File tree

.github/workflows/build.yml

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -113,9 +113,14 @@ jobs:
113113
runs-on: ubuntu-latest
114114
strategy:
115115
matrix:
116-
VLEN: [128, 256, 512]
116+
VLEN: [64, 128, 256]
117117
# For now, ELEN can't be freely choosen and needs to match XLEN
118118
XLEN: [32, 64]
119+
# Omit the 512/32 combination because it takes around 6 hours to build
120+
# often exceeding the Github CI limit of 6 hours.
121+
include:
122+
- VLEN: 512
123+
XLEN: 64
119124

120125
steps:
121126
- name: Free Disk Space

compare-releases.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,8 @@ def show_release_difference(opts, testsets):
3131
show_testset_difference(opts, set, previous, current)
3232

3333
def get_testsets(prev_release_dir, cur_release_dir):
34-
testset_names = ["riscv-tests", "riscv-arch-tests"] + [f"riscv-vector-tests-v{vlen}x{xlen}" for vlen in [128, 256, 512] for xlen in [32, 64]]
34+
combos = [(vlen, xlen) for vlen in [64, 128, 256, 512] for xlen in [32, 64]]
35+
testset_names = ["riscv-tests", "riscv-arch-tests"] + [f"riscv-vector-tests-v{vlen}x{xlen}" for (vlen, xlen) in combos]
3536
testset_filenames = [name + ".tar.gz" for name in testset_names]
3637
return [(name,
3738
os.path.join(prev_release_dir, filename),

justfile

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -111,11 +111,12 @@ vector-tests-tgz VLEN XLEN prefix=INSTALL_PREFIX: (build-vector-tests VLEN XLEN
111111
[script("/usr/bin/bash")]
112112
all-vector-tests-tgz prefix=INSTALL_PREFIX:
113113
set -eux
114-
for vlen in 128 256 512; do
114+
for vlen in 64 128 256; do
115115
for xlen in 32 64; do
116116
just --unstable vector-tests-tgz ${vlen} ${xlen}
117117
done
118118
done
119+
just --unstable vector-tests-tgz 512 64
119120

120121
# Without a specified VLEN and XLEN, the clean target only cleans the build
121122
# for the default VLEN/XLEN. This makes sure all the combinations used
@@ -124,7 +125,7 @@ all-vector-tests-tgz prefix=INSTALL_PREFIX:
124125
[working-directory: 'riscv-vector-tests']
125126
[script("/usr/bin/bash")]
126127
clean-vector-tests:
127-
for vlen in 128 256 512; do
128+
for vlen in 64 128 256 512; do
128129
for xlen in 32 64; do
129130
make VLEN=${vlen} XLEN=${xlen} clean
130131
done
@@ -167,13 +168,18 @@ download-release release:
167168
if [ ! -f releases/{{release}}/{{RISCV_TESTS_ARCHIVE}} ]; then
168169
wget -O releases/{{release}}/{{RISCV_TESTS_ARCHIVE}} {{RELEASE_DOWNLOAD_URL}}/{{release}}/{{RISCV_TESTS_ARCHIVE}}
169170
fi
170-
for vlen in 128 256 512; do
171+
for vlen in 64 128 256; do
171172
for xlen in 32 64; do
172173
if [ ! -f releases/{{release}}/{{VECTOR_TESTS_ARCHIVE_PREFIX}}v${vlen}x${xlen}.tar.gz ]; then
173174
wget -O releases/{{release}}/{{VECTOR_TESTS_ARCHIVE_PREFIX}}v${vlen}x${xlen}.tar.gz {{RELEASE_DOWNLOAD_URL}}/{{release}}/{{VECTOR_TESTS_ARCHIVE_PREFIX}}v${vlen}x${xlen}.tar.gz
174175
fi
175176
done
176177
done
178+
vlen=512
179+
xlen=64
180+
if [ ! -f releases/{{release}}/{{VECTOR_TESTS_ARCHIVE_PREFIX}}v${vlen}x${xlen}.tar.gz ]; then
181+
wget -O releases/{{release}}/{{VECTOR_TESTS_ARCHIVE_PREFIX}}v${vlen}x${xlen}.tar.gz {{RELEASE_DOWNLOAD_URL}}/{{release}}/{{VECTOR_TESTS_ARCHIVE_PREFIX}}v${vlen}x${xlen}.tar.gz
182+
fi
177183

178184
# This provides only a summary. For detailed differences, run `compare-releases.py` directly with `-v`.
179185
[doc]

0 commit comments

Comments
 (0)