diff options
| author | Pan Li <pan2.li@intel.com> | 2023-11-21 14:33:17 +0800 |
|---|---|---|
| committer | Pan Li <pan2.li@intel.com> | 2023-11-22 10:23:47 +0800 |
| commit | 646653b439ec7d4957b9161ee80a6055b37aff3e (patch) | |
| tree | b898ad1deb996c9a52b06063c6edb7f7625d7aa1 | |
| parent | c5b9a52fbc69bb0738f40978fab6ff78915ce99b (diff) | |
| download | riscv-gnu-toolchain-646653b439ec7d4957b9161ee80a6055b37aff3e.zip riscv-gnu-toolchain-646653b439ec7d4957b9161ee80a6055b37aff3e.tar.gz riscv-gnu-toolchain-646653b439ec7d4957b9161ee80a6055b37aff3e.tar.bz2 | |
Fix CI run failure on rv64gc
Signed-off-by: Pan Li <pan2.li@intel.com>
| -rwxr-xr-x | .github/setup-apt.sh | 2 | ||||
| -rwxr-xr-x | scripts/wrapper/spike/riscv64-unknown-linux-gnu-run | 8 |
2 files changed, 7 insertions, 3 deletions
diff --git a/.github/setup-apt.sh b/.github/setup-apt.sh index 49efd02..a470961 100755 --- a/.github/setup-apt.sh +++ b/.github/setup-apt.sh @@ -6,4 +6,4 @@ apt update apt install -y autoconf automake autotools-dev curl python3 python3-pip libmpc-dev libmpfr-dev \ libgmp-dev gawk build-essential bison flex texinfo gperf libtool \ patchutils bc zlib1g-dev libexpat-dev git ninja-build cmake libglib2.0-dev expect \ - device-tree-compiler + device-tree-compiler python3-pyelftools diff --git a/scripts/wrapper/spike/riscv64-unknown-linux-gnu-run b/scripts/wrapper/spike/riscv64-unknown-linux-gnu-run index 819ac7a..fb569f1 100755 --- a/scripts/wrapper/spike/riscv64-unknown-linux-gnu-run +++ b/scripts/wrapper/spike/riscv64-unknown-linux-gnu-run @@ -4,5 +4,9 @@ xlen="$(march-to-cpu-opt --elf-file-path $1 --print-xlen)" isa="$(march-to-cpu-opt --elf-file-path $1 --print-spike-isa)" varch="$(march-to-cpu-opt --elf-file-path $1 --print-spike-varch)" -[[ -z ${varch} ]] && spike --isa=${isa} ${PK_PATH}/pk${xlen} "$@" -[[ ! -z ${varch} ]] && spike --isa=${isa} --varch=${varch} ${PK_PATH}/pk${xlen} "$@" +isa_option="--isa=${isa}" +varch_option="" + +[[ ! -z ${varch} ]] && varch_option="--varch=${varch}" + +spike ${isa_option} ${varch_option} ${PK_PATH}/pk${xlen} "$@" |