Mercurial > hg > truffle

changeset 19475:b7c9c23f7205

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge.
author Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
date Wed, 18 Feb 2015 12:49:57 +0100
parents 880717e44675 (current diff) a95544db6f9c (diff)
children bd2dd97f2bdb 1cbf4661e1e9
files
diffstat 3 files changed, 18 insertions(+), 12 deletions(-) [+]
line wrap: on
line diff
--- a/graal/com.oracle.graal.truffle.hotspot/src/com/oracle/graal/truffle/hotspot/HotSpotTruffleRuntime.java	Wed Feb 18 12:12:26 2015 +0100
+++ b/graal/com.oracle.graal.truffle.hotspot/src/com/oracle/graal/truffle/hotspot/HotSpotTruffleRuntime.java	Wed Feb 18 12:49:57 2015 +0100
@@ -109,7 +109,7 @@
             }
         }
         selectedProcessors = Math.max(1, selectedProcessors);
-        compileQueue = new ThreadPoolExecutor(2, 2, 0L, TimeUnit.MILLISECONDS, new LinkedBlockingQueue<Runnable>(), factory);
+        compileQueue = new ThreadPoolExecutor(selectedProcessors, selectedProcessors, 0L, TimeUnit.MILLISECONDS, new LinkedBlockingQueue<Runnable>(), factory);
 
     }
 
--- a/graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/GraalTruffleRuntime.java	Wed Feb 18 12:12:26 2015 +0100
+++ b/graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/GraalTruffleRuntime.java	Wed Feb 18 12:49:57 2015 +0100
@@ -113,7 +113,11 @@
 
     @Override
     public MaterializedFrame createMaterializedFrame(Object[] arguments, FrameDescriptor frameDescriptor) {
-        return new FrameWithBoxing(frameDescriptor, arguments);
+        if (TruffleCompilerOptions.TruffleUseFrameWithoutBoxing.getValue()) {
+            return new FrameWithoutBoxing(frameDescriptor, arguments);
+        } else {
+            return new FrameWithBoxing(frameDescriptor, arguments);
+        }
     }
 
     @Override
--- a/graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/substitutions/TruffleGraphBuilderPlugins.java	Wed Feb 18 12:12:26 2015 +0100
+++ b/graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/substitutions/TruffleGraphBuilderPlugins.java	Wed Feb 18 12:49:57 2015 +0100
@@ -186,16 +186,18 @@
             }
         });
 
-        // FrameWithoutBoxing.class
-        r = new Registration(plugins, metaAccess, FrameWithoutBoxing.class);
-        registerMaterialize(r);
-        registerUnsafeCast(r);
-        registerUnsafeLoadStorePlugins(r, Kind.Int, Kind.Long, Kind.Float, Kind.Double, Kind.Object);
-
-        // FrameWithBoxing.class
-        r = new Registration(plugins, metaAccess, FrameWithBoxing.class);
-        registerMaterialize(r);
-        registerUnsafeCast(r);
+        if (TruffleCompilerOptions.TruffleUseFrameWithoutBoxing.getValue()) {
+            // FrameWithoutBoxing.class
+            r = new Registration(plugins, metaAccess, FrameWithoutBoxing.class);
+            registerMaterialize(r);
+            registerUnsafeCast(r);
+            registerUnsafeLoadStorePlugins(r, Kind.Int, Kind.Long, Kind.Float, Kind.Double, Kind.Object);
+        } else {
+            // FrameWithBoxing.class
+            r = new Registration(plugins, metaAccess, FrameWithBoxing.class);
+            registerMaterialize(r);
+            registerUnsafeCast(r);
+        }
 
         // CompilerDirectives.class
         r = new Registration(plugins, metaAccess, UnsafeAccessImpl.class);