Verified Commit 7846eef3 authored by Minyong Li's avatar Minyong Li 💬
Browse files

core.*Test: various tiny style fixes

parent 0b86d106
...@@ -5,7 +5,6 @@ import chiseltest._ ...@@ -5,7 +5,6 @@ import chiseltest._
import chisel3._ import chisel3._
class ChaChaBlockTest extends FlatSpec with ChiselScalatestTester { class ChaChaBlockTest extends FlatSpec with ChiselScalatestTester {
private val rfc8439232TestVector = Seq( private val rfc8439232TestVector = Seq(
"h61707865".U(32.W) -> "he4e7f110".U(32.W), "h61707865".U(32.W) -> "he4e7f110".U(32.W),
"h3320646e".U(32.W) -> "h15593bd1".U(32.W), "h3320646e".U(32.W) -> "h15593bd1".U(32.W),
...@@ -24,7 +23,6 @@ class ChaChaBlockTest extends FlatSpec with ChiselScalatestTester { ...@@ -24,7 +23,6 @@ class ChaChaBlockTest extends FlatSpec with ChiselScalatestTester {
"h4a000000".U(32.W) -> "he883d0cb".U(32.W), "h4a000000".U(32.W) -> "he883d0cb".U(32.W),
"h00000000".U(32.W) -> "h4e3c50a2".U(32.W) "h00000000".U(32.W) -> "h4e3c50a2".U(32.W)
) )
private val rfc8439242B1TestVector = Seq( private val rfc8439242B1TestVector = Seq(
"h61707865".U(32.W) -> "hf3514f22".U(32.W), "h61707865".U(32.W) -> "hf3514f22".U(32.W),
"h3320646e".U(32.W) -> "he1d91b40".U(32.W), "h3320646e".U(32.W) -> "he1d91b40".U(32.W),
...@@ -43,7 +41,6 @@ class ChaChaBlockTest extends FlatSpec with ChiselScalatestTester { ...@@ -43,7 +41,6 @@ class ChaChaBlockTest extends FlatSpec with ChiselScalatestTester {
"h4a000000".U(32.W) -> "h4c2c21ea".U(32.W), "h4a000000".U(32.W) -> "h4c2c21ea".U(32.W),
"h00000000".U(32.W) -> "hb7417df0".U(32.W) "h00000000".U(32.W) -> "hb7417df0".U(32.W)
) )
private val rfc8439242B2TestVector = Seq( private val rfc8439242B2TestVector = Seq(
"h61707865".U(32.W) -> "h9f74a669".U(32.W), "h61707865".U(32.W) -> "h9f74a669".U(32.W),
"h3320646e".U(32.W) -> "h410f633f".U(32.W), "h3320646e".U(32.W) -> "h410f633f".U(32.W),
......
...@@ -50,5 +50,4 @@ class DataMemoryTest extends FlatSpec with ChiselScalatestTester { ...@@ -50,5 +50,4 @@ class DataMemoryTest extends FlatSpec with ChiselScalatestTester {
c.io.read.data.expect("hcafe".U(dataWidth.W)) c.io.read.data.expect("hcafe".U(dataWidth.W))
} }
} }
} }
...@@ -60,7 +60,7 @@ class ProgramMemoryTest extends FlatSpec with ChiselScalatestTester { ...@@ -60,7 +60,7 @@ class ProgramMemoryTest extends FlatSpec with ChiselScalatestTester {
} }
} }
it should "correctly do relative branch" in { it should "do relative branching correctly" in {
test(new ProgramMemory(addrWidth, cwWidth, size)) { c => test(new ProgramMemory(addrWidth, cwWidth, size)) { c =>
c.io.br.abs.poke(false.B) c.io.br.abs.poke(false.B)
c.io.br.rel.poke(false.B) c.io.br.rel.poke(false.B)
...@@ -100,7 +100,7 @@ class ProgramMemoryTest extends FlatSpec with ChiselScalatestTester { ...@@ -100,7 +100,7 @@ class ProgramMemoryTest extends FlatSpec with ChiselScalatestTester {
} }
} }
it should "do absolute branch correctly" in { it should "do absolute branching correctly" in {
test(new ProgramMemory(addrWidth, cwWidth, size)) { c => test(new ProgramMemory(addrWidth, cwWidth, size)) { c =>
c.io.br.abs.poke(false.B) c.io.br.abs.poke(false.B)
c.io.br.rel.poke(false.B) c.io.br.rel.poke(false.B)
...@@ -136,5 +136,4 @@ class ProgramMemoryTest extends FlatSpec with ChiselScalatestTester { ...@@ -136,5 +136,4 @@ class ProgramMemoryTest extends FlatSpec with ChiselScalatestTester {
} }
} }
} }
} }
...@@ -8,7 +8,6 @@ import chiseltest._ ...@@ -8,7 +8,6 @@ import chiseltest._
import chisel3._ import chisel3._
class QuarterRoundTest extends FlatSpec with ChiselScalatestTester { class QuarterRoundTest extends FlatSpec with ChiselScalatestTester {
it should "compute RFC8439 2.1.1 test vector correctly" in { it should "compute RFC8439 2.1.1 test vector correctly" in {
test(new QuarterRound) { c => test(new QuarterRound) { c =>
c.io.in(0).poke("h11111111".U(32.W)) c.io.in(0).poke("h11111111".U(32.W))
...@@ -36,5 +35,4 @@ class QuarterRoundTest extends FlatSpec with ChiselScalatestTester { ...@@ -36,5 +35,4 @@ class QuarterRoundTest extends FlatSpec with ChiselScalatestTester {
c.io.out(3).expect("hccc07c79".U(32.W)) c.io.out(3).expect("hccc07c79".U(32.W))
} }
} }
} }
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment