From e537f99b3939e9545e41874ec5031ee6f156bdcb Mon Sep 17 00:00:00 2001 From: Luke Kenneth Casson Leighton Date: Fri, 19 Mar 2021 19:12:11 +0000 Subject: [PATCH] decode predicate src/dest zeroing in SVP64RMModeDecode --- src/soc/consts.py | 4 +-- src/soc/decoder/power_svp64_rm.py | 45 +++++++++++++++++++++++++------ 2 files changed, 39 insertions(+), 10 deletions(-) diff --git a/src/soc/consts.py b/src/soc/consts.py index 76b16f2b..2af98d91 100644 --- a/src/soc/consts.py +++ b/src/soc/consts.py @@ -220,8 +220,8 @@ class SVP64MODEb: MOD2_MSB = 0 MOD2_LSB = 1 # when predicate not set: 0=ignore/skip 1=zero - SZ = 3 # for source - DZ = 4 # for destination + DZ = 3 # for destination + SZ = 4 # for source # reduce mode REDUCE = 2 # 0=normal predication 1=reduce mode SVM = 3 # subvector reduce mode 0=independent 1=horizontal diff --git a/src/soc/decoder/power_svp64_rm.py b/src/soc/decoder/power_svp64_rm.py index dc5b71d1..da6db621 100644 --- a/src/soc/decoder/power_svp64_rm.py +++ b/src/soc/decoder/power_svp64_rm.py @@ -16,7 +16,7 @@ https://libre-soc.org/openpower/sv/svp64/ | MODE | `19:23` | changes Vector behaviour | """ -from nmigen import Elaboratable, Module, Signal +from nmigen import Elaboratable, Module, Signal, Const from soc.decoder.power_enums import (SVP64RMMode, Function, SVPtype, SVP64PredMode, SVP64sat) from soc.consts import EXTRA3, SVP64MODE @@ -25,33 +25,36 @@ from nmutil.util import sel """RM Mode +there are three Mode variants, two for LD/ST and one for everything else +https://libre-soc.org/openpower/sv/svp64/ +https://libre-soc.org/openpower/sv/ldst/ LD/ST immed: 00 str sz dz normal mode 01 inv CR-bit Rc=1: ffirst CR sel 01 inv els RC1 Rc=0: ffirst z/nonz -10 N sz els sat mode: N=0/1 u/s +10 N dz els sat mode: N=0/1 u/s 11 inv CR-bit Rc=1: pred-result CR sel 11 inv els RC1 Rc=0: pred-result z/nonz LD/ST indexed: 00 0 sz dz normal mode -00 rsv rsvd reserved +00 1 rsvd reserved 01 inv CR-bit Rc=1: ffirst CR sel -01 inv sz RC1 Rc=0: ffirst z/nonz +01 inv dz RC1 Rc=0: ffirst z/nonz 10 N sz dz sat mode: N=0/1 u/s 11 inv CR-bit Rc=1: pred-result CR sel -11 inv sz RC1 Rc=0: pred-result z/nonz +11 inv dz RC1 Rc=0: pred-result z/nonz Arithmetic: 00 0 sz dz normal mode -00 1 sz CRM reduce mode (mapreduce), SUBVL=1 +00 1 dz CRM reduce mode (mapreduce), SUBVL=1 00 1 SVM CRM subvector reduce mode, SUBVL>1 01 inv CR-bit Rc=1: ffirst CR sel -01 inv sz RC1 Rc=0: ffirst z/nonz +01 inv dz RC1 Rc=0: ffirst z/nonz 10 N sz dz sat mode: N=0/1 u/s 11 inv CR-bit Rc=1: pred-result CR sel -11 inv sz RC1 Rc=0: pred-result z/nonz +11 inv dz RC1 Rc=0: pred-result z/nonz """ class SVP64RMModeDecode(Elaboratable): @@ -60,6 +63,7 @@ class SVP64RMModeDecode(Elaboratable): self.fn_in = Signal(Function) # LD/ST is different self.ptype_in = Signal(SVPtype) self.rc_in = Signal() + self.ldst_idx = Signal() # main mode (normal, reduce, saturate, ffirst, pred-result) self.mode = Signal(SVP64RMMode) @@ -102,6 +106,31 @@ class SVP64RMModeDecode(Elaboratable): with m.Case(3): comb += self.mode.eq(SVP64RMMode.PREDRES) # predicate result + # extract zeroing + with m.Switch(mode2): + with m.Case(0): # needs further decoding (LDST no mapreduce) + with m.If(is_ldst): + comb += self.pred_sz.eq(mode[SVP64MODE.SZ]) + comb += self.pred_dz.eq(mode[SVP64MODE.DZ]) + with m.Elif(mode[SVP64MODE.REDUCE]): + with m.If(self.rm_in.subvl == Const(0, 2)): # no SUBVL + comb += self.pred_dz.eq(mode[SVP64MODE.DZ]) + with m.Else(): + comb += self.pred_sz.eq(mode[SVP64MODE.SZ]) + comb += self.pred_dz.eq(mode[SVP64MODE.DZ]) + with m.Case(1, 3): + with m.If(is_ldst): + with m.If(~self.ldst_idx): + comb += self.pred_dz.eq(mode[SVP64MODE.DZ]) + with m.Elif(self.rc_in): + comb += self.pred_dz.eq(mode[SVP64MODE.DZ]) + with m.Case(2): + with m.If(is_ldst & ~self.ldst_idx): + comb += self.pred_dz.eq(mode[SVP64MODE.DZ]) + with m.Else(): + comb += self.pred_sz.eq(mode[SVP64MODE.SZ]) + comb += self.pred_dz.eq(mode[SVP64MODE.DZ]) + # extract src/dest predicate. use EXTRA3.MASK because EXTRA2.MASK # is in exactly the same bits srcmask = sel(m, self.rm_in.extra, EXTRA3.MASK) -- 2.30.2