From e013c6b1e737efff061b984e9570e8878d848699 Mon Sep 17 00:00:00 2001
From: Luke Kenneth Casson Leighton <lkcl@lkcl.net>
Date: Sun, 11 Jul 2021 12:34:50 +0100
Subject: [PATCH] rename SVP64REMAP to SVP64SHAPE

---
 src/openpower/decoder/isa/svshape.py | 8 ++++----
 src/openpower/sv/svp64.py            | 5 +++--
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/src/openpower/decoder/isa/svshape.py b/src/openpower/decoder/isa/svshape.py
index e2eeaeae..97df57ae 100644
--- a/src/openpower/decoder/isa/svshape.py
+++ b/src/openpower/decoder/isa/svshape.py
@@ -2,7 +2,7 @@ from openpower.decoder.selectable_int import (FieldSelectableInt, SelectableInt,
                                         selectconcat)
 from openpower.decoder.isa.remapyield import iterate_indices
 from openpower.decoder.isa.remap_fft_yield import iterate_butterfly_indices
-from openpower.sv.svp64 import SVP64REMAP
+from openpower.sv.svp64 import SVP64SHAPE
 import os
 from copy import deepcopy
 from openpower.util import log
@@ -14,7 +14,7 @@ class SVSHAPE(SelectableInt):
         offs = 0
         # set up sub-fields from Record layout
         self.fsi = {}
-        l = deepcopy(SVP64REMAP.layout)
+        l = deepcopy(SVP64SHAPE.layout)
         l.reverse()
         for field, width in l:
             end =  offs+width
@@ -27,11 +27,11 @@ class SVSHAPE(SelectableInt):
     @property
     def order(self):
         permute = self.fsi['permute'].asint(msb0=True)
-        return SVP64REMAP.order(permute)
+        return SVP64SHAPE.order(permute)
 
     @order.setter
     def order(self, value):
-        rorder = SVP64REMAP.rorder(value)
+        rorder = SVP64SHAPE.rorder(value)
         self.fsi['permute'].eq(rorder)
 
     @property
diff --git a/src/openpower/sv/svp64.py b/src/openpower/sv/svp64.py
index cdf7a85e..16134e08 100644
--- a/src/openpower/sv/svp64.py
+++ b/src/openpower/sv/svp64.py
@@ -50,9 +50,10 @@ roptions = {}
 for k, v in options.items():
     roptions[v] = k
 
+
 # in nMigen, Record begins at the LSB and fills upwards
 # however in OpenPOWER, numbering is MSB0.  sigh.
-class SVP64REMAP(Record):
+class SVP64SHAPE(Record):
     layout=[("mode"    , 2),
             ("skip"    , 2),
             ("offset"  , 4),
@@ -62,7 +63,7 @@ class SVP64REMAP(Record):
             ("ydimsz"  , 6),
             ("xdimsz"  , 6)]
 
-    """SVP64 SHAPE (REMAP) Record.
+    """SVP64 SHAPE Record.
 
     https://libre-soc.org/openpower/sv/remap/
 
-- 
2.30.2