luke
/
yosys
mirror of https://github.com/YosysHQ/yosys.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Undo the weird abc changes

This commit is contained in:
Akash Levy 2026-02-03 23:21:48 -08:00
parent 8e5d24aa6b
commit 807df40422
2 changed files with 28 additions and 64 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
frontends/verific/verific.cc
View File

@ -3143,9 +3143,6 @@ std::string verific_import(Design *design, const std::map<std::string,std::strin
if (verific_opt) { if (verific_opt) {
log(" Optimizing netlist for %s.\n", it->first.c_str()); log(" Optimizing netlist for %s.\n", it->first.c_str());
// log(" Inferring clock enable muxes for %s.\n", it->first.c_str());
// nl->InferClockEnableMux();
log(" Running post-elaboration for %s.\n", it->first.c_str()); log(" Running post-elaboration for %s.\n", it->first.c_str());
nl->PostElaborationProcess(); nl->PostElaborationProcess();
@ -3866,7 +3863,6 @@ struct VerificPass : public Pass {
unsigned verilog_mode = veri_file::UNDEFINED; unsigned verilog_mode = veri_file::UNDEFINED;
#ifdef VERIFIC_VHDL_SUPPORT #ifdef VERIFIC_VHDL_SUPPORT
unsigned vhdl_mode = vhdl_file::UNDEFINED; unsigned vhdl_mode = vhdl_file::UNDEFINED;
bool is_formal = false;
#endif #endif
bool is_formal = false; bool is_formal = false;
#else #else

88
passes/techmap/abc.cc
View File

@ -191,10 +191,10 @@ struct AbcProcess
int status; int status;
int ret = waitpid(pid, &status, 0); int ret = waitpid(pid, &status, 0);
if (ret != pid) { if (ret != pid) {
log_error("waitpid(%d) failed\n", pid); log_error("waitpid(%d) failed", pid);
} }
if (!WIFEXITED(status) || WEXITSTATUS(status) != 0) { if (!WIFEXITED(status) || WEXITSTATUS(status) != 0) {
log_error("ABC failed with status %X\n", status); log_error("ABC failed with status %X", status);
} }
if (from_child_pipe >= 0) if (from_child_pipe >= 0)
close(from_child_pipe); close(from_child_pipe);
@ -206,12 +206,12 @@ std::optional<AbcProcess> spawn_abc(const char* abc_exe, DeferredLogs &logs) {
// fork()s. // fork()s.
int to_child_pipe[2]; int to_child_pipe[2];
if (pipe2(to_child_pipe, O_CLOEXEC) != 0) { if (pipe2(to_child_pipe, O_CLOEXEC) != 0) {
logs.log_error("pipe failed\n"); logs.log_error("pipe failed");
return std::nullopt; return std::nullopt;
} }
int from_child_pipe[2]; int from_child_pipe[2];
if (pipe2(from_child_pipe, O_CLOEXEC) != 0) { if (pipe2(from_child_pipe, O_CLOEXEC) != 0) {
logs.log_error("pipe failed\n"); logs.log_error("pipe failed");
return std::nullopt; return std::nullopt;
} }
@ -224,39 +224,39 @@ std::optional<AbcProcess> spawn_abc(const char* abc_exe, DeferredLogs &logs) {
posix_spawn_file_actions_t file_actions; posix_spawn_file_actions_t file_actions;
if (posix_spawn_file_actions_init(&file_actions) != 0) { if (posix_spawn_file_actions_init(&file_actions) != 0) {
logs.log_error("posix_spawn_file_actions_init failed\n"); logs.log_error("posix_spawn_file_actions_init failed");
return std::nullopt; return std::nullopt;
} }
if (posix_spawn_file_actions_addclose(&file_actions, to_child_pipe[1]) != 0) { if (posix_spawn_file_actions_addclose(&file_actions, to_child_pipe[1]) != 0) {
logs.log_error("posix_spawn_file_actions_addclose failed\n"); logs.log_error("posix_spawn_file_actions_addclose failed");
return std::nullopt; return std::nullopt;
} }
if (posix_spawn_file_actions_addclose(&file_actions, from_child_pipe[0]) != 0) { if (posix_spawn_file_actions_addclose(&file_actions, from_child_pipe[0]) != 0) {
logs.log_error("posix_spawn_file_actions_addclose failed\n"); logs.log_error("posix_spawn_file_actions_addclose failed");
return std::nullopt; return std::nullopt;
} }
if (posix_spawn_file_actions_adddup2(&file_actions, to_child_pipe[0], STDIN_FILENO) != 0) { if (posix_spawn_file_actions_adddup2(&file_actions, to_child_pipe[0], STDIN_FILENO) != 0) {
logs.log_error("posix_spawn_file_actions_adddup2 failed\n"); logs.log_error("posix_spawn_file_actions_adddup2 failed");
return std::nullopt; return std::nullopt;
} }
if (posix_spawn_file_actions_adddup2(&file_actions, from_child_pipe[1], STDOUT_FILENO) != 0) { if (posix_spawn_file_actions_adddup2(&file_actions, from_child_pipe[1], STDOUT_FILENO) != 0) {
logs.log_error("posix_spawn_file_actions_adddup2 failed\n"); logs.log_error("posix_spawn_file_actions_adddup2 failed");
return std::nullopt; return std::nullopt;
} }
if (posix_spawn_file_actions_addclose(&file_actions, to_child_pipe[0]) != 0) { if (posix_spawn_file_actions_addclose(&file_actions, to_child_pipe[0]) != 0) {
logs.log_error("posix_spawn_file_actions_addclose failed\n"); logs.log_error("posix_spawn_file_actions_addclose failed");
return std::nullopt; return std::nullopt;
} }
if (posix_spawn_file_actions_addclose(&file_actions, from_child_pipe[1]) != 0) { if (posix_spawn_file_actions_addclose(&file_actions, from_child_pipe[1]) != 0) {
logs.log_error("posix_spawn_file_actions_addclose failed\n"); logs.log_error("posix_spawn_file_actions_addclose failed");
return std::nullopt; return std::nullopt;
} }
char arg1[] = "-s"; char arg1[] = "-s";
char* argv[] = { strdup(abc_exe), arg1, nullptr }; char* argv[] = { strdup(abc_exe), arg1, nullptr };
if (0 != posix_spawnp(&result.pid, abc_exe, &file_actions, nullptr, argv, environ)) { if (0 != posix_spawnp(&result.pid, abc_exe, &file_actions, nullptr, argv, environ)) {
logs.log_error("posix_spawnp %s failed (errno=%s)\n", abc_exe, strerror(errno)); logs.log_error("posix_spawnp %s failed (errno=%s)", abc_exe, strerror(errno));
return std::nullopt; return std::nullopt;
} }
free(argv[0]); free(argv[0]);
@ -1124,72 +1124,40 @@ void AbcModuleState::prepare_module(RTLIL::Design *design, RTLIL::Module *module
handle_loops(assign_map, module); handle_loops(assign_map, module);
} }
static bool is_abc_prompt(const std::string &line, std::string &rest) {
size_t pos = 0;
while (true) {
// The prompt may not start at the start of the line, because
// ABC can output progress and maybe other data that isn't
// newline-terminated.
size_t start = line.find("abc ", pos);
if (start == std::string::npos)
return false;
pos = start + 4;
size_t digits = 0;
while (pos + digits < line.size() && line[pos + digits] >= '0' && line[pos + digits] <= '9')
++digits;
if (digits < 2)
return false;
if (line.substr(pos + digits, 2) == "> ") {
rest = line.substr(pos + digits + 2);
return true;
}
}
}
bool read_until_abc_done(abc_output_filter &filt, int fd, DeferredLogs &logs) { bool read_until_abc_done(abc_output_filter &filt, int fd, DeferredLogs &logs) {
std::string line; std::string line;
char buf[1024]; char buf[1024];
bool seen_source_cmd = false;
bool seen_yosys_abc_done = false;
while (true) { while (true) {
int ret = read(fd, buf, sizeof(buf) - 1); int ret = read(fd, buf, sizeof(buf) - 1);
if (ret < 0) { if (ret < 0) {
logs.log_error("Failed to read from ABC, errno=%d\n", errno); logs.log_error("Failed to read from ABC, errno=%d", errno);
return false; return false;
} }
if (ret == 0) { if (ret == 0) {
logs.log_error("ABC exited prematurely\n"); logs.log_error("ABC exited prematurely");
return false; return false;
} }
char *start = buf; char *start = buf;
char *end = buf + ret; char *end = buf + ret;
while (start < end) { while (start < end) {
char *p = static_cast<char*>(memchr(start, '\n', end - start)); char *p = static_cast<char*>(memchr(start, '\n', end - start));
char *upto = p == nullptr ? end : p + 1; if (p == nullptr) {
line.append(start, upto - start); break;
start = upto;
std::string rest;
bool is_prompt = is_abc_prompt(line, rest);
if (is_prompt && seen_source_cmd) {
// This is the first prompt after we sourced the script.
// We are done here.
// We won't have seen a newline yet since ABC is waiting at the prompt.
if (!seen_yosys_abc_done)
logs.log_error("ABC script did not complete successfully\n");
return seen_yosys_abc_done;
} }
if (line.empty() || line[line.size() - 1] != '\n') { line.append(start, p + 1 - start);
// No newline yet, wait for more text if (line.substr(0, 14) == "YOSYS_ABC_DONE") {
continue; // Ignore any leftover output, there should only be a prompt perhaps
return true;
}
// If ABC aborted the sourced script, it returns to the prompt and will
// never print YOSYS_ABC_DONE. Treat this as a failed run, not a hang.
if (line.substr(0, 7) == "Error: ") {
logs.log_error("ABC: %s", line.c_str());
return false;
} }
filt.next_line(line); filt.next_line(line);
if (is_prompt && rest.substr(0, 7) == "source ")
seen_source_cmd = true;
if (line.substr(0, 14) == "YOSYS_ABC_DONE")
seen_yosys_abc_done = true;
line.clear(); line.clear();
start = p + 1;
} }
line.append(start, end - start); line.append(start, end - start);
} }
@ -2876,4 +2844,4 @@ struct AbcPass : public Pass {
} }
} AbcPass; } AbcPass;
PRIVATE_NAMESPACE_END PRIVATE_NAMESPACE_END