Updating. [skip ci]

.github/workflows/Benchmark.yml

@@ -4,6 +4,7 @@ on:
   workflow_dispatch:
   push:
     branches:
+    - main
     - benchmarking
 
 jobs:
@@ -56,12 +57,12 @@ jobs:
       run: |
            git config --global user.email "40668522+RealTimeChris@users.noreply.github.com"
            git config --global user.name "RealTimeChris"
-           git checkout -b temp-branch-msvc-windows
+           git checkout -b temp-msvc-windows
            git add . 
            git commit -m "Updates - MSVC-Windows"
-           git push -f https://${{ secrets.GITHUB_TOKEN }}@github.com/RealTimeChris/Json-Performance.git temp-branch-msvc-windows
+           git push -f https://${{ secrets.GITHUB_TOKEN }}@github.com/RealTimeChris/Json-Performance.git temp-msvc-windows
 
-  Build-GCC-Ubuntu:
+  Build-GNUCXX-Ubuntu:
     runs-on: ubuntu-latest
 
     strategy:
@@ -76,7 +77,7 @@ jobs:
       run: |
            pip install seaborn
   
-    - name: Install the latest gcc compiler.
+    - name: Install the latest gnucxx compiler.
       working-directory: ./
       run: |
            sudo apt-get install build-essential
@@ -111,10 +112,10 @@ jobs:
       run: |
            sudo git config --global user.email "40668522+RealTimeChris@users.noreply.github.com"
            sudo git config --global user.name "RealTimeChris"
-           sudo git checkout -b temp-branch-gcc-ubuntu
+           sudo git checkout -b temp-gnucxx-ubuntu
            sudo git add . 
-           sudo git commit -m "Updates - GCC-Ubuntu"
-           sudo git push -f https://${{ secrets.GITHUB_TOKEN }}@github.com/RealTimeChris/Json-Performance.git temp-branch-gcc-ubuntu
+           sudo git commit -m "Updates - GNUCXX-Ubuntu"
+           sudo git push -f https://${{ secrets.GITHUB_TOKEN }}@github.com/RealTimeChris/Json-Performance.git temp-gnucxx-ubuntu
 
   Build-CLANG-Ubuntu:
     runs-on: ubuntu-latest
@@ -132,7 +133,7 @@ jobs:
            sudo apt update && sudo apt upgrade
            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 +142,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
@@ -167,12 +168,12 @@ jobs:
       run: |
            sudo git config --global user.email "40668522+RealTimeChris@users.noreply.github.com"
            sudo git config --global user.name "RealTimeChris"
-           sudo git checkout -b temp-branch-clang-ubuntu
+           sudo git checkout -b temp-clang-ubuntu
            sudo git add . 
            sudo git commit -m "Updates - CLANG-Ubuntu"
-           sudo git push -f https://${{ secrets.GITHUB_TOKEN }}@github.com/RealTimeChris/Json-Performance.git temp-branch-clang-ubuntu
-
-  Build-CLANG-MacOS:
+           sudo git push -f https://${{ secrets.GITHUB_TOKEN }}@github.com/RealTimeChris/Json-Performance.git temp-clang-ubuntu
+        
+  Build-GNUCXX-MacOS:
     runs-on: macos-latest
 
     strategy:
@@ -200,14 +201,20 @@ jobs:
         source env/bin/activate
         pip install -r requirements.txt
     
-    - name: Install the latest clang compiler.
+    - name: Install the latest GNUCXX compiler
       run: |
-        brew install llvm
+        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=/opt/homebrew/opt/llvm/bin/clang++
+        cmake -S . -B ./Build -DCMAKE_BUILD_TYPE=${{matrix.build_type}} -DCMAKE_CXX_COMPILER=${{env.GXX_PATH}}
     
     - name: Build the Test
       working-directory: ./Build
@@ -234,12 +241,12 @@ jobs:
       run: |
         sudo git config --global user.email "40668522+RealTimeChris@users.noreply.github.com"
         sudo git config --global user.name "RealTimeChris"
-        sudo git checkout -b temp-branch-clang-macos
+        sudo git checkout -b temp-gnucxx-macos
         sudo git add . 
-        sudo git commit -m "Updates - CLANG-MacOS"
-        sudo git push -f https://${{ secrets.GITHUB_TOKEN }}@github.com/RealTimeChris/Json-Performance.git temp-branch-clang-macos
-        
-  Build-GCC-MacOS:
+        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
 
     strategy:
@@ -267,20 +274,14 @@ jobs:
         source env/bin/activate
         pip install -r requirements.txt
     
-    - name: Install the latest GCC compiler
-      run: |
-        brew install gcc --force-bottle
-    
-    - name: Determine g++ path
-      id: gpp_path
+    - name: Install the latest clang compiler.
       run: |
-        echo "G++ Path: $(which g++)"
-        echo "GXX_PATH=$(which g++)" >> $GITHUB_ENV
+        brew install llvm
     
     - name: Configure CMake
       working-directory: ./
       run: |
-        cmake -S . -B ./Build -DCMAKE_BUILD_TYPE=${{matrix.build_type}} -DCMAKE_CXX_COMPILER=${{env.GXX_PATH}}
+        cmake -S . -B ./Build -DCMAKE_BUILD_TYPE=${{matrix.build_type}} -DCMAKE_CXX_COMPILER=/opt/homebrew/opt/llvm/bin/clang++
     
     - name: Build the Test
       working-directory: ./Build
@@ -307,19 +308,19 @@ jobs:
       run: |
         sudo git config --global user.email "40668522+RealTimeChris@users.noreply.github.com"
         sudo git config --global user.name "RealTimeChris"
-        sudo git checkout -b temp-branch-gcc-macos
+        sudo git checkout -b temp-clang-macos
         sudo git add . 
-        sudo git commit -m "Updates - GCC-MacOS"
-        sudo git push -f https://${{ secrets.GITHUB_TOKEN }}@github.com/RealTimeChris/Json-Performance.git temp-branch-gcc-macos
+        sudo git commit -m "Updates - CLANG-MacOS"
+        sudo git push -f https://${{ secrets.GITHUB_TOKEN }}@github.com/RealTimeChris/Json-Performance.git temp-clang-macos
 
   Merge-Branches:
     runs-on: ubuntu-latest
     needs:
       - Build-MSVC-Windows
-      - Build-GCC-Ubuntu
+      - Build-GNUCXX-Ubuntu
       - Build-CLANG-Ubuntu
+      - Build-GNUCXX-MacOS
       - Build-CLANG-MacOS
-      - Build-GCC-MacOS
 
     steps:
     - uses: actions/checkout@v4
@@ -332,19 +333,25 @@ jobs:
         sudo git config --global user.name "RealTimeChris"
         sudo git fetch origin
         sudo git checkout benchmarking
-        sudo git merge origin/temp-branch-msvc-windows --no-ff
-        sudo git merge origin/temp-branch-gcc-ubuntu --no-ff
-        sudo git merge origin/temp-branch-clang-ubuntu --no-ff
-        sudo git merge origin/temp-branch-clang-macos --no-ff
-        sudo git merge origin/temp-branch-gcc-macos --no-ff
-        sudo git push origin benchmarking
+        sudo git pull -f origin benchmarking
+        sudo git merge origin/temp-msvc-windows --no-ff
+        sudo git merge origin/temp-gnucxx-ubuntu --no-ff
+        sudo git merge origin/temp-clang-ubuntu --no-ff
+        sudo git merge origin/temp-gnucxx-macos --no-ff
+        sudo git merge origin/temp-clang-macos --no-ff
+        sudo git checkout --orphan newBranch
+        sudo git add .
+        sudo git commit -m "Updating necessary files."
+        sudo git branch -D benchmarking
+        sudo git branch -m benchmarking
+        sudo git push origin benchmarking -f
 
     - name: Delete temporary branches
       env:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       run: |
-        sudo git push origin --delete temp-branch-msvc-windows
-        sudo git push origin --delete temp-branch-gcc-ubuntu
-        sudo git push origin --delete temp-branch-clang-ubuntu
-        sudo git push origin --delete temp-branch-clang-macos
-        sudo git push origin --delete temp-branch-gcc-macos
+        sudo git push origin --delete temp-msvc-windows
+        sudo git push origin --delete temp-gnucxx-ubuntu
+        sudo git push origin --delete temp-clang-ubuntu
+        sudo git push origin --delete temp-gnucxx-macos
+        sudo git push origin --delete temp-clang-macos

CMakeLists.txt

@@ -42,7 +42,7 @@ FetchContent_MakeAvailable(BenchmarkSuite)
 
 FetchContent_Declare(
   simdjson
-  GIT_REPOSITORY https://github.com/RealTimeChris/simdjson.git
+  GIT_REPOSITORY https://github.com/simdjson/simdjson.git
   GIT_TAG master
   GIT_SHALLOW TRUE
 )
@@ -82,10 +82,10 @@ if (WIN32)
 		OPTIONAL
 	)
 endif()
-message("COMPILER: ${CMAKE_CXX_COMPILER_ID}")
+
 target_compile_definitions(
 	"Json-Performance" PUBLIC 
-	"JSON_TEST_PATH=\"${CMAKE_CURRENT_SOURCE_DIR}/Source/ConformanceTests\""
+	"JSON_TEST_PATH=\"${CMAKE_CURRENT_SOURCE_DIR}/Source/\""
 	"JSON_PATH=\"${CMAKE_CURRENT_SOURCE_DIR}/Json\""
 	"README_PATH=\"${CMAKE_CURRENT_SOURCE_DIR}/\""
 	"GRAPHS_PATH=\"${CMAKE_CURRENT_SOURCE_DIR}/Graphs\""