Skip to content

Commit d2cfec1

Browse files
Merge branch 'master' into add_enable_pin_counting_filter_option_to_recluster_util
2 parents 87cf1d1 + 268103b commit d2cfec1

File tree

4 files changed

+27
-1
lines changed

4 files changed

+27
-1
lines changed

.github/workflows/containers.yml

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,24 @@
11
name: Containers
22

33
on:
4+
# We want to run the CI when anything is pushed to master.
5+
# Since master is a protected branch this only happens when a PR is merged.
6+
# This is a double check in case the PR was stale and had some issues.
47
push:
8+
branches:
9+
- master
510
pull_request:
611
workflow_dispatch:
712
schedule:
813
- cron: '0 0 * * 0' # weekly
914

15+
# We want to cancel previous runs for a given PR or branch / ref if another CI
16+
# run is requested.
17+
# See: https://docs.github.com/en/actions/using-jobs/using-concurrency
18+
concurrency:
19+
group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
20+
cancel-in-progress: true
21+
1022
jobs:
1123

1224
Image:

.github/workflows/test.yml

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,24 @@
11
name: Test
22

33
on:
4+
# We want to run the CI when anything is pushed to master.
5+
# Since master is a protected branch this only happens when a PR is merged.
6+
# This is a double check in case the PR was stale and had some issues.
47
push:
8+
branches:
9+
- master
510
pull_request:
611
workflow_dispatch:
712
schedule:
813
- cron: '0 0 * * *' # daily
914

15+
# We want to cancel previous runs for a given PR or branch / ref if another CI
16+
# run is requested.
17+
# See: https://docs.github.com/en/actions/using-jobs/using-concurrency
18+
concurrency:
19+
group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
20+
cancel-in-progress: true
21+
1022
env:
1123
# default compiler for all non-compatibility tests
1224
MATRIX_EVAL: "CC=gcc-11 && CXX=g++-11"

libs/librrgraph/src/base/rr_graph_storage.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -401,11 +401,13 @@ class t_rr_graph_storage {
401401

402402
/** @brief Get the source node for the specified edge. */
403403
RRNodeId edge_src_node(const RREdgeId& edge) const {
404+
VTR_ASSERT_DEBUG(edge.is_valid());
404405
return edge_src_node_[edge];
405406
}
406407

407408
/** @brief Get the destination node for the specified edge. */
408409
RRNodeId edge_sink_node(const RREdgeId& edge) const {
410+
VTR_ASSERT_DEBUG(edge.is_valid());
409411
return edge_dest_node_[edge];
410412
}
411413

vpr/src/route/connection_router.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -372,7 +372,7 @@ void ConnectionRouter<Heap>::timing_driven_expand_cheapest(t_heap* cheapest,
372372
VTR_LOGV_DEBUG(router_debug_, " Better cost to %d\n", inode);
373373
VTR_LOGV_DEBUG(router_debug_, " New total cost: %g\n", new_total_cost);
374374
VTR_LOGV_DEBUG(router_debug_, " New back cost: %g\n", new_back_cost);
375-
VTR_LOGV_DEBUG(router_debug_, " Setting path costs for associated node %d (from %d edge %zu)\n",
375+
VTR_LOGV_DEBUG(router_debug_ && (rr_nodes_.node_type(RRNodeId(cheapest->index)) != t_rr_type::SOURCE), " Setting path costs for associated node %d (from %d edge %zu)\n",
376376
cheapest->index,
377377
static_cast<size_t>(rr_graph_->edge_src_node(cheapest->prev_edge())),
378378
static_cast<size_t>(cheapest->prev_edge()));

0 commit comments

Comments
 (0)