decode fast spr for OP_BCREG CTR, TAR and LR
[soc.git] / src / soc / fu / branch / test / test_pipe_caller.py
index 66020211592b0b61ef7734c02f64eced6ea0fd6c..c14ed97479701a160421506eebbd816a4e0aa7aa 100644 (file)
@@ -6,15 +6,17 @@ import unittest
 from soc.decoder.isa.caller import ISACaller, special_sprs
 from soc.decoder.power_decoder import (create_pdecode)
 from soc.decoder.power_decoder2 import (PowerDecode2)
-from soc.decoder.power_enums import (XER_bits, Function)
+from soc.decoder.power_enums import (XER_bits, Function, InternalOp)
 from soc.decoder.selectable_int import SelectableInt
 from soc.simulator.program import Program
 from soc.decoder.isa.all import ISA
+from soc.regfile.regfiles import FastRegs
 
 from soc.fu.branch.pipeline import BranchBasePipe
 from soc.fu.branch.pipe_data import BranchPipeSpec
 import random
 
+from soc.regfile.util import fast_reg_to_spr # HACK!
 
 class TestCase:
     def __init__(self, program, regs, sprs, cr, name):
@@ -98,21 +100,26 @@ class BranchTestCase(FHDLTestCase):
 
     def test_bc_reg(self):
         # XXX: bcctr and bcctrl time out (irony: they're counters)
-        #choices = ["bclr", "bclrl", "bctar", "bctarl", "bcctr", "bcctrl"]
-        choices = ["bclr", "bclrl", "bctar", "bctarl", ]
+        choices = ["bclr", "bclrl", "bcctr", "bcctrl", "bctar", "bctarl"]
         for insn in choices:
             for i in range(20):
                 bh = random.randrange(0, 3)
-                bo = random.choice([0, 2, 8, 10, 16, 18])
+                bo = random.choice([4, 12])
                 bi = random.randrange(0, 31)
                 cr = random.randrange(0, (1<<32)-1)
                 ctr = random.randint(0, (1<<32)-1)
+                lr = random.randint(0, (1<<64)-1) & ~3
+                tar = random.randint(0, (1<<64)-1) & ~3
                 lst = [f"{insn} {bo}, {bi}, {bh}"]
-                initial_sprs={9: SelectableInt(ctr, 64)}
+                initial_sprs={9: SelectableInt(ctr, 64),
+                              8: SelectableInt(lr, 64),
+                              815: SelectableInt(tar, 64)}
                 self.run_tst_program(Program(lst),
                                      initial_sprs=initial_sprs,
                                      initial_cr=cr)
 
+        
+
     def test_ilang(self):
         pspec = BranchPipeSpec(id_wid=2)
         alu = BranchBasePipe(pspec)
@@ -174,17 +181,8 @@ class TestRunner(FHDLTestCase):
                     # set to TAR, op_bclr* require spr2 to be set to LR.
                     # if op_sc*, op_rf* and op_hrfid are to be added here
                     # then additional op-decoding is required, accordingly
-                    yield branch.p.data_i.spr1.eq(simulator.spr['CTR'].value)
-                    print(f"cr0: {simulator.crl[0].get_range()}")
                     yield Settle()
-
-                    cr_en = yield pdecode2.e.read_cr1.ok
-                    if cr_en:
-                        cr_sel = yield pdecode2.e.read_cr1.data
-                        cr = simulator.crl[cr_sel].get_range().value
-                        yield branch.p.data_i.cr.eq(cr)
-                        full_cr = simulator.cr.get_range().value
-                        print(f"full cr: {full_cr:x}, sel: {cr_sel}, cr: {cr:x}")
+                    yield from self.set_inputs(branch, pdecode2, simulator)
                     fn_unit = yield pdecode2.e.fn_unit
                     self.assertEqual(fn_unit, Function.BRANCH.value, code)
                     yield
@@ -208,8 +206,12 @@ class TestRunner(FHDLTestCase):
         self.assertEqual(branch_taken, sim_branch_taken, code)
         if branch_taken:
             branch_addr = yield branch.n.data_o.nia.data
+            print(f"real: {branch_addr:x}, sim: {sim.pc.CIA.value:x}")
             self.assertEqual(branch_addr, sim.pc.CIA.value, code)
 
+        # TODO: check write_fast1 as well (should contain CTR)
+
+        # TODO: this should be checking write_fast2
         lk = yield dec2.e.lk
         branch_lk = yield branch.n.data_o.lr.ok
         self.assertEqual(lk, branch_lk, code)
@@ -217,6 +219,47 @@ class TestRunner(FHDLTestCase):
             branch_lr = yield branch.n.data_o.lr.data
             self.assertEqual(sim.spr['LR'], branch_lr, code)
 
+    def set_inputs(self, branch, dec2, sim):
+        yield branch.p.data_i.spr1.eq(sim.spr['CTR'].value)
+        print(f"cr0: {sim.crl[0].get_range()}")
+
+        # TODO: this needs to now be read_fast1.data and read_fast2.data
+        if False:
+            fast1_en = yield dec2.e.read_fast1.ok
+            if fast1_en:
+                fast1_sel = yield dec2.e.read_fast1.data
+                spr1_sel = fast_reg_to_spr(fast1_sel)
+                spr1_data = sim.spr[spr1_sel].value
+                yield branch.p.data_i.spr1.eq(spr1_data)
+
+            fast2_en = yield dec2.e.read_fast2.ok
+            if fast2_en:
+                fast2_sel = yield dec2.e.read_fast2.data
+                spr2_sel = fast_reg_to_spr(fast2_sel)
+                spr2_data = sim.spr[spr2_sel].value
+                yield branch.p.data_i.spr2.eq(spr2_data)
+
+        # TODO: drop this once it's in PowerDecode2
+        # (actually, DecodeA and DecodeB)
+        insn_type = yield dec2.e.insn_type
+        if insn_type == InternalOp.OP_BCREG.value:
+            xo9 = yield dec2.dec.FormXL.XO[9]
+            xo5 = yield dec2.dec.FormXL.XO[5]
+            if xo9 == 0:
+                yield branch.p.data_i.spr2.eq(sim.spr['LR'].value)
+            elif xo5 == 1:
+                yield branch.p.data_i.spr2.eq(sim.spr['TAR'].value)
+            else:
+                yield branch.p.data_i.spr2.eq(sim.spr['CTR'].value)
+
+        cr_en = yield dec2.e.read_cr1.ok
+        if cr_en:
+            cr_sel = yield dec2.e.read_cr1.data
+            cr = sim.crl[cr_sel].get_range().value
+            yield branch.p.data_i.cr.eq(cr)
+            full_cr = sim.cr.get_range().value
+            print(f"full cr: {full_cr:x}, sel: {cr_sel}, cr: {cr:x}")
+
 
 if __name__ == "__main__":
     unittest.main(exit=False)