Skip to content

Commit c8a9343

Browse files
committed
odb: fix merge changes
Signed-off-by: osamahammad21 <[email protected]>
1 parent b65c1ec commit c8a9343

File tree

2 files changed

+6
-3
lines changed

2 files changed

+6
-3
lines changed

src/odb/src/3dblox/3dblox.cpp

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -112,8 +112,9 @@ dbChip::ChipType getChipType(const std::string& type, utl::Logger* logger)
112112
}
113113
void ThreeDBlox::createChiplet(const ChipletDef& chiplet)
114114
{
115-
dbChip* chip
116-
= dbChip::create(db_, chiplet.name, getChipType(chiplet.type, logger_));
115+
auto tech = db_->getTech(); // TODO: specify tech
116+
dbChip* chip = dbChip::create(
117+
db_, tech, chiplet.name, getChipType(chiplet.type, logger_));
117118

118119
chip->setWidth(chiplet.design_width * db_->getDbuPerMicron());
119120
chip->setHeight(chiplet.design_height * db_->getDbuPerMicron());
@@ -179,7 +180,8 @@ void ThreeDBlox::createRegion(const ChipletRegion& region, dbChip* chip)
179180
}
180181
void ThreeDBlox::createDesignTopChiplet(const DesignDef& design)
181182
{
182-
dbChip* chip = dbChip::create(db_, design.name, dbChip::ChipType::HIER);
183+
dbChip* chip
184+
= dbChip::create(db_, nullptr, design.name, dbChip::ChipType::HIER);
183185
db_->setTopChip(chip);
184186
}
185187
void ThreeDBlox::createChipInst(const ChipletInst& chip_inst)

src/odb/test/cpp/Test3DBloxParser.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ struct F_DBV_PARSER
1616
F_DBV_PARSER()
1717
{
1818
db = dbDatabase::create();
19+
dbTech::create(db, "tech");
1920
logger = new utl::Logger();
2021
db->setLogger(logger);
2122
ThreeDBlox parser(logger, db);

0 commit comments

Comments
 (0)