[chiselsim] Add setting modification arguments

Add two new type class implementation arguments to simulation methods and
use them to modify the common and backend settings.

Signed-off-by: Schuyler Eldridge <[email protected]>

Author: seldridge

src/main/scala/chisel3/simulator/Simulator.scala

@@ -91,13 +91,16 @@ trait Simulator[T <: Backend] {
   final def simulate[T <: RawModule, U](
     module:         => T,
     chiselSettings: ChiselSettings[T] = ChiselSettings.defaultRaw[T]
-  )(body: (SimulatedModule[T]) => U): Simulator.BackendInvocationDigest[U] = {
+  )(body: (SimulatedModule[T]) => U)(
+    implicit commonSettingsModifications: svsim.CommonSettingsModifications,
+    backendSettingsModifications:         svsim.BackendSettingsModifications
+  ): Simulator.BackendInvocationDigest[U] = {
     val workspace = new Workspace(path = workspacePath, workingDirectoryPrefix = workingDirectoryPrefix)
     workspace.reset()
     val elaboratedModule = workspace.elaborateGeneratedModule({ () => module }, firtoolArgs)
     workspace.generateAdditionalSources()
 
-    val commonCompilationSettingsUpdated = commonCompilationSettings.copy(
+    val commonCompilationSettingsUpdated = commonSettingsModifications(commonCompilationSettings).copy(
       // Append to the include directorires based on what the
       // workspace indicates is the path for primary sources.  This
       // ensures that `` `include `` directives can be resolved.
@@ -119,7 +122,7 @@ trait Simulator[T <: Backend] {
           .compile(backend)(
             tag,
             commonCompilationSettingsUpdated,
-            backendSpecificCompilationSettings,
+            backendSettingsModifications(backendSpecificCompilationSettings).asInstanceOf[backend.CompilationSettings],
             customSimulationWorkingDirectory,
             verbose
           )

src/main/scala/chisel3/simulator/SimulatorAPI.scala

@@ -26,7 +26,12 @@ trait SimulatorAPI {
   def simulateRaw[T <: RawModule](
     module:         => T,
     chiselSettings: ChiselSettings[T] = ChiselSettings.defaultRaw[T]
-  )(stimulus: (T) => Unit)(implicit hasSimulator: HasSimulator, testingDirectory: HasTestingDirectory): Unit = {
+  )(stimulus: (T) => Unit)(
+    implicit hasSimulator:        HasSimulator,
+    testingDirectory:             HasTestingDirectory,
+    commonSettingsModifications:  svsim.CommonSettingsModifications,
+    backendSettingsModifications: svsim.BackendSettingsModifications
+  ): Unit = {
 
     hasSimulator.getSimulator
       .simulate(module, chiselSettings) { module =>
@@ -51,10 +56,14 @@ trait SimulatorAPI {
     module:                => T,
     chiselSettings:        ChiselSettings[T] = ChiselSettings.default[T],
     additionalResetCycles: Int = 0
-  )(stimulus: (T) => Unit)(implicit hasSimulator: HasSimulator, testingDirectory: HasTestingDirectory): Unit =
-    simulateRaw(module, chiselSettings) { dut =>
-      ResetProcedure.module(additionalResetCycles)(dut)
-      stimulus(dut)
-    }
+  )(stimulus: (T) => Unit)(
+    implicit hasSimulator:        HasSimulator,
+    testingDirectory:             HasTestingDirectory,
+    commonSettingsModifications:  svsim.CommonSettingsModifications,
+    backendSettingsModifications: svsim.BackendSettingsModifications
+  ): Unit = simulateRaw(module, chiselSettings) { dut =>
+    ResetProcedure.module(additionalResetCycles)(dut)
+    stimulus(dut)
+  }
 
 }

src/test/scala-2/chiselTests/simulator/scalatest/ChiselSimSpec.scala

@@ -156,7 +156,12 @@ class ChiselSimSpec extends AnyFunSpec with Matchers with ChiselSim with FileChe
       val directory = Directory(FileSystems.getDefault().getPath("test_run_dir", "foo").toFile())
       directory.deleteRecursively()
 
-      simulate(new Foo()) { _ => }(hasSimulator = implicitly[HasSimulator], testingDirectory = fooDirectory)
+      simulate(new Foo()) { _ => }(
+        hasSimulator = implicitly[HasSimulator],
+        testingDirectory = fooDirectory,
+        implicitly,
+        implicitly
+      )
 
       info(s"found expected directory: '$directory'")
       assert(directory.exists)