Fix types and require LLVM 16

brandtbucher · brandtbucher · commit ffac31b882e7 · 2023-11-14T11:47:22.000-08:00
diff --git a/.github/workflows/jit.yml b/.github/workflows/jit.yml
@@ -2,7 +2,7 @@ name: JIT
 on: push
 jobs:
   jit:
-    name: ${{ matrix.target }} (${{ matrix.debug && 'Debug' || 'Release' }}, LLVM ${{ matrix.llvm }})
+    name: ${{ matrix.target }} (${{ matrix.debug && 'Debug' || 'Release' }})
     runs-on: ${{ matrix.runner }}
     strategy:
       fail-fast: false
@@ -21,8 +21,6 @@ jobs:
           - true
           - false
         llvm:
-          - 14
-          - 15
           - 16
         include:
           - target: i686-pc-windows-msvc/msvc
@@ -68,7 +66,6 @@ jobs:
             exclude: test_tools
     env:
       CC: ${{ matrix.compiler }}
-      PYTHON_LLVM_VERSION: ${{ matrix.llvm }}
     steps:
       - uses: actions/checkout@v3
       - uses: actions/setup-python@v4
@@ -80,7 +77,6 @@ jobs:
           echo "::group::Install LLVM"
           sudo apt purge --auto-remove llvm python3-lldb-14 llvm-14
           sudo bash -c "$(wget -O - https://apt.llvm.org/llvm.sh)" ./llvm.sh ${{ matrix.llvm }}
-          ${{ matrix.debug == false && matrix.llvm == 14 && matrix.compiler == 'clang' && 'sudo apt install --yes libclang-rt-14-dev' || '' }}
           echo "::endgroup::"
           echo "::group::Configure Python (Build)"
           export PATH="$(llvm-config-${{ matrix.llvm }} --bindir):$PATH"
@@ -113,7 +109,6 @@ jobs:
           echo "::group::Install LLVM"
           sudo apt purge --auto-remove llvm python3-lldb-14 llvm-14
           sudo bash -c "$(wget -O - https://apt.llvm.org/llvm.sh)" ./llvm.sh ${{ matrix.llvm }}
-          ${{ matrix.debug == false && matrix.llvm == 14 && matrix.compiler == 'clang' && 'sudo apt install --yes libclang-rt-14-dev' || '' }}
           echo "::endgroup::"
           echo "::group::Configure Python"
           export PATH="$(llvm-config-${{ matrix.llvm }} --bindir):$PATH"
diff --git a/Tools/jit/README.md b/Tools/jit/README.md
@@ -11,15 +11,15 @@ This branch has an (always-on) JIT compiler. While most everything you already k
 
 While the JIT compiler does not require end users to install any third-party dependencies, part of it must be *built* using LLVM. It is *not* required for you to build the rest of CPython using LLVM, or the even the same version of LLVM (in fact, this is uncommon).
 
-LLVM versions 14, 15, and 16 all work. Both `clang` and `llvm-readobj` need to be installed and discoverable (version suffixes, like `clang-16`, are okay). It's highly recommended that you also have `llvm-objdump` available, since this allows the build script to dump human-readable assembly for the generated code.
+LLVM version 16 is required. Both `clang` and `llvm-readobj` need to be installed and discoverable (version suffixes, like `clang-16`, are okay). It's highly recommended that you also have `llvm-objdump` available, since this allows the build script to dump human-readable assembly for the generated code.
 
 It's easy to install all of the required tools:
 
 #### Linux
 
 Install LLVM 16 on Ubuntu/Debian:
 
-```
+```sh
 wget https://apt.llvm.org/llvm.sh
 chmod +x llvm.sh
 sudo ./llvm.sh 16
@@ -39,7 +39,7 @@ Homebrew won't add any of the tools to your `$PATH`. That's okay; the build scri
 
 LLVM 16 can be installed on Windows by using the installers published on [LLVM's GitHub releases page](https://github.com/llvm/llvm-project/releases/tag/llvmorg-16.0.6).
 
-[Here's a recent one.](https://github.com/llvm/llvm-project/releases/download/llvmorg-16.0.4/LLVM-16.0.4-win64.exe)
+[Here's a recent one.](https://github.com/llvm/llvm-project/releases/download/llvmorg-16.0.6/LLVM-16.0.6-win64.exe) **When installing, be sure to select the option labeled "Add LLVM to the system PATH".**
 
 ### Building
 
diff --git a/Tools/jit/build.py b/Tools/jit/build.py
