From 65bbf155003a86cd836f7ff4a2def6af91794780 Mon Sep 17 00:00:00 2001
From: Adam Izraelevitz
Date: Wed, 21 Feb 2018 14:30:00 -0800
Subject: Change primop arg type (#587)

* Changed primops to not accept mixed-type args

* Changed return type of sub of two uints to uint

* Added negative tests

* Removed rocket.fir. Manually changed RocketCore to not mix mul arg types. Added integration tests

* Clarified test description and remove println

* Fixed use of throwInternalError
---
 src/test/scala/firrtlTests/fixed/FixedTypeInferenceSpec.scala | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

(limited to 'src/test/scala/firrtlTests/fixed')

diff --git a/src/test/scala/firrtlTests/fixed/FixedTypeInferenceSpec.scala b/src/test/scala/firrtlTests/fixed/FixedTypeInferenceSpec.scala
index 37209786..a866836f 100644
--- a/src/test/scala/firrtlTests/fixed/FixedTypeInferenceSpec.scala
+++ b/src/test/scala/firrtlTests/fixed/FixedTypeInferenceSpec.scala
@@ -197,12 +197,11 @@ class FixedTypeInferenceSpec extends FirrtlFlatSpec {
         |  module Unit :
         |    input a : Fixed<10><<2>>
         |    input b : Fixed<7><<3>>
-        |    input c : UInt<2>
         |    output cat : UInt
         |    output head : UInt
         |    output tail : UInt
         |    output bits : UInt
-        |    cat <= cat(a, c)
+        |    cat <= cat(a, b)
         |    head <= head(a, 3)
         |    tail <= tail(a, 3)
         |    bits <= bits(a, 6, 3)""".stripMargin
@@ -211,12 +210,11 @@ class FixedTypeInferenceSpec extends FirrtlFlatSpec {
         |  module Unit :
         |    input a : Fixed<10><<2>>
         |    input b : Fixed<7><<3>>
-        |    input c : UInt<2>
-        |    output cat : UInt<12>
+        |    output cat : UInt<17>
         |    output head : UInt<3>
         |    output tail : UInt<7>
         |    output bits : UInt<4>
-        |    cat <= cat(a, c)
+        |    cat <= cat(a, b)
         |    head <= head(a, 3)
         |    tail <= tail(a, 3)
         |    bits <= bits(a, 6, 3)""".stripMargin
-- 
cgit v1.2.3