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 D832F986782; Tue, 23 Jan 2024 12:32:10 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org D832F986782 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=tarantool.org; s=dev; t=1706002330; bh=uOhj9xIbYIg0n8xiA5+qx0slg3EybVpLhvoZQK2kSz8=; h=Date:To:Cc:References:In-Reply-To:Subject:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: From:Reply-To:From; b=D4tndJMOu0bAKmuDvbPoqzgRnO5mtZ1GwsNsAyzu4ZHw0n2zHyqiJHCXFpoP2zhj4 /MZsn6lC6Yp8HyoqY1z93T76j/hC56VCazrHAdbVQOY+L3tfvlWyNum7uCCmCUuPDx Rcg2cyf4WxyZS1MGZKEqcItgwQvi9LsPM1koNYOY= Received: from smtp45.i.mail.ru (smtp45.i.mail.ru [95.163.41.83]) (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 602BF986781 for ; Tue, 23 Jan 2024 12:32:10 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org 602BF986781 Received: by smtp45.i.mail.ru with esmtpa (envelope-from ) id 1rSD8b-00DyxM-1S; Tue, 23 Jan 2024 12:32:09 +0300 Message-ID: Date: Tue, 23 Jan 2024 12:32:09 +0300 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Content-Language: en-US To: Sergey Kaplun , Maxim Kokryashkin Cc: tarantool-patches@dev.tarantool.org References: <6785a95ee05ea262eff6226bc7867c9280ea37ea.1705661401.git.skaplun@tarantool.org> In-Reply-To: <6785a95ee05ea262eff6226bc7867c9280ea37ea.1705661401.git.skaplun@tarantool.org> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-Mailru-Src: smtp X-4EC0790: 10 X-7564579A: EEAE043A70213CC8 X-77F55803: 4F1203BC0FB41BD9C4CE30293DC53173C6572E29AED1347C5733A4CF546C45731313CFAB8367EF908E2BE116634AD74DB32AF8C756C2CAF0F8FCB9087383B051AC16AB0E7CA82C49AE87E38DD37F4ED5 X-7FA49CB5: FF5795518A3D127A4AD6D5ED66289B5278DA827A17800CE7C579B1C3ABE6C709C2099A533E45F2D0395957E7521B51C2CFCAF695D4D8E9FCEA1F7E6F0F101C6778DA827A17800CE707BCAA832FAF0FF28F08D7030A58E5AD1A62830130A00468AEEEE3FBA3A834EE7353EFBB55337566D3A137727DC7E4DD1EEB6B2EF4FB96E2ED3A1B16549E6466A471835C12D1D9774AD6D5ED66289B5278DA827A17800CE7ABB305BD10C6E5099FA2833FD35BB23D2EF20D2F80756B5F868A13BD56FB6657A471835C12D1D977725E5C173C3A84C3CF36E64A7E3F8E58117882F4460429728AD0CFFFB425014E868A13BD56FB6657D81D268191BDAD3DC09775C1D3CA48CFBFFF513DCDB8CC61BA3038C0950A5D36C8A9BA7A39EFB766D91E3A1F190DE8FDBA3038C0950A5D36D5E8D9A59859A8B65276EF5FA9B1B5E376E601842F6C81A1F004C906525384303E02D724532EE2C3F43C7A68FF6260569E8FC8737B5C2249957A4DEDD2346B42E827F84554CEF50127C277FBC8AE2E8BF1175FABE1C0F9B6AAAE862A0553A39223F8577A6DFFEA7C789C969B8F27C422C4224003CC83647689D4C264860C145E X-C1DE0DAB: 0D63561A33F958A58F4FE0E453D94AB68216663C95E24714DBA333413C0F5145F87CCE6106E1FC07E67D4AC08A07B9B06A1CB4668A9CA5FACB5012B2E24CD356 X-C8649E89: 1C3962B70DF3F0ADE00A9FD3E00BEEDF3FED46C3ACD6F73ED3581295AF09D3DF87807E0823442EA2ED31085941D9CD0AF7F820E7B07EA4CFF3C3CA2FA098A890B7A8A0707C4782FC7D23F7A15AAB3455D62AB143BB3C207AFB9773CE30426B0E4BEAD515961AA0A7C93B968585DAAD4BD46D6506F3C32295E48CAC7CA610320002C26D483E81D6BE0DBAE6F56676BC7117BB6831D7356A2DEC5B5AD62611EEC62B5AFB4261A09AF0 X-D57D3AED: 3ZO7eAau8CL7WIMRKs4sN3D3tLDjz0dLbV79QFUyzQ2Ujvy7cMT6pYYqY16iZVKkSc3dCLJ7zSJH7+u4VD18S7Vl4ZUrpaVfd2+vE6kuoey4m4VkSEu530nj6fImhcD4MUrOEAnl0W826KZ9Q+tr5ycPtXkTV4k65bRjmOUUP8cvGozZ33TWg5HZplvhhXbhDGzqmQDTd6OAevLeAnq3Ra9uf7zvY2zzsIhlcp/Y7m53TZgf2aB4JOg4gkr2biojGSQVxX8i/5W5UnqQ/jRZ/Q== X-Mailru-Sender: C4F68CFF4024C8867DFDF7C7F258845852EED3FCC514E50E3CDE5381654048BBEE413AC195CE408C282EC151BADDC1D3523A6D01B4765B2DFB59E2DDD9FE06B14FA522850F29BC30B0DAF586E7D11B3E67EA787935ED9F1B X-Mras: Ok Subject: Re: [Tarantool-patches] [PATCH luajit 05/25] test: enable in LuaJIT-tests 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 Bronnikov via Tarantool-patches Reply-To: Sergey Bronnikov Errors-To: tarantool-patches-bounces@dev.tarantool.org Sender: "Tarantool-patches" Hi, Sergey! thanks for the patch! please take a look on my comments Sergey On 1/19/24 14:32, Sergey Kaplun wrote: > This patch removes unused `dofile()`. Also, it uses the basename of the > ctest library to be loaded via ffi. It adds groups with names of > subtests and enables the test in . Complex type is undefined on > Windows, so the correponding tests are not enabled for this platform. > Fastcalls are enabled only for the x86 architecture. Stdcalls are > enabled only for Windows on x86. Tests with calls with 10 arguments with > sizes less than 8 bits are dummy for M1. This suite lacks a mechanism to > skip subtests satisfying complicated conditions, so it is done manually > by the corresponding `if` check. > > Part of tarantool/tarantool#9398 > --- > test/LuaJIT-tests/lib/ffi/ffi_call.lua | 180 +++++++++++++------------ > test/LuaJIT-tests/lib/ffi/index | 1 + > 2 files changed, 92 insertions(+), 89 deletions(-) > > diff --git a/test/LuaJIT-tests/lib/ffi/ffi_call.lua b/test/LuaJIT-tests/lib/ffi/ffi_call.lua > index 1eb5e906..c362f3e0 100644 > --- a/test/LuaJIT-tests/lib/ffi/ffi_call.lua > +++ b/test/LuaJIT-tests/lib/ffi/ffi_call.lua > @@ -1,8 +1,5 @@ > - > local ffi = require("ffi") > > -dofile("../common/ffi_util.inc") > - > local tonumber = tonumber > > ffi.cdef[[ > @@ -73,81 +70,87 @@ double __stdcall stdcall_dd(double a, double b); > float __stdcall stdcall_ff(float a, float b); > ]] > > -local C = ffi.load("../clib/ctest") > +local C = ffi.load("ctest") > > -assert(C.call_i(-42) == -41) > -assert(C.call_ii(-42, 17) == -42+17) > -assert(C.call_10i(-42, 17, 12345, 9987, -100, 11, 51, 0x12345678, 338, -78901234) == -42+17+12345+9987-100+11+51+0x12345678+338-78901234) > +do --- call int enum double float args > + assert(C.call_i(-42) == -41) > + assert(C.call_ii(-42, 17) == -42+17) > > -assert(C.call_ie(123) == 124) > + assert(C.call_ie(123) == 124) > > -assert(tonumber(C.call_ji(0x123456789LL, -17)) == tonumber(0x123456789LL-17)) > -assert(tonumber(C.call_ij(-17, 0x123456789LL)) == tonumber(0x123456789LL-17)) > -assert(tonumber(C.call_jj(-42, 17)) == -42+17) > -assert(tonumber(C.call_jj(0x123456789abcdef0LL, -0x789abcde99887766LL)) == tonumber(0x123456789abcdef0LL-0x789abcde99887766LL)) > + assert(tonumber(C.call_ji(0x123456789LL, -17)) == tonumber(0x123456789LL-17)) > + assert(tonumber(C.call_ij(-17, 0x123456789LL)) == tonumber(0x123456789LL-17)) > + assert(tonumber(C.call_jj(-42, 17)) == -42+17) > + assert(tonumber(C.call_jj(0x123456789abcdef0LL, -0x789abcde99887766LL)) == tonumber(0x123456789abcdef0LL-0x789abcde99887766LL)) > > -assert(C.call_dd(12.5, -3.25) == 12.5-3.25) > -assert(C.call_10d(-42.5, 17.125, 12345.5, 9987, -100.625, 11, 51, 0x12345678, 338, -78901234.75) == -42.5+17.125+12345.5+9987-100.625+11+51+0x12345678+338-78901234.75) > + assert(C.call_dd(12.5, -3.25) == 12.5-3.25) > > -assert(C.call_ff(12.5, -3.25) == 12.5-3.25) > -assert(C.call_10f(-42.5, 17.125, 12345.5, 9987, -100.625, 11, 51, 0x123456, 338, -789012.75) == -42.5+17.125+12345.5+9987-100.625+11+51+0x123456+338-789012.75) > + assert(C.call_ff(12.5, -3.25) == 12.5-3.25) > > -assert(C.call_idifjd(-42, 17.125, 0x12345, -100.625, 12345678901234, -789012.75) == -42+17.125+0x12345-100.625+12345678901234-789012.75) > + assert(C.call_idifjd(-42, 17.125, 0x12345, -100.625, 12345678901234, -789012.75) == -42+17.125+0x12345-100.625+12345678901234-789012.75) > +end > + > +do --- call 10 args > + if not (jit.os == "OSX" and jit.arch == "arm64") then -- NYI > + assert(C.call_10i(-42, 17, 12345, 9987, -100, 11, 51, 0x12345678, 338, -78901234) == -42+17+12345+9987-100+11+51+0x12345678+338-78901234) these tests totally unreadable. I would rewrite such tests in the following manner: local args = {-42, 17, 12345, 9987, -100, 11, 51, 0x12345678, 338, -78901234} assert(C.call_10i(unpack(args)) == sum(args)) where `sum` is a function that sum elements in a passed table. (Or even calculate RHS once and use it and doesn't depend on calculations in runtime.) Same comment for other similar tests. > + assert(C.call_10f(-42.5, 17.125, 12345.5, 9987, -100.625, 11, 51, 0x123456, 338, -789012.75) == -42.5+17.125+12345.5+9987-100.625+11+51+0x123456+338-789012.75) > + end > + assert(C.call_10d(-42.5, 17.125, 12345.5, 9987, -100.625, 11, 51, 0x12345678, 338, -78901234.75) == -42.5+17.125+12345.5+9987-100.625+11+51+0x12345678+338-78901234.75) > +end > > -do > +do --- call pointer arg > local a = ffi.new("int[10]", -42) > assert(C.call_p_i(a) == -42+1) > assert(tonumber(ffi.cast("intptr_t", C.call_p_p(a+3))) == tonumber(ffi.cast("intptr_t", a+4))) > assert(C.call_pp_i(a+8, a+5) == 3) > end > > --- vararg > -assert(C.call_ividi(-42, ffi.new("int", 17), 12.5, ffi.new("int", 131)) == -42+17+12.5+131) > +do --- vararg > + assert(C.call_ividi(-42, ffi.new("int", 17), 12.5, ffi.new("int", 131)) == -42+17+12.5+131) > +end > > -- complex > -if pcall(function() return C.call_dd_cd end) then > - do > - local c = C.call_dd_cd(12.5, -3.25) > - assert(c.re == 12.5 and c.im == -3.25*2) > - end > - do > - local c1 = ffi.new("complex", 12.5, -3.25) > - local cz = C.call_cd(c1) > - assert(cz.re == 12.5+1 and cz.im == -3.25-2) > - end > - do > - local c1 = ffi.new("complex", 12.5, -3.25) > - local c2 = ffi.new("complex", -17.125, 100.625) > - local cz = C.call_cdcd(c1, c2) > - assert(cz.re == 12.5-17.125 and cz.im == -3.25+100.625) > - end > +do --- dd_cd -windows > + local c = C.call_dd_cd(12.5, -3.25) > + assert(c.re == 12.5 and c.im == -3.25*2) > +end > +do --- cd -windows > + local c1 = ffi.new("complex", 12.5, -3.25) > + local cz = C.call_cd(c1) > + assert(cz.re == 12.5+1 and cz.im == -3.25-2) > +end > +do --- cdcd -windows > + local c1 = ffi.new("complex", 12.5, -3.25) > + local c2 = ffi.new("complex", -17.125, 100.625) > + local cz = C.call_cdcd(c1, c2) > + assert(cz.re == 12.5-17.125 and cz.im == -3.25+100.625) > +end > > - do > - local c = C.call_ff_cf(12.5, -3.25) > - assert(c.re == 12.5 and c.im == -3.25*2) > - end > - do > - local c1 = ffi.new("complex float", 12.5, -3.25) > - local cz = C.call_cf(c1) > - assert(cz.re == 12.5+1 and cz.im == -3.25-2) > - end > - do > - local c1 = ffi.new("complex float", 12.5, -3.25) > - local c2 = ffi.new("complex float", -17.125, 100.625) > - local cz = C.call_cfcf(c1, c2) > - assert(cz.re == 12.5-17.125 and cz.im == -3.25+100.625) > - end > +do --- ff_cf -windows > + local c = C.call_ff_cf(12.5, -3.25) > + assert(c.re == 12.5 and c.im == -3.25*2) > +end > +do --- cf -windows > + local c1 = ffi.new("complex float", 12.5, -3.25) > + local cz = C.call_cf(c1) > + assert(cz.re == 12.5+1 and cz.im == -3.25-2) > +end > +do --- cfcf -windows > + local c1 = ffi.new("complex float", 12.5, -3.25) > + local c2 = ffi.new("complex float", -17.125, 100.625) > + local cz = C.call_cfcf(c1, c2) > + assert(cz.re == 12.5-17.125 and cz.im == -3.25+100.625) > end > > -- structs > -do > +do --- s_ii > local s1 = ffi.new("s_ii", -42, 17) > local sz = C.call_sii(s1) > assert(s1.x == -42 and s1.y == 17) > assert(sz.x == -42 and sz.y == 17) > end > > -do > +do --- s_jj > local s1 = ffi.new("s_jj", 0x123456789abcdef0LL, -0x789abcde99887766LL) > local sz = C.call_sjj(s1) > assert(s1.x == 0x123456789abcdef0LL) > @@ -156,28 +159,28 @@ do > assert(sz.y == -0x789abcde99887766LL) > end > > -do > +do --- s_ff > local s1 = ffi.new("s_ff", 12.5, -3.25) > local sz = C.call_sff(s1) > assert(s1.x == 12.5 and s1.y == -3.25) > assert(sz.x == 12.5 and sz.y == -3.25) > end > > -do > +do --- s_dd > local s1 = ffi.new("s_dd", 12.5, -3.25) > local sz = C.call_sdd(s1) > assert(s1.x == 12.5 and s1.y == -3.25) > assert(sz.x == 12.5 and sz.y == -3.25) > end > > -do > +do --- s_8i > local s1 = ffi.new("s_8i", -42, 17, 12345, 9987, -100, 11, 51, 0x12345678) > local sz = C.call_s8i(s1) > assert(s1.a+s1.b+s1.c+s1.d+s1.e+s1.f+s1.g+s1.h == -42+17+12345+9987-100+11+51+0x12345678) > assert(sz.a+sz.b+sz.c+sz.d+sz.e+sz.f+sz.g+sz.h == -42+17+12345+9987-100+11+51+0x12345678) > end > > -do > +do --- s_ii s_ii > local s1 = ffi.new("s_ii", -42, 17) > local s2 = ffi.new("s_ii", 0x12345, -98765) > local sz = C.call_siisii(s1, s2) > @@ -186,7 +189,7 @@ do > assert(sz.x == -42+0x12345 and sz.y == 17-98765) > end > > -do > +do --- s_ff s_ff > local s1 = ffi.new("s_ff", 12.5, -3.25) > local s2 = ffi.new("s_ff", -17.125, 100.625) > local sz = C.call_sffsff(s1, s2) > @@ -195,7 +198,7 @@ do > assert(sz.x == 12.5-17.125 and sz.y == -3.25+100.625) > end > > -do > +do --- s_dd s_dd > local s1 = ffi.new("s_dd", 12.5, -3.25) > local s2 = ffi.new("s_dd", -17.125, 100.625) > local sz = C.call_sddsdd(s1, s2) > @@ -204,7 +207,7 @@ do > assert(sz.x == 12.5-17.125 and sz.y == -3.25+100.625) > end > > -do > +do --- s_8i s_8i > local s1 = ffi.new("s_8i", -42, 17, 12345, 9987, -100, 11, 51, 0x12345678) > local s2 = ffi.new("s_8i", 99, 311, 98765, -51, 312, 97, 17, 0x44332211) > local sz = C.call_s8is8i(s1, s2) > @@ -215,7 +218,7 @@ do > assert(sz.h == 0x12345678+0x44332211) > end > > -do > +do --- is8ii > local s1 = ffi.new("s_8i", -42, 17, 12345, 9987, -100, 11, 51, 0x12345678) > local sz = C.call_is8ii(19, s1, -51) > assert(s1.a+s1.b+s1.c+s1.d+s1.e+s1.f+s1.g+s1.h == -42+17+12345+9987-100+11+51+0x12345678) > @@ -225,42 +228,41 @@ do > end > > -- target-specific > -if jit.arch == "x86" then > +do --- fastcall void int double +x86 > assert(C.fastcall_void() == 1) > assert(C.fastcall_i(-42) == -41) > assert(C.fastcall_ii(-42, 17) == -42+17) > assert(C.fastcall_iii(-42, 17, 139) == -42+17+139) > assert(tonumber(C.fastcall_ji(0x123456789LL, -17)) == tonumber(0x123456789LL-17)) > assert(C.fastcall_dd(12.5, -3.25) == 12.5-3.25) > +end > > - do > - local a = ffi.new("int[10]", -42) > - assert(C.fastcall_pp_i(a+8, a+5) == 3) > - end > - > - do > - local s1 = ffi.new("s_ii", -42, 17) > - local s2 = ffi.new("s_ii", 0x12345, -98765) > - local sz = C.fastcall_siisii(s1, s2) > - assert(s1.x == -42 and s1.y == 17) > - assert(s2.x == 0x12345 and s2.y == -98765) > - assert(sz.x == -42+0x12345 and sz.y == 17-98765) > - end > +do --- fastcall pp_i +x86 > + local a = ffi.new("int[10]", -42) > + assert(C.fastcall_pp_i(a+8, a+5) == 3) > +end > > - do > - local s1 = ffi.new("s_dd", 12.5, -3.25) > - local s2 = ffi.new("s_dd", -17.125, 100.625) > - local sz = C.fastcall_sddsdd(s1, s2) > - assert(s1.x == 12.5 and s1.y == -3.25) > - assert(s2.x == -17.125 and s2.y == 100.625) > - assert(sz.x == 12.5-17.125 and sz.y == -3.25+100.625) > - end > +do --- fastcall s_ii s_ii +x86 > + local s1 = ffi.new("s_ii", -42, 17) > + local s2 = ffi.new("s_ii", 0x12345, -98765) > + local sz = C.fastcall_siisii(s1, s2) > + assert(s1.x == -42 and s1.y == 17) > + assert(s2.x == 0x12345 and s2.y == -98765) > + assert(sz.x == -42+0x12345 and sz.y == 17-98765) > +end > > - if jit.os == "Windows" then > - assert(C.stdcall_i(-42) == -41) > - assert(C.stdcall_ii(-42, 17) == -42+17) > - assert(C.stdcall_dd(12.5, -3.25) == 12.5-3.25) > - assert(C.stdcall_ff(12.5, -3.25) == 12.5-3.25) > - end > +do --- fastcall s_dd s_dd +x86 > + local s1 = ffi.new("s_dd", 12.5, -3.25) > + local s2 = ffi.new("s_dd", -17.125, 100.625) > + local sz = C.fastcall_sddsdd(s1, s2) > + assert(s1.x == 12.5 and s1.y == -3.25) > + assert(s2.x == -17.125 and s2.y == 100.625) > + assert(sz.x == 12.5-17.125 and sz.y == -3.25+100.625) > end > > +do --- stdcall +x86 +windows > + assert(C.stdcall_i(-42) == -41) > + assert(C.stdcall_ii(-42, 17) == -42+17) > + assert(C.stdcall_dd(12.5, -3.25) == 12.5-3.25) > + assert(C.stdcall_ff(12.5, -3.25) == 12.5-3.25) > +end > diff --git a/test/LuaJIT-tests/lib/ffi/index b/test/LuaJIT-tests/lib/ffi/index > index 8d833107..599a0182 100644 > --- a/test/LuaJIT-tests/lib/ffi/index > +++ b/test/LuaJIT-tests/lib/ffi/index > @@ -4,6 +4,7 @@ copy_fill.lua > err.lua > ffi_arith_ptr.lua > ffi_bitfield.lua > +ffi_call.lua > istype.lua > jit_array.lua > jit_complex.lua