X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=src%2Fopenpower%2Fdecoder%2Fpower_enums.py;h=86a9c28803400a881579412290cbb922309fb29a;hb=ae770cc6c2d648a020c8a0ed0447211933c25d3e;hp=21081a5b69f6e30fe2c5db3073dd549e62bc7e67;hpb=9d6f84c05e78c9c6c0d61921eaaf8e914c4be6ac;p=openpower-isa.git diff --git a/src/openpower/decoder/power_enums.py b/src/openpower/decoder/power_enums.py index 21081a5b..86a9c288 100644 --- a/src/openpower/decoder/power_enums.py +++ b/src/openpower/decoder/power_enums.py @@ -116,6 +116,11 @@ class Form(Enum): Z22 = 27 Z23 = 28 SVL = 29 # Simple-V for setvl instruction + SVD = 30 # Simple-V for LD/ST bit-reverse, variant of D-Form + SVDS = 31 # Simple-V for LD/ST bit-reverse, variant of DS-Form + SVM = 32 # Simple-V SHAPE mode - TEMPORARY TEMPORARY TEMPORARY + SVRM = 33 # Simple-V REMAP mode - TEMPORARY TEMPORARY TEMPORARY + TLI = 34 # ternlogi # Simple-V svp64 fields https://libre-soc.org/openpower/sv/svp64/ @@ -182,6 +187,35 @@ class SVP64RMMode(Enum): FFIRST = 2 SATURATE = 3 PREDRES = 4 + BRANCH = 5 + + +@unique +class SVP64BCPredMode(Enum): + NONE = 0 + MASKZERO = 1 + MASKONE = 2 + + +@unique +class SVP64BCVLSETMode(Enum): + NONE = 0 + VL_INCL = 1 + VL_EXCL = 2 + + +# note that these are chosen to be exactly the same as +# SVP64 RM bit 4. ALL=1 => bit4=1 +@unique +class SVP64BCGate(Enum): + ANY = 0 + ALL = 1 + + +class SVP64BCCTRMode(Enum): + NONE = 0 + TEST = 1 + TEST_INV = 2 @unique @@ -206,12 +240,14 @@ class SVP64sat(Enum): SIGNED = 1 UNSIGNED = 2 + @unique class SVP64LDSTmode(Enum): NONE = 0 INDEXED = 1 ELSTRIDE = 2 UNITSTRIDE = 3 + SHIFT = 4 # supported instructions: make sure to keep up-to-date with CSV files @@ -220,10 +256,13 @@ _insns = [ "NONE", "add", "addc", "addco", "adde", "addeo", "addi", "addic", "addic.", "addis", "addme", "addmeo", "addo", "addze", "addzeo", + "addg6s", "and", "andc", "andi.", "andis.", "attn", "b", "bc", "bcctr", "bclr", "bctar", "bpermd", + "cbcdtd", + "cdtbcd", "cmp", "cmpb", "cmpeqb", "cmpi", "cmpl", "cmpli", "cmprb", "cntlzd", "cntlzw", "cnttzd", "cnttzw", "crand", "crandc", "creqv", @@ -237,18 +276,29 @@ _insns = [ "extsb", "extsh", "extsw", "extswsli", "fadd", "fadds", "fsub", "fsubs", # FP add / sub "fcfids", "fcfidus", "fsqrts", "fres", "frsqrtes", # FP stuff + "fdmadds", # DCT FP 3-arg "fmsubs", "fmadds", "fnmsubs", "fnmadds", # FP 3-arg + "ffadds", "ffsubs", "ffmuls", "ffdivs", # FFT FP 2-arg + "ffmsubs", "ffmadds", "ffnmsubs", "ffnmadds", # FFT FP 3-arg "fmul", "fmuls", "fdiv", "fdivs", # FP mul / div "fmr", "fabs", "fnabs", "fneg", "fcpsgn", # FP move/abs/neg + "fsins", "fcoss", # FP SIN/COS "hrfid", "icbi", "icbt", "isel", "isync", "lbarx", "lbz", "lbzu", "lbzux", "lbzx", # load byte "ld", "ldarx", "ldbrx", "ldu", "ldux", "ldx", # load double + # "lbzbr", "lbzubr", # load byte SVP64 bit-reversed + # "ldbr", "ldubr", # load double SVP64 bit-reversed "lfs", "lfsx", "lfsu", "lfsux", # FP load single - "lfd", "lfdx", "lfdu", "lfdux", "lfiwzx", "lfiwax", # FP load double + "lfd", "lfdx", "lfdu", "lfdux", "lfiwzx", "lfiwax", # FP load double "lha", "lharx", "lhau", "lhaux", "lhax", # load half "lhbrx", "lhz", "lhzu", "lhzux", "lhzx", # more load half + # "lhabr", "lhaubr", # load half SVP64 bit-reversed + # "lhzbr", "lhzubr", # more load half SVP64 bit-reversed "lwa", "lwarx", "lwaux", "lwax", "lwbrx", # load word "lwz", "lwzcix", "lwzu", "lwzux", "lwzx", # more load word + # "lwabr", # load word SVP64 bit-reversed + # "lwzbr", "lwzubr", # more load word SVP64 bit-reversed + "maddhd", "maddhdu", "maddld", # INT multiply-and-add "mcrf", "mcrxr", "mcrxrx", "mfcr/mfocrf", # CR mvs "mfmsr", "mfspr", "modsd", "modsw", "modud", "moduw", @@ -265,18 +315,22 @@ _insns = [ "rlwimi", "rlwinm", "rlwnm", "setb", "setvl", # https://libre-soc.org/openpower/sv/setvl + "svremap", # https://libre-soc.org/openpower/sv/remap - TEMPORARY + "svshape", # https://libre-soc.org/openpower/sv/remap + "svstep", # https://libre-soc.org/openpower/sv/setvl "sim_cfg", "slbia", "sld", "slw", "srad", "sradi", "sraw", "srawi", "srd", "srw", "stb", "stbcix", "stbcx", "stbu", "stbux", "stbx", "std", "stdbrx", "stdcx", "stdu", "stdux", "stdx", - "stfs", "stfsx", "stfsu", "stfux", # FP store single + "stfs", "stfsx", "stfsu", "stfux", "stfsux", # FP store single "stfd", "stfdx", "stfdu", "stfdux", "stfiwx", # FP store double "sth", "sthbrx", "sthcx", "sthu", "sthux", "sthx", "stw", "stwbrx", "stwcx", "stwu", "stwux", "stwx", "subf", "subfc", "subfco", "subfe", "subfeo", "subfic", "subfme", "subfmeo", "subfo", "subfze", "subfzeo", "sync", + "ternlogi", "td", "tdi", "tlbie", "tlbiel", "tw", "twi", @@ -290,6 +344,9 @@ for i, insn in enumerate(_insns): insns[i] = insn asmidx[insn] = i +# must be long enough to cover all instructions +asmlen = len(_insns).bit_length() + # Internal Operation numbering. Add new opcodes here (FPADD, FPMUL etc.) @@ -370,7 +427,15 @@ class MicrOp(Enum): OP_TLBIE = 75 OP_SETVL = 76 OP_FPOP = 77 # temporary: replace with actual ops - OP_FPOP_I = 78 # temporary: replace with actual ops + OP_FPOP_I = 78 # temporary: replace with actual ops + OP_FP_MADD = 79 + OP_SVREMAP = 80 + OP_SVSHAPE = 81 + OP_SVSTEP = 82 + OP_ADDG6S = 83 + OP_CDTBCD = 84 + OP_CBCDTD = 85 + OP_TERNLOG = 86 @unique @@ -401,6 +466,8 @@ class In2Sel(Enum): SPR = 12 RS = 13 # for shiftrot (M-Form) FRB = 14 + CONST_SVD = 15 # for SVD-Form + CONST_SVDS = 16 # for SVDS-Form @unique @@ -410,6 +477,8 @@ class In3Sel(Enum): RB = 2 # for shiftrot (M-Form) FRS = 3 FRC = 4 + RC = 5 # for SVP64 bit-reverse LD/ST + RT = 6 # for ternlog[i] @unique @@ -420,6 +489,7 @@ class OutSel(Enum): SPR = 3 RT_OR_ZERO = 4 FRT = 5 + FRS = 6 @unique @@ -486,9 +556,10 @@ def get_spr_enum(full_file): this saves drastically on the size of the regfile """ short_list = {'PIDR', 'DAR', 'PRTBL', 'DSISR', 'SVSRR0', 'SVSTATE', + 'SVSTATE0', 'SVSTATE1', 'SVSTATE2', 'SVSTATE3', 'SPRG0_priv', 'SPRG1_priv', 'SPRG2_priv', 'SPRG3_priv', 'SPRG3' - } + } spr_csv = [] for row in get_csv("sprs.csv"): if full_file or row['SPR'] in short_list: @@ -507,6 +578,7 @@ def get_spr_enum(full_file): SPR = Enum('SPR', fields) return SPR, spr_dict, spr_byname + SPRfull, spr_dict, spr_byname = get_spr_enum(full_file=True) SPRreduced, _, _ = get_spr_enum(full_file=False)