Skip to content

Commit 0d8ffeb

Browse files
authored
spec-test-script/runtest.py: Move "--size-level=1" to common place for RISCV64 (#3644)
1 parent 583fa52 commit 0d8ffeb

1 file changed

Lines changed: 4 additions & 7 deletions

File tree

tests/wamr-test-suites/spec-test-script/runtest.py

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -55,9 +55,10 @@
5555
"riscv32": ["--target=riscv32", "--target-abi=ilp32", "--cpu=generic-rv32", "--cpu-features=+m,+a,+c"],
5656
"riscv32_ilp32f": ["--target=riscv32", "--target-abi=ilp32f", "--cpu=generic-rv32", "--cpu-features=+m,+a,+c,+f"],
5757
"riscv32_ilp32d": ["--target=riscv32", "--target-abi=ilp32d", "--cpu=generic-rv32", "--cpu-features=+m,+a,+c,+f,+d"],
58-
"riscv64": ["--target=riscv64", "--target-abi=lp64", "--cpu=generic-rv64", "--cpu-features=+m,+a,+c"],
59-
"riscv64_lp64f": ["--target=riscv64", "--target-abi=lp64f", "--cpu=generic-rv64", "--cpu-features=+m,+a,+c,+f"],
60-
"riscv64_lp64d": ["--target=riscv64", "--target-abi=lp64d", "--cpu=generic-rv64", "--cpu-features=+m,+a,+c,+f,+d"],
58+
# RISCV64 requires -mcmodel=medany, which can be set by --size-level=1
59+
"riscv64": ["--target=riscv64", "--target-abi=lp64", "--cpu=generic-rv64", "--cpu-features=+m,+a,+c", "--size-level=1"],
60+
"riscv64_lp64f": ["--target=riscv64", "--target-abi=lp64f", "--cpu=generic-rv64", "--cpu-features=+m,+a,+c,+f", "--size-level=1"],
61+
"riscv64_lp64d": ["--target=riscv64", "--target-abi=lp64d", "--cpu=generic-rv64", "--cpu-features=+m,+a,+c,+f,+d", "--size-level=1"],
6162
"xtensa": ["--target=xtensa"],
6263
}
6364

@@ -1140,10 +1141,6 @@ def compile_wasm_to_aot(wasm_tempfile, aot_tempfile, runner, opts, r, output = '
11401141
if opts.qemu or opts.memory64:
11411142
cmd.append("--bounds-checks=1")
11421143

1143-
# RISCV64 requires -mcmodel=medany, which can be set by --size-level=1
1144-
if test_target.startswith("riscv64"):
1145-
cmd.append("--size-level=1")
1146-
11471144
cmd += ["-o", aot_tempfile, wasm_tempfile]
11481145

11491146
log("Running: %s" % " ".join(cmd))

0 commit comments

Comments
 (0)