Skip to content

musketeer: fix edge types #780

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Apr 10, 2017
Merged

musketeer: fix edge types #780

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 10 additions & 10 deletions src/musketeer/fence_inserter.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -494,7 +494,7 @@ void inline fence_insertert::mip_fill_matrix(
e_c_it!=e_i->end();
++e_c_it)
{
std::set<event_idt> pt_set;
std::set<unsigned> pt_set;
assert(map_to_e.find(*e_c_it)!=map_to_e.end());
const_graph_visitor.PT(map_to_e.find(*e_c_it)->second, pt_set);
/* sum_e' f_e' */
Expand Down Expand Up @@ -538,7 +538,7 @@ void inline fence_insertert::mip_fill_matrix(
e_nc_it!=e_i->end();
++e_nc_it)
{
std::set<event_idt> pt_set;
std::set<unsigned> pt_set;
assert(map_to_e.find(*e_nc_it)!=map_to_e.end());
const_graph_visitor.PT(map_to_e.find(*e_nc_it)->second, pt_set);
/* sum_e' (f_e' + lwf_e') */
Expand Down Expand Up @@ -582,7 +582,7 @@ void inline fence_insertert::mip_fill_matrix(
e_nc_it!=e_i->end();
++e_nc_it)
{
std::set<event_idt> pt_set;
std::set<unsigned> pt_set;
assert(map_to_e.find(*e_nc_it)!=map_to_e.end());
const_graph_visitor.PT(map_to_e.find(*e_nc_it)->second, pt_set);
/* dp_e + sum_e' (f_e' + lwf_e' + br_e') */
Expand Down Expand Up @@ -649,12 +649,12 @@ void inline fence_insertert::mip_fill_matrix(
e_nc_it!=e_i->end();
++e_nc_it)
{
std::set<event_idt> pt_set;
std::set<unsigned> pt_set;
assert(map_to_e.find(*e_nc_it)!=map_to_e.end());
const_graph_visitor.PT(map_to_e.find(*e_nc_it)->second, pt_set);
// uncomment for cf
#if 0
std::set<event_idt> it_set;
std::set<unsigned> it_set;
IT(map_to_e.find(*e_nc_it)->second, it_set);
#endif
/* dp_e + sum_e' (f_e' + lwf_e') + sum_e'' cf_e'') */
Expand Down Expand Up @@ -722,13 +722,13 @@ void inline fence_insertert::mip_fill_matrix(
{
unsigned possibilities_met=0;

std::set<event_idt> ct_set;
std::set<unsigned> ct_set;
assert(invisible_var.map_to_e.find(*e_c_it)!=
invisible_var.map_to_e.end());
const_graph_visitor.CT(invisible_var.map_to_e.find(*e_c_it)->second,
ct_set);

std::set<event_idt> ct_not_powr_set;
std::set<unsigned> ct_not_powr_set;
const_graph_visitor.CT_not_powr(invisible_var.map_to_e.find(
*e_c_it)->second, ct_not_powr_set);

Expand Down Expand Up @@ -801,7 +801,7 @@ void fence_insertert::solve()
assert(i-1==constraints_number);

const std::size_t const_constraints_number=constraints_number;
const event_idt const_unique=unique;
const unsigned const_unique=unique;

const std::size_t mat_size=
// NOLINTNEXTLINE(whitespace/operators)
Expand Down Expand Up @@ -1234,13 +1234,13 @@ void fence_insertert::print_vars() const
{
instrumenter.message.statistics()
<< "---- pos/pos+ (visible) variables ----" << messaget::eom;
for(std::map<edget, event_idt>::const_iterator it=map_from_e.begin();
for(std::map<edget, unsigned>::const_iterator it=map_from_e.begin();
it!=map_from_e.end(); ++it)
instrumenter.message.statistics() << it->first.first << ","
<< it->first.second << messaget::eom;
instrumenter.message.statistics() << "---- cmp (invisible) variables ----"
<< messaget::eom;
for(std::map<edget, event_idt>::const_iterator it=
for(std::map<edget, unsigned>::const_iterator it=
invisible_var.map_from_e.begin();
it!=invisible_var.map_from_e.end(); ++it)
instrumenter.message.statistics() << it->first.first << ","
Expand Down
20 changes: 10 additions & 10 deletions src/musketeer/fence_inserter.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,19 +30,19 @@ struct mip_vart
{
typedef event_grapht::critical_cyclet::delayt edget;

event_idt unique;
unsigned unique;

std::map<event_idt, edget> map_to_e;
std::map<edget, event_idt> map_from_e;
std::map<unsigned, edget> map_to_e;
std::map<edget, unsigned> map_from_e;

event_idt add_edge(const edget &e)
unsigned add_edge(const edget &e)
{
if(map_from_e.find(e) != map_from_e.end())
return map_from_e[e];
else
{
++unique;
map_to_e.insert(std::pair<event_idt, edget>(unique, e));
map_to_e.insert(std::pair<unsigned, edget>(unique, e));
map_from_e[e] = unique;
return unique;
}
Expand All @@ -62,10 +62,10 @@ class fence_insertert
instrumentert &instrumenter;

/* normal variables used almost everytime */
std::map<event_idt, edget> &map_to_e;
std::map<edget, event_idt> &map_from_e;
event_idt add_edge(const edget &e) { return var.add_edge(e); }
event_idt add_invisible_edge(const edget &e)
std::map<unsigned, edget> &map_to_e;
std::map<edget, unsigned> &map_from_e;
unsigned add_edge(const edget &e) { return var.add_edge(e); }
unsigned add_invisible_edge(const edget &e)
{
return invisible_var.add_edge(e);
}
Expand All @@ -78,7 +78,7 @@ class fence_insertert
const_graph_visitort const_graph_visitor;

protected:
event_idt &unique;
unsigned &unique;
unsigned fence_options;

/* MIP variables to edges in po^+/\C */
Expand Down