Thanks to visit codestin.com
Credit goes to github.com

Skip to content

ZJIT: Drop trace_zjit_* instructions #13189

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Apr 28, 2025
Merged

ZJIT: Drop trace_zjit_* instructions #13189

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
57 changes: 36 additions & 21 deletions iseq.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3283,7 +3283,7 @@ iseq_data_to_ary(const rb_iseq_t *iseq)
VALUE exception = rb_ary_new(); /* [[....]] */
VALUE misc = rb_hash_new();

static ID insn_syms[VM_INSTRUCTION_SIZE/2]; /* w/o-trace only */
static ID insn_syms[VM_BARE_INSTRUCTION_SIZE]; /* w/o-trace only */
struct st_table *labels_table = st_init_numtable();
VALUE labels_wrapper = TypedData_Wrap_Struct(0, &label_wrapper, labels_table);

Expand Down Expand Up @@ -3745,17 +3745,21 @@ rb_iseq_defined_string(enum defined_type type)
return rb_fstring_cstr(estr);
}

/* A map from encoded_insn to insn_data: decoded insn number, its len,
* non-trace version of encoded insn, and trace version. */

// A map from encoded_insn to insn_data: decoded insn number, its len,
// decoded ZJIT insn number, non-trace version of encoded insn,
// trace version, and zjit version.
static st_table *encoded_insn_data;
typedef struct insn_data_struct {
int insn;
int insn_len;
void *notrace_encoded_insn;
void *trace_encoded_insn;
#if USE_ZJIT
int zjit_insn;
void *zjit_encoded_insn;
#endif
} insn_data_t;
static insn_data_t insn_data[VM_INSTRUCTION_SIZE/2];
static insn_data_t insn_data[VM_BARE_INSTRUCTION_SIZE];

void
rb_free_encoded_insn_data(void)
Expand All @@ -3772,27 +3776,33 @@ rb_vm_encoded_insn_data_table_init(void)
#else
#define INSN_CODE(insn) (insn)
#endif
st_data_t insn;
encoded_insn_data = st_init_numtable_with_size(VM_INSTRUCTION_SIZE / 2);

for (insn = 0; insn < VM_INSTRUCTION_SIZE/2; insn++) {
st_data_t key1 = (st_data_t)INSN_CODE(insn);
st_data_t key2 = (st_data_t)INSN_CODE(insn + VM_INSTRUCTION_SIZE/2);
encoded_insn_data = st_init_numtable_with_size(VM_BARE_INSTRUCTION_SIZE);

insn_data[insn].insn = (int)insn;
for (int insn = 0; insn < VM_BARE_INSTRUCTION_SIZE; insn++) {
insn_data[insn].insn = insn;
insn_data[insn].insn_len = insn_len(insn);

if (insn != BIN(opt_invokebuiltin_delegate_leave)) {
insn_data[insn].notrace_encoded_insn = (void *) key1;
insn_data[insn].trace_encoded_insn = (void *) key2;
}
else {
insn_data[insn].notrace_encoded_insn = (void *) INSN_CODE(BIN(opt_invokebuiltin_delegate));
insn_data[insn].trace_encoded_insn = (void *) INSN_CODE(BIN(opt_invokebuiltin_delegate) + VM_INSTRUCTION_SIZE/2);
}
// When tracing :return events, we convert opt_invokebuiltin_delegate_leave + leave into
// opt_invokebuiltin_delegate + trace_leave. https://github.com/ruby/ruby/pull/3256
int notrace_insn = (insn != BIN(opt_invokebuiltin_delegate_leave)) ? insn : BIN(opt_invokebuiltin_delegate);
insn_data[insn].notrace_encoded_insn = (void *)INSN_CODE(notrace_insn);
insn_data[insn].trace_encoded_insn = (void *)INSN_CODE(notrace_insn + VM_BARE_INSTRUCTION_SIZE);

st_data_t key1 = (st_data_t)INSN_CODE(insn);
st_data_t key2 = (st_data_t)INSN_CODE(insn + VM_BARE_INSTRUCTION_SIZE);
st_add_direct(encoded_insn_data, key1, (st_data_t)&insn_data[insn]);
st_add_direct(encoded_insn_data, key2, (st_data_t)&insn_data[insn]);

#if USE_ZJIT
int zjit_insn = vm_bare_insn_to_zjit_insn(insn);
insn_data[insn].zjit_insn = zjit_insn;
insn_data[insn].zjit_encoded_insn = (insn != zjit_insn) ? (void *)INSN_CODE(zjit_insn) : 0;

if (insn != zjit_insn) {
st_data_t key3 = (st_data_t)INSN_CODE(zjit_insn);
st_add_direct(encoded_insn_data, key3, (st_data_t)&insn_data[insn]);
}
#endif
}
}

Expand Down Expand Up @@ -3821,8 +3831,13 @@ rb_vm_insn_addr2opcode(const void *addr)
insn_data_t *e = (insn_data_t *)val;
int opcode = e->insn;
if (addr == e->trace_encoded_insn) {
opcode += VM_INSTRUCTION_SIZE/2;
opcode += VM_BARE_INSTRUCTION_SIZE;
}
#if USE_ZJIT
else if (addr == e->zjit_encoded_insn) {
opcode = e->zjit_insn;
}
#endif
return opcode;
}

Expand Down
2 changes: 1 addition & 1 deletion tool/ruby_vm/models/instructions.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,6 @@
RubyVM::OperandsUnifications.to_a + \
RubyVM::InstructionsUnifications.to_a

require_relative 'zjit_instructions'
require_relative 'trace_instructions'
require_relative 'zjit_instructions'
RubyVM::Instructions.freeze
4 changes: 4 additions & 0 deletions tool/ruby_vm/models/trace_instructions.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,10 @@ def has_attribute? *;
return false
end

def zjit_profile?
return false
end

private

@instances = RubyVM::Instructions.map {|i| new i }
Expand Down
2 changes: 2 additions & 0 deletions tool/ruby_vm/views/insns.inc.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,8 @@ enum ruby_vminsn_type {
VM_INSTRUCTION_SIZE
};

#define VM_BARE_INSTRUCTION_SIZE <%= RubyVM::Instructions.count { |i| i.name !~ /\A(trace|zjit)_/ } %>

#define ASSERT_VM_INSTRUCTION_SIZE(array) \
STATIC_ASSERT(numberof_##array, numberof(array) == VM_INSTRUCTION_SIZE)

Expand Down
Loading
Loading