Add interpreter emulator for ECS in inliner

This change adds the infrastructure to emulate the interpreter execution during estimate code size of target in inliner. Also the loop looking for callsites in ECS is refactored and moved to `findAndCreateCallsitesFromBytecodes`. ECS will be changed to call this function in a following commit. Signed-off-by: Yi Zhang <[email protected]>
eclipse-openj9 · Dec 4, 2019 · 2fb42c4 · 2fb42c4
1 parent 9d2b322
commit 2fb42c4
Show file tree

Hide file tree

Showing 8 changed files with 1,248 additions and 96 deletions.
diff --git a/runtime/compiler/build/files/common.mk b/runtime/compiler/build/files/common.mk
@@ -334,6 +334,7 @@ JIT_PRODUCT_SOURCE_FILES+=\
     compiler/optimizer/InterProceduralAnalyzer.cpp \
     compiler/optimizer/J9EstimateCodeSize.cpp \
     compiler/optimizer/J9Inliner.cpp \
+    compiler/optimizer/InterpreterEmulator.cpp \
     compiler/ras/DebugExt.cpp \
     compiler/ras/DebugExtSegmentProvider.cpp \
     compiler/ras/HashTable.cpp \

diff --git a/runtime/compiler/optimizer/CMakeLists.txt b/runtime/compiler/optimizer/CMakeLists.txt
@@ -36,6 +36,7 @@ j9jit_files(
 	optimizer/InterProceduralAnalyzer.cpp
 	optimizer/J9CFGSimplifier.cpp
 	optimizer/J9EstimateCodeSize.cpp
+	optimizer/InterpreterEmulator.cpp
 	optimizer/J9Inliner.cpp
 	optimizer/J9LocalCSE.cpp
 	optimizer/J9OptimizationManager.cpp

diff --git a/runtime/compiler/optimizer/EstimateCodeSize.cpp b/runtime/compiler/optimizer/EstimateCodeSize.cpp
@@ -73,14 +73,6 @@ TR_EstimateCodeSize::release(TR_EstimateCodeSize *estimator)
    comp->fej9()->releaseCodeEstimator(comp, estimator);
    }
 
-
-void
-TR_EstimateCodeSize::markIsCold(flags8_t * flags, int32_t i)
-   {
-   _isLeaf = false;
-   flags[i].set(isCold);
-   }
-
 bool
 TR_EstimateCodeSize::calculateCodeSize(TR_CallTarget *calltarget, TR_CallStack *callStack, bool recurseDown)
    {

diff --git a/runtime/compiler/optimizer/EstimateCodeSize.hpp b/runtime/compiler/optimizer/EstimateCodeSize.hpp
@@ -85,6 +85,11 @@ class TR_EstimateCodeSize
    bool isLeaf()                       { return _isLeaf; }
 
    int32_t getNumOfEstimatedCalls()    { return _numOfEstimatedCalls; }
+   /*
+    * \brief
+    *    tell whether this callsite has inlineable target
+    */
+   bool isInlineable(TR_CallStack *, TR_CallSite *callsite);
 
    TR::Compilation *comp()              { return _inliner->comp(); }
    TR_InlinerTracer *tracer()          { return _tracer; }
@@ -93,9 +98,6 @@ class TR_EstimateCodeSize
 
    virtual bool estimateCodeSize(TR_CallTarget *, TR_CallStack * , bool recurseDown = true) = 0;
 
-   bool isInlineable(TR_CallStack *, TR_CallSite *callsite);
-
-   void markIsCold(flags8_t * flags, int32_t i);
 
    bool returnCleanup(int32_t);      // common tasks requiring completion before returning from estimation