github-mirrors/cvw
1
0
Fork 0
mirror of https://github.com/openhwgroup/cvw.git synced 2025-06-28 01:32:49 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #1113 from davidharrishmc/dev

Browse source 
Fixed Issue 1111
This commit is contained in:
Jordan Carlin 2024-11-17 09:02:37 -08:00 • committed by GitHub
commit 3e45ef4dff
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
6 changed files with 30 additions and 36 deletions
Download patch file Download diff file Expand all files Collapse all files

2
site-setup.csh
View file

@ -49,7 +49,7 @@ setenv SPIKE_PATH $RISCV/bin # Change this for your path to riscv-isa-s
setenv IDV $RISCV/ImperasDV-OpenHW setenv IDV $RISCV/ImperasDV-OpenHW
if ($?IDV) then if ($?IDV) then
# echo "Imperas exists" # echo "Imperas exists"
setenv IMPERAS_HOME $IDV/Imperas setenv IMPERAS_HOME $IDV
setenv IMPERAS_PERSONALITY CPUMAN_DV_ASYNC setenv IMPERAS_PERSONALITY CPUMAN_DV_ASYNC
setenv ROOTDIR ~/ setenv ROOTDIR ~/
source ${IMPERAS_HOME}/bin/setup.sh source ${IMPERAS_HOME}/bin/setup.sh

2
site-setup.sh
View file

@ -66,7 +66,7 @@ export SPIKE_PATH=$RISCV/bin # Copy this as it is
export IDV=$RISCV/ImperasDV-OpenHW export IDV=$RISCV/ImperasDV-OpenHW
if [ -e "$IDV" ]; then if [ -e "$IDV" ]; then
# echo "Imperas exists" # echo "Imperas exists"
export IMPERAS_HOME=$IDV/Imperas export IMPERAS_HOME=$IDV
export IMPERAS_PERSONALITY=CPUMAN_DV_ASYNC export IMPERAS_PERSONALITY=CPUMAN_DV_ASYNC
export ROOTDIR=~/ export ROOTDIR=~/
source "${IMPERAS_HOME}"/bin/setup.sh source "${IMPERAS_HOME}"/bin/setup.sh

2
tests/wally-riscv-arch-test/riscv-test-suite/rv32i_m/privilege/src/WALLY-TEST-LIB-32.h
View file

@ -133,8 +133,8 @@ cause_m_time_interrupt:
add t3, t2, t3 // add desired offset to the current time add t3, t2, t3 // add desired offset to the current time
bgtu t3, t2, nowrap_m // check new time exceeds current time (no wraparound) bgtu t3, t2, nowrap_m // check new time exceeds current time (no wraparound)
addi t6, t6, 1 // if wrap, increment most significant word addi t6, t6, 1 // if wrap, increment most significant word
sw t6,4(t4) // store into most significant word of MTIMECMP
nowrap_m: nowrap_m:
sw t6,4(t4) // store into most significant word of MTIMECMP
sw t3, 0(t4) // store into least significant word of MTIMECMP sw t3, 0(t4) // store into least significant word of MTIMECMP
time_loop_m: time_loop_m:
addi a3, a3, -1 addi a3, a3, -1

22
tests/wally-riscv-arch-test/riscv-test-suite/rv32i_m/privilege/src/WALLY-wfi-01.S
View file

@ -36,20 +36,20 @@ WRITE_READ_CSR mie, 0xFFF // Enable interrupts from all sources
// Code copied from test library to cause m time interrupt, with time loop replaced with wfi. // Code copied from test library to cause m time interrupt, with time loop replaced with wfi.
/* Note: the following line might cause problems in the future. If more than 0x50 cycles are needed before the wfi /* Note: the following line might cause problems in the future. If more than 0x100 cycles are needed before the wfi
instruction begins, then the program might fall into a loop and run forever*/ instruction begins, then the program might fall into a loop and run forever*/
li x28, 0x50 // Desired offset from the present time li x28, 0x100 // Desired offset from the present time
mv a3, x28 // copy value in to know to stop waiting for interrupt after this many cycles mv a3, x28 // copy value in to know to stop waiting for interrupt after this many cycles
la x29, 0x02004000 // MTIMECMP register in CLINT la x29, 0x02004000 // MTIMECMP register in CLINT
la x30, 0x0200BFF8 // MTIME register in CLINT la x30, 0x0200BFF8 // MTIME register in CLINT
lw x7, 0(x30) // low word of MTIME lw x7, 0(x30) // low word of MTIME
lw x31, 4(x30) // high word of MTIME lw x31, 4(x30) // high word of MTIME
add x28, x7, x28 // add desired offset to the current time add x28, x7, x28 // add desired offset to the current time
bgtu x28, x7, nowrap // check new time exceeds current time (no wraparound) bgtu x28, x7, nowrap // check new time exceeds current time (no wraparound)
addi x31, x31, 1 // if wrap, increment most significant word addi x31, x31, 1 // if wrap, increment most significant word
sw x31,4(x29) // store into most significant word of MTIMECMP
nowrap: nowrap:
sw x31,4(x29) // store into most significant word of MTIMECMP
sw x28, 0(x29) // store into least significant word of MTIMECMP sw x28, 0(x29) // store into least significant word of MTIMECMP
auipc ra, 0x0 auipc ra, 0x0

2
tests/wally-riscv-arch-test/riscv-test-suite/rv64i_m/privilege/src/WALLY-TEST-LIB-64.h
View file

@ -136,8 +136,8 @@ cause_m_time_interrupt:
add t3, t2, t3 // add desired offset to the current time add t3, t2, t3 // add desired offset to the current time
bgtu t3, t2, nowrap_m // check new time exceeds current time (no wraparound) bgtu t3, t2, nowrap_m // check new time exceeds current time (no wraparound)
addi t6, t6, 1 // if wrap, increment most significant word addi t6, t6, 1 // if wrap, increment most significant word
sw t6,4(t4) // store into most significant word of MTIMECMP
nowrap_m: nowrap_m:
sw t6,4(t4) // store into most significant word of MTIMECMP
sw t3, 0(t4) // store into least significant word of MTIMECMP sw t3, 0(t4) // store into least significant word of MTIMECMP
time_loop_m: time_loop_m:
addi a3, a3, -1 addi a3, a3, -1

36
tests/wally-riscv-arch-test/riscv-test-suite/rv64i_m/privilege/src/WALLY-wfi-01.S
View file

@ -35,30 +35,24 @@ WRITE_READ_CSR mie, 0xFFF // Enable interrupts from all sources
// Code copied from test library to cause m time interrupt, with time loop replaced with wfi. // Code copied from test library to cause m time interrupt, with time loop replaced with wfi.
li x28, 0x60 // Desired offset from the present time li x28, 0x60 // Desired offset from the present time
mv a3, x28 // copy value in to know to stop waiting for interrupt after this many cycles mv a3, x28 // copy value in to know to stop waiting for interrupt after this many cycles
la x29, 0x02004000 // MTIMECMP register in CLINT la x29, 0x02004000 // MTIMECMP register in CLINT
la x30, 0x0200BFF8 // MTIME register in CLINT la x30, 0x0200BFF8 // MTIME register in CLINT
lw x7, 0(x30) // low word of MTIME ld x7, 0(x30) // read MTIME
lw x31, 4(x30) // high word of MTIME add x28, x7, x28 // add offset
add x28, x7, x28 // add desired offset to the current time sw x28, 0(x29) // MTIMECMP = MTIME + offset
bgtu x28, x7, nowrap // check new time exceeds current time (no wraparound)
addi x31, x31, 1 // if wrap, increment most significant word
sw x31,4(x29) // store into most significant word of MTIMECMP
nowrap: auipc ra, 0x0
sw x28, 0(x29) // store into least significant word of MTIMECMP addi ra, ra, 0xC // load address after wfi into ra so we return to the right place after handling the time interrupt
auipc ra, 0x0 wfi // test wfi until trap goes off
addi ra, ra, 0xC // load address after wfi into ra so we return to the right place after handling the time interrupt
wfi // test wfi until trap goes off li x28, 0x600d111 // magic number "good 111" to write to output after interrupt goes off.
// this tests whether wfi is a nop or not since we should get the output for the interrupt before this one
li x28, 0x600d111 // magic number "good 111" to write to output after interrupt goes off. sd x28, 0(x6)
// this tests whether wfi is a nop or not since we should get the output for the interrupt before this one addi x6, x6, 8
sd x28, 0(x6) addi x16, x16, 8
addi x6, x6, 8
addi x16, x16, 8
END_TESTS END_TESTS