Add an envvar to turn PEA on/off

MoarVM · Nov 13, 2018 · 8e85c39 · 8e85c39
1 parent 0f51f33
commit 8e85c39
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 2 deletions.
diff --git a/src/core/instance.h b/src/core/instance.h
@@ -258,6 +258,7 @@ struct MVMInstance {
     MVMint8 spesh_inline_enabled;
     MVMint8 spesh_inline_log;
     MVMint8 spesh_osr_enabled;
+    MVMint8 spesh_pea_enabled;
     MVMint8 spesh_nodelay;
     MVMint8 spesh_blocking;
 

diff --git a/src/main.c b/src/main.c
@@ -85,6 +85,7 @@ The following environment variables are respected:\n\
     MVM_SPESH_DISABLE           Disables all dynamic optimization\n\
     MVM_SPESH_INLINE_DISABLE    Disables inlining\n\
     MVM_SPESH_OSR_DISABLE       Disables on-stack replacement\n\
+    MVM_SPESH_PEA_DISABLE       Disables partial escape analysis and related optimizations\n\
     MVM_SPESH_BLOCKING          Blocks log-sending thread while specializer runs\n\
     MVM_SPESH_LOG               Specifies a dynamic optimizer log file\n\
     MVM_SPESH_NODELAY           Run dynamic optimization even for cold frames\n\

diff --git a/src/moar.c b/src/moar.c
@@ -76,7 +76,8 @@ MVMInstance * MVM_vm_create_instance(void) {
     MVMInstance *instance;
 
     char *spesh_log, *spesh_nodelay, *spesh_disable, *spesh_inline_disable,
-         *spesh_osr_disable, *spesh_limit, *spesh_blocking, *spesh_inline_log;
+         *spesh_osr_disable, *spesh_limit, *spesh_blocking, *spesh_inline_log,
+         *spesh_pea_disable;
     char *jit_expr_disable, *jit_disable, *jit_last_frame, *jit_last_bb;
     char *dynvar_log;
     int init_stat;
@@ -219,6 +220,9 @@ MVMInstance * MVM_vm_create_instance(void) {
         spesh_osr_disable = getenv("MVM_SPESH_OSR_DISABLE");
         if (!spesh_osr_disable || !spesh_osr_disable[0])
             instance->spesh_osr_enabled = 1;
+        spesh_pea_disable = getenv("MVM_SPESH_PEA_DISABLE");
+        if (!spesh_pea_disable || !spesh_pea_disable[0])
+            instance->spesh_pea_enabled = 1;
     }
 
     init_mutex(instance->mutex_parameterization_add, "parameterization");

diff --git a/src/spesh/optimize.c b/src/spesh/optimize.c
@@ -3315,7 +3315,8 @@ void MVM_spesh_optimize(MVMThreadContext *tc, MVMSpeshGraph *g, MVMSpeshPlanned
     /* Perform partial escape analysis at this point, which may make more
      * information available, or give more `set` instructions for the `set`
      * elimination in the post-inline pass to get rid of. */
-    MVM_spesh_pea(tc, g);
+    if (tc->instance->spesh_pea_enabled)
+        MVM_spesh_pea(tc, g);
 
     /* Make a post-inline pass through the graph doing things that are better
      * done after inlinings have taken place. Note that these things must not