1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Improve YJIT command line option parsing

Browse Source 
Previously, options such as "--yjit123" would enable YJIT. Additionally,
the error message for argument parsing mentioned "--jit-..." instead of
"--yjit-...".
This commit is contained in:
Alan Wu 2021-10-15 16:51:57 -04:00
parent d11ea2520e
commit 11096da6cc
2 changed files with 30 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
ruby.c
View File

@ -1050,31 +1050,44 @@ set_option_encoding_once(const char *type, VALUE *name, const char *e, long elen
#define opt_match_arg(s, l, name) \ #define opt_match_arg(s, l, name) \
opt_match(s, l, name) && (*(s) ? 1 : (rb_raise(rb_eRuntimeError, "--jit-" name " needs an argument"), 0)) opt_match(s, l, name) && (*(s) ? 1 : (rb_raise(rb_eRuntimeError, "--jit-" name " needs an argument"), 0))
static void #define yjit_opt_match_noarg(s, l, name) \
opt_match(s, l, name) && (*(s) ? (rb_warn("argument to --yjit-" name " is ignored"), 1) : 1)
#define yjit_opt_match_arg(s, l, name) \
opt_match(s, l, name) && (*(s) && *(s+1) ? 1 : (rb_raise(rb_eRuntimeError, "--yjit-" name " needs an argument"), 0))
static bool
setup_yjit_options(const char *s, struct rb_yjit_options *yjit_opt) setup_yjit_options(const char *s, struct rb_yjit_options *yjit_opt)
{ {
if (*s != '-') return; const char prefix[] = "yjit-";
const size_t l = strlen(++s); if (strncmp(prefix, s, sizeof(prefix)-1) != 0) {
return false;
}
s += sizeof(prefix)-1;
const size_t l = strlen(s);
if (l == 0) {
return false;
}
if (opt_match_arg(s, l, "exec-mem-size")) { if (yjit_opt_match_arg(s, l, "exec-mem-size")) {
yjit_opt->exec_mem_size = atoi(s + 1); yjit_opt->exec_mem_size = atoi(s + 1);
} }
else if (opt_match_arg(s, l, "call-threshold")) { else if (yjit_opt_match_arg(s, l, "call-threshold")) {
yjit_opt->call_threshold = atoi(s + 1); yjit_opt->call_threshold = atoi(s + 1);
} }
else if (opt_match_arg(s, l, "max-versions")) { else if (yjit_opt_match_arg(s, l, "max-versions")) {
yjit_opt->max_versions = atoi(s + 1); yjit_opt->max_versions = atoi(s + 1);
} }
else if (opt_match_noarg(s, l, "greedy-versioning")) { else if (yjit_opt_match_noarg(s, l, "greedy-versioning")) {
yjit_opt->greedy_versioning = true; yjit_opt->greedy_versioning = true;
} }
else if (opt_match_noarg(s, l, "stats")) { else if (yjit_opt_match_noarg(s, l, "stats")) {
yjit_opt->gen_stats = true; yjit_opt->gen_stats = true;
} }
else { else {
rb_raise(rb_eRuntimeError, rb_raise(rb_eRuntimeError,
"invalid yjit option `%s' (--help will show valid yjit options)", s); "invalid yjit option `%s' (--help will show valid yjit options)", s);
} }
return true;
} }
#if USE_MJIT #if USE_MJIT
@ -1490,9 +1503,8 @@ proc_options(long argc, char **argv, ruby_cmdline_options_t *opt, int envopt)
rb_warn("MJIT support is disabled."); rb_warn("MJIT support is disabled.");
#endif #endif
} }
else if (strncmp("yjit", s, 4) == 0) { else if (strcmp("yjit", s) == 0 || setup_yjit_options(s, &opt->yjit)) {
FEATURE_SET(opt->features, FEATURE_BIT(yjit)); FEATURE_SET(opt->features, FEATURE_BIT(yjit));
setup_yjit_options(s + 4, &opt->yjit);
} }
else if (strcmp("yydebug", s) == 0) { else if (strcmp("yydebug", s) == 0) {
if (envopt) goto noenvopt_long; if (envopt) goto noenvopt_long;

8
test/ruby/test_yjit.rb
View File

@ -29,6 +29,14 @@ class TestYJIT < Test::Unit::TestCase
end end
end end
def test_command_line_switches
assert_in_out_err('--yjit-', '', [], /invalid option --yjit-/)
assert_in_out_err('--yjithello', '', [], /invalid option --yjithello/)
assert_in_out_err('--yjit-call-threshold', '', [], /--yjit-call-threshold needs an argument/)
assert_in_out_err('--yjit-call-threshold=', '', [], /--yjit-call-threshold needs an argument/)
assert_in_out_err('--yjit-greedy-versioning=1', '', [], /warning: argument to --yjit-greedy-versioning is ignored/)
end
def test_enable_from_env_var def test_enable_from_env_var
yjit_child_env = {'RUBY_YJIT_ENABLE' => '1'} yjit_child_env = {'RUBY_YJIT_ENABLE' => '1'}
assert_in_out_err([yjit_child_env, '--version'], '', [RUBY_DESCRIPTION]) assert_in_out_err([yjit_child_env, '--version'], '', [RUBY_DESCRIPTION])