update csharp infra

.github/dotnet.sh

@@ -3,4 +3,4 @@
 curl -sSL https://packages.microsoft.com/keys/microsoft.asc | sudo tee /etc/apt/trusted.gpg.d/microsoft.asc
 sudo apt-add-repository https://packages.microsoft.com/ubuntu/22.04/prod
 sudo apt-get update
-sudo apt-get install -y libmsquic zlib1g-dev
+sudo apt-get install -y libmsquic zlib1g-dev clang

.github/workflows/bench.yml

@@ -29,6 +29,8 @@ jobs:
             codon,
             cpp,
             csharp,
+            csharp_preview,
+            csharp_native_aot,
             crystal,
             d,
             dart,

README.md

@@ -65,16 +65,18 @@ _Current benchmarks problems and their implementations are from [The Computer La
 
 [podman](https://podman.io/getting-started/installation) (or [docker](https://www.docker.com/) by changing `docker_cmd: podman` to `docker_cmd: docker` in `bench/bench.yaml`)
 
+unzip
+
 ## Build
 
 _The 1st step is to build source code from various of lanuages_
 
 ```bash
 cd bench
 # To build a subset
-dotnet run -p tool -- --task build --langs lisp go --problems nbody helloworld --force-rebuild
+dotnet run --project tool -- --task build --langs lisp go --problems nbody helloworld --force-rebuild
 # To build all
-dotnet run -p tool -- --task build
+dotnet run --project tool -- --task build
 ```
 
 ## Test
@@ -84,9 +86,9 @@ _The 2nd step is to test built binaries to ensure the correctness of their imple
 ```bash
 cd bench
 # To test a subset
-dotnet run -p tool -- --task test --langs lisp go --problems nbody helloworld
+dotnet run --project tool -- --task test --langs lisp go --problems nbody helloworld
 # To test all
-dotnet run -p tool -- --task test
+dotnet run --project tool -- --task test
 ```
 
 ## Bench
@@ -96,16 +98,16 @@ _The 3rd step is to generate benchmarks_
 ```bash
 cd bench
 # To bench a subset
-dotnet run -p tool -- --task bench --langs lisp go --problems nbody helloworld
+dotnet run --project tool -- --task bench --langs lisp go --problems nbody helloworld
 # To bench all
-dotnet run -p tool -- --task bench
+dotnet run --project tool -- --task bench
 ```
 
 _For usage_
 
 ```bash
 cd bench
-dotnet run -p tool -- -h
+dotnet run --project tool -- -h
 
 BenchTool
   Main function

bench/bench_csharp.yaml

@@ -35,7 +35,9 @@ problems:
   - name: regex-redux
     source:
       - 5.cs
+      - 5-m.cs
       - 6.cs
+      - 6-m.cs
   - name: mandelbrot
     source:
       - 1.cs

bench/bench_csharp_native_aot.yaml

@@ -1,4 +1,4 @@
-lang: csharp
+lang: csharp_native_aot
 problems:
   - name: helloworld
     source:
@@ -34,7 +34,9 @@ problems:
   - name: regex-redux
     source:
       - 5.cs
+      - 5-m.cs
       - 6.cs
+      - 6-m.cs
   - name: mandelbrot
     source:
       - 1.cs

bench/bench_csharp_preview.yaml

@@ -1,68 +1,72 @@
-lang: csharp
-enabled: false
+lang: csharp_preview
 problems:
-  # - name: helloworld
-  #   source:
-  #     - 1.cs
-  # - name: binarytrees
-  #   source:
-  #     - 1.cs
-  # - name: merkletrees
-  #   source:
-  #     - 1.cs
-  #     - 2.cs
-  # - name: nbody
-  #   source:
-  #     - 8.cs
-  #     - 9.cs
-  # - name: spectral-norm
-  #   source:
-  #     - 3.cs
-  # - name: pidigits
-  #   source:
-  #     - 1.cs
-  # - name: edigits
-  #   source:
-  #     - 1.cs
-  # - name: fannkuch-redux
-  #   source:
-  #     # - 9.cs
-  # - name: fasta
-  #   source:
-  #     - 5.cs
-  # - name: knucleotide
-  #   source:
-  #     - 6.cs
+  - name: helloworld
+    source:
+      - 1.cs
+  - name: binarytrees
+    source:
+      - 1.cs
+  - name: merkletrees
+    source:
+      - 1.cs
+      - 2.cs
+  - name: nbody
+    source:
+      - 8.cs
+      - 9.cs
+  - name: spectral-norm
+    source:
+      - 3.cs
+  - name: pidigits
+    source:
+      - 1.cs
+  - name: edigits
+    source:
+      - 1.cs
+  - name: fannkuch-redux
+    source:
+      # - 9.cs
+  - name: fasta
+    source:
+      - 5.cs
+  - name: knucleotide
+    source:
+      - 6.cs
   - name: regex-redux
     source:
       - 5.cs
-      # - 5p.cs
-  # - name: mandelbrot
-  #   source:
-  #     - 1.cs
-  #     - 2.cs
-  #     - 3.cs
-  # - name: json-serde
-  #   source:
-  #     - 1.cs
-  #     - 2.cs
-  # - name: coro-prime-sieve
-  #   source:
-  #     - 1.cs
+      - 5-m.cs
+      - 6.cs
+      - 6-m.cs
+  - name: mandelbrot
+    source:
+      - 1.cs
+      - 2.cs
+      - 3.cs
+  - name: json-serde
+    source:
+      - 1.cs
+      - 2.cs
+  - name: coro-prime-sieve
+    source:
+      - 1.cs
   - name: http-server
     source:
+      - 1.cs
+      - 2.cs
+      - 2-http2.cs
       - 2-http3.cs
-  # - name: nsieve
-  #   source:
-  #     - 1.cs
-  #     - 2.cs
-  # - name: lru
-  #   source:
-  #     - 1.cs
-  #     - 2.cs
-  # - name: secp256k1
-  #   source:
-  #     - 1.cs
+  - name: nsieve
+    source:
+      - 1.cs
+      - 2.cs
+  - name: lru
+    source:
+      - 1.cs
+      - 2.cs
+  - name: secp256k1
+    source:
+      - 1.cs
 compiler_version_command:
 compiler_version_regex:
 runtime_version_parameter:
@@ -73,10 +77,10 @@ environments:
     compiler: dotnet
     version: 7
     compiler_version_command: dotnet --version
-    docker: mcr.microsoft.com/dotnet/sdk:7.0
+    docker: mcr.microsoft.com/dotnet/sdk:8.0
     # docker_volumns:
     #   - /tmp/.nuget/packages:/root/.nuget/packages
     include: dotnet_preview
-    build: dotnet publish -c Release -r linux-x64 -f net7 --self-contained true -p:PublishSingleFile=true -o out # -p:PublishReadyToRun=true
+    build: dotnet publish -c Release -r linux-x64 -f net8 --self-contained true -p:PublishSingleFile=true -o out # -p:PublishReadyToRun=true
     out_dir: out
     run_cmd: app

bench/tool/Linux/procfs/Interop.ProcFsStat.TryReadStatusFile.cs

@@ -14,7 +14,7 @@
 
 internal static partial class Interop
 {
-    internal static partial class procfs
+    internal static partial class ProcFs
     {
         internal const string RootPath = "/proc/";
         private const string StatusFileName = "/status";

bench/tool/Linux/procfs/Interop.ProcFsStat.cs

@@ -13,7 +13,7 @@
 
 internal static partial class Interop
 {
-    internal static partial class procfs
+    internal static partial class ProcFs
     {
         private const string ExeFileName = "/exe";
         private const string CmdLineFileName = "/cmdline";

bench/tool/ProcessUtils.cs

@@ -215,12 +215,12 @@ private static async Task<IReadOnlySet<int>> GetImmediateChildProcessIdsLinuxAsy
                         long totalMemoryBytes = 0;
                         if (s_isLinux)
                         {
-                            if (procfs.TryReadStatFile(pid, out procfs.ParsedStat stat))
+                            if (ProcFs.TryReadStatFile(pid, out ProcFs.ParsedStat stat))
                             {
                                 m.CpuTimeUser = TicksToTimeSpanLinux(stat.utime + stat.cutime);
                                 m.CpuTimeKernel = TicksToTimeSpanLinux(stat.stime + stat.cstime);
                                 isChildProcessCpuTimeCounted = stat.cutime > 0 || stat.cstime > 0;
-                                if (procfs.TryReadStatusFile(pid, out procfs.ParsedStatus status))
+                                if (ProcFs.TryReadStatusFile(pid, out ProcFs.ParsedStatus status))
                                 {
                                     totalMemoryBytes = (long)status.VmRSS;
                                 }
@@ -276,14 +276,14 @@ private static async Task<IReadOnlySet<int>> GetImmediateChildProcessIdsLinuxAsy
                                             m.CpuTimeKernel += cp.PrivilegedProcessorTime;
                                             totalMemoryBytes += cp.WorkingSet64;
                                         }
-                                        else if (procfs.TryReadStatFile(cp.Id, out procfs.ParsedStat cpstat))
+                                        else if (ProcFs.TryReadStatFile(cp.Id, out ProcFs.ParsedStat cpstat))
                                         {
                                             if (!isChildProcessCpuTimeCounted)
                                             {
                                                 m.CpuTimeUser += TicksToTimeSpanLinux(cpstat.utime);
                                                 m.CpuTimeKernel += TicksToTimeSpanLinux(cpstat.stime);
                                             }
-                                            if (procfs.TryReadStatusFile(cp.Id, out procfs.ParsedStatus cpstatus))
+                                            if (ProcFs.TryReadStatusFile(cp.Id, out ProcFs.ParsedStatus cpstatus))
                                             {
                                                 totalMemoryBytes += (long)cpstatus.VmRSS;
                                             }