Remove FloatWireVector

Author: gaborszita

pyrtl/rtllib/pyrtlfloat/__init__.py

@@ -1,12 +1,20 @@
 from ._types import FloatingPointType, FPTypeProperties, PyrtlFloatConfig, RoundingMode
-from .floatoperations import FloatOperations
-from .floatwirevector import Float16WireVector
+from .floatoperations import (
+    BFloat16Operations,
+    Float16Operations,
+    Float32Operations,
+    Float64Operations,
+    FloatOperations,
+)
 
 __all__ = [
     "FloatingPointType",
     "FPTypeProperties",
     "PyrtlFloatConfig",
     "RoundingMode",
     "FloatOperations",
-    "Float16WireVector",
+    "BFloat16Operations",
+    "Float16Operations",
+    "Float32Operations",
+    "Float64Operations",
 ]

pyrtl/rtllib/pyrtlfloat/floatoperations.py

@@ -2,14 +2,14 @@
 
 from ._add_sub import AddSubHelper
 from ._multiplication import MultiplicationHelper
-from ._types import PyrtlFloatConfig, RoundingMode
+from ._types import FloatingPointType, PyrtlFloatConfig, RoundingMode
 
 
 class FloatOperations:
     default_rounding_mode = RoundingMode.RNE
 
     @staticmethod
-    def multiply(
+    def mul(
         config: PyrtlFloatConfig,
         operand_a: pyrtl.WireVector,
         operand_b: pyrtl.WireVector,
@@ -31,3 +31,47 @@ def sub(
         operand_b: pyrtl.WireVector,
     ) -> pyrtl.WireVector:
         return AddSubHelper.sub(config, operand_a, operand_b)
+
+
+class _BaseTypedFloatOperations:
+    _fp_type: FloatingPointType = None
+
+    @classmethod
+    def mul(
+        cls, operand_a: pyrtl.WireVector, operand_b: pyrtl.WireVector
+    ) -> pyrtl.WireVector:
+        return FloatOperations.mul(cls._get_config(), operand_a, operand_b)
+
+    @classmethod
+    def add(
+        cls, operand_a: pyrtl.WireVector, operand_b: pyrtl.WireVector
+    ) -> pyrtl.WireVector:
+        return FloatOperations.add(cls._get_config(), operand_a, operand_b)
+
+    @classmethod
+    def sub(
+        cls, operand_a: pyrtl.WireVector, operand_b: pyrtl.WireVector
+    ) -> pyrtl.WireVector:
+        return FloatOperations.sub(cls._get_config(), operand_a, operand_b)
+
+    @classmethod
+    def _get_config(cls) -> PyrtlFloatConfig:
+        return PyrtlFloatConfig(
+            cls._fp_type.value, FloatOperations.default_rounding_mode
+        )
+
+
+class BFloat16Operations(_BaseTypedFloatOperations):
+    _fp_type = FloatingPointType.BFLOAT16
+
+
+class Float16Operations(_BaseTypedFloatOperations):
+    _fp_type = FloatingPointType.FLOAT16
+
+
+class Float32Operations(_BaseTypedFloatOperations):
+    _fp_type = FloatingPointType.FLOAT32
+
+
+class Float64Operations(_BaseTypedFloatOperations):
+    _fp_type = FloatingPointType.FLOAT64

pyrtl/rtllib/pyrtlfloat/floatwirevector.py

@@ -1,23 +1,19 @@
 import unittest
 
 import pyrtl
-from pyrtl.rtllib.pyrtlfloat import Float16WireVector, FloatOperations, RoundingMode
+from pyrtl.rtllib.pyrtlfloat import Float16Operations, FloatOperations, RoundingMode
 
 
 class TestMultiplication(unittest.TestCase):
     def setUp(self):
         pyrtl.reset_working_block()
         a = pyrtl.Input(bitwidth=16, name="a")
         b = pyrtl.Input(bitwidth=16, name="b")
-        a_floatwv = Float16WireVector()
-        a_floatwv <<= a
-        b_floatwv = Float16WireVector()
-        b_floatwv <<= b
         FloatOperations.default_rounding_mode = RoundingMode.RNE
         result_add = pyrtl.Output(name="result_add")
-        result_add <<= a_floatwv + b_floatwv
+        result_add <<= Float16Operations.add(a, b)
         result_sub = pyrtl.Output(name="result_sub")
-        result_sub <<= a_floatwv - b_floatwv
+        result_sub <<= Float16Operations.sub(a, b)
         self.sim = pyrtl.Simulation()
 
     def test_multiplication_simple(self):

tests/rtllib/pyrtlfloat/test_add_sub.py

@@ -1,24 +1,20 @@
 import unittest
 
 import pyrtl
-from pyrtl.rtllib.pyrtlfloat import Float16WireVector, FloatOperations, RoundingMode
+from pyrtl.rtllib.pyrtlfloat import Float16Operations, FloatOperations, RoundingMode
 
 
 class TestMultiplication(unittest.TestCase):
     def setUp(self):
         pyrtl.reset_working_block()
         a = pyrtl.Input(bitwidth=16, name="a")
         b = pyrtl.Input(bitwidth=16, name="b")
-        a_floatwv = Float16WireVector()
-        a_floatwv <<= a
-        b_floatwv = Float16WireVector()
-        b_floatwv <<= b
         FloatOperations.default_rounding_mode = RoundingMode.RNE
         result_rne = pyrtl.Output(name="result_rne")
-        result_rne <<= a_floatwv * b_floatwv
+        result_rne <<= Float16Operations.mul(a, b)
         FloatOperations.default_rounding_mode = RoundingMode.RTZ
         result_rtz = pyrtl.Output(name="result_rtz")
-        result_rtz <<= a_floatwv * b_floatwv
+        result_rtz <<= Float16Operations.mul(a, b)
         self.sim = pyrtl.Simulation()
 
     def test_multiplication_simple(self):