Merge pull request chipsalliance#1828 from alainmarcel/alainmarcel-pa…

…tch-1 elab and binding
hs-apotell · Sep 12, 2021 · 3f3b65a · 3f3b65a
2 parents eba317b + c8f8412
commit 3f3b65a
Show file tree

Hide file tree

Showing 77 changed files with 9,104 additions and 6,460 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -3,7 +3,10 @@
  url = https:/google/flatbuffers.git
 [submodule "third_party/UHDM"]
  path = third_party/UHDM
- url = https:/alainmarcel/UHDM.git
+ url = https:/chipsalliance/UHDM.git
 [submodule "third_party/googletest"]
  path = third_party/googletest
  url = https:/google/googletest.git
+[submodule "third_party/antlr4"]
+ path = third_party/antlr4
+ url = https:/alainmarcel/antlr4.git
diff --git a/src/API/Surelog.h b/src/API/Surelog.h
@@ -25,7 +25,9 @@
 
 #include "CommandLine/CommandLineParser.h"
 #include "Design/Design.h"
-#include "include/sv_vpi_user.h"
+
+// UHDM
+#include <uhdm/sv_vpi_user.h>
 
 namespace SURELOG {
 struct scompiler;

diff --git a/src/Common/PortNetHolder.h b/src/Common/PortNetHolder.h
@@ -23,7 +23,8 @@
 
 #include <vector>
 
-#include "headers/uhdm_forward_decl.h"
+// UHDM
+#include <uhdm/uhdm_forward_decl.h>
 
 #ifndef PORTNETHOLDER_H
 #define PORTNETHOLDER_H

diff --git a/src/Design/ClockingBlock.h b/src/Design/ClockingBlock.h
@@ -29,7 +29,9 @@
 #include "Design/FileContent.h"
 #include "Design/Signal.h"
 #include "SourceCompile/SymbolTable.h"
-#include "headers/uhdm_forward_decl.h"
+
+// UHDM
+#include <uhdm/uhdm_forward_decl.h>
 
 namespace SURELOG {
 

diff --git a/src/Design/DummyType.cpp b/src/Design/DummyType.cpp
@@ -24,7 +24,9 @@
 
 #include "Design/FileContent.h"
 #include "SourceCompile/SymbolTable.h"
-#include "uhdm.h"
+
+// UHDM
+#include <uhdm/uhdm.h>
 
 namespace SURELOG {
 DummyType::DummyType(const FileContent* fC, NodeId nameId, NodeId structId)

diff --git a/src/Design/ModuleDefinition.h b/src/Design/ModuleDefinition.h
@@ -34,7 +34,9 @@
 #include "Design/ModPort.h"
 #include "Design/Signal.h"
 #include "Design/ValuedComponentI.h"
-#include "headers/containers.h" // uhdm
+
+// UHDM
+#include <uhdm/containers.h>
 
 namespace UHDM {
 class udp_defn;

diff --git a/src/Design/ModuleInstance.cpp b/src/Design/ModuleInstance.cpp
@@ -26,11 +26,13 @@
 #include <string>
 
 #include "Design/FileContent.h"
-#include "ElaboratorListener.h"
 #include "Library/Library.h"
 #include "SourceCompile/SymbolTable.h"
-#include "clone_tree.h"
-#include "uhdm.h"
+
+// UHDM
+#include <uhdm/ElaboratorListener.h>
+#include <uhdm/clone_tree.h>
+#include <uhdm/uhdm.h>
 
 using namespace SURELOG;
 using namespace UHDM;

diff --git a/src/Design/Netlist.h b/src/Design/Netlist.h
@@ -31,7 +31,9 @@
 #include "Design/FileContent.h"
 #include "Design/ModPort.h"
 #include "SourceCompile/SymbolTable.h"
-#include "headers/uhdm_forward_decl.h"
+
+// UHDM
+#include <uhdm/uhdm_forward_decl.h>
 
 namespace SURELOG {
 

diff --git a/src/Design/SimpleType.cpp b/src/Design/SimpleType.cpp
@@ -24,7 +24,9 @@
 
 #include "Design/FileContent.h"
 #include "SourceCompile/SymbolTable.h"
-#include "uhdm.h"
+
+// UHDM
+#include <uhdm/uhdm.h>
 
 using namespace SURELOG;
 

diff --git a/src/Design/Struct.cpp b/src/Design/Struct.cpp
@@ -24,7 +24,9 @@
 
 #include "Design/FileContent.h"
 #include "SourceCompile/SymbolTable.h"
-#include "uhdm.h"
+
+// UHDM
+#include <uhdm/uhdm.h>
 
 using namespace SURELOG;
 

diff --git a/src/DesignCompile/Builtin.cpp b/src/DesignCompile/Builtin.cpp
@@ -30,8 +30,8 @@
 #include "Testbench/FunctionMethod.h"
 
 // UHDM
-#include "headers/Serializer.h"
-#include "headers/class_defn.h"
+#include <uhdm/Serializer.h>
+#include <uhdm/class_defn.h>
 
 namespace SURELOG {
 static VObjectType convert(std::string_view type) {

diff --git a/src/DesignCompile/CompileAssertion.cpp b/src/DesignCompile/CompileAssertion.cpp
@@ -30,7 +30,6 @@
 #include "Design/Struct.h"
 #include "Design/Union.h"
 #include "DesignCompile/CompileHelper.h"
-#include "ElaboratorListener.h"
 #include "Expression/ExprBuilder.h"
 #include "Expression/Value.h"
 #include "SourceCompile/CompilationUnit.h"
@@ -42,9 +41,12 @@
 #include "UhdmWriter.h"
 #include "Utils/FileUtils.h"
 #include "Utils/StringUtils.h"
-#include "clone_tree.h"
-#include "expr.h"
-#include "uhdm.h"
+
+// UHDM
+#include <uhdm/ElaboratorListener.h>
+#include <uhdm/clone_tree.h>
+#include <uhdm/expr.h>
+#include <uhdm/uhdm.h>
 
 namespace SURELOG {
 

diff --git a/src/DesignCompile/CompileClass.cpp b/src/DesignCompile/CompileClass.cpp
@@ -38,7 +38,9 @@
 #include "SourceCompile/SymbolTable.h"
 #include "SourceCompile/VObjectTypes.h"
 #include "Testbench/ClassDefinition.h"
-#include "headers/uhdm.h"
+
+// UHDM
+#include <uhdm/uhdm.h>
 
 using namespace SURELOG;
 

diff --git a/src/DesignCompile/CompileDesign.cpp b/src/DesignCompile/CompileDesign.cpp
@@ -28,6 +28,9 @@
 
 #include <stdint.h>
 
+#include <thread>
+#include <vector>
+
 #include "CommandLine/CommandLineParser.h"
 #include "Design/FileContent.h"
 #include "DesignCompile/Builtin.h"
@@ -54,17 +57,14 @@
 #include "SourceCompile/PreprocessFile.h"
 #include "SourceCompile/SymbolTable.h"
 #include "Testbench/ClassDefinition.h"
-#include "vpi_visitor.h"
 
 #ifdef USETBB
 #include <tbb/task.h>
 #include <tbb/task_group.h>
-
-#include "tbb/task_scheduler_init.h"
+#include <tbb/task_scheduler_init.h>
 #endif
 
-#include <thread>
-#include <vector>
+#include <uhdm/vpi_visitor.h>
 
 using namespace SURELOG;
 

diff --git a/src/DesignCompile/CompileDesign.h b/src/DesignCompile/CompileDesign.h
@@ -26,9 +26,11 @@
 
 #include <mutex>
 
-#include "Serializer.h"
 #include "SourceCompile/Compiler.h"
-#include "include/sv_vpi_user.h"
+
+// UHDM
+#include <uhdm/Serializer.h>
+#include <uhdm/sv_vpi_user.h>
 
 namespace SURELOG {
 

diff --git a/src/DesignCompile/CompileExpression.cpp b/src/DesignCompile/CompileExpression.cpp
@@ -38,7 +38,6 @@
 #include "DesignCompile/CompileDesign.h"
 #include "DesignCompile/CompileHelper.h"
 #include "DesignCompile/UhdmWriter.h"
-#include "ElaboratorListener.h"
 #include "ErrorReporting/ErrorContainer.h"
 #include "Expression/ExprBuilder.h"
 #include "Expression/Value.h"
@@ -52,11 +51,14 @@
 #include "Utils/FileUtils.h"
 #include "Utils/NumUtils.h"
 #include "Utils/StringUtils.h"
-#include "clone_tree.h"
-#include "expr.h"
-#include "headers/ExprEval.h"
-#include "uhdm.h"
-#include "vpi_visitor.h"
+
+// UHDM
+#include <uhdm/ElaboratorListener.h>
+#include <uhdm/ExprEval.h>
+#include <uhdm/clone_tree.h>
+#include <uhdm/expr.h>
+#include <uhdm/uhdm.h>
+#include <uhdm/vpi_visitor.h>
 
 using namespace SURELOG;
 using namespace UHDM;

diff --git a/src/DesignCompile/CompileHelper.cpp b/src/DesignCompile/CompileHelper.cpp
@@ -37,20 +37,22 @@
 #include "Design/Union.h"
 #include "DesignCompile/CompileDesign.h"
 #include "DesignCompile/UhdmWriter.h"
-#include "ElaboratorListener.h"
 #include "Expression/ExprBuilder.h"
 #include "Expression/Value.h"
-#include "Serializer.h"
 #include "SourceCompile/CompilationUnit.h"
 #include "SourceCompile/CompileSourceFile.h"
 #include "SourceCompile/Compiler.h"
 #include "SourceCompile/ParseFile.h"
 #include "SourceCompile/PreprocessFile.h"
 #include "Testbench/ClassDefinition.h"
 #include "Testbench/Property.h"
-#include "clone_tree.h"
-#include "expr.h"
-#include "uhdm.h"
+
+// UHDM
+#include <uhdm/ElaboratorListener.h>
+#include <uhdm/Serializer.h>
+#include <uhdm/clone_tree.h>
+#include <uhdm/expr.h>
+#include <uhdm/uhdm.h>
 
 using namespace SURELOG;
 using namespace UHDM;

diff --git a/src/DesignCompile/CompileHelper_test.cpp b/src/DesignCompile/CompileHelper_test.cpp
@@ -46,7 +46,9 @@
 #include "Testbench/ClassDefinition.h"
 #include "gmock/gmock.h"
 #include "gtest/gtest.h"
-#include "vpi_visitor.h"
+
+// UHDM
+#include <uhdm/vpi_visitor.h>
 
 using namespace UHDM;
 

diff --git a/src/DesignCompile/CompileStmt.cpp b/src/DesignCompile/CompileStmt.cpp
@@ -44,9 +44,9 @@
 #include "Utils/StringUtils.h"
 
 // UHDM
-#include "ElaboratorListener.h"
-#include "expr.h"
-#include "uhdm.h"
+#include <uhdm/ElaboratorListener.h>
+#include <uhdm/expr.h>
+#include <uhdm/uhdm.h>
 
 using namespace SURELOG;
 using namespace UHDM;

diff --git a/src/DesignCompile/CompileType.cpp b/src/DesignCompile/CompileType.cpp
@@ -48,10 +48,10 @@
 #include "Utils/StringUtils.h"
 
 // UHDM
-#include "ElaboratorListener.h"
-#include "clone_tree.h"
-#include "expr.h"
-#include "uhdm.h"
+#include <uhdm/ElaboratorListener.h>
+#include <uhdm/clone_tree.h>
+#include <uhdm/expr.h>
+#include <uhdm/uhdm.h>
 
 using namespace SURELOG;
 using namespace UHDM;

diff --git a/src/DesignCompile/DesignElaboration.cpp b/src/DesignCompile/DesignElaboration.cpp
@@ -37,7 +37,6 @@
 #include "DesignCompile/CompileDesign.h"
 #include "DesignCompile/CompileModule.h"
 #include "DesignCompile/NetlistElaboration.h"
-#include "ElaboratorListener.h"
 #include "ErrorReporting/Error.h"
 #include "ErrorReporting/ErrorContainer.h"
 #include "ErrorReporting/ErrorDefinition.h"
@@ -53,8 +52,11 @@
 #include "Testbench/ClassDefinition.h"
 #include "Testbench/Property.h"
 #include "Utils/StringUtils.h"
-#include "clone_tree.h"
-#include "vpi_visitor.h"
+
+// UHDM
+#include <uhdm/ElaboratorListener.h>
+#include <uhdm/clone_tree.h>
+#include <uhdm/vpi_visitor.h>
 
 using namespace SURELOG;
 

diff --git a/src/DesignCompile/ElaborationStep.cpp b/src/DesignCompile/ElaborationStep.cpp
@@ -53,10 +53,10 @@
 #include "Utils/StringUtils.h"
 
 // UHDM
-#include "headers/ElaboratorListener.h"
-#include "headers/Serializer.h"
-#include "headers/clone_tree.h"
-#include "headers/uhdm.h"
+#include <uhdm/ElaboratorListener.h>
+#include <uhdm/Serializer.h>
+#include <uhdm/clone_tree.h>
+#include <uhdm/uhdm.h>
 
 using namespace SURELOG;
 using namespace UHDM;

diff --git a/src/DesignCompile/ElaborationStep.h b/src/DesignCompile/ElaborationStep.h
@@ -32,7 +32,9 @@
 #include "DesignCompile/CompileDesign.h"
 #include "DesignCompile/CompileHelper.h"
 #include "ErrorReporting/ErrorDefinition.h"
-#include "headers/uhdm_forward_decl.h"
+
+// UHDM
+#include <uhdm/uhdm_forward_decl.h>
 
 namespace SURELOG {
 

diff --git a/src/DesignCompile/EvalFunc.cpp b/src/DesignCompile/EvalFunc.cpp
@@ -50,10 +50,10 @@
 #include "Utils/StringUtils.h"
 
 // UHDM
-#include "ElaboratorListener.h"
-#include "clone_tree.h"
-#include "expr.h"
-#include "uhdm.h"
+#include <uhdm/ElaboratorListener.h>
+#include <uhdm/clone_tree.h>
+#include <uhdm/expr.h>
+#include <uhdm/uhdm.h>
 
 using namespace SURELOG;
 using namespace UHDM;