From f5de2e7461eb7415ab566a25a3f0b0522e32e094 Mon Sep 17 00:00:00 2001
From: Luke Kenneth Casson Leighton <lkcl@lkcl.net>
Date: Mon, 28 Dec 2020 19:54:59 +0000
Subject: [PATCH] move table names

---
 openpower/opcode_regs_deduped.mdwn | 117 +++++++++--------------------
 openpower/sv_analysis.py           |  19 +++--
 2 files changed, 48 insertions(+), 88 deletions(-)

diff --git a/openpower/opcode_regs_deduped.mdwn b/openpower/opcode_regs_deduped.mdwn
index c9f306c11..5db73153b 100644
--- a/openpower/opcode_regs_deduped.mdwn
+++ b/openpower/opcode_regs_deduped.mdwn
@@ -607,111 +607,66 @@ minor_63h.csv | 0b1111 | fnmadd | -Form |
 """]]
 
 # svp64 remaps
-## LDST-1R-1W-imm (LDSTRM-2P-1S1D)
+* **LDST-1R-1W-imm**: LDSTRM-2P-1S1D
+* **LDST-1R-2W-imm**: LDSTRM-2P-1S2D
+* **LDST-2R-imm**: LDSTRM-2P-2S
+* **LDST-2R-1W**: LDSTRM-2P-2S1D
+* **LDST-2R-1W-imm**: LDSTRM-2P-2S1D
+* **LDST-2R-2W**: LDSTRM-2P-2S1D
+* **LDST-3R**: LDSTRM-2P-3S
+* **LDST-3R-CRo**: LDSTRM-2P-3S
+* **LDST-3R-1W**: LDSTRM-2P-2S1D
+* **CRio**: RM-2P-1S1D
+* **CR=2R1W**: RM-1P-2S1D
+* **1W-CRi**: RM-2P-1S1D
+* **1R-CRo**: RM-2P-1S1D
+* **1R-CRio**: RM-2P-2S1D
+* **1R-1W**: RM-2P-1S1D
+* **1R-1W-imm**: RM-2P-1S1D
+* **1R-1W-CRo**: RM-2P-1S1D
+* **1R-1W-CRo**: RM-2P-1S1D
+* **1R-1W-CRio**: RM-2P-1S1D
+* **2R-CRo**: RM-1P-2S1D
+* **2R-CRio**: RM-1P-2S1D
+* **2R-1W**: RM-1P-2S1D
+* **2R-1W-CRo**: RM-1P-2S1D
+* **2R-1W-CRo**: RM-1P-2S1D
+* **2R-1W-CRi**: RM-1P-3S1D
+* **2R-1W-CRio**: RM-1P-2S1D
+* **3R-1W-CRio**: RM-1P-3S1D
+## LDSTRM-2P-1S1D
 
 [[!table format=csv file="openpower/isatables/LDSTRM-2P-1S1D.csv"]]
 
-## LDST-1R-2W-imm (LDSTRM-2P-1S2D)
+## LDSTRM-2P-1S2D
 
 [[!table format=csv file="openpower/isatables/LDSTRM-2P-1S2D.csv"]]
 
-## LDST-2R-imm (LDSTRM-2P-2S)
+## LDSTRM-2P-2S
 
 [[!table format=csv file="openpower/isatables/LDSTRM-2P-2S.csv"]]
 
-## LDST-2R-1W (LDSTRM-2P-2S1D)
+## LDSTRM-2P-2S1D
 
 [[!table format=csv file="openpower/isatables/LDSTRM-2P-2S1D.csv"]]
 
-## LDST-2R-1W-imm (LDSTRM-2P-2S1D)
-
-[[!table format=csv file="openpower/isatables/LDSTRM-2P-2S1D.csv"]]
-
-## LDST-2R-2W (LDSTRM-2P-2S1D)
-
-[[!table format=csv file="openpower/isatables/LDSTRM-2P-2S1D.csv"]]
-
-## LDST-3R (LDSTRM-2P-3S)
-
-[[!table format=csv file="openpower/isatables/LDSTRM-2P-3S.csv"]]
-
-## LDST-3R-CRo (LDSTRM-2P-3S)
+## LDSTRM-2P-3S
 
 [[!table format=csv file="openpower/isatables/LDSTRM-2P-3S.csv"]]
 
-## LDST-3R-1W (LDSTRM-2P-2S1D)
-
-[[!table format=csv file="openpower/isatables/LDSTRM-2P-2S1D.csv"]]
-
-## CRio (RM-2P-1S1D)
+## RM-2P-1S1D
 
 [[!table format=csv file="openpower/isatables/RM-2P-1S1D.csv"]]
 
-## CR=2R1W (RM-1P-2S1D)
+## RM-1P-2S1D
 
 [[!table format=csv file="openpower/isatables/RM-1P-2S1D.csv"]]
 
-## 1W-CRi (RM-2P-1S1D)
-
-[[!table format=csv file="openpower/isatables/RM-2P-1S1D.csv"]]
-
-## 1R-CRo (RM-2P-1S1D)
-
-[[!table format=csv file="openpower/isatables/RM-2P-1S1D.csv"]]
-
-## 1R-CRio (RM-2P-2S1D)
+## RM-2P-2S1D
 
 [[!table format=csv file="openpower/isatables/RM-2P-2S1D.csv"]]
 
-## 1R-1W (RM-2P-1S1D)
-
-[[!table format=csv file="openpower/isatables/RM-2P-1S1D.csv"]]
-
-## 1R-1W-imm (RM-2P-1S1D)
-
-[[!table format=csv file="openpower/isatables/RM-2P-1S1D.csv"]]
-
-## 1R-1W-CRo (RM-2P-1S1D)
-
-[[!table format=csv file="openpower/isatables/RM-2P-1S1D.csv"]]
-
-## 1R-1W-CRo (RM-2P-1S1D)
-
-[[!table format=csv file="openpower/isatables/RM-2P-1S1D.csv"]]
-
-## 1R-1W-CRio (RM-2P-1S1D)
-
-[[!table format=csv file="openpower/isatables/RM-2P-1S1D.csv"]]
-
-## 2R-CRo (RM-1P-2S1D)
-
-[[!table format=csv file="openpower/isatables/RM-1P-2S1D.csv"]]
-
-## 2R-CRio (RM-1P-2S1D)
-
-[[!table format=csv file="openpower/isatables/RM-1P-2S1D.csv"]]
-
-## 2R-1W (RM-1P-2S1D)
-
-[[!table format=csv file="openpower/isatables/RM-1P-2S1D.csv"]]
-
-## 2R-1W-CRo (RM-1P-2S1D)
-
-[[!table format=csv file="openpower/isatables/RM-1P-2S1D.csv"]]
-
-## 2R-1W-CRo (RM-1P-2S1D)
-
-[[!table format=csv file="openpower/isatables/RM-1P-2S1D.csv"]]
-
-## 2R-1W-CRi (RM-1P-3S1D)
-
-[[!table format=csv file="openpower/isatables/RM-1P-3S1D.csv"]]
-
-## 2R-1W-CRio (RM-1P-2S1D)
-
-[[!table format=csv file="openpower/isatables/RM-1P-2S1D.csv"]]
-
-## 3R-1W-CRio (RM-1P-3S1D)
+## RM-1P-3S1D
 
 [[!table format=csv file="openpower/isatables/RM-1P-3S1D.csv"]]
 
diff --git a/openpower/sv_analysis.py b/openpower/sv_analysis.py
index 5c1b646c4..ad0bfb484 100644
--- a/openpower/sv_analysis.py
+++ b/openpower/sv_analysis.py
@@ -318,17 +318,13 @@ def process_csvs():
         if value == 'non-SV':
             continue
 
+        # print out svp64 tables by category
+        print ("* **%s**: %s" % (name, value))
+
         # store csv entries by svp64 RM category
         if value not in svp64:
             svp64[value] = []
 
-        # print out svp64 tables by category
-        print ("## %s (%s)" % (name, value))
-        print ('')
-        print ('[[!table format=csv file="openpower/isatables/%s.csv"]]' % \
-                    value)
-        print ('')
-
         rows = bykey[key]
         rows.sort()
 
@@ -505,8 +501,17 @@ def process_csvs():
             #if res['0'] != 'TODO':
             svp64[value].append(res)
 
+    print ('')
+
     # now write out the csv files
     for value, csv in svp64.items():
+        # print out svp64 tables by category
+        print ("## %s" % value)
+        print ('')
+        print ('[[!table format=csv file="openpower/isatables/%s.csv"]]' % \
+                    value)
+        print ('')
+
         #csvcols = ['insn', 'Ptype', 'Etype', '0', '1', '2', '3']
         write_csv("%s.csv" % value, csv, csvcols)
 
-- 
2.30.2