Skip to content

Commit 42c58b3

Browse files
authored
Merge branch 'The-OpenROAD-Project:master' into gui_timing_widget_bugfix
2 parents 5c21d9a + 88bfc9f commit 42c58b3

Some content is hidden

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

78 files changed

+1458
-181
lines changed

.github/workflows/github-actions-lint-tcl.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,13 +19,13 @@ jobs:
1919
- name: Install Dependencies
2020
run: |
2121
python3 -m venv venv
22-
venv/bin/pip install tclint==0.4.2
22+
venv/bin/pip install tclint==0.6.1
2323
2424
- name: Lint
2525
run: |
2626
source venv/bin/activate
2727
tclfmt --version
2828
tclfmt --in-place .
2929
git diff --exit-code
30-
tclint --no-check-style .
30+
tclint .
3131

BUILD.bazel

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -138,11 +138,13 @@ cc_binary(
138138
name = "openroad",
139139
srcs = [
140140
"src/Main.cc",
141-
"//bazel:runfiles",
142141
],
143142
copts = OPENROAD_COPTS,
144143
features = ["-use_header_modules"],
145-
malloc = "@tcmalloc//tcmalloc",
144+
malloc = select({
145+
"@platforms//os:linux": "@tcmalloc//tcmalloc",
146+
"@platforms//os:macos": "@bazel_tools//tools/cpp:malloc",
147+
}),
146148
visibility = ["//visibility:public"],
147149
deps = [
148150
":openroad_lib",
@@ -155,6 +157,7 @@ cc_binary(
155157
"@boost.stacktrace",
156158
"@rules_cc//cc/runfiles",
157159
"@tk_tcl//:tcl",
160+
"//bazel:runfiles",
158161
],
159162
)
160163

bazel/BUILD

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,4 +16,5 @@ cc_library(
1616
deps = [
1717
"@rules_cc//cc/runfiles",
1818
],
19+
alwayslink = True,
1920
)

bazel/InitRunFiles.cpp

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,11 @@
66
#include <optional>
77
#include <string>
88

9+
#if defined(__APPLE__)
10+
#include <mach-o/dyld.h>
11+
#include <sys/param.h>
12+
#endif
13+
914
#include "rules_cc/cc/runfiles/runfiles.h"
1015

1116
// Avoid adding any dependencies like boost.filesystem
@@ -19,7 +24,7 @@ static std::optional<std::string> getProgramLocation()
1924
char result[MAXPATHLEN + 1] = {'\0'};
2025
uint32_t path_len = MAXPATHLEN;
2126
if (_NSGetExecutablePath(result, &path_len) != 0) {
22-
path_len = readlink("/proc/self/exe", result, MAXPATHLEN);
27+
path_len = readlink(result, result, MAXPATHLEN);
2328
}
2429
#else
2530
char result[PATH_MAX + 1] = {'\0'};

etc/DependencyInstaller.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -75,8 +75,8 @@ _installCommonDev() {
7575
spdlogVersion=1.15.0
7676
gtestVersion=1.13.0
7777
gtestChecksum="a1279c6fb5bf7d4a5e0d0b2a4adb39ac"
78-
abslVersion=20250814.0
79-
abslChecksum="016feacd6a6b3b9a47ab844e61f4f7bd"
78+
abslVersion=20240722.0
79+
abslChecksum="740fb8f35ebdf82740c294bde408b9c0"
8080
bisonVersion=3.8.2
8181
bisonChecksum="1e541a097cda9eca675d29dd2832921f"
8282
flexVersion=2.6.4

src/cts/BUILD

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
# SPDX-License-Identifier: BSD-3-Clause
22
# Copyright (c) 2025, The OpenROAD Authors
33

4+
load("//bazel:python_wrap_cc.bzl", "python_wrap_cc")
45
load("//bazel:tcl_encode_or.bzl", "tcl_encode")
56
load("//bazel:tcl_wrap_cc.bzl", "tcl_wrap_cc")
6-
load("//bazel:python_wrap_cc.bzl", "python_wrap_cc")
77

88
package(
99
default_visibility = ["//:__subpackages__"],
@@ -16,11 +16,9 @@ cc_library(
1616
"src/Clock.h",
1717
"src/Clustering.h",
1818
"src/CtsObserver.h",
19-
"src/CtsOptions.h",
2019
"src/HTreeBuilder.h",
2120
"src/LevelBalancer.h",
2221
"src/SinkClustering.h",
23-
"src/TechChar.h",
2422
"src/TreeBuilder.h",
2523
"src/Util.h",
2624
],
@@ -51,7 +49,10 @@ cc_library(
5149
"src/CtsOptions.h",
5250
"src/TechChar.h",
5351
],
54-
includes = ["include", "src"],
52+
includes = [
53+
"include",
54+
"src",
55+
],
5556
deps = [
5657
":private_hdrs",
5758
"//src/dbSta",
@@ -136,4 +137,4 @@ python_wrap_cc(
136137
swig_includes = [
137138
"include",
138139
],
139-
)
140+
)

src/cts/src/TritonCTS.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
#include <fstream>
1313
#include <functional>
1414
#include <iostream>
15+
#include <iterator>
1516
#include <limits>
1617
#include <map>
1718
#include <memory>

src/cut/src/blif.cpp

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

44
#include "cut/blif.h"
55

6+
#include <algorithm>
67
#include <fstream>
78
#include <iostream>
89
#include <iterator>

src/dbSta/src/dbSdcNetwork.cc

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

44
#include "dbSdcNetwork.hh"
55

6-
#include <spdlog/fmt/fmt.h>
7-
86
#include <cstddef>
97
#include <functional>
108
#include <memory>
119
#include <string>
1210
#include <string_view>
1311

12+
#include "spdlog/fmt/fmt.h"
1413
#include "sta/ParseBus.hh"
1514
#include "sta/PatternMatch.hh"
1615

src/dft/src/utils/BUILD

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,5 +29,6 @@ cc_library(
2929
"//src/odb",
3030
"//src/sta:opensta_lib",
3131
"//src/utl",
32+
"@spdlog",
3233
],
3334
)

0 commit comments

Comments
 (0)