Fixed minor errors in update_bench_incremental.py and yamlindex.py

goblint · May 6, 2024 · 531a711 · 531a711
1 parent d92d246
commit 531a711
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 9 deletions.
diff --git a/gobexec/goblint/bench/yamlindex.py b/gobexec/goblint/bench/yamlindex.py
@@ -22,26 +22,32 @@ def __call__(self, name: str, args: List[str]) -> Tool[Incremental, R]:
 def load(def_path: Path, set_path: List[Path], tool_factory: ToolFactory) -> Matrix[Incremental, R]:
     defsets_ = DefSets.from_paths(def_path, set_path)
     groups: List[Group[Incremental]] = []
-    tool: Tool[Incremental,R] = tool_factory(name= "",args=defsets_.def_.confs)
+    tools: [Tool[Incremental, R]] = []
     for set_ in defsets_.sets:
         groups.append(Group(name=set_.name, benchmarks=[]))
         for bench in set_.benchmarks:
-            patch_path = Path("../bench")/bench.path.with_suffix("."+"patch")
+            patch_path = Path("../bench") / bench.path.with_suffix("." + "patch")
             parts = list(patch_path.parts)
             temp = parts[3].split(".")
-            parts[3] = temp[0]+"01."+temp[1]
+            parts[3] = temp[0] + "01." + temp[1]
             patch_path = Path(*parts)
             groups[-1].benchmarks.append(Incremental(
                 name=bench.name,
                 description=bench.info,
-                files=Path("../bench")/bench.path,
-                patch= patch_path,
+                files=Path("../bench") / bench.path,
+                patch=patch_path,
                 tool_data={
-                        ARGS_TOOL_KEY: shlex.split(bench.param) if bench.param else []
-                    }))
+                    ARGS_TOOL_KEY: shlex.split(bench.param) if bench.param else []
+                }))
+    for conf in defsets_.def_.confs[1:]:
+        if conf.param is not None:
+            tools.append(tool_factory(name=conf.name,args= ["--conf", (Path("../bench") / Path(defsets_.def_.baseconf)).absolute()] + shlex.split(conf.param) ))
+        else:
+            tools.append(tool_factory(name=conf.name, args=["--conf", (Path("../bench") / Path(defsets_.def_.baseconf)).absolute()]))
+
     return Matrix(
         name=def_path.stem,
-        tools=[tool],
+        tools=tools,
         groups=groups,
     )
 

diff --git a/update_bench_incremental.py b/update_bench_incremental.py
@@ -16,6 +16,7 @@
 from_scratch = GoblintToolFromScratch(
     name="from_scratch",
     program=str(Path("../analyzer/goblint").absolute()),
+    args=["--conf", Path("../bench/index/conf/td3.json").absolute()]
 
 )
 
@@ -24,7 +25,9 @@ def index_tool_factory(name, args):
     incremental = GoblintToolIncremental(
         name=name,
         program=str(Path("../analyzer/goblint").absolute()),
-        from_scratch=from_scratch
+        from_scratch=from_scratch,
+        args=args
+
     )
     return ExtractTool(
         incremental,