diff options
| -rwxr-xr-x | mpm/python/e320_bist | 2 | ||||
| -rwxr-xr-x | mpm/python/n3xx_bist | 4 | ||||
| -rw-r--r-- | mpm/python/usrp_mpm/bist.py | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/mpm/python/e320_bist b/mpm/python/e320_bist index c9662fe14..d399400ee 100755 --- a/mpm/python/e320_bist +++ b/mpm/python/e320_bist @@ -152,7 +152,7 @@ class E320BIST(bist.UsrpBIST): if self.args.dry_run: return True, {'throughput': 1250e6} result = bist.test_ddr3_with_usrp_probe() - return result.get('throughput', 0) > 1000e3, result + return result.get('throughput', 0) > 1000e6, result def bist_gpsdo(self): """ diff --git a/mpm/python/n3xx_bist b/mpm/python/n3xx_bist index 37f64bd5b..33dab3bf6 100755 --- a/mpm/python/n3xx_bist +++ b/mpm/python/n3xx_bist @@ -153,7 +153,7 @@ class N3XXBIST(bist.UsrpBIST): # the current result. if ('error_msg' not in result) \ or self.args.option.get('skip_load_fpga', False): - return result.get('throughput', 0) > 1000e3, result + return result.get('throughput', 0) > 1000e6, result # Otherwise, we load the AA FPGA image, because that's one image where # we think the DmaFIFO block is actually instantiated. self.reload_fpga_image = True @@ -169,7 +169,7 @@ class N3XXBIST(bist.UsrpBIST): 'error_msg': "Failed to load AA image: {}".format(str(ex)), } result = bist.test_ddr3_with_usrp_probe() - return result.get('throughput', 0) > 1000e3, result + return result.get('throughput', 0) > 1000e6, result def bist_gpsdo(self): """ diff --git a/mpm/python/usrp_mpm/bist.py b/mpm/python/usrp_mpm/bist.py index 6a7886515..c5e2ad9db 100644 --- a/mpm/python/usrp_mpm/bist.py +++ b/mpm/python/usrp_mpm/bist.py @@ -305,7 +305,7 @@ def test_ddr3_with_usrp_probe(extra_args=None): } mobj = re.search(r"Throughput: (?P<thrup>[0-9.]+)\s?MB", output) if mobj is not None: - return {'throughput': float(mobj.group('thrup')) * 1000} + return {'throughput': float(mobj.group('thrup')) * 1e6} else: return { 'throughput': 0, |