Merge pull request eclipse-omr#7596 from mpirvu/dltoptlevel

Remember whether dltOptLevel= is specified in a subset
vijaysun-omr · Dec 18, 2024 · a3a92be · a3a92be
2 parents b596d79 + dbf3288
commit a3a92be
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 4 deletions.
diff --git a/compiler/control/OMROptions.cpp b/compiler/control/OMROptions.cpp
@@ -3723,11 +3723,23 @@ OMR::Options::processOption(
          }
       }
    else
+      {
       processingMethod = opt->fcn;
+      }
 
    // Process this entry
    //
-   return processingMethod(option + opt->length, base, opt);
+   const char *retVal = processingMethod(option + opt->length, base, opt);
+
+   // Check to see whether the dltOptLevel option is specified in a subset
+   // and remember that information in the global JIT cmdLineOptions
+   if (optionSet)
+      {
+      if (optionSet->getOptions()->getDLTOptLevel() != -1)
+         _jitCmdLineOptions->setAnOptionSetContainsADltOptLevel(true);
+      }
+
+   return retVal;
    }
 
 

diff --git a/compiler/control/OMROptions.hpp b/compiler/control/OMROptions.hpp
@@ -1421,6 +1421,7 @@ class OMR_EXTENSIBLE Options
       _osVersionString = NULL;
       _allowRecompilation = false;
       _anOptionSetContainsACountValue = false;
+      _anOptionSetContainsADltOptLevel = false;
       _numInterfaceCallCacheSlots = 0;
       _numInterfaceCallStaticSlots = 0;
       _storeSinkingLastOpt = 0;
@@ -1434,9 +1435,9 @@ class OMR_EXTENSIBLE Options
       _maxStaticPICSlots = 0;
       _hotMaxStaticPICSlots = 0;
       _newAotrtDebugLevel = 0;
-      _disableDLTBytecodeIndex = 0;
-      _enableDLTBytecodeIndex = 0;
-      _dltOptLevel = 0;
+      _disableDLTBytecodeIndex = -1;
+      _enableDLTBytecodeIndex = -1;
+      _dltOptLevel = -1;
       _profilingCount = 0;
       _profilingFrequency = 0;
       _counterBucketGranularity = 0;
@@ -1665,6 +1666,9 @@ class OMR_EXTENSIBLE Options
 
    bool      anOptionSetContainsACountValue()          {return _anOptionSetContainsACountValue; }
    void      setAnOptionSetContainsACountValue(bool b) { _anOptionSetContainsACountValue = b; }
+
+   bool      anOptionSetContainsADltOptLevel()          {return _anOptionSetContainsADltOptLevel; }
+   void      setAnOptionSetContainsADltOptLevel(bool b) { _anOptionSetContainsADltOptLevel = b; }
    int32_t   getEnableDLTBytecodeIndex()       {return _enableDLTBytecodeIndex;}
    int32_t   getDisableDLTBytecodeIndex()      {return _disableDLTBytecodeIndex;}
    int32_t   getDLTOptLevel()                  {return _dltOptLevel;}
@@ -2440,6 +2444,7 @@ class OMR_EXTENSIBLE Options
    char *                      _osVersionString;
    bool                        _allowRecompilation;
    bool                        _anOptionSetContainsACountValue;
+   bool                        _anOptionSetContainsADltOptLevel;
    int32_t                     _numInterfaceCallCacheSlots;
    int32_t                     _numInterfaceCallStaticSlots;
    int32_t                     _storeSinkingLastOpt;