mirrors/yosys
3
0
Fork 0
mirror of https://github.com/YosysHQ/yosys synced 2025-10-09 09:21:58 +00:00
Code Activity

sdc: refactor find_matching

Browse source
This commit is contained in:
Emil Jiří Tywoniak 2025-08-04 13:27:42 +02:00 • committed by Emil J. Tywoniak
parent c81145ec31
commit 5647bdeb2b
1 changed files with 25 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

53
passes/cmds/sdc.cc
View file

@ -412,7 +412,25 @@ void inspect_globals(Tcl_Interp* interp) {
std::vector<SdcGraphNode> graph = build_graph(sdc_calls); std::vector<SdcGraphNode> graph = build_graph(sdc_calls);
dump_sdc_graph(graph, node_ownership(graph)); dump_sdc_graph(graph, node_ownership(graph));
} }
template <typename T, typename U>
std::vector<std::tuple<std::string, T, SdcObjects::BitSelection>>
find_matching(U objects, const MatchConfig& config, const std::vector<std::string> &patterns, const char* obj_type)
{
std::vector<std::tuple<std::string, T, SdcObjects::BitSelection>> resolved;
for (auto pat : patterns) {
bool found = false;
for (auto [name, obj] : objects) {
auto [does_match, matching_bits] = matches(name, pat, config);
if (does_match) {
found = true;
resolved.push_back(std::make_tuple(name, obj, matching_bits));
}
}
if (!found)
log_warning("No matches in design for %s %s\n", obj_type, pat.c_str());
}
return resolved;
}
static int sdc_get_pins_cmd(ClientData data, Tcl_Interp *interp, int objc, Tcl_Obj* const objv[]) static int sdc_get_pins_cmd(ClientData data, Tcl_Interp *interp, int objc, Tcl_Obj* const objv[])
{ {
auto* objects = (SdcObjects*)data; auto* objects = (SdcObjects*)data;
@ -454,18 +472,8 @@ static int sdc_get_pins_cmd(ClientData data, Tcl_Interp *interp, int objc, Tcl_O
MatchConfig config(regexp_flag, nocase_flag, hierarchical_flag); MatchConfig config(regexp_flag, nocase_flag, hierarchical_flag);
std::vector<std::tuple<std::string, SdcObjects::CellPin, SdcObjects::BitSelection>> resolved; std::vector<std::tuple<std::string, SdcObjects::CellPin, SdcObjects::BitSelection>> resolved;
for (auto pat : patterns) { const auto& pins = objects->design_pins;
bool found = false; resolved = find_matching<SdcObjects::CellPin, decltype(pins)>(pins, config, patterns, "pin");
for (auto [name, pin] : objects->design_pins) {
auto [does_match, matching_bits] = matches(name, pat, config);
if (does_match) {
found = true;
resolved.push_back(std::make_tuple(name, pin, matching_bits));
}
}
if (!found)
log_warning("No matches in design for pin %s\n", pat.c_str());
}
if (separator != "/") { if (separator != "/") {
Tcl_SetResult(interp, (char *)"Only '/' accepted as separator", TCL_STATIC); Tcl_SetResult(interp, (char *)"Only '/' accepted as separator", TCL_STATIC);
@ -519,20 +527,12 @@ static int sdc_get_ports_cmd(ClientData data, Tcl_Interp *interp, int objc, Tcl_
log_error("get_ports got unexpected number of patterns in simple mode\n"); log_error("get_ports got unexpected number of patterns in simple mode\n");
} }
} }
MatchConfig config(regexp_flag, nocase_flag, false); MatchConfig config(regexp_flag, nocase_flag, false);
std::vector<std::tuple<std::string, Wire*, SdcObjects::BitSelection>> resolved; std::vector<std::tuple<std::string, Wire*, SdcObjects::BitSelection>> resolved;
for (auto pat : patterns) { const auto& ports = objects->design_ports;
bool found = false; resolved = find_matching<Wire*, decltype(ports)>(ports, config, patterns, "port");
for (auto [name, wire] : objects->design_ports) {
auto [does_match, matching_bits] = matches(name, pat, config);
if (does_match) {
found = true;
resolved.push_back(std::make_tuple(name, wire, matching_bits));
}
}
if (!found)
log_warning("No matches in design for port %s\n", pat.c_str());
}
Tcl_Obj *result = nullptr; Tcl_Obj *result = nullptr;
for (auto [name, wire, matching_bits] : resolved) { for (auto [name, wire, matching_bits] : resolved) {
if (objects->value_mode == SdcObjects::ValueMode::Normal) { if (objects->value_mode == SdcObjects::ValueMode::Normal) {
@ -676,9 +676,6 @@ struct SdcPass : public Pass {
SdcPass() : Pass("sdc", "sniff at some SDC") { } SdcPass() : Pass("sdc", "sniff at some SDC") { }
void execute(std::vector<std::string> args, RTLIL::Design *design) override { void execute(std::vector<std::string> args, RTLIL::Design *design) override {
log_header(design, "Executing SDC pass.\n"); log_header(design, "Executing SDC pass.\n");
// if (args.size() < 2)
// log_cmd_error("Missing SDC file.\n");
// TODO optional extra stub file
size_t argidx; size_t argidx;
std::vector<std::string> opensta_stubs_paths; std::vector<std::string> opensta_stubs_paths;
for (argidx = 1; argidx < args.size(); argidx++) { for (argidx = 1; argidx < args.size(); argidx++) {