From 8ceaaa0aa8a15349d996e08e6d8e955fc8aa62ee Mon Sep 17 00:00:00 2001
From: Luke Kenneth Casson Leighton <lkcl@lkcl.net>
Date: Mon, 22 Mar 2021 17:30:58 +0000
Subject: [PATCH] add SVP64Asm option for "m=" to set both src and dest mask

---
 src/soc/sv/trans/svp64.py | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/src/soc/sv/trans/svp64.py b/src/soc/sv/trans/svp64.py
index 90019124..887ca87f 100644
--- a/src/soc/sv/trans/svp64.py
+++ b/src/soc/sv/trans/svp64.py
@@ -419,8 +419,16 @@ class SVP64Asm:
 
             # ok let's start identifying opcode augmentation fields
             for encmode in opmodes:
-                # predicate mask (dest)
+                # predicate mask (src and dest)
                 if encmode.startswith("m="):
+                    pme = encmode
+                    pmmode, pmask = decode_predicate(encmode[2:])
+                    smmode, smask = pmmode, pmask
+                    mmode = pmmode
+                    has_pmask = True
+                    has_smask = True
+                # predicate mask (dest)
+                if encmode.startswith("dm="):
                     pme = encmode
                     pmmode, pmask = decode_predicate(encmode[2:])
                     mmode = pmmode
@@ -621,7 +629,8 @@ if __name__ == '__main__':
                  'sv.cmpi 5, 1, 3, 2',
                  'sv.setb 5, 31',
                  'sv.isel 64.v, 3, 2, 65.v',
-                 'sv.setb/m=r3/sm=1<<r3 5, 31',
+                 'sv.setb/pm=r3/sm=1<<r3 5, 31',
+                 'sv.setb/m=r3 5, 31',
                  'sv.setb/vec2 5, 31',
                  'sv.setb/sw=8/ew=16 5, 31',
                  'sv.extsw./ff=eq 5, 31',
-- 
2.30.2