Speccpu Compiler Check fix for Windows (#458)

* Installed Compiler Check fix for Windows

* Update Path.

* Move def.

* Excluding version check for widows as we dont support compiler version for CompilerInstallation in windows.

* Update tests

* Update Doc

---------

Co-authored-by: Rakeshwar Reddy Kambaiahgari <[email protected]>

Author: RakeshwarK

src/VirtualClient/VirtualClient.Actions.UnitTests/SPEC/SpecCpuExecutorTests.cs

@@ -119,7 +119,6 @@ public async Task SpecCpuExecutorExecutesTheCorrectCommandsWithInstallationInWin
                 $"powershell -Command \"Mount-DiskImage -ImagePath {this.mockPackage.Path}\\speccpu.iso\"",
                 $"powershell -Command \"(Get-DiskImage -ImagePath {this.mockPackage.Path}\\speccpu.iso| Get-Volume).DriveLetter\"",
                 $"cmd /c echo 1 | X:\\install.bat {this.mockPackage.Path}",
-                "gcc -dumpversion",
                 $"powershell -Command \"Dismount-DiskImage -ImagePath {this.mockPackage.Path}\\speccpu.iso\"",
                 $"cmd /c runspeccpu.bat --config vc-win-x64.cfg --iterations 2 --copies 4 --threads 8 --tune all --noreportable intrate"
             };
@@ -135,36 +134,18 @@ public async Task SpecCpuExecutorExecutesTheCorrectCommandsWithInstallationInWin
                     output.Append("X");
                 }
 
-                if (exe == "gcc" && arguments == "-dumpversion")
-                {
-                    return new InMemoryProcess
-                    {
-                        StartInfo = new ProcessStartInfo
-                        {
-                            FileName = exe,
-                            Arguments = arguments
-                        },
-                        ExitCode = 0,
-                        OnStart = () => true,
-                        OnHasExited = () => true,
-                        StandardOutput = new ConcurrentBuffer(new StringBuilder("10")),
-                    };
-                }
-                else
+                return new InMemoryProcess
                 {
-                    return new InMemoryProcess
+                    StartInfo = new ProcessStartInfo
                     {
-                        StartInfo = new ProcessStartInfo
-                        {
-                            FileName = exe,
-                            Arguments = arguments
-                        },
-                        ExitCode = 0,
-                        OnStart = () => true,
-                        OnHasExited = () => true,
-                        StandardOutput = output
-                    };
-                }
+                        FileName = exe,
+                        Arguments = arguments
+                    },
+                    ExitCode = 0,
+                    OnStart = () => true,
+                    OnHasExited = () => true,
+                    StandardOutput = output
+                };
             };
 
             using (TestSpecCpuExecutor specCpuExecutor = new TestSpecCpuExecutor(this.mockFixture.Dependencies, this.mockFixture.Parameters))

src/VirtualClient/VirtualClient.Actions/SPECcpu/SpecCpuExecutor.cs

@@ -413,37 +413,41 @@ private async Task WriteSpecCpuConfigAsync(CancellationToken cancellationToken)
                     this.PlatformSpecifics.GetScriptPath("speccpu", SpecCpuExecutor.SpecCpuRunShell),
                     this.Combine(this.PackageDirectory, SpecCpuExecutor.SpecCpuRunShell),
                     true);
+
+                string compilerVersion = await this.GetInstalledCompilerDumpVersionAsync("gcc", cancellationToken);
+
+                if (string.IsNullOrEmpty(compilerVersion))
+                {
+                    throw new WorkloadException("gcc version not found.");
+                }
+
+                templateText = templateText.Replace(
+                SpecCpuConfigPlaceHolder.Gcc10Workaround,
+                Convert.ToInt32(compilerVersion) >= 10 ? SpecCpuConfigPlaceHolder.Gcc10WorkaroundContent : string.Empty,
+                StringComparison.OrdinalIgnoreCase);
             }
             else
             {
                 this.fileSystem.File.Copy(
                 this.PlatformSpecifics.GetScriptPath("speccpu", SpecCpuExecutor.SpecCpuRunBat),
                 this.Combine(this.PackageDirectory, SpecCpuExecutor.SpecCpuRunBat),
                 true);
-            }
 
-            string compilerVersion = await this.GetInstalledCompilerDumpVersionAsync("gcc", cancellationToken);
-
-            if (string.IsNullOrEmpty(compilerVersion))
-            {
-                throw new WorkloadException("gcc version not found.");
+                templateText = templateText.Replace(
+                SpecCpuConfigPlaceHolder.Gcc10Workaround,
+                SpecCpuConfigPlaceHolder.Gcc10WorkaroundContent,
+                StringComparison.OrdinalIgnoreCase);
             }
 
             templateText = templateText.Replace(SpecCpuConfigPlaceHolder.BaseOptimizingFlags, this.BaseOptimizingFlags, StringComparison.OrdinalIgnoreCase);
             templateText = templateText.Replace(SpecCpuConfigPlaceHolder.PeakOptimizingFlags, this.PeakOptimizingFlags, StringComparison.OrdinalIgnoreCase);
-            templateText = templateText.Replace(
-                SpecCpuConfigPlaceHolder.Gcc10Workaround,
-                Convert.ToInt32(compilerVersion) >= 10 ? SpecCpuConfigPlaceHolder.Gcc10WorkaroundContent : string.Empty,
-                StringComparison.OrdinalIgnoreCase);
-
             await this.fileSystem.File.WriteAllTextAsync(this.Combine(this.PackageDirectory, "config", configurationFile), templateText, cancellationToken);
         }
 
         private async Task<string> GetInstalledCompilerDumpVersionAsync(string compilerName, CancellationToken cancellationToken)
         {
             string command = compilerName;
             string commandArguments = "-dumpversion";
-
             string version = string.Empty;
 
             using (IProcessProxy process = this.systemManager.ProcessManager.CreateElevatedProcess(this.Platform, command, commandArguments))

website/docs/workloads/speccpu/speccpu-profiles.md

@@ -20,6 +20,8 @@ for evaluating the performance of the CPU for processing calculations.
   * win-x64
   * win-arm64
 
+  **Note**: On Windows platform, the **gcc** compiler version is required to be 10 or higher.
+
 * **Supports Disconnected Scenarios**  
   * No. Internet connection required.