Fix CI run failure on rv64gc

Signed-off-by: Pan Li <[email protected]>

Author: Incarnation-p-lee

.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

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} "$@"