From: Luke Kenneth Casson Leighton Date: Wed, 1 Apr 2020 13:35:17 +0000 (+0100) Subject: semi-functional prototype which reads code-fragments and does "stuff" X-Git-Tag: div_pipeline~1583 X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=1cfc9d6f32cb5ef643c01e1f9d629cefdbd70b7f;p=soc.git semi-functional prototype which reads code-fragments and does "stuff" --- diff --git a/src/soc/decoder/power_pseudo.py b/src/soc/decoder/power_pseudo.py index 0d499447..fac1bae8 100644 --- a/src/soc/decoder/power_pseudo.py +++ b/src/soc/decoder/power_pseudo.py @@ -15,6 +15,8 @@ from ply import lex, yacc import astor from soc.decoder.power_decoder import create_pdecode +from nmigen.back.pysim import Simulator, Delay +from nmigen import Module, Signal # I use the Python AST @@ -472,6 +474,8 @@ class PowerParser: self.gprs = {} for rname in ['RA', 'RB', 'RC', 'RT', 'RS']: self.gprs[rname] = None + self.read_regs = [] + self.write_regs = [] # The grammar comments come from Python's Grammar/Grammar file @@ -504,16 +508,17 @@ class PowerParser: # ignoring decorators def p_funcdef(self, p): "funcdef : DEF NAME parameters COLON suite" - p[0] = ast.Function(None, p[2], list(p[3]), (), 0, None, p[5]) + p[0] = ast.FunctionDef(p[2], p[3], p[5], ()) # parameters: '(' [varargslist] ')' def p_parameters(self, p): """parameters : LPAR RPAR | LPAR varargslist RPAR""" if len(p) == 3: - p[0] = [] + args=[] else: - p[0] = p[2] + args = p[2] + p[0] = ast.arguments(args=args, vararg=None, kwarg=None, defaults=[]) # varargslist: (fpdef ['=' test] ',')* ('*' NAME [',' '**' NAME] | @@ -557,7 +562,10 @@ class PowerParser: """small_stmt : flow_stmt | break_stmt | expr_stmt""" - p[0] = p[1] + if isinstance(p[1], ast.Call): + p[0] = ast.Expr(p[1]) + else: + p[0] = p[1] # expr_stmt: testlist (augassign (yield_expr|testlist) | # ('=' (yield_expr|testlist))*) @@ -571,6 +579,8 @@ class PowerParser: #p[0] = ast.Discard(p[1]) p[0] = p[1] else: + if p[1].id in self.gprs: + self.write_regs.append(p[1].id) # add to list of regs to write p[0] = Assign(p[1], p[3]) def p_flow_stmt(self, p): @@ -725,12 +735,9 @@ class PowerParser: if isinstance(p[2], ast.Name): print ("tuple name", p[2].id) if p[2].id in self.gprs: - #p[0] = ast.Call(ast.Name("GPR"), [p[2]], []) - #idx = ast.Slice(ast.Constant(0), ast.Constant(-1), None) - #idx = ast.Subscript(p[2], idx) - #idx = ast.Subscript(p[2], idx) - p[0] = ast.Subscript(ast.Name("GPR"), ast.Str(p[2].id)) - return + self.read_regs.append(p[2].id) # add to list of regs to read + #p[0] = ast.Subscript(ast.Name("GPR"), ast.Str(p[2].id)) + #return p[0] = p[2] # trailer: '(' [arglist] ')' | '[' subscriptlist ']' | '.' NAME @@ -894,10 +901,7 @@ do while n < 64 leave n <- n + 1 RA <- EXTZ64(n) -""" - -testreg = """ -x <- (RS) +print (RA) """ #code = testreg @@ -919,58 +923,143 @@ while True: #sys.exit(0) -sd = create_pdecode() -print ("forms", sd.sigforms) -for f in sd.FormX: - print ("field", f) +def tolist(num): + l = [] + for i in range(64): + l.append(1 if (num & (1<", " ".join(map(str,args))) + # Set up the GardenSnake run-time environment + def print_(*args): + print ("args", args) + print ("-->", " ".join(map(str,args))) -def listconcat(l1, l2): - return l1 + l2 + def listconcat(l1, l2): + return l1 + l2 -from soc.decoder.helpers import (EXTS64, EXTZ64, ROTL64, ROTL32, MASK,) + from soc.decoder.helpers import (EXTS64, EXTZ64, ROTL64, ROTL32, MASK,) -class GPR(dict): - def __init__(self): - for rname in ['RA', 'RS']: - self[rname] = [0]*64 + d = {} + d["print"] = print_ + d["EXTS64"] = EXTS64 + d["EXTZ64"] = EXTZ64 + d["concat"] = listconcat + d["GPR"] = gsc.gpr + + form = 'X' + gsc.gpr.set_form(form) + getform = gsc.parser.sd.sigforms[form]._asdict() + #print ("getform", form) + #for k, f in getform.items(): + #print (k, f) + #d[k] = getform[k] + + compiled_code = compile(source, mode="exec", filename="") + + m = Module() + comb = m.d.comb + instruction = Signal(32) + + m.submodules.decode = decode = gsc.parser.sd + comb += decode.raw_opcode_in.eq(instruction) + sim = Simulator(m) + + instr = [0x11111117] + + def process(): + for ins in instr: + print("0x{:X}".format(ins & 0xffffffff)) + + # ask the decoder to decode this binary data (endian'd) + yield decode.bigendian.eq(0) # little / big? + yield instruction.eq(ins) # raw binary instr. + yield Delay(1e-6) + + # read regs, drop them into dict for function + for rname in gsc.parser.read_regs: + regidx = yield getattr(decode.sigforms['X'], rname) + d[rname] = gsc.gpr[regidx] + print ("read reg", rname, regidx, get_reg_hex(d[rname])) + + exec (compiled_code, d) + print ("Done") + + print (d.keys()) + print (decode.sigforms['X']) + x = yield decode.sigforms['X'].RS + ra = yield decode.sigforms['X'].RA + print ("RA", ra, d['RA']) + print ("RS", x) -d = {} -d["print"] = print_ -d["EXTS64"] = EXTS64 -d["EXTZ64"] = EXTZ64 -d["concat"] = listconcat -d["GPR"] = GPR() + for wname in gsc.parser.write_regs: + reg = getform[wname] + print ("write regs", wname, d[wname], reg) + regidx = yield reg + gsc.gpr[regidx] = tolist(d[wname]) -form = 'X' -getform = gsc.parser.sd.sigforms[form] -print (getform._asdict()) -for k, f in getform._asdict().items(): - d[k] = getattr(getform, k) + sim.add_process(process) + with sim.write_vcd("simulator.vcd", "simulator.gtkw", + traces=[decode.ports()]): + sim.run() -compiled_code = compile(source, mode="exec", filename="") + for i in range(len(gsc.gpr)): + print ("regfile", i, get_reg_hex(gsc.gpr[i])) -exec (compiled_code, d) -print ("Done") +if __name__ == '__main__': + test()