From ee2a5781d80a39f14d27b567ac1be607895b7971 Mon Sep 17 00:00:00 2001 From: Miodrag Milanovic Date: Sun, 29 Jun 2025 10:15:35 +0200 Subject: [PATCH] Resolve name conflicts --- himbaechel/uarch/gatemate/pack_clocking.cc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/himbaechel/uarch/gatemate/pack_clocking.cc b/himbaechel/uarch/gatemate/pack_clocking.cc index a21d463d..ff6c9c93 100644 --- a/himbaechel/uarch/gatemate/pack_clocking.cc +++ b/himbaechel/uarch/gatemate/pack_clocking.cc @@ -199,7 +199,7 @@ void GateMatePacker::pack_bufg() if (user_glb) { ci.movePortTo(id_I, glbout[die], ctx->idf("USR_GLB%d", i)); move_ram_o_fixed(glbout[die], ctx->idf("USR_GLB%d", i), ctx->getBelLocation(glbout[die]->bel)); - glbout[die]->params[ctx->idf("USR_GLB%d", i)] = Property(Property::State::S1); + glbout[die]->params[ctx->idf("USR_GLB%d_EN", i)] = Property(Property::State::S1); } } else { // SER_CLK @@ -209,7 +209,7 @@ void GateMatePacker::pack_bufg() ci.movePortTo(id_O, glbout[die], ctx->idf("GLB%d", i)); glbout[die]->params[ctx->idf("GLB%d_EN", i)] = Property(Property::State::S1); - glbout[die]->params[ctx->idf("GLB%d", i)] = Property(glb_mux, 3); + glbout[die]->params[ctx->idf("GLB%d_CFG", i)] = Property(glb_mux, 3); packed_cells.emplace(ci.name); } } @@ -222,10 +222,10 @@ void GateMatePacker::pack_bufg() if (!global_signals.count(feedback_net)) { pll[i]->movePortTo(id_CLK_FEEDBACK, glbout[die], ctx->idf("USR_FB%d", i)); move_ram_o_fixed(glbout[die], ctx->idf("USR_FB%d", i), ctx->getBelLocation(glbout[die]->bel)); - glbout[die]->params[ctx->idf("USR_FB%d", i)] = Property(Property::State::S1); + glbout[die]->params[ctx->idf("USR_FB%d_EN", i)] = Property(Property::State::S1); } else { int index = global_signals[feedback_net]; - glbout[die]->params[ctx->idf("FB%d", i)] = Property(index, 2); + glbout[die]->params[ctx->idf("FB%d_CFG", i)] = Property(index, 2); pll[i]->disconnectPort(id_CLK_FEEDBACK); } NetInfo *conn =