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 3AF916EC40; Fri, 4 Jun 2021 16:14:06 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org 3AF916EC40 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=tarantool.org; s=dev; t=1622812446; bh=30Gbrgku+iHZz+fzEsWYMycgYhl4v1tF4lrMRXukbL4=; 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=N7og+4Q+fFe8ab4lUWF9EskqO8Fd8l0xN8IsT8Prwq92cJwNVgxRCUHy0fM4n57OR 60va2fpyLVOMH/0GJYZK32Lad7N1FjUnV4Nz99bV1kBxeoPtQ99I+c7qO/K7SUBlqt GYQ2bnHQsaKb0eZ8bvty2h7fqQuAZHgHhdrSBDYY= Received: from smtpng2.m.smailru.net (smtpng2.m.smailru.net [94.100.179.3]) (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 075256EC40 for ; Fri, 4 Jun 2021 16:14:03 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org 075256EC40 Received: by smtpng2.m.smailru.net with esmtpa (envelope-from ) id 1lp9eE-0004aM-U9; Fri, 04 Jun 2021 16:14:03 +0300 Date: Fri, 4 Jun 2021 16:12:51 +0300 To: Sergey Ostanevich Message-ID: References: <51e2abaf644791331a077cab0852aa54d04941ff.1621859367.git.skaplun@tarantool.org> <225B5D75-E1D0-4137-8E78-FC78EE6952A0@tarantool.org> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <225B5D75-E1D0-4137-8E78-FC78EE6952A0@tarantool.org> X-7564579A: 646B95376F6C166E X-77F55803: 4F1203BC0FB41BD9D5B0DA836B685C54907A7AE9C1BA82BC67C1327DFB87C6A6182A05F538085040955B8D91EE6FA16531C8A69224DDB09F7ECB2DADED1784E81022964586E00891 X-7FA49CB5: FF5795518A3D127A4AD6D5ED66289B5278DA827A17800CE7E50EC9128971FD6EEA1F7E6F0F101C67BD4B6F7A4D31EC0BCC500DACC3FED6E28638F802B75D45FF8AA50765F7900637222645A8BD7B05AE8638F802B75D45FF36EB9D2243A4F8B5A6FCA7DBDB1FC311F39EFFDF887939037866D6147AF826D8364C5DC4323A6F33AC082ED56C34E204117882F4460429724CE54428C33FAD305F5C1EE8F4F765FCF1175FABE1C0F9B6A471835C12D1D9774AD6D5ED66289B52BA9C0B312567BB23117882F446042972877693876707352033AC447995A7AD18CB629EEF1311BF91D2E47CDBA5A96583BA9C0B312567BB231DD303D21008E29813377AFFFEAFD269A417C69337E82CC2E827F84554CEF50127C277FBC8AE2E8BA83251EDC214901ED5E8D9A59859A8B6753C3A5E0A5AB5B7089D37D7C0E48F6C5571747095F342E88FB05168BE4CE3AF X-C1DE0DAB: 0D63561A33F958A5A88399532C1DA2FF6CBA62CF70A0ECABC8833752200B8E1CD59269BC5F550898D99A6476B3ADF6B47008B74DF8BB9EF7333BD3B22AA88B938A852937E12ACA75FBC5FED0552DA851410CA545F18667F91A7EA1CDA0B5A7A0 X-C8649E89: 4E36BF7865823D7055A7F0CF078B5EC49A30900B95165D34C1E32F4AD4B2486BCEABA0D4D2B2F9D77B53734BFAF16FC2A3F307EC490AA03CAFBA5DE99039307F1D7E09C32AA3244CAE8AA03345BB8A42A37FF18A1961153E5595C85A795C7BAEFACE5A9C96DEB163 X-D57D3AED: 3ZO7eAau8CL7WIMRKs4sN3D3tLDjz0dLbV79QFUyzQ2Ujvy7cMT6pYYqY16iZVKkSc3dCLJ7zSJH7+u4VD18S7Vl4ZUrpaVfd2+vE6kuoey4m4VkSEu530nj6fImhcD4MUrOEAnl0W826KZ9Q+tr5ycPtXkTV4k65bRjmOUUP8cvGozZ33TWg5HZplvhhXbhDGzqmQDTd6OAevLeAnq3Ra9uf7zvY2zzsIhlcp/Y7m53TZgf2aB4JOg4gkr2biojz99asgmzejrDy04PsYP+vw== X-Mailru-Sender: 689FA8AB762F73936BC43F508A0638220FC98AF31E11A2ED0E9F535F5EA206A50FBE9A32752B8C9C2AA642CC12EC09F1FB559BB5D741EB962F61BD320559CF1EFD657A8799238ED567EA787935ED9F1B X-Mras: Ok Subject: Re: [Tarantool-patches] [PATCH luajit 1/4] ARM, ARM64, PPC: Fix TSETR fallback. 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" Hi! Thanks for the review! On 02.06.21, Sergey Ostanevich wrote: > Hi! > Thanks for the patch! > > See my 3 cents below. > > Sergos > > > > On 24 May 2021, at 16:27, Sergey Kaplun wrote: > > > > From: Mike Pall > > > > Thanks to Javier Guerra Giraldez. > > > > (cherry picked from commit ae20998ff5aaacc8e3afd46c64e28a8e039b58a1) > > > > This patch fixes the issue introduced by commits > > f307d0adafc7e35d2dc1c461d50f6572c5e6bca8 ('ARM64: Add build > > infrastructure and initial port of interpreter.') for arm64 and > > 73ef845fcaf65937ad63e9cf6b681cb3e61f4504 ('Add special bytecodes for > > builtins.') for arm and ppc. Within the mentioned commits the new > > bytecode TSETR is introduced for the corresponding architectures. > > > > When the new index of the table processed during this bytecode is the > > integer, that is greater than asize of the table, the VM fallbacks to > > vmeta_tsetr, for calling > > lj_tab_setinth(lua_State *L, GCtab *t, int32_t key). The first argument > > CARG1 is not set by the VM and contains an invalid value, so the > > mentioned call leads to crash. > > This patch adds the missed set of CARG1 to the right value. > > > > Sergey Kaplun: > > * added the description and the test for the problem > > > > Resolves tarantool/tarantool#6084 > > Part of tarantool/tarantool#5629 > > --- > > src/vm_arm.dasc | 1 + > > src/vm_arm64.dasc | 1 + > > src/vm_ppc.dasc | 1 + > > test/tarantool-tests/CMakeLists.txt | 9 ++++--- > > ...-missed-carg1-in-bctsetr-fallback.test.lua | 25 +++++++++++++++++++ > > test/tarantool-tests/utils.lua | 22 ++++++++++++++++ > > 6 files changed, 55 insertions(+), 4 deletions(-) > > create mode 100644 test/tarantool-tests/gh-6084-missed-carg1-in-bctsetr-fallback.test.lua > > > > diff --git a/src/vm_arm.dasc b/src/vm_arm.dasc > > index ae2efdfd..21f7fecb 100644 > > --- a/src/vm_arm.dasc > > +++ b/src/vm_arm.dasc > > @@ -701,6 +701,7 @@ static void build_subroutines(BuildCtx *ctx) > > |->vmeta_tsetr: > > | str BASE, L->base > > | .IOS mov RC, BASE > > + | mov CARG1, L > > | str PC, SAVE_PC > > | bl extern lj_tab_setinth // (lua_State *L, GCtab *t, int32_t key) > > | // Returns TValue *. > > diff --git a/src/vm_arm64.dasc b/src/vm_arm64.dasc > > index f783428f..6bf59509 100644 > > --- a/src/vm_arm64.dasc > > +++ b/src/vm_arm64.dasc > > @@ -711,6 +711,7 @@ static void build_subroutines(BuildCtx *ctx) > > |->vmeta_tsetr: > > | sxtw CARG3, TMP1w > > | str BASE, L->base > > + | mov CARG1, L > > | str PC, SAVE_PC > > | bl extern lj_tab_setinth // (lua_State *L, GCtab *t, int32_t key) > > | // Returns TValue *. > > diff --git a/src/vm_ppc.dasc b/src/vm_ppc.dasc > > index 62e9b681..3f48b7ff 100644 > > --- a/src/vm_ppc.dasc > > +++ b/src/vm_ppc.dasc > > @@ -995,6 +995,7 @@ static void build_subroutines(BuildCtx *ctx) > > | > > |->vmeta_tsetr: > > | stp BASE, L->base > > + | mr CARG1, L > > | stw PC, SAVE_PC > > | bl extern lj_tab_setinth // (lua_State *L, GCtab *t, int32_t key) > > | // Returns TValue *. > > diff --git a/test/tarantool-tests/CMakeLists.txt b/test/tarantool-tests/CMakeLists.txt > > index 475e2e5d..2fdb4d1f 100644 > > --- a/test/tarantool-tests/CMakeLists.txt > > +++ b/test/tarantool-tests/CMakeLists.txt > > @@ -61,11 +61,12 @@ add_subdirectory(lj-flush-on-trace) > > add_subdirectory(misclib-getmetrics-capi) > > > > # The part of the memory profiler toolchain is located in tools > > -# directory and auxiliary tests-related modules are located in the > > -# current directory (but tests are run in the binary directory), > > -# so LUA_PATH need to be updated. > > +# directory, jit, profiler, and bytecode toolchains are located > > +# in src/ directory and auxiliary tests-related modules are > > +# located in the current directory (but tests are run in the > > +# binary directory), so LUA_PATH need to be updated. > > set(LUA_PATH > > - "${CMAKE_CURRENT_SOURCE_DIR}/?.lua\;${PROJECT_SOURCE_DIR}/tools/?.lua" > > + "${CMAKE_CURRENT_SOURCE_DIR}/?.lua\;${PROJECT_SOURCE_DIR}/tools/?.lua\;${PROJECT_SOURCE_DIR}/src/?.lua" > > ) > > set(LUA_TEST_SUFFIX .test.lua) > > set(LUA_TEST_FLAGS --failures --shuffle) > > diff --git a/test/tarantool-tests/gh-6084-missed-carg1-in-bctsetr-fallback.test.lua b/test/tarantool-tests/gh-6084-missed-carg1-in-bctsetr-fallback.test.lua > > new file mode 100644 > > index 00000000..26344274 > > --- /dev/null > > +++ b/test/tarantool-tests/gh-6084-missed-carg1-in-bctsetr-fallback.test.lua > > @@ -0,0 +1,25 @@ > > +local tap = require("tap") > > +local utils = require("utils") > > Sorry, but > > s-ostanevich:tarantool-tests s.ostanevich$ egrep -l "\.*\"" *.lua | wc -l > 6 > s-ostanevich:tarantool-tests s.ostanevich$ egrep -l "\.*\'" *.lua | wc -l > 14 > > clearly votes for require(‘tap') against require("tap”) I've tried to follow the original code style from src/jit/ directory: | src$ grep -l -P 'require.*"' */*.lua -r | wc -l | 17 | src$ grep -l -P "require.*'" */*.lua -r | wc -l | 0 Also, you count utils.lua 3 times. But I don't mind :) Branch is force-pushed. =================================================================== diff --git a/test/tarantool-tests/gh-6084-missed-carg1-in-bctsetr-fallback.test.lua b/test/tarantool-tests/gh-6084-missed-carg1-in-bctsetr-fallback.test.lua index 26344274..1a438c82 100644 --- a/test/tarantool-tests/gh-6084-missed-carg1-in-bctsetr-fallback.test.lua +++ b/test/tarantool-tests/gh-6084-missed-carg1-in-bctsetr-fallback.test.lua @@ -1,7 +1,7 @@ -local tap = require("tap") -local utils = require("utils") +local tap = require('tap') +local utils = require('utils') -local test = tap.test("gh-6084-missed-carg1-in-bctsetr-fallback") +local test = tap.test('gh-6084-missed-carg1-in-bctsetr-fallback') test:plan(1) -- Bytecode TSETR appears only in built-ins libraries, when doing @@ -15,7 +15,7 @@ test:plan(1) -- We need to make sure the bytecode is present in the chosen -- built-in to make sure our test is still valid. -assert(utils.hasbc(table.move, "TSETR")) +assert(utils.hasbc(table.move, 'TSETR')) -- Empty table has asize equals 0. Just copy its element (equals -- nil) to the field by index 1 > 0, to fallback inside TSETR. =================================================================== Side note: we should document our LuaJIT codestyle... > > > + > > +local test = tap.test("gh-6084-missed-carg1-in-bctsetr-fallback") > > +test:plan(1) > > + > > +-- Bytecode TSETR appears only in built-ins libraries, when doing > > +-- fixups for fast function written in Lua (i.e. `table.move()`), > > +-- by replacing all TSETV bytecodes with the TSETR. > > +-- See for more details. > > + > > +-- This test checks that fallback path, when the index of the new > > +-- set element is greater than the table's asize, doesn't lead > > +-- to a crash. > > + > > +-- We need to make sure the bytecode is present in the chosen > > +-- built-in to make sure our test is still valid. > > +assert(utils.hasbc(table.move, "TSETR")) > > + > > +-- Empty table has asize equals 0. Just copy its element (equals > > +-- nil) to the field by index 1 > 0, to fallback inside TSETR. > > +table.move({}, 1, 1, 1) > > I would like to see the move is correctly performed, rather the fact > there were no crash. It gives a bigger space for unexpected behavior. Fixed. Branch is force-pushed. =================================================================== diff --git a/test/tarantool-tests/gh-6084-missed-carg1-in-bctsetr-fallback.test.lua b/test/tarantool-tests/gh-6084-missed-carg1-in-bctsetr-fallback.test.lua index 1a438c82..95bf3bd7 100644 --- a/test/tarantool-tests/gh-6084-missed-carg1-in-bctsetr-fallback.test.lua +++ b/test/tarantool-tests/gh-6084-missed-carg1-in-bctsetr-fallback.test.lua @@ -2,7 +2,7 @@ local tap = require('tap') local utils = require('utils') local test = tap.test('gh-6084-missed-carg1-in-bctsetr-fallback') -test:plan(1) +test:plan(2) -- Bytecode TSETR appears only in built-ins libraries, when doing -- fixups for fast function written in Lua (i.e. `table.move()`), @@ -17,9 +17,11 @@ test:plan(1) -- built-in to make sure our test is still valid. assert(utils.hasbc(table.move, 'TSETR')) --- Empty table has asize equals 0. Just copy its element (equals --- nil) to the field by index 1 > 0, to fallback inside TSETR. -table.move({}, 1, 1, 1) +-- `t` table has asize equals 1. Just copy its first element (1) +-- to the field by index 2 > 1, to fallback inside TSETR. +local t = {1} +local res = table.move(t, 1, 1, 2) +test:ok(t == res, 'table.move returns the same table') +test:ok(t[1] == t[2], 'table.move is correct') -test:ok(true) os.exit(test:check() and 0 or 1) =================================================================== > > > + > > +test:ok(true) > > +os.exit(test:check() and 0 or 1) > > diff --git a/test/tarantool-tests/utils.lua b/test/tarantool-tests/utils.lua > > index c0403cf1..61d4de7a 100644 > > --- a/test/tarantool-tests/utils.lua > > +++ b/test/tarantool-tests/utils.lua > > @@ -2,11 +2,14 @@ local M = {} > > > > local ffi = require('ffi') > > local tap = require('tap') > > +local bc = require('jit.bc') > > > > ffi.cdef([[ > > int setenv(const char *name, const char *value, int overwrite); > > ]]) > > > > +local function noop() end > > Name of this one in a patch that messess with bytecodes is confusing. Could it > be a simpler one, like ‘empty’? Fixed. Branch is force-pushed. =================================================================== diff --git a/test/tarantool-tests/utils.lua b/test/tarantool-tests/utils.lua index 61d4de7a..57932c5d 100644 --- a/test/tarantool-tests/utils.lua +++ b/test/tarantool-tests/utils.lua @@ -8,7 +8,7 @@ ffi.cdef([[ int setenv(const char *name, const char *value, int overwrite); ]]) -local function noop() end +local function empty() end local function luacmd(args) -- arg[-1] is guaranteed to be not nil. @@ -101,11 +101,11 @@ function M.hasbc(f, bytecode) write = function(out, line) if line:match(bytecode) then hasbc = true - out.write = noop + out.write = empty end end, - flush = noop, - close = noop, + flush = empty, + close = empty, } bc.dump(f, out) return hasbc =================================================================== > > > + > > local function luacmd(args) > > -- arg[-1] is guaranteed to be not nil. > > local idx = -2 > > @@ -89,4 +92,23 @@ function M.tweakenv(condition, variable) > > ffi.C.setenv(variable, testvar, 0) > > end > > > > +function M.hasbc(f, bytecode) > > + assert(type(f) == 'function', 'argument #1 should be a function') > > + assert(type(bytecode) == 'string', 'argument #2 should be a string') > > + local hasbc = false > > + -- Check the bytecode entry line by line. > > + local out = { > > + write = function(out, line) > > + if line:match(bytecode) then > > + hasbc = true > > + out.write = noop > > + end > > + end, > > + flush = noop, > > + close = noop, > > + } > > + bc.dump(f, out) > > + return hasbc > > +end > > + > > return M > > -- > > 2.31.0 > > > -- Best regards, Sergey Kaplun