From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from [87.239.111.99] (localhost [127.0.0.1]) by dev.tarantool.org (Postfix) with ESMTP id 4B2D4C7CE41; Wed, 21 Aug 2024 12:18:32 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org 4B2D4C7CE41 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=tarantool.org; s=dev; t=1724231912; bh=R1Zsdh399NLG1cXbCyVgdCoBH66EskiLLwEeKvkMSCY=; h=To:Date:In-Reply-To:References:Subject:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To:Cc: From; b=w7HTcavVf5GpRkKfReftH3KE6z+JiCAIWacRpGwhAPeJSF+G5vTMpb7QNeSp8FjDq Mx4rIZcEm05NdrZWje5ZzV810tGSLhP5bonTKHzZ6AAPqkFeaykz/VrfxHVCekukTH 6+4GmLzGYcz+m7GLfCRfERLNQbkXlOX4hfHD8ndQ= Received: from smtp35.i.mail.ru (smtp35.i.mail.ru [95.163.41.76]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by dev.tarantool.org (Postfix) with ESMTPS id CFE4DC61999 for ; Wed, 21 Aug 2024 12:01:40 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org CFE4DC61999 Received: by smtp35.i.mail.ru with esmtpa (envelope-from ) id 1sghDn-00000005aRz-47vB; Wed, 21 Aug 2024 12:01:40 +0300 To: Maxim Kokryashkin , Sergey Bronnikov Date: Wed, 21 Aug 2024 11:58:42 +0300 Message-ID: X-Mailer: git-send-email 2.45.2 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Mailru-Src: smtp X-4EC0790: 10 X-7564579A: 646B95376F6C166E X-77F55803: 4F1203BC0FB41BD93D5A650E6D4F687E3F95B42C72368E38E708D993FA5736C4182A05F538085040E2B4DF28154CEE61D27678DDAA806314D08B5DCF69FF07BCEFF80BD07D1CDB79F600E77B63AAB791 X-7FA49CB5: FF5795518A3D127A4AD6D5ED66289B5278DA827A17800CE7CB5C87C4C9A74E8BEA1F7E6F0F101C67BD4B6F7A4D31EC0BCC500DACC3FED6E28638F802B75D45FF8AA50765F7900637817108B649554FEC8638F802B75D45FF36EB9D2243A4F8B5A6FCA7DBDB1FC311F39EFFDF887939037866D6147AF826D8E8C8A2BE627E3FF8C1F3096FD6B0A5BA7FFBF7174B9DFE58CC7F00164DA146DAFE8445B8C89999728AA50765F7900637F3E38EE449E3E2AE389733CBF5DBD5E9C8A9BA7A39EFB766F5D81C698A659EA7CC7F00164DA146DA9985D098DBDEAEC8C2B5EEE3591E0D35F6B57BC7E6449061A352F6E88A58FB86F5D81C698A659EA7E827F84554CEF5019E625A9149C048EE9ECD01F8117BC8BEE2021AF6380DFAD18AA50765F790063735872C767BF85DA227C277FBC8AE2E8B9EB32FE0C26A3A4C75ECD9A6C639B01B4E70A05D1297E1BBCB5012B2E24CD356 X-C1DE0DAB: 0D63561A33F958A5B2426D13099090605002B1117B3ED696D0C9E559FB0D152A406406D89DD9EB8A823CB91A9FED034534781492E4B8EEADA2D5570B22232E1EC79554A2A72441328621D336A7BC284946AD531847A6065A535571D14F44ED41 X-C8649E89: 1C3962B70DF3F0ADE00A9FD3E00BEEDF3FED46C3ACD6F73ED3581295AF09D3DF87807E0823442EA2ED31085941D9CD0AF7F820E7B07EA4CFD8063E41F55CDF72C27C7706929D64679FF32B01ED48B03F726F73E87FE492E7768602CF99B16996D14E51FF79EEE603044E36DCBBE40322B2A94BCD9D7316CE48A4F14C76C82C1CC226CC413062362A913E6812662D5F2A5EAB5682573093F7837F15F2B5E4A70B33F2C28C22F508233FCF178C6DD14203 X-D57D3AED: 3ZO7eAau8CL7WIMRKs4sN3D3tLDjz0dLbV79QFUyzQ2Ujvy7cMT6pYYqY16iZVKkSc3dCLJ7zSJH7+u4VD18S7Vl4ZUrpaVfd2+vE6kuoey4m4VkSEu530nj6fImhcD4MUrOEAnl0W826KZ9Q+tr5ycPtXkTV4k65bRjmOUUP8cvGozZ33TWg5HZplvhhXbhDGzqmQDTd6OAevLeAnq3Ra9uf7zvY2zzsIhlcp/Y7m53TZgf2aB4JOg4gkr2biojegttVMu7AX8M2ZMKCQ64dw== X-DA7885C5: E19CCECA672C2668F255D290C0D534F9CDFB50CD43EDE037DF04AEA226ABA48A1AFB29BC0068ABFF5B1A4C17EAA7BC4BEF2421ABFA55128DAF83EF9164C44C7E X-Mailru-Sender: 689FA8AB762F7393C6D0B12EA33CAA9B9BCF179ACDD8C59EDAC77899D9C4377FD03FB18BD9DD78DBE49D44BB4BD9522A059A1ED8796F048DB274557F927329BE89D5A3BC2B10C37545BD1C3CC395C826B4A721A3011E896F X-Mras: Ok Subject: [Tarantool-patches] [PATCH v2 luajit 39/45] test: enable LuaJIT test X-BeenThere: tarantool-patches@dev.tarantool.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Tarantool development patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , From: Sergey Kaplun via Tarantool-patches Reply-To: Sergey Kaplun Cc: tarantool-patches@dev.tarantool.org Errors-To: tarantool-patches-bounces@dev.tarantool.org Sender: "Tarantool-patches" This patch moves the aforementioned test from the to the directory, includes it in , 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 --- 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 -- 2.45.2