diff options
| author | Jiuyang Liu | 2021-12-15 15:53:52 +0800 |
|---|---|---|
| committer | GitHub | 2021-12-15 07:53:52 +0000 |
| commit | 36506c527ff0f51636beee4160f0ce1f6ad2f90a (patch) | |
| tree | ef6f708959d6f115154d76ddd6216a7ba288a01f /integration-tests/src/test | |
| parent | 7e8ec50376f852d5ab35d7609d986c7e4128abb1 (diff) | |
Refactor TruthTable to use Seq (#2217)
This makes the resulting Verilog from decoding a TruthTable deterministic.
Diffstat (limited to 'integration-tests/src/test')
| -rw-r--r-- | integration-tests/src/test/scala/chiselTests/util/experimental/DecoderSpec.scala | 4 | ||||
| -rw-r--r-- | integration-tests/src/test/scala/chiselTests/util/experimental/minimizer/MinimizerSpec.scala | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/integration-tests/src/test/scala/chiselTests/util/experimental/DecoderSpec.scala b/integration-tests/src/test/scala/chiselTests/util/experimental/DecoderSpec.scala index c31fdee0..2d50555e 100644 --- a/integration-tests/src/test/scala/chiselTests/util/experimental/DecoderSpec.scala +++ b/integration-tests/src/test/scala/chiselTests/util/experimental/DecoderSpec.scala @@ -10,7 +10,7 @@ import chiseltest._ import chiseltest.formal._ class DecoderSpec extends AnyFlatSpec with ChiselScalatestTester with Formal { - val xor = TruthTable( + val xor = TruthTable.fromString( """10->1 |01->1 | 0""".stripMargin) @@ -42,7 +42,7 @@ class DecoderSpec extends AnyFlatSpec with ChiselScalatestTester with Formal { """10->1 |01->1 | 0""".stripMargin, - QMCMinimizer.minimize(TruthTable( + QMCMinimizer.minimize(TruthTable.fromString( """10->1 |01->1 | 0""".stripMargin)).toString diff --git a/integration-tests/src/test/scala/chiselTests/util/experimental/minimizer/MinimizerSpec.scala b/integration-tests/src/test/scala/chiselTests/util/experimental/minimizer/MinimizerSpec.scala index a932eb77..07afd074 100644 --- a/integration-tests/src/test/scala/chiselTests/util/experimental/minimizer/MinimizerSpec.scala +++ b/integration-tests/src/test/scala/chiselTests/util/experimental/minimizer/MinimizerSpec.scala @@ -19,7 +19,7 @@ class DecodeTestModule(minimizer: Minimizer, table: TruthTable) extends Module { chisel3.experimental.verification.assert( // for each instruction, if input matches, output should match, not no matched, fallback to default (table.table.map { case (key, value) => (i === key) && (minimizedO === value) } ++ - Seq(table.table.keys.map(i =/= _).reduce(_ && _) && minimizedO === table.default)).reduce(_ || _) + Seq(table.table.map(_._1).map(i =/= _).reduce(_ && _) && minimizedO === table.default)).reduce(_ || _) ) } |
