Skip to content

Commit ebd8148

Browse files
author
Nathan Shreve
committed
Created final FourAryHeap implementation, but kept BinaryHeap as a inherited class of KAryHeap
1 parent 51f78a8 commit ebd8148

18 files changed

+405
-589
lines changed

.gitignore

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -154,3 +154,15 @@ tags
154154
cmake-build-debug
155155
cmake-build-release
156156
/.metadata/
157+
158+
#
159+
# OTHER
160+
#
161+
fine-grained-parallel-router
162+
lookahead_info_paths
163+
lookahead_verifier_output
164+
run_flat
165+
run_vpr.py
166+
tests
167+
.gitignore
168+
run_heap_tests.py

run_heap_tests.py

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

utils/route_diag/src/main.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ static void do_one_route(const Netlist<>& net_list,
103103
segment_inf,
104104
is_flat);
105105

106-
ConnectionRouter<BinaryHeap> router(
106+
ConnectionRouter<FourAryHeap> router(
107107
device_ctx.grid,
108108
*router_lookahead,
109109
device_ctx.rr_graph.rr_nodes(),

vpr/src/base/read_route.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@
4646
#include "route_common.h"
4747
#include "route_tree.h"
4848
#include "read_route.h"
49-
#include "binary_heap.h"
49+
#include "four_ary_heap.h"
5050

5151
#include "old_traceback.h"
5252

@@ -129,7 +129,7 @@ bool read_route(const char* route_file, const t_router_opts& router_opts, bool v
129129
fp.close();
130130

131131
/*Correctly set up the clb opins*/
132-
BinaryHeap small_heap;
132+
FourAryHeap small_heap;
133133
small_heap.init_heap(device_ctx.grid);
134134
if (!flat_router) {
135135
reserve_locally_used_opins(&small_heap, router_opts.initial_pres_fac,

0 commit comments

Comments
 (0)