# HG changeset patch # User Josef Eisl # Date 1453223782 -3600 # Node ID 47cba47e365393aeeb77027e38e90a37ef8829e9 # Parent ef5ce69bdc2159c4639b4f3b998e4f81f9cf0500 TraceRA: introduce TraceBuilderPhase. diff -r ef5ce69bdc21 -r 47cba47e3653 graal/com.oracle.graal.compiler.common/src/com/oracle/graal/compiler/common/alloc/TraceBuilder.java --- a/graal/com.oracle.graal.compiler.common/src/com/oracle/graal/compiler/common/alloc/TraceBuilder.java Tue Jan 19 17:15:51 2016 +0100 +++ b/graal/com.oracle.graal.compiler.common/src/com/oracle/graal/compiler/common/alloc/TraceBuilder.java Tue Jan 19 18:16:22 2016 +0100 @@ -29,28 +29,12 @@ import com.oracle.graal.compiler.common.cfg.AbstractBlockBase; import com.oracle.graal.debug.Debug; -import com.oracle.graal.debug.Debug.Scope; -import com.oracle.graal.debug.DebugCloseable; -import com.oracle.graal.debug.DebugMemUseTracker; -import com.oracle.graal.debug.DebugTimer; import com.oracle.graal.debug.Indent; public final class TraceBuilder> { - private static final String PHASE_NAME = "LIRPhaseTime_TraceBuilderPhase"; - private static final DebugTimer timer = Debug.timer(PHASE_NAME); - private static final DebugMemUseTracker memUseTracker = Debug.memUseTracker(PHASE_NAME); - - /** - * Build traces of sequentially executed blocks. - */ - @SuppressWarnings("try") public static > TraceBuilderResult computeTraces(T startBlock, List blocks) { - try (Scope s = Debug.scope("TraceBuilder")) { - try (DebugCloseable a = timer.start(); DebugCloseable c = memUseTracker.start()) { - return new TraceBuilder<>(blocks).build(startBlock); - } - } + return new TraceBuilder<>(blocks).build(startBlock); } private final PriorityQueue worklist; diff -r ef5ce69bdc21 -r 47cba47e3653 graal/com.oracle.graal.lir/src/com/oracle/graal/lir/alloc/trace/TraceBuilderPhase.java --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/alloc/trace/TraceBuilderPhase.java Tue Jan 19 18:16:22 2016 +0100 @@ -0,0 +1,52 @@ +/* + * Copyright (c) 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 + * 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.lir.alloc.trace; + +import java.util.List; + +import com.oracle.graal.compiler.common.alloc.TraceBuilder; +import com.oracle.graal.compiler.common.alloc.TraceBuilderResult; +import com.oracle.graal.compiler.common.cfg.AbstractBlockBase; +import com.oracle.graal.lir.LIR; +import com.oracle.graal.lir.gen.LIRGenerationResult; +import com.oracle.graal.lir.phases.LIRPhase; + +import jdk.vm.ci.code.TargetDescription; + +public class TraceBuilderPhase extends LIRPhase { + + public static final class TraceBuilderContext { + public TraceBuilderResult traceBuilderResult; + + } + + @Override + protected > void run(TargetDescription target, LIRGenerationResult lirGenRes, List codeEmittingOrder, List linearScanOrder, TraceBuilderContext context) { + B startBlock = linearScanOrder.get(0); + LIR lir = lirGenRes.getLIR(); + assert startBlock.equals(lir.getControlFlowGraph().getStartBlock()); + context.traceBuilderResult = TraceBuilder.computeTraces(startBlock, linearScanOrder); + + } + +} diff -r ef5ce69bdc21 -r 47cba47e3653 graal/com.oracle.graal.lir/src/com/oracle/graal/lir/alloc/trace/TraceRegisterAllocationPhase.java --- a/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/alloc/trace/TraceRegisterAllocationPhase.java Tue Jan 19 17:15:51 2016 +0100 +++ b/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/alloc/trace/TraceRegisterAllocationPhase.java Tue Jan 19 18:16:22 2016 +0100 @@ -24,10 +24,7 @@ import java.util.List; -import jdk.vm.ci.code.TargetDescription; - import com.oracle.graal.compiler.common.alloc.RegisterAllocationConfig; -import com.oracle.graal.compiler.common.alloc.TraceBuilder; import com.oracle.graal.compiler.common.alloc.TraceBuilderResult; import com.oracle.graal.compiler.common.alloc.TraceStatisticsPrinter; import com.oracle.graal.compiler.common.cfg.AbstractBlockBase; @@ -40,6 +37,7 @@ import com.oracle.graal.lir.StandardOp.JumpOp; import com.oracle.graal.lir.StandardOp.LabelOp; import com.oracle.graal.lir.alloc.trace.TraceAllocationPhase.TraceAllocationContext; +import com.oracle.graal.lir.alloc.trace.TraceBuilderPhase.TraceBuilderContext; import com.oracle.graal.lir.alloc.trace.lsra.TraceLinearScan; import com.oracle.graal.lir.gen.LIRGenerationResult; import com.oracle.graal.lir.gen.LIRGeneratorTool.MoveFactory; @@ -50,11 +48,14 @@ import com.oracle.graal.options.OptionType; import com.oracle.graal.options.OptionValue; +import jdk.vm.ci.code.TargetDescription; + /** * An implementation of a Trace Register Allocator as described in "Trace Register Allocation" by Josef Eisl. */ public final class TraceRegisterAllocationPhase extends AllocationPhase { + public static class Options { // @formatter:off @Option(help = "Use inter-trace register hints.", type = OptionType.Debug) @@ -70,6 +71,7 @@ private static final TraceGlobalMoveResolutionPhase TRACE_GLOBAL_MOVE_RESOLUTION_PHASE = new TraceGlobalMoveResolutionPhase(); private static final TraceTrivialAllocator TRACE_TRIVIAL_ALLOCATOR = new TraceTrivialAllocator(); + private static final TraceBuilderPhase TRACE_BUILDER_PHASE = new TraceBuilderPhase(); public static final int TRACE_DUMP_LEVEL = 3; private static final DebugMetric trivialTracesMetric = Debug.metric("TraceRA[trivialTraces]"); @@ -82,10 +84,7 @@ RegisterAllocationConfig registerAllocationConfig = context.registerAllocationConfig; LIR lir = lirGenRes.getLIR(); assert SSIVerifier.verify(lir) : "LIR not in SSI form."; - B startBlock = linearScanOrder.get(0); - assert startBlock.equals(lir.getControlFlowGraph().getStartBlock()); - TraceBuilderResult resultTraces = TraceBuilder.computeTraces(startBlock, linearScanOrder); - TraceStatisticsPrinter.printTraceStatistics(resultTraces, lirGenRes.getCompilationUnitName()); + TraceBuilderResult resultTraces = builtTraces(target, lirGenRes, codeEmittingOrder, linearScanOrder); TraceAllocationContext traceContext = new TraceAllocationContext(spillMoveFactory, registerAllocationConfig, resultTraces); @@ -117,6 +116,15 @@ deconstructSSIForm(lir); } + private static > TraceBuilderResult builtTraces(TargetDescription target, LIRGenerationResult lirGenRes, List codeEmittingOrder, List linearScanOrder) { + TraceBuilderContext traceBuilderContext = new TraceBuilderPhase.TraceBuilderContext(); + TRACE_BUILDER_PHASE.apply(target, lirGenRes, codeEmittingOrder, linearScanOrder, traceBuilderContext, false); + @SuppressWarnings("unchecked") + TraceBuilderResult resultTraces = (TraceBuilderResult) traceBuilderContext.traceBuilderResult; + TraceStatisticsPrinter.printTraceStatistics(resultTraces, lirGenRes.getCompilationUnitName()); + return resultTraces; + } + /** * Remove Phi/Sigma In/Out. *