making test smaller

Author: nickrallison

src/test/scala/tech/rocksavage/chiselware/timer/TimerBasicTests.scala

@@ -127,12 +127,9 @@ object TimerBasicTests extends AnyFlatSpec with ChiselScalatestTester {
         writeAPB(dut.io.apb, enAddr.U, 1.U)
 
         // 2 clock cycles for apb write to finish
-        var totalCycles    = 0
-        
-        var prescalerValue = 1
+        var totalCycles = 0
 
-        
-        
+        var prescalerValue = 1
 
         val cyclesToCount10     = 19 // has to account for time for apb write
         val cyclesFromCount10   = 34 // has to account for time for apb write

src/test/scala/tech/rocksavage/chiselware/timer/TimerTest.scala

@@ -9,11 +9,10 @@ import firrtl2.options.TargetDirAnnotation
 import org.scalatest.flatspec.AnyFlatSpec
 import org.scalatest.matchers.should.Matchers
 import tech.rocksavage.chiselware.timer.param.TimerParams
-import tech.rocksavage.chiselware.timer.TimerBasicTests
 import tech.rocksavage.test._
 
-/** Highly randomized test suite driven by configuration parameters. Includes
-  * code coverage for all top-level ports. Inspired by the DynamicFifo
+/** Highly randomized test suite driven by configuration parameters. Includes code coverage for all
+  * top-level ports. Inspired by the DynamicFifo
   */
 
 class TimerTest extends AnyFlatSpec with ChiselScalatestTester with Matchers {
@@ -67,8 +66,8 @@ class TimerTest extends AnyFlatSpec with ChiselScalatestTester with Matchers {
         val dataWidth      = 32
         val addrWidth      = 32
         val wordWidth      = 8
-        val countWidth     = 32
-        val prescalerWidth = 32
+        val countWidth     = 8
+        val prescalerWidth = 8
 
         // Pass in randomly selected values to DUT
         val timerParams =
@@ -91,12 +90,11 @@ class TimerTest extends AnyFlatSpec with ChiselScalatestTester with Matchers {
         testName match {
             // Test case for Master Mode Initialization
             case "formal" =>
-                "TimerInner" should "Formally Verify" in {
+                "TimerInner" should "Formally Verify" in
                     verify(
                       new TimerInnerFVHarness(timerParams, true),
-                      Seq(BoundedCheck(40))
+                      Seq(BoundedCheck(40)),
                     )
-                }
             case "pwm_ceiling_test" =>
                 it should "verify PWM ceiling functionality" in {
                     val cov = test(new Timer(timerParams, false))
@@ -108,7 +106,7 @@ class TimerTest extends AnyFlatSpec with ChiselScalatestTester with Matchers {
                       testName,
                       configName,
                       coverage,
-                      covDir
+                      covDir,
                     )
                 }
             case "prescaler_change_test" =>
@@ -117,15 +115,15 @@ class TimerTest extends AnyFlatSpec with ChiselScalatestTester with Matchers {
                         .withAnnotations(backendAnnotations) { dut =>
                             TimerBasicTests.testPrescalerChange(
                               dut,
-                              timerParams
+                              timerParams,
                             )
                         }
                     coverageCollector.collectCoverage(
                       cov.getAnnotationSeq,
                       testName,
                       configName,
                       coverage,
-                      covDir
+                      covDir,
                     )
                 }
             case "low_maxcount_dutycycle_test" =>
@@ -134,15 +132,15 @@ class TimerTest extends AnyFlatSpec with ChiselScalatestTester with Matchers {
                         .withAnnotations(backendAnnotations) { dut =>
                             TimerBasicTests.testLowMaxCountDutyCycle(
                               dut,
-                              timerParams
+                              timerParams,
                             )
                         }
                     coverageCollector.collectCoverage(
                       cov.getAnnotationSeq,
                       testName,
                       configName,
                       coverage,
-                      covDir
+                      covDir,
                     )
                 }
             case "random_test" =>
@@ -151,58 +149,55 @@ class TimerTest extends AnyFlatSpec with ChiselScalatestTester with Matchers {
                         .withAnnotations(backendAnnotations) { dut =>
                             TimerBasicTests.testRandomMaxCountAndPrescaler(
                               dut,
-                              timerParams
+                              timerParams,
                             )
                         }
                     coverageCollector.collectCoverage(
                       cov.getAnnotationSeq,
                       testName,
                       configName,
                       coverage,
-                      covDir
+                      covDir,
                     )
                 }
             case "basic" =>
                 it should "pass a basic test" in {
                     val cov = test(
                       new Timer(
                         timerParams,
-                        false
-                      )
+                        false,
+                      ),
                     )
                         .withAnnotations(backendAnnotations) { dut =>
                             TimerBasicTests.timerBasicTest(
                               dut,
-                              timerParams
+                              timerParams,
                             )
                         }
                     coverageCollector.collectCoverage(
                       cov.getAnnotationSeq,
                       testName,
                       configName,
                       coverage,
-                      covDir
+                      covDir,
                     )
                 }
             case _ => allTests(timerParams, configName, covDir, coverage)
         }
-        it should "generate cumulative coverage report" in {
+        it should "generate cumulative coverage report" in
             coverageCollector.saveCumulativeCoverage(coverage, covDir)
-        }
     }
 
     def allTests(
         timerParams: TimerParams,
         configName: String,
         covDir: String,
-        coverage: Boolean
-    ): Unit = {
-        "TimerInner" should "Formally Verify" in {
+        coverage: Boolean): Unit = {
+        "TimerInner" should "Formally Verify" in
             verify(
               new TimerInnerFVHarness(timerParams, true),
-              Seq(BoundedCheck(40))
+              Seq(BoundedCheck(40)),
             )
-        }
 
         it should "verify PWM ceiling functionality" in {
             val testName = "pwm_ceiling_test"
@@ -215,7 +210,7 @@ class TimerTest extends AnyFlatSpec with ChiselScalatestTester with Matchers {
               testName,
               configName,
               coverage,
-              covDir
+              covDir,
             )
         }
 
@@ -230,7 +225,7 @@ class TimerTest extends AnyFlatSpec with ChiselScalatestTester with Matchers {
               testName,
               configName,
               coverage,
-              covDir
+              covDir,
             )
         }
         it should "verify duty cycle with low maxCount over multiple cycles" in {
@@ -244,7 +239,7 @@ class TimerTest extends AnyFlatSpec with ChiselScalatestTester with Matchers {
               testName,
               configName,
               coverage,
-              covDir
+              covDir,
             )
         }
         it should "verify timer with random maxCount and prescaler" in {
@@ -253,15 +248,15 @@ class TimerTest extends AnyFlatSpec with ChiselScalatestTester with Matchers {
                 .withAnnotations(backendAnnotations) { dut =>
                     TimerBasicTests.testRandomMaxCountAndPrescaler(
                       dut,
-                      timerParams
+                      timerParams,
                     )
                 }
             coverageCollector.collectCoverage(
               cov.getAnnotationSeq,
               testName,
               configName,
               coverage,
-              covDir
+              covDir,
             )
         }
         it should "pass a basic test" in {
@@ -271,15 +266,15 @@ class TimerTest extends AnyFlatSpec with ChiselScalatestTester with Matchers {
                 .withAnnotations(backendAnnotations) { dut =>
                     TimerBasicTests.timerBasicTest(
                       dut,
-                      timerParams
+                      timerParams,
                     )
                 }
             coverageCollector.collectCoverage(
               cov.getAnnotationSeq,
               testName,
               configName,
               coverage,
-              covDir
+              covDir,
             )
         }
     }