Skip to content

Bump submodules #4

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
RyanGlScott merged 1 commit into from
Oct 29, 2021
Merged

Bump submodules #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 11 additions & 6 deletions copilot-verifier/src/Copilot/Verifier.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,9 @@ import Crux.LLVM.Config (llvmCruxConfig, LLVMOptions(..))
import Crux.LLVM.Compile (genBitCode)
import Crux.LLVM.Simulate (setupSimCtxt, parseLLVM, explainFailure)
import CruxLLVMMain
(withCruxLLVMLogging, cruxLLVMLoggingToSayWhat, processLLVMOptions)
( CruxLLVMLogging, withCruxLLVMLogging
, cruxLLVMLoggingToSayWhat, processLLVMOptions
)

import What4.Config
(extendConfig)
Expand Down Expand Up @@ -141,21 +143,24 @@ verify csettings0 properties prefix spec =
let csettings = csettings0{ cSettingsOutputDirectory = Just odir }
let csrc = odir </> prefix ++ ".c"
let cruxOpts1 = cruxOpts0{ outDir = odir, bldDir = odir, inputFiles = [csrc] }
let ?outputConfig = defaultOutputConfig cruxLogMessageToSayWhat (Just cruxOpts1)
ocfg <- defaultOutputConfig cruxLogMessageToSayWhat
let ?outputConfig = ocfg (Just cruxOpts1)
cruxOpts2 <- withCruxLogMessage (postprocessOptions cruxOpts1)
(cruxOpts3, llvmOpts2) <- processLLVMOptions (cruxOpts2, llvmOpts0{ optLevel = 0 })
return (cruxOpts3, llvmOpts2, csettings, csrc)

compileWith csettings prefix spec
putStrLn ("Generated " ++ show csrc)

let ?outputConfig = defaultOutputConfig cruxLLVMLoggingToSayWhat (Just cruxOpts)
ocfg <- defaultOutputConfig cruxLLVMLoggingToSayWhat
let ?outputConfig = ocfg (Just cruxOpts)
bcFile <- withCruxLLVMLogging (genBitCode cruxOpts llvmOpts)
putStrLn ("Compiled " ++ prefix ++ " into " ++ bcFile)

verifyBitcode csettings properties spec cruxOpts llvmOpts bcFile

verifyBitcode ::
Logs CruxLLVMLogging =>
CSettings ->
[String] ->
Spec ->
Expand All @@ -170,7 +175,6 @@ verifyBitcode csettings properties spec cruxOpts llvmOpts bcFile =
startCaching sym
bbMapRef <- newIORef mempty
let ?recordLLVMAnnotation = \an bb -> modifyIORef bbMapRef (Map.insert an bb)
let ?outputConfig = defaultOutputConfig cruxLLVMLoggingToSayWhat (Just cruxOpts)

let adapters = [z3Adapter] -- TODO? configurable
extendConfig (solver_adapter_config_options z3Adapter) (getConfiguration sym)
Expand All @@ -181,8 +185,9 @@ verifyBitcode csettings properties spec cruxOpts llvmOpts bcFile =
{ printHandle = view outputHandle ?outputConfig }

llvmMod <- parseLLVM bcFile
Some trans <- let ?transOpts = transOpts llvmOpts
in translateModule halloc memVar llvmMod
(Some trans, _warns) <-
let ?transOpts = transOpts llvmOpts
in translateModule halloc memVar llvmMod

putStrLn ("Translated bitcode into Crucible")

Expand Down
2 changes: 1 addition & 1 deletion deps/crucible
Open in desktop
Submodule crucible updated 120 files
2 changes: 1 addition & 1 deletion deps/llvm-pretty
Open in desktop
Submodule llvm-pretty updated from 97fd46 to 7ab7ac
2 changes: 1 addition & 1 deletion deps/llvm-pretty-bc-parser
Open in desktop
Submodule llvm-pretty-bc-parser updated 5 files
+23 −0 disasm-test/tests/fcmp-fast-math.ll
+1 −1 llvm-pretty
+4 −4 src/Data/LLVM/BitCode/IR/Constants.hs
+36 −27 src/Data/LLVM/BitCode/IR/Function.hs
+33 −8 src/Data/LLVM/BitCode/IR/Metadata.hs
2 changes: 1 addition & 1 deletion deps/what4
Open in desktop
Submodule what4 updated 18 files
+5 −12 what4-abc/src/What4/Solver/ABC.hs
+46 −52 what4/src/What4/Expr/App.hs
+3 −8 what4/src/What4/Expr/AppTheory.hs
+77 −49 what4/src/What4/Expr/Builder.hs
+25 −12 what4/src/What4/Expr/GroundEval.hs
+3 −3 what4/src/What4/Expr/WeightedSum.hs
+62 −17 what4/src/What4/Interface.hs
+41 −0 what4/src/What4/InterpretedFloatingPoint.hs
+3 −1 what4/src/What4/LabeledPred.hs
+2 −0 what4/src/What4/Protocol/SMTLib2.hs
+27 −33 what4/src/What4/Protocol/SMTWriter.hs
+2 −1 what4/src/What4/Protocol/VerilogWriter/ABCVerilog.hs
+2 −10 what4/src/What4/Protocol/VerilogWriter/Backend.hs
+2 −0 what4/src/What4/Solver/Yices.hs
+434 −0 what4/src/What4/SpecialFunctions.hs
+87 −24 what4/src/What4/Utils/AbstractDomains.hs
+10 −0 what4/src/What4/Utils/AnnotatedMap.hs
+1 −0 what4/what4.cabal