Commit 57805560 authored by Robert Ricci's avatar Robert Ricci

Remove two more useless compile time options

PNODE_ALWAYS_FRONT wasn't used for anything

PNODE_SWITCH_LOAD was a bugfix, which we had turned on by default, and
there was no point in being able to turn the bug back on.
parent 2175000c
......@@ -64,7 +64,7 @@ CXXFLAGS += -O3
CXXFLAGS += -DMELT -DEPSILON_TERMINATE -DCHILL -DNEIGHBOR_LENGTH \
-DLOCAL_DERIVATIVE -DALLOW_NEGATIVE_DELTA
# Bug/scoring fixes
CXXFLAGS += -DINTERSWITCH_LENGTH -DPNODE_SWITCH_LOAD -DFIX_SHARED_INTERFACES
CXXFLAGS += -DINTERSWITCH_LENGTH -DFIX_SHARED_INTERFACES
# Various tweaks to the simulated annealing behavior
CXXFLAGS += -DFIND_PNODE_SEARCH -DNO_REVERT
# Keeps information about which pclasses are potential mappings for vnodes on a
......
......@@ -173,9 +173,3 @@ Bugfixes
FIX_SHARED_INTERFACES Fix a bug in which assign was happily re-using
interfaces for more than one vlink, without penalty.
Should be the default
PNODE_SWITCH_LOAD When putting a pnode back into a pclass list, swith the
order in which it is inserted, based on its current
load. Should be the default
PNODE_ALWAYS_FRONT Always put a pnode into the front of its pclass list,
regardless of whether it is being used or not. Only for
debugging PNODE_SWITCH_LOAD - should go away
......@@ -423,19 +423,11 @@ int pclass_unset(tb_pnode *p)
// remove_node empty means only one user.
if (! (*dit).second->exists(p)) {
assert(p->current_type_record->get_current_load() > 0);
#ifdef PNODE_ALWAYS_FRONT
(*dit).second->push_front(p);
#else
#ifdef PNODE_SWITCH_LOAD
if (p->current_type_record->get_current_load() == 0) {
#else
if (p->get_current_load() == 1) {
#endif
(*dit).second->push_back(p);
} else {
(*dit).second->push_front(p);
}
#endif
}
}
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment