Merge pull request #770 from os-fpga/checker_added_NW_class

checker: added class 'Nw' (Network) for clock-data checking in blif

Author: serge-dsa

planning/src/RS/rsCheck.cpp

@@ -1,17 +1,24 @@
 #include "RS/rsCheck.h"
 #include "file_readers/pln_blif_file.h"
 #include "file_readers/pln_csv_reader.h"
+#include "util/nw/Nw.h"
 
 namespace pln {
 
 using std::string;
 using std::endl;
 
+static void nw_test_01();
+
 static bool do_check_blif(CStr cfn) {
   assert(cfn);
   uint16_t tr = ltrace();
   auto& ls = lout();
 
+  if (::getenv("pln_nw_test_01")) {
+    nw_test_01();
+  }
+
   BLIF_file bfile(string{cfn});
 
   if (tr >= 4)
@@ -46,13 +53,13 @@ static bool do_check_blif(CStr cfn) {
           bfile.numInputs(), bfile.numOutputs(), bfile.topModel_.c_str());
 
   if (tr >= 4) {
-    lputs();
+    flush_out(true);
     bfile.printInputs(ls);
-    lputs();
+    flush_out(true);
     bfile.printOutputs(ls);
   }
 
-  lputs();
+  flush_out(true);
   ls << ">>>>> checking BLIF " << cfn << "  ..." << endl;
 
   bool chk_ok = bfile.checkBlif();
@@ -159,5 +166,56 @@ bool do_check(const rsOpts& opts, bool blif_vs_csv) {
   return status;
 }
 
+// DEBUG new NW code:
+static void nw_test_01() {
+  flush_out(true);
+  pln::NW g;
+  uint64_t key_cnt = 100;
+  uint nid = g.insP(XY{0, 0}, key_cnt++);
+  assert(nid > 0);
+  assert(g.hasNode(nid));
+
+  g.addRoot(nid);
+  g.insP(XY{200, 0}, key_cnt++);
+  g.insP(XY{200, 200}, key_cnt++);
+  g.insP(XY{0, 200}, key_cnt++);
+
+  g.beComplete();
+
+  g.dump("\t  g is a complete graph");
+  lprintf("\t  g. numN()= %u   numE()= %u\n", g.numN(), g.numE());
+  assert(g.numE() == 6);
+
+  pln::vecu topo;
+  g.getTopo(topo);
+
+  flush_out(true);
+  lputs("==== **** DOT ****");
+
+  g.dumpDot("g");
+  std::ofstream fos("g.dot");
+  if (fos.is_open()) {
+    g.printDot(fos, nullptr, false);
+    lputs(" written g.dot");
+    fos.close();
+  } else {
+    flush_out(true);
+    lprintf2("[Error] NOT fos.is_open()\n");
+    flush_out(true);
+  }
+
+  flush_out(true);
+  lputs("==== **** METIS ****");
+
+  g.dumpMetis(true);
+
+  flush_out(true);
+
+  bool wr_ok = g.writeMetis("g.met", true);
+  lprintf("wr_ok:%i\n", wr_ok);
+  if (wr_ok)
+    lputs(" written g.met");
+}
+
 }
 

planning/src/main.cpp

@@ -1,4 +1,4 @@
-static const char* _pln_VERSION_STR = "pln0273";
+static const char* _pln_VERSION_STR = "pln0274";
 
 #include "RS/rsEnv.h"
 #include "util/pln_log.h"

planning/src/util/geo/xyz.h

@@ -1,15 +1,24 @@
 // class XY  - 2D Point
 // class XYZ - 3D Point
 #pragma once
+#ifndef _pln_util_geo_XYZ_H_1c192a5bf5646b833_
+#define _pln_util_geo_XYZ_H_1c192a5bf5646b833_
+
 #include "util/geo/iv.h"
 
+#undef XY
+#undef XYZ
+
 namespace pln {
 
+using ipair = std::pair<int, int>;
+
 struct XY {
   int x_ = INT_MIN, y_ = INT_MIN;
 
   XY() noexcept = default;
   XY(int a, int b) noexcept : x_(a), y_(b) {}
+  XY(ipair p) noexcept : x_(p.first), y_(p.second) {}
 
   bool valid() const noexcept { return x_ != INT_MIN; }
   bool nonNeg() const noexcept { return x_ >= 0; }
@@ -25,6 +34,12 @@ struct XY {
     y_ = 0;
   }
 
+  void moveRel(int dx, int dy) noexcept {
+    x_ += dx;
+    y_ += dy;
+  }
+  void moveRel(XY d) noexcept { moveRel(d.x_, d.y_); }
+
   void negate() noexcept {
     x_ = -x_;
     y_ = -y_;
@@ -68,6 +83,11 @@ struct XY {
     y_ -= p.y_;
   }
 
+  void operator = (ipair p) noexcept {
+    x_ = p.first;
+    y_ = p.second;
+  }
+
   static constexpr int p_round(double x) noexcept {
     if (x >= 0) {
       if (x >= double(INT_MAX) - 0.5) return INT_MAX;
@@ -107,14 +127,41 @@ struct XY {
     return double(p.x_ - x_) * (p.x_ - x_) + double(p.y_ - y_) * (p.y_ - y_);
   }
 
-  std::string toString() const noexcept {
-    std::string s{"("};
-    s += std::to_string(x_);
-    s.push_back(' ');
-    s += std::to_string(y_);
-    s.push_back(')');
-    return s;
+  uint64_t cantorHash() const noexcept {
+    uint64_t a = x_;
+    uint64_t b = y_;
+    return ((a + b) >> 1) * (a + b + 1) + b;
+  }
+  uint64_t fnvHash() const noexcept {
+    uint64_t a = x_;
+    uint64_t b = y_;
+    constexpr uint64_t m = 0xc6a4a7935bd1e995;
+    return (a ^ (b * m + (a << 6) + (a >> 2))) + 0xe6546b64;
   }
+
+  static inline std::string i2s(int i) noexcept { return std::to_string(i); }
+
+  static inline std::string conc(const std::string& a, char ch, const std::string& b) noexcept {
+    std::string z;
+    z.reserve(a.length() + b.length() + 2);
+    z = a;
+    z.push_back(ch);
+    z += b;
+    return z;
+  }
+
+  static inline std::string conc(char a, const std::string& s, char b) noexcept {
+    std::string z;
+    z.reserve(s.length() + 3);
+    z.push_back(a);
+    z += s;
+    z.push_back(b);
+    return z;
+  }
+
+  std::string x_spc_y() const noexcept { return conc( i2s(x_), ' ', i2s(y_) ); }
+  std::string x_com_y() const noexcept { return conc( i2s(x_), ',', i2s(y_) ); }
+  std::string toString() const noexcept { return conc( '(', x_spc_y(), ')' ); }
 };
 
 struct XYZ : public XY {
@@ -137,6 +184,7 @@ struct XYZ : public XY {
     z_ = c;
   }
   void set3(XYZ u) noexcept { *this = u; }
+  void setZ(int zz) noexcept { z_ = zz; }
 
   bool operator==(XYZ u) const noexcept {
     return x_ == u.x_ && y_ == u.y_ && z_ == u.z_;
@@ -152,6 +200,17 @@ struct XYZ : public XY {
   }
 
   int dist3D(XYZ u) const noexcept { return dist(u) + std::abs(z_ - u.z_); }
+
+  std::string toString() const noexcept {
+    std::string s{"("};
+    s += std::to_string(x_);
+    s.push_back(' ');
+    s += std::to_string(y_);
+    s.push_back(' ');
+    s += std::to_string(z_);
+    s.push_back(')');
+    return s;
+  }
 };
 
 inline std::ostream& operator<<(std::ostream& os, XY p) {
@@ -167,11 +226,21 @@ inline std::ostream& operator<<(std::ostream& os, const XYZ& u) {
 inline int64_t dot(XY a, XY b) noexcept { return a.dot(b); }
 inline int64_t det(XY a, XY b) noexcept { return a.det(b); }
 
+inline XY operator-(XY a, XY b) noexcept {
+  return XY(a.x_ - b.x_, a.y_ - b.y_);
+}
+inline XY operator+(XY a, XY b) noexcept {
+  return XY(a.x_ + b.x_, a.y_ + b.y_);
+}
+
 inline int abc_ori(XY a, XY b, XY c) noexcept {
   int64_t det = XY::det3(a, b, c);
   if (det > 0) return 1;
   if (det < 0) return -1;
   return 0;
 }
 
-}  // namespace pln
+}
+
+#endif
+