Netlist streaming

CMakeLists.txt

@@ -64,4 +64,4 @@ add_subdirectory(test)
 find_package(Doxygen)
 if(DOXYGEN_FOUND)
   add_subdirectory(docs)
-endif(DOXYGEN_FOUND)
+endif(DOXYGEN_FOUND)

docs/CMakeLists.txt

@@ -16,4 +16,4 @@ if(DOXYGEN_FOUND)
   install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/html DESTINATION doc OPTIONAL) 
 else (DOXYGEN_FOUND)
   message("Doxygen need to be installed to generate the doxygen documentation")
-endif (DOXYGEN_FOUND)
+endif (DOXYGEN_FOUND)

src/snl/snippets/app/src/CMakeLists.txt

@@ -2,6 +2,6 @@
 #
 # SPDX-License-Identifier: Apache-2.0
 
-add_executable(snl_app SNLSnippet.cpp)
+add_executable(snl_app SNLSnippet.cpp SNLUniverseSnippet.cpp)
 target_include_directories(snl_app SYSTEM BEFORE PUBLIC ${Boost_INCLUDE_DIR})
 target_link_libraries(snl_app Naja::SNL)

src/snl/snippets/app/src/SNLReceiver.cpp

@@ -0,0 +1,69 @@
+#include <iostream>
+
+#include "SNLDB.h"
+#include "SNLCapnP.h"
+
+using namespace naja::SNL;
+
+namespace {
+
+void displayDesign(const SNLDesign* design) {
+  std::cout << design->getDescription() << std::endl;
+  for (auto term: design->getTerms()) {
+    std::cout << term->getDescription() << std::endl;
+  }
+  for (auto net: design->getNets()) {
+    std::cout << net->getDescription() << std::endl;
+  }
+  for (auto instance: design->getInstances()) {
+    std::cout << instance->getDescription() << std::endl;
+  }
+}
+
+void displayLibrary(const SNLLibrary* lib) {
+  std::cout << lib->getDescription() << std::endl;
+  for (auto design: lib->getDesigns()) {
+    displayDesign(design);
+  }
+}
+
+void displayDB(const SNLDB* db) {
+  std::cout << db->getDescription() << std::endl;
+  for (auto lib: db->getLibraries()) {
+    displayLibrary(lib);
+  }
+}
+
+}
+
+int main(int argc, char* argv[]) {
+  if (argc != 2) {
+    exit(34);
+  }
+  int port = std::stoi(argv[1]);
+
+  SNLDB* db = SNLCapnP::receive(port);
+  if (db) {
+    std::cout << "Received " << db->getString() << std::endl; 
+    displayDB(db);
+  } else {
+    std::cout << "No DB received" << std::endl; 
+  }
+  return 0;
+/*
+  auto topIns1 = top->getInstance(SNLName("ins1"));
+  std::cout << topIns1->getName().getString() << " instance terminals:" << std::endl;
+  for (auto instTerm: topIns1->getInstTerms()) {
+    std::cout << "  - " << instTerm->getTerm()->getName().getString() << std::endl;
+  }
+
+  auto topNet1 = top->getScalarNet(0); // net1 is an anonymous net at ID 0
+  std::cout << topNet1->getString() << " components:" << std::endl;
+  for (auto component: topNet1->getComponents()) {
+    std::cout << "  - " << component->getString() << std::endl;
+  }
+
+*/
+
+  return 0;
+}

src/snl/snippets/app/src/SNLSender.cpp

@@ -0,0 +1,41 @@
+#include <iostream>
+
+#include "SNLUniverse.h"
+#include "SNLCapnP.h"
+#include "SNLUniverseSnippet.h"
+
+using namespace naja::SNL;
+
+int main(int argc, char* argv[]) {
+  if (argc != 3) {
+    exit(34);
+  }
+  std::string ipAddress = argv[1];
+  int port = std::stoi(argv[2]);
+
+  SNLUniverseSnippet::create();
+  auto universe = SNLUniverse::get();
+  assert(universe);
+  auto db = universe->getDB(1);
+  assert(db);
+
+  std::cout << "Sending " << db->getString() << std::endl;
+  SNLCapnP::send(db, ipAddress, port);
+  return 0;
+/*
+  auto topIns1 = top->getInstance(SNLName("ins1"));
+  std::cout << topIns1->getName().getString() << " instance terminals:" << std::endl;
+  for (auto instTerm: topIns1->getInstTerms()) {
+    std::cout << "  - " << instTerm->getTerm()->getName().getString() << std::endl;
+  }
+
+  auto topNet1 = top->getScalarNet(0); // net1 is an anonymous net at ID 0
+  std::cout << topNet1->getString() << " components:" << std::endl;
+  for (auto component: topNet1->getComponents()) {
+    std::cout << "  - " << component->getString() << std::endl;
+  }
+
+*/
+
+  return 0;
+}

src/snl/snippets/app/src/SNLSnippet.cpp

@@ -2,79 +2,9 @@
 //
 // SPDX-License-Identifier: Apache-2.0
 
-#include <iostream>
-
-#include "SNLUniverse.h"
-#include "SNLScalarNet.h"
-#include "SNLScalarTerm.h"
-#include "SNLBusTerm.h"
-#include "SNLBusTermBit.h"
-#include "SNLInstTerm.h"
-
-using namespace naja::SNL;
+#include "SNLUniverseSnippet.h"
 
 int main() {
-  SNLUniverse::create();
-  auto db = SNLDB::create(SNLUniverse::get());
-  auto primLib = SNLLibrary::create(db, SNLLibrary::Type::Primitives, SNLName("primitives"));
-  auto prim0 = SNLDesign::create(primLib, SNLDesign::Type::Primitive);
-  auto prim1 = SNLDesign::create(primLib, SNLDesign::Type::Primitive);
-
-  auto mylib = SNLLibrary::create(db, SNLName("mylib"));
-
-  auto model1 = SNLDesign::create(mylib, SNLName("Model1"));
-  {
-    SNLScalarTerm::create(model1, SNLTerm::Direction::Input, SNLName("i0"));
-    SNLScalarTerm::create(model1, SNLTerm::Direction::Input, SNLName("i1"));
-    SNLScalarTerm::create(model1, SNLTerm::Direction::Output, SNLName("o"));
-    SNLParameter::create(model1, SNLName("PARAM0"), SNLParameter::Type::Decimal, "18");
-    SNLParameter::create(model1, SNLName("PARAM1"), SNLParameter::Type::String,  "OPTION2");
-    SNLInstance::create(model1, prim0); // anonymous
-    SNLInstance::create(model1, prim1, SNLName("ins"));  
-  }
-
-  std::cout << model1->getName().getString() << " terms:" << std::endl;
-  for (auto term: model1->getTerms()) {
-    std::cout << "  - " << term->getString() << std::endl;
-  }
-
-  auto model2 = SNLDesign::create(mylib, SNLName("Model2"));
-  SNLBusTerm::create(model2, SNLTerm::Direction::Input, 4, 0, SNLName("i0"));
-  SNLScalarTerm::create(model2, SNLTerm::Direction::Input, SNLName("i1"));
-  SNLBusTerm::create(model2, SNLTerm::Direction::Output, 31, 0, SNLName("o"));
-  std::cout << model2->getName().getString() << " terms:" << std::endl;
-  for (auto term: model2->getTerms()) {
-    std::cout << "  - " << term->getString() << std::endl;
-  }
-
-  auto top = SNLDesign::create(mylib, SNLName("top"));
-  {
-    auto i = SNLScalarTerm::create(top, SNLTerm::Direction::Input, SNLName("i"));
-    auto o = SNLScalarTerm::create(top, SNLTerm::Direction::Input, SNLName("o"));
-    auto ins1 = SNLInstance::create(top, model1, SNLName("ins1"));
-    auto ins2 = SNLInstance::create(top, model2, SNLName("ins2"));
-    auto net1 = SNLScalarNet::create(top); //anonymous
-    auto net2 = SNLScalarNet::create(top); //anonymous
-    auto net3 = SNLScalarNet::create(top, SNLName("n"));
-    i->setNet(net1);
-    ins1->getInstTerm(ins1->getModel()->getScalarTerm(SNLName("i0")))->setNet(net1);
-    ins1->getInstTerm(ins1->getModel()->getScalarTerm(SNLName("i1")))->setNet(net3);
-    ins2->getInstTerm(ins2->getModel()->getScalarTerm(SNLName("i1")))->setNet(net3);
-    ins2->getInstTerm(ins2->getModel()->getBusTerm(SNLName("o"))->getBit(0))->setNet(net3);
-    o->setNet(net2);
-  }
-
-  auto topIns1 = top->getInstance(SNLName("ins1"));
-  std::cout << topIns1->getName().getString() << " instance terminals:" << std::endl;
-  for (auto instTerm: topIns1->getInstTerms()) {
-    std::cout << "  - " << instTerm->getTerm()->getName().getString() << std::endl;
-  }
-
-  auto topNet1 = top->getScalarNet(0); // net1 is an anonymous net at ID 0
-  std::cout << topNet1->getString() << " components:" << std::endl;
-  for (auto component: topNet1->getComponents()) {
-    std::cout << "  - " << component->getString() << std::endl;
-  }
-
+  SNLUniverseSnippet::create();
   return 0;
 }

src/snl/snippets/app/src/SNLUniverseSnippet.cpp

@@ -0,0 +1,76 @@
+#include "SNLUniverseSnippet.h"
+
+#include <iostream>
+
+#include "SNLUniverse.h"
+#include "SNLScalarTerm.h"
+#include "SNLBusTerm.h"
+#include "SNLBusTermBit.h"
+#include "SNLScalarNet.h"
+#include "SNLInstTerm.h"
+
+using namespace naja::SNL;
+
+void SNLUniverseSnippet::create() {
+  SNLUniverse::create();
+  auto db = SNLDB::create(SNLUniverse::get());
+  auto primLib = SNLLibrary::create(db, SNLLibrary::Type::Primitives, SNLName("primitives"));
+  auto prim0 = SNLDesign::create(primLib, SNLDesign::Type::Primitive);
+  auto prim1 = SNLDesign::create(primLib, SNLDesign::Type::Primitive);
+
+  auto mylib = SNLLibrary::create(db, SNLName("mylib"));
+
+  auto model1 = SNLDesign::create(mylib, SNLName("Model1"));
+  {
+    SNLScalarTerm::create(model1, SNLTerm::Direction::Input, SNLName("i0"));
+    SNLScalarTerm::create(model1, SNLTerm::Direction::Input, SNLName("i1"));
+    SNLScalarTerm::create(model1, SNLTerm::Direction::Output, SNLName("o"));
+    SNLParameter::create(model1, SNLName("PARAM0"), SNLParameter::Type::Decimal, "18");
+    SNLParameter::create(model1, SNLName("PARAM1"), SNLParameter::Type::String,  "OPTION2");
+    SNLInstance::create(model1, prim0); // anonymous
+    SNLInstance::create(model1, prim1, SNLName("ins"));  
+  }
+
+  std::cout << model1->getName().getString() << " terms:" << std::endl;
+  for (auto term: model1->getTerms()) {
+    std::cout << "  - " << term->getString() << std::endl;
+  }
+
+  auto model2 = SNLDesign::create(mylib, SNLName("Model2"));
+  SNLBusTerm::create(model2, SNLTerm::Direction::Input, 4, 0, SNLName("i0"));
+  SNLScalarTerm::create(model2, SNLTerm::Direction::Input, SNLName("i1"));
+  SNLBusTerm::create(model2, SNLTerm::Direction::Output, 31, 0, SNLName("o"));
+  std::cout << model2->getName().getString() << " terms:" << std::endl;
+  for (auto term: model2->getTerms()) {
+    std::cout << "  - " << term->getString() << std::endl;
+  }
+
+  auto top = SNLDesign::create(mylib, SNLName("top"));
+  {
+    auto i = SNLScalarTerm::create(top, SNLTerm::Direction::Input, SNLName("i"));
+    auto o = SNLScalarTerm::create(top, SNLTerm::Direction::Input, SNLName("o"));
+    auto ins1 = SNLInstance::create(top, model1, SNLName("ins1"));
+    auto ins2 = SNLInstance::create(top, model2, SNLName("ins2"));
+    auto net1 = SNLScalarNet::create(top); //anonymous
+    auto net2 = SNLScalarNet::create(top); //anonymous
+    auto net3 = SNLScalarNet::create(top, SNLName("n"));
+    i->setNet(net1);
+    ins1->getInstTerm(ins1->getModel()->getScalarTerm(SNLName("i0")))->setNet(net1);
+    ins1->getInstTerm(ins1->getModel()->getScalarTerm(SNLName("i1")))->setNet(net3);
+    ins2->getInstTerm(ins2->getModel()->getScalarTerm(SNLName("i1")))->setNet(net3);
+    ins2->getInstTerm(ins2->getModel()->getBusTerm(SNLName("o"))->getBit(0))->setNet(net3);
+    o->setNet(net2);
+  }
+
+  auto topIns1 = top->getInstance(SNLName("ins1"));
+  std::cout << topIns1->getName().getString() << " instance terminals:" << std::endl;
+  for (auto instTerm: topIns1->getInstTerms()) {
+    std::cout << "  - " << instTerm->getTerm()->getName().getString() << std::endl;
+  }
+
+  auto topNet1 = top->getScalarNet(0); // net1 is an anonymous net at ID 0
+  std::cout << topNet1->getString() << " components:" << std::endl;
+  for (auto component: topNet1->getComponents()) {
+    std::cout << "  - " << component->getString() << std::endl;
+  }
+}

src/snl/snippets/app/src/SNLUniverseSnippet.h

@@ -0,0 +1,9 @@
+#ifndef __SNL_UNIVERSE_SNIPPET_H_
+#define __SNL_UNIVERSE_SNIPPET_H_
+
+class SNLUniverseSnippet {
+  public:
+    static void create();
+};
+
+#endif /* __SNL_UNIVERSE_SNIPPET_H_ */

src/snl/snippets/cpp/CMakeLists.txt

@@ -2,5 +2,19 @@
 #
 # SPDX-License-Identifier: Apache-2.0
 
-add_executable(snl_snippet ${PROJECT_SOURCE_DIR}/src/snl/snippets/app/src/SNLSnippet.cpp)
-target_link_libraries(snl_snippet naja_snl)
+add_executable(snl_snippet
+  ${PROJECT_SOURCE_DIR}/src/snl/snippets/app/src/SNLUniverseSnippet.cpp
+  ${PROJECT_SOURCE_DIR}/src/snl/snippets/app/src/SNLSnippet.cpp
+)
+add_executable(snl_receiver
+  ${PROJECT_SOURCE_DIR}/src/snl/snippets/app/src/SNLUniverseSnippet.cpp
+  ${PROJECT_SOURCE_DIR}/src/snl/snippets/app/src/SNLReceiver.cpp
+)
+add_executable(snl_sender
+  ${PROJECT_SOURCE_DIR}/src/snl/snippets/app/src/SNLUniverseSnippet.cpp
+  ${PROJECT_SOURCE_DIR}/src/snl/snippets/app/src/SNLSender.cpp
+)
+
+target_link_libraries(snl_snippet naja_snl)
+target_link_libraries(snl_receiver naja_snl_dump)
+target_link_libraries(snl_sender naja_snl_dump)

src/snl/snl/kernel/SNLDB.cpp

@@ -12,6 +12,7 @@
 #include "SNLUniverse.h"
 #include "SNLDB0.h"
 #include "SNLException.h"
+#include "SNLMacros.h"
 
 namespace naja { namespace SNL {
 
@@ -173,6 +174,15 @@ SNLID SNLDB::getSNLID() const {
   return SNLID(id_);
 }
 
+void SNLDB::setID(SNLID::DBID id) {
+  if (SNLUniverse::get()->isDB0(this)) {
+    //error
+  }
+  SNLUniverse::get()->removeDB(this);
+  id_ = id;
+  SNLUniverse::get()->addDB(this);
+}
+
 bool SNLDB::isTopDB() const {
   return SNLUniverse::get()->getTopDB() == this;
 }
@@ -192,6 +202,12 @@ void SNLDB::setTopDesign(SNLDesign* design) {
   topDesign_ = design;
 }
 
+bool SNLDB::deepCompare(const SNLDB* other, std::string& reason) const {
+  //don't compare SNLDB ID
+  DEEP_COMPARE_MEMBER(Libraries)
+  return true;
+}
+
 void SNLDB::mergeAssigns() {
   for (auto library: getLibraries()) {
     if (not library->isPrimitives()) {

src/snl/snl/kernel/SNLDB.h

@@ -31,6 +31,12 @@ class SNLDB final: public SNLObject {
     SNLID::DBID getID() const { return id_; }
     SNLID getSNLID() const;
 
+    ///\brief Change the SNLDB id. Main purpose: compare DBs after save and load.
+    ///\param id new DBID
+    ///\warning use with caution: all DB objects SNLIDs will be modified, as the DB id part of SNLID will
+    ///be modified.
+    void setID(SNLID::DBID id);
+
     ///\return the SNLLibrary in this SNLDB with SNLID::LibraryID:id 
     SNLLibrary* getLibrary(SNLID::LibraryID id) const;
     ///\return the SNLLibrary in this SNLDB with SNLName:name 
@@ -62,6 +68,9 @@ class SNLDB final: public SNLObject {
     bool operator<(const SNLDB &rdb) const {
       return getSNLID() < rdb.getSNLID();
     }
+
+    bool deepCompare(const SNLDB* db, std::string& reason) const;
+
   private:
     SNLDB() = default;
     SNLDB(SNLID::DBID id);