Be explicit about Templates.Utils.* imports

CTSRD-CHERI · Dec 31, 2024 · 80f475c · 80f475c
1 parent d444481
commit 80f475c
Show file tree

Hide file tree

Showing 17 changed files with 23 additions and 69 deletions.
diff --git a/QCVEngine.cabal b/QCVEngine.cabal
@@ -35,7 +35,6 @@ executable QCVEngine
                        QuickCheckVEngine.TestTypes,
                        QuickCheckVEngine.Test,
                        QuickCheckVEngine.Template,
-                       QuickCheckVEngine.Templates.Utils,
                        QuickCheckVEngine.Templates.Utils.General,
                        QuickCheckVEngine.Templates.Utils.FP,
                        QuickCheckVEngine.Templates.Utils.HPM,

diff --git a/src/QuickCheckVEngine/Main.hs b/src/QuickCheckVEngine/Main.hs
@@ -62,7 +62,6 @@ import QuickCheckVEngine.MainHelpers
 import QuickCheckVEngine.RVFI_DII
 import qualified QuickCheckVEngine.Template as T
 import QuickCheckVEngine.Test
-import QuickCheckVEngine.Templates.Utils
 import QuickCheckVEngine.Templates.GenAll
 import QuickCheckVEngine.Templates.GenArithmetic
 import QuickCheckVEngine.Templates.GenMemory

diff --git a/src/QuickCheckVEngine/MainHelpers.hs b/src/QuickCheckVEngine/MainHelpers.hs
@@ -74,7 +74,7 @@ import RISCV hiding (and, or)
 import QuickCheckVEngine.RVFI_DII
 import QuickCheckVEngine.Test
 import qualified QuickCheckVEngine.Template as T
-import QuickCheckVEngine.Templates.Utils
+import QuickCheckVEngine.Templates.Utils.General
 
 instance Show DII_Packet where
   show (DII_End _) = "# Test end"

diff --git a/src/QuickCheckVEngine/Templates/GenAll.hs b/src/QuickCheckVEngine/Templates/GenAll.hs
@@ -39,7 +39,8 @@ import Test.QuickCheck
 import RISCV
 import RISCV.ArchDesc
 import QuickCheckVEngine.Template
-import QuickCheckVEngine.Templates.Utils
+import QuickCheckVEngine.Templates.Utils.FP
+import QuickCheckVEngine.Templates.Utils.General
 
 genAll :: Template
 genAll = readParams $ \params -> random $ do

diff --git a/src/QuickCheckVEngine/Templates/GenArithmetic.hs b/src/QuickCheckVEngine/Templates/GenArithmetic.hs
@@ -42,7 +42,7 @@ import Test.QuickCheck
 import RISCV.RV32_I
 import RISCV.RV64_I
 import QuickCheckVEngine.Template
-import QuickCheckVEngine.Templates.Utils
+import QuickCheckVEngine.Templates.Utils.General
 
 gen_rv32_i_arithmetic :: Template
 gen_rv32_i_arithmetic = random $ do

diff --git a/src/QuickCheckVEngine/Templates/GenAtomics.hs b/src/QuickCheckVEngine/Templates/GenAtomics.hs
@@ -43,7 +43,8 @@ import RISCV.RV32_A
 import RISCV.RV64_A
 import RISCV.RV32_Xcheri
 import QuickCheckVEngine.Template
-import QuickCheckVEngine.Templates.Utils
+import QuickCheckVEngine.Templates.Utils.CHERI
+import QuickCheckVEngine.Templates.Utils.General
 
 gen_rv32_a :: Template
 gen_rv32_a = readParams $ \p -> genAtomics False (has_cheri (archDesc p))

diff --git a/src/QuickCheckVEngine/Templates/GenCHERI.hs b/src/QuickCheckVEngine/Templates/GenCHERI.hs
@@ -50,7 +50,9 @@ import Control.Monad
 import RISCV
 import InstrCodec
 import QuickCheckVEngine.Template
-import QuickCheckVEngine.Templates.Utils
+import QuickCheckVEngine.Templates.Utils.CHERI
+import QuickCheckVEngine.Templates.Utils.FP
+import QuickCheckVEngine.Templates.Utils.General
 import QuickCheckVEngine.Templates.GenArithmetic
 import QuickCheckVEngine.Templates.GenFP
 import QuickCheckVEngine.Templates.GenCompressed

diff --git a/src/QuickCheckVEngine/Templates/GenCSRs.hs b/src/QuickCheckVEngine/Templates/GenCSRs.hs
@@ -39,7 +39,7 @@ module QuickCheckVEngine.Templates.GenCSRs (
 import RISCV.RV32_I
 import RISCV.RV32_Zicsr
 import QuickCheckVEngine.Template
-import QuickCheckVEngine.Templates.Utils
+import QuickCheckVEngine.Templates.Utils.General
 
 gen_rv32_i_zicsr :: Template
 gen_rv32_i_zicsr = readParams $ \param -> random $

diff --git a/src/QuickCheckVEngine/Templates/GenCompressed.hs b/src/QuickCheckVEngine/Templates/GenCompressed.hs
@@ -37,7 +37,8 @@ module QuickCheckVEngine.Templates.GenCompressed (
 
 import RISCV.RV_C
 import QuickCheckVEngine.Template
-import QuickCheckVEngine.Templates.Utils
+import QuickCheckVEngine.Templates.Utils.Compressed
+import QuickCheckVEngine.Templates.Utils.General
 
 gen_rv_c :: Template
 gen_rv_c = random $ do

diff --git a/src/QuickCheckVEngine/Templates/GenControlFlow.hs b/src/QuickCheckVEngine/Templates/GenControlFlow.hs
@@ -40,7 +40,7 @@ import InstrCodec
 import Test.QuickCheck
 import RISCV.RV32_I
 import QuickCheckVEngine.Template
-import QuickCheckVEngine.Templates.Utils
+import QuickCheckVEngine.Templates.Utils.General
 
 gen_rv32_i_controlflow :: Template
 gen_rv32_i_controlflow = genControlFlow

diff --git a/src/QuickCheckVEngine/Templates/GenFP.hs b/src/QuickCheckVEngine/Templates/GenFP.hs
@@ -44,7 +44,8 @@ module QuickCheckVEngine.Templates.GenFP (
 import InstrCodec
 import RISCV
 import QuickCheckVEngine.Template
-import QuickCheckVEngine.Templates.Utils
+import QuickCheckVEngine.Templates.Utils.FP
+import QuickCheckVEngine.Templates.Utils.General
 import Test.QuickCheck
 
 gen_rv32_f :: Template

diff --git a/src/QuickCheckVEngine/Templates/GenHPM.hs b/src/QuickCheckVEngine/Templates/GenHPM.hs
@@ -37,7 +37,7 @@ module QuickCheckVEngine.Templates.GenHPM (
 
 import RISCV
 import QuickCheckVEngine.Template
-import QuickCheckVEngine.Templates.Utils
+import QuickCheckVEngine.Templates.Utils.HPM
 import QuickCheckVEngine.Templates.RandomTest
 
 genHPM :: Template

diff --git a/src/QuickCheckVEngine/Templates/GenMemory.hs b/src/QuickCheckVEngine/Templates/GenMemory.hs
@@ -60,7 +60,7 @@ import RISCV.RV64_I
 import RISCV.RV32_Xcheri
 import RISCV.RV_CSRs
 import QuickCheckVEngine.Template
-import QuickCheckVEngine.Templates.Utils
+import QuickCheckVEngine.Templates.Utils.General
 import Data.Bits
 import qualified RISCV.ArchDesc as Arch
 

diff --git a/src/QuickCheckVEngine/Templates/GenMulDiv.hs b/src/QuickCheckVEngine/Templates/GenMulDiv.hs
@@ -39,7 +39,7 @@ module QuickCheckVEngine.Templates.GenMulDiv (
 import RISCV.RV32_M
 import RISCV.RV64_M
 import QuickCheckVEngine.Template
-import QuickCheckVEngine.Templates.Utils
+import QuickCheckVEngine.Templates.Utils.General
 
 gen_rv32_m :: Template
 gen_rv32_m = genMulDiv False

diff --git a/src/QuickCheckVEngine/Templates/GenTransExec.hs b/src/QuickCheckVEngine/Templates/GenTransExec.hs
@@ -54,7 +54,9 @@ import RISCV.RV_CSRs
 import RISCV.ArchDesc
 import QuickCheckVEngine.Template
 import QuickCheckVEngine.Templates.GenMemory
-import QuickCheckVEngine.Templates.Utils
+import QuickCheckVEngine.Templates.Utils.CHERI
+import QuickCheckVEngine.Templates.Utils.HPM
+import QuickCheckVEngine.Templates.Utils.General
 import QuickCheckVEngine.RVFI_DII.RVFI
 import QuickCheckVEngine.Templates.GenMemory
 import Data.Bits

diff --git a/src/QuickCheckVEngine/Templates/RandomTest.hs b/src/QuickCheckVEngine/Templates/RandomTest.hs
@@ -39,7 +39,8 @@ module QuickCheckVEngine.Templates.RandomTest (
 import Test.QuickCheck
 import RISCV
 import QuickCheckVEngine.Template
-import QuickCheckVEngine.Templates.Utils
+import QuickCheckVEngine.Templates.Utils.FP
+import QuickCheckVEngine.Templates.Utils.General
 
 -- | 'randomTest' provides a 'Template' for a random test
 randomTest :: Template

diff --git a/src/QuickCheckVEngine/Templates/Utils.hs b/src/QuickCheckVEngine/Templates/Utils.hs