Bug fix in selection of obstacles

978983537 · Apr 10, 2019 · 5e10eb5 · 5e10eb5
1 parent 9801f30
commit 5e10eb5
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 1 deletion.
diff --git a/rsyn/src/rsyn/io/parser/lef_def/LEFControlParser.cpp b/rsyn/src/rsyn/io/parser/lef_def/LEFControlParser.cpp
@@ -362,6 +362,7 @@ int lefUnits(lefrCallbackType_e c, lefiUnits* units, lefiUserData ud) {
 // -----------------------------------------------------------------------------
 
 int lefObstructionCB(lefrCallbackType_e c, lefiObstruction* obs, lefiUserData ud) {
+	//std::cout << "Reading lef obstacles\n";
 	LefDscp & dscp = getLibraryFromUserData(ud);
 	LefMacroDscp & lefMacro = dscp.clsLefMacroDscps.back();
 
@@ -382,6 +383,10 @@ int lefObstructionCB(lefrCallbackType_e c, lefiObstruction* obs, lefiUserData ud
 			lefObs.clsBounds.push_back(libRect);
 		} // end if-else 
 	} // end for 
+
+//	if (lefMacro.clsMacroName == "bufx2" || lefMacro.clsMacroName == "BUFX2") {
+//		std::cout << "#Obstacles" << lefMacro.clsObs.size() << "\n";
+//	}
 	return 0;
 } // end method 
 

diff --git a/rsyn/src/rsyn/io/reader/ISPD2018Reader.cpp b/rsyn/src/rsyn/io/reader/ISPD2018Reader.cpp
@@ -99,7 +99,7 @@ void ISPD2018Reader::populateDesign() {
 	Reader::populateRsyn(lefDescriptor, defDescriptor, design);
 
 	Rsyn::Json physicalDesignConfiguration;
-	physicalDesignConfiguration["clsEnableMergeRectangles"] = true;
+	physicalDesignConfiguration["clsEnableMergeRectangles"] = false;
 	physicalDesignConfiguration["clsEnableNetPinBoundaries"] = true;
 	physicalDesignConfiguration["clsEnableRowSegments"] = true;
 	session.startService("rsyn.physical", physicalDesignConfiguration);

diff --git a/rsyn/src/rsyn/phy/obj/impl/PhysicalDesign.cpp b/rsyn/src/rsyn/phy/obj/impl/PhysicalDesign.cpp
@@ -591,6 +591,10 @@ Rsyn::LibraryCell PhysicalDesign::addPhysicalLibraryCell(const LefMacroDscp& mac
 		} // end for
 
 		phlCell.clsObs.push_back(phObs);
+//		if (macro.clsMacroName == "bufx2" || macro.clsMacroName == "BUFX2") {
+//			std::cout << "----#Obstacles: " << macro.clsObs.size() << "\n";
+//			std::cout << "" << macro.clsObs[0].clsBounds.size() << "\n";
+//		}
 		if (data->clsEnableMergeRectangles && libObs.clsBounds.size() > 1) {
 			std::vector<Bounds> bounds;
 			mergeBounds(scaledBounds, bounds);