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 724959DB7A3; Mon, 29 Jan 2024 13:57:55 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org 724959DB7A3 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=tarantool.org; s=dev; t=1706525875; bh=Z2pNPS6b85n8OkWvMue5w14jaOXlEDljXCGdWUAqhwM=; 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=WF2YAWyc+m0ea2oLjfvKEQDnQACXz9amDBqCVOh1vD9ulxXDQHJL2H1r11z801w9S lMKITnuBdWdIswArAkELRLYL01ifJ6jr7wPUnDPUzwWDA82REtM8ZD2xo/USsq1hub /trflFcuNyW9VbMc3lh2OZtW46y6h/i3X4o5ZYPk= Received: from smtp32.i.mail.ru (smtp32.i.mail.ru [95.163.41.73]) (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 70EA89C203D for ; Mon, 29 Jan 2024 13:49:47 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org 70EA89C203D Received: by smtp32.i.mail.ru with esmtpa (envelope-from ) id 1rUPD0-0000000BQ6r-3T4k; Mon, 29 Jan 2024 13:49:47 +0300 To: Maxim Kokryashkin , Sergey Bronnikov Date: Mon, 29 Jan 2024 13:45:17 +0300 Message-ID: X-Mailer: git-send-email 2.43.0 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Mailru-Src: smtp X-4EC0790: 10 X-7564579A: 646B95376F6C166E X-77F55803: 4F1203BC0FB41BD96A58C36AA2E9964961C035FBEF5806C782512F712DED10CE182A05F5380850404FB53C1F5DF529D333594132A326AF8B2F0B37710D825C38DCA417647058147803D3BFA7FB8E1556 X-7FA49CB5: FF5795518A3D127A4AD6D5ED66289B5278DA827A17800CE7A962EFA892AC980EEA1F7E6F0F101C67BD4B6F7A4D31EC0BCC500DACC3FED6E28638F802B75D45FF8AA50765F790063718A0EC59585977138638F802B75D45FF36EB9D2243A4F8B5A6FCA7DBDB1FC311F39EFFDF887939037866D6147AF826D8EC7129B6C6F62DDABE1BF1E404F07B8EAC80028F1D9707CECC7F00164DA146DAFE8445B8C89999728AA50765F79006372A3B24BF85B2E607389733CBF5DBD5E9C8A9BA7A39EFB766F5D81C698A659EA7CC7F00164DA146DA9985D098DBDEAEC8062BEEFFB5F8EA3EF6B57BC7E6449061A352F6E88A58FB86F5D81C698A659EA73AA81AA40904B5D9A18204E546F3947C24F796C710B8583CC0837EA9F3D197644AD6D5ED66289B523666184CF4C3C14F6136E347CC761E07725E5C173C3A84C3A15DAAE06F417D70BA3038C0950A5D36B5C8C57E37DE458B330BD67F2E7D9AF16D1867E19FE14079C09775C1D3CA48CFE478A468B35FE7671DD303D21008E298D5E8D9A59859A8B6B372FE9A2E580EFC725E5C173C3A84C3AA8C68A3574AB3B435872C767BF85DA2F004C90652538430E4A6367B16DE6309 X-C1DE0DAB: 0D63561A33F958A5556563EBCEEEB6F35002B1117B3ED69623B9CD5DACA6581892B673A2F5DDD7E7823CB91A9FED034534781492E4B8EEADFF021744A2531FDDF36E2E0160E5C55395B8A2A0B6518DF68C46860778A80D548E8926FB43031F38 X-C8649E89: 1C3962B70DF3F0ADE00A9FD3E00BEEDF3FED46C3ACD6F73ED3581295AF09D3DF87807E0823442EA2ED31085941D9CD0AF7F820E7B07EA4CF0EAAC2A952DF39EBDFD56F4B1EBDA270CF59CDDBB5A77984CFC3C989935354D230FDAC359DA246328FB01E7B8BF01A6979E5D9ADB1310941B718120DE96C5CC52AF0D59662BE6E56C226CC413062362A913E6812662D5F2A5EAB5682573093F7837F15F2B5E4A70B33F2C28C22F508233FCF178C6DD14203 X-D57D3AED: 3ZO7eAau8CL7WIMRKs4sN3D3tLDjz0dLbV79QFUyzQ2Ujvy7cMT6pYYqY16iZVKkSc3dCLJ7zSJH7+u4VD18S7Vl4ZUrpaVfd2+vE6kuoey4m4VkSEu530nj6fImhcD4MUrOEAnl0W826KZ9Q+tr5ycPtXkTV4k65bRjmOUUP8cvGozZ33TWg5HZplvhhXbhDGzqmQDTd6OAevLeAnq3Ra9uf7zvY2zzsIhlcp/Y7m53TZgf2aB4JOg4gkr2biojmd9AG1X07oT+pWNyl85Rhw== X-Mailru-Sender: 11C2EC085EDE56FAC07928AF2646A769C0A66E648B6C51CD33594132A326AF8B2F0B37710D825C38B7CBEF92542CD7C88B0A2698F12F5C9EC77752E0C033A69E86920BD37369036789A8C6A0E60D2BB63A5DB60FBEB33A8A0DA7A0AF5A3A8387 X-Mras: Ok Subject: [Tarantool-patches] [PATCH v2 luajit 17/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 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 changes `dofile()` (which uses an unreliable relative file path and mutates `_G` with global functions to be defined) to the corresponding require of the helper function. It adds groups with the names of subtests and enables the test in . It renames structures typedefs to avoid conflicts with cdef in other tests. The GC threshold is increased since all tests run in a single process, so the number of GC objects is greater. Part of tarantool/tarantool#9398 --- test/LuaJIT-tests/lib/ffi/ffi_new.lua | 50 +++++++++++++-------------- test/LuaJIT-tests/lib/ffi/index | 1 + 2 files changed, 26 insertions(+), 25 deletions(-) diff --git a/test/LuaJIT-tests/lib/ffi/ffi_new.lua b/test/LuaJIT-tests/lib/ffi/ffi_new.lua index 9cdbd538..e5b19053 100644 --- a/test/LuaJIT-tests/lib/ffi/ffi_new.lua +++ b/test/LuaJIT-tests/lib/ffi/ffi_new.lua @@ -1,37 +1,37 @@ local ffi = require("ffi") local bit = require("bit") -dofile("../common/ffi_util.inc") +local fails = require("common.fails") ffi.cdef([[ -typedef struct { int a,b,c; } foo1_t; -typedef int foo2_t[?]; +typedef struct { int a,b,c; } foo1_new_t; +typedef int foo2_new_t[?]; void *malloc(size_t size); void free(void *ptr); ]]) -do - assert(ffi.sizeof("foo1_t") == 12) - local cd = ffi.new("foo1_t") +do --- foo1_new_t + assert(ffi.sizeof("foo1_new_t") == 12) + local cd = ffi.new("foo1_new_t") assert(ffi.sizeof(cd) == 12) - local foo1_t = ffi.typeof("foo1_t") - assert(ffi.sizeof(foo1_t) == 12) - cd = foo1_t() + local foo1_new_t = ffi.typeof("foo1_new_t") + assert(ffi.sizeof(foo1_new_t) == 12) + cd = foo1_new_t() assert(ffi.sizeof(cd) == 12) end -do - assert(ffi.sizeof("foo2_t", 3) == 12) - local cd = ffi.new("foo2_t", 3) +do --- foo2_new_t + assert(ffi.sizeof("foo2_new_t", 3) == 12) + local cd = ffi.new("foo2_new_t", 3) assert(ffi.sizeof(cd) == 12) - local foo2_t = ffi.typeof("foo2_t") - fails(ffi.sizeof, foo2_t) - assert(ffi.sizeof(foo2_t, 3) == 12) - cd = foo2_t(3) + local foo2_new_t = ffi.typeof("foo2_new_t") + fails(ffi.sizeof, foo2_new_t) + assert(ffi.sizeof(foo2_new_t, 3) == 12) + cd = foo2_new_t(3) assert(ffi.sizeof(cd) == 12) end -do +do --- byte to int cast local tpi = ffi.typeof("int") local tpb = ffi.typeof("uint8_t") local t = {} @@ -42,7 +42,7 @@ do assert(x == 199*257 + 1) end -do +do --- aligned structure GC local oc = collectgarbage("count") for al=0,15 do local align = 2^al -- 1, 2, 4, ..., 32768 @@ -54,17 +54,17 @@ do end end local nc = collectgarbage("count") - assert(nc < oc + 3000, "GC step missing for ffi.new") + assert(nc < oc * 10, "GC step missing for ffi.new") end -do +do --- VLA local t = {} for i=1,100 do t[i] = ffi.new("int[?]", i) end assert(ffi.sizeof(t[100]) == 400) for i=0,99 do assert(t[100][i] == 0) end end -do +do --- VLS local t = {} local ct = ffi.typeof("struct { double x; int y[?];}") for i=1,100 do t[i] = ct(i) end @@ -72,7 +72,7 @@ do for i=0,99 do assert(t[100].y[i] == 0) end end -do +do --- aligned(16) structure exit from trace local ct = ffi.typeof("struct __attribute__((aligned(16))) { int x; }") local y for i=1,200 do @@ -82,7 +82,7 @@ do assert(bit.band(ffi.cast("intptr_t", ffi.cast("void *", y)), 15) == 0) end -do +do --- cdata resurrecting local q local p = ffi.gc(ffi.new("int[1]"), function(x) q = x end) p = nil @@ -93,13 +93,13 @@ do assert(q == nil) end -do +do --- GC malloc free local p = ffi.gc(ffi.C.malloc(2^20), ffi.C.free) p = nil collectgarbage() end -do +do --- test lua_close() cleanup local p = ffi.gc(ffi.new("int[1]"), function(x) assert(type(x) == "cdata") end) -- test for lua_close() cleanup. end diff --git a/test/LuaJIT-tests/lib/ffi/index b/test/LuaJIT-tests/lib/ffi/index index 338a6930..e6c1fd0f 100644 --- a/test/LuaJIT-tests/lib/ffi/index +++ b/test/LuaJIT-tests/lib/ffi/index @@ -15,6 +15,7 @@ ffi_jit_call.lua ffi_jit_conv.lua ffi_lex_number.lua ffi_metatype.lua +ffi_new.lua istype.lua jit_array.lua jit_complex.lua -- 2.43.0