Rust: Fix rust coverage (#790)

This PR fixes how rust coverage report is interpreted in build_runner --------- Signed-off-by: Arthur Chan <[email protected]>
google · Feb 14, 2025 · 435be08 · 435be08
1 parent 248a804
commit 435be08
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 5 deletions.
diff --git a/experiment/builder_runner.py b/experiment/builder_runner.py
@@ -727,6 +727,8 @@ def _extract_local_textcoverage_data(self,
         new_textcov = textcov.Textcov.from_jvm_file(f)
       elif self.benchmark.language == 'python':
         new_textcov = textcov.Textcov.from_python_file(f)
+      elif self.benchmark.language == 'rust':
+        new_textcov = textcov.Textcov.from_rust_file(f)
       else:
         target_basename = os.path.basename(self.benchmark.target_path)
         new_textcov = textcov.Textcov.from_file(
@@ -1060,8 +1062,15 @@ def build_and_run_cloud(
           run_result.coverage = textcov.Textcov.from_python_file(f)
         self._copy_textcov_to_workdir(bucket, textcov_blob_path,
                                       generated_target_name)
+    elif self.benchmark.language == 'rust':
+      blob = bucket.blob(textcov_blob_path)
+      if blob.exists():
+        with blob.open() as f:
+          run_result.coverage = textcov.Textcov.from_rust_file(f)
+        self._copy_textcov_to_workdir(bucket, textcov_blob_path,
+                                      generated_target_name)
     else:
-      # C/C++/Rust
+      # C/C++
       blob = bucket.blob(textcov_blob_path)
       if blob.exists():
         with blob.open('rb') as f:

diff --git a/run_all_experiments.py b/run_all_experiments.py
@@ -453,10 +453,12 @@ def _process_total_coverage_gain() -> dict[str, dict[str, Any]]:
       for textcov_file in os.listdir(summary):
         if textcov_file.endswith('.covreport'):
           with open(os.path.join(summary, textcov_file), 'rb') as f:
-
-            textcov_dict[project_name].append(
-                textcov.Textcov.from_file(
-                    f, ignore_function_patterns=ignore_patterns))
+            if benchmark_used[0].language == 'rust':
+              textcov_dict[project_name].append(textcov.Textcov.from_file(f))
+            else:
+              textcov_dict[project_name].append(
+                  textcov.Textcov.from_rust_file(
+                      f, ignore_function_patterns=ignore_patterns))
         elif textcov_file == 'all_cov.json':
           with open(os.path.join(summary, textcov_file)) as f:
             textcov_dict[project_name].append(