From 7bbf7f00f6d363ff9dbf86aa72aaf8b94c830217 Mon Sep 17 00:00:00 2001 From: Paul Rigge Date: Wed, 6 Feb 2019 17:14:28 -0800 Subject: [PATCH] Run transforms in slightly different order Also, don't rename TestHarness. --- tapeout/src/main/scala/transforms/Generate.scala | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/tapeout/src/main/scala/transforms/Generate.scala b/tapeout/src/main/scala/transforms/Generate.scala index 5fab8aa9..24472d18 100644 --- a/tapeout/src/main/scala/transforms/Generate.scala +++ b/tapeout/src/main/scala/transforms/Generate.scala @@ -122,14 +122,14 @@ sealed trait GenerateTopAndHarnessApp extends LazyLogging { this: App => private def getFirstPhasePasses(top: Boolean, harness: Boolean): Seq[Transform] = { val pre = Seq( new ReParentCircuit(synTop.get), - new RemoveUnusedModules ) val enumerate = if (harness) { Seq( - new EnumerateModules( { m => if (m.name != options.synTop.get) { AllModules.add(m.name) } } ) + new EnumerateModules( { m => if (m.name != options.harnessTop.get && m.name != options.synTop.get) { AllModules.add(m.name) } } ), ) } else Seq() val post = if (top) { Seq( + new RemoveUnusedModules, new passes.memlib.InferReadWrite(), new passes.memlib.ReplSeqMem(), new passes.clocklist.ClockListTransform() @@ -170,8 +170,8 @@ sealed trait GenerateTopAndHarnessApp extends LazyLogging { this: App => // always the same for now Seq( new ConvertToExtMod((m) => m.name == synTop.get), - new RemoveUnusedModules, - new RenameModulesAndInstances((m) => AllModules.rename(m)) + new RenameModulesAndInstances((m) => AllModules.rename(m)), + // new RemoveUnusedModules, ) }