gowin: Himbaechel. Fix IDES16/OSER16

Signed-off-by: YRabbit <[email protected]>
YosysHQ · Mar 13, 2024 · ff96fc5 · ff96fc5
1 parent 4e8436a
commit ff96fc5
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/himbaechel/uarch/gowin/constids.inc b/himbaechel/uarch/gowin/constids.inc
@@ -797,6 +797,7 @@ X(IDES8)
 X(IDES10)
 X(IVIDEO)
 X(IDES16)
+X(IOLOGIC)
 X(IOLOGICI)
 X(IOLOGICO)
 X(IOLOGICA)

diff --git a/himbaechel/uarch/gowin/gowin.cc b/himbaechel/uarch/gowin/gowin.cc
@@ -200,7 +200,7 @@ void GowinImpl::postRoute()
 
     for (auto &cell : ctx->cells) {
         auto ci = cell.second.get();
-        if (ci->type.in(id_IOLOGICI, id_IOLOGICO) ||
+        if (ci->type.in(id_IOLOGICI, id_IOLOGICO, id_IOLOGIC) ||
             ((is_iologici(ci) || is_iologico(ci)) && !ci->type.in(id_ODDR, id_ODDRC, id_IDDR, id_IDDRC))) {
             if (visited_hclk_users.find(ci->name) == visited_hclk_users.end()) {
                 // mark FCLK<-HCLK connections

diff --git a/himbaechel/uarch/gowin/pack.cc b/himbaechel/uarch/gowin/pack.cc
@@ -741,7 +741,7 @@ struct GowinPacker
         aux->setParam(ctx->id("UPDATE"), Property("SAME"));
 
         // make cell in the next location
-        ctx->createCell(main_name, id_IOLOGICO);
+        ctx->createCell(main_name, id_IOLOGIC);
         aux = ctx->cells.at(main_name).get();
 
         aux->setAttr(ctx->id("MAIN_CELL"), Property(main_name.str(ctx)));
@@ -814,7 +814,7 @@ struct GowinPacker
         ci.copyPortTo(id_CALIB, aux, id_CALIB);
 
         // make cell in the next location
-        ctx->createCell(main_name, id_IOLOGICI);
+        ctx->createCell(main_name, id_IOLOGIC);
         aux = ctx->cells.at(main_name).get();
 
         aux->setAttr(ctx->id("MAIN_CELL"), Property(main_name.str(ctx)));