Fix dasm paths

MihuBot · Jan 25, 2025 · fd5eee0 · fd5eee0
1 parent e6f2fde
commit fd5eee0
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 8 deletions.
diff --git a/Runner/Helpers/JitDiffUtils.cs b/Runner/Helpers/JitDiffUtils.cs
@@ -156,6 +156,8 @@ public static string GetCommentMarkdown(string[] diffs, int lengthLimit, bool re
     public static async Task<(string[] Diffs, bool NoisyDiffsRemoved)> GetDiffMarkdownAsync(
         JobBase job,
         (string Description, string DasmFile, string Name)[] diffs,
+        string mainDasmDirectory,
+        string prDasmDirectory,
         Func<string, string?>? tryGetExtraInfo,
         Func<string, string> replaceMethodName,
         int maxCount)
@@ -165,9 +167,6 @@ public static string GetCommentMarkdown(string[] diffs, int lengthLimit, bool re
             return (Array.Empty<string>(), false);
         }
 
-        const string MainDasmDirectory = $"{JitDiffJob.DiffsMainDirectory}/{JitDiffJob.DasmSubdirectory}";
-        const string PrDasmDirectory = $"{JitDiffJob.DiffsPrDirectory}/{JitDiffJob.DasmSubdirectory}";
-
         bool includeKnownNoise = job.TryGetFlag("includeKnownNoise");
         bool includeRemovedMethod = job.TryGetFlag("includeRemovedMethodImprovements");
         bool IncludeNewMethod = job.TryGetFlag("includeNewMethodRegressions");
@@ -189,8 +188,8 @@ await Parallel.ForAsync(0, diffs.Length, async (i, _) =>
                 return;
             }
 
-            string mainDiffsFile = $"{MainDasmDirectory}/{diff.DasmFile}";
-            string prDiffsFile = $"{PrDasmDirectory}/{diff.DasmFile}";
+            string mainDiffsFile = $"{mainDasmDirectory}/{diff.DasmFile}";
+            string prDiffsFile = $"{prDasmDirectory}/{diff.DasmFile}";
 
             await job.LogAsync($"Generating diffs for {diff.Name}");
 

diff --git a/Runner/Jobs/JitDiffJob.cs b/Runner/Jobs/JitDiffJob.cs
@@ -12,6 +12,9 @@ internal sealed class JitDiffJob : JobBase
     public const string DasmSubdirectory = "dasmset_1/base";
     public const string ExtraProjectsDirectory = "extra-projects";
 
+    private const string CombinedDasmMainDirectory = "diffs-main-combined";
+    private const string CombinedDasmPrDirectory = "diffs-pr-combined";
+
     public JitDiffJob(HttpClient client, Dictionary<string, string> metadata) : base(client, metadata) { }
 
     protected override async Task RunJobCoreAsync()
@@ -239,10 +242,10 @@ await Task.WhenAll(
             PendingTasks.Enqueue(ZipAndUploadArtifactAsync("jit-diffs-pr", DiffsPrDirectory));
         }
 
-        CombineAllDiffs(DiffsMainDirectory, "diffs-main-combined");
-        CombineAllDiffs(DiffsPrDirectory, "diffs-pr-combined");
+        CombineAllDiffs(DiffsMainDirectory, CombinedDasmMainDirectory);
+        CombineAllDiffs(DiffsPrDirectory, CombinedDasmPrDirectory);
 
-        string diffAnalyzeSummary = await JitDiffUtils.RunJitAnalyzeAsync(this, "diffs-main-combined", "diffs-pr-combined");
+        string diffAnalyzeSummary = await JitDiffUtils.RunJitAnalyzeAsync(this, CombinedDasmMainDirectory, CombinedDasmPrDirectory);
 
         PendingTasks.Enqueue(UploadTextArtifactAsync("diff-frameworks.txt", diffAnalyzeSummary));
 
@@ -295,6 +298,8 @@ private async Task UploadJitDiffExamplesAsync(string diffAnalyzeSummary, bool re
         var (diffs, noisyDiffsRemoved) = await JitDiffUtils.GetDiffMarkdownAsync(
             this,
             JitDiffUtils.ParseDiffAnalyzeEntries(diffAnalyzeSummary, regressions),
+            CombinedDasmMainDirectory,
+            CombinedDasmPrDirectory,
             tryGetExtraInfo: null,
             replaceMethodName: name => name,
             maxCount: 20);

diff --git a/Runner/Jobs/RegexDiffJob.cs b/Runner/Jobs/RegexDiffJob.cs
@@ -679,6 +679,8 @@ private async Task UploadJitDiffExamplesAsync(string diffAnalyzeSummary, bool re
         var (diffs, noisyDiffsRemoved) = await JitDiffUtils.GetDiffMarkdownAsync(
             this,
             JitDiffUtils.ParseDiffAnalyzeEntries(diffAnalyzeSummary, regressions),
+            $"{JitDiffJob.DiffsMainDirectory}/{JitDiffJob.DasmSubdirectory}",
+            $"{JitDiffJob.DiffsMainDirectory}/{JitDiffJob.DasmSubdirectory}",
             tryGetExtraInfo,
             replaceName,
             maxCount: 1_000);