Skip to content

driver: move IdString collection to yosys_shutdown #5484

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

Merged
merged 2 commits into from
Nov 14, 2025
+6 −7
Merged

driver: move IdString collection to yosys_shutdown #5484

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
65d7d70
driver: move IdString collection to yosys_shutdown
widlarizer Nov 14, 2025
c497b3b
Revert "rtlil: make tracing optional in IdString garbage collection"
widlarizer Nov 14, 2025
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
1 change: 0 additions & 1 deletion kernel/driver.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -158,7 +158,6 @@ extern "C" {

void yosys_atexit()
{
RTLIL::OwningIdString::collect_garbage(false);
#if defined(YOSYS_ENABLE_READLINE) || defined(YOSYS_ENABLE_EDITLINE)
if (!yosys_history_file.empty()) {
#if defined(YOSYS_ENABLE_READLINE)
Expand Down
9 changes: 4 additions & 5 deletions kernel/rtlil.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -246,15 +246,14 @@ struct IdStringCollector {
int64_t RTLIL::OwningIdString::gc_ns;
int RTLIL::OwningIdString::gc_count;

void RTLIL::OwningIdString::collect_garbage(bool trace)
void RTLIL::OwningIdString::collect_garbage()
{
int64_t start = PerformanceTimer::query();
#ifndef YOSYS_NO_IDS_REFCNT
IdStringCollector collector;
if (trace)
for (auto &[idx, design] : *RTLIL::Design::get_all_designs()) {
collector.trace(*design);
}
for (auto &[idx, design] : *RTLIL::Design::get_all_designs()) {
collector.trace(*design);
}
int size = GetSize(global_id_storage_);
for (int i = static_cast<int>(StaticId::STATIC_ID_END); i < size; ++i) {
RTLIL::IdString::Storage &storage = global_id_storage_.at(i);
Expand Down
2 changes: 1 addition & 1 deletion kernel/rtlil.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -574,7 +574,7 @@
}

// Collect all non-owning references.
static void collect_garbage(bool trace = true);
static void collect_garbage();
static int64_t garbage_collection_ns() { return gc_ns; }
static int garbage_collection_count() { return gc_count; }

Expand Down Expand Up @@ -1272,7 +1272,7 @@
RTLIL::IdString name;
};

struct RTLIL::SigChunk

Check warning on line 1275 in kernel/rtlil.h

View workflow job for this annotation

GitHub Actions / test-compile (ubuntu-latest, gcc-14) 

‘((__vector(2) int*)((char*)&<unnamed> + offsetof(Yosys::RTLIL::SigSpec, Yosys::RTLIL::SigSpec::<unnamed>)))[4]’ may be used uninitialized [-Wmaybe-uninitialized]

Check warning on line 1275 in kernel/rtlil.h

View workflow job for this annotation

GitHub Actions / test-compile (ubuntu-latest, gcc-14) 

‘((__vector(2) int*)((char*)&<unnamed> + offsetof(Yosys::RTLIL::SigSpec, Yosys::RTLIL::SigSpec::<unnamed>)))[4]’ may be used uninitialized [-Wmaybe-uninitialized]

Check warning on line 1275 in kernel/rtlil.h

View workflow job for this annotation

GitHub Actions / test-compile (ubuntu-latest, gcc-14) 

‘((__vector(2) int*)((char*)&<unnamed> + offsetof(Yosys::RTLIL::SigSpec, Yosys::RTLIL::SigSpec::<unnamed>)))[4]’ may be used uninitialized [-Wmaybe-uninitialized]

Check warning on line 1275 in kernel/rtlil.h

View workflow job for this annotation

GitHub Actions / test-compile (ubuntu-latest, gcc-14) 

‘((__vector(2) int*)((char*)&<unnamed> + offsetof(Yosys::RTLIL::SigSpec, Yosys::RTLIL::SigSpec::<unnamed>)))[4]’ may be used uninitialized [-Wmaybe-uninitialized]

Check warning on line 1275 in kernel/rtlil.h

View workflow job for this annotation

GitHub Actions / test-compile (ubuntu-latest, gcc-14) 

‘((__vector(2) int*)((char*)&<unnamed> + offsetof(Yosys::RTLIL::SigSpec, Yosys::RTLIL::SigSpec::<unnamed>)))[4]’ may be used uninitialized [-Wmaybe-uninitialized]

Check warning on line 1275 in kernel/rtlil.h

View workflow job for this annotation

GitHub Actions / test-compile (ubuntu-latest, gcc-14) 

‘((__vector(2) int*)((char*)&<unnamed> + offsetof(Yosys::RTLIL::SigSpec, Yosys::RTLIL::SigSpec::<unnamed>)))[4]’ may be used uninitialized [-Wmaybe-uninitialized]

Check warning on line 1275 in kernel/rtlil.h

View workflow job for this annotation

GitHub Actions / test-compile (ubuntu-latest, gcc-14) 

‘((__vector(2) int*)((char*)&<unnamed> + offsetof(Yosys::RTLIL::SigSpec, Yosys::RTLIL::SigSpec::<unnamed>)))[4]’ may be used uninitialized [-Wmaybe-uninitialized]
{
RTLIL::Wire *wire;
std::vector<RTLIL::State> data; // only used if wire == NULL, LSB at index 0
Expand Down
1 change: 1 addition & 0 deletions kernel/yosys.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -260,6 +260,7 @@ void yosys_shutdown()

delete yosys_design;
yosys_design = NULL;
RTLIL::OwningIdString::collect_garbage();

for (auto f : log_files)
if (f != stderr)
Expand Down
Loading