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

Jump to bottom

Relation analysis with immutable and lazy data structures #743

Merged
merged 3 commits into from
Oct 3, 2024
Merged

Relation analysis with immutable and lazy data structures #743

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ca48530
Relation analysis with immutable and lazy data structures
natgavrilenko Sep 25, 2024
8b9d3d6
Updated sync barrier method after rebasing
natgavrilenko Sep 30, 2024
22084a1
Review comments
natgavrilenko Sep 30, 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
3 changes: 3 additions & 0 deletions dartagnan/src/main/java/com/dat3m/dartagnan/GlobalSettings.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,9 @@ public static String getHomeDirectory() {
}

public static String getCatDirectory() {
if (USE_TEST_PATH) {
return "../cat";
}
String env = System.getenv("DAT3M_HOME");
env = env == null ? "" : env;
return env + "/cat";
Expand Down
4 changes: 2 additions & 2 deletions dartagnan/src/main/java/com/dat3m/dartagnan/configuration/RelationAnalysisMethod.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,15 @@
import java.util.Arrays;

public enum RelationAnalysisMethod implements OptionInterface {
NONE, NATIVE;
NONE, NATIVE, LAZY;

public static RelationAnalysisMethod getDefault() {
return NATIVE;
}

// Used to decide the order shown by the selector in the UI
public static RelationAnalysisMethod[] orderedValues() {
RelationAnalysisMethod[] order = { NONE, NATIVE };
RelationAnalysisMethod[] order = { NONE, NATIVE, LAZY };
// Be sure no element is missing
assert(Arrays.asList(order).containsAll(Arrays.asList(values())));
return order;
Expand Down
16 changes: 9 additions & 7 deletions dartagnan/src/main/java/com/dat3m/dartagnan/encoding/EncodeSets.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,9 @@
import com.dat3m.dartagnan.wmm.Relation;
import com.dat3m.dartagnan.wmm.analysis.RelationAnalysis;
import com.dat3m.dartagnan.wmm.definition.*;
import com.dat3m.dartagnan.wmm.utils.EventGraph;
import com.dat3m.dartagnan.wmm.utils.graph.EventGraph;
import com.dat3m.dartagnan.wmm.utils.graph.mutable.MapEventGraph;
import com.dat3m.dartagnan.wmm.utils.graph.mutable.MutableEventGraph;

import java.util.HashMap;
import java.util.Map;
Expand Down Expand Up @@ -61,8 +63,8 @@ public Map<Relation, EventGraph> visitComposition(Composition comp) {

final Relation r1 = comp.getLeftOperand();
final Relation r2 = comp.getRightOperand();
final EventGraph set1 = new EventGraph();
final EventGraph set2 = new EventGraph();
final MutableEventGraph set1 = new MapEventGraph();
final MutableEventGraph set2 = new MapEventGraph();
final RelationAnalysis.Knowledge k1 = ra.getKnowledge(r1);
final RelationAnalysis.Knowledge k2 = ra.getKnowledge(r2);
Map<Event, Set<Event>> out = ra.getKnowledge(r1).getMaySet().getOutMap();
Expand All @@ -85,7 +87,7 @@ public Map<Relation, EventGraph> visitComposition(Composition comp) {
public Map<Relation, EventGraph> visitDomainIdentity(DomainIdentity domId) {
final RelationAnalysis.Knowledge k1 = ra.getKnowledge(domId.getOperand());
Map<Event, Set<Event>> out = k1.getMaySet().getOutMap();
EventGraph result = new EventGraph();
MutableEventGraph result = new MapEventGraph();
news.apply((e1, e2) ->
out.getOrDefault(e1, Set.of()).forEach(e -> {
if (!k1.getMustSet().contains(e1, e)) {
Expand All @@ -100,7 +102,7 @@ public Map<Relation, EventGraph> visitDomainIdentity(DomainIdentity domId) {
public Map<Relation, EventGraph> visitRangeIdentity(RangeIdentity rangeId) {
final RelationAnalysis.Knowledge k1 = ra.getKnowledge(rangeId.getOperand());
Map<Event, Set<Event>> in = k1.getMaySet().getInMap();
EventGraph result = new EventGraph();
MutableEventGraph result = new MapEventGraph();
news.apply((e1, e2) ->
in.getOrDefault(e2, Set.of()).forEach(e -> {
if (!k1.getMustSet().contains(e, e2)) {
Expand All @@ -122,7 +124,7 @@ public Map<Relation, EventGraph> visitInverse(Inverse inv) {
public Map<Relation, EventGraph> visitTransitiveClosure(TransitiveClosure trans) {
final Relation rel = trans.getDefinedRelation();
final Relation r1 = trans.getOperand();
EventGraph factors = new EventGraph();
MutableEventGraph factors = new MapEventGraph();
final RelationAnalysis.Knowledge k0 = ra.getKnowledge(rel);
Map<Event, Set<Event>> out = k0.getMaySet().getOutMap();
news.apply((e1, e2) -> {
Expand All @@ -142,7 +144,7 @@ public Map<Relation, EventGraph> visitTransitiveClosure(TransitiveClosure trans)

@Override
public Map<Relation, EventGraph> visitLinuxCriticalSections(LinuxCriticalSections rscs) {
EventGraph queue = new EventGraph();
MutableEventGraph queue = new MapEventGraph();
final RelationAnalysis.Knowledge k0 = ra.getKnowledge(rscs.getDefinedRelation());
Map<Event, Set<Event>> in = k0.getMaySet().getInMap();
Map<Event, Set<Event>> out = k0.getMaySet().getOutMap();
Expand Down
2 changes: 1 addition & 1 deletion dartagnan/src/main/java/com/dat3m/dartagnan/encoding/EncodingContext.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
import com.dat3m.dartagnan.wmm.Relation;
import com.dat3m.dartagnan.wmm.analysis.RelationAnalysis;
import com.dat3m.dartagnan.wmm.axiom.Acyclicity;
import com.dat3m.dartagnan.wmm.utils.EventGraph;
import com.dat3m.dartagnan.wmm.utils.graph.EventGraph;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.sosy_lab.common.configuration.InvalidConfigurationException;
Expand Down
Loading
Loading