# HG changeset patch # User ecaspole # Date 1512075634 18000 # Node ID 3af0ab7d1d903125a5ee68fe0498fc6f243f0d00 # Parent 9289fcb41aae902b6a1db16a4591a13d1bd5d779 8192821: Make LogCompilation into a maven project Summary: Add a maven project setup while preserving make build. Reviewed-by: kvn diff -r 9289fcb41aae -r 3af0ab7d1d90 src/utils/LogCompilation/Makefile --- a/src/utils/LogCompilation/Makefile Thu Nov 30 20:37:20 2017 +0100 +++ b/src/utils/LogCompilation/Makefile Thu Nov 30 16:00:34 2017 -0500 @@ -25,7 +25,7 @@ com.sun.hotspot.tools.compiler #END PKGLIST -FILELIST = com/sun/hotspot/tools/compiler/*.java +FILELIST = main/java/com/sun/hotspot/tools/compiler/*.java ifneq "x$(ALT_BOOTDIR)" "x" BOOTDIR := $(ALT_BOOTDIR) diff -r 9289fcb41aae -r 3af0ab7d1d90 src/utils/LogCompilation/README --- a/src/utils/LogCompilation/README Thu Nov 30 20:37:20 2017 +0100 +++ b/src/utils/LogCompilation/README Thu Nov 30 16:00:34 2017 -0500 @@ -16,3 +16,10 @@ https://wiki.openjdk.java.net/display/HotSpot/LogCompilation+overview https://wiki.openjdk.java.net/display/HotSpot/PrintCompilation https://wiki.openjdk.java.net/display/HotSpot/LogCompilation+tool + +The project layout is now for Maven. To build the project with Maven do: + + mvn clean install + +The build also copies the resulting target jar to ./logc.jar for easy +interop with the Makefile build. \ No newline at end of file diff -r 9289fcb41aae -r 3af0ab7d1d90 src/utils/LogCompilation/pom.xml --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/utils/LogCompilation/pom.xml Thu Nov 30 16:00:34 2017 -0500 @@ -0,0 +1,110 @@ + + + + 4.0.0 + com.sun.hotspot.tools.compiler + LogCompilation + jar + 1.0-SNAPSHOT + LogCompilation + http://maven.apache.org + + + junit + junit + 4.8.2 + test + + + + + + org.apache.maven.plugins + maven-shade-plugin + 3.1.0 + + + package + + shade + + + + + com.sun.hotspot.tools.compiler.LogCompilation + + + false + + + + + + org.apache.maven.plugins + maven-compiler-plugin + + 1.8 + 1.8 + + + + org.apache.maven.plugins + maven-release-plugin + 2.5.3 + + + org.apache.maven.plugins + maven-javadoc-plugin + 3.0.0-M1 + + + maven-antrun-plugin + 1.8 + + + copy + package + + + + + + + run + + + + + + + diff -r 9289fcb41aae -r 3af0ab7d1d90 src/utils/LogCompilation/src/com/sun/hotspot/tools/compiler/BasicLogEvent.java --- a/src/utils/LogCompilation/src/com/sun/hotspot/tools/compiler/BasicLogEvent.java Thu Nov 30 20:37:20 2017 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,94 +0,0 @@ -/* - * Copyright (c) 2009, 2015, 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 - * under the terms of the GNU General Public License version 2 only, as - * published by the Free Software Foundation. - * - * This code is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License - * version 2 for more details (a copy is included in the LICENSE file that - * accompanied this code). - * - * You should have received a copy of the GNU General Public License version - * 2 along with this work; if not, write to the Free Software Foundation, - * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * - * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA - * or visit www.oracle.com if you need additional information or have any - * questions. - * - */ - -package com.sun.hotspot.tools.compiler; - -import java.io.PrintStream; - -/** - * Provide basic data structures and behaviour for {@link LogEvent}s. - */ -public abstract class BasicLogEvent implements LogEvent { - - /** - * The event's ID. This is a number; we represent it as a string for - * convenience. - */ - protected final String id; - - /** - * The event's start time. - */ - protected final double start; - - /** - * The event's end time. - */ - protected double end; - - /** - * The compilation during which this event was signalled. - */ - protected Compilation compilation; - - BasicLogEvent(double start, String id) { - this.start = start; - this.end = start; - this.id = id; - } - - public final double getStart() { - return start; - } - - public final double getEnd() { - return end; - } - - public final void setEnd(double end) { - this.end = end; - } - - public final double getElapsedTime() { - return ((int) ((getEnd() - getStart()) * 1000)) / 1000.0; - } - - public final String getId() { - return id; - } - - public final Compilation getCompilation() { - return compilation; - } - - /** - * Set the compilation for this event. This is not a {@code final} method - * as it is overridden in {@link UncommonTrapEvent}. - */ - public void setCompilation(Compilation compilation) { - this.compilation = compilation; - } - - abstract public void print(PrintStream stream, boolean printID); -} diff -r 9289fcb41aae -r 3af0ab7d1d90 src/utils/LogCompilation/src/com/sun/hotspot/tools/compiler/CallSite.java --- a/src/utils/LogCompilation/src/com/sun/hotspot/tools/compiler/CallSite.java Thu Nov 30 20:37:20 2017 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,371 +0,0 @@ -/* - * Copyright (c) 2009, 2015, 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 - * under the terms of the GNU General Public License version 2 only, as - * published by the Free Software Foundation. - * - * This code is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License - * version 2 for more details (a copy is included in the LICENSE file that - * accompanied this code). - * - * You should have received a copy of the GNU General Public License version - * 2 along with this work; if not, write to the Free Software Foundation, - * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * - * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA - * or visit www.oracle.com if you need additional information or have any - * questions. - * - */ - -package com.sun.hotspot.tools.compiler; - -import java.io.PrintStream; -import java.util.ArrayDeque; -import java.util.ArrayList; -import java.util.List; - -/** - * Representation of a compilation scope in a compilation log. This class is a - * hybrid: its instances can represent original scopes of methods being - * compiled, but are also used to represent call sites in given methods. - */ -public class CallSite { - - /** - * The index of the call in the caller. This will be 0 if this instance - * represents a compilation root. - */ - private int bci; - - /** - * The method that is called at this call site. This will be {@code null} - * if this instance represents a compilation root. - */ - private Method method; - - /** - * The invocation count for this call site. - */ - private int count; - - /** - * The receiver type of the call represented by this instance, if known. - */ - private String receiver; - - /** - * In case the {@linkplain receiver receiver type} of the call represented - * by this instance is known, this is how often the type was encountered. - */ - private int receiver_count; - - /** - * The reason for a success or failure of an inlining operation at this - * call site. - */ - private String reason; - - /** - * A list of all calls in this compilation scope. - */ - private List calls; - - /** - * Number of nodes in the graph at the end of parsing this compilation - * scope. - */ - private int endNodes; - - /** - * Number of live nodes in the graph at the end of parsing this compilation - * scope. - */ - private int endLiveNodes; - - /** - * Time in seconds since VM startup at which parsing this compilation scope - * ended. - */ - private double timeStamp; - - /** - * The inline ID in case the call represented by this instance is inlined, - * 0 otherwise. - */ - private long inlineId; - - /** - * List of uncommon traps in this compilation scope. - */ - private List traps; - - /** - * Default constructor: used to create an instance that represents the top - * scope of a compilation. - */ - CallSite() {} - - /** - * Constructor to create an instance that represents an actual method call. - */ - CallSite(int bci, Method m) { - this.bci = bci; - this.method = m; - } - - /** - * Add a call site to the compilation scope represented by this instance. - */ - void add(CallSite site) { - if (getCalls() == null) { - calls = new ArrayList<>(); - } - getCalls().add(site); - } - - /** - * Return the last of the {@linkplain #getCalls() call sites} in this - * compilation scope. - */ - CallSite last() { - return getCalls().get(getCalls().size() - 1); - } - - /** - * Return the last-but-one of the {@linkplain #getCalls() call sites} in - * this compilation scope. - */ - CallSite lastButOne() { - return getCalls().get(getCalls().size() - 2); - } - - public String toString() { - StringBuilder sb = new StringBuilder(); - if (getReason() == null) { - sb.append(" @ " + getBci() + " " + getMethod()); - } else { - sb.append("- @ " + getBci() + " " + getMethod() + " " + getReason()); - } - sb.append("\n"); - if (getCalls() != null) { - for (CallSite site : getCalls()) { - sb.append(site); - sb.append("\n"); - } - } - return sb.toString(); - } - - public void print(PrintStream stream) { - print(stream, 0, true, false); - } - - void emit(PrintStream stream, int indent) { - for (int i = 0; i < indent; i++) { - stream.print(' '); - } - } - - public void print(PrintStream stream, int indent, boolean printInlining, boolean printUncommonTraps) { - emit(stream, indent); - String m = getMethod().getHolder() + "::" + getMethod().getName(); - if (getReason() == null) { - stream.print(" @ " + getBci() + " " + m + " (" + getMethod().getBytes() + " bytes)"); - } else { - stream.print(" @ " + getBci() + " " + m + " " + getReason()); - } - stream.printf(" (end time: %6.4f", getTimeStamp()); - if (getEndNodes() > 0) { - stream.printf(" nodes: %d live: %d", getEndNodes(), getEndLiveNodes()); - } - stream.println(")"); - - if (getReceiver() != null) { - emit(stream, indent + 4); - stream.println("type profile " + getMethod().getHolder() + " -> " + getReceiver() + " (" + - (getReceiverCount() * 100 / getCount()) + "%)"); - } - if (printInlining && getCalls() != null) { - for (CallSite site : getCalls()) { - site.print(stream, indent + 2, printInlining, printUncommonTraps); - } - } - if (printUncommonTraps && getTraps() != null) { - for (UncommonTrap site : getTraps()) { - site.print(stream, indent + 2); - } - } - } - - public int getBci() { - return bci; - } - - public void setBci(int bci) { - this.bci = bci; - } - - public Method getMethod() { - return method; - } - - public void setMethod(Method method) { - this.method = method; - } - - public int getCount() { - return count; - } - - public void setCount(int count) { - this.count = count; - } - - public String getReceiver() { - return receiver; - } - - public void setReceiver(String receiver) { - this.receiver = receiver; - } - - public int getReceiverCount() { - return receiver_count; - } - - public void setReceiver_count(int receiver_count) { - this.receiver_count = receiver_count; - } - - public String getReason() { - return reason; - } - - public void setReason(String reason) { - this.reason = reason; - } - - public List getCalls() { - return calls; - } - - public List getTraps() { - return traps; - } - - void add(UncommonTrap e) { - if (traps == null) { - traps = new ArrayList(); - } - traps.add(e); - } - - void setEndNodes(int n) { - endNodes = n; - } - - public int getEndNodes() { - return endNodes; - } - - void setEndLiveNodes(int n) { - endLiveNodes = n; - } - - public int getEndLiveNodes() { - return endLiveNodes; - } - - void setTimeStamp(double time) { - timeStamp = time; - } - - public double getTimeStamp() { - return timeStamp; - } - - /** - * Check whether this call site matches another. Every late inline call - * site has a unique inline ID. If the call site we're looking for has one, - * then use it; otherwise rely on method name and byte code index. - */ - private boolean matches(CallSite other) { - if (other.inlineId != 0) { - return inlineId == other.inlineId; - } - return method.equals(other.method) && bci == other.bci; - } - - /** - * Locate a late inline call site: find, in this instance's - * {@linkplain #calls call sites}, the one furthest down the given call - * stack. - * - * Multiple chains of identical call sites with the same method name / bci - * combination are possible, so we have to try them all until we find the - * late inline call site that has a matching inline ID. - * - * @return a matching call site, or {@code null} if none was found. - */ - public CallSite findCallSite(ArrayDeque sites) { - if (calls == null) { - return null; - } - CallSite site = sites.pop(); - for (CallSite c : calls) { - if (c.matches(site)) { - if (!sites.isEmpty()) { - CallSite res = c.findCallSite(sites); - if (res != null) { - sites.push(site); - return res; - } - } else { - sites.push(site); - return c; - } - } - } - sites.push(site); - return null; - } - - /** - * Locate a late inline call site in the tree spanned by all this instance's - * {@linkplain #calls call sites}, and return the sequence of call sites - * (scopes) leading to that late inline call site. - */ - public ArrayDeque findCallSite2(CallSite site) { - if (calls == null) { - return null; - } - - for (CallSite c : calls) { - if (c.matches(site)) { - ArrayDeque stack = new ArrayDeque<>(); - stack.push(c); - return stack; - } else { - ArrayDeque stack = c.findCallSite2(site); - if (stack != null) { - stack.push(c); - return stack; - } - } - } - return null; - } - - public long getInlineId() { - return inlineId; - } - - public void setInlineId(long inlineId) { - this.inlineId = inlineId; - } -} diff -r 9289fcb41aae -r 3af0ab7d1d90 src/utils/LogCompilation/src/com/sun/hotspot/tools/compiler/Compilation.java --- a/src/utils/LogCompilation/src/com/sun/hotspot/tools/compiler/Compilation.java Thu Nov 30 20:37:20 2017 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,364 +0,0 @@ -/* - * Copyright (c) 2009, 2015, 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 - * under the terms of the GNU General Public License version 2 only, as - * published by the Free Software Foundation. - * - * This code is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License - * version 2 for more details (a copy is included in the LICENSE file that - * accompanied this code). - * - * You should have received a copy of the GNU General Public License version - * 2 along with this work; if not, write to the Free Software Foundation, - * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * - * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA - * or visit www.oracle.com if you need additional information or have any - * questions. - * - */ - -package com.sun.hotspot.tools.compiler; - -import java.io.PrintStream; -import java.util.ArrayList; - -/** - * One particular compilation, represented in the compilation log file as a - * {@code task} element. - */ -public class Compilation implements LogEvent { - - /** - * The compilation ID. - */ - private int id; - - /** - * Whether this is a compilation for on-stack replacement (OSR). - */ - private boolean osr; - - /** - * The method being compiled. - */ - private Method method; - - /** - * The {@linkplain CallSite scope} of this compilation. This is created as - * an empty {@link CallSite} instance, to be filled with data (and - * meaning) later on. - */ - private CallSite call = new CallSite(); - - /** - * In case a {@code late_inline} event occurs during the compilation, this - * field holds the information about it. - */ - private CallSite lateInlineCall = new CallSite(); - - /** - * The bytecode instruction index for on-stack replacement compilations; -1 - * if this is not an OSR compilation. - */ - private int bci; - - /** - * The method under compilation's invocation count. - */ - private String icount; - - /** - * The method under compilation's backedge count. - */ - private String bcount; - - /** - * Additional information for special compilations (e.g., adapters). - */ - private String special; - - /** - * The name of the compiler performing this compilation. - */ - private String compiler; - - /** - * Start time stamp. - */ - private double start; - - /** - * End time stamp. - */ - private double end; - - /** - * Trip count of the register allocator. - */ - private int attempts; - - /** - * The compilation result (a native method). - */ - private NMethod nmethod; - - /** - * The phases through which this compilation goes. - */ - private ArrayList phases = new ArrayList<>(4); - - /** - * In case this compilation fails, the reason for that. - */ - private String failureReason; - - Compilation(int id) { - this.id = id; - } - - void reset() { - call = new CallSite(); - lateInlineCall = new CallSite(); - phases = new ArrayList<>(4); - } - - /** - * Get a compilation phase by name, or {@code null}. - * - * @param s the name of the phase to retrieve in this compilation. - * - * @return a compilation phase, or {@code null} if no phase with the given - * name is found. - */ - Phase getPhase(String s) { - for (Phase p : getPhases()) { - if (p.getName().equals(s)) { - return p; - } - } - return null; - } - - double getRegallocTime() { - return getPhase("regalloc").getElapsedTime(); - } - - public double getStart() { - return start; - } - - public void setCompiler(String compiler) { - this.compiler = compiler; - } - - public String getCompiler() { - return compiler; - } - - @Override - public String toString() { - StringBuilder sb = new StringBuilder(); - sb.append(getId()); - sb.append(" "); - sb.append(getCompiler()); - sb.append(" "); - sb.append(getMethod()); - sb.append(" "); - sb.append(getIcount()); - sb.append("+"); - sb.append(getBcount()); - sb.append("\n"); - if (getCall() != null && getCall().getCalls() != null) { - for (CallSite site : getCall().getCalls()) { - sb.append(site); - sb.append("\n"); - } - } - if (getLateInlineCall().getCalls() != null) { - sb.append("late inline:\n"); - for (CallSite site : getLateInlineCall().getCalls()) { - sb.append(site); - sb.append("\n"); - } - } - return sb.toString(); - } - - public void printShort(PrintStream stream) { - if (getMethod() == null) { - stream.println(getSpecial()); - } else { - int bc = isOsr() ? getBCI() : -1; - stream.print(getId() + getMethod().decodeFlags(bc) + " " + compiler + " " + getMethod().format(bc)); - } - } - - public void print(PrintStream stream, boolean printID) { - print(stream, 0, printID, true, false); - } - - public void print(PrintStream stream, boolean printID, boolean printInlining) { - print(stream, 0, printID, printInlining, false); - } - - public void print(PrintStream stream, boolean printID, boolean printInlining, boolean printUncommonTraps) { - print(stream, 0, printID, printInlining, printUncommonTraps); - } - - public void print(PrintStream stream, int indent, boolean printID, boolean printInlining, boolean printUncommonTraps) { - if (getMethod() == null) { - stream.println(getSpecial()); - } else { - if (printID) { - stream.print(getId()); - } - int bc = isOsr() ? getBCI() : -1; - stream.print(getMethod().decodeFlags(bc) + " " + compiler + " " + getMethod().format(bc)); - stream.println(); - if (getFailureReason() != null) { - stream.println("COMPILE SKIPPED: " + getFailureReason() + " (not retryable)"); - } - if (printInlining && call.getCalls() != null) { - for (CallSite site : call.getCalls()) { - site.print(stream, indent + 2, printInlining, printUncommonTraps); - } - } - if (printUncommonTraps && call.getTraps() != null) { - for (UncommonTrap site : call.getTraps()) { - site.print(stream, indent + 2); - } - } - if (printInlining && lateInlineCall.getCalls() != null) { - stream.println("late inline:"); - for (CallSite site : lateInlineCall.getCalls()) { - site.print(stream, indent + 2, printInlining, printUncommonTraps); - } - } - } - } - - public int getId() { - return id; - } - - public void setId(int id) { - this.id = id; - } - - public boolean isOsr() { - return osr; - } - - public void setOsr(boolean osr) { - this.osr = osr; - } - - public int getBCI() { - return bci; - } - - public void setBCI(int osrBci) { - this.bci = osrBci; - } - - public String getIcount() { - return icount; - } - - public void setICount(String icount) { - this.icount = icount; - } - - public String getBcount() { - return bcount; - } - - public void setBCount(String bcount) { - this.bcount = bcount; - } - - public String getSpecial() { - return special; - } - - public void setSpecial(String special) { - this.special = special; - } - - public void setStart(double start) { - this.start = start; - } - - public double getEnd() { - return end; - } - - public void setEnd(double end) { - this.end = end; - } - - public int getAttempts() { - return attempts; - } - - public void setAttempts(int attempts) { - this.attempts = attempts; - } - - public NMethod getNMethod() { - return nmethod; - } - - public void setNMethod(NMethod NMethod) { - this.nmethod = NMethod; - } - - public ArrayList getPhases() { - return phases; - } - - public String getFailureReason() { - return failureReason; - } - - public void setFailureReason(String failureReason) { - this.failureReason = failureReason; - } - - public Method getMethod() { - return method; - } - - /** - * Set the method under compilation. If it is already set, ignore the - * argument to avoid changing the method by post-parse inlining info. - * - * @param method the method under compilation. May be ignored. - */ - public void setMethod(Method method) { - if (getMethod() == null) { - this.method = method; - } - } - - public CallSite getCall() { - return call; - } - - public CallSite getLateInlineCall() { - return lateInlineCall; - } - - public double getElapsedTime() { - return end - start; - } - - public Compilation getCompilation() { - return this; - } -} diff -r 9289fcb41aae -r 3af0ab7d1d90 src/utils/LogCompilation/src/com/sun/hotspot/tools/compiler/Constants.java --- a/src/utils/LogCompilation/src/com/sun/hotspot/tools/compiler/Constants.java Thu Nov 30 20:37:20 2017 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,46 +0,0 @@ -/* - * Copyright (c) 2009, 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 - * under the terms of the GNU General Public License version 2 only, as - * published by the Free Software Foundation. - * - * This code is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License - * version 2 for more details (a copy is included in the LICENSE file that - * accompanied this code). - * - * You should have received a copy of the GNU General Public License version - * 2 along with this work; if not, write to the Free Software Foundation, - * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * - * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA - * or visit www.oracle.com if you need additional information or have any - * questions. - * - */ - -package com.sun.hotspot.tools.compiler; - -interface Constants { - static final int JVM_ACC_PUBLIC = 0x0001; /* visible to everyone */ - static final int JVM_ACC_PRIVATE = 0x0002; /* visible only to the defining class */ - static final int JVM_ACC_PROTECTED = 0x0004; /* visible to subclasses */ - static final int JVM_ACC_STATIC = 0x0008; /* instance variable is static */ - static final int JVM_ACC_FINAL = 0x0010; /* no further subclassing, overriding */ - static final int JVM_ACC_SYNCHRONIZED = 0x0020; /* wrap method call in monitor lock */ - static final int JVM_ACC_SUPER = 0x0020; /* funky handling of invokespecial */ - static final int JVM_ACC_VOLATILE = 0x0040; /* can not cache in registers */ - static final int JVM_ACC_BRIDGE = 0x0040; /* bridge method generated by compiler */ - static final int JVM_ACC_TRANSIENT = 0x0080; /* not persistent */ - static final int JVM_ACC_VARARGS = 0x0080; /* method declared with variable number of args */ - static final int JVM_ACC_NATIVE = 0x0100; /* implemented in C */ - static final int JVM_ACC_INTERFACE = 0x0200; /* class is an interface */ - static final int JVM_ACC_ABSTRACT = 0x0400; /* no definition provided */ - static final int JVM_ACC_STRICT = 0x0800; /* strict floating point */ - static final int JVM_ACC_SYNTHETIC = 0x1000; /* compiler-generated class, method or field */ - static final int JVM_ACC_ANNOTATION = 0x2000; /* annotation type */ - static final int JVM_ACC_ENUM = 0x4000; /* field is declared as element of enum */ -} diff -r 9289fcb41aae -r 3af0ab7d1d90 src/utils/LogCompilation/src/com/sun/hotspot/tools/compiler/LogCleanupReader.java --- a/src/utils/LogCompilation/src/com/sun/hotspot/tools/compiler/LogCleanupReader.java Thu Nov 30 20:37:20 2017 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,217 +0,0 @@ -/* - * Copyright (c) 2009, 2015, 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 - * under the terms of the GNU General Public License version 2 only, as - * published by the Free Software Foundation. - * - * This code is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License - * version 2 for more details (a copy is included in the LICENSE file that - * accompanied this code). - * - * You should have received a copy of the GNU General Public License version - * 2 along with this work; if not, write to the Free Software Foundation, - * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * - * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA - * or visit www.oracle.com if you need additional information or have any - * questions. - * - */ - -package com.sun.hotspot.tools.compiler; - -import java.io.*; -import java.util.regex.*; - -/** - * This class is a filter class to deal with malformed XML that used - * to be produced by the JVM when generating LogCompilation. In 1.6 - * and later releases it shouldn't be required. - */ -class LogCleanupReader extends Reader { - - private Reader reader; - - private char[] buffer = new char[4096]; - - private int bufferCount; - - private int bufferOffset; - - private char[] line = new char[1024]; - - private int index; - - private int length; - - private char[] one = new char[1]; - - LogCleanupReader(Reader r) { - reader = r; - } - - static final private Matcher duplicateCompileID = Pattern.compile(".+ compile_id='[0-9]+'.*( compile_id='[0-9]+)").matcher(""); - static final private Matcher compilerName = Pattern.compile("' (C[12]) compile_id=").matcher(""); - static final private Matcher destroyVM = Pattern.compile("'(destroy_vm)/").matcher(""); - - /** - * The log cleanup takes place in this method. If any of the three patterns - * ({@link #duplicateCompileID}, {@link #compilerName}, {@link #destroyVM}) - * match, that indicates a problem in the log. The cleanup is performed by - * correcting the input line and writing it back into the {@link #line} - * buffer. - */ - private void fill() throws IOException { - rawFill(); - if (length != -1) { - boolean changed = false; - String s = new String(line, 0, length); - - compilerName.reset(s); - if (compilerName.find()) { - s = s.substring(0, compilerName.start(1)) + s.substring(compilerName.end(1) + 1); - changed = true; - } - - duplicateCompileID.reset(s); - if (duplicateCompileID.lookingAt()) { - s = s.substring(0, duplicateCompileID.start(1)) + s.substring(duplicateCompileID.end(1) + 1); - changed = true; - } - - destroyVM.reset(s); - if (destroyVM.find()) { - s = s.substring(0, destroyVM.start(1)) + s.substring(destroyVM.end(1)); - changed = true; - } - - if (changed) { - s.getChars(0, s.length(), line, 0); - length = s.length(); - } - } - } - - private void rawFill() throws IOException { - if (bufferCount == -1) { - length = -1; - return; - } - - int i = 0; - boolean fillNonEOL = true; - outer: - while (true) { - if (fillNonEOL) { - int p; - for (p = bufferOffset; p < bufferCount; p++) { - char c = buffer[p]; - if (c == '\r' || c == '\n') { - bufferOffset = p; - fillNonEOL = false; - continue outer; - } - if (i >= line.length) { - // copy and enlarge the line array - char[] newLine = new char[line.length * 2]; - System.arraycopy(line, 0, newLine, 0, line.length); - line = newLine; - } - line[i++] = c; - } - bufferOffset = p; - } else { - int p; - for (p = bufferOffset; p < bufferCount; p++) { - char c = buffer[p]; - if (c != '\r' && c != '\n') { - bufferOffset = p; - length = i; - index = 0; - return; - } - line[i++] = c; - } - bufferOffset = p; - } - if (bufferCount == -1) { - if (i == 0) { - length = -1; - } else { - length = i; - } - index = 0; - return; - } - if (bufferOffset != bufferCount) { - System.out.println(bufferOffset); - System.out.println(bufferCount); - throw new InternalError("how did we get here"); - } - // load more data and try again. - bufferCount = reader.read(buffer, 0, buffer.length); - bufferOffset = 0; - } - } - - public int read() throws java.io.IOException { - read(one, 0, 1); - return one[0]; - } - - public int read(char[] buffer) throws java.io.IOException { - return read(buffer, 0, buffer.length); - } - - public int read(char[] b, int off, int len) throws java.io.IOException { - if (length == -1) { - return -1; - } - - if (index == length) { - fill(); - if (length == -1) { - return -1; - } - } - int n = Math.min(length - index, Math.min(b.length - off, len)); - // System.out.printf("%d %d %d %d %d\n", index, length, off, len, n); - System.arraycopy(line, index, b, off, n); - index += n; - return n; - } - - public long skip(long n) throws java.io.IOException { - long result = n; - while (n-- > 0) read(); - return result; - } - - public boolean ready() throws java.io.IOException { - return reader.ready() || (line != null && length > 0); - } - - public boolean markSupported() { - return false; - } - - public void mark(int unused) throws java.io.IOException { - throw new UnsupportedOperationException("mark not supported"); - } - - public void reset() throws java.io.IOException { - reader.reset(); - line = null; - index = 0; - } - - public void close() throws java.io.IOException { - reader.close(); - line = null; - index = 0; - } -} diff -r 9289fcb41aae -r 3af0ab7d1d90 src/utils/LogCompilation/src/com/sun/hotspot/tools/compiler/LogCompilation.java --- a/src/utils/LogCompilation/src/com/sun/hotspot/tools/compiler/LogCompilation.java Thu Nov 30 20:37:20 2017 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,511 +0,0 @@ -/* - * Copyright (c) 2009, 2015, 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 - * under the terms of the GNU General Public License version 2 only, as - * published by the Free Software Foundation. - * - * This code is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License - * version 2 for more details (a copy is included in the LICENSE file that - * accompanied this code). - * - * You should have received a copy of the GNU General Public License version - * 2 along with this work; if not, write to the Free Software Foundation, - * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * - * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA - * or visit www.oracle.com if you need additional information or have any - * questions. - * - */ - -package com.sun.hotspot.tools.compiler; - -import java.io.ByteArrayOutputStream; -import java.io.File; -import java.io.FileNotFoundException; -import java.io.FileOutputStream; -import java.io.PrintStream; -import java.util.*; - -import org.xml.sax.*; -import org.xml.sax.helpers.*; - -/** - * The LogCompilation tool parses log files generated by HotSpot using the - * {@code -XX:+LogCompilation} command line flag, and outputs the data - * collected therein in a nicely formatted way. There are various sorting - * options available, as well as options that select specific compilation - * events (such as inlining decisions) for inclusion in the output. - * - * The tool is also capable of fixing broken compilation logs as sometimes - * generated by Java 1.5 JVMs. - */ -public class LogCompilation extends DefaultHandler implements ErrorHandler { - - /** - * Print usage information and terminate with a given exit code. - */ - public static void usage(int exitcode) { - System.out.println("Usage: LogCompilation [ -v ] [ -c ] [ -s ] [ -e | -n ] file1 ..."); - System.out.println("By default, the tool will print the logged compilations ordered by start time."); - System.out.println(" -c: clean up malformed 1.5 xml"); - System.out.println(" -i: print inlining decisions"); - System.out.println(" -S: print compilation statistics"); - System.out.println(" -U: print uncommon trap statistics"); - System.out.println(" -t: print with time stamps"); - System.out.println(" -s: sort events by start time (default)"); - System.out.println(" -e: sort events by elapsed time"); - System.out.println(" -n: sort events by name and start"); - System.out.println(" -C: compare logs (give files to compare on command line)"); - System.out.println(" -d: do not print compilation IDs"); - System.exit(exitcode); - } - - /** - * Process command line arguments, parse log files and trigger desired - * functionality. - */ - public static void main(String[] args) throws Exception { - Comparator sort = LogParser.sortByStart; - boolean statistics = false; - boolean printInlining = false; - boolean cleanup = false; - boolean trapHistory = false; - boolean printTimeStamps = false; - boolean compare = false; - boolean printID = true; - int index = 0; - - while (args.length > index) { - String a = args[index]; - if (a.equals("-e")) { - sort = LogParser.sortByElapsed; - index++; - } else if (a.equals("-n")) { - sort = LogParser.sortByNameAndStart; - index++; - } else if (a.equals("-s")) { - sort = LogParser.sortByStart; - index++; - } else if (a.equals("-t")) { - printTimeStamps = true; - index++; - } else if (a.equals("-c")) { - cleanup = true; - index++; - } else if (a.equals("-S")) { - statistics = true; - index++; - } else if (a.equals("-U")) { - trapHistory = true; - index++; - } else if (a.equals("-h")) { - usage(0); - } else if (a.equals("-i")) { - printInlining = true; - index++; - } else if (a.equals("-C")) { - compare = true; - index++; - } else if (a.equals("-d")) { - printID = false; - index++; - } else { - if (a.charAt(0) == '-') { - System.out.println("Unknown option '" + a + "', assuming file name."); - } - break; - } - } - - if (index >= args.length) { - usage(1); - } - - if (compare) { - compareLogs(index, args); - return; - } - - while (index < args.length) { - ArrayList events = null; - try { - events = LogParser.parse(args[index], cleanup); - } catch (FileNotFoundException fnfe) { - System.out.println("File not found: " + args[index]); - System.exit(1); - } - - Collections.sort(events, sort); - - if (statistics) { - printStatistics(events, System.out); - } else if (trapHistory) { - printTrapHistory(events, System.out); - } else { - for (LogEvent c : events) { - if (c instanceof NMethod) { - // skip these - continue; - } - if (printTimeStamps) { - System.out.print(c.getStart() + ": "); - } - if (c instanceof Compilation) { - Compilation comp = (Compilation) c; - comp.print(System.out, printID, printInlining); - } else { - c.print(System.out, printID); - } - } - } - index++; - } - } - - /** - * Print extensive statistics from parsed log files. - */ - public static void printStatistics(ArrayList events, PrintStream out) { - // track code cache size - long cacheSize = 0; - long maxCacheSize = 0; - // track number of nmethods - int nmethodsCreated = 0; - int nmethodsLive = 0; - // track how many compilations were attempted multiple times - // (indexed by attempts, mapping to number of compilations) - int[] attempts = new int[32]; - int maxattempts = 0; - - // track time spent in compiler phases - LinkedHashMap phaseTime = new LinkedHashMap<>(7); - // track nodes created per phase - LinkedHashMap phaseNodes = new LinkedHashMap<>(7); - double elapsed = 0; - - for (LogEvent e : events) { - if (e instanceof Compilation) { - Compilation c = (Compilation) e; - c.printShort(out); - out.printf(" %6.4f\n", c.getElapsedTime()); - attempts[c.getAttempts()]++; - maxattempts = Math.max(maxattempts,c.getAttempts()); - elapsed += c.getElapsedTime(); - for (Phase phase : c.getPhases()) { - Double v = phaseTime.get(phase.getName()); - if (v == null) { - v = Double.valueOf(0.0); - } - phaseTime.put(phase.getName(), Double.valueOf(v.doubleValue() + phase.getElapsedTime())); - - Integer v2 = phaseNodes.get(phase.getName()); - if (v2 == null) { - v2 = Integer.valueOf(0); - } - phaseNodes.put(phase.getName(), Integer.valueOf(v2.intValue() + phase.getNodes())); - // Print phase name, elapsed time, nodes at the start of - // the phase, nodes created in the phase, live nodes at the - // start of the phase, live nodes added in the phase. - out.printf("\t%s %6.4f %d %d %d %d\n", phase.getName(), phase.getElapsedTime(), phase.getStartNodes(), phase.getNodes(), phase.getStartLiveNodes(), phase.getAddedLiveNodes()); - } - } else if (e instanceof MakeNotEntrantEvent) { - MakeNotEntrantEvent mne = (MakeNotEntrantEvent) e; - NMethod nm = mne.getNMethod(); - if (mne.isZombie()) { - if (nm == null) { - System.err.println("zombie make not entrant event without nmethod: " + mne.getId()); - } - cacheSize -= nm.getSize(); - nmethodsLive--; - } - } else if (e instanceof NMethod) { - nmethodsLive++; - nmethodsCreated++; - NMethod nm = (NMethod) e; - cacheSize += nm.getSize(); - maxCacheSize = Math.max(cacheSize, maxCacheSize); - } - } - out.printf("NMethods: %d created %d live %d bytes (%d peak) in the code cache\n", nmethodsCreated, nmethodsLive, cacheSize, maxCacheSize); - out.println("Phase times:"); - for (String name : phaseTime.keySet()) { - Double v = phaseTime.get(name); - Integer v2 = phaseNodes.get(name); - out.printf("%20s %6.4f %d\n", name, v.doubleValue(), v2.intValue()); - } - out.printf("%20s %6.4f\n", "total", elapsed); - - if (maxattempts > 0) { - out.println("Distribution of regalloc passes:"); - for (int i = 0; i <= maxattempts; i++) { - out.printf("%2d %8d\n", i, attempts[i]); - } - } - } - - /** - * Container class for a pair of a method and a bytecode instruction index - * used by a compiler. This is used in - * {@linkplain #compareLogs() comparing logs}. - */ - static class MethodBCIPair { - public MethodBCIPair(Method m, int b, String c) { - method = m; - bci = b; - compiler = c; - } - - Method method; - int bci; - String compiler; - - public boolean equals(Object other) { - if (!(other instanceof MethodBCIPair)) { - return false; - } - MethodBCIPair otherp = (MethodBCIPair)other; - return (otherp.bci == bci && - otherp.method.equals(method) && - otherp.compiler.equals(compiler)); - } - - public int hashCode() { - return method.hashCode() + bci; - } - - public String toString() { - if (bci != -1) { - return method + "@" + bci + " (" + compiler + ")"; - } else { - return method + " (" + compiler + ")"; - } - } - } - - /** - * Compare a number of compilation log files. Each of the logs is parsed, - * and all compilations found therein are written to a sorted file (prefix - * {@code sorted-}. A summary is written to a new file {@code summary.txt}. - * - * @param index the index in the command line arguments at which to start - * looking for files to compare. - * @param args the command line arguments with which {@link LogCompilation} - * was originally invoked. - * - * @throws Exception in case any exceptions are thrown in the called - * methods. - */ - @SuppressWarnings("unchecked") - static void compareLogs(int index, String[] args) throws Exception { - HashMap methods = new HashMap<>(); - ArrayList> logs = new ArrayList<>(); - PrintStream[] outs = new PrintStream[args.length - index]; - PrintStream summary = new PrintStream(new FileOutputStream("summary.txt")); - int o = 0; - // Process all logs given on the command line: collect compilation - // data; in particular, method/bci pairs. - while (index < args.length) { - String basename = new File(args[index]).getName(); - String outname = "sorted-" + basename; - System.out.println("Sorting " + basename + " to " + outname); - outs[o] = new PrintStream(new FileOutputStream(outname)); - o++; - System.out.println("Parsing " + args[index]); - ArrayList events = LogParser.parse(args[index], false); - HashMap compiles = new HashMap<>(); - logs.add(compiles); - for (LogEvent c : events) { - if (c instanceof Compilation) { - Compilation comp = (Compilation) c; - MethodBCIPair key = new MethodBCIPair(comp.getMethod(), comp.getBCI(), - comp.getCompiler()); - MethodBCIPair e = methods.get(key); - if (e == null) { - methods.put(key, key); - } else { - key = e; - } - Object other = compiles.get(key); - if (other == null) { - compiles.put(key, comp); - } else { - if (!(other instanceof List)) { - List