projects / libreriscv.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
(no commit message)
[libreriscv.git] / openpower / sv_analysis.py
diff --git a/openpower/sv_analysis.py b/openpower/sv_analysis.py
index ad0bfb4843a14cafdb04a46939a46dcdf31212f2..2a4c5e57ecef73d6ddbb5b7e7261a1032a36b91a 100644 (file)
--- a/openpower/sv_analysis.py
+++ b/openpower/sv_analysis.py
@@ -55,7 +55,8 @@ def blank_key(row):
 # Floating point registers names like: FRT, FRA, FR1, ..., FRTp, ...
 # Return True if field is a register
 def isreg(field):
-    return field.startswith('R') or field.startswith('FR')
+    return (field.startswith('R') or field.startswith('FR') or
+            field == 'SPR')
 
 
 # These are the attributes of the instructions,
@@ -182,11 +183,15 @@ def process_csvs():
 
     # Ignore those containing: valid test sprs
     for fname in glob(pth):
+        if '-' in fname:
+            continue
         if 'valid' in fname:
             continue
         if 'test' in fname:
             continue
-        if 'sprs' in fname:
+        if fname.endswith('sprs.csv'):
+            continue
+        if fname.endswith('minor_19_valid.csv'):
             continue
         if 'RM' in fname:
             continue
@@ -202,6 +207,8 @@ def process_csvs():
             # skip instructions that are not suitable
             if insn_name in ['mcrxr', 'mcrxrx', 'darn']:
                 continue
+            if insn_name.startswith('bc') or 'rfid' in insn_name:
+                continue
             insns[insn_name] = row # accumulate csv data by instruction
             dkey = create_key(row)
             key = tuple(dkey.values())
@@ -387,7 +394,7 @@ def process_csvs():
                 elif 'st' in insn_name and 'x' in insn_name: # stwux
                     res['Etype'] = 'EXTRA2' # RM EXTRA2 type
                     res['0'] = 'd:RA' # RA: Rdest1_EXTRA2
-                    res['1'] = 's:RS,s:RA' # RS: Rdest2_EXTRA2, RA: Rsrc1_EXTRA2
+                    res['1'] = 's:RS;s:RA' # RS: Rdest2_EXTRA2, RA: Rsrc1_EXTRA2
                     res['2'] = 's:RB' # RB: Rsrc2_EXTRA2
                 elif 'u' in insn_name: # ldux etc.
                     res['Etype'] = 'EXTRA2' # RM EXTRA2 type
@@ -403,7 +410,7 @@ def process_csvs():
             elif value == 'LDSTRM-2P-3S':
                 res['Etype'] = 'EXTRA2' # RM EXTRA2 type
                 if 'cx' in insn_name:
-                    res['0'] = 's:RS,d:CR0' # RS: Rsrc1_EXTRA2 CR0: dest
+                    res['0'] = 's:RS;d:CR0' # RS: Rsrc1_EXTRA2 CR0: dest
                 else:
                     res['0'] = 's:RS' # RS: Rsrc1_EXTRA2
                 res['1'] = 's:RA' # RA: Rsrc2_EXTRA2
@@ -411,7 +418,13 @@ def process_csvs():
 
             elif value == 'RM-2P-1S1D':
                 res['Etype'] = 'EXTRA3' # RM EXTRA3 type
-                if name == 'CRio' and insn_name == 'mcrf':
+                if insn_name == 'mtspr':
+                    res['0'] = 'd:SPR' # SPR: Rdest1_EXTRA3
+                    res['1'] = 's:RS' # RS: Rsrc1_EXTRA3
+                elif insn_name == 'mfspr':
+                    res['0'] = 'd:RS' # RS: Rdest1_EXTRA3
+                    res['1'] = 's:SPR' # SPR: Rsrc1_EXTRA3
+                elif name == 'CRio' and insn_name == 'mcrf':
                     res['0'] = 'd:BF' # BFA: Rdest1_EXTRA3
                     res['1'] = 's:BFA' # BFA: Rsrc1_EXTRA3
                 elif 'mfcr' in insn_name or 'mfocrf' in insn_name:
@@ -427,15 +440,27 @@ def process_csvs():
                     res['0'] = 'd:RT' # RT: Rdest1_EXTRA3
                     res['1'] = 's:RA' # RA: Rsrc1_EXTRA3
                 elif regs == ['RA','','','RT','','CR0']:
-                    res['0'] = 'd:RT,d:CR0' # RT,CR0: Rdest1_EXTRA3
+                    res['0'] = 'd:RT;d:CR0' # RT,CR0: Rdest1_EXTRA3
                     res['1'] = 's:RA' # RA: Rsrc1_EXTRA3
                 elif (regs == ['RS','','','RA','','CR0'] or
                       regs == ['','','RS','RA','','CR0']):
-                    res['0'] = 'd:RA,d:CR0' # RA,CR0: Rdest1_EXTRA3
+                    res['0'] = 'd:RA;d:CR0' # RA,CR0: Rdest1_EXTRA3
                     res['1'] = 's:RS' # RS: Rsrc1_EXTRA3
                 elif regs == ['RS','','','RA','','']:
                     res['0'] = 'd:RA' # RA: Rdest1_EXTRA3
                     res['1'] = 's:RS' # RS: Rsrc1_EXTRA3
+                elif regs == ['','FRB','','FRT','0','CR1']:
+                    res['0'] = 'd:FRT;d:CR1' # FRT,CR1: Rdest1_EXTRA3
+                    res['1'] = 's:FRA' # FRA: Rsrc1_EXTRA3
+                elif regs == ['','FRB','','','','CR1']:
+                    res['0'] = 'd:CR1' # CR1: Rdest1_EXTRA3
+                    res['1'] = 's:FRB' # FRA: Rsrc1_EXTRA3
+                elif regs == ['','FRB','','','','BF']:
+                    res['0'] = 'd:BF' # BF: Rdest1_EXTRA3
+                    res['1'] = 's:FRB' # FRA: Rsrc1_EXTRA3
+                elif regs == ['','FRB','','FRT','','CR1']:
+                    res['0'] = 'd:FRT;d:CR1' # FRT,CR1: Rdest1_EXTRA3
+                    res['1'] = 's:FRB' # FRB: Rsrc1_EXTRA3
                 else:
                     res['0'] = 'TODO'
 
@@ -445,6 +470,23 @@ def process_csvs():
                     res['0'] = 'd:BT' # BT: Rdest1_EXTRA3
                     res['1'] = 's:BA' # BA: Rsrc1_EXTRA3
                     res['2'] = 's:BB' # BB: Rsrc2_EXTRA3
+                elif regs == ['FRA','','FRC','FRT','','CR1']:
+                    res['0'] = 'd:FRT;d:CR1' # FRT,CR1: Rdest1_EXTRA3
+                    res['1'] = 's:FRA' # FRA: Rsrc1_EXTRA3
+                    res['2'] = 's:FRC' # FRC: Rsrc1_EXTRA3
+                # should be for fcmp
+                elif regs == ['FRA','FRB','','','','BF']:
+                    res['0'] = 'd:BF' # BF: Rdest1_EXTRA3
+                    res['1'] = 's:FRA' # FRA: Rsrc1_EXTRA3
+                    res['2'] = 's:FRB' # FRB: Rsrc1_EXTRA3
+                elif regs == ['FRA','FRB','','FRT','','']:
+                    res['0'] = 'd:FRT' # FRT: Rdest1_EXTRA3
+                    res['1'] = 's:FRA' # FRA: Rsrc1_EXTRA3
+                    res['2'] = 's:FRB' # FRB: Rsrc1_EXTRA3
+                elif regs == ['FRA','FRB','','FRT','','CR1']:
+                    res['0'] = 'd:FRT;d:CR1' # FRT,CR1: Rdest1_EXTRA3
+                    res['1'] = 's:FRA' # FRA: Rsrc1_EXTRA3
+                    res['2'] = 's:FRB' # FRB: Rsrc1_EXTRA3
                 elif name == '2R-1W' or insn_name == 'cmpb': # cmpb
                     if insn_name in ['bpermd', 'cmpb']:
                         res['0'] = 'd:RA' # RA: Rdest1_EXTRA3
@@ -459,15 +501,15 @@ def process_csvs():
                     res['2'] = 's:RB' # RB: Rsrc1_EXTRA3
                 elif (regs == ['','RB','RS','RA','','CR0'] or
                       regs == ['RS','RB','','RA','','CR0']):
-                    res['0'] = 'd:RA,d:CR0' # RA,CR0: Rdest1_EXTRA3
+                    res['0'] = 'd:RA;d:CR0' # RA,CR0: Rdest1_EXTRA3
                     res['1'] = 's:RB' # RB: Rsrc1_EXTRA3
                     res['2'] = 's:RS' # RS: Rsrc1_EXTRA3
                 elif regs == ['RA','RB','','RT','','CR0']:
-                    res['0'] = 'd:RT,d:CR0' # RT,CR0: Rdest1_EXTRA3
+                    res['0'] = 'd:RT;d:CR0' # RT,CR0: Rdest1_EXTRA3
                     res['1'] = 's:RA' # RA: Rsrc1_EXTRA3
                     res['2'] = 's:RB' # RB: Rsrc1_EXTRA3
                 elif regs == ['RA','','RS','RA','','CR0']:
-                    res['0'] = 'd:RA,d:CR0' # RA,CR0: Rdest1_EXTRA3
+                    res['0'] = 'd:RA;d:CR0' # RA,CR0: Rdest1_EXTRA3
                     res['1'] = 's:RA' # RA: Rsrc1_EXTRA3
                     res['2'] = 's:RS' # RS: Rsrc1_EXTRA3
                 else:
@@ -490,7 +532,7 @@ def process_csvs():
                     res['2'] = 's:RB' # RT: Rsrc2_EXTRA2
                     res['3'] = 's:BC' # BC: Rsrc3_EXTRA2
                 else:
-                    res['0'] = 'd:FRT,d:CR1' # FRT, CR1: Rdest1_EXTRA2
+                    res['0'] = 'd:FRT;d:CR1' # FRT, CR1: Rdest1_EXTRA2
                     res['1'] = 's:FRA' # FRA: Rsrc1_EXTRA2
                     res['2'] = 's:FRB' # FRB: Rsrc2_EXTRA2
                     res['3'] = 's:FRC' # FRC: Rsrc3_EXTRA2
@@ -499,6 +541,9 @@ def process_csvs():
             #for k in ['in1', 'in2', 'in3', 'out', 'CR in', 'CR out']:
             #    del res[k]
             #if res['0'] != 'TODO':
+            for k in res:
+                if res[k] == 'NONE' or res[k] == '':
+                    res[k] = '0'
             svp64[value].append(res)
 
     print ('')
http://libre-riscv.org ikiwiki