Skip to content

Commit 995b629

Browse files
jfgavajfgava
committed
grt: fix clang-tidy signed char to const int conversion
Signed-off-by: Jonas Gava <[email protected]>
1 parent b83ff32 commit 995b629

File tree

7 files changed

+24
-23
lines changed

7 files changed

+24
-23
lines changed

‎src/grt/src/fastroute/include/FastRoute.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@ class FastRouteCore
118118
void clearNetsToRoute() { net_ids_.clear(); }
119119
void initEdges();
120120
void initEdgesCapacityPerLayer();
121-
void setNumAdjustments(int nAdjustements);
121+
void setNumAdjustments(int nAdjustments);
122122
void addAdjustment(int x1,
123123
int y1,
124124
int x2,

‎src/grt/src/fastroute/src/RipUp.cpp‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ void FastRouteCore::newRipup(const TreeEdge* treeedge,
4646
const RouteType edge_type = treeedge->route.type;
4747
const auto [ymin, ymax] = std::minmax(y1, y2);
4848
FrNet* net = nets_[netID];
49-
const int edgeCost = net->getEdgeCost();
49+
const int8_t edgeCost = net->getEdgeCost();
5050

5151
if (edge_type == RouteType::LRoute) // remove L routing
5252
{
@@ -117,7 +117,7 @@ bool FastRouteCore::newRipupCongestedL(const TreeEdge* treeedge,
117117
const auto [ymin, ymax] = std::minmax(y1, y2);
118118

119119
FrNet* net = nets_[netID];
120-
const int edgeCost = net->getEdgeCost();
120+
const int8_t edgeCost = net->getEdgeCost();
121121

122122
bool needRipup = false;
123123

@@ -225,7 +225,7 @@ bool FastRouteCore::newRipupCheck(const TreeEdge* treeedge,
225225
}
226226
}
227227
if (needRipup) {
228-
const int edgeCost = net->getEdgeCost();
228+
const int8_t edgeCost = net->getEdgeCost();
229229

230230
for (int i = 0; i < treeedge->route.routelen; i++) {
231231
if (grids[i].x == grids[i + 1].x) { // a vertical edge
@@ -357,7 +357,7 @@ bool FastRouteCore::newRipup3DType3(const int netID, const int edgeID)
357357
void FastRouteCore::releaseNetResources(const int netID)
358358
{
359359
FrNet* net = nets_[netID];
360-
const int edgeCost = net->getEdgeCost();
360+
const int8_t edgeCost = net->getEdgeCost();
361361
const auto& treeedges = sttrees_[netID].edges;
362362
const int num_edges = sttrees_[netID].num_edges();
363363

@@ -392,7 +392,7 @@ void FastRouteCore::releaseNetResources(const int netID)
392392

393393
void FastRouteCore::newRipupNet(const int netID)
394394
{
395-
const int edgeCost = nets_[netID]->getEdgeCost();
395+
const int8_t edgeCost = nets_[netID]->getEdgeCost();
396396

397397
const auto& treeedges = sttrees_[netID].edges;
398398
const auto& treenodes = sttrees_[netID].nodes;

‎src/grt/src/fastroute/src/graph2d.cpp‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
// SPDX-License-Identifier: BSD-3-Clause
22
// Copyright (c) 2019-2025, The OpenROAD Authors
33

4+
#include <cstdint>
45
#include <set>
56
#include <string>
67

@@ -535,7 +536,7 @@ void Graph2D::printEdgeCapPerLayer()
535536
// Checks if there is enough NDR capacity for a given net.
536537
bool Graph2D::hasNDRCapacity(FrNet* net, int x, int y, EdgeDirection direction)
537538
{
538-
const int edgeCost = net->getEdgeCost();
539+
const int8_t edgeCost = net->getEdgeCost();
539540
double max_single_layer_cap = 0;
540541

541542
if (edgeCost > 1) {
@@ -568,7 +569,7 @@ double Graph2D::getCostNDRAware(FrNet* net,
568569
const double edge_cost,
569570
EdgeDirection direction)
570571
{
571-
int edgeCost = net->getEdgeCost();
572+
const int8_t edgeCost = net->getEdgeCost();
572573

573574
// No processing needed for nets with 1 edge cost
574575
if (edgeCost == 1) {
@@ -635,7 +636,7 @@ void Graph2D::updateNDRCapLayer(const int x,
635636
EdgeDirection dir,
636637
const double edge_cost)
637638
{
638-
const int edgeCost = net->getEdgeCost();
639+
const int8_t edgeCost = net->getEdgeCost();
639640
if (edgeCost == 1) {
640641
return;
641642
}

‎src/grt/src/fastroute/src/maze.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,7 @@ void FastRouteCore::fixOverlappingEdge(
142142

143143
// Updates the usage of the altered edge
144144
FrNet* net = nets_[net_id];
145-
const int edgeCost = net->getEdgeCost();
145+
const int8_t edgeCost = net->getEdgeCost();
146146
for (int k = 0; k < treeedge->route.routelen;
147147
k++) { // remove the usages of the old edges
148148
if (treeedge->route.grids[k].x == treeedge->route.grids[k + 1].x) {
@@ -1696,7 +1696,7 @@ void FastRouteCore::mazeRouteMSMD(const int iter,
16961696
}
16971697

16981698
FrNet* net = nets_[netID];
1699-
int edgeCost = net->getEdgeCost();
1699+
int8_t edgeCost = net->getEdgeCost();
17001700

17011701
// update edge usage
17021702
for (int i = 0; i < cnt_n1n2 - 1; i++) {

‎src/grt/src/fastroute/src/maze3D.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -666,7 +666,7 @@ void FastRouteCore::mazeRouteMSMDOrder3D(int expand,
666666
const int netID = tree_order_pv_[orderIndex].treeIndex;
667667

668668
FrNet* net = nets_[netID];
669-
int edge_cost = 0;
669+
int8_t edge_cost = 0;
670670

671671
int enlarge = expand;
672672
const int num_terminals = sttrees_[netID].num_terminals;

‎src/grt/src/fastroute/src/route.cpp‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -206,7 +206,7 @@ void FastRouteCore::newrouteL(const int netID,
206206
const bool viaGuided)
207207
{
208208
FrNet* net = nets_[netID];
209-
const int edgeCost = net->getEdgeCost();
209+
const int8_t edgeCost = net->getEdgeCost();
210210

211211
const int num_edges = sttrees_[netID].num_edges();
212212
auto& treeedges = sttrees_[netID].edges;
@@ -350,7 +350,7 @@ void FastRouteCore::newrouteLAll(const bool firstTime, const bool viaGuided)
350350
void FastRouteCore::newrouteZ_edge(const int netID, const int edgeID)
351351
{
352352
FrNet* net = nets_[netID];
353-
const int edgeCost = net->getEdgeCost();
353+
const int8_t edgeCost = net->getEdgeCost();
354354

355355
// only route the non-degraded edges (len>0)
356356
if (sttrees_[netID].edges[edgeID].len <= 0) {
@@ -470,7 +470,7 @@ void FastRouteCore::newrouteZ_edge(const int netID, const int edgeID)
470470
void FastRouteCore::newrouteZ(const int netID, const int threshold)
471471
{
472472
FrNet* net = nets_[netID];
473-
const int edgeCost = net->getEdgeCost();
473+
const int8_t edgeCost = net->getEdgeCost();
474474

475475
const int num_terminals = sttrees_[netID].num_terminals;
476476
const int num_edges = sttrees_[netID].num_edges();
@@ -759,7 +759,7 @@ void FastRouteCore::spiralRoute(const int netID, const int edgeID)
759759
auto& treenodes = sttrees_[netID].nodes;
760760

761761
FrNet* net = nets_[netID];
762-
const int edgeCost = net->getEdgeCost();
762+
const int8_t edgeCost = net->getEdgeCost();
763763

764764
TreeEdge* treeedge = &(treeedges[edgeID]);
765765
if (treeedge->len <= 0) // only route the non-degraded edges (len>0)
@@ -1194,7 +1194,7 @@ void FastRouteCore::routeMonotonic(const int netID,
11941194
int cnt = 0;
11951195
std::vector<GPoint3D>& grids = treeedge->route.grids;
11961196
grids.resize(x_range_ + y_range_);
1197-
const int edgeCost = nets_[netID]->getEdgeCost();
1197+
const int8_t edgeCost = nets_[netID]->getEdgeCost();
11981198

11991199
if (BL1) {
12001200
if (bestp1x > x1) {
@@ -1361,7 +1361,7 @@ void FastRouteCore::newrouteLInMaze(const int netID)
13611361
const auto& treenodes = sttrees_[netID].nodes;
13621362

13631363
FrNet* net = nets_[netID];
1364-
const int edgeCost = net->getEdgeCost();
1364+
const int8_t edgeCost = net->getEdgeCost();
13651365

13661366
// loop for all the tree edges
13671367
for (int i = 0; i < num_edges; i++) {

‎src/grt/src/fastroute/src/utility.cpp‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1313,7 +1313,7 @@ void FastRouteCore::removeLoops()
13131313
auto& treeedges = sttrees_[netID].edges;
13141314

13151315
FrNet* net = nets_[netID];
1316-
const int edgeCost = net->getEdgeCost();
1316+
const int8_t edgeCost = net->getEdgeCost();
13171317

13181318
for (int edgeID = 0; edgeID < sttrees_[netID].num_edges(); edgeID++) {
13191319
TreeEdge edge = sttrees_[netID].edges[edgeID];
@@ -1366,7 +1366,7 @@ void FastRouteCore::verify2DEdgesUsage()
13661366
}
13671367
const auto& treenodes = sttrees_[netID].nodes;
13681368
const auto& treeedges = sttrees_[netID].edges;
1369-
const int edgeCost = nets_[netID]->getEdgeCost();
1369+
const int8_t edgeCost = nets_[netID]->getEdgeCost();
13701370

13711371
for (int edgeID = 0; edgeID < sttrees_[netID].num_edges(); edgeID++) {
13721372
const TreeEdge* treeedge = &(treeedges[edgeID]);
@@ -1481,7 +1481,7 @@ void FastRouteCore::verify3DEdgesUsage()
14811481
const auto& treeedges = sttrees_[netID].edges;
14821482
const int num_edges = sttrees_[netID].num_edges();
14831483

1484-
const int edgeCost = nets_[netID]->getEdgeCost();
1484+
const int8_t edgeCost = nets_[netID]->getEdgeCost();
14851485

14861486
for (int edgeID = 0; edgeID < num_edges; edgeID++) {
14871487
const TreeEdge* treeedge = &(treeedges[edgeID]);
@@ -1797,7 +1797,7 @@ void FastRouteCore::copyBR()
17971797
for (const int& netID : net_ids_) {
17981798
const int numEdges = sttrees_[netID].num_edges();
17991799
FrNet* net = nets_[netID];
1800-
const int edgeCost = net->getEdgeCost();
1800+
const int8_t edgeCost = net->getEdgeCost();
18011801

18021802
for (int edgeID = 0; edgeID < numEdges; edgeID++) {
18031803
const TreeEdge& edge = sttrees_[netID].edges[edgeID];
@@ -1881,7 +1881,7 @@ void FastRouteCore::copyBR()
18811881
for (const int& netID : net_ids_) {
18821882
const int numEdges = sttrees_[netID].num_edges();
18831883
FrNet* net = nets_[netID];
1884-
const int edgeCost = net->getEdgeCost();
1884+
const int8_t edgeCost = net->getEdgeCost();
18851885

18861886
for (int edgeID = 0; edgeID < numEdges; edgeID++) {
18871887
const TreeEdge& edge = sttrees_[netID].edges[edgeID];

0 commit comments

Comments
 (0)