Merge branch 'master' of https://github.com/rmanohar/actsim

Author: rmanohar

chpgraph.cc

@@ -1112,8 +1112,69 @@ static Expr *expr_to_chp_expr (Expr *e, ActSimCore *s, int *flags)
  return ret;
 }
 
+static int _get_detailed_costs (int &pos, const stateinfo_t *si) 
+{
+ char buf[10240];
+ char *nsname = NULL;
+ if (si->bnl->p->getns() != ActNamespace::Global()) {
+ nsname = si->bnl->p->getns()->Name();
+ }
+ if (nsname) {
+ snprintf (buf, 10240, "sim.chp.%s::%s.delays", nsname+2, si->bnl->p->getName());
+ FREE (nsname);
+ nsname = NULL;
+ }
+ else {
+ snprintf (buf, 10240, "sim.chp.%s.delays", si->bnl->p->getName());
+ }
+ if (!config_exists(buf)) {
+ return config_get_int ("sim.chp.default_delay");
+ }
+ int *dda_table = config_get_table_int (buf);
+ Assert (pos>=0, "huh?!");
+ int ret;
+ if (pos>=config_get_table_size(buf)) {
+ warning ("Detailed annotation table mismatch!");
+ ret = config_get_int ("sim.chp.default_delay");
+ }
+ else {
+ ret = int(dda_table[pos++]);
+ }
+ if (debug_metrics) { 
+ fprintf (stderr, "delay : %d\n", ret);
+ }
+ return ret;
+}
 
-static chpsimstmt *gc_to_chpsim (act_chp_gc_t *gc, ActSimCore *s)
+static void _dump_debug (act_chp_lang_t *c) {
+ if (debug_metrics) {
+ if (c->type == ACT_CHP_ASSIGN || c->type == ACT_CHP_ASSIGNSELF || 
+ c->type == ACT_CHP_RECV || c->type == ACT_CHP_SEND) {
+ fprintf (stderr, "\n basic : (");
+ }
+ if (c->type == ACT_CHP_SELECT || c->type == ACT_CHP_SELECT_NONDET) {
+ fprintf (stderr, "\n select : (");
+ }
+ if (c->type == ACT_CHP_COMMA) {
+ fprintf (stderr, "\n parallel : (");
+ }
+ if (c->type == ACT_CHP_LOOP || c->type == ACT_CHP_DOLOOP) {
+ fprintf (stderr, "\n loop : (");
+ }
+ chp_print(stderr, c);
+ fprintf (stderr, ") :: ");
+ }
+ return;
+}
+
+static void _get_detailed_costs (int &pos, const stateinfo_t *si, chpsimstmt *stmt)
+{
+ stmt->bw_cost = 0;
+ stmt->energy_cost = 0;
+ stmt->delay_cost = _get_detailed_costs (pos, si);
+}
+
+static chpsimstmt *gc_to_chpsim (act_chp_gc_t *gc, ActSimCore *s, const int annotate_mode, int &dda_pos)
 {
  chpsimcond *tmp;
  chpsimstmt *ret;
@@ -1124,7 +1185,7 @@ static chpsimstmt *gc_to_chpsim (act_chp_gc_t *gc, ActSimCore *s)
 
  NEW (ret, chpsimstmt);
  ret->type = CHPSIM_COND;
- ret->delay_cost = 0;
+ ret->delay_cost = (annotate_mode) ? _get_detailed_costs(dda_pos, s->cursi()) : 0;
  ret->energy_cost = 0;
  ret->bw_cost = 0;
  tmp = NULL;
@@ -1172,8 +1233,10 @@ chpsimgraph_info *ChpSimGraph::buildChpSimGraph (ActSimCore *sc,
  if (!c) return NULL;
 
  gi = new chpsimgraph_info;
+ int annotate_mode = config_get_int ("sim.chp.detailed_delay_annotation");
 
  if (c->type == ACT_HSE_FRAGMENTS) {
+ if (annotate_mode!=0) { fatal_error("Detailed annotation not supported for HSE fragments"); }
  int len = 0;
  int i;
  act_chp_lang_t *ch;
@@ -1192,7 +1255,8 @@ chpsimgraph_info *ChpSimGraph::buildChpSimGraph (ActSimCore *sc,
  for (ch = c; ch; ch = ch->u.frag.next) {
  b = hash_add (fH, ch->label);
  b->i = i;
- frags[i] = _buildChpSimGraph (sc, ch->u.frag.body, &nstop[i]);
+ int dummy = 0;
+ frags[i] = _buildChpSimGraph (sc, ch->u.frag.body, &nstop[i], annotate_mode, dummy);
  i++;
  }
 
@@ -1288,7 +1352,8 @@ chpsimgraph_info *ChpSimGraph::buildChpSimGraph (ActSimCore *sc,
  return gi;
  }
  stop = new ChpSimGraph (sc);
- gi->g = _buildChpSimGraph (sc, c, &stop);
+ int dda_pos = 0;
+ gi->g = _buildChpSimGraph (sc, c, &stop, annotate_mode, dda_pos);
  gi->max_count = max_pending_count;
  gi->max_stats = max_stats;
  gi->e = NULL;
@@ -1393,7 +1458,7 @@ static void _get_costs (stateinfo_t *si, ActId *id, chpsimstmt *stmt)
 
 ChpSimGraph *ChpSimGraph::_buildChpSimGraph (ActSimCore *sc,
  act_chp_lang_t *c,
- ChpSimGraph **stop)
+ ChpSimGraph **stop, const int annotate_mode, int &dda_pos)
 {
  ChpSimGraph *ret = NULL;
  ChpSimGraph *tmp2;
@@ -1412,7 +1477,7 @@ ChpSimGraph *ChpSimGraph::_buildChpSimGraph (ActSimCore *sc,
  if (list_length (c->u.semi_comma.cmd)== 1) {
  ret = _buildChpSimGraph
 (sc,
- (act_chp_lang_t *)list_value (list_first (c->u.semi_comma.cmd)), stop);
+ (act_chp_lang_t *)list_value (list_first (c->u.semi_comma.cmd)), stop, annotate_mode, dda_pos);
  _update_label (&labels, c->label, ret);
  return ret;
  }
@@ -1421,7 +1486,7 @@ ChpSimGraph *ChpSimGraph::_buildChpSimGraph (ActSimCore *sc,
  li; li = list_next (li)) {
  cur_pending_count = count;
  act_chp_lang_t *t = (act_chp_lang_t *) list_value (li);
- ChpSimGraph *tmp = _buildChpSimGraph (sc, t, &tmp2);
+ ChpSimGraph *tmp = _buildChpSimGraph (sc, t, &tmp2, annotate_mode, dda_pos);
  if (tmp) {
 if (!ret) {
  ret = tmp;
@@ -1441,7 +1506,7 @@ ChpSimGraph *ChpSimGraph::_buildChpSimGraph (ActSimCore *sc,
  if (list_length (c->u.semi_comma.cmd)== 1) {
  ret = _buildChpSimGraph
 (sc,
- (act_chp_lang_t *)list_value (list_first (c->u.semi_comma.cmd)), stop);
+ (act_chp_lang_t *)list_value (list_first (c->u.semi_comma.cmd)), stop, annotate_mode, dda_pos);
  _update_label (&labels, c->label, ret);
  return ret;
  }
@@ -1462,16 +1527,17 @@ ChpSimGraph *ChpSimGraph::_buildChpSimGraph (ActSimCore *sc,
  for (listitem_t *li = list_first (c->u.semi_comma.cmd);
  li; li = list_next (li)) {
  ret->all[i] = _buildChpSimGraph (sc,
- (act_chp_lang_t *)list_value (li), &tmp2);
+ (act_chp_lang_t *)list_value (li), &tmp2, annotate_mode, dda_pos);
  if (ret->all[i]) {
 tmp2->next = *stop;
 count++;
  }
  i++;
  }
  if (count > 0) {
+ _dump_debug (c);
  NEW (ret->stmt, chpsimstmt);
- ret->stmt->delay_cost = 0;
+ ret->stmt->delay_cost = (annotate_mode) ? _get_detailed_costs(dda_pos, sc->cursi()) : 0;
  ret->stmt->energy_cost = 0;
  ret->stmt->bw_cost = 0;
  ret->stmt->type = CHPSIM_FORK;
@@ -1492,7 +1558,8 @@ ChpSimGraph *ChpSimGraph::_buildChpSimGraph (ActSimCore *sc,
  case ACT_CHP_SELECT_NONDET:
  case ACT_CHP_LOOP:
  ret = new ChpSimGraph (sc);
- ret->stmt = gc_to_chpsim (c->u.gc, sc);
+ _dump_debug (c);
+ ret->stmt = gc_to_chpsim (c->u.gc, sc, annotate_mode, dda_pos);
  if (c->type == ACT_CHP_LOOP) {
  ret->stmt->type = CHPSIM_LOOP;
  }
@@ -1516,7 +1583,7 @@ ChpSimGraph *ChpSimGraph::_buildChpSimGraph (ActSimCore *sc,
  count = cur_pending_count;
  for (act_chp_gc_t *gc = c->u.gc; gc; gc = gc->next) {
  cur_pending_count = count;
- ret->all[i] = _buildChpSimGraph (sc, gc->s, &tmp2);
+ ret->all[i] = _buildChpSimGraph (sc, gc->s, &tmp2, annotate_mode, dda_pos);
  if (ret->all[i]) {
 if (c->type == ACT_CHP_LOOP) {
  /* loop back */
@@ -1543,7 +1610,7 @@ ChpSimGraph *ChpSimGraph::_buildChpSimGraph (ActSimCore *sc,
  case ACT_CHP_DOLOOP:
  {
  ChpSimGraph *ntmp;
- ChpSimGraph *nret = _buildChpSimGraph (sc, c->u.gc->s, &ntmp);
+ ChpSimGraph *nret = _buildChpSimGraph (sc, c->u.gc->s, &ntmp, annotate_mode, dda_pos);
 
  ret = new ChpSimGraph (sc);
 
@@ -1552,12 +1619,13 @@ ChpSimGraph *ChpSimGraph::_buildChpSimGraph (ActSimCore *sc,
 ntmp = nret;
  }
  ntmp->next = ret;
- ret->stmt = gc_to_chpsim (c->u.gc, sc);
+ _dump_debug (c);
+ ret->stmt = gc_to_chpsim (c->u.gc, sc, annotate_mode, dda_pos);
  ret->stmt->type = CHPSIM_LOOP;
  (*stop) = new ChpSimGraph (sc);
  ret->next = (*stop);
  MALLOC (ret->all, ChpSimGraph *, 1);
- ret->all[0] = _buildChpSimGraph (sc, c->u.gc->s, &tmp2);
+ ret->all[0] = _buildChpSimGraph (sc, c->u.gc->s, &tmp2, annotate_mode, dda_pos);
  if (!ret->all[0]) {
 ret->all[0] = _gen_nop (sc);
 tmp2 = ret->all[0];
@@ -1590,7 +1658,13 @@ ChpSimGraph *ChpSimGraph::_buildChpSimGraph (ActSimCore *sc,
 
  ret = new ChpSimGraph (sc);
  NEW (ret->stmt, chpsimstmt);
- _get_costs (sc->cursi(), c->u.comm.chan, ret->stmt);
+ if (annotate_mode) {
+ _dump_debug (c);
+ _get_detailed_costs (dda_pos, sc->cursi(), ret->stmt);
+ }
+ else {
+ _get_costs (sc->cursi(), c->u.comm.chan, ret->stmt);
+ }
  ret->stmt->type = CHPSIM_SEND;
  ret->stmt->u.sendrecv.is_struct = ch_struct;
  if (ch_struct == 0) {
@@ -1685,7 +1759,13 @@ ChpSimGraph *ChpSimGraph::_buildChpSimGraph (ActSimCore *sc,
  }
  ret = new ChpSimGraph (sc);
  NEW (ret->stmt, chpsimstmt);
- _get_costs (sc->cursi(), c->u.comm.chan, ret->stmt);
+ if (annotate_mode) {
+ _dump_debug (c);
+ _get_detailed_costs (dda_pos, sc->cursi(), ret->stmt);
+ }
+ else {
+ _get_costs (sc->cursi(), c->u.comm.chan, ret->stmt);
+ }
  ret->stmt->type = CHPSIM_RECV;
  if (ch_struct) {
 ret->stmt->u.sendrecv.is_struct = 1;
@@ -1859,7 +1939,14 @@ ChpSimGraph *ChpSimGraph::_buildChpSimGraph (ActSimCore *sc,
 
  ret = new ChpSimGraph (sc);
  NEW (ret->stmt, chpsimstmt);
- _get_costs (sc->cursi(), c->u.assign.id, ret->stmt);
+
+ if (annotate_mode) {
+ _dump_debug (c);
+ _get_detailed_costs (dda_pos, sc->cursi(), ret->stmt);
+ }
+ else {
+ _get_costs (sc->cursi(), c->u.assign.id, ret->stmt);
+ }
  ret->stmt->type = CHPSIM_ASSIGN;
  if (TypeFactory::isStructure (it)) {
 ret->stmt->u.assign.is_struct = 1;

chpsim.h

@@ -172,7 +172,7 @@ class ChpSimGraph {
  static void recordChannel (ActSimCore *, ChpSim *, act_chp_lang_t *);
 private:
  static ChpSimGraph *_buildChpSimGraph (ActSimCore *,
- act_chp_lang_t *, ChpSimGraph **stop);
+ act_chp_lang_t *, ChpSimGraph **stop, int, int&);
  static int cur_pending_count;
 
 };

main.cc

@@ -1838,6 +1838,7 @@ int main (int argc, char **argv)
  config_set_default_real ("sim.chp.default_leakage", 0);
  config_set_default_int ("sim.chp.default_area", 0);
  config_set_default_int ("sim.chp.debug_metrics", 0);
+ config_set_default_int ("sim.chp.detailed_delay_annotation", 0);
  config_set_int ("net.emit_parasitics", 1);
 
  /* initialize ACT library */