Skip to content

Commit 6fbe1c4

Browse files
sombraSoftsombraSoft
authored
Merge branch 'master' into dependency-installer-refactor
Signed-off-by: Sombrio <sombrio@sombrasoft.dev>
2 parents 0d4b287 + 66bcec9 commit 6fbe1c4

565 files changed

Lines changed: 83915 additions & 7818 deletions

File tree

Some content is hidden

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

‎.clang-tidy‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ Checks: >
88
-clang-analyzer-cplusplus.NewDeleteLeaks,
99
-clang-analyzer-optin.performance.Padding,
1010
readability-*,
11-
-readability-identifier-naming
11+
-readability-identifier-naming,
1212
-readability-braces-around-statements,
1313
-readability-convert-member-functions-to-static,
1414
-readability-function-cognitive-complexity,

‎.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"

‎BUILD.bazel‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,6 @@ config_setting(
4949

5050
OPENROAD_LIBRARY_DEPS = [
5151
":openroad_version",
52-
":ord",
5352
"//src/ant",
5453
"//src/ant:ui",
5554
"//src/cgt",
@@ -106,6 +105,7 @@ OPENROAD_LIBRARY_DEPS = [
106105
"//src/utl",
107106
"//src/utl:ui",
108107
"@edu_berkeley_abc//:abc-lib",
108+
":ord",
109109
] + select(
110110
{
111111
":platform_cli": ["//src/gui"],
@@ -187,11 +187,11 @@ cc_library(
187187
"include",
188188
],
189189
visibility = ["//visibility:public"],
190-
deps = OPENROAD_LIBRARY_DEPS + [
190+
deps = [
191191
"//src/sta:opensta_lib",
192192
"@boost.stacktrace",
193193
"@tk_tcl//:tcl",
194-
],
194+
] + OPENROAD_LIBRARY_DEPS,
195195
)
196196

197197
cc_library(

‎Jenkinsfile‎

Lines changed: 29 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ def baseTests(String image) {
44
Map base_tests = [failFast: false];
55

66
base_tests['Unit Tests CTest'] = {
7-
withDockerContainer(args: '-u root -t', image: image) {
7+
withDockerContainer(args: '-u root', image: image) {
88
stage('Setup CTest') {
99
echo 'Nothing to be done.';
1010
}
@@ -43,7 +43,7 @@ def baseTests(String image) {
4343
flow_tests.each { current_test ->
4444
base_tests["Flow Test - ${current_test}"] = {
4545
node {
46-
withDockerContainer(args: '-u root -t', image: image) {
46+
withDockerContainer(args: '-u root', image: image) {
4747
stage("Setup ${current_test}") {
4848
sh label: 'Configure git', script: "git config --system --add safe.directory '*'";
4949
checkout scm;
@@ -78,7 +78,7 @@ def getParallelTests(String image) {
7878
def ret = [
7979
'Docs Tester': {
8080
node {
81-
withDockerContainer(args: '-u root -t', image: image) {
81+
withDockerContainer(args: '-u root', image: image) {
8282
stage('Setup Docs Test') {
8383
echo "Setting up Docs Tester environment in ${image}";
8484
sh label: 'Configure git', script: "git config --system --add safe.directory '*'";
@@ -101,7 +101,7 @@ def getParallelTests(String image) {
101101

102102
'Build without GUI': {
103103
node {
104-
withDockerContainer(args: '-u root -t', image: image) {
104+
withDockerContainer(args: '-u root', image: image) {
105105
stage('Setup no-GUI Build') {
106106
echo "Build without GUI";
107107
sh label: 'Configure git', script: "git config --system --add safe.directory '*'";
@@ -118,7 +118,7 @@ def getParallelTests(String image) {
118118

119119
'Build without Test': {
120120
node {
121-
withDockerContainer(args: '-u root -t', image: image) {
121+
withDockerContainer(args: '-u root', image: image) {
122122
stage('Setup no-test Build') {
123123
echo "Build without Tests";
124124
sh label: 'Configure git', script: "git config --system --add safe.directory '*'";
@@ -172,7 +172,7 @@ def getParallelTests(String image) {
172172

173173
'Unit Tests Ninja': {
174174
node {
175-
withDockerContainer(args: '-u root -t', image: image) {
175+
withDockerContainer(args: '-u root', image: image) {
176176
stage('Setup Ninja Tests') {
177177
sh label: 'Configure git', script: "git config --system --add safe.directory '*'";
178178
checkout scm;
@@ -195,7 +195,7 @@ def getParallelTests(String image) {
195195

196196
'Compile with C++20': {
197197
node {
198-
withDockerContainer(args: '-u root -t', image: image) {
198+
withDockerContainer(args: '-u root', image: image) {
199199
stage('Setup C++20 Compile') {
200200
sh label: 'Configure git', script: "git config --system --add safe.directory '*'";
201201
checkout scm;
@@ -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 -t -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
}
@@ -293,4 +298,4 @@ node {
293298
stage('Send Email Report') {
294299
sendEmail();
295300
}
296-
}
301+
}

‎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.

‎etc/DependencyInstaller.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ fi
4444
# ------------------------------------------------------------------------------
4545
# Dependency Versions and Checksums
4646
# ------------------------------------------------------------------------------
47-
YOSYS_VERSION="v0.57"
47+
YOSYS_VERSION="v0.58"
4848
CMAKE_VERSION_BIG="3.31"
4949
CMAKE_VERSION_SMALL="${CMAKE_VERSION_BIG}.9"
5050
CMAKE_CHECKSUM_AARCH64="8d426361ce8c54494c0a041a0e3bcc5c"

‎src/OpenRoad.cc‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -485,13 +485,13 @@ void OpenRoad::writeCdl(const char* out_filename,
485485

486486
void OpenRoad::read3Dbv(const std::string& filename)
487487
{
488-
odb::ThreeDBlox parser(logger_, db_);
488+
odb::ThreeDBlox parser(logger_, db_, sta_);
489489
parser.readDbv(filename);
490490
}
491491

492492
void OpenRoad::read3Dbx(const std::string& filename)
493493
{
494-
odb::ThreeDBlox parser(logger_, db_);
494+
odb::ThreeDBlox parser(logger_, db_, sta_);
495495
parser.readDbx(filename);
496496
}
497497

‎src/cts/src/TritonCTS.cpp‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
#include <cassert>
88
#include <cctype>
99
#include <cmath>
10+
#include <cstdio>
1011
#include <cstring>
1112
#include <ctime>
1213
#include <fstream>

‎src/cts/test/BUILD‎

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,16 @@ MANUAL_TESTS = [
5353
"cts_readme_msgs_check",
5454
]
5555

56+
# TODO: Enable once difference between bazel and ctest is resolved.
57+
MANUAL_FOR_BAZEL_TESTS = [
58+
"array",
59+
"array_ins_delay",
60+
"array_no_blockages",
61+
"array_repair_clock_nets",
62+
"gated_clock4",
63+
"simple_test_hier",
64+
]
65+
5666
ALL_TESTS = COMPULSORY_TESTS + MANUAL_TESTS
5767

5868
filegroup(
@@ -175,7 +185,8 @@ filegroup(
175185
regression_test(
176186
name = test_name,
177187
data = [":" + test_name + "_resources"],
178-
tags = [] if test_name in COMPULSORY_TESTS else ["manual"],
188+
tags = ["manual"] if test_name in MANUAL_TESTS or
189+
test_name in MANUAL_FOR_BAZEL_TESTS else [],
179190
visibility = ["//visibility:public"],
180191
)
181192
for test_name in ALL_TESTS

0 commit comments

Comments
 (0)