From 70f16cbb46ea0dfa47f1324dd9e924f6c69cc45f Mon Sep 17 00:00:00 2001 From: David Biancolin Date: Fri, 21 Jan 2022 08:48:27 -0800 Subject: [PATCH 1/2] [firechip] Properly string interpolate exit failure in ScalaTestSuite (#1095) --- generators/firechip/src/test/scala/ScalaTestSuite.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/generators/firechip/src/test/scala/ScalaTestSuite.scala b/generators/firechip/src/test/scala/ScalaTestSuite.scala index 397f23d4..2e1a1a61 100644 --- a/generators/firechip/src/test/scala/ScalaTestSuite.scala +++ b/generators/firechip/src/test/scala/ScalaTestSuite.scala @@ -65,7 +65,7 @@ abstract class FireSimTestSuite( Await result (Future sequence subresults, Duration.Inf) } results.flatten foreach { case (name, exitcode) => - assert(exitcode == 0, "Failed $name") + assert(exitcode == 0, s"Failed $name") } } } else { From 9adb1036a3bea97cfc7f2dda640ddcb18ddd8bf8 Mon Sep 17 00:00:00 2001 From: Tynan McAuley Date: Fri, 21 Jan 2022 09:47:03 -0800 Subject: [PATCH 2/2] Document simulator-timeout settings (#1094) --- variables.mk | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/variables.mk b/variables.mk index d41473b2..7025d89e 100644 --- a/variables.mk +++ b/variables.mk @@ -25,7 +25,9 @@ HELP_PROJECT_VARIABLES = \ HELP_SIMULATION_VARIABLES = \ " BINARY = riscv elf binary that the simulator will run when using the run-binary* targets" \ -" VERBOSE_FLAGS = flags used when doing verbose simulation [$(VERBOSE_FLAGS)]" +" VERBOSE_FLAGS = flags used when doing verbose simulation [$(VERBOSE_FLAGS)]" \ +" timeout_cycles = number of clock cycles before simulator times out, defaults to 10000000" \ +" bmark_timeout_cycles = number of clock cycles before benchmark simulator times out, defaults to 100000000" # include default simulation rules HELP_COMMANDS = \