tests: Fixup files for formatting compatibility

rowanG077 · rowanG077 · commit 9089390aac0a · 2024-06-18T22:57:15.000+02:00
diff --git a/tests/Main.hs b/tests/Main.hs
@@ -27,8 +27,8 @@ import           Test.Tasty.Clash
 
 -- | GHC version as major.minor.patch1. For example: 8.10.2.
 ghcVersion3 :: String
-ghcVersion3 =
 #ifdef __GLASGOW_HASKELL_PATCHLEVEL2__
+ghcVersion3 =
   let ghc_p1 = __GLASGOW_HASKELL_PATCHLEVEL1__
       ghc_p2 = __GLASGOW_HASKELL_PATCHLEVEL2__ in
   case ghc_p2 of
@@ -37,10 +37,39 @@ ghcVersion3 =
     _ ->
       intercalate "." (map show (versionBranch compilerVersion <> [ghc_p1,ghc_p2]))
 #else
+ghcVersion3 =
   let ghc_p1 = __GLASGOW_HASKELL_PATCHLEVEL1__ in
   intercalate "." (map show (versionBranch compilerVersion <> [ghc_p1]))
 #endif
 
+multipleHiddenEnabled :: Bool
+#ifdef CLASH_MULTIPLE_HIDDEN
+multipleHiddenEnabled = True
+#else
+multipleHiddenEnabled = False
+#endif
+
+coSimEnabled :: Bool
+#ifdef COSIM
+coSimEnabled = True
+#else
+coSimEnabled = False
+#endif
+
+ghcVersionGreater94 :: Bool
+#if MIN_VERSION_GLASGOW_HASKELL(9,4,0,0)
+ghcVersionGreater94 = True
+#else
+ghcVersionGreater94 = False
+#endif
+
+baseVersionGreater414 :: Bool
+#if MIN_VERSION_base(4,14,0)
+baseVersionGreater414 = True
+#else
+baseVersionGreater414 = False
+#endif
+
 -- Directory clash binary is expected to live in
 cabalClashBinDir :: IO String
 cabalClashBinDir = makeAbsolute rel_path
@@ -380,9 +409,7 @@ runClashTest = defaultMain $ clashTestRoot
         , runTest "DivZero" def
         , runTest "LambdaDrop" def{hdlSim=[]}
         , runTest "IrrefError" def{hdlSim=[]}
-#ifdef CLASH_MULTIPLE_HIDDEN
-        , runTest "MultipleHidden" def
-#endif
+        , runTestIf multipleHiddenEnabled "MultipleHidden" def
         , outputTest "NameInlining" def
         , runTest "NameInstance" def{hdlSim=[]}
         , outputTest "NameInstance" def
@@ -637,12 +664,10 @@ runClashTest = defaultMain $ clashTestRoot
         [ runTest "MAC" def{hdlSim=[]}
         , runTest "CBlockRamTest" def{hdlSim=[]}
         ]
-#ifdef COSIM
       , clashTestGroup "CoSim"
-        [ runTest "Multiply" def{hdlTargets=[Verilog]}
-        , runTest "Register" def{hdlTargets=[Verilog]}
+        [ runTestIf coSimEnabled "Multiply" def{hdlTargets=[Verilog]}
+        , runTestIf coSimEnabled "Register" def{hdlTargets=[Verilog]}
         ]
-#endif
       , clashTestGroup "CustomReprs"
         [ clashTestGroup "RotateC"
           [ runTest "RotateC" def
@@ -717,9 +742,7 @@ runClashTest = defaultMain $ clashTestRoot
         ]
       , clashTestGroup "Feedback"
         [ runTest "Fib" def
-#ifdef CLASH_MULTIPLE_HIDDEN
-        , runTest "MutuallyRecursive" def
-#endif
+        , runTestIf multipleHiddenEnabled "MutuallyRecursive" def
         ]
       , clashTestGroup "Fixed"
         [ runTest "Mixer" def
@@ -808,14 +831,12 @@ runClashTest = defaultMain $ clashTestRoot
         , runTest "T2360" def{hdlSim=[],clashFlags=["-fclash-force-undefined=0"]}
         , outputTest "T2502" def{hdlTargets=[VHDL]}
         , outputTest "T2508" def{hdlTargets=[VHDL]}
-#if MIN_VERSION_GLASGOW_HASKELL(9,4,0,0)
-        , runTest "T2510" def{
+        , runTestIf ghcVersionGreater94 "T2510" def{
             hdlTargets=[VHDL]
           , hdlSim=[]
           , expectClashFail=Just (TestSpecificExitCode 0, "Warning: primitive T2510.bb isn't marked OPAQUE.")
           }
         , outputTest "T2510" def{hdlTargets=[VHDL], clashFlags=["-DNOINLINE=OPAQUE"]}
-#endif
         , outputTest "T2542" def{hdlTargets=[VHDL]}
         , runTest "T2593" def{hdlSim=[]}
         , runTest "T2623CaseConFVs" def{hdlLoad=[],hdlSim=[],hdlTargets=[VHDL]}
@@ -846,9 +867,7 @@ runClashTest = defaultMain $ clashTestRoot
           ]
       , clashTestGroup "Numbers"
         [ runTest "BitInteger" def
-#if MIN_VERSION_base(4,14,0)
-        , runTest "BitReverse" def
-#endif
+        , runTestIf baseVersionGreater414 "BitReverse" def
         , runTest "BitsTB" def { buildTargets = BuildSpecific [ "bitsTB1"
                                                               , "bitsTB2"
                                                               , "bitsTB3"
@@ -950,13 +969,9 @@ runClashTest = defaultMain $ clashTestRoot
           [ runTest "Blob" def
           ]
         , runTest "AndEnable" def
-#ifdef CLASH_MULTIPLE_HIDDEN
-        ,
-          -- TODO: Vivado is disabled because it gives different results, see
+        , -- TODO: Vivado is disabled because it gives different results, see
           -- https://github.com/clash-lang/clash-compiler/issues/2267
-          runTest "AndSpecificEnable" def{hdlSim=hdlSim def \\ [Vivado]}
-
-#endif
+          runTestIf multipleHiddenEnabled "AndSpecificEnable" def{hdlSim=hdlSim def \\ [Vivado]}
         , runTest "Ram" def
         , clashTestGroup "Ram"
           [ runTest "RMultiTop" def
diff --git a/tests/shouldfail/Cores/Xilinx/VIO/InputProbesExceeded.hs b/tests/shouldfail/Cores/Xilinx/VIO/InputProbesExceeded.hs
@@ -1,17 +1,19 @@
+{-# LANGUAGE TemplateHaskell #-}
+
 module InputProbesExceeded where
 
-import Clash.Prelude
 import Clash.Cores.Xilinx.VIO
+import Clash.Prelude
 
 import qualified Data.List as L
 
 type Dom = XilinxSystem
 
-inNames = $(listToVecTH (L.map (("probe_in_" <>) . show) [0::Int, 1..256]))
+inNames = $(listToVecTH (L.map (("probe_in_" <>) . show) [0 :: Int, 1 .. 256]))
 outNames = Nil
 
 topEntity ::
   "clk" ::: Clock Dom ->
-  "in"  ::: Signal Dom (Vec 257 Bool) ->
+  "in" ::: Signal Dom (Vec 257 Bool) ->
   "out" ::: Signal Dom ()
 topEntity = vioProbe @Dom inNames outNames ()
diff --git a/tests/shouldfail/Cores/Xilinx/VIO/OutputProbesExceeded.hs b/tests/shouldfail/Cores/Xilinx/VIO/OutputProbesExceeded.hs
@@ -1,14 +1,16 @@
+{-# LANGUAGE TemplateHaskell #-}
+
 module OutputProbesExceeded where
 
-import Clash.Prelude
 import Clash.Cores.Xilinx.VIO
+import Clash.Prelude
 
 import qualified Data.List as L
 
 type Dom = XilinxSystem
 
 inNames = Nil
-outNames = $(listToVecTH (L.map (("probe_out_" <>) . show) [0::Int, 1..256]))
+outNames = $(listToVecTH (L.map (("probe_out_" <>) . show) [0 :: Int, 1 .. 256]))
 
 topEntity ::
   "clk" ::: Clock Dom ->
diff --git a/tests/shouldwork/Basic/AES.hs b/tests/shouldwork/Basic/AES.hs
@@ -1,3 +1,5 @@
+{-# LANGUAGE TemplateHaskell #-}
+
 module AES where
 
 import Clash.Prelude
diff --git a/tests/shouldwork/Basic/T1591.hs b/tests/shouldwork/Basic/T1591.hs
@@ -1,4 +1,5 @@
 {-# LANGUAGE CPP #-}
+{-# LANGUAGE TemplateHaskell #-}
 
 #if __GLASGOW_HASKELL__ >= 810
 {-# LANGUAGE StandaloneKindSignatures #-}
diff --git a/tests/shouldwork/BitVector/UnpackUndefined.hs b/tests/shouldwork/BitVector/UnpackUndefined.hs
@@ -1,3 +1,5 @@
+{-# LANGUAGE MagicHash #-}
+
 module UnpackUndefined where
 import Clash.Prelude
 import Clash.Sized.Internal.BitVector
diff --git a/tests/shouldwork/BlackBox/LITrendering.hs b/tests/shouldwork/BlackBox/LITrendering.hs
@@ -1,3 +1,5 @@
+{-# LANGUAGE MagicHash #-}
+
 -- Tests that ~LIT's are rendered as bare literals in HDL
 
 {-# LANGUAGE AllowAmbiguousTypes #-}
diff --git a/tests/shouldwork/Cores/Xilinx/DcFifo/Basic.hs b/tests/shouldwork/Cores/Xilinx/DcFifo/Basic.hs
@@ -1,4 +1,5 @@
 {-# LANGUAGE CPP #-}
+{-# LANGUAGE MagicHash #-}
 
 module Basic where
 
diff --git a/tests/shouldwork/Cores/Xilinx/Floating.hs b/tests/shouldwork/Cores/Xilinx/Floating.hs
@@ -6,6 +6,7 @@ Maintainer :  QBayLogic B.V. <devops@qbaylogic.com>
 -}
 
 {-# LANGUAGE CPP #-}
+{-# LANGUAGE TemplateHaskell #-}
 
 {-# OPTIONS_GHC -fconstraint-solver-iterations=10 -Wall -Werror #-}
 
diff --git a/tests/shouldwork/Cores/Xilinx/VIO.hs b/tests/shouldwork/Cores/Xilinx/VIO.hs
@@ -1,5 +1,6 @@
 {-# LANGUAGE CPP #-}
 {-# LANGUAGE OverloadedStrings #-}
+{-# LANGUAGE TemplateHaskell #-}
 
 module VIO where
 
diff --git a/tests/shouldwork/Cores/Xilinx/XpmCdcArraySingle.hs b/tests/shouldwork/Cores/Xilinx/XpmCdcArraySingle.hs
@@ -1,3 +1,5 @@
+{-# LANGUAGE TemplateHaskell #-}
+
 module XpmCdcArraySingle where
 
 import Clash.Explicit.Prelude
diff --git a/tests/shouldwork/Cores/Xilinx/XpmCdcGray.hs b/tests/shouldwork/Cores/Xilinx/XpmCdcGray.hs
@@ -1,3 +1,5 @@
+{-# LANGUAGE TemplateHaskell #-}
+
 module XpmCdcGray where
 
 import Clash.Explicit.Prelude
diff --git a/tests/shouldwork/Cores/Xilinx/XpmCdcHandshake.hs b/tests/shouldwork/Cores/Xilinx/XpmCdcHandshake.hs
@@ -1,3 +1,5 @@
+{-# LANGUAGE TemplateHaskell #-}
+
 module XpmCdcHandshake where
 
 import Clash.Cores.Xilinx.Xpm.Cdc.Handshake
diff --git a/tests/shouldwork/Cores/Xilinx/XpmCdcPulse.hs b/tests/shouldwork/Cores/Xilinx/XpmCdcPulse.hs
@@ -1,3 +1,5 @@
+{-# LANGUAGE TemplateHaskell #-}
+
 module XpmCdcPulse where
 
 import Clash.Explicit.Prelude
diff --git a/tests/shouldwork/Cores/Xilinx/XpmCdcSingle.hs b/tests/shouldwork/Cores/Xilinx/XpmCdcSingle.hs
@@ -1,3 +1,5 @@
+{-# LANGUAGE TemplateHaskell #-}
+
 module XpmCdcSingle where
 
 import Clash.Explicit.Prelude
diff --git a/tests/shouldwork/Cores/Xilinx/XpmCdcSyncRst.hs b/tests/shouldwork/Cores/Xilinx/XpmCdcSyncRst.hs
@@ -1,3 +1,5 @@
+{-# LANGUAGE TemplateHaskell #-}
+
 module XpmCdcSyncRst where
 
 import Clash.Explicit.Prelude
diff --git a/tests/shouldwork/Cores/Xilinx/XpmTestCommon.hs b/tests/shouldwork/Cores/Xilinx/XpmTestCommon.hs
@@ -1,3 +1,5 @@
+{-# LANGUAGE TemplateHaskell #-}
+
 {-# OPTIONS_GHC -Wno-orphans #-}
 {-# OPTIONS_GHC -fforce-recomp #-}
 module XpmTestCommon where
diff --git a/tests/shouldwork/CustomReprs/Deriving/BitPackDerivation.hs b/tests/shouldwork/CustomReprs/Deriving/BitPackDerivation.hs
@@ -1,5 +1,6 @@
 {-# LANGUAGE CPP #-}
 {-# LANGUAGE PartialTypeSignatures #-}
+{-# LANGUAGE TemplateHaskell #-}
 {-# OPTIONS_GHC -Wno-partial-type-signatures #-}
 module BitPackDerivation where
 
diff --git a/tests/shouldwork/DDR/DDRin.hs b/tests/shouldwork/DDR/DDRin.hs
@@ -1,5 +1,5 @@
 {-# LANGUAGE CPP #-}
-
+{-# LANGUAGE TemplateHaskell #-}
 {-# OPTIONS_GHC -Wno-orphans #-}
 
 module DDRin where
diff --git a/tests/shouldwork/FixedNumber/FixedS.hs b/tests/shouldwork/FixedNumber/FixedS.hs
@@ -1,3 +1,5 @@
+{-# LANGUAGE TemplateHaskell #-}
+
 module FixedS where
 
 import Clash.Prelude
diff --git a/tests/shouldwork/Issues/T1933.hs b/tests/shouldwork/Issues/T1933.hs
@@ -1,4 +1,6 @@
 {-# LANGUAGE CPP #-}
+{-# LANGUAGE TemplateHaskell #-}
+
 module T1933 where
 
 import Clash.Prelude
@@ -30,11 +32,14 @@ q = coerce p
 {-# CLASH_OPAQUE q #-}
 
 topEntity :: Unsigned 12 -> T
-topEntity x =
 #if __GLASGOW_HASKELL__ == 900
+topEntity x =
   let r = fromIntegral q :: Unsigned 12
+      {-# NOINLINE r #-}
+   in f (MkT x r)
 #else
+topEntity x =
   let r = coerce q :: Unsigned 12
-#endif
       {-# NOINLINE r #-}
    in f (MkT x r)
+#endif
diff --git a/tests/shouldwork/Numbers/Bits.hs b/tests/shouldwork/Numbers/Bits.hs
@@ -2,6 +2,8 @@
 {-# LANGUAGE PartialTypeSignatures #-}
 {-# LANGUAGE ScopedTypeVariables #-}
 {-# LANGUAGE ViewPatterns #-}
+{-# LANGUAGE TemplateHaskell #-}
+
 #if __GLASGOW_HASKELL__ < 900
 {-# LANGUAGE AllowAmbiguousTypes #-}
 #endif
diff --git a/tests/shouldwork/Numbers/BitsTB.hs b/tests/shouldwork/Numbers/BitsTB.hs
@@ -1,4 +1,5 @@
 {-# LANGUAGE CPP #-}
+{-# LANGUAGE TemplateHaskell #-}
 
 module BitsTB where
 import Clash.Prelude
diff --git a/tests/shouldwork/Numbers/ExpWithClashCF.hs b/tests/shouldwork/Numbers/ExpWithClashCF.hs
@@ -1,3 +1,5 @@
+{-# LANGUAGE TemplateHaskell #-}
+
 module ExpWithClashCF where
 
 import Clash.Prelude
diff --git a/tests/shouldwork/Numbers/ExpWithGhcCF.hs b/tests/shouldwork/Numbers/ExpWithGhcCF.hs
@@ -1,4 +1,5 @@
 {-# LANGUAGE CPP #-}
+{-# LANGUAGE TemplateHaskell #-}
 {-# OPTIONS_GHC -fno-specialise #-} -- TODO: remove when https://gitlab.haskell.org/ghc/ghc/-/issues/23109#note_499130 is fixed
 
 module ExpWithGhcCF where
diff --git a/tests/shouldwork/Numbers/Integral.hs b/tests/shouldwork/Numbers/Integral.hs
@@ -5,6 +5,7 @@
 {-# LANGUAGE ScopedTypeVariables #-}
 {-# LANGUAGE StandaloneDeriving #-}
 {-# LANGUAGE ViewPatterns #-}
+{-# LANGUAGE TemplateHaskell #-}
 
 
 {-# OPTIONS_GHC -Wno-partial-type-signatures #-}
diff --git a/tests/shouldwork/Numbers/IntegralTB.hs b/tests/shouldwork/Numbers/IntegralTB.hs
@@ -1,4 +1,5 @@
 {-# LANGUAGE CPP #-}
+{-# LANGUAGE TemplateHaskell #-}
 
 module IntegralTB where
 import Clash.Prelude
diff --git a/tests/shouldwork/Numbers/NumConstantFoldingTB_1.hs b/tests/shouldwork/Numbers/NumConstantFoldingTB_1.hs
@@ -1,3 +1,5 @@
+{-# LANGUAGE TemplateHaskell #-}
+
 module NumConstantFoldingTB_1 where
 import Clash.Prelude
 import Clash.Explicit.Testbench
diff --git a/tests/shouldwork/Numbers/NumConstantFoldingTB_2.hs b/tests/shouldwork/Numbers/NumConstantFoldingTB_2.hs
@@ -1,3 +1,5 @@
+{-# LANGUAGE TemplateHaskell #-}
+
 module NumConstantFoldingTB_2 where
 import Clash.Prelude
 import Clash.Explicit.Testbench
@@ -14,4 +16,3 @@ testBench = done
     done           = expectedOutput (pure topEntity)
     clk            = tbSystemClockGen (not <$> done)
     rst            = systemResetGen
-
diff --git a/tests/shouldwork/Numbers/Resize3.hs b/tests/shouldwork/Numbers/Resize3.hs
@@ -1,4 +1,5 @@
 {-# LANGUAGE CPP #-}
+{-# LANGUAGE TemplateHaskell #-}
 
 module Resize3 where
 
diff --git a/tests/shouldwork/Numbers/ShiftRotate.hs b/tests/shouldwork/Numbers/ShiftRotate.hs
@@ -7,6 +7,7 @@ So it checks that the HDL implementations have the same behavior as the Haskell
 -}
 {-# LANGUAGE CPP #-}
 {-# LANGUAGE PartialTypeSignatures #-}
+{-# LANGUAGE TemplateHaskell #-}
 {-# OPTIONS_GHC -Wno-partial-type-signatures #-}
 module ShiftRotate where
 import Clash.Prelude
diff --git a/tests/shouldwork/Numbers/ShiftRotateBase.hs b/tests/shouldwork/Numbers/ShiftRotateBase.hs
@@ -1,5 +1,6 @@
 {-# LANGUAGE CPP #-}
 {-# LANGUAGE PartialTypeSignatures #-}
+{-# LANGUAGE TemplateHaskell #-}
 {-# OPTIONS_GHC -Wno-partial-type-signatures #-}
 module ShiftRotateBase where
 import Clash.Prelude
diff --git a/tests/shouldwork/Numbers/ShiftRotateNegative.hs b/tests/shouldwork/Numbers/ShiftRotateNegative.hs
@@ -12,6 +12,7 @@ import Clash.Prelude
 import Clash.Explicit.Testbench
 import Clash.Sized.Internal.BitVector
 
+{- FOURMOLU_DISABLE -}
 testBench :: Signal System Bool
 testBench = done
  where
@@ -107,6 +108,7 @@ topEntity (x, i) =
   , g (unpack x) i
   ) :>
   Nil
+{- FOURMOLU_ENABLE -}
 
 f :: (Bits a) => a -> Int -> a
 f x i = x `shiftL` (-i) `rotateL` (-i) `shiftR` (-i) `rotateR` (-i)
diff --git a/tests/shouldwork/Numbers/SignedProjectionTB.hs b/tests/shouldwork/Numbers/SignedProjectionTB.hs
diff --git a/tests/shouldwork/Numbers/UndefinedConstantFolding.hs b/tests/shouldwork/Numbers/UndefinedConstantFolding.hs
diff --git a/tests/shouldwork/Numbers/UndefinedConstantFoldingTB.hs b/tests/shouldwork/Numbers/UndefinedConstantFoldingTB.hs
diff --git a/tests/shouldwork/RTree/TRepeat2.hs b/tests/shouldwork/RTree/TRepeat2.hs
diff --git a/tests/shouldwork/Signal/AndSpecificEnable.hs b/tests/shouldwork/Signal/AndSpecificEnable.hs
diff --git a/tests/shouldwork/Signal/DualBlockRam.hs b/tests/shouldwork/Signal/DualBlockRam.hs
diff --git a/tests/shouldwork/Signal/DualBlockRamDefinitions.hs b/tests/shouldwork/Signal/DualBlockRamDefinitions.hs
diff --git a/tests/shouldwork/Signal/DynamicClocks.hs b/tests/shouldwork/Signal/DynamicClocks.hs
diff --git a/tests/shouldwork/Signal/ROM/Async.hs b/tests/shouldwork/Signal/ROM/Async.hs
diff --git a/tests/shouldwork/Signal/ROM/AsyncBlob.hs b/tests/shouldwork/Signal/ROM/AsyncBlob.hs
diff --git a/tests/shouldwork/Signal/ROM/Blob.hs b/tests/shouldwork/Signal/ROM/Blob.hs
diff --git a/tests/shouldwork/Signal/ROM/BlobVec.hs b/tests/shouldwork/Signal/ROM/BlobVec.hs
diff --git a/tests/shouldwork/Testbench/SyncTB.hs b/tests/shouldwork/Testbench/SyncTB.hs
diff --git a/tests/shouldwork/Vector/Iterate.hs b/tests/shouldwork/Vector/Iterate.hs
diff --git a/tests/shouldwork/Vector/VecConst.hs b/tests/shouldwork/Vector/VecConst.hs
diff --git a/tests/src/Test/Tasty/Clash.hs b/tests/src/Test/Tasty/Clash.hs

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,5 @@`
	`1`	`+{-# LANGUAGE TemplateHaskell #-}`
	`2`	`+`
`1`	`3`	`module AES where`
`2`	`4`
`3`	`5`	`import Clash.Prelude`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`{-# LANGUAGE CPP #-}`
	`2`	`+{-# LANGUAGE TemplateHaskell #-}`
`2`	`3`
`3`	`4`	`#if __GLASGOW_HASKELL__ >= 810`
`4`	`5`	`{-# LANGUAGE StandaloneKindSignatures #-}`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,5 @@`
	`1`	`+{-# LANGUAGE MagicHash #-}`
	`2`	`+`
`1`	`3`	`module UnpackUndefined where`
`2`	`4`	`import Clash.Prelude`
`3`	`5`	`import Clash.Sized.Internal.BitVector`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,5 @@`
	`1`	`+{-# LANGUAGE MagicHash #-}`
	`2`	`+`
`1`	`3`	`-- Tests that ~LIT's are rendered as bare literals in HDL`
`2`	`4`
`3`	`5`	`{-# LANGUAGE AllowAmbiguousTypes #-}`