diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 7275a61..2d987fa 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -53,4 +53,4 @@ jobs: if: matrix.os == 'windows-latest' uses: ncipollo/release-action@v1.14.0 with: - tag: v1.4.9 \ No newline at end of file + tag: v1.4.9.1 \ No newline at end of file diff --git a/Program.cs b/Program.cs index 5aac2be..264fd1f 100644 --- a/Program.cs +++ b/Program.cs @@ -15,6 +15,7 @@ using Hardware.Info; using NvAPIWrapper.DRS.SettingValues; using System.Linq; +using System.Net.NetworkInformation; Console.ForegroundColor = ConsoleColor.Green; Console.WriteLine("Welcome to the best benchmark in the entire universe"); @@ -24,6 +25,7 @@ if (RuntimeInformation.IsOSPlatform(OSPlatform.OSX)) { + Console.ForegroundColor = ConsoleColor.Cyan; var startInfo = new ProcessStartInfo { FileName = "/usr/sbin/system_profiler", @@ -38,8 +40,11 @@ while (!process.StandardOutput.EndOfStream) { string? line = process.StandardOutput.ReadLine(); + //Exclusions if (line != null && !line.Contains("Serial Number (system):") && !line.Contains("Hardware UUID:") && !line.Contains("Model Number:") && !line.Contains("Provisioning UDID:") && !line.Contains("Boot Volume:") - && !line.Contains("Boot Mode:") && !line.Contains("Computer Name:") && !line.Contains("User Name:")) + && !line.Contains("Boot Mode:") && !line.Contains("Computer Name:") && !line.Contains("User Name:") && !line.Contains("Kernel Version: Darwin") && !line.Contains("Secure Virtual Memory: Enabled") + && !line.Contains("System Integrity Protection: Enabled") && !line.Contains("Time since boot:") && !line.Contains("System Firmware Version:") && !line.Contains("OS Loader Version:") + && !line.Contains("Activation Lock Status:") && !line.Contains("Bus: Built-In") && !line.Contains("Vendor:")) { Console.WriteLine(line); } @@ -75,10 +80,22 @@ Console.WriteLine(item["NumberOfLogicalProcessors"]); Console.ForegroundColor = ConsoleColor.White; - Console.Write("Clock Speed: "); + Console.Write("Base Frequency: "); Console.ForegroundColor = ConsoleColor.Yellow; Console.WriteLine("{0}MHz", item["MaxClockSpeed"]); + IHardwareInfo hardwareInfo; + hardwareInfo = new HardwareInfo(); + hardwareInfo.RefreshAll(); + Console.ForegroundColor = ConsoleColor.White; + Console.Write("Current Frequency: "); + Console.ForegroundColor = ConsoleColor.Yellow; + + foreach (var cpu in hardwareInfo.CpuList) + { + Console.WriteLine("{0}MHz", cpu.CurrentClockSpeed); + } + Console.ForegroundColor = ConsoleColor.White; Console.Write("L2 Cache: "); Console.ForegroundColor = ConsoleColor.Yellow; diff --git a/README.md b/README.md index 9c2c473..8d16df5 100644 --- a/README.md +++ b/README.md @@ -4,7 +4,7 @@ - You can run a Hashing benchmark with MD5, SHA256 and SHA512. - Or a single thread and multi thread benchmark. - Or a encrypt/decrypt benchmark (May need admin privileges) -- Using `BenchmarkDotNet` , `SharpDX` and `NvAPIWrapper`. +- Using `BenchmarkDotNet` , `SharpDX`, `NvAPIWrapper` and `Hardware.info` # Maintenance @@ -172,7 +172,12 @@ Intel Core i7-12800H CPU 1.80GHz (Alder Lake), 1 CPU, 20 logical and 14 physical ## .NET 8 Ranking: -Testing... +1. Dell latitude 5531 - i7-12700H @ 55W `32s` +2. MacBook Pro 14" 2023 - M2 Pro 10 Core CPU (6P + 4E) `35s` +3. MacBook Pro 16" 2021 - M1 Max 10 Core CPU (8P + 2E) `42s` +4. Desktop - i7-8700K @ 4.7ghz `105s` +5. MacBook Pro 15" 2018 - i7-8850H @ 45W `133s` +6. MacBook Pro 13" 2017 - i5-7660U @ 15W `401s` # Minimum system requirements @@ -180,4 +185,4 @@ Testing... - Dual core CPU - Windows 10 or MacOS 12 - 4GB RAM -- 1GB Storage +- 1GB Storage \ No newline at end of file