Inject numcores into the perf index calculation, and lintify.

acceptance/router_benchmark/benchmark.py

@@ -349,9 +349,9 @@ def horsepower(self) -> tuple[int]:
 
         return round(hp["coremark"]), round(hp["mmbm"])
 
-    def perfIndex(self, rate: int, coremark:int, mmbm: int) -> float:
+    def perfIndex(self, rate: int, numcores: int, coremark: int, mmbm: int) -> float:
         # mmbm is in mebiBytes/s
-        return 1.0 / (coremark_sum * (1.0/rate - BM_PACKET_LEN / (mmbm * 1024 * 1024)))
+        return 1.0 / (coremark_sum * numcores * (1.0/rate - BM_PACKET_LEN / (mmbm * 1024 * 1024)))
 
     def run(self):
         print("Benchmarking...")
@@ -392,7 +392,7 @@ def run(self):
             for tt in TEST_CASES:
                 # TODO(jiceatscion): The perf index assumes that line speed isn't the bottleneck.
                 # It almost never is, but ideally we'd need to run iperf3 to verify.
-                print(f"Perf index for {tt}: {self.perfIndex(rateMap[tt], coremark, mmbm)}")
+                print(f"Perf index for {tt}: {self.perfIndex(rateMap[tt], cores, coremark, mmbm)}")
 
         # Check the saturation...
         # Make sure that the saturation is within the expeected ballpark: that should manifest as

acceptance/router_benchmark/test.py

@@ -565,9 +565,9 @@ def horsepower(self) -> tuple[int]:
 
         return round(coremark), round(mmbm)
 
-    def perfIndex(self, rate: int, coremark:int, mmbm: int) -> float:
+    def perfIndex(self, rate: int, numcores: int, coremark: int, mmbm: int) -> float:
         # mmbm is in mebiBytes/s
-        return 1.0 / (coremark * (1.0/rate - BM_PACKET_LEN / (mmbm * 1024 * 1024)))
+        return 1.0 / (coremark * numcores * (1.0/rate - BM_PACKET_LEN / (mmbm * 1024 * 1024)))
 
     def _run(self):
         coremark, mmbm = self.horsepower()
@@ -599,7 +599,8 @@ def _run(self):
             for tt in TEST_CASES:
                 # TODO(jiceatscion): The perf index assumes that line speed isn't the bottleneck.
                 # It almost never is, but ideally we'd need to run iperf3 to verify.
-                logger.info(f"Perf index for {tt}: {self.perfIndex(rateMap[tt], coremark, mmbm)}")
+                logger.info(
+                    f"Perf index for {tt}: {self.perfIndex(rateMap[tt], cores, coremark, mmbm)}")
 
         # Log and check the performance...
         # If this is used as a CI test. Make sure that the performance is within the expected