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 91D6B98678A; Tue, 23 Jan 2024 12:36:53 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org 91D6B98678A DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=tarantool.org; s=dev; t=1706002613; bh=b4Msv3JwCxRWTAf3md6h5VWTMCGFOkoWTTZTUjoYtlc=; 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=pvTHG41s9b0tnFC31QDkffBXqQFY2m8Q59sbqpNNL3CILxHsyHdzJeazg+MIfEV2q /H+QTDScgmOQo/6uNA9mjeE3ckQq83PrkKX2Sx2VENtfW80rlBYSlfKcJxeH4TCwSO lOylV+VHeagxIeKGgBdEKuPPPBDLxH9nmAXP3GLo= Received: from smtp58.i.mail.ru (smtp58.i.mail.ru [95.163.41.96]) (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 1A554986781 for ; Tue, 23 Jan 2024 12:36:52 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org 1A554986781 Received: by smtp58.i.mail.ru with esmtpa (envelope-from ) id 1rSDD8-002iDs-0p; Tue, 23 Jan 2024 12:36:50 +0300 Content-Type: multipart/alternative; boundary="------------2bTEm6BU16pQH58fH3UjsVlZ" Message-ID: <02757523-a8d3-4d46-a47f-aeca721c9c9b@tarantool.org> Date: Tue, 23 Jan 2024 12:36:49 +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: <8254ae42f1f9e872efecf156cfa0885156c934d9.1705661401.git.skaplun@tarantool.org> In-Reply-To: <8254ae42f1f9e872efecf156cfa0885156c934d9.1705661401.git.skaplun@tarantool.org> X-Mailru-Src: smtp X-4EC0790: 10 X-7564579A: 646B95376F6C166E X-77F55803: 4F1203BC0FB41BD9AE5B4AFB3AE2A5903BF75383F3F9E5C7DFDDEC3DF03165DE182A05F538085040004D4954F852F99D92EA8F83775DADF6A6F85A92687D39B2B976E901181E00EA X-7FA49CB5: FF5795518A3D127A4AD6D5ED66289B5278DA827A17800CE73B44982FA5E78411EA1F7E6F0F101C67BD4B6F7A4D31EC0BCC500DACC3FED6E28638F802B75D45FF8AA50765F79006379347C0682FC030B08638F802B75D45FF36EB9D2243A4F8B5A6FCA7DBDB1FC311F39EFFDF887939037866D6147AF826D8DD6D40CD1B47D89DEB23F3DF533AAFE6117882F4460429724CE54428C33FAD305F5C1EE8F4F765FC2EE5AD8F952D28FBA471835C12D1D9774AD6D5ED66289B52BA9C0B312567BB23117882F446042972877693876707352033AC447995A7AD18C26CFBAC0749D213D2E47CDBA5A96583BA9C0B312567BB2376E601842F6C81A19E625A9149C048EE9647ADFADE5905B1AD7EC71F1DB884274AD6D5ED66289B523666184CF4C3C14F6136E347CC761E07725E5C173C3A84C3C24E78AA85F86F6C76E601842F6C81A1F004C906525384303E02D724532EE2C3F43C7A68FF6260569E8FC8737B5C2249957A4DEDD2346B42E827F84554CEF50127C277FBC8AE2E8BA83251EDC214901ED5E8D9A59859A8B6A8DADCFA31BDB70175ECD9A6C639B01B4E70A05D1297E1BBCB5012B2E24CD356 X-C1DE0DAB: 0D63561A33F958A584D1A3B883449EE1256DF47562A6110B9BBB080C10DF431BF87CCE6106E1FC07E67D4AC08A07B9B02A336C6518635091CB5012B2E24CD356 X-C8649E89: 1C3962B70DF3F0ADE00A9FD3E00BEEDF3FED46C3ACD6F73ED3581295AF09D3DF87807E0823442EA2ED31085941D9CD0AF7F820E7B07EA4CFBE46D6F122AE7EAEC27E10367AF9F337DB3B802C4F4F581232AA6387EDDF4326F2F1C324C53BDAF24BEAD515961AA0A757D36DCC82CDC182E842F12A92A4D0E8E48CAC7CA610320002C26D483E81D6BE0DBAE6F56676BC7117BB6831D7356A2DEC5B5AD62611EEC62B5AFB4261A09AF0 X-D57D3AED: 3ZO7eAau8CL7WIMRKs4sN3D3tLDjz0dLbV79QFUyzQ2Ujvy7cMT6pYYqY16iZVKkSc3dCLJ7zSJH7+u4VD18S7Vl4ZUrpaVfd2+vE6kuoey4m4VkSEu530nj6fImhcD4MUrOEAnl0W826KZ9Q+tr5ycPtXkTV4k65bRjmOUUP8cvGozZ33TWg5HZplvhhXbhDGzqmQDTd6OAevLeAnq3Ra9uf7zvY2zzsIhlcp/Y7m53TZgf2aB4JOg4gkr2biojGSQVxX8i/5XpwDY+xHEwng== X-Mailru-Sender: C4F68CFF4024C8867DFDF7C7F2588458F540E32E42F3A45778C588B0519583D0F9EB359CAF6226B7282EC151BADDC1D3523A6D01B4765B2DFB59E2DDD9FE06B14FA522850F29BC30B0DAF586E7D11B3E67EA787935ED9F1B X-Mras: Ok Subject: Re: [Tarantool-patches] [PATCH luajit 06/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" This is a multi-part message in MIME format. --------------2bTEm6BU16pQH58fH3UjsVlZ Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit Hi, Sergey! thanks for the patch! see comments below On 1/19/24 14:32, 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 | 33 +++++++++++----------- > test/LuaJIT-tests/lib/ffi/index | 1 + > 2 files changed, 18 insertions(+), 16 deletions(-) > > diff --git a/test/LuaJIT-tests/lib/ffi/ffi_callback.lua b/test/LuaJIT-tests/lib/ffi/ffi_callback.lua > index 1fd14bd0..253bf1d9 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 first letter should be uppercase and dot is missed in a comment, right? here and below > local cb = ffi.cast("int (*)(int, int, int)", function(a, b, c) > return a+b+c > end) > @@ -19,7 +19,7 @@ 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) == > @@ -37,11 +37,13 @@ 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) My eyes are bleeding I can't read anymore... Why you cannot add more whitespaces to expressions? > + 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) > @@ -51,7 +53,7 @@ do > 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) > @@ -67,8 +69,7 @@ if jit.arch == "x86" then > 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 --- cb.free cb.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 --- string.byte > assert(ffi.cast("int (*)()", function() return string.byte"A" end)() == 65) > end > > -do > +do --- debug.traceback debug.sethook > 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 --------------2bTEm6BU16pQH58fH3UjsVlZ Content-Type: text/html; charset=UTF-8 Content-Transfer-Encoding: 7bit

Hi, Sergey!

thanks for the patch!

see comments below

On 1/19/24 14:32, Sergey Kaplun wrote:
This patch names all subtests and includes the test in <index>.
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 | 33 +++++++++++-----------
 test/LuaJIT-tests/lib/ffi/index            |  1 +
 2 files changed, 18 insertions(+), 16 deletions(-)

diff --git a/test/LuaJIT-tests/lib/ffi/ffi_callback.lua b/test/LuaJIT-tests/lib/ffi/ffi_callback.lua
index 1fd14bd0..253bf1d9 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

first letter should be uppercase and dot is missed in a comment, right?

here and below

   local cb = ffi.cast("int (*)(int, int, int)", function(a, b, c)
     return a+b+c
   end)
@@ -19,7 +19,7 @@ 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) ==
@@ -37,11 +37,13 @@ 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)

My eyes are bleeding I can't read anymore...

Why you cannot add more whitespaces to expressions?


+  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)
@@ -51,7 +53,7 @@ do
 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)
@@ -67,8 +69,7 @@ if jit.arch == "x86" then
     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 --- cb.free cb.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 --- string.byte
   assert(ffi.cast("int (*)()", function() return string.byte"A" end)() == 65)
 end
 
-do
+do --- debug.traceback debug.sethook
   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
--------------2bTEm6BU16pQH58fH3UjsVlZ--