Skip to content

Commit

Permalink
fix problem wrt iverilog version
Browse files Browse the repository at this point in the history
  • Loading branch information
yy665 committed Oct 11, 2023
1 parent 737bc6d commit ef2f70f
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 16 deletions.
4 changes: 2 additions & 2 deletions bin/runbsc
Original file line number Diff line number Diff line change
Expand Up @@ -91,13 +91,13 @@ case "$CMD" in
#Run simulation in Bluesim
"$BSC" $ARGS -sim $BPATH "$TOP".bsv
"$BSC" $ARGS $BPATH -sim -o "$TB".bexe -e "$TB" "$TB".ba
timeout "$TOUT"s ./"$TB".bexe | grep -v "WARNING" > "$SIMOUT"
timeout "$TOUT"s ./"$TB".bexe | grep -v "WARNING" | grep -v "\$finish" > "$SIMOUT"
;;
"s")
#Run simulation in Verilog
"$BSC" $ARGS $BPATH $VPATH $VSIM -vdir $VDIR -simdir $SDIR -u "$TOP".bsv
"$BSC" $ARGS $VPATH $VSIM -verilog -vdir $VDIR -simdir $SDIR -o "$TB".bexe -e "$TB" "$VDIR"/"$TB".v
timeout "$TOUT"s ./"$TB".bexe | grep -v "WARNING" > "$SIMOUT"
timeout "$TOUT"s ./"$TB".bexe | grep -v "WARNING" | grep -v "\$finish" > "$SIMOUT"
;;
"c")
rm -f *.bi *.bo *.ba
Expand Down
26 changes: 12 additions & 14 deletions src/test/scala/pipedsl/RiscSuite.scala
Original file line number Diff line number Diff line change
Expand Up @@ -27,21 +27,19 @@ class RiscSuite extends AnyFunSuite {
//For each processor impl
testFiles.foreach(t => {
val testBaseName = getTestName(t)
if (testBaseName.contains("exn")) {
test(testBaseName + " Typecheck") {
testTypecheck(testFolder, t)
}
test(testBaseName + " BSV Compile") {
testBlueSpecCompile(testFolder, t, None, Map())
}
//For each program
sims.foreach(s => {
val simInputs = getInputMap(s)
test(testBaseName + " Simulate " + s) {
testBlueSpecSim(testFolder, t, None, simInputs, Some(s + ".simsol"))
}
})
test(testBaseName + " Typecheck") {
testTypecheck(testFolder, t)
}
test(testBaseName + " BSV Compile") {
testBlueSpecCompile(testFolder, t, None, Map())
}
//For each program
sims.foreach(s => {
val simInputs = getInputMap(s)
test(testBaseName + " Simulate " + s) {
testBlueSpecSim(testFolder, t, None, simInputs, Some(s + ".simsol"))
}
})

})
}

0 comments on commit ef2f70f

Please sign in to comment.