feat: Drop GHC's LLVM version check

compiler/GHC/CmmToLlvm.hs

@@ -38,8 +38,8 @@ import GHC.Utils.Panic
 import GHC.Utils.Logger
 import qualified GHC.Data.Stream as Stream
 
-import Control.Monad ( when, forM_ )
-import Data.Maybe ( fromMaybe, catMaybes, isNothing )
+import Control.Monad ( forM_ )
+import Data.Maybe ( catMaybes )
 import System.IO
 
 -- -----------------------------------------------------------------------------
@@ -57,36 +57,8 @@ llvmCodeGen logger cfg h dus cmm_stream
        -- Pass header
        showPass logger "LLVM CodeGen"
 
-       -- get llvm version, cache for later use
-       let mb_ver = llvmCgLlvmVersion cfg
-
-       -- warn if unsupported
-       forM_ mb_ver $ \ver -> do
-         debugTraceMsg logger 2
-              (text "Using LLVM version:" <+> text (llvmVersionStr ver))
-         let doWarn = llvmCgDoWarn cfg
-         when (not (llvmVersionSupported ver) && doWarn) $ putMsg logger $
-           "You are using an unsupported version of LLVM!" $$
-           "Currently only" <+> text (llvmVersionStr supportedLlvmVersionLowerBound) <+>
-           "up to" <+> text (llvmVersionStr supportedLlvmVersionUpperBound) <+> "(non inclusive) is supported." <+>
-           "System LLVM version: " <> text (llvmVersionStr ver) $$
-           "We will try though..."
-
-       when (isNothing mb_ver) $ do
-         let doWarn = llvmCgDoWarn cfg
-         when doWarn $ putMsg logger $
-           "Failed to detect LLVM version!" $$
-           "Make sure LLVM is installed correctly." $$
-           "We will try though..."
-
-       -- HACK: the Nothing case here is potentially wrong here but we
-       -- currently don't use the LLVM version to guide code generation
-       -- so this is okay.
-       let llvm_ver :: LlvmVersion
-           llvm_ver = fromMaybe supportedLlvmVersionLowerBound mb_ver
-
        -- run code generation
-       (a, _) <- runLlvm logger cfg llvm_ver bufh dus $
+       (a, _) <- runLlvm logger cfg bufh dus $
          llvmCodeGen' cfg cmm_stream
 
        bFlush bufh

compiler/GHC/CmmToLlvm/Base.hs

@@ -18,7 +18,7 @@ module GHC.CmmToLlvm.Base (
         LlvmM,
         runLlvm, withClearVars, varLookup, varInsert,
         markStackReg, checkStackReg,
-        funLookup, funInsert, getLlvmVer,
+        funLookup, funInsert,
         dumpIfSetLlvm, renderLlvm, markUsedVar, getUsedVars,
         ghcInternalFunctions, getPlatform, getConfig,
 
@@ -277,8 +277,7 @@ llvmPtrBits platform = widthInBits $ typeWidth $ gcWord platform
 --
 
 data LlvmEnv = LlvmEnv
-  { envVersion   :: LlvmVersion      -- ^ LLVM version
-  , envConfig    :: !LlvmCgConfig    -- ^ Configuration for LLVM code gen
+  { envConfig    :: !LlvmCgConfig    -- ^ Configuration for LLVM code gen
   , envLogger    :: !Logger          -- ^ Logger
   , envOutput    :: BufHandle        -- ^ Output buffer
   , envTag       :: !Char            -- ^ Tag for creating unique values
@@ -331,16 +330,15 @@ liftUDSMT m = LlvmM $ \env -> do x <- m
                                  return (x, env)
 
 -- | Get initial Llvm environment.
-runLlvm :: Logger -> LlvmCgConfig -> LlvmVersion -> BufHandle -> DSM.DUniqSupply -> LlvmM a -> IO (a, DSM.DUniqSupply)
-runLlvm logger cfg ver out us m = do
+runLlvm :: Logger -> LlvmCgConfig -> BufHandle -> DSM.DUniqSupply -> LlvmM a -> IO (a, DSM.DUniqSupply)
+runLlvm logger cfg out us m = do
     ((a, _), us') <- DSM.runUDSMT us $ runLlvmM m env
     return (a, us')
   where env = LlvmEnv { envFunMap    = emptyUFM
                       , envVarMap    = emptyUFM
                       , envStackRegs = []
                       , envUsedVars  = []
                       , envAliases   = emptyUniqSet
-                      , envVersion   = ver
                       , envConfig    = cfg
                       , envLogger    = logger
                       , envOutput    = out
@@ -388,10 +386,6 @@ getMetaUniqueId :: LlvmM MetaId
 getMetaUniqueId = LlvmM $ \env ->
     return (envFreshMeta env, env { envFreshMeta = succ $ envFreshMeta env })
 
--- | Get the LLVM version we are generating code for
-getLlvmVer :: LlvmM LlvmVersion
-getLlvmVer = getEnv envVersion
-
 -- | Dumps the document if the corresponding flag has been set by the user
 dumpIfSetLlvm :: DumpFlag -> String -> DumpFormat -> Outp.SDoc -> LlvmM ()
 dumpIfSetLlvm flag hdr fmt doc = do

compiler/GHC/CmmToLlvm/Config.hs

@@ -25,7 +25,6 @@ data LlvmCgConfig = LlvmCgConfig
   , llvmCgAvxEnabled        :: !Bool
   , llvmCgBmiVersion        :: Maybe BmiVersion  -- ^ (x86) BMI instructions
   , llvmCgLlvmVersion       :: Maybe LlvmVersion -- ^ version of Llvm we're using
-  , llvmCgDoWarn            :: !Bool         -- ^ True ==> warn unsupported Llvm version
   , llvmCgLlvmTarget        :: !String       -- ^ target triple passed to LLVM
   , llvmCgLlvmConfig        :: !LlvmConfig   -- ^ Supported LLVM configurations.
                                              -- see Note [LLVM configuration]

compiler/GHC/CmmToLlvm/Version.hs

@@ -1,9 +1,6 @@
 module GHC.CmmToLlvm.Version
   ( LlvmVersion(..)
-  , supportedLlvmVersionLowerBound
-  , supportedLlvmVersionUpperBound
   , parseLlvmVersion
-  , llvmVersionSupported
   , llvmVersionStr
   , llvmVersionList
   )
@@ -12,7 +9,6 @@ where
 import GHC.Prelude
 
 import GHC.CmmToLlvm.Version.Type
-import GHC.CmmToLlvm.Version.Bounds
 
 import Data.Char (isDigit)
 import Data.List (intercalate)
@@ -32,10 +28,6 @@ parseLlvmVersion =
       where
         (ver_str, rest) = span isDigit s
 
-llvmVersionSupported :: LlvmVersion -> Bool
-llvmVersionSupported v =
-  v >= supportedLlvmVersionLowerBound && v < supportedLlvmVersionUpperBound
-
 llvmVersionStr :: LlvmVersion -> String
 llvmVersionStr = intercalate "." . map show . llvmVersionList
 

compiler/GHC/Driver/Config/CmmToLlvm.hs

@@ -29,7 +29,6 @@ initLlvmCgConfig logger config_cache dflags = do
                                       ArchX86    -> bmiVersion dflags
                                       _          -> Nothing
     , llvmCgLlvmVersion          = version
-    , llvmCgDoWarn               = wopt Opt_WarnUnsupportedLlvmVersion dflags
     , llvmCgLlvmTarget           = platformMisc_llvmTarget $! platformMisc dflags
     , llvmCgLlvmConfig           = llvm_config
     }

compiler/GHC/Driver/Errors/Ppr.hs

@@ -34,7 +34,6 @@ import GHC.HsToCore.Errors.Types (DsMessage)
 import GHC.Iface.Errors.Types
 import GHC.Tc.Errors.Ppr () -- instance Diagnostic TcRnMessage
 import GHC.Iface.Errors.Ppr () -- instance Diagnostic IfaceMessage
-import GHC.CmmToLlvm.Version (llvmVersionStr, supportedLlvmVersionLowerBound, supportedLlvmVersionUpperBound)
 
 --
 -- Suggestions
@@ -276,12 +275,7 @@ instance Diagnostic DriverMessage where
              , nest 2 $ ppr node ]
     DriverNoConfiguredLLVMToolchain ->
       mkSimpleDecorated $
-        text "GHC was not configured with a supported LLVM toolchain" $$
-          text ("Make sure you have installed LLVM between ["
-            ++ llvmVersionStr supportedLlvmVersionLowerBound
-            ++ " and "
-            ++ llvmVersionStr supportedLlvmVersionUpperBound
-            ++ ") and reinstall GHC to ensure -fllvm works")
+        text "GHC was not configured with a supported LLVM toolchain"
 
   diagnosticReason = \case
     DriverUnknownMessage m

compiler/GHC/Driver/Flags.hs

@@ -1041,7 +1041,6 @@ data WarningFlag =
    | Opt_WarnMissedSpecs
    | Opt_WarnAllMissedSpecs
    | Opt_WarnUnsupportedCallingConventions
-   | Opt_WarnUnsupportedLlvmVersion
    | Opt_WarnMissedExtraSharedLib
    | Opt_WarnInlineRuleShadowing
    | Opt_WarnTypedHoles
@@ -1175,7 +1174,6 @@ warnFlagNames wflag = case wflag of
   Opt_WarnMisplacedPragmas                        -> "misplaced-pragmas" :| []
   Opt_WarnUnsafe                                  -> "unsafe" :| []
   Opt_WarnUnsupportedCallingConventions           -> "unsupported-calling-conventions" :| []
-  Opt_WarnUnsupportedLlvmVersion                  -> "unsupported-llvm-version" :| []
   Opt_WarnMissedExtraSharedLib                    -> "missed-extra-shared-lib" :| []
   Opt_WarnUntickedPromotedConstructors            -> "unticked-promoted-constructors" :| []
   Opt_WarnUnusedDoBind                            -> "unused-do-bind" :| []
@@ -1350,7 +1348,6 @@ standardWarnings -- see Note [Documenting warning flags]
         Opt_WarnDodgyForeignImports,
         Opt_WarnInlineRuleShadowing,
         Opt_WarnAlternativeLayoutRuleTransitional,
-        Opt_WarnUnsupportedLlvmVersion,
         Opt_WarnMissedExtraSharedLib,
         Opt_WarnTabs,
         Opt_WarnUnrecognisedWarningFlags,

compiler/GHC/Driver/Session.hs

@@ -2337,7 +2337,6 @@ wWarningFlagsDeps = [minBound..maxBound] >>= \x -> case x of
   Opt_WarnMisplacedPragmas -> warnSpec x
   Opt_WarnUnsafe -> warnSpec' x setWarnUnsafe
   Opt_WarnUnsupportedCallingConventions -> warnSpec x
-  Opt_WarnUnsupportedLlvmVersion -> warnSpec x
   Opt_WarnMissedExtraSharedLib -> warnSpec x
   Opt_WarnUntickedPromotedConstructors -> warnSpec x
   Opt_WarnUnusedDoBind -> warnSpec x

compiler/GHC/SysTools/Tasks.hs

@@ -31,7 +31,7 @@ module GHC.SysTools.Tasks
 import GHC.Prelude
 import GHC.ForeignSrcLang
 
-import GHC.CmmToLlvm.Version (LlvmVersion, llvmVersionStr, supportedLlvmVersionUpperBound, parseLlvmVersion, supportedLlvmVersionLowerBound)
+import GHC.CmmToLlvm.Version (LlvmVersion, parseLlvmVersion)
 
 import GHC.Settings
 

compiler/ghc.cabal.in

@@ -353,7 +353,6 @@ Library
         GHC.CmmToLlvm.Ppr
         GHC.CmmToLlvm.Regs
         GHC.CmmToLlvm.Version
-        GHC.CmmToLlvm.Version.Bounds
         GHC.CmmToLlvm.Version.Type
         GHC.Cmm.Dominators
         GHC.Cmm.Reducibility

hadrian/src/Hadrian/Haskell/Cabal/Parse.hs

@@ -126,8 +126,9 @@ biModules pd = go [ comp | comp@(bi,_,_,_) <-
 --
 -- Put another way, while Hadrian knows these are generated, Cabal
 -- should just think they are regular source files.
+-- TODO: Review if this is necessary
 extraPreConfigureDeps :: [String]
-extraPreConfigureDeps = ["compiler/GHC/CmmToLlvm/Version/Bounds.hs"]
+extraPreConfigureDeps = []
 
 -- TODO: Track command line arguments and package configuration flags.
 -- | Configure a package using the Cabal library by collecting all the command

hadrian/src/Rules/Generate.hs

@@ -78,9 +78,6 @@ rtsDependencies = do
 
 compilerDependencies :: Expr [FilePath]
 compilerDependencies = do
-    let fixed = ("compiler" -/-) <$>
-                  [ "GHC/CmmToLlvm/Version/Bounds.hs"
-                  ]
     stage   <- getStage
     ghcPath <- expr $ buildPath (vanillaContext stage compiler)
     let buildSpecific = (ghcPath -/-) <$>
@@ -105,7 +102,7 @@ compilerDependencies = do
                   , "GHC/Platform/Constants.hs"
                   , "GHC/Settings/Config.hs"
                   ]
-    pure $ fixed ++ buildSpecific
+    pure buildSpecific
 
 generatedDependencies :: Expr [FilePath]
 generatedDependencies = do
@@ -389,10 +386,6 @@ templateRules = do
     , interpolateSetting "LlvmMinVersion" LlvmMinVersion
     , interpolateSetting "LlvmMaxVersion" LlvmMaxVersion
     ]
-  templateRule "compiler/GHC/CmmToLlvm/Version/Bounds.hs" $ mconcat
-    [ interpolateVar "LlvmMinVersion" $ replaceEq '.' ',' <$> setting LlvmMinVersion
-    , interpolateVar "LlvmMaxVersion" $ replaceEq '.' ',' <$> setting LlvmMaxVersion
-    ]
   bindistRules
 
 bindistRules :: Rules ()

hadrian/src/Rules/Lint.hs

@@ -91,8 +91,7 @@ compiler = do
   let compilerDir    = "compiler"
   let ghcautoconf    = stage1RtsInc </> "ghcautoconf.h"
   let ghcplatform    = stage1RtsInc </> "ghcplatform.h"
-  let ghcLlvmVersion = compilerDir </> "GHC/CmmToLlvm/Version/Bounds.hs"
-  need $ mconcat [[ghcautoconf, ghcplatform, ghcLlvmVersion], hsIncls stage1Compiler, [machDeps]]
+  need $ mconcat [[ghcautoconf, ghcplatform], hsIncls stage1Compiler, [machDeps]]
   let includeDirs =
         [ stage1RtsInc
         , compilerDir

testsuite/tests/driver/all.T

@@ -277,7 +277,7 @@ test('T12971', [when(opsys('mingw32'), fragile(17945)), ignore_stdout], makefile
 test('json_dump', normal, compile_fail, ['-ddump-json'])
 test('json', normalise_version('ghc'), compile_fail, ['-fdiagnostics-as-json'])
 test('json_warn', normalise_version('ghc'), compile, ['-fdiagnostics-as-json -Wunused-matches -Wx-partial'])
-test('json2', normalise_version('ghc-internal', 'base','ghc-prim'), compile, ['-ddump-types -ddump-json -Wno-unsupported-llvm-version'])
+test('json2', normalise_version('ghc-internal', 'base','ghc-prim'), compile, ['-ddump-types -ddump-json'])
 test('T16167', [normalise_version('ghc'),req_interp,exit_code(1)], run_command,
      ['{compiler} -x hs -e ":set prog T16167.hs" -ddump-json T16167.hs'])
 test('T13604', [], makefile_test, [])