Skip to content

Commit f9648d1

Browse files
committed
Merge remote-tracking branch 'origin/master' into dpl-remove-pad-fillers
2 parents cc3d763 + 320b89c commit f9648d1

File tree

6 files changed

+41
-29
lines changed

6 files changed

+41
-29
lines changed

Jenkinsfile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -221,9 +221,10 @@ def bazelTest = {
221221
stage('bazelisk test ...') {
222222
withCredentials([string(credentialsId: 'bazel-auth-token-b64', variable: 'BAZEL_AUTH_TOKEN_B64')]) {
223223
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"'
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'
225225
try {
226226
sh label: 'Bazel Build', script: cmd + ' ...';
227+
sh label: 'Bazel Build', script: 'bazelisk analyze-profile build.profile';
227228
} catch (e) {
228229
currentBuild.result = 'FAILURE';
229230
sh label: 'Bazel Build (keep_going)', script: cmd + ' --keep_going ...';

src/cts/test/BUILD

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -161,6 +161,9 @@ filegroup(
161161
"max_cap": [
162162
"//src/rsz/test:hi_fanout.tcl",
163163
],
164+
"skip_nets": [
165+
"gated_clock2.def",
166+
],
164167
}.get(test_name, []),
165168
)
166169
for test_name in ALL_TESTS

src/cts/test/skip_nets.ok

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -131,9 +131,9 @@ CTS config:
131131
[INFO CTS-0016] Fanout distribution for the current clock = 8:1, 9:2, 10:1..
132132
[INFO CTS-0017] Max level of the clock tree: 2.
133133
[INFO CTS-0098] Clock net "clk"
134-
[INFO CTS-0099] Sinks 3
134+
[INFO CTS-0099] Sinks 2
135135
[INFO CTS-0100] Leaf buffers 0
136-
[INFO CTS-0101] Average sink wire length 57.59 um
136+
[INFO CTS-0101] Average sink wire length 47.55 um
137137
[INFO CTS-0102] Path depth 2 - 2
138138
[INFO CTS-0207] Leaf load cells 18
139139
[INFO CTS-0098] Clock net "clk_regs"
@@ -148,9 +148,6 @@ CTS config:
148148
[INFO CTS-0101] Average sink wire length 29.38 um
149149
[INFO CTS-0102] Path depth 2 - 2
150150
[INFO CTS-0207] Leaf load cells 18
151-
[DEBUG CTS-insertion delay] top buffer delay for macro tree clkbuf_0_clk is 2.666e-11
152-
[DEBUG CTS-insertion delay] top buffer delay for register tree clkbuf_regs_0_clk is 2.480e-11
153-
[DEBUG CTS-insertion delay] top buffer delay for register tree clkbuf_0_gclk2 is 3.492e-11
154151
[INFO CTS-0033] Balancing latency for clock clk
155152
[DEBUG CTS-insertion delay] new delay buffer delaybuf_0_clk is inserted at (100608 169407)
156153
[DEBUG CTS-insertion delay] new delay buffer delaybuf_1_clk is inserted at (101216 138954)

src/ram/CMakeLists.txt

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -62,21 +62,21 @@ messages(
6262
TARGET ram
6363
)
6464

65-
#if (Python3_FOUND AND BUILD_PYTHON)
66-
# swig_lib(NAME ram_py
67-
# NAMESPACE ram
68-
# LANGUAGE python
69-
# I_FILE src/ram-py.i
70-
# SWIG_INCLUDES ${PROJECT_SOURCE_DIR}/include/ram
71-
# SCRIPTS ${CMAKE_CURRENT_BINARY_DIR}/ram_py.py
72-
# )
73-
#
74-
# target_link_libraries(ram_py
75-
# PUBLIC
76-
# ram
77-
# odb
78-
# )
79-
#
80-
#endif()
65+
if (Python3_FOUND AND BUILD_PYTHON)
66+
swig_lib(NAME ram_py
67+
NAMESPACE ram
68+
LANGUAGE python
69+
I_FILE src/ram-py.i
70+
SWIG_INCLUDES ${PROJECT_SOURCE_DIR}/include/ram
71+
SCRIPTS ${CMAKE_CURRENT_BINARY_DIR}/ram_py.py
72+
)
73+
74+
target_link_libraries(ram_py
75+
PUBLIC
76+
ram
77+
odb
78+
)
79+
80+
endif()
8181

8282
add_subdirectory(test)

src/ram/include/ram/ram.h

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -90,15 +90,15 @@ class RamGen
9090

9191
sta::dbNetwork* network_;
9292
odb::dbDatabase* db_;
93-
odb::dbBlock* block_;
93+
odb::dbBlock* block_{nullptr};
9494
Logger* logger_;
9595

96-
odb::dbMaster* storage_cell_;
97-
odb::dbMaster* tristate_cell_;
98-
odb::dbMaster* inv_cell_;
99-
odb::dbMaster* and2_cell_;
100-
odb::dbMaster* clock_gate_cell_;
101-
odb::dbMaster* buffer_cell_;
96+
odb::dbMaster* storage_cell_{nullptr};
97+
odb::dbMaster* tristate_cell_{nullptr};
98+
odb::dbMaster* inv_cell_{nullptr};
99+
odb::dbMaster* and2_cell_{nullptr};
100+
odb::dbMaster* clock_gate_cell_{nullptr};
101+
odb::dbMaster* buffer_cell_{nullptr};
102102
};
103103

104104
} // namespace ram

src/ram/src/ram-py.i

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
// SPDX-License-Identifier: BSD-3-Clause
2+
// Copyright (c) 2022-2025, The OpenROAD Authors
3+
4+
%{
5+
#include "ord/OpenRoad.hh"
6+
#include "ram/ram.h"
7+
8+
%}
9+
10+
%include "../../Exception-py.i"
11+
%include "ram/ram.h"

0 commit comments

Comments
 (0)