Skip to content

Commit 6ce01e7

Browse files
committed
Merge branch 'master' into mbff
2 parents 3cf956c + 83ff256 commit 6ce01e7

File tree

149 files changed

+9433
-4096
lines changed

Some content is hidden

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

149 files changed

+9433
-4096
lines changed

.gitignore

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -57,10 +57,7 @@ obj-x86_64-linux-gnu/
5757

5858
user.bazelrc
5959

60-
bazel-bin
61-
bazel-out
62-
bazel-testlogs
63-
bazel-OpenROAD
60+
bazel-*
6461

6562
projectview.bazelproject
6663
.bsp/

MODULE.bazel

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -91,6 +91,13 @@ bazel_dep(name = "tcmalloc", version = "0.0.0-20250331-43fcf6e")
9191
bazel_dep(name = "zlib", version = "1.3.1.bcr.5")
9292
bazel_dep(name = "yaml-cpp", version = "0.8.0")
9393

94+
# Use HEAD of master upstream to fix bugs such as missing stdint include
95+
git_override(
96+
module_name = "yaml-cpp",
97+
commit = "a83cd31548b19d50f3f983b069dceb4f4d50756d",
98+
remote = "https://github.com/jbeder/yaml-cpp.git",
99+
)
100+
94101
# A from source build of QT that allows it to link into OpenROAD.
95102
# Building like any other bazel project. scripts in the docker folder
96103
# of this project generate stubs .ifso for things like X11 that will
@@ -111,7 +118,7 @@ bazel_dep(name = "abseil-cpp", version = "20240722.0", repo_name = "com_google_a
111118
# BCR, they should depend on their own version.
112119
bazel_dep(name = "glpk", version = "5.0.bcr.3", repo_name = "org_gnu_glpk")
113120

114-
## Fix the compiler version and avoid any local compiler
121+
## Lock the compiler version and avoid any local compiler
115122
bazel_dep(name = "toolchains_llvm", version = "1.5.0")
116123

117124
# Configure and register the toolchain.
@@ -155,7 +162,7 @@ bazel_dep(name = "bazel-orfs")
155162
# To bump version, run: bazelisk run @bazel-orfs//:bump
156163
git_override(
157164
module_name = "bazel-orfs",
158-
commit = "677ecf4bb7195903bb58beae171d254dac984e27",
165+
commit = "aacba96353744e059284a40175b74934a370e5c0",
159166
remote = "https://github.com/The-OpenROAD-Project/bazel-orfs.git",
160167
)
161168

@@ -164,10 +171,10 @@ orfs = use_extension("@bazel-orfs//:extension.bzl", "orfs_repositories")
164171
# To bump version, run: bazelisk run @bazel-orfs//:bump
165172
orfs.default(
166173
# Official image https://hub.docker.com/r/openroad/orfs/tags
167-
image = "docker.io/openroad/orfs:v3.0-4048-g3e652e573",
174+
image = "docker.io/openroad/orfs:v3.0-4076-gf94bb8c31",
168175
# Use OpenROAD of this repo instead of from the docker image
169176
openroad = "//:openroad",
170-
sha256 = "1950de791a90b9cf62e7a04a9a9650c4a4eb8e342f7620c10917999040be28ee",
177+
sha256 = "3338a59012776ed939a3d4e66fc2609ac68d2c7f588a4563ed9ca7cefd913faf",
171178
)
172179
use_repo(orfs, "com_github_nixos_patchelf_download")
173180
use_repo(orfs, "docker_orfs")

MODULE.bazel.lock

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

include/ord/InitOpenRoad.hh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@
33

44
#pragma once
55

6-
#include <tcl.h>
7-
86
#include <string>
97

8+
#include "tcl.h"
9+
1010
namespace ord {
1111

1212
// Call this inside of Tcl_Main.

src/Design.cc

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,6 @@
33

44
#include "ord/Design.h"
55

6-
#include <tcl.h>
7-
86
#include <cmath>
97
#include <cstdint>
108
#include <istream>
@@ -20,6 +18,7 @@
2018
#include "odb/db.h"
2119
#include "ord/OpenRoad.hh"
2220
#include "ord/Tech.h"
21+
#include "tcl.h"
2322
#include "utl/Logger.h"
2423

2524
namespace ord {

src/Main.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
#include <libgen.h>
55
#include <stdlib.h> // NOLINT(modernize-deprecated-headers): for setenv()
66
#include <strings.h>
7-
#include <tcl.h>
87

98
#include <array>
109
#include <climits>
@@ -19,6 +18,7 @@
1918
#include <system_error>
2019

2120
#include "boost/stacktrace/stacktrace.hpp"
21+
#include "tcl.h"
2222
#ifdef ENABLE_READLINE
2323
// If you get an error on this include be sure you have
2424
// the package tcl-tclreadline-devel installed

src/OpenRoad.cc

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,6 @@
33

44
#include "ord/OpenRoad.hh"
55

6-
#include <tcl.h>
7-
86
#include <cstdlib>
97
#include <cstring>
108
#include <filesystem>
@@ -16,6 +14,7 @@
1614
#include <vector>
1715

1816
#include "ord/Version.hh"
17+
#include "tcl.h"
1918
#ifdef ENABLE_PYTHON3
2019
#define PY_SSIZE_T_CLEAN
2120
#include "Python.h"

src/Tech.cc

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,6 @@
33

44
#include "ord/Tech.h"
55

6-
#include <tcl.h>
7-
86
#include <string>
97

108
#include "db_sta/dbNetwork.hh"
@@ -15,6 +13,7 @@
1513
#include "sta/Liberty.hh"
1614
#include "sta/MinMax.hh"
1715
#include "sta/Units.hh"
16+
#include "tcl.h"
1817

1918
namespace ord {
2019

src/Timing.cc

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,6 @@
33

44
#include "ord/Timing.h"
55

6-
#include <tcl.h>
7-
86
#include <algorithm>
97
#include <array>
108
#include <cstring>

src/ant/include/ant/MakeAntennaChecker.hh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
#pragma once
55

6-
#include <tcl.h>
6+
#include "tcl.h"
77

88
namespace ant {
99

0 commit comments

Comments
 (0)