Skip to content
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

Add support to CAAT for SyncBar and SyncFence relations #724

Merged
merged 2 commits into from
Sep 5, 2024
Merged

Add support to CAAT for SyncBar and SyncFence relations #724

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1b4552f
Add support to CAAT for SyncBar and SyncFence relations (by cutting t…
ThomasHaas Sep 2, 2024
8680657
- Added cutting of vloc relation (Refinement still fails to understan…
ThomasHaas Sep 2, 2024
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
15 changes: 12 additions & 3 deletions dartagnan/src/main/java/com/dat3m/dartagnan/verification/solving/RefinementSolver.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -469,6 +469,13 @@ private RefinementIteration doRefinementIteration(ProverEnvironment prover, WMMS
// ================================================================================================================
// Special memory model processing

private static boolean isUnknownDefinitionForCAAT(Definition def) {
// TODO: We should probably automatically cut all "unknown relation",
// i.e., use a white-list of known relations instead of a blacklist of unknown one's.
return def instanceof LinuxCriticalSections // LKMM
|| def instanceof SyncFence || def instanceof SyncBar || def instanceof SameVirtualLocation; // GPUs
}

private static RefinementModel generateRefinementModel(Wmm original) {
// We cut (i) negated axioms, (ii) negated relations (if derived),
// and (iii) some special relations because they are derived from internal relations (like data/addr/ctrl)
Expand All @@ -492,7 +499,7 @@ private static RefinementModel generateRefinementModel(Wmm original) {
} else if (c instanceof Definition def && def.getDefinedRelation().hasName()) {
// (iii) Special relations
final String name = def.getDefinedRelation().getName().get();
if (name.equals(DATA) || name.equals(CTRL) || name.equals(ADDR) || name.equals(CRIT)) {
if (name.equals(DATA) || name.equals(CTRL) || name.equals(ADDR) || isUnknownDefinitionForCAAT(def)) {
constraintsToCut.add(c);
}
} else if (c instanceof Definition def && def instanceof Fences) {
Expand All @@ -516,15 +523,17 @@ private static void addBiases(Wmm memoryModel, EnumSet<Baseline> biases) {
memoryModel.getOrCreatePredefinedRelation(POLOC),
rf,
memoryModel.getOrCreatePredefinedRelation(CO),
memoryModel.getOrCreatePredefinedRelation(FR)))));
memoryModel.getOrCreatePredefinedRelation(FR)
))));
}
if (biases.contains(Baseline.NO_OOTA)) {
// ---- acyclic (dep | rf) ----
memoryModel.addConstraint(new Acyclicity(memoryModel.addDefinition(new Union(memoryModel.newRelation(),
memoryModel.getOrCreatePredefinedRelation(CTRL),
memoryModel.getOrCreatePredefinedRelation(DATA),
memoryModel.getOrCreatePredefinedRelation(ADDR),
rf))));
rf)
)));
}
if (biases.contains(Baseline.ATOMIC_RMW)) {
// ---- empty (rmw & fre;coe) ----
Expand Down
4 changes: 2 additions & 2 deletions dartagnan/src/test/java/com/dat3m/dartagnan/spirv/basic/SpirvAssertionsTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
import com.dat3m.dartagnan.utils.Result;
import com.dat3m.dartagnan.verification.VerificationTask;
import com.dat3m.dartagnan.verification.solving.AssumeSolver;
import com.dat3m.dartagnan.verification.solving.RefinementSolver;
import com.dat3m.dartagnan.wmm.Wmm;
import org.junit.Test;
import org.junit.runner.RunWith;
Expand Down Expand Up @@ -120,10 +121,9 @@ public static Iterable<Object[]> data() throws IOException {

@Test
public void testAllSolvers() throws Exception {
/* TODO: Implementation
try (SolverContext ctx = mkCtx(); ProverEnvironment prover = mkProver(ctx)) {
assertEquals(expected, RefinementSolver.run(ctx, prover, mkTask()).getResult());
}*/
}
try (SolverContext ctx = mkCtx(); ProverEnvironment prover = mkProver(ctx)) {
assertEquals(expected, AssumeSolver.run(ctx, prover, mkTask()).getResult());
}
Expand Down
4 changes: 2 additions & 2 deletions dartagnan/src/test/java/com/dat3m/dartagnan/spirv/benchmarks/SpirvAssertionsTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
import com.dat3m.dartagnan.utils.Result;
import com.dat3m.dartagnan.verification.VerificationTask;
import com.dat3m.dartagnan.verification.solving.AssumeSolver;
import com.dat3m.dartagnan.verification.solving.RefinementSolver;
import com.dat3m.dartagnan.wmm.Wmm;
import org.junit.Test;
import org.junit.runner.RunWith;
Expand Down Expand Up @@ -113,10 +114,9 @@ public static Iterable<Object[]> data() throws IOException {

@Test
public void testAllSolvers() throws Exception {
/* TODO: Implementation
try (SolverContext ctx = mkCtx(); ProverEnvironment prover = mkProver(ctx)) {
assertEquals(expected, RefinementSolver.run(ctx, prover, mkTask()).getResult());
}*/
}
try (SolverContext ctx = mkCtx(); ProverEnvironment prover = mkProver(ctx)) {
assertEquals(expected, AssumeSolver.run(ctx, prover, mkTask()).getResult());
}
Expand Down
4 changes: 2 additions & 2 deletions dartagnan/src/test/java/com/dat3m/dartagnan/spirv/benchmarks/SpirvChecksTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
import com.dat3m.dartagnan.utils.Result;
import com.dat3m.dartagnan.verification.VerificationTask;
import com.dat3m.dartagnan.verification.solving.AssumeSolver;
import com.dat3m.dartagnan.verification.solving.RefinementSolver;
import com.dat3m.dartagnan.wmm.Wmm;
import org.junit.Test;
import org.junit.runner.RunWith;
Expand Down Expand Up @@ -117,10 +118,9 @@ public static Iterable<Object[]> data() throws IOException {

@Test
public void testAllSolvers() throws Exception {
/* TODO: Implementation
try (SolverContext ctx = mkCtx(); ProverEnvironment prover = mkProver(ctx)) {
assertEquals(expected, RefinementSolver.run(ctx, prover, mkTask()).getResult());
}*/
}
try (SolverContext ctx = mkCtx(); ProverEnvironment prover = mkProver(ctx)) {
assertEquals(expected, AssumeSolver.run(ctx, prover, mkTask()).getResult());
}
Expand Down
4 changes: 2 additions & 2 deletions dartagnan/src/test/java/com/dat3m/dartagnan/spirv/benchmarks/SpirvRacesTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
import com.dat3m.dartagnan.utils.Result;
import com.dat3m.dartagnan.verification.VerificationTask;
import com.dat3m.dartagnan.verification.solving.AssumeSolver;
import com.dat3m.dartagnan.verification.solving.RefinementSolver;
import com.dat3m.dartagnan.wmm.Wmm;
import org.junit.Test;
import org.junit.runner.RunWith;
Expand Down Expand Up @@ -118,10 +119,9 @@ public static Iterable<Object[]> data() throws IOException {

@Test
public void testAllSolvers() throws Exception {
/* TODO: Implementation
try (SolverContext ctx = mkCtx(); ProverEnvironment prover = mkProver(ctx)) {
assertEquals(expected, RefinementSolver.run(ctx, prover, mkTask()).getResult());
}*/
}
try (SolverContext ctx = mkCtx(); ProverEnvironment prover = mkProver(ctx)) {
assertEquals(expected, AssumeSolver.run(ctx, prover, mkTask()).getResult());
}
Expand Down
4 changes: 2 additions & 2 deletions dartagnan/src/test/java/com/dat3m/dartagnan/spirv/gpuverify/SpirvChecksTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
import com.dat3m.dartagnan.utils.Result;
import com.dat3m.dartagnan.verification.VerificationTask;
import com.dat3m.dartagnan.verification.solving.AssumeSolver;
import com.dat3m.dartagnan.verification.solving.RefinementSolver;
import com.dat3m.dartagnan.wmm.Wmm;
import org.junit.Test;
import org.junit.runner.RunWith;
Expand Down Expand Up @@ -345,10 +346,9 @@ public static Iterable<Object[]> data() throws IOException {

@Test
public void testAllSolvers() throws Exception {
/* TODO: Implementation
try (SolverContext ctx = mkCtx(); ProverEnvironment prover = mkProver(ctx)) {
assertEquals(expected, RefinementSolver.run(ctx, prover, mkTask()).getResult());
}*/
}
try (SolverContext ctx = mkCtx(); ProverEnvironment prover = mkProver(ctx)) {
assertEquals(expected, AssumeSolver.run(ctx, prover, mkTask()).getResult());
}
Expand Down
4 changes: 2 additions & 2 deletions dartagnan/src/test/java/com/dat3m/dartagnan/spirv/gpuverify/SpirvRacesTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
import com.dat3m.dartagnan.utils.Result;
import com.dat3m.dartagnan.verification.VerificationTask;
import com.dat3m.dartagnan.verification.solving.AssumeSolver;
import com.dat3m.dartagnan.verification.solving.RefinementSolver;
import com.dat3m.dartagnan.wmm.Wmm;
import org.junit.Test;
import org.junit.runner.RunWith;
Expand Down Expand Up @@ -345,10 +346,9 @@ public static Iterable<Object[]> data() throws IOException {

@Test
public void testAllSolvers() throws Exception {
/* TODO: Implementation
try (SolverContext ctx = mkCtx(); ProverEnvironment prover = mkProver(ctx)) {
assertEquals(expected, RefinementSolver.run(ctx, prover, mkTask()).getResult());
}*/
}
try (SolverContext ctx = mkCtx(); ProverEnvironment prover = mkProver(ctx)) {
assertEquals(expected, AssumeSolver.run(ctx, prover, mkTask()).getResult());
}
Expand Down
Loading