Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

make: Fix tcl error #141

Merged
merged 2 commits into from
Sep 9, 2024
Merged

make: Fix tcl error #141

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d504d14
openroad: Remove redundant substitution
hovind Sep 9, 2024
4527e7f
openroad: Add tcl for yosys
hovind Sep 9, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 6 additions & 5 deletions openroad.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -243,18 +243,17 @@ def flow_substitutions(ctx):
"${MAKE_PATH}": ctx.executable._make.path,
"${MAKEFILE_PATH}": ctx.file._makefile.path,
"${FLOW_HOME}": ctx.file._makefile.dirname,
"${TCL_LIBRARY}": commonpath(ctx.files._tcl),
}

def openroad_substitutions(ctx):
return {
"${MAKE_PATH}": ctx.executable._make.path,
"${YOSYS_PATH}": "",
"${OPENROAD_PATH}": ctx.executable._openroad.path,
"${KLAYOUT_PATH}": ctx.executable._klayout.path,
"${STDBUF_PATH}": "",
"${RUBY_PATH}": commonpath(ctx.files._ruby),
"${DLN_LIBRARY_PATH}": commonpath(ctx.files._ruby_dynamic),
"${TCL_LIBRARY}": commonpath(ctx.files._tcl),
"${LIBGL_DRIVERS_PATH}": commonpath(ctx.files._opengl),
"${QT_PLUGIN_PATH}": commonpath(ctx.files._qt_plugins),
"${GIO_MODULE_DIR}": commonpath(ctx.files._gio_modules),
Expand Down Expand Up @@ -579,9 +578,11 @@ def _yosys_impl(ctx):
"ABC": ctx.executable._abc.path,
"YOSYS_EXE": ctx.executable._yosys.path,
"OPENROAD_EXE": "",
"TCL_LIBRARY": commonpath(ctx.files._tcl),
},
inputs = depset(
ctx.files.data +
ctx.files._tcl +
[
canon_output,
config,
Expand Down Expand Up @@ -628,8 +629,8 @@ def _yosys_impl(ctx):
[dep[OrfsInfo].lib for dep in ctx.attr.deps if dep[OrfsInfo].lib],
),
runfiles = ctx.runfiles(
synth_outputs + [canon_output, config_short, make, ctx.executable._yosys, ctx.executable._make, ctx.file._makefile] +
ctx.files.verilog_files + ctx.files.data + canon_logs + synth_logs,
synth_outputs + canon_logs + synth_logs + [canon_output, config_short, make, ctx.executable._yosys, ctx.executable._make, ctx.file._makefile] +
ctx.files.verilog_files + ctx.files.data + ctx.files._tcl,
transitive_files = depset(transitive = transitive_inputs),
),
),
Expand All @@ -650,7 +651,7 @@ def _yosys_impl(ctx):
files = [config_short] + ctx.files.verilog_files + ctx.files.data,
runfiles = ctx.runfiles(transitive_files = depset(
[config_short, make, ctx.executable._yosys, ctx.executable._make, ctx.file._makefile] +
ctx.files.verilog_files + ctx.files.data,
ctx.files.verilog_files + ctx.files.data + ctx.files._tcl,
transitive = transitive_inputs,
)),
),
Expand Down