From 87c5d034f2d32132eed01a6f43b567af9b34cbcd Mon Sep 17 00:00:00 2001 From: Schuyler Eldridge Date: Thu, 25 Jun 2020 16:10:25 -0400 Subject: Batch renames in LowerTypes (#1718) * Batch renames in LowerTypes Signed-off-by: Schuyler Eldridge * Add benchmarking for LowerTypes Add infrastructure of benchmarking Transforms (in addition to existing infra for Passes). Also run System.gc between each timed benchmark to improve stability. Co-authored-by: Jack Koenig Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>--- src/main/scala/firrtl/passes/LowerTypes.scala | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) (limited to 'src') diff --git a/src/main/scala/firrtl/passes/LowerTypes.scala b/src/main/scala/firrtl/passes/LowerTypes.scala index ccfe5828..29792d17 100644 --- a/src/main/scala/firrtl/passes/LowerTypes.scala +++ b/src/main/scala/firrtl/passes/LowerTypes.scala @@ -55,16 +55,16 @@ object LowerTypes extends Transform with DependencyAPIMigration { val name = root + loweredName(e) renames.rename(root + e.serialize, name) Seq(name) - case (t: BundleType) => t.fields.flatMap { f => - val subNames = renameExps(renames, WSubField(e, f.name, f.tpe, times(flow(e), f.flip)), root) + case (t: BundleType) => + val subNames = t.fields.flatMap { f => + renameExps(renames, WSubField(e, f.name, f.tpe, times(flow(e), f.flip)), root) + } renames.rename(root + e.serialize, subNames) subNames - } - case (t: VectorType) => (0 until t.size).flatMap { i => - val subNames = renameExps(renames, WSubIndex(e, i, t.tpe,flow(e)), root) + case (t: VectorType) => + val subNames = (0 until t.size).flatMap { i => renameExps(renames, WSubIndex(e, i, t.tpe,flow(e)), root) } renames.rename(root + e.serialize, subNames) subNames - } } private def renameMemExps(renames: RenameMap, e: Expression, portAndField: Expression): Seq[String] = e.tpe match { @@ -224,9 +224,10 @@ object LowerTypes extends Transform with DependencyAPIMigration { val d = WRef(mem.name, sx.dataType) tail match { case None => - create_exps(mem.name, sx.dataType) foreach { x => - renames.rename(e.serialize, s"${loweredName(x)}.${port.serialize}.${field.serialize}") + val names = create_exps(mem.name, sx.dataType).map { x => + s"${loweredName(x)}.${port.serialize}.${field.serialize}" } + renames.rename(e.serialize, names) case Some(_) => renameMemExps(renames, d, mergeRef(port, field)) } -- cgit v1.2.3