Cast to int instead of using .integer
Signed-off-by: Alex Forencich <alex@alexforencich.com>
This commit is contained in:
@@ -455,7 +455,7 @@ class PtpTdSink(Reset):
|
||||
while True:
|
||||
await clock_edge_event
|
||||
|
||||
sdi_sample = self.data.value.integer
|
||||
sdi_sample = int(self.data.value)
|
||||
|
||||
# increment fns portion
|
||||
self.ts_fns += ((self.period_ns << 32) + self.period_fns)
|
||||
|
||||
@@ -61,14 +61,14 @@ class TB:
|
||||
await RisingEdge(self.dut.clk)
|
||||
|
||||
def get_output_ts_tod_ns(self):
|
||||
ts = self.dut.output_ts_tod.value.integer
|
||||
ts = int(self.dut.output_ts_tod.value)
|
||||
return Decimal(ts >> 48).scaleb(9) + (Decimal(ts & 0xffffffffffff) / Decimal(2**16))
|
||||
|
||||
def get_output_ts_tod_s(self):
|
||||
return self.get_output_ts_tod_ns().scaleb(-9)
|
||||
|
||||
def get_output_ts_rel_ns(self):
|
||||
ts = self.dut.output_ts_rel.value.integer
|
||||
ts = int(self.dut.output_ts_rel.value)
|
||||
return Decimal(ts) / Decimal(2**16)
|
||||
|
||||
def get_output_ts_rel_s(self):
|
||||
@@ -137,10 +137,10 @@ async def run_load_timestamps(dut):
|
||||
|
||||
await RisingEdge(dut.clk)
|
||||
|
||||
assert dut.output_ts_tod.value.integer == 12345678
|
||||
assert dut.output_ts_tod_step.value.integer == 1
|
||||
assert dut.output_ts_rel.value.integer == 12345678
|
||||
assert dut.output_ts_rel_step.value.integer == 1
|
||||
assert int(dut.output_ts_tod.value) == 12345678
|
||||
assert int(dut.output_ts_tod_step.value) == 1
|
||||
assert int(dut.output_ts_rel.value) == 12345678
|
||||
assert int(dut.output_ts_rel_step.value) == 1
|
||||
|
||||
await RisingEdge(dut.clk)
|
||||
|
||||
@@ -207,7 +207,7 @@ async def run_seconds_increment(dut):
|
||||
for k in range(3000):
|
||||
await RisingEdge(dut.clk)
|
||||
|
||||
if dut.output_pps.value.integer:
|
||||
if int(dut.output_pps.value):
|
||||
saw_pps = True
|
||||
tb.log.info("Got PPS with sink ToD TS %s", tb.get_output_ts_tod_ns())
|
||||
assert (tb.get_output_ts_tod_s() - 1) < 6.4e-9
|
||||
|
||||
@@ -105,14 +105,14 @@ class TB:
|
||||
self.dut.output_clk.value = 0
|
||||
|
||||
def get_input_ts_ns(self):
|
||||
ts = self.dut.input_ts.value.integer
|
||||
ts = int(self.dut.input_ts.value)
|
||||
if len(self.dut.input_ts) == 64:
|
||||
return ts/2**16*1e-9
|
||||
else:
|
||||
return (ts >> 48) + ((ts & 0xffffffffffff)/2**16*1e-9)
|
||||
|
||||
def get_output_ts_ns(self):
|
||||
ts = self.dut.output_ts.value.integer
|
||||
ts = int(self.dut.output_ts.value)
|
||||
if len(self.dut.output_ts) == 64:
|
||||
return ts/2**16*1e-9
|
||||
else:
|
||||
@@ -177,7 +177,7 @@ async def run_test(dut):
|
||||
for i in range(100000):
|
||||
await RisingEdge(dut.input_clk)
|
||||
|
||||
assert tb.dut.locked.value.integer
|
||||
assert int(tb.dut.locked.value)
|
||||
|
||||
diffs = await tb.measure_ts_diff()
|
||||
tb.log.info(f"Difference: {mean(diffs)*1e9} ns (stdev: {stdev(diffs)*1e9})")
|
||||
@@ -194,7 +194,7 @@ async def run_test(dut):
|
||||
for i in range(100000):
|
||||
await RisingEdge(dut.input_clk)
|
||||
|
||||
assert tb.dut.locked.value.integer
|
||||
assert int(tb.dut.locked.value)
|
||||
|
||||
diffs = await tb.measure_ts_diff()
|
||||
tb.log.info(f"Difference: {mean(diffs)*1e9} ns (stdev: {stdev(diffs)*1e9})")
|
||||
@@ -211,7 +211,7 @@ async def run_test(dut):
|
||||
for i in range(100000):
|
||||
await RisingEdge(dut.input_clk)
|
||||
|
||||
assert tb.dut.locked.value.integer
|
||||
assert int(tb.dut.locked.value)
|
||||
|
||||
diffs = await tb.measure_ts_diff()
|
||||
tb.log.info(f"Difference: {mean(diffs)*1e9} ns (stdev: {stdev(diffs)*1e9})")
|
||||
@@ -228,7 +228,7 @@ async def run_test(dut):
|
||||
for i in range(100000):
|
||||
await RisingEdge(dut.input_clk)
|
||||
|
||||
assert tb.dut.locked.value.integer
|
||||
assert int(tb.dut.locked.value)
|
||||
|
||||
diffs = await tb.measure_ts_diff()
|
||||
tb.log.info(f"Difference: {mean(diffs)*1e9} ns (stdev: {stdev(diffs)*1e9})")
|
||||
@@ -245,7 +245,7 @@ async def run_test(dut):
|
||||
for i in range(100000):
|
||||
await RisingEdge(dut.input_clk)
|
||||
|
||||
assert tb.dut.locked.value.integer
|
||||
assert int(tb.dut.locked.value)
|
||||
|
||||
diffs = await tb.measure_ts_diff()
|
||||
tb.log.info(f"Difference: {mean(diffs)*1e9} ns (stdev: {stdev(diffs)*1e9})")
|
||||
@@ -277,7 +277,7 @@ async def run_test(dut):
|
||||
for i in range(200):
|
||||
await RisingEdge(dut.input_clk)
|
||||
|
||||
assert tb.dut.locked.value.integer
|
||||
assert int(tb.dut.locked.value)
|
||||
|
||||
diffs = await tb.measure_ts_diff()
|
||||
tb.log.info(f"Difference: {mean(diffs)*1e9} ns (stdev: {stdev(diffs)*1e9})")
|
||||
@@ -309,7 +309,7 @@ async def run_test(dut):
|
||||
for i in range(20):
|
||||
await RisingEdge(dut.input_clk)
|
||||
|
||||
assert tb.dut.locked.value.integer
|
||||
assert int(tb.dut.locked.value)
|
||||
|
||||
diffs = await tb.measure_ts_diff()
|
||||
tb.log.info(f"Difference: {mean(diffs)*1e9} ns (stdev: {stdev(diffs)*1e9})")
|
||||
@@ -326,7 +326,7 @@ async def run_test(dut):
|
||||
for i in range(100000):
|
||||
await RisingEdge(dut.input_clk)
|
||||
|
||||
assert tb.dut.locked.value.integer
|
||||
assert int(tb.dut.locked.value)
|
||||
|
||||
diffs = await tb.measure_ts_diff()
|
||||
tb.log.info(f"Difference: {mean(diffs)*1e9} ns (stdev: {stdev(diffs)*1e9})")
|
||||
@@ -343,7 +343,7 @@ async def run_test(dut):
|
||||
for i in range(100000):
|
||||
await RisingEdge(dut.input_clk)
|
||||
|
||||
assert tb.dut.locked.value.integer
|
||||
assert int(tb.dut.locked.value)
|
||||
|
||||
diffs = await tb.measure_ts_diff()
|
||||
tb.log.info(f"Difference: {mean(diffs)*1e9} ns (stdev: {stdev(diffs)*1e9})")
|
||||
@@ -360,7 +360,7 @@ async def run_test(dut):
|
||||
for i in range(100000):
|
||||
await RisingEdge(dut.input_clk)
|
||||
|
||||
assert tb.dut.locked.value.integer
|
||||
assert int(tb.dut.locked.value)
|
||||
|
||||
# diffs = await tb.measure_ts_diff()
|
||||
# tb.log.info(f"Difference: {mean(diffs)*1e9} ns (stdev: {stdev(diffs)*1e9})")
|
||||
@@ -392,7 +392,7 @@ async def run_test(dut):
|
||||
# for i in range(20):
|
||||
# await RisingEdge(dut.input_clk)
|
||||
|
||||
# assert tb.dut.locked.value.integer
|
||||
# assert int(tb.dut.locked.value)
|
||||
|
||||
diffs = await tb.measure_ts_diff()
|
||||
tb.log.info(f"Difference: {mean(diffs)*1e9} ns (stdev: {stdev(diffs)*1e9})")
|
||||
@@ -409,7 +409,7 @@ async def run_test(dut):
|
||||
for i in range(100000):
|
||||
await RisingEdge(dut.input_clk)
|
||||
|
||||
assert tb.dut.locked.value.integer
|
||||
assert int(tb.dut.locked.value)
|
||||
|
||||
diffs = await tb.measure_ts_diff()
|
||||
tb.log.info(f"Difference: {mean(diffs)*1e9} ns (stdev: {stdev(diffs)*1e9})")
|
||||
@@ -426,7 +426,7 @@ async def run_test(dut):
|
||||
for i in range(100000):
|
||||
await RisingEdge(dut.input_clk)
|
||||
|
||||
assert tb.dut.locked.value.integer
|
||||
assert int(tb.dut.locked.value)
|
||||
|
||||
diffs = await tb.measure_ts_diff()
|
||||
tb.log.info(f"Difference: {mean(diffs)*1e9} ns (stdev: {stdev(diffs)*1e9})")
|
||||
|
||||
@@ -99,11 +99,11 @@ class TB:
|
||||
self.clock_period = period
|
||||
|
||||
def get_output_ts_tod_ns(self):
|
||||
ts = self.dut.output_ts_tod.value.integer
|
||||
ts = int(self.dut.output_ts_tod.value)
|
||||
return Decimal(ts >> 48).scaleb(9) + (Decimal(ts & 0xffffffffffff) / Decimal(2**16))
|
||||
|
||||
def get_output_ts_rel_ns(self):
|
||||
ts = self.dut.output_ts_rel.value.integer
|
||||
ts = int(self.dut.output_ts_rel.value)
|
||||
return Decimal(ts) / Decimal(2**16)
|
||||
|
||||
async def _run_clock(self):
|
||||
@@ -198,7 +198,7 @@ async def run_test(dut):
|
||||
for i in range(100000):
|
||||
await RisingEdge(dut.clk)
|
||||
|
||||
assert tb.dut.locked.value.integer
|
||||
assert int(tb.dut.locked.value)
|
||||
|
||||
rel_diffs, tod_diffs = await tb.measure_ts_diff()
|
||||
tb.log.info(f"Difference (rel): {mean(rel_diffs)} ns (stdev: {stdev(rel_diffs)})")
|
||||
@@ -217,7 +217,7 @@ async def run_test(dut):
|
||||
for i in range(100000):
|
||||
await RisingEdge(dut.clk)
|
||||
|
||||
assert tb.dut.locked.value.integer
|
||||
assert int(tb.dut.locked.value)
|
||||
|
||||
rel_diffs, tod_diffs = await tb.measure_ts_diff()
|
||||
tb.log.info(f"Difference (rel): {mean(rel_diffs)} ns (stdev: {stdev(rel_diffs)})")
|
||||
@@ -236,7 +236,7 @@ async def run_test(dut):
|
||||
for i in range(100000):
|
||||
await RisingEdge(dut.clk)
|
||||
|
||||
assert tb.dut.locked.value.integer
|
||||
assert int(tb.dut.locked.value)
|
||||
|
||||
rel_diffs, tod_diffs = await tb.measure_ts_diff()
|
||||
tb.log.info(f"Difference (rel): {mean(rel_diffs)} ns (stdev: {stdev(rel_diffs)})")
|
||||
@@ -255,7 +255,7 @@ async def run_test(dut):
|
||||
for i in range(100000):
|
||||
await RisingEdge(dut.clk)
|
||||
|
||||
assert tb.dut.locked.value.integer
|
||||
assert int(tb.dut.locked.value)
|
||||
|
||||
rel_diffs, tod_diffs = await tb.measure_ts_diff()
|
||||
tb.log.info(f"Difference (rel): {mean(rel_diffs)} ns (stdev: {stdev(rel_diffs)})")
|
||||
@@ -274,7 +274,7 @@ async def run_test(dut):
|
||||
for i in range(100000):
|
||||
await RisingEdge(dut.clk)
|
||||
|
||||
assert tb.dut.locked.value.integer
|
||||
assert int(tb.dut.locked.value)
|
||||
|
||||
rel_diffs, tod_diffs = await tb.measure_ts_diff()
|
||||
tb.log.info(f"Difference (rel): {mean(rel_diffs)} ns (stdev: {stdev(rel_diffs)})")
|
||||
@@ -308,7 +308,7 @@ async def run_test(dut):
|
||||
for i in range(200):
|
||||
await RisingEdge(dut.clk)
|
||||
|
||||
assert tb.dut.locked.value.integer
|
||||
assert int(tb.dut.locked.value)
|
||||
|
||||
rel_diffs, tod_diffs = await tb.measure_ts_diff()
|
||||
tb.log.info(f"Difference (rel): {mean(rel_diffs)} ns (stdev: {stdev(rel_diffs)})")
|
||||
@@ -342,7 +342,7 @@ async def run_test(dut):
|
||||
for i in range(20):
|
||||
await RisingEdge(dut.clk)
|
||||
|
||||
assert tb.dut.locked.value.integer
|
||||
assert int(tb.dut.locked.value)
|
||||
|
||||
rel_diffs, tod_diffs = await tb.measure_ts_diff()
|
||||
tb.log.info(f"Difference (rel): {mean(rel_diffs)} ns (stdev: {stdev(rel_diffs)})")
|
||||
@@ -361,7 +361,7 @@ async def run_test(dut):
|
||||
for i in range(100000):
|
||||
await RisingEdge(dut.clk)
|
||||
|
||||
assert tb.dut.locked.value.integer
|
||||
assert int(tb.dut.locked.value)
|
||||
|
||||
rel_diffs, tod_diffs = await tb.measure_ts_diff()
|
||||
tb.log.info(f"Difference (rel): {mean(rel_diffs)} ns (stdev: {stdev(rel_diffs)})")
|
||||
@@ -380,7 +380,7 @@ async def run_test(dut):
|
||||
for i in range(100000):
|
||||
await RisingEdge(dut.clk)
|
||||
|
||||
assert tb.dut.locked.value.integer
|
||||
assert int(tb.dut.locked.value)
|
||||
|
||||
rel_diffs, tod_diffs = await tb.measure_ts_diff()
|
||||
tb.log.info(f"Difference (rel): {mean(rel_diffs)} ns (stdev: {stdev(rel_diffs)})")
|
||||
@@ -399,7 +399,7 @@ async def run_test(dut):
|
||||
for i in range(100000):
|
||||
await RisingEdge(dut.clk)
|
||||
|
||||
assert tb.dut.locked.value.integer
|
||||
assert int(tb.dut.locked.value)
|
||||
|
||||
rel_diffs, tod_diffs = await tb.measure_ts_diff()
|
||||
tb.log.info(f"Difference (rel): {mean(rel_diffs)} ns (stdev: {stdev(rel_diffs)})")
|
||||
@@ -433,7 +433,7 @@ async def run_test(dut):
|
||||
for i in range(20):
|
||||
await RisingEdge(dut.clk)
|
||||
|
||||
assert tb.dut.locked.value.integer
|
||||
assert int(tb.dut.locked.value)
|
||||
|
||||
rel_diffs, tod_diffs = await tb.measure_ts_diff()
|
||||
tb.log.info(f"Difference (rel): {mean(rel_diffs)} ns (stdev: {stdev(rel_diffs)})")
|
||||
@@ -452,7 +452,7 @@ async def run_test(dut):
|
||||
for i in range(100000):
|
||||
await RisingEdge(dut.clk)
|
||||
|
||||
assert tb.dut.locked.value.integer
|
||||
assert int(tb.dut.locked.value)
|
||||
|
||||
rel_diffs, tod_diffs = await tb.measure_ts_diff()
|
||||
tb.log.info(f"Difference (rel): {mean(rel_diffs)} ns (stdev: {stdev(rel_diffs)})")
|
||||
@@ -471,7 +471,7 @@ async def run_test(dut):
|
||||
for i in range(100000):
|
||||
await RisingEdge(dut.clk)
|
||||
|
||||
assert tb.dut.locked.value.integer
|
||||
assert int(tb.dut.locked.value)
|
||||
|
||||
rel_diffs, tod_diffs = await tb.measure_ts_diff()
|
||||
tb.log.info(f"Difference (rel): {mean(rel_diffs)} ns (stdev: {stdev(rel_diffs)})")
|
||||
|
||||
@@ -362,7 +362,7 @@ async def run_seconds_increment(dut):
|
||||
for k in range(3000):
|
||||
await RisingEdge(dut.clk)
|
||||
|
||||
if dut.output_pps.value.integer:
|
||||
if int(dut.output_pps.value):
|
||||
saw_pps = True
|
||||
tb.log.info("Got PPS with sink ToD TS %s", tb.ptp_td_sink.get_ts_tod_ns())
|
||||
assert (tb.ptp_td_sink.get_ts_tod_s() - 1) < 6.4e-9
|
||||
|
||||
Reference in New Issue
Block a user