Mercurial > hg > graal-compiler

changeset 23315:b9e2743ec122

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Update jvmci import.
author Roland Schatz <roland.schatz@oracle.com>
date Fri, 15 Jan 2016 16:30:38 +0100
parents 00a2a20e8109
children 52f4acf6f365
files graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/CompilationTask.java graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/HotSpotGraalCompiler.java mx.graal/suite.py
diffstat 3 files changed, 9 insertions(+), 18 deletions(-) [+]
line wrap: on
line diff
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/CompilationTask.java	Fri Jan 15 18:27:58 2016 +0100
+++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/CompilationTask.java	Fri Jan 15 16:30:38 2016 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2016, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -31,14 +31,12 @@
 import static com.oracle.graal.compiler.GraalCompilerOptions.PrintStackTraceOnException;
 
 import java.lang.reflect.Field;
-import java.util.concurrent.TimeUnit;
 
 import jdk.vm.ci.code.BailoutException;
 import jdk.vm.ci.code.CodeCacheProvider;
-import jdk.vm.ci.code.CompilationRequestFailure;
+import jdk.vm.ci.code.CompilationRequestResult;
 import jdk.vm.ci.code.CompilationResult;
 import jdk.vm.ci.code.InstalledCode;
-import jdk.vm.ci.hotspot.HotSpotCodeCacheProvider;
 import jdk.vm.ci.hotspot.HotSpotCompilationRequest;
 import jdk.vm.ci.hotspot.HotSpotInstalledCode;
 import jdk.vm.ci.hotspot.HotSpotJVMCIRuntimeProvider;
@@ -154,10 +152,9 @@
     public static final DebugTimer CodeInstallationTime = Debug.timer("CodeInstallation");
 
     @SuppressWarnings("try")
-    public CompilationRequestFailure runCompilation() {
+    public CompilationRequestResult runCompilation() {
         HotSpotVMConfig config = jvmciRuntime.getConfig();
         final long threadId = Thread.currentThread().getId();
-        long startCompilationTime = System.nanoTime();
         HotSpotInstalledCode installedCode = null;
         int entryBCI = getEntryBCI();
         final boolean isOSR = entryBCI != JVMCICompiler.INVOCATION_ENTRY_BCI;
@@ -239,7 +236,7 @@
             /*
              * Treat bailouts as retryable.
              */
-            return new CompilationRequestFailure(bailout.getMessage(), true);
+            return CompilationRequestResult.failure(bailout.getMessage(), true);
         } catch (Throwable t) {
             // Log a failure event.
             CompilerFailureEvent event = eventProvider.newCompilerFailureEvent();
@@ -254,7 +251,7 @@
              * Treat random exceptions from the compiler as indicating a problem compiling this
              * method.
              */
-            return new CompilationRequestFailure(t.getMessage(), false);
+            return CompilationRequestResult.failure(t.getMessage(), false);
         } finally {
             try {
                 int compiledBytecodes = 0;
@@ -285,12 +282,6 @@
                     assert ctask != 0L;
                     UNSAFE.putInt(ctask + config.compileTaskNumInlinedBytecodesOffset, compiledBytecodes);
                 }
-                long compilationTime = System.nanoTime() - startCompilationTime;
-                if ((config.ciTime || config.ciTimeEach) && installedCode != null) {
-                    long timeUnitsPerSecond = TimeUnit.NANOSECONDS.convert(1, TimeUnit.SECONDS);
-                    final HotSpotCodeCacheProvider codeCache = (HotSpotCodeCacheProvider) jvmciRuntime.getHostJVMCIBackend().getCodeCache();
-                    codeCache.notifyCompilationStatistics(getId(), method, entryBCI != JVMCICompiler.INVOCATION_ENTRY_BCI, compiledBytecodes, compilationTime, timeUnitsPerSecond, installedCode);
-                }
             } catch (Throwable t) {
                 handleException(t);
             }
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/HotSpotGraalCompiler.java	Fri Jan 15 18:27:58 2016 +0100
+++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/HotSpotGraalCompiler.java	Fri Jan 15 16:30:38 2016 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -30,7 +30,7 @@
 import jdk.vm.ci.code.CallingConvention;
 import jdk.vm.ci.code.CallingConvention.Type;
 import jdk.vm.ci.code.CompilationRequest;
-import jdk.vm.ci.code.CompilationRequestFailure;
+import jdk.vm.ci.code.CompilationRequestResult;
 import jdk.vm.ci.code.CompilationResult;
 import jdk.vm.ci.hotspot.HotSpotCodeCacheProvider;
 import jdk.vm.ci.hotspot.HotSpotCompilationRequest;
@@ -86,7 +86,7 @@
 
     @Override
     @SuppressWarnings("try")
-    public CompilationRequestFailure compileMethod(CompilationRequest request) {
+    public CompilationRequestResult compileMethod(CompilationRequest request) {
         // Ensure a debug configuration for this thread is initialized
         if (Debug.isEnabled() && DebugScope.getConfig() == null) {
             DebugEnvironment.initialize(TTY.out);
--- a/mx.graal/suite.py	Fri Jan 15 18:27:58 2016 +0100
+++ b/mx.graal/suite.py	Fri Jan 15 16:30:38 2016 +0100
@@ -39,7 +39,7 @@
             {
                "name" : "jvmci",
                "optional" : "true",
-               "version" : "8f5a558875f4c6fe53e1db408a542ce049c6e1b1",
+               "version" : "1fbfcc0334d34d574646289ce1c93b05699ee555",
                "urls" : [
                     {"url" : "http://lafo.ssw.uni-linz.ac.at/hg/graal-jvmci-8", "kind" : "hg"},
                     {"url" : "https://curio.ssw.jku.at/nexus/content/repositories/snapshots", "kind" : "binary"},