Add --pretty:no-expr-inlining to prevent expression inlining (#1869)

Also rename --Wno-scala-version-warning to
--warn:no-scala-version-deprecation and adopt naming convention where
resulting annotation matches the CLI option

3 files changed, 37 insertions, 3 deletions

diff --git a/src/test/scala/firrtlTests/InlineBooleanExpressionsSpec.scala b/src/test/scala/firrtlTests/InlineBooleanExpressionsSpec.scala
index fb7ecfdb..15dffee6 100644
--- a/src/test/scala/firrtlTests/InlineBooleanExpressionsSpec.scala
+++ b/src/test/scala/firrtlTests/InlineBooleanExpressionsSpec.scala
@@ -8,7 +8,7 @@ import firrtl.options.Dependency
 import firrtl.passes._
 import firrtl.transforms._
 import firrtl.testutils._
-import firrtl.stage.TransformManager
+import firrtl.stage.{PrettyNoExprInlining, TransformManager}
 
 class InlineBooleanExpressionsSpec extends FirrtlFlatSpec {
   val transform = new InlineBooleanExpressions
@@ -312,4 +312,19 @@ class InlineBooleanExpressionsSpec extends FirrtlFlatSpec {
         |    o <= add(a, not(b))""".stripMargin
     firrtlEquivalenceTest(input, Seq(new InlineBooleanExpressions))
   }
+
+  it should s"respect --${PrettyNoExprInlining.longOption}" in {
+    val input =
+      """circuit Top :
+        |  module Top :
+        |    input a : UInt<1>
+        |    input b : UInt<1>
+        |    input c : UInt<1>
+        |    output out : UInt<1>
+        |
+        |    node _T_1 = and(a, b)
+        |    out <= and(_T_1, c)""".stripMargin
+    val result = exec(input, PrettyNoExprInlining :: Nil)
+    (result) should be(parse(input).serialize)
+  }
 }
diff --git a/src/test/scala/firrtlTests/stage/FirrtlMainSpec.scala b/src/test/scala/firrtlTests/stage/FirrtlMainSpec.scala
index ee942d85..bf4b790e 100644
--- a/src/test/scala/firrtlTests/stage/FirrtlMainSpec.scala
+++ b/src/test/scala/firrtlTests/stage/FirrtlMainSpec.scala
@@ -10,7 +10,7 @@ import java.io.{File, PrintWriter}
 
 import firrtl.{BuildInfo, FileUtils}
 
-import firrtl.stage.{FirrtlMain, SuppressScalaVersionWarning}
+import firrtl.stage.{FirrtlMain, WarnNoScalaVersionDeprecation}
 import firrtl.stage.transforms.CheckScalaVersion
 import firrtl.util.BackendCompilationUtilities
 import org.scalatest.featurespec.AnyFeatureSpec
@@ -169,7 +169,7 @@ class FirrtlMainSpec
     */
   val defaultStdOut: Option[String] = BuildInfo.scalaVersion.split("\\.").toList match {
     case "2" :: v :: _ :: Nil if v.toInt <= 11 =>
-      Some(CheckScalaVersion.deprecationMessage("2.11", s"--${SuppressScalaVersionWarning.longOption}"))
+      Some(CheckScalaVersion.deprecationMessage("2.11", s"--${WarnNoScalaVersionDeprecation.longOption}"))
     case x =>
       None
   }
diff --git a/src/test/scala/firrtlTests/transforms/CombineCatsSpec.scala b/src/test/scala/firrtlTests/transforms/CombineCatsSpec.scala
index a916eac5..cd0907dc 100644
--- a/src/test/scala/firrtlTests/transforms/CombineCatsSpec.scala
+++ b/src/test/scala/firrtlTests/transforms/CombineCatsSpec.scala
@@ -5,6 +5,7 @@ package firrtlTests.transforms
 import firrtl.PrimOps._
 import firrtl._
 import firrtl.ir.DoPrim
+import firrtl.stage.PrettyNoExprInlining
 import firrtl.transforms.{CombineCats, MaxCatLenAnnotation}
 import firrtl.testutils.FirrtlFlatSpec
 import firrtl.testutils.FirrtlCheckers._
@@ -174,4 +175,22 @@ class CombineCatsSpec extends FirrtlFlatSpec {
       case DoPrim(Cat, Seq(_, DoPrim(Cat, Seq(_, DoPrim(Cat, _, _, _)), _, _)), _, _) => true
     }
   }
+
+  "CombineCats" should s"respect --${PrettyNoExprInlining.longOption}" in {
+    val input =
+      """circuit test :
+        |  module test :
+        |    input in1 : UInt<1>
+        |    input in2 : UInt<2>
+        |    input in3 : UInt<3>
+        |    input in4 : UInt<4>
+        |    output out : UInt<10>
+        |
+        |    node _T_1 = cat(in1, in2)
+        |    node _T_2 = cat(_T_1, in3)
+        |    out <= cat(_T_2, in4)
+        |""".stripMargin
+    val result = execute(input, transforms, PrettyNoExprInlining :: Nil)
+    result.circuit.serialize should be(parse(input).serialize)
+  }
 }