djsundog/circuitpython
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

tools/mpy-tool.py: Optimise freezing of ints that can fit a small int.

Browse Source 
Signed-off-by: Damien George <damien@micropython.org>
This commit is contained in:
Damien George 2022-04-07 23:53:37 +10:00
parent abdc4ec08d
commit 9c8a56343f
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
tools/mpy-tool.py
View File

@ -327,6 +327,13 @@ class Opcodes:
mapping[MP_BC_BINARY_OP_MULTI + i] = "BINARY_OP %d %s" % (i, mp_binary_op_method_name[i]) mapping[MP_BC_BINARY_OP_MULTI + i] = "BINARY_OP %d %s" % (i, mp_binary_op_method_name[i])
# This definition of a small int covers all possible targets, in the sense that every
# target can encode as a small int, an integer that passes this test. The minimum is set
# by MICROPY_OBJ_REPR_B on a 16-bit machine, where there are 14 bits for the small int.
def mp_small_int_fits(i):
return -0x2000 <= i <= 0x1FFF
# this function mirrors that in py/bc.c # this function mirrors that in py/bc.c
def mp_opcode_format(bytecode, ip, count_var_uint): def mp_opcode_format(bytecode, ip, count_var_uint):
opcode = bytecode[ip] opcode = bytecode[ip]
@ -633,8 +640,10 @@ class CompiledModule:
const_obj_content += 4 * 4 const_obj_content += 4 * 4
return "MP_ROM_PTR(&%s)" % obj_name return "MP_ROM_PTR(&%s)" % obj_name
elif is_int_type(obj): elif is_int_type(obj):
if config.MICROPY_LONGINT_IMPL == config.MICROPY_LONGINT_IMPL_NONE: if mp_small_int_fits(obj):
# TODO check if we can actually fit this long-int into a small-int # Encode directly as a small integer object.
return "MP_ROM_INT(%d)" % obj
elif config.MICROPY_LONGINT_IMPL == config.MICROPY_LONGINT_IMPL_NONE:
raise FreezeError(self, "target does not support long int") raise FreezeError(self, "target does not support long int")
elif config.MICROPY_LONGINT_IMPL == config.MICROPY_LONGINT_IMPL_LONGLONG: elif config.MICROPY_LONGINT_IMPL == config.MICROPY_LONGINT_IMPL_LONGLONG:
# TODO # TODO