Skip to content

Commit

Permalink
Merge branch 'master' into mpl2_boundary
Browse files Browse the repository at this point in the history
  • Loading branch information
AcKoucher committed Feb 23, 2024
2 parents 4bf3344 + 6011bbe commit 82c651d
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 43 deletions.
40 changes: 0 additions & 40 deletions Jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -61,46 +61,6 @@ pipeline {
}
}
}
stage('Docker centos7 gcc') {
agent any;
stages{
stage('Pull centos7') {
steps {
retry(3) {
script {
try {
sh 'docker pull openroad/centos7-dev'
}
catch (err) {
echo err.getMessage();
sh 'sleep 1m ; exit 1';
}
}
}
}
}
stage('Build docker centos7') {
steps {
script {
parallel (
'build gcc': { sh './etc/DockerHelper.sh create -os=centos7 -target=builder -compiler=gcc' },
'build clang': { sh './etc/DockerHelper.sh create -os=centos7 -target=builder -compiler=clang' },
)
}
}
}
stage('Test docker centos7') {
steps {
script {
parallel (
'test gcc': { sh './etc/DockerHelper.sh test -os=centos7 -target=builder -compiler=gcc' },
'test clang': { sh './etc/DockerHelper.sh test -os=centos7 -target=builder -compiler=clang' },
)
}
}
}
}
}
stage('Docker Ubuntu 20.04 gcc') {
agent any;
stages{
Expand Down
12 changes: 9 additions & 3 deletions src/gpl/src/routeBase.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -557,10 +557,16 @@ std::pair<bool, bool> RouteBase::routability()
continue;
}

int idxX = (gCell->dCx() - tg_->lx()) / tg_->tileSizeX();
int idxY = (gCell->dCy() - tg_->ly()) / tg_->tileSizeY();
int idxX = std::min((gCell->dCx() - tg_->lx()) / tg_->tileSizeX(),
tg_->tileCntX() - 1);
int idxY = std::min((gCell->dCy() - tg_->ly()) / tg_->tileSizeY(),
tg_->tileCntY() - 1);

Tile* tile = tg_->tiles()[idxY * tg_->tileCntX() + idxX];
size_t index = idxY * tg_->tileCntX() + idxX;
if (index >= tg_->tiles().size()) {
continue;
}
Tile* tile = tg_->tiles()[index];

// Don't care when inflRatio <= 1
if (tile->inflatedRatio() <= 1.0) {
Expand Down

0 comments on commit 82c651d

Please sign in to comment.