forked from LuaJIT/LuaJIT
-
Notifications
You must be signed in to change notification settings - Fork 13
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Thanks to Peter Cawley. (cherry picked from commit 9e04372) For `IR_BSHR`, `IR_BROL`, `IR_BROR` during `kfold_int64arith()` the left argument is truncated down to 32 bits, which leads to incorrect results if the right argument is >= 32. Also, `IR_BSAR` does an unsigned shift rather than a signed shift, but since this case branch is unreachable, it is harmless for now. This patch fixes all misbehaviours (including possible for `IR_BSAR`) to preserve IR semantics. Sergey Kaplun: * added the description and the test for the problem Part of tarantool/tarantool#10199
- Loading branch information
Showing
2 changed files
with
78 additions
and
4 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
74 changes: 74 additions & 0 deletions
74
test/tarantool-tests/lj-1079-fix-64-bitshift-folds.test.lua
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,74 @@ | ||
local tap = require('tap') | ||
|
||
-- Test file to demonstrate LuaJIT misbehaviour on folding | ||
-- for bitshift operations. | ||
-- See also, https://github.com/LuaJIT/LuaJIT/issues/1079. | ||
|
||
local test = tap.test('lj-1079-fix-64-bitshift-folds'):skipcond({ | ||
['Test requires JIT enabled'] = not jit.status(), | ||
}) | ||
|
||
local bit = require('bit') | ||
|
||
test:plan(4) | ||
|
||
-- Generic function for `bit.ror()`, `bit.rol()`. | ||
local function bitop_rotation(bitop) | ||
local r = {} | ||
for i = 1, 4 do | ||
-- (i & k1) o k2 ==> (i o k2) & (k1 o k2) | ||
local int64 = bit.band(i, 7LL) | ||
r[i] = tonumber(bitop(int64, 32)) | ||
end | ||
return r | ||
end | ||
|
||
-- Similar function for `bit.rshift()`. | ||
local function bitop_rshift_signed() | ||
local r = {} | ||
for i = 1, 4 do | ||
-- (i & k1) o k2 ==> (i o k2) & (k1 o k2) | ||
-- XXX: Use `-i` instead of `i` to prevent other folding due | ||
-- to IR difference so the IRs don't match fold rule mask. | ||
-- (-i & 7LL) < 1 << 32 => result == 0. | ||
local int64 = bit.band(-i, 7LL) | ||
r[i] = tonumber(bit.rshift(int64, 32)) | ||
end | ||
return r | ||
end | ||
|
||
-- A little bit different example, which leads to the assertion | ||
-- failure due to the incorrect recording. | ||
local function bitop_rshift_huge() | ||
local r = {} | ||
for i = 1, 4 do | ||
-- (i & k1) o k2 ==> (i o k2) & (k1 o k2) | ||
-- XXX: Need to use cast to the int64_t via `+ 0LL`, see the | ||
-- documentation [1] for the details. | ||
-- [1]: https://bitop.luajit.org/semantics.html | ||
local int64 = bit.band(2 ^ 33 + i, 2 ^ 33 + 0LL) | ||
r[i] = tonumber(bit.rshift(int64, 32)) | ||
end | ||
return r | ||
end | ||
|
||
local function test_64bitness(subtest, payload_func, bitop) | ||
subtest:plan(1) | ||
|
||
jit.off() | ||
jit.flush() | ||
local results_joff = payload_func(bitop) | ||
jit.on() | ||
-- Reset hotcounters. | ||
jit.opt.start('hotloop=1') | ||
local results_jon = payload_func(bitop) | ||
subtest:is_deeply(results_jon, results_joff, | ||
'same results for VM and JIT for ' .. subtest.name) | ||
end | ||
|
||
test:test('rol', test_64bitness, bitop_rotation, bit.rol) | ||
test:test('ror', test_64bitness, bitop_rotation, bit.ror) | ||
test:test('rshift signed', test_64bitness, bitop_rshift_signed) | ||
test:test('rshift huge', test_64bitness, bitop_rshift_huge) | ||
|
||
test:done(true) |