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 689376EC44; Mon, 16 Nov 2026 15:06:12 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org 689376EC44 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=tarantool.org; s=dev; t=1794830772; bh=M2Qbes/ALDaG6udUdN2VAP4gJUoo0IEdaFZuRQbHnKE=; h=To:Date:Subject:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:Cc:From; b=aaKEeKul7mur7KonXXtN7TB3MylAEkK94hptSa+GONvWde7KOBxUHU8xduuGh8D2a xPSZAjju4++s89qki9wyAK8jXDnYBVNVVfKBIBH7bGMgw3Nz0I2ejgEcHjV7oimVZS 6I+qIE9c/q3J99wOyXn/vvms3xmtRjBDDre/3fco= Received: from send151.i.mail.ru (send151.i.mail.ru [89.221.237.246]) (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 7E8776EC44 for ; Mon, 16 Nov 2026 15:06:10 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org 7E8776EC44 Received: by exim-smtp-canary-30-775d6dcd67-rtj77 with esmtpa (envelope-from ) id 1xSvTN-000000008O7-0p3S; Mon, 16 Nov 2026 15:06:09 +0300 To: Sergey Bronnikov , Evgeniy Temirgaleev Date: Mon, 16 Nov 2026 15:05:33 +0300 Message-ID: <20261116120533.2886125-1-skaplun@tarantool.org> X-Mailer: git-send-email 2.56.0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Mailru-Src: smtp X-7564579A: 646B95376F6C166E X-77F55803: 4F1203BC0FB41BD9749DDC91F62168F9AC432E70D1E5EF84D18C78A25495B055182A05F538085040EBFB5B395921778E3DE06ABAFEAF670548EACC472163918C2DBC838FB492AB3702A17C04448FB737 X-7FA49CB5: FF5795518A3D127A4AD6D5ED66289B5278DA827A17800CE7A4C4638C9DDF45FCEA1F7E6F0F101C67BD4B6F7A4D31EC0BCC500DACC3FED6E28638F802B75D45FF8AA50765F7900637AC83A81C8FD4AD23D82A6BABE6F325AC2E85FA5F3EDFCBAA7353EFBB553375660DEDE30684C59E5B98221FDEAEAD51C44B8ACFC5EB0667C8894B83D81886A9CE389733CBF5DBD5E9D5E8D9A59859A8B625DC386152A6764ACC7F00164DA146DA6F5DAA56C3B73B237318B6A418E8EAB8090A508E0FED6299176DF2183F8FC7C03FBDFDC7E18BC620CD04E86FAF290E2DB606B96278B59C421DD303D21008E29813377AFFFEAFD269A417C69337E82CC2E827F84554CEF50127C277FBC8AE2E8BA83251EDC214901ED5E8D9A59859A8B67A7B0CDC955A1711089D37D7C0E48F6C5571747095F342E88FB05168BE4CE3AF X-C1DE0DAB: 0D63561A33F958A5CC1D2208EB24C82F5002B1117B3ED69640DB9BF880E526201E49B01306B5E3AD823CB91A9FED034534781492E4B8EEAD0BE004AA24E73514C79554A2A72441328621D336A7BC284946AD531847A6065A535571D14F44ED41 X-C8649E89: 1C3962B70DF3F0AD73CAD6646DEDE191716CD42B3DD1D34C77DD89D51EBB774225B6776AC983F447FC0B9F89525902EE6F57B2FD27647F25E66C117BDB76D65987A0991080A24DFA2B70C9F2BA42886EE1058EBB234A5E65C80BBA9A913989D9610AEF333543F7C3B8341EE9D5BE9A0A6041499AAB29ABA023E2C3E8746DB59A2A880BA08F88F9AAC7CEAA0681F5848F4C41F94D744909CECFA6C6B0C050A61A8CAF69B82BA93681CD72808BE417F3B9E0E7457915DAA85F X-D57D3AED: 3ZO7eAau8CL7WIMRKs4sN3D3tLDjz0dLbV79QFUyzQ2Ujvy7cMT6pYYqY16iZVKkSc3dCLJ7zSJH7+u4VD18S7Vl4ZUrpaVfd2+vE6kuoey4m4VkSEu53w8ahmwBjZKM/YPHZyZHvz5uv+WouB9+ObcCpyrx6l7KImUglyhkEat/+ysWwi0gdhEs0JGjl6ggRWTy1haxBpVdbIX1nthFXOcIETfglQORZ0zpDET4Zrk3igikrdHlWF/auC3N7rtpOphDQ8QPJMA= X-Mailru-Sender: 520A125C2F17F0B17094CDC02B85F11B979D94358B9A3B213DE06ABAFEAF670548EACC472163918CB7CBEF92542CD7C88B0A2698F12F5C9EC77752E0C033A69E86920BD37369036789A8C6A0E60D2BB63A5DB60FBEB33A8A0DA7A0AF5A3A8387 X-Mras: Ok Subject: [Tarantool-patches] [PATCH luajit] ARM64: Don't fuse sign extensions into logical operands. 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" From: Mike Pall Thanks to Peter Cawley. (cherry picked from commit 90742d91c27d185b70d1b4a6343fb6b7c26002db) Logical instructions [1] (`orr`, etc.) have no sign extension form (unlike `ADD Xd, Xn, Wm, SXTW #k`). This makes the fusing sign extension into them meaningless and leads to the incorrect result in the JIT-compiled code. This patch prevents the fusing of sign extension (`sxtw`) into logical instructions. [1]: https://cybersandeep.gitbook.io/arm64basicguide/chapter-3-basic-arm64-instructions#id-3.2.2-logical-instructions Sergey Kaplun: * added the description and the test for the problem Part of tarantool/tarantool#13442 --- Branch: https://github.com/tarantool/luajit/tree/skaplun/lj-1076-not-fuse-sign-ext-logical Related issues: * https://github.com/LuaJIT/LuaJIT/issues/1076 * https://github.com/tarantool/tarantool/issues/13442 src/lj_asm_arm64.h | 11 ++- ...lj-1076-not-fuse-sign-ext-logical.test.lua | 70 +++++++++++++++++++ 2 files changed, 74 insertions(+), 7 deletions(-) create mode 100644 test/tarantool-tests/lj-1076-not-fuse-sign-ext-logical.test.lua diff --git a/src/lj_asm_arm64.h b/src/lj_asm_arm64.h index f731ab05..f080dd6e 100644 --- a/src/lj_asm_arm64.h +++ b/src/lj_asm_arm64.h @@ -208,16 +208,13 @@ static Reg asm_fuseahuref(ASMState *as, IRRef ref, int32_t *ofsp, RegSet allow, static uint32_t asm_fuseopm(ASMState *as, A64Ins ai, IRRef ref, RegSet allow) { IRIns *ir = IR(ref); + int logical = (ai & 0x1f000000) == 0x0a000000; if (ra_hasreg(ir->r)) { ra_noweak(as, ir->r); return A64F_M(ir->r); } else if (irref_isk(ref)) { - uint32_t m; int64_t k = get_k64val(as, ref); - if ((ai & 0x1f000000) == 0x0a000000) - m = emit_isk13(k, irt_is64(ir->t)); - else - m = emit_isk12(k); + uint32_t m = logical ? emit_isk13(k, irt_is64(ir->t)) : emit_isk12(k); if (m) return m; } else if (mayfuse(as, ref)) { @@ -229,7 +226,7 @@ static uint32_t asm_fuseopm(ASMState *as, A64Ins ai, IRRef ref, RegSet allow) (IR(ir->op2)->i & (irt_is64(ir->t) ? 63 : 31)); IRIns *irl = IR(ir->op1); if (sh == A64SH_LSL && - irl->o == IR_CONV && + irl->o == IR_CONV && !logical && irl->op2 == ((IRT_I64<op1, allow); return A64F_M(m) | A64F_SH(sh, shift); } - } else if (ir->o == IR_CONV && + } else if (ir->o == IR_CONV && !logical && ir->op2 == ((IRT_I64<op1, allow); return A64F_M(m) | A64F_EX(A64EX_SXTW); diff --git a/test/tarantool-tests/lj-1076-not-fuse-sign-ext-logical.test.lua b/test/tarantool-tests/lj-1076-not-fuse-sign-ext-logical.test.lua new file mode 100644 index 00000000..b199648d --- /dev/null +++ b/test/tarantool-tests/lj-1076-not-fuse-sign-ext-logical.test.lua @@ -0,0 +1,70 @@ +local tap = require('tap') + +-- The test file to demonstrate incorrect LuaJIT's fusing of the +-- sign extension instruction into logical instructions. +-- See also: https://github.com/LuaJIT/LuaJIT/issues/1076. +local test = tap.test('lj-1076-not-fuse-sign-ext-logical'):skipcond({ + ['Test requires JIT enabled'] = not jit.status(), +}) + +test:plan(5) + +jit.opt.start('hotloop=1') + +local ffi = require('ffi') +local cast = ffi.cast + +local bnot = bit.bnot + +local N = -5 + +-- Test avoiding erroneous fusing of: +-- | sxtw x1, w4 +-- | mvn x0, x1 +-- +-- to the: +-- | mov x0, x4, lsl #48 + +local r = {} +for i = 1, 4 do + r[i] = bnot(cast('int64_t', N)) +end + +test:is(r[1], 4LL, 'correct result for bnot') +test:samevalues(r, 'avoid fusion for explicit CONV with sign extension') + +-- Test avoiding erroneous fusing of: +-- | sxtw x21, w23 +-- | orr x20, x20, x21 +-- +-- to the: +-- | orn x20, x20, x23, lsl #48 + +local function logical_shift_unfused(subtest, expected) + subtest:plan(2) + jit.flush() + jit.opt.start('hotloop=1') + -- Use code generation to avoid using non-constant variables + -- defining functions preventing folding and fusion. + local script = string.format([[ + local bor = bit.bor + local arshift, lshift, rshift = bit.arshift, bit.lshift, bit.rshift + local N = -5 + local zero = 0LL + local result = {} + for i = 1, 4 do + result[i] = bor(%s(N, 1), zero) + end + return result + ]], subtest.name) + local f = assert(loadstring(script, 'unfused ' .. subtest.name)) + local result = f() + subtest:is(result[1], expected, 'correct result for ' .. subtest.name) + subtest:samevalues(result, 'avoid fusion sxtw and orr for ' .. subtest.name) +end + +test:test('arshift', logical_shift_unfused, -3LL) +test:test('lshift', logical_shift_unfused, -10LL) +test:test('rshift', logical_shift_unfused, 0x7FFFFFFDLL) + +test:done(true) -- 2.56.0