From: Luke Kenneth Casson Leighton <lkcl@lkcl.net>
Date: Sat, 30 May 2020 22:33:40 +0000 (+0100)
Subject: get carry from cr write_cr
X-Git-Tag: div_pipeline~727
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=7fb19327ebe7146bca82c93dad717ba95026306f;p=soc.git

get carry from cr write_cr
---

diff --git a/src/soc/fu/compunits/test/test_alu_compunit.py b/src/soc/fu/compunits/test/test_alu_compunit.py
index b0739bc1..da20105e 100644
--- a/src/soc/fu/compunits/test/test_alu_compunit.py
+++ b/src/soc/fu/compunits/test/test_alu_compunit.py
@@ -226,21 +226,16 @@ class TestRunner(FHDLTestCase):
     def check_extra_cu_outputs(self, cu, dec2, sim, code):
         rc = yield dec2.e.rc.data
         op = yield dec2.e.insn_type
-
-        if rc or \
-           op == InternalOp.OP_CMP.value or \
-           op == InternalOp.OP_CMPEQB.value:
-            cr_actual = yield from get_cu_output(cu, 1, code)
+        cridx_ok = yield dec2.e.write_cr.ok
+        cridx = yield dec2.e.write_cr.data
 
         if rc:
-            cr_expected = sim.crl[0].get_range().value
-            self.assertEqual(cr_expected, cr_actual, code)
-
-        if op == InternalOp.OP_CMP.value or \
-           op == InternalOp.OP_CMPEQB.value:
-            bf = yield dec2.dec.BF
-            cr_expected = sim.crl[bf].get_range().value
-            self.assertEqual(cr_expected, cr_actual, code)
+            self.assertEqual(cridx, 0, code)
+
+        if cridx_ok:
+            cr_expected = sim.crl[cridx].get_range().value
+            cr_actual = yield from get_cu_output(cu, 1, code)
+            self.assertEqual(cr_expected, cr_actual, "CR%d %s" % (cridx, code))
 
         cry_out = yield dec2.e.output_carry
         if cry_out: