From: Sergey Kaplun via Tarantool-patches <tarantool-patches@dev.tarantool.org> To: Maxim Kokryashkin <m.kokryashkin@tarantool.org>, Sergey Bronnikov <sergeyb@tarantool.org> Cc: tarantool-patches@dev.tarantool.org Subject: [Tarantool-patches] [PATCH luajit 36/36] test: enable <misc/wbarrier_obar.lua> LuaJIT test Date: Wed, 14 Aug 2024 16:56:18 +0300 [thread overview] Message-ID: <9e5b28f87b0b51c9c001ec38dba3d5f0b2b47109.1723638851.git.skaplun@tarantool.org> (raw) In-Reply-To: <cover.1723638851.git.skaplun@tarantool.org> This patch moves the aforementioned test to the <trace/wbarrier.lua> test, with refactoring to restore the JIT engine and GC settings after the test. Part of tarantool/tarantool#9398 --- test/LuaJIT-tests/misc/wbarrier_obar.lua | 22 ------------- test/LuaJIT-tests/trace/wbarrier.lua | 41 ++++++++++++++++++++++++ 2 files changed, 41 insertions(+), 22 deletions(-) delete mode 100644 test/LuaJIT-tests/misc/wbarrier_obar.lua diff --git a/test/LuaJIT-tests/misc/wbarrier_obar.lua b/test/LuaJIT-tests/misc/wbarrier_obar.lua deleted file mode 100644 index 258db215..00000000 --- a/test/LuaJIT-tests/misc/wbarrier_obar.lua +++ /dev/null @@ -1,22 +0,0 @@ --- DSE of USTORE must eliminate OBAR, too. - -if jit and jit.opt then pcall(jit.opt.start, "-sink") end - -local f -do - local x - f = function() - local y = 0 - for i=1,10000 do - x = {1} - if y > 0 then end - x = 1 - end - end -end - -collectgarbage() -collectgarbage("setstepmul", 1) -collectgarbage("restart") -f() - diff --git a/test/LuaJIT-tests/trace/wbarrier.lua b/test/LuaJIT-tests/trace/wbarrier.lua index 625c0ff2..9c9c50af 100644 --- a/test/LuaJIT-tests/trace/wbarrier.lua +++ b/test/LuaJIT-tests/trace/wbarrier.lua @@ -1,3 +1,12 @@ +local function jit_opt_is_on(needed) + for _, opt in ipairs({jit.status()}) do + if opt == needed then + return true + end + end + return false +end + do --- TBAR for HSTORE. local t = {[0]={}} for i = 1, 1e5 do t[i] = {t[i - 1]} end @@ -14,3 +23,35 @@ do --- OBAR for USTORE. end f() end + +do --- DSE of USTORE must eliminate OBAR too. + local need_restore_sink = false + if jit_opt_is_on("sink") then + need_restore_sink = true + jit.opt.start("-sink") + end + + local f + do + local x + f = function() + local y = 0 + for _ = 1, 10000 do + x = {1} + if y > 0 then end + x = 1 + end + end + end + + collectgarbage() + local oldstepmul = collectgarbage("setstepmul", 1) + collectgarbage("restart") + + f() + + collectgarbage("setstepmul", oldstepmul) + if need_restore_sink then + jit.opt.start("+sink") + end +end -- 2.45.2
prev parent reply other threads:[~2024-08-14 14:15 UTC|newest] Thread overview: 58+ messages / expand[flat|nested] mbox.gz Atom feed top 2024-08-14 13:55 [Tarantool-patches] [PATCH luajit 00/36] Rearrange LuaJIT misc tests Sergey Kaplun via Tarantool-patches 2024-08-14 13:55 ` [Tarantool-patches] [PATCH luajit 01/36] test: don't run JIT-based LuaJIT tests without JIT Sergey Kaplun via Tarantool-patches 2024-08-15 12:47 ` Sergey Bronnikov via Tarantool-patches 2024-08-19 8:47 ` Sergey Kaplun via Tarantool-patches 2024-08-14 13:55 ` [Tarantool-patches] [PATCH luajit 02/36] test: enable <misc/alias_alloc.lua> LuaJIT test Sergey Kaplun via Tarantool-patches 2024-08-15 12:51 ` Sergey Bronnikov via Tarantool-patches 2024-08-15 13:31 ` Sergey Kaplun via Tarantool-patches 2024-08-30 7:25 ` Sergey Bronnikov via Tarantool-patches 2024-08-14 13:55 ` [Tarantool-patches] [PATCH luajit 03/36] test: refactor <lang/coroutine.lua> " Sergey Kaplun via Tarantool-patches 2024-08-15 13:00 ` Sergey Bronnikov via Tarantool-patches 2024-08-14 13:55 ` [Tarantool-patches] [PATCH luajit 04/36] test: remove <misc/coro_yield.lua> " Sergey Kaplun via Tarantool-patches 2024-08-15 13:05 ` Sergey Bronnikov via Tarantool-patches 2024-08-14 13:55 ` [Tarantool-patches] [PATCH luajit 05/36] test: enable <misc/debug_gc.lua> " Sergey Kaplun via Tarantool-patches 2024-08-15 13:09 ` Sergey Bronnikov via Tarantool-patches 2024-08-15 13:25 ` Sergey Kaplun via Tarantool-patches 2024-08-14 13:55 ` [Tarantool-patches] [PATCH luajit 06/36] test: enable <misc/dualnum.lua> " Sergey Kaplun via Tarantool-patches 2024-08-15 13:11 ` Sergey Bronnikov via Tarantool-patches 2024-08-15 13:19 ` Sergey Bronnikov via Tarantool-patches 2024-08-15 13:22 ` Sergey Kaplun via Tarantool-patches 2024-08-14 13:55 ` [Tarantool-patches] [PATCH luajit 07/36] test: remove <misc/fori_coerce.lua> " Sergey Kaplun via Tarantool-patches 2024-08-15 13:20 ` Sergey Bronnikov via Tarantool-patches 2024-08-14 13:55 ` [Tarantool-patches] [PATCH luajit 08/36] test: remove <misc/fori_dir.lua> " Sergey Kaplun via Tarantool-patches 2024-08-15 13:21 ` Sergey Bronnikov via Tarantool-patches 2024-08-14 13:55 ` [Tarantool-patches] [PATCH luajit 09/36] test: remove <misc/gc_rechain.lua> " Sergey Kaplun via Tarantool-patches 2024-08-15 13:22 ` Sergey Bronnikov via Tarantool-patches 2024-08-14 13:55 ` [Tarantool-patches] [PATCH luajit 10/36] test: enable <misc/gc_trace.lua> " Sergey Kaplun via Tarantool-patches 2024-08-15 13:24 ` Sergey Bronnikov via Tarantool-patches 2024-08-14 13:55 ` [Tarantool-patches] [PATCH luajit 11/36] test: enable <misc/gcstep.lua> " Sergey Kaplun via Tarantool-patches 2024-08-15 13:34 ` Sergey Bronnikov via Tarantool-patches 2024-08-14 13:55 ` [Tarantool-patches] [PATCH luajit 12/36] test: enable <misc/hook_active.lua> " Sergey Kaplun via Tarantool-patches 2024-08-15 13:38 ` Sergey Bronnikov via Tarantool-patches 2024-08-14 13:55 ` [Tarantool-patches] [PATCH luajit 13/36] test: enable <misc/hook_line.lua> " Sergey Kaplun via Tarantool-patches 2024-08-15 13:42 ` Sergey Bronnikov via Tarantool-patches 2024-08-14 13:55 ` [Tarantool-patches] [PATCH luajit 14/36] test: enable <misc/hook_norecord.lua> " Sergey Kaplun via Tarantool-patches 2024-08-15 13:56 ` Sergey Bronnikov via Tarantool-patches 2024-08-14 13:55 ` [Tarantool-patches] [PATCH luajit 15/36] test: enable <misc/hook_record.lua> " Sergey Kaplun via Tarantool-patches 2024-08-15 13:57 ` Sergey Bronnikov via Tarantool-patches 2024-08-14 13:55 ` [Tarantool-patches] [PATCH luajit 16/36] test: enable <misc/hook_top.lua> " Sergey Kaplun via Tarantool-patches 2024-08-14 13:55 ` [Tarantool-patches] [PATCH luajit 17/36] test: enable <misc/jit_flush.lua> " Sergey Kaplun via Tarantool-patches 2024-08-14 13:56 ` [Tarantool-patches] [PATCH luajit 18/36] test: remove <misc/loop_unroll.lua> " Sergey Kaplun via Tarantool-patches 2024-08-14 13:56 ` [Tarantool-patches] [PATCH luajit 19/36] test: enable <misc/parse_comp.lua> " Sergey Kaplun via Tarantool-patches 2024-08-14 13:56 ` [Tarantool-patches] [PATCH luajit 20/36] test: enable <misc/parse_esc.lua> " Sergey Kaplun via Tarantool-patches 2024-08-14 13:56 ` [Tarantool-patches] [PATCH luajit 21/36] test: enable <misc/parse_misc.lua> " Sergey Kaplun via Tarantool-patches 2024-08-14 13:56 ` [Tarantool-patches] [PATCH luajit 22/36] test: enable <misc/phi_conv.lua> " Sergey Kaplun via Tarantool-patches 2024-08-14 13:56 ` [Tarantool-patches] [PATCH luajit 23/36] test: enable <misc/recurse_deep.lua> " Sergey Kaplun via Tarantool-patches 2024-08-14 13:56 ` [Tarantool-patches] [PATCH luajit 24/36] test: remove <misc/recurse_tail.lua> " Sergey Kaplun via Tarantool-patches 2024-08-14 13:56 ` [Tarantool-patches] [PATCH luajit 25/36] test: enable <misc/stack_gc.lua> " Sergey Kaplun via Tarantool-patches 2024-08-14 13:56 ` [Tarantool-patches] [PATCH luajit 26/36] test: enable <misc/stack_purge.lua> " Sergey Kaplun via Tarantool-patches 2024-08-14 13:56 ` [Tarantool-patches] [PATCH luajit 27/36] test: enable <misc/stackov.lua> " Sergey Kaplun via Tarantool-patches 2024-08-14 13:56 ` [Tarantool-patches] [PATCH luajit 28/36] test: enable <misc/stackovc.lua> " Sergey Kaplun via Tarantool-patches 2024-08-14 13:56 ` [Tarantool-patches] [PATCH luajit 29/36] test: enable <misc/tcall_base.lua> " Sergey Kaplun via Tarantool-patches 2024-08-14 13:56 ` [Tarantool-patches] [PATCH luajit 30/36] test: enable <misc/tcall_loop.lua> " Sergey Kaplun via Tarantool-patches 2024-08-14 13:56 ` [Tarantool-patches] [PATCH luajit 31/36] test: enable <misc/tonumber_scan.lua> " Sergey Kaplun via Tarantool-patches 2024-08-14 13:56 ` [Tarantool-patches] [PATCH luajit 32/36] test: remove <misc/uclo.lua> " Sergey Kaplun via Tarantool-patches 2024-08-14 13:56 ` [Tarantool-patches] [PATCH luajit 33/36] test: enable <misc/unordered_jit.lua> " Sergey Kaplun via Tarantool-patches 2024-08-14 13:56 ` [Tarantool-patches] [PATCH luajit 34/36] test: enable <misc/wbarrier.lua> " Sergey Kaplun via Tarantool-patches 2024-08-14 13:56 ` [Tarantool-patches] [PATCH luajit 35/36] test: enable <misc/wbarrier_jit.lua> " Sergey Kaplun via Tarantool-patches 2024-08-14 13:56 ` Sergey Kaplun via Tarantool-patches [this message]
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=9e5b28f87b0b51c9c001ec38dba3d5f0b2b47109.1723638851.git.skaplun@tarantool.org \ --to=tarantool-patches@dev.tarantool.org \ --cc=m.kokryashkin@tarantool.org \ --cc=sergeyb@tarantool.org \ --cc=skaplun@tarantool.org \ --subject='Re: [Tarantool-patches] [PATCH luajit 36/36] test: enable <misc/wbarrier_obar.lua> LuaJIT test' \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: link
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox