diff options
author | Takashi Kokubun <[email protected]> | 2023-03-06 23:17:25 -0800 |
---|---|---|
committer | Takashi Kokubun <[email protected]> | 2023-03-06 23:44:01 -0800 |
commit | 23ec248e48f696ae986e2b19cd572ece02a5ba55 (patch) | |
tree | 3973e15ea1c34d000b40a64bd64e78880f28efec /test/lib | |
parent | 2e875549a934fa04b7939810fa0d8a2762702aaa (diff) |
s/mjit/rjit/
Notes
Notes:
Merged: https://github.com/ruby/ruby/pull/7462
Diffstat (limited to 'test/lib')
-rw-r--r-- | test/lib/jit_support.rb | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/test/lib/jit_support.rb b/test/lib/jit_support.rb index 769bc3d644..d9c2522641 100644 --- a/test/lib/jit_support.rb +++ b/test/lib/jit_support.rb @@ -25,7 +25,7 @@ module JITSupport ] module_function - # Run Ruby script with --mjit-wait (Synchronous JIT compilation). + # Run Ruby script with --rjit-wait (Synchronous JIT compilation). # Returns [stdout, stderr] def eval_with_jit(env = nil, script, **opts) stdout, stderr = nil, nil @@ -40,13 +40,13 @@ module JITSupport def eval_with_jit_without_retry(env = nil, script, verbose: 0, call_threshold: 5, save_temps: false, max_cache: 1000, wait: true, timeout: JIT_TIMEOUT) args = [ - '--disable-gems', "--mjit-verbose=#{verbose}", - "--mjit-call-threshold=#{call_threshold}", "--mjit-max-cache=#{max_cache}", + '--disable-gems', "--rjit-verbose=#{verbose}", + "--rjit-call-threshold=#{call_threshold}", "--rjit-max-cache=#{max_cache}", ] args << '--disable-yjit' - args << '--mjit-wait' if wait - args << '--mjit-save-temps' if save_temps - args << '--mjit-debug' if defined?(@mjit_debug) && @mjit_debug + args << '--rjit-wait' if wait + args << '--rjit-save-temps' if save_temps + args << '--rjit-debug' if defined?(@rjit_debug) && @rjit_debug args << '-e' << script args.unshift(env ? base_env.merge!(env) : base_env) EnvUtil.invoke_ruby(args, @@ -69,7 +69,7 @@ module JITSupport @yjit_supported = ![nil, 'no'].include?(RbConfig::CONFIG['YJIT_SUPPORT']) end - def remove_mjit_logs(stderr) + def remove_rjit_logs(stderr) if defined?(RubyVM::RJIT) && RubyVM::RJIT.enabled? # utility for -DFORCE_RJIT_ENABLE stderr.gsub(/^RJIT warning: Skipped to compile unsupported instruction: \w+\n/m, '') else @@ -87,7 +87,7 @@ module JITSupport stderr.include?("error trying to exec 'cc1': execvp: No such file or directory") end - def mjit_force_enabled? + def rjit_force_enabled? "#{RbConfig::CONFIG['CFLAGS']} #{RbConfig::CONFIG['CPPFLAGS']}".match?(/(\A|\s)-D ?RJIT_FORCE_ENABLE\b/) end end |