From 8287408addf2231882d0ca872e96c9b92778c6d7 Mon Sep 17 00:00:00 2001
From: Luke Kenneth Casson Leighton <lkcl@lkcl.net>
Date: Mon, 5 Jul 2021 14:18:54 +0100
Subject: [PATCH] update SVREMAP to match spec

---
 src/openpower/sv/svp64.py | 36 +++++++++++++++++++-----------------
 1 file changed, 19 insertions(+), 17 deletions(-)

diff --git a/src/openpower/sv/svp64.py b/src/openpower/sv/svp64.py
index 8c7a1963..32880775 100644
--- a/src/openpower/sv/svp64.py
+++ b/src/openpower/sv/svp64.py
@@ -47,26 +47,28 @@ class SVP64REMAP(Record):
 
     https://libre-soc.org/openpower/sv/remap/
 
-    | Field Name  | Field bits | Description                            |
-    |-------------|------------|----------------------------------------|
-    | XDIMSZ      | `0:5`      | X Dimension size                       |
-    | YDIMSZ      | `6:11`     | Y Dimension size                       |
-    | ZDIMSZ      | `12:17`    | Z Dimension size                       |
-    | PERMUTE     | `18:20`    | Permutation order (XYZ, XZY, YXZ...)   |
-    | INVXYZ      | `21:23`    | Invert order of X or Y or Z            |
-    | OFFSET      | `24:29`    | Adds to index before modulo            |
-    | APPLYDIM    | `30:31`    | how many dimensions in use             |
+    | Field Name | Field bits | Description                            |
+    |------------|------------|----------------------------------------|
+    | XDIMSZ     | `0:5`      | X Dimension size                       |
+    | YDIMSZ     | `6:11`     | Y Dimension size                       |
+    | ZDIMSZ     | `12:17`    | Z Dimension size                       |
+    | PERMUTE    | `18:20`    | Permutation order (XYZ, XZY, YXZ...)   |
+    | INVXYZ     | `21:23`    | Invert order of X or Y or Z            |
+    | OFFSET     | `24:27`    | Adds to index after REMAP (offsets)    |
+    | SKIP       | `28:29`    | Skips dimension numbered SKIP          |
+    | MODE       | `30:31`    | Selects Mode: Matrix, FFT, DCT         |
     """
     def __init__(self, name=None):
-        Record.__init__(self, layout=[("applydim" , 2),
-                                      ("offset"   , 6),
-                                      ("invxyz"   , 3),
-                                      ("permute"  , 3),
-                                      ("zdimsz"   , 6),
-                                      ("ydimsz"   , 6),
-                                      ("xdimsz"   , 6)], name=name)
+        Record.__init__(self, layout=[("mode"    , 2),
+                                      ("skip"    , 2),
+                                      ("offset"  , 4),
+                                      ("invxyz"  , 3),
+                                      ("permute" , 3),
+                                      ("zdimsz"  , 6),
+                                      ("ydimsz"  , 6),
+                                      ("xdimsz"  , 6)], name=name)
 
     def ports(self):
-        return [self.applydim, self.offset, self.invxyz, self.permute,
+        return [self.mode, self.skip, self.offset, self.invxyz, self.permute,
                 self.zdimsz, self.ydimsz, self.xdimsz]
 
-- 
2.30.2