From 04ca2c6cd3deb83ada53364c4450323f9736e343 Mon Sep 17 00:00:00 2001
From: lkcl <lkcl@web>
Date: Sat, 4 Jun 2022 22:14:52 +0100
Subject: [PATCH]

---
 openpower/sv/shape_table_format.mdwn | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/openpower/sv/shape_table_format.mdwn b/openpower/sv/shape_table_format.mdwn
index 7c6a65b98..59a1f1fcf 100644
--- a/openpower/sv/shape_table_format.mdwn
+++ b/openpower/sv/shape_table_format.mdwn
@@ -155,6 +155,9 @@ def index_remap(ISHAPE, i):
     if ISHAPE.permute = 0b111 # 1,0
        MSHAPE.permute = 0b010 # 1,0,2
     el_idx = remap_matrix(MSHAPE, i)
-    return GPR((ISHAPE.SVGPR<<1)+el_idx+ISHAPE.offset)
+    svreg = ISHAPE.SVGPR << 1
+    srcwid = elwid_to_bitwidth(ISHAPE.elwid)
+    offs = ISHAPE.offset
+    return get_polymorphed_reg(svreg, srcwid, el_idx) + offs
 ```
 
-- 
2.30.2