from openpower.simulator.program import Program
-from openpower.sv.trans.pysvp64dis import load, dump
-from openpower.sv.trans.svp64 import SVP64Asm
-from openpower.decoder.power_insn import Database, Verbosity
+from openpower.insndb.dis import load, dump
+from openpower.insndb.asm import SVP64Asm
+from openpower.insndb.core import Database, Style
from openpower.decoder.power_enums import find_wiki_dir
from openpower.sv import sv_binutils_fptrans
import unittest
+from io import BytesIO
import itertools
import sys
lst = list(isa)
with Program(lst, bigendian=False) as program:
print ("ops", program._instructions)
+ binfile = BytesIO()
program.binfile.seek(0)
- insns = load(program.binfile)
+ binfile.write(program.binfile.read())
+ program.binfile.seek(0)
+ binfile.seek(0)
+ insns = load(binfile)
#for insn in insns:
#print ("insn", insn)
insns = list(insns)
print ("insns", insns)
- for i, line in enumerate(dump(insns, verbosity=Verbosity.SHORT)):
+ for i, line in enumerate(dump(insns, style=Style.SHORT)):
name = expected[i].split(" ")[0]
with self.subTest("%d:%s" % (i, name)):
print("instruction", repr(line), repr(expected[i]))
expected = [
'sv.crand *16,*2,*33',
'sv.crand 12,2,33',
- 'sv.crand/ff=eq/m=r10 12,2,33',
+ 'sv.crand/ff=RC1/m=r10 12,2,33',
'sv.crand/m=r10 12,2,33',
'sv.crand/m=r10/sz 12,2,33',
- # XXX dz/sz is not the canonical way, must be zz
- 'sv.crand/dz/m=r10/sz 12,2,33', # NOT OK
'sv.crand/m=r10/zz 12,2,33', # SHOULD PASS
]
self._do_tst(expected)
def test_13_RC1(self):
expected = [
"sv.add/ff=RC1 *3,*7,*11",
- "sv.add/pr=RC1 *3,*7,*11",
"sv.add/ff=~RC1 *3,*7,*11",
- "sv.add/pr=~RC1 *3,*7,*11",
]
self._do_tst(expected)
"sv.add./ff=le *3,*7,*11",
"sv.add./ff=gt *3,*7,*11",
"sv.add./ff=ne *3,*7,*11",
- "sv.add./pr=eq *3,*7,*11",
- "sv.add./pr=ns *3,*7,*11",
]
self._do_tst(expected)
def test_18_sea(self):
expected = [
"sv.ldux/sea 5,6,7",
+ "sv.ldux/pi/sea 5,6,7",
]
self._do_tst(expected)
def test_20_cmp(self):
expected = [
"sv.cmp *4,1,*0,1",
- "sv.cmp/ff=RC1 *4,1,*0,1",
- "sv.cmp/ff=RC1/vli *4,1,*0,1",
- "sv.cmp/ff=~RC1 *4,1,*0,1",
- "sv.cmp/ff=RC1/m=r3/sz *4,1,*0,1",
- "sv.cmp/dz/ff=RC1/m=r3 *4,1,*0,1",
- "sv.cmp/dz/ff=RC1/m=r3/sz *4,1,*0,1",
+ "sv.cmp/ff=eq *4,1,*0,1",
+ "sv.cmp/ff=eq/vli *4,1,*0,1",
+ "sv.cmp/ff=ne *4,1,*0,1",
+ "sv.cmp/ff=eq/m=r3/zz *4,1,*0,1",
+ "sv.cmp/ff=lt/m=r3/zz *4,1,*0,1",
+ "sv.cmp/ff=gt/m=r3/zz *4,1,*0,1",
+ "sv.cmp/zz/ff=gt/m=r3 *4,1,*0,1", # WRONG
]
self._do_tst(expected)
def test_29_dsld_dsrd(self):
expected = [
- "dsld 5,4,5,1",
- "dsrd 5,4,5,2",
+ "dsld 5,4,5,3",
+ "dsrd 5,4,5,3",
"dsld. 5,4,5,3",
- "dsrd. 5,4,5,0",
- "sv.dsld *5,4,5,1",
- "sv.dsrd *5,4,5,2",
- "sv.dsld. *5,4,5,3",
- "sv.dsrd. *5,4,5,0",
+ "dsrd. 5,4,5,3",
+ "sv.dsld *6,4,5,3",
+ "sv.dsrd *6,4,5,3",
+ "sv.dsld. *6,4,5,3",
+ "sv.dsrd. *6,4,5,3",
]
self._do_tst(expected)
def test_30_divmod2du(self):
expected = [
"divmod2du 5,4,5,3",
+ "maddedu 5,4,5,3",
+ "sv.divmod2du 5,4,5,3",
+ "sv.divmod2du *6,4,*0,3",
+ "sv.maddedu 5,4,5,3",
+ "sv.maddedu *6,4,5,3",
+ ]
+ self._do_tst(expected)
+
+ def test_31_sadd_saddw_sadduw(self):
+ expected = [
+ "sadd 31,0,0,0",
+ "sadd 0,31,0,0",
+ "sadd 0,0,31,0",
+ "sadd 0,0,0,3",
+ "sadd. 31,0,0,0",
+ "sadd. 0,31,0,0",
+ "sadd. 0,0,31,0",
+ "sadd. 0,0,0,3",
+ "saddw 31,0,0,0",
+ "saddw 0,31,0,0",
+ "saddw 0,0,31,0",
+ "saddw 0,0,0,3",
+ "saddw. 31,0,0,0",
+ "saddw. 0,31,0,0",
+ "saddw. 0,0,31,0",
+ "saddw. 0,0,0,3",
+ "sadduw 31,0,0,0",
+ "sadduw 0,31,0,0",
+ "sadduw 0,0,31,0",
+ "sadduw 0,0,0,3",
+ "sadduw. 31,0,0,0",
+ "sadduw. 0,31,0,0",
+ "sadduw. 0,0,31,0",
+ "sadduw. 0,0,0,3",
+ ]
+ self._do_tst(expected)
+
+ def test_32_ldst_idx_ffirst(self):
+ expected = [
+ "sv.stdx/ff=RC1 *4,16,2",
+ "sv.stdx/ff=~RC1 *4,16,2",
+ "sv.ldx/ff=RC1 *4,16,2",
+ "sv.ldx/ff=~RC1 *4,16,2",
+ ]
+ self._do_tst(expected)
+
+ def test_33_ldst_imm_ffirst(self):
+ expected = [
+ "sv.std/ff=RC1 *4,16(2)",
+ "sv.std/ff=~RC1 *4,16(2)",
+ "sv.ld/ff=RC1 *4,16(2)",
+ "sv.ld/ff=~RC1 *4,16(2)",
]
self._do_tst(expected)
+ def test_34_ldst_update_imm_ffirst(self):
+ expected = [
+ "sv.ldu/ff=~RC1/vli *16,0(*17)",
+ ]
+ self._do_tst(expected)
+
+ def test_35_ffmadds(self):
+ expected = [
+ "sv.ffmadds *0,*0,*0",
+ ]
+ self._do_tst(expected)
+
+ def test_36_extras_rlwimi(self):
+ self._do_tst(["sv.rlwimi 3, 1, 5, 20, 6"])
+
+ def test_36_extras_rlwimi_(self):
+ self._do_tst(["sv.rlwimi. 3, 1, 5, 20, 6"])
+
+ def test_36_extras_rldimi(self):
+ self._do_tst(["sv.rldimi 3, 4, 56, 4"])
+
+ def test_36_extras_rldimi_(self):
+ self._do_tst(["sv.rldimi. 3, 4, 56, 4"])
+
+ def test_36_extras_fishmv(self):
+ self._do_tst(["sv.fishmv 3, 0x0FD0"])
if __name__ == "__main__":
unittest.main()
projects / openpower-isa.git / blobdiff