From 3f8e1536ff2f4b5090cd2c074ada5d7a413d169f Mon Sep 17 00:00:00 2001 From: chick Date: Sun, 25 Sep 2016 18:23:07 -0700 Subject: remove unnecessary parentheses --- src/main/scala/firrtl/passes/AnnotateValidMemConfigs.scala | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/main/scala/firrtl/passes/AnnotateValidMemConfigs.scala') diff --git a/src/main/scala/firrtl/passes/AnnotateValidMemConfigs.scala b/src/main/scala/firrtl/passes/AnnotateValidMemConfigs.scala index d229aaf3..e77955ed 100644 --- a/src/main/scala/firrtl/passes/AnnotateValidMemConfigs.scala +++ b/src/main/scala/firrtl/passes/AnnotateValidMemConfigs.scala @@ -193,7 +193,7 @@ case class SRAMCompiler( val squarestAspectRatio = validMinConfigsSquareness.unzip._1.min val validConfig = validMinConfigsSquareness(squarestAspectRatio) val validRules = defaultSearchOrdering filter (r => - (validConfig.width <= r.getValidWidths.max && validConfig.depth <= r.getValidDepths.max)) + validConfig.width <= r.getValidWidths.max && validConfig.depth <= r.getValidDepths.max) // TODO: don't just take first option // TODO: More optimal split if particular value is in range but not supported // TODO: Support up to 2 read ports, 2 write ports; should be power of 2? @@ -271,7 +271,7 @@ class AnnotateValidMemConfigs(reader: Option[YamlFileReader]) extends Pass { def updateStmts(s: Statement): Statement = s match { case m: DefMemory if containsInfo(m.info, "useMacro") => sramCompilers match { case None => m - case Some(compiler) if (m.readwriters.length == 1) => + case Some(compiler) if m.readwriters.length == 1 => compiler.sp match { case None => error("Design needs RW port memory compiler!") case Some(p) => p append m @@ -285,5 +285,5 @@ class AnnotateValidMemConfigs(reader: Option[YamlFileReader]) extends Pass { case s => s map updateStmts } - def run(c: Circuit) = c copy (modules = (c.modules map (_ map updateStmts))) + def run(c: Circuit) = c copy (modules = c.modules map (_ map updateStmts)) } -- cgit v1.2.3