Updating to keep up with benchmark_suite changes.

Author: RealTimeChris

.github/workflows/Benchmark.yml

@@ -80,12 +80,12 @@ jobs:
       working-directory: ./
       run: |
            sudo apt-get install build-essential
-           sudo apt-get install g++-12
+           sudo apt-get install g++-14
 
     - name: Configure CMake
       working-directory: ./
       run: |
-           cmake -S . -B ./Build -DCMAKE_BUILD_TYPE=${{matrix.build_type}} -DCMAKE_CXX_COMPILER=/usr/bin/g++-12
+           cmake -S . -B ./Build -DCMAKE_BUILD_TYPE=${{matrix.build_type}} -DCMAKE_CXX_COMPILER=/usr/bin/g++-14
 
     - name: Build the Test
       working-directory: ./Build
@@ -132,7 +132,7 @@ jobs:
            sudo apt update
            wget https://apt.llvm.org/llvm.sh
            chmod u+x llvm.sh
-           sudo ./llvm.sh 19
+           sudo ./llvm.sh 20
 
     - name: Install Seaborn
       run: |
@@ -141,7 +141,7 @@ jobs:
     - name: Configure CMake
       working-directory: ./
       run: |
-           cmake -S . -B ./Build -DCMAKE_BUILD_TYPE=${{matrix.build_type}} -DCMAKE_CXX_COMPILER=/usr/bin/clang++-19
+           cmake -S . -B ./Build -DCMAKE_BUILD_TYPE=${{matrix.build_type}} -DCMAKE_CXX_COMPILER=/usr/bin/clang++-20
 
     - name: Build the Test
       working-directory: ./Build
@@ -173,77 +173,83 @@ jobs:
            sudo git push -f https://${{ secrets.GITHUB_TOKEN }}@github.com/RealTimeChris/Json-Performance.git temp-clang-ubuntu
         
   Build-GNUCXX-MacOS:
-    runs-on: macos-latest
+      runs-on: macos-latest
+      strategy:
+        fail-fast: false
+        matrix:
+          build_type: [Release]
+      steps:
+      - uses: actions/checkout@v4
+  
+      - name: Set up Python
+        uses: actions/setup-python@v5
+        with:
+          python-version: '3.x'
+  
+      - name: Create requirements.txt
+        run: |
+          echo seaborn > requirements.txt
+          echo matplotlib >> requirements.txt
+          echo pandas >> requirements.txt
+  
+      - name: Install dependencies
+        run: |
+          python -m venv env
+          source env/bin/activate
+          pip install -r requirements.txt
+  
+      - name: Install GCC
+        run: |
+          brew install gcc
+  
+      - name: Set up GCC environment
+        run: |
+          GCC_PATH=$(brew --prefix gcc)
+          GCC_VER=$(ls ${GCC_PATH}/bin/gcc-* 2>/dev/null | grep -oE '[0-9]+$' | sort -rn | head -1)
 
-    strategy:
-      fail-fast: false
-      matrix:
-        build_type: [Release]
+          echo "CC=${GCC_PATH}/bin/gcc-${GCC_VER}" >> $GITHUB_ENV
+          echo "CXX=${GCC_PATH}/bin/g++-${GCC_VER}" >> $GITHUB_ENV
 
-    steps:
-    - uses: actions/checkout@v4
-    
-    - name: Set up Python
-      uses: actions/setup-python@v5
-      with:
-        python-version: '3.x'
-    
-    - name: Create requirements.txt
-      run: |
-        echo seaborn > requirements.txt
-        echo matplotlib >> requirements.txt
-        echo pandas >> requirements.txt
-    
-    - name: Install dependencies
-      run: |
-        python -m venv env
-        source env/bin/activate
-        pip install -r requirements.txt
-    
-    - name: Install the latest GNUCXX compiler
-      run: |
-        brew install gcc --force-bottle
-    
-    - name: Determine g++ path
-      id: gpp_path
-      run: |
-        echo "G++ Path: $(which g++)"
-        echo "GXX_PATH=$(which g++)" >> $GITHUB_ENV
-    
-    - name: Configure CMake
-      working-directory: ./
-      run: |
-        cmake -S . -B ./Build -DCMAKE_BUILD_TYPE=${{matrix.build_type}} -DCMAKE_CXX_COMPILER=${{env.GXX_PATH}}
-    
-    - name: Build the Test
-      working-directory: ./Build
-      run: |
-        cmake --build . --config=${{ matrix.build_type }}
-    
-    - name: Install the Test
-      working-directory: ./Build
-      run: |
-        sudo cmake --install . --config=${{ matrix.build_type }}
-        sudo chmod +x /Users/runner/work/Json-Performance/Json-Performance/Install/bin/Json-Performance
-    
-    - name: Run the Test
-      working-directory: /Users/runner/work/Json-Performance/Json-Performance/Install/bin/
-      run: |
-        source /Users/runner/work/Json-Performance/Json-Performance/env/bin/activate
-        ./Json-Performance
-      continue-on-error: true
-    
-    - name: Commit and push the changes to a temp branch.
-      env:
-        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}   
-      working-directory: /Users/runner/work/Json-Performance/Json-Performance/
-      run: |
-        sudo git config --global user.email "[email protected]"
-        sudo git config --global user.name "RealTimeChris"
-        sudo git checkout -b temp-gnucxx-macos
-        sudo git add . 
-        sudo git commit -m "Updates - GNUCXX-MacOS"
-        sudo git push -f https://${{ secrets.GITHUB_TOKEN }}@github.com/RealTimeChris/Json-Performance.git temp-gnucxx-macos
+          ${GCC_PATH}/bin/gcc-${GCC_VER} --version
+          ${GCC_PATH}/bin/g++-${GCC_VER} --version
+  
+      - name: Configure CMake
+        working-directory: ./
+        run: |
+          cmake -S . -B ./Build \
+            -DCMAKE_BUILD_TYPE=${{matrix.build_type}} \
+            -DCMAKE_C_COMPILER=${{ env.CC }} \
+            -DCMAKE_CXX_COMPILER=${{ env.CXX }}
+  
+      - name: Build the Test
+        working-directory: ./Build
+        run: |
+          cmake --build . --config=${{ matrix.build_type }}
+  
+      - name: Install the Test
+        working-directory: ./Build
+        run: |
+          sudo cmake --install . --config=${{ matrix.build_type }}
+          sudo chmod +x /Users/runner/work/Json-Performance/Json-Performance/Install/bin/Json-Performance
+  
+      - name: Run the Test
+        working-directory: /Users/runner/work/Json-Performance/Json-Performance/Install/bin/
+        run: |
+          source /Users/runner/work/Json-Performance/Json-Performance/env/bin/activate
+          ./Json-Performance
+        continue-on-error: true
+  
+      - name: Commit and push the changes to a temp branch.
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}   
+        working-directory: /Users/runner/work/Json-Performance/Json-Performance/
+        run: |
+          sudo git config --global user.email "[email protected]"
+          sudo git config --global user.name "RealTimeChris"
+          sudo git checkout -b temp-gnucxx-macos
+          sudo git add . 
+          sudo git commit -m "Updates - GNUCXX-MacOS"
+          sudo git push -f https://${{ secrets.GITHUB_TOKEN }}@github.com/RealTimeChris/Json-Performance.git temp-gnucxx-macos
 
   Build-CLANG-MacOS:
     runs-on: macos-latest
@@ -280,7 +286,7 @@ jobs:
     - name: Configure CMake
       working-directory: ./
       run: |
-        cmake -S . -B ./Build -DCMAKE_BUILD_TYPE=${{matrix.build_type}} -DCMAKE_CXX_COMPILER=/opt/homebrew/opt/llvm/bin/clang++
+        cmake -S . -B ./Build -DCMAKE_BUILD_TYPE=${{matrix.build_type}}
     
     - name: Build the Test
       working-directory: ./Build

CMakeLists.txt

@@ -33,12 +33,12 @@ FetchContent_MakeAvailable(glaze)
 getCommitHash("${glaze_SOURCE_DIR}" GLAZE_COMMIT_HASH)
 
 FetchContent_Declare(
-  BenchmarkSuite
-  GIT_REPOSITORY https://github.com/RealTimeChris/BenchmarkSuite.git
+  benchmarksuite
+  GIT_REPOSITORY https://github.com/RealTimeChris/benchmarksuite.git
   GIT_TAG main
   GIT_SHALLOW TRUE
 )
-FetchContent_MakeAvailable(BenchmarkSuite)
+FetchContent_MakeAvailable(benchmarksuite)
 
 FetchContent_Declare(
   simdjson
@@ -56,7 +56,7 @@ add_executable(
 
 target_link_libraries(
 	"Json-Performance" PUBLIC 
-	Jsonifier::Jsonifier glaze::glaze simdjson BenchmarkSuite::BenchmarkSuite
+	Jsonifier::Jsonifier glaze::glaze simdjson benchmarksuite::benchmarksuite
 )
 
 target_compile_options(

ReadMe.md

@@ -36,4 +36,4 @@ Here's a few benchmarks on a few common operating system/compiler platforms. Alt
 6. Run the executable from wherever it was installed to!
 1. 
 #### Note:
-These benchmarks were executed using the CPU benchmark library [BenchmarkSuite](https://github.com/RealTimeChris/BenchmarkSuite)
+These benchmarks were executed using the CPU benchmark library [benchmarksuite](https://github.com/RealTimeChris/benchmarksuite)

Source/Common.hpp

@@ -22,7 +22,7 @@
 /// https://github.com/RealTimeChris/jsonifier
 #pragma once
 
-#include <BnchSwt/BenchmarkSuite.hpp>
+#include <bnch_swt/index.hpp>
 #include "UnicodeEmoji.hpp"
 #include "CitmCatalog.hpp"
 #include "Twitter.hpp"
@@ -42,7 +42,7 @@ static constexpr auto measuredIterations{ 25 };
 
 constexpr auto getCurrentOperatingSystem() {
 	constexpr bnch_swt::string_literal osName{ OPERATING_SYSTEM_NAME };
-	constexpr auto osNameNew = bnch_swt::internal::toLower(osName);
+	constexpr auto osNameNew = bnch_swt::internal::to_lower(osName);
 	if constexpr (osNameNew.operator std::string_view().contains("linux")) {
 		return bnch_swt::string_literal{ "Ubuntu" };
 	} else if constexpr (osNameNew.operator std::string_view().contains("windows")) {
@@ -56,11 +56,11 @@ constexpr auto getCurrentOperatingSystem() {
 
 constexpr auto getCurrentCompilerId() {
 	constexpr bnch_swt::string_literal compilerId{ COMPILER_ID };
-	constexpr auto osCompilerIdNew = bnch_swt::internal::toLower(compilerId);
+	constexpr auto osCompilerIdNew = bnch_swt::internal::to_lower(compilerId);
 	if constexpr (osCompilerIdNew.operator std::string_view().contains("gnu") || osCompilerIdNew.operator std::string_view().contains("gcc") ||
-		osCompilerIdNew.operator std::string_view().contains("g++") || osCompilerIdNew.operator std::string_view().contains("apple")) {
+		osCompilerIdNew.operator std::string_view().contains("g++")) {
 		return bnch_swt::string_literal{ "GNUCXX" };
-	} else if constexpr (osCompilerIdNew.operator std::string_view().contains("clang")) {
+	} else if constexpr (osCompilerIdNew.operator std::string_view().contains("clang") || osCompilerIdNew.operator std::string_view().contains("appleclang")) {
 		return bnch_swt::string_literal{ "CLANG" };
 	} else if constexpr (osCompilerIdNew.operator std::string_view().contains("msvc")) {
 		return bnch_swt::string_literal{ "MSVC" };
@@ -144,7 +144,7 @@ std::string getCPUInfo() {
 }
 
 void executePythonScript(const std::string& scriptPath, const std::string& argument01, const std::string& argument02) {
-#if defined(JSONIFIER_WIN)
+#if JSONIFIER_PLATFORM_WINDOWS
 	static std::string pythonName{ "python " };
 #else
 	static std::string pythonName{ "python3 " };
@@ -367,13 +367,13 @@ template<result_type type> struct result {
 	result& operator=(const result&) noexcept = default;
 	result(const result&) noexcept			  = default;
 
-	result(const std::string& colorNew, const bnch_swt::performance_metrics& results) {
-		byteLength.emplace(results.bytesProcessed);
-		jsonTime.emplace(results.timeInNs);
-		jsonSpeedPercentageDeviation.emplace(results.throughputPercentageDeviation);
-		jsonSpeed.emplace(results.throughputMbPerSec);
-		if (results.cyclesPerByte.has_value()) {
-			jsonCycles.emplace(results.cyclesPerByte.value() * 1024 * 1024);
+	result(const std::string& colorNew, const bnch_swt::performance_metrics<bnch_swt::benchmark_types::cpu>& results) {
+		byteLength.emplace(results.bytes_processed);
+		jsonTime.emplace(results.time_in_ns);
+		jsonSpeedPercentageDeviation.emplace(results.throughput_percentage_deviation);
+		jsonSpeed.emplace(results.throughput_mb_per_sec);
+		if (results.cycles_per_byte.has_value()) {
+			jsonCycles.emplace(results.cycles_per_byte.value() * 1024 * 1024);
 		}
 		color = colorNew;
 	}
@@ -459,7 +459,7 @@ struct test_results {
 };
 
 std::tm getTime() {
-#if defined(JSONIFIER_WIN)
+#if JSONIFIER_PLATFORM_WINDOWS
 	std::time_t result = std::time(nullptr);
 	std::tm resultTwo{};
 	localtime_s(&resultTwo, &result);

Source/Glaze.hpp

@@ -22,7 +22,7 @@
 /// https://github.com/RealTimeChris/jsonifier
 #pragma once
 
-#include <BnchSwt/BenchmarkSuite.hpp>
+#include <bnch_swt/index.hpp>
 #include <glaze/glaze.hpp>
 #include "Common.hpp"
 

Source/Jsonifier.hpp

@@ -22,7 +22,7 @@
 /// https://github.com/RealTimeChris/jsonifier
 #pragma once
 
-#include <BnchSwt/BenchmarkSuite.hpp>
+#include <bnch_swt/index.hpp>
 #include <jsonifier/Index.hpp>
 #include "Common.hpp"
 

Source/Simdjson.hpp

@@ -22,7 +22,7 @@
 /// https://github.com/RealTimeChris/jsonifier
 #pragma once
 
-#include <BnchSwt/BenchmarkSuite.hpp>
+#include <bnch_swt/index.hpp>
 #include "simdjson.h"
 #include "Common.hpp"