Skip to content

Commit

Permalink
Fix CI run failure on rv64gc
Browse files Browse the repository at this point in the history
Signed-off-by: Pan Li <[email protected]>
  • Loading branch information
Incarnation-p-lee committed Nov 22, 2023
1 parent c5b9a52 commit 76e29dd
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 4 deletions.
2 changes: 1 addition & 1 deletion .github/setup-apt.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
3 changes: 2 additions & 1 deletion .github/workflows/build.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ name: Build

on:
push:
workflow_dispatch:
branches:
- master
pull_request:
Expand Down Expand Up @@ -114,7 +115,7 @@ jobs:
make -j $(nproc) ${{ matrix.mode }}
- name: make report
run: make report-${{ matrix.mode }} -j $(nproc)
run: make report-${{ matrix.mode }} -j $(nproc) RUNTESTFLAGS=riscv.exp=call-with-empty-struct-float.C || /usr/bin/cat build-gcc-newlib-stage2/gcc/testsuite/g++/g++.log

build-multilib:
if: ${{ false }} # Disable until multilib errors are triaged
Expand Down
10 changes: 8 additions & 2 deletions scripts/wrapper/spike/riscv64-unknown-linux-gnu-run
Original file line number Diff line number Diff line change
@@ -1,8 +1,14 @@
#!/bin/bash

set -x

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

0 comments on commit 76e29dd

Please sign in to comment.