Support the new way to support Tier2 and JIT

Author: mdboom

bench_runner/scripts/should_run.py

@@ -30,6 +30,10 @@ def _main(
         )
         sys.exit(1)
 
+    if tier2 and jit:
+        print("Tier 2 interpreter and JIT may not be selected at the same time")
+        sys.exit(1)
+
     # Now that we've assert we are Python 3.11 or later, we can import
     # parts of our library.
     from bench_runner import git

bench_runner/templates/_benchmark.src.yml

@@ -211,7 +211,7 @@ jobs:
         if: ${{ steps.should_run.outputs.should_run != 'false' }}
         run: |
           cd cpython
-          ./configure ${{ inputs.pgo == true && '--enable-optimizations --with-lto=yes' || '' }} ${{ inputs.jit == true && '--enable-experimental-jit' || '' }}
+          ./configure ${{ inputs.pgo == true && '--enable-optimizations --with-lto=yes' || '' }} ${{ inputs.tier2 == true && '--enable-experimental-jit=interpreter' || '' }} ${{ inputs.jit == true && '--enable-experimental-jit=yes' || '' }}
           make -j4
       - name: Install pyperformance
         if: ${{ steps.should_run.outputs.should_run != 'false' }}
@@ -308,7 +308,7 @@ jobs:
         if: ${{ steps.should_run.outputs.should_run != 'false' }}
         run: |
           cd cpython
-          ./configure ${{ inputs.pgo == true && '--enable-optimizations --with-lto=yes' || '' }} ${{ inputs.jit == true && '--enable-experimental-jit' || '' }}
+          ./configure ${{ inputs.pgo == true && '--enable-optimizations --with-lto=yes' || '' }} ${{ inputs.tier2 == true && '--enable-experimental-jit=interpreter' || '' }} ${{ inputs.jit == true && '--enable-experimental-jit=yes' || '' }}
           make -j4
       # On macos ARM64, actions/setup-python isn't available, so we rely on a
       # pre-installed homebrew one, used through a venv

bench_runner/templates/_pystats.src.yml

@@ -109,7 +109,7 @@ jobs:
         if: ${{ steps.should_run.outputs.should_run != 'false' }}
         run: |
           cd cpython
-          ./configure --enable-pystats --prefix=$PWD/install ${{ inputs.jit == true && '--enable-experimental-jit' || '' }}
+          ./configure --enable-pystats --prefix=$PWD/install ${{ inputs.tier2 == true && '--enable-experimental-jit=interpreter' || '' }} ${{ inputs.jit == true && '--enable-experimental-jit=yes' || '' }}
           make -j4
           make install
       - name: Install pyperformance into the system python