# HG changeset patch
# User Bernhard Urban <bernhard.urban@jku.at>
# Date 1384808858 -3600
# Node ID 1729072a893a784b56c14ca8d46ccfac249f430a
# Parent  b6e04d6fe3a715b48982fdc86c032bf52d638962
NewMemoryAwareScheduling: hide data structure behind wrapper class

diff -r b6e04d6fe3a7 -r 1729072a893a graal/com.oracle.graal.phases/src/com/oracle/graal/phases/schedule/SchedulePhase.java
--- a/graal/com.oracle.graal.phases/src/com/oracle/graal/phases/schedule/SchedulePhase.java	Mon Nov 18 17:22:37 2013 +0100
+++ b/graal/com.oracle.graal.phases/src/com/oracle/graal/phases/schedule/SchedulePhase.java	Mon Nov 18 22:07:38 2013 +0100
@@ -175,24 +175,53 @@
         }
     }
 
-    private class NewMemoryScheduleClosure extends BlockIteratorClosure<Set<LocationIdentity>> {
+    private class KillSet implements Iterable<LocationIdentity> {
+        private final Set<LocationIdentity> set;
+
+        public KillSet() {
+            this.set = new HashSet<>();
+        }
+
+        public KillSet(KillSet other) {
+            this.set = new HashSet<>(other.set);
+        }
+
+        public void add(LocationIdentity locationIdentity) {
+            set.add(locationIdentity);
+        }
+
+        public void addAll(KillSet other) {
+            set.addAll(other.set);
+        }
+
+        public Iterator<LocationIdentity> iterator() {
+            return set.iterator();
+        }
+
+        public boolean isKilled(LocationIdentity locationIdentity) {
+            return set.contains(locationIdentity);
+        }
+
+    }
+
+    private class NewMemoryScheduleClosure extends BlockIteratorClosure<KillSet> {
         @Override
-        protected Set<LocationIdentity> getInitialState() {
+        protected KillSet getInitialState() {
             return cloneState(blockToKillSet.get(getCFG().getStartBlock()));
         }
 
         @Override
-        protected Set<LocationIdentity> processBlock(Block block, Set<LocationIdentity> currentState) {
+        protected KillSet processBlock(Block block, KillSet currentState) {
             currentState.addAll(computeKillSet(block));
             return currentState;
         }
 
         @Override
-        protected Set<LocationIdentity> merge(Block merge, List<Set<LocationIdentity>> states) {
+        protected KillSet merge(Block merge, List<KillSet> states) {
             assert merge.getBeginNode() instanceof MergeNode;
 
-            Set<LocationIdentity> initKillSet = new HashSet<>();
-            for (Set<LocationIdentity> state : states) {
+            KillSet initKillSet = new KillSet();
+            for (KillSet state : states) {
                 initKillSet.addAll(state);
             }
 
@@ -200,16 +229,16 @@
         }
 
         @Override
-        protected Set<LocationIdentity> cloneState(Set<LocationIdentity> state) {
-            return new HashSet<>(state);
+        protected KillSet cloneState(KillSet state) {
+            return new KillSet(state);
         }
 
         @Override
-        protected List<Set<LocationIdentity>> processLoop(Loop loop, Set<LocationIdentity> state) {
-            LoopInfo<Set<LocationIdentity>> info = ReentrantBlockIterator.processLoop(this, loop, cloneState(state));
+        protected List<KillSet> processLoop(Loop loop, KillSet state) {
+            LoopInfo<KillSet> info = ReentrantBlockIterator.processLoop(this, loop, cloneState(state));
 
             assert loop.header.getBeginNode() instanceof LoopBeginNode;
-            Set<LocationIdentity> headerState = merge(loop.header, info.endStates);
+            KillSet headerState = merge(loop.header, info.endStates);
 
             // second iteration, for propagating information to loop exits
             info = ReentrantBlockIterator.processLoop(this, loop, cloneState(headerState));
@@ -226,12 +255,12 @@
      * @param block block to analyze
      * @return all killed locations
      */
-    private Set<LocationIdentity> computeKillSet(Block block) {
-        Set<LocationIdentity> cachedSet = blockToKillSet.get(block);
+    private KillSet computeKillSet(Block block) {
+        KillSet cachedSet = blockToKillSet.get(block);
         if (cachedSet != null) {
             return cachedSet;
         }
-        HashSet<LocationIdentity> set = new HashSet<>();
+        KillSet set = new KillSet();
         blockToKillSet.put(block, set);
 
         if (block.getBeginNode() instanceof MergeNode) {
@@ -265,7 +294,7 @@
      * Map from blocks to the nodes in each block.
      */
     private BlockMap<List<ScheduledNode>> blockToNodesMap;
-    private BlockMap<Set<LocationIdentity>> blockToKillSet;
+    private BlockMap<KillSet> blockToKillSet;
     private final Map<FloatingNode, List<FixedNode>> phantomUsages = new IdentityHashMap<>();
     private final Map<FixedNode, List<FloatingNode>> phantomInputs = new IdentityHashMap<>();
     private final SchedulingStrategy selectedStrategy;
@@ -343,11 +372,11 @@
                 Debug.printf("post-dom: %s. ", b.getPostdominator());
                 Debug.printf("preds: %s. ", b.getPredecessors());
                 Debug.printf("succs: %s ====\n", b.getSuccessors());
-                BlockMap<Set<LocationIdentity>> killMaps = blockToKillSet;
-                if (killMaps != null) {
+                BlockMap<KillSet> killSets = blockToKillSet;
+                if (killSets != null) {
                     Debug.printf("X block kills: \n");
-                    if (killMaps.get(b) != null) {
-                        for (LocationIdentity locId : killMaps.get(b)) {
+                    if (killSets.get(b) != null) {
+                        for (LocationIdentity locId : killSets.get(b)) {
                             Debug.printf("X %s killed by %s\n", locId, "dunno anymore");
                         }
                     }
@@ -539,7 +568,7 @@
         Stack<Block> path = computePathInDominatorTree(earliestBlock, latestBlock);
         Debug.printf("|path| is %d: %s\n", path.size(), path);
 
-        Set<LocationIdentity> killSet = new HashSet<>();
+        KillSet killSet = new KillSet();
         // follow path, start at earliest schedule
         while (path.size() > 0) {
             Block currentBlock = path.pop();
@@ -551,11 +580,11 @@
                 HashSet<Block> region = computeRegion(currentBlock, dominatedBlock);
                 Debug.printf("%s: region for %s -> %s: %s\n", n, currentBlock, dominatedBlock, region);
 
-                Map<FixedNode, Set<LocationIdentity>> states;
-                states = ReentrantBlockIterator.apply(maschedClosure, currentBlock, new HashSet<>(killSet), region);
+                Map<FixedNode, KillSet> states;
+                states = ReentrantBlockIterator.apply(maschedClosure, currentBlock, new KillSet(killSet), region);
 
-                Set<LocationIdentity> mergeState = states.get(dominatedBlock.getBeginNode());
-                if (mergeState.contains(locid)) {
+                KillSet mergeState = states.get(dominatedBlock.getBeginNode());
+                if (mergeState.isKilled(locid)) {
                     // location got killed somewhere in the branches,
                     // thus we've to move the read above it
                     return currentBlock;
@@ -566,8 +595,8 @@
                 if (dominatedBlock == null) {
                     return currentBlock;
                 }
-                Set<LocationIdentity> blockKills = computeKillSet(currentBlock);
-                if (blockKills.contains(locid)) {
+                KillSet blockKills = computeKillSet(currentBlock);
+                if (blockKills.isKilled(locid)) {
                     return currentBlock;
                 }
                 killSet.addAll(blockKills);