fully propagate refines

Author: rmanohar

act/body.cc

@@ -1881,7 +1881,7 @@ ActBody *ActBody_Print::Clone(ActNamespace *replace, ActNamespace *newns)
 }
 
 
-void ActBody::updateInstType (list_t *namelist, InstType *it)
+void ActBody::updateInstType (list_t *namelist, InstType *it, bool handle_subref)
 {
  ActBody *b = this;
  listitem_t *li;
@@ -1908,7 +1908,7 @@ void ActBody::updateInstType (list_t *namelist, InstType *it)
  else if (dynamic_cast<ActBody_Loop *> (b)) {
  ActBody_Loop *bl = dynamic_cast<ActBody_Loop *> (b);
  if (bl->getBody()) {
-bl->getBody()->updateInstType (namelist, it);
+bl->getBody()->updateInstType (namelist, it, handle_subref);
  }
  }
  else {
@@ -1919,12 +1919,24 @@ void ActBody::updateInstType (list_t *namelist, InstType *it)
  else if (dynamic_cast<ActBody_Genloop *> (b)) {
 sel = dynamic_cast<ActBody_Genloop *> (b)->getGC();
  }
+ else if (dynamic_cast<ActBody_Lang *> (b) && handle_subref) {
+ActBody_Lang *l = dynamic_cast<ActBody_Lang *> (b);
+if (l->gettype() == ActBody_Lang::LANG_REFINE) {
+ act_refine *r = (act_refine *) l->getlang();
+ if (r->b && r->nsteps <= ActNamespace::Act()->getRefSteps ()) {
+ ActNamespace::Act()->decRefSteps (r->nsteps);
+ r->b->updateInstType (namelist, it, true);
+ ActNamespace::Act()->incRefSteps (r->nsteps);
+ }
+}
+sel = NULL;
+ }
  else {
 sel = NULL;
  }
  while (sel) {
 if (sel->getBody()) {
- sel->getBody()->updateInstType (namelist, it);
+ sel->getBody()->updateInstType (namelist, it, handle_subref);
 }
 sel = sel->getNext();
  }

act/body.h

@@ -119,9 +119,13 @@ class ActBody {
  * instance type to the new one specified. This is used to support
  * overrides.
  * @param namelist is a list of names (char * list)
- * @param it is the updated instance type for the specified identifiers
+ * @param it is the updated instance type for the specified
+ * identifiers
+ * @param handle_subref is a flag. If it is true, then the update
+ * method also handles a nested refine within the body; otherwise
+ * those are ignored.
  */
- void updateInstType (list_t *namelist, InstType *it);
+ void updateInstType (list_t *namelist, InstType *it, bool handle_subref);
 
  /**
  * @return the saved away line number associated with a body

act/defs.m4

@@ -648,7 +648,7 @@ override_one_spec: user_type [ "+" ] bare_id_list ";"
  }
  /* walk through the body, editing instances */
  if (b) {
- b->updateInstType ($3, $1);
+ b->updateInstType ($3, $1, false);
  if (port_override_asserts) {
 b->Tail()->Append (port_override_asserts);
  }

act/types.cc

@@ -2827,17 +2827,19 @@ void Data::synthStructMacro ()
 void UserDef::_apply_ref_overrides (ActBody *b, ActBody *srch)
 {
  list_t *ol = NULL;
+
  while (srch) {
  ActBody_Lang *l = dynamic_cast<ActBody_Lang *> (srch);
  if (l) {
  if (l->gettype() == ActBody_Lang::LANG_REFINE) {
 act_refine *r = (act_refine *) l->getlang();
-if (acceptRefine (ActNamespace::Act()->getRefSteps(), r->nsteps) &&
- r->overrides) {
+if (acceptRefine (ActNamespace::Act()->getRefSteps(), r->nsteps)) {
  listitem_t *oi, *oprev;
  if (!ol) {
  ol = list_new ();
  }
+
+ /* insert the override into a sorted list of refinement levels */
  oi = list_first (ol);
  oprev = NULL;
  while (oi) {
@@ -2870,14 +2872,33 @@ void UserDef::_apply_ref_overrides (ActBody *b, ActBody *srch)
  }
  /* apply overrides in refinement order */
  if (ol) {
- for (listitem_t *oi = list_first (ol); oi; oi = list_next (oi)) {
- act_refine *ri = (act_refine *) list_value (oi);
- refine_override *rl = ri->overrides; 
+ for (listitem_t *oi = list_first (ol); oi; oi = list_next (oi)) {
+ act_refine *ri = (act_refine *) list_value (oi);
+ refine_override *rl = ri->overrides;
+
  while (rl) {
- b->updateInstType (rl->ids, rl->it);
- rl = rl->next;
- }
- }
+b->updateInstType (rl->ids, rl->it, false);
+rl = rl->next;
+ }
+
+ /* also propagate the refinement to the bodies of the earlier
+ refinement bodies! */
+
+ /** XXX: this doesn't correctly handle nested refinement blocks **/
+ if (ri->overrides) {
+for (listitem_t *op = list_first (ol); op != oi; op = list_next (op)) {
+ act_refine *rp = (act_refine *) list_value (op);
+ rl = ri->overrides;
+ Assert (rp->nsteps <= ActNamespace::Act()->getRefSteps(), "What?");
+ ActNamespace::Act()->decRefSteps (rp->nsteps);
+ while (rl) {
+ rp->b->updateInstType (rl->ids, rl->it, true);
+ rl = rl->next;
+ }
+ ActNamespace::Act()->incRefSteps (rp->nsteps);
+}
+ }
+ }
  }
 }