Merge pull request chipsalliance#3678 from alainmarcel/alainmarcel-patch-1

anltr cache purge only in lowmem option

Author: alaindargelas

include/Surelog/SourceCompile/AntlrParserHandler.h

@@ -44,7 +44,7 @@ class AntlrParserHandler {
  public:
   AntlrParserHandler() = default;
   ~AntlrParserHandler();
-
+  bool m_clearAntlrCache = false;
   antlr4::ANTLRInputStream* m_inputStream = nullptr;
   SV3_1aLexer* m_lexer = nullptr;
   antlr4::CommonTokenStream* m_tokens = nullptr;

include/Surelog/SourceCompile/PreprocessFile.h

@@ -260,6 +260,7 @@ class PreprocessFile final {
   struct AntlrParserHandler final {
     AntlrParserHandler() = default;
     ~AntlrParserHandler();
+    bool m_clearAntlrCache = false;
     antlr4::ANTLRInputStream* m_inputStream = nullptr;
     SV3_1aPpLexer* m_pplexer = nullptr;
     antlr4::CommonTokenStream* m_pptokens = nullptr;

src/SourceCompile/AntlrParserHandler.cpp

@@ -33,8 +33,10 @@ AntlrParserHandler::~AntlrParserHandler() {
   delete m_errorListener;
   // ParseTree is deleted in antlr4::ParseTreeTracker
   // delete m_tree; // INVALID MEMORY READ can be seen in AdvancedDebug
-  m_lexer->getInterpreter<antlr4::atn::LexerATNSimulator>()->clearDFA();
-  m_parser->getInterpreter<antlr4::atn::ParserATNSimulator>()->clearDFA();
+  if (m_clearAntlrCache) {
+    m_lexer->getInterpreter<antlr4::atn::LexerATNSimulator>()->clearDFA();
+    m_parser->getInterpreter<antlr4::atn::ParserATNSimulator>()->clearDFA();
+  }
   delete m_parser;
   delete m_tokens;
   delete m_lexer;

src/SourceCompile/ParseFile.cpp

@@ -271,6 +271,7 @@ bool ParseFile::parseOneFile_(PathId fileId, uint32_t lineOffset) {
   PreprocessFile* pp = getCompileSourceFile()->getPreprocessor();
   Timer tmr;
   m_antlrParserHandler = new AntlrParserHandler();
+  m_antlrParserHandler->m_clearAntlrCache = clp->lowMem();
   if (m_sourceText.empty()) {
     std::istream& stream = fileSystem->openForRead(fileId);
     if (!stream.good()) {

src/SourceCompile/PreprocessFile.cpp

@@ -312,8 +312,10 @@ PreprocessFile::~PreprocessFile() {
 PreprocessFile::AntlrParserHandler::~AntlrParserHandler() {
   delete m_errorListener;
   // delete m_pptree;  // INVALID MEMORY READ can be seen in AdvancedDebug
-  m_pplexer->getInterpreter<antlr4::atn::LexerATNSimulator>()->clearDFA();
-  m_ppparser->getInterpreter<antlr4::atn::ParserATNSimulator>()->clearDFA();
+  if (m_clearAntlrCache) {
+    m_pplexer->getInterpreter<antlr4::atn::LexerATNSimulator>()->clearDFA();
+    m_ppparser->getInterpreter<antlr4::atn::ParserATNSimulator>()->clearDFA();
+  }
   delete m_ppparser;
   delete m_pptokens;
   delete m_pplexer;
@@ -364,6 +366,7 @@ bool PreprocessFile::preprocess() {
 
   if (m_antlrParserHandler == nullptr) {
     m_antlrParserHandler = new AntlrParserHandler();
+    m_antlrParserHandler->m_clearAntlrCache = clp->lowMem();
     if (m_macroBody.empty()) {
       if (m_debugPP)
         std::cout << "PP PREPROCESS FILE: " << PathIdPP(m_fileId) << std::endl;