From e3db4b95f5f8673eeb1a06a7163b7741a6585442 Mon Sep 17 00:00:00 2001 From: Luke Kenneth Casson Leighton Date: Sat, 4 Sep 2021 14:11:47 +0100 Subject: [PATCH] split out ISATestRunner to separate module --- src/openpower/decoder/isa/test_caller.py | 151 +---------------------- src/openpower/decoder/isa/test_runner.py | 151 +++++++++++++++++++++++ 2 files changed, 153 insertions(+), 149 deletions(-) create mode 100644 src/openpower/decoder/isa/test_runner.py diff --git a/src/openpower/decoder/isa/test_caller.py b/src/openpower/decoder/isa/test_caller.py index 8d2c0020..5fa7fbeb 100644 --- a/src/openpower/decoder/isa/test_caller.py +++ b/src/openpower/decoder/isa/test_caller.py @@ -1,156 +1,9 @@ -from nmigen import Module, Signal -from nmigen.back.pysim import Simulator, Delay, Settle from nmutil.formaltest import FHDLTestCase import unittest -from openpower.decoder.isa.caller import ISACaller -from openpower.decoder.power_decoder import create_pdecode -from openpower.decoder.power_decoder2 import (PowerDecode2) from openpower.simulator.program import Program -from openpower.decoder.isa.caller import ISACaller, inject from openpower.decoder.selectable_int import SelectableInt -from openpower.decoder.orderedset import OrderedSet -from openpower.decoder.isa.all import ISA -from nmutil.formaltest import FHDLTestCase - - -class Register: - def __init__(self, num): - self.num = num - - -class ISATestRunner(FHDLTestCase): - def __init__(self, tst_data, include_fp=True): - super().__init__("run_all") - self.test_data = tst_data - self.include_fp = include_fp - - def run_all(self): - m = Module() - comb = m.d.comb - instruction = Signal(32) - - pdecode = create_pdecode(include_fp=self.include_fp) - m.submodules.pdecode2 = pdecode2 = PowerDecode2(pdecode) - - comb += pdecode2.dec.raw_opcode_in.eq(instruction) - sim = Simulator(m) - - def process(): - - for test in self.test_data: - - with self.subTest(test.name): - generator = test.program - - gen = list(generator.generate_instructions()) - insncode = generator.assembly.splitlines() - instructions = list(zip(gen, insncode)) - - simulator = ISA(pdecode2, test.regs, - test.sprs, - test.cr, - initial_insns=gen, respect_pc=True, - initial_svstate=test.svstate, - initial_mem=test.mem, - fpregfile=None, - disassembly=insncode, - bigendian=0, - mmu=False) - - print ("GPRs") - simulator.gpr.dump() - print ("FPRs") - simulator.fpr.dump() - - yield pdecode2.dec.bigendian.eq(0) # little / big? - pc = simulator.pc.CIA.value - index = pc//4 - while index < len(instructions): - print("instr pc", pc) - try: - yield from simulator.setup_one() - except KeyError: # instruction not in imem: stop - break - yield Settle() - - ins, code = instructions[index] - print(" 0x{:X}".format(ins & 0xffffffff)) - opname = code.split(' ')[0] - print(code, opname) - - # ask the decoder to decode this binary data (endian'd) - yield from simulator.execute_one() - pc = simulator.pc.CIA.value - index = pc//4 - - # run simulator multiple times, using the same PowerDecoder2, - # with multiple sub-tests - sim.add_process(process) - with sim.write_vcd("simulator.vcd", "simulator.gtkw", - traces=[]): - sim.run() - - -def run_tst(generator, initial_regs, initial_sprs=None, svstate=0, mmu=False, - initial_cr=0, mem=None, - initial_fprs=None): - if initial_sprs is None: - initial_sprs = {} - m = Module() - comb = m.d.comb - instruction = Signal(32) - - pdecode = create_pdecode(include_fp=initial_fprs is not None) - - gen = list(generator.generate_instructions()) - insncode = generator.assembly.splitlines() - instructions = list(zip(gen, insncode)) - - m.submodules.pdecode2 = pdecode2 = PowerDecode2(pdecode) - simulator = ISA(pdecode2, initial_regs, initial_sprs, initial_cr, - initial_insns=gen, respect_pc=True, - initial_svstate=svstate, - initial_mem=mem, - fpregfile=initial_fprs, - disassembly=insncode, - bigendian=0, - mmu=mmu) - comb += pdecode2.dec.raw_opcode_in.eq(instruction) - sim = Simulator(m) - - def process(): - - print ("GPRs") - simulator.gpr.dump() - print ("FPRs") - simulator.fpr.dump() - - yield pdecode2.dec.bigendian.eq(0) # little / big? - pc = simulator.pc.CIA.value - index = pc//4 - while index < len(instructions): - print("instr pc", pc) - try: - yield from simulator.setup_one() - except KeyError: # indicates instruction not in imem: stop - break - yield Settle() - - ins, code = instructions[index] - print(" 0x{:X}".format(ins & 0xffffffff)) - opname = code.split(' ')[0] - print(code, opname) - - # ask the decoder to decode this binary data (endian'd) - yield from simulator.execute_one() - pc = simulator.pc.CIA.value - index = pc//4 - - sim.add_process(process) - with sim.write_vcd("simulator.vcd", "simulator.gtkw", - traces=[]): - sim.run() - return simulator +from openpower.decoder.isa.test_runner import (Register, ISATestRunner, + run_tst) class DecoderTestCase(FHDLTestCase): diff --git a/src/openpower/decoder/isa/test_runner.py b/src/openpower/decoder/isa/test_runner.py new file mode 100644 index 00000000..7cfc6304 --- /dev/null +++ b/src/openpower/decoder/isa/test_runner.py @@ -0,0 +1,151 @@ +from nmigen import Module, Signal +from nmigen.back.pysim import Simulator, Settle +from openpower.decoder.isa.caller import ISACaller +from openpower.decoder.power_decoder import create_pdecode +from openpower.decoder.power_decoder2 import (PowerDecode2) +from openpower.simulator.program import Program +from openpower.decoder.isa.caller import ISACaller, inject +from openpower.decoder.isa.all import ISA +from nmutil.formaltest import FHDLTestCase + + +class Register: + def __init__(self, num): + self.num = num + + +class ISATestRunner(FHDLTestCase): + def __init__(self, tst_data, include_fp=True): + super().__init__("run_all") + self.test_data = tst_data + self.include_fp = include_fp + + def run_all(self): + m = Module() + comb = m.d.comb + instruction = Signal(32) + + pdecode = create_pdecode(include_fp=self.include_fp) + m.submodules.pdecode2 = pdecode2 = PowerDecode2(pdecode) + + comb += pdecode2.dec.raw_opcode_in.eq(instruction) + sim = Simulator(m) + + def process(): + + for test in self.test_data: + + with self.subTest(test.name): + generator = test.program + + gen = list(generator.generate_instructions()) + insncode = generator.assembly.splitlines() + instructions = list(zip(gen, insncode)) + + simulator = ISA(pdecode2, test.regs, + test.sprs, + test.cr, + initial_insns=gen, respect_pc=True, + initial_svstate=test.svstate, + initial_mem=test.mem, + fpregfile=None, + disassembly=insncode, + bigendian=0, + mmu=False) + + print ("GPRs") + simulator.gpr.dump() + print ("FPRs") + simulator.fpr.dump() + + yield pdecode2.dec.bigendian.eq(0) # little / big? + pc = simulator.pc.CIA.value + index = pc//4 + while index < len(instructions): + print("instr pc", pc) + try: + yield from simulator.setup_one() + except KeyError: # instruction not in imem: stop + break + yield Settle() + + ins, code = instructions[index] + print(" 0x{:X}".format(ins & 0xffffffff)) + opname = code.split(' ')[0] + print(code, opname) + + # ask the decoder to decode this binary data (endian'd) + yield from simulator.execute_one() + pc = simulator.pc.CIA.value + index = pc//4 + + # run simulator multiple times, using the same PowerDecoder2, + # with multiple sub-tests + sim.add_process(process) + with sim.write_vcd("simulator.vcd", "simulator.gtkw", + traces=[]): + sim.run() + + +def run_tst(generator, initial_regs, initial_sprs=None, svstate=0, mmu=False, + initial_cr=0, mem=None, + initial_fprs=None): + if initial_sprs is None: + initial_sprs = {} + m = Module() + comb = m.d.comb + instruction = Signal(32) + + pdecode = create_pdecode(include_fp=initial_fprs is not None) + + gen = list(generator.generate_instructions()) + insncode = generator.assembly.splitlines() + instructions = list(zip(gen, insncode)) + + m.submodules.pdecode2 = pdecode2 = PowerDecode2(pdecode) + simulator = ISA(pdecode2, initial_regs, initial_sprs, initial_cr, + initial_insns=gen, respect_pc=True, + initial_svstate=svstate, + initial_mem=mem, + fpregfile=initial_fprs, + disassembly=insncode, + bigendian=0, + mmu=mmu) + comb += pdecode2.dec.raw_opcode_in.eq(instruction) + sim = Simulator(m) + + def process(): + + print ("GPRs") + simulator.gpr.dump() + print ("FPRs") + simulator.fpr.dump() + + yield pdecode2.dec.bigendian.eq(0) # little / big? + pc = simulator.pc.CIA.value + index = pc//4 + while index < len(instructions): + print("instr pc", pc) + try: + yield from simulator.setup_one() + except KeyError: # indicates instruction not in imem: stop + break + yield Settle() + + ins, code = instructions[index] + print(" 0x{:X}".format(ins & 0xffffffff)) + opname = code.split(' ')[0] + print(code, opname) + + # ask the decoder to decode this binary data (endian'd) + yield from simulator.execute_one() + pc = simulator.pc.CIA.value + index = pc//4 + + sim.add_process(process) + with sim.write_vcd("simulator.vcd", "simulator.gtkw", + traces=[]): + sim.run() + return simulator + + -- 2.30.2