ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/Faster/Faster.pm
(Generate patch)

Comparing Faster/Faster.pm (file contents):
Revision 1.15 by root, Fri Mar 10 18:58:26 2006 UTC vs.
Revision 1.34 by root, Wed Mar 15 02:32:27 2006 UTC

4 4
5=head1 SYNOPSIS 5=head1 SYNOPSIS
6 6
7 use Faster; 7 use Faster;
8 8
9 perl -MFaster ...
10
9=head1 DESCRIPTION 11=head1 DESCRIPTION
10 12
13This module implements a very simple-minded "JIT" (or actually AIT, ahead
14of time compiler). It works by more or less translating every function it
15sees into a C program, compiling it and then replacing the function by the
16compiled code.
17
18As a result, startup times are immense, as every function might lead to a
19full-blown compilation.
20
21The speed improvements are also not great, you can expect 20% or so on
22average, for code that runs very often. The reason for this is that data
23handling is mostly being done by the same old code, it just gets called
24a bit faster. Regexes and string operations won't get faster. Airhtmetic
25doresn't become any faster. Just the operands and other stuff is put on
26the stack faster, and the opcodes themselves have a bit less overhead.
27
28Faster is in the early stages of development. Due to its design its
29relatively safe to use (it will either work or simply slowdown the program
30immensely, but rarely cause bugs).
31
32More intelligent algorithms (loop optimisation, type inference) could
33improve that easily, but requires a much more elaborate presentation and
34optimiser than what is in place. There are no plans to improve Faster in
35this way, yet, but it would provide a reasonably good place to start.
36
37Usage is very easy, just C<use Faster> and every function called from then
38on will be compiled.
39
40Right now, Faster can leave lots of F<*.c> and F<*.so> files in your
41F<$FASTER_CACHEDIR> (by default F<$HOME/.perl-faster-cache>), and it will
42even create those temporary files in an insecure manner, so watch out.
43
11=over 4 44=over 4
12 45
13=cut 46=cut
14 47
15package Faster; 48package Faster;
49
50no warnings;
16 51
17use strict; 52use strict;
18use Config; 53use Config;
19use B (); 54use B ();
55use DynaLoader ();
20use Digest::MD5 (); 56use Digest::MD5 ();
21use DynaLoader (); 57use Storable ();
58use Fcntl ();
22 59
23BEGIN { 60BEGIN {
24 our $VERSION = '0.01'; 61 our $VERSION = '0.01';
25 62
26 require XSLoader; 63 require XSLoader;
27 XSLoader::load __PACKAGE__, $VERSION; 64 XSLoader::load __PACKAGE__, $VERSION;
28} 65}
29 66
67my $CACHEDIR =
68 $ENV{FASTER_CACHE}
69 || (exists $ENV{HOME} && "$ENV{HOME}/.perl-faster-cache")
70 || do {
71 require File::Temp;
72 File::Temp::tempdir (CLEANUP => 1)
73 };
74
30my $COMPILE = "$Config{cc} -c -I$Config{archlibexp}/CORE $Config{optimize} $Config{ccflags} $Config{cccdlflags}"; 75my $COMPILE = "$Config{cc} -c -I$Config{archlibexp}/CORE $Config{optimize} $Config{ccflags} $Config{cccdlflags}";
31my $LINK = "$Config{ld} $Config{ldflags} $Config{lddlflags} $Config{ccdlflags}"; 76my $LINK = "$Config{ld} $Config{ldflags} $Config{lddlflags} $Config{ccdlflags}";
32my $LIBS = "$Config{libs}"; 77my $LIBS = "";
33my $_o = $Config{_o}; 78my $_o = $Config{_o};
34my $_so = ".so"; 79my $_so = ".so";
35 80
36# we don't need no steenking PIC on x86 81# we don't need no steenking PIC on x86
37$COMPILE =~ s/-f(?:PIC|pic)//g 82$COMPILE =~ s/-f(?:PIC|pic)//g
38 if $Config{archname} =~ /^(i[3456]86)-/; 83 if $Config{archname} =~ /^(i[3456]86)-/;
39 84
40my $opt_assert = 0; 85my $opt_assert = $ENV{FASTER_DEBUG} & 2;
86my $verbose = $ENV{FASTER_VERBOSE}+0;
87
88warn "Faster: CACHEDIR is $CACHEDIR\n" if $verbose > 2;
41 89
42our $source; 90our $source;
43 91
44my @ops; 92our @ops;
45my $op; 93our $insn;
94our $op;
46my $op_name; 95our $op_name;
47my @loop; 96our %op_regcomp;
48 97
49my %flag; 98# ops that cause immediate return to the interpreter
99my %f_unsafe = map +($_ => undef), qw(
100 leavesub leavesublv return
101 goto last redo next
102 eval flip leaveeval entertry
103 formline grepstart mapstart
104 substcont entereval require
105);
50 106
51# complex flag steting is no longer required, rewrite this ugly code 107# ops with known stack extend behaviour
52for (split /\n/, <<EOF) { 108# the values given are maximum values
53 leavesub unsafe 109my %extend = (
54 leavesublv unsafe 110 pushmark => 0,
55 return unsafe 111 nextstate => 0, # might reduce the stack
56 flip unsafe 112 unstack => 0,
57 goto unsafe 113 enter => 0,
58 last unsafe
59 redo unsafe
60 next unsafe
61 eval unsafe
62 leaveeval unsafe
63 entertry unsafe
64 formline unsafe
65 grepstart unsafe
66 mapstart unsafe
67 substcont unsafe
68 entereval unsafe noasync todo
69 require unsafe
70 114
71 mapstart noasync 115 stringify => 0,
72 grepstart noasync 116 not => 0,
73 match noasync 117 and => 0,
118 or => 0,
119 gvsv => 0,
120 rv2gv => 0,
121 preinc => 0,
122 predec => 0,
123 postinc => 0,
124 postdec => 0,
125 aelem => 0,
126 helem => 0,
127 qr => 1, #???
128 pushre => 1,
129 gv => 1,
130 aelemfast => 1,
131 aelem => 0,
132 padsv => 1,
133 const => 1,
134 pop => 1,
135 shift => 1,
136 eq => -1,
137 ne => -1,
138 gt => -1,
139 lt => -1,
140 ge => -1,
141 lt => -1,
142 cond_expr => -1,
143 add => -1,
144 subtract => -1,
145 multiply => -1,
146 divide => -1,
147 aassign => 0,
148 sassign => -2,
149 method => 0,
150 method_named => 1,
151);
74 152
75 last noasync 153# ops that do not need an ASYNC_CHECK
76 next noasync 154my %f_noasync = map +($_ => undef), qw(
77 redo noasync 155 mapstart grepstart match entereval
78 seq noasync 156 enteriter entersub leaveloop
79 pushmark noasync extend=0
80 padsv noasync extend=1
81 padav noasync extend=1
82 padhv noasync extend=1
83 padany noasync extend=1
84 entersub noasync
85 aassign noasync
86 sassign noasync
87 rv2av noasync
88 rv2cv noasync
89 rv2gv noasync
90 rv2hv noasync
91 refgen noasync
92 nextstate noasync
93 gv noasync
94 gvsv noasync
95 add noasync
96 subtract noasync
97 multiply noasync
98 divide noasync
99 complement noasync
100 cond_expr noasync
101 and noasync
102 or noasync
103 not noasync
104 defined noasync
105 method_named noasync
106 preinc noasync
107 postinc noasync
108 predec noasync
109 postdec noasync
110 stub noasync
111 unstack noasync
112 leaveloop noasync
113 aelem noasync
114 aelemfast noasync
115 helem noasync
116 pushre noasync
117 subst noasync
118 const noasync extend=1
119 list noasync
120 join noasync
121 split noasync
122 concat noasync
123 push noasync
124 pop noasync
125 shift noasync
126 unshift noasync
127 length noasync
128 substr noasync
129 stringify noasync
130 eq noasync
131 ne noasync
132 gt noasync
133 lt noasync
134 ge noasync
135 le noasync
136 enteriter noasync
137 ord noasync
138 157
139 iter async 158 pushmark nextstate caller
140EOF
141 my (undef, $op, @flags) = split /\s+/;
142 159
143 undef $flag{$_}{$op} 160 const stub unstack
144 for ("known", @flags); 161 last next redo goto seq
145} 162 padsv padav padhv padany
163 aassign sassign orassign
164 rv2av rv2cv rv2gv rv2hv refgen
165 gv gvsv
166 add subtract multiply divide
167 complement cond_expr and or not
168 bit_and bit_or bit_xor
169 defined
170 method method_named bless
171 preinc postinc predec postdec
172 aelem aelemfast helem delete exists
173 pushre subst list lslice join split concat
174 length substr stringify ord
175 push pop shift unshift
176 eq ne gt lt ge le
177 regcomp regcreset regcmaybe
178);
146 179
147my %callop = ( 180my %callop = (
148 entersub => "(PL_ppaddr [OP_ENTERSUB]) (aTHX)", 181 entersub => "(PL_op->op_ppaddr) (aTHX)",
149 mapstart => "Perl_pp_grepstart (aTHX)", 182 mapstart => "Perl_pp_grepstart (aTHX)",
150); 183);
151 184
152sub callop { 185sub callop {
153 $callop{$op_name} || "Perl_pp_$op_name (aTHX)" 186 $callop{$op_name} || "Perl_pp_$op_name (aTHX)"
161sub out_callop { 194sub out_callop {
162 assert "nextop == (OP *)$$op"; 195 assert "nextop == (OP *)$$op";
163 $source .= " PL_op = nextop; nextop = " . (callop $op) . ";\n"; 196 $source .= " PL_op = nextop; nextop = " . (callop $op) . ";\n";
164} 197}
165 198
199sub out_jump {
200 assert "nextop == (OP *)${$_[0]}L";
201 $source .= " goto op_${$_[0]};\n";
202}
203
204sub out_cond_jump {
205 $source .= " if (nextop == (OP *)${$_[0]}L) goto op_${$_[0]};\n";
206}
207
166sub out_jump_next { 208sub out_jump_next {
209 out_cond_jump $op_regcomp{$$op}
210 if $op_regcomp{$$op};
211
167 assert "nextop == (OP *)${$op->next}"; 212 assert "nextop == (OP *)${$op->next}";
168 $source .= " goto op_${$op->next};\n"; 213 $source .= " goto op_${$op->next};\n";
169} 214}
170 215
171sub out_next { 216sub out_next {
175} 220}
176 221
177sub out_linear { 222sub out_linear {
178 out_callop; 223 out_callop;
179 out_jump_next; 224 out_jump_next;
180}
181
182sub out_cond_jump {
183 $source .= " if (nextop == (OP *)${$_[0]}L) goto op_${$_[0]};\n";
184} 225}
185 226
186sub op_entersub { 227sub op_entersub {
187 out_callop; 228 out_callop;
188 $source .= " RUNOPS_TILL ((OP *)${$op->next}L);\n"; 229 $source .= " RUNOPS_TILL ((OP *)${$op->next}L);\n";
198 239
199 out_next; 240 out_next;
200} 241}
201 242
202sub op_pushmark { 243sub op_pushmark {
203 $source .= " PUSHMARK (PL_stack_sp);\n"; 244 $source .= " faster_PUSHMARK (PL_stack_sp);\n";
204 245
205 out_next; 246 out_next;
206} 247}
207 248
208if ($Config{useithreads} ne "define") { 249if ($Config{useithreads} ne "define") {
209 # disable optimisations on ithreads 250 # disable optimisations on ithreads
210 251
211 *op_const = sub { 252 *op_const = sub {
212 $source .= " { dSP; XPUSHs ((SV *)${$op->sv}L); PUTBACK; }\n"; 253 $source .= " { dSP; PUSHs ((SV *)${$op->sv}L); PUTBACK; }\n";
254
255 $ops[0]{follows_const}++ if @ops;#d#
213 256
214 out_next; 257 out_next;
215 }; 258 };
216 259
217 *op_gv = \&op_const; 260 *op_gv = \&op_const;
237 if (!($op->flags & B::OPf_MOD)) { 280 if (!($op->flags & B::OPf_MOD)) {
238 $source .= " if (SvGMAGICAL (sv)) sv = sv_mortalcopy (sv);\n"; 281 $source .= " if (SvGMAGICAL (sv)) sv = sv_mortalcopy (sv);\n";
239 } 282 }
240 283
241 $source .= " dSP;\n"; 284 $source .= " dSP;\n";
242 $source .= " XPUSHs (sv);\n"; 285 $source .= " PUSHs (sv);\n";
243 $source .= " PUTBACK;\n"; 286 $source .= " PUTBACK;\n";
244 $source .= " }\n"; 287 $source .= " }\n";
245 288
246 out_next; 289 out_next;
247 }; 290 };
248 291
249 *op_gvsv = sub { 292 *op_gvsv = sub {
250 $source .= " {\n"; 293 $source .= " {\n";
251 $source .= " dSP;\n"; 294 $source .= " dSP;\n";
252 $source .= " EXTEND (SP, 1);\n";
253 295
254 if ($op->private & B::OPpLVAL_INTRO) { 296 if ($op->private & B::OPpLVAL_INTRO) {
255 $source .= " PUSHs (save_scalar ((GV *)${$op->sv}L));\n"; 297 $source .= " PUSHs (save_scalar ((GV *)${$op->sv}L));\n";
256 } else { 298 } else {
257 $source .= " PUSHs (GvSV ((GV *)${$op->sv}L));\n"; 299 $source .= " PUSHs (GvSV ((GV *)${$op->sv}L));\n";
317 out_next; 359 out_next;
318} 360}
319 361
320sub op_padsv { 362sub op_padsv {
321 my $flags = $op->flags; 363 my $flags = $op->flags;
322 my $target = $op->targ; 364 my $padofs = "(PADOFFSET)" . $op->targ;
323 365
324 $source .= <<EOF; 366 $source .= <<EOF;
325 { 367 {
326 dSP; 368 dSP;
327 XPUSHs (PAD_SV ((PADOFFSET)$target)); 369 SV *sv = PAD_SVl ($padofs);
370EOF
371
372 if (($flags & B::OPf_MOD) && ($op->private & B::OPpLVAL_INTRO)) {
373 $source .= " SAVECLEARSV (PAD_SVl ($padofs));\n";
374 $ops[0]{follows_padsv_lval_intro}++ if @ops;#d#
375 }
376
377 $source .= <<EOF;
378 PUSHs (sv);
328 PUTBACK; 379 PUTBACK;
329EOF 380EOF
330 if ($op->flags & B::OPf_MOD) { 381
331 if ($op->private & B::OPpLVAL_INTRO) { 382 if (($flags & B::OPf_MOD) && ($op->private & B::OPpDEREF)) {
332 $source .= " SAVECLEARSV (PAD_SVl ((PADOFFSET)$target));\n"; 383 $source .= " if (!SvROK (sv)) vivify_ref (sv, " . $op->private . " & OPpDEREF);\n";
333 } elsif ($op->private & B::OPpDEREF) {
334 my $deref = $op->private & B::OPpDEREF;
335 $source .= " Perl_vivify_ref (PAD_SVl ((PADOFFSET)$target), $deref);\n";
336 }
337 } 384 }
385 $source .= " }\n";
386
387 out_next;
388}
389
390sub op_sassign {
391 $source .= <<EOF;
392 {
393 dSP;
394 dPOPTOPssrl;
395EOF
396 $source .= " SV *temp = left; left = right; right = temp;\n"
397 if $op->private & B::OPpASSIGN_BACKWARDS;
398
399 if ($insn->{follows_padsv_lval_intro} && !($op->private & B::OPpASSIGN_BACKWARDS)) {
400 # simple assignment - the target exists, but is basically undef
401 $source .= " SvSetSV (right, left);\n";
402 } else {
403 $source .= " SvSetMagicSV (right, left);\n";
404 }
405
338 $source .= <<EOF; 406 $source .= <<EOF;
407 SETs (right);
408 PUTBACK;
339 } 409 }
340EOF 410EOF
341 411
342 out_next; 412 out_next;
343} 413}
344 414
345# pattern const+ (or general push1) 415# pattern const+ (or general push1)
346# pattern pushmark return(?)
347# pattern pushmark gv rv2av pushmark padsv+o.ä. aassign 416# pattern pushmark gv rv2av pushmark padsv+o.ä. aassign
348 417
349# pattern const method_named
350sub op_method_named { 418sub op_method_named {
419 if ($insn->{follows_const}) {
351 $source .= <<EOF; 420 $source .= <<EOF;
421 {
422 dSP;
423 static SV *last_cv;
424 static U32 last_sub_generation;
425
426 /* simple "polymorphic" inline cache */
427 if (PL_sub_generation == last_sub_generation)
428 {
429 PUSHs (last_cv);
430 PUTBACK;
431 }
432 else
433 {
434 PL_op = nextop; nextop = Perl_pp_method_named (aTHX);
435
436 SPAGAIN;
437 last_sub_generation = PL_sub_generation;
438 last_cv = TOPs;
439 }
440 }
441EOF
442 } else {
443 $source .= <<EOF;
352 { 444 {
353 static HV *last_stash; 445 static HV *last_stash;
354 static SV *last_cv; 446 static SV *last_cv;
355 static U32 last_sub_generation; 447 static U32 last_sub_generation;
356 448
363 455
364 /* simple "polymorphic" inline cache */ 456 /* simple "polymorphic" inline cache */
365 if (stash == last_stash 457 if (stash == last_stash
366 && PL_sub_generation == last_sub_generation) 458 && PL_sub_generation == last_sub_generation)
367 { 459 {
368 XPUSHs (last_cv); 460 PUSHs (last_cv);
369 PUTBACK; 461 PUTBACK;
370 } 462 }
371 else 463 else
372 { 464 {
373 PL_op = nextop; nextop = Perl_pp_method_named (aTHX); 465 PL_op = nextop; nextop = Perl_pp_method_named (aTHX);
383 /* error case usually */ 475 /* error case usually */
384 PL_op = nextop; nextop = Perl_pp_method_named (aTHX); 476 PL_op = nextop; nextop = Perl_pp_method_named (aTHX);
385 } 477 }
386 } 478 }
387EOF 479EOF
480 }
388 481
389 out_next; 482 out_next;
390} 483}
391 484
392sub op_grepstart { 485sub op_grepstart {
406} 499}
407 500
408sub out_break_op { 501sub out_break_op {
409 my ($idx) = @_; 502 my ($idx) = @_;
410 503
504 if ($op->flags & B::OPf_SPECIAL && $insn->{loop}) {
505 # common case: no label, innermost loop only
506 my $next = $insn->{loop}{loop_targ}[$idx];
411 out_callop; 507 out_callop;
412 508 out_jump $next;
413 out_cond_jump $_->[$idx] 509 } elsif (my $loop = $insn->{loop}) {
414 for reverse @loop; 510 # less common case: maybe break to some outer loop
415
416 $source .= " return nextop;\n"; 511 $source .= " return nextop;\n";
512 # todo: walk stack up
513 } else {
514 $source .= " return nextop;\n";
515 }
417} 516}
418 517
419sub xop_next { 518sub op_next {
420 out_break_op 0; 519 out_break_op 0;
421} 520}
422 521
423sub op_last { 522sub op_last {
424 out_break_op 1; 523 out_break_op 1;
429} 528}
430 529
431sub cv2c { 530sub cv2c {
432 my ($cv) = @_; 531 my ($cv) = @_;
433 532
434 @loop = (); 533 local @ops;
534 local %op_regcomp;
435 535
436 my %opsseen; 536 my $curloop;
437 my @todo = $cv->START; 537 my @todo = $cv->START;
538 my %op_target;
539 my $numpushmark;
540 my $scope;
438 541
542 my %op_seen;
439 while (my $op = shift @todo) { 543 while (my $op = shift @todo) {
544 my $next;
440 for (; $$op; $op = $op->next) { 545 for (; $$op; $op = $next) {
441 last if $opsseen{$$op}++; 546 last if $op_seen{$$op}++;
442 push @ops, $op; 547
548 $next = $op->next;
443 549
444 my $name = $op->name; 550 my $name = $op->name;
445 my $class = B::class $op; 551 my $class = B::class $op;
446 552
553 my $insn = { op => $op };
554
555 # end of loop reached?
556 $curloop = $curloop->{loop} if $curloop && $$op == ${$curloop->{loop_targ}[1]};
557
558 # remember enclosing loop
559 $insn->{loop} = $curloop if $curloop;
560
561 push @ops, $insn;
562
563 if (exists $extend{$name}) {
564 my $extend = $extend{$name};
565 $extend = $extend->($op) if ref $extend;
566 $insn->{extend} = $extend if defined $extend;
567 }
568
569 # TODO: mark scopes similar to loops, make them comparable
570 # static cxstack(?)
447 if ($class eq "LOGOP") { 571 if ($class eq "LOGOP") {
448 unshift @todo, $op->other; # unshift vs. push saves jumps 572 push @todo, $op->other;
573 $op_target{${$op->other}}++;
574
575 # regcomp/o patches ops at runtime, lets expect that
576 if ($name eq "regcomp" && $op->other->pmflags & B::PMf_KEEP) {
577 $op_target{${$op->first}}++;
578 $op_regcomp{${$op->first}} = $op->next;
579 }
580
449 } elsif ($class eq "PMOP") { 581 } elsif ($class eq "PMOP") {
582 if (${$op->pmreplstart}) {
450 unshift @todo, $op->pmreplstart if ${$op->pmreplstart}; 583 unshift @todo, $op->pmreplstart;
584 $op_target{${$op->pmreplstart}}++;
585 }
586
451 } elsif ($class eq "LOOP") { 587 } elsif ($class eq "LOOP") {
452 push @loop, [$op->nextop, $op->lastop->next, $op->redoop->next]; 588 my @targ = ($op->nextop, $op->lastop->next, $op->redoop);
589
590 unshift @todo, $next, $op->redoop, $op->nextop, $op->lastop;
591 $next = $op->redoop;
592
593 $op_target{$$_}++ for @targ;
594
595 $insn->{loop_targ} = \@targ;
596 $curloop = $insn;
597
598 } elsif ($class eq "COP") {
599 if (defined $op->label) {
600 $insn->{bblock}++;
601 $curloop->{contains_label}{$op->label}++ if $curloop; #TODO: should be within loop
602 }
603
604 } else {
605 if ($name eq "pushmark") {
606 $numpushmark++;
607 }
453 } 608 }
454 } 609 }
455 } 610 }
611
612 $_->{bblock}++ for grep $op_target{${$_->{op}}}, @ops;
456 613
457 local $source = <<EOF; 614 local $source = <<EOF;
458OP *%%%FUNC%%% (pTHX) 615OP *%%%FUNC%%% (pTHX)
459{ 616{
460 register OP *nextop = (OP *)${$ops[0]}L; 617 register OP *nextop = (OP *)${$ops[0]->{op}}L;
461EOF 618EOF
619
620 $source .= " faster_PUSHMARK_PREALLOC ($numpushmark);\n"
621 if $numpushmark;
462 622
463 while (@ops) { 623 while (@ops) {
464 $op = shift @ops; 624 $insn = shift @ops;
625
626 $op = $insn->{op};
465 $op_name = $op->name; 627 $op_name = $op->name;
466 628
629 my $class = B::class $op;
630
631 $source .= "\n/* start basic block */\n" if exists $insn->{bblock};#d#
467 $source .= "op_$$op: /* $op_name */\n"; 632 $source .= "op_$$op: /* $op_name */\n";
468 #$source .= "fprintf (stderr, \"$$op in op $op_name\\n\");\n";#d# 633 #$source .= "fprintf (stderr, \"$$op in op $op_name\\n\");\n";#d#
469 #$source .= "{ dSP; sv_dump (TOPs); }\n";#d# 634 #$source .= "{ dSP; sv_dump (TOPs); }\n";#d#
470 635
471 $source .= " PERL_ASYNC_CHECK ();\n" 636 $source .= " PERL_ASYNC_CHECK ();\n"
472 unless exists $flag{noasync}{$op_name}; 637 unless exists $f_noasync{$op_name};
473 638
474 if (my $can = __PACKAGE__->can ("op_$op_name")) { 639 if (my $can = __PACKAGE__->can ("op_$op_name")) {
475 # handcrafted replacement 640 # handcrafted replacement
641
642 if ($insn->{extend} > 0) {
643 # coalesce EXTENDs
644 # TODO: properly take negative preceeding and following EXTENDs into account
645 for my $i (@ops) {
646 last if exists $i->{bblock};
647 last unless exists $i->{extend};
648 my $extend = delete $i->{extend};
649 $insn->{extend} += $extend if $extend > 0;
650 }
651
652 $source .= " { dSP; EXTEND (SP, $insn->{extend}); PUTBACK; }\n"
653 if $insn->{extend} > 0;
654 }
655
476 $can->($op); 656 $can->($op);
477 657
478 } elsif (exists $flag{unsafe}{$op_name}) { 658 } elsif (exists $f_unsafe{$op_name}) {
479 # unsafe, return to interpreter 659 # unsafe, return to interpreter
480 assert "nextop == (OP *)$$op"; 660 assert "nextop == (OP *)$$op";
481 $source .= " return nextop;\n"; 661 $source .= " return nextop;\n";
482 662
483 } elsif ("LOGOP" eq B::class $op) { 663 } elsif ("LOGOP" eq $class) {
484 # logical operation with optionaö branch 664 # logical operation with optional branch
485 out_callop; 665 out_callop;
486 out_cond_jump $op->other; 666 out_cond_jump $op->other;
487 out_jump_next; 667 out_jump_next;
488 668
489 } elsif ("PMOP" eq B::class $op) { 669 } elsif ("PMOP" eq $class) {
490 # regex-thingy 670 # regex-thingy
491 out_callop; 671 out_callop;
492 out_cond_jump $op->pmreplroot if ${$op->pmreplroot}; 672 out_cond_jump $op->pmreplroot if $op_name ne "pushre" && ${$op->pmreplroot};
493 out_jump_next; 673 out_jump_next;
494 674
495 } else { 675 } else {
496 # normal operator, linear execution 676 # normal operator, linear execution
497 out_linear; 677 out_linear;
508 #warn $source; 688 #warn $source;
509 689
510 $source 690 $source
511} 691}
512 692
693my $uid = "aaaaaaa0";
694my %so;
695
513sub source2ptr { 696sub func2ptr {
514 my ($source) = @_; 697 my (@func) = @_;
515 698
516 my $md5 = Digest::MD5::md5_hex $source; 699 #LOCK
517 $source =~ s/%%%FUNC%%%/Faster_$md5/; 700 mkdir $CACHEDIR, 0777;
701 sysopen my $meta_fh, "$CACHEDIR/meta", &Fcntl::O_RDWR | &Fcntl::O_CREAT, 0666
702 or die "$$CACHEDIR/meta: $!";
703 binmode $meta_fh, ":raw:perlio";
704 fcntl_lock fileno $meta_fh
705 or die "$CACHEDIR/meta: $!";
518 706
519 my $stem = "/tmp/$md5"; 707 my $meta = eval { Storable::fd_retrieve $meta_fh } || { version => 1 };
520 708
521 unless (-e "$stem$_so") { 709 for my $f (@func) {
710 $f->{func} = "F" . Digest::MD5::md5_hex ($f->{source});
711 $f->{so} = $meta->{$f->{func}};
712 }
713
714 if (grep !$_->{so}, @func) {
715 my $stem;
716
717 do {
718 $stem = "$CACHEDIR/$$-" . $uid++;
719 } while -e "$stem$_so";
720
522 open FILE, ">:raw", "$stem.c"; 721 open my $fh, ">:raw", "$stem.c";
523 print FILE <<EOF; 722 print $fh <<EOF;
524#define PERL_NO_GET_CONTEXT 723#define PERL_NO_GET_CONTEXT
724#define PERL_CORE
525 725
526#include <assert.h> 726#include <assert.h>
527 727
528#include "EXTERN.h" 728#include "EXTERN.h"
529#include "perl.h" 729#include "perl.h"
530#include "XSUB.h" 730#include "XSUB.h"
731
732#if 1
733# define faster_PUSHMARK_PREALLOC(count) while (PL_markstack_ptr + (count) >= PL_markstack_max) markstack_grow ()
734# define faster_PUSHMARK(p) *++PL_markstack_ptr = (p) - PL_stack_base
735#else
736# define faster_PUSHMARK_PREALLOC(count) 1
737# define faster_PUSHMARK(p) PUSHMARK(p)
738#endif
531 739
532#define RUNOPS_TILL(op) \\ 740#define RUNOPS_TILL(op) \\
533 while (nextop != (op)) \\ 741 while (nextop != (op)) \\
534 { \\ 742 { \\
535 PERL_ASYNC_CHECK (); \\ 743 PERL_ASYNC_CHECK (); \\
536 PL_op = nextop; nextop = (PL_op->op_ppaddr)(aTHX); \\ 744 PL_op = nextop; nextop = (PL_op->op_ppaddr)(aTHX); \\
537 } 745 }
538 746
539EOF 747EOF
748 for my $f (grep !$_->{so}, @func) {
749 next if $f->{so} = $meta->{$f->{func}}; # some cv's alias others
750
751 warn "compiling $f->{name} to $stem$_so:$f->{func}\n" if $verbose > 1;
752 my $source = $f->{source};
753 $source =~ s/%%%FUNC%%%/$f->{func}/g;
540 print FILE $source; 754 print $fh $source;
755 $meta->{$f->{func}} = $f->{so} = $stem;
756 }
757
541 close FILE; 758 close $fh;
542 system "$COMPILE -o $stem$_o $stem.c"; 759 system "$COMPILE -o $stem$_o $stem.c";
760 unlink "$stem.c" unless $ENV{FASTER_DEBUG} & 1;
543 system "$LINK -o $stem$_so $stem$_o $LIBS"; 761 system "$LINK -o $stem$_so $stem$_o $LIBS";
762 unlink "$stem$_o";
544 } 763 }
545 764
546# warn $source; 765 for my $f (@func) {
766 my $stem = $f->{so};
767
547 my $so = DynaLoader::dl_load_file "$stem$_so" 768 my $so = ($so{$stem} ||= DynaLoader::dl_load_file "$stem$_so")
548 or die "$stem$_so: $!"; 769 or die "$stem$_so: $!";
549 770
550 DynaLoader::dl_find_symbol $so, "Faster_$md5" 771 #unlink "$stem$_so";
551 or die "Faster_$md5: $!" 772
773 $f->{ptr} = DynaLoader::dl_find_symbol $so, $f->{func}
774 or die "$f->{func} not found in $stem$_so: $!";
775 }
776
777 seek $meta_fh, 0, 0 or die "$CACHEDIR/meta: $!";
778 Storable::nstore_fd $meta, $meta_fh;
779 truncate $meta_fh, tell $meta_fh;
780
781 # UNLOCK (by closing $meta_fh)
552} 782}
783
784my %ignore;
553 785
554sub entersub { 786sub entersub {
555 my ($cv) = @_; 787 my ($cv) = @_;
556 788
557 # always compile the whole stash 789 my $pkg = $cv->STASH->NAME;
558# my @stash = $cv->STASH->ARRAY; 790
559# warn join ":", @stash; 791 return if $ignore{$pkg};
560# exit; 792
793 warn "optimising ", $cv->STASH->NAME, "\n"
794 if $verbose;
561 795
562 eval { 796 eval {
797 my @func;
798
799 push @func, {
800 cv => $cv,
801 name => "<>",
563 my $source = cv2c $cv; 802 source => cv2c $cv,
803 };
564 804
565 my $ptr = source2ptr $source; 805 # always compile the whole stash
806 my %stash = $cv->STASH->ARRAY;
807 while (my ($k, $v) = each %stash) {
808 $v->isa (B::GV::)
809 or next;
566 810
811 my $cv = $v->CV;
812
813 if ($cv->isa (B::CV::)
814 && ${$cv->START}
815 && $cv->START->name ne "null") {
816
817 push @func, {
818 cv => $cv,
819 name => $k,
820 source => cv2c $cv,
821 };
822 }
823 }
824
825 func2ptr @func;
826
827 for my $f (@func) {
567 patch_cv $cv, $ptr; 828 patch_cv $f->{cv}, $f->{ptr};
829 }
568 }; 830 };
569 831
570 warn $@ if $@; 832 if ($@) {
833 $ignore{$pkg}++;
834 warn $@;
835 }
571} 836}
572 837
573hook_entersub; 838hook_entersub;
574 839
5751; 8401;
841
842=back
843
844=head1 ENVIRONMENT VARIABLES
845
846The following environment variables influence the behaviour of Faster:
847
848=over 4
849
850=item FASTER_VERBOSE
851
852Faster will output more informational messages when set to values higher
853than C<0>. Currently, C<1> outputs which packages are being compiled, C<3>
854outputs the cache directory and C<10> outputs information on which perl
855function is compiled into which shared object.
856
857=item FASTER_DEBUG
858
859Add debugging code when set to values higher than C<0>. Currently, this
860adds 1-3 C<assert>'s per perl op (FASTER_DEBUG > 1), to ensure that opcode
861order and C execution order are compatible.
862
863=item FASTER_CACHE
864
865Set a persistent cache directory that caches compiled code fragments. The
866default is C<$HOME/.perl-faster-cache> if C<HOME> is set and a temporary
867directory otherwise.
868
869This directory will always grow in size, so you might need to erase it
870from time to time.
576 871
577=back 872=back
578 873
579=head1 BUGS/LIMITATIONS 874=head1 BUGS/LIMITATIONS
580 875
581Perl will check much less often for asynchronous signals in 876Perl will check much less often for asynchronous signals in
582Faster-compiled code. It tries to check on every function call, loop 877Faster-compiled code. It tries to check on every function call, loop
583iteration and every I/O operator, though. 878iteration and every I/O operator, though.
584 879
585The following things will disable Faster. If you manage to enable them at 880The following things will disable Faster. If you manage to enable them at
586runtime, bad things will happen. 881runtime, bad things will happen. Enabling them at startup will be fine,
882though.
587 883
588 enabled tainting 884 enabled tainting
589 enabled debugging 885 enabled debugging
590 886
591This will dramatically reduce Faster's performance: 887Thread-enabled builds of perl will dramatically reduce Faster's
888performance, but you don't care about speed if you enable threads anyway.
592 889
593 threads (but you don't care about speed if you use threads anyway)
594
595These constructs will force the use of the interpreter as soon as they are 890These constructs will force the use of the interpreter for the currently
596being executed, for the rest of the currently executed: 891executed function as soon as they are being encountered during execution.
597 892
598 .., ... (flipflop operators)
599 goto 893 goto
600 next, redo (but not well-behaved last's) 894 next, redo (but not well-behaved last's)
895 labels, if used
601 eval 896 eval
602 require 897 require
603 any use of formats 898 any use of formats
899 .., ... (flipflop operators)
604 900
605=head1 AUTHOR 901=head1 AUTHOR
606 902
607 Marc Lehmann <schmorp@schmorp.de> 903 Marc Lehmann <schmorp@schmorp.de>
608 http://home.schmorp.de/ 904 http://home.schmorp.de/

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines