aboutsummaryrefslogtreecommitdiffstats
path: root/mpm
diff options
context:
space:
mode:
authorWade Fife <wade.fife@ettus.com>2022-01-27 11:07:44 -0600
committerAaron Rossetto <aaron.rossetto@ni.com>2022-02-03 14:21:31 -0600
commit929d620bc2ccb0cabf398c9224432be25685d2f4 (patch)
tree82d09fe8c0afbf8f21047c9a836c25df48195d44 /mpm
parentd2374c6ad67f94fa577d28d5660f32579f4775cc (diff)
downloaduhd-929d620bc2ccb0cabf398c9224432be25685d2f4.tar.gz
uhd-929d620bc2ccb0cabf398c9224432be25685d2f4.tar.bz2
uhd-929d620bc2ccb0cabf398c9224432be25685d2f4.zip
mpm: Fix units for DRAM BIST
There was a mixture of KB/s and B/s in the DRAM BIST. The BIST now returns B/s in all cases.
Diffstat (limited to 'mpm')
-rwxr-xr-xmpm/python/e320_bist2
-rwxr-xr-xmpm/python/n3xx_bist4
-rw-r--r--mpm/python/usrp_mpm/bist.py2
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,