From: Igor Munkin via Tarantool-patches <tarantool-patches@dev.tarantool.org> To: Sergey Kaplun <skaplun@tarantool.org> Cc: tarantool-patches@dev.tarantool.org Subject: Re: [Tarantool-patches] [PATCH luajit 6/7] test: fix lua-Harness JIT-related tests Date: Tue, 28 Feb 2023 19:01:54 +0000 [thread overview] Message-ID: <Y/5PolfdRCFFzIn0@tarantool.org> (raw) In-Reply-To: <Y+uBn3VMt5ETrhjk@root> Sergey, Thanks for your review! I've fixed both typos in commit message and added the new patch at the bottom. On 14.02.23, Sergey Kaplun wrote: > Hi, Igor! > Thanks for the patch! > Please, consider my comment below. > > On 13.02.23, Igor Munkin wrote: <snipped> > > I afraid that this check isn't fully correct either: > `jit.status()` yields CPU-specific flags and JIT optimization flags. > For ARM64 the subset of CPU-specific flags is empty. Hence, if someone > runs the tests with `jit.opt.start(0)` to disable all JIT optimization > this check will return false for LuaJIT compiled with JIT. > > | $ src/luajit -e 'jit.opt.start(0) print(jit.arch, jit.status(), select("#", jit.status()) > 1)' > | arm64 true false > Ouch, you're right. I've fixed the issue the way you suggested below. > Also, I found the easier way to check `LJ_HASJIT` is set or not. > We can simply check the existance of `jit.opt` module: > > | $ src/luajit -e 'print(jit.opt)' > | nil > <snipped> > > -- > > 2.30.2 > > > > -- > Best regards, > Sergey Kaplun Here is the new patch: ================================================================================ test: fix lua-Harness JIT-related tests lua-Harness considers whether JIT is enabled or not in the scope of the 403-jit.t and 411-luajit.t tests. However, the original condition is wrong, since <jit.status> yields false for both cases, when JIT is just turned off and when LuaJIT is built without compiler support. So, if <jit.status> yields false, the latter case is considered. The condition is fixed to differ both aforementioned cases in the following way: when jit.opt is nil, LuaJIT is built without compiler; otherwise, JIT support is on board. Part of tarantool/tarantool#8252 diff --git a/test/lua-Harness-tests/403-jit.t b/test/lua-Harness-tests/403-jit.t index 0f986da9..1a88564b 100755 --- a/test/lua-Harness-tests/403-jit.t +++ b/test/lua-Harness-tests/403-jit.t @@ -31,7 +31,7 @@ if not jit then skip_all("only with LuaJIT") end -local compiled_with_jit = jit.status() +local compiled_with_jit = jit.opt ~= nil local luajit20 = jit.version_num < 20100 and not jit.version:match'RaptorJIT' local has_jit_opt = compiled_with_jit local has_jit_security = jit.security diff --git a/test/lua-Harness-tests/411-luajit.t b/test/lua-Harness-tests/411-luajit.t index 3a9a7b8f..6cfd6837 100755 --- a/test/lua-Harness-tests/411-luajit.t +++ b/test/lua-Harness-tests/411-luajit.t @@ -37,7 +37,7 @@ if not pcall(io.popen, lua .. [[ -e "a=1"]]) then skip_all("io.popen not supported") end -local compiled_with_jit = jit.status() +local compiled_with_jit = jit.opt ~= nil local has_jutil = pcall(require, 'jit.util') local has_openresty_listing = profile.openresty or jit.version:match'moonjit' ================================================================================ -- Best regards, IM
next prev parent reply other threads:[~2023-02-28 19:06 UTC|newest] Thread overview: 38+ messages / expand[flat|nested] mbox.gz Atom feed top 2023-02-13 17:02 [Tarantool-patches] [PATCH luajit 0/7] Adjust tests to be run when JIT is disabled Igor Munkin via Tarantool-patches 2023-02-13 17:02 ` [Tarantool-patches] [PATCH luajit 1/7] Minor fixes Igor Munkin via Tarantool-patches 2023-02-13 18:47 ` Sergey Kaplun via Tarantool-patches 2023-02-14 13:51 ` Maxim Kokryashkin via Tarantool-patches 2023-02-13 17:02 ` [Tarantool-patches] [PATCH luajit 2/7] build: fix build with JIT disabled Igor Munkin via Tarantool-patches 2023-02-13 18:53 ` Sergey Kaplun via Tarantool-patches 2023-02-27 9:15 ` Igor Munkin via Tarantool-patches 2023-02-28 8:16 ` Maxim Kokryashkin via Tarantool-patches 2023-02-14 13:53 ` Maxim Kokryashkin via Tarantool-patches 2023-02-13 17:02 ` [Tarantool-patches] [PATCH luajit 3/7] test: stop using utils.selfrun in tests Igor Munkin via Tarantool-patches 2023-02-15 8:08 ` Sergey Kaplun via Tarantool-patches 2023-02-27 9:16 ` Igor Munkin via Tarantool-patches 2023-02-27 9:28 ` Sergey Kaplun via Tarantool-patches 2023-02-15 21:43 ` Maxim Kokryashkin via Tarantool-patches 2023-02-27 9:16 ` Igor Munkin via Tarantool-patches 2023-02-28 8:18 ` Maxim Kokryashkin via Tarantool-patches 2023-02-13 17:02 ` [Tarantool-patches] [PATCH luajit 4/7] test: make skipcond helper more convenient Igor Munkin via Tarantool-patches 2023-02-15 8:46 ` Sergey Kaplun via Tarantool-patches 2023-02-27 9:18 ` Igor Munkin via Tarantool-patches 2023-02-27 10:09 ` Sergey Kaplun via Tarantool-patches 2023-02-28 8:27 ` Maxim Kokryashkin via Tarantool-patches 2023-02-15 22:08 ` Maxim Kokryashkin via Tarantool-patches 2023-02-13 17:02 ` [Tarantool-patches] [PATCH luajit 5/7] test: add skipcond for all JIT-related tests Igor Munkin via Tarantool-patches 2023-02-14 13:50 ` Sergey Kaplun via Tarantool-patches 2023-02-15 22:31 ` Maxim Kokryashkin via Tarantool-patches 2023-02-28 19:02 ` Igor Munkin via Tarantool-patches 2023-03-01 19:31 ` Maxim Kokryashkin via Tarantool-patches 2023-02-13 17:02 ` [Tarantool-patches] [PATCH luajit 6/7] test: fix lua-Harness " Igor Munkin via Tarantool-patches 2023-02-14 12:42 ` Sergey Kaplun via Tarantool-patches 2023-02-28 19:01 ` Igor Munkin via Tarantool-patches [this message] 2023-02-15 22:35 ` Maxim Kokryashkin via Tarantool-patches 2023-02-28 19:02 ` Igor Munkin via Tarantool-patches 2023-03-01 19:31 ` Maxim Kokryashkin via Tarantool-patches 2023-02-13 17:02 ` [Tarantool-patches] [PATCH luajit 7/7] ci: add nojit flavor for exotic builds Igor Munkin via Tarantool-patches 2023-02-13 19:14 ` Sergey Kaplun via Tarantool-patches 2023-02-15 21:18 ` Maxim Kokryashkin via Tarantool-patches 2023-02-27 9:36 ` [Tarantool-patches] [PATCH luajit 0/7] Adjust tests to be run when JIT is disabled Igor Munkin via Tarantool-patches 2023-02-28 19:05 ` Igor Munkin via Tarantool-patches
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=Y/5PolfdRCFFzIn0@tarantool.org \ --to=tarantool-patches@dev.tarantool.org \ --cc=imun@tarantool.org \ --cc=skaplun@tarantool.org \ --subject='Re: [Tarantool-patches] [PATCH luajit 6/7] test: fix lua-Harness JIT-related tests' \ /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