ruby-changes:73229
From: Noah <ko1@a...>
Date: Tue, 30 Aug 2022 01:03:20 +0900 (JST)
Subject: [ruby-changes:73229] 4b1ab009c4 (master): Port the YJIT defined opcode; fix C_ARG_REGS (https://github.com/Shopify/ruby/pull/342)
https://git.ruby-lang.org/ruby.git/commit/?id=4b1ab009c4 From 4b1ab009c4ceea2232d1c71a1af7bf1a04af2165 Mon Sep 17 00:00:00 2001 From: Noah Gibbs <the.codefolio.guy@g...> Date: Wed, 27 Jul 2022 17:42:52 +0100 Subject: Port the YJIT defined opcode; fix C_ARG_REGS (https://github.com/Shopify/ruby/pull/342) --- yjit/src/asm/x86_64/mod.rs | 3 --- yjit/src/backend/arm64/mod.rs | 4 ++-- yjit/src/backend/x86_64/mod.rs | 4 ++-- yjit/src/codegen.rs | 25 +++++++++---------------- 4 files changed, 13 insertions(+), 23 deletions(-) diff --git a/yjit/src/asm/x86_64/mod.rs b/yjit/src/asm/x86_64/mod.rs index d23279f277..3f865b82a5 100644 --- a/yjit/src/asm/x86_64/mod.rs +++ b/yjit/src/asm/x86_64/mod.rs @@ -264,9 +264,6 @@ pub const R13B: X86Opnd = X86Opnd::Reg(X86Reg { num_bits: 8, reg_type: RegType:: https://github.com/ruby/ruby/blob/trunk/yjit/src/asm/x86_64/mod.rs#L264 pub const R14B: X86Opnd = X86Opnd::Reg(X86Reg { num_bits: 8, reg_type: RegType::GP, reg_no: 14 }); pub const R15B: X86Opnd = X86Opnd::Reg(X86Reg { num_bits: 8, reg_type: RegType::GP, reg_no: 15 }); -// C argument registers on this platform -pub const C_ARG_REGS: [X86Opnd; 6] = [RDI, RSI, RDX, RCX, R8, R9]; - //=========================================================================== /// Shorthand for memory operand with base register and displacement diff --git a/yjit/src/backend/arm64/mod.rs b/yjit/src/backend/arm64/mod.rs index 018dd79ae4..99cf08c09c 100644 --- a/yjit/src/backend/arm64/mod.rs +++ b/yjit/src/backend/arm64/mod.rs @@ -193,7 +193,7 @@ impl Assembler https://github.com/ruby/ruby/blob/trunk/yjit/src/backend/arm64/mod.rs#L193 } }, Op::CCall => { - assert!(opnds.len() < C_ARG_REGS.len()); + assert!(opnds.len() < C_ARG_OPNDS.len()); // For each of the operands we're going to first load them // into a register and then move them into the correct @@ -202,7 +202,7 @@ impl Assembler https://github.com/ruby/ruby/blob/trunk/yjit/src/backend/arm64/mod.rs#L202 // which is both the return value and first argument register for (idx, opnd) in opnds.into_iter().enumerate().rev() { let value = asm.load(opnd); - asm.mov(Opnd::Reg(C_ARG_REGREGS[idx]), value); + asm.mov(C_ARG_OPNDS[idx], value); } // Now we push the CCall without any arguments so that it diff --git a/yjit/src/backend/x86_64/mod.rs b/yjit/src/backend/x86_64/mod.rs index c1bcdca3e7..13bb106b97 100644 --- a/yjit/src/backend/x86_64/mod.rs +++ b/yjit/src/backend/x86_64/mod.rs @@ -339,11 +339,11 @@ impl Assembler https://github.com/ruby/ruby/blob/trunk/yjit/src/backend/x86_64/mod.rs#L339 // C function call Op::CCall => { // Temporary - assert!(insn.opnds.len() < C_ARG_REGS.len()); + assert!(insn.opnds.len() < _C_ARG_OPNDS.len()); // For each operand for (idx, opnd) in insn.opnds.iter().enumerate() { - mov(cb, C_ARG_REGS[idx], insn.opnds[idx].into()); + mov(cb, X86Opnd::Reg(_C_ARG_OPNDS[idx].unwrap_reg()), insn.opnds[idx].into()); } let ptr = insn.target.unwrap().unwrap_fun_ptr(); diff --git a/yjit/src/codegen.rs b/yjit/src/codegen.rs index e29e570de1..cb4b23e26e 100644 --- a/yjit/src/codegen.rs +++ b/yjit/src/codegen.rs @@ -2177,11 +2177,12 @@ fn gen_setinstancevariable( https://github.com/ruby/ruby/blob/trunk/yjit/src/codegen.rs#L2177 KeepCompiling } +*/ fn gen_defined( jit: &mut JITState, ctx: &mut Context, - cb: &mut CodeBlock, + asm: &mut Assembler, _ocb: &mut OutlinedCb, ) -> CodegenStatus { let op_type = jit_get_arg(jit, 0); @@ -2190,26 +2191,19 @@ fn gen_defined( https://github.com/ruby/ruby/blob/trunk/yjit/src/codegen.rs#L2191 // Save the PC and SP because the callee may allocate // Note that this modifies REG_SP, which is why we do it first - jit_prepare_routine_call(jit, ctx, cb, REG0); + jit_prepare_routine_call(jit, ctx, asm); // Get the operands from the stack let v_opnd = ctx.stack_pop(1); // Call vm_defined(ec, reg_cfp, op_type, obj, v) - mov(cb, C_ARG_REGS[0], REG_EC); - mov(cb, C_ARG_REGS[1], REG_CFP); - mov(cb, C_ARG_REGS[2], uimm_opnd(op_type.into())); - jit_mov_gc_ptr(jit, cb, C_ARG_REGS[3], obj); - mov(cb, C_ARG_REGS[4], v_opnd); - call_ptr(cb, REG0, rb_vm_defined as *const u8); + let def_result = asm.ccall(rb_vm_defined as *const u8, vec![EC, CFP, op_type.into(), obj.into(), v_opnd]); // if (vm_defined(ec, GET_CFP(), op_type, obj, v)) { // val = pushval; // } - jit_mov_gc_ptr(jit, cb, REG1, pushval); - cmp(cb, AL, imm_opnd(0)); - mov(cb, RAX, uimm_opnd(Qnil.into())); - cmovnz(cb, RAX, REG1); + asm.test(def_result, Opnd::UImm(255)); + let out_value = asm.csel_nz(pushval.into(), Qnil.into()); // Push the return value onto the stack let out_type = if pushval.special_const_p() { @@ -2218,11 +2212,12 @@ fn gen_defined( https://github.com/ruby/ruby/blob/trunk/yjit/src/codegen.rs#L2212 Type::Unknown }; let stack_ret = ctx.stack_push(out_type); - mov(cb, stack_ret, RAX); + asm.mov(stack_ret, out_value); KeepCompiling } +/* fn gen_checktype( jit: &mut JITState, ctx: &mut Context, @@ -5997,10 +5992,8 @@ fn get_gen_fn(opcode: VALUE) -> Option<InsnGenFn> { https://github.com/ruby/ruby/blob/trunk/yjit/src/codegen.rs#L5992 YARVINSN_splatarray => Some(gen_splatarray), YARVINSN_newrange => Some(gen_newrange), YARVINSN_putstring => Some(gen_putstring), - /* - YARVINSN_expandarray => Some(gen_expandarray), + //YARVINSN_expandarray => Some(gen_expandarray), YARVINSN_defined => Some(gen_defined), - */ YARVINSN_checkkeyword => Some(gen_checkkeyword), /* YARVINSN_concatstrings => Some(gen_concatstrings), -- cgit v1.2.1 -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/