From 3bb0f11e6ce670b77a0e347ec06d71087bc1e5ea Mon Sep 17 00:00:00 2001 From: Palmer Dabbelt Date: Fri, 5 Feb 2016 09:56:42 -0800 Subject: [PATCH 1/3] Chisel3 <> reverse fix --- src/main/scala/Vlsi.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/scala/Vlsi.scala b/src/main/scala/Vlsi.scala index 4f9a42aa..bb4f6f5c 100644 --- a/src/main/scala/Vlsi.scala +++ b/src/main/scala/Vlsi.scala @@ -11,7 +11,7 @@ class MemDessert(topParams: Parameters) extends Module { implicit val p = topParams val io = new MemDesserIO(p(HtifKey).width) val x = Module(new MemDesser(p(HtifKey).width)) - io.narrow <> x.io.narrow + x.io.narrow <> io.narrow io.wide <> x.io.wide } From 8422aaf6fca4ab511b2c37bdff4a6157f588363b Mon Sep 17 00:00:00 2001 From: Palmer Dabbelt Date: Fri, 5 Feb 2016 09:57:47 -0800 Subject: [PATCH 2/3] Add a "/" when targetDir doesn't have one This isn't Chisel 3 specific, but that's what I happened to do in the Chisel 3 Driver wrapper. --- src/main/scala/Testing.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/scala/Testing.scala b/src/main/scala/Testing.scala index a010975b..a194915e 100644 --- a/src/main/scala/Testing.scala +++ b/src/main/scala/Testing.scala @@ -165,7 +165,7 @@ object TestGenerator extends App with FileSystemUtilities { val v = createOutputFile(configClassName + ".knb") v.write(world.getKnobs) v.close - val d = new java.io.FileOutputStream(Driver.targetDir + configClassName + ".dtb") + val d = new java.io.FileOutputStream(Driver.targetDir + "/" + configClassName + ".dtb") d.write(paramsFromConfig(DeviceTree)) d.close val w = createOutputFile(configClassName + ".cst") From b2ed35e8aa2b5d63f42abf7d9e9115d79e3c6105 Mon Sep 17 00:00:00 2001 From: Palmer Dabbelt Date: Fri, 5 Feb 2016 09:59:02 -0800 Subject: [PATCH 3/3] Print a better error on missing config classes Without this you don't actually see what config class you tried to use, which makes it hard to grep around Makefiles to see why things are broken. --- src/main/scala/Testing.scala | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/scala/Testing.scala b/src/main/scala/Testing.scala index a194915e..2540d83b 100644 --- a/src/main/scala/Testing.scala +++ b/src/main/scala/Testing.scala @@ -136,8 +136,8 @@ object TestGenerator extends App with FileSystemUtilities { Class.forName(s"$projectName.$configClassName").newInstance.asInstanceOf[Config] } catch { case e: java.lang.ClassNotFoundException => - throwException(s"Could not find the cde.Config subclass you asked for " + - "(i.e. \"$configClassName\"), did you misspell it?", e) + throwException("Unable to find configClassName \"" + configClassName + + "\", did you misspell it?", e) } val world = config.toInstance val paramsFromConfig: Parameters = Parameters.root(world)