[svn:parrot] r45843 - in branches/runcore_purge: config/gen/makefiles include/parrot runtime/parrot/library src/runcore t/examples t/tools/ops2cutils

cotto at svn.parrot.org cotto at svn.parrot.org
Wed Apr 21 07:12:44 UTC 2010


Author: cotto
Date: Wed Apr 21 07:12:43 2010
New Revision: 45843
URL: https://trac.parrot.org/parrot/changeset/45843

Log:
[profiling] get fulltest passing, remove code related to event checking

Modified:
   branches/runcore_purge/config/gen/makefiles/root.in
   branches/runcore_purge/include/parrot/runcore_api.h
   branches/runcore_purge/runtime/parrot/library/distutils.pir
   branches/runcore_purge/src/runcore/main.c
   branches/runcore_purge/t/examples/shootout.t
   branches/runcore_purge/t/tools/ops2cutils/01-new.t
   branches/runcore_purge/t/tools/ops2cutils/03-print_c_header_file.t
   branches/runcore_purge/t/tools/ops2cutils/04-print_c_source_top.t
   branches/runcore_purge/t/tools/ops2cutils/05-print_c_source_bottom.t
   branches/runcore_purge/t/tools/ops2cutils/06-dynamic.t
   branches/runcore_purge/t/tools/ops2cutils/09-dynamic_nolines.t
   branches/runcore_purge/t/tools/ops2cutils/10-print_c_source_file.t

Modified: branches/runcore_purge/config/gen/makefiles/root.in
==============================================================================
--- branches/runcore_purge/config/gen/makefiles/root.in	Wed Apr 21 06:17:35 2010	(r45842)
+++ branches/runcore_purge/config/gen/makefiles/root.in	Wed Apr 21 07:12:43 2010	(r45843)
@@ -170,7 +170,7 @@
     parrot.pc \
     compilers/imcc/imcc.y.flag \
     compilers/imcc/imcc.l.flag \
-    src/ops/core_ops.c 
+    src/ops/core_ops.c
 
 GEN_PASM_INCLUDES = \
 	runtime/parrot/include/cclass.pasm \
@@ -1703,13 +1703,12 @@
 check : test
 
 # Test various run cores and other stuff
-# 'testC', 'testg' and 'testj' are tested only
+# 'testg' and 'testj' are tested only
 # when the needed runcores are available
 fulltest :
 	- at make@ testb \
 	testf \
 	testr \
-	testS \
 	src_tests \
 	run_tests \
 	buildtools_tests \
@@ -1726,10 +1725,6 @@
 testb : test_prep
 	$(PERL) t/harness $(EXTRA_TEST_ARGS) -b $(RUNCORE_TEST_FILES)
 
-# CGP core
-testC : test_prep
-	$(PERL) t/harness $(EXTRA_TEST_ARGS) -C $(RUNCORE_TEST_FILES)
-
 # fast core
 testf : test_prep
 	$(PERL) t/harness $(EXTRA_TEST_ARGS) -f $(RUNCORE_TEST_FILES)
@@ -1750,18 +1745,6 @@
 testr : test_prep
 	$(PERL) t/harness $(EXTRA_TEST_ARGS) -r $(RUNCORE_TEST_FILES)
 
-# switched core
-testS : test_prep
-	$(PERL) t/harness $(EXTRA_TEST_ARGS) -S $(RUNCORE_TEST_FILES)
-
-# Computed goto jitted core - target retained, but falls back to standard core
-testCj : test_prep
-	$(PERL) t/harness $(EXTRA_TEST_ARGS) $(RUNCORE_TEST_FILES)
-
-# switched jitted core - target retained, but falls back to standard core
-testSj : test_prep
-	$(PERL) t/harness $(EXTRA_TEST_ARGS) $(RUNCORE_TEST_FILES)
-
 # test the EXEC stuff
 testexec: test_prep
 	$(PERL) t/harness $(EXTRA_TEST_ARGS) --run-exec $(RUNCORE_TEST_FILES)
@@ -2287,7 +2270,6 @@
     cover-testb \
     cover-testf \
     cover-testr \
-    cover-testS \
     cover-src \
     cover-run \
     cover-perl \
@@ -2315,9 +2297,6 @@
 cover-testb: cover.dummy
 	- at make@ testb
 
-cover-testC: cover.dummy
-	- at make@ testC
-
 cover-testf: cover.dummy
 	- at make@ testf
 
@@ -2330,9 +2309,6 @@
 cover-testr: cover.dummy
 	- at make@ testr
 
-cover-testS: cover.dummy
-	- at make@ testS
-
 cover-src: cover.dummy
 	- at make@ src_tests
 

Modified: branches/runcore_purge/include/parrot/runcore_api.h
==============================================================================
--- branches/runcore_purge/include/parrot/runcore_api.h	Wed Apr 21 06:17:35 2010	(r45842)
+++ branches/runcore_purge/include/parrot/runcore_api.h	Wed Apr 21 07:12:43 2010	(r45843)
@@ -38,7 +38,6 @@
 typedef enum Parrot_runcore_flags {
     RUNCORE_REENTRANT_FLAG    = 1 << 0,
     RUNCORE_FUNC_TABLE_FLAG   = 1 << 1,
-    RUNCORE_EVENT_CHECK_FLAG  = 1 << 2,
 } Parrot_runcore_flags;
 
 
@@ -52,11 +51,6 @@
 #define PARROT_RUNCORE_FUNC_TABLE_SET(runcore) \
     Runcore_flag_SET(runcore, RUNCORE_FUNC_TABLE_FLAG)
 
-#define PARROT_RUNCORE_EVENT_CHECK_TEST(runcore) \
-    Runcore_flag_TEST(runcore, RUNCORE_EVENT_CHECK_FLAG)
-#define PARROT_RUNCORE_EVENT_CHECK_SET(runcore) \
-    Runcore_flag_SET(runcore, RUNCORE_EVENT_CHECK_FLAG)
-
 /* HEADERIZER BEGIN: src/runcore/main.c */
 /* Don't modify between HEADERIZER BEGIN / HEADERIZER END.  Your changes will be lost. */
 

Modified: branches/runcore_purge/runtime/parrot/library/distutils.pir
==============================================================================
--- branches/runcore_purge/runtime/parrot/library/distutils.pir	Wed Apr 21 06:17:35 2010	(r45842)
+++ branches/runcore_purge/runtime/parrot/library/distutils.pir	Wed Apr 21 07:12:43 2010	(r45843)
@@ -4281,9 +4281,6 @@
     flags .= " "
     $S0 = $P0['cc_hasjit']
     flags .= $S0
-    flags .= " "
-    $S0 = $P0['cg_flag']
-    flags .= $S0
     .return (flags)
 .end
 

Modified: branches/runcore_purge/src/runcore/main.c
==============================================================================
--- branches/runcore_purge/src/runcore/main.c	Wed Apr 21 06:17:35 2010	(r45842)
+++ branches/runcore_purge/src/runcore/main.c	Wed Apr 21 07:12:43 2010	(r45843)
@@ -54,9 +54,6 @@
 static void stop_prederef(PARROT_INTERP)
         __attribute__nonnull__(1);
 
-static void turn_ev_check(PARROT_INTERP, int on)
-        __attribute__nonnull__(1);
-
 #define ASSERT_ARGS_dynop_register_switch __attribute__unused__ int _ASSERT_ARGS_CHECK = (\
        PARROT_ASSERT_ARG(interp))
 #define ASSERT_ARGS_get_dynamic_op_lib_init __attribute__unused__ int _ASSERT_ARGS_CHECK = (\
@@ -66,8 +63,6 @@
     , PARROT_ASSERT_ARG(table))
 #define ASSERT_ARGS_stop_prederef __attribute__unused__ int _ASSERT_ARGS_CHECK = (\
        PARROT_ASSERT_ARG(interp))
-#define ASSERT_ARGS_turn_ev_check __attribute__unused__ int _ASSERT_ARGS_CHECK = (\
-       PARROT_ASSERT_ARG(interp))
 /* Don't modify between HEADERIZER BEGIN / HEADERIZER END.  Your changes will be lost. */
 /* HEADERIZER END: static */
 
@@ -168,44 +163,6 @@
 
 /*
 
-=item C<static void turn_ev_check(PARROT_INTERP, int on)>
-
-Turn on or off event checking for prederefed cores.
-
-Fills in the C<event_checker> opcode, or restores original ops in all
-branch locations of the opcode stream.
-
-Note that when C<on> is true, this is being called from the event
-handler thread.
-
-=cut
-
-*/
-
-static void
-turn_ev_check(PARROT_INTERP, int on)
-{
-    ASSERT_ARGS(turn_ev_check)
-    const Prederef * const pi = &interp->code->prederef;
-    size_t i;
-
-    if (!pi->branches)
-        return;
-
-    for (i = 0; i < pi->n_branches; ++i) {
-        const size_t offs = pi->branches[i].offs;
-        if (on)
-            interp->code->prederef.code[offs] =
-                ((void **)interp->op_lib->op_func_table)
-                            [CORE_OPS_check_events__];
-        else
-            interp->code->prederef.code[offs] = pi->branches[i].op;
-    }
-}
-
-
-/*
-
 =item C<static oplib_init_f get_dynamic_op_lib_init(PARROT_INTERP, const PMC
 *lib)>
 
@@ -575,9 +532,6 @@
         PARROT_ASSERT(table);
         interp->op_func_table = table;
     }
-
-    if (PARROT_RUNCORE_EVENT_CHECK_TEST(interp->run_core))
-        turn_ev_check(interp, on);
 }
 
 

Modified: branches/runcore_purge/t/examples/shootout.t
==============================================================================
--- branches/runcore_purge/t/examples/shootout.t	Wed Apr 21 06:17:35 2010	(r45842)
+++ branches/runcore_purge/t/examples/shootout.t	Wed Apr 21 07:12:43 2010	(r45843)
@@ -74,15 +74,13 @@
         $args =~ s/-j/-C/;
         $args =~ s/-Cj/-C/;
     }
-    unless ( $PConfig{cg_flag} =~ /HAVE/ ) {
-        $args =~ s/-Cj/-j/;
+    $args =~ s/-Cj/-j/;
 
-        # Remove any plain -C option.
-        $args =~ s/(^|\s)-C(\s|$)/$1$2/;
+    # Remove any plain -C option.
+    $args =~ s/(^|\s)-C(\s|$)/$1$2/;
 
-        # Remove any extra Cs still floating around
-        $args =~ s/C//;
-    }
+    # Remove any extra Cs still floating around
+    $args =~ s/C//;
 
     # look for input files
     my $input = "$file$INPUT_EXT";

Modified: branches/runcore_purge/t/tools/ops2cutils/01-new.t
==============================================================================
--- branches/runcore_purge/t/tools/ops2cutils/01-new.t	Wed Apr 21 06:17:35 2010	(r45842)
+++ branches/runcore_purge/t/tools/ops2cutils/01-new.t	Wed Apr 21 07:12:43 2010	(r45843)
@@ -19,7 +19,7 @@
     }
     unshift @INC, qq{$topdir/lib};
 }
-use Test::More tests => 19;
+use Test::More tests => 15;
 use Carp;
 use Cwd;
 use File::Copy;

Modified: branches/runcore_purge/t/tools/ops2cutils/03-print_c_header_file.t
==============================================================================
--- branches/runcore_purge/t/tools/ops2cutils/03-print_c_header_file.t	Wed Apr 21 06:17:35 2010	(r45842)
+++ branches/runcore_purge/t/tools/ops2cutils/03-print_c_header_file.t	Wed Apr 21 07:12:43 2010	(r45843)
@@ -19,7 +19,7 @@
     }
     unshift @INC, qq{$topdir/lib};
 }
-use Test::More tests => 24;
+use Test::More tests => 12;
 use Carp;
 use Cwd;
 use File::Copy;

Modified: branches/runcore_purge/t/tools/ops2cutils/04-print_c_source_top.t
==============================================================================
--- branches/runcore_purge/t/tools/ops2cutils/04-print_c_source_top.t	Wed Apr 21 06:17:35 2010	(r45842)
+++ branches/runcore_purge/t/tools/ops2cutils/04-print_c_source_top.t	Wed Apr 21 07:12:43 2010	(r45843)
@@ -19,7 +19,7 @@
     }
     unshift @INC, qq{$topdir/lib};
 }
-use Test::More tests => 26;
+use Test::More tests => 10;
 use Carp;
 use Cwd;
 use File::Copy;

Modified: branches/runcore_purge/t/tools/ops2cutils/05-print_c_source_bottom.t
==============================================================================
--- branches/runcore_purge/t/tools/ops2cutils/05-print_c_source_bottom.t	Wed Apr 21 06:17:35 2010	(r45842)
+++ branches/runcore_purge/t/tools/ops2cutils/05-print_c_source_bottom.t	Wed Apr 21 07:12:43 2010	(r45843)
@@ -19,7 +19,7 @@
     }
     unshift @INC, qq{$topdir/lib};
 }
-use Test::More tests => 26;
+use Test::More tests => 10;
 use Carp;
 use Cwd;
 use File::Copy;

Modified: branches/runcore_purge/t/tools/ops2cutils/06-dynamic.t
==============================================================================
--- branches/runcore_purge/t/tools/ops2cutils/06-dynamic.t	Wed Apr 21 06:17:35 2010	(r45842)
+++ branches/runcore_purge/t/tools/ops2cutils/06-dynamic.t	Wed Apr 21 07:12:43 2010	(r45843)
@@ -19,7 +19,7 @@
     }
     unshift @INC, qq{$topdir/lib};
 }
-use Test::More tests => 27;
+use Test::More tests => 15;
 use Carp;
 use Cwd;
 use File::Copy;
@@ -55,13 +55,13 @@
     }
     chdir "src/dynoplibs" or croak "Unable to change to src/dynoplibs: $!";
 
-    test_dynops( [qw( C        obscure.ops )] );
+    test_dynops( [qw( C obscure.ops )] );
 
     {
         my ($self, $stdout, $stderr);
         capture(
             sub { $self = Parrot::Ops2c::Utils->new( {
-                        argv => [qw( CSwitch  obscure.ops obscure.ops )],
+                        argv => [qw( C obscure.ops obscure.ops )],
                         flag => { dynamic => 1 },
                 } ); },
             \$stdout,

Modified: branches/runcore_purge/t/tools/ops2cutils/09-dynamic_nolines.t
==============================================================================
--- branches/runcore_purge/t/tools/ops2cutils/09-dynamic_nolines.t	Wed Apr 21 06:17:35 2010	(r45842)
+++ branches/runcore_purge/t/tools/ops2cutils/09-dynamic_nolines.t	Wed Apr 21 07:12:43 2010	(r45843)
@@ -19,7 +19,7 @@
     }
     unshift @INC, qq{$topdir/lib};
 }
-use Test::More tests => 22;
+use Test::More tests => 10;
 use Carp;
 use Cwd;
 use File::Copy;

Modified: branches/runcore_purge/t/tools/ops2cutils/10-print_c_source_file.t
==============================================================================
--- branches/runcore_purge/t/tools/ops2cutils/10-print_c_source_file.t	Wed Apr 21 06:17:35 2010	(r45842)
+++ branches/runcore_purge/t/tools/ops2cutils/10-print_c_source_file.t	Wed Apr 21 07:12:43 2010	(r45843)
@@ -19,7 +19,7 @@
     }
     unshift @INC, qq{$topdir/lib};
 }
-use Test::More tests => 21;
+use Test::More tests => 12;
 use Carp;
 use Cwd;
 use File::Copy;


More information about the parrot-commits mailing list