Commit graph

38 commits

Author SHA1 Message Date
k0kubun
e38a0b4606 revisit more MJIT test skips
r65308 passed both trunk-mjit and trunk-mjit-wait CIs. MJIT copy job
looks working fine. Then this commit skips 5 more tests. Some of them
were skipped in a very early stage and may still need to be skipped, but
I want to confirm them since they haven't been changed for a long time.

And this prefers having inline information on `RubyVM::MJIT.enabled?`.
This commit makes it easier to confirm whether there's suspicious test
skip by RubyVM::MJIT.enabled? or not.

After this commit, tentatively we're not skipping tests for MJIT other
than `assert_no_memory_leak` ones.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@65311 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2018-10-22 15:49:22 +00:00
k0kubun
6264225c7e test/readline/test_readline.rb: fix readline test
for mingw.

test/lib/minitest/unit.rb: Add 'guards' for mingw.
Removed still-unused method `mswin?` from original patch.

[Fix GH-1941]

From: MSP-Greg <MSP-Greg@users.noreply.github.com>

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@64525 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2018-08-23 23:50:48 +00:00
hsbt
114fec048f Added guard condition for old ruby about RubyVM::MJIT.
Test libraries under the test/lib is used with default gems in
  their repositories. default gems may support old ruby like
  Ruby 2.5. When default gems invoke test libraries of Ruby core
  with old ruby, they raised
  `uninitialized constant RubyVM::MJIT (NameError)`

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@63772 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2018-06-27 15:56:55 +00:00
k0kubun
ed935aa5be mjit_compile.c: merge initial JIT compiler
which has been developed by Takashi Kokubun <takashikkbn@gmail> as
YARV-MJIT. Many of its bugs are fixed by wanabe <s.wanabe@gmail.com>.

This JIT compiler is designed to be a safe migration path to introduce
JIT compiler to MRI. So this commit does not include any bytecode
changes or dynamic instruction modifications, which are done in original
MJIT.

This commit even strips off some aggressive optimizations from
YARV-MJIT, and thus it's slower than YARV-MJIT too. But it's still
fairly faster than Ruby 2.5 in some benchmarks (attached below).

Note that this JIT compiler passes `make test`, `make test-all`, `make
test-spec` without JIT, and even with JIT. Not only it's perfectly safe
with JIT disabled because it does not replace VM instructions unlike
MJIT, but also with JIT enabled it stably runs Ruby applications
including Rails applications.

I'm expecting this version as just "initial" JIT compiler. I have many
optimization ideas which are skipped for initial merging, and you may
easily replace this JIT compiler with a faster one by just replacing
mjit_compile.c. `mjit_compile` interface is designed for the purpose.

common.mk: update dependencies for mjit_compile.c.

internal.h: declare `rb_vm_insn_addr2insn` for MJIT.

vm.c: exclude some definitions if `-DMJIT_HEADER` is provided to
compiler. This avoids to include some functions which take a long time
to compile, e.g. vm_exec_core. Some of the purpose is achieved in
transform_mjit_header.rb (see `IGNORED_FUNCTIONS`) but others are
manually resolved for now. Load mjit_helper.h for MJIT header.
mjit_helper.h: New. This is a file used only by JIT-ed code. I'll
refactor `mjit_call_cfunc` later.
vm_eval.c: add some #ifdef switches to skip compiling some functions
like Init_vm_eval.

win32/mkexports.rb: export thread/ec functions, which are used by MJIT.

include/ruby/defines.h: add MJIT_FUNC_EXPORTED macro alis to clarify
that a function is exported only for MJIT.

array.c: export a function used by MJIT.
bignum.c: ditto.
class.c: ditto.
compile.c: ditto.
error.c: ditto.
gc.c: ditto.
hash.c: ditto.
iseq.c: ditto.
numeric.c: ditto.
object.c: ditto.
proc.c: ditto.
re.c: ditto.
st.c: ditto.
string.c: ditto.
thread.c: ditto.
variable.c: ditto.
vm_backtrace.c: ditto.
vm_insnhelper.c: ditto.
vm_method.c: ditto.

I would like to improve maintainability of function exports, but I
believe this way is acceptable as initial merging if we clarify the
new exports are for MJIT (so that we can use them as TODO list to fix)
and add unit tests to detect unresolved symbols.
I'll add unit tests of JIT compilations in succeeding commits.

Author: Takashi Kokubun <takashikkbn@gmail.com>
Contributor: wanabe <s.wanabe@gmail.com>

Part of [Feature #14235]

---

* Known issues
  * Code generated by gcc is faster than clang. The benchmark may be worse
    in macOS. Following benchmark result is provided by gcc w/ Linux.
  * Performance is decreased when Google Chrome is running
  * JIT can work on MinGW, but it doesn't improve performance at least
    in short running benchmark.
  * Currently it doesn't perform well with Rails. We'll try to fix this
    before release.

---

* Benchmark reslts

Benchmarked with:
Intel 4.0GHz i7-4790K with 16GB memory under x86-64 Ubuntu 8 Cores

- 2.0.0-p0: Ruby 2.0.0-p0
- r62186: Ruby trunk (early 2.6.0), before MJIT changes
- JIT off: On this commit, but without `--jit` option
- JIT on: On this commit, and with `--jit` option

** Optcarrot fps

Benchmark: https://github.com/mame/optcarrot

|         |2.0.0-p0 |r62186   |JIT off  |JIT on   |
|:--------|:--------|:--------|:--------|:--------|
|fps      |37.32    |51.46    |51.31    |58.88    |
|vs 2.0.0 |1.00x    |1.38x    |1.37x    |1.58x    |

** MJIT benchmarks

Benchmark: https://github.com/benchmark-driver/mjit-benchmarks
(Original: https://github.com/vnmakarov/ruby/tree/rtl_mjit_branch/MJIT-benchmarks)

|           |2.0.0-p0 |r62186   |JIT off  |JIT on   |
|:----------|:--------|:--------|:--------|:--------|
|aread      |1.00     |1.09     |1.07     |2.19     |
|aref       |1.00     |1.13     |1.11     |2.22     |
|aset       |1.00     |1.50     |1.45     |2.64     |
|awrite     |1.00     |1.17     |1.13     |2.20     |
|call       |1.00     |1.29     |1.26     |2.02     |
|const2     |1.00     |1.10     |1.10     |2.19     |
|const      |1.00     |1.11     |1.10     |2.19     |
|fannk      |1.00     |1.04     |1.02     |1.00     |
|fib        |1.00     |1.32     |1.31     |1.84     |
|ivread     |1.00     |1.13     |1.12     |2.43     |
|ivwrite    |1.00     |1.23     |1.21     |2.40     |
|mandelbrot |1.00     |1.13     |1.16     |1.28     |
|meteor     |1.00     |2.97     |2.92     |3.17     |
|nbody      |1.00     |1.17     |1.15     |1.49     |
|nest-ntimes|1.00     |1.22     |1.20     |1.39     |
|nest-while |1.00     |1.10     |1.10     |1.37     |
|norm       |1.00     |1.18     |1.16     |1.24     |
|nsvb       |1.00     |1.16     |1.16     |1.17     |
|red-black  |1.00     |1.02     |0.99     |1.12     |
|sieve      |1.00     |1.30     |1.28     |1.62     |
|trees      |1.00     |1.14     |1.13     |1.19     |
|while      |1.00     |1.12     |1.11     |2.41     |

** Discourse's script/bench.rb

Benchmark: https://github.com/discourse/discourse/blob/v1.8.7/script/bench.rb

NOTE: Rails performance was somehow a little degraded with JIT for now.
We should fix this.
(At least I know opt_aref is performing badly in JIT and I have an idea
 to fix it. Please wait for the fix.)

*** JIT off
Your Results: (note for timings- percentile is first, duration is second in millisecs)

categories_admin:
  50: 17
  75: 18
  90: 22
  99: 29
home_admin:
  50: 21
  75: 21
  90: 27
  99: 40
topic_admin:
  50: 17
  75: 18
  90: 22
  99: 32
categories:
  50: 35
  75: 41
  90: 43
  99: 77
home:
  50: 39
  75: 46
  90: 49
  99: 95
topic:
  50: 46
  75: 52
  90: 56
  99: 101

*** JIT on
Your Results: (note for timings- percentile is first, duration is second in millisecs)

categories_admin:
  50: 19
  75: 21
  90: 25
  99: 33
home_admin:
  50: 24
  75: 26
  90: 30
  99: 35
topic_admin:
  50: 19
  75: 20
  90: 25
  99: 30
categories:
  50: 40
  75: 44
  90: 48
  99: 76
home:
  50: 42
  75: 48
  90: 51
  99: 89
topic:
  50: 49
  75: 55
  90: 58
  99: 99

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@62197 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2018-02-04 11:22:28 +00:00
hsbt
d5f86e836f Specify frozen_string_literal: true.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@59121 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2017-06-20 11:10:37 +00:00
nobu
6657567eba fix up r57167
* test/lib/minitest/unit.rb (MiniTest::Unit#_run_anything): stop
  if any errors or failures.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@58661 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2017-05-10 23:52:14 +00:00
naruse
a3990118e6 Supress warning: instance variable @repeat_count not initialized
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@57795 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2017-03-07 05:11:02 +00:00
nobu
642b3a260b test/unit.rb: --repeat-count option
* test/lib/test/unit.rb (Test::Unit::RepeatOption): --repeat-count
  option to repeat COUNT times while success.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@57167 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2016-12-24 00:50:59 +00:00
nobu
4b298ad77a Use qualified names
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@56037 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2016-08-30 06:22:30 +00:00
nobu
eecfa1fc7a incompatible encoding workaround
* test/lib/minitest/unit.rb (puke): workaround incompatible
  encoding error messages.

* test/lib/test/unit/assertions.rb (AllFailures.message): ditto.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@53743 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2016-02-05 04:45:10 +00:00
naruse
3e92b635fb Add frozen_string_literal: false for all files
When you change this to true, you may need to add more tests.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@53141 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2015-12-16 05:07:31 +00:00
nobu
49243b9944 unit.rb: no insult method
* test/lib/minitest/unit.rb (i_suck_and_my_tests_are_order_dependent!):
  remove.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@49133 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2015-01-04 02:04:31 +00:00
nobu
8a57298c09 unit.rb: no UNDEFINED
* test/lib/minitest/unit.rb (UNDEFINED): remove.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@49132 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2015-01-04 02:04:26 +00:00
drbrain
3908d5d330 * lib/rake: Update to rake 10.4.0
* test/rake:  ditto.
* NEWS:  ditto.

* test/lib/minitest/unit.rb:  Add compatibility shim for minitest 5.
  This only provides minitest 5 unit test naming compatibility.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@48560 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2014-11-25 07:03:36 +00:00
nobu
98a2dfe7f6 minitest/unit.rb: flush messages
* test/lib/minitest/unit.rb (MiniTest::Unit#_run_suite): flush
  messages after each tests.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@46905 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2014-07-23 06:23:05 +00:00
akr
6c6f9b19b4 * test/lib/leakchecker.rb: Leak checker extracted from
test/lib/minitest/unit.rb.



git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@46280 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2014-05-31 13:31:32 +00:00
akr
40ec552861 * test/lib/minitest/unit.rb: Check Tempfile leaks for each test method
again.



git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@46265 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2014-05-30 23:32:19 +00:00
akr
283e5d5aab * test/lib/minitest/unit.rb (check_fd_leak): Sort the inspected
objects list for a FD.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@46251 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2014-05-30 12:01:09 +00:00
akr
e03e2b95a0 * test/lib/minitest/unit.rb (check_fd_leak): Try GC to delete leaked
FDs.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@46250 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2014-05-30 09:08:23 +00:00
nobu
bb1fb1167e minitest/unit.rb: defer requiring -test-
* test/lib/minitest/unit.rb (find_fds): defer requiring a library
  under "-test-" until needed, or can't work in other (installed)
  ruby.  grep doesn't need separated map.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@46248 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2014-05-30 06:27:23 +00:00
akr
83ead3c4a7 * ext/-test-/dir: Dir#fileno implemented.
* test/lib/minitest/unit.rb (find_fds): Don't return the fd used to
  scan /proc/$$/fd.



git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@46240 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2014-05-29 22:28:47 +00:00
akr
b519ce9a8a * test/lib/minitest/unit.rb (capture_subprocess_io): Close fds.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@46230 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2014-05-29 13:26:02 +00:00
akr
9b612d382d * test/lib/minitest/unit.rb: Use Tempfile#close! instead of
Tempfile#unlink to close file descriptors.

* test/openssl/test_config.rb: Ditto.

* test/ruby/test_io.rb: Ditto.



git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@46189 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2014-05-27 15:49:13 +00:00
akr
1c35277c2b * io.c (rb_io_autoclose_p): Don't raise on frozen IO.
* test/lib/minitest/unit.rb: IO#autoclose? may raise IOError.



git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@46165 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2014-05-27 10:09:55 +00:00
akr
dbd239a7aa * test/lib/minitest/unit.rb: Show leaked file descriptors.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@46156 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2014-05-27 03:24:52 +00:00
nobu
fd372dc8a2 minitest/unit.rb: fix leaking tempfile
* test/lib/minitest/unit.rb (capture_subprocess_io): opened files
  can not be unlinked on Windows.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@46127 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2014-05-26 03:42:27 +00:00
akr
1902f5fa25 * test/lib/minitest/unit.rb: Show Finished threads line-by-line.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@46124 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2014-05-25 23:00:04 +00:00
akr
c8660d8966 Show leaked threads line-by-line.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@46122 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2014-05-25 16:16:38 +00:00
akr
b5d3b55bb7 * test/lib/minitest/unit.rb: Show leaked tempfiles line-by-line.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@46120 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2014-05-25 16:03:23 +00:00
akr
8559c4c125 * test/lib/minitest/unit.rb (MiniTest::Assertions#diff): Remove
tempfiles.



git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@46118 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2014-05-25 14:16:02 +00:00
akr
6f2b1d6e82 * test/lib/minitest/unit.rb: Check tempfile leak for each test class.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@46115 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2014-05-25 13:44:05 +00:00
akr
540ffb3abd * test/lib/minitest/unit.rb: Less ObjectSpace.each_object(Tempfile)
invocation.



git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@46112 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2014-05-25 08:15:08 +00:00
akr
70c15b19fa * test/lib/minitest/unit.rb: Use Thread.list instead of
ObjectSpace.each_object(Thread).



git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@46111 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2014-05-25 07:58:02 +00:00
akr
36c9605a6e * test/lib/minitest/unit.rb: Sort leaked threads and tempfiles.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@46104 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2014-05-25 03:34:27 +00:00
akr
0be4ec01cd * test/lib/minitest/unit.rb: Show leakes threads and tempfiles.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@46089 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2014-05-25 00:41:18 +00:00
akr
36f3ee6dc8 * test/lib/minitest/unit.rb (parallelize_me!): Removed.
This fixes the line-by-line structure of the test result in verbose
  mode.  [ruby-core:54905]

* test/lib/minitest/parallel_each.rb: Removed.

* test/minitest/test_minitest_mock.rb: Don't call parallelize_me!.

* test/minitest/test_minitest_spec.rb: Ditto.

* test/minitest/test_minitest_unit.rb: Ditto.
  Tests for parallel feature removed.



git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@46074 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2014-05-24 07:09:29 +00:00
akr
bdf98fc627 * test/lib/minitest: Remove comments not appropriate now.
* test/minitest: Ditto.



git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@46070 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2014-05-24 06:01:51 +00:00
hsbt
f8c6a5dc02 * test/runner.rb: remove dependency test-unit and minitest
from stdlib when running with test-all.
  [Feature #9711][ruby-core:61890]
* test/testunit/*.rb: ditto.
* test/lib: ditto.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@45970 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2014-05-17 06:26:51 +00:00