Skip to content

Commit 4e3e6e3

Browse files
authored
Merge branch 'The-OpenROAD-Project:master' into gui_fix_through_in_timing_widget
2 parents 187eb10 + 88fbf65 commit 4e3e6e3

File tree

171 files changed

+6686
-5990
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

171 files changed

+6686
-5990
lines changed

.github/dependabot.yml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,3 @@ updates:
44
directory: "/"
55
schedule:
66
interval: "daily"
7-
- package-ecosystem: "gitsubmodule"
8-
directory: "/"
9-
schedule:
10-
interval: "daily"

.github/workflows/github-actions-clang-tidy.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
uses: The-OpenROAD-Project/clang-tidy-review@master
1818
id: review
1919
with:
20-
clang_tidy_version: 15
20+
clang_tidy_version: 19
2121
build_dir: "./build"
2222
cmake_command: cmake . -B build
2323
config_file: ".clang-tidy"

Jenkinsfile

Lines changed: 21 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -217,28 +217,33 @@ def bazelTest = {
217217
checkout scm;
218218
sh label: 'Setup Docker Image', script: 'docker build -f docker/Dockerfile.bazel -t openroad/bazel-ci .';
219219
}
220-
withDockerContainer(args: '-u root -v /var/run/docker.sock:/var/run/docker.sock', image: 'openroad/bazel-ci:latest') {
221-
stage('bazelisk test ...') {
222-
withCredentials([string(credentialsId: 'bazel-auth-token-b64', variable: 'BAZEL_AUTH_TOKEN_B64')]) {
223-
timeout(time: 120, unit: 'MINUTES') {
224-
def cmd = 'bazelisk test --config=ci --show_timestamps --test_output=errors --curses=no --force_pic --remote_header="Authorization=Basic $BAZEL_AUTH_TOKEN_B64" --profile=build.profile'
225-
try {
226-
try {
227-
sh label: 'Test, using cached results and building a minimum of dependencies', script: cmd + ' ...';
228-
} finally {
229-
sh label: 'Analyze build times', script: 'bazelisk analyze-profile build.profile';
230-
}
231-
} catch (e) {
232-
currentBuild.result = 'FAILURE';
220+
try {
221+
withDockerContainer(args: '-u root -v /var/run/docker.sock:/var/run/docker.sock', image: 'openroad/bazel-ci:latest') {
222+
stage('bazelisk test ...') {
223+
withCredentials([string(credentialsId: 'bazel-auth-token-b64', variable: 'BAZEL_AUTH_TOKEN_B64')]) {
224+
timeout(time: 120, unit: 'MINUTES') {
225+
def cmd = 'bazelisk test --config=ci --show_timestamps --test_output=errors --curses=no --force_pic --remote_header="Authorization=Basic $BAZEL_AUTH_TOKEN_B64" --profile=build.profile'
233226
try {
234-
sh label: 'Test (keep_going)', script: cmd + ' --keep_going ...';
235-
} finally {
236-
sh label: 'Analyze build times', script: 'bazelisk analyze-profile build.profile';
227+
try {
228+
sh label: 'Test, using cached results and building a minimum of dependencies', script: cmd + ' ...';
229+
} finally {
230+
sh label: 'Analyze build times', script: 'bazelisk analyze-profile build.profile';
231+
}
232+
} catch (e) {
233+
try {
234+
sh label: 'Test (keep_going)', script: cmd + ' --keep_going ...';
235+
} catch (e2) {
236+
currentBuild.result = 'FAILURE';
237+
} finally {
238+
sh label: 'Analyze build times', script: 'bazelisk analyze-profile build.profile';
239+
}
237240
}
238241
}
239242
}
240243
}
241244
}
245+
} catch (IOException e) {
246+
echo "Caught: ${e}";
242247
}
243248
}
244249
}

MODULE.bazel

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -162,10 +162,10 @@ orfs = use_extension("@bazel-orfs//:extension.bzl", "orfs_repositories")
162162
# To bump version, run: bazelisk run @bazel-orfs//:bump
163163
orfs.default(
164164
# Official image https://hub.docker.com/r/openroad/orfs/tags
165-
image = "docker.io/openroad/orfs:v3.0-3911-g99312fa58",
165+
image = "docker.io/openroad/orfs:v3.0-3998-gb31abb52d",
166166
# Use OpenROAD of this repo instead of from the docker image
167167
openroad = "//:openroad",
168-
sha256 = "36d3ac23732803c9e47181e167a105c69d4d6927a96782c4a4a27ceca40d8ff8",
168+
sha256 = "dc40b4a466dcc394b542f2189422ca1c5480c223926fd7a6844211e23a129117",
169169
)
170170
use_repo(orfs, "com_github_nixos_patchelf_download")
171171
use_repo(orfs, "docker_orfs")

MODULE.bazel.lock

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/cut/src/abc_library_factory.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
#include "db_sta/dbNetwork.hh"
1515
#include "db_sta/dbSta.hh"
1616
#include "sta/TimingModel.hh"
17+
#include "utl/Logger.h"
1718
// Poor include definitions in ABC
1819
// clang-format off
1920
#include "misc/st/st.h"

src/cut/src/logic_extractor.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
#include "sta/NetworkClass.hh"
2121
#include "sta/PortDirection.hh"
2222
#include "sta/SearchPred.hh"
23+
#include "utl/Logger.h"
2324

2425
namespace cut {
2526

src/dft/src/cells/ScanCellFactory.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
#include "sta/Liberty.hh"
2020
#include "sta/NetworkClass.hh"
2121
#include "sta/Sequential.hh"
22+
#include "utl/Logger.h"
2223

2324
namespace dft {
2425

src/dft/src/utils/Utils.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
#include "sta/Liberty.hh"
1818
#include "sta/NetworkClass.hh"
1919
#include "sta/SdcClass.hh"
20+
#include "utl/Logger.h"
2021

2122
namespace dft::utils {
2223

src/dpl/include/dpl/Opendp.h

Lines changed: 12 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -29,11 +29,6 @@ namespace dpl {
2929

3030
using utl::Logger;
3131

32-
using odb::dbDatabase;
33-
using odb::dbMaster;
34-
using odb::dbMasterType;
35-
using odb::dbTechLayer;
36-
3732
class Node;
3833
class Group;
3934
class Master;
@@ -73,7 +68,7 @@ struct GridPt;
7368
struct DbuPt;
7469
struct DbuRect;
7570

76-
using dbMasterSeq = std::vector<dbMaster*>;
71+
using dbMasterSeq = std::vector<odb::dbMaster*>;
7772

7873
using IRDropByPoint = std::map<odb::Point, double>;
7974
struct GapInfo;
@@ -84,7 +79,7 @@ struct IRDrop;
8479
class Opendp
8580
{
8681
public:
87-
Opendp(dbDatabase* db, Logger* logger);
82+
Opendp(odb::dbDatabase* db, Logger* logger);
8883
~Opendp();
8984

9085
Opendp(const Opendp&) = delete;
@@ -101,7 +96,7 @@ class Opendp
10196
void reportLegalizationStats() const;
10297

10398
void setPaddingGlobal(int left, int right);
104-
void setPadding(dbMaster* master, int left, int right);
99+
void setPadding(odb::dbMaster* master, int left, int right);
105100
void setPadding(odb::dbInst* inst, int left, int right);
106101
void setDebug(std::unique_ptr<dpl::DplObserver>& observer);
107102

@@ -120,7 +115,7 @@ class Opendp
120115
void optimizeMirroring();
121116

122117
// Place decap cells
123-
void addDecapMaster(dbMaster* decap_master, double decap_cap);
118+
void addDecapMaster(odb::dbMaster* decap_master, double decap_cap);
124119
void insertDecapCells(double target, IRDropByPoint& psm_ir_drops);
125120

126121
// Get the instance adjacent to the left or right of a given instance
@@ -150,7 +145,7 @@ class Opendp
150145
// gap -> sequence of masters to fill the gap
151146
using GapFillers = std::vector<dbMasterSeq>;
152147

153-
using MasterByImplant = std::map<dbTechLayer*, dbMasterSeq>;
148+
using MasterByImplant = std::map<odb::dbTechLayer*, dbMasterSeq>;
154149

155150
using YCoordToGap = std::map<DbuY, std::vector<GapInfo*>>;
156151

@@ -278,7 +273,7 @@ class Opendp
278273
dbMasterSeq filterFillerMasters(const dbMasterSeq& filler_masters) const;
279274
MasterByImplant splitByImplant(const dbMasterSeq& filler_masters);
280275
void setGridCells();
281-
dbMasterSeq& gapFillers(dbTechLayer* implant,
276+
dbMasterSeq& gapFillers(odb::dbTechLayer* implant,
282277
GridX gap,
283278
const MasterByImplant& filler_masters_by_implant);
284279
void placeRowFillers(GridY row,
@@ -292,7 +287,9 @@ class Opendp
292287
std::vector<int> findDecapCellIndices(const DbuX& gap_width,
293288
const double& current,
294289
const double& target);
295-
void insertDecapInPos(dbMaster* master, const DbuX& pos_x, const DbuY& pos_y);
290+
void insertDecapInPos(odb::dbMaster* master,
291+
const DbuX& pos_x,
292+
const DbuY& pos_y);
296293
void insertDecapInRow(const std::vector<GapInfo*>& gaps,
297294
DbuY gap_y,
298295
DbuX irdrop_x,
@@ -309,7 +306,7 @@ class Opendp
309306
void setGridLoc(Node* cell, GridX x, GridY y);
310307

311308
Logger* logger_ = nullptr;
312-
dbDatabase* db_ = nullptr;
309+
odb::dbDatabase* db_ = nullptr;
313310
odb::dbBlock* block_ = nullptr;
314311
odb::Rect core_;
315312

@@ -331,8 +328,8 @@ class Opendp
331328

332329
// Filler placement.
333330
// gap (in sites) -> seq of masters by implant
334-
std::map<dbTechLayer*, GapFillers> gap_fillers_;
335-
std::map<dbMaster*, int> filler_count_;
331+
std::map<odb::dbTechLayer*, GapFillers> gap_fillers_;
332+
std::map<odb::dbMaster*, int> filler_count_;
336333
bool have_fillers_ = false;
337334

338335
// Decap placement.

0 commit comments

Comments
 (0)