Inline frame deallocation on OSS builds

Summary: We can easily inline frame deallocation on OSS builds now too - we just need to test if the frameobj has been materialized.

Reviewed By: yoney

Differential Revision: D106881389

fbshipit-source-id: 1a229fe34ec9f016b606968cb4c550f8a8a2d51b

Author: DinoV

cinderx/Jit/jit_rt.cpp

@@ -832,30 +832,6 @@ void JITRT_UnlinkFrame(PyThreadState* tstate) {
   cleanupFrameExecutable(frame);
 }
 
-void JITRT_UnlinkLightweightFrameFast(PyThreadState* tstate) {
-  _PyInterpreterFrame* frame = currentFrame(tstate);
-  setCurrentFrame(tstate, frame->previous);
-
-  JIT_DCHECK(
-      frameCode(frame) != nullptr && frameCode(frame)->co_nfreevars == 0,
-      "assumes no freevars");
-
-  JIT_DCHECK(
-      frameCode(frame) != nullptr &&
-          !(frameCode(frame)->co_flags & jit::kCoFlagsAnyGenerator),
-      "doesn't work with generators");
-
-  // Fast path for non-generator frames with no freevars.
-  // The frame header is directly before the frame for non-generators.
-  if (frame->frame_obj != nullptr) {
-    // Frame was materialized by the runtime, use the slow path.
-    increfFuncObjForNonGenerator(frame);
-
-    jit::jitFrameClearExceptCode(frame);
-  }
-  cleanupFrameExecutable(frame);
-}
-
 PyObject*
 JITRT_LoadGlobal(PyObject* globals, PyObject* builtins, PyObject* name) {
   PyObject* result =

cinderx/Jit/jit_rt.h

@@ -66,11 +66,6 @@ void JITRT_DecrefFrame(PyFrameObject* frame);
  */
 void JITRT_UnlinkFrame(PyThreadState* tstate);
 
-// Specialized version of JITRT_UnlinkFrame for non-generator functions with no
-// free variables that use lightweight frames. Avoids the expensive
-// jitFrameClearExceptCode path.
-void JITRT_UnlinkLightweightFrameFast(PyThreadState* tstate);
-
 /*
  * Handles a call that includes kw arguments where the target function has
  * *args, **kwargs, or keyword only args.

cinderx/Jit/lir/generator.cpp

@@ -5191,15 +5191,9 @@ void LIRGenerator::emitUnlinkFrame(
   } else if (!env_->can_deopt) {
     emitInlineUnlinkLeafFrame(
         bbb, is_generator, func_reg, executable, exec_dtor, callee_frame);
-#ifdef ENABLE_LIGHTWEIGHT_FRAMES
   } else {
     emitInlineUnlinkFastFrame(
         bbb, is_generator, func_reg, executable, exec_dtor, callee_frame);
-#else
-  } else {
-    bbb.appendInvokeInstruction(
-        JITRT_UnlinkLightweightFrameFast, env_->asm_tstate);
-#endif
   }
 }
 
@@ -5249,6 +5243,7 @@ void LIRGenerator::emitInlineUnlinkFastFrame(
   auto done_block = bbb.allocateBlock();
   auto not_materialized = bbb.allocateBlock();
 
+#ifdef ENABLE_LIGHTWEIGHT_FRAMES
   Instruction* frame_status = bbb.appendInstr(
       OutVReg{},
       Instruction::kMove,
@@ -5259,6 +5254,16 @@ void LIRGenerator::emitInlineUnlinkFastFrame(
   static_assert(JIT_FRAME_INITIALIZED == 2);
   bbb.appendBranch(
       Instruction::kBranchBitNotSet, not_materialized, frame_status, Imm{1});
+#else
+  Instruction* frame_obj_reg = bbb.appendInstr(
+      OutVReg{},
+      Instruction::kMove,
+      Ind{frame,
+          static_cast<int32_t>(offsetof(_PyInterpreterFrame, frame_obj))});
+
+  bbb.appendInstr(Instruction::kTest, frame_obj_reg, frame_obj_reg);
+  bbb.appendBranch(Instruction::kBranchZ, not_materialized);
+#endif
 
   {
     BasicBlock* materialized_block = bbb.allocateBlock();