Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Rcx grid #6807

Merged
merged 21 commits into from
Mar 4, 2025
Merged

Rcx grid #6807

merged 21 commits into from
Mar 4, 2025

Conversation

openroad-ci
Copy link
Collaborator

No description provided.

maliberty added 19 commits March 3, 2025 21:35
@maliberty
rcx: rm unused Ath__searchBox methods
a4935bd 
Signed-off-by: Matt Liberty <mliberty@precisioninno.com>
@maliberty
rcx: const methods in Ath__searchBox
3417ba7 
Signed-off-by: Matt Liberty <mliberty@precisioninno.com>
@maliberty
rcx: rm declared but not defined in Ath__wire
29c6c7f 
Signed-off-by: Matt Liberty <mliberty@precisioninno.com>
@maliberty
rcx: rm unused Ath__gridTable ctors + misc cleanup
d1e44f0 
Signed-off-by: Matt Liberty <mliberty@precisioninno.com>
@maliberty
rcx: rm dead args to Ath__gridTable ctor
fa2b4da 
Signed-off-by: Matt Liberty <mliberty@precisioninno.com>
@maliberty
rcx: inline Ath__GridTable::init1
deab8d6 
Signed-off-by: Matt Liberty <mliberty@precisioninno.com>
@maliberty
rcx: const Ath__gridTable and misc refactor
d4897f7 
Signed-off-by: Matt Liberty <mliberty@precisioninno.com>
@maliberty
rcx: rename Ath__gridTable -> GridTable
555978a 
Signed-off-by: Matt Liberty <mliberty@precisioninno.com>
@maliberty
rcx: rename Ath__grid -> Grid
6013ad6 
Signed-off-by: Matt Liberty <mliberty@precisioninno.com>
@maliberty
rcx: rename Ath__track -> Track
c0621b0 
Signed-off-by: Matt Liberty <mliberty@precisioninno.com>
@maliberty
rcx: rename Ath__wire -> Wire
d110cfd 
Signed-off-by: Matt Liberty <mliberty@precisioninno.com>
@maliberty
rcx: rename Ath__searchBox -> SearchBox
e42489b 
Signed-off-by: Matt Liberty <mliberty@precisioninno.com>
@maliberty
rcx: rename Ath__overlapAdjust -> OverlapAdjust
7314923 
Signed-off-by: Matt Liberty <mliberty@precisioninno.com>
@maliberty
rcx: rename Ath__box -> Box
12bd092 
Signed-off-by: Matt Liberty <mliberty@precisioninno.com>
@maliberty
rcx: rm schema from grids
e5da676 
Signed-off-by: Matt Liberty <mliberty@precisioninno.com>
@maliberty
rcx: rm unused Grid ctor
494f13d 
Signed-off-by: Matt Liberty <mliberty@precisioninno.com>
@maliberty
rcx: rm unused methods and files in GridTable
8b3157f 
Signed-off-by: Matt Liberty <mliberty@precisioninno.com>
@maliberty
rcx: rm unused Grid::_level
367bef3 
Signed-off-by: Matt Liberty <mliberty@precisioninno.com>
@maliberty
rcx: rm unused Grid fields _widthTable and _shiftTable
c544186 
Signed-off-by: Matt Liberty <mliberty@precisioninno.com>
@maliberty
rcx: clang-format
858fdcd 
Signed-off-by: Matt Liberty <mliberty@precisioninno.com>
github-actions[bot]
github-actions bot reviewed Mar 4, 2025
View reviewed changes
Copy link
Contributor

@github-actions github-actions bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

clang-tidy made some suggestions

There were too many comments to post at once. Showing the first 25 out of 58. Check the log or trigger a new build to see more.

src/rcx/include/rcx/extMeasureRC.h
@@ -419,7 +419,7 @@ class extMeasureRC : public extMeasure
int metUnder,
const char* prefix = "");
void GetOUname(char buf[20], int met, int metOver, int metUnder);
void PrintCrossOvelaps(Ath__wire* w,
void PrintCrossOvelaps(Wire* w,
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

warning: function 'rcx::extMeasureRC::PrintCrossOvelaps' has a definition with different parameter names [readability-inconsistent-declaration-parameter-name]

  void PrintCrossOvelaps(Wire* w,
       ^
Additional context

src/rcx/src/extmeasure_print.cpp:106: the definition seen here

void extMeasureRC::PrintCrossOvelaps(Wire* w,
                   ^

src/rcx/include/rcx/extMeasureRC.h:421: differing parameters are named here: ('x2'), in definition: ('len')

  void PrintCrossOvelaps(Wire* w,
       ^

src/rcx/include/rcx/extMeasureRC.h
@@ -991,19 +991,19 @@
// void PrintCrossSeg(FILE *fp, int x1, int x2, int met, int metOver, int
// metUnder, const char *prefix="");
// void GetOUname(char buf[20], int met, int metOver, int metUnder);
bool GetCrossOvelaps(Ath__wire* w,
bool GetCrossOvelaps(Wire* w,
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

warning: function 'rcx::extMeasureRC::GetCrossOvelaps' has a definition with different parameter names [readability-inconsistent-declaration-parameter-name]

  bool GetCrossOvelaps(Wire* w,
       ^
Additional context

src/rcx/src/extmeasure_couple.cpp:1128: the definition seen here

bool extMeasureRC::GetCrossOvelaps(Wire* w,
                   ^

src/rcx/include/rcx/extMeasureRC.h:993: differing parameters are named here: ('x2'), in definition: ('len')

  bool GetCrossOvelaps(Wire* w,
       ^

src/rcx/include/rcx/grids.h Outdated
uint getDir();
uint getLevel();
uint getDir() const;
uint getLevel() const;
void setDir(int v = -1);
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

warning: function 'rcx::SearchBox::setDir' has a definition with different parameter names [readability-inconsistent-declaration-parameter-name]

  void setDir(int v = -1);
       ^
Additional context

src/rcx/src/grids.cpp:202: the definition seen here

void SearchBox::setDir(int dir)
                ^

src/rcx/include/rcx/grids.h:83: differing parameters are named here: ('v'), in definition: ('dir')

  void setDir(int v = -1);
       ^

src/rcx/include/rcx/grids.h
Wire* makeWire(int* ll, int* ur, uint id, uint* m1);
Wire* makeWire(uint dir, int* ll, int* ur, uint id1, uint id2, uint type = 0);

Wire* makeWire(Wire* w, uint type = 0);
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

warning: function 'rcx::Grid::makeWire' has a definition with different parameter names [readability-inconsistent-declaration-parameter-name]

  Wire* makeWire(Wire* w, uint type = 0);
        ^
Additional context

src/rcx/src/grids.cpp:1626: the definition seen here

Wire* Grid::makeWire(Wire* v, uint type)
            ^

src/rcx/include/rcx/grids.h:394: differing parameters are named here: ('w'), in definition: ('v')

  Wire* makeWire(Wire* w, uint type = 0);
        ^

src/rcx/include/rcx/grids.h
void releaseWire(uint wireId);
Ath__box* maxSearchBox() { return &_maxSearchBox; };
Box* maxSearchBox() { return &_maxSearchBox; };
int xMin();
int xMax();
int yMin();
int yMax();
uint getRowNum(int x);
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

warning: function 'rcx::GridTable::getRowNum' has a definition with different parameter names [readability-inconsistent-declaration-parameter-name]

  uint getRowNum(int x);
       ^
Additional context

src/rcx/src/grids.cpp:2408: the definition seen here

uint GridTable::getRowNum(int y)
                ^

src/rcx/include/rcx/grids.h:561: differing parameters are named here: ('x'), in definition: ('y')

  uint getRowNum(int x);
       ^

src/rcx/src/extmeasure_diag.cpp
if (next_track == NULL)
return NULL;

Ath__wire* first_wire = NULL;
Wire* first_wire = NULL;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

warning: use nullptr [modernize-use-nullptr]

Suggested change
Wire* first_wire = NULL;
Wire* first_wire = nullptr;

src/rcx/src/extmeasure_diag.cpp
if (track == NULL)
continue;

fprintf(fp, "Track %d M%d %s %d \n", tr, jj, vert, track->getBase());
for (Ath__wire* w = track->getNextWire(NULL); w != NULL;
w = w->getNext()) {
for (Wire* w = track->getNextWire(NULL); w != NULL; w = w->getNext()) {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

warning: use nullptr [modernize-use-nullptr]

Suggested change
for (Wire* w = track->getNextWire(NULL); w != NULL; w = w->getNext()) {
for (Wire* w = track->getNextWire(NULL); w != nullptr; w = w->getNext()) {

src/rcx/src/extmeasure_diag.cpp
if (track == NULL)
continue;

fprintf(fp, "Track %d M%d %s %d \n", tr, jj, vert, track->getBase());
for (Ath__wire* w = track->getNextWire(NULL); w != NULL;
w = w->getNext()) {
for (Wire* w = track->getNextWire(NULL); w != NULL; w = w->getNext()) {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

warning: use nullptr [modernize-use-nullptr]

Suggested change
for (Wire* w = track->getNextWire(NULL); w != NULL; w = w->getNext()) {
for (Wire* w = track->getNextWire(nullptr); w != NULL; w = w->getNext()) {

src/rcx/src/extmeasure_diag.cpp
uint ii = track->getGrid()->searchLowMarker();
int first_marker_index = -1;
for (; ii <= track->getGrid()->searchHiMarker(); ii++) {
for (Ath__wire* w = track->getMarker(ii); w != NULL; w = w->getNext()) {
for (Wire* w = track->getMarker(ii); w != NULL; w = w->getNext()) {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

warning: use nullptr [modernize-use-nullptr]

Suggested change
for (Wire* w = track->getMarker(ii); w != NULL; w = w->getNext()) {
for (Wire* w = track->getMarker(ii); w != nullptr; w = w->getNext()) {

src/rcx/src/extmeasure_diag.cpp
w->setNext(w1);
}
}
bool swap = false;
if (tbl.getCnt() <= 1)
return false;
for (uint ii = 0; ii < tbl.getCnt() - 1; ii++) {
Ath__wire* prev = NULL;
Wire* prev = NULL;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

warning: use nullptr [modernize-use-nullptr]

Suggested change
Wire* prev = NULL;
Wire* prev = nullptr;

@maliberty
rcx: misc tidy
d24cb0a 
Signed-off-by: Matt Liberty <mliberty@precisioninno.com>
@maliberty maliberty enabled auto-merge March 4, 2025 07:46
@maliberty maliberty merged commit 1ebf5fc into The-OpenROAD-Project:master Mar 4, 2025
11 checks passed
@maliberty maliberty deleted the rcx-grid branch March 4, 2025 08:46
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@github-actions github-actions[bot] github-actions[bot] left review comments

@maliberty maliberty maliberty approved these changes

Assignees

@maliberty maliberty

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@openroad-ci @maliberty