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

hdl.ast: add Value.{rotate_left,rotate_right}.

Browse source
This commit is contained in:
Dan Ravensloft 2020-04-13 14:40:39 +01:00 committed by GitHub
parent 8b137438d0
commit 06c45c9ff0
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 108 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
nmigen/hdl/ast.py
View file

@ -423,6 +423,42 @@ class Value(metaclass=ABCMeta):
else:
return Cat(*matches).any()
def rotate_left(self, offset):
"""Rotate left by constant modulo 2**len(self).
Parameters
----------
offset : int
Amount to rotate by.
Returns
-------
Value, out
The input rotated left by offset if offset is positive, else the input rotated right by -offset.
"""
if not isinstance(offset, int):
raise TypeError("Rotate amount must be an integer, not {!r}".format(offset))
offset %= len(self)
return Cat(self[-offset:], self[:-offset]) # meow :3
def rotate_right(self, offset):
"""Rotate right by constant modulo 2**len(self).
Parameters
----------
offset : int
Amount to rotate by.
Returns
-------
Value, out
The input rotated right by offset if offset is positive, else the input rotated left by -offset.
"""
if not isinstance(offset, int):
raise TypeError("Rotate amount must be an integer, not {!r}".format(offset))
offset %= len(self)
return Cat(self[offset:], self[:offset])
def eq(self, value):
"""Assignment.

21
nmigen/test/test_hdl_ast.py
View file

@ -205,6 +205,27 @@ class ValueTestCase(FHDLTestCase):
msg="Cannot index value with 'str'"):
Const(31)["str"]
def test_rotate_left(self):
self.assertRepr(Value.cast(256).rotate_left(1), "(cat (slice (const 9'd256) 8:9) (slice (const 9'd256) 0:8))")
self.assertRepr(Value.cast(256).rotate_left(7), "(cat (slice (const 9'd256) 2:9) (slice (const 9'd256) 0:2))")
self.assertRepr(Value.cast(256).rotate_left(-1), "(cat (slice (const 9'd256) 1:9) (slice (const 9'd256) 0:1))")
self.assertRepr(Value.cast(256).rotate_left(-7), "(cat (slice (const 9'd256) 7:9) (slice (const 9'd256) 0:7))")
def test_rotate_left_wrong(self):
with self.assertRaises(TypeError,
msg="Rotate amount must be an integer, not 'str'"):
Const(31).rotate_left("str")
def test_rotate_right(self):
self.assertRepr(Value.cast(256).rotate_right(1), "(cat (slice (const 9'd256) 1:9) (slice (const 9'd256) 0:1))")
self.assertRepr(Value.cast(256).rotate_right(7), "(cat (slice (const 9'd256) 7:9) (slice (const 9'd256) 0:7))")
self.assertRepr(Value.cast(256).rotate_right(-1), "(cat (slice (const 9'd256) 8:9) (slice (const 9'd256) 0:8))")
self.assertRepr(Value.cast(256).rotate_right(-7), "(cat (slice (const 9'd256) 2:9) (slice (const 9'd256) 0:2))")
def test_rotate_right_wrong(self):
with self.assertRaises(TypeError,
msg="Rotate amount must be an integer, not 'str'"):
Const(31).rotate_right("str")
class ConstTestCase(FHDLTestCase):
def test_shape(self):

51
nmigen/test/test_sim.py
View file

@ -301,6 +301,57 @@ class SimulatorUnitTestCase(FHDLTestCase):
for i in range(10):
self.assertStatement(stmt, [C(i)], C(0))
def test_rotate_left(self):
stmt = lambda y, a: y.eq(a.rotate_left(1))
self.assertStatement(stmt, [C(0b1)], C(0b1))
self.assertStatement(stmt, [C(0b1001000)], C(0b0010001))
stmt = lambda y, a: y.eq(a.rotate_left(5))
self.assertStatement(stmt, [C(0b1000000)], C(0b0010000))
self.assertStatement(stmt, [C(0b1000001)], C(0b0110000))
stmt = lambda y, a: y.eq(a.rotate_left(7))
self.assertStatement(stmt, [C(0b1000000)], C(0b1000000))
self.assertStatement(stmt, [C(0b1000001)], C(0b1000001))
stmt = lambda y, a: y.eq(a.rotate_left(9))
self.assertStatement(stmt, [C(0b1000000)], C(0b0000010))
self.assertStatement(stmt, [C(0b1000001)], C(0b0000110))
stmt = lambda y, a: y.eq(a.rotate_left(-1))
self.assertStatement(stmt, [C(0b1)], C(0b1))
self.assertStatement(stmt, [C(0b1001000)], C(0b0100100))
stmt = lambda y, a: y.eq(a.rotate_left(-5))
self.assertStatement(stmt, [C(0b1000000)], C(0b0000010))
self.assertStatement(stmt, [C(0b1000001)], C(0b0000110))
stmt = lambda y, a: y.eq(a.rotate_left(-7))
self.assertStatement(stmt, [C(0b1000000)], C(0b1000000))
self.assertStatement(stmt, [C(0b1000001)], C(0b1000001))
stmt = lambda y, a: y.eq(a.rotate_left(-9))
self.assertStatement(stmt, [C(0b1000000)], C(0b0010000))
self.assertStatement(stmt, [C(0b1000001)], C(0b0110000))
def test_rotate_right(self):
stmt = lambda y, a: y.eq(a.rotate_right(1))
self.assertStatement(stmt, [C(0b1)], C(0b1))
self.assertStatement(stmt, [C(0b1001000)], C(0b0100100))
stmt = lambda y, a: y.eq(a.rotate_right(5))
self.assertStatement(stmt, [C(0b1000000)], C(0b0000010))
self.assertStatement(stmt, [C(0b1000001)], C(0b0000110))
stmt = lambda y, a: y.eq(a.rotate_right(7))
self.assertStatement(stmt, [C(0b1000000)], C(0b1000000))
self.assertStatement(stmt, [C(0b1000001)], C(0b1000001))
stmt = lambda y, a: y.eq(a.rotate_right(9))
self.assertStatement(stmt, [C(0b1000000)], C(0b0010000))
self.assertStatement(stmt, [C(0b1000001)], C(0b0110000))
stmt = lambda y, a: y.eq(a.rotate_right(-1))
self.assertStatement(stmt, [C(0b1)], C(0b1))
self.assertStatement(stmt, [C(0b1001000)], C(0b0010001))
stmt = lambda y, a: y.eq(a.rotate_right(-5))
self.assertStatement(stmt, [C(0b1000000)], C(0b0010000))
self.assertStatement(stmt, [C(0b1000001)], C(0b0110000))
stmt = lambda y, a: y.eq(a.rotate_right(-7))
self.assertStatement(stmt, [C(0b1000000)], C(0b1000000))
self.assertStatement(stmt, [C(0b1000001)], C(0b1000001))
stmt = lambda y, a: y.eq(a.rotate_right(-9))
self.assertStatement(stmt, [C(0b1000000)], C(0b0000010))
self.assertStatement(stmt, [C(0b1000001)], C(0b0000110))
class SimulatorIntegrationTestCase(FHDLTestCase):
@contextmanager