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

Rename ::YJIT to RubyVM::YJIT

Browse Source 
Since the YJIT Ruby module is CRuby specific and not meant for general
use, it should live under RubyVM instead of at top level.
This commit is contained in:
Alan Wu 2021-10-27 16:10:25 -04:00
parent d8e97169ba
commit e53d07f583
Notes: git 2021-10-29 02:43:23 +09:00 
Merged: https://github.com/ruby/ruby/pull/5038
6 changed files with 19 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
spec/ruby/command_line/dash_v_spec.rb
View File

@ -7,6 +7,6 @@ describe "The -v command line option" do
describe "when used alone" do describe "when used alone" do
it "prints version and ends" do it "prints version and ends" do
ruby_exe(nil, args: '-v').should include(RUBY_DESCRIPTION) ruby_exe(nil, args: '-v').should include(RUBY_DESCRIPTION)
end unless defined?(YJIT) && YJIT.enabled? # pending. not sure why MJIT doesn't need anything to fix this. end unless defined?(RubyVM::YJIT) && RubyVM::YJIT.enabled? # pending. not sure why MJIT doesn't need anything to fix this.
end end
end end

2
test/-ext-/bug_reporter/test_bug_reporter.rb
View File

@ -8,7 +8,7 @@ class TestBugReporter < Test::Unit::TestCase
description = RUBY_DESCRIPTION description = RUBY_DESCRIPTION
description = description.sub(/\+JIT /, '') if defined?(RubyVM::JIT) && RubyVM::JIT.enabled? description = description.sub(/\+JIT /, '') if defined?(RubyVM::JIT) && RubyVM::JIT.enabled?
description = description.sub(/\+YJIT /, '') if defined?(YJIT.enabled?) && YJIT.enabled? description = description.sub(/\+YJIT /, '') if defined?(RubyVM::YJIT.enabled?) && RubyVM::YJIT.enabled?
expected_stderr = [ expected_stderr = [
:*, :*,
/\[BUG\]\sSegmentation\sfault.*\n/, /\[BUG\]\sSegmentation\sfault.*\n/,

8
test/ruby/test_rubyoptions.rb
View File

@ -7,10 +7,12 @@ require 'tempfile'
require_relative '../lib/jit_support' require_relative '../lib/jit_support'
class TestRubyOptions < Test::Unit::TestCase class TestRubyOptions < Test::Unit::TestCase
def self.yjit_enabled? = defined?(RubyVM::YJIT.enabled?) && RubyVM::YJIT.enabled?
NO_JIT_DESCRIPTION = NO_JIT_DESCRIPTION =
if defined?(RubyVM::JIT) && RubyVM::JIT.enabled? # checking -DMJIT_FORCE_ENABLE if defined?(RubyVM::JIT) && RubyVM::JIT.enabled? # checking -DMJIT_FORCE_ENABLE
RUBY_DESCRIPTION.sub(/\+JIT /, '') RUBY_DESCRIPTION.sub(/\+JIT /, '')
elsif defined?(YJIT.enabled?) && YJIT.enabled? # checking -DYJIT_FORCE_ENABLE elsif yjit_enabled? # checking -DYJIT_FORCE_ENABLE
RUBY_DESCRIPTION.sub(/\+YJIT /, '') RUBY_DESCRIPTION.sub(/\+YJIT /, '')
else else
RUBY_DESCRIPTION RUBY_DESCRIPTION
@ -146,7 +148,7 @@ class TestRubyOptions < Test::Unit::TestCase
assert_match(VERSION_PATTERN, r[0]) assert_match(VERSION_PATTERN, r[0])
if defined?(RubyVM::JIT) && RubyVM::JIT.enabled? && !mjit_force_enabled? # checking -DMJIT_FORCE_ENABLE if defined?(RubyVM::JIT) && RubyVM::JIT.enabled? && !mjit_force_enabled? # checking -DMJIT_FORCE_ENABLE
assert_equal(NO_JIT_DESCRIPTION, r[0]) assert_equal(NO_JIT_DESCRIPTION, r[0])
elsif defined?(YJIT.enabled?) && YJIT.enabled? && !yjit_force_enabled? # checking -DYJIT_FORCE_ENABLE elsif self.class.yjit_enabled? && !yjit_force_enabled? # checking -DYJIT_FORCE_ENABLE
assert_equal(NO_JIT_DESCRIPTION, r[0]) assert_equal(NO_JIT_DESCRIPTION, r[0])
else else
assert_equal(RUBY_DESCRIPTION, r[0]) assert_equal(RUBY_DESCRIPTION, r[0])
@ -212,7 +214,7 @@ class TestRubyOptions < Test::Unit::TestCase
assert_match(VERSION_PATTERN, r[0]) assert_match(VERSION_PATTERN, r[0])
if ENV['RUBY_YJIT_ENABLE'] == '1' if ENV['RUBY_YJIT_ENABLE'] == '1'
assert_equal(NO_JIT_DESCRIPTION, r[0]) assert_equal(NO_JIT_DESCRIPTION, r[0])
elsif defined?(RubyVM::JIT) && RubyVM::JIT.enabled? || defined?(YJIT.enabled?) && YJIT.enabled? # checking -D(M|Y)JIT_FORCE_ENABLE elsif defined?(RubyVM::JIT) && RubyVM::JIT.enabled? || self.class.yjit_enabled? # checking -D(M|Y)JIT_FORCE_ENABLE
assert_equal(EnvUtil.invoke_ruby(['-e', 'print RUBY_DESCRIPTION'], '', true).first, r[0]) assert_equal(EnvUtil.invoke_ruby(['-e', 'print RUBY_DESCRIPTION'], '', true).first, r[0])
else else
assert_equal(RUBY_DESCRIPTION, r[0]) assert_equal(RUBY_DESCRIPTION, r[0])

14
test/ruby/test_yjit.rb
View File

@ -3,7 +3,7 @@ require 'test/unit'
require 'envutil' require 'envutil'
require 'tmpdir' require 'tmpdir'
return unless defined?(YJIT) && YJIT.enabled? return unless defined?(RubyVM::YJIT) && RubyVM::YJIT.enabled?
# Tests for YJIT with assertions on compilation and side exits # Tests for YJIT with assertions on compilation and side exits
# insipired by the MJIT tests in test/ruby/test_jit.rb # insipired by the MJIT tests in test/ruby/test_jit.rb
@ -49,7 +49,7 @@ class TestYJIT < Test::Unit::TestCase
assert_equal([], stderr) assert_equal([], stderr)
end end
assert_in_out_err([yjit_child_env, '-e puts RUBY_DESCRIPTION'], '', [RUBY_DESCRIPTION]) assert_in_out_err([yjit_child_env, '-e puts RUBY_DESCRIPTION'], '', [RUBY_DESCRIPTION])
assert_in_out_err([yjit_child_env, '-e p YJIT.enabled?'], '', ['true']) assert_in_out_err([yjit_child_env, '-e p RubyVM::YJIT.enabled?'], '', ['true'])
end end
def test_compile_getclassvariable def test_compile_getclassvariable
@ -498,7 +498,7 @@ class TestYJIT < Test::Unit::TestCase
objects[1].foo objects[1].foo
} }
stats = YJIT.runtime_stats stats = RubyVM::YJIT.runtime_stats
return :ok unless stats[:all_stats] return :ok unless stats[:all_stats]
return :ok if stats[:invalidation_count] < 10 return :ok if stats[:invalidation_count] < 10
@ -513,12 +513,12 @@ class TestYJIT < Test::Unit::TestCase
ANY = Object.new ANY = Object.new
def assert_compiles(test_script, insns: [], min_calls: 1, stdout: nil, exits: {}, result: ANY, frozen_string_literal: nil) def assert_compiles(test_script, insns: [], min_calls: 1, stdout: nil, exits: {}, result: ANY, frozen_string_literal: nil)
reset_stats = <<~RUBY reset_stats = <<~RUBY
YJIT.runtime_stats RubyVM::YJIT.runtime_stats
YJIT.reset_stats! RubyVM::YJIT.reset_stats!
RUBY RUBY
write_results = <<~RUBY write_results = <<~RUBY
stats = YJIT.runtime_stats stats = RubyVM::YJIT.runtime_stats
def collect_blocks(blocks) def collect_blocks(blocks)
blocks.sort_by(&:address).map { |b| [b.iseq_start_index, b.iseq_end_index] } blocks.sort_by(&:address).map { |b| [b.iseq_start_index, b.iseq_end_index] }
@ -527,7 +527,7 @@ class TestYJIT < Test::Unit::TestCase
def collect_iseqs(iseq) def collect_iseqs(iseq)
iseq_array = iseq.to_a iseq_array = iseq.to_a
insns = iseq_array.last.grep(Array) insns = iseq_array.last.grep(Array)
blocks = YJIT.blocks_for(iseq) blocks = RubyVM::YJIT.blocks_for(iseq)
h = { h = {
name: iseq_array[5], name: iseq_array[5],
insns: insns, insns: insns,

8
yjit.rb
View File

@ -5,12 +5,12 @@
# #
# This module is only defined when YJIT has support for the particular platform # This module is only defined when YJIT has support for the particular platform
# on which CRuby is built. # on which CRuby is built.
module YJIT module RubyVM::YJIT
if defined?(Disasm) if defined?(Disasm)
def self.disasm(iseq, tty: $stdout && $stdout.tty?) def self.disasm(iseq, tty: $stdout && $stdout.tty?)
iseq = RubyVM::InstructionSequence.of(iseq) iseq = RubyVM::InstructionSequence.of(iseq)
blocks = YJIT.blocks_for(iseq) blocks = blocks_for(iseq)
return if blocks.empty? return if blocks.empty?
str = String.new str = String.new
@ -28,7 +28,7 @@ module YJIT
end end
} }
cs = YJIT::Disasm.new cs = Disasm.new
sorted_blocks.each_with_index do |block, i| sorted_blocks.each_with_index do |block, i|
str << "== BLOCK #{i+1}/#{blocks.length}: #{block.code.length} BYTES, ISEQ RANGE [#{block.iseq_start_index},#{block.iseq_end_index}) ".ljust(80, "=") str << "== BLOCK #{i+1}/#{blocks.length}: #{block.code.length} BYTES, ISEQ RANGE [#{block.iseq_start_index},#{block.iseq_end_index}) ".ljust(80, "=")
str << "\n" str << "\n"
@ -65,7 +65,7 @@ module YJIT
def self.graphviz_for(iseq) def self.graphviz_for(iseq)
iseq = RubyVM::InstructionSequence.of(iseq) iseq = RubyVM::InstructionSequence.of(iseq)
cs = YJIT::Disasm.new cs = Disasm.new
highlight = ->(comment) { "<b>#{comment}</b>" } highlight = ->(comment) { "<b>#{comment}</b>" }
linebreak = "<br align=\"left\"/>\n" linebreak = "<br align=\"left\"/>\n"

2
yjit_iface.c
View File

@ -1119,7 +1119,7 @@ rb_yjit_init(struct rb_yjit_options *options)
yjit_init_codegen(); yjit_init_codegen();
// YJIT Ruby module // YJIT Ruby module
mYjit = rb_define_module("YJIT"); mYjit = rb_define_module_under(rb_cRubyVM, "YJIT");
rb_define_module_function(mYjit, "blocks_for", yjit_blocks_for, 1); rb_define_module_function(mYjit, "blocks_for", yjit_blocks_for, 1);
// YJIT::Block (block version, code block) // YJIT::Block (block version, code block)