diff --git a/dependency_support/org_theopenroadproject/tcl_encode.bzl b/dependency_support/org_theopenroadproject/tcl_encode.bzl index 46cb72bf..ca830fdf 100644 --- a/dependency_support/org_theopenroadproject/tcl_encode.bzl +++ b/dependency_support/org_theopenroadproject/tcl_encode.bzl @@ -23,8 +23,6 @@ def _tcl_encode_impl(ctx): outfile_name = ctx.attr.out if ctx.attr.out else ctx.attr.name + ".cc" output_file = ctx.actions.declare_file(outfile_name) - (inputs, _) = ctx.resolve_tools(tools = [ctx.attr._tclsh, ctx.attr._encode_script]) - args = ctx.actions.args() args.add(ctx.file._encode_script) args.add(output_file) @@ -35,7 +33,7 @@ def _tcl_encode_impl(ctx): outputs = [output_file], inputs = ctx.files.srcs, arguments = [args], - tools = inputs, + tools = [ctx.executable._tclsh, ctx.executable._encode_script], executable = ([file for file in ctx.files._tclsh if file.basename == "tclsh"][0]), ) return [DefaultInfo(files = depset([output_file]))] diff --git a/dependency_support/org_theopenroadproject/tcl_wrap_cc.bzl b/dependency_support/org_theopenroadproject/tcl_wrap_cc.bzl index 1cc421b0..248d0b5e 100644 --- a/dependency_support/org_theopenroadproject/tcl_wrap_cc.bzl +++ b/dependency_support/org_theopenroadproject/tcl_wrap_cc.bzl @@ -56,8 +56,6 @@ def _tcl_wrap_cc_impl(ctx): outfile_name = ctx.attr.out if ctx.attr.out else ctx.attr.name + ".cc" output_file = ctx.actions.declare_file(outfile_name) - (inputs, _) = ctx.resolve_tools(tools = [ctx.attr._swig]) - include_root_directory = root_label.workspace_root + "/" + root_label.package src_inputs = _get_transative_srcs(ctx.files.srcs + ctx.files.root_swig_src, ctx.attr.deps) @@ -87,8 +85,7 @@ def _tcl_wrap_cc_impl(ctx): outputs = [output_file], inputs = src_inputs, arguments = [args], - tools = inputs, - executable = ([file for file in ctx.files._swig if file.basename == "swig"][0]), + executable = ctx.executable._swig, ) return [ DefaultInfo(files = depset([output_file])), @@ -137,7 +134,7 @@ tcl_wrap_cc = rule( ), "_swig": attr.label( default = "@org_swig//:swig_stable", - allow_files = True, + executable = True, cfg = "exec", ), }, diff --git a/flows/flows.bzl b/flows/flows.bzl index f31e7430..2973c219 100644 --- a/flows/flows.bzl +++ b/flows/flows.bzl @@ -169,9 +169,6 @@ flow_binary = rule( ) def _run_step_with_inputs(ctx, step, inputs_dict, outputs_step_dict): - # inputs and output manifests are for the runfiles of the step executable. - (tool_inputs, input_manifests) = ctx.resolve_tools(tools = [step]) - # The inputs_env and inputs handle the named inputs of the step. inputs = [] inputs_env = {} @@ -208,11 +205,10 @@ def _run_step_with_inputs(ctx, step, inputs_dict, outputs_step_dict): outputs = outputs, inputs = inputs, command = step[DefaultInfo].files_to_run.executable.path, - tools = tool_inputs, + tools = [step.files_to_run], arguments = step[FlowStepInfo].arguments, mnemonic = step[FlowStepInfo].executable_type, env = dicts.add(constants_env, inputs_env, outputs_env), - input_manifests = input_manifests, toolchain = None, ) diff --git a/place_and_route/open_road.bzl b/place_and_route/open_road.bzl index e5e9e9d7..0c6012c8 100644 --- a/place_and_route/open_road.bzl +++ b/place_and_route/open_road.bzl @@ -228,7 +228,6 @@ def openroad_command(ctx, commands, input_db = None, step_name = None, inputs = command_file = ctx.actions.declare_file(file_name) ctx.actions.write(command_file, content = "\n".join(real_commands)) - (tool_inputs, input_manifests) = ctx.resolve_tools(tools = [ctx.attr._openroad]) openroad_runfiles_dir = ctx.executable._openroad.path + ".runfiles" log_file = ctx.actions.declare_file( @@ -252,8 +251,6 @@ def openroad_command(ctx, commands, input_db = None, step_name = None, inputs = command_file.path, ], executable = ctx.executable._openroad, - tools = tool_inputs, - input_manifests = input_manifests, env = { "TCL_LIBRARY": openroad_runfiles_dir + "/tk_tcl/library", }, diff --git a/static_timing/build_defs.bzl b/static_timing/build_defs.bzl index a1b8cca7..d6fcdd87 100644 --- a/static_timing/build_defs.bzl +++ b/static_timing/build_defs.bzl @@ -31,7 +31,6 @@ def _run_opensta_impl(ctx): netlist = synth_info.synthesized_netlist liberty_file = synth_info.standard_cell_info.default_corner.liberty - (tool_inputs, input_manifests) = ctx.resolve_tools(tools = [ctx.attr._opensta]) opensta_runfiles_dir = ctx.executable._opensta.path + ".runfiles" sta_tcl = ctx.file.sta_tcl @@ -47,11 +46,9 @@ def _run_opensta_impl(ctx): ctx.actions.run( outputs = [sta_log], - inputs = tool_inputs.to_list() + [liberty_file, sta_tcl, netlist], + inputs = [liberty_file, sta_tcl, netlist], arguments = ["-exit", sta_tcl.path], executable = ctx.executable._opensta, - tools = tool_inputs, - input_manifests = input_manifests, env = env, mnemonic = "RunningSTA", toolchain = None, diff --git a/synthesis/build_defs.bzl b/synthesis/build_defs.bzl index 47a2a9fd..face8998 100644 --- a/synthesis/build_defs.bzl +++ b/synthesis/build_defs.bzl @@ -104,8 +104,6 @@ def _synthesize_design_impl(ctx): inputs.append(abc_script) inputs.append(default_liberty_file) - (tool_inputs, input_manifests) = ctx.resolve_tools(tools = [ctx.attr.yosys_tool]) - yosys_runfiles_dir = ctx.executable.yosys_tool.path + ".runfiles" log_file = ctx.actions.declare_file("{}_yosys_output.log".format(ctx.attr.name)) @@ -170,11 +168,9 @@ def _synthesize_design_impl(ctx): ctx.actions.run( outputs = [output_file, log_file], - inputs = inputs + tool_inputs.to_list(), + inputs = inputs, arguments = [args], executable = ctx.executable.yosys_tool, - tools = tool_inputs, - input_manifests = input_manifests, env = env, mnemonic = "SynthesizingRTL", toolchain = None,