[svn:parrot] r37081 - in trunk: . compilers/imcc docs docs/book docs/imcc examples/benchmarks examples/c examples/library examples/sdl examples/shootout src t/examples tools/dev
coke at svn.parrot.org
coke at svn.parrot.org
Mon Mar 2 16:33:59 UTC 2009
Author: coke
Date: Mon Mar 2 16:33:58 2009
New Revision: 37081
URL: https://trac.parrot.org/parrot/changeset/37081
Log:
RT #46503: [DEPRECATED] Remove individual runcore command line flags...
make fulltest still fails, but it seems to be unrelated to this patch.
./parrot -b no longer works: -R bounds or --runcore=bounds is now required.
Modified:
trunk/DEPRECATED.pod
trunk/compilers/imcc/main.c
trunk/docs/book/ch13_reference.pod
trunk/docs/debug.pod
trunk/docs/imcc/operation.pod
trunk/docs/jit.pod
trunk/docs/native_exec.pod
trunk/docs/running.pod
trunk/examples/benchmarks/oo1.pasm
trunk/examples/benchmarks/oo2.pasm
trunk/examples/c/test_main.c
trunk/examples/library/md5sum.pir
trunk/examples/sdl/mandel.pir
trunk/examples/shootout/ack.pir
trunk/examples/shootout/binarytrees.pir
trunk/examples/shootout/fannkuch.pir
trunk/examples/shootout/fasta.pir
trunk/examples/shootout/harmonic.pir
trunk/examples/shootout/mandelbrot.pir
trunk/examples/shootout/nbody.pir
trunk/examples/shootout/nsieve-bits-2.pir
trunk/examples/shootout/nsieve-bits.pir
trunk/examples/shootout/nsieve.pir
trunk/examples/shootout/partialsums-2.pir
trunk/examples/shootout/partialsums.pir
trunk/examples/shootout/pidigits.pir
trunk/examples/shootout/random.pasm
trunk/examples/shootout/random.pir
trunk/examples/shootout/recursive-2.pir
trunk/examples/shootout/recursive.pir
trunk/examples/shootout/revcomp.pir
trunk/examples/shootout/spectralnorm.pir
trunk/examples/shootout/sumcol.pir
trunk/examples/shootout/takfp.pir
trunk/src/embed.c
trunk/src/pic_jit.c
trunk/t/examples/shootout.t
trunk/tools/dev/parrotbench.pl
Modified: trunk/DEPRECATED.pod
==============================================================================
--- trunk/DEPRECATED.pod Mon Mar 2 16:11:27 2009 (r37080)
+++ trunk/DEPRECATED.pod Mon Mar 2 16:33:58 2009 (r37081)
@@ -21,16 +21,6 @@
.include 'include/warnings.pasm'
warningson .PARROT_WARNINGS_DEPRECATED_FLAG
-=head1 Command line options
-
-=over 4
-
-=item Remove individual runcore command line flags [BEFORE 1.0]
-
-L<http://rt.perl.org/rt3/Ticket/Display.html?id=46503>
-
-=back
-
=head1 Configuration
=over 4
Modified: trunk/compilers/imcc/main.c
==============================================================================
--- trunk/compilers/imcc/main.c Mon Mar 2 16:11:27 2009 (r37080)
+++ trunk/compilers/imcc/main.c Mon Mar 2 16:33:58 2009 (r37081)
@@ -146,7 +146,7 @@
{
ASSERT_ARGS(usage)
fprintf(fp,
- "parrot -[abcCEfgGhjprStvVwy.] [-d [FLAGS]] [-D [FLAGS]]"
+ "parrot -[acEGhprtvVwy.] [-d [FLAGS]] [-D [FLAGS]]"
"[-O [level]] [-o FILE] <file>\n");
}
@@ -219,13 +219,13 @@
" -L add path to library search\n"
" <Run core options>\n"
" -R --runcore CORE\n"
- " -b --bounds-checks|--slow-core\n"
- " -C --CGP-core\n"
- " -f --fast-core\n"
- " -g --computed-goto-core\n"
- " -j --jit-core\n"
+ " --bounds-checks|--slow-core\n"
+ " --CGP-core\n"
+ " --fast-core\n"
+ " --computed-goto-core\n"
+ " --jit-core\n"
" -p --profile\n"
- " -S --switched-core\n"
+ " --switched-core\n"
" -t --trace [flags]\n"
" <VM options>\n"
" -D --parrot-debug[=HEXFLAGS]\n"
@@ -293,7 +293,6 @@
static struct longopt_opt_decl options[] = {
{ '.', '.', (OPTION_flags)0, { "--wait" } },
- { 'C', 'C', (OPTION_flags)0, { "--CGP-core" } },
{ 'D', 'D', OPTION_optional_FLAG, { "--parrot-debug" } },
{ 'E', 'E', (OPTION_flags)0, { "--pre-process-only" } },
{ 'G', 'G', (OPTION_flags)0, { "--no-gc" } },
@@ -301,20 +300,15 @@
{ 'L', 'L', OPTION_required_FLAG, { NULL } },
{ 'O', 'O', OPTION_optional_FLAG, { "--optimize" } },
{ 'R', 'R', OPTION_required_FLAG, { "--runcore" } },
- { 'S', 'S', (OPTION_flags)0, { "--switched-core" } },
{ 'V', 'V', (OPTION_flags)0, { "--version" } },
{ '\0', OPT_DESTROY_FLAG, (OPTION_flags)0,
{ "--leak-test", "--destroy-at-end" } },
{ '\0', OPT_GC_DEBUG, (OPTION_flags)0, { "--gc-debug" } },
{ 'a', 'a', (OPTION_flags)0, { "--pasm" } },
- { 'b', 'b', (OPTION_flags)0, { "--bounds-checks", "--slow-core" } },
{ 'c', 'c', (OPTION_flags)0, { "--pbc" } },
{ 'd', 'd', OPTION_optional_FLAG, { "--imcc-debug" } },
{ '\0', OPT_HELP_DEBUG, (OPTION_flags)0, { "--help-debug" } },
- { 'f', 'f', (OPTION_flags)0, { "--fast-core" } },
- { 'g', 'g', (OPTION_flags)0, { "--computed-goto-core" } },
{ 'h', 'h', (OPTION_flags)0, { "--help" } },
- { 'j', 'j', (OPTION_flags)0, { "--jit-core" } },
{ 'o', 'o', OPTION_required_FLAG, { "--output" } },
{ '\0', OPT_PBC_OUTPUT, (OPTION_flags)0, { "--output-pbc" } },
{ 'p', 'p', (OPTION_flags)0, { "--profile" } },
@@ -412,12 +406,6 @@
"main: Unrecognized runcore '%s' specified."
"\n\nhelp: parrot -h\n", opt.opt_arg);
break;
- case 'b':
- Parrot_warn(interp, PARROT_WARNINGS_ALL_FLAG,
- "The -b option is deprecated, use the -R or "
- "--runcore options instead.");
- SET_FLAG(PARROT_BOUNDS_FLAG);
- break;
case 'p':
SET_FLAG(PARROT_PROFILE_FLAG);
break;
@@ -427,36 +415,6 @@
else
SET_TRACE(PARROT_TRACE_OPS_FLAG);
break;
- case 'j':
- Parrot_warn(interp, PARROT_WARNINGS_ALL_FLAG,
- "The -j option is deprecated, use the -R or "
- "--runcore options instead.");
- SET_CORE(PARROT_JIT_CORE);
- break;
- case 'S':
- Parrot_warn(interp, PARROT_WARNINGS_ALL_FLAG,
- "The -S option is deprecated, use the -R or "
- "--runcore options instead.");
- SET_CORE(PARROT_SWITCH_CORE);
- break;
- case 'C':
- Parrot_warn(interp, PARROT_WARNINGS_ALL_FLAG,
- "The -C option is deprecated, use the -R or "
- "--runcore options instead.");
- SET_CORE(PARROT_CGP_CORE);
- break;
- case 'f':
- Parrot_warn(interp, PARROT_WARNINGS_ALL_FLAG,
- "The -f option is deprecated, use the -R or "
- "--runcore options instead.");
- SET_CORE(PARROT_FAST_CORE);
- break;
- case 'g':
- Parrot_warn(interp, PARROT_WARNINGS_ALL_FLAG,
- "The -g option is deprecated, use the -R or "
- "--runcore options instead.");
- SET_CORE(PARROT_CGOTO_CORE);
- break;
case 'd':
if (opt.opt_arg && is_all_hex_digits(opt.opt_arg)) {
IMCC_INFO(interp)->debug = strtoul(opt.opt_arg, 0, 16);
Modified: trunk/docs/book/ch13_reference.pod
==============================================================================
--- trunk/docs/book/ch13_reference.pod Mon Mar 2 16:11:27 2009 (r37080)
+++ trunk/docs/book/ch13_reference.pod Mon Mar 2 16:33:58 2009 (r37081)
@@ -3573,20 +3573,20 @@
=over 4
-=item -b,--bounds-checks
+=item --bounds-checks
Activate bounds checking. This also runs with the I<slow core> as a
side effect.
-=item -f,--fast-core
+=item --fast-core
Run with the I<fast core>.
-=item -g,--computed-goto-core
+=item --computed-goto-core
Run the I<computed goto core> (CGoto).
-=item -j,--jit-core
+=item --jit-core
Run with the I<JIT core> if available.
@@ -3596,15 +3596,11 @@
execution times after the program stops. It also runs within the
I<slow core>.
-=item -C,--CGP-core
+=item --CGP-core
Run with the I<CGoto-Prederefed> core.
-=item -P,--predereferenced-core
-
-Run with the I<Prederefed core>.
-
-=item -S,--switched-core
+=item --switched-core
Run with the I<Switched core>.
Modified: trunk/docs/debug.pod
==============================================================================
--- trunk/docs/debug.pod Mon Mar 2 16:11:27 2009 (r37080)
+++ trunk/docs/debug.pod Mon Mar 2 16:33:58 2009 (r37081)
@@ -113,7 +113,7 @@
Step 4: Run your program under C<gdb> with JIT and debugging on
- gdb> run -j -D4 test.pbc
+ gdb> run -R jit -D4 test.pbc
Step 5: C<gdb> will stop at the beginning of runops_jit. Step through the lines
until just before the JITed code is executed (the line will be something like
Modified: trunk/docs/imcc/operation.pod
==============================================================================
--- trunk/docs/imcc/operation.pod Mon Mar 2 16:11:27 2009 (r37080)
+++ trunk/docs/imcc/operation.pod Mon Mar 2 16:33:58 2009 (r37081)
@@ -266,7 +266,7 @@
=head1 Running code
Additionally the generated code can be run immediately inside imcc.
-All parrot runtime options like B<-j> or B<-t> are available.
+All parrot runtime options like B<-R jit> or B<-t> are available.
=head1 FILES
Modified: trunk/docs/jit.pod
==============================================================================
--- trunk/docs/jit.pod Mon Mar 2 16:11:27 2009 (r37080)
+++ trunk/docs/jit.pod Mon Mar 2 16:33:58 2009 (r37081)
@@ -517,7 +517,7 @@
# gdb confirmations should be off
parrot -o $1.pbc -d1 $1.pasm
echo "b runops_jit
- r -D4 -j $1.pbc
+ r -D4 -R jit $1.pbc
n
add-symbol-file $1.o 0
s
Modified: trunk/docs/native_exec.pod
==============================================================================
--- trunk/docs/native_exec.pod Mon Mar 2 16:11:27 2009 (r37080)
+++ trunk/docs/native_exec.pod Mon Mar 2 16:33:58 2009 (r37081)
@@ -33,7 +33,7 @@
This generates the "myprog" executable, which runs equivalently to
- ./parrot -j myprog.pbc
+ ./parrot -R jit myprog.pbc
minus the time required to JIT-compile the bytecode.
Modified: trunk/docs/running.pod
==============================================================================
--- trunk/docs/running.pod Mon Mar 2 16:11:27 2009 (r37080)
+++ trunk/docs/running.pod Mon Mar 2 16:33:58 2009 (r37081)
@@ -147,24 +147,24 @@
switch-jit switch core with JIT
trace bounds checking core w/ trace info (see 'parrot --help-debug')
-=item -b, --bounds-checks, --slow-core
+=item --bounds-checks, --slow-core
Select the bounds-checking slow core (default).
-=item -g, --computed-goto-core
+=item --computed-goto-core
Select the CGoto core (if available).
-=item -C, --CGP-core
+=item --CGP-core
Select the CGP (CGoto Predereferenced) core (if available).
-=item -f, --fast-core
+=item --fast-core
Select the fast (or function) core. Bounds checking, profiling, and tracing
are not available. (That's why it's so fast.)
-=item -j, --jit-core
+=item --jit-core
Run with the JIT subsystem (if available).
@@ -172,7 +172,7 @@
Run with the slow core and print an execution profile.
-=item -S, --switched-core
+=item --switched-core
TODO: This needs to be documented briefly here and also in glossary.pod.
Modified: trunk/examples/benchmarks/oo1.pasm
==============================================================================
--- trunk/examples/benchmarks/oo1.pasm Mon Mar 2 16:11:27 2009 (r37080)
+++ trunk/examples/benchmarks/oo1.pasm Mon Mar 2 16:33:58 2009 (r37081)
@@ -10,7 +10,7 @@
# python oo1.py 1.2 (first time)
# python oo1.py 0.51
-# parrot -C oo1.pasm -g -O3
+# parrot -R cgp oo1.pasm -g -O3
# original list fixed 4.9 (leaks mem ~ 110 M used)
# don't clone vtable 4.4
@@ -22,7 +22,7 @@
# anchor P1 1.36
# Dan's new object layout 1.05
-# parrot -j oo1.pasm
+# parrot -R jit oo1.pasm
# find_global hack 1.51
# reuse exception 1.30
# reuse regsave mem 1.23
@@ -30,10 +30,10 @@
# Dan's new object layout 1.00
-# parrot -C oo1-prop.pasm
+# parrot -R cgp oo1-prop.pasm
# invokecc 0.75
# RetCont out of loop 0.57
-# parrot -j oo1-prop.pasm 0.54
+# parrot -R jit oo1-prop.pasm 0.54
.namespace [ "Foo" ]
Modified: trunk/examples/benchmarks/oo2.pasm
==============================================================================
--- trunk/examples/benchmarks/oo2.pasm Mon Mar 2 16:11:27 2009 (r37080)
+++ trunk/examples/benchmarks/oo2.pasm Mon Mar 2 16:33:58 2009 (r37081)
@@ -10,18 +10,18 @@
# python oo2.py 2.9 (first time)
# python oo2.py 2.4
-# parrot -C oo2.pasm -g -O3
+# parrot -R cgp oo2.pasm -g -O3
# with reuse regsave mem 6.15
# anchor P1 6.7
# Dan's new object layout 5.1
-# parrot -j oo2.pasm -g -O3
+# parrot -R jit oo2.pasm -g -O3
# with reuse regsave mem 6.1
# anchor P1 6.5
# Dan's new object layout 4.9
-# parrot -C oo2-prop.pasm 2.8
-# parrot -j oo2-prop.pasm 2.6
+# parrot -R cgp oo2-prop.pasm 2.8
+# parrot -R jit oo2-prop.pasm 2.6
.namespace [ "Foo" ]
Modified: trunk/examples/c/test_main.c
==============================================================================
--- trunk/examples/c/test_main.c Mon Mar 2 16:11:27 2009 (r37080)
+++ trunk/examples/c/test_main.c Mon Mar 2 16:33:58 2009 (r37081)
@@ -11,6 +11,9 @@
C<examples/c/test_main.c> is being retained as an example of a non-trivial, but
still clean, Parrot embedding.
+While it bears some resemblance to IMCC, no effort is made to keep this
+sample up to date with respect to the latest parrot functionality.
+
=head2 Functions
=over 4
Modified: trunk/examples/library/md5sum.pir
==============================================================================
--- trunk/examples/library/md5sum.pir Mon Mar 2 16:11:27 2009 (r37080)
+++ trunk/examples/library/md5sum.pir Mon Mar 2 16:33:58 2009 (r37081)
@@ -13,7 +13,7 @@
The main purpose of this script is testing the Digest/MD5.pir library.
It should behave very much like md5sum(1).
-Running parrot with -j will give a significant performance boost (often
+Running parrot with C<-R jit> will give a significant performance boost (often
about ten-fold).
=head1 AUTHOR
Modified: trunk/examples/sdl/mandel.pir
==============================================================================
--- trunk/examples/sdl/mandel.pir Mon Mar 2 16:11:27 2009 (r37080)
+++ trunk/examples/sdl/mandel.pir Mon Mar 2 16:33:58 2009 (r37081)
@@ -555,13 +555,13 @@
Optimized build
- [2] plain runcore 64 bit 3.0s
- [2] -C runcore 64 bit 1.5s
- [2] plain runcore 32 bit 3.6s
- [2] -C runcore 32 bit 1.6s
- [1] -j 1.1s
- [2] -j 0.8s
- [3] -j 0.5s
+ [2] plain runcore 64 bit 3.0s
+ [2] -R cgp runcore 64 bit 1.5s
+ [2] plain runcore 32 bit 3.6s
+ [2] -R cgp runcore 32 bit 1.6s
+ [1] -R jit 1.1s
+ [2] -R jit 0.8s
+ [3] -R jit 0.5s
=head1 SEE ALSO
Modified: trunk/examples/shootout/ack.pir
==============================================================================
--- trunk/examples/shootout/ack.pir Mon Mar 2 16:11:27 2009 (r37080)
+++ trunk/examples/shootout/ack.pir Mon Mar 2 16:33:58 2009 (r37081)
@@ -1,4 +1,4 @@
-#!./parrot -Oc -Cj
+#!./parrot -Oc -R cgp-jit
# OUTPUT="Ack(3, 9) = 4093\n"
#
# RQ (Karl)
Modified: trunk/examples/shootout/binarytrees.pir
==============================================================================
--- trunk/examples/shootout/binarytrees.pir Mon Mar 2 16:11:27 2009 (r37080)
+++ trunk/examples/shootout/binarytrees.pir Mon Mar 2 16:33:58 2009 (r37081)
@@ -1,4 +1,4 @@
-#!./parrot -C
+#!./parrot -R cgp
#
# binarytrees.pir N (N = 16 for shootout)
# by Joshua Isom, modified by Leopold Toetsch
Modified: trunk/examples/shootout/fannkuch.pir
==============================================================================
--- trunk/examples/shootout/fannkuch.pir Mon Mar 2 16:11:27 2009 (r37080)
+++ trunk/examples/shootout/fannkuch.pir Mon Mar 2 16:33:58 2009 (r37081)
@@ -1,4 +1,4 @@
-#!./parrot -j
+#!./parrot -R jit
#
# fannkuch.pir N (N = 9 for shootout)
# by Joshua Isom
Modified: trunk/examples/shootout/fasta.pir
==============================================================================
--- trunk/examples/shootout/fasta.pir Mon Mar 2 16:11:27 2009 (r37080)
+++ trunk/examples/shootout/fasta.pir Mon Mar 2 16:33:58 2009 (r37081)
@@ -1,4 +1,4 @@
-#!./parrot -C
+#!./parrot -R cgp
#
# fasta.pir N (N = 2500000 for shootout)
# by Joshua Isom
Modified: trunk/examples/shootout/harmonic.pir
==============================================================================
--- trunk/examples/shootout/harmonic.pir Mon Mar 2 16:11:27 2009 (r37080)
+++ trunk/examples/shootout/harmonic.pir Mon Mar 2 16:33:58 2009 (r37081)
@@ -4,7 +4,7 @@
=head1 SYNOPSIS
- % ./parrot examples/shootout/harmonic.pir -j 10000000
+ % ./parrot examples/shootout/harmonic.pir -R jit 10000000
=head1 DESCRIPTION
Modified: trunk/examples/shootout/mandelbrot.pir
==============================================================================
--- trunk/examples/shootout/mandelbrot.pir Mon Mar 2 16:11:27 2009 (r37080)
+++ trunk/examples/shootout/mandelbrot.pir Mon Mar 2 16:33:58 2009 (r37081)
@@ -1,11 +1,11 @@
-#!./parrot -j
+#!./parrot -R jit
=head1 NAME
examples/shootout/mandelbrot.pir - Print the Mandelbrot set
=head1 SYNOPSIS
- % ./parrot examples/shootout/mandelbrot.pir -j 600 > out.pbm
+ % ./parrot examples/shootout/mandelbrot.pir -R jit 600 > out.pbm
=head1 DESCRIPTION
Modified: trunk/examples/shootout/nbody.pir
==============================================================================
--- trunk/examples/shootout/nbody.pir Mon Mar 2 16:11:27 2009 (r37080)
+++ trunk/examples/shootout/nbody.pir Mon Mar 2 16:33:58 2009 (r37081)
@@ -1,4 +1,4 @@
-#!./parrot -j
+#!./parrot -R jit
# The Computer Language Shootout
# http://shootout.alioth.debian.org/
#
Modified: trunk/examples/shootout/nsieve-bits-2.pir
==============================================================================
--- trunk/examples/shootout/nsieve-bits-2.pir Mon Mar 2 16:11:27 2009 (r37080)
+++ trunk/examples/shootout/nsieve-bits-2.pir Mon Mar 2 16:33:58 2009 (r37081)
@@ -1,4 +1,4 @@
-#!./parrot -j
+#!./parrot -R jit
#
# nsieve-bits-2 N (N = 9 for shootout)
# by Leopold Toetsch
Modified: trunk/examples/shootout/nsieve-bits.pir
==============================================================================
--- trunk/examples/shootout/nsieve-bits.pir Mon Mar 2 16:11:27 2009 (r37080)
+++ trunk/examples/shootout/nsieve-bits.pir Mon Mar 2 16:33:58 2009 (r37081)
@@ -1,4 +1,4 @@
-#!./parrot -j
+#!./parrot -R jit
#
# nsieve-bits N (N = 9 for shootout)
# by Leopold Toetsch
Modified: trunk/examples/shootout/nsieve.pir
==============================================================================
--- trunk/examples/shootout/nsieve.pir Mon Mar 2 16:11:27 2009 (r37080)
+++ trunk/examples/shootout/nsieve.pir Mon Mar 2 16:33:58 2009 (r37081)
@@ -1,4 +1,4 @@
-#!./parrot -j
+#!./parrot -R jit
#
# nsieve N (N = 9 for shootout)
# by Leopold Toetsch
Modified: trunk/examples/shootout/partialsums-2.pir
==============================================================================
--- trunk/examples/shootout/partialsums-2.pir Mon Mar 2 16:11:27 2009 (r37080)
+++ trunk/examples/shootout/partialsums-2.pir Mon Mar 2 16:33:58 2009 (r37081)
@@ -1,4 +1,4 @@
-#!./parrot -j
+#!./parrot -R jit
#
# partialsums N (N = 2500000 for shootout)
#
Modified: trunk/examples/shootout/partialsums.pir
==============================================================================
--- trunk/examples/shootout/partialsums.pir Mon Mar 2 16:11:27 2009 (r37080)
+++ trunk/examples/shootout/partialsums.pir Mon Mar 2 16:33:58 2009 (r37081)
@@ -1,4 +1,4 @@
-#!./parrot -C
+#!./parrot -R cgp
#
# partialsums N (N = 2500000 for shootout)
#
Modified: trunk/examples/shootout/pidigits.pir
==============================================================================
--- trunk/examples/shootout/pidigits.pir Mon Mar 2 16:11:27 2009 (r37080)
+++ trunk/examples/shootout/pidigits.pir Mon Mar 2 16:33:58 2009 (r37081)
@@ -1,4 +1,4 @@
-#!./parrot -C
+#!./parrot -R cgp
#
# pidigits N (N = 1000 for shootout)
#
Modified: trunk/examples/shootout/random.pasm
==============================================================================
--- trunk/examples/shootout/random.pasm Mon Mar 2 16:11:27 2009 (r37080)
+++ trunk/examples/shootout/random.pasm Mon Mar 2 16:33:58 2009 (r37081)
@@ -1,4 +1,4 @@
-#!./parrot -j
+#!./parrot -R jit
#
# random.pasm N (N = 900000 for shootout)
# by Joshua Isom
Modified: trunk/examples/shootout/random.pir
==============================================================================
--- trunk/examples/shootout/random.pir Mon Mar 2 16:11:27 2009 (r37080)
+++ trunk/examples/shootout/random.pir Mon Mar 2 16:33:58 2009 (r37081)
@@ -1,4 +1,4 @@
-#!./parrot -C
+#!./parrot -R cgp
#
# random.pir N (N = 900000 for shootout)
# by Joshua Isom
Modified: trunk/examples/shootout/recursive-2.pir
==============================================================================
--- trunk/examples/shootout/recursive-2.pir Mon Mar 2 16:11:27 2009 (r37080)
+++ trunk/examples/shootout/recursive-2.pir Mon Mar 2 16:33:58 2009 (r37081)
@@ -1,10 +1,10 @@
-#!./parrot -Oc -Cj
+#!./parrot -Oc -R cgp-jit
#
# Ack by Leopold Toetsch
# Fib and Tak by Joshua Isom
# use less registers (leo)
-# time ./parrot -Oc -Cj recursive-2.pir 11
+# time ./parrot -Oc -R cgp-jit recursive-2.pir 11
# real 2.32 s (AMD X2 at 2000)
# modified default value to n=3. Karl Forner
Modified: trunk/examples/shootout/recursive.pir
==============================================================================
--- trunk/examples/shootout/recursive.pir Mon Mar 2 16:11:27 2009 (r37080)
+++ trunk/examples/shootout/recursive.pir Mon Mar 2 16:33:58 2009 (r37081)
@@ -1,4 +1,4 @@
-#!./parrot -Oc -Cj
+#!./parrot -Oc -R cgp-jit
#
# Ack by Leopold Toetsch
# Fib and Tak by Joshua Isom
Modified: trunk/examples/shootout/revcomp.pir
==============================================================================
--- trunk/examples/shootout/revcomp.pir Mon Mar 2 16:11:27 2009 (r37080)
+++ trunk/examples/shootout/revcomp.pir Mon Mar 2 16:33:58 2009 (r37081)
@@ -1,4 +1,4 @@
-#!parrot -j
+#!parrot -R jit
# Reads from stdin a file in the format made by fasta.pir
# N = 2500000 for fasta
Modified: trunk/examples/shootout/spectralnorm.pir
==============================================================================
--- trunk/examples/shootout/spectralnorm.pir Mon Mar 2 16:11:27 2009 (r37080)
+++ trunk/examples/shootout/spectralnorm.pir Mon Mar 2 16:33:58 2009 (r37081)
@@ -1,4 +1,4 @@
-#!./parrot -j
+#!./parrot -R jit
#
# spectralnorm.pir N (N = 100 for shootout)
# by Michal Jurosz
Modified: trunk/examples/shootout/sumcol.pir
==============================================================================
--- trunk/examples/shootout/sumcol.pir Mon Mar 2 16:11:27 2009 (r37080)
+++ trunk/examples/shootout/sumcol.pir Mon Mar 2 16:33:58 2009 (r37081)
@@ -1,6 +1,6 @@
-#!./parrot -j
+#!./parrot -R jit
#
-# ./parrot -j sumcol.pir < sum8M
+# ./parrot -R jit sumcol.pir < sum8M
# by Joshua Isom
# N.B. it is called the sum-file benchmark on the computer shootout (KF)
Modified: trunk/examples/shootout/takfp.pir
==============================================================================
--- trunk/examples/shootout/takfp.pir Mon Mar 2 16:11:27 2009 (r37080)
+++ trunk/examples/shootout/takfp.pir Mon Mar 2 16:33:58 2009 (r37081)
@@ -1,6 +1,6 @@
-#!./parrot -C
+#!./parrot -R cgp
#
-# ./parrot -C takfp.pir N (N = 10 for shootout)
+# ./parrot -R cgp takfp.pir N (N = 10 for shootout)
# by Joshua Isom
# changed default value to N=7 (shootout default before being deprecated)
# anyway N=10 froze my laptop. Karl Forner
Modified: trunk/src/embed.c
==============================================================================
--- trunk/src/embed.c Mon Mar 2 16:11:27 2009 (r37080)
+++ trunk/src/embed.c Mon Mar 2 16:33:58 2009 (r37081)
@@ -717,7 +717,7 @@
=item C<static FLOATVAL calibrate>
With this calibration, reported times of C<parrot -p> almost match those
-measured with time C<parrot -b>.
+measured with time C<parrot -R bounds>.
=cut
Modified: trunk/src/pic_jit.c
==============================================================================
--- trunk/src/pic_jit.c Mon Mar 2 16:11:27 2009 (r37080)
+++ trunk/src/pic_jit.c Mon Mar 2 16:33:58 2009 (r37081)
@@ -160,7 +160,7 @@
.return ($I0)
.end
... prints 42, if PIC_TEST is 1, because the C function is called
- with -C and -S runcores.
+ with cgp and switch runcores.
*/
/*
Modified: trunk/t/examples/shootout.t
==============================================================================
--- trunk/t/examples/shootout.t Mon Mar 2 16:11:27 2009 (r37080)
+++ trunk/t/examples/shootout.t Mon Mar 2 16:33:58 2009 (r37081)
@@ -35,7 +35,7 @@
To add a new test, you do not have to modify this script:
1. add your script (toto.pir) to examples/shootout
- 2. put parrot options in the first line (e.g "#!./parrot -Oc -Cj")
+ 2. put parrot options in the first line (e.g "#!./parrot -Oc -R cgp-jit")
3. make sure you have default argument values
4. put the expected output as a file : toto.pir_output
5. if you need an input file (to be read from stdin), call it toto.pir_input
Modified: trunk/tools/dev/parrotbench.pl
==============================================================================
--- trunk/tools/dev/parrotbench.pl Mon Mar 2 16:11:27 2009 (r37080)
+++ trunk/tools/dev/parrotbench.pl Mon Mar 2 16:33:58 2009 (r37081)
@@ -63,7 +63,7 @@
exclude = waves
[benchmark parrotj]
- exe = ../../parrot -j
+ exe = ../../parrot -R jit
type = .pasm
type = .pir
More information about the parrot-commits
mailing list