-
Notifications
You must be signed in to change notification settings - Fork 43
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'master' into portfolio-update
- Loading branch information
Showing
65 changed files
with
4,473 additions
and
2,329 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Binary file not shown.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
127 changes: 127 additions & 0 deletions
127
...jects/cfa/cfa-analysis/src/test/java/hu/bme/mit/theta/cfa/analysis/CfaMddCheckerTest.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,127 @@ | ||
| /* | ||
| * Copyright 2024 Budapest University of Technology and Economics | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
| package hu.bme.mit.theta.cfa.analysis; | ||
|
|
||
| import static hu.bme.mit.theta.cfa.analysis.config.CfaConfigBuilder.Domain.*; | ||
| import static hu.bme.mit.theta.cfa.analysis.config.CfaConfigBuilder.Refinement.*; | ||
|
|
||
| import hu.bme.mit.theta.analysis.algorithm.SafetyResult; | ||
| import hu.bme.mit.theta.analysis.algorithm.mdd.MddCex; | ||
| import hu.bme.mit.theta.analysis.algorithm.mdd.MddChecker; | ||
| import hu.bme.mit.theta.analysis.algorithm.mdd.MddProof; | ||
| import hu.bme.mit.theta.analysis.expr.ExprAction; | ||
| import hu.bme.mit.theta.cfa.CFA; | ||
| import hu.bme.mit.theta.cfa.dsl.CfaDslManager; | ||
| import hu.bme.mit.theta.common.OsHelper; | ||
| import hu.bme.mit.theta.common.logging.ConsoleLogger; | ||
| import hu.bme.mit.theta.common.logging.Logger; | ||
| import hu.bme.mit.theta.common.logging.NullLogger; | ||
| import hu.bme.mit.theta.core.type.Expr; | ||
| import hu.bme.mit.theta.core.type.booltype.BoolType; | ||
| import hu.bme.mit.theta.core.utils.indexings.VarIndexing; | ||
| import hu.bme.mit.theta.core.utils.indexings.VarIndexingFactory; | ||
| import hu.bme.mit.theta.solver.SolverFactory; | ||
| import hu.bme.mit.theta.solver.SolverManager; | ||
| import hu.bme.mit.theta.solver.SolverPool; | ||
| import hu.bme.mit.theta.solver.smtlib.SmtLibSolverManager; | ||
| import hu.bme.mit.theta.solver.z3legacy.Z3SolverManager; | ||
| import java.io.FileInputStream; | ||
| import java.util.Arrays; | ||
| import java.util.Collection; | ||
| import org.junit.Assert; | ||
| import org.junit.Assume; | ||
| import org.junit.Test; | ||
| import org.junit.runner.RunWith; | ||
| import org.junit.runners.Parameterized; | ||
|
|
||
| @RunWith(value = Parameterized.class) | ||
| public class CfaMddCheckerTest { | ||
|
|
||
| @Parameterized.Parameter(value = 0) | ||
| public String filePath; | ||
|
|
||
| @Parameterized.Parameter(value = 1) | ||
| public boolean isSafe; | ||
|
|
||
| @Parameterized.Parameters(name = "{index}: {0}, {1}") | ||
| public static Collection<Object[]> data() { | ||
| return Arrays.asList( | ||
| new Object[][] { | ||
| {"src/test/resources/arithmetic-bool00.cfa", false}, | ||
| {"src/test/resources/arithmetic-bool01.cfa", false}, | ||
| {"src/test/resources/arithmetic-bool10.cfa", false}, | ||
| {"src/test/resources/arithmetic-bool11.cfa", false}, | ||
| {"src/test/resources/arithmetic-mod.cfa", true}, | ||
| {"src/test/resources/counter5_true.cfa", true}, | ||
| {"src/test/resources/counter_bv_true.cfa", true}, | ||
| {"src/test/resources/counter_bv_false.cfa", false}, | ||
| {"src/test/resources/ifelse.cfa", false}, | ||
| }); | ||
| } | ||
|
|
||
| @Test | ||
| public void test() throws Exception { | ||
| final Logger logger = new ConsoleLogger(Logger.Level.SUBSTEP); | ||
|
|
||
| SolverManager.registerSolverManager(Z3SolverManager.create()); | ||
| if (OsHelper.getOs().equals(OsHelper.OperatingSystem.LINUX)) { | ||
| SolverManager.registerSolverManager( | ||
| SmtLibSolverManager.create(SmtLibSolverManager.HOME, NullLogger.getInstance())); | ||
| } | ||
|
|
||
| final SolverFactory solverFactory; | ||
| try { | ||
| solverFactory = SolverManager.resolveSolverFactory("Z3"); | ||
| } catch (Exception e) { | ||
| Assume.assumeNoException(e); | ||
| return; | ||
| } | ||
|
|
||
| try { | ||
| CFA cfa = CfaDslManager.createCfa(new FileInputStream(filePath)); | ||
| var monolithicExpr = CfaToMonolithicExprKt.toMonolithicExpr(cfa); | ||
|
|
||
| final SafetyResult<MddProof, MddCex> status; | ||
| try (var solverPool = new SolverPool(solverFactory)) { | ||
| final MddChecker<ExprAction> checker = | ||
| MddChecker.create( | ||
| monolithicExpr.getInitExpr(), | ||
| VarIndexingFactory.indexing(0), | ||
| new ExprAction() { | ||
| @Override | ||
| public Expr<BoolType> toExpr() { | ||
| return monolithicExpr.getTransExpr(); | ||
| } | ||
|
|
||
| @Override | ||
| public VarIndexing nextIndexing() { | ||
| return VarIndexingFactory.indexing(1); | ||
| } | ||
| }, | ||
| monolithicExpr.getPropExpr(), | ||
| monolithicExpr.getVars(), | ||
| solverPool, | ||
| logger, | ||
| MddChecker.IterationStrategy.GSAT); | ||
| status = checker.check(null); | ||
| } | ||
|
|
||
| Assert.assertEquals(isSafe, status.isSafe()); | ||
| } finally { | ||
| SolverManager.closeAll(); | ||
| } | ||
| } | ||
| } |
88 changes: 88 additions & 0 deletions
88
...lysis/src/main/java/hu/bme/mit/theta/analysis/algorithm/bounded/AbstractMonolithicExpr.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,88 @@ | ||
| /* | ||
| * Copyright 2024 Budapest University of Technology and Economics | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
| package hu.bme.mit.theta.analysis.algorithm.bounded | ||
|
|
||
| import hu.bme.mit.theta.analysis.pred.PredPrec | ||
| import hu.bme.mit.theta.analysis.pred.PredState | ||
| import hu.bme.mit.theta.core.decl.Decl | ||
| import hu.bme.mit.theta.core.decl.Decls | ||
| import hu.bme.mit.theta.core.decl.VarDecl | ||
| import hu.bme.mit.theta.core.model.Valuation | ||
| import hu.bme.mit.theta.core.type.Expr | ||
| import hu.bme.mit.theta.core.type.anytype.Exprs | ||
| import hu.bme.mit.theta.core.type.booltype.BoolExprs | ||
| import hu.bme.mit.theta.core.type.booltype.BoolLitExpr | ||
| import hu.bme.mit.theta.core.type.booltype.BoolType | ||
| import hu.bme.mit.theta.core.type.booltype.IffExpr | ||
| import hu.bme.mit.theta.core.type.booltype.SmartBoolExprs.And | ||
| import hu.bme.mit.theta.core.type.booltype.SmartBoolExprs.Not | ||
| import hu.bme.mit.theta.core.utils.ExprUtils | ||
| import hu.bme.mit.theta.core.utils.indexings.VarIndexingFactory | ||
| import java.util.HashMap | ||
|
|
||
| fun MonolithicExpr.createAbstract(prec: PredPrec): MonolithicExpr { | ||
| // TODO: handle initOffsetIndex in abstract initExpr | ||
| val lambdaList = ArrayList<IffExpr>() | ||
| val lambdaPrimeList = ArrayList<IffExpr>() | ||
| val activationLiterals = ArrayList<VarDecl<*>>() | ||
| val literalToPred = HashMap<Decl<*>, Expr<BoolType>>() | ||
|
|
||
| prec.preds.forEachIndexed { index, expr -> | ||
| run { | ||
| val v = Decls.Var("v$index", BoolType.getInstance()) | ||
| activationLiterals.add(v) | ||
| literalToPred[v] = expr | ||
| lambdaList.add(IffExpr.of(v.ref, expr)) | ||
| lambdaPrimeList.add( | ||
| BoolExprs.Iff(Exprs.Prime(v.ref), ExprUtils.applyPrimes(expr, this.transOffsetIndex)) | ||
| ) | ||
| } | ||
| } | ||
|
|
||
| var indexingBuilder = VarIndexingFactory.indexingBuilder(1) | ||
| this.vars | ||
| .filter { it !in ctrlVars } | ||
| .forEach { decl -> | ||
| repeat(transOffsetIndex.get(decl)) { indexingBuilder = indexingBuilder.inc(decl) } | ||
| } | ||
|
|
||
| return MonolithicExpr( | ||
| initExpr = And(And(lambdaList), initExpr), | ||
| transExpr = And(And(lambdaList), And(lambdaPrimeList), transExpr), | ||
| propExpr = Not(And(And(lambdaList), Not(propExpr))), | ||
| transOffsetIndex = indexingBuilder.build(), | ||
| initOffsetIndex = VarIndexingFactory.indexing(0), | ||
| vars = activationLiterals + ctrlVars, | ||
| valToState = { valuation: Valuation -> | ||
| PredState.of( | ||
| valuation | ||
| .toMap() | ||
| .entries | ||
| .stream() | ||
| .filter { it.key !in ctrlVars } | ||
| .map { | ||
| when ((it.value as BoolLitExpr).value) { | ||
| true -> literalToPred[it.key] | ||
| false -> Not(literalToPred[it.key]) | ||
| } | ||
| } | ||
| .toList() | ||
| ) | ||
| }, | ||
| biValToAction = this.biValToAction, | ||
| ctrlVars = ctrlVars, | ||
| ) | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.