From 9ea2004ce0c9c42abc6b8a0857624b3a46b3c8c1 Mon Sep 17 00:00:00 2001 From: Maxime Chevalier-Boisvert Date: Tue, 16 Aug 2022 12:00:35 -0400 Subject: [PATCH] Temporarily disable rb_str_concat, add CI tests (#407) Make sure we can load the test-all runner and run test_yjit.rb PR: https://github.com/Shopify/ruby/pull/407 --- .cirrus.yml | 11 +++++++++-- .github/workflows/yjit-new-backend.yml | 11 ++++++++--- yjit/src/codegen.rs | 2 +- 3 files changed, 18 insertions(+), 6 deletions(-) diff --git a/.cirrus.yml b/.cirrus.yml index 90b8ac853ba167..9321a0ce1c48fc 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -163,6 +163,13 @@ yjit_task: bootstraptest/test_yjit_rust_port.rb \ bootstraptest/test_yjit.rb - # FIXME: not currently working on CI, missing cargo # Check that we can do a full ruby build - #full_build_script: make -j + full_build_script: source $HOME/.cargo/env && make -j + + # Check that we can build rdoc successfully + make_rdoc_script: source $HOME/.cargo/env && make -j rdoc + + # Run John's YJIT instruction tests, and make sure we can load the test-all runner + test_yjit_script: source $HOME/.cargo/env && make test-all TESTS='test/ruby/test_yjit.rb' RUN_OPTS="--yjit-call-threshold=1" + + # TODO: check that we can we run all of test-all successfully diff --git a/.github/workflows/yjit-new-backend.yml b/.github/workflows/yjit-new-backend.yml index 69767156b39a88..ff2b7e41afb489 100644 --- a/.github/workflows/yjit-new-backend.yml +++ b/.github/workflows/yjit-new-backend.yml @@ -90,8 +90,13 @@ jobs: bootstraptest/test_yjit_rust_port.rb \ bootstraptest/test_yjit.rb - # Try building rdoc - - run: make -j rdoc - # Check that we can do a full ruby build - run: make -j + + # Check that we can build rdoc successfully + - run: make -j rdoc + + # Run John's YJIT instruction tests, and make sure we can load the test-all runner + - run: make test-all TESTS='test/ruby/test_yjit.rb' RUN_OPTS="--yjit-call-threshold=1" + + # TODO: check that we can we run all of test-all successfully diff --git a/yjit/src/codegen.rs b/yjit/src/codegen.rs index 54e366698de279..668dd710e3e951 100644 --- a/yjit/src/codegen.rs +++ b/yjit/src/codegen.rs @@ -6134,7 +6134,7 @@ impl CodegenGlobals { //self.yjit_reg_method(rb_cString, "to_s", jit_rb_str_to_s); //self.yjit_reg_method(rb_cString, "to_str", jit_rb_str_to_s); self.yjit_reg_method(rb_cString, "bytesize", jit_rb_str_bytesize); - self.yjit_reg_method(rb_cString, "<<", jit_rb_str_concat); + //self.yjit_reg_method(rb_cString, "<<", jit_rb_str_concat); //self.yjit_reg_method(rb_cString, "+@", jit_rb_str_uplus); // Thread.current