Test equalTo, greaterThan, atLeast in PopCount tester and fix property name

maartenboersma · maartenboersma · commit a205a0210d9a · 2025-08-08T12:42:04.000+02:00
diff --git a/src/test/scala-2/chiselTests/PopCount.scala b/src/test/scala-2/chiselTests/PopCount.scala
@@ -18,11 +18,16 @@ class PopCountTester(n: Int) extends Module {
   val expected = x.asBools.foldLeft(0.U)(_ +& _)
   assert(result === expected)
 
+  for (c <- 0 to n + 2) {
+    assert(PopCount.equalTo    (c, x) === (PopCount(x)===c.U), s"Wrong result for PopCount.equalTo    ($c,x) function, x.width=$n")
+    assert(PopCount.greaterThan(c, x) === (PopCount(x)>  c.U), s"Wrong result for PopCount.greaterThan($c,x) function, x.width=$n")
+    assert(PopCount.atLeast    (c, x) === (PopCount(x)>= c.U), s"Wrong result for PopCount.atLeast    ($c,x) function, x.width=$n")
+  }
   require(result.getWidth == BigInt(n).bitLength)
 }
 
 class PopCountSpec extends AnyPropSpec with PropertyUtils with ChiselSim {
-  property("Mul lookup table should return the correct result") {
+  property("PopCount circuitry should return the correct result") {
     forAll(smallPosInts) { (n: Int) => simulate(new PopCountTester(n))(RunUntilFinished(math.pow(2, n).toInt + 2)) }
   }
 }

Original file line number	Diff line number	Diff line change
`@@ -18,11 +18,16 @@ class PopCountTester(n: Int) extends Module {`
`18`	`18`	`val expected = x.asBools.foldLeft(0.U)(_ +& _)`
`19`	`19`	`assert(result === expected)`
`20`	`20`
	`21`	`+ for (c <- 0 to n + 2) {`
	`22`	`+ assert(PopCount.equalTo (c, x) === (PopCount(x)===c.U), s"Wrong result for PopCount.equalTo ($c,x) function, x.width=$n")`
	`23`	`+ assert(PopCount.greaterThan(c, x) === (PopCount(x)> c.U), s"Wrong result for PopCount.greaterThan($c,x) function, x.width=$n")`
	`24`	`+ assert(PopCount.atLeast (c, x) === (PopCount(x)>= c.U), s"Wrong result for PopCount.atLeast ($c,x) function, x.width=$n")`
	`25`	`+ }`
`21`	`26`	`require(result.getWidth == BigInt(n).bitLength)`
`22`	`27`	`}`
`23`	`28`
`24`	`29`	`class PopCountSpec extends AnyPropSpec with PropertyUtils with ChiselSim {`
`25`		`- property("Mul lookup table should return the correct result") {`
	`30`	`+ property("PopCount circuitry should return the correct result") {`
`26`	`31`	`forAll(smallPosInts) { (n: Int) => simulate(new PopCountTester(n))(RunUntilFinished(math.pow(2, n).toInt + 2)) }`
`27`	`32`	`}`
`28`	`33`	`}`