Mercurial > hg > truffle

changeset 6492:dc409418cc2c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
removed MethodEntryCounters
author Doug Simon <doug.simon@oracle.com>
date Tue, 02 Oct 2012 22:06:37 +0200
parents e61ef9ba27a8
children 85c1b84f8fd9
files graal/com.oracle.graal.compiler.phases/src/com/oracle/graal/compiler/GraalOptions.java graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/bridge/VMToCompilerImpl.java graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/counters/MethodEntryCounters.java graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/meta/HotSpotResolvedJavaMethod.java graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/target/amd64/HotSpotAMD64Backend.java
diffstat 5 files changed, 2 insertions(+), 200 deletions(-) [+]
line wrap: on
line diff
--- a/graal/com.oracle.graal.compiler.phases/src/com/oracle/graal/compiler/GraalOptions.java	Tue Oct 02 18:25:17 2012 +0200
+++ b/graal/com.oracle.graal.compiler.phases/src/com/oracle/graal/compiler/GraalOptions.java	Tue Oct 02 22:06:37 2012 +0200
@@ -217,15 +217,6 @@
     public static boolean OptTailDuplication                 = true;
 
     /**
-     * Insert a counter in the method prologue to track the most frequently called methods that were compiled by Graal.
-     */
-    public static boolean MethodEntryCounters               = false;
-    /**
-     * Number of caller program counters to distinguish when counting methods.
-     */
-    public static int     MethodEntryCountersCallers        = 20;
-
-    /**
      * Prints all the available GraalOptions.
      */
     public static boolean PrintFlags                           = false;
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/bridge/VMToCompilerImpl.java	Tue Oct 02 18:25:17 2012 +0200
+++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/bridge/VMToCompilerImpl.java	Tue Oct 02 22:06:37 2012 +0200
@@ -36,7 +36,6 @@
 import com.oracle.graal.debug.*;
 import com.oracle.graal.debug.internal.*;
 import com.oracle.graal.hotspot.*;
-import com.oracle.graal.hotspot.counters.*;
 import com.oracle.graal.hotspot.meta.*;
 import com.oracle.graal.hotspot.snippets.*;
 import com.oracle.graal.java.*;
@@ -220,7 +219,6 @@
         }
         System.gc();
         CompilationStatistics.clear("bootstrap2");
-        MethodEntryCounters.printCounters(graalRuntime);
     }
 
     private void enqueue(Method m) throws Throwable {
@@ -286,7 +284,6 @@
             }
         }
         CompilationStatistics.clear("final");
-        MethodEntryCounters.printCounters(graalRuntime);
         SnippetCounter.printGroups(TTY.out().out());
     }
 
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/counters/MethodEntryCounters.java	Tue Oct 02 18:25:17 2012 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,173 +0,0 @@
-/*
- * Copyright (c) 2012, 2012, 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.oracle.graal.hotspot.counters;
-
-import static com.oracle.graal.api.code.ValueUtil.*;
-
-import java.util.*;
-
-import sun.misc.*;
-
-import com.oracle.graal.api.code.*;
-import com.oracle.graal.api.meta.*;
-import com.oracle.graal.compiler.*;
-import com.oracle.graal.compiler.gen.*;
-import com.oracle.graal.hotspot.*;
-import com.oracle.graal.lir.LIRInstruction.Opcode;
-import com.oracle.graal.lir.amd64.*;
-import com.oracle.graal.lir.asm.*;
-import com.oracle.max.asm.*;
-import com.oracle.max.asm.target.amd64.*;
-import com.oracle.max.asm.target.amd64.AMD64Assembler.ConditionFlag;
-import com.oracle.max.criutils.*;
-
-public class MethodEntryCounters {
-    protected static final class Counter implements Comparable<Counter> {
-        protected static ArrayList<Counter> counters = new ArrayList<>();
-
-        protected final String method;
-        protected final long[] counts = new long[GraalOptions.MethodEntryCountersCallers * 2 + 2];
-
-        protected long sortCount;
-
-        protected Counter(ResolvedJavaMethod method) {
-            this.method = MetaUtil.format("%H.%n", method);
-            counters.add(this);
-        }
-
-        @Override
-        public int compareTo(Counter o) {
-            return (int) (o.sortCount - sortCount);
-        }
-    }
-
-
-    @Opcode("ENTRY_COUNTER")
-    protected static class AMD64MethodEntryOp extends AMD64LIRInstruction {
-        @Temp protected Value counterArr;
-        @Temp protected Value callerPc;
-
-        protected static int codeSize;
-
-        protected final Counter counter;
-
-        protected AMD64MethodEntryOp(Counter counter, Value counterArr, Value callerPc) {
-            this.counter = counter;
-            this.counterArr = counterArr;
-            this.callerPc = callerPc;
-        }
-
-        @Override
-        public void emitCode(TargetMethodAssembler tasm, AMD64MacroAssembler masm) {
-            int start = masm.codeBuffer.position();
-            int off = Unsafe.ARRAY_LONG_BASE_OFFSET;
-            int scale = Unsafe.ARRAY_LONG_INDEX_SCALE;
-
-            AMD64Move.move(tasm, masm, counterArr, Constant.forObject(counter.counts));
-            AMD64Move.load(tasm, masm, callerPc, new Address(Kind.Long, AMD64.rbp.asValue(Kind.Long), 8), null);
-
-            Label done = new Label();
-            for (int i = 0; i < counter.counts.length - 2; i += 2) {
-                Address counterPcAddr = new Address(Kind.Long, counterArr, i * scale + off);
-                Address counterValueAddr = new Address(Kind.Long, counterArr, (i + 1) * scale + off);
-
-                Label skipClaim = new Label();
-                masm.cmpq(counterPcAddr, 0);
-                masm.jccb(ConditionFlag.notEqual, skipClaim);
-                AMD64Move.store(tasm, masm, counterPcAddr, callerPc, null);
-                masm.bind(skipClaim);
-
-                Label skipInc = new Label();
-                masm.cmpq(counterPcAddr, asRegister(callerPc));
-                masm.jccb(ConditionFlag.notEqual, skipInc);
-                masm.addq(counterValueAddr, 1);
-                masm.jmp(done);
-                masm.bind(skipInc);
-            }
-
-            Address counterValueAddr = new Address(Kind.Long, counterArr, (counter.counts.length - 1) * scale + off);
-            masm.addq(counterValueAddr, 1);
-            masm.bind(done);
-
-            int size = masm.codeBuffer.position() - start;
-            assert codeSize == 0 || codeSize == size;
-            codeSize = size;
-        }
-    }
-
-
-    public static void emitCounter(LIRGenerator gen, ResolvedJavaMethod method) {
-        if (!GraalOptions.MethodEntryCounters) {
-            return;
-        }
-        gen.append(new AMD64MethodEntryOp(new Counter(method), gen.newVariable(Kind.Long), gen.newVariable(Kind.Long)));
-    }
-
-    public static int getCodeSize() {
-        if (!GraalOptions.MethodEntryCounters) {
-            return 0;
-        }
-        return AMD64MethodEntryOp.codeSize;
-    }
-
-
-    public static void printCounters(HotSpotGraalRuntime compiler) {
-        if (!GraalOptions.MethodEntryCounters) {
-            return;
-        }
-        ArrayList<Counter> copy = new ArrayList<>(Counter.counters);
-        long total = 0;
-        for (Counter counter : copy) {
-            long sum = 0;
-            for (int i = 0; i < counter.counts.length; i += 2) {
-                sum += counter.counts[i + 1];
-            }
-            counter.sortCount = sum;
-            total += sum;
-        }
-        Collections.sort(copy);
-
-        TTY.println();
-        TTY.println("** Compiled method invocation counters **");
-        for (Counter counter : copy) {
-            TTY.println("%16d %5.2f%%  %s", counter.sortCount, (double) counter.sortCount / total * 100d, counter.method);
-
-            if (counter.counts.length > 2) {
-                for (int i = 0; i < counter.counts.length; i += 2) {
-                    if (counter.counts[i] != 0 || counter.counts[i + 1] != 0) {
-                        TTY.print("              %16d  %5.2f%%", counter.counts[i + 1], (double) counter.counts[i + 1] / counter.sortCount * 100d);
-                        if (counter.counts[i] == 0) {
-                            TTY.println("  [other callers]");
-                        } else {
-                            TTY.println("  %x  %s", counter.counts[i], compiler.getCompilerToVM().decodePC(counter.counts[i]));
-                        }
-                        counter.counts[i] = 0;
-                        counter.counts[i + 1] = 0;
-                    }
-                }
-            }
-        }
-        TTY.println("** Compiled method invocation counters **");
-        TTY.println();
-    }
-}
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/meta/HotSpotResolvedJavaMethod.java	Tue Oct 02 18:25:17 2012 +0200
+++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/meta/HotSpotResolvedJavaMethod.java	Tue Oct 02 22:06:37 2012 +0200
@@ -31,7 +31,6 @@
 import com.oracle.graal.bytecode.*;
 import com.oracle.graal.compiler.*;
 import com.oracle.graal.hotspot.*;
-import com.oracle.graal.hotspot.counters.*;
 
 /**
  * Implementation of {@link JavaMethod} for resolved HotSpot methods.
@@ -169,12 +168,7 @@
     }
 
     public int compiledCodeSize() {
-        int result = HotSpotGraalRuntime.getInstance().getCompilerToVM().JavaMethod_getCompiledCodeSize(this);
-        if (result > 0) {
-            assert result > MethodEntryCounters.getCodeSize();
-            result =  result - MethodEntryCounters.getCodeSize();
-        }
-        return result;
+        return HotSpotGraalRuntime.getInstance().getCompilerToVM().JavaMethod_getCompiledCodeSize(this);
     }
 
     @Override
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/target/amd64/HotSpotAMD64Backend.java	Tue Oct 02 18:25:17 2012 +0200
+++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/target/amd64/HotSpotAMD64Backend.java	Tue Oct 02 22:06:37 2012 +0200
@@ -38,13 +38,12 @@
 import com.oracle.graal.graph.*;
 import com.oracle.graal.hotspot.*;
 import com.oracle.graal.hotspot.bridge.*;
-import com.oracle.graal.hotspot.counters.*;
 import com.oracle.graal.hotspot.meta.*;
 import com.oracle.graal.hotspot.nodes.*;
 import com.oracle.graal.hotspot.target.*;
 import com.oracle.graal.lir.*;
 import com.oracle.graal.lir.amd64.*;
-import com.oracle.graal.lir.amd64.AMD64Move.*;
+import com.oracle.graal.lir.amd64.AMD64Move.CompareAndSwapOp;
 import com.oracle.graal.lir.asm.*;
 import com.oracle.graal.nodes.*;
 import com.oracle.graal.nodes.java.*;
@@ -194,12 +193,6 @@
         }
 
         @Override
-        protected void emitPrologue() {
-            super.emitPrologue();
-            MethodEntryCounters.emitCounter(this, method);
-        }
-
-        @Override
         protected void emitDirectCall(DirectCallTargetNode callTarget, Value result, Value[] parameters, Value[] temps, LIRFrameState callState) {
             append(new AMD64DirectCallOp(callTarget.target(), result, parameters, temps, callState, ((HotSpotDirectCallTargetNode) callTarget).invokeKind(), lir));
         }