Skip to content

Commit 726294a

Browse files
committed
[Router] Refactored Heap Interface & Removed Deprecated Implementations
- Changed APIs in the `HeapInterface` class. - Removed the `HeapStorage` class (used for dynamic memory allocations). - Removed the deprecated bucket heap implementation. - Replaced the prior k-ary heap implementation with the enhanced d-ary heap introduced in commit b11b2e.
1 parent 87a7e97 commit 726294a

21 files changed

+107
-1775
lines changed

vpr/src/base/ShowSetup.cpp

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -462,9 +462,6 @@ static void ShowRouterOpts(const t_router_opts& RouterOpts) {
462462
case e_heap_type::FOUR_ARY_HEAP:
463463
VTR_LOG("FOUR_ARY_HEAP\n");
464464
break;
465-
case e_heap_type::BUCKET_HEAP_APPROXIMATION:
466-
VTR_LOG("BUCKET_HEAP_APPROXIMATION\n");
467-
break;
468465
default:
469466
VPR_FATAL_ERROR(VPR_ERROR_UNKNOWN, "Unknown router_heap\n");
470467
}

vpr/src/base/read_options.cpp

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1063,8 +1063,6 @@ struct ParseRouterHeap {
10631063
conv_value.set_value(e_heap_type::BINARY_HEAP);
10641064
else if (str == "four_ary")
10651065
conv_value.set_value(e_heap_type::FOUR_ARY_HEAP);
1066-
else if (str == "bucket")
1067-
conv_value.set_value(e_heap_type::BUCKET_HEAP_APPROXIMATION);
10681066
else {
10691067
std::stringstream msg;
10701068
msg << "Invalid conversion from '" << str << "' to e_heap_type (expected one of: " << argparse::join(default_choices(), ", ") << ")";
@@ -1077,11 +1075,9 @@ struct ParseRouterHeap {
10771075
ConvertedValue<std::string> conv_value;
10781076
if (val == e_heap_type::BINARY_HEAP)
10791077
conv_value.set_value("binary");
1080-
else if (val == e_heap_type::FOUR_ARY_HEAP)
1081-
conv_value.set_value("four_ary");
10821078
else {
1083-
VTR_ASSERT(val == e_heap_type::BUCKET_HEAP_APPROXIMATION);
1084-
conv_value.set_value("bucket");
1079+
VTR_ASSERT(val == e_heap_type::FOUR_ARY_HEAP);
1080+
conv_value.set_value("four_ary");
10851081
}
10861082
return conv_value;
10871083
}

vpr/src/base/read_route.cpp

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020
#include <ctime>
2121
#include <sstream>
2222
#include <string>
23-
#include <unordered_set>
2423

2524
#include "atom_netlist.h"
2625
#include "atom_netlist_utils.h"
@@ -46,7 +45,6 @@
4645
#include "route_common.h"
4746
#include "route_tree.h"
4847
#include "read_route.h"
49-
#include "four_ary_heap.h"
5048

5149
#include "old_traceback.h"
5250

vpr/src/route/binary_heap.cpp

Lines changed: 0 additions & 77 deletions
This file was deleted.

vpr/src/route/binary_heap.h

Lines changed: 0 additions & 17 deletions
This file was deleted.

0 commit comments

Comments
 (0)