Shift to clang

Author: Genbox

Src/FastData.Generator.CPlusPlus.TestHarness/CPlusPlusBenchmark.cs

@@ -1,5 +1,6 @@
 using System.Globalization;
 using System.Text;
+using Genbox.FastData.Generator.CPlusPlus.TestHarness.Code;
 using Genbox.FastData.InternalShared;
 using Genbox.FastData.InternalShared.Harness;
 using Genbox.FastData.InternalShared.Helpers;
@@ -52,7 +53,7 @@ public override BenchmarkSuite CreateFiles(IEnumerable<ITestData> data)
 
     public override void Run(BenchmarkSuite suite, bool useBencher, bool useShell)
     {
-        ProcessResult configureResult = ProcessHelper.RunProcess("cmake", "-S . -B build", Bootstrap.RootDir, 100_000);
+        ProcessResult configureResult = ProcessHelper.RunProcess("cmake", "-S . -B build -DCMAKE_CXX_COMPILER=\"" + ClangCompiler.CompilerPath + "\"", Bootstrap.RootDir, 100_000);
 
         if (configureResult.ExitCode != 0)
             throw new InvalidOperationException($"Failed to configure CMake. Exit code: {configureResult.ExitCode}\nSTDOUT:\n{configureResult.StandardOutput}\nSTDERR:\n{configureResult.StandardError}");
@@ -81,6 +82,18 @@ private string RenderBenchmarkQueries(ITestData data, string identifier)
     private static string BuildCMakeLists(IEnumerable<string> sources) =>
         $$"""
           cmake_minimum_required(VERSION 3.20)
+
+          if(DEFINED ENV{FASTDATA_CLANGXX})
+            set(_clangxx "$ENV{FASTDATA_CLANGXX}")
+            if(IS_DIRECTORY "${_clangxx}")
+              set(_clangxx "${_clangxx}/clang++")
+            endif()
+            if(WIN32 AND NOT EXISTS "${_clangxx}" AND EXISTS "${_clangxx}.exe")
+              set(_clangxx "${_clangxx}.exe")
+            endif()
+            set(CMAKE_CXX_COMPILER "${_clangxx}" CACHE FILEPATH "" FORCE)
+          endif()
+
           project(fast_data_benchmarks LANGUAGES CXX)
           set(CMAKE_CXX_STANDARD 17)
           set(CMAKE_CXX_STANDARD_REQUIRED ON)

Src/FastData.Generator.CPlusPlus.TestHarness/CPlusPlusBootstrap.cs

@@ -13,11 +13,11 @@ public CPlusPlusBootstrap(HarnessType type) : base("CPlusPlus", type)
     {
         CPlusPlusLanguageDef langDef = new CPlusPlusLanguageDef();
         Map = new TypeMap(langDef.TypeDefinitions, GeneratorEncoding.UTF8);
-        Compiler = new GccCompiler(RootDir);
+        Compiler = new ClangCompiler(RootDir);
     }
 
     internal TypeMap Map { get; }
-    internal GccCompiler Compiler { get; }
+    internal ClangCompiler Compiler { get; }
 
     public override ICodeGenerator GeneratorFactory(string id) => CPlusPlusCodeGenerator.Create(new CPlusPlusCodeGeneratorConfig(id));
 }

…PlusPlus.TestHarness/Code/GccCompiler.cs …usPlus.TestHarness/Code/ClangCompiler.csSrc/FastData.Generator.CPlusPlus.TestHarness/Code/GccCompiler.cs renamed to Src/FastData.Generator.CPlusPlus.TestHarness/Code/ClangCompiler.cs Src/FastData.Generator.CPlusPlus.TestHarness/Code/GccCompiler.cs renamed to Src/FastData.Generator.CPlusPlus.TestHarness/Code/ClangCompiler.cs

@@ -3,15 +3,16 @@
 
 namespace Genbox.FastData.Generator.CPlusPlus.TestHarness.Code;
 
-public sealed class GccCompiler
+public sealed class ClangCompiler
 {
     private readonly string _rootPath;
+    internal const string CompilerPath = @"C:\clang+llvm-22.1.0-x86_64-pc-windows-msvc\bin\clang++.exe";
 
-    public GccCompiler(string rootDir)
+    public ClangCompiler(string rootDir)
     {
         _rootPath = rootDir;
 
-        if (!ProcessHelper.TryRunProcess("g++.exe", "--version"))
+        if (!ProcessHelper.TryRunProcess(CompilerPath, "--version"))
             throw new InvalidOperationException("No compiler found");
     }
 
@@ -24,7 +25,7 @@ public string Compile(string fileId, string source)
         if (!FileHelper.TryWriteFile(srcFile, source) && File.Exists(dstFile))
             return dstFile;
 
-        ProcessResult res = ProcessHelper.RunProcess("g++", $"{srcFile} -std=c++17 -O3 -DNDEBUG -o {dstFile}");
+        ProcessResult res = ProcessHelper.RunProcess(CompilerPath, $"\"{srcFile}\" -std=c++17 -O3 -DNDEBUG -o \"{dstFile}\"");
 
         if (res.ExitCode != 0)
         {