Skip to content

Further changes for SVCOMP 2025 #777

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
merged 8 commits into from
Nov 11, 2024
Merged

Further changes for SVCOMP 2025 #777

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
f8e5927
Make use of bound.save and bound.load for svcomp
hernan-poncedeleon Nov 8, 2024
33c5161
Remove outdated svcomp options
hernan-poncedeleon Nov 8, 2024
0d2fdc1
Add support for llvm.threadlocal.address intrinsic
hernan-poncedeleon Nov 9, 2024
252f913
Use lazy RA for svcomp
hernan-poncedeleon Nov 9, 2024
81066d0
Add support for more intrinsics
hernan-poncedeleon Nov 9, 2024
455ebfc
Feedback implemented
hernanponcedeleon Nov 11, 2024
d0ed9df
Fix
hernanponcedeleon Nov 11, 2024
e2c9b02
Move variable down
hernanponcedeleon Nov 11, 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
4 changes: 2 additions & 2 deletions dartagnan/src/main/java/com/dat3m/dartagnan/program/processing/Intrinsics.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1325,7 +1325,7 @@ private List<Event> inlineNonDet(FunctionCall call) {
} else {
// Nondeterministic integers
final int bits = switch (suffix) {
case "longlong", "ulonglong" -> 128;
case "longlong", "ulonglong" -> 64;
case "long", "ulong" -> 64;
case "int", "uint", "unsigned_int" -> 32;
case "short", "ushort", "unsigned_short" -> 16;
Expand Down Expand Up @@ -1579,7 +1579,7 @@ private List<Event> inlineMemSet(FunctionCall call) {
private List<Event> inlineLLVMThreadLocal(FunctionCall call) {
final Register resultReg = getResultRegisterAndCheckArguments(1, call);
final Expression exp = call.getArguments().get(0);
checkArgument(exp instanceof MemoryObject object && object.isThreadLocal(), "Calling thread local instrinsic on a non thread local object \"%s\"", call);
checkArgument(exp instanceof MemoryObject object && object.isThreadLocal(), "Calling thread-local intrinsic on a non-thread-local object \"%s\"", call);
return List.of(
EventFactory.newLocal(resultReg, exp)
);
Expand Down
8 changes: 5 additions & 3 deletions svcomp/src/main/java/com/dat3m/svcomp/SVCOMPRunner.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,8 @@ private void property(String p) {

public static void main(String[] args) throws Exception {

String final boundsFilePath = System.getenv("DAT3M_OUTPUT") + "/bounds.csv";

if(Arrays.asList(args).contains("--help")) {
collectOptions();
return;
Expand All @@ -74,7 +76,7 @@ public static void main(String[] args) throws Exception {
String programPath = Arrays.stream(args).filter(a -> supportedFormats.stream().anyMatch(a::endsWith)).findFirst().get();
File fileProgram = new File(programPath);
// To be sure we do not mixed benchmarks, if the bounds file exists, delete it
new File(System.getenv("DAT3M_OUTPUT") + "/bounds.csv").delete();
new File(boundsFilePath).delete();

String[] argKeyword = Arrays.stream(args)
.filter(s->s.startsWith("-"))
Expand Down Expand Up @@ -109,8 +111,8 @@ public static void main(String[] args) throws Exception {
cmd.add(fileModel.toString());
cmd.add(programPath);
cmd.add("svcomp.properties");
cmd.add("--bound.load=" + System.getenv().get("DAT3M_OUTPUT") + "/bounds.csv");
cmd.add("--bound.save=" + System.getenv().get("DAT3M_OUTPUT") + "/bounds.csv");
cmd.add("--bound.load=" + boundsFilePath);
cmd.add("--bound.save=" + boundsFilePath);
cmd.add(String.format("--%s=%s", PROPERTY, r.property.asStringOption()));
cmd.add(String.format("--%s=%s", BOUND, bound));
cmd.add(String.format("--%s=%s", WITNESS_ORIGINAL_PROGRAM_PATH, programPath));
Expand Down
Loading