X-Git-Url: http://git.megacz.com/?p=sbp.git;a=blobdiff_plain;f=src%2Fedu%2Fberkeley%2Fsbp%2FGSS.java;h=816c0860364e43c5c2f78b32ee53cd835826521e;hp=a5d6f88391dcdff2b95d6d003535dfd7db48817c;hb=ae0cef03f2e46f6ae6438f9a3e60ca36ff1a4643;hpb=2a11d8ca5ae3af89ac2bdea58f71e463b6e4affe diff --git a/src/edu/berkeley/sbp/GSS.java b/src/edu/berkeley/sbp/GSS.java index a5d6f88..816c086 100644 --- a/src/edu/berkeley/sbp/GSS.java +++ b/src/edu/berkeley/sbp/GSS.java @@ -10,24 +10,31 @@ import java.lang.reflect.*; /** implements Tomita's Graph Structured Stack */ class GSS { + static int count = 0; + static int shifts = 0; + static int reductions = 0; + int resets = 0; + int waits = 0; + public GSS() { } private Phase.Node[] reducing_list = null; - public int resets = 0; - public int waits = 0; - HashMapBag inhibited = new HashMapBag(); - HashMapBag expectedInhibit = new HashMapBag(); + // FIXME: right now, these are the performance bottleneck HashMapBag waiting = new HashMapBag(); HashMapBag performed = new HashMapBag(); + HashMapBag lastperformed = new HashMapBag(); + HashMapBag expected = new HashMapBag(); /** FIXME */ - public Forest.Ref finalResult; + Forest.Many finalResult; /** corresponds to a positions between tokens the input stream; same as Tomita's U_i's */ - public class Phase implements Invokable.Node>, IntegerMappable { + class Phase implements Invokable.Node>, IntegerMappable, GraphViz.ToGraphViz, Iterable { + public Iterator iterator() { return hash.iterator(); } public void invoke(State st, Forest result, Node n) { + shifts++; good |= next.newNode(n, result, st, false); } @@ -38,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; @@ -55,17 +61,18 @@ class GSS { this.pos = previous==null ? 0 : previous.pos+1; this.token = token; this.location = location; - inhibited.clear(); + performed.clear(); reset(); } public void reset() throws ParseFailed { waiting.clear(); + expected.clear(); + lastperformed.clear(); + lastperformed.addAll(performed); performed.clear(); hash = new IntPairMap(); - singularReductions = new IntPairMap(); - expectedInhibit.clear(); - expectedInhibit.addAll(inhibited); + reset = false; good = false; closed = false; reducing = false; @@ -99,21 +106,34 @@ class GSS { int pos = parent==null?0:parent.phase()==null?0:parent.phase().pos; Sequence owner = reduction==null ? null : reduction.owner(); if (reduction!=null) { - if (inhibited.contains(pos, owner)) return; + if (owner.hates!=null) { + for (Sequence s : performed.getAll(pos)) + if (owner.hates.contains(s)) + return; + for (Sequence s : lastperformed.getAll(pos)) + if (owner.hates.contains(s)) { + //System.out.println("now expecting ["+pos+"] => " + s); + expected.add(pos, s); + return; + } + } if (owner.needs != null) for(Sequence s : owner.needs) if (!performed.contains(pos, s)) { waiting.add(s, new Waiting(parent, pending, state, fromEmptyReduction, reduction)); return; } - if ((owner.needed != null && owner.needed.size()>0) || - (owner.hated != null && owner.hated.size()>0) || - (owner.hates != null && owner.hates.size()>0)) + if (!performed.contains(pos, owner)) { performed.add(pos, owner); + if (owner.hated != null) + for(Sequence seq : owner.hated) + if (performed.contains(pos, seq)) { + performed.remove(pos, seq); + reset = true; + } + } } - if (!owner.lame) - newNode(parent, pending, state, fromEmptyReduction); - if (reduction!=null) inhibit(reduction, parent==null?0:parent.phase().pos); + newNode(parent, pending, state, fromEmptyReduction); if (reduction != null) { boolean redo = true; while(redo) { @@ -129,13 +149,14 @@ class GSS { } } } + private boolean newNode2(Node p, Node parent, Forest pending, State state, boolean fromEmptyReduction) { - p.holder.merge(pending); - if (p.parents().contains(parent)) return true; + 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; @@ -156,34 +177,8 @@ class GSS { return true; } - public void uninhibit(int p, Sequence s) { - if (s.hated!=null) - for(Sequence s2 : s.hated) - inhibited.remove(p, s2); - } - - public void inhibit(Position r, int p) { - if (r.owner().hated == null) return; - // remember that dead states are still allowed to shift -- just not allowed to reduce - boolean reset = false; - for(Sequence seq : r.owner().hated) { - if (performed.contains(p,seq)) { - uninhibit(p, seq); - //System.out.println("\nresetting due to " + r.owner() + " killing " + seq); - //inhibited.clear(); - inhibited.add(p, seq); - //inhibited = new HashMapBag(); - reset = true; - resets++; - throw new Reset(); - } - inhibited.add(p, seq); - expectedInhibit.remove(p, seq); - } - } - /** perform all reduction operations */ - public void reduce() throws ParseFailed{ + public void reduce() throws ParseFailed { try { reducing = true; if (reducing_list==null || reducing_list.length < hash.size()) @@ -200,25 +195,33 @@ class GSS { reducing_list[i] = null; n.performReductions(); } - if (expectedInhibit.size() > 0) { - inhibited.removeAll(expectedInhibit); - System.out.println("\n!!!!\n"); + if (reset) { + reset = false; + resets++; throw new Reset(); - } + } + for(int i : expected) + for(Sequence s : expected.getAll(i)) + if (!performed.contains(i, s)) { + //System.out.println("resetting due to pos="+i+": " + s + " " + System.identityHashCode(s)); + resets++; + throw new Reset(); + } } catch (Reset r) { reset(); reduce(); } + count = 0; } + private boolean reset = false; class Reset extends RuntimeException { } /** perform all shift operations, adding promoted nodes to next */ public void shift(Phase next, Forest result) throws ParseFailed { // this massively improves GC performance - if (prev!=null) { + if (prev!=null && parser.helpgc) { prev.hash = null; - prev.singularReductions = null; } this.next = next; closed = true; @@ -226,8 +229,9 @@ class GSS { boolean ok = false; for(Phase.Node n : hash.values()) { if (token == null && n.state.isAccepting()) { - if (finalResult==null) finalResult = new Forest.Ref(); - finalResult.merge(n.holder); + if (finalResult==null) finalResult = new Forest.Many(); + for(Object f : n.results()) + finalResult.merge((Forest)f); } if (token == null) continue; n.state.invokeShifts(token, this, result, n); @@ -245,7 +249,7 @@ class GSS { } - public class Waiting { + class Waiting { Node parent; Forest pending; State state; @@ -268,9 +272,10 @@ class GSS { // Node ///////////////////////////////////////////////////////////////////////////////// /** a node in the GSS */ - public final class Node extends FastSet implements Invokable, IntegerMappable { + final class Node implements Invokable, IntegerMappable, GraphViz.ToGraphViz { + public FastSet set = new FastSet(); - private Forest.Ref holder = null; + private boolean allqueued = false; /** what state this node is in */ @@ -278,9 +283,25 @@ 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; } - public Forest.Ref holder() { return holder==null ? (holder = new Forest.Ref()) : holder; } - public Forest pending() { return Phase.this.closed ? holder().resolve() : holder; } - public FastSet parents() { return this; } + + private HashSet resultMap = new HashSet(); + public Iterable results() { return resultMap; } + public FastSet parents() { return set; } + public boolean merge(Node parent, Forest result) { + // FIXME: inefficient! + for(Forest.Many f : results()) { + if (f.parents.contains(parent) /* UGLY: */ && f.parents.size()==1) { + f.merge(result); + return true; + } + } + Forest.Many f = new Forest.Many(); + f.parents.add(parent); + f.merge(result); + resultMap.add(f); + set.add(parent, true); + return false; + } public void performReductions() { if (allqueued) return; @@ -295,6 +316,7 @@ class GSS { public void performEmptyReductions() { state.invokeReductions(token, this, null, null); } public final void invoke(Position r, Node n, Node n2) { + reductions++; if (n==null || n2==null || r.pos==0) { if (r.pos==0) { if (n==null) n = this; @@ -302,50 +324,33 @@ 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); + 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; - Forest old = holder[pos]; - holder[pos] = n.pending(); - if (pos==0) { - System.arraycopy(holder, 0, r.holder, 0, holder.length); - Forest rex = null; - if (r.pos==1) rex = singularReductions.get(this, r); - if (rex==null) { - rex = r.rewrite(n.phase().getLocation()); - if (r.pos==1) singularReductions.put(this, r, rex); - } - n2.finish(r, rex, n.phase(), holder); - } else { - n2.reduce(r, pos-1, n.phase(), holder); - } - holder[pos] = old; + n.reduce(r, pos, n.phase(), n2); } } - public void reduce(Position r, int pos, Phase target, Forest[] holder) { + public void reduce(Position r, int pos, Phase target, Node only) { + Forest[] holder = r.holder; Forest old = holder[pos]; - holder[pos] = this.pending(); - if (pos==0) { - System.arraycopy(holder, 0, r.holder, 0, holder.length); - for(int i=0; i rr = new HashSet(); + for(Forest result : results()) rr.add(result); + for(Forest result : rr) + for(Node child : ((Forest.Many)result).parents) { + if (only != null && child!=only) continue; + holder[pos] = result; + if (pos==0) child.finish(r, r.rewrite(child.phase().getLocation().createRegion(phase().getLocation())), target); + else child.reduce(r, pos-1, target, null); } - for(Node child : this.parents()) child.finish(r, rex, target, holder); - } else { - for(Node child : this.parents()) child.reduce(r, pos-1, target, holder); - } + 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) @@ -354,7 +359,7 @@ class GSS { private Node(Node parent, Forest pending, State state) { this.state = state; - this.holder().merge(pending); + this.merge(parent, pending); Phase start = parent==null ? null : parent.phase(); if (parent != null) parents().add(parent, true); if (Phase.this.hash.get(state, start) != null) throw new Error("severe problem!"); @@ -362,11 +367,41 @@ 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; public int toInt() { return pos+1; } public int size() { return hash==null ? 0 : hash.size(); } - } + // GraphViz ////////////////////////////////////////////////////////////////////////////// + + public GraphViz.Node toGraphViz(GraphViz gv) { + if (gv.hasNode(this)) return gv.createNode(this); + GraphViz.Group g = gv.createGroup(this); + g.label = "Phase " + pos; + g.color = "gray"; + g.cluster = true; + return g; + } + public boolean isTransparent() { return false; } + public boolean isHidden() { return false; } + + } }