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 EE905A6A7C2; Thu, 1 Feb 2024 19:01:13 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org EE905A6A7C2 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=tarantool.org; s=dev; t=1706803274; bh=H6EED5lWg7wcLHAXyTSjyUlQs8wMdE+NXWSEFlZbIH0=; 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=W1DkiQkWH8+9V6hwJInVqpdwYB6FEHbLEq3PPXO+3hr/1Eoh8xQmK9DgDauGGlmCi 8KmpZdugyDAfzqswGzbjargUUM35DPiytulnU9uWkhRRbhUM7o5Su3JusSYTk5X7yG PqpjadSX04U33lYZZPyk57Fpr3/74RNrVc/q+wHc= Received: from smtp53.i.mail.ru (smtp53.i.mail.ru [95.163.41.90]) (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 96FACA6B9EE for ; Thu, 1 Feb 2024 19:01:12 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org 96FACA6B9EE Received: by smtp53.i.mail.ru with esmtpa (envelope-from ) id 1rVZV1-00000007yyQ-42G5; Thu, 01 Feb 2024 19:01:12 +0300 Message-ID: <2b42d0a7-6f9d-4f8e-81d4-9c0caa46e5a5@tarantool.org> Date: Thu, 1 Feb 2024 19:01:11 +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: <6530fdfc363b7d0e2ace9c8951d0025d4d3f152d.1706520765.git.skaplun@tarantool.org> In-Reply-To: <6530fdfc363b7d0e2ace9c8951d0025d4d3f152d.1706520765.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: B8F34718100C35BD X-77F55803: 4F1203BC0FB41BD9010253A383FA2A75ECC4B2554A31FE8EB5297114064901CE182A05F53808504054DF9FDE4159F15591417EB218679B82419D1DF1725B2EA7BBCBD0CDED06F352AE91743CFF4764B1 X-7FA49CB5: FF5795518A3D127A4AD6D5ED66289B5278DA827A17800CE7F65C230EDDCD559EEA1F7E6F0F101C67BD4B6F7A4D31EC0BCC500DACC3FED6E28638F802B75D45FF8AA50765F7900637F898CA578D17CA188638F802B75D45FF36EB9D2243A4F8B5A6FCA7DBDB1FC311F39EFFDF887939037866D6147AF826D8D94AFC38A63A6AA813820942FA67574CFE28914F4CEF3B00CC7F00164DA146DAFE8445B8C89999728AA50765F7900637F924B32C592EA89F389733CBF5DBD5E9C8A9BA7A39EFB766F5D81C698A659EA7CC7F00164DA146DA9985D098DBDEAEC82FFDA4F57982C5F4F6B57BC7E6449061A352F6E88A58FB86F5D81C698A659EA73AA81AA40904B5D9A18204E546F3947C251EFD5447B32ED603F1AB874ED890284AD6D5ED66289B523666184CF4C3C14F6136E347CC761E07725E5C173C3A84C3940A41BBCF1845AABA3038C0950A5D36B5C8C57E37DE458B330BD67F2E7D9AF16D1867E19FE14079C09775C1D3CA48CFE478A468B35FE7671DD303D21008E298D5E8D9A59859A8B6B372FE9A2E580EFC725E5C173C3A84C3AA8C68A3574AB3B435872C767BF85DA2F004C90652538430E4A6367B16DE6309 X-C1DE0DAB: 0D63561A33F958A590C8DBF7AC0631FE5002B1117B3ED69694E7BE0B7F10A485FB820E9FE7BD014C823CB91A9FED034534781492E4B8EEAD2609375A3A81E2DDBDAD6C7F3747799A X-C8649E89: 1C3962B70DF3F0ADE00A9FD3E00BEEDF3FED46C3ACD6F73ED3581295AF09D3DF87807E0823442EA2ED31085941D9CD0AF7F820E7B07EA4CF5D8B97E90EE23E3A854A4E2E95D7672E9A60A77B18EC0EDBE6A622F76111A34DD2D1C8B3CBCE0EE8BAF4CF3B87E910B1FF9351FFE673EAE78256C5D22566030E05A196B6AD1913F25F4332CA8FE04980913E6812662D5F2AB9AF64DB4688768036DF5FE9C0001AF333F2C28C22F508233FCF178C6DD14203 X-D57D3AED: 3ZO7eAau8CL7WIMRKs4sN3D3tLDjz0dLbV79QFUyzQ2Ujvy7cMT6pYYqY16iZVKkSc3dCLJ7zSJH7+u4VD18S7Vl4ZUrpaVfd2+vE6kuoey4m4VkSEu530nj6fImhcD4MUrOEAnl0W826KZ9Q+tr5ycPtXkTV4k65bRjmOUUP8cvGozZ33TWg5HZplvhhXbhDGzqmQDTd6OAevLeAnq3Ra9uf7zvY2zzsIhlcp/Y7m53TZgf2aB4JOg4gkr2biojKdLLj0Q7SP9RAG0ViG9tQg== X-Mailru-Sender: C4F68CFF4024C8867DFDF7C7F2588458A062B4F321E30B95AA70CB78A12CDBB541CC6E264246F12D8345A53A7D7C8AEB645D15D82EE4B272BD6E4642A116CA93524AA66B5ACBE6721EF430B9A63E2A504198E0F3ECE9B5443453F38A29522196 X-Mras: Ok Subject: Re: [Tarantool-patches] [PATCH v2 luajit 07/26] 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! LGTM On 1/29/24 13:45, Sergey Kaplun wrote: > This patch names all subtests and includes the test in . > The test 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_callback.lua | 45 +++++++++++----------- > test/LuaJIT-tests/lib/ffi/index | 1 + > 2 files changed, 24 insertions(+), 22 deletions(-) > > diff --git a/test/LuaJIT-tests/lib/ffi/ffi_callback.lua b/test/LuaJIT-tests/lib/ffi/ffi_callback.lua > index 1fd14bd0..44fac680 100644 > --- a/test/LuaJIT-tests/lib/ffi/ffi_callback.lua > +++ b/test/LuaJIT-tests/lib/ffi/ffi_callback.lua > @@ -6,7 +6,7 @@ void qsort(void *base, size_t nmemb, size_t size, > int (*compar)(const uint8_t *, const uint8_t *)); > ]] > > -do > +do --- blacklisted callback > local cb = ffi.cast("int (*)(int, int, int)", function(a, b, c) > return a+b+c > end) > @@ -19,11 +19,11 @@ do > end > end > > -do > +do --- cast to function > assert(ffi.cast("int64_t (*)(int64_t, int64_t, int64_t)", function(a, b, c) > return a+b+c > - end)(12345678901234567LL, 70000000000000001LL, 10000000909090904LL) == > - 12345678901234567LL+70000000000000001LL+10000000909090904LL) > + end)(12345678901234567LL, 70000000000000001LL, 10000000909090904LL) == > + 12345678901234567LL + 70000000000000001LL + 10000000909090904LL) > > assert(ffi.cast("double (*)(double, float, double)", function(a, b, c) > return a+b+c > @@ -37,21 +37,23 @@ do > return a+b+c > end)(7.125, -123.25, 9999.33) == 9883.205078125) > > - assert(ffi.cast("int (*)(int, int, int, int, int, int, int, int, int, int)", > - function(a, b, c, d, e, f, g, h, i, j) > - return a+b+c+d+e+f+g+h+i+j > - end)(-42, 17, 12345, 9987, -100, 11, 51, 0x12345678, 338, -78901234) == > - -42+17+12345+9987-100+11+51+0x12345678+338-78901234) > + if not (jit.os == "OSX" and jit.arch == "arm64") then -- NYI > + assert(ffi.cast("int (*)(int, int, int, int, int, int, int, int, int, int)", > + function(a, b, c, d, e, f, g, h, i, j) > + return a+b+c+d+e+f+g+h+i+j > + end)(-42, 17, 12345, 9987, -100, 11, 51, 0x12345678, 338, -78901234) == > + -42 + 17 + 12345 + 9987 - 100 + 11 + 51 + 0x12345678 + 338 - 78901234) > + end > > assert(ffi.cast("double (*)(double, double, double, double, double, double, double, double, double, double)", > function(a, b, c, d, e, f, g, h, i, j) > return a+b+c+d+e+f+g+h+i+j > - end)(-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)(-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 > > -- Target-specific tests. > -if jit.arch == "x86" then > +do --- cast with fastcall attribute +x86 > assert(ffi.cast("__fastcall int (*)(int, int, int)", function(a, b, c) > return a+b+c > end)(10, 99, 13) == 122) > @@ -63,12 +65,11 @@ if jit.arch == "x86" then > -- Test reordering. > assert(ffi.cast("int64_t __fastcall (*)(int64_t, int, int)", function(a, b, c) > return a+b+c > - end)(12345678901234567LL, 12345, 989797123) == > - 12345678901234567LL+12345+989797123) > + end)(12345678901234567LL, 12345, 989797123) == > + 12345678901234567LL + 12345 + 989797123) > end > > --- Error handling. > -do > +do --- error handling > local function f() > return > end -- Error for result conversion triggered here. > @@ -84,7 +85,7 @@ do > assert(pcall(ffi.cast("int (*)(int,int,int,int, int,int,int,int, int)", function() error("test") end), 1,1,1,1, 1,1,1,1, 1) == false) > end > > -do > +do --- qsort > local function cmp(pa, pb) > local a, b = pa[0], pb[0] > if a < b then > @@ -102,7 +103,7 @@ do > for i=0,254 do assert(arr[i] <= arr[i+1]) end > end > > -if ffi.abi"win" then > +do --- EnumWindows +windows > ffi.cdef[[ > typedef int (__stdcall *WNDENUMPROC)(void *hwnd, intptr_t l); > int EnumWindows(WNDENUMPROC func, intptr_t l); > @@ -123,7 +124,7 @@ if ffi.abi"win" then > assert(count > 10) > end > > -do > +do --- callback free, callback set > local cb = ffi.cast("int(*)(void)", function() return 1 end) > assert(cb() == 1) > cb:free() > @@ -136,7 +137,7 @@ do > assert(cb() == 3) > end > > -do > +do --- compiled free of function > local ft = ffi.typeof("void(*)(void)") > local function f() end > local t = {} > @@ -146,11 +147,11 @@ do > end > end > > -do > +do --- fast function cast string.byte > assert(ffi.cast("int (*)()", function() return string.byte"A" end)() == 65) > end > > -do > +do --- debug.traceback cast > local f = ffi.cast("void (*)(void)", function() debug.traceback() end) > debug.sethook(function() debug.sethook(nil, "", 0); f() end, "", 1) > local x > diff --git a/test/LuaJIT-tests/lib/ffi/index b/test/LuaJIT-tests/lib/ffi/index > index 599a0182..9a22104a 100644 > --- a/test/LuaJIT-tests/lib/ffi/index > +++ b/test/LuaJIT-tests/lib/ffi/index > @@ -5,6 +5,7 @@ err.lua > ffi_arith_ptr.lua > ffi_bitfield.lua > ffi_call.lua > +ffi_callback.lua > istype.lua > jit_array.lua > jit_complex.lua