CI: add LLVM version to its build cache

Also disallow non-version-21 LLVMs.

Author: pjaaskel

.github/workflows/ci.yml

@@ -83,20 +83,20 @@ jobs:
 
       - name: Install LLVM
         run: |
-          if [[ "${{ steps.llvm-cache-restore.outputs.cache-hit }}" != "true" ]]; then
+          if [[ "${{ steps.llvm-${{ env.LLVM_VERSION }}-cache-restore.outputs.cache-hit }}" != "true" ]]; then
             echo "Cache not found. Installing LLVM..."
             cd openasip
             ./tools/scripts/install_llvm_${{ env.LLVM_VERSION }}.sh ${{ github.workspace }}/local
           else
-            echo "Cache hit! LLVM is already installed, skipping installation."
+            echo "Cache hit! LLVM ${{ env.LLVM_VERSION }} is already installed, skipping installation."
           fi
 
       - name: Save LLVM cache
         id: llvm-cache-save
         uses: actions/cache/save@v4
         with:
           path: ${{ github.workspace }}/local
-          key: ${{ steps.llvm-cache-restore.outputs.cache-primary-key }}
+          key: ${{ steps.llvm-${{ env.LLVM_VERSION }}-cache-restore.outputs.cache-primary-key }}
 
       - name: Compile and install
         run: |

openasip/configure.ac

@@ -548,28 +548,6 @@ LLVM_INCLUDEDIR=/usr/include
 fi
 
 case "$LLVM_VERSION" in
-     16*)
-     AC_DEFINE([LLVM_16], [], "Using LLVM 16")
-     LLVM_VERSION=16
-     LLVM_LIBRARYVERSION=16
-     LLVM_OLDER_THAN_17=1
-     LLVM_SHARED_LIB_FILE=$LLVM_LIBDIR/libLLVMTCE-$LLVM_LIBRARYVERSION$LIBRARY_SUFFIX
-     LLVM_SHARED_LIB=-lLLVMTCE-$LLVM_LIBRARYVERSION
-     LLVM_LDFLAGS="$($llvmConf --ldflags) $LLVM_SHARED_LIB"
-     AC_DEFINE([LLVM_HAS_CUSTOM_VECTOR_EXTENSION], [2], "LLVM has the wide custom vector extension patch(wide)")
-     AC_SUBST([LLVM_HAS_CUSTOM_VECTOR_EXTENSION], ["2"])
-
-;;
-     17*)
-     AC_DEFINE([LLVM_17], [], "Using LLVM 17")
-     LLVM_VERSION=17
-     LLVM_LIBRARYVERSION=17
-     LLVM_SHARED_LIB_FILE=$LLVM_LIBDIR/libLLVMTCE-$LLVM_LIBRARYVERSION$LIBRARY_SUFFIX
-     LLVM_SHARED_LIB=-lLLVMTCE-$LLVM_LIBRARYVERSION
-     LLVM_LDFLAGS="$($llvmConf --ldflags) $LLVM_SHARED_LIB"
-     AC_DEFINE([LLVM_HAS_CUSTOM_VECTOR_EXTENSION], [2], "LLVM has the wide custom vector extension patch(wide)")
-     AC_SUBST([LLVM_HAS_CUSTOM_VECTOR_EXTENSION], ["2"])
-;;
      21*)
      AC_DEFINE([LLVM_21], [], "Using LLVM 21")
      LLVM_VERSION=21
@@ -599,12 +577,6 @@ AC_MSG_NOTICE([
 ])
 
 
-if  test "x$LLVM_OLDER_THAN_17" == "x1";
-then
-AC_DEFINE_UNQUOTED(LLVM_OLDER_THAN_17, 1, [LLVM version is older than 17])
-fi
-
-
 if test ! -e $LLVM_SHARED_LIB_FILE;
 then
   # Try the alternative location where llvm.org/apt packages install it.