Cleaned LZA

kuznia-rdzeni · Nov 4, 2024 · d46eadd · d46eadd
1 parent 19241c2
commit d46eadd
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 41 deletions.
diff --git a/coreblocks/func_blocks/fu/fpu/lza.py b/coreblocks/func_blocks/fu/fpu/lza.py
@@ -20,11 +20,6 @@ def __init__(self, *, fpu_params: FPUParams):
         self.predict_out_layout = [
             ("shift_amount", range(fpu_params.sig_width)),
             ("is_zero", 1),
-            ("G", fpu_params.sig_width + 2),
-            ("T", fpu_params.sig_width + 2),
-            ("Z", fpu_params.sig_width + 2),
-            ("f", fpu_params.sig_width + 1),
-            ("L", fpu_params.sig_width + 1),
         ]
 
 
@@ -58,47 +53,34 @@ def elaborate(self, platform):
 
         @def_method(m, self.predict_request)
         def _(arg):
-            T = Signal(self.lza_params.sig_width + 2)
-            G = Signal(self.lza_params.sig_width + 2)
-            Z = Signal(self.lza_params.sig_width + 2)
-            f = Signal(self.lza_params.sig_width + 1)
-            L = Signal(self.lza_params.sig_width + 1)
+            t = Signal(self.lza_params.sig_width + 1)
+            g = Signal(self.lza_params.sig_width + 1)
+            z = Signal(self.lza_params.sig_width + 1)
+            f = Signal(self.lza_params.sig_width)
             shift_amount = Signal(range(self.lza_params.sig_width))
             is_zero = Signal(1)
 
-            m.d.av_comb += T.eq((arg.sig_a ^ arg.sig_b) << 1)
-            m.d.av_comb += G.eq((arg.sig_a & arg.sig_b) << 1)
-            m.d.av_comb += Z.eq(((~(arg.sig_a) & ~(arg.sig_b)) << 1))
-            m.d.av_comb += T[-1].eq(1)
+            m.d.av_comb += t.eq((arg.sig_a ^ arg.sig_b) << 1)
+            m.d.av_comb += g.eq((arg.sig_a & arg.sig_b) << 1)
+            m.d.av_comb += z.eq(((~(arg.sig_a) & ~(arg.sig_b)) << 1))
             with m.If(arg.carry):
-                m.d.av_comb += G[0].eq(arg.carry)
+                m.d.av_comb += g[0].eq(1)
             with m.Else():
-                m.d.av_comb += Z[0].eq(1)
+                m.d.av_comb += z[0].eq(1)
 
-            for i in reversed(range(1, self.lza_params.sig_width + 2)):
-                m.d.av_comb += f[i - 1].eq((T[i] ^ ~(Z[i - 1])))
-
-            for i in range(self.lza_params.sig_width + 1):
-                if i == (self.lza_params.sig_width):
-                    m.d.av_comb += L[i].eq(f[i])
-                else:
-                    m.d.av_comb += L[i].eq(((~(f[(i + 1) : self.lza_params.sig_width + 1]).any()) & f[i]))
+            for i in reversed(range(1, self.lza_params.sig_width + 1)):
+                m.d.av_comb += f[i - 1].eq((t[i] ^ ~(z[i - 1])))
 
             m.d.av_comb += shift_amount.eq(0)
-            for i in range(self.lza_params.sig_width):
-                with m.If(L[self.lza_params.sig_width - i - 1]):
+            for i in reversed(range(self.lza_params.sig_width)):
+                with m.If(f[self.lza_params.sig_width - i - 1]):
                     m.d.av_comb += shift_amount.eq(i)
 
-            m.d.av_comb += is_zero.eq((arg.carry & T[1 : self.lza_params.sig_width + 1].all()))
+            m.d.av_comb += is_zero.eq((arg.carry & t[1 : self.lza_params.sig_width].all()))
 
             return {
                 "shift_amount": shift_amount,
                 "is_zero": is_zero,
-                "G": G,
-                "T": T,
-                "Z": Z,
-                "f": f,
-                "L": L,
             }
 
         return m
diff --git a/test/func_blocks/fu/test_lza.py b/test/func_blocks/fu/test_lza.py
@@ -116,15 +116,6 @@ def lza_test():
             ]
             for i in range(len(test_cases)):
                 resp = yield from lza.predict_request_adapter.call(test_cases[i])
-                print(f"Case: {i}")
-                print("{:024b}".format(test_cases[i]["sig_a"]))
-                print("{:024b}".format(test_cases[i]["sig_b"]))
-                print("G,T,Z")
-                print("{:026b}".format(resp["G"]))
-                print("{:026b}".format(resp["T"]))
-                print("{:026b}".format(resp["Z"]))
-                print("{:026b}".format(resp["f"]))
-                print("{:026b}".format(resp["L"]))
                 assert resp["shift_amount"] == expected_results[i]["shift_amount"]
                 assert resp["is_zero"] == expected_results[i]["is_zero"]