archive/ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2025-08-16 05:59:00 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

ZJIT: Fix "immediate value too large" on cmp for x86_64 (#14125)

Browse source 
Co-authored-by: Alan Wu <alansi.xingwu@shopify.com>
This commit is contained in:
Takashi Kokubun 2025-08-06 10:05:20 -07:00 • committed by GitHub
parent bcd21053f7
commit ebb775be8d
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 31 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

8
test/ruby/test_zjit.rb
View file

@ -283,6 +283,14 @@ class TestZJIT < Test::Unit::TestCase
}, insns: [:opt_eq], call_threshold: 2 }, insns: [:opt_eq], call_threshold: 2
end end
def test_opt_eq_with_minus_one
assert_compiles '[false, true]', %q{
def test(a) = a == -1
test(1) # profile opt_eq
[test(0), test(-1)]
}, insns: [:opt_eq], call_threshold: 2
end
def test_opt_neq_dynamic def test_opt_neq_dynamic
# TODO(max): Don't split this test; instead, run all tests with and without # TODO(max): Don't split this test; instead, run all tests with and without
# profiling. # profiling.

27
zjit/src/backend/x86_64/mod.rs
View file

@ -381,7 +381,7 @@ impl Assembler
mov(cb, Assembler::SCRATCH0, opnd.into()); mov(cb, Assembler::SCRATCH0, opnd.into());
Assembler::SCRATCH0 Assembler::SCRATCH0
} else { } else {
opnd.into() imm_opnd(*value as i64)
} }
}, },
_ => opnd.into() _ => opnd.into()
@ -963,7 +963,9 @@ mod tests {
asm.cmp(Opnd::Reg(RAX_REG), Opnd::UImm(0xFF)); asm.cmp(Opnd::Reg(RAX_REG), Opnd::UImm(0xFF));
asm.compile_with_num_regs(&mut cb, 0); asm.compile_with_num_regs(&mut cb, 0);
assert_eq!(format!("{:x}", cb), "4881f8ff000000"); assert_disasm!(cb, "4881f8ff000000", "
0x0: cmp rax, 0xff
");
} }
#[test] #[test]
@ -973,7 +975,22 @@ mod tests {
asm.cmp(Opnd::Reg(RAX_REG), Opnd::UImm(0xFFFF_FFFF_FFFF)); asm.cmp(Opnd::Reg(RAX_REG), Opnd::UImm(0xFFFF_FFFF_FFFF));
asm.compile_with_num_regs(&mut cb, 0); asm.compile_with_num_regs(&mut cb, 0);
assert_eq!(format!("{:x}", cb), "49bbffffffffffff00004c39d8"); assert_disasm!(cb, "49bbffffffffffff00004c39d8", "
0x0: movabs r11, 0xffffffffffff
0xa: cmp rax, r11
");
}
#[test]
fn test_emit_cmp_64_bits() {
let (mut asm, mut cb) = setup_asm();
asm.cmp(Opnd::Reg(RAX_REG), Opnd::UImm(0xFFFF_FFFF_FFFF_FFFF));
asm.compile_with_num_regs(&mut cb, 0);
assert_disasm!(cb, "4883f8ff", "
0x0: cmp rax, -1
");
} }
#[test] #[test]
@ -1051,7 +1068,9 @@ mod tests {
asm.test(Opnd::Reg(RAX_REG), Opnd::UImm(0xFF)); asm.test(Opnd::Reg(RAX_REG), Opnd::UImm(0xFF));
asm.compile_with_num_regs(&mut cb, 0); asm.compile_with_num_regs(&mut cb, 0);
assert_eq!(format!("{:x}", cb), "f6c0ff"); assert_disasm!(cb, "48f7c0ff000000", "
0x0: test rax, 0xff
");
} }
#[test] #[test]