Skip to content

Commit ead65e6

Browse files
japhbjaphb
committed
Factor compiler definitions out of timeall into compilers.pl
1 parent 74a2fce commit ead65e6

File tree

2 files changed

+137
-136
lines changed

2 files changed

+137
-136
lines changed

‎compilers.pl

Lines changed: 135 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,135 @@
1+
{
2+
perl5 => [
3+
{
4+
name => 'perl5',
5+
enabled => 1,
6+
language => 'Perl 5',
7+
compiler => 'perl5',
8+
vm => 'perl5',
9+
dir => 'BENCH',
10+
f_run => [qw( VM )],
11+
e_run => [qw( VM -E )],
12+
show_ver => [qw( VM -E say+$] )],
13+
},
14+
{
15+
name => 'p5.pl',
16+
enabled => 1,
17+
language => 'Perl 5',
18+
compiler => 'perlito5',
19+
vm => 'perl5',
20+
f_run => [qw( VM -Ilib5 perlito5.pl -Isrc5/lib )],
21+
e_run => [qw( VM -Ilib5 perlito5.pl -Isrc5/lib -e )],
22+
show_ver => [qw( VM -Ilib5 perlito5.pl --version )],
23+
},
24+
{
25+
name => 'p5.js_node',
26+
enabled => 1,
27+
language => 'Perl 5',
28+
compiler => 'perlito5',
29+
vm => 'node.js',
30+
f_run => [qw( VM perlito5.js -Isrc5/lib )],
31+
e_run => [qw( VM perlito5.js -Isrc5/lib -e )],
32+
show_ver => [qw( VM perlito5.js --version )],
33+
},
34+
{
35+
name => 'p5.js_v8',
36+
enabled => 1,
37+
language => 'Perl 5',
38+
compiler => 'perlito5',
39+
vm => 'd8',
40+
f_compile => [qw( VM perlito5.js -- -Isrc5/lib -Cjs )],
41+
e_compile => [qw( VM perlito5.js -- -Isrc5/lib -Cjs -e )],
42+
show_ver => [qw( VM perlito5.js -- --version )],
43+
f_run => [qw( VM COMPILED -- )],
44+
e_run => [qw( VM COMPILED -- )],
45+
},
46+
],
47+
perl6 => [
48+
{
49+
name => 'rakudo',
50+
enabled => 1,
51+
language => 'Perl 6',
52+
compiler => 'rakudo',
53+
vm => 'parrot',
54+
f_run => [qw( install/bin/perl6 )],
55+
e_run => [qw( install/bin/perl6 -e )],
56+
show_ver => [qw( install/bin/perl6 --version )],
57+
},
58+
{
59+
name => 'niecza',
60+
enabled => 1,
61+
language => 'Perl 6',
62+
compiler => 'niecza',
63+
vm => 'mono',
64+
f_run => [qw( VM run/Niecza.exe )],
65+
e_run => [qw( VM run/Niecza.exe -e )],
66+
show_ver => [qw( VM run/Niecza.exe --version )],
67+
},
68+
{
69+
name => 'p6.pl',
70+
enabled => 1,
71+
language => 'Perl 6',
72+
compiler => 'perlito6',
73+
vm => 'perl5',
74+
f_compile => [qw( VM -Ilib5 perlito6.pl -Cperl5 )],
75+
e_compile => [qw( VM -Ilib5 perlito6.pl -Cperl5 -e )],
76+
show_ver => [qw( VM -Ilib5 perlito6.pl --version )],
77+
f_run => [qw( VM -Ilib5 COMPILED )],
78+
e_run => [qw( VM -Ilib5 COMPILED )],
79+
},
80+
{
81+
name => 'p6.js_v8',
82+
enabled => 1,
83+
language => 'Perl 6',
84+
compiler => 'perlito6',
85+
vm => 'd8',
86+
f_compile => [qw( VM perlito6.js -- -Cjs )],
87+
e_compile => [qw( VM perlito6.js -- -Cjs -e )],
88+
show_ver => [qw( VM perlito6.js -- --version )],
89+
f_run => [qw( VM COMPILED -- )],
90+
e_run => [qw( VM COMPILED -- )],
91+
},
92+
],
93+
nqp => [
94+
{
95+
name => 'nqp',
96+
enabled => 1,
97+
language => 'NQP',
98+
compiler => 'nqp',
99+
vm => 'parrot',
100+
f_run => [qw( install/bin/nqp --vmlibs=math_ops )],
101+
e_run => [qw( install/bin/nqp --vmlibs=math_ops -e )],
102+
show_ver => [qw( install/bin/nqp --version )],
103+
},
104+
{
105+
name => 'nqp-jvm',
106+
enabled => 1,
107+
language => 'NQP',
108+
compiler => 'nqp-jvm',
109+
vm => 'jvm',
110+
f_run => [qw( ./nqp )],
111+
e_run => [qw( ./nqp -e )],
112+
show_ver => [qw( ./nqp --version )],
113+
},
114+
{
115+
name => 'rakudo.nqp',
116+
enabled => 1,
117+
language => 'NQP',
118+
compiler => 'rakudo',
119+
vm => 'parrot',
120+
f_run => [qw( install/bin/perl6 )],
121+
e_run => [qw( install/bin/perl6 -e )],
122+
show_ver => [qw( install/bin/perl6 --version )],
123+
},
124+
{
125+
name => 'niecza.nqp',
126+
enabled => 1,
127+
language => 'NQP',
128+
compiler => 'niecza',
129+
vm => 'mono',
130+
f_run => [qw( VM run/Niecza.exe )],
131+
e_run => [qw( VM run/Niecza.exe -e )],
132+
show_ver => [qw( VM run/Niecza.exe --version )],
133+
},
134+
],
135+
}

‎timeall

Lines changed: 2 additions & 136 deletions
Original file line numberDiff line numberDiff line change
@@ -31,141 +31,7 @@ my %VM = (
3131
mono => 'mono-sgen',
3232
d8 => 'BENCH/../v8/out/native/d8',
3333
);
34-
my %COMPILERS = (
35-
perl5 => [
36-
{
37-
name => 'perl5',
38-
enabled => 1,
39-
language => 'Perl 5',
40-
compiler => 'perl5',
41-
vm => 'perl5',
42-
dir => 'BENCH',
43-
f_run => [qw( VM )],
44-
e_run => [qw( VM -E )],
45-
show_ver => [qw( VM -E say+$] )],
46-
},
47-
{
48-
name => 'p5.pl',
49-
enabled => 1,
50-
language => 'Perl 5',
51-
compiler => 'perlito5',
52-
vm => 'perl5',
53-
f_run => [qw( VM -Ilib5 perlito5.pl -Isrc5/lib )],
54-
e_run => [qw( VM -Ilib5 perlito5.pl -Isrc5/lib -e )],
55-
show_ver => [qw( VM -Ilib5 perlito5.pl --version )],
56-
},
57-
{
58-
name => 'p5.js_node',
59-
enabled => 1,
60-
language => 'Perl 5',
61-
compiler => 'perlito5',
62-
vm => 'node.js',
63-
f_run => [qw( VM perlito5.js -Isrc5/lib )],
64-
e_run => [qw( VM perlito5.js -Isrc5/lib -e )],
65-
show_ver => [qw( VM perlito5.js --version )],
66-
},
67-
{
68-
name => 'p5.js_v8',
69-
enabled => 1,
70-
language => 'Perl 5',
71-
compiler => 'perlito5',
72-
vm => 'd8',
73-
f_compile => [qw( VM perlito5.js -- -Isrc5/lib -Cjs )],
74-
e_compile => [qw( VM perlito5.js -- -Isrc5/lib -Cjs -e )],
75-
show_ver => [qw( VM perlito5.js -- --version )],
76-
f_run => [qw( VM COMPILED -- )],
77-
e_run => [qw( VM COMPILED -- )],
78-
},
79-
],
80-
perl6 => [
81-
{
82-
name => 'rakudo',
83-
enabled => 1,
84-
language => 'Perl 6',
85-
compiler => 'rakudo',
86-
vm => 'parrot',
87-
f_run => [qw( install/bin/perl6 )],
88-
e_run => [qw( install/bin/perl6 -e )],
89-
show_ver => [qw( install/bin/perl6 --version )],
90-
},
91-
{
92-
name => 'niecza',
93-
enabled => 1,
94-
language => 'Perl 6',
95-
compiler => 'niecza',
96-
vm => 'mono',
97-
f_run => [qw( VM run/Niecza.exe )],
98-
e_run => [qw( VM run/Niecza.exe -e )],
99-
show_ver => [qw( VM run/Niecza.exe --version )],
100-
},
101-
{
102-
name => 'p6.pl',
103-
enabled => 1,
104-
language => 'Perl 6',
105-
compiler => 'perlito6',
106-
vm => 'perl5',
107-
f_compile => [qw( VM -Ilib5 perlito6.pl -Cperl5 )],
108-
e_compile => [qw( VM -Ilib5 perlito6.pl -Cperl5 -e )],
109-
show_ver => [qw( VM -Ilib5 perlito6.pl --version )],
110-
f_run => [qw( VM -Ilib5 COMPILED )],
111-
e_run => [qw( VM -Ilib5 COMPILED )],
112-
},
113-
{
114-
name => 'p6.js_v8',
115-
enabled => 1,
116-
language => 'Perl 6',
117-
compiler => 'perlito6',
118-
vm => 'd8',
119-
f_compile => [qw( VM perlito6.js -- -Cjs )],
120-
e_compile => [qw( VM perlito6.js -- -Cjs -e )],
121-
show_ver => [qw( VM perlito6.js -- --version )],
122-
f_run => [qw( VM COMPILED -- )],
123-
e_run => [qw( VM COMPILED -- )],
124-
},
125-
],
126-
nqp => [
127-
{
128-
name => 'nqp',
129-
enabled => 1,
130-
language => 'NQP',
131-
compiler => 'nqp',
132-
vm => 'parrot',
133-
f_run => [qw( install/bin/nqp --vmlibs=math_ops )],
134-
e_run => [qw( install/bin/nqp --vmlibs=math_ops -e )],
135-
show_ver => [qw( install/bin/nqp --version )],
136-
},
137-
{
138-
name => 'nqp-jvm',
139-
enabled => 1,
140-
language => 'NQP',
141-
compiler => 'nqp-jvm',
142-
vm => 'jvm',
143-
f_run => [qw( ./nqp )],
144-
e_run => [qw( ./nqp -e )],
145-
show_ver => [qw( ./nqp --version )],
146-
},
147-
{
148-
name => 'rakudo.nqp',
149-
enabled => 1,
150-
language => 'NQP',
151-
compiler => 'rakudo',
152-
vm => 'parrot',
153-
f_run => [qw( install/bin/perl6 )],
154-
e_run => [qw( install/bin/perl6 -e )],
155-
show_ver => [qw( install/bin/perl6 --version )],
156-
},
157-
{
158-
name => 'niecza.nqp',
159-
enabled => 1,
160-
language => 'NQP',
161-
compiler => 'niecza',
162-
vm => 'mono',
163-
f_run => [qw( VM run/Niecza.exe )],
164-
e_run => [qw( VM run/Niecza.exe -e )],
165-
show_ver => [qw( VM run/Niecza.exe --version )],
166-
},
167-
],
168-
);
34+
my $COMPILERS = do "$FindBin::Bin/compilers.pl";
16935
my %TESTS = (
17036
e => do "$FindBin::Bin/microbenchmarks.pl",
17137
f => do "$FindBin::Bin/minibenchmarks.pl",
@@ -220,7 +86,7 @@ sub MAIN {
22086

22187
sub canonify_compilers {
22288
for my $group (@GROUPS) {
223-
for my $compiler (@{$COMPILERS{$group}}) {
89+
for my $compiler (@{$COMPILERS->{$group}}) {
22490
$compiler->{group} = $group;
22591
push @COMPILERS, $compiler;
22692
}

0 commit comments

Comments
 (0)