From 9635cc331103c7b6025edf181e42cf91ae504194 Mon Sep 17 00:00:00 2001 From: gatecat Date: Wed, 12 Jan 2022 13:41:54 +0000 Subject: [PATCH] lef: Fix MANUFACTURINGGRID order Signed-off-by: gatecat --- crlcore/src/ccore/lefdef/LefExport.cpp | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/crlcore/src/ccore/lefdef/LefExport.cpp b/crlcore/src/ccore/lefdef/LefExport.cpp index ac8b91dc..e2ee9c64 100644 --- a/crlcore/src/ccore/lefdef/LefExport.cpp +++ b/crlcore/src/ccore/lefdef/LefExport.cpp @@ -481,7 +481,13 @@ namespace { ); if ( status != 0 ) return driver->checkStatus(status); - return driver->checkStatus ( lefwEndUnits() ); + status = lefwEndUnits(); + + status = lefwManufacturingGrid ( LefDriver::toLefUnits(DbU::fromGrid(1.0)) ); + + if ( status != 0 ) return driver->checkStatus(status); + + return driver->checkStatus ( status ); } @@ -566,14 +572,7 @@ namespace { int LefDriver::_manufacturingGridCbk ( lefwCallbackType_e, lefiUserData udata ) { -#if 1 - // The driver puts it before UNITS, which seems to displease Cadence Encounter. - // So, as long as it doesn't prevent Encounter to works, disable it. - LefDriver* driver = (LefDriver*)udata; - return driver->checkStatus ( lefwManufacturingGrid ( LefDriver::toLefUnits(DbU::fromGrid(1.0)) ) ); -#else return 0; -#endif }