diff options
| -rw-r--r-- | all.h | 2 | ||||
| -rw-r--r-- | cfg.c | 44 | ||||
| -rw-r--r-- | main.c | 12 |
3 files changed, 46 insertions, 12 deletions
@@ -527,7 +527,7 @@ void elimsb(Fn *); Blk *newblk(void); void edgedel(Blk *, Blk **); void fillpreds(Fn *); -void fillrpo(Fn *); +void fillcfg(Fn *); void filldom(Fn *); int sdom(Blk *, Blk *); int dom(Blk *, Blk *); @@ -11,6 +11,34 @@ newblk() return b; } +/* TODO - this never seems to do anything??? */ +static void +prunephis(Fn *f) +{ + Blk *b; + Phi *p, **pp; + uint na, na0; + + for (b = f->start; b; b = b->link) { + assert(b->id < f->nblk); + for (pp = &b->phi; (*pp);) { + p = *pp; + for (na = na0 = 0; na < p->narg; na++) + if (p->blk[na]->id != -1u) { + p->blk[na0] = p->blk[na]; + p->arg[na0] = p->arg[na]; + na0++; + } + if (na0 == 0) { + *pp = p->link; + } else { + p->narg = na0; + pp = &p->link; + } + } + } +} + void edgedel(Blk *bs, Blk **pbd) { @@ -53,7 +81,7 @@ addpred(Blk *bp, Blk *bc) bc->pred[bc->npred-1] = bp; } -/* fill predecessors information in blocks */ +/* fill predecessors information in blocks; prune dead phi refs */ void fillpreds(Fn *f) { @@ -67,6 +95,8 @@ fillpreds(Fn *f) if (b->s2 && b->s2 != b->s1) addpred(b, b->s2); } + /* TODO - this never seems to do anything??? */ + prunephis(f); } static void @@ -89,7 +119,7 @@ porec(Blk *b, uint *npo) } /* fill the rpo information; prune dead blks */ -void +static void fillrpo(Fn *f) { Blk *b, **p; @@ -104,8 +134,6 @@ fillrpo(Fn *f) f->rpo = vnew(f->nblk, sizeof f->rpo[0], PFn); for (p=&f->start; (b=*p);) { if (b->id == -1u) { - edgedel(b, &b->s1); - edgedel(b, &b->s2); *p = b->link; } else { b->id = f->nblk-b->id-1; /* po -> rpo */ @@ -115,6 +143,14 @@ fillrpo(Fn *f) } } +/* fill rpo, preds; prune dead blks, prune dead blk refs from phis */ +void +fillcfg(Fn *f) +{ + fillrpo(f); + fillpreds(f); +} + /* for dominators computation, read * "A Simple, Fast Dominance Algorithm" * by K. Cooper, T. Harvey, and K. Kennedy. @@ -59,8 +59,7 @@ func(Fn *fn) printfn(fn, stderr); } T.abi0(fn); - fillrpo(fn); - fillpreds(fn); + fillcfg(fn); filluse(fn); promote(fn); filluse(fn); @@ -79,19 +78,18 @@ func(Fn *fn) fold(fn); T.abi1(fn); simpl(fn); - fillpreds(fn); + fillcfg(fn); filluse(fn); T.isel(fn); - fillrpo(fn); + fillcfg(fn); filllive(fn); fillloop(fn); fillcost(fn); spill(fn); rega(fn); - fillrpo(fn); + fillcfg(fn); simpljmp(fn); - fillpreds(fn); - fillrpo(fn); + fillcfg(fn); assert(fn->rpo[0] == fn->start); for (n=0;; n++) if (n == fn->nblk-1) { |