Set min LLVM version to 9 and make version checking use a non-inclusive upper

bound.

We use a non-inclusive upper bound so that setting the upper bound to 13 for
example means that all 12.x versions are accepted.

(cherry picked from commit 6c783817ef089e85642c3383937117cff9d15f67)

5 files changed, 20 insertions, 17 deletions

diff --git a/aclocal.m4 b/aclocal.m4
index 88f82e70fe..47d69c5c1c 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -2244,7 +2244,7 @@ AC_DEFUN([FIND_LLVM_PROG],[
             [AC_MSG_RESULT(no)
              $1=""
              AC_MSG_NOTICE([We only support llvm $3 to $4 (found $PROG_VERSION).])],
-            [AX_COMPARE_VERSION([$PROG_VERSION], [gt], [$4],
+            [AX_COMPARE_VERSION([$PROG_VERSION], [ge], [$4],
              [AC_MSG_RESULT(no)
               $1=""
               AC_MSG_NOTICE([We only support llvm $3 to $4 (found $PROG_VERSION).])],
diff --git a/compiler/llvmGen/LlvmCodeGen.hs b/compiler/llvmGen/LlvmCodeGen.hs
index 67e95c1b89..fc194fd87e 100644
--- a/compiler/llvmGen/LlvmCodeGen.hs
+++ b/compiler/llvmGen/LlvmCodeGen.hs
@@ -58,8 +58,8 @@ llvmCodeGen dflags h cmm_stream
          let doWarn = wopt Opt_WarnUnsupportedLlvmVersion dflags
          when (not (llvmVersionSupported ver) && doWarn) $ putMsg dflags $
            "You are using an unsupported version of LLVM!" $$
-           "Currently only" <+> text (llvmVersionStr supportedLlvmVersionMin) <+>
-           "to" <+> text (llvmVersionStr supportedLlvmVersionMax) <+> "is supported." <+>
+           "Currently only" <+> text (llvmVersionStr supportedLlvmVersionLowerBound) <+>
+           "to" <+> text (llvmVersionStr supportedLlvmVersionUpperBound) <+> "is supported." <+>
            "System LLVM version: " <> text (llvmVersionStr ver) $$
            "We will try though..."
          let isS390X = platformArch (targetPlatform dflags) == ArchS390X
@@ -72,7 +72,7 @@ llvmCodeGen dflags h cmm_stream
        -- currently don't use the LLVM version to guide code generation
        -- so this is okay.
        let llvm_ver :: LlvmVersion
-           llvm_ver = fromMaybe supportedLlvmVersionMin mb_ver
+           llvm_ver = fromMaybe supportedLlvmVersionLowerBound mb_ver
 
        -- run code generation
        a <- runLlvm dflags llvm_ver bufh $
diff --git a/compiler/llvmGen/LlvmCodeGen/Base.hs b/compiler/llvmGen/LlvmCodeGen/Base.hs
index 8e22100d8f..7cdb92b219 100644
--- a/compiler/llvmGen/LlvmCodeGen/Base.hs
+++ b/compiler/llvmGen/LlvmCodeGen/Base.hs
@@ -14,7 +14,7 @@ module LlvmCodeGen.Base (
         LlvmUnresData, LlvmData, UnresLabel, UnresStatic,
 
         LlvmVersion, llvmVersionSupported, parseLlvmVersion,
-        supportedLlvmVersionMin, supportedLlvmVersionMax,
+        supportedLlvmVersionLowerBound, supportedLlvmVersionUpperBound,
         llvmVersionStr, llvmVersionList,
 
         LlvmM,
@@ -267,7 +267,6 @@ llvmPtrBits dflags = widthInBits $ typeWidth $ gcWord dflags
 -- * Llvm Version
 --
 
--- Newtype to avoid using the Eq instance!
 newtype LlvmVersion = LlvmVersion { llvmVersionNE :: NE.NonEmpty Int }
   deriving (Eq, Ord)
 
@@ -285,14 +284,17 @@ parseLlvmVersion =
       where
         (ver_str, rest) = span isDigit s
 
--- | The LLVM Version that is currently supported.
-supportedLlvmVersionMin, supportedLlvmVersionMax :: LlvmVersion
-supportedLlvmVersionMin = LlvmVersion (sUPPORTED_LLVM_VERSION_MIN NE.:| [])
-supportedLlvmVersionMax = LlvmVersion (sUPPORTED_LLVM_VERSION_MAX NE.:| [])
+-- | The (inclusive) lower bound on the LLVM Version that is currently supported.
+supportedLlvmVersionLowerBound :: LlvmVersion
+supportedLlvmVersionLowerBound = LlvmVersion (sUPPORTED_LLVM_VERSION_MIN NE.:| [])
+
+-- | The (not-inclusive) upper bound  bound on the LLVM Version that is currently supported.
+supportedLlvmVersionUpperBound :: LlvmVersion
+supportedLlvmVersionUpperBound = LlvmVersion (sUPPORTED_LLVM_VERSION_MAX NE.:| [])
 
 llvmVersionSupported :: LlvmVersion -> Bool
 llvmVersionSupported v =
-  v > supportedLlvmVersionMin && v <= supportedLlvmVersionMax
+  v >= supportedLlvmVersionLowerBound && v < supportedLlvmVersionUpperBound
 
 llvmVersionStr :: LlvmVersion -> String
 llvmVersionStr = intercalate "." . map show . llvmVersionList
diff --git a/compiler/main/SysTools/Tasks.hs b/compiler/main/SysTools/Tasks.hs
index 82a609d8b3..9e46327cda 100644
--- a/compiler/main/SysTools/Tasks.hs
+++ b/compiler/main/SysTools/Tasks.hs
@@ -23,7 +23,7 @@ import System.IO
 import System.Process
 import GhcPrelude
 
-import LlvmCodeGen.Base (LlvmVersion, llvmVersionStr, supportedLlvmVersionMin, supportedLlvmVersionMax, llvmVersionStr, parseLlvmVersion)
+import LlvmCodeGen.Base (LlvmVersion, llvmVersionStr, supportedLlvmVersionLowerBound, supportedLlvmVersionUpperBound, llvmVersionStr, parseLlvmVersion)
 
 import SysTools.Process
 import SysTools.Info
@@ -236,10 +236,11 @@ figureLlvmVersion dflags = traceToolCommand dflags "llc" $ do
                 errorMsg dflags $ vcat
                     [ text "Warning:", nest 9 $
                           text "Couldn't figure out LLVM version!" $$
-                          text ("Make sure you have installed LLVM between "
-                                ++ llvmVersionStr supportedLlvmVersionMin
+                          text ("Make sure you have installed LLVM between ["
+                                ++ llvmVersionStr supportedLlvmVersionLowerBound
                                 ++ " and "
-                                ++ llvmVersionStr supportedLlvmVersionMax) ]
+                                ++ llvmVersionStr supportedLlvmVersionUpperBound
+                                ++ ")") ]
                 return Nothing)
 
 
diff --git a/configure.ac b/configure.ac
index 44586446dd..04c9c972b8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -690,8 +690,8 @@ AC_SUBST(InstallNameToolCmd)
 # tools we are looking for. In the past, GHC supported a number of
 # versions of LLVM simultaneously, but that stopped working around
 # 3.5/3.6 release of LLVM.
-LlvmMinVersion=10
-LlvmMaxVersion=12 # inclusive
+LlvmMinVersion=9  # inclusive
+LlvmMaxVersion=13 # not inclusive
 AC_SUBST([LlvmMinVersion])
 AC_SUBST([LlvmMaxVersion])
 sUPPORTED_LLVM_VERSION_MIN=$(echo \($LlvmMinVersion\) | sed 's/\./,/')