From: Luke Kenneth Casson Leighton <lkcl@lkcl.net>
Date: Sat, 23 Jan 2021 21:39:26 +0000 (+0000)
Subject: cleanup on aisle 3 - simplify sv_mode  svp64
X-Git-Tag: 24jan2021_ls180~2
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=182b6a1df7992dd702c254003fadaecfee97a209;p=soc.git

cleanup on aisle 3 - simplify sv_mode  svp64
---

diff --git a/src/soc/sv/trans/svp64.py b/src/soc/sv/trans/svp64.py
index e598c9bb..a5dcf15c 100644
--- a/src/soc/sv/trans/svp64.py
+++ b/src/soc/sv/trans/svp64.py
@@ -485,6 +485,7 @@ class SVP64:
             # "normal" mode
             if sv_mode is None:
                 mode |= (src_zero << 3) | (dst_zero << 4) # predicate zeroing
+                sv_mode = 0b00
 
             # "mapreduce" modes
             elif sv_mode == 0b00:
@@ -503,7 +504,6 @@ class SVP64:
             # "failfirst" modes
             elif sv_mode == 0b01:
                 assert dst_zero == 0, "dest-zero not allowed in failfirst mode"
-                mode |= 0b01 # sets failfirst
                 if failfirst == 'RC1':
                     mode |= (0b1<<4) # sets RC1 mode
                     mode |= (src_zero << 3) # predicate src-zeroing
@@ -520,14 +520,12 @@ class SVP64:
 
             # "saturation" modes
             elif sv_mode == 0b10:
-                mode |= 0b10 # sets saturation mode
                 mode |= (src_zero << 3) | (dst_zero << 4) # predicate zeroing
                 mode |= (saturation<<2) # sets signed/unsigned saturation
 
             # "predicate-result" modes.  err... code-duplication from ffirst
             elif sv_mode == 0b11:
                 assert dst_zero == 0, "dest-zero not allowed in predresult mode"
-                mode |= 0b11 # sets predicate-result
                 if predresult == 'RC1':
                     mode |= (0b1<<4) # sets RC1 mode
                     mode |= (src_zero << 3) # predicate src-zeroing
@@ -543,6 +541,7 @@ class SVP64:
                     mode |= (predresult << 2) # set BO
 
             # whewww.... modes all done... :)
+            mode |= sv_mode
 
             # sanity-check that 2Pred mask is same mode
             if has_pmask and has_smask: