From: Sergey Bronnikov via Tarantool-patches <tarantool-patches@dev.tarantool.org> To: Sergey Kaplun <skaplun@tarantool.org>, Maxim Kokryashkin <m.kokryashkin@tarantool.org> Cc: tarantool-patches@dev.tarantool.org Subject: Re: [Tarantool-patches] [PATCH v2 luajit 39/45] test: enable <misc/tonumber_scan.lua> LuaJIT test Date: Thu, 22 Aug 2024 17:33:46 +0300 [thread overview] Message-ID: <7255a275-68de-43f1-8188-0950be8a6a6b@tarantool.org> (raw) In-Reply-To: <f7ce40a24a58b0c4a408299f4f728a5b3ef9247e.1724228998.git.skaplun@tarantool.org> [-- Attachment #1: Type: text/plain, Size: 3281 bytes --] Sergey, On 21.08.2024 11:58, Sergey Kaplun wrote: > This patch moves the aforementioned test from the <misc> to the > <lib/base> directory, includes it in <index>, and names the subtest. > > Also, the NaN checks are skipped for parsing via `strtod()`, since > LuaJIT uses canonicalized NaNs, which are equal to -NaN > (0xfff8000000000000). > > Part of tarantool/tarantool#9398 > --- thanks for the patch! LGTM > test/LuaJIT-tests/lib/base/index | 1 + > .../{misc => lib/base}/tonumber_scan.lua | 58 ++++++++++++------- > 2 files changed, 37 insertions(+), 22 deletions(-) > rename test/LuaJIT-tests/{misc => lib/base}/tonumber_scan.lua (93%) > > diff --git a/test/LuaJIT-tests/lib/base/index b/test/LuaJIT-tests/lib/base/index > index 942c53c0..bef5dcb4 100644 > --- a/test/LuaJIT-tests/lib/base/index > +++ b/test/LuaJIT-tests/lib/base/index > @@ -8,4 +8,5 @@ pairs.lua > pcall_jit.lua > select.lua > tonumber_tostring.lua > +tonumber_scan.lua +ffi > xpcall_jit.lua +compat5.2 > diff --git a/test/LuaJIT-tests/misc/tonumber_scan.lua b/test/LuaJIT-tests/lib/base/tonumber_scan.lua > similarity index 93% > rename from test/LuaJIT-tests/misc/tonumber_scan.lua > rename to test/LuaJIT-tests/lib/base/tonumber_scan.lua > index 78e1ca3e..e2dcd4d0 100644 > --- a/test/LuaJIT-tests/misc/tonumber_scan.lua > +++ b/test/LuaJIT-tests/lib/base/tonumber_scan.lua > @@ -150,31 +150,45 @@ local function tohex64(x) > return "0x"..bit.tohex(tonumber(x/2LL^32))..bit.tohex(tonumber(x%2LL^32)).."ULL" > end > > -local conv = tonumber > +local e = ffi.new("char *[1]") > +local u = ffi.new("union { double d; uint64_t x; }") > > -if arg and arg[1] == "strtod" then > - local e = ffi.new("char *[1]") > - function conv(s) > - local d = ffi.C.strtod(s, e) > - return (e[0][0] == 0 and #s ~= 0) and d or nil > +local function test_conv(conv, skip_nan) > + for i = 1, #t, 2 do > + local y, s = t[i], t[i + 1] > + if s:lower():match('nan') and skip_nan then > + -- LuaJIT uses canonicalized NaNs. > + -- -NaN = 0xfff8000000000000. > + -- Hence, `strtod()` yields a different value here. > + goto continue > + end > + local d = conv(s) > + local ok > + if d == nil then > + ok = (y == false) > + else > + u.d = d > + ok = (y == u.x) > + end > + if not ok then > + error(string.format( > + "FAIL: '%s'\n\tGOT: %s\n\tOK: %s", > + s, > + d and tohex64(u.x) or "nil", > + y and tohex64(y) or "nil", "\n\n" > + )) > + end > + ::continue:: > end > end > > -local u = ffi.new("union { double d; uint64_t x; }") > - > -for i=1,#t,2 do > - local y, s = t[i], t[i+1] > - local d = conv(s) > - local ok > - if d == nil then > - ok = (y == false) > - else > - u.d = d > - ok = (y == u.x) > - end > - if not ok then > - io.write('FAIL: "', s, '"\n GOT: ', d and tohex64(u.x) or "nil", " OK: ", y and tohex64(y) or "nil", "\n\n") > --- print(" "..tohex64(u.x)..", \""..s.."\",") > - end > +do --- tonumber parsing > + test_conv(tonumber) > end > > +do --- strtod parsing > + test_conv(function(s) > + local d = ffi.C.strtod(s, e) > + return (e[0][0] == 0 and #s ~= 0) and d or nil > + end, true) > +end [-- Attachment #2: Type: text/html, Size: 3781 bytes --]
next prev parent reply other threads:[~2024-08-22 14:33 UTC|newest] Thread overview: 157+ messages / expand[flat|nested] mbox.gz Atom feed top 2024-08-21 8:58 [Tarantool-patches] [PATCH v2 luajit 00/45] Rearrange LuaJIT misc tests Sergey Kaplun via Tarantool-patches 2024-08-21 8:58 ` [Tarantool-patches] [PATCH v2 luajit 01/45] test: don't run JIT-based LuaJIT tests without JIT Sergey Kaplun via Tarantool-patches 2024-08-21 15:24 ` Sergey Bronnikov via Tarantool-patches 2024-09-04 22:53 ` Maxim Kokryashkin via Tarantool-patches 2024-09-04 22:55 ` Maxim Kokryashkin via Tarantool-patches 2024-08-21 8:58 ` [Tarantool-patches] [PATCH v2 luajit 02/45] test: actualize <LuaJIT-tests/README.md> Sergey Kaplun via Tarantool-patches 2024-08-21 15:27 ` Sergey Bronnikov via Tarantool-patches 2024-08-21 16:40 ` Sergey Kaplun via Tarantool-patches 2024-09-04 22:54 ` Maxim Kokryashkin via Tarantool-patches 2024-08-21 8:58 ` [Tarantool-patches] [PATCH v2 luajit 03/45] test: enable <misc/alias_alloc.lua> LuaJIT test Sergey Kaplun via Tarantool-patches 2024-08-21 16:15 ` Sergey Bronnikov via Tarantool-patches 2024-09-04 22:55 ` Maxim Kokryashkin via Tarantool-patches 2024-08-21 8:58 ` [Tarantool-patches] [PATCH v2 luajit 04/45] test: refactor <alias_alloc.lua> " Sergey Kaplun via Tarantool-patches 2024-08-21 16:18 ` Sergey Bronnikov via Tarantool-patches 2024-09-04 22:55 ` Maxim Kokryashkin via Tarantool-patches 2024-08-21 8:58 ` [Tarantool-patches] [PATCH v2 luajit 05/45] test: refactor <lang/coroutine.lua> " Sergey Kaplun via Tarantool-patches 2024-08-21 16:20 ` Sergey Bronnikov via Tarantool-patches 2024-08-21 16:27 ` Sergey Bronnikov via Tarantool-patches 2024-09-04 22:56 ` Maxim Kokryashkin via Tarantool-patches 2024-08-21 8:58 ` [Tarantool-patches] [PATCH v2 luajit 06/45] test: remove <misc/coro_yield.lua> " Sergey Kaplun via Tarantool-patches 2024-08-21 16:23 ` Sergey Bronnikov via Tarantool-patches 2024-08-21 16:36 ` Sergey Kaplun via Tarantool-patches 2024-08-22 15:04 ` Sergey Bronnikov via Tarantool-patches 2024-09-04 22:56 ` Maxim Kokryashkin via Tarantool-patches 2024-08-21 8:58 ` [Tarantool-patches] [PATCH v2 luajit 07/45] test: enable <misc/debug_gc.lua> " Sergey Kaplun via Tarantool-patches 2024-08-22 15:04 ` Sergey Bronnikov via Tarantool-patches 2024-09-04 22:57 ` Maxim Kokryashkin via Tarantool-patches 2024-08-21 8:58 ` [Tarantool-patches] [PATCH v2 luajit 08/45] test: enable <misc/dualnum.lua> " Sergey Kaplun via Tarantool-patches 2024-08-22 14:54 ` Sergey Bronnikov via Tarantool-patches 2024-09-04 22:57 ` Maxim Kokryashkin via Tarantool-patches 2024-08-21 8:58 ` [Tarantool-patches] [PATCH v2 luajit 09/45] test: refactor <lang/dualnum.lua> " Sergey Kaplun via Tarantool-patches 2024-08-22 15:05 ` Sergey Bronnikov via Tarantool-patches 2024-09-04 22:58 ` Maxim Kokryashkin via Tarantool-patches 2024-08-21 8:58 ` [Tarantool-patches] [PATCH v2 luajit 10/45] test: remove <misc/fori_coerce.lua> " Sergey Kaplun via Tarantool-patches 2024-08-22 14:53 ` Sergey Bronnikov via Tarantool-patches 2024-09-04 22:58 ` Maxim Kokryashkin via Tarantool-patches 2024-08-21 8:58 ` [Tarantool-patches] [PATCH v2 luajit 11/45] test: remove <misc/fori_dir.lua> " Sergey Kaplun via Tarantool-patches 2024-08-22 15:05 ` Sergey Bronnikov via Tarantool-patches 2024-09-04 22:58 ` Maxim Kokryashkin via Tarantool-patches 2024-08-21 8:58 ` [Tarantool-patches] [PATCH v2 luajit 12/45] test: remove <misc/gc_rechain.lua> " Sergey Kaplun via Tarantool-patches 2024-08-22 14:53 ` Sergey Bronnikov via Tarantool-patches 2024-09-04 22:59 ` Maxim Kokryashkin via Tarantool-patches 2024-08-21 8:58 ` [Tarantool-patches] [PATCH v2 luajit 13/45] test: enable <misc/gc_trace.lua> " Sergey Kaplun via Tarantool-patches [not found] ` <4f43c5dc-d8c2-48a1-a26b-00b626ce69e5@tarantool.org> 2024-08-22 12:54 ` Sergey Kaplun via Tarantool-patches 2024-08-22 15:06 ` Sergey Bronnikov via Tarantool-patches 2024-09-04 23:04 ` Maxim Kokryashkin via Tarantool-patches 2024-08-21 8:58 ` [Tarantool-patches] [PATCH v2 luajit 14/45] test: refactor <trace/gc.lua> " Sergey Kaplun via Tarantool-patches 2024-08-22 14:53 ` Sergey Bronnikov via Tarantool-patches 2024-09-04 23:04 ` Maxim Kokryashkin via Tarantool-patches 2024-08-21 8:58 ` [Tarantool-patches] [PATCH v2 luajit 15/45] test: enable <misc/gcstep.lua> " Sergey Kaplun via Tarantool-patches 2024-08-22 12:14 ` Sergey Bronnikov via Tarantool-patches 2024-08-22 12:57 ` Sergey Kaplun via Tarantool-patches 2024-08-22 15:07 ` Sergey Bronnikov via Tarantool-patches 2024-09-04 23:05 ` Maxim Kokryashkin via Tarantool-patches 2024-08-21 8:58 ` [Tarantool-patches] [PATCH v2 luajit 16/45] test: enable <misc/hook_active.lua> " Sergey Kaplun via Tarantool-patches 2024-08-23 14:35 ` Sergey Bronnikov via Tarantool-patches 2024-09-04 23:11 ` Maxim Kokryashkin via Tarantool-patches 2024-08-21 8:58 ` [Tarantool-patches] [PATCH v2 luajit 17/45] test: enable <misc/hook_line.lua> " Sergey Kaplun via Tarantool-patches 2024-08-23 14:38 ` Sergey Bronnikov via Tarantool-patches 2024-08-26 6:39 ` Sergey Kaplun via Tarantool-patches 2024-08-29 9:44 ` Sergey Bronnikov via Tarantool-patches 2024-09-04 23:12 ` Maxim Kokryashkin via Tarantool-patches 2024-08-21 8:58 ` [Tarantool-patches] [PATCH v2 luajit 18/45] test: enable <misc/hook_norecord.lua> " Sergey Kaplun via Tarantool-patches 2024-09-04 23:12 ` Maxim Kokryashkin via Tarantool-patches 2024-08-21 8:58 ` [Tarantool-patches] [PATCH v2 luajit 19/45] test: enable <misc/hook_record.lua> " Sergey Kaplun via Tarantool-patches 2024-08-23 15:12 ` Sergey Bronnikov via Tarantool-patches 2024-08-23 15:15 ` Sergey Bronnikov via Tarantool-patches 2024-09-04 23:12 ` Maxim Kokryashkin via Tarantool-patches 2024-08-21 8:58 ` [Tarantool-patches] [PATCH v2 luajit 20/45] test: enable <misc/hook_top.lua> " Sergey Kaplun via Tarantool-patches 2024-08-23 15:17 ` Sergey Bronnikov via Tarantool-patches 2024-09-04 23:13 ` Maxim Kokryashkin via Tarantool-patches 2024-08-21 8:58 ` [Tarantool-patches] [PATCH v2 luajit 21/45] test: enable <misc/jit_flush.lua> " Sergey Kaplun via Tarantool-patches 2024-08-23 15:30 ` Sergey Bronnikov via Tarantool-patches 2024-08-26 6:50 ` Sergey Kaplun via Tarantool-patches 2024-08-29 9:44 ` Sergey Bronnikov via Tarantool-patches 2024-09-04 23:14 ` Maxim Kokryashkin via Tarantool-patches 2024-08-21 8:58 ` [Tarantool-patches] [PATCH v2 luajit 22/45] test: remove <misc/loop_unroll.lua> " Sergey Kaplun via Tarantool-patches 2024-08-22 12:33 ` Sergey Bronnikov via Tarantool-patches 2024-09-04 23:14 ` Maxim Kokryashkin via Tarantool-patches 2024-08-21 8:58 ` [Tarantool-patches] [PATCH v2 luajit 23/45] test: enable <misc/parse_comp.lua> " Sergey Kaplun via Tarantool-patches 2024-08-22 13:07 ` Sergey Bronnikov via Tarantool-patches 2024-09-04 23:14 ` Maxim Kokryashkin via Tarantool-patches 2024-08-21 8:58 ` [Tarantool-patches] [PATCH v2 luajit 24/45] test: enable <misc/parse_esc.lua> " Sergey Kaplun via Tarantool-patches 2024-08-22 13:28 ` Sergey Bronnikov via Tarantool-patches 2024-09-04 23:14 ` Maxim Kokryashkin via Tarantool-patches 2024-08-21 8:58 ` [Tarantool-patches] [PATCH v2 luajit 25/45] test: enable <misc/parse_misc.lua> " Sergey Kaplun via Tarantool-patches 2024-08-22 13:31 ` Sergey Bronnikov via Tarantool-patches 2024-09-04 23:15 ` Maxim Kokryashkin via Tarantool-patches 2024-08-21 8:58 ` [Tarantool-patches] [PATCH v2 luajit 26/45] test: enable <misc/phi_conv.lua> " Sergey Kaplun via Tarantool-patches 2024-08-22 13:39 ` Sergey Bronnikov via Tarantool-patches 2024-08-22 13:41 ` Sergey Bronnikov via Tarantool-patches 2024-09-04 23:16 ` Maxim Kokryashkin via Tarantool-patches 2024-08-21 8:58 ` [Tarantool-patches] [PATCH v2 luajit 27/45] test: refactor <trace/phi/conv.lua> " Sergey Kaplun via Tarantool-patches 2024-08-22 13:41 ` Sergey Bronnikov via Tarantool-patches 2024-09-04 23:16 ` Maxim Kokryashkin via Tarantool-patches 2024-08-21 8:58 ` [Tarantool-patches] [PATCH v2 luajit 28/45] test: enable <misc/recurse_deep.lua> " Sergey Kaplun via Tarantool-patches 2024-08-22 13:44 ` Sergey Bronnikov via Tarantool-patches 2024-09-04 23:16 ` Maxim Kokryashkin via Tarantool-patches 2024-08-21 8:58 ` [Tarantool-patches] [PATCH v2 luajit 29/45] test: remove <misc/recurse_tail.lua> " Sergey Kaplun via Tarantool-patches 2024-08-22 13:45 ` Sergey Bronnikov via Tarantool-patches 2024-09-04 23:16 ` Maxim Kokryashkin via Tarantool-patches 2024-08-21 8:58 ` [Tarantool-patches] [PATCH v2 luajit 30/45] test: enable <misc/stack_gc.lua> " Sergey Kaplun via Tarantool-patches 2024-08-22 13:46 ` Sergey Bronnikov via Tarantool-patches 2024-09-04 23:16 ` Maxim Kokryashkin via Tarantool-patches 2024-08-21 8:58 ` [Tarantool-patches] [PATCH v2 luajit 31/45] test: refactor <lang/gc_stack.lua> " Sergey Kaplun via Tarantool-patches 2024-08-22 13:47 ` Sergey Bronnikov via Tarantool-patches 2024-08-26 6:56 ` Sergey Kaplun via Tarantool-patches 2024-08-29 9:45 ` Sergey Bronnikov via Tarantool-patches 2024-09-04 23:17 ` Maxim Kokryashkin via Tarantool-patches 2024-08-21 8:58 ` [Tarantool-patches] [PATCH v2 luajit 32/45] test: enable <misc/stack_purge.lua> " Sergey Kaplun via Tarantool-patches 2024-08-22 13:49 ` Sergey Bronnikov via Tarantool-patches 2024-09-04 23:18 ` Maxim Kokryashkin via Tarantool-patches 2024-08-21 8:58 ` [Tarantool-patches] [PATCH v2 luajit 33/45] test: refactor <trace/stack_purge.lua> " Sergey Kaplun via Tarantool-patches 2024-08-22 13:49 ` Sergey Bronnikov via Tarantool-patches 2024-09-04 23:18 ` Maxim Kokryashkin via Tarantool-patches 2024-08-21 8:58 ` [Tarantool-patches] [PATCH v2 luajit 34/45] test: enable <misc/stackov.lua> " Sergey Kaplun via Tarantool-patches 2024-08-22 13:51 ` Sergey Bronnikov via Tarantool-patches 2024-08-22 14:34 ` Sergey Kaplun via Tarantool-patches 2024-08-23 15:42 ` Sergey Bronnikov via Tarantool-patches 2024-09-04 23:19 ` Maxim Kokryashkin via Tarantool-patches 2024-08-21 8:58 ` [Tarantool-patches] [PATCH v2 luajit 35/45] test: enable <misc/stackovc.lua> " Sergey Kaplun via Tarantool-patches 2024-08-22 13:53 ` Sergey Bronnikov via Tarantool-patches 2024-08-22 14:36 ` Sergey Kaplun via Tarantool-patches 2024-08-23 15:41 ` Sergey Bronnikov via Tarantool-patches 2024-09-04 23:19 ` Maxim Kokryashkin via Tarantool-patches 2024-08-21 8:58 ` [Tarantool-patches] [PATCH v2 luajit 36/45] test: enable <misc/tcall_base.lua> " Sergey Kaplun via Tarantool-patches 2024-08-22 14:11 ` Sergey Bronnikov via Tarantool-patches 2024-09-04 23:19 ` Maxim Kokryashkin via Tarantool-patches 2024-08-21 8:58 ` [Tarantool-patches] [PATCH v2 luajit 37/45] test: refactor <trace/tcall_base.lua> " Sergey Kaplun via Tarantool-patches 2024-08-22 14:12 ` Sergey Bronnikov via Tarantool-patches 2024-09-04 23:19 ` Maxim Kokryashkin via Tarantool-patches 2024-08-21 8:58 ` [Tarantool-patches] [PATCH v2 luajit 38/45] test: enable <misc/tcall_loop.lua> " Sergey Kaplun via Tarantool-patches 2024-08-22 14:14 ` Sergey Bronnikov via Tarantool-patches 2024-09-04 23:19 ` Maxim Kokryashkin via Tarantool-patches 2024-08-21 8:58 ` [Tarantool-patches] [PATCH v2 luajit 39/45] test: enable <misc/tonumber_scan.lua> " Sergey Kaplun via Tarantool-patches 2024-08-22 14:33 ` Sergey Bronnikov via Tarantool-patches [this message] 2024-09-04 23:20 ` Maxim Kokryashkin via Tarantool-patches 2024-08-21 8:58 ` [Tarantool-patches] [PATCH v2 luajit 40/45] test: remove <misc/uclo.lua> " Sergey Kaplun via Tarantool-patches 2024-08-22 14:43 ` Sergey Bronnikov via Tarantool-patches 2024-09-04 23:21 ` Maxim Kokryashkin via Tarantool-patches 2024-08-21 8:58 ` [Tarantool-patches] [PATCH v2 luajit 41/45] test: enable <misc/unordered_jit.lua> " Sergey Kaplun via Tarantool-patches 2024-08-22 14:49 ` Sergey Bronnikov via Tarantool-patches 2024-09-04 23:21 ` Maxim Kokryashkin via Tarantool-patches 2024-08-21 8:58 ` [Tarantool-patches] [PATCH v2 luajit 42/45] test: enable <misc/wbarrier.lua> " Sergey Kaplun via Tarantool-patches 2024-08-22 14:51 ` Sergey Bronnikov via Tarantool-patches 2024-09-04 23:21 ` Maxim Kokryashkin via Tarantool-patches 2024-08-21 8:58 ` [Tarantool-patches] [PATCH v2 luajit 43/45] test: enable <misc/wbarrier_jit.lua> " Sergey Kaplun via Tarantool-patches 2024-08-22 14:52 ` Sergey Bronnikov via Tarantool-patches 2024-09-04 23:21 ` Maxim Kokryashkin via Tarantool-patches 2024-08-21 8:58 ` [Tarantool-patches] [PATCH v2 luajit 44/45] test: enable <misc/wbarrier_obar.lua> " Sergey Kaplun via Tarantool-patches 2024-08-22 15:17 ` Sergey Bronnikov via Tarantool-patches 2024-09-04 23:22 ` Maxim Kokryashkin via Tarantool-patches 2024-08-21 8:58 ` [Tarantool-patches] [PATCH v2 luajit 45/45] test: update <LuaJIT-tests/README.md> Sergey Kaplun via Tarantool-patches 2024-08-22 15:17 ` Sergey Bronnikov via Tarantool-patches 2024-09-04 23:22 ` Maxim Kokryashkin via Tarantool-patches 2024-08-23 15:55 ` [Tarantool-patches] [PATCH v2 luajit 00/45] Rearrange LuaJIT misc tests Sergey Bronnikov via Tarantool-patches 2024-10-18 15:07 ` Sergey Kaplun via Tarantool-patches
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=7255a275-68de-43f1-8188-0950be8a6a6b@tarantool.org \ --to=tarantool-patches@dev.tarantool.org \ --cc=m.kokryashkin@tarantool.org \ --cc=sergeyb@tarantool.org \ --cc=skaplun@tarantool.org \ --subject='Re: [Tarantool-patches] [PATCH v2 luajit 39/45] test: enable <misc/tonumber_scan.lua> LuaJIT test' \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: link
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox