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 7057B31F038; Thu, 2 Mar 2023 19:45:47 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org 7057B31F038 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=tarantool.org; s=dev; t=1677775547; bh=ugiYCYtF8gti3CMMiVNGqj3QwHCnYwOsU9IZbeQ5+Hc=; h=Date:To:References:In-Reply-To:Subject:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To:Cc: From; b=JNdZwirs61D/Q6YxyYezwjJ4jfkhrQM3aecxxCXa6T+ynLhw7XkoiKezo1WTImair EBY23p3FKeMQhp/mv5eB7iLh0mr6D4EEzMSxjT7fr4TdP2LudtIvUkik2JMPnHHUsp sYbtQ2OFukv807NxFkohRJFfuV870PRc2C7PMi4w= Received: from smtp3.i.mail.ru (smtp3.i.mail.ru [95.163.41.67]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dev.tarantool.org (Postfix) with ESMTPS id 2C9361FA901 for ; Thu, 2 Mar 2023 19:45:46 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org 2C9361FA901 Received: by smtp3.i.mail.ru with esmtpa (envelope-from ) id 1pXm3t-00FGl6-3B; Thu, 02 Mar 2023 19:45:45 +0300 Date: Thu, 2 Mar 2023 16:42:36 +0000 To: Sergey Kaplun Message-ID: References: MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline In-Reply-To: X-Clacks-Overhead: GNU Terry Pratchett X-Mailru-Src: smtp X-4EC0790: 10 X-7564579A: 646B95376F6C166E X-77F55803: 4F1203BC0FB41BD9BCEC41593EBD83573B8B9DD5B75D52A341ADC24F957E6F69182A05F5380850402DBCE2B372E94F7A4C246BE6442980DF81F7EA0E918B97D264DAAB5A5D4E7897 X-7FA49CB5: FF5795518A3D127A4AD6D5ED66289B5278DA827A17800CE7AEF9C2E372EE2CB3EA1F7E6F0F101C67BD4B6F7A4D31EC0BCC500DACC3FED6E28638F802B75D45FF8AA50765F79006378D6424E594306CB78638F802B75D45FF36EB9D2243A4F8B5A6FCA7DBDB1FC311F39EFFDF887939037866D6147AF826D82DE1188AFFD564B698CD2DAADB792672117882F4460429724CE54428C33FAD305F5C1EE8F4F765FCF80095D1E17F4578A471835C12D1D9774AD6D5ED66289B52BA9C0B312567BB23117882F4460429728776938767073520B28585415E75ADA9F04B652EEC242312D2E47CDBA5A96583BA9C0B312567BB2376E601842F6C81A19E625A9149C048EECCD848CCB6FE560CA68A47777D5C6D9CD8FC6C240DEA7642DBF02ECDB25306B2B78CF848AE20165D0A6AB1C7CE11FEE31E44367C8E80A7B403F1AB874ED89028C4224003CC836476E2F48590F00D11D6E2021AF6380DFAD1A18204E546F3947CB11811A4A51E3B096D1867E19FE1407959CC434672EE6371089D37D7C0E48F6C8AA50765F7900637A7EFCB0EB5ACB161EFF80C71ABB335746BA297DBC24807EABDAD6C7F3747799A X-C8649E89: 4E36BF7865823D7055A7F0CF078B5EC49A30900B95165D34023CA4E4726A7D6C9025EF4B4F8BE9440237A1614FD3262058D538F3152B58BA9F8A5B5F0535ADF51D7E09C32AA3244C6B8F267EA559072E7EBC2BD1A8FD659D795D98D676DD64D0927AC6DF5659F194 X-D57D3AED: 3ZO7eAau8CL7WIMRKs4sN3D3tLDjz0dLbV79QFUyzQ2Ujvy7cMT6pYYqY16iZVKkSc3dCLJ7zSJH7+u4VD18S7Vl4ZUrpaVfd2+vE6kuoey4m4VkSEu530nj6fImhcD4MUrOEAnl0W826KZ9Q+tr5ycPtXkTV4k65bRjmOUUP8cvGozZ33TWg5HZplvhhXbhDGzqmQDTd6OAevLeAnq3Ra9uf7zvY2zzsIhlcp/Y7m53TZgf2aB4JOg4gkr2biojpNlqDWxrEBa5NbcPn7JF0A== X-Mailru-Sender: 2FEBA92C8E508479FE7B9A1DF348D53155503225AEF3D800FA67A263487A31797919D337A9BC66222326FE6F2A341ACE0FB9F97486540B4CD9E8847AB8CFED4D9ABF8A61C016C2CFB0DAF586E7D11B3E67EA787935ED9F1B X-Mras: Ok Subject: Re: [Tarantool-patches] [PATCH luajit v2 3/5] test: add skipcond for all JIT-related 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: Igor Munkin via Tarantool-patches Reply-To: Igor Munkin Cc: tarantool-patches@dev.tarantool.org Errors-To: tarantool-patches-bounces@dev.tarantool.org Sender: "Tarantool-patches" Sergey, Thanks for your review! See my replies below. On 01.03.23, Sergey Kaplun wrote: > Hi, Igor! > Thanks for the patch! > LGTM, with minnor suggestions below. > > On 28.02.23, Igor Munkin wrote: > > This patch adjusts all tests for JIT engine to avoid failures when JIT > > is disabled, so skipcond with the result of as a condition > > is added to handle this. > > I see some additional `pcall`-s here for `jit.flush()`, etc.. > I suggest the following commit message naming to be consistent with the > next patch ("test: fix lua-Harness JIT-related tests"): > | test: fix tarantool JIT-related tests OK, here is the new commit message: | test: adjust JIT-related tests in tarantool-tests | | This patch adjusts all tests for JIT engine to avoid failures when JIT | is disabled, so skipcond with the result of as a condition | is added to handle this. | | Furthermore, all tests explicitly that explicitly disable JIT for its | purpose, are also adjusted by wrapping calls with . | | Part of tarantool/tarantool#8252 > > > > > Part of tarantool/tarantool#8252 > > > > Signed-off-by: Igor Munkin > > --- > > test/tarantool-tests/bc-jit-unpatching.test.lua | 6 ++++-- > > .../fix-fold-simplify-conv-sext.test.lua | 7 ++++--- > > .../fix-slot-check-for-mm-record.test.lua | 4 +++- > > test/tarantool-tests/gh-4199-gc64-fuse.test.lua | 1 + > > test/tarantool-tests/gh-4427-ffi-sandwich.test.lua | 1 + > > .../gh-4476-fix-string-find-recording.test.lua | 4 +++- > > .../gh-5813-resolving-of-c-symbols.test.lua | 4 +++- > > .../gh-6065-jit-library-smoke-tests.test.lua | 4 +++- > > .../gh-6098-fix-side-exit-patching-on-arm64.test.lua | 5 ++++- > > test/tarantool-tests/gh-6189-cur_L.test.lua | 7 +++++-- > > ...h-6227-bytecode-allocator-for-comparisons.test.lua | 5 ++++- > > .../gh-6371-string-char-no-arg.test.lua | 5 +++-- > > .../gh-6782-stitching-in-vmevent-handler.test.lua | 6 ++++-- > > .../gh-6976-narrowing-of-unary-minus.test.lua | 5 ++++- > > .../gh-7264-add-proto-trace-sysprof-default.test.lua | 1 + > > test/tarantool-tests/lj-350-sload-typecheck.test.lua | 8 +++++--- > > .../lj-356-ir-khash-non-string-obj.test.lua | 11 +++++++---- > > test/tarantool-tests/lj-357-arm64-hrefk.test.lua | 6 ++++-- > > .../lj-375-ir-bufput-signed-char.test.lua | 4 +++- > > .../lj-408-tonumber-cdata-record.test.lua | 11 ++++++----- > > test/tarantool-tests/lj-416-xor-before-jcc.test.lua | 6 ++++-- > > test/tarantool-tests/lj-430-maxirconst.test.lua | 1 + > > .../lj-505-fold-no-strref-for-ptrdiff.test.lua | 4 +++- > > .../lj-524-fold-conv-respect-src-irt.test.lua | 6 ++++-- > > .../lj-556-fix-loop-realignment.test.lua | 4 +++- > > .../lj-584-bad-renames-for-sunk-values.test.lua | 4 +++- > > test/tarantool-tests/lj-603-err-snap-restore.test.lua | 1 + > > .../lj-672-cdata-allocation-recording.test.lua | 1 + > > .../lj-864-varg-rec-base-offset.test.lua | 6 ++++-- > > test/tarantool-tests/lj-flush-on-trace.test.lua | 1 + > > test/tarantool-tests/misclib-getmetrics-capi.test.lua | 1 + > > test/tarantool-tests/misclib-getmetrics-lapi.test.lua | 1 + > > test/tarantool-tests/misclib-memprof-lapi.test.lua | 2 +- > > test/tarantool-tests/misclib-sysprof-capi.test.lua | 5 +++-- > > test/tarantool-tests/misclib-sysprof-lapi.test.lua | 5 +++-- > > 35 files changed, 106 insertions(+), 47 deletions(-) > > > > diff --git a/test/tarantool-tests/gh-4476-fix-string-find-recording.test.lua b/test/tarantool-tests/gh-4476-fix-string-find-recording.test.lua > > index f48af173..0758b38f 100644 > > --- a/test/tarantool-tests/gh-4476-fix-string-find-recording.test.lua > > +++ b/test/tarantool-tests/gh-4476-fix-string-find-recording.test.lua > > @@ -1,6 +1,8 @@ > > local tap = require('tap') > > +local test = tap.test("gh-4476-fix-string-find-recording"):skipcond({ > > Minor: I suggest to use single quotes here according to our code style > for tests. This file is using mixed style, so it will be minor > improvement of the situation. Fixed. > > > + ['Test requires JIT enabled'] = not jit.status(), > > +}) > > > > -local test = tap.test("gh-4476-fix-string-find-recording") > > diff --git a/test/tarantool-tests/lj-524-fold-conv-respect-src-irt.test.lua b/test/tarantool-tests/lj-524-fold-conv-respect-src-irt.test.lua > > index cd0f0f04..b2ccae63 100644 > > --- a/test/tarantool-tests/lj-524-fold-conv-respect-src-irt.test.lua > > +++ b/test/tarantool-tests/lj-524-fold-conv-respect-src-irt.test.lua > > @@ -1,9 +1,11 @@ > > local tap = require('tap') > > -local ffi = require('ffi') > > +local test = tap.test("or-524-fold-icorrect-behavior"):skipcond({ > > Minor: I suggest to use single quotes here according to our code style > for tests. This file is using mixed style, so it will be minor > improvement of the situation. Fixed. > > > + ['Test requires JIT enabled'] = not jit.status(), > > +}) > > > > -local test = tap.test("or-524-fold-icorrect-behavior") > > -- > > 2.30.2 > > > > -- > Best regards, > Sergey Kaplun -- Best regards, IM