Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 2 additions & 5 deletions src/gui/src/renderThread.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -325,7 +325,6 @@ void RenderThread::drawTracks(dbTechLayer* layer,
painter->setBrush(Qt::NoBrush);

bool is_horizontal = layer->getDirection() == dbTechLayerDir::HORIZONTAL;
std::vector<int> grids;
if ((!is_horizontal && viewer_->options_->arePrefTracksVisible())
|| (is_horizontal && viewer_->options_->areNonPrefTracksVisible())) {
bool show_grid = true;
Expand All @@ -336,8 +335,7 @@ void RenderThread::drawTracks(dbTechLayer* layer,
}

if (show_grid) {
grid->getGridX(grids);
for (int x : grids) {
for (int x : grid->getGridX()) {
if (restart_) {
break;
}
Expand All @@ -362,8 +360,7 @@ void RenderThread::drawTracks(dbTechLayer* layer,
}

if (show_grid) {
grid->getGridY(grids);
for (int y : grids) {
for (int y : grid->getGridY()) {
if (restart_) {
break;
}
Expand Down
2 changes: 2 additions & 0 deletions src/odb/include/odb/db.h
Original file line number Diff line number Diff line change
Expand Up @@ -3728,11 +3728,13 @@ class dbTrackGrid : public dbObject
/// Get the "X" track coordinates for a this tech-layer.
///
void getGridX(std::vector<int>& x_grid);
const std::vector<int>& getGridX();

///
/// Get the "Y" track coordinates for a this tech-layer.
///
void getGridY(std::vector<int>& y_grid);
const std::vector<int>& getGridY();

///
/// Get the block this grid belongs too.
Expand Down
109 changes: 67 additions & 42 deletions src/odb/src/db/dbTrackGrid.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
#include "odb/db.h"
#include "odb/dbSet.h"
#include "odb/dbTypes.h"
#include "odb/odb.h"
#include "utl/Logger.h"

namespace odb {
Expand Down Expand Up @@ -83,72 +84,92 @@ dbTechLayer* dbTrackGrid::getTechLayer()
return (dbTechLayer*) tech->_layer_tbl->getPtr(grid->_layer);
}

void dbTrackGrid::getGridX(std::vector<int>& x_grid)
const std::vector<int>& dbTrackGrid::getGridX()
{
x_grid.clear();

_dbTrackGrid* grid = (_dbTrackGrid*) this;

uint i;
if (grid->grid_x_.empty()) {
uint i;

for (i = 0; i < grid->_x_origin.size(); ++i) {
int j;
for (i = 0; i < grid->_x_origin.size(); ++i) {
int j;

int x = grid->_x_origin[i];
int count = grid->_x_count[i];
int step = grid->_x_step[i];
int x = grid->_x_origin[i];
int count = grid->_x_count[i];
int step = grid->_x_step[i];

for (j = 0; j < count; ++j) {
x_grid.push_back(x);
x += step;
for (j = 0; j < count; ++j) {
grid->grid_x_.push_back(x);
x += step;
}
}
}

// empty grid
if (x_grid.begin() == x_grid.end()) {
return;
}
// empty grid
if (grid->grid_x_.begin() == grid->grid_x_.end()) {
return grid->grid_x_;
}

// sort coords in asscending order
std::sort(x_grid.begin(), x_grid.end());
// sort coords in asscending order
std::sort(grid->grid_x_.begin(), grid->grid_x_.end());

// remove any duplicates
auto new_end = std::unique(x_grid.begin(), x_grid.end());
x_grid.erase(new_end, x_grid.end());
// remove any duplicates
auto new_end = std::unique(grid->grid_x_.begin(), grid->grid_x_.end());
grid->grid_x_.erase(new_end, grid->grid_x_.end());
}

return grid->grid_x_;
}

void dbTrackGrid::getGridY(std::vector<int>& y_grid)
void dbTrackGrid::getGridX(std::vector<int>& x_grid)
{
y_grid.clear();
const std::vector<int>& grid = getGridX();
x_grid.clear();
x_grid.reserve(grid.size());
x_grid.insert(x_grid.end(), grid.begin(), grid.end());
}

const std::vector<int>& dbTrackGrid::getGridY()
{
_dbTrackGrid* grid = (_dbTrackGrid*) this;

uint i;
if (grid->grid_y_.empty()) {
uint i;

for (i = 0; i < grid->_y_origin.size(); ++i) {
int j;
for (i = 0; i < grid->_y_origin.size(); ++i) {
int j;

int y = grid->_y_origin[i];
int count = grid->_y_count[i];
int step = grid->_y_step[i];
int y = grid->_y_origin[i];
int count = grid->_y_count[i];
int step = grid->_y_step[i];

for (j = 0; j < count; ++j) {
y_grid.push_back(y);
y += step;
for (j = 0; j < count; ++j) {
grid->grid_y_.push_back(y);
y += step;
}
}
}

// empty grid
if (y_grid.begin() == y_grid.end()) {
return;
// empty grid
if (grid->grid_y_.begin() == grid->grid_y_.end()) {
return grid->grid_y_;
}

// sort coords in asscending order
std::sort(grid->grid_y_.begin(), grid->grid_y_.end());

// remove any duplicates
auto new_end = std::unique(grid->grid_y_.begin(), grid->grid_y_.end());
grid->grid_y_.erase(new_end, grid->grid_y_.end());
}

// sort coords in asscending order
std::sort(y_grid.begin(), y_grid.end());
return grid->grid_y_;
}

// remove any duplicates
auto new_end = std::unique(y_grid.begin(), y_grid.end());
y_grid.erase(new_end, y_grid.end());
void dbTrackGrid::getGridY(std::vector<int>& y_grid)
{
const std::vector<int>& grid = getGridY();
y_grid.clear();
y_grid.reserve(grid.size());
y_grid.insert(y_grid.end(), grid.begin(), grid.end());
}

dbBlock* dbTrackGrid::getBlock()
Expand All @@ -168,6 +189,8 @@ void dbTrackGrid::addGridPatternX(int origin_x,
grid->_x_step.push_back(step);
grid->_first_mask.push_back(first_mask);
grid->_samemask.push_back(samemask);

grid->grid_x_.clear();
}

void dbTrackGrid::addGridPatternY(int origin_y,
Expand All @@ -182,6 +205,8 @@ void dbTrackGrid::addGridPatternY(int origin_y,
grid->_y_step.push_back(step);
grid->_first_mask.push_back(first_mask);
grid->_samemask.push_back(samemask);

grid->grid_y_.clear();
}

int dbTrackGrid::getNumGridPatternsX()
Expand Down
6 changes: 6 additions & 0 deletions src/odb/src/db/dbTrackGrid.h
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@

#pragma once

#include <vector>

#include "dbCore.h"
#include "dbDatabase.h"
#include "dbVector.h"
Expand Down Expand Up @@ -31,6 +33,10 @@ class _dbTrackGrid : public _dbObject
dbVector<bool> _samemask;
dbId<_dbTechLayer> _next_grid;

// Transient
std::vector<int> grid_x_;
std::vector<int> grid_y_;

_dbTrackGrid(_dbDatabase*, const _dbTrackGrid& g);
_dbTrackGrid(_dbDatabase*);
~_dbTrackGrid();
Expand Down
9 changes: 2 additions & 7 deletions src/pad/src/RDLRouter.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1206,18 +1206,13 @@ void RDLRouter::makeGraph()

graph_weight_ = boost::get(boost::edge_weight, graph_);

std::vector<int> x_grid;
std::vector<int> y_grid;

odb::dbTrackGrid* tracks = block_->findTrackGrid(layer_);
tracks->getGridX(x_grid);
tracks->getGridY(y_grid);

// filter grid points based on spacing requirements
const int pitch = width_ + spacing_ - 1;
const int start = width_ / 2 + 1;
x_grid_.clear();
for (const auto& x : x_grid) {
for (const auto& x : tracks->getGridX()) {
bool add = false;
if (x_grid_.empty()) {
if (x >= start) {
Expand All @@ -1234,7 +1229,7 @@ void RDLRouter::makeGraph()
}
}
y_grid_.clear();
for (const auto& y : y_grid) {
for (const auto& y : tracks->getGridY()) {
bool add = false;
if (y_grid_.empty()) {
if (y >= start) {
Expand Down
6 changes: 3 additions & 3 deletions src/pdn/src/techlayer.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -47,11 +47,11 @@ void TechLayer::populateGrid(odb::dbBlock* block, odb::dbTechLayerDir dir)

auto* tracks = block->findTrackGrid(layer_);
if (dir == odb::dbTechLayerDir::HORIZONTAL) {
tracks->getGridY(grid_);
grid_ = tracks->getGridY();
Copy link
Member

Choose a reason for hiding this comment

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

You are making a copy here fwiw

} else if (dir == odb::dbTechLayerDir::VERTICAL) {
tracks->getGridX(grid_);
grid_ = tracks->getGridX();
} else {
tracks->getGridY(grid_);
grid_ = tracks->getGridY();
}
}

Expand Down