From 6e84b8335dea5ef09ee8bee3bc598850fc282804 Mon Sep 17 00:00:00 2001 From: Dmitry Selyutin Date: Thu, 8 Sep 2022 21:01:46 +0300 Subject: [PATCH] svshape2: rename fields --- openpower/isa/simplev.mdwn | 2 +- openpower/isatables/fields.text | 6 +++--- src/openpower/decoder/isa/test_caller_svshape2.py | 2 +- src/openpower/sv/trans/svp64.py | 6 +++--- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/openpower/isa/simplev.mdwn b/openpower/isa/simplev.mdwn index 32ad1314..7d5cabcd 100644 --- 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 848d06ef..0cad72a6 100644 --- 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 43284adf..fc92c80d 100644 --- 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 3b7953f2..49fcb0d9 100644 --- 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. -- 2.30.2