Skip to content

Commit c37c7b0

Browse files
committed
test more backends
1 parent 6b90316 commit c37c7b0

25 files changed

+125
-85
lines changed

src/main/scala/examples/Risc.scala

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -51,8 +51,3 @@ class Risc extends Module {
5151
pc := pc + 1.U
5252
}
5353
}
54-
55-
object Opcodes {
56-
val add_op = 0
57-
val imm_op = 1
58-
}

src/main/scala/solutions/Adder.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ package solutions
33

44
import Chisel._
55

6-
class Adder(val w: Int) extends Module {
6+
class AdderSol(val w: Int) extends Module {
77
val io = new Bundle {
88
val in0 = UInt(INPUT, w)
99
val in1 = UInt(INPUT, w)

src/test/scala/examples/Adder.scala

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,11 @@ class AdderTests(c: Adder, b: Option[TesterBackend] = None) extends PeekPokeTest
2222
}
2323

2424
class AdderTester extends ChiselFlatSpec {
25-
"Adder" should "correctly add randomly generated numbers" in {
26-
runPeekPokeTester(() => new Adder(8)){
27-
(c,b) => new AdderTests(c,b)} should be (true)
25+
behavior of "Adder"
26+
backends foreach {backend =>
27+
it should s"correctly add randomly generated numbers $backend" in {
28+
runPeekPokeTester(() => new Adder(8), backend){
29+
(c,b) => new AdderTests(c,b)} should be (true)
30+
}
2831
}
2932
}

src/test/scala/examples/Adder4.scala

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,12 @@ class Adder4Tests(c: Adder4, b: Option[TesterBackend] = None) extends PeekPokeTe
2121
}
2222

2323
class Adder4Tester extends ChiselFlatSpec {
24-
"Adder4" should "correctly add randomly generated numbers" in {
25-
runPeekPokeTester(() => new Adder4){
26-
(c,b) => new Adder4Tests(c,b)}
24+
behavior of "Adder4"
25+
backends foreach {backend =>
26+
it should s"correctly add randomly generated numbers $backend" in {
27+
runPeekPokeTester(() => new Adder4, backend){
28+
(c,b) => new Adder4Tests(c,b)} should be (true)
29+
}
2730
}
2831
}
2932

src/test/scala/examples/ByteSelector.scala

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,11 @@ class ByteSelectorTests(c: ByteSelector, b: Option[TesterBackend] = None) extend
1515
}
1616

1717
class ByteSelectorTester extends ChiselFlatSpec {
18-
"ByteSelector" should "correctly select correct bits from an input" in {
19-
runPeekPokeTester(() => new ByteSelector){
20-
(c,b) => new ByteSelectorTests(c,b)}
18+
behavior of "ByteSelector"
19+
backends foreach {backend =>
20+
it should s"correctly select correct bits from an input in $backend" in {
21+
runPeekPokeTester(() => new ByteSelector, backend){
22+
(c,b) => new ByteSelectorTests(c,b)} should be (true)
23+
}
2124
}
2225
}

src/test/scala/examples/Combinational.scala

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,12 @@ class CombinationalTests(c: Combinational, b: Option[TesterBackend] = None) exte
1717
}
1818

1919
class CombinationalTester extends ChiselFlatSpec {
20-
"Combinational" should "correctly add randomly generated numbers" in {
21-
runPeekPokeTester(() => new Combinational){
22-
(c,b) => new CombinationalTests(c,b)}
20+
behavior of "Combinational"
21+
backends foreach {backend =>
22+
it should s"correctly add randomly generated numbers in $backend" in {
23+
runPeekPokeTester(() => new Combinational, backend){
24+
(c,b) => new CombinationalTests(c,b)} should be (true)
25+
}
2326
}
2427
}
2528

src/test/scala/examples/Darken.scala

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,12 @@ class DarkenTests(c: Darken, val infilename: String, val outfilename: String, b:
2020
}
2121

2222
class DarkenTester extends ChiselFlatSpec {
23-
"Darken" should "darken an image" in {
24-
runPeekPokeTester(() => new Darken()){
25-
(c,b) => new DarkenTests(c, "src/test/resources/in.im24", "out.im24", b)
26-
} should be (true)
23+
behavior of "Darken"
24+
backends foreach {backend =>
25+
it should s"darken an image in $backend" in {
26+
runPeekPokeTester(() => new Darken(), backend){
27+
(c,b) => new DarkenTests(c, "src/test/resources/in.im24", "out.im24", b)
28+
} should be (true)
29+
}
2730
}
2831
}

src/test/scala/examples/EnableShiftRegister.scala

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,11 @@ class EnableShiftRegisterTests(c: EnableShiftRegister, b: Option[TesterBackend]
2222
}
2323

2424
class EnableShiftRegisterTester extends ChiselFlatSpec {
25-
"EnableShiftRegister" should "create a pipeline of registers and shift them each cycle" in {
26-
runPeekPokeTester(() => new EnableShiftRegister) {
27-
(c,b) => new EnableShiftRegisterTests(c,b)
25+
behavior of "EnableShiftRegister"
26+
backends foreach {backend =>
27+
it should s"create a pipeline of registers and shift them each cycle in $backend" in {
28+
runPeekPokeTester(() => new EnableShiftRegister, backend) {
29+
(c,b) => new EnableShiftRegisterTests(c,b)} should be (true)
2830
}
2931
}
3032
}

src/test/scala/examples/FullAdder.scala

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,11 @@ class FullAdderTests(c: FullAdder, b: Option[TesterBackend] = None) extends Peek
2222
}
2323

2424
class FullAdderTester extends ChiselFlatSpec {
25-
"FullAdder" should "correctly add randomly generated numbers and show carry" in {
26-
runPeekPokeTester(() => new FullAdder) {
27-
(c,b) => new FullAdderTests(c,b)
25+
behavior of "FullAdder"
26+
backends foreach {backend =>
27+
it should s"correctly add randomly generated numbers and show carry in $backend" in {
28+
runPeekPokeTester(() => new FullAdder, backend) {
29+
(c,b) => new FullAdderTests(c,b)} should be (true)
2830
}
2931
}
3032
}

src/test/scala/examples/Functionality.scala

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,11 @@ class FunctionalityTests(c: Functionality, b: Option[TesterBackend] = None) exte
1717
}
1818

1919
class FunctionalityTester extends ChiselFlatSpec {
20-
"Functionality" should "demonstrate usage of functions that generate code" in {
21-
runPeekPokeTester(() => new Functionality) {
22-
(c,b) => new FunctionalityTests(c,b)
20+
behavior of "Functionality"
21+
backends foreach {backend =>
22+
it should s"demonstrate usage of functions that generate code in $backend" in {
23+
runPeekPokeTester(() => new Functionality, backend) {
24+
(c,b) => new FunctionalityTests(c,b)} should be (true)
2325
}
2426
}
2527
}

0 commit comments

Comments
 (0)
pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy