Commit graph

547 commits

Author SHA1 Message Date
Max Bernstein
096d48d7db ZJIT: Deref struct in find() 2025-07-30 10:36:15 -07:00
Max Bernstein
7b10dbd55f ZJIT: Remove catch-all case to make it clearer what's unimplemented 2025-07-30 10:36:15 -07:00
Max Bernstein
9a30554796 ZJIT: Remove unused ArraySet instruction 2025-07-30 10:36:15 -07:00
Takashi Kokubun
2cd10de330
ZJIT: Prepare for sharing JIT hooks with ZJIT (#14044) 2025-07-30 10:11:10 -07:00
Max Bernstein
ade4558602
ZJIT: Catch more failed recursive compilations (#14042)
Untangle the logic a bit and specifically:

* catch `gen_entry` failures
* don't set `start_ptr` until all recursive calls succeed

Co-authored-by: Alan Wu <alanwu@ruby-lang.org>
2025-07-29 16:36:25 -04:00
Max Bernstein
039f4139f8
ZJIT: Create delta debugging script to narrow JIT failures (#14041)
Add support for `--zjit-allowed-iseqs=SomeFile` and
`--zjit-log-compiled-iseqs=SomeFile` so we can restrict and inspect
which ISEQs get compiled.

Then add `jit_bisect.rb` which we can run to try and narrow a failing
script. For example:

    plum% ../tool/zjit_bisect.rb ../build-dev/miniruby "test.rb"
    I, [2025-07-29T12:41:18.657177 #96899]  INFO -- : Starting with JIT list of 4 items.
    I, [2025-07-29T12:41:18.657229 #96899]  INFO -- : Verifying items
    I, [2025-07-29T12:41:18.726213 #96899]  INFO -- : step fixed[0] and items[4]
    I, [2025-07-29T12:41:18.726246 #96899]  INFO -- : 4 candidates
    I, [2025-07-29T12:41:18.797212 #96899]  INFO -- : 2 candidates
    Reduced JIT list:
    bar@test.rb:8
    plum%

We start with 4 compiled functions and shrink to just one.
2025-07-29 19:43:14 +00:00
Takashi Kokubun
b22eb0e468
ZJIT: Add --zjit-stats (#14034) 2025-07-29 10:00:15 -07:00
Jean Boussier
7ee127d2d1 Get rid of imemo_ast
It has been marked as obsolete for a while and I see no reason
to keep it.
2025-07-29 13:05:12 +02:00
Stan Lo
a0d0b84bad
ZJIT: Support invalidating constant patch points (#13998) 2025-07-28 14:48:41 -07:00
Max Bernstein
3f22434e1a ZJIT: Fix land race 2025-07-28 15:36:20 -04:00
Max Bernstein
b2b2aff61d ZJIT: Mark Symbol, Float, NilClass, TrueClass, FalseClass as final
They can be subclassed but new instances cannot be created.
2025-07-28 12:35:21 -07:00
Max Bernstein
f6dccdb1ff ZJIT: Remove Integer subclasses from lattice
While Integer can technically be subclassed, instances of subclasses
cannot be created. Remove it from the type lattice.
2025-07-28 12:35:21 -07:00
Stan Lo
043489abc2
ZJIT: Inline guard type checks for some built-in types (#14017)
This implements similar fast-path guard type checks as YJIT.
2025-07-28 15:32:32 -04:00
Alan Wu
ff428b4dd0 ZJIT: Keep a frame pointer and use it for memory params
Previously, ZJIT miscompiled the following because of native SP
interference.

    def a(n1,n2,n3,n4,n5,n6,n7,n8) = [n8]
    a(0,0,0,0,0,0,0, :ok)

Commented problematic disassembly:

    ; call rb_ary_new_capa
    mov x0, #1
    mov x16, #0x1278
    movk x16, #0x4bc, lsl #16
    movk x16, #1, lsl #32
    blr x16
    ; call rb_ary_push
    mov x1, x0
    str x1, [sp, #-0x10]! ; c_push() from alloc_regs()
    mov x0, x1            ; arg0, the array
    ldur x1, [sp]         ; meant to be arg1=n8, but sp just moved!
    mov x16, #0x3968
    movk x16, #0x4bc, lsl #16
    movk x16, #1, lsl #32
    blr x16

Since the frame pointer stays constant in the body of the function,
static offsets based on it don't run the risk of being invalidated by SP
movements.

Pass the registers to preserve through Insn::FrameSetup. This allows ARM
to use STP and waste no gaps between EC, SP, and CFP.

x86 now preserves and restores RBP since we use it as the frame pointer.
Since all arches now have a frame pointer, remove offset based SP
movement in the epilogue and restore registers using the frame pointer.
2025-07-28 15:30:50 -04:00
Alan Wu
271e52d553 ZJIT: Re-enable some A64 assembler tests
Tweak for Condition to build when `cfg!(target = "x86_64")`.
2025-07-24 17:01:27 -04:00
Alan Wu
7e2b6291b8 ZJIT: DRY up underscore rexport anti-pattern
Keeping the same name makes re-exporting more concise.
2025-07-24 17:01:27 -04:00
Peter Zhu
f186f2cb70 Remove unused imemo_parser_strterm 2025-07-24 09:49:13 -04:00
Stan Lo
3504eba9b8 ZJIT: Start testing againt /test 2025-07-23 19:52:59 -04:00
Alan Wu
41149a96ef ZJIT: Fix clobbering register for self in gen_entry_params()
Previously, for 8+ params we wound up clobbering the self param when
putting the last param in memory in the JIT entry point:

    # ZJIT entry point: a@../test.rb:5
    <snip>
    ldur x0, [x19, #0x18]
    # set method params: 8
    ldur x1, [x21, #-0x58]
    ldur x2, [x21, #-0x50]
    ldur x3, [x21, #-0x48]
    ldur x4, [x21, #-0x40]
    ldur x5, [x21, #-0x38]
    ldur x11, [x21, #-0x30]
    ldur x12, [x21, #-0x28]
    ldur x0, [x21, #-0x20]
    stur x0, [sp, #-0x20]
    bl #0x11e17018c

Doing the memcpys for parameters in memory first avoids this clobbering.

    # set method params: 8
    ldur x0, [x21, #-0x20]
    stur x0, [sp, #-0x20]
    ldur x12, [x21, #-0x28]
    ldur x11, [x21, #-0x30]
    ldur x5, [x21, #-0x38]
    ldur x4, [x21, #-0x40]
    ldur x3, [x21, #-0x48]
    ldur x2, [x21, #-0x50]
    ldur x1, [x21, #-0x58]
    ldur x0, [x19, #0x18]
2025-07-23 13:29:03 -04:00
Alan Wu
33363030e1 ZJIT: Use rb_vm_env_write() for hir::Insn::SetLocal
We weren't firing write barriers before when writing to imemo/env
objects. Wbcheck caught this with test/ruby/test_refinement.rb:

    ruby -v: ruby 3.5.0dev (2025-07-22T17:05:58Z wbcheck 2569a80954) +ZJIT dev +PRISM +GC[wbcheck] [x86_64-linux]
    WBCHECK ERROR: Missed write barrier detected!
      Parent object: 0x558de9f4e6e0 (wb_protected: true)
        rb_obj_info_dump: 0x0000558de9f4e6e0 T_IMEMO/<env>
      Reference counts - snapshot: 3, writebarrier: 0, current: 4, missed: 1
      Missing reference to: 0x558decf37c30
        rb_obj_info_dump: 0x0000558decf37c30 method/UnboundMethod method

    WBCHECK SUMMARY: Found 1 objects with missed write barriers (1 total violations)
2025-07-22 18:04:28 -04:00
Alan Wu
e77eee96a3 ZJIT: Load return value before frame teardown
Or else the following returns garbage since it loads after
moving SP. Prior bad disassembly:

    def a(n1,n2,n3,n4,n5,n6,n7,n8) = n8
    a(1,1,1,1,1,1,1,0)

    # Block: bb0(v0, v1, v2, v3, v4, v5, v6, v7, v8)
    stp x29, x30, [sp, #-0x10]!
    mov x29, sp
    # bump C stack pointer
    sub sp, sp, #0x10
    # Insn: v10 Return v8
    # pop stack frame
    adds x19, x19, #0x38
    stur x19, [x20, #0x10]
    # restore C stack pointer
    add sp, sp, #0x10
    mov sp, x29
    ldp x29, x30, [sp], #0x10
    ldur x0, [sp]
    ret
2025-07-21 23:09:42 -04:00
Alan Wu
3bbdcf0848 ZJIT: Remove no-op movs after register allocation
Previously `no_dead_mov_from_vreg` generated:

    0x0: ldur x0, [x0]
    0x4: mov x0, x0
    0x8: ret

Because of phase ordering. Split couldn't recognize that the no-op mov
because at that point it sees a `VReg`.
2025-07-21 13:51:44 -04:00
Alan Wu
495e3f642b ZJIT: Trim disassembly output from capstone-rs
It has a bad habit of leaving a trailing space, for example for ARM
`ret`.
2025-07-21 13:51:44 -04:00
Stan Lo
8df61bfc92
ZJIT: Support invalidating on method redefinition (#13875)
ZJIT: Support invalidating method redefinition

This commit adds support for the MethodRedefined invariant to be invalidated
when a method is redefined.

Changes:
- Added CME pointer to the MethodRedefined invariant in HIR
- Updated all places where MethodRedefined invariants are created to
    include the CME pointer
- Added handling for MethodRedefined invariants in gen_patch_point to
    call track_cme_assumption, which registers the patch point for
    invalidation when rb_zjit_cme_invalidate is called

This ensures that when a method is redefined, all JIT code that
depends on that method will be properly invalidated.
2025-07-18 15:36:51 +00:00
Stan Lo
81515aca67
ZJIT: Fix fixnum folding for negative values (#13942)
Use `fixnum_from_isize` instead of `fixnum_from_usize` in
`fold_fixnum_bop` to properly handle negative values. Casting negative
`i64` to `usize` produces large unsigned values that exceed `RUBY_FIXNUM_MAX`.
2025-07-17 19:48:53 -04:00
Max Bernstein
30b1368829
ZJIT: Create perf map files for profilers (#13941)
This lets us ZJIT compiled functions show up in the profiles of, say,
perf, or samply.

Fix https://github.com/Shopify/ruby/issues/634
2025-07-17 22:36:44 +00:00
Takashi Kokubun
014df99c94
ZJIT: Remove obsoleted exit_trampoline (#13943) 2025-07-17 14:12:54 -07:00
Takashi Kokubun
04d43e1870
ZJIT: Give up JIT-to-JIT calls for 6+ args (#13939) 2025-07-17 12:22:26 -07:00
John Hawthorn
cb33f22f5b ZJIT: Precise GC writebarriers
This issues writebarriers for objects added via gc_offsets or by
profiling. This may be slower than writebarrier_remember, but we would
like it to be more debuggable.

Co-authored-by: Max Bernstein <ruby@bernsteinbear.com>
Co-authored-by: Stan Lo <stan001212@gmail.com>
2025-07-17 11:50:13 -07:00
Takashi Kokubun
39b844e064 Tweak the comment on mark_all_executable() a little [ci skip] 2025-07-17 11:42:07 -07:00
Takashi Kokubun
ff77473acb
ZJIT: Mark the code region executable on partial failures (#13937) 2025-07-17 11:39:03 -07:00
Alan Wu
1a20765074 DRY up CARGO_VERBOSE for JITs 2025-07-16 19:50:30 -04:00
Alan Wu
116509670a ZJIT: Define make recipes only when configured
This gives a better signal when say you try to run `make zjit-test` on a
YJIT-only build.
2025-07-16 19:50:30 -04:00
Alan Wu
960fae438b
ZJIT: Add missing write barrier in profiling (GH-13922)
Fixes `TestZJIT::test_require_rubygems`. It was crashing locally due to
false collection of a live object. See
<https://alanwu.space/post/write-barrier/>.

Co-authored-by: Max Bernstein <max@bernsteinbear.com>
Co-authored-by: Takashi Kokubun <takashi.kokubun@shopify.com>
Co-authored-by: Stan Lo <stan.lo@shopify.com>
2025-07-16 23:25:37 +00:00
Max Bernstein
15cf72dade
ZJIT: Check if BOP is redefined before rewriting (#13916)
Fix https://github.com/Shopify/ruby/issues/592
2025-07-16 22:12:19 +00:00
Max Bernstein
4403cb2705
ZJIT: Eagerly infer types of rewritten Const instructions (#13917)
This helps us rewrite more SendWithoutBlock into SendWithoutBlockDirect.
2025-07-16 17:17:01 -04:00
Max Bernstein
900eb04853
ZJIT: Split shift with immediate operand (#13914)
Fix https://github.com/Shopify/ruby/issues/627
2025-07-16 19:50:33 +00:00
Max Bernstein
343619c93c
ZJIT: Remove dead have_two_fixnums function (#13913) 2025-07-16 19:17:38 +00:00
Alan Wu
95521324de ZJIT: A64: Fix bad operand swapping in asm.sub(imm, reg)
Previously, my buggy optimization would turn `asm.sub(imm, reg)`
into `subs out, reg, imm` since it runs through the addition path which
relies on the commutative property. Don't do that because subtraction
does not commute. Good thing no one seems to use this form.

Also, delete the 2 regs match arm for Add because it's already covered
by the fallback arm -- both split_load_operand() and
split_shifted_immediate() are no-op when the input is a register.

Fixes: 1317377fa7 ("ZJIT: A64: Have add/sub to SP be
single-instruction")
2025-07-16 14:10:22 -04:00
Alan Wu
0c26dea5bb ZJIT: A64: Fix the optimization merging asm.add(reg, imm) with Mov
The raw bytes didn't disassemble to the disassembly, but we missed this
since CI didn't run `make zjit-test` with the disasm feature.

Fixes: 1317377fa7 ("ZJIT: A64: Have add/sub to SP be
single-instruction")
2025-07-16 14:10:22 -04:00
Alan Wu
7df8e9e427 ZJIT: A64: Fix asm.add_into(NATIVE_STACK_POINTER, ...)
Previously, it issued CMN, which doesn't add to the stack pointer.
2025-07-16 14:10:22 -04:00
Alan Wu
5ee3937a9c ZJIT: Have make zjit-test use the same Cargo features as miniruby
This is so that e.g. building with `--enable-zjit=dev` will test with the
disassembly feature. It makes more sense, saves on build time and
reveals that
`backend::arm64::tests::sp_movements_are_single_instruction` was in
fact failing with the `disasm` feature.
2025-07-16 14:10:22 -04:00
Takashi Kokubun
ea81e7b8b7
ZJIT: Remove an extra slash from $(TESTS) (#13911) 2025-07-16 10:46:12 -07:00
Takashi Kokubun
acc3172530
ZJIT: Profile each instruction at most num_profiles times (#13903)
* ZJIT: Profile each instruction at most num_profiles times

* Use saturating_add for num_profiles
2025-07-16 09:53:10 -07:00
Takashi Kokubun
af1ad78bff Use a const block
Co-authored-by: Alan Wu <XrXr@users.noreply.github.com>
2025-07-16 09:50:25 -07:00
Takashi Kokubun
8668e4dd07 ZJIT: Restore SP on side-exit chains 2025-07-16 09:50:25 -07:00
Takashi Kokubun
2250a66aa8 ZJIT: Fix SP alignment on JIT entry for x86_64 2025-07-16 09:50:25 -07:00
Stan Lo
5723945335
ZJIT: Start testing against /test/ruby/ and update all ZJIT related testing targets/docs (#13791)
* ZJIT: Add test exclusions for ZJIT

* ZJIT: Update test targets and documentation

- Rename `zjit-test-all` to `zjit-check`
- Add `zjit-test-all` target to zjit.mk to run all Ruby tests with ZJIT enabled
  excluding known failing tests
- Update documentation and CI workflow to reflect the new targets
2025-07-15 15:03:40 -07:00
Alan Wu
b2ef33b3c5 ZJIT: Redo JIT function native stack frame layout
Previously, gen_param() access slots at `SP-x` for `x≥0` after subtracting from
SP, so it was accessing slots from above the top of the stack. Also, the
slots gen_entry_params() wrote to at entry point did not correspond to
the slots access inside the JIT function.

Redo the stack frame layout so that inside the function slots are at
`SP+x`. Write to those slots in the entry point by anticipating the size
of the frame.

Fixes test_spilled_method_args().
2025-07-15 14:47:32 -04:00
Alan Wu
50e2d58af8 ZJIT: Ban asm.load_into(Mem, ..) and avoid it in gen_entry_params()
Now that params can be in memory, this particular load_into() was
panicking with "Invalid operands for LDUR" with
test_spilled_method_args() on ARM.
Since it's documented to be for register destinations let's validate it.
2025-07-15 14:47:32 -04:00