mirrors/yosys
3
0
Fork 0
mirror of https://github.com/YosysHQ/yosys synced 2025-05-09 08:45:48 +00:00
Code Activity

Merge a5458d21ef into 6378ba10eb

Browse source
This commit is contained in:
Emil J 2025-05-08 11:39:08 +00:00 • committed by GitHub
commit 61e9f771fb
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
6 changed files with 170 additions and 84 deletions
Download patch file Download diff file Expand all files Collapse all files

26
frontends/ast/ast.cc
View file

@ -248,6 +248,9 @@ AstNode::AstNode(AstNodeType type, AstNode *child1, AstNode *child2, AstNode *ch
children.push_back(child4);
fixup_hierarchy_flags();
#ifdef ASTNODE_GC
Tagger::get().reg(this);
#endif
}
// create a (deep recursive) copy of a node
@ -283,12 +286,28 @@ void AstNode::cloneInto(AstNode *other) const
// delete all children in this node
void AstNode::delete_children()
{
#ifdef ASTNODE_GC
for (auto &it : children)
if (Tagger::get().nodes.count(it))
delete it;
// else
// log("skip child %p\n", it);
#else
for (auto &it : children)
delete it;
#endif
children.clear();
#ifdef ASTNODE_GC
for (auto &it : attributes)
if (Tagger::get().nodes.count(it.second))
delete it.second;
// else
// log("skip attr %p\n", it.second);
#else
for (auto &it : attributes)
delete it.second;
#endif
attributes.clear();
}
@ -296,7 +315,14 @@ void AstNode::delete_children()
AstNode::~AstNode()
{
astnodes--;
#ifdef ASTNODE_GC
Tagger::get().unreg(this);
#endif
delete_children();
if (yosys_xtrace) {
log("DESTR %X %p\n", hashidx_, this);
log_backtrace("", yosys_xtrace-1);
}
}
// create a nice text representation of the node

65
frontends/ast/ast.h
View file

@ -467,6 +467,71 @@ namespace AST_INTERNAL
AST::AstNode *original_ast = nullptr);
}
#undef ASTNODE_GC
#ifdef ASTNODE_GC
struct Tagger {
std::set<AST::AstNode*> nodes;
std::set<AST::AstNode*> tagged;
static Tagger& get() {
static Tagger instance;
return instance;
}
void reg(AST::AstNode* p) {
if (!p)
return;
log_assert(!nodes.count(p));
nodes.insert(p);
}
void unreg(AST::AstNode* p) {
if (!p || !nodes.count(p))
return;
nodes.erase(p);
}
void tag(AST::AstNode* p) {
if (!p)
return;
tagged.insert(p);
for (AST::AstNode* c : p->children)
tag(c);
for (auto x : p->attributes)
tag(x.second);
tag(p->id2ast);
}
void clear() {
tagged.clear();
}
void dump_untagged() {
Yosys::log("Dumping untagged:\n");
for (auto p : nodes) {
if (!tagged.count(p)) {
Yosys::log(">> %p\n", p);
p->dumpAst(stdout, "");
}
}
}
void shadow_kill(AST::AstNode* p) {
if (!p || !nodes.count(p))
return;
for (AST::AstNode* c : p->children)
shadow_kill(c);
for (auto x : p->attributes)
shadow_kill(x.second);
shadow_kill(p->id2ast);
delete p;
}
void kill_untagged() {
auto copy = nodes;
while (!copy.empty()) {
AST::AstNode* p = *(copy.begin());
copy.erase(p);
if (!tagged.count(p)) {
shadow_kill(p);
}
}
}
};
#endif // ASTNODE_GC
YOSYS_NAMESPACE_END
#endif

12
frontends/verilog/verilog_frontend.cc
View file

@ -39,6 +39,7 @@
YOSYS_NAMESPACE_BEGIN
using namespace VERILOG_FRONTEND;
// use the Verilog bison/flex parser to generate an AST and use AST::process() to convert it to RTLIL
static std::vector<std::string> verilog_defaults;
@ -528,7 +529,15 @@ struct VerilogFrontend : public Frontend {
AST::process(design, current_ast, flag_nodisplay, flag_dump_ast1, flag_dump_ast2, flag_no_dump_ptr, flag_dump_vlog1, flag_dump_vlog2, flag_dump_rtlil, flag_nolatches,
flag_nomeminit, flag_nomem2reg, flag_mem2reg, flag_noblackbox, lib_mode, flag_nowb, flag_noopt, flag_icells, flag_pwires, flag_nooverwrite, flag_overwrite, flag_defer, default_nettype_wire);
#ifdef ASTNODE_GC
Tagger::get().clear();
Tagger::get().tag(current_ast);
for (RTLIL::Module* m : design->modules())
if (AST::AstModule* am = dynamic_cast<AST::AstModule*>(m))
Tagger::get().tag(am->ast);
// Tagger::get().dump_untagged();
#endif
if (!flag_nopp)
delete lexin;
@ -539,6 +548,9 @@ struct VerilogFrontend : public Frontend {
delete current_ast;
current_ast = NULL;
#ifdef ASTNODE_GC
Tagger::get().kill_untagged();
#endif
log("Successfully finished Verilog frontend.\n");
}

13
kernel/rtlil.cc
View file

@ -32,19 +32,6 @@
YOSYS_NAMESPACE_BEGIN
bool RTLIL::IdString::destruct_guard_ok = false;
RTLIL::IdString::destruct_guard_t RTLIL::IdString::destruct_guard;
std::vector<char*> RTLIL::IdString::global_id_storage_;
dict<char*, int> RTLIL::IdString::global_id_index_;
#ifndef YOSYS_NO_IDS_REFCNT
std::vector<int> RTLIL::IdString::global_refcount_storage_;
std::vector<int> RTLIL::IdString::global_free_idx_list_;
#endif
#ifdef YOSYS_USE_STICKY_IDS
int RTLIL::IdString::last_created_idx_[8];
int RTLIL::IdString::last_created_idx_ptr_;
#endif
#define X(_id) IdString RTLIL::ID::_id;
#include "kernel/constids.inc"
#undef X

137
kernel/rtlil.h
View file

@ -106,42 +106,41 @@ namespace RTLIL
typedef std::pair<SigSpec, SigSpec> SigSig;
};
#undef YOSYS_XTRACE_GET_PUT
#undef YOSYS_SORT_ID_FREE_LIST
#undef YOSYS_USE_STICKY_IDS
#undef YOSYS_NO_IDS_REFCNT
class Interner {
public:
std::vector<char*> storage;
dict<char*, int> map;
#ifndef YOSYS_NO_IDS_REFCNT
std::vector<int> refcounts;
std::vector<int> free_list;
#endif
#ifdef YOSYS_USE_STICKY_IDS
int RTLIL::IdString::last_created_idx_[8];
int RTLIL::IdString::last_created_idx_ptr_;
#endif
static Interner& get() {
static Interner instance;
return instance;
}
};
inline const auto& internerInitializer = Interner::get();
struct RTLIL::IdString
{
#undef YOSYS_XTRACE_GET_PUT
#undef YOSYS_SORT_ID_FREE_LIST
#undef YOSYS_USE_STICKY_IDS
#undef YOSYS_NO_IDS_REFCNT
// the global id string cache
static bool destruct_guard_ok; // POD, will be initialized to zero
static struct destruct_guard_t {
destruct_guard_t() { destruct_guard_ok = true; }
~destruct_guard_t() { destruct_guard_ok = false; }
} destruct_guard;
static std::vector<char*> global_id_storage_;
static dict<char*, int> global_id_index_;
#ifndef YOSYS_NO_IDS_REFCNT
static std::vector<int> global_refcount_storage_;
static std::vector<int> global_free_idx_list_;
#endif
#ifdef YOSYS_USE_STICKY_IDS
static int last_created_idx_ptr_;
static int last_created_idx_[8];
#endif
static inline void xtrace_db_dump()
{
#ifdef YOSYS_XTRACE_GET_PUT
for (int idx = 0; idx < GetSize(global_id_storage_); idx++)
for (int idx = 0; idx < GetSize(Interner::get().storage); idx++)
{
if (global_id_storage_.at(idx) == nullptr)
if (Interner::get().storage.at(idx) == nullptr)
log("#X# DB-DUMP index %d: FREE\n", idx);
else
log("#X# DB-DUMP index %d: '%s' (ref %d)\n", idx, global_id_storage_.at(idx), global_refcount_storage_.at(idx));
log("#X# DB-DUMP index %d: '%s' (ref %d)\n", idx, Interner::get().storage.at(idx), Interner::get().refcounts.at(idx));
}
#endif
}
@ -157,7 +156,7 @@ struct RTLIL::IdString
}
#endif
#ifdef YOSYS_SORT_ID_FREE_LIST
std::sort(global_free_idx_list_.begin(), global_free_idx_list_.end(), std::greater<int>());
std::sort(Interner::get().free_list.begin(), Interner::get().free_list.end(), std::greater<int>());
#endif
}
@ -165,11 +164,11 @@ struct RTLIL::IdString
{
if (idx) {
#ifndef YOSYS_NO_IDS_REFCNT
global_refcount_storage_[idx]++;
Interner::get().refcounts[idx]++;
#endif
#ifdef YOSYS_XTRACE_GET_PUT
if (yosys_xtrace)
log("#X# GET-BY-INDEX '%s' (index %d, refcount %d)\n", global_id_storage_.at(idx), idx, global_refcount_storage_.at(idx));
log("#X# GET-BY-INDEX '%s' (index %d, refcount %d)\n", Interner::get().storage.at(idx), idx, Interner::get().refcounts.at(idx));
#endif
}
return idx;
@ -177,19 +176,17 @@ struct RTLIL::IdString
static int get_reference(const char *p)
{
log_assert(destruct_guard_ok);
if (!p[0])
return 0;
auto it = global_id_index_.find((char*)p);
if (it != global_id_index_.end()) {
auto it = Interner::get().map.find((char*)p);
if (it != Interner::get().map.end()) {
#ifndef YOSYS_NO_IDS_REFCNT
global_refcount_storage_.at(it->second)++;
Interner::get().refcounts.at(it->second)++;
#endif
#ifdef YOSYS_XTRACE_GET_PUT
if (yosys_xtrace)
log("#X# GET-BY-NAME '%s' (index %d, refcount %d)\n", global_id_storage_.at(it->second), it->second, global_refcount_storage_.at(it->second));
log("#X# GET-BY-NAME '%s' (index %d, refcount %d)\n", Interner::get().storage.at(it->second), it->second, Interner::get().refcounts.at(it->second));
#endif
return it->second;
}
@ -201,31 +198,31 @@ struct RTLIL::IdString
log_error("Found control character or space (0x%02x) in string '%s' which is not allowed in RTLIL identifiers\n", *c, p);
#ifndef YOSYS_NO_IDS_REFCNT
if (global_free_idx_list_.empty()) {
if (global_id_storage_.empty()) {
global_refcount_storage_.push_back(0);
global_id_storage_.push_back((char*)"");
global_id_index_[global_id_storage_.back()] = 0;
if (Interner::get().free_list.empty()) {
if (Interner::get().storage.empty()) {
Interner::get().refcounts.push_back(0);
Interner::get().storage.push_back((char*)"");
Interner::get().map[Interner::get().storage.back()] = 0;
}
log_assert(global_id_storage_.size() < 0x40000000);
global_free_idx_list_.push_back(global_id_storage_.size());
global_id_storage_.push_back(nullptr);
global_refcount_storage_.push_back(0);
log_assert(Interner::get().storage.size() < 0x40000000);
Interner::get().free_list.push_back(Interner::get().storage.size());
Interner::get().storage.push_back(nullptr);
Interner::get().refcounts.push_back(0);
}
int idx = global_free_idx_list_.back();
global_free_idx_list_.pop_back();
global_id_storage_.at(idx) = strdup(p);
global_id_index_[global_id_storage_.at(idx)] = idx;
global_refcount_storage_.at(idx)++;
int idx = Interner::get().free_list.back();
Interner::get().free_list.pop_back();
Interner::get().storage.at(idx) = strdup(p);
Interner::get().map[Interner::get().storage.at(idx)] = idx;
Interner::get().refcounts.at(idx)++;
#else
if (global_id_storage_.empty()) {
global_id_storage_.push_back((char*)"");
global_id_index_[global_id_storage_.back()] = 0;
if (Interner::get().storage.empty()) {
Interner::get().storage.push_back((char*)"");
Interner::get().map[Interner::get().storage.back()] = 0;
}
int idx = global_id_storage_.size();
global_id_storage_.push_back(strdup(p));
global_id_index_[global_id_storage_.back()] = idx;
int idx = Interner::get().storage.size();
Interner::get().storage.push_back(strdup(p));
Interner::get().map[Interner::get().storage.back()] = idx;
#endif
if (yosys_xtrace) {
@ -235,7 +232,7 @@ struct RTLIL::IdString
#ifdef YOSYS_XTRACE_GET_PUT
if (yosys_xtrace)
log("#X# GET-BY-NAME '%s' (index %d, refcount %d)\n", global_id_storage_.at(idx), idx, global_refcount_storage_.at(idx));
log("#X# GET-BY-NAME '%s' (index %d, refcount %d)\n", Interner::get().storage.at(idx), idx, Interner::get().refcounts.at(idx));
#endif
#ifdef YOSYS_USE_STICKY_IDS
@ -253,18 +250,15 @@ struct RTLIL::IdString
#ifndef YOSYS_NO_IDS_REFCNT
static inline void put_reference(int idx)
{
// put_reference() may be called from destructors after the destructor of
// global_refcount_storage_ has been run. in this case we simply do nothing.
if (!destruct_guard_ok || !idx)
if (!idx)
return;
#ifdef YOSYS_XTRACE_GET_PUT
if (yosys_xtrace) {
log("#X# PUT '%s' (index %d, refcount %d)\n", global_id_storage_.at(idx), idx, global_refcount_storage_.at(idx));
log("#X# PUT '%s' (index %d, refcount %d)\n", Interner::get().storage.at(idx), idx, Interner::get().refcounts.at(idx));
}
#endif
int &refcount = global_refcount_storage_[idx];
int &refcount = Interner::get().refcounts[idx];
if (--refcount > 0)
return;
@ -275,14 +269,14 @@ struct RTLIL::IdString
static inline void free_reference(int idx)
{
if (yosys_xtrace) {
log("#X# Removed IdString '%s' with index %d.\n", global_id_storage_.at(idx), idx);
log("#X# Removed IdString '%s' with index %d.\n", Interner::get().storage.at(idx), idx);
log_backtrace("-X- ", yosys_xtrace-1);
}
global_id_index_.erase(global_id_storage_.at(idx));
free(global_id_storage_.at(idx));
global_id_storage_.at(idx) = nullptr;
global_free_idx_list_.push_back(idx);
Interner::get().map.erase(Interner::get().storage.at(idx));
free(Interner::get().storage.at(idx));
Interner::get().storage.at(idx) = nullptr;
Interner::get().free_list.push_back(idx);
}
#else
static inline void put_reference(int) { }
@ -315,11 +309,11 @@ struct RTLIL::IdString
}
inline const char *c_str() const {
return global_id_storage_.at(index_);
return Interner::get().storage.at(index_);
}
inline std::string str() const {
return std::string(global_id_storage_.at(index_));
return std::string(Interner::get().storage.at(index_));
}
inline bool operator<(const IdString &rhs) const {
@ -447,6 +441,7 @@ inline bool RTLIL::IdString::in(const pool<IdString> &rhs) const { return rhs.co
inline bool RTLIL::IdString::in(const pool<IdString> &&rhs) const { return rhs.count(*this) != 0; }
namespace RTLIL {
inline const auto& ensure_init = internerInitializer;
namespace ID {
#define X(_id) extern IdString _id;
#include "kernel/constids.inc"

1
kernel/yosys.cc
View file

@ -185,6 +185,7 @@ void yosys_setup()
if(already_setup)
return;
already_setup = true;
(void)Interner::get();
#ifdef WITH_PYTHON
// With Python 3.12, calling PyImport_AppendInittab on an already