Mercurial > hg > truffle

changeset 18151:04b54406c292

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Use FrameMapBuilder in Backend.newLIRGenerationResult().
author Josef Eisl <josef.eisl@jku.at>
date Wed, 22 Oct 2014 10:00:19 +0200
parents 22f2e42923de
children ff694c40bdee
files graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/GraalCompiler.java graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/alloc/LinearScan.java graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/target/Backend.java graal/com.oracle.graal.hotspot.amd64/src/com/oracle/graal/hotspot/amd64/AMD64HotSpotBackend.java graal/com.oracle.graal.hotspot.amd64/src/com/oracle/graal/hotspot/amd64/AMD64HotSpotLIRGenerationResult.java graal/com.oracle.graal.hotspot.hsail/src/com/oracle/graal/hotspot/hsail/HSAILHotSpotBackend.java graal/com.oracle.graal.hotspot.hsail/src/com/oracle/graal/hotspot/hsail/HSAILHotSpotLIRGenerationResult.java graal/com.oracle.graal.hotspot.ptx/src/com/oracle/graal/hotspot/ptx/PTXHotSpotBackend.java graal/com.oracle.graal.hotspot.sparc/src/com/oracle/graal/hotspot/sparc/SPARCHotSpotBackend.java graal/com.oracle.graal.hotspot.sparc/src/com/oracle/graal/hotspot/sparc/SPARCHotSpotLIRGenerationResult.java graal/com.oracle.graal.lir/src/com/oracle/graal/lir/RedundantMoveElimination.java graal/com.oracle.graal.lir/src/com/oracle/graal/lir/gen/LIRGenerationResultBase.java
diffstat 12 files changed, 30 insertions(+), 30 deletions(-) [+]
line wrap: on
line diff
--- a/graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/GraalCompiler.java	Tue Oct 21 17:03:56 2014 +0200
+++ b/graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/GraalCompiler.java	Wed Oct 22 10:00:19 2014 +0200
@@ -242,8 +242,8 @@
             throw Debug.handle(e);
         }
         try (Scope ds = Debug.scope("BackEnd", lir)) {
-            FrameMap frameMap = backend.newFrameMap(registerConfig);
-            LIRGenerationResult lirGenRes = backend.newLIRGenerationResult(lir, frameMap, graph.method(), stub);
+            FrameMapBuilder frameMapBuilder = backend.newFrameMap(registerConfig);
+            LIRGenerationResult lirGenRes = backend.newLIRGenerationResult(lir, frameMapBuilder, graph.method(), stub);
             LIRGeneratorTool lirGen = backend.newLIRGenerator(cc, lirGenRes);
             NodeLIRBuilderTool nodeLirGen = backend.newNodeLIRBuilder(graph, lirGen);
 
@@ -269,7 +269,7 @@
 
             try (Scope s = Debug.scope("Allocator", nodeLirGen)) {
                 if (backend.shouldAllocateRegisters()) {
-                    LinearScan.allocate(target, lir, frameMap);
+                    LinearScan.allocate(target, lir, frameMapBuilder);
                 }
             } catch (Throwable e) {
                 throw Debug.handle(e);
@@ -279,7 +279,7 @@
                 EdgeMoveOptimizer.optimize(lir);
                 ControlFlowOptimizer.optimize(lir, codeEmittingOrder);
                 if (lirGen.canEliminateRedundantMoves()) {
-                    RedundantMoveElimination.optimize(lir, frameMap);
+                    RedundantMoveElimination.optimize(lir, frameMapBuilder);
                 }
                 NullCheckOptimizer.optimize(lir, target.implicitNullCheckLimit);
 
--- a/graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/alloc/LinearScan.java	Tue Oct 21 17:03:56 2014 +0200
+++ b/graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/alloc/LinearScan.java	Wed Oct 22 10:00:19 2014 +0200
@@ -1801,8 +1801,8 @@
         }
     }
 
-    public static void allocate(TargetDescription target, LIR lir, FrameMap frameMap) {
-        new LinearScan(target, lir, frameMap).allocate();
+    public static void allocate(TargetDescription target, LIR lir, FrameMapBuilder frameMapBuilder) {
+        new LinearScan(target, lir, frameMapBuilder).allocate();
     }
 
     private void allocate() {
--- a/graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/target/Backend.java	Tue Oct 21 17:03:56 2014 +0200
+++ b/graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/target/Backend.java	Wed Oct 22 10:00:19 2014 +0200
@@ -75,7 +75,7 @@
 
     public abstract LIRGeneratorTool newLIRGenerator(CallingConvention cc, LIRGenerationResult lirGenRes);
 
-    public abstract LIRGenerationResult newLIRGenerationResult(LIR lir, FrameMap frameMap, ResolvedJavaMethod method, Object stub);
+    public abstract LIRGenerationResult newLIRGenerationResult(LIR lir, FrameMapBuilder frameMapBuilder, ResolvedJavaMethod method, Object stub);
 
     public abstract NodeLIRBuilderTool newNodeLIRBuilder(StructuredGraph graph, LIRGeneratorTool lirGen);
 
--- a/graal/com.oracle.graal.hotspot.amd64/src/com/oracle/graal/hotspot/amd64/AMD64HotSpotBackend.java	Tue Oct 21 17:03:56 2014 +0200
+++ b/graal/com.oracle.graal.hotspot.amd64/src/com/oracle/graal/hotspot/amd64/AMD64HotSpotBackend.java	Wed Oct 22 10:00:19 2014 +0200
@@ -76,8 +76,8 @@
     }
 
     @Override
-    public LIRGenerationResult newLIRGenerationResult(LIR lir, FrameMap frameMap, ResolvedJavaMethod method, Object stub) {
-        return new AMD64HotSpotLIRGenerationResult(lir, frameMap, stub);
+    public LIRGenerationResult newLIRGenerationResult(LIR lir, FrameMapBuilder frameMapBuilder, ResolvedJavaMethod method, Object stub) {
+        return new AMD64HotSpotLIRGenerationResult(lir, frameMapBuilder, stub);
     }
 
     @Override
--- a/graal/com.oracle.graal.hotspot.amd64/src/com/oracle/graal/hotspot/amd64/AMD64HotSpotLIRGenerationResult.java	Tue Oct 21 17:03:56 2014 +0200
+++ b/graal/com.oracle.graal.hotspot.amd64/src/com/oracle/graal/hotspot/amd64/AMD64HotSpotLIRGenerationResult.java	Wed Oct 22 10:00:19 2014 +0200
@@ -46,8 +46,8 @@
      */
     private Map<LIRFrameState, SaveRegistersOp> calleeSaveInfo = new HashMap<>();
 
-    public AMD64HotSpotLIRGenerationResult(LIR lir, FrameMap frameMap, Object stub) {
-        super(lir, frameMap);
+    public AMD64HotSpotLIRGenerationResult(LIR lir, FrameMapBuilder frameMapBuilder, Object stub) {
+        super(lir, frameMapBuilder);
         this.stub = stub;
     }
 
--- a/graal/com.oracle.graal.hotspot.hsail/src/com/oracle/graal/hotspot/hsail/HSAILHotSpotBackend.java	Tue Oct 21 17:03:56 2014 +0200
+++ b/graal/com.oracle.graal.hotspot.hsail/src/com/oracle/graal/hotspot/hsail/HSAILHotSpotBackend.java	Wed Oct 22 10:00:19 2014 +0200
@@ -397,8 +397,8 @@
     }
 
     @Override
-    public LIRGenerationResult newLIRGenerationResult(LIR lir, FrameMap frameMap, ResolvedJavaMethod method, Object stub) {
-        return new HSAILHotSpotLIRGenerationResult(lir, frameMap);
+    public LIRGenerationResult newLIRGenerationResult(LIR lir, FrameMapBuilder frameMapBuilder, ResolvedJavaMethod method, Object stub) {
+        return new HSAILHotSpotLIRGenerationResult(lir, frameMapBuilder);
     }
 
     @Override
--- a/graal/com.oracle.graal.hotspot.hsail/src/com/oracle/graal/hotspot/hsail/HSAILHotSpotLIRGenerationResult.java	Tue Oct 21 17:03:56 2014 +0200
+++ b/graal/com.oracle.graal.hotspot.hsail/src/com/oracle/graal/hotspot/hsail/HSAILHotSpotLIRGenerationResult.java	Wed Oct 22 10:00:19 2014 +0200
@@ -32,8 +32,8 @@
 
     private List<DeoptimizingOp> deopts = new ArrayList<>();
 
-    public HSAILHotSpotLIRGenerationResult(LIR lir, FrameMap frameMap) {
-        super(lir, frameMap);
+    public HSAILHotSpotLIRGenerationResult(LIR lir, FrameMapBuilder frameMapBuilder) {
+        super(lir, frameMapBuilder);
     }
 
     public List<DeoptimizingOp> getDeopts() {
--- a/graal/com.oracle.graal.hotspot.ptx/src/com/oracle/graal/hotspot/ptx/PTXHotSpotBackend.java	Tue Oct 21 17:03:56 2014 +0200
+++ b/graal/com.oracle.graal.hotspot.ptx/src/com/oracle/graal/hotspot/ptx/PTXHotSpotBackend.java	Wed Oct 22 10:00:19 2014 +0200
@@ -343,8 +343,8 @@
     }
 
     @Override
-    public LIRGenerationResult newLIRGenerationResult(LIR lir, FrameMap frameMap, ResolvedJavaMethod method, Object stub) {
-        return new LIRGenerationResultBase(lir, frameMap);
+    public LIRGenerationResult newLIRGenerationResult(LIR lir, FrameMapBuilder frameMapBuilder, ResolvedJavaMethod method, Object stub) {
+        return new LIRGenerationResultBase(lir, frameMapBuilder);
     }
 
     @Override
--- a/graal/com.oracle.graal.hotspot.sparc/src/com/oracle/graal/hotspot/sparc/SPARCHotSpotBackend.java	Tue Oct 21 17:03:56 2014 +0200
+++ b/graal/com.oracle.graal.hotspot.sparc/src/com/oracle/graal/hotspot/sparc/SPARCHotSpotBackend.java	Wed Oct 22 10:00:19 2014 +0200
@@ -82,8 +82,8 @@
     }
 
     @Override
-    public LIRGenerationResult newLIRGenerationResult(LIR lir, FrameMap frameMap, ResolvedJavaMethod method, Object stub) {
-        return new SPARCHotSpotLIRGenerationResult(lir, frameMap, stub);
+    public LIRGenerationResult newLIRGenerationResult(LIR lir, FrameMapBuilder frameMapBuilder, ResolvedJavaMethod method, Object stub) {
+        return new SPARCHotSpotLIRGenerationResult(lir, frameMapBuilder, stub);
     }
 
     @Override
--- a/graal/com.oracle.graal.hotspot.sparc/src/com/oracle/graal/hotspot/sparc/SPARCHotSpotLIRGenerationResult.java	Tue Oct 21 17:03:56 2014 +0200
+++ b/graal/com.oracle.graal.hotspot.sparc/src/com/oracle/graal/hotspot/sparc/SPARCHotSpotLIRGenerationResult.java	Wed Oct 22 10:00:19 2014 +0200
@@ -46,8 +46,8 @@
      */
     private Map<LIRFrameState, SaveRegistersOp> calleeSaveInfo = new HashMap<>();
 
-    public SPARCHotSpotLIRGenerationResult(LIR lir, FrameMap frameMap, Object stub) {
-        super(lir, frameMap);
+    public SPARCHotSpotLIRGenerationResult(LIR lir, FrameMapBuilder frameMapBuilder, Object stub) {
+        super(lir, frameMapBuilder);
         this.stub = stub;
     }
 
--- a/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/RedundantMoveElimination.java	Tue Oct 21 17:03:56 2014 +0200
+++ b/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/RedundantMoveElimination.java	Wed Oct 22 10:00:19 2014 +0200
@@ -39,9 +39,9 @@
  */
 public final class RedundantMoveElimination {
 
-    public static void optimize(LIR lir, FrameMap frameMap) {
+    public static void optimize(LIR lir, FrameMapBuilder frameMapBuilder) {
         RedundantMoveElimination redundantMoveElimination = new RedundantMoveElimination();
-        redundantMoveElimination.doOptimize(lir, frameMap);
+        redundantMoveElimination.doOptimize(lir, frameMapBuilder);
     }
 
     /**
@@ -101,11 +101,11 @@
     /**
      * The main method doing the elimination of redundant moves.
      */
-    private void doOptimize(LIR lir, FrameMap frameMap) {
+    private void doOptimize(LIR lir, FrameMapBuilder frameMapBuilder) {
 
         try (Indent indent = Debug.logAndIndent("eliminate redundant moves")) {
 
-            callerSaveRegs = frameMap.getRegisterConfig().getCallerSaveRegisters();
+            callerSaveRegs = frameMapBuilder.getRegisterConfig().getCallerSaveRegisters();
 
             initBlockData(lir);
 
@@ -113,7 +113,7 @@
             // Unallocatable registers should never be optimized.
             eligibleRegs = new int[numRegs];
             Arrays.fill(eligibleRegs, -1);
-            for (Register reg : frameMap.getRegisterConfig().getAllocatableRegisters()) {
+            for (Register reg : frameMapBuilder.getRegisterConfig().getAllocatableRegisters()) {
                 if (reg.number < numRegs) {
                     eligibleRegs[reg.number] = reg.number;
                 }
--- a/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/gen/LIRGenerationResultBase.java	Tue Oct 21 17:03:56 2014 +0200
+++ b/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/gen/LIRGenerationResultBase.java	Wed Oct 22 10:00:19 2014 +0200
@@ -26,15 +26,15 @@
 
 public class LIRGenerationResultBase implements LIRGenerationResult {
     private final LIR lir;
-    private final FrameMap frameMap;
+    private final FrameMapBuilder frameMapBuilder;
     /**
      * Records whether the code being generated makes at least one foreign call.
      */
     private boolean hasForeignCall;
 
-    public LIRGenerationResultBase(LIR lir, FrameMap frameMap) {
+    public LIRGenerationResultBase(LIR lir, FrameMapBuilder frameMapBuilder) {
         this.lir = lir;
-        this.frameMap = frameMap;
+        this.frameMapBuilder = frameMapBuilder;
     }
 
     public LIR getLIR() {
@@ -53,7 +53,7 @@
     }
 
     public final FrameMapBuilder getFrameMapBuilder() {
-        return frameMap;
+        return frameMapBuilder;
     }
 
 }