Merge pull request #8564 from The-OpenROAD-Project-staging/odb-ndr-wrong-way

odb: fix wrong way dir width when an NDR is present

Author: maliberty

src/odb/src/db/dbWireShapeItr.cpp

@@ -143,7 +143,7 @@ bool dbWireShapeItr::next(dbShape& shape)
         goto nextOpCode;
       }
       auto dw = _dw;
-      if (_layer->getDirection() == dbTechLayerDir::VERTICAL) {
+      if (!_has_width && _layer->getDirection() == dbTechLayerDir::VERTICAL) {
         dw = _layer->getWrongWayWidth() / 2;
       }
 
@@ -182,7 +182,7 @@ bool dbWireShapeItr::next(dbShape& shape)
       }
       auto dw = _dw;
 
-      if (_layer->getDirection() == dbTechLayerDir::HORIZONTAL) {
+      if (!_has_width && _layer->getDirection() == dbTechLayerDir::HORIZONTAL) {
         dw = _layer->getWrongWayWidth() / 2;
       }
       shape.setSegment(_prev_x,

src/odb/test/cpp/TestDbWire.cc

@@ -9,6 +9,7 @@
 #include <memory>
 
 #include "odb/db.h"
+#include "odb/dbShape.h"
 #include "odb/dbWireCodec.h"
 #include "odb/lefin.h"
 #include "tst/fixture.h"
@@ -36,6 +37,40 @@ class OdbMultiPatternedTest : public tst::Fixture
   odb::dbBlock* block_;
 };
 
+TEST_F(OdbMultiPatternedTest, NdrWidth)
+{
+  dbTechLayer* met1 = lib_->getTech()->findLayer("met1");
+  ASSERT_NE(met1, nullptr);
+
+  // Setup an NDR
+  dbTechNonDefaultRule* ndr = dbTechNonDefaultRule::create(block_, "ndr");
+  dbTechLayerRule* rule = dbTechLayerRule::create(ndr, met1);
+  const int width = 42;
+  rule->setWidth(width);
+
+  // Apply it to some routing
+  dbNet* net = dbNet::create(block_, "net");
+  dbWire* wire = dbWire::create(net);
+  dbWireEncoder encoder;
+  encoder.begin(wire);
+  encoder.newPath(met1, dbWireType::ROUTED, rule);
+  encoder.addPoint(0, 0);
+  encoder.addPoint(0, 100000);
+  encoder.addPoint(100000, 100000);
+  encoder.end();
+
+  // Check the width in both directions is correct
+  int shape_cnt = 0;
+  odb::dbWireShapeItr it;
+  it.begin(wire);
+  odb::dbShape shape;
+  while (it.next(shape)) {
+    EXPECT_EQ(shape.getBox().minDXDY(), width);
+    ++shape_cnt;
+  }
+  EXPECT_EQ(shape_cnt, 2);
+}
+
 TEST_F(OdbMultiPatternedTest, CanColorColoredLayer)
 {
   // Arrange