Actually, make the default yes-off

brandtbucher · Sep 22, 2024 · a6f1035 · a6f1035
1 parent edc643a
commit a6f1035
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 15 deletions.
diff --git a/PCbuild/build.bat b/PCbuild/build.bat
@@ -68,7 +68,8 @@ set verbose=/nologo /v:m /clp:summary
 set kill=
 set do_pgo=
 set pgo_job=-m test --pgo
-set UseTIER2=
+set UseTIER2=3
+set UseJIT=true
 
 :CheckOpts
 if "%~1"=="-h" goto Usage

diff --git a/Python/pylifecycle.c b/Python/pylifecycle.c
@@ -1299,16 +1299,16 @@ init_interp_main(PyThreadState *tstate)
             // PYTHON_JIT=0|1 overrides the default
             enabled = *env != '0';
         }
-        // if (enabled) {
-        //     PyObject *opt = _PyOptimizer_NewUOpOptimizer();
-        //     if (opt == NULL) {
-        //         return _PyStatus_ERR("can't initialize optimizer");
-        //     }
-        //     if (_Py_SetTier2Optimizer((_PyOptimizerObject *)opt)) {
-        //         return _PyStatus_ERR("can't install optimizer");
-        //     }
-        //     Py_DECREF(opt);
-        // }
+        if (enabled) {
+            PyObject *opt = _PyOptimizer_NewUOpOptimizer();
+            if (opt == NULL) {
+                return _PyStatus_ERR("can't initialize optimizer");
+            }
+            if (_Py_SetTier2Optimizer((_PyOptimizerObject *)opt)) {
+                return _PyStatus_ERR("can't install optimizer");
+            }
+            Py_DECREF(opt);
+        }
     }
 #endif
 

diff --git a/configure b/configure
diff --git a/configure.ac b/configure.ac
@@ -1822,9 +1822,9 @@ AC_ARG_ENABLE([experimental-jit],
               [],
               [enable_experimental_jit=no])
 case $enable_experimental_jit in
-  no)              jit_flags="";          tier2_flags="" ;;
+  yes-off)         jit_flags="";          tier2_flags="" ;;  # XXX
   yes)             jit_flags="-D_Py_JIT"; tier2_flags="-D_Py_TIER2=1" ;;
-  yes-off)         jit_flags="-D_Py_JIT"; tier2_flags="-D_Py_TIER2=3" ;;
+  no)              jit_flags="-D_Py_JIT"; tier2_flags="-D_Py_TIER2=3" ;;  # XXX
   interpreter)     jit_flags="";          tier2_flags="-D_Py_TIER2=4" ;;
   interpreter-off) jit_flags="";          tier2_flags="-D_Py_TIER2=6" ;;  # Secret option
   *) AC_MSG_ERROR(