X-Git-Url: http://git.megacz.com/?p=sbp.git;a=blobdiff_plain;f=src%2Fedu%2Fberkeley%2Fsbp%2FGSS.java;h=7af8b0754fe25e7fe38d388431a5b0cf47a5e02c;hp=11904d8b8eae83fde2fa6cd1f01e318508e63b9b;hb=acfe58223b9a0f78e64a14a1ca5d5998626ee3fe;hpb=628b3a8eaafdbe8507e841076051bff42aadf5ee diff --git a/src/edu/berkeley/sbp/GSS.java b/src/edu/berkeley/sbp/GSS.java index 11904d8..7af8b07 100644 --- a/src/edu/berkeley/sbp/GSS.java +++ b/src/edu/berkeley/sbp/GSS.java @@ -8,9 +8,11 @@ import java.util.*; import java.lang.reflect.*; /** implements Tomita's Graph Structured Stack */ -class GSS { +public class GSS { public static int count = 0; + public static int shifts = 0; + public static int reductions = 0; public GSS() { } @@ -18,6 +20,7 @@ class GSS { public int resets = 0; public int waits = 0; + // FIXME: right now, these are the performance bottleneck HashMapBag waiting = new HashMapBag(); HashMapBag performed = new HashMapBag(); HashMapBag lastperformed = new HashMapBag(); @@ -31,6 +34,7 @@ class GSS { public Iterator iterator() { return hash.iterator(); } public void invoke(State st, Forest result, Node n) { + shifts++; good |= next.newNode(n, result, st, false); } @@ -41,7 +45,6 @@ class GSS { boolean reducing; private IntPairMap hash; /* ALLOC */ - private IntPairMap singularReductions; /* ALLOC */ private boolean closed; private boolean good; private Phase next = null; @@ -69,7 +72,6 @@ class GSS { lastperformed.addAll(performed); performed.clear(); hash = new IntPairMap(); - singularReductions = new IntPairMap(); reset = false; good = false; closed = false; @@ -148,13 +150,14 @@ class GSS { } } } + private boolean newNode2(Node p, Node parent, Forest pending, State state, boolean fromEmptyReduction) { - //if (p.parents().contains(parent)) return true; - p.merge(parent, pending); + if (p.merge(parent, pending)) return true; p.parents().add(parent, true); if (p!=parent && !fromEmptyReduction && reducing) p.performReductions(parent); return true; } + private boolean newNode3(Node parent, Forest pending, State state, boolean fromEmptyReduction) { do { if (token != null && state.canShift(token)) break; @@ -220,7 +223,6 @@ class GSS { // this massively improves GC performance if (prev!=null && parser.helpgc) { prev.hash = null; - prev.singularReductions = null; } this.next = next; closed = true; @@ -274,24 +276,7 @@ class GSS { final class Node implements Invokable, IntegerMappable, GraphViz.ToGraphViz { public FastSet set = new FastSet(); - public GraphViz.Node toGraphViz(GraphViz gv) { - if (gv.hasNode(this)) return gv.createNode(this); - GraphViz.Node n = gv.createNode(this); - n.label = ""+state.toStringx(); - n.shape = "rectangle"; - n.fill = "green"; - //GraphViz.Node f = pending().toGraphViz(gv); - //n.add(f); - for(Forest result : results()) n.edge(result, ""); - for(Node parent : parents()) n.edge(parent, ""); - ((GraphViz.Group)phase().toGraphViz(gv)).add(n); - return n; - } - public boolean isTransparent() { return false; } - public boolean isHidden() { return false; } - - - //private Forest.Ref holder = new Forest.Ref(); + private boolean allqueued = false; /** what state this node is in */ @@ -299,14 +284,16 @@ class GSS { /** which Phase this Node belongs to (node that Node is also a non-static inner class of Phase) */ public Phase phase() { return Phase.this; } - //private HashMap resultMap = new HashMap(); private HashSet resultMap = new HashSet(); - public void merge(Node parent, Forest result) { + public Iterable results() { return resultMap; } + public FastSet parents() { return set; } + public boolean merge(Node parent, Forest result) { + // FIXME: inefficient! for(Forest.Ref f : results()) { - if (f.parents.contains(parent) && f.parents.size()==1) { + if (f.parents.contains(parent) /* UGLY: */ && f.parents.size()==1) { f.merge(result); - return; + return true; } } Forest.Ref f = new Forest.Ref(); @@ -314,27 +301,8 @@ class GSS { f.merge(result); resultMap.add(f); set.add(parent, true); - /* - Forest.Ref f = (Forest.Ref)resultMap.get(parent); - if (f==null) { f = new Forest.Ref(); resultMap.put(parent, f); } - f.merge(result); - set.add(parent, true); - */ + return false; } - public Iterable results() { return resultMap; } - //private Forest pending(Node n) { - //return !Phase.this.closed ? holder : holder.resolve(); - /* - for(Forest f : resultMap) - if (resultMap.contains(f, n)) - return f; - return null; - */ - /* - return resultMap.get(n); - } - */ - public FastSet parents() { return set; } public void performReductions() { if (allqueued) return; @@ -349,7 +317,7 @@ class GSS { public void performEmptyReductions() { state.invokeReductions(token, this, null, null); } public final void invoke(Position r, Node n, Node n2) { - //if (r.owner().lame) return; + reductions++; if (n==null || n2==null || r.pos==0) { if (r.pos==0) { if (n==null) n = this; @@ -357,83 +325,31 @@ class GSS { } if (n==null) return; Forest[] holder = new Forest[r.pos]; - if (r.pos==0) n.finish(r, r.zero(), n.phase(), holder); - else n.reduce(r, r.pos-1, n.phase(), holder, null, null); + if (r.pos==0) n.finish(r, r.zero(), n.phase()); + else n.reduce(r, r.pos-1, n.phase(), null); } else { - Forest[] holder = new Forest[r.pos]; if (r.pos<=0) throw new Error("called wrong form of reduce()"); int pos = r.pos-1; - n.reduce(r, pos, n.phase(), holder, n2, null); + n.reduce(r, pos, n.phase(), n2); } } - /* - public void reduce(Position r, int pos, Phase target, Forest[] holder) { - reduce(r, pos, target, holder, null); } - public void reduce(Position r, int pos, Phase target, Forest[] holder, Node only) { - reduce(r, pos, target, holder, only, this.pending()); - } - */ - public void reduce(Position r, int pos, Phase target, Forest[] holder, Node only, Forest pending) { + public void reduce(Position r, int pos, Phase target, Node only) { + Forest[] holder = r.holder; Forest old = holder[pos]; - holder[pos] = pending; - if (pos==0) { - - // FIXME: I'm unsure about this -- basically we want to deal with the case where - // there are two nodes, each of whose Ref points to the same Forest instance. - // Some node in the next phase has both of these as parents. This might happen - // since the same reduction can appear in more than one state. - - if (only != null) { - for(Forest result : results()) - for(Node child : ((Forest.Ref)result).parents) { - if (child!=only) continue; - pending = holder[pos] = result; - System.arraycopy(holder, 0, r.holder, 0, holder.length); - for(int i=0; i)result).parents) - child.finish(r, rex, target, holder); - } - } - } else { - if (only != null) { - for(Forest result : results()) - for(Node child : ((Forest.Ref)result).parents) { - if (child!=only) continue; - holder[pos] = result; - only.reduce(r, pos-1, target, holder, null, null); - } - } else { - for(Forest result : results()) - for(Node child : ((Forest.Ref)result).parents) { - holder[pos] = result; - child.reduce(r, pos-1, target, holder, null, null); - } + + for(Forest result : results()) + for(Node child : ((Forest.Ref)result).parents) { + if (only != null && child!=only) continue; + holder[pos] = result; + if (pos==0) child.finish(r, r.rewrite(phase().getLocation()), target); + else child.reduce(r, pos-1, target, null); } - } + holder[pos] = old; } - public void finish(Position r, Forest result, Phase target, Forest[] holder) { + public void finish(Position r, Forest result, Phase target) { Parser.Table.State state0 = state.gotoSetNonTerminals.get(r.owner()); if (result==null) throw new Error(); if (state0!=null) @@ -450,6 +366,23 @@ class GSS { } public int toInt() { return idx; } private final int idx = node_idx++; + + // GraphViz ////////////////////////////////////////////////////////////////////////////// + + public GraphViz.Node toGraphViz(GraphViz gv) { + if (gv.hasNode(this)) return gv.createNode(this); + GraphViz.Node n = gv.createNode(this); + n.label = ""+state.toStringx(); + n.shape = "rectangle"; + n.fill = "green"; + for(Forest result : results()) n.edge(result, ""); + for(Node parent : parents()) n.edge(parent, ""); + ((GraphViz.Group)phase().toGraphViz(gv)).add(n); + return n; + } + public boolean isTransparent() { return false; } + public boolean isHidden() { return false; } + } private int node_idx = 0;