svshape2: rename fields

diff --git a/openpower/isa/simplev.mdwn b/openpower/isa/simplev.mdwn
index 32ad13147ee850f386f564575c845db8014d3bac..7d5cabcdee184e0fe76a1a8a71686096c2402b97 100644 (file)
--- a/openpower/isa/simplev.mdwn
+++ b/openpower/isa/simplev.mdwn
@@ -369,7 +369,7 @@ Special Registers Altered:
 
 SVM2-Form
 
-* svshape2 offs,yx,rmm,SVd,sk,mm
+* svshape2 SVo,SVM2yx,rmm,SVd,sk,mm
 
 Pseudo-code:
 

diff --git a/openpower/isatables/fields.text b/openpower/isatables/fields.text
index 848d06ef19b28b51b0e519a203658800b0f37722..0cad72a626517e47f3132327a39e4c68fed0f4c5 100644 (file)
--- a/openpower/isatables/fields.text
+++ b/openpower/isatables/fields.text
@@ -307,8 +307,8 @@
     | PO   |  SVxd   |   SVyd | SVzd | SVrm |vf |   XO      |
 
 # 1.6.35.1 SVM2-FORM
-    |0     |6     |10|11      |16    |21 |24|25 |26    |31  |
-    | PO   | offs |yx|   rmm  | SVd  |XO |mm|sk |   XO      |
+    |0     |6     |10   |11      |16    |21 |24|25 |26    |31  |
+    | PO   | SVo  |SVMyx|   rmm  | SVd  |XO |mm|sk |   XO      |
 
 # 1.6.36 SVRM-FORM
     |0     |6     |11  |13   |15   |17   |19   |21  |22   |26     |31 |
@@ -1043,6 +1043,6 @@
     yx (23)
         Field used to specify loop dimension order in svindex
         Formats: SVI
-    yx (10)
+    SVMyx (10)
         Field used to specify loop dimension order in svshape2
         Formats: SVM2

diff --git a/src/openpower/decoder/isa/test_caller_svshape2.py b/src/openpower/decoder/isa/test_caller_svshape2.py
index 43284adf03a3090f0718b88220c616f19a2c056b..fc92c80deea99006168ae4eb83ae2111ae7c0aaf 100644 (file)
--- a/src/openpower/decoder/isa/test_caller_svshape2.py
+++ b/src/openpower/decoder/isa/test_caller_svshape2.py
@@ -1,5 +1,5 @@
 """SVP64 unit test for svshape2
-svshape2 offs,yx,rmm,SVd,sk,mm
+svshape2 SVo,yx,rmm,SVd,sk,mm
 """
 from nmigen import Module, Signal
 from nmigen.sim import Simulator, Delay, Settle

diff --git a/src/openpower/sv/trans/svp64.py b/src/openpower/sv/trans/svp64.py
index 3b7953f22a734c752ee41ed0b0f40aafa2c2151c..49fcb0d9e4f3da83be679d4df966db87b598220b 100644 (file)
--- a/src/openpower/sv/trans/svp64.py
+++ b/src/openpower/sv/trans/svp64.py
@@ -197,11 +197,11 @@ def svshape2(fields):
 
     https://libre-soc.org/openpower/sv/remap/discussion
 
-    * svshape2 offs,yx,rmm,SVd,sk,mm
+    * svshape2 SVo,SVM2yx,rmm,SVd,sk,mm
 
     # 1.6.35.1 SVM2-FORM from fields.txt
-    # |0     |6     |10|11      |16    |21 |24|25 |26    |31  |
-    # | PO   | offs |yx|   rmm  | SVd  |XO |mm|sk |   XO      |
+    # |0     |6     |10   |11      |16    |21 |24|25 |26    |31  |
+    # | PO   | SVo  |SVMyx|   rmm  | SVd  |XO |mm|sk |   XO      |
 
     note that this fits into the space of svshape and that XO is
     split across 2 areas.