Skip to content

Commit 1e4dc2f

Browse files
committed
Merge remote-tracking branch 'origin/master' into pad-corner-check-overlaps
2 parents 625007a + ed7fd37 commit 1e4dc2f

File tree

292 files changed

+83447
-104236
lines changed

Some content is hidden

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

292 files changed

+83447
-104236
lines changed

.bazelrc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ common --incompatible_disallow_empty_glob
1414

1515
build --cxxopt "-std=c++17" --host_cxxopt "-std=c++17"
1616
build --cxxopt "-xc++" --host_cxxopt "-xc++"
17+
build --cxxopt "-DBAZEL_BUILD" --host_cxxopt "-DBAZEL_BUILD"
1718

1819
# Needed for floating point stability in FFT (fft_test will check this).
1920
# See also https://kristerw.github.io/2021/11/09/fp-contract/

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ jobs:
1717
uses: The-OpenROAD-Project/clang-tidy-review@master
1818
id: review
1919
with:
20+
clang_tidy_version: 15
2021
build_dir: "./build"
2122
cmake_command: cmake . -B build
2223
config_file: ".clang-tidy"

Jenkinsfile

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -223,11 +223,18 @@ def bazelTest = {
223223
timeout(time: 120, unit: 'MINUTES') {
224224
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'
225225
try {
226-
sh label: 'Bazel Build', script: cmd + ' ...';
227-
sh label: 'Bazel Build', script: 'bazelisk analyze-profile build.profile';
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+
}
228231
} catch (e) {
229232
currentBuild.result = 'FAILURE';
230-
sh label: 'Bazel Build (keep_going)', script: cmd + ' --keep_going ...';
233+
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';
237+
}
231238
}
232239
}
233240
}

MODULE.bazel

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,6 @@ bazel_dep(name = "boost.smart_ptr", version = BOOST_VERSION)
7979
bazel_dep(name = "boost.spirit", version = BOOST_VERSION)
8080
bazel_dep(name = "boost.stacktrace", version = BOOST_VERSION)
8181
bazel_dep(name = "boost.system", version = BOOST_VERSION)
82-
bazel_dep(name = "boost.test", version = BOOST_VERSION + ".bcr.1")
8382
bazel_dep(name = "boost.thread", version = BOOST_VERSION + ".bcr.2")
8483
bazel_dep(name = "boost.tokenizer", version = BOOST_VERSION)
8584
bazel_dep(name = "boost.unordered", version = BOOST_VERSION)
@@ -104,7 +103,7 @@ git_override(
104103
remote = "https://github.com/The-OpenROAD-Project/qt_bazel_prebuilts",
105104
)
106105

107-
bazel_dep(name = "googletest", version = "1.16.0", dev_dependency = True)
106+
bazel_dep(name = "googletest", version = "1.17.0", dev_dependency = True)
108107

109108
# Dependencies needed by one of the rules_hdl repos. Once they are on
110109
# BCR, they should depend on their own version.
@@ -154,7 +153,7 @@ bazel_dep(name = "bazel-orfs")
154153
# To bump version, run: bazelisk run @bazel-orfs//:bump
155154
git_override(
156155
module_name = "bazel-orfs",
157-
commit = "da01065203fbcc043c82318b544fbe111053b9d0",
156+
commit = "2aa6a9dd3c0006c5358e363fcac9e209c4dccc47",
158157
remote = "https://github.com/The-OpenROAD-Project/bazel-orfs.git",
159158
)
160159

@@ -163,10 +162,10 @@ orfs = use_extension("@bazel-orfs//:extension.bzl", "orfs_repositories")
163162
# To bump version, run: bazelisk run @bazel-orfs//:bump
164163
orfs.default(
165164
# Official image https://hub.docker.com/r/openroad/orfs/tags
166-
image = "docker.io/openroad/orfs:v3.0-3872-g66e441c6c",
165+
image = "docker.io/openroad/orfs:v3.0-3911-g99312fa58",
167166
# Use OpenROAD of this repo instead of from the docker image
168167
openroad = "//:openroad",
169-
sha256 = "f75321f10023a8bf99b1ed5dfe1dab6351f588eda24f186a66e9145fd9b76fd1",
168+
sha256 = "36d3ac23732803c9e47181e167a105c69d4d6927a96782c4a4a27ceca40d8ff8",
170169
)
171170
use_repo(orfs, "com_github_nixos_patchelf_download")
172171
use_repo(orfs, "docker_orfs")

MODULE.bazel.lock

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

bazel/BUILD

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
load("@openroad_rules_python//python:pip.bzl", "compile_pip_requirements")
22
load("@rules_cc//cc:cc_library.bzl", "cc_library")
33

4+
package(features = ["layering_check"])
5+
46
compile_pip_requirements(
57
name = "requirements",
68
src = "requirements.in",

bazel/openmp/BUILD

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414

1515
package(
1616
default_visibility = ["//visibility:private"],
17+
features = ["layering_check"],
1718
)
1819

1920
exports_files(

bazel/openmp/bundled.BUILD.bazel

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,6 @@ cc_library(
8686
"runtime/src/ompt-general.cpp",
8787
"runtime/src/ompt-internal.h",
8888
"runtime/src/ompt-specific.h",
89-
"runtime/src/test-touch.c",
9089
"runtime/src/z_Linux_asm.S",
9190
"runtime/src/z_Linux_util.cpp",
9291
] + [

default.nix

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@
3838
stdenv,
3939
overrideSDK,
4040
git,
41+
yaml-cpp,
4142
}: let
4243
or-tools' =
4344
(or-tools.override {
@@ -111,6 +112,7 @@
111112
cbc
112113
re2
113114
gtest
115+
yaml-cpp
114116
];
115117

116118
nativeBuildInputs = [

docs/user/Bazel.md

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -359,3 +359,13 @@ This will:
359359
- launch the GUI opening gui_final gcd
360360

361361
`bazelisk run test/orfs/gcd:gcd_final` run alone would create the `/tmp/gcd` folder and the arguments. The arguments after `--` are forwarded to the `/tmp/gcd/make` script that invokes make with the gcd ORFS project set up in `/tmp/gcd/_main/config.mk`.
362+
363+
## Hacking ORFS with `//test/orfs/gcd:gcd_test` test case
364+
365+
First create a local work folder with all dependencies for the step that you want to work on:
366+
367+
bazelisk run //test/orfs/gcd:gcd_floorplan_deps /tmp/floorplan
368+
369+
Now run make directly with the `/tmp/floorplan/_main` work folder, but be sure to use the `do-` targets that side-step ORFS make dependency checking:
370+
371+
make --file ~/OpenROAD-flow-scripts/flow/Makefile --dir /tmp/floorplan/_main DESIGN_CONFIG=config.mk do-floorplan

0 commit comments

Comments
 (0)