just really pog off

kivikakk · May 14, 2024 · 564cbae · 564cbae
1 parent fb93e39
commit 564cbae
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 8 deletions.
diff --git a/src/main/scala/ee/hrzn/chryse/ChryseApp.scala b/src/main/scala/ee/hrzn/chryse/ChryseApp.scala
@@ -62,9 +62,17 @@ abstract class ChryseApp {
               opt[Unit]('d', "debug")
                 .action((_, c) => c.copy(cxxrtlDebug = true))
                 .text("generate source-level debug information"),
-              opt[Unit]('v', "vcd")
-                .action((_, c) => c.copy(cxxrtlVcd = true))
-                .text("output a VCD file when running cxxsim (passes --vcd)"),
+              opt[String]('v', "vcd")
+                .valueName("<file>")
+                .action((p, c) => c.copy(cxxrtlVcdOutPath = Some(p)))
+                .text(
+                  "output a VCD file when running cxxsim (passes --vcd <file> to the executable)",
+                ),
+              arg[String]("<arg>...")
+                .unbounded()
+                .optional()
+                .action((arg, c) => c.copy(cxxrtlArgs = c.cxxrtlArgs :+ arg))
+                .text("other arguments for the cxxsim executable"),
               note(""),
             )
       }
@@ -133,7 +141,8 @@ final case class ChryseAppConfig(
     cxxrtlCompileOnly: Boolean = false,
     cxxrtlOptimize: Boolean = false,
     cxxrtlDebug: Boolean = false,
-    cxxrtlVcd: Boolean = false,
+    cxxrtlVcdOutPath: Option[String] = None,
+    cxxrtlArgs: List[String] = List(),
 )
 
 class ChryseAppStepFailureException(step: String)

diff --git a/src/main/scala/ee/hrzn/chryse/tasks/CxxsimTask.scala b/src/main/scala/ee/hrzn/chryse/tasks/CxxsimTask.scala
@@ -15,8 +15,8 @@ import scala.sys.process._
 
 object CxxsimTask extends BaseTask {
   private val cxxsimDir = "cxxsim"
-  private val cxxOpts = Seq("-std=c++14", "-g", "-pedantic", "-Wall", "-Wextra",
-    "-Wno-zero-length-array", "-Wno-unused-parameter")
+  private val baseCxxOpts = Seq("-std=c++14", "-g", "-pedantic", "-Wall",
+    "-Wextra", "-Wno-zero-length-array", "-Wno-unused-parameter")
 
   def apply(
       name: String,
@@ -78,6 +78,12 @@ object CxxsimTask extends BaseTask {
     val headers = filesInDirWithExt(cxxsimDir, ".h").toSeq
 
     val yosysDatDir = Seq("yosys-config", "--datdir").!!.trim()
+    val cxxOpts =
+      baseCxxOpts ++ (if (config.cxxrtlDebug) Seq("-g")
+                      else Seq()) ++
+        (if (config.cxxrtlOptimize)
+           Seq("-O3")
+         else Seq())
 
     def buildPathForCc(cc: String) =
       cc.replace(s"$cxxsimDir/", s"$buildDir/")
@@ -112,8 +118,11 @@ object CxxsimTask extends BaseTask {
 
     if (config.cxxrtlCompileOnly) return
 
-    val binArgs = if (config.cxxrtlVcd) Seq("--vcd") else Seq()
-    val binCmd  = Seq(binPath) ++ binArgs
+    val binArgs = config.cxxrtlVcdOutPath match {
+      case Some(vcdOutPath) => Seq("--vcd", vcdOutPath)
+      case _                => Seq()
+    }
+    val binCmd = Seq(binPath) ++ binArgs ++ config.cxxrtlArgs
 
     println(s"running: $binCmd")
     val rc = binCmd.!