Dump IR before running analysis

yqyq-w · Nov 19, 2022 · 438c7c4 · 438c7c4
1 parent 4aa8caf
commit 438c7c4
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 18 deletions.
diff --git a/A5/tai-e/plan.yml b/A5/tai-e/plan.yml
@@ -1,3 +1,5 @@
+- id: class-dumper
+  options: {}
 - id: cipta
   options:
     merge-string-constants: false
@@ -12,5 +14,3 @@
     algorithm: cipta
     action: dump
     file: null
-- id: class-dumper
-  options: {}
diff --git a/A5/tai-e/src/main/java/pascal/taie/analysis/Tests.java b/A5/tai-e/src/main/java/pascal/taie/analysis/Tests.java
@@ -59,6 +59,10 @@ private static void doTestPTA(
         String classPath = "src/test/resources/pta/" + dir;
         Collections.addAll(args, "-cp", classPath);
         Collections.addAll(args, "-m", main);
+        if (DUMP_IR) {
+            // dump IR
+            Collections.addAll(args, "-a", ClassDumper.ID);
+        }
         List<String> ptaArgs = new ArrayList<>();
         ptaArgs.add("implicit-entries:false");
         String action = GENERATE_EXPECTED_RESULTS ? "dump" : "compare";
@@ -77,10 +81,6 @@ private static void doTestPTA(
             ptaArgs.add("only-app:true");
         }
         Collections.addAll(args, "-a", id + "=" + String.join(";", ptaArgs));
-        if (DUMP_IR) {
-            // dump IR
-            Collections.addAll(args, "-a", ClassDumper.ID);
-        }
         Main.main(args.toArray(new String[0]));
     }
 

diff --git a/A6/tai-e/plan.yml b/A6/tai-e/plan.yml
@@ -1,3 +1,5 @@
+- id: class-dumper
+  options: {}
 - id: cspta
   options:
     cs: ci
@@ -12,5 +14,3 @@
     algorithm: cspta
     action: dump
     file: null
-- id: class-dumper
-  options: {}
diff --git a/A6/tai-e/src/main/java/pascal/taie/analysis/Tests.java b/A6/tai-e/src/main/java/pascal/taie/analysis/Tests.java
@@ -59,6 +59,10 @@ private static void doTestPTA(
         String classPath = "src/test/resources/pta/" + dir;
         Collections.addAll(args, "-cp", classPath);
         Collections.addAll(args, "-m", main);
+        if (DUMP_IR) {
+            // dump IR
+            Collections.addAll(args, "-a", ClassDumper.ID);
+        }
         List<String> ptaArgs = new ArrayList<>();
         ptaArgs.add("implicit-entries:false");
         String action = GENERATE_EXPECTED_RESULTS ? "dump" : "compare";
@@ -77,10 +81,6 @@ private static void doTestPTA(
             ptaArgs.add("only-app:true");
         }
         Collections.addAll(args, "-a", id + "=" + String.join(";", ptaArgs));
-        if (DUMP_IR) {
-            // dump IR
-            Collections.addAll(args, "-a", ClassDumper.ID);
-        }
         Main.main(args.toArray(new String[0]));
     }
 

diff --git a/A8/tai-e/plan.yml b/A8/tai-e/plan.yml
@@ -1,3 +1,5 @@
+- id: class-dumper
+  options: {}
 - id: cspta
   options:
     cs: ci
@@ -13,5 +15,3 @@
     algorithm: cspta
     action: dump
     file: null
-- id: class-dumper
-  options: {}
diff --git a/A8/tai-e/src/main/java/pascal/taie/analysis/Tests.java b/A8/tai-e/src/main/java/pascal/taie/analysis/Tests.java
@@ -59,6 +59,10 @@ private static void doTestPTA(
         String classPath = "src/test/resources/pta/" + dir;
         Collections.addAll(args, "-cp", classPath);
         Collections.addAll(args, "-m", main);
+        if (DUMP_IR) {
+            // dump IR
+            Collections.addAll(args, "-a", ClassDumper.ID);
+        }
         List<String> ptaArgs = new ArrayList<>();
         ptaArgs.add("implicit-entries:false");
         String action = GENERATE_EXPECTED_RESULTS ? "dump" : "compare";
@@ -76,10 +80,6 @@ private static void doTestPTA(
             // if given options do not specify only-app, then set it true
             ptaArgs.add("only-app:true");
         }
-        if (DUMP_IR) {
-            // dump IR
-            Collections.addAll(args, "-a", ClassDumper.ID);
-        }
         Collections.addAll(args, "-a", id + "=" + String.join(";", ptaArgs));
         Main.main(args.toArray(new String[0]));
     }