From c71ab67b33dc3a4646067ca3325118211190b474 Mon Sep 17 00:00:00 2001 From: Soichiro Isshiki Date: Sat, 23 Sep 2023 23:03:11 +0900 Subject: [PATCH] Add DockerImage's for recent versions of CRuby. fix. --- tools/run-benchmark.rb | 31 +++++++++++++++++++++++++++---- 1 file changed, 27 insertions(+), 4 deletions(-) diff --git a/tools/run-benchmark.rb b/tools/run-benchmark.rb index c406ecf..51e131f 100644 --- a/tools/run-benchmark.rb +++ b/tools/run-benchmark.rb @@ -165,7 +165,7 @@ def self.fps_history(mode, count) libgdbm-dev libdb-dev git ruby ) -class MasterMJIT < DockerImage +class MasterRJIT < DockerImage FROM = "ubuntu:20.04" APT = MASTER_APT RUN = [ @@ -174,7 +174,12 @@ class MasterMJIT < DockerImage "cd ruby && ./configure --prefix=`pwd`/local", "cd ruby && make && make install", ] - RUBY = "ruby/ruby --jit -Iruby" + RUBY = "ruby/ruby --rjit -Iruby" +end + +class Ruby33RJIT < DockerImage + FROM = "ruby:3.3-rc" + RUBY = "ruby --rjit -Iruby" end class Ruby30MJIT < DockerImage @@ -193,17 +198,27 @@ class Ruby26MJIT < DockerImage end class MasterYJIT < DockerImage - FROM = "ubuntu:20.04" + FROM = "rust:latest" APT = MASTER_APT RUN = [ "git clone --depth 1 https://github.com/ruby/ruby.git", - "cd ruby && autoconf", + "cd ruby && ./autogen.sh", "cd ruby && ./configure --prefix=`pwd`/local", "cd ruby && make && make install", ] RUBY = "ruby/ruby --yjit -Iruby" end +class Ruby33YJIT < DockerImage + FROM = "ruby:3.3-rc" + RUBY = "ruby --yjit -Iruby" +end + +class Ruby32YJIT < DockerImage + FROM = "ruby:3.2" + RUBY = "ruby --yjit -Iruby" +end + class Master < DockerImage FROM = "ubuntu:20.04" APT = MASTER_APT @@ -216,6 +231,14 @@ class Master < DockerImage RUBY = "ruby/ruby -Iruby" end +class Ruby33 < DockerImage + FROM = "ruby:3.3-rc" +end + +class Ruby32 < DockerImage + FROM = "ruby:3.2" +end + class Ruby30 < DockerImage FROM = "rubylang/ruby:3.0-focal" end