Re: [Tarantool-patches] [PATCH] dbg: fix mapping of FPMATHOP to string

[Sergey Bronnikov via Tarantool-patches <tarantool-patches@dev.tarantool.org>]

Hi, Mikhail,

thanks for the patch! Please see my comments.

Sergey

On 9/8/26 20:40, Mikhail Elhimov wrote:
> Closes tarantool/tarantool#13159
it is desired to add a description for the changes (why `exp2` was 
removed etc.)
> ---
> Branch: https://github.com/tarantool/luajit/tree/elhimov/gh-13159-fix-fpmathop-mapping
> Related issue: https://github.com/tarantool/tarantool/issues/13159
>
>   src/luajit_dbg.py                             |  1 -
>   .../debug-extension-tests.py                  | 64 ++++++++++++++++++-
>   2 files changed, 63 insertions(+), 2 deletions(-)
>
> diff --git a/src/luajit_dbg.py b/src/luajit_dbg.py
> index 80057a4e..76001b7d 100644
> --- a/src/luajit_dbg.py
> +++ b/src/luajit_dbg.py
> @@ -1722,7 +1722,6 @@ IRFPMS = [
>       'ceil',
>       'trunc',
>       'sqrt',
> -    'exp2',
>       'log',
>       'log2',
>       'other'
> diff --git a/test/tarantool-debugger-tests/debug-extension-tests.py b/test/tarantool-debugger-tests/debug-extension-tests.py
> index 895171a4..9989032b 100644
> --- a/test/tarantool-debugger-tests/debug-extension-tests.py
> +++ b/test/tarantool-debugger-tests/debug-extension-tests.py
> @@ -688,6 +688,58 @@ class TestLJIRFloadAbs(TestCaseBase):
>       )
>   
>   
> +class TestLJIRFPMathOpBase(TestCaseBase):
> +    location = 'lj_cf_print'
> +    extension_cmds = (
> +        'n\n'  # Load L.
> +        'lj-trace ' + '&((GG_State *)L)->J->cur'
> +    )
> +
> +    @classmethod
> +    def setUpClass(cls):
> +        cls.lua_script = (
> +            'jit.opt.start("hotloop=1")\n'
> +            'local function trace(a)\n'
> +            '  local x = {}\n'
> +            '  return x\n'
> +            'end\n'
> +            'trace(1)\n'
> +            'trace(1)\n'
> +            'print()\n'
> +        ).format(cls.lua_expr)
> +        cls.pattern = r'num FPMATH .* ref: ' + RX_IRN + r' lit: ' + cls.op
> +        super(TestLJIRFPMathOpBase, cls).setUpClass()
> +
> +
> +@unittest.skipIf(machine in ('arm64', 'aarch64'),
> +                 "not used as there is no corresponding hardware instruction")
> +class TestLJIRFPMathFloor(TestLJIRFPMathOpBase):
> +    lua_expr = 'math.floor(a)'
> +    op = 'floor'
> +
> +
> +@unittest.skipIf(machine in ('arm64', 'aarch64'),
> +                 "not used as there is no corresponding hardware instruction")
> +class TestLJIRFPMathCeil(TestLJIRFPMathOpBase):
> +    lua_expr = 'math.ceil(a)'
> +    op = 'ceil'
> +
> +
> +class TestLJIRFPMathSqrt(TestLJIRFPMathOpBase):
> +    lua_expr = 'math.sqrt(a)'
> +    op = 'sqrt'
> +
> +
> +class TestLJIRFPMathLog(TestLJIRFPMathOpBase):
> +    lua_expr = 'math.log(a)'
> +    op = 'log'
> +

Usually we add a patch with fix for the problem and a test that covers a 
problem.

I propose leave a testcase TestLJIRFPMathLog and move other testcases to 
a separate commit.

> +
> +class TestLJIRFPMathLog2(TestLJIRFPMathOpBase):
> +    lua_expr = 'math.log(a, 3)'
> +    op = 'log2'
> +
> +
>   # XXX: Implemented only for GC64 in LuaJIT until backporting the
>   # corresponding commit.
>   if IS_GC64:
> @@ -1051,7 +1103,17 @@ class TestLJCTypeBase(TestCaseBase):
>       pattern = r'\[\d+\] <int>'
>   
>   
> -for test_cls in TestCaseBase.__subclasses__():
> +def get_leaf_subclasses(cls):
> +    subclasses = cls.__subclasses__()
> +    if not subclasses:
> +        yield cls
> +    else:
> +        for sub in subclasses:
> +            for leaf in get_leaf_subclasses(sub):
> +                yield leaf
> +
> +
> +for test_cls in get_leaf_subclasses(TestCaseBase):
>       test_cls.test = lambda self: self.check()
>   
>   if __name__ == '__main__':