From 5f542f2025a9218e7c19ef5bb6150746fa44110f Mon Sep 17 00:00:00 2001 From: Luke Kenneth Casson Leighton Date: Fri, 24 Sep 2021 17:35:46 +0100 Subject: [PATCH] rename files, test_issuer.py is for the TestIssuer, make the shift rot test named "shift rot" --- .../decoder/isa/test_caller_shift_rot.py | 272 ++---------------- src/openpower/decoder/isa/test_issuer.py | 37 --- 2 files changed, 25 insertions(+), 284 deletions(-) delete mode 100644 src/openpower/decoder/isa/test_issuer.py diff --git a/src/openpower/decoder/isa/test_caller_shift_rot.py b/src/openpower/decoder/isa/test_caller_shift_rot.py index d8fa5eb0..09b67333 100644 --- a/src/openpower/decoder/isa/test_caller_shift_rot.py +++ b/src/openpower/decoder/isa/test_caller_shift_rot.py @@ -1,259 +1,37 @@ -from nmutil.formaltest import FHDLTestCase -import unittest -from openpower.decoder.power_enums import XER_bits -from openpower.test.state import ExpectedState, TestState -from openpower.simulator.program import Program -from openpower.decoder.selectable_int import SelectableInt -from openpower.decoder.isa.test_runner import run_tst -from openpower.test.state import TestState - - -class DecoderTestCase(FHDLTestCase): - - def test_0_proof_regression_rlwnm(self): - lst = ["rlwnm 3, 1, 2, 16, 20"] - initial_regs = [0] * 32 - #initial_regs[1] =0x7ffdbffb91b906b9 - initial_regs[1] = 0x11faafff1111aa11 - #initial_regs[2] = 31 - initial_regs[2] = 11 - # set expected (intregs, pc, [crregs], so, ov, ca) - e = ExpectedState(initial_regs, 4) - e.intregs[3] = 0x8800 - with Program(lst, bigendian=False) as program: - # and here lies the rabbit hole...at least for me - sim = self.run_tst_program(program, initial_regs, expected=e) - """ - def test_case_srw_1(self): - lst = ["sraw 3, 1, 2"] - initial_regs = [0] * 32 - initial_regs[1] = 0x12345678 - initial_regs[2] = 8 - e = ExpectedState(initial_regs, 4, [0,0,0,0,0,0,0,0], 0, 0, 0) - e.intregs[3] = 0x123456 - with Program(lst, bigendian=False) as program: - sim = self.run_tst_program(program, initial_regs) - self.check_regs(sim, e) - - def test_case_srw_2(self): - lst = ["sraw 3, 1, 2"] - initial_regs = [0] * 32 - initial_regs[1] = 0x82345678 # test the carry - initial_regs[2] = 8 - with Program(lst, bigendian=False) as program: - sim = self.run_tst_program(program, initial_regs) - self.assertEqual(sim.gpr(3), SelectableInt(0xffffffffff823456, 64)) - - def test_case_sld_rb_too_big(self): - lst = ["sld 3, 1, 4", - ] - initial_regs = [0] * 32 - initial_regs[1] = 0xffffffffffffffff - initial_regs[4] = 64 # too big, output should be zero - with Program(lst, bigendian=False) as program: - sim = self.run_tst_program(program, initial_regs) - self.assertEqual(sim.gpr(3), SelectableInt(0, 64)) - - def test_case_sld_rb_is_zero(self): - lst = ["sld 3, 1, 4"] - initial_regs = [0] * 32 - initial_regs[1] = 0x8000000000000000 - initial_regs[4] = 0 # no shift; output should equal input - with Program(lst, bigendian=False) as program: - sim = self.run_tst_program(program, initial_regs) - self.assertEqual(sim.gpr(3), SelectableInt(initial_regs[1], 64)) - - def test_case_shift_once(self): - lst = ["slw 3, 1, 4", - "slw 3, 1, 2"] - initial_regs = [0] * 32 - initial_regs[1] = 0x80000000 - initial_regs[2] = 0x40 - initial_regs[4] = 0x00 - with Program(lst, bigendian=False) as program: - sim = self.run_tst_program(program, initial_regs) - self.assertEqual(sim.gpr(1), SelectableInt(initial_regs[1], 64)) - - def test_case_rlwinm_1(self): - lst = ["rlwinm 3, 1, 1, 31, 31"] # Extracts sign bit - initial_regs = [0] * 32 - initial_regs[1] = 0x8fffffff - with Program(lst, bigendian=False) as program: - sim = self.run_tst_program(program, initial_regs) - self.assertEqual(sim.gpr(3), SelectableInt(1, 64)) - - def test_case_rlwinm_2(self): - lst = ["rlwinm 3, 1, 1, 0, 30"] - initial_regs = [0] * 32 - initial_regs[1] = 0xf1110001 - with Program(lst, bigendian=False) as program: - sim = self.run_tst_program(program, initial_regs) - self.assertEqual(sim.gpr(3), SelectableInt(0xe2220002, 64)) +""" Decoder tests - def test_case_rlwinm_3(self): - lst = ["rlwinm 3, 1, 0, 16, 31"] # Clear high-order 16 bits - initial_regs = [0] * 32 - initial_regs[1] = 0xebeb1888 - with Program(lst, bigendian=False) as program: - sim = self.run_tst_program(program, initial_regs) - self.assertEqual(sim.gpr(3), SelectableInt(0x1888, 64)) +related bugs: - def test_case_rlwimi_1(self): - lst = ["rlwimi 3, 1, 31, 0, 0"] - initial_regs = [0] * 32 - initial_regs[1] = 0x1 - initial_regs[3] = 0x7fffffff - with Program(lst, bigendian=False) as program: - sim = self.run_tst_program(program, initial_regs) - self.assertEqual(sim.gpr(3), SelectableInt(0xffffffff, 64)) + * +""" - def test_case_rlwimi_2(self): - lst = ["rlwimi 3, 1, 16, 8, 15"] - initial_regs = [0] * 32 - initial_regs[1] = 0xcc - initial_regs[3] = 0x7f00ffff - with Program(lst, bigendian=False) as program: - sim = self.run_tst_program(program, initial_regs) - self.assertEqual(sim.gpr(3), SelectableInt(0x7fccffff, 64)) - - def test_case_rlwnm_1(self): - lst = ["rlwnm 3, 1, 2, 0, 31"] - initial_regs = [0] * 32 - initial_regs[1] = 0x111 - initial_regs[2] = 1 - with Program(lst, bigendian=False) as program: - sim = self.run_tst_program(program, initial_regs) - self.assertEqual(sim.gpr(3), SelectableInt(0x222, 64)) - - def test_case_rlwnm_2(self): - lst = ["rlwnm 3, 1, 2, 8, 11"] - initial_regs = [0] * 32 - initial_regs[1] = 0xfebaacda - initial_regs[2] = 16 - with Program(lst, bigendian=False) as program: - sim = self.run_tst_program(program, initial_regs) - self.assertEqual(sim.gpr(3), SelectableInt(0xd00000, 64)) - - def test_case_rldic_1(self): - lst = ["rldic 3, 1, 8, 31"] # Simple rotate and clear - initial_regs = [0] * 32 - initial_regs[1] = 0x0100ffff00000111 - with Program(lst, bigendian=False) as program: - sim = self.run_tst_program(program, initial_regs) - self.assertEqual(sim.gpr(3), SelectableInt(0x11100, 64)) - - def test_case_rldic_2(self): - lst = ["rldic 3, 1, 0, 51"] # No rotate and clear - initial_regs = [0] * 32 - initial_regs[1] = 0x0100ffff00000fff - with Program(lst, bigendian=False) as program: - sim = self.run_tst_program(program, initial_regs) - self.assertEqual(sim.gpr(3), SelectableInt(0xfff, 64)) - - def test_case_rldicl_1(self): - lst = ["rldicl 3, 1, 8, 44"] # Simple rotate with left clear - initial_regs = [0] * 32 - initial_regs[1] = 0x0100ffff00000111 - with Program(lst, bigendian=False) as program: - sim = self.run_tst_program(program, initial_regs) - self.assertEqual(sim.gpr(3), SelectableInt(0x11101, 64)) - - def test_case_rldicl_2(self): - lst = ["rldicl 3, 1, 32, 47"] # Rotate right and clear - initial_regs = [0] * 32 - initial_regs[1] = 0x1000dead0000111c - with Program(lst, bigendian=False) as program: - sim = self.run_tst_program(program, initial_regs) - self.assertEqual(sim.gpr(3), SelectableInt(0xdead, 64)) - - def test_case_rldicr_1(self): - lst = ["rldicr 3, 1, 16, 15"] # Simple rotate with right clear - initial_regs = [0] * 32 - initial_regs[1] = 0x0100ffffe0000111 - with Program(lst, bigendian=False) as program: - sim = self.run_tst_program(program, initial_regs) - self.assertEqual(sim.gpr(3), SelectableInt(0xffff000000000000, 64)) +import unittest +import sys - def test_case_rldicr_2(self): - lst = ["rldicr 3, 1, 32, 32"] # Rotate right and clear - initial_regs = [0] * 32 - initial_regs[1] = 0x1000caef0000dead - with Program(lst, bigendian=False) as program: - sim = self.run_tst_program(program, initial_regs) - self.assertEqual(sim.gpr(3), SelectableInt(0xdead00000000, 64)) +# These tests utilize the run_hdl=False parameter to compare +# simulator with expected states +from soc.simple.test.test_runner import TestRunner +from openpower.decoder.isa.shift_rot_cases import ShiftRotTestCase - def test_case_regression_extswsli_1(self): - lst = [f"extswsli 3, 1, 31"] - initial_regs = [0] * 32 - initial_regs[1] = 0x5678 - with Program(lst, bigendian=False) as program: - sim = self.run_tst_program(program, initial_regs) - self.assertEqual(sim.gpr(3), SelectableInt(0x2b3c00000000, 64)) - def test_case_regression_extswsli_2(self): - lst = [f"extswsli 3, 1, 7"] - initial_regs = [0] * 32 - initial_regs[1] = 0x3ffffd7377f19fdd - with Program(lst, bigendian=False) as program: - sim = self.run_tst_program(program, initial_regs) - self.assertEqual(sim.gpr(3), SelectableInt(0x3bf8cfee80, 64)) +if __name__ == "__main__": - def test_case_regression_extswsli_3(self): - lst = [f"extswsli 3, 1, 0"] - initial_regs = [0] * 32 - initial_regs[1] = 0x0000010180122900 - with Program(lst, bigendian=False) as program: - sim = self.run_tst_program(program, initial_regs) - self.assertEqual(sim.gpr(3), SelectableInt(0xffffffff80122900, 64)) - """ + # allow list of testing to be selected by command-line + testing = sys.argv[1:] - def run_tst_program(self, prog, initial_regs=[0] * 32, initial_mem=None, - expected=None): - simulator = run_tst(prog, initial_regs, mem=initial_mem, - state=(self, 0)) + if not testing: + testing = ['shiftrot'] - simulator.gpr.dump() - # this is by no means perfect... needs work but it's functional - if expected is not None: - # have to put these in manually - expected.to_test = expected - expected.dut = self - expected.state_type = "expected" - expected.code = 0 - # do actual comparison - simulator.state.compare(expected) - return simulator + unittest.main(exit=False) + suite = unittest.TestSuite() - """ - def check_regs(self, sim, e): - # int regs - for i in range(32): - self.assertEqual(sim.gpr(i), SelectableInt(e.intregs[i], 64), - "int reg %d -> sim not equal to expected." % (i)) - # pc - self.assertEqual(sim.pc.CIA.value, SelectableInt(e.pc, 64), - "pc -> sim not equal to expected.") - # cr - for i in range(8): - self.assertEqual(sim.crl[7 - i].get_range().value, - SelectableInt(e.crregs[7-i], 64), - "cr reg %d -> sim not equal to expected." % (i)) - # xer - self.so = sim.spr['XER'][XER_bits['SO']].value - self.ov = sim.spr['XER'][XER_bits['OV']].value - self.ov32 = sim.spr['XER'][XER_bits['OV32']].value - self.ca = sim.spr['XER'][XER_bits['CA']].value - self.ca32 = sim.spr['XER'][XER_bits['CA32']].value - self.ov = self.ov | (self.ov32 << 1) - self.ca = self.ca | (self.ca32 << 1) - self.assertEqual(self.so, SelectableInt(e.so, 64), - "so -> sim not equal to expected.") - self.assertEqual(self.ov, SelectableInt(e.ov, 64), - "ov -> sim not equal to expected.") - self.assertEqual(self.ca, SelectableInt(e.ca, 64), - "ca -> sim not equal to expected.") - """ + # dictionary of data for tests + tests = {'shiftrot': ShiftRotTestCase().test_data} + # walk through all tests, those requested get added + for tname, data in tests.items(): + if tname in testing: + suite.addTest(TestRunner(data, run_hdl=False)) -if __name__ == "__main__": - unittest.main() + runner = unittest.TextTestRunner() + runner.run(suite) diff --git a/src/openpower/decoder/isa/test_issuer.py b/src/openpower/decoder/isa/test_issuer.py deleted file mode 100644 index 09b67333..00000000 --- a/src/openpower/decoder/isa/test_issuer.py +++ /dev/null @@ -1,37 +0,0 @@ -""" Decoder tests - -related bugs: - - * -""" - -import unittest -import sys - -# These tests utilize the run_hdl=False parameter to compare -# simulator with expected states -from soc.simple.test.test_runner import TestRunner -from openpower.decoder.isa.shift_rot_cases import ShiftRotTestCase - - -if __name__ == "__main__": - - # allow list of testing to be selected by command-line - testing = sys.argv[1:] - - if not testing: - testing = ['shiftrot'] - - unittest.main(exit=False) - suite = unittest.TestSuite() - - # dictionary of data for tests - tests = {'shiftrot': ShiftRotTestCase().test_data} - - # walk through all tests, those requested get added - for tname, data in tests.items(): - if tname in testing: - suite.addTest(TestRunner(data, run_hdl=False)) - - runner = unittest.TextTestRunner() - runner.run(suite) -- 2.30.2