1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Revert "YJIT: implement expandarray_rhs_too_small case (#8153)"

Browse Source 
This reverts commit 3b88a0bee841aee77bee306d9d34e587561515cf.

  This commit break aarch64 platform and Apple Silicon
This commit is contained in:
Hiroshi SHIBATA 2023-08-02 14:22:11 +09:00
parent c5abe0d08f
commit fd782dcd1e
No known key found for this signature in database
GPG Key ID: F9CF13417264FAC2
2 changed files with 18 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

66
yjit/src/backend/x86_64/mod.rs
View File

@ -428,31 +428,11 @@ impl Assembler
} }
} }
fn emit_csel( fn emit_csel(cb: &mut CodeBlock, truthy: Opnd, falsy: Opnd, out: Opnd, cmov_fn: fn(&mut CodeBlock, X86Opnd, X86Opnd)) {
cb: &mut CodeBlock, if out != truthy {
truthy: Opnd, mov(cb, out.into(), truthy.into());
falsy: Opnd,
out: Opnd,
cmov_fn: fn(&mut CodeBlock, X86Opnd, X86Opnd),
cmov_neg: fn(&mut CodeBlock, X86Opnd, X86Opnd)){
// Assert that output is a register
out.unwrap_reg();
// If the truthy value is a memory operand
if let Opnd::Mem(_) = truthy {
if out != falsy {
mov(cb, out.into(), falsy.into());
}
cmov_fn(cb, out.into(), truthy.into());
} else {
if out != truthy {
mov(cb, out.into(), truthy.into());
}
cmov_neg(cb, out.into(), falsy.into());
} }
cmov_fn(cb, out.into(), falsy.into());
} }
//dbg!(&self.insns); //dbg!(&self.insns);
@ -744,28 +724,28 @@ impl Assembler
Insn::Breakpoint => int3(cb), Insn::Breakpoint => int3(cb),
Insn::CSelZ { truthy, falsy, out } => { Insn::CSelZ { truthy, falsy, out } => {
emit_csel(cb, *truthy, *falsy, *out, cmovz, cmovnz); emit_csel(cb, *truthy, *falsy, *out, cmovnz);
}, },
Insn::CSelNZ { truthy, falsy, out } => { Insn::CSelNZ { truthy, falsy, out } => {
emit_csel(cb, *truthy, *falsy, *out, cmovnz, cmovz); emit_csel(cb, *truthy, *falsy, *out, cmovz);
}, },
Insn::CSelE { truthy, falsy, out } => { Insn::CSelE { truthy, falsy, out } => {
emit_csel(cb, *truthy, *falsy, *out, cmove, cmovne); emit_csel(cb, *truthy, *falsy, *out, cmovne);
}, },
Insn::CSelNE { truthy, falsy, out } => { Insn::CSelNE { truthy, falsy, out } => {
emit_csel(cb, *truthy, *falsy, *out, cmovne, cmove); emit_csel(cb, *truthy, *falsy, *out, cmove);
}, },
Insn::CSelL { truthy, falsy, out } => { Insn::CSelL { truthy, falsy, out } => {
emit_csel(cb, *truthy, *falsy, *out, cmovl, cmovge); emit_csel(cb, *truthy, *falsy, *out, cmovge);
}, },
Insn::CSelLE { truthy, falsy, out } => { Insn::CSelLE { truthy, falsy, out } => {
emit_csel(cb, *truthy, *falsy, *out, cmovle, cmovg); emit_csel(cb, *truthy, *falsy, *out, cmovg);
}, },
Insn::CSelG { truthy, falsy, out } => { Insn::CSelG { truthy, falsy, out } => {
emit_csel(cb, *truthy, *falsy, *out, cmovg, cmovle); emit_csel(cb, *truthy, *falsy, *out, cmovle);
}, },
Insn::CSelGE { truthy, falsy, out } => { Insn::CSelGE { truthy, falsy, out } => {
emit_csel(cb, *truthy, *falsy, *out, cmovge, cmovl); emit_csel(cb, *truthy, *falsy, *out, cmovl);
} }
Insn::LiveReg { .. } => (), // just a reg alloc signal, no code Insn::LiveReg { .. } => (), // just a reg alloc signal, no code
Insn::PadInvalPatch => { Insn::PadInvalPatch => {
@ -1197,26 +1177,4 @@ mod tests {
0x23: call rax 0x23: call rax
"}); "});
} }
#[test]
fn test_cmov_mem() {
let (mut asm, mut cb) = setup_asm();
let top = Opnd::mem(64, SP, 0);
let ary_opnd = SP;
let array_len_opnd = Opnd::mem(64, SP, 16);
asm.cmp(array_len_opnd, 1.into());
let elem_opnd = asm.csel_g(Opnd::mem(64, ary_opnd, 0), Qnil.into());
asm.mov(top, elem_opnd);
asm.compile_with_num_regs(&mut cb, 1);
assert_disasm!(cb, "48837b1001b804000000480f4f03488903", {"
0x0: cmp qword ptr [rbx + 0x10], 1
0x5: mov eax, 4
0xa: cmovg rax, qword ptr [rbx]
0xe: mov qword ptr [rbx], rax
"});
}
} }

11
yjit/src/codegen.rs
View File

@ -1517,6 +1517,11 @@ fn gen_expandarray(
let array_reg = asm.load(array_opnd); let array_reg = asm.load(array_opnd);
let array_len_opnd = get_array_len(asm, array_reg); let array_len_opnd = get_array_len(asm, array_reg);
// Only handle the case where the number of values in the array is greater
// than or equal to the number of values requested.
asm.cmp(array_len_opnd, num.into());
asm.jl(Target::side_exit(Counter::expandarray_rhs_too_small));
// Load the address of the embedded array into REG1. // Load the address of the embedded array into REG1.
// (struct RArray *)(obj)->as.ary // (struct RArray *)(obj)->as.ary
let array_reg = asm.load(array_opnd); let array_reg = asm.load(array_opnd);
@ -1537,11 +1542,7 @@ fn gen_expandarray(
for i in (0..num).rev() { for i in (0..num).rev() {
let top = asm.stack_push(Type::Unknown); let top = asm.stack_push(Type::Unknown);
let offset = i32::try_from(i * SIZEOF_VALUE).unwrap(); let offset = i32::try_from(i * SIZEOF_VALUE).unwrap();
asm.mov(top, Opnd::mem(64, ary_opnd, offset));
// If the element index is less than the length of the array, load it
asm.cmp(array_len_opnd, i.into());
let elem_opnd = asm.csel_g(Opnd::mem(64, ary_opnd, offset), Qnil.into());
asm.mov(top, elem_opnd);
} }
Some(KeepCompiling) Some(KeepCompiling)