Mercurial > hg > graal-compiler
changeset 13226:0b4d38339708
moved CompilationResult metric updating out from TargetMethodAssembler.finish()
author | Doug Simon <doug.simon@oracle.com> |
---|---|
date | Tue, 03 Dec 2013 10:08:35 +0100 |
parents | f83540edfcd4 |
children | 1a66453f73db |
files | graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/GraalCompiler.java graal/com.oracle.graal.lir/src/com/oracle/graal/lir/asm/TargetMethodAssembler.java |
diffstat | 2 files changed, 24 insertions(+), 24 deletions(-) [+] |
line wrap: on
line diff
--- a/graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/GraalCompiler.java Tue Dec 03 10:06:09 2013 +0100 +++ b/graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/GraalCompiler.java Tue Dec 03 10:08:35 2013 +0100 @@ -30,6 +30,7 @@ import com.oracle.graal.alloc.*; import com.oracle.graal.api.code.*; +import com.oracle.graal.api.code.CompilationResult.*; import com.oracle.graal.api.meta.*; import com.oracle.graal.compiler.alloc.*; import com.oracle.graal.compiler.gen.*; @@ -288,6 +289,29 @@ } compilationResult.setLeafGraphIds(leafGraphIds); + if (Debug.isMeterEnabled()) { + List<DataPatch> ldp = compilationResult.getDataReferences(); + DebugMetric[] dms = new DebugMetric[Kind.values().length]; + for (int i = 0; i < dms.length; i++) { + dms[i] = Debug.metric("DataPatches-" + Kind.values()[i].toString()); + } + DebugMetric dmRaw = Debug.metric("DataPatches-raw"); + + for (DataPatch dp : ldp) { + if (dp.constant != null) { + dms[dp.constant.getKind().ordinal()].add(1); + } else { + dmRaw.add(1); + } + } + + Debug.metric("CompilationResults").increment(); + Debug.metric("CodeBytesEmitted").add(compilationResult.getTargetCodeSize()); + Debug.metric("InfopointsEmitted").add(compilationResult.getInfopoints().size()); + Debug.metric("DataPatches").add(ldp.size()); + Debug.metric("ExceptionHandlersEmitted").add(compilationResult.getExceptionHandlers().size()); + } + if (Debug.isLogEnabled()) { Debug.log("%s", backend.getProviders().getCodeCache().disassemble(compilationResult, null)); }
--- a/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/asm/TargetMethodAssembler.java Tue Dec 03 10:06:09 2013 +0100 +++ b/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/asm/TargetMethodAssembler.java Tue Dec 03 10:08:35 2013 +0100 @@ -27,7 +27,6 @@ import java.util.*; import com.oracle.graal.api.code.*; -import com.oracle.graal.api.code.CompilationResult.DataPatch; import com.oracle.graal.api.meta.*; import com.oracle.graal.asm.*; import com.oracle.graal.debug.*; @@ -107,29 +106,6 @@ compilationResult.recordExceptionHandler(codeOffset, ei.exceptionEdge.label().position()); } } - - if (Debug.isMeterEnabled()) { - List<DataPatch> ldp = compilationResult.getDataReferences(); - DebugMetric[] dms = new DebugMetric[Kind.values().length]; - for (int i = 0; i < dms.length; i++) { - dms[i] = Debug.metric("DataPatches-" + Kind.values()[i].toString()); - } - DebugMetric dmRaw = Debug.metric("DataPatches-raw"); - - for (DataPatch dp : ldp) { - if (dp.constant != null) { - dms[dp.constant.getKind().ordinal()].add(1); - } else { - dmRaw.add(1); - } - } - - Debug.metric("CompilationResults").increment(); - Debug.metric("CodeBytesEmitted").add(compilationResult.getTargetCodeSize()); - Debug.metric("InfopointsEmitted").add(compilationResult.getInfopoints().size()); - Debug.metric("DataPatches").add(ldp.size()); - Debug.metric("ExceptionHandlersEmitted").add(compilationResult.getExceptionHandlers().size()); - } } public void recordExceptionHandlers(int pcOffset, LIRFrameState info) {