Revert D92722098

Summary:
This diff reverts D92722098
S620883, it could be causing pyperf samples to drop

Depends on D92722098

Differential Revision: D92927513

fbshipit-source-id: f01a36f7688f3b01c667f21e6725c344f79de45c

Author: generatedunixname89002005232357

cinderx/Jit/cell_helpers.c

@@ -2979,13 +2979,8 @@ void HIRBuilder::emitStoreDeref(
   Register* old = temps_.AllocateStack();
   Register* dst = tc.frame.localsplus[idx];
   Register* src = tc.frame.stack.pop();
-#ifdef Py_GIL_DISABLED
-  // Use atomic swap for thread-safe cell access in FT-Python.
-  tc.emit<SwapCellItem>(old, dst, src);
-#else
   tc.emit<StealCellItem>(old, dst);
   tc.emit<SetCellItem>(dst, src, old);
-#endif
 }
 
 void HIRBuilder::emitLoadAssertionError(

cinderx/Jit/hir/builder.cpp

@@ -499,7 +499,6 @@ bool Instr::isReplayable() const {
     case Opcode::kRunPeriodicTasks:
     case Opcode::kSend:
     case Opcode::kSetCellItem:
-    case Opcode::kSwapCellItem:
     case Opcode::kSetCurrentAwaiter:
     case Opcode::kSetDictItem:
     case Opcode::kSetSetItem:
@@ -795,7 +794,6 @@ bool isPassthrough(const Instr& instr) {
     case Opcode::kSetSetItem:
     case Opcode::kSetUpdate:
     case Opcode::kStealCellItem:
-    case Opcode::kSwapCellItem:
     case Opcode::kStoreArrayItem:
     case Opcode::kStoreAttr:
     case Opcode::kStoreAttrCached:

cinderx/Jit/hir/hir.cpp

@@ -2663,15 +2663,6 @@ DEFINE_SIMPLE_INSTR(LoadCellItem, (TOptObject), HasOutput, Operands<1>);
 // in the cell that the cell is about to lose its reference to.
 DEFINE_SIMPLE_INSTR(StealCellItem, (TObject), HasOutput, Operands<1>);
 
-// Atomically swap the cell value, returning the old value. Used in FT-Python
-// for thread-safe STORE_DEREF. Takes cell as operand 0 and new value as
-// operand 1. Returns the old value (owned reference for decref).
-DEFINE_SIMPLE_INSTR(
-    SwapCellItem,
-    (TObject, TOptObject),
-    HasOutput,
-    Operands<2>);
-
 // Store a value to the cell in dst. The `old` arg is unused but exists in order
 // to ensure that the previous cell contents are not decref-ed until after the
 // new cell contents are in place.

cinderx/Jit/hir/hir.h

@@ -150,7 +150,6 @@ namespace jit::hir {
   V(SetUpdate)                         \
   V(Snapshot)                          \
   V(StealCellItem)                     \
-  V(SwapCellItem)                      \
   V(StoreArrayItem)                    \
   V(StoreAttr)                         \
   V(StoreAttrCached)                   \

cinderx/Jit/hir/hir_ops.h

@@ -162,11 +162,6 @@ MemoryEffects memoryEffects(const Instr& inst) {
     case Opcode::kSetCellItem:
       return {true, AEmpty, {inst.NumOperands(), 2}, ACellItem};
 
-    // Atomically swaps cell value. Steals operand 1 (new value) and returns
-    // owned reference to old value. Used for thread-safe STORE_DEREF.
-    case Opcode::kSwapCellItem:
-      return {false, AEmpty, {inst.NumOperands(), 2}, ACellItem};
-
     // Returns a stolen (from the cell), not borrowed, reference.
     case Opcode::kStealCellItem:
       return commonEffects(inst, AEmpty);
@@ -238,13 +233,7 @@ MemoryEffects memoryEffects(const Instr& inst) {
       return borrowFrom(inst, AEmpty);
 
     case Opcode::kLoadCellItem:
-#ifdef Py_GIL_DISABLED
-      // In FT-Python, LoadCellItem calls PyCell_GetRef which returns an
-      // owned (new) reference.
-      return commonEffects(inst, AEmpty);
-#else
       return borrowFrom(inst, ACellItem);
-#endif
 
     case Opcode::kLoadField: {
       auto& ldfld = static_cast<const LoadField&>(inst);
@@ -438,7 +427,6 @@ bool hasArbitraryExecution(const Instr& inst) {
     case Opcode::kSetFunctionAttr:
     case Opcode::kSnapshot:
     case Opcode::kStealCellItem:
-    case Opcode::kSwapCellItem:
     case Opcode::kStoreArrayItem:
     case Opcode::kStoreField:
     case Opcode::kTpAlloc:

cinderx/Jit/hir/instr_effects.cpp

@@ -1041,7 +1041,6 @@ HIRParser::parseInstr(std::string_view opcode, Register* dst, int bb_index) {
     case Opcode::kSetDictItem:
     case Opcode::kSetFunctionAttr:
     case Opcode::kStealCellItem:
-    case Opcode::kSwapCellItem:
     case Opcode::kStoreArrayItem:
     case Opcode::kStoreField:
     case Opcode::kTpAlloc:

cinderx/Jit/hir/parser.cpp

@@ -234,7 +234,6 @@ Type outputType(
     case Opcode::kLoadGlobalCached:
     case Opcode::kMatchClass:
     case Opcode::kStealCellItem:
-    case Opcode::kSwapCellItem:
     case Opcode::kWaitHandleLoadWaiter:
       return TOptObject;
 

cinderx/Jit/hir/pass.cpp

@@ -294,7 +294,6 @@ static std::string format_immediates(const Function* func, const Instr& instr) {
     case Opcode::kSetUpdate:
     case Opcode::kSnapshot:
     case Opcode::kStealCellItem:
-    case Opcode::kSwapCellItem:
     case Opcode::kStoreArrayItem:
     case Opcode::kStoreSubscr:
     case Opcode::kWaitHandleLoadCoroOrResult:

cinderx/Jit/hir/printer.cpp

@@ -578,23 +578,6 @@ LoadMethodResult JITRT_LoadSpecial(PyObject* self, int special_idx);
 void JITRT_AtQuiescentState(PyThreadState* tstate);
 #endif
 
-#if PY_VERSION_HEX >= 0x030D0000
-
-extern "C" {
-
-/*
- * Atomically load cell value with new reference (for LOAD_DEREF).
- */
-PyObject* JITRT_LoadCellItem(PyCellObject* cell);
-
-/*
- * Atomically swap cell value, returns old value for decref (for STORE_DEREF).
- */
-PyObject* JITRT_SwapCellItem(PyCellObject* cell, PyObject* new_value);
-}
-
-#endif
-
 /*
  * A PyObject that is used to indicate that an iterator has finished
  * normally. This must never escape into managed code.