Skip to content

fixed wrong module swap count #9175

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

Open
openroad-ci wants to merge 2 commits into
base: master
Choose a base branch
from
+16 −7
Open

fixed wrong module swap count #9175

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
980c1eb
fixed wrong module swap count
precisionmoon Dec 30, 2025
cc561a5
gemini code review fix
precisionmoon Dec 31, 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
19 changes: 14 additions & 5 deletions src/rsz/src/ConcreteSwapArithModules.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -235,12 +235,14 @@ bool ConcreteSwapArithModules::hasArithOperatorProperty(
return false;
}

bool ConcreteSwapArithModules::doSwapInstances(
const std::set<dbModInst*>& insts,
const std::string& target)
bool ConcreteSwapArithModules::doSwapInstances(std::set<dbModInst*>& insts,
const std::string& target)
{
int swapped_count = 0;

// Create a new inst set since old insts are destroyed
std::set<dbModInst*> swappedInsts;

for (dbModInst* inst : insts) {
dbModule* old_master = inst->getMaster();
if (!old_master) {
Expand Down Expand Up @@ -271,11 +273,18 @@ bool ConcreteSwapArithModules::doSwapInstances(
inst->getName(),
old_name,
new_name);
inst->swapMaster(new_master);
swapped_count++;
dbModInst* new_inst = inst->swapMaster(new_master);

if (new_inst) {
swapped_count++;
swappedInsts.insert(new_inst);
}
}
}

insts.clear();
insts.insert(swappedInsts.begin(), swappedInsts.end());

logger_->info(RSZ,
160,
"{} arithmetic instances have swapped to improve '{}' target",
Expand Down
2 changes: 1 addition & 1 deletion src/rsz/src/ConcreteSwapArithModules.hh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ class ConcreteSwapArithModules : public SwapArithModules
const std::string& target,
float slack_threshold,
std::set<dbModInst*>& insts) override;
bool doSwapInstances(const std::set<dbModInst*>& insts,
bool doSwapInstances(std::set<dbModInst*>& insts,
const std::string& target) override;

protected:
Expand Down
2 changes: 1 addition & 1 deletion src/rsz/src/SwapArithModules.hh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ class SwapArithModules : public sta::dbStaState
float slack_threshold,
std::set<dbModInst*>& insts)
= 0;
virtual bool doSwapInstances(const std::set<dbModInst*>& insts,
virtual bool doSwapInstances(std::set<dbModInst*>& insts,
const std::string& target)
= 0;

Expand Down