Merge pull request #3667 from alainmarcel/alainmarcel-patch-1

purge parsers before elab

Author: alaindargelas

include/Surelog/DesignCompile/CompileDesign.h

@@ -49,13 +49,15 @@ class CompileDesign {
 
   bool compile();
   bool elaborate();
+  void purgeParsers();
   vpiHandle writeUHDM(PathId fileId);
 
   Compiler* getCompiler() const { return m_compiler; }
   virtual UHDM::Serializer& getSerializer() { return m_serializer; }
   void lockSerializer() { m_serializerMutex.lock(); }
   void unlockSerializer() { m_serializerMutex.unlock(); }
-
+  UHDM::VectorOfinclude_file_info* getFileInfo() { return m_fileInfo; }
+   
  private:
   CompileDesign(const CompileDesign& orig) = delete;
 
@@ -70,7 +72,7 @@ class CompileDesign {
   Compiler* const m_compiler;
   std::vector<SymbolTable*> m_symbolTables;
   std::vector<ErrorContainer*> m_errorContainers;
-
+  UHDM::VectorOfinclude_file_info* m_fileInfo = nullptr;
   std::mutex m_serializerMutex;
   UHDM::Serializer m_serializer;
 };

include/Surelog/SourceCompile/Compiler.h

@@ -66,6 +66,7 @@ class Compiler {
   virtual ~Compiler();
 
   bool compile();
+  void purgeParsers();
   CommandLineParser* getCommandLineParser() const {
     return m_commandLineParser;
   }

src/Common/PlatformFileSystem_test.cpp

@@ -1035,26 +1035,15 @@ TEST(PlatformFileSystemTest, InMemoryTest) {
 
   Compiler *const compiler = new Compiler(clp, errors, symbolTable);
   compiler->compile();
+  Design *design = compiler->getDesign();
+  EXPECT_NE(design, nullptr);
 
-  const auto &compileSourceFiles = compiler->getCompileSourceFiles();
-  EXPECT_EQ(compileSourceFiles.size(), 1);
-
-  CompileSourceFile *const compileSourceFile = compileSourceFiles.front();
-  EXPECT_NE(compileSourceFile, nullptr);
-
-  ParseFile *const parseFile = compileSourceFile->getParser();
-  EXPECT_NE(parseFile, nullptr);
-
-  FileContent *const fC = parseFile->getFileContent();
-  EXPECT_NE(fC, nullptr);
+  const auto &compileSourceFiles = design->getAllFileContents();
+  EXPECT_EQ(compileSourceFiles.size(), 2);
 
   CompileDesign *const compileDesign = compiler->getCompileDesign();
   EXPECT_NE(compileDesign, nullptr);
 
-  // Preprocess, Parse, Compile, Elaborate
-  Design *const design = compiler->getDesign();
-  EXPECT_NE(design, nullptr);
-
   const auto &insts = design->getTopLevelModuleInstances();
   ModuleInstance *top = nullptr;
   if (!insts.empty()) {

src/DesignCompile/CompileDesign.cpp

@@ -49,6 +49,7 @@
 #include <Surelog/Testbench/Program.h>
 
 // UHDM
+#include <uhdm/include_file_info.h>
 #include <uhdm/param_assign.h>
 #include <uhdm/vpi_visitor.h>
 
@@ -331,6 +332,28 @@ bool CompileDesign::compilation_() {
     builtin->addBuiltinClasses();
   }
 
+  // Compile Include file info
+  FileSystem* const fileSystem = FileSystem::getInstance();
+  m_fileInfo = m_serializer.MakeInclude_file_infoVec();
+  for (const CompileSourceFile* sourceFile :
+       getCompiler()->getCompileSourceFiles()) {
+    const PreprocessFile* const pf = sourceFile->getPreprocessor();
+    for (const IncludeFileInfo& ifi : pf->getIncludeFileInfo()) {
+      if ((ifi.m_context == IncludeFileInfo::Context::INCLUDE) &&
+          (ifi.m_action == IncludeFileInfo::Action::PUSH)) {
+        UHDM::include_file_info* const pifi =
+            m_serializer.MakeInclude_file_info();
+        pifi->VpiFile(fileSystem->toPath(pf->getRawFileId()));
+        pifi->VpiIncludedFile(fileSystem->toPath(ifi.m_sectionFileId));
+        pifi->VpiLineNo(ifi.m_originalStartLine);
+        pifi->VpiColumnNo(ifi.m_originalStartColumn);
+        pifi->VpiEndLineNo(ifi.m_originalEndLine);
+        pifi->VpiEndColumnNo(ifi.m_originalEndColumn);
+        m_fileInfo->push_back(pifi);
+      }
+    }
+  }
+
   // Compile classes
   compileMT_<ClassDefinition, ClassNameClassDefinitionMultiMap,
              FunctorCompileClass>(
@@ -370,6 +393,8 @@ bool CompileDesign::elaboration_() {
   return true;
 }
 
+void CompileDesign::purgeParsers() { m_compiler->purgeParsers(); }
+
 vpiHandle CompileDesign::writeUHDM(PathId fileId) {
   UhdmWriter* uhdmwriter = new UhdmWriter(this, m_compiler->getDesign());
   vpiHandle h = uhdmwriter->write(fileId);

src/DesignCompile/ElaboratorHarness.cpp

@@ -22,6 +22,7 @@
  */
 
 #include <Surelog/CommandLine/CommandLineParser.h>
+#include <Surelog/Design/Design.h>
 #include <Surelog/DesignCompile/ElaboratorHarness.h>
 #include <Surelog/ErrorReporting/ErrorContainer.h>
 #include <Surelog/SourceCompile/CompileSourceFile.h>
@@ -47,10 +48,8 @@ std::tuple<Design*, FileContent*, CompileDesign*> ElaboratorHarness::elaborate(
   compiler->compile();
   Design* design = compiler->getDesign();
   FileContent* fC = nullptr;
-  if (!compiler->getCompileSourceFiles().empty()) {
-    CompileSourceFile* csf = compiler->getCompileSourceFiles().at(0);
-    ParseFile* pf = csf->getParser();
-    fC = pf->getFileContent();
+  if (!design->getAllFileContents().empty()) {
+    fC = design->getAllFileContents()[0].second;
   }
   result = std::make_tuple(design, fC, compiler->getCompileDesign());
   return result;

src/DesignCompile/UhdmWriter.cpp

@@ -3901,26 +3901,7 @@ vpiHandle UhdmWriter::write(PathId uhdmFileId) {
 
     // ---------------------------
     // Include File Info
-
-    VectorOfinclude_file_info* fileInfos = s.MakeInclude_file_infoVec();
-    d->Include_file_infos(fileInfos);
-    for (const CompileSourceFile* sourceFile :
-         m_compileDesign->getCompiler()->getCompileSourceFiles()) {
-      const PreprocessFile* const pf = sourceFile->getPreprocessor();
-      for (const IncludeFileInfo& ifi : pf->getIncludeFileInfo()) {
-        if ((ifi.m_context == IncludeFileInfo::Context::INCLUDE) &&
-            (ifi.m_action == IncludeFileInfo::Action::PUSH)) {
-          include_file_info* const pifi = s.MakeInclude_file_info();
-          pifi->VpiFile(fileSystem->toPath(pf->getRawFileId()));
-          pifi->VpiIncludedFile(fileSystem->toPath(ifi.m_sectionFileId));
-          pifi->VpiLineNo(ifi.m_originalStartLine);
-          pifi->VpiColumnNo(ifi.m_originalStartColumn);
-          pifi->VpiEndLineNo(ifi.m_originalEndLine);
-          pifi->VpiEndColumnNo(ifi.m_originalEndColumn);
-          fileInfos->push_back(pifi);
-        }
-      }
-    }
+    d->Include_file_infos(m_compileDesign->getFileInfo());
 
     // -------------------------------
     // Non-Elaborated Model

src/SourceCompile/Compiler.cpp

@@ -103,6 +103,15 @@ Compiler::~Compiler() {
   cleanup_();
 }
 
+void Compiler::purgeParsers() {
+  for (auto& entry : m_antlrPpMap) {
+    delete entry.second;
+  }
+
+  m_antlrPpMap.clear();
+  DeleteContainerPointersAndClear(&m_compilers);
+}
+
 struct FunctorCompileOneFile {
   FunctorCompileOneFile(CompileSourceFile* compileSource,
                         CompileSourceFile::Action action)
@@ -1042,6 +1051,8 @@ bool Compiler::compile() {
       tmr.reset();
     }
 
+    m_compileDesign->purgeParsers();
+
     if (m_commandLineParser->elaborate()) {
       m_compileDesign->elaborate();
       m_errors->printMessages(m_commandLineParser->muteStdout());

third_party/antlr4

@@ -3,7 +3,7 @@
 [WRN:CM0010] Command line argument "-Wno-UNOPTFLAT" ignored.
 
 Running: cd ${SURELOG_DIR}/build/regression/CoresSweRVMP/slpp_all/mp_parser; cmake -G "Unix Makefiles" .; make -j 16
--- Configuring done (0.0s)
+-- Configuring done (0.1s)
 -- Generating done (0.0s)
 -- Build files have been written to: ${SURELOG_DIR}/build/regression/CoresSweRVMP/slpp_all/mp_parser
 [100%] Generating preprocessing
@@ -118,18 +118,18 @@ Running: cd ${SURELOG_DIR}/build/regression/CoresSweRVMP/slpp_all/mp_preprocess;
 -- Configuring done (0.0s)
 -- Generating done (0.0s)
 -- Build files have been written to: ${SURELOG_DIR}/build/regression/CoresSweRVMP/slpp_all/mp_preprocess
-[  6%] Generating 10_lsu_bus_intf.sv
-[ 12%] Generating 11_ifu_bp_ctl.sv
-[ 18%] Generating 12_beh_lib.sv
-[ 25%] Generating 13_ifu_mem_ctl.sv
-[ 31%] Generating 14_mem_lib.sv
-[ 37%] Generating 15_exu.sv
+[  6%] Generating 11_ifu_bp_ctl.sv
+[ 12%] Generating 13_ifu_mem_ctl.sv
+[ 25%] Generating 12_beh_lib.sv
+[ 25%] Generating 10_lsu_bus_intf.sv
+[ 31%] Generating 15_exu.sv
+[ 37%] Generating 14_mem_lib.sv
 [ 43%] Generating 16_dec_decode_ctl.sv
 [ 50%] Generating 1_lsu_stbuf.sv
 [ 56%] Generating 2_ahb_to_axi4.sv
 [ 62%] Generating 3_rvjtag_tap.sv
-[ 68%] Generating 5_lsu_bus_buffer.sv
-[ 75%] Generating 4_dec_tlu_ctl.sv
+[ 68%] Generating 4_dec_tlu_ctl.sv
+[ 75%] Generating 5_lsu_bus_buffer.sv
 [ 81%] Generating 6_dbg.sv
 [ 87%] Generating 7_axi4_to_ahb.sv
 [ 93%] Generating 8_ifu_aln_ctl.sv