Skip to content

Commit e3efb15

Browse files
Update Web GUI and odb tests
Signed-off-by: Jorge Ferreira <jorge.ferreira@precisioninno.com>
1 parent 6b0d6b4 commit e3efb15

7 files changed

Lines changed: 11 additions & 107 deletions

File tree

src/OpenRoad.tcl

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -236,21 +236,6 @@ proc check_3dblox { args } {
236236
ord::check_3dblox_cmd
237237
}
238238

239-
sta::define_cmd_args "clear_3dbx" {}
240-
241-
proc clear_3dbx { args } {
242-
sta::parse_key_args "clear_3dbx" args keys {} flags {}
243-
sta::check_argc_eq0 "clear_3dbx" $args
244-
# read_3dbx creates one dbChip per chiplet (CPU/MEM/…) plus one HIER
245-
# chip for the assembly. Destroying only the top chip leaves the
246-
# chiplet defs behind and the next read_3dbx errors with "Chiplet X
247-
# already exists". Snapshot the set first because destroy mutates it.
248-
set db [ord::get_db]
249-
set chips [list]
250-
foreach c [$db getChips] { lappend chips $c }
251-
foreach c $chips { odb::dbChip_destroy $c }
252-
}
253-
254239
sta::define_cmd_args "write_db" {filename}
255240

256241
sta::define_cmd_args "read_db" {[-hier] filename}

src/odb/test/BUILD

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,6 @@ COMPULSORY_TESTS = [
151151
"bterm_hier_create",
152152
"check_3dblox",
153153
"check_routing_tracks",
154-
"clear_3dbx",
155154
"create_blockage",
156155
"create_obstruction",
157156
"create_sboxes",

src/odb/test/CMakeLists.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ or_integration_tests(
77
bterm_hier_create
88
check_3dblox
99
check_routing_tracks
10-
clear_3dbx
1110
create_blockage
1211
create_obstruction
1312
create_sboxes

src/odb/test/clear_3dbx.ok

Lines changed: 0 additions & 13 deletions
This file was deleted.

src/odb/test/clear_3dbx.tcl

Lines changed: 0 additions & 37 deletions
This file was deleted.

src/web/messages.txt

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
GUI 0019 web.tcl:119 Display option must have 2 elements {control name} {value}. ERROR https://github.com/The-OpenROAD-Project/OpenROAD/tree/master/workspace/teste/OpenROAD-flow-scripts/tools/OpenROAD/src/web/src/web.tcl#L119
2-
WEB 0001 web_serve.cpp:227 Server started on {}. INFO https://github.com/The-OpenROAD-Project/OpenROAD/tree/master/workspace/teste/OpenROAD-flow-scripts/tools/OpenROAD/src/web/src/web_serve.cpp#L227
3-
WEB 0002 web_serve.cpp:231 Server error : {} ERROR https://github.com/The-OpenROAD-Project/OpenROAD/tree/master/workspace/teste/OpenROAD-flow-scripts/tools/OpenROAD/src/web/src/web_serve.cpp#L231
4-
WEB 0004 web_serve.cpp:166 Serving static files from {} INFO https://github.com/The-OpenROAD-Project/OpenROAD/tree/master/workspace/teste/OpenROAD-flow-scripts/tools/OpenROAD/src/web/src/web_serve.cpp#L166
5-
WEB 0006 web_serve.cpp:110 Web server is already running. WARN https://github.com/The-OpenROAD-Project/OpenROAD/tree/master/workspace/teste/OpenROAD-flow-scripts/tools/OpenROAD/src/web/src/web_serve.cpp#L110
2+
WEB 0001 web_serve.cpp:199 Server started on {}. INFO https://github.com/The-OpenROAD-Project/OpenROAD/tree/master/workspace/teste/OpenROAD-flow-scripts/tools/OpenROAD/src/web/src/web_serve.cpp#L199
3+
WEB 0002 web_serve.cpp:203 Server error : {} ERROR https://github.com/The-OpenROAD-Project/OpenROAD/tree/master/workspace/teste/OpenROAD-flow-scripts/tools/OpenROAD/src/web/src/web_serve.cpp#L203
4+
WEB 0004 web_serve.cpp:167 Serving static files from {} INFO https://github.com/The-OpenROAD-Project/OpenROAD/tree/master/workspace/teste/OpenROAD-flow-scripts/tools/OpenROAD/src/web/src/web_serve.cpp#L167
5+
WEB 0006 web_serve.cpp:111 Web server is already running. WARN https://github.com/The-OpenROAD-Project/OpenROAD/tree/master/workspace/teste/OpenROAD-flow-scripts/tools/OpenROAD/src/web/src/web_serve.cpp#L111
66
WEB 0010 web.cpp:1121 Failed to open acceptor: {} ERROR https://github.com/The-OpenROAD-Project/OpenROAD/tree/master/workspace/teste/OpenROAD-flow-scripts/tools/OpenROAD/src/web/src/web.cpp#L1121
77
WEB 0011 web.cpp:1126 Failed to set reuse_address option: {} ERROR https://github.com/The-OpenROAD-Project/OpenROAD/tree/master/workspace/teste/OpenROAD-flow-scripts/tools/OpenROAD/src/web/src/web.cpp#L1126
88
WEB 0017 web.cpp:1132 Failed to bind to endpoint: {} ERROR https://github.com/The-OpenROAD-Project/OpenROAD/tree/master/workspace/teste/OpenROAD-flow-scripts/tools/OpenROAD/src/web/src/web.cpp#L1132
@@ -24,5 +24,5 @@ WEB 0032 web.cpp:1470 Saved timing report to {} INFO https://github
2424
WEB 0033 web.cpp:1340 Cached {} tiles at zoom {}. INFO https://github.com/The-OpenROAD-Project/OpenROAD/tree/master/workspace/teste/OpenROAD-flow-scripts/tools/OpenROAD/src/web/src/web.cpp#L1340
2525
WEB 0034 web.cpp:1364 Rendered {} setup + {} hold path overlays. INFO https://github.com/The-OpenROAD-Project/OpenROAD/tree/master/workspace/teste/OpenROAD-flow-scripts/tools/OpenROAD/src/web/src/web.cpp#L1364
2626
WEB 0035 web.cpp:1256 No design loaded. ERROR https://github.com/The-OpenROAD-Project/OpenROAD/tree/master/workspace/teste/OpenROAD-flow-scripts/tools/OpenROAD/src/web/src/web.cpp#L1256
27-
WEB 0040 request_handler.cpp:1361 Exit requested from web GUI; shutting down. INFO https://github.com/The-OpenROAD-Project/OpenROAD/tree/master/workspace/teste/OpenROAD-flow-scripts/tools/OpenROAD/src/web/src/request_handler.cpp#L1361
28-
WEB 0041 web_serve.cpp:285 Web session closed. INFO https://github.com/The-OpenROAD-Project/OpenROAD/tree/master/workspace/teste/OpenROAD-flow-scripts/tools/OpenROAD/src/web/src/web_serve.cpp#L285
27+
WEB 0040 request_handler.cpp:1362 Exit requested from web GUI; shutting down. INFO https://github.com/The-OpenROAD-Project/OpenROAD/tree/master/workspace/teste/OpenROAD-flow-scripts/tools/OpenROAD/src/web/src/request_handler.cpp#L1362
28+
WEB 0041 web_serve.cpp:257 Web session closed. INFO https://github.com/The-OpenROAD-Project/OpenROAD/tree/master/workspace/teste/OpenROAD-flow-scripts/tools/OpenROAD/src/web/src/web_serve.cpp#L257

src/web/src/web_serve.cpp

Lines changed: 5 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -186,44 +186,15 @@ void WebServer::serve(int port, const std::string& doc_root)
186186
threads_.emplace_back([this] { ioc_->run(); });
187187
}
188188

189-
// Prefer Chromium app mode: --app=URL opens a standalone window
190-
// that JS can close via window.close(). A regular xdg-open tab
191-
// cannot be closed from JS, so `exit` in the web console would
192-
// leave the tab orphaned.
193-
bool launched = false;
194189
#if defined(__APPLE__)
195-
launched = std::system(("open -na 'Google Chrome' --args --app=" + url
196-
+ " > /dev/null 2>&1")
197-
.c_str())
198-
== 0;
199-
#elif !defined(_WIN32)
200-
static const char* kAppBrowsers[] = {"google-chrome",
201-
"google-chrome-stable",
202-
"chromium",
203-
"chromium-browser",
204-
"microsoft-edge",
205-
"brave-browser"};
206-
for (const char* browser : kAppBrowsers) {
207-
const std::string check
208-
= std::string("command -v ") + browser + " > /dev/null 2>&1";
209-
if (std::system(check.c_str()) == 0) {
210-
std::system(
211-
(std::string(browser) + " --app=" + url + " > /dev/null 2>&1 &")
212-
.c_str());
213-
launched = true;
214-
break;
215-
}
216-
}
217-
#endif
218-
if (!launched) {
219-
#if defined(__APPLE__)
220-
std::system(("open " + url + " > /dev/null 2>&1").c_str());
190+
std::string open_cmd = "open " + url + " > /dev/null 2>&1";
221191
#elif defined(_WIN32)
222-
std::system(("start " + url + " > nul 2>&1").c_str());
192+
std::string open_cmd = "start " + url + " > nul 2>&1";
223193
#else
224-
std::system(("xdg-open " + url + " > /dev/null 2>&1 &").c_str());
194+
std::string open_cmd = "xdg-open " + url + " > /dev/null 2>&1 &";
225195
#endif
226-
}
196+
int ret = std::system(open_cmd.c_str());
197+
(void) ret;
227198

228199
logger_->info(utl::WEB, 1, "Server started on {}.", url);
229200

0 commit comments

Comments
 (0)