Remove unused methods from JITSupport

ruby · Mar 12, 2023 · 4445b9e · 4445b9e
1 parent 195e329
commit 4445b9e
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 84 deletions.
diff --git a/test/lib/jit_support.rb b/test/lib/jit_support.rb
@@ -1,67 +1,7 @@
 require 'rbconfig'
 
 module JITSupport
-  JIT_TIMEOUT = 600 # 10min for each...
-  JIT_SUCCESS_PREFIX = 'JIT success'
-  JIT_RECOMPILE_PREFIX = 'JIT recompile'
-  JIT_COMPACTION_PREFIX = 'JIT compaction \(\d+\.\dms\)'
-  UNSUPPORTED_COMPILERS = [
-    %r[\A.*/bin/intel64/icc\b],
-    %r[\A/opt/developerstudio\d+\.\d+/bin/cc\z],
-  ]
-  UNSUPPORTED_ARCHITECTURES = [
-    's390x',
-    'sparc',
-  ]
-  # debian-riscv64: "gcc: internal compiler error: Segmentation fault signal terminated program cc1" https://rubyci.org/logs/rubyci.s3.amazonaws.com/debian-riscv64/ruby-master/log/20200420T083601Z.fail.html.gz
-  # freebsd12: cc1 internal failure https://rubyci.org/logs/rubyci.s3.amazonaws.com/freebsd12/ruby-master/log/20200306T103003Z.fail.html.gz
-  # rhel8: one or more PCH files were found, but they were invalid https://rubyci.org/logs/rubyci.s3.amazonaws.com/rhel8/ruby-master/log/20200306T153003Z.fail.html.gz
-  # centos8: ditto https://rubyci.org/logs/rubyci.s3.amazonaws.com/centos8/ruby-master/log/20200512T003004Z.fail.html.gz
-  PENDING_RUBYCI_NICKNAMES = %w[
-    debian-riscv64
-    freebsd12
-    rhel8
-    centos8
-  ]
-
   module_function
-  # Run Ruby script with --rjit-wait (Synchronous JIT compilation).
-  # Returns [stdout, stderr]
-  def eval_with_jit(env = nil, script, **opts)
-    stdout, stderr = nil, nil
-    # retry 3 times while cc1 error happens.
-    3.times do |i|
-      stdout, stderr, status = eval_with_jit_without_retry(env, script, **opts)
-      assert_equal(true, status.success?, "Failed to run script with JIT:\n#{code_block(script)}\nstdout:\n#{code_block(stdout)}\nstderr:\n#{code_block(stderr)}")
-      break unless retried_stderr?(stderr)
-    end
-    [stdout, stderr]
-  end
-
-  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', "--rjit-verbose=#{verbose}",
-      "--rjit-call-threshold=#{call_threshold}", "--rjit-max-cache=#{max_cache}",
-    ]
-    args << '--disable-yjit'
-    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,
-      '', true, true, timeout: timeout,
-    )
-  end
-
-  # For RJIT
-  def supported?
-    return @supported if defined?(@supported)
-    @supported = RbConfig::CONFIG["RJIT_SUPPORT"] != 'no' &&
-      UNSUPPORTED_COMPILERS.all? { |regexp| !regexp.match?(RbConfig::CONFIG['RJIT_CC']) } &&
-      !PENDING_RUBYCI_NICKNAMES.include?(ENV['RUBYCI_NICKNAME']) &&
-      !UNSUPPORTED_ARCHITECTURES.include?(RUBY_PLATFORM.split('-', 2).first)
-  end
 
   def rjit_supported?
     return @rjit_supported if defined?(@rjit_supported)
@@ -75,24 +15,6 @@ def yjit_supported?
     @yjit_supported = ![nil, 'no'].include?(RbConfig::CONFIG['YJIT_SUPPORT'])
   end
 
-  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
-      stderr
-    end
-  end
-
-  def code_block(code)
-    %Q["""\n#{code}\n"""\n\n]
-  end
-
-  # We're retrying cc1 not found error on gcc, which should be solved in the future but ignored for now.
-  def retried_stderr?(stderr)
-    RbConfig::CONFIG['CC'].start_with?('gcc') &&
-      stderr.include?("error trying to exec 'cc1': execvp: No such file or directory")
-  end
-
   def rjit_force_enabled?
     "#{RbConfig::CONFIG['CFLAGS']} #{RbConfig::CONFIG['CPPFLAGS']}".match?(/(\A|\s)-D ?RJIT_FORCE_ENABLE\b/)
   end

diff --git a/test/ruby/test_rubyoptions.rb b/test/ruby/test_rubyoptions.rb
@@ -172,7 +172,7 @@ def test_copyright
   end
 
   def test_enable
-    if JITSupport.supported?
+    if JITSupport.yjit_supported? || JITSupport.rjit_supported?
       assert_in_out_err(%w(--enable all -e) + [""], "", [], [])
       assert_in_out_err(%w(--enable-all -e) + [""], "", [], [])
       assert_in_out_err(%w(--enable=all -e) + [""], "", [], [])

diff --git a/test/test_open3.rb b/test/test_open3.rb
@@ -130,11 +130,7 @@ def test_popen2
           i.close
           STDERR.reopen(old)
           assert_equal("zo", o.read)
-          if defined?(JITSupport)
-            assert_equal("ze", JITSupport.remove_rjit_logs(r.read))
-          else
-            assert_equal("ze", r.read)
-          end
+          assert_equal("ze", r.read)
         }
       }
     }