usb-tools/amaranth
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

hdl._ast: deprecate Value.implies.

Browse source
This commit is contained in:
Wanda 2024-04-16 13:45:05 +02:00 • committed by Catherine
parent c4370efcf4
commit a7a7d32099
4 changed files with 12 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

6
tests/test_hdl_rec.py
View file

@ -6,6 +6,7 @@ from amaranth.hdl._ast import *
with warnings.catch_warnings():
warnings.filterwarnings(action="ignore", category=DeprecationWarning)
from amaranth.hdl.rec import *
from amaranth._utils import _ignore_deprecated
from .utils import *
@ -299,8 +300,9 @@ class RecordTestCase(FHDLTestCase):
self.assertEqual(repr(r1.any()), "(r| (cat (sig r1__a)))")
self.assertEqual(repr(r1.all()), "(r& (cat (sig r1__a)))")
self.assertEqual(repr(r1.xor()), "(r^ (cat (sig r1__a)))")
self.assertEqual(repr(r1.implies(1)), "(| (~ (cat (sig r1__a))) (const 1'd1))")
self.assertEqual(repr(r1.implies(s1)), "(| (~ (cat (sig r1__a))) (sig s1))")
with _ignore_deprecated():
self.assertEqual(repr(r1.implies(1)), "(| (~ (cat (sig r1__a))) (const 1'd1))")
self.assertEqual(repr(r1.implies(s1)), "(| (~ (cat (sig r1__a))) (sig s1))")
# bit_select, word_select, matches,
self.assertEqual(repr(r1.bit_select(0, 1)), "(slice (cat (sig r1__a)) 0:1)")

9
tests/test_lib_fifo.py
View file

@ -156,12 +156,15 @@ class FIFOModelEquivalenceSpec(Elaboratable):
gold.w_data.eq(dut.w_data),
]
m.d.comb += Assert(dut.r_rdy.implies(gold.r_rdy))
m.d.comb += Assert(dut.w_rdy.implies(gold.w_rdy))
with m.If(dut.r_rdy):
m.d.comb += Assert(gold.r_rdy)
with m.If(dut.w_rdy):
m.d.comb += Assert(gold.w_rdy)
m.d.comb += Assert(dut.r_level == gold.r_level)
m.d.comb += Assert(dut.w_level == gold.w_level)
m.d.comb += Assert(dut.r_rdy.implies(dut.r_data == gold.r_data))
with m.If(dut.r_rdy):
m.d.comb += Assert(dut.r_data == gold.r_data)
return m