Use different dotnet install path for performance runs

Author: MihaZupan

Runner/Helpers/RuntimeHelpers.cs

@@ -200,21 +200,23 @@ string GetMergeScript(string name)
         }
     }
 
-    public static async Task InstallRuntimeDotnetSdkAsync(JobBase job)
+    public static async Task InstallRuntimeDotnetSdkAsync(JobBase job, string? installDir = null)
     {
-        await InstallDotnetSdkAsync(job, "runtime/global.json");
+        await InstallDotnetSdkAsync(job, "runtime/global.json", installDir);
     }
 
-    public static async Task InstallDotnetSdkAsync(JobBase job, string globalJsonPath)
+    public static async Task InstallDotnetSdkAsync(JobBase job, string globalJsonPath, string? installDir = null)
     {
         AssertIsLinux();
 
+        installDir ??= "/usr/lib/dotnet";
+
         if (!File.Exists("dotnet-install.sh"))
         {
             await job.RunProcessAsync("wget", "https://dot.net/v1/dotnet-install.sh");
         }
 
-        await job.RunProcessAsync("bash", $"dotnet-install.sh --jsonfile {globalJsonPath} --install-dir /usr/lib/dotnet");
+        await job.RunProcessAsync("bash", $"dotnet-install.sh --jsonfile {globalJsonPath} --install-dir {installDir}");
     }
 
     public static async Task CopyReleaseArtifactsAsync(JobBase job, string logPrefix, string destination, string runtimeConfig = "Release")

Runner/Jobs/BenchmarkLibrariesJob.cs

@@ -4,6 +4,8 @@ namespace Runner.Jobs;
 
 internal sealed partial class BenchmarkLibrariesJob : JobBase
 {
+    private const string DotnetInstallDir = "dotnet-performance";
+
     public BenchmarkLibrariesJob(HttpClient client, Dictionary<string, string> metadata) : base(client, metadata) { }
 
     protected override async Task RunJobCoreAsync()
@@ -30,7 +32,7 @@ protected override async Task RunJobCoreAsync()
         {
             await clonePerformanceTask;
 
-            PendingTasks.Enqueue(RuntimeHelpers.InstallDotnetSdkAsync(this, "performance/global.json"));
+            PendingTasks.Enqueue(RuntimeHelpers.InstallDotnetSdkAsync(this, "performance/global.json", DotnetInstallDir));
 
             coreRuns = await DownloadCoreRootsAsync(entries);
         }
@@ -63,9 +65,9 @@ protected override async Task RunJobCoreAsync()
                 await JitDiffJob.BuildAndCopyRuntimeBranchBitsAsync(this, "pr", uploadArtifacts: false, buildChecked: false, canSkipRebuild: false);
             }
 
-            await RuntimeHelpers.InstallRuntimeDotnetSdkAsync(this);
+            await RuntimeHelpers.InstallRuntimeDotnetSdkAsync(this, DotnetInstallDir);
 
-            await RuntimeHelpers.InstallDotnetSdkAsync(this, "performance/global.json");
+            await RuntimeHelpers.InstallDotnetSdkAsync(this, "performance/global.json", DotnetInstallDir);
 
             coreRuns = ["artifacts-main/corerun", "artifacts-pr/corerun"];
         }
@@ -229,7 +231,7 @@ private async Task RunBenchmarksAsync(string[] coreRunPaths)
 
         int dotnetVersion = RuntimeHelpers.GetDotnetVersion("performance");
 
-        string coreRuns = string.Join(' ', coreRunPaths.Select(Path.GetFullPath));
+        string coreRuns = string.Join(' ', coreRunPaths.Select(p => $"\"{Path.GetFullPath(p)}\""));
 
         int coreCount = (int)(HardwareInfo?.CpuList.First().NumberOfCores ?? 0);
         if (coreCount > Environment.ProcessorCount)
@@ -242,8 +244,10 @@ private async Task RunBenchmarksAsync(string[] coreRunPaths)
 
         string? artifactsDir = null;
 
-        await RunProcessAsync("/usr/lib/dotnet/dotnet",
-            $"run -c Release --framework net{dotnetVersion}.0 -- --filter {filter} -h {HiddenColumns} --corerun {coreRuns} {parallelSuffix}",
+        string dotnetPath = Path.GetFullPath($"{DotnetInstallDir}/dotnet");
+
+        await RunProcessAsync(dotnetPath,
+            $"run -c Release --framework net{dotnetVersion}.0 -- --cli \"{dotnetPath}\" --filter {filter} -h {HiddenColumns} --corerun {coreRuns} {parallelSuffix}",
             workDir: "performance/src/benchmarks/micro",
             processLogs: line =>
             {