Skip to content

Commit 18bcdad

Browse files
author
Nathan Shreve
committed
In documentation, FourAryHeap and KAryHeap no longer show inherited member info; also, t_heap fn.s described better
1 parent 5c40446 commit 18bcdad

File tree

2 files changed

+9
-14
lines changed

2 files changed

+9
-14
lines changed

doc/src/api/vprinternals/router_heap.rst

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,8 @@ KAryHeap
2424
----------
2525
.. doxygenclass:: KAryHeap
2626
:project: vpr
27-
:members:
2827

2928
FourAryHeap
3029
----------
3130
.. doxygenclass:: FourAryHeap
32-
:project: vpr
33-
:members:
31+
:project: vpr

vpr/src/route/heap_type.h

Lines changed: 8 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -27,32 +27,29 @@ struct t_heap {
2727
t_heap_path* path_data;
2828

2929
/**
30-
* @brief Get <i>u.next</i>.
30+
* @brief Get the next t_heap item in the linked list.
3131
*/
3232
t_heap* next_heap_item() const {
3333
return u.next;
3434
}
3535

3636
/**
37-
* @brief Set <i>u.next</i>.
37+
* @brief Set the next t_heap item in the linked list.
3838
*/
3939
void set_next_heap_item(t_heap* next) {
4040
u.next = next;
4141
}
4242

4343
/**
44-
* @brief Get <i>u.prev_edge</i>.
44+
* @brief Get the edge from the previous node used to reach the current node.
4545
*
4646
* @note
4747
* Be careful: will return 0 (a valid id!) if uninitialized.
48-
*/
49-
constexpr RREdgeId prev_edge() const {
50-
static_assert(sizeof(uint32_t) == sizeof(RREdgeId));
51-
return RREdgeId(u.prev_edge);
48+
@@ -52,7 +52,7 @@ struct t_heap {
5249
}
5350
5451
/**
55-
* @brief Set <i>u.prev_edge</i>.
52+
* @brief Set the edge from the previous node used to reach the current node..
5653
*/
5754
inline void set_prev_edge(RREdgeId edge) {
5855
static_assert(sizeof(uint32_t) == sizeof(RREdgeId));
@@ -61,7 +58,7 @@ struct t_heap {
6158

6259
private:
6360
union {
64-
///@brief Pointer to the next s_heap structure in the free linked list.
61+
///@brief Pointer to the next t_heap structure in the free linked list.
6562
t_heap* next = nullptr;
6663

6764
/**
@@ -121,7 +118,7 @@ class HeapStorage {
121118
* As a general rule, any t_heap objects returned from this interface,
122119
* **must** be HeapInterface::free'd before destroying the HeapInterface
123120
* instance. This ensure that no leaks are present in the users of the heap.
124-
* Violating this assumption may result in a assertion violation.
121+
* Violating this assumption may result in an assertion violation.
125122
*/
126123
class HeapInterface {
127124
public:
@@ -160,7 +157,7 @@ class HeapInterface {
160157
* - empty_heap<BR>
161158
* - build_heap<BR>
162159
*
163-
* @param grid
160+
* @param grid The FPGA device grid
164161
*/
165162
virtual void init_heap(const DeviceGrid& grid) = 0;
166163

0 commit comments

Comments
 (0)