GS:Capture: VAAPI support

MemoryViewWidget.cpp
BreakpointModel.cpp

.github/ISSUE_TEMPLATE/app_bug_report.yaml

@@ -29,6 +29,9 @@ body:
           - If your bug is the result of upscaling please use the forums or discord for assistance with various upscaling workarounds. Additionally, the unofficial PCSX2 [Wiki](https://wiki.pcsx2.net/Main_Page) often lists various fixes for upscaling issues.
         - We do **not** accept issues relating to Widescreen/no-interlace patches at this time.
           - Any issues pertaining to Widescreen/no-interlace patches please forward them to the [patches repository](https://github.com/PCSX2/pcsx2_patches). 
+        - We do **not** accept issues pertaining to Linux builds other than the official AppImage and Flatpak.
+          - Please contact your packager for support. We have no control over other builds, nor can we investigate any issues, and historically they have been known to be broken.
+          - This includes pre-configured "distributions" such as EmuDeck, the "AUR", etc.
 
   - type: textarea
     id: desc
@@ -67,11 +70,10 @@ body:
       - Windows 11
       - Windows 10 (64bit)
       - Linux (64bit) - Specify distro below
+      - macOS 14 (Sonoma)
       - macOS 13 (Ventura)
       - macOS 12 (Monterey)
       - macOS 11 (Big Sur)
-      - macOS 10.15 (Catalina)
-      - macOS 10.14 (Mojave)
     validations:
       required: true
   - type: input

.github/ISSUE_TEMPLATE/emu_bug_report.yaml

@@ -18,6 +18,8 @@ body:
 
         Please make an effort to make sure your issue isn't already reported.
 
+        Please make sure your game is verified using the built-in game verifier.
+
         Do not create issues involving software piracy of BIOS or ISO files, our rules specifically prohibit this and your issue will be closed.
 
         ### Please Avoid Issues Pertaining to the Following:
@@ -29,6 +31,9 @@ body:
           - If your bug is the result of upscaling please use the forums or discord for assistance with various upscaling workarounds. Additionally, the unofficial PCSX2 [Wiki](https://wiki.pcsx2.net/Main_Page) often lists various fixes for upscaling issues.
         - We do **not** accept issues relating to Widescreen/no-interlace patches at this time.
           - Any issues pertaining to Widescreen/no-interlace patches please forward them to the [patches repository](https://github.com/PCSX2/pcsx2_patches). 
+        - We do **not** accept issues pertaining to Linux builds other than the official AppImage and Flatpak.
+          - Please contact your packager for support. We have no control over other builds, nor can we investigate any issues, and historically they have been known to be broken.
+          - This includes pre-configured "distributions" such as EmuDeck, the "AUR", etc.
 
   - type: textarea
     id: desc
@@ -82,11 +87,10 @@ body:
       - Windows 11
       - Windows 10 (64bit)
       - Linux (64bit) - Specify distro below
+      - macOS 14 (Sonoma)
       - macOS 13 (Ventura)
       - macOS 12 (Monterey)
       - macOS 11 (Big Sur)
-      - macOS 10.15 (Catalina)
-      - macOS 10.14 (Mojave)
     validations:
       required: true
   - type: input
@@ -124,9 +128,9 @@ body:
       description: |
         Any non-default core settings. If you don't want to list them out, please provide screenshots of your configuration window.
 
-        Please note that the safe preset works for most games. MTVU can have some compatibility issues so please disable it before making a report.
+        Please note that defaults tend to work best.
 
-        If you need to modify the settings manually because a game requires you to do so to work, please state that explicitly.
+        If you need to modify the settings manually to fix an issue , please state that explicitly.
     validations:
       required: false
   - type: textarea

.github/dependabot.yml

@@ -6,3 +6,7 @@ updates:
     schedule:
       # Check for updates to GitHub Actions every week
       interval: "weekly"
+    groups:
+      ci-deps:
+        patterns:
+          - "*"

.github/labeler.yml

@@ -2,127 +2,187 @@
 
 # General Labels
 'Build | Project System':
-  - '.github/*'
-  - '.github/**/*'
-  - '*.sln'
-  - '**/*.sln'
-  - '*.vcxproj*'
-  - '**/*.vcxproj*'
-  - 'cmake/*'
-  - 'cmake/**/*'
-  - 'CMakeLists.txt'
-  - '**/CMakeLists.txt'
-  - 'build.sh'
+  - changed-files:
+    - any-glob-to-any-file:
+      - '.github/*'
+      - '.github/**/*'
+      - '*.sln'
+      - '**/*.sln'
+      - '*.vcxproj*'
+      - '**/*.vcxproj*'
+      - 'cmake/*'
+      - 'cmake/**/*'
+      - 'CMakeLists.txt'
+      - '**/CMakeLists.txt'
+      - 'build.sh'
 'Dependencies':
-  - '3rdparty/*'
-  - '3rdparty/**/*'
-  - '**/3rdpartyDeps.props'
-  - '.gitmodules'
+  - changed-files:
+    - any-glob-to-any-file:
+      - '3rdparty/*'
+      - '3rdparty/**/*'
+      - '**/3rdpartyDeps.props'
+      - '.gitmodules'
 'Documentation':
-  - '*.md'
-  - '**/*.md'
-  - '*.pdf'
-  - '**/*.pdf'
+  - changed-files:
+    - any-glob-to-any-file:
+      - '*.md'
+      - '**/*.md'
+      - '*.pdf'
+      - '**/*.pdf'
 'GUI/Qt':
-  - 'pcsx2-qt/*'
-  - 'pcsx2-qt/**/*'
-  - '3rdparty/Qt/*'
-  - '3rdparty/Qt/**/*'
+  - changed-files:
+    - any-glob-to-any-file:
+      - 'pcsx2-qt/*'
+      - 'pcsx2-qt/**/*'
+      - '3rdparty/Qt/*'
+      - '3rdparty/Qt/**/*'
 'GameDB':
-  - '**/GameIndex.*'
+  - changed-files:
+    - any-glob-to-any-file:
+      - '**/GameIndex.*'
 'Installer | Package':
-  - 'build.sh'
+  - changed-files:
+    - any-glob-to-any-file:
+      - 'build.sh'
 'Translations':
-  - 'pcsx2-qt/Translations/*'
+  - changed-files:
+    - any-glob-to-any-file:
+      - 'pcsx2-qt/Translations/*'
 
 # Tools / Features
 'Debugger':
-  - 'pcsx2/DebugTools/*'
-  - 'pcsx2/DebugTools/**/*'
-  - 'pcsx2-qt/Debugger/*'
-  - 'pcsx2-qt/Debugger/**/*'
+  - changed-files:
+    - any-glob-to-any-file:
+      - 'pcsx2/DebugTools/*'
+      - 'pcsx2/DebugTools/**/*'
+      - 'pcsx2-qt/Debugger/*'
+      - 'pcsx2-qt/Debugger/**/*'
 'IPC':
-  - 'pcsx2/IPC*'
-  - 'pcsx2/**/IPC*'
+  - changed-files:
+    - any-glob-to-any-file:
+      - 'pcsx2/IPC*'
+      - 'pcsx2/**/IPC*'
 'TAS Functionality':
-  - 'pcsx2/Recording/*'
-  - 'pcsx2/Recording/**/*'
+  - changed-files:
+    - any-glob-to-any-file:
+      - 'pcsx2/Recording/*'
+      - 'pcsx2/Recording/**/*'
 'RetroAchievements':
-  - 'pcsx2/Frontend/Achievements.*'
-  - 'pcsx2/Achievements.*'
+  - changed-files:
+    - any-glob-to-any-file:
+      - 'pcsx2/Frontend/Achievements.*'
+      - 'pcsx2/Achievements.*'
 
 # Emulation Components
 'Counters':
-  - 'pcsx2/Counters.*'
+  - changed-files:
+    - any-glob-to-any-file:
+      - 'pcsx2/Counters.*'
 'Vector Units':
-  - 'pcsx2/VU*'
-  - 'pcsx2/**/VU*'
-  - 'pcsx2/*VU*'
-  - 'pcsx2/**/*VU*'
+  - changed-files:
+    - any-glob-to-any-file:
+      - 'pcsx2/VU*'
+      - 'pcsx2/**/VU*'
+      - 'pcsx2/*VU*'
+      - 'pcsx2/**/*VU*'
 'VIF':
-  - 'pcsx2/Vif*'
-  - 'pcsx2/**/Vif*'
-  - 'pcsx2/VIF*'
-  - 'pcsx2/**/VIF*'
+  - changed-files:
+    - any-glob-to-any-file:
+      - 'pcsx2/Vif*'
+      - 'pcsx2/**/Vif*'
+      - 'pcsx2/VIF*'
+      - 'pcsx2/**/VIF*'
 
 # GS Related Labels
 'GS':
-  - 'pcsx2/GS/*'
-  - 'pcsx2/GS/**/*'
-  - 'bin/resources/shaders/*'
-  - 'bin/resources/shaders/**/*'
+  - changed-files:
+    - any-glob-to-any-file:
+      - 'pcsx2/GS/*'
+      - 'pcsx2/GS/**/*'
+      - 'bin/resources/shaders/*'
+      - 'bin/resources/shaders/**/*'
 'GS: Direct3D 11':
-  - 'pcsx2/GS/Renderers/DX11/*'
-  - 'pcsx2/GS/Renderers/DX11/**/*'
-  - 'bin/resources/shaders/dx11/*'
-  - 'bin/resources/shaders/dx11/**/*'
+  - changed-files:
+    - any-glob-to-any-file:
+      - 'pcsx2/GS/Renderers/DX11/*'
+      - 'pcsx2/GS/Renderers/DX11/**/*'
+      - 'bin/resources/shaders/dx11/*'
+      - 'bin/resources/shaders/dx11/**/*'
 'GS: Direct3D 12':
-  - 'pcsx2/GS/Renderers/DX12/*'
-  - 'pcsx2/GS/Renderers/DX12/**/*'
-  - 'bin/resources/shaders/dx11/*'
-  - 'bin/resources/shaders/dx11/**/*'
+  - changed-files:
+    - any-glob-to-any-file:
+      - 'pcsx2/GS/Renderers/DX12/*'
+      - 'pcsx2/GS/Renderers/DX12/**/*'
+      - 'bin/resources/shaders/dx11/*'
+      - 'bin/resources/shaders/dx11/**/*'
 'GS: Hardware':
-  - 'pcsx2/GS/Renderers/HW/*'
-  - 'pcsx2/GS/Renderers/HW/**/*'
+  - changed-files:
+    - any-glob-to-any-file:
+      - 'pcsx2/GS/Renderers/HW/*'
+      - 'pcsx2/GS/Renderers/HW/**/*'
 'GS: OpenGL':
-  - 'pcsx2/GS/Renderers/OpenGL/*'
-  - 'pcsx2/GS/Renderers/OpenGL/**/*'
-  - 'bin/resources/shaders/opengl/*'
-  - 'bin/resources/shaders/opengl/**/*'
+  - changed-files:
+    - any-glob-to-any-file:
+      - 'pcsx2/GS/Renderers/OpenGL/*'
+      - 'pcsx2/GS/Renderers/OpenGL/**/*'
+      - 'bin/resources/shaders/opengl/*'
+      - 'bin/resources/shaders/opengl/**/*'
 'GS: Vulkan':
-  - 'pcsx2/GS/Renderers/Vulkan/*'
-  - 'pcsx2/GS/Renderers/Vulkan/**/*'
-  - 'bin/resources/shaders/vulkan/*'
-  - 'bin/resources/shaders/vulkan/**/*'
+  - changed-files:
+    - any-glob-to-any-file:
+      - 'pcsx2/GS/Renderers/Vulkan/*'
+      - 'pcsx2/GS/Renderers/Vulkan/**/*'
+      - 'bin/resources/shaders/vulkan/*'
+      - 'bin/resources/shaders/vulkan/**/*'
 'GS: Metal':
-  - 'pcsx2/GS/Renderers/Metal/*'
-  - 'pcsx2/GS/Renderers/Metal/**/*'
+  - changed-files:
+    - any-glob-to-any-file:
+      - 'pcsx2/GS/Renderers/Metal/*'
+      - 'pcsx2/GS/Renderers/Metal/**/*'
 'GS: Texture Cache':
-  - 'pcsx2/GS/Renderers/*TextureCache*.*'
-  - 'pcsx2/GS/Renderers/**/*TextureCache*.*'
+  - changed-files:
+    - any-glob-to-any-file:
+      - 'pcsx2/GS/Renderers/*TextureCache*.*'
+      - 'pcsx2/GS/Renderers/**/*TextureCache*.*'
 'GS: Software':
-  - 'pcsx2/GS/Renderers/SW/*'
-  - 'pcsx2/GS/Renderers/SW/**/*'
+  - changed-files:
+    - any-glob-to-any-file:
+      - 'pcsx2/GS/Renderers/SW/*'
+      - 'pcsx2/GS/Renderers/SW/**/*'
 
 # Other Core Components
 'CDVD':
-  - 'pcsx2/CDVD/*'
-  - 'pcsx2/CDVD/**/*'
+  - changed-files:
+    - any-glob-to-any-file:
+      - 'pcsx2/CDVD/*'
+      - 'pcsx2/CDVD/**/*'
 'DEV9':
-  - 'pcsx2/DEV9/*'
-  - 'pcsx2/DEV9/**/*'
+  - changed-files:
+    - any-glob-to-any-file:
+      - 'pcsx2/DEV9/*'
+      - 'pcsx2/DEV9/**/*'
 'IPU':
-  - 'pcsx2/IPU/*'
-  - 'pcsx2/IPU/**/*'
+  - changed-files:
+    - any-glob-to-any-file:
+      - 'pcsx2/IPU/*'
+      - 'pcsx2/IPU/**/*'
 'Memory Card':
-  - 'pcsx2/SIO/Memcard/*'
-  - 'pcsx2/SIO/Memcard/**/*'
+  - changed-files:
+    - any-glob-to-any-file:
+      - 'pcsx2/SIO/Memcard/*'
+      - 'pcsx2/SIO/Memcard/**/*'
 'PAD':
-  - 'pcsx2/SIO/Pad/*'
-  - 'pcsx2/SIO/Pad/**/*'
+  - changed-files:
+    - any-glob-to-any-file:
+      - 'pcsx2/SIO/Pad/*'
+      - 'pcsx2/SIO/Pad/**/*'
 'SPU2':
-  - 'pcsx2/SPU2/*'
-  - 'pcsx2/SPU2/**/*'
+  - changed-files:
+    - any-glob-to-any-file:
+      - 'pcsx2/SPU2/*'
+      - 'pcsx2/SPU2/**/*'
 'USB':
-  - 'pcsx2/USB/*'
-  - 'pcsx2/USB/**/*'
+  - changed-files:
+    - any-glob-to-any-file:
+      - 'pcsx2/USB/*'
+      - 'pcsx2/USB/**/*'

.github/workflows/cron_publish_flatpak.yml

@@ -33,6 +33,7 @@ jobs:
     uses: ./.github/workflows/linux_build_flatpak.yml
     with:
       jobName: "Qt"
+      artifactPrefixName: "PCSX2-linux-Qt-x64-flatpak"
       compiler: clang
       cmakeflags: ""
       publish: true

.github/workflows/cron_update_base_translation.yml

@@ -17,7 +17,7 @@ jobs:
         run: ./.github/workflows/scripts/common/update_base_translation.sh
       
       - name: Create Pull Request
-        uses: peter-evans/create-pull-request@v5
+        uses: peter-evans/create-pull-request@v6
         with:
           title: "Qt: Update Base Translation"
           commit-message: "Qt: Update Base Translation"

.github/workflows/cron_update_controller_db.yml

@@ -19,7 +19,7 @@ jobs:
           mv ./game_controller_db.txt ${{github.workspace}}/bin/resources/game_controller_db.txt
 
       - name: Create Pull Request
-        uses: peter-evans/create-pull-request@v5
+        uses: peter-evans/create-pull-request@v6
         with:
           title: "PAD: Update to latest controller database"
           commit-message: "PAD: Update to latest controller database."

.github/workflows/linux_build_flatpak.yml

@@ -6,6 +6,9 @@ on:
       jobName:
         required: true
         type: string
+      artifactPrefixName:
+        required: true
+        type: string
       os:
         required: false
         type: string
@@ -36,18 +39,30 @@ on:
         required: false
         type: boolean
         default: false
+      stableBuild:
+        required: false
+        type: boolean
+        default: false
 
 jobs:
   build_linux:
     name: ${{ inputs.jobName }}
     runs-on: ${{ inputs.os }}
+    container:
+      image: ghcr.io/flathub-infra/flatpak-github-actions:kde-6.7
+      options: --privileged
     timeout-minutes: 60
 
     steps:
       - name: Checkout Repository
         uses: actions/checkout@v4
         with:
-          submodules: recursive
+          set-safe-directory: ${{ env.GITHUB_WORKSPACE }}
+
+      # Work around container ownership issue
+      - name: Set Safe Directory
+        shell: bash
+        run: git config --global --add safe.directory "*"
 
       # Hackity hack. When running the workflow on a schedule, we don't have the tag,
       # it doesn't fetch tags, therefore we don't get a version. So grab them manually.
@@ -56,78 +71,86 @@ jobs:
         if: ${{ inputs.fetchTags }}
         run: git fetch --tags --no-recurse-submodules
 
+      - name: Add stable release identifier file
+        if: ${{ inputs.stableBuild == true || inputs.stableBuild == 'true' }}
+        shell: bash
+        run: |
+          echo "#define DEFAULT_UPDATER_CHANNEL \"stable\"" > ./pcsx2-qt/DefaultUpdaterChannel.h
+          cat ./pcsx2-qt/DefaultUpdaterChannel.h
+
       - name: Prepare Artifact Metadata
         id: artifact-metadata
         shell: bash
         env:
-          OS: linux
-          BUILD_SYSTEM: flatpak
-          ARCH: ${{ inputs.platform }}
+          PREFIX: ${{ inputs.artifactPrefixName }}
           EVENT_NAME: ${{ github.event_name }}
           PR_TITLE: ${{ github.event.pull_request.title }}
           PR_NUM: ${{ github.event.pull_request.number }}
           PR_SHA: ${{ github.event.pull_request.head.sha }}
         run: ./.github/workflows/scripts/common/name-artifacts.sh
 
-      - name: Install Packages
-        env:
-          COMPILER: ${{ inputs.compiler }}
-        run: .github/workflows/scripts/linux/install-packages-flatpak.sh
-
       - name: Download patches
         run: |
           cd bin/resources
-          aria2c -Z "${{ inputs.patchesUrl }}/patches.zip"
+          wget "${{ inputs.patchesUrl }}/patches.zip"
 
       - name: Generate AppStream XML
         run: |
           ./.github/workflows/scripts/linux/generate-metainfo.sh .github/workflows/scripts/linux/flatpak/net.pcsx2.PCSX2.metainfo.xml
           cat .github/workflows/scripts/linux/flatpak/net.pcsx2.PCSX2.metainfo.xml
-          flatpak run org.freedesktop.appstream-glib validate .github/workflows/scripts/linux/flatpak/net.pcsx2.PCSX2.metainfo.xml
+      #    flatpak-builder-lint appstream .github/workflows/scripts/linux/flatpak/net.pcsx2.PCSX2.metainfo.xml
 
       - name: Validate manifest
         run: |
-          flatpak run --command=flatpak-builder-lint org.flatpak.Builder manifest .github/workflows/scripts/linux/flatpak/net.pcsx2.PCSX2.json
+          flatpak-builder-lint manifest .github/workflows/scripts/linux/flatpak/net.pcsx2.PCSX2.json
 
       - name: Build Flatpak
-        uses: flatpak/flatpak-github-actions/flatpak-builder@v6.3
+        uses: flathub-infra/flatpak-github-actions/flatpak-builder@23796715b3dfa4c86ddf50cf29c3cc8b3c82dca8
         with:
           bundle: ${{ steps.artifact-metadata.outputs.artifact-name }}.flatpak
+          upload-artifact: false
           manifest-path: .github/workflows/scripts/linux/flatpak/net.pcsx2.PCSX2.json
           arch: x86_64
           build-bundle: true
           verbose: true
-          mirror-screenshots-url: https://dl.flathub.org/repo/screenshots
+          mirror-screenshots-url: https://dl.flathub.org/media
           branch: ${{ inputs.branch }}
           cache: true
           restore-cache: true
           cache-key: ${{ inputs.os }} ${{ inputs.platform }} ${{ inputs.compiler }} flatpak ${{ hashFiles('.github/workflows/scripts/linux/flatpak/**/*.json') }}
 
-      - name: Commit screenshots to OSTree
-        run: |
-          ostree commit --repo=repo --canonical-permissions --branch=screenshots/x86_64 flatpak_app/screenshots
-
-      #- name: Validate build directory
+      #- name: Validate build
       #  run: |
-      #    flatpak run --command=flatpak-builder-lint org.flatpak.Builder builddir flatpak_app
-      #
-      #- name: Validate repo
-      #  run: |
-      #    flatpak run --command=flatpak-builder-lint org.flatpak.Builder repo repo
+      #    flatpak-builder-lint repo repo
 
       - name: Push to Flathub beta
         if: inputs.publish == true && inputs.branch == 'beta'
-        uses: flatpak/flatpak-github-actions/flat-manager@v6.3
+        uses: flathub-infra/flatpak-github-actions/flat-manager@23796715b3dfa4c86ddf50cf29c3cc8b3c82dca8
         with:
           flat-manager-url: https://hub.flathub.org/
           repository: beta
           token: ${{ secrets.FLATHUB_BETA_TOKEN }}
+          build-log-url: ${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}
 
       - name: Push to Flathub stable
         if: inputs.publish == true && inputs.branch == 'stable'
-        uses: flatpak/flatpak-github-actions/flat-manager@v6.3
+        uses: flathub-infra/flatpak-github-actions/flat-manager@23796715b3dfa4c86ddf50cf29c3cc8b3c82dca8
         with:
           flat-manager-url: https://hub.flathub.org/
           repository: stable
           token: ${{ secrets.FLATHUB_TOKEN }}
+          build-log-url: ${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}
+
+      # NOTE - this is done after on purpose so the flatpak file is wherever it needs to be for the previous pushes
+      - name: Prepare artifacts folder
+        # NOTE - 'flatpak-builder' dumps the artifact out into the current directory
+        run: |
+          mkdir -p "$GITHUB_WORKSPACE"/ci-artifacts/
+          mv "./${{ steps.artifact-metadata.outputs.artifact-name }}.flatpak" "$GITHUB_WORKSPACE"/ci-artifacts/
+
+      - name: Upload artifact
+        uses: actions/upload-artifact@v4
+        with:
+          name: ${{ steps.artifact-metadata.outputs.artifact-name }}
+          path: ci-artifacts
 

.github/workflows/linux_build_matrix.yml

@@ -15,6 +15,7 @@ jobs:
     uses: ./.github/workflows/linux_build_qt.yml
     with:
       jobName: "AppImage Build"
+      artifactPrefixName: "PCSX2-linux-Qt-x64-appimage-sse4"
       compiler: clang
       cmakeflags: ""
       buildAppImage: true
@@ -25,6 +26,7 @@ jobs:
     uses: ./.github/workflows/linux_build_flatpak.yml
     with:
       jobName: "Flatpak Build"
+      artifactPrefixName: "PCSX2-linux-Qt-x64-flatpak-sse4"
       compiler: clang
       cmakeflags: ""
       publish: false

.github/workflows/linux_build_qt.yml

@@ -6,6 +6,9 @@ on:
       jobName:
         required: true
         type: string
+      artifactPrefixName:
+        required: true
+        type: string
       os:
         required: false
         type: string
@@ -36,6 +39,10 @@ on:
         required: false
         type: boolean
         default: false
+      stableBuild:
+        required: false
+        type: boolean
+        default: false
 
 jobs:
   build_linux:
@@ -57,24 +64,28 @@ jobs:
         run: |
           sudo rm -f /etc/apt/sources.list.d/ubuntu-toolchain-r-ubuntu-test-jammy.list
           sudo apt-get update
-          sudo apt-get install -y --allow-downgrades libc6=2.35-0ubuntu3.4 libc6-dev=2.35-0ubuntu3.4 libstdc++6=12.3.0-1ubuntu1~22.04 libgcc-s1=12.3.0-1ubuntu1~22.04
+          sudo apt-get install -y --allow-downgrades 'libc6=2.35-0ubuntu*' 'libc6-dev=2.35-0ubuntu*' libstdc++6=12.3.0-1ubuntu1~22.04 libgcc-s1=12.3.0-1ubuntu1~22.04
 
       - name: Checkout Repository
         uses: actions/checkout@v4
-        with:
-          submodules: recursive
 
       # actions/checkout elides tags, fetch them primarily for releases
       - name: Fetch Tags
         if: ${{ inputs.fetchTags }}
         run: git fetch --tags --no-recurse-submodules
 
+      - name: Add stable release identifier file
+        if: ${{ inputs.stableBuild == true || inputs.stableBuild == 'true' }}
+        shell: bash
+        run: |
+          echo "#define DEFAULT_UPDATER_CHANNEL \"stable\"" > ./pcsx2-qt/DefaultUpdaterChannel.h
+          cat ./pcsx2-qt/DefaultUpdaterChannel.h
+
       - name: Prepare Artifact Metadata
         id: artifact-metadata
         shell: bash
         env:
-          OS: linux
-          ARCH: ${{ inputs.platform }}
+          PREFIX: ${{ inputs.artifactPrefixName }}
           EVENT_NAME: ${{ github.event_name }}
           PR_TITLE: ${{ github.event.pull_request.title }}
           PR_NUM: ${{ github.event.pull_request.number }}
@@ -87,27 +98,36 @@ jobs:
         run: echo "timestamp=$(date -u "+%Y-%m-%d-%H;%M;%S")" >> $GITHUB_OUTPUT
 
       - name: ccache cache files
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: .ccache
           key: ${{ inputs.os }} ${{ inputs.platform }} ${{ inputs.compiler }} ${{ inputs.detail }} ccache ${{ steps.ccache_cache_timestamp.outputs.timestamp }}
           restore-keys: ${{ inputs.os }} ${{ inputs.platform }} ${{ inputs.compiler }} ${{ inputs.detail }} ccache
 
       - name: Install Packages
-        env:
-          COMPILER: ${{ inputs.compiler }}
-        run: .github/workflows/scripts/linux/install-packages-qt.sh
+        run: |
+          tools/retry.sh wget -qO- https://apt.llvm.org/llvm-snapshot.gpg.key | sudo tee /etc/apt/trusted.gpg.d/apt.llvm.org.asc
+          sudo tools/retry.sh apt-add-repository -n 'deb http://apt.llvm.org/jammy/ llvm-toolchain-jammy-17 main'
+          sudo tools/retry.sh apt-get update
+          sudo tools/retry.sh apt-get -y install \
+            build-essential ccache clang-17 cmake curl extra-cmake-modules git libasound2-dev libaio-dev libavcodec-dev libavformat-dev libavutil-dev \
+            libcurl4-openssl-dev libdbus-1-dev libdecor-0-dev libegl-dev libevdev-dev libfontconfig-dev libfreetype-dev libfuse2 libgtk-3-dev libgudev-1.0-dev \
+            libharfbuzz-dev libinput-dev libopengl-dev libpcap-dev libpipewire-0.3-dev libpulse-dev libssl-dev libswresample-dev libswscale-dev libudev-dev \
+            libwayland-dev libx11-dev libx11-xcb-dev libxcb1-dev libxcb-composite0-dev libxcb-cursor-dev libxcb-damage0-dev libxcb-glx0-dev libxcb-icccm4-dev \
+            libxcb-image0-dev libxcb-keysyms1-dev libxcb-present-dev libxcb-randr0-dev libxcb-render0-dev libxcb-render-util0-dev libxcb-shape0-dev \
+            libxcb-shm0-dev libxcb-sync-dev libxcb-util-dev libxcb-xfixes0-dev libxcb-xinput-dev libxcb-xkb-dev libxext-dev libxkbcommon-x11-dev libxrandr-dev \
+            lld-17 llvm-17 ninja-build patchelf pkg-config zlib1g-dev
 
       - name: Cache Dependencies
         id: cache-deps
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: ~/deps
           key: ${{ inputs.os }} ${{ inputs.platform }} deps ${{ hashFiles('.github/workflows/scripts/linux/build-dependencies-qt.sh') }}
 
       - name: Build Dependencies
         if: steps.cache-deps.outputs.cache-hit != 'true'
-        run: .github/workflows/scripts/linux/build-dependencies-qt.sh
+        run: .github/workflows/scripts/linux/build-dependencies-qt.sh "$HOME/deps"
 
       - name: Download patches
         run: |
@@ -116,16 +136,31 @@ jobs:
 
       - name: Generate CMake
         env:
-          COMPILER: ${{ inputs.compiler }}
           ADDITIONAL_CMAKE_ARGS: ${{ inputs.cmakeflags }}
-          CLANG_PATH: /usr/bin/clang-17
-          CLANGXX_PATH: /usr/bin/clang++-17
         run: |
-          DEPS_PREFIX="$HOME/deps" .github/workflows/scripts/linux/generate-cmake-qt.sh
+          cmake -B build -G Ninja \
+            -DCMAKE_BUILD_TYPE=Release \
+            -DCMAKE_INTERPROCEDURAL_OPTIMIZATION=ON \
+            -DCMAKE_PREFIX_PATH="$HOME/deps" \
+            -DCMAKE_C_COMPILER=clang-17 \
+            -DCMAKE_CXX_COMPILER=clang++-17 \
+            -DCMAKE_EXE_LINKER_FLAGS_INIT="-fuse-ld=lld" \
+            -DCMAKE_MODULE_LINKER_FLAGS_INIT="-fuse-ld=lld" \
+            -DCMAKE_CXX_COMPILER_LAUNCHER=ccache \
+            -DENABLE_SETCAP=OFF \
+            -DDISABLE_ADVANCE_SIMD=TRUE \
+            $ADDITIONAL_CMAKE_ARGS
 
       - name: Build PCSX2
         working-directory: build
-        run: ../.github/workflows/scripts/linux/compile.sh
+        run: |
+          # Prepare the Cache
+          ccache -p
+          ccache -z
+          # Build
+          ninja
+          # Save the Cache
+          ccache -s
 
       - name: Run Tests
         working-directory: ./build
@@ -142,7 +177,7 @@ jobs:
 
       - name: Upload artifact
         if: inputs.buildAppImage == true
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: ${{ steps.artifact-metadata.outputs.artifact-name }}
           path: ci-artifacts

.github/workflows/macos_build.yml

@@ -6,10 +6,13 @@ on:
       jobName:
         required: true
         type: string
+      artifactPrefixName:
+        required: true
+        type: string
       os:
         required: false
         type: string
-        default: macos-13
+        default: macos-14
       patchesUrl:
         required: false
         type: string
@@ -18,6 +21,10 @@ on:
         required: false
         type: boolean
         default: false
+      stableBuild:
+        required: false
+        type: boolean
+        default: false
 
 jobs:
   build_macos:
@@ -36,22 +43,27 @@ jobs:
     steps:
       - name: Checkout Repository
         uses: actions/checkout@v4
-        with:
-          submodules: recursive
 
       # actions/checkout elides tags, fetch them primarily for releases
       - name: Fetch Tags
         if: ${{ inputs.fetchTags }}
         run: git fetch --tags --no-recurse-submodules
 
-      - name: Use Xcode 14.3.1
-        run: sudo xcode-select -s /Applications/Xcode_14.3.1.app
+      - name: Add stable release identifier file
+        if: ${{ inputs.stableBuild == true || inputs.stableBuild == 'true' }}
+        shell: bash
+        run: |
+          echo "#define DEFAULT_UPDATER_CHANNEL \"stable\"" > ./pcsx2-qt/DefaultUpdaterChannel.h
+          cat ./pcsx2-qt/DefaultUpdaterChannel.h
+
+      - name: Use Xcode 15.2
+        run: sudo xcode-select -s /Applications/Xcode_15.2.app
 
       - name: Prepare Artifact Metadata
         id: artifact-metadata
         shell: bash
         env:
-          OS: macos
+          PREFIX: ${{ inputs.artifactPrefixName }}
           EVENT_NAME: ${{ github.event_name }}
           PR_TITLE: ${{ github.event.pull_request.title }}
           PR_NUM: ${{ github.event.pull_request.number }}
@@ -60,26 +72,25 @@ jobs:
 
       - name: Install Packages
         env:
-          PLATFORM: "x64"
           HOMEBREW_NO_INSTALL_CLEANUP: 1
           HOMEBREW_NO_ANALYTICS: 1
         run: |
-          # Unlike other packages, brew's MoltenVK build uses MoltenVK's minimum macOS version of 10.13 so we can use it
-          if ! brew install molten-vk ccache nasm; then
+          if ! brew install ccache nasm; then
             brew update
-            brew install molten-vk ccache nasm
+            brew install ccache nasm
           fi
 
       - name: Cache Dependencies
         id: cache-deps
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: ~/deps
           key: ${{ inputs.os }} deps ${{ hashFiles('.github/workflows/scripts/macos/build-dependencies.sh') }}
 
       - name: Build Dependencies
         if: steps.cache-deps.outputs.cache-hit != 'true'
-        run: .github/workflows/scripts/macos/build-dependencies.sh
+        run: |
+          .github/workflows/scripts/macos/build-dependencies.sh "$HOME/deps"
 
       - name: Download patches
         run: |
@@ -92,7 +103,7 @@ jobs:
         run: echo "timestamp=$(date -u "+%Y-%m-%d-%H;%M;%S")" >> $GITHUB_OUTPUT
 
       - name: Cache ccache cache
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: .ccache
           key: ${{ inputs.os }} ccache ${{ steps.ccache_cache_timestamp.outputs.timestamp }}
@@ -102,11 +113,9 @@ jobs:
         run: |
           cmake -DCMAKE_PREFIX_PATH="$HOME/deps" \
                 -DCMAKE_BUILD_TYPE=Release \
-                -DUSE_OPENGL=OFF \
+                -DCMAKE_OSX_ARCHITECTURES="x86_64" \
                 -DDISABLE_ADVANCE_SIMD=ON \
                 -DCMAKE_INTERPROCEDURAL_OPTIMIZATION=ON \
-                -DUSE_SYSTEM_LIBS=OFF \
-                -DUSE_SYSTEM_SDL2=ON \
                 -DUSE_LINKED_FFMPEG=ON \
                 -DCMAKE_C_COMPILER_LAUNCHER=ccache \
                 -DCMAKE_CXX_COMPILER_LAUNCHER=ccache \
@@ -135,7 +144,6 @@ jobs:
 
       - name: Prepare Build Artifacts
         run: |
-          cp /usr/local/lib/libMoltenVK.dylib build/pcsx2*/PCSX2.app/Contents/Frameworks/
           TAG="$(git tag --points-at HEAD)"
           if [ -z "$TAG" ]; then
             APPNAME="${{ steps.artifact-metadata.outputs.artifact-name }}"
@@ -148,7 +156,7 @@ jobs:
           cp "${{ steps.artifact-metadata.outputs.artifact-name }}.tar.xz" ci-artifacts/macOS.tar.xz
 
       - name: Upload Artifact
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: ${{ steps.artifact-metadata.outputs.artifact-name }}
           path: "*.tar.xz"

.github/workflows/macos_build_matrix.yml

@@ -15,4 +15,5 @@ jobs:
     uses: ./.github/workflows/macos_build.yml
     with:
       jobName: "MacOS Build"
+      artifactPrefixName: "PCSX2-macos-Qt"
     secrets: inherit

.github/workflows/release_cut_new.yml

@@ -10,16 +10,19 @@ on:
   push:
     branches:
       - master
-  # TODO - future work
-  # workflow_dispatch:
-  #   inputs:
-  #     isStable:
-  #       description: 'Should it be a stable release?'
-  #       required: true
-  #       default: 'false'
-  #     versionTag:
-  #       description: 'The version to tag with'
-  #       required: true
+  workflow_dispatch:
+    inputs:
+      is_prelease:
+        description: 'Should be a pre-release?'
+        required: true
+        default: 'true'
+        type: choice
+        options:
+          - 'true'
+          - 'false'
+      tag_value:
+        description: 'Create a new release from latest master with the given tag, if this is left blank it will bump the patch version. You dont need to include the "v" prefix'
+        required: false
 
 permissions:
   contents: write
@@ -37,11 +40,13 @@ jobs:
       # Docs - https://github.com/mathieudutour/github-tag-action
       - name: Bump Version and Push Tag
         id: tag_version
-        uses: mathieudutour/github-tag-action@v6.1
+        uses: mathieudutour/github-tag-action@v6.2
         with:
           github_token: ${{ github.token }}
           tag_prefix: v
           default_bump: patch
+          # if set, it will overwrite the bump settings
+          custom_tag: ${{ github.event.inputs.tag_value == '' && null || github.event.inputs.tag_value }}
 
       # TODO - we could do this and remove the node.js script, but auto-generated notes only work
       # with PRs -- not commits (determine how much we care).
@@ -62,9 +67,18 @@ jobs:
           node index.js
           mv ./release-notes.md ${GITHUB_WORKSPACE}/release-notes.md
 
-      - name: Create a GitHub Release
-        uses: softprops/action-gh-release@v1
-        if: steps.tag_version.outputs.new_tag
+      - name: Create a GitHub Release (Manual)
+        uses: softprops/action-gh-release@v2
+        if: steps.tag_version.outputs.new_tag && github.event_name == 'workflow_dispatch'
+        with:
+          body_path: ./release-notes.md
+          draft: true
+          prerelease: ${{ github.event_name != 'workflow_dispatch' || inputs.is_prelease == 'true' }}
+          tag_name: ${{ steps.tag_version.outputs.new_tag }}
+
+      - name: Create a GitHub Release (Push)
+        uses: softprops/action-gh-release@v2
+        if: steps.tag_version.outputs.new_tag && github.event_name != 'workflow_dispatch'
         with:
           body_path: ./release-notes.md
           draft: true
@@ -81,10 +95,12 @@ jobs:
     uses: ./.github/workflows/linux_build_qt.yml
     with:
       jobName: "AppImage Build"
+      artifactPrefixName: "PCSX2-linux-Qt-x64-appimage"
       compiler: clang
       cmakeflags: ""
       buildAppImage: true
       fetchTags: true
+      stableBuild: ${{ github.event_name == 'workflow_dispatch' && inputs.is_prelease == 'false' }}
     secrets: inherit
 
   build_linux_flatpak:
@@ -95,11 +111,13 @@ jobs:
     uses: ./.github/workflows/linux_build_flatpak.yml
     with:
       jobName: "Flatpak Build"
+      artifactPrefixName: "PCSX2-linux-Qt-x64-flatpak"
       compiler: clang
       cmakeflags: ""
       branch: "stable"
       publish: false
       fetchTags: true
+      stableBuild: ${{ github.event_name == 'workflow_dispatch' && inputs.is_prelease == 'false' }}
     secrets: inherit
 
   # Windows
@@ -111,10 +129,12 @@ jobs:
     uses: ./.github/workflows/windows_build_qt.yml
     with:
       jobName: "Windows Build"
+      artifactPrefixName: "PCSX2-windows-Qt-x64"
       configuration: CMake
       buildSystem: cmake
       cmakeFlags: -DCMAKE_C_COMPILER=clang-cl -DCMAKE_CXX_COMPILER=clang-cl
       fetchTags: true
+      stableBuild: ${{ github.event_name == 'workflow_dispatch' && inputs.is_prelease == 'false' }}
     secrets: inherit
 
   # MacOS
@@ -126,7 +146,9 @@ jobs:
     uses: ./.github/workflows/macos_build.yml
     with:
       jobName: "MacOS Build"
+      artifactPrefixName: "PCSX2-macos-Qt"
       fetchTags: true
+      stableBuild: ${{ github.event_name == 'workflow_dispatch' && inputs.is_prelease == 'false' }}
     secrets: inherit
 
   # Upload the Artifacts
@@ -146,7 +168,7 @@ jobs:
       - name: Prepare Artifact Folder
         run: mkdir ./ci-artifacts/
 
-      - uses: actions/download-artifact@v3
+      - uses: actions/download-artifact@v4
         name: Download all Artifacts
         with:
           path: ./ci-artifacts/
@@ -159,9 +181,6 @@ jobs:
         working-directory: ./ci-artifacts/
         run: for d in *windows*/; do 7z a "${d}asset.7z" ./$d/*; done
 
-      # Artifact Naming:
-      # MacOS: PCSX2-<tag>-macOS-[additional hyphen seperated tags]
-      # Windows|Linux: PCSX2-<tag>-<windows|linux>-<32bit|64bit>--[additional hyphen seperated tags]
       - name: Name and Upload the Release Assets
         env:
           GITHUB_TOKEN: ${{ github.token }}

.github/workflows/scripts/common/name-artifacts.sh

@@ -1,39 +1,26 @@
 #!/bin/bash
 
 # Artifact Naming Scheme:
-# PCSX2-<OS>-Qt-[ARCH]-[SIMD]-[pr\[PR_NUM\]]-[title|sha\[SHA|PR_TITLE\]
+# PCSX2-<OS>-Qt-[BUILD_SYSTEM]-[ARCH]-[SIMD]-[pr\[PR_NUM\]]-[title|sha\[SHA|PR_TITLE\]
 # -- limited to 200 chars
 # Outputs:
 # - artifact-name
 
+# Example - PCSX2-linux-Qt-x64-flatpak-sse4-sha[e880a2749]
+
 # Inputs as env-vars
-# OS
-# BUILD_SYSTEM
-# ARCH
-# SIMD
+# PREFIX
 # EVENT_NAME
 # PR_TITLE
 # PR_NUM
 # PR_SHA
 
-NAME=""
-
-if [ "${OS}" == "macos" ]; then
-  # MacOS has combined binaries for x64 and ARM64.
-  NAME="PCSX2-${OS}-Qt"
-elif [[ ("${OS}" == "windows" && "$BUILD_SYSTEM" != "cmake") ]]; then
-  NAME="PCSX2-${OS}-Qt-${ARCH}-${SIMD}"
-else
-  NAME="PCSX2-${OS}-Qt-${ARCH}"
+if [[ -z "${PREFIX}" ]]; then
+  echo "PREFIX is not set, can't name artifact without it!"
+  exit 1
 fi
 
-# Add cmake if used to differentate it from msbuild builds
-# Else the two artifacts will have the same name and the files will be merged
-if [[ ! -z "${BUILD_SYSTEM}" ]]; then
-  if [[ "${BUILD_SYSTEM}" == "cmake" ]] || [[ "${BUILD_SYSTEM}" == "flatpak" ]]; then
-    NAME="${NAME}-${BUILD_SYSTEM}"
-  fi
-fi
+NAME="${PREFIX}"
 
 # Add PR / Commit Metadata
 if [ "$EVENT_NAME" == "pull_request" ]; then

.github/workflows/scripts/common/shaderc-changes.patch

@@ -0,0 +1,577 @@
+diff --git a/CHANGES b/CHANGES
+index 5d3dd16..587b612 100644
+--- a/CHANGES
++++ b/CHANGES
+@@ -4,7 +4,7 @@ v2024.1
+  - Update dependencies
+  - Propagate test/install options to Glslang
+ 
+-v2024.0
++v2024.0 2024-03-09
+  - Update dependencies
+  - Utilities:
+     - Use Python3 explicitly in utility scripts
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index ffcb54b..7c1a6d8 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -117,6 +117,9 @@ if(MSVC)
+   endif()
+ endif(MSVC)
+ 
++if(NOT WIN32)
++  add_definitions("-fvisibility=hidden")
++endif()
+ 
+ # Configure subdirectories.
+ # We depend on these for later projects, so they should come first.
+@@ -124,7 +127,6 @@ add_subdirectory(third_party)
+ 
+ add_subdirectory(libshaderc_util)
+ add_subdirectory(libshaderc)
+-add_subdirectory(glslc)
+ if(${SHADERC_ENABLE_EXAMPLES})
+     add_subdirectory(examples)
+ endif()
+@@ -158,5 +160,3 @@ function(define_pkg_config_file NAME LIBS)
+ endfunction()
+ 
+ define_pkg_config_file(shaderc -lshaderc_shared)
+-define_pkg_config_file(shaderc_static "-lshaderc ${EXTRA_STATIC_PKGCONFIG_LIBS} -lshaderc_util")
+-define_pkg_config_file(shaderc_combined -lshaderc_combined)
+diff --git a/libshaderc/CMakeLists.txt b/libshaderc/CMakeLists.txt
+index df9a88d..b15e5d7 100644
+--- a/libshaderc/CMakeLists.txt
++++ b/libshaderc/CMakeLists.txt
+@@ -24,13 +24,6 @@ set(SHADERC_SOURCES
+   src/shaderc_private.h
+ )
+ 
+-add_library(shaderc STATIC ${SHADERC_SOURCES})
+-shaderc_default_compile_options(shaderc)
+-target_include_directories(shaderc
+-    PUBLIC include
+-    PRIVATE ${glslang_SOURCE_DIR}
+-            ${SPIRV-Headers_SOURCE_DIR}/include)
+-
+ add_library(shaderc_shared SHARED ${SHADERC_SOURCES})
+ shaderc_default_compile_options(shaderc_shared)
+ target_include_directories(shaderc_shared
+@@ -54,7 +47,7 @@ if(SHADERC_ENABLE_INSTALL)
+     DESTINATION
+       ${CMAKE_INSTALL_INCLUDEDIR}/shaderc)
+ 
+-  install(TARGETS shaderc shaderc_shared
++  install(TARGETS shaderc_shared
+     LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
+     RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
+     BUNDLE DESTINATION ${CMAKE_INSTALL_BINDIR}
+@@ -69,20 +62,8 @@ set(SHADERC_LIBS
+   SPIRV-Tools
+ )
+ 
+-target_link_libraries(shaderc PRIVATE ${SHADERC_LIBS})
+ target_link_libraries(shaderc_shared PRIVATE ${SHADERC_LIBS})
+ 
+-shaderc_add_tests(
+-  TEST_PREFIX shaderc
+-  LINK_LIBS shaderc
+-  INCLUDE_DIRS include ${shaderc_SOURCE_DIR}/libshaderc_util/include ${glslang_SOURCE_DIR}
+-               ${spirv-tools_SOURCE_DIR}/include
+-               ${SPIRV-Headers_SOURCE_DIR}/include
+-  TEST_NAMES
+-    shaderc
+-    shaderc_cpp
+-    shaderc_private)
+-
+ shaderc_add_tests(
+   TEST_PREFIX shaderc_shared
+   LINK_LIBS shaderc_shared SPIRV-Tools
+@@ -94,22 +75,6 @@ shaderc_add_tests(
+     shaderc_cpp
+     shaderc_private)
+ 
+-shaderc_combine_static_lib(shaderc_combined shaderc)
+-
+-if(SHADERC_ENABLE_INSTALL)
+-  install(TARGETS shaderc_combined DESTINATION ${CMAKE_INSTALL_LIBDIR})
+-endif(SHADERC_ENABLE_INSTALL)
+-
+-shaderc_add_tests(
+-  TEST_PREFIX shaderc_combined
+-  LINK_LIBS shaderc_combined ${CMAKE_THREAD_LIBS_INIT}
+-  INCLUDE_DIRS include ${shaderc_SOURCE_DIR}/libshaderc_util/include ${glslang_SOURCE_DIR}
+-               ${spirv-tools_SOURCE_DIR}/include
+-               ${SPIRV-Headers_SOURCE_DIR}/include
+-  TEST_NAMES
+-    shaderc
+-    shaderc_cpp)
+-
+ if(${SHADERC_ENABLE_TESTS})
+   add_executable(shaderc_c_smoke_test ./src/shaderc_c_smoke_test.c)
+   shaderc_default_c_compile_options(shaderc_c_smoke_test)
+diff --git a/libshaderc/include/shaderc/shaderc.h b/libshaderc/include/shaderc/shaderc.h
+index 3a3e97d..65d5b77 100644
+--- a/libshaderc/include/shaderc/shaderc.h
++++ b/libshaderc/include/shaderc/shaderc.h
+@@ -317,7 +317,7 @@ SHADERC_EXPORT void shaderc_compile_options_set_source_language(
+ 
+ // Sets the compiler mode to generate debug information in the output.
+ SHADERC_EXPORT void shaderc_compile_options_set_generate_debug_info(
+-    shaderc_compile_options_t options);
++    shaderc_compile_options_t options, bool enabled, bool enable_non_semantic);
+ 
+ // Sets the compiler optimization level to the given level. Only the last one
+ // takes effect if multiple calls of this function exist.
+@@ -506,6 +506,10 @@ SHADERC_EXPORT void shaderc_compile_options_set_invert_y(
+ SHADERC_EXPORT void shaderc_compile_options_set_nan_clamp(
+     shaderc_compile_options_t options, bool enable);
+ 
++// Returns a string representation of the specified compilation status.
++SHADERC_EXPORT const char* shaderc_compilation_status_to_string(
++    shaderc_compilation_status status);
++
+ // An opaque handle to the results of a call to any shaderc_compile_into_*()
+ // function.
+ typedef struct shaderc_compilation_result* shaderc_compilation_result_t;
+@@ -529,28 +533,31 @@ typedef struct shaderc_compilation_result* shaderc_compilation_result_t;
+ // present.  May be safely called from multiple threads without explicit
+ // synchronization. If there was failure in allocating the compiler object,
+ // null will be returned.
+-SHADERC_EXPORT shaderc_compilation_result_t shaderc_compile_into_spv(
++SHADERC_EXPORT shaderc_compilation_status shaderc_compile_into_spv(
+     const shaderc_compiler_t compiler, const char* source_text,
+     size_t source_text_size, shaderc_shader_kind shader_kind,
+     const char* input_file_name, const char* entry_point_name,
+-    const shaderc_compile_options_t additional_options);
++    const shaderc_compile_options_t additional_options,
++    shaderc_compilation_result_t* result);
+ 
+ // Like shaderc_compile_into_spv, but the result contains SPIR-V assembly text
+ // instead of a SPIR-V binary module.  The SPIR-V assembly syntax is as defined
+ // by the SPIRV-Tools open source project.
+-SHADERC_EXPORT shaderc_compilation_result_t shaderc_compile_into_spv_assembly(
++SHADERC_EXPORT shaderc_compilation_status shaderc_compile_into_spv_assembly(
+     const shaderc_compiler_t compiler, const char* source_text,
+     size_t source_text_size, shaderc_shader_kind shader_kind,
+     const char* input_file_name, const char* entry_point_name,
+-    const shaderc_compile_options_t additional_options);
++    const shaderc_compile_options_t additional_options,
++    shaderc_compilation_result_t* result);
+ 
+ // Like shaderc_compile_into_spv, but the result contains preprocessed source
+ // code instead of a SPIR-V binary module
+-SHADERC_EXPORT shaderc_compilation_result_t shaderc_compile_into_preprocessed_text(
++SHADERC_EXPORT shaderc_compilation_status shaderc_compile_into_preprocessed_text(
+     const shaderc_compiler_t compiler, const char* source_text,
+     size_t source_text_size, shaderc_shader_kind shader_kind,
+     const char* input_file_name, const char* entry_point_name,
+-    const shaderc_compile_options_t additional_options);
++    const shaderc_compile_options_t additional_options,
++    shaderc_compilation_result_t* result);
+ 
+ // Takes an assembly string of the format defined in the SPIRV-Tools project
+ // (https://github.com/KhronosGroup/SPIRV-Tools/blob/master/syntax.md),
+@@ -561,10 +568,11 @@ SHADERC_EXPORT shaderc_compilation_result_t shaderc_compile_into_preprocessed_te
+ // May be safely called from multiple threads without explicit synchronization.
+ // If there was failure in allocating the compiler object, null will be
+ // returned.
+-SHADERC_EXPORT shaderc_compilation_result_t shaderc_assemble_into_spv(
++SHADERC_EXPORT shaderc_compilation_status shaderc_assemble_into_spv(
+     const shaderc_compiler_t compiler, const char* source_assembly,
+     size_t source_assembly_size,
+-    const shaderc_compile_options_t additional_options);
++    const shaderc_compile_options_t additional_options,
++    shaderc_compilation_result_t* result);
+ 
+ // The following functions, operating on shaderc_compilation_result_t objects,
+ // offer only the basic thread-safety guarantee.
+diff --git a/libshaderc/include/shaderc/shaderc.hpp b/libshaderc/include/shaderc/shaderc.hpp
+index 3817af8..5592b49 100644
+--- a/libshaderc/include/shaderc/shaderc.hpp
++++ b/libshaderc/include/shaderc/shaderc.hpp
+@@ -168,8 +168,9 @@ class CompileOptions {
+   }
+ 
+   // Sets the compiler mode to generate debug information in the output.
+-  void SetGenerateDebugInfo() {
+-    shaderc_compile_options_set_generate_debug_info(options_);
++  void SetGenerateDebugInfo(bool enabled, bool non_semantic_debug_info) {
++    shaderc_compile_options_set_generate_debug_info(options_, enabled,
++      non_sematic_debug_info);
+   }
+ 
+   // Sets the compiler optimization level to the given level. Only the last one
+@@ -425,9 +426,10 @@ class Compiler {
+                                         const char* input_file_name,
+                                         const char* entry_point_name,
+                                         const CompileOptions& options) const {
+-    shaderc_compilation_result_t compilation_result = shaderc_compile_into_spv(
++    shaderc_compilation_result_t compilation_result = nullptr;
++    shaderc_compile_into_spv(
+         compiler_, source_text, source_text_size, shader_kind, input_file_name,
+-        entry_point_name, options.options_);
++        entry_point_name, options.options_, &compilation_result);
+     return SpvCompilationResult(compilation_result);
+   }
+ 
+@@ -451,9 +453,10 @@ class Compiler {
+                                         size_t source_text_size,
+                                         shaderc_shader_kind shader_kind,
+                                         const char* input_file_name) const {
+-    shaderc_compilation_result_t compilation_result =
+-        shaderc_compile_into_spv(compiler_, source_text, source_text_size,
+-                                 shader_kind, input_file_name, "main", nullptr);
++    shaderc_compilation_result_t compilation_result = nullptr;
++    shaderc_compile_into_spv(compiler_, source_text, source_text_size,
++                             shader_kind, input_file_name, "main", nullptr,
++                             &compilation_result);
+     return SpvCompilationResult(compilation_result);
+   }
+ 
+@@ -504,8 +507,11 @@ class Compiler {
+   SpvCompilationResult AssembleToSpv(const char* source_assembly,
+                                      size_t source_assembly_size,
+                                      const CompileOptions& options) const {
+-    return SpvCompilationResult(shaderc_assemble_into_spv(
+-        compiler_, source_assembly, source_assembly_size, options.options_));
++    shaderc_compilation_result_t compilation_result = nullptr;
++    shaderc_assemble_into_spv(
++        compiler_, source_assembly, source_assembly_size, options.options_,
++        &compilation_result);
++    return SpvCompilationResult(compilation_result);
+   }
+ 
+   // Assembles the given SPIR-V assembly and returns a SPIR-V binary module
+@@ -513,8 +519,11 @@ class Compiler {
+   // Like the first AssembleToSpv method but uses the default compiler options.
+   SpvCompilationResult AssembleToSpv(const char* source_assembly,
+                                      size_t source_assembly_size) const {
+-    return SpvCompilationResult(shaderc_assemble_into_spv(
+-        compiler_, source_assembly, source_assembly_size, nullptr));
++    shaderc_compilation_result_t compilation_result = nullptr;
++    shaderc_assemble_into_spv(
++        compiler_, source_assembly, source_assembly_size, nullptr,
++        &compilation_result);
++    return SpvCompilationResult(compilation_result);
+   }
+ 
+   // Assembles the given SPIR-V assembly and returns a SPIR-V binary module
+@@ -523,9 +532,11 @@ class Compiler {
+   // std::string.
+   SpvCompilationResult AssembleToSpv(const std::string& source_assembly,
+                                      const CompileOptions& options) const {
+-    return SpvCompilationResult(
+-        shaderc_assemble_into_spv(compiler_, source_assembly.data(),
+-                                  source_assembly.size(), options.options_));
++    shaderc_compilation_result_t compilation_result = nullptr;
++    shaderc_assemble_into_spv(
++      compiler_, source_assembly.data(), source_assembly.size(),
++      options.options_, &compilation_result);
++    return SpvCompilationResult(compilation_result);
+   }
+ 
+   // Assembles the given SPIR-V assembly and returns a SPIR-V binary module
+@@ -533,8 +544,10 @@ class Compiler {
+   // Like the first AssembleToSpv method but the source is provided as a
+   // std::string and also uses default compiler options.
+   SpvCompilationResult AssembleToSpv(const std::string& source_assembly) const {
+-    return SpvCompilationResult(shaderc_assemble_into_spv(
+-        compiler_, source_assembly.data(), source_assembly.size(), nullptr));
++    shaderc_compilation_result_t compilation_result = nullptr;
++    shaderc_assemble_into_spv(compiler_, source_assembly.data(),
++      source_assembly.size(), nullptr, &compilation_result);
++    return SpvCompilationResult(compilation_result);
+   }
+ 
+   // Compiles the given source GLSL and returns the SPIR-V assembly text
+@@ -544,10 +557,11 @@ class Compiler {
+       const char* source_text, size_t source_text_size,
+       shaderc_shader_kind shader_kind, const char* input_file_name,
+       const char* entry_point_name, const CompileOptions& options) const {
+-    shaderc_compilation_result_t compilation_result =
+-        shaderc_compile_into_spv_assembly(
+-            compiler_, source_text, source_text_size, shader_kind,
+-            input_file_name, entry_point_name, options.options_);
++    shaderc_compilation_result_t compilation_result = nullptr;
++    shaderc_compile_into_spv_assembly(
++        compiler_, source_text, source_text_size, shader_kind,
++        input_file_name, entry_point_name, options.options_,
++        &compilation_result);
+     return AssemblyCompilationResult(compilation_result);
+   }
+ 
+@@ -592,10 +606,10 @@ class Compiler {
+       const char* source_text, size_t source_text_size,
+       shaderc_shader_kind shader_kind, const char* input_file_name,
+       const CompileOptions& options) const {
+-    shaderc_compilation_result_t compilation_result =
+-        shaderc_compile_into_preprocessed_text(
++    shaderc_compilation_result_t compilation_result;
++    shaderc_compile_into_preprocessed_text(
+             compiler_, source_text, source_text_size, shader_kind,
+-            input_file_name, "main", options.options_);
++            input_file_name, "main", options.options_, &compilation_result);
+     return PreprocessedSourceCompilationResult(compilation_result);
+   }
+ 
+diff --git a/libshaderc/src/shaderc.cc b/libshaderc/src/shaderc.cc
+index 63f1bbc..c1a9b12 100644
+--- a/libshaderc/src/shaderc.cc
++++ b/libshaderc/src/shaderc.cc
+@@ -418,8 +418,12 @@ void shaderc_compile_options_set_source_language(
+ }
+ 
+ void shaderc_compile_options_set_generate_debug_info(
+-    shaderc_compile_options_t options) {
+-  options->compiler.SetGenerateDebugInfo();
++    shaderc_compile_options_t options, bool enabled, bool enable_non_semantic) {
++  if (enabled) {
++    options->compiler.SetGenerateDebugInfo();
++    if (enable_non_semantic)
++      options->compiler.SetEmitNonSemanticDebugInfo();
++  }
+ }
+ 
+ void shaderc_compile_options_set_optimization_level(
+@@ -591,8 +595,31 @@ void shaderc_compiler_release(shaderc_compiler_t compiler) {
+   delete compiler;
+ }
+ 
++const char* shaderc_compilation_status_to_string(shaderc_compilation_status status)
++{
++  static constexpr const std::pair<shaderc_compilation_status, const char*> status_names[] = {
++    {shaderc_compilation_status_success, "shaderc_compilation_status_success"},
++    {shaderc_compilation_status_invalid_stage, "shaderc_compilation_status_invalid_stage"},
++    {shaderc_compilation_status_compilation_error, "shaderc_compilation_status_compilation_error"},
++    {shaderc_compilation_status_internal_error, "shaderc_compilation_status_internal_error"},
++    {shaderc_compilation_status_null_result_object, "shaderc_compilation_status_null_result_object"},
++    {shaderc_compilation_status_invalid_assembly, "shaderc_compilation_status_invalid_assembly"},
++    {shaderc_compilation_status_validation_error, "shaderc_compilation_status_validation_error"},
++    {shaderc_compilation_status_transformation_error, "shaderc_compilation_status_transformation_error"},
++    {shaderc_compilation_status_configuration_error, "shaderc_compilation_status_configuration_error"},
++  };
++
++  for (const auto& it : status_names)
++  {
++    if (status == it.first)
++      return it.second;
++  }
++
++  return "shaderc_compilation_status_unknown";
++}
++
+ namespace {
+-shaderc_compilation_result_t CompileToSpecifiedOutputType(
++shaderc_compilation_result_vector* CompileToSpecifiedOutputType(
+     const shaderc_compiler_t compiler, const char* source_text,
+     size_t source_text_size, shaderc_shader_kind shader_kind,
+     const char* input_file_name, const char* entry_point_name,
+@@ -669,48 +696,59 @@ shaderc_compilation_result_t CompileToSpecifiedOutputType(
+ }
+ }  // anonymous namespace
+ 
+-shaderc_compilation_result_t shaderc_compile_into_spv(
++shaderc_compilation_status shaderc_compile_into_spv(
+     const shaderc_compiler_t compiler, const char* source_text,
+     size_t source_text_size, shaderc_shader_kind shader_kind,
+     const char* input_file_name, const char* entry_point_name,
+-    const shaderc_compile_options_t additional_options) {
+-  return CompileToSpecifiedOutputType(
++    const shaderc_compile_options_t additional_options,
++    shaderc_compilation_result_t* result) {
++  shaderc_compilation_result_vector* resultv = CompileToSpecifiedOutputType(
+       compiler, source_text, source_text_size, shader_kind, input_file_name,
+       entry_point_name, additional_options,
+       shaderc_util::Compiler::OutputType::SpirvBinary);
++  *result = resultv;
++  return resultv ? resultv->compilation_status : shaderc_compilation_status_internal_error;
+ }
+ 
+-shaderc_compilation_result_t shaderc_compile_into_spv_assembly(
++shaderc_compilation_status shaderc_compile_into_spv_assembly(
+     const shaderc_compiler_t compiler, const char* source_text,
+     size_t source_text_size, shaderc_shader_kind shader_kind,
+     const char* input_file_name, const char* entry_point_name,
+-    const shaderc_compile_options_t additional_options) {
+-  return CompileToSpecifiedOutputType(
++    const shaderc_compile_options_t additional_options,
++    shaderc_compilation_result_t* result) {
++  shaderc_compilation_result_vector* resultv = CompileToSpecifiedOutputType(
+       compiler, source_text, source_text_size, shader_kind, input_file_name,
+       entry_point_name, additional_options,
+       shaderc_util::Compiler::OutputType::SpirvAssemblyText);
++  *result = resultv;
++  return resultv ? resultv->compilation_status : shaderc_compilation_status_internal_error;
+ }
+ 
+-shaderc_compilation_result_t shaderc_compile_into_preprocessed_text(
++shaderc_compilation_status shaderc_compile_into_preprocessed_text(
+     const shaderc_compiler_t compiler, const char* source_text,
+     size_t source_text_size, shaderc_shader_kind shader_kind,
+     const char* input_file_name, const char* entry_point_name,
+-    const shaderc_compile_options_t additional_options) {
+-  return CompileToSpecifiedOutputType(
++    const shaderc_compile_options_t additional_options,
++    shaderc_compilation_result_t* result) {
++  shaderc_compilation_result_vector* resultv = CompileToSpecifiedOutputType(
+       compiler, source_text, source_text_size, shader_kind, input_file_name,
+       entry_point_name, additional_options,
+       shaderc_util::Compiler::OutputType::PreprocessedText);
++  *result = resultv;
++  return resultv ? resultv->compilation_status : shaderc_compilation_status_internal_error;
+ }
+ 
+-shaderc_compilation_result_t shaderc_assemble_into_spv(
++shaderc_compilation_status shaderc_assemble_into_spv(
+     const shaderc_compiler_t compiler, const char* source_assembly,
+     size_t source_assembly_size,
+-    const shaderc_compile_options_t additional_options) {
+-  auto* result = new (std::nothrow) shaderc_compilation_result_spv_binary;
+-  if (!result) return nullptr;
+-  result->compilation_status = shaderc_compilation_status_invalid_assembly;
+-  if (!compiler->initializer) return result;
+-  if (source_assembly == nullptr) return result;
++    const shaderc_compile_options_t additional_options,
++    shaderc_compilation_result_t* result) {
++  auto* bresult = new (std::nothrow) shaderc_compilation_result_spv_binary;
++  if (!bresult) return shaderc_compilation_status_internal_error;
++  bresult->compilation_status = shaderc_compilation_status_invalid_assembly;
++  *result = bresult;
++  if (!compiler->initializer) return bresult->compilation_status;
++  if (source_assembly == nullptr) return bresult->compilation_status;
+ 
+   TRY_IF_EXCEPTIONS_ENABLED {
+     spv_binary assembling_output_data = nullptr;
+@@ -724,22 +762,22 @@ shaderc_compilation_result_t shaderc_assemble_into_spv(
+         GetCompilerTargetEnvVersion(target_env_version),
+         {source_assembly, source_assembly + source_assembly_size},
+         &assembling_output_data, &errors);
+-    result->num_errors = !assembling_succeeded;
++    bresult->num_errors = !assembling_succeeded;
+     if (assembling_succeeded) {
+-      result->SetOutputData(assembling_output_data);
+-      result->output_data_size =
++      bresult->SetOutputData(assembling_output_data);
++      bresult->output_data_size =
+           assembling_output_data->wordCount * sizeof(uint32_t);
+-      result->compilation_status = shaderc_compilation_status_success;
++      bresult->compilation_status = shaderc_compilation_status_success;
+     } else {
+-      result->messages = std::move(errors);
+-      result->compilation_status = shaderc_compilation_status_invalid_assembly;
++      bresult->messages = std::move(errors);
++      bresult->compilation_status = shaderc_compilation_status_invalid_assembly;
+     }
+   }
+   CATCH_IF_EXCEPTIONS_ENABLED(...) {
+-    result->compilation_status = shaderc_compilation_status_internal_error;
++    bresult->compilation_status = shaderc_compilation_status_internal_error;
+   }
+ 
+-  return result;
++  return bresult->compilation_status;
+ }
+ 
+ size_t shaderc_result_get_length(const shaderc_compilation_result_t result) {
+diff --git a/libshaderc_util/include/libshaderc_util/compiler.h b/libshaderc_util/include/libshaderc_util/compiler.h
+index d9d02b9..b076ec8 100644
+--- a/libshaderc_util/include/libshaderc_util/compiler.h
++++ b/libshaderc_util/include/libshaderc_util/compiler.h
+@@ -195,6 +195,7 @@ class Compiler {
+         warnings_as_errors_(false),
+         suppress_warnings_(false),
+         generate_debug_info_(false),
++        emit_non_semantic_debug_info_(false),
+         enabled_opt_passes_(),
+         target_env_(TargetEnv::Vulkan),
+         target_env_version_(TargetEnvVersion::Default),
+@@ -220,6 +221,10 @@ class Compiler {
+   // such as identifier names and line numbers.
+   void SetGenerateDebugInfo();
+ 
++  // Requests that the compiler emit non-semantic debug information.
++  // Requires VK_KHR_shader_non_semantic_info.
++  void SetEmitNonSemanticDebugInfo();
++
+   // Sets the optimization level to the given level. Only the last one takes
+   // effect if multiple calls of this method exist.
+   void SetOptimizationLevel(OptimizationLevel level);
+@@ -486,6 +491,10 @@ class Compiler {
+   // output.
+   bool generate_debug_info_;
+ 
++  // When true and generate_debug_info_ is also set, generate non-semantic debug
++  // information.
++  bool emit_non_semantic_debug_info_;
++
+   // Optimization passes to be applied.
+   std::vector<PassId> enabled_opt_passes_;
+ 
+diff --git a/libshaderc_util/src/compiler.cc b/libshaderc_util/src/compiler.cc
+index e5f5d10..1f9e6a5 100644
+--- a/libshaderc_util/src/compiler.cc
++++ b/libshaderc_util/src/compiler.cc
+@@ -341,6 +341,11 @@ std::tuple<bool, std::vector<uint32_t>, size_t> Compiler::Compile(
+   options.generateDebugInfo = generate_debug_info_;
+   options.disableOptimizer = true;
+   options.optimizeSize = false;
++  options.emitNonSemanticShaderDebugInfo =
++      generate_debug_info_ && emit_non_semantic_debug_info_;
++  options.emitNonSemanticShaderDebugSource =
++      generate_debug_info_ && emit_non_semantic_debug_info_;
++
+   // Note the call to GlslangToSpv also populates compilation_output_data.
+   glslang::GlslangToSpv(*program.getIntermediate(used_shader_stage), spirv,
+                         &options);
+@@ -438,6 +443,10 @@ void Compiler::SetGenerateDebugInfo() {
+   }
+ }
+ 
++void Compiler::SetEmitNonSemanticDebugInfo() {
++  emit_non_semantic_debug_info_ = true;
++}
++
+ void Compiler::SetOptimizationLevel(Compiler::OptimizationLevel level) {
+   // Clear previous settings first.
+   enabled_opt_passes_.clear();
+diff --git a/third_party/CMakeLists.txt b/third_party/CMakeLists.txt
+index d44f62a..83966b6 100644
+--- a/third_party/CMakeLists.txt
++++ b/third_party/CMakeLists.txt
+@@ -20,9 +20,9 @@ set(SHADERC_TINT_DIR "${SHADERC_THIRD_PARTY_ROOT_DIR}/tint" CACHE STRING
+ set(SHADERC_ABSL_DIR "${SHADERC_THIRD_PARTY_ROOT_DIR}/abseil_cpp" CACHE STRING
+   "Location of re2 source")
+ 
+-set( SKIP_GLSLANG_INSTALL ${SHADERC_SKIP_INSTALL} )
+-set( SKIP_SPIRV_TOOLS_INSTALL ${SHADERC_SKIP_INSTALL} )
+-set( SKIP_GOOGLETEST_INSTALL ${SHADERC_SKIP_INSTALL} )
++set( SKIP_GLSLANG_INSTALL ON )
++set( SKIP_SPIRV_TOOLS_INSTALL ON )
++set( SKIP_GOOGLETEST_INSTALL ON )
+ 
+ # Configure third party projects.
+ if(${SHADERC_ENABLE_TESTS})
+@@ -64,7 +64,10 @@ if (NOT TARGET SPIRV-Tools)
+       add_subdirectory(${SHADERC_RE2_DIR} re2)
+       add_subdirectory(${SHADERC_EFFCEE_DIR} effcee)
+     endif()
+-    add_subdirectory(${SHADERC_SPIRV_TOOLS_DIR} spirv-tools)
++    set(SPIRV_SKIP_EXECUTABLES ON CACHE BOOL "Skip building SPIRV-Tools executables")
++    set(SPIRV_TOOLS_BUILD_STATIC OFF CACHE BOOL "Skip building two SPIRV-Tools libs")
++    set(SPIRV_TOOLS_LIBRARY_TYPE STATIC CACHE STRING "Build static SPIRV-Tools libs")
++    add_subdirectory(${SHADERC_SPIRV_TOOLS_DIR} spirv-tools EXCLUDE_FROM_ALL)
+     if (NOT "${SPIRV_SKIP_TESTS}")
+       if (MSVC)
+         if (${MSVC_VERSION} LESS 1920)
+@@ -87,8 +90,8 @@ if (NOT TARGET glslang)
+       # Glslang tests are off by default. Turn them on if testing Shaderc.
+       set(GLSLANG_TESTS ON)
+     endif()
+-    set(GLSLANG_ENABLE_INSTALL $<NOT:${SKIP_GLSLANG_INSTALL}>)
+-    add_subdirectory(${SHADERC_GLSLANG_DIR} glslang)
++    set(GLSLANG_ENABLE_INSTALL OFF)
++    add_subdirectory(${SHADERC_GLSLANG_DIR} glslang EXCLUDE_FROM_ALL)
+   endif()
+   if (NOT TARGET glslang)
+     message(FATAL_ERROR "glslang was not found - required for compilation")

.github/workflows/scripts/common/update_base_translation.sh

@@ -1,12 +1,11 @@
 #!/bin/bash
 
 SCRIPTDIR=$(dirname "${BASH_SOURCE[0]}")
-source "$SCRIPTDIR/../linux/functions.sh"
 
 set -e
 
 # While we use custom Qt builds for our releases, the Qt6 package will be good enough
 # for just updating translations. Saves building it for this action alone.
-retry_command sudo apt-get -y install qt6-l10n-tools
+"$SCRIPTDIR/../../../../tools/retry.sh" sudo apt-get -y install qt6-l10n-tools
 
-PATH=/usr/lib/qt6/bin:$PATH "$SCRIPTDIR/../../../../pcsx2-qt/Translations/update_en_translation.sh"
+PATH=/usr/lib/qt6/bin:$PATH "$SCRIPTDIR/../../../../pcsx2-qt/Translations/update_base_translation.sh"

.github/workflows/scripts/linux/appimage-qt.sh

@@ -26,7 +26,6 @@
 # For more information, please refer to <http://unlicense.org/>
 
 SCRIPTDIR=$(dirname "${BASH_SOURCE[0]}")
-source "$SCRIPTDIR/functions.sh"
 
 if [ "$#" -ne 4 ]; then
     echo "Syntax: $0 <path to pcsx2 directory> <path to build directory> <deps prefix> <output name>"
@@ -42,6 +41,10 @@ BINARY=pcsx2-qt
 APPDIRNAME=PCSX2.AppDir
 STRIP=strip
 
+declare -a MANUAL_LIBS=(
+	"libshaderc_shared.so.1"
+)
+
 declare -a MANUAL_QT_LIBS=(
 	"libQt6WaylandEglClientHwIntegration.so.6"
 )
@@ -52,6 +55,12 @@ declare -a MANUAL_QT_PLUGINS=(
 	"wayland-shell-integration"
 )
 
+declare -a REMOVE_LIBS=(
+	'libwayland-client.so*'
+	'libwayland-cursor.so*'
+	'libwayland-egl.so*'
+)
+
 set -e
 
 LINUXDEPLOY=./linuxdeploy-x86_64.AppImage
@@ -60,23 +69,41 @@ APPIMAGETOOL=./appimagetool-x86_64.AppImage
 PATCHELF=patchelf
 
 if [ ! -f "$LINUXDEPLOY" ]; then
-	retry_command wget -O "$LINUXDEPLOY" https://github.com/linuxdeploy/linuxdeploy/releases/download/continuous/linuxdeploy-x86_64.AppImage
+	"$PCSX2DIR/tools/retry.sh" wget -O "$LINUXDEPLOY" https://github.com/linuxdeploy/linuxdeploy/releases/download/continuous/linuxdeploy-x86_64.AppImage
 	chmod +x "$LINUXDEPLOY"
 fi
 
 if [ ! -f "$LINUXDEPLOY_PLUGIN_QT" ]; then
-	retry_command wget -O "$LINUXDEPLOY_PLUGIN_QT" https://github.com/linuxdeploy/linuxdeploy-plugin-qt/releases/download/continuous/linuxdeploy-plugin-qt-x86_64.AppImage
+	"$PCSX2DIR/tools/retry.sh" wget -O "$LINUXDEPLOY_PLUGIN_QT" https://github.com/linuxdeploy/linuxdeploy-plugin-qt/releases/download/continuous/linuxdeploy-plugin-qt-x86_64.AppImage
 	chmod +x "$LINUXDEPLOY_PLUGIN_QT"
 fi
 
 if [ ! -f "$APPIMAGETOOL" ]; then
-	retry_command wget -O "$APPIMAGETOOL" https://github.com/AppImage/AppImageKit/releases/download/continuous/appimagetool-x86_64.AppImage
+	"$PCSX2DIR/tools/retry.sh" wget -O "$APPIMAGETOOL" https://github.com/AppImage/AppImageKit/releases/download/continuous/appimagetool-x86_64.AppImage
 	chmod +x "$APPIMAGETOOL"
 fi
 
 OUTDIR=$(realpath "./$APPDIRNAME")
 rm -fr "$OUTDIR"
 
+echo "Locating extra libraries..."
+EXTRA_LIBS_ARGS=""
+for lib in "${MANUAL_LIBS[@]}"; do
+	srcpath=$(find "$DEPSDIR" -name "$lib")
+	if [ ! -f "$srcpath" ]; then
+		echo "Missinge extra library $lib. Exiting."
+		exit 1
+	fi
+
+	echo "Found $lib at $srcpath."
+
+	if [ "$EXTRA_LIBS_ARGS" == "" ]; then
+		EXTRA_LIBS_ARGS="--library=$srcpath"
+	else
+		EXTRA_LIBS_ARGS="$EXTRA_LIBS_ARGS,$srcpath"
+	fi
+done
+
 # Why the nastyness? linuxdeploy strips our main binary, and there's no option to turn it off.
 # It also doesn't strip the Qt libs. We can't strip them after running linuxdeploy, because
 # patchelf corrupts the libraries (but they still work), but patchelf+strip makes them crash
@@ -98,11 +125,12 @@ cp "$PCSX2DIR/.github/workflows/scripts/linux/pcsx2-qt.desktop" "net.pcsx2.PCSX2
 cp "$PCSX2DIR/bin/resources/icons/AppIconLarge.png" "PCSX2.png"
 
 echo "Running linuxdeploy to create AppDir..."
-EXTRA_QT_PLUGINS="core;gui;network;svg;waylandclient;widgets;xcbqpa" \
+EXTRA_QT_PLUGINS="core;gui;svg;waylandclient;widgets;xcbqpa" \
 EXTRA_PLATFORM_PLUGINS="libqwayland-egl.so;libqwayland-generic.so" \
+DEPLOY_PLATFORM_THEMES="1" \
 QMAKE="$DEPSDIR/bin/qmake" \
 NO_STRIP="1" \
-$LINUXDEPLOY --plugin qt --appdir="$OUTDIR" --executable="$BUILDDIR/bin/pcsx2-qt" \
+$LINUXDEPLOY --plugin qt --appdir="$OUTDIR" --executable="$BUILDDIR/bin/pcsx2-qt" $EXTRA_LIBS_ARGS \
 --desktop-file="net.pcsx2.PCSX2.desktop" --icon-file="PCSX2.png"
 
 echo "Copying resources into AppDir..."
@@ -136,6 +164,16 @@ for GROUP in "${MANUAL_QT_PLUGINS[@]}"; do
 	done
 done
 
+# Why do we have to manually remove these libs? Because the linuxdeploy Qt plugin
+# copies them, not the "main" linuxdeploy binary, and plugins don't inherit the
+# include list...
+for lib in "${REMOVE_LIBS[@]}"; do
+	for libpath in $(find "$OUTDIR/usr/lib" -name "$lib"); do
+		echo "    Removing problematic library ${libpath}."
+		rm -f "$libpath"
+	done
+done
+
 # Restore unstripped deps (for cache).
 rm -fr "$DEPSDIR"
 mv "$DEPSDIR.bak" "$DEPSDIR"

.github/workflows/scripts/linux/build-dependencies-qt.sh

@@ -2,52 +2,141 @@
 
 set -e
 
-INSTALLDIR="$HOME/deps"
+if [ "$#" -ne 1 ]; then
+    echo "Syntax: $0 <output directory>"
+    exit 1
+fi
+
+SCRIPTDIR=$(realpath $(dirname "${BASH_SOURCE[0]}"))
 NPROCS="$(getconf _NPROCESSORS_ONLN)"
-SDL=SDL2-2.28.5
-QT=6.6.1
+INSTALLDIR="$1"
+if [ "${INSTALLDIR:0:1}" != "/" ]; then
+	INSTALLDIR="$PWD/$INSTALLDIR"
+fi
+
 LIBBACKTRACE=ad106d5fdd5d960bd33fae1c48a351af567fd075
+LIBJPEG=9f
+LIBPNG=1.6.43
+LIBWEBP=1.4.0
+LZ4=b8fd2d15309dd4e605070bd4486e26b6ef814e29
+SDL=SDL2-2.30.5
+QT=6.7.2
+ZSTD=1.5.6
+
+SHADERC=2024.1
+SHADERC_GLSLANG=142052fa30f9eca191aa9dcf65359fcaed09eeec
+SHADERC_SPIRVHEADERS=5e3ad389ee56fca27c9705d093ae5387ce404df4
+SHADERC_SPIRVTOOLS=dd4b663e13c07fea4fbb3f70c1c91c86731099f7
 
 mkdir -p deps-build
 cd deps-build
 
 cat > SHASUMS <<EOF
-332cb37d0be20cb9541739c61f79bae5a477427d79ae85e352089afdaf6666e4  $SDL.tar.gz
 fd6f417fe9e3a071cf1424a5152d926a34c4a3c5070745470be6cf12a404ed79  $LIBBACKTRACE.zip
-450c5b4677b2fe40ed07954d7f0f40690068e80a94c9df86c2c905ccd59d02f7  qtbase-everywhere-src-$QT.tar.xz
-ac4ed08950072e375be662cfa64fdb447dd6e935cf29c56a4128d1500492188f  qtimageformats-everywhere-src-$QT.tar.xz
-248deb56d26a463cf3162f530358ccf90cfb654bbf518bb35ddf81b205e09228  qtsvg-everywhere-src-$QT.tar.xz
-4939105a7345ab4e19e7caee8654a836e65bd41910359623e0f233f3aff0914a  qttools-everywhere-src-$QT.tar.xz
-668702e822ad7150b27e7caa2158595fd9b3b77ffbc8262e6509872a3920ee88  qttranslations-everywhere-src-$QT.tar.xz
-66cc2d632dc07fc6cc4e35247f48b7c1753276ccbf86e86d7b24d799725568b1  qtwayland-everywhere-src-$QT.tar.xz
+04705c110cb2469caa79fb71fba3d7bf834914706e9641a4589485c1f832565b  jpegsrc.v$LIBJPEG.tar.gz
+6a5ca0652392a2d7c9db2ae5b40210843c0bbc081cbd410825ab00cc59f14a6c  libpng-$LIBPNG.tar.xz
+61f873ec69e3be1b99535634340d5bde750b2e4447caa1db9f61be3fd49ab1e5  libwebp-$LIBWEBP.tar.gz
+0728800155f3ed0a0c87e03addbd30ecbe374f7b080678bbca1506051d50dec3  $LZ4.tar.gz
+f374f3fa29c37dfcc20822d4a7d7dc57e58924d1a5f2ad511bfab4c8193de63b  $SDL.tar.gz
+8c29e06cf42aacc1eafc4077ae2ec6c6fcb96a626157e0593d5e82a34fd403c1  zstd-$ZSTD.tar.gz
+c5f22a5e10fb162895ded7de0963328e7307611c688487b5d152c9ee64767599  qtbase-everywhere-src-$QT.tar.xz
+e1a1d8785fae67d16ad0a443b01d5f32663a6b68d275f1806ebab257485ce5d6  qtimageformats-everywhere-src-$QT.tar.xz
+fb0d1286a35be3583fee34aeb5843c94719e07193bdf1d4d8b0dc14009caef01  qtsvg-everywhere-src-$QT.tar.xz
+58e855ad1b2533094726c8a425766b63a04a0eede2ed85086860e54593aa4b2a  qttools-everywhere-src-$QT.tar.xz
+9845780b5dc1b7279d57836db51aeaf2e4a1160c42be09750616f39157582ca9  qttranslations-everywhere-src-$QT.tar.xz
+a2a057e1dd644bd44abb9990fecc194b2e25c2e0f39e81aa9fee4c1e5e2a8a5b  qtwayland-everywhere-src-$QT.tar.xz
+eb3b5f0c16313d34f208d90c2fa1e588a23283eed63b101edd5422be6165d528  shaderc-$SHADERC.tar.gz
+aa27e4454ce631c5a17924ce0624eac736da19fc6f5a2ab15a6c58da7b36950f  shaderc-glslang-$SHADERC_GLSLANG.tar.gz
+5d866ce34a4b6908e262e5ebfffc0a5e11dd411640b5f24c85a80ad44c0d4697  shaderc-spirv-headers-$SHADERC_SPIRVHEADERS.tar.gz
+03ee1a2c06f3b61008478f4abe9423454e53e580b9488b47c8071547c6a9db47  shaderc-spirv-tools-$SHADERC_SPIRVTOOLS.tar.gz
 EOF
 
-curl -L \
-	-O "https://libsdl.org/release/$SDL.tar.gz" \
+curl -C - -L \
 	-O "https://github.com/ianlancetaylor/libbacktrace/archive/$LIBBACKTRACE.zip" \
+	-O "https://ijg.org/files/jpegsrc.v$LIBJPEG.tar.gz" \
+	-O "https://downloads.sourceforge.net/project/libpng/libpng16/$LIBPNG/libpng-$LIBPNG.tar.xz" \
+	-O "https://storage.googleapis.com/downloads.webmproject.org/releases/webp/libwebp-$LIBWEBP.tar.gz" \
+	-O "https://github.com/lz4/lz4/archive/$LZ4.tar.gz" \
+	-O "https://libsdl.org/release/$SDL.tar.gz" \
+	-O "https://github.com/facebook/zstd/releases/download/v$ZSTD/zstd-$ZSTD.tar.gz" \
 	-O "https://download.qt.io/official_releases/qt/${QT%.*}/$QT/submodules/qtbase-everywhere-src-$QT.tar.xz" \
 	-O "https://download.qt.io/official_releases/qt/${QT%.*}/$QT/submodules/qtimageformats-everywhere-src-$QT.tar.xz" \
 	-O "https://download.qt.io/official_releases/qt/${QT%.*}/$QT/submodules/qtsvg-everywhere-src-$QT.tar.xz" \
 	-O "https://download.qt.io/official_releases/qt/${QT%.*}/$QT/submodules/qttools-everywhere-src-$QT.tar.xz" \
 	-O "https://download.qt.io/official_releases/qt/${QT%.*}/$QT/submodules/qttranslations-everywhere-src-$QT.tar.xz" \
-	-O "https://download.qt.io/official_releases/qt/${QT%.*}/$QT/submodules/qtwayland-everywhere-src-$QT.tar.xz"
+	-O "https://download.qt.io/official_releases/qt/${QT%.*}/$QT/submodules/qtwayland-everywhere-src-$QT.tar.xz" \
+	-o "shaderc-$SHADERC.tar.gz" "https://github.com/google/shaderc/archive/refs/tags/v$SHADERC.tar.gz" \
+	-o "shaderc-glslang-$SHADERC_GLSLANG.tar.gz" "https://github.com/KhronosGroup/glslang/archive/$SHADERC_GLSLANG.tar.gz" \
+	-o "shaderc-spirv-headers-$SHADERC_SPIRVHEADERS.tar.gz" "https://github.com/KhronosGroup/SPIRV-Headers/archive/$SHADERC_SPIRVHEADERS.tar.gz" \
+	-o "shaderc-spirv-tools-$SHADERC_SPIRVTOOLS.tar.gz" "https://github.com/KhronosGroup/SPIRV-Tools/archive/$SHADERC_SPIRVTOOLS.tar.gz"
 
 shasum -a 256 --check SHASUMS
 
-echo "Building SDL..."
-tar xf "$SDL.tar.gz"
-cd "$SDL"
-./configure --prefix "$INSTALLDIR" --enable-dbus --without-x --disable-video-opengl --disable-video-opengles --disable-video-vulkan --disable-wayland-shared --disable-ime --disable-oss --disable-alsa --disable-jack --disable-esd --disable-pipewire --disable-pulseaudio --disable-arts --disable-nas --disable-sndio --disable-fusionsound --disable-diskaudio
-make "-j$NPROCS"
+echo "Building libbacktrace..."
+rm -fr "libbacktrace-$LIBBACKTRACE"
+unzip "$LIBBACKTRACE.zip"
+cd "libbacktrace-$LIBBACKTRACE"
+./configure --prefix="$INSTALLDIR"
+make
 make install
 cd ..
 
-echo "Building libbacktrace..."
-unzip "$LIBBACKTRACE.zip"
-cd "libbacktrace-$LIBBACKTRACE"
-./configure --prefix="$HOME/deps"
-make
+echo "Building libpng..."
+rm -fr "libpng-$LIBPNG"
+tar xf "libpng-$LIBPNG.tar.xz"
+cd "libpng-$LIBPNG"
+cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_PREFIX_PATH="$INSTALLDIR" -DCMAKE_INSTALL_PREFIX="$INSTALLDIR" -DBUILD_SHARED_LIBS=ON -DBUILD_SHARED_LIBS=ON -DPNG_TESTS=OFF -DPNG_STATIC=OFF -DPNG_SHARED=ON -DPNG_TOOLS=OFF -B build -G Ninja
+cmake --build build --parallel
+ninja -C build install
+cd ..
+
+echo "Building libjpeg..."
+rm -fr "jpeg-$LIBJPEG"
+tar xf "jpegsrc.v$LIBJPEG.tar.gz"
+cd "jpeg-$LIBJPEG"
+mkdir build
+cd build
+../configure --prefix="$INSTALLDIR" --disable-static --enable-shared
+make "-j$NPROCS"
 make install
+cd ../..
+
+echo "Building LZ4..."
+rm -fr "lz4-$LZ4"
+tar xf "$LZ4.tar.gz"
+cd "lz4-$LZ4"
+cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_PREFIX_PATH="$INSTALLDIR" -DCMAKE_INSTALL_PREFIX="$INSTALLDIR" -DBUILD_SHARED_LIBS=ON -DLZ4_BUILD_CLI=OFF -DLZ4_BUILD_LEGACY_LZ4C=OFF -B build-dir -G Ninja build/cmake
+cmake --build build-dir --parallel
+ninja -C build-dir install
+cd ..
+
+echo "Building Zstandard..."
+rm -fr "zstd-$ZSTD"
+tar xf "zstd-$ZSTD.tar.gz"
+cd "zstd-$ZSTD"
+cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_PREFIX_PATH="$INSTALLDIR" -DCMAKE_INSTALL_PREFIX="$INSTALLDIR" -DBUILD_SHARED_LIBS=ON -DZSTD_BUILD_SHARED=ON -DZSTD_BUILD_STATIC=OFF -DZSTD_BUILD_PROGRAMS=OFF -B build -G Ninja build/cmake
+cmake --build build --parallel
+ninja -C build install
+cd ..
+
+echo "Building WebP..."
+rm -fr "libwebp-$LIBWEBP"
+tar xf "libwebp-$LIBWEBP.tar.gz"
+cd "libwebp-$LIBWEBP"
+cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_PREFIX_PATH="$INSTALLDIR" -DCMAKE_INSTALL_PREFIX="$INSTALLDIR" -B build -G Ninja \
+  -DWEBP_BUILD_ANIM_UTILS=OFF -DWEBP_BUILD_CWEBP=OFF -DWEBP_BUILD_DWEBP=OFF -DWEBP_BUILD_GIF2WEBP=OFF -DWEBP_BUILD_IMG2WEBP=OFF \
+  -DWEBP_BUILD_VWEBP=OFF -DWEBP_BUILD_WEBPINFO=OFF -DWEBP_BUILD_WEBPMUX=OFF -DWEBP_BUILD_EXTRAS=OFF -DBUILD_SHARED_LIBS=ON
+cmake --build build --parallel
+ninja -C build install
+cd ..
+
+echo "Building SDL..."
+rm -fr "$SDL"
+tar xf "$SDL.tar.gz"
+cd "$SDL"
+cmake -B build -DCMAKE_BUILD_TYPE=Release -DCMAKE_PREFIX_PATH="$INSTALLDIR" -DCMAKE_INSTALL_PREFIX="$INSTALLDIR" -DBUILD_SHARED_LIBS=ON -DSDL_SHARED=ON -DSDL_STATIC=OFF -G Ninja
+cmake --build build --parallel
+ninja -C build install
 cd ..
 
 # Couple notes:
@@ -56,65 +145,54 @@ cd ..
 # ICU avoids pulling in a bunch of large libraries, and hopefully we can get away without it.
 # OpenGL is needed to render window decorations in Wayland, apparently.
 echo "Building Qt Base..."
+rm -fr "qtbase-everywhere-src-$QT"
 tar xf "qtbase-everywhere-src-$QT.tar.xz"
 cd "qtbase-everywhere-src-$QT"
 mkdir build
 cd build
-../configure -prefix "$INSTALLDIR" -release -dbus-linked -gui -widgets -fontconfig -qt-doubleconversion -ssl -openssl-runtime -opengl desktop -qpa xcb,wayland -xkbcommon -- -DFEATURE_dbus=ON -DFEATURE_icu=OFF -DFEATURE_printsupport=OFF -DFEATURE_sql=OFF
+../configure -prefix "$INSTALLDIR" -release -dbus-linked -gui -widgets -fontconfig -qt-doubleconversion -ssl -openssl-runtime -opengl desktop -qpa xcb,wayland -xkbcommon -xcb -gtk -- -DFEATURE_dbus=ON -DFEATURE_icu=OFF -DFEATURE_sql=OFF -DFEATURE_system_png=ON -DFEATURE_system_jpeg=ON -DFEATURE_system_zlib=ON -DFEATURE_system_freetype=ON -DFEATURE_system_harfbuzz=ON
 cmake --build . --parallel
-cmake --install .
+ninja install
 cd ../../
 
 echo "Building Qt SVG..."
+rm -fr "qtsvg-everywhere-src-$QT"
 tar xf "qtsvg-everywhere-src-$QT.tar.xz"
 cd "qtsvg-everywhere-src-$QT"
 mkdir build
 cd build
-cmake -G Ninja -DCMAKE_PREFIX_PATH="$INSTALLDIR" -DCMAKE_INSTALL_PREFIX="$INSTALLDIR" -DCMAKE_BUILD_TYPE=Release ..
+"$INSTALLDIR/bin/qt-configure-module" .. -- -DCMAKE_PREFIX_PATH="$INSTALLDIR"
 cmake --build . --parallel
-cmake --install .
+ninja install
 cd ../../
 
 echo "Building Qt Image Formats..."
+rm -fr "qtimageformats-everywhere-src-$QT"
 tar xf "qtimageformats-everywhere-src-$QT.tar.xz"
 cd "qtimageformats-everywhere-src-$QT"
 mkdir build
 cd build
-cmake -G Ninja -DCMAKE_PREFIX_PATH="$INSTALLDIR" -DCMAKE_INSTALL_PREFIX="$INSTALLDIR" -DCMAKE_BUILD_TYPE=Release ..
+"$INSTALLDIR/bin/qt-configure-module" .. -- -DCMAKE_PREFIX_PATH="$INSTALLDIR" -DFEATURE_system_webp=ON
 cmake --build . --parallel
-cmake --install .
+ninja install
 cd ../../
 
 echo "Building Qt Wayland..."
+rm -fr "qtwayland-everywhere-src-$QT"
 tar xf "qtwayland-everywhere-src-$QT.tar.xz"
 cd "qtwayland-everywhere-src-$QT"
 mkdir build
 cd build
-cmake -G Ninja -DCMAKE_PREFIX_PATH="$INSTALLDIR" -DCMAKE_INSTALL_PREFIX="$INSTALLDIR" -DCMAKE_BUILD_TYPE=Release ..
+"$INSTALLDIR/bin/qt-configure-module" .. -- -DCMAKE_PREFIX_PATH="$INSTALLDIR"
 cmake --build . --parallel
-cmake --install .
+ninja install
 cd ../../
 
 echo "Installing Qt Tools..."
+rm -fr "qttools-everywhere-src-$QT"
 tar xf "qttools-everywhere-src-$QT.tar.xz"
 cd "qttools-everywhere-src-$QT"
-# From Mac build-dependencies.sh:
-# Linguist relies on a library in the Designer target, which takes 5-7 minutes to build on the CI
-# Avoid it by not building Linguist, since we only need the tools that come with it
-patch -u src/linguist/CMakeLists.txt <<EOF
---- src/linguist/CMakeLists.txt
-+++ src/linguist/CMakeLists.txt
-@@ -14,7 +14,7 @@
- add_subdirectory(lrelease-pro)
- add_subdirectory(lupdate)
- add_subdirectory(lupdate-pro)
--if(QT_FEATURE_process AND QT_FEATURE_pushbutton AND QT_FEATURE_toolbutton AND TARGET Qt::Widgets AND NOT no-png)
-+if(QT_FEATURE_process AND QT_FEATURE_pushbutton AND QT_FEATURE_toolbutton AND TARGET Qt::Widgets AND TARGET Qt::PrintSupport AND NOT no-png)
-     add_subdirectory(linguist)
- endif()
-EOF
-
-# Also force disable clang scanning, it gets very confused.
+# Force disable clang scanning, it gets very confused.
 patch -u configure.cmake <<EOF
 --- configure.cmake
 +++ configure.cmake
@@ -139,21 +217,40 @@ EOF
 
 mkdir build
 cd build
-cmake -G Ninja -DCMAKE_PREFIX_PATH="$INSTALLDIR" -DCMAKE_INSTALL_PREFIX="$INSTALLDIR" -DCMAKE_BUILD_TYPE=Release -DFEATURE_assistant=OFF -DFEATURE_clang=OFF -DFEATURE_designer=OFF -DFEATURE_kmap2qmap=OFF -DFEATURE_pixeltool=OFF -DFEATURE_pkg_config=OFF -DFEATURE_qev=OFF -DFEATURE_qtattributionsscanner=OFF -DFEATURE_qtdiag=OFF -DFEATURE_qtplugininfo=OFF ..
+"$INSTALLDIR/bin/qt-configure-module" .. -- -DCMAKE_PREFIX_PATH="$INSTALLDIR" -DFEATURE_assistant=OFF -DFEATURE_clang=OFF -DFEATURE_designer=ON -DFEATURE_kmap2qmap=OFF -DFEATURE_pixeltool=OFF -DFEATURE_pkg_config=OFF -DFEATURE_qev=OFF -DFEATURE_qtattributionsscanner=OFF -DFEATURE_qtdiag=OFF -DFEATURE_qtplugininfo=OFF
 cmake --build . --parallel
-cmake --install .
+ninja install
 cd ../../
 
 echo "Installing Qt Translations..."
+rm -fr "qttranslations-everywhere-src-$QT"
 tar xf "qttranslations-everywhere-src-$QT.tar.xz"
 cd "qttranslations-everywhere-src-$QT"
 mkdir build
 cd build
-cmake -G Ninja -DCMAKE_PREFIX_PATH="$INSTALLDIR" -DCMAKE_INSTALL_PREFIX="$INSTALLDIR" -DCMAKE_BUILD_TYPE=Release ..
+"$INSTALLDIR/bin/qt-configure-module" .. -- -DCMAKE_PREFIX_PATH="$INSTALLDIR"
 cmake --build . --parallel
-cmake --install .
+ninja install
 cd ../../
 
+echo "Building shaderc..."
+rm -fr "shaderc-$SHADERC"
+tar xf "shaderc-$SHADERC.tar.gz"
+cd "shaderc-$SHADERC"
+cd third_party
+tar xf "../../shaderc-glslang-$SHADERC_GLSLANG.tar.gz"
+mv "glslang-$SHADERC_GLSLANG" "glslang"
+tar xf "../../shaderc-spirv-headers-$SHADERC_SPIRVHEADERS.tar.gz"
+mv "SPIRV-Headers-$SHADERC_SPIRVHEADERS" "spirv-headers"
+tar xf "../../shaderc-spirv-tools-$SHADERC_SPIRVTOOLS.tar.gz"
+mv "SPIRV-Tools-$SHADERC_SPIRVTOOLS" "spirv-tools"
+cd ..
+patch -p1 < "$SCRIPTDIR/../common/shaderc-changes.patch"
+cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_PREFIX_PATH="$INSTALLDIR" -DCMAKE_INSTALL_PREFIX="$INSTALLDIR" -DSHADERC_SKIP_TESTS=ON -DSHADERC_SKIP_EXAMPLES=ON -DSHADERC_SKIP_COPYRIGHT_CHECK=ON -B build -G Ninja
+cmake --build build --parallel
+ninja -C build install
+cd ..
+
 echo "Cleaning up..."
 cd ..
 rm -r deps-build

.github/workflows/scripts/linux/compile.sh

@@ -1,15 +0,0 @@
-#!/bin/bash
-
-set -e
-
-if [ -n "${GITHUB_ACTIONS}" ]; then
-    echo "Warning: Running this script outside of GitHub Actions isn't recommended."
-fi
-
-# Prepare the Cache
-ccache -p
-ccache -z
-# Build
-ninja
-# Save the Cache
-ccache -s

.github/workflows/scripts/linux/flatpak/modules/11-libaio.json

@@ -1,24 +0,0 @@
-{
-  "name": "libaio",
-  "no-autogen": true,
-  "make-install-args": [
-    "prefix=/app"
-  ],
-  "build-options": {
-    "strip": true
-  },
-  "sources": [
-    {
-      "type": "git",
-      "url": "https://pagure.io/libaio.git",
-      "tag": "libaio-0.3.113",
-      "commit": "1b18bfafc6a2f7b9fa2c6be77a95afed8b7be448"
-    }
-  ],
-  "cleanup": [
-    "/include",
-    "/lib/*.a",
-    "/lib/*.la"
-  ]
-}
-

.github/workflows/scripts/linux/flatpak/modules/20-sdl2.json

@@ -1,26 +1,12 @@
 {
   "name": "sdl2",
-  "buildsystem": "autotools",
-  "no-autogen": true,
+  "buildsystem": "cmake-ninja",
+  "builddir": true,
   "config-opts": [
-    "--disable-dbus",
-    "--without-x",
-    "--disable-video-opengl",
-    "--disable-video-opengles",
-    "--disable-video-vulkan",
-    "--disable-wayland-shared",
-    "--disable-ime",
-    "--disable-oss",
-    "--disable-alsa",
-    "--disable-jack",
-    "--disable-esd",
-    "--disable-pipewire",
-    "--disable-pulseaudio",
-    "--disable-arts",
-    "--disable-nas",
-    "--disable-sndio",
-    "--disable-fusionsound",
-    "--disable-diskaudio"
+    "-DBUILD_SHARED_LIBS=ON",
+    "-DSDL_SHARED=ON",
+    "-DSDL_STATIC=OFF",
+    "-DSDL_TESTS=OFF"
   ],
   "build-options": {
     "strip": true
@@ -28,8 +14,8 @@
   "sources": [
     {
       "type": "archive",
-      "url": "https://libsdl.org/release/SDL2-2.28.5.tar.gz",
-      "sha256": "332cb37d0be20cb9541739c61f79bae5a477427d79ae85e352089afdaf6666e4"
+      "url": "https://libsdl.org/release/SDL2-2.30.5.tar.gz",
+      "sha256": "f374f3fa29c37dfcc20822d4a7d7dc57e58924d1a5f2ad511bfab4c8193de63b"
     }
   ],
   "cleanup": [
@@ -42,4 +28,3 @@
     "/share/aclocal"
   ]
 }
-

.github/workflows/scripts/linux/flatpak/modules/22-shaderc.json

@@ -0,0 +1,51 @@
+{
+  "name": "shaderc",
+  "buildsystem": "cmake-ninja",
+  "builddir": true,
+  "config-opts": [
+    "-DCMAKE_BUILD_TYPE=Release",
+    "-DSHADERC_SKIP_TESTS=ON",
+    "-DSHADERC_SKIP_EXAMPLES=ON",
+    "-DSHADERC_SKIP_COPYRIGHT_CHECK=ON"
+  ],
+  "build-options": {
+    "strip": true
+  },
+  "sources": [
+    {
+      "type": "git",
+      "url": "https://github.com/google/shaderc.git",
+      "commit": "47a9387ef5b3600d30d84c71ec77a59dc7db46fa"
+    },
+    {
+      "type": "archive",
+      "url": "https://github.com/KhronosGroup/glslang/archive/142052fa30f9eca191aa9dcf65359fcaed09eeec.tar.gz",
+      "sha256": "aa27e4454ce631c5a17924ce0624eac736da19fc6f5a2ab15a6c58da7b36950f",
+      "dest": "third_party/glslang"
+    },
+    {
+      "type": "archive",
+      "url": "https://github.com/KhronosGroup/SPIRV-Headers/archive/5e3ad389ee56fca27c9705d093ae5387ce404df4.tar.gz",
+      "sha256": "5d866ce34a4b6908e262e5ebfffc0a5e11dd411640b5f24c85a80ad44c0d4697",
+      "dest": "third_party/spirv-headers"
+    },
+    {
+      "type": "archive",
+      "url": "https://github.com/KhronosGroup/SPIRV-Tools/archive/dd4b663e13c07fea4fbb3f70c1c91c86731099f7.tar.gz",
+      "sha256": "03ee1a2c06f3b61008478f4abe9423454e53e580b9488b47c8071547c6a9db47",
+      "dest": "third_party/spirv-tools"
+    },
+    {
+      "type": "patch",
+      "path": "../../../common/shaderc-changes.patch"
+    }
+  ],
+  "cleanup": [
+    "/bin",
+    "/include",
+    "/lib/*.a",
+    "/lib/*.la",
+    "/lib/cmake",
+    "/lib/pkgconfig"
+  ]
+}

.github/workflows/scripts/linux/flatpak/net.pcsx2.PCSX2.json

@@ -1,7 +1,7 @@
 {
   "app-id": "net.pcsx2.PCSX2",
   "runtime": "org.kde.Platform",
-  "runtime-version": "6.6",
+  "runtime-version": "6.7",
   "sdk": "org.kde.Sdk",
   "sdk-extensions": [
     "org.freedesktop.Sdk.Extension.llvm17"
@@ -26,22 +26,32 @@
   ],
   "modules": [
     "modules/10-libpcap.json",
-    "modules/11-libaio.json",
     "modules/20-sdl2.json",
     "modules/21-libbacktrace.json",
+    "modules/22-shaderc.json",
     {
       "name": "pcsx2",
-      "buildsystem": "simple",
+      "buildsystem": "cmake-ninja",
+      "builddir": true,
+      "no-make-install": true,
       "build-options": {
         "strip": false,
         "no-debuginfo": true,
-        "env": {
-          "DEPS_PREFIX": "/app",
-          "COMPILER": "clang",
-          "CLANG_PATH": "/usr/lib/sdk/llvm17/bin/clang",
-          "CLANGXX_PATH": "/usr/lib/sdk/llvm17/bin/clang++",
-          "ADDITIONAL_CMAKE_ARGS": "-DUSE_LINKED_FFMPEG=ON"
-        }
+        "cflags": "",
+        "cflags-override": true,
+        "cxxflags": "",
+        "cxxflags-override": true,
+        "config-opts": [
+          "-DCMAKE_BUILD_TYPE=Release",
+          "-DCMAKE_INTERPROCEDURAL_OPTIMIZATION=ON",
+          "-DCMAKE_C_COMPILER=/usr/lib/sdk/llvm17/bin/clang",
+          "-DCMAKE_CXX_COMPILER=/usr/lib/sdk/llvm17/bin/clang++",
+          "-DCMAKE_EXE_LINKER_FLAGS_INIT=-fuse-ld=lld",
+          "-DCMAKE_MODULE_LINKER_FLAGS_INIT=-fuse-ld=lld",
+          "-DCMAKE_SHARED_LINKER_FLAGS_INIT=-fuse-ld=lld",
+          "-DUSE_LINKED_FFMPEG=ON",
+          "-DDISABLE_ADVANCE_SIMD=TRUE"
+	]
       },
       "sources": [
         {
@@ -49,18 +59,13 @@
           "path": "../../../../.."
         }
       ],
-      "build-commands": [
-        ".github/workflows/scripts/linux/generate-cmake-qt.sh",
-        "cd build && ../.github/workflows/scripts/linux/compile.sh && cd ..",
-        "cp -a build/bin ${FLATPAK_DEST}",
-        "cd build && ninja unittests && cd .."
-      ],
       "post-install": [
-        "install -Dm644 bin/resources/icons/AppIconLarge.png ${FLATPAK_DEST}/share/icons/hicolor/512x512/apps/net.pcsx2.PCSX2.png",
-        "install -Dm644 .github/workflows/scripts/linux/pcsx2-qt.desktop ${FLATPAK_DEST}/share/applications/net.pcsx2.PCSX2.desktop",
-        "desktop-file-edit --set-key=Icon --set-value=net.pcsx2.PCSX2 ${FLATPAK_DEST}/share/applications/net.pcsx2.PCSX2.desktop",
-        "install -Dm644 .github/workflows/scripts/linux/flatpak/net.pcsx2.PCSX2.metainfo.xml ${FLATPAK_DEST}/share/metainfo/net.pcsx2.PCSX2.metainfo.xml",
-        "mkdir -p ${FLATPAK_DEST}/lib/ffmpeg"
+        "cp -a bin \"${FLATPAK_DEST}\"",
+        "install -Dm644 \"${FLATPAK_BUILDER_BUILDDIR}/bin/resources/icons/AppIconLarge.png\" \"${FLATPAK_DEST}/share/icons/hicolor/512x512/apps/net.pcsx2.PCSX2.png\"",
+        "install -Dm644 \"${FLATPAK_BUILDER_BUILDDIR}/.github/workflows/scripts/linux/pcsx2-qt.desktop\" \"${FLATPAK_DEST}/share/applications/net.pcsx2.PCSX2.desktop\"",
+	"desktop-file-edit --set-key=Icon --set-value=net.pcsx2.PCSX2 \"${FLATPAK_DEST}/share/applications/net.pcsx2.PCSX2.desktop\"",
+	"install -Dm644 \"${FLATPAK_BUILDER_BUILDDIR}/.github/workflows/scripts/linux/flatpak/net.pcsx2.PCSX2.metainfo.xml\" \"${FLATPAK_DEST}/share/metainfo/net.pcsx2.PCSX2.metainfo.xml\"",
+        "mkdir -p \"${FLATPAK_DEST}/lib/ffmpeg\""
       ]
     }
   ]

.github/workflows/scripts/linux/functions.sh

@@ -1,16 +0,0 @@
-#!/bin/bash
-
-function retry_command {
-	# Package servers tend to be unreliable at times..
-	# Retry a bunch of times.
-	local RETRIES=10
-
-	for i in $(seq 1 "$RETRIES"); do
-		"$@" && break
-		if [ "$i" == "$RETRIES" ]; then
-			echo "Command \"$@\" failed after ${RETRIES} retries."
-			exit 1
-		fi
-	done
-}
-

.github/workflows/scripts/linux/generate-cmake-qt.sh

@@ -1,50 +0,0 @@
-#!/usr/bin/env bash
-
-set -e
-
-if [[ -z "${DEPS_PREFIX}" ]]; then
-  echo "DEPS_PREFIX is not set."
-  exit 1
-fi
-
-echo "Using build dependencies from: ${DEPS_PREFIX}"
-
-if [ "${COMPILER}" = "clang" ]; then
-  if [[ -z "${CLANG_PATH}" ]] || [[ -z "${CLANGXX_PATH}" ]]; then
-    echo "CLANG_PATH or CLANGXX_PATH is not set."
-    exit 1
-  fi
-
-	echo "Using clang toolchain"
-	cat > "clang-toolchain.cmake" << EOF
-set(CMAKE_C_COMPILER "${CLANG_PATH}")
-set(CMAKE_CXX_COMPILER "${CLANGXX_PATH}")
-set(CMAKE_EXE_LINKER_FLAGS_INIT "-fuse-ld=lld")
-set(CMAKE_MODULE_LINKER_FLAGS_INIT "-fuse-ld=lld")
-set(CMAKE_SHARED_LINKER_FLAGS_INIT "-fuse-ld=lld")
-EOF
-	ADDITIONAL_CMAKE_ARGS="$ADDITIONAL_CMAKE_ARGS -DCMAKE_INTERPROCEDURAL_OPTIMIZATION=ON -DCMAKE_TOOLCHAIN_FILE=clang-toolchain.cmake"
-fi
-
-echo "Additional CMake Args - ${ADDITIONAL_CMAKE_ARGS}"
-
-# Generate CMake into ./build
-# DISABLE_ADVANCE_SIMD is needed otherwise we end up doing -march=native.
-
-# shellcheck disable=SC2086
-cmake \
-	-B build \
-	-G Ninja \
-	$ADDITIONAL_CMAKE_ARGS \
-	-DCMAKE_CXX_COMPILER_LAUNCHER=ccache \
-	-DCMAKE_BUILD_TYPE=Release \
-	-DQT_BUILD=ON \
-	-DCUBEB_API=ON \
-	-DX11_API=ON \
-	-DWAYLAND_API=ON \
-	-DENABLE_SETCAP=OFF \
-	-DCMAKE_PREFIX_PATH="${DEPS_PREFIX}" \
-	-DUSE_SYSTEM_SDL2=ON \
-	-DUSE_SYSTEM_ZSTD=OFF \
-	-DDISABLE_ADVANCE_SIMD=TRUE
-

.github/workflows/scripts/linux/generate-metainfo.sh

@@ -8,7 +8,7 @@ if [[ $# -lt 1 ]]; then
 fi
 
 OUTFILE=$1
-GIT_DATE=$(git log -1 --pretty=%cd --date=short)
+GIT_DATE=$(git log -1 --pretty=%cd --date=iso8601)
 GIT_VERSION=$(git tag --points-at HEAD)
 GIT_HASH=$(git rev-parse HEAD)
 

.github/workflows/scripts/linux/install-packages-flatpak.sh

@@ -1,58 +0,0 @@
-#!/bin/bash
-
-SCRIPTDIR=$(dirname "${BASH_SOURCE[0]}")
-source "$SCRIPTDIR/functions.sh"
-
-set -e
-
-ARCH=x86_64
-KDE_BRANCH=6.6
-BRANCH=23.08
-FLAT_MANAGER_CLIENT_DIR="$HOME/.local/bin"
-
-# Build packages. Mostly needed for flat-manager-client.
-declare -a BUILD_PACKAGES=(
-  "flatpak"
-  "flatpak-builder"
-  "appstream-util"
-  "python3-aiohttp"
-  "python3-tenacity"
-  "python3-gi"
-  "gobject-introspection"
-  "libappstream-glib8"
-  "libappstream-glib-dev"
-  "libappstream-dev"
-  "gir1.2-ostree-1.0"
-)
-
-# Flatpak runtimes and SDKs.
-declare -a FLATPAK_PACKAGES=(
-  "org.kde.Platform/${ARCH}/${KDE_BRANCH}"
-  "org.kde.Sdk/${ARCH}/${KDE_BRANCH}"
-  "org.freedesktop.Platform.ffmpeg-full/${ARCH}/${BRANCH}"
-  "org.freedesktop.Sdk.Extension.llvm17/${ARCH}/${BRANCH}"
-  "org.freedesktop.appstream-glib/${ARCH}/stable"
-)
-
-retry_command sudo apt-get -qq update
-
-# Install packages needed for building
-echo "Will install the following packages for building - ${BUILD_PACKAGES[*]}"
-retry_command sudo apt-get -y install "${BUILD_PACKAGES[@]}"
-
-sudo flatpak remote-add --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo
-
-# Install packages needed for building
-echo "Will install the following packages for building - ${FLATPAK_PACKAGES[*]}"
-retry_command sudo flatpak -y install "${FLATPAK_PACKAGES[@]}"
-
-echo "Installing Flatpak Builder"
-retry_command sudo flatpak -y install flathub org.flatpak.builder
-
-echo "Downloading flat-manager-client"
-mkdir -p "$FLAT_MANAGER_CLIENT_DIR"
-pushd "$FLAT_MANAGER_CLIENT_DIR"
-aria2c -Z "https://raw.githubusercontent.com/flatpak/flat-manager/9401efbdc0d6bd489507d8401c567ba219d735d5/flat-manager-client"
-chmod +x flat-manager-client
-echo "$FLAT_MANAGER_CLIENT_DIR" >> $GITHUB_PATH
-popd

.github/workflows/scripts/linux/install-packages-qt.sh

@@ -1,84 +0,0 @@
-#!/bin/bash
-
-SCRIPTDIR=$(dirname "${BASH_SOURCE[0]}")
-source "$SCRIPTDIR/functions.sh"
-
-set -e
-
-# Packages - Build and Qt
-declare -a BUILD_PACKAGES=(
-	"build-essential"
-	"g++"
-	"git"
-	"cmake"
-	"ccache"
-	"ninja-build"
-	"patchelf"
-	"libfuse2"
-	"libglib2.0-dev"
-	"libfontconfig1-dev"
-	"libharfbuzz-dev"
-	"libjpeg-dev"
-	"libpng-dev"
-	"libfreetype-dev"
-	"libinput-dev"
-	"libxcb-*-dev"
-	"libxkbcommon-dev"
-	"libxkbcommon-x11-dev"
-	"libxrender-dev"
-	"libwayland-dev"
-	"libgl1-mesa-dev"
-	"libegl-dev"
-	"libegl1-mesa-dev"
-	"libgl1-mesa-dev"
-	"libssl-dev"
-)
-
-# Packages - PCSX2
-declare -a PCSX2_PACKAGES=(
-	"extra-cmake-modules"
-	"libaio-dev"
-	"libasound2-dev"
-	"libbz2-dev"
-	"libcurl4-openssl-dev"
-	"libdbus-1-dev"
-	"libegl1-mesa-dev"
-	"libgl1-mesa-dev"
-	"libgtk-3-dev"
-	"libharfbuzz-dev"
-	"libjpeg-dev"
-	"liblzma-dev"
-	"libpcap0.8-dev"
-	"libpng-dev"
-	"libpulse-dev"
-	"librsvg2-dev"
-	"libsamplerate0-dev"
-	"libudev-dev"
-	"libx11-xcb-dev"
-	"libavcodec-dev"
-	"libavformat-dev"
-	"libavutil-dev"
-	"libswresample-dev"
-	"libswscale-dev"
-	"pkg-config"
-	"zlib1g-dev"
-)
-
-if [ "${COMPILER}" = "clang" ]; then
-	BUILD_PACKAGES+=("llvm-17" "lld-17" "clang-17")
-
-	# Ubuntu 22.04 doesn't ship with LLVM 16, so we need to pull it from the llvm.org repos.
-	retry_command wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key | sudo apt-key add -
-	sudo apt-add-repository -n 'deb http://apt.llvm.org/jammy/ llvm-toolchain-jammy-17 main'
-fi
-
-retry_command sudo apt-get -qq update && break
-
-# Install packages needed for building
-echo "Will install the following packages for building - ${BUILD_PACKAGES[*]}"
-retry_command sudo apt-get -y install "${BUILD_PACKAGES[@]}"
-
-# Install packages needed by pcsx2
-PCSX2_PACKAGES=("${PCSX2_PACKAGES[@]}")
-echo "Will install the following packages for pcsx2 - ${PCSX2_PACKAGES[*]}"
-retry_command sudo apt-get -y install "${PCSX2_PACKAGES[@]}"

.github/workflows/scripts/macos/build-dependencies-universal.sh

@@ -0,0 +1,385 @@
+#!/bin/bash
+
+set -e
+
+merge_binaries() {
+	X86DIR=$1
+	ARMDIR=$2
+	echo "Merging ARM64 binaries from $ARMDIR into fat binaries at $X86DIR..."
+
+	IFS="
+"
+	pushd "$X86DIR"
+	for X86BIN in $(find . -type f \( -name '*.dylib' -o -name '*.a' -o -perm +111 \)); do
+		if file "$X86DIR/$X86BIN" | grep "Mach-O " >/dev/null; then
+			ARMBIN="${ARMDIR}/${X86BIN}"
+			echo "Merge $ARMBIN to $X86BIN..."
+			lipo -create "$X86BIN" "$ARMBIN" -o "$X86BIN"
+		fi
+	done
+	popd
+}
+
+if [ "$#" -ne 1 ]; then
+    echo "Syntax: $0 <output directory>"
+    exit 1
+fi
+
+# The bundled ffmpeg has a lot of things disabled to reduce code size.
+# Users may want to use system ffmpeg for additional features
+: ${BUILD_FFMPEG:=1}
+
+export MACOSX_DEPLOYMENT_TARGET=11.0
+
+NPROCS="$(getconf _NPROCESSORS_ONLN)"
+SCRIPTDIR=$(realpath $(dirname "${BASH_SOURCE[0]}"))
+INSTALLDIR="$1"
+if [ "${INSTALLDIR:0:1}" != "/" ]; then
+	INSTALLDIR="$PWD/$INSTALLDIR"
+fi
+
+FREETYPE=2.13.2
+HARFBUZZ=8.3.1
+SDL=SDL2-2.30.3
+ZSTD=1.5.5
+LZ4=b8fd2d15309dd4e605070bd4486e26b6ef814e29
+LIBPNG=1.6.43
+LIBJPEG=9f
+LIBWEBP=1.3.2
+FFMPEG=6.0
+MOLTENVK=1.2.8
+QT=6.7.1
+
+SHADERC=2024.1
+SHADERC_GLSLANG=142052fa30f9eca191aa9dcf65359fcaed09eeec
+SHADERC_SPIRVHEADERS=5e3ad389ee56fca27c9705d093ae5387ce404df4
+SHADERC_SPIRVTOOLS=dd4b663e13c07fea4fbb3f70c1c91c86731099f7
+
+mkdir -p deps-build
+cd deps-build
+
+export PKG_CONFIG_PATH="$INSTALLDIR/lib/pkgconfig:$PKG_CONFIG_PATH"
+export LDFLAGS="-L$INSTALLDIR/lib $LDFLAGS"
+export CFLAGS="-I$INSTALLDIR/include $CFLAGS"
+export CXXFLAGS="-I$INSTALLDIR/include $CXXFLAGS"
+CMAKE_COMMON=(
+	-DCMAKE_BUILD_TYPE=Release
+	-DCMAKE_SHARED_LINKER_FLAGS="-dead_strip -dead_strip_dylibs"
+	-DCMAKE_PREFIX_PATH="$INSTALLDIR"
+	-DCMAKE_INSTALL_PREFIX="$INSTALLDIR"
+	-DCMAKE_INSTALL_NAME_DIR='$<INSTALL_PREFIX>/lib'
+)
+CMAKE_ARCH_X64=-DCMAKE_OSX_ARCHITECTURES="x86_64"
+CMAKE_ARCH_ARM64=-DCMAKE_OSX_ARCHITECTURES="arm64"
+CMAKE_ARCH_UNIVERSAL=-DCMAKE_OSX_ARCHITECTURES="x86_64;arm64"
+
+cat > SHASUMS <<EOF
+12991c4e55c506dd7f9b765933e62fd2be2e06d421505d7950a132e4f1bb484d  freetype-$FREETYPE.tar.xz
+19a54fe9596f7a47c502549fce8e8a10978c697203774008cc173f8360b19a9a  harfbuzz-$HARFBUZZ.tar.gz
+820440072f8f5b50188c1dae104f2ad25984de268785be40c41a099a510f0aec  $SDL.tar.gz
+9c4396cc829cfae319a6e2615202e82aad41372073482fce286fac78646d3ee4  zstd-$ZSTD.tar.gz
+0728800155f3ed0a0c87e03addbd30ecbe374f7b080678bbca1506051d50dec3  $LZ4.tar.gz
+6a5ca0652392a2d7c9db2ae5b40210843c0bbc081cbd410825ab00cc59f14a6c  libpng-$LIBPNG.tar.xz
+2a499607df669e40258e53d0ade8035ba4ec0175244869d1025d460562aa09b4  libwebp-$LIBWEBP.tar.gz
+04705c110cb2469caa79fb71fba3d7bf834914706e9641a4589485c1f832565b  jpegsrc.v$LIBJPEG.tar.gz
+57be87c22d9b49c112b6d24bc67d42508660e6b718b3db89c44e47e289137082  ffmpeg-$FFMPEG.tar.xz
+85beaf8abfcc54d9da0ff0257ae311abd9e7aa96e53da37e1c37d6bc04ac83cd  v$MOLTENVK.tar.gz
+b7338da1bdccb4d861e714efffaa83f174dfe37e194916bfd7ec82279a6ace19  qtbase-everywhere-src-$QT.tar.xz
+a733b98f771064d000476b8861f822143982749448ba8abf9f1813edb8dfe79f  qtimageformats-everywhere-src-$QT.tar.xz
+3ed5b80f7228c41dd463b7a57284ed273d224d1c323c0dd78c5209635807cbce  qtsvg-everywhere-src-$QT.tar.xz
+0953cddf6248f3959279a10904892e8a98eb3e463d729a174b6fc47febd99824  qttools-everywhere-src-$QT.tar.xz
+03d71565872b0e0e7303349071df031ab0f922f6dbdd3a5ec1ade9e188e4fbf4  qttranslations-everywhere-src-$QT.tar.xz
+eb3b5f0c16313d34f208d90c2fa1e588a23283eed63b101edd5422be6165d528  shaderc-$SHADERC.tar.gz
+aa27e4454ce631c5a17924ce0624eac736da19fc6f5a2ab15a6c58da7b36950f  shaderc-glslang-$SHADERC_GLSLANG.tar.gz
+5d866ce34a4b6908e262e5ebfffc0a5e11dd411640b5f24c85a80ad44c0d4697  shaderc-spirv-headers-$SHADERC_SPIRVHEADERS.tar.gz
+03ee1a2c06f3b61008478f4abe9423454e53e580b9488b47c8071547c6a9db47  shaderc-spirv-tools-$SHADERC_SPIRVTOOLS.tar.gz
+EOF
+
+curl -C - -L \
+	-o "freetype-$FREETYPE.tar.xz" "https://sourceforge.net/projects/freetype/files/freetype2/$FREETYPE/freetype-$FREETYPE.tar.xz/download" \
+	-o "harfbuzz-$HARFBUZZ.tar.gz" "https://github.com/harfbuzz/harfbuzz/archive/refs/tags/$HARFBUZZ.tar.gz" \
+	-O "https://libsdl.org/release/$SDL.tar.gz" \
+	-O "https://github.com/facebook/zstd/releases/download/v$ZSTD/zstd-$ZSTD.tar.gz" \
+	-O "https://github.com/lz4/lz4/archive/$LZ4.tar.gz" \
+	-O "https://downloads.sourceforge.net/project/libpng/libpng16/$LIBPNG/libpng-$LIBPNG.tar.xz" \
+	-O "https://ijg.org/files/jpegsrc.v$LIBJPEG.tar.gz" \
+	-O "https://storage.googleapis.com/downloads.webmproject.org/releases/webp/libwebp-$LIBWEBP.tar.gz" \
+	-O "https://ffmpeg.org/releases/ffmpeg-$FFMPEG.tar.xz" \
+	-O "https://github.com/KhronosGroup/MoltenVK/archive/refs/tags/v$MOLTENVK.tar.gz" \
+	-O "https://download.qt.io/official_releases/qt/${QT%.*}/$QT/submodules/qtbase-everywhere-src-$QT.tar.xz" \
+	-O "https://download.qt.io/official_releases/qt/${QT%.*}/$QT/submodules/qtimageformats-everywhere-src-$QT.tar.xz" \
+	-O "https://download.qt.io/official_releases/qt/${QT%.*}/$QT/submodules/qtsvg-everywhere-src-$QT.tar.xz" \
+	-O "https://download.qt.io/official_releases/qt/${QT%.*}/$QT/submodules/qttools-everywhere-src-$QT.tar.xz" \
+	-O "https://download.qt.io/official_releases/qt/${QT%.*}/$QT/submodules/qttranslations-everywhere-src-$QT.tar.xz" \
+	-o "shaderc-$SHADERC.tar.gz" "https://github.com/google/shaderc/archive/refs/tags/v$SHADERC.tar.gz" \
+	-o "shaderc-glslang-$SHADERC_GLSLANG.tar.gz" "https://github.com/KhronosGroup/glslang/archive/$SHADERC_GLSLANG.tar.gz" \
+	-o "shaderc-spirv-headers-$SHADERC_SPIRVHEADERS.tar.gz" "https://github.com/KhronosGroup/SPIRV-Headers/archive/$SHADERC_SPIRVHEADERS.tar.gz" \
+	-o "shaderc-spirv-tools-$SHADERC_SPIRVTOOLS.tar.gz" "https://github.com/KhronosGroup/SPIRV-Tools/archive/$SHADERC_SPIRVTOOLS.tar.gz"
+
+shasum -a 256 --check SHASUMS
+
+echo "Installing SDL..."
+rm -fr "$SDL"
+tar xf "$SDL.tar.gz"
+cd "$SDL"
+cmake -B build "${CMAKE_COMMON[@]}" "$CMAKE_ARCH_UNIVERSAL" -DSDL_X11=OFF -DBUILD_SHARED_LIBS=ON
+make -C build "-j$NPROCS"
+make -C build install
+cd ..
+
+if [ "$BUILD_FFMPEG" -ne 0 ]; then
+	echo "Installing FFmpeg..."
+	rm -fr "ffmpeg-$FFMPEG"
+	tar xf "ffmpeg-$FFMPEG.tar.xz"
+	cd "ffmpeg-$FFMPEG"
+	mkdir build
+	cd build
+	LDFLAGS="-dead_strip $LDFLAGS" CFLAGS="-Os $CFLAGS" CXXFLAGS="-Os $CXXFLAGS" \
+		../configure --prefix="$INSTALLDIR" \
+		--enable-cross-compile --arch=x86_64 --cc='clang -arch x86_64' --cxx='clang++ -arch x86_64' --disable-x86asm \
+		--disable-all --disable-autodetect --disable-static --enable-shared \
+		--enable-avcodec --enable-avformat --enable-avutil --enable-swresample --enable-swscale \
+		--enable-audiotoolbox --enable-videotoolbox \
+		--enable-encoder=ffv1,qtrle,pcm_s16be,pcm_s16le,*_at,*_videotoolbox \
+		--enable-muxer=avi,matroska,mov,mp3,mp4,wav \
+		--enable-protocol=file
+	make "-j$NPROCS"
+	cd ..
+	mkdir build-arm64
+	cd build-arm64
+	LDFLAGS="-dead_strip $LDFLAGS" CFLAGS="-Os $CFLAGS" CXXFLAGS="-Os $CXXFLAGS" \
+		../configure --prefix="$INSTALLDIR" \
+		--enable-cross-compile --arch=arm64 --cc='clang -arch arm64' --cxx='clang++ -arch arm64' --disable-x86asm \
+		--disable-all --disable-autodetect --disable-static --enable-shared \
+		--enable-avcodec --enable-avformat --enable-avutil --enable-swresample --enable-swscale \
+		--enable-audiotoolbox --enable-videotoolbox \
+		--enable-encoder=ffv1,qtrle,pcm_s16be,pcm_s16le,*_at,*_videotoolbox \
+		--enable-muxer=avi,matroska,mov,mp3,mp4,wav \
+		--enable-protocol=file
+	make "-j$NPROCS"
+	cd ..
+	merge_binaries $(realpath build) $(realpath build-arm64)
+	cd build
+	make install
+	cd ../..
+fi
+
+echo "Installing Zstd..."
+rm -fr "zstd-$ZSTD"
+tar xf "zstd-$ZSTD.tar.gz"
+cd "zstd-$ZSTD"
+cmake "${CMAKE_COMMON[@]}" "$CMAKE_ARCH_X64" -DBUILD_SHARED_LIBS=ON -DZSTD_BUILD_PROGRAMS=OFF -B build-dir build/cmake
+make -C build-dir "-j$NPROCS"
+cmake "${CMAKE_COMMON[@]}" "$CMAKE_ARCH_ARM64" -DBUILD_SHARED_LIBS=ON -DZSTD_BUILD_PROGRAMS=OFF -B build-dir-arm64 build/cmake
+make -C build-dir-arm64 "-j$NPROCS"
+merge_binaries $(realpath build-dir) $(realpath build-dir-arm64)
+make -C build-dir install
+cd ..
+
+echo "Installing LZ4..."
+rm -fr "lz4-$LZ4"
+tar xf "$LZ4.tar.gz"
+cd "lz4-$LZ4"
+cmake "${CMAKE_COMMON[@]}" "$CMAKE_ARCH_X64" -DBUILD_SHARED_LIBS=ON -DLZ4_BUILD_CLI=OFF -DLZ4_BUILD_LEGACY_LZ4C=OFF -B build-dir build/cmake
+make -C build-dir "-j$NPROCS"
+cmake "${CMAKE_COMMON[@]}" "$CMAKE_ARCH_ARM64" -DBUILD_SHARED_LIBS=ON -DLZ4_BUILD_CLI=OFF -DLZ4_BUILD_LEGACY_LZ4C=OFF -B build-dir-arm64 build/cmake
+make -C build-dir-arm64 "-j$NPROCS"
+merge_binaries $(realpath build-dir) $(realpath build-dir-arm64)
+make -C build-dir install
+cd ..
+
+echo "Installing libpng..."
+rm -fr "libpng-$LIBPNG"
+tar xf "libpng-$LIBPNG.tar.xz"
+cd "libpng-$LIBPNG"
+cmake "${CMAKE_COMMON[@]}" "$CMAKE_ARCH_X64" -DBUILD_SHARED_LIBS=ON -DPNG_TESTS=OFF -DPNG_FRAMEWORK=OFF -B build
+make -C build "-j$NPROCS"
+cmake "${CMAKE_COMMON[@]}" "$CMAKE_ARCH_ARM64" -DBUILD_SHARED_LIBS=ON -DPNG_TESTS=OFF -DPNG_FRAMEWORK=OFF -DPNG_ARM_NEON=on -B build-arm64
+make -C build-arm64 "-j$NPROCS"
+merge_binaries $(realpath build) $(realpath build-arm64)
+make -C build install
+cd ..
+
+echo "Installing libjpeg..."
+rm -fr "jpeg-$LIBJPEG"
+tar xf "jpegsrc.v$LIBJPEG.tar.gz"
+cd "jpeg-$LIBJPEG"
+mkdir build
+cd build
+../configure --prefix="$INSTALLDIR" --disable-static --enable-shared --host="x86_64-apple-darwin" CFLAGS="-arch x86_64"
+make "-j$NPROCS"
+cd ..
+mkdir build-arm64
+cd build-arm64
+../configure --prefix="$INSTALLDIR" --disable-static --enable-shared --host="aarch64-apple-darwin" CFLAGS="-arch arm64"
+make "-j$NPROCS"
+cd ..
+merge_binaries $(realpath build) $(realpath build-arm64)
+make -C build install
+cd ..
+
+echo "Installing WebP..."
+rm -fr "libwebp-$LIBWEBP"
+tar xf "libwebp-$LIBWEBP.tar.gz"
+cd "libwebp-$LIBWEBP"
+cmake "${CMAKE_COMMON[@]}" "$CMAKE_ARCH_X64" -B build \
+	-DWEBP_BUILD_ANIM_UTILS=OFF -DWEBP_BUILD_CWEBP=OFF -DWEBP_BUILD_DWEBP=OFF -DWEBP_BUILD_GIF2WEBP=OFF -DWEBP_BUILD_IMG2WEBP=OFF \
+	-DWEBP_BUILD_VWEBP=OFF -DWEBP_BUILD_WEBPINFO=OFF -DWEBP_BUILD_WEBPMUX=OFF -DWEBP_BUILD_EXTRAS=OFF -DBUILD_SHARED_LIBS=ON
+make -C build "-j$NPROCS"
+cmake "${CMAKE_COMMON[@]}" "$CMAKE_ARCH_ARM64" -B build-arm64 \
+	-DWEBP_BUILD_ANIM_UTILS=OFF -DWEBP_BUILD_CWEBP=OFF -DWEBP_BUILD_DWEBP=OFF -DWEBP_BUILD_GIF2WEBP=OFF -DWEBP_BUILD_IMG2WEBP=OFF \
+	-DWEBP_BUILD_VWEBP=OFF -DWEBP_BUILD_WEBPINFO=OFF -DWEBP_BUILD_WEBPMUX=OFF -DWEBP_BUILD_EXTRAS=OFF -DBUILD_SHARED_LIBS=ON
+make -C build-arm64 "-j$NPROCS"
+merge_binaries $(realpath build) $(realpath build-arm64)
+make -C build install
+cd ..
+
+echo "Building FreeType without HarfBuzz..."
+rm -fr "freetype-$FREETYPE"
+tar xf "freetype-$FREETYPE.tar.xz"
+cd "freetype-$FREETYPE"
+cmake "${CMAKE_COMMON[@]}" "$CMAKE_ARCH_UNIVERSAL" -DBUILD_SHARED_LIBS=ON -DFT_REQUIRE_ZLIB=ON -DFT_REQUIRE_PNG=ON -DFT_DISABLE_BZIP2=TRUE -DFT_DISABLE_BROTLI=TRUE -DFT_DISABLE_HARFBUZZ=TRUE -B build
+cmake --build build --parallel
+cmake --install build
+cd ..
+
+echo "Building HarfBuzz..."
+rm -fr "harfbuzz-$HARFBUZZ"
+tar xf "harfbuzz-$HARFBUZZ.tar.gz"
+cd "harfbuzz-$HARFBUZZ"
+cmake "${CMAKE_COMMON[@]}" "$CMAKE_ARCH_UNIVERSAL" -DBUILD_SHARED_LIBS=ON -DHB_BUILD_UTILS=OFF -B build
+cmake --build build --parallel
+cmake --install build
+cd ..
+
+echo "Building FreeType with HarfBuzz..."
+rm -fr "freetype-$FREETYPE"
+tar xf "freetype-$FREETYPE.tar.xz"
+cd "freetype-$FREETYPE"
+cmake "${CMAKE_COMMON[@]}" "$CMAKE_ARCH_UNIVERSAL" -DBUILD_SHARED_LIBS=ON -DFT_REQUIRE_ZLIB=ON -DFT_REQUIRE_PNG=ON -DFT_DISABLE_BZIP2=TRUE -DFT_DISABLE_BROTLI=TRUE -DFT_REQUIRE_HARFBUZZ=TRUE -B build
+cmake --build build --parallel
+cmake --install build
+cd ..
+
+# MoltenVK already builds universal binaries, nothing special to do here.
+echo "Installing MoltenVK..."
+rm -fr "MoltenVK-${MOLTENVK}"
+tar xf "v$MOLTENVK.tar.gz"
+cd "MoltenVK-${MOLTENVK}"
+./fetchDependencies --macos
+make macos
+cp Package/Latest/MoltenVK/dynamic/dylib/macOS/libMoltenVK.dylib "$INSTALLDIR/lib/"
+cd ..
+
+echo "Installing Qt Base..."
+rm -fr "qtbase-everywhere-src-$QT"
+tar xf "qtbase-everywhere-src-$QT.tar.xz"
+cd "qtbase-everywhere-src-$QT"
+# since we don't have a direct reference to QtSvg, it doesn't deployed directly from the main binary
+# (only indirectly from iconengines), and the libqsvg.dylib imageformat plugin does not get deployed.
+# We could run macdeployqt twice, but that's even more janky than patching it.
+patch -u src/tools/macdeployqt/shared/shared.cpp <<EOF
+--- shared.cpp
++++ shared.cpp
+@@ -1119,14 +1119,8 @@
+         addPlugins(QStringLiteral("networkinformation"));
+     }
+ 
+-    // All image formats (svg if QtSvg is used)
+-    const bool usesSvg = deploymentInfo.containsModule("Svg", libInfix);
+-    addPlugins(QStringLiteral("imageformats"), [usesSvg](const QString &lib) {
+-        if (lib.contains(QStringLiteral("qsvg")) && !usesSvg)
+-            return false;
+-        return true;
+-    });
+-
++    // All image formats
++    addPlugins(QStringLiteral("imageformats"));
+     addPlugins(QStringLiteral("iconengines"));
+ 
+     // Platforminputcontext plugins if QtGui is in use
+EOF
+cmake -B build "${CMAKE_COMMON[@]}" "$CMAKE_ARCH_UNIVERSAL" -DFEATURE_dbus=OFF -DFEATURE_framework=OFF -DFEATURE_icu=OFF -DFEATURE_opengl=OFF -DFEATURE_printsupport=OFF -DFEATURE_sql=OFF -DFEATURE_gssapi=OFF -DFEATURE_system_png=ON -DFEATURE_system_jpeg=ON -DFEATURE_system_zlib=ON -DFEATURE_system_freetype=ON -DFEATURE_system_harfbuzz=ON
+make -C build "-j$NPROCS"
+make -C build install
+cd ..
+
+echo "Installing Qt SVG..."
+rm -fr "qtsvg-everywhere-src-$QT"
+tar xf "qtsvg-everywhere-src-$QT.tar.xz"
+cd "qtsvg-everywhere-src-$QT"
+mkdir build
+cd build
+"$INSTALLDIR/bin/qt-configure-module" .. -- "${CMAKE_COMMON[@]}" "$CMAKE_ARCH_UNIVERSAL"
+make "-j$NPROCS"
+make install
+cd ../..
+
+echo "Installing Qt Image Formats..."
+rm -fr "qtimageformats-everywhere-src-$QT"
+tar xf "qtimageformats-everywhere-src-$QT.tar.xz"
+cd "qtimageformats-everywhere-src-$QT"
+mkdir build
+cd build
+"$INSTALLDIR/bin/qt-configure-module" .. -- "${CMAKE_COMMON[@]}" "$CMAKE_ARCH_UNIVERSAL" -DFEATURE_system_webp=ON
+make "-j$NPROCS"
+make install
+cd ../..
+
+echo "Installing Qt Tools..."
+rm -fr "qttools-everywhere-src-$QT"
+tar xf "qttools-everywhere-src-$QT.tar.xz"
+cd "qttools-everywhere-src-$QT"
+# Linguist relies on a library in the Designer target, which takes 5-7 minutes to build on the CI
+# Avoid it by not building Linguist, since we only need the tools that come with it
+patch -u src/linguist/CMakeLists.txt <<EOF
+--- src/linguist/CMakeLists.txt
++++ src/linguist/CMakeLists.txt
+@@ -14,7 +14,7 @@
+ add_subdirectory(lrelease-pro)
+ add_subdirectory(lupdate)
+ add_subdirectory(lupdate-pro)
+-if(QT_FEATURE_process AND QT_FEATURE_pushbutton AND QT_FEATURE_toolbutton AND TARGET Qt::Widgets AND NOT no-png)
++if(QT_FEATURE_process AND QT_FEATURE_pushbutton AND QT_FEATURE_toolbutton AND TARGET Qt::Widgets AND TARGET Qt::PrintSupport AND NOT no-png)
+     add_subdirectory(linguist)
+ endif()
+EOF
+mkdir build
+cd build
+"$INSTALLDIR/bin/qt-configure-module" .. -- "${CMAKE_COMMON[@]}" "$CMAKE_ARCH_UNIVERSAL" -DFEATURE_assistant=OFF -DFEATURE_clang=OFF -DFEATURE_designer=OFF -DFEATURE_kmap2qmap=OFF -DFEATURE_pixeltool=OFF -DFEATURE_pkg_config=OFF -DFEATURE_qev=OFF -DFEATURE_qtattributionsscanner=OFF -DFEATURE_qtdiag=OFF -DFEATURE_qtplugininfo=OFF
+make "-j$NPROCS"
+make install
+cd ../..
+
+echo "Building shaderc..."
+rm -fr "shaderc-$SHADERC"
+tar xf "shaderc-$SHADERC.tar.gz"
+cd "shaderc-$SHADERC"
+cd third_party
+tar xf "../../shaderc-glslang-$SHADERC_GLSLANG.tar.gz"
+mv "glslang-$SHADERC_GLSLANG" "glslang"
+tar xf "../../shaderc-spirv-headers-$SHADERC_SPIRVHEADERS.tar.gz"
+mv "SPIRV-Headers-$SHADERC_SPIRVHEADERS" "spirv-headers"
+tar xf "../../shaderc-spirv-tools-$SHADERC_SPIRVTOOLS.tar.gz"
+mv "SPIRV-Tools-$SHADERC_SPIRVTOOLS" "spirv-tools"
+cd ..
+patch -p1 < "$SCRIPTDIR/../common/shaderc-changes.patch"
+cmake "${CMAKE_COMMON[@]}" "$CMAKE_ARCH_UNIVERSAL" -DSHADERC_SKIP_TESTS=ON -DSHADERC_SKIP_EXAMPLES=ON -DSHADERC_SKIP_COPYRIGHT_CHECK=ON -B build
+make -C build "-j$NPROCS"
+make -C build install
+cd ..
+
+echo "Installing Qt Translations..."
+rm -fr "qttranslations-everywhere-src-$QT"
+tar xf "qttranslations-everywhere-src-$QT.tar.xz"
+cd "qttranslations-everywhere-src-$QT"
+mkdir build
+cd build
+"$INSTALLDIR/bin/qt-configure-module" .. -- "${CMAKE_COMMON[@]}" "$CMAKE_ARCH_UNIVERSAL"
+make "-j$NPROCS"
+make install
+cd ../..
+
+echo "Cleaning up..."
+cd ..
+rm -rf deps-build

.github/workflows/scripts/macos/build-dependencies.sh

@@ -2,144 +2,328 @@
 
 set -e
 
+if [ "$#" -ne 1 ]; then
+    echo "Syntax: $0 <output directory>"
+    exit 1
+fi
+
+# The bundled ffmpeg has a lot of things disabled to reduce code size.
+# Users may want to use system ffmpeg for additional features
+: ${BUILD_FFMPEG:=1}
+
 export MACOSX_DEPLOYMENT_TARGET=11.0
 
-INSTALLDIR="$HOME/deps"
 NPROCS="$(getconf _NPROCESSORS_ONLN)"
-SDL=SDL2-2.28.5
-PNG=1.6.37
-JPG=9e
-FFMPEG=6.0
-QT=6.6.0
+SCRIPTDIR=$(realpath $(dirname "${BASH_SOURCE[0]}"))
+INSTALLDIR="$1"
+if [ "${INSTALLDIR:0:1}" != "/" ]; then
+	INSTALLDIR="$PWD/$INSTALLDIR"
+fi
 
-mkdir deps-build
+FREETYPE=2.13.2
+HARFBUZZ=8.3.1
+SDL=SDL2-2.30.5
+ZSTD=1.5.6
+LZ4=b8fd2d15309dd4e605070bd4486e26b6ef814e29
+LIBPNG=1.6.43
+LIBJPEG=9f
+LIBWEBP=1.4.0
+FFMPEG=6.0
+MOLTENVK=1.2.9
+QT=6.7.2
+
+SHADERC=2024.1
+SHADERC_GLSLANG=142052fa30f9eca191aa9dcf65359fcaed09eeec
+SHADERC_SPIRVHEADERS=5e3ad389ee56fca27c9705d093ae5387ce404df4
+SHADERC_SPIRVTOOLS=dd4b663e13c07fea4fbb3f70c1c91c86731099f7
+
+mkdir -p deps-build
 cd deps-build
 
 export PKG_CONFIG_PATH="$INSTALLDIR/lib/pkgconfig:$PKG_CONFIG_PATH"
-export LDFLAGS="-L$INSTALLDIR/lib -dead_strip $LDFLAGS"
-export CFLAGS="-I$INSTALLDIR/include -Os $CFLAGS"
-export CXXFLAGS="-I$INSTALLDIR/include -Os $CXXFLAGS"
+export LDFLAGS="-L$INSTALLDIR/lib $LDFLAGS"
+export CFLAGS="-I$INSTALLDIR/include $CFLAGS"
+export CXXFLAGS="-I$INSTALLDIR/include $CXXFLAGS"
+CMAKE_COMMON=(
+	-DCMAKE_BUILD_TYPE=Release
+	-DCMAKE_SHARED_LINKER_FLAGS="-dead_strip -dead_strip_dylibs"
+	-DCMAKE_PREFIX_PATH="$INSTALLDIR"
+	-DCMAKE_INSTALL_PREFIX="$INSTALLDIR"
+	-DCMAKE_OSX_ARCHITECTURES="x86_64"
+	-DCMAKE_INSTALL_NAME_DIR='$<INSTALL_PREFIX>/lib'
+)
 
 cat > SHASUMS <<EOF
-332cb37d0be20cb9541739c61f79bae5a477427d79ae85e352089afdaf6666e4  $SDL.tar.gz
-505e70834d35383537b6491e7ae8641f1a4bed1876dbfe361201fc80868d88ca  libpng-$PNG.tar.xz
+12991c4e55c506dd7f9b765933e62fd2be2e06d421505d7950a132e4f1bb484d  freetype-$FREETYPE.tar.xz
+19a54fe9596f7a47c502549fce8e8a10978c697203774008cc173f8360b19a9a  harfbuzz-$HARFBUZZ.tar.gz
+f374f3fa29c37dfcc20822d4a7d7dc57e58924d1a5f2ad511bfab4c8193de63b  $SDL.tar.gz
+8c29e06cf42aacc1eafc4077ae2ec6c6fcb96a626157e0593d5e82a34fd403c1  zstd-$ZSTD.tar.gz
+0728800155f3ed0a0c87e03addbd30ecbe374f7b080678bbca1506051d50dec3  $LZ4.tar.gz
+6a5ca0652392a2d7c9db2ae5b40210843c0bbc081cbd410825ab00cc59f14a6c  libpng-$LIBPNG.tar.xz
+61f873ec69e3be1b99535634340d5bde750b2e4447caa1db9f61be3fd49ab1e5  libwebp-$LIBWEBP.tar.gz
+04705c110cb2469caa79fb71fba3d7bf834914706e9641a4589485c1f832565b  jpegsrc.v$LIBJPEG.tar.gz
 57be87c22d9b49c112b6d24bc67d42508660e6b718b3db89c44e47e289137082  ffmpeg-$FFMPEG.tar.xz
-039d53312acb5897a9054bd38c9ccbdab72500b71fdccdb3f4f0844b0dd39e0e  qtbase-everywhere-src-$QT.tar.xz
-e1542cb50176e237809895c6549598c08587c63703d100be54ac2d806834e384  qtimageformats-everywhere-src-$QT.tar.xz
-33da25fef51102f564624a7ea3e57cb4a0a31b7b44783d1af5749ac36d3c72de  qtsvg-everywhere-src-$QT.tar.xz
-4e9feebc142bbb6e453e1dc3277e09ec45c8ef081b5ee2a029e6684b5905ba99  qttools-everywhere-src-$QT.tar.xz
-a0d89a236f64b810eb0fe4ae1e90db22b0e86263521b35f89e69f1392815078c  qttranslations-everywhere-src-$QT.tar.xz
+f415a09385030c6510a936155ce211f617c31506db5fbc563e804345f1ecf56e  v$MOLTENVK.tar.gz
+c5f22a5e10fb162895ded7de0963328e7307611c688487b5d152c9ee64767599  qtbase-everywhere-src-$QT.tar.xz
+e1a1d8785fae67d16ad0a443b01d5f32663a6b68d275f1806ebab257485ce5d6  qtimageformats-everywhere-src-$QT.tar.xz
+fb0d1286a35be3583fee34aeb5843c94719e07193bdf1d4d8b0dc14009caef01  qtsvg-everywhere-src-$QT.tar.xz
+58e855ad1b2533094726c8a425766b63a04a0eede2ed85086860e54593aa4b2a  qttools-everywhere-src-$QT.tar.xz
+9845780b5dc1b7279d57836db51aeaf2e4a1160c42be09750616f39157582ca9  qttranslations-everywhere-src-$QT.tar.xz
+eb3b5f0c16313d34f208d90c2fa1e588a23283eed63b101edd5422be6165d528  shaderc-$SHADERC.tar.gz
+aa27e4454ce631c5a17924ce0624eac736da19fc6f5a2ab15a6c58da7b36950f  shaderc-glslang-$SHADERC_GLSLANG.tar.gz
+5d866ce34a4b6908e262e5ebfffc0a5e11dd411640b5f24c85a80ad44c0d4697  shaderc-spirv-headers-$SHADERC_SPIRVHEADERS.tar.gz
+03ee1a2c06f3b61008478f4abe9423454e53e580b9488b47c8071547c6a9db47  shaderc-spirv-tools-$SHADERC_SPIRVTOOLS.tar.gz
 EOF
 
 curl -L \
+	-o "freetype-$FREETYPE.tar.xz" "https://sourceforge.net/projects/freetype/files/freetype2/$FREETYPE/freetype-$FREETYPE.tar.xz/download" \
+	-o "harfbuzz-$HARFBUZZ.tar.gz" "https://github.com/harfbuzz/harfbuzz/archive/refs/tags/$HARFBUZZ.tar.gz" \
 	-O "https://libsdl.org/release/$SDL.tar.gz" \
-	-O "https://downloads.sourceforge.net/project/libpng/libpng16/$PNG/libpng-$PNG.tar.xz" \
+	-O "https://github.com/facebook/zstd/releases/download/v$ZSTD/zstd-$ZSTD.tar.gz" \
+	-O "https://github.com/lz4/lz4/archive/$LZ4.tar.gz" \
+	-O "https://downloads.sourceforge.net/project/libpng/libpng16/$LIBPNG/libpng-$LIBPNG.tar.xz" \
+	-O "https://ijg.org/files/jpegsrc.v$LIBJPEG.tar.gz" \
+	-O "https://storage.googleapis.com/downloads.webmproject.org/releases/webp/libwebp-$LIBWEBP.tar.gz" \
 	-O "https://ffmpeg.org/releases/ffmpeg-$FFMPEG.tar.xz" \
+	-O "https://github.com/KhronosGroup/MoltenVK/archive/refs/tags/v$MOLTENVK.tar.gz" \
 	-O "https://download.qt.io/official_releases/qt/${QT%.*}/$QT/submodules/qtbase-everywhere-src-$QT.tar.xz" \
 	-O "https://download.qt.io/official_releases/qt/${QT%.*}/$QT/submodules/qtimageformats-everywhere-src-$QT.tar.xz" \
 	-O "https://download.qt.io/official_releases/qt/${QT%.*}/$QT/submodules/qtsvg-everywhere-src-$QT.tar.xz" \
 	-O "https://download.qt.io/official_releases/qt/${QT%.*}/$QT/submodules/qttools-everywhere-src-$QT.tar.xz" \
 	-O "https://download.qt.io/official_releases/qt/${QT%.*}/$QT/submodules/qttranslations-everywhere-src-$QT.tar.xz" \
+	-o "shaderc-$SHADERC.tar.gz" "https://github.com/google/shaderc/archive/refs/tags/v$SHADERC.tar.gz" \
+	-o "shaderc-glslang-$SHADERC_GLSLANG.tar.gz" "https://github.com/KhronosGroup/glslang/archive/$SHADERC_GLSLANG.tar.gz" \
+	-o "shaderc-spirv-headers-$SHADERC_SPIRVHEADERS.tar.gz" "https://github.com/KhronosGroup/SPIRV-Headers/archive/$SHADERC_SPIRVHEADERS.tar.gz" \
+	-o "shaderc-spirv-tools-$SHADERC_SPIRVTOOLS.tar.gz" "https://github.com/KhronosGroup/SPIRV-Tools/archive/$SHADERC_SPIRVTOOLS.tar.gz"
 
 shasum -a 256 --check SHASUMS
 
 echo "Installing SDL..."
+rm -fr "$SDL"
 tar xf "$SDL.tar.gz"
 cd "$SDL"
-
-# MFI causes multiple joystick connection events, I'm guessing because both the HIDAPI and MFI interfaces
-# race each other, and sometimes both end up getting through. So, just force MFI off.
-patch -u CMakeLists.txt <<EOF
---- CMakeLists.txt	2023-08-03 01:33:11
-+++ CMakeLists.txt	2023-08-26 12:58:53
-@@ -2105,7 +2105,7 @@
-           #import <Foundation/Foundation.h>
-           #import <CoreHaptics/CoreHaptics.h>
-           int main() { return 0; }" HAVE_FRAMEWORK_COREHAPTICS)
--      if(HAVE_FRAMEWORK_GAMECONTROLLER AND HAVE_FRAMEWORK_COREHAPTICS)
-+      if(HAVE_FRAMEWORK_GAMECONTROLLER AND HAVE_FRAMEWORK_COREHAPTICS AND FALSE)
-         # Only enable MFI if we also have CoreHaptics to ensure rumble works
-         set(SDL_JOYSTICK_MFI 1)
-         set(SDL_FRAMEWORK_GAMECONTROLLER 1)
-
-EOF
-
-cmake -B build -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX="$INSTALLDIR" -DSDL_X11=OFF
+cmake -B build "${CMAKE_COMMON[@]}" -DSDL_X11=OFF -DBUILD_SHARED_LIBS=ON
 make -C build "-j$NPROCS"
 make -C build install
 cd ..
 
+if [ "$BUILD_FFMPEG" -ne 0 ]; then
+	echo "Installing FFmpeg..."
+	rm -fr "ffmpeg-$FFMPEG"
+	tar xf "ffmpeg-$FFMPEG.tar.xz"
+	cd "ffmpeg-$FFMPEG"
+	LDFLAGS="-dead_strip $LDFLAGS" CFLAGS="-Os $CFLAGS" CXXFLAGS="-Os $CXXFLAGS" \
+		./configure --prefix="$INSTALLDIR" \
+		--enable-cross-compile --arch=x86_64 --cc='clang -arch x86_64' --cxx='clang++ -arch x86_64' \
+		--disable-all --disable-autodetect --disable-static --enable-shared \
+		--enable-avcodec --enable-avformat --enable-avutil --enable-swresample --enable-swscale \
+		--enable-audiotoolbox --enable-videotoolbox \
+		--enable-encoder=ffv1,qtrle,pcm_s16be,pcm_s16le,*_at,*_videotoolbox \
+		--enable-muxer=avi,matroska,mov,mp3,mp4,wav \
+		--enable-protocol=file
+	make "-j$NPROCS"
+	make install
+	cd ..
+fi
+
+echo "Installing Zstd..."
+rm -fr "zstd-$ZSTD"
+tar xf "zstd-$ZSTD.tar.gz"
+cd "zstd-$ZSTD"
+cmake "${CMAKE_COMMON[@]}" -DBUILD_SHARED_LIBS=ON -DZSTD_BUILD_PROGRAMS=OFF -B build-dir build/cmake
+make -C build-dir "-j$NPROCS"
+make -C build-dir install
+cd ..
+
+echo "Installing LZ4..."
+rm -fr "lz4-$LZ4"
+tar xf "$LZ4.tar.gz"
+cd "lz4-$LZ4"
+cmake "${CMAKE_COMMON[@]}" -DBUILD_SHARED_LIBS=ON -DLZ4_BUILD_CLI=OFF -DLZ4_BUILD_LEGACY_LZ4C=OFF -B build-dir build/cmake
+make -C build-dir "-j$NPROCS"
+make -C build-dir install
+cd ..
+
 echo "Installing libpng..."
-tar xf "libpng-$PNG.tar.xz"
-cd "libpng-$PNG"
-./configure --prefix "$INSTALLDIR" --disable-dependency-tracking
-make "-j$NPROCS"
-make install
+rm -fr "libpng-$LIBPNG"
+tar xf "libpng-$LIBPNG.tar.xz"
+cd "libpng-$LIBPNG"
+cmake "${CMAKE_COMMON[@]}" -DBUILD_SHARED_LIBS=ON -DPNG_TESTS=OFF -DPNG_FRAMEWORK=OFF -B build
+make -C build "-j$NPROCS"
+make -C build install
 cd ..
 
-echo "Installing FFmpeg..."
-tar xf "ffmpeg-$FFMPEG.tar.xz"
-cd "ffmpeg-$FFMPEG"
-./configure --prefix="$INSTALLDIR" --disable-all --disable-autodetect --disable-static --enable-shared \
-	--enable-avcodec --enable-avformat --enable-avutil --enable-swresample --enable-swscale \
-	--enable-audiotoolbox --enable-videotoolbox \
-	--enable-encoder=ffv1,qtrle,pcm_s16be,pcm_s16le,*_at,*_videotoolbox \
-	--enable-muxer=avi,matroska,mov,mp3,mp4,wav \
-	--enable-protocol=file
+echo "Installing libjpeg..."
+rm -fr "jpeg-$LIBJPEG"
+tar xf "jpegsrc.v$LIBJPEG.tar.gz"
+cd "jpeg-$LIBJPEG"
+mkdir build
+cd build
+../configure --prefix="$INSTALLDIR" --disable-static --enable-shared --host="x86_64-apple-darwin" CFLAGS="-arch x86_64"
 make "-j$NPROCS"
 make install
+cd ../..
+
+echo "Installing WebP..."
+rm -fr "libwebp-$LIBWEBP"
+tar xf "libwebp-$LIBWEBP.tar.gz"
+cd "libwebp-$LIBWEBP"
+cmake "${CMAKE_COMMON[@]}" -B build \
+	-DWEBP_BUILD_ANIM_UTILS=OFF -DWEBP_BUILD_CWEBP=OFF -DWEBP_BUILD_DWEBP=OFF -DWEBP_BUILD_GIF2WEBP=OFF -DWEBP_BUILD_IMG2WEBP=OFF \
+	-DWEBP_BUILD_VWEBP=OFF -DWEBP_BUILD_WEBPINFO=OFF -DWEBP_BUILD_WEBPMUX=OFF -DWEBP_BUILD_EXTRAS=OFF -DBUILD_SHARED_LIBS=ON
+make -C build "-j$NPROCS"
+make -C build install
+cd ..
+
+echo "Building FreeType without HarfBuzz..."
+rm -fr "freetype-$FREETYPE"
+tar xf "freetype-$FREETYPE.tar.xz"
+cd "freetype-$FREETYPE"
+cmake "${CMAKE_COMMON[@]}" -DBUILD_SHARED_LIBS=ON -DFT_REQUIRE_ZLIB=ON -DFT_REQUIRE_PNG=ON -DFT_DISABLE_BZIP2=TRUE -DFT_DISABLE_BROTLI=TRUE -DFT_DISABLE_HARFBUZZ=TRUE -B build
+cmake --build build --parallel
+cmake --install build
+cd ..
+
+echo "Building HarfBuzz..."
+rm -fr "harfbuzz-$HARFBUZZ"
+tar xf "harfbuzz-$HARFBUZZ.tar.gz"
+cd "harfbuzz-$HARFBUZZ"
+cmake "${CMAKE_COMMON[@]}" -DBUILD_SHARED_LIBS=ON -DHB_BUILD_UTILS=OFF -B build
+cmake --build build --parallel
+cmake --install build
+cd ..
+
+echo "Building FreeType with HarfBuzz..."
+rm -fr "freetype-$FREETYPE"
+tar xf "freetype-$FREETYPE.tar.xz"
+cd "freetype-$FREETYPE"
+cmake "${CMAKE_COMMON[@]}" -DBUILD_SHARED_LIBS=ON -DFT_REQUIRE_ZLIB=ON -DFT_REQUIRE_PNG=ON -DFT_DISABLE_BZIP2=TRUE -DFT_DISABLE_BROTLI=TRUE -DFT_REQUIRE_HARFBUZZ=TRUE -B build
+cmake --build build --parallel
+cmake --install build
+cd ..
+
+# MoltenVK already builds universal binaries, nothing special to do here.
+echo "Installing MoltenVK..."
+rm -fr "MoltenVK-${MOLTENVK}"
+tar xf "v$MOLTENVK.tar.gz"
+cd "MoltenVK-${MOLTENVK}"
+sed -i '' 's/xcodebuild "$@"/xcodebuild $XCODEBUILD_EXTRA_ARGS "$@"/g' fetchDependencies
+sed -i '' 's/XCODEBUILD :=/XCODEBUILD ?=/g' Makefile
+XCODEBUILD_EXTRA_ARGS="VALID_ARCHS=x86_64" ./fetchDependencies --macos
+XCODEBUILD="set -o pipefail && xcodebuild VALID_ARCHS=x86_64" make macos
+cp Package/Latest/MoltenVK/dynamic/dylib/macOS/libMoltenVK.dylib "$INSTALLDIR/lib/"
 cd ..
 
 echo "Installing Qt Base..."
+rm -fr "qtbase-everywhere-src-$QT"
 tar xf "qtbase-everywhere-src-$QT.tar.xz"
 cd "qtbase-everywhere-src-$QT"
-cmake -B build -DCMAKE_PREFIX_PATH="$INSTALLDIR" -DCMAKE_INSTALL_PREFIX="$INSTALLDIR" -DCMAKE_BUILD_TYPE=Release -DFEATURE_optimize_size=ON -DFEATURE_dbus=OFF -DFEATURE_framework=OFF -DFEATURE_icu=OFF -DFEATURE_opengl=OFF -DFEATURE_printsupport=OFF -DFEATURE_sql=OFF -DFEATURE_gssapi=OFF
-make -C build "-j$NPROCS"
-make -C build install
-cd ..
-echo "Installing Qt SVG..."
-tar xf "qtsvg-everywhere-src-$QT.tar.xz"
-cd "qtsvg-everywhere-src-$QT"
-cmake -B build -DCMAKE_PREFIX_PATH="$INSTALLDIR" -DCMAKE_INSTALL_PREFIX="$INSTALLDIR" -DCMAKE_BUILD_TYPE=MinSizeRel
-make -C build "-j$NPROCS"
-make -C build install
-cd ..
-echo "Installing Qt Image Formats..."
-tar xf "qtimageformats-everywhere-src-$QT.tar.xz"
-cd "qtimageformats-everywhere-src-$QT"
-cmake -B build -DCMAKE_PREFIX_PATH="$INSTALLDIR" -DCMAKE_INSTALL_PREFIX="$INSTALLDIR" -DCMAKE_BUILD_TYPE=MinSizeRel
-make -C build "-j$NPROCS"
-make -C build install
-cd ..
-echo "Installing Qt Tools..."
-tar xf "qttools-everywhere-src-$QT.tar.xz"
-cd "qttools-everywhere-src-$QT"
-# Linguist relies on a library in the Designer target, which takes 5-7 minutes to build on the CI
-# Avoid it by not building Linguist, since we only need the tools that come with it
-patch -u src/linguist/CMakeLists.txt <<EOF
---- src/linguist/CMakeLists.txt
-+++ src/linguist/CMakeLists.txt
-@@ -14,7 +14,7 @@
- add_subdirectory(lrelease-pro)
- add_subdirectory(lupdate)
- add_subdirectory(lupdate-pro)
--if(QT_FEATURE_process AND QT_FEATURE_pushbutton AND QT_FEATURE_toolbutton AND TARGET Qt::Widgets AND NOT no-png)
-+if(QT_FEATURE_process AND QT_FEATURE_pushbutton AND QT_FEATURE_toolbutton AND TARGET Qt::Widgets AND TARGET Qt::PrintSupport AND NOT no-png)
-     add_subdirectory(linguist)
- endif()
+
+# since we don't have a direct reference to QtSvg, it doesn't deployed directly from the main binary
+# (only indirectly from iconengines), and the libqsvg.dylib imageformat plugin does not get deployed.
+# We could run macdeployqt twice, but that's even more janky than patching it.
+
+# https://github.com/qt/qtbase/commit/7b018629c3c3ab23665bf1da00c43c1546042035
+# The QProcess default wait time of 30s may be too short in e.g. CI environments where processes may be blocked
+# for a longer time waiting for CPU or IO.
+
+patch -u src/tools/macdeployqt/shared/shared.cpp <<EOF
+--- shared.cpp
++++ shared.cpp
+@@ -152,7 +152,7 @@
+     LogDebug() << " inspecting" << binaryPath;
+     QProcess otool;
+     otool.start("otool", QStringList() << "-L" << binaryPath);
+-    otool.waitForFinished();
++    otool.waitForFinished(-1);
+ 
+     if (otool.exitStatus() != QProcess::NormalExit || otool.exitCode() != 0) {
+         LogError() << otool.readAllStandardError();
+@@ -1122,14 +1122,8 @@
+         addPlugins(QStringLiteral("networkinformation"));
+     }
+ 
+-    // All image formats (svg if QtSvg is used)
+-    const bool usesSvg = deploymentInfo.containsModule("Svg", libInfix);
+-    addPlugins(QStringLiteral("imageformats"), [usesSvg](const QString &lib) {
+-        if (lib.contains(QStringLiteral("qsvg")) && !usesSvg)
+-            return false;
+-        return true;
+-    });
+-
++    // All image formats
++    addPlugins(QStringLiteral("imageformats"));
+     addPlugins(QStringLiteral("iconengines"));
+ 
+     // Platforminputcontext plugins if QtGui is in use
 EOF
-cmake -B build -DCMAKE_PREFIX_PATH="$INSTALLDIR" -DCMAKE_INSTALL_PREFIX="$INSTALLDIR" -DCMAKE_BUILD_TYPE=Release -DFEATURE_assistant=OFF -DFEATURE_clang=OFF -DFEATURE_designer=OFF -DFEATURE_kmap2qmap=OFF -DFEATURE_pixeltool=OFF -DFEATURE_pkg_config=OFF -DFEATURE_qev=OFF -DFEATURE_qtattributionsscanner=OFF -DFEATURE_qtdiag=OFF -DFEATURE_qtplugininfo=OFF
-make -C build "-j$NPROCS"
-make -C build install
-cd ..
-echo "Installing Qt Translations..."
-tar xf "qttranslations-everywhere-src-$QT.tar.xz"
-cd "qttranslations-everywhere-src-$QT"
-cmake -B build -DCMAKE_PREFIX_PATH="$INSTALLDIR" -DCMAKE_INSTALL_PREFIX="$INSTALLDIR" -DCMAKE_BUILD_TYPE=Release
+cmake -B build "${CMAKE_COMMON[@]}" -DFEATURE_dbus=OFF -DFEATURE_framework=OFF -DFEATURE_icu=OFF -DFEATURE_opengl=OFF -DFEATURE_sql=OFF -DFEATURE_gssapi=OFF -DFEATURE_system_png=ON -DFEATURE_system_jpeg=ON -DFEATURE_system_zlib=ON -DFEATURE_system_freetype=ON -DFEATURE_system_harfbuzz=ON
 make -C build "-j$NPROCS"
 make -C build install
 cd ..
 
+echo "Installing Qt SVG..."
+rm -fr "qtsvg-everywhere-src-$QT"
+tar xf "qtsvg-everywhere-src-$QT.tar.xz"
+cd "qtsvg-everywhere-src-$QT"
+mkdir build
+cd build
+"$INSTALLDIR/bin/qt-configure-module" .. -- "${CMAKE_COMMON[@]}"
+make "-j$NPROCS"
+make install
+cd ../..
+
+echo "Installing Qt Image Formats..."
+rm -fr "qtimageformats-everywhere-src-$QT"
+tar xf "qtimageformats-everywhere-src-$QT.tar.xz"
+cd "qtimageformats-everywhere-src-$QT"
+mkdir build
+cd build
+"$INSTALLDIR/bin/qt-configure-module" .. -- "${CMAKE_COMMON[@]}" -DFEATURE_system_webp=ON
+make "-j$NPROCS"
+make install
+cd ../..
+
+echo "Installing Qt Tools..."
+rm -fr "qttools-everywhere-src-$QT"
+tar xf "qttools-everywhere-src-$QT.tar.xz"
+cd "qttools-everywhere-src-$QT"
+mkdir build
+cd build
+"$INSTALLDIR/bin/qt-configure-module" .. -- "${CMAKE_COMMON[@]}" -DFEATURE_assistant=OFF -DFEATURE_clang=OFF -DFEATURE_designer=ON -DFEATURE_kmap2qmap=OFF -DFEATURE_pixeltool=OFF -DFEATURE_pkg_config=OFF -DFEATURE_qev=OFF -DFEATURE_qtattributionsscanner=OFF -DFEATURE_qtdiag=OFF -DFEATURE_qtplugininfo=OFF
+make "-j$NPROCS"
+make install
+cd ../..
+
+echo "Building shaderc..."
+rm -fr "shaderc-$SHADERC"
+tar xf "shaderc-$SHADERC.tar.gz"
+cd "shaderc-$SHADERC"
+cd third_party
+tar xf "../../shaderc-glslang-$SHADERC_GLSLANG.tar.gz"
+mv "glslang-$SHADERC_GLSLANG" "glslang"
+tar xf "../../shaderc-spirv-headers-$SHADERC_SPIRVHEADERS.tar.gz"
+mv "SPIRV-Headers-$SHADERC_SPIRVHEADERS" "spirv-headers"
+tar xf "../../shaderc-spirv-tools-$SHADERC_SPIRVTOOLS.tar.gz"
+mv "SPIRV-Tools-$SHADERC_SPIRVTOOLS" "spirv-tools"
+cd ..
+patch -p1 < "$SCRIPTDIR/../common/shaderc-changes.patch"
+cmake "${CMAKE_COMMON[@]}" "$CMAKE_ARCH_UNIVERSAL" -DSHADERC_SKIP_TESTS=ON -DSHADERC_SKIP_EXAMPLES=ON -DSHADERC_SKIP_COPYRIGHT_CHECK=ON -B build
+make -C build "-j$NPROCS"
+make -C build install
+cd ..
+
+echo "Installing Qt Translations..."
+rm -fr "qttranslations-everywhere-src-$QT"
+tar xf "qttranslations-everywhere-src-$QT.tar.xz"
+cd "qttranslations-everywhere-src-$QT"
+mkdir build
+cd build
+"$INSTALLDIR/bin/qt-configure-module" .. -- "${CMAKE_COMMON[@]}"
+make "-j$NPROCS"
+make install
+cd ../..
+
 echo "Cleaning up..."
 cd ..
-rm -r deps-build
+rm -rf deps-build

.github/workflows/scripts/releases/announce-release/package-lock.json

@@ -461,15 +461,15 @@
       "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8="
     },
     "node_modules/ws": {
-      "version": "8.2.3",
-      "resolved": "https://registry.npmjs.org/ws/-/ws-8.2.3.tgz",
-      "integrity": "sha512-wBuoj1BDpC6ZQ1B7DWQBYVLphPWkm8i9Y0/3YdHjHKHiohOJ1ws+3OccDWtH+PoC9DZD5WOTrJvNbWvjS6JWaA==",
+      "version": "8.17.1",
+      "resolved": "https://registry.npmjs.org/ws/-/ws-8.17.1.tgz",
+      "integrity": "sha512-6XQFvXTkbfUOZOKKILFG1PDK2NDQs4azKQl26T0YS5CxqWLgXajbPZ+h4gZekJyRqFU8pvnbAbbs/3TgRPy+GQ==",
       "engines": {
         "node": ">=10.0.0"
       },
       "peerDependencies": {
         "bufferutil": "^4.0.1",
-        "utf-8-validate": "^5.0.2"
+        "utf-8-validate": ">=5.0.2"
       },
       "peerDependenciesMeta": {
         "bufferutil": {
@@ -842,9 +842,9 @@
       "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8="
     },
     "ws": {
-      "version": "8.2.3",
-      "resolved": "https://registry.npmjs.org/ws/-/ws-8.2.3.tgz",
-      "integrity": "sha512-wBuoj1BDpC6ZQ1B7DWQBYVLphPWkm8i9Y0/3YdHjHKHiohOJ1ws+3OccDWtH+PoC9DZD5WOTrJvNbWvjS6JWaA==",
+      "version": "8.17.1",
+      "resolved": "https://registry.npmjs.org/ws/-/ws-8.17.1.tgz",
+      "integrity": "sha512-6XQFvXTkbfUOZOKKILFG1PDK2NDQs4azKQl26T0YS5CxqWLgXajbPZ+h4gZekJyRqFU8pvnbAbbs/3TgRPy+GQ==",
       "requires": {}
     }
   }

.github/workflows/scripts/windows/build-dependencies-arm64.bat

@@ -0,0 +1,293 @@
+@echo off
+setlocal enabledelayedexpansion
+
+echo Setting environment...
+if exist "%ProgramFiles%\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvarsamd64_arm64.bat" (
+  call "%ProgramFiles%\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvarsamd64_arm64.bat"
+) else if exist "%ProgramFiles%\Microsoft Visual Studio\2022\Community\VC\Auxiliary\Build\vcvarsamd64_arm64.bat" (
+  call "%ProgramFiles%\Microsoft Visual Studio\2022\Community\VC\Auxiliary\Build\vcvarsamd64_arm64.bat"
+) else (
+  echo Visual Studio 2022 not found.
+  goto error
+)
+
+set SEVENZIP="C:\Program Files\7-Zip\7z.exe"
+set PATCH="C:\Program Files\Git\usr\bin\patch.exe"
+
+if defined DEBUG (
+  echo DEBUG=%DEBUG%
+) else (
+  set DEBUG=1
+)
+
+pushd %~dp0
+set "SCRIPTDIR=%CD%"
+cd ..\..\..\..
+mkdir deps-build
+cd deps-build || goto error
+set "BUILDDIR=%CD%"
+cd ..
+mkdir deps-arm64
+cd deps-arm64 || goto error
+set "INSTALLDIR=%CD%"
+cd ..
+cd deps || goto error
+set "X64INSTALLDIR=%CD%"
+cd ..
+popd
+
+echo SCRIPTDIR=%SCRIPTDIR%
+echo BUILDDIR=%BUILDDIR%
+echo INSTALLDIR=%INSTALLDIR%
+
+cd "%BUILDDIR%"
+
+set FREETYPE=2.13.2
+set HARFBUZZ=8.3.1
+set LIBJPEG=9f
+set LIBPNG=1643
+set LZ4=b8fd2d15309dd4e605070bd4486e26b6ef814e29
+set QT=6.7.0
+set QTMINOR=6.7
+set SDL=SDL2-2.30.2
+set WEBP=1.3.2
+set ZLIB=1.3.1
+set ZLIBSHORT=131
+set ZSTD=1.5.5
+
+set SHADERC=2024.1
+set SHADERC_GLSLANG=142052fa30f9eca191aa9dcf65359fcaed09eeec
+set SHADERC_SPIRVHEADERS=5e3ad389ee56fca27c9705d093ae5387ce404df4
+set SHADERC_SPIRVTOOLS=dd4b663e13c07fea4fbb3f70c1c91c86731099f7
+
+call :downloadfile "freetype-%FREETYPE%.tar.gz" https://sourceforge.net/projects/freetype/files/freetype2/%FREETYPE%/freetype-%FREETYPE%.tar.gz/download 1ac27e16c134a7f2ccea177faba19801131116fd682efc1f5737037c5db224b5 || goto error
+call :downloadfile "harfbuzz-%HARFBUZZ%.zip" https://github.com/harfbuzz/harfbuzz/archive/refs/tags/%HARFBUZZ%.zip b2bc56184ae37324bc4829fde7d3f9e6916866ad711ee85792e457547c9fd127 || goto error
+call :downloadfile "lpng%LIBPNG%.zip" https://download.sourceforge.net/libpng/lpng1643.zip fc466a1e638e635d6c66363bdf3f38555b81b0141d0b06ba45b49ccca327436d || goto error
+call :downloadfile "jpegsr%LIBJPEG%.zip" https://ijg.org/files/jpegsr%LIBJPEG%.zip 6255da8c89e09d694e6800688c76145eb6870a76ac0d36c74fccd61b3940aafa || goto error
+call :downloadfile "libwebp-%WEBP%.tar.gz" "https://storage.googleapis.com/downloads.webmproject.org/releases/webp/libwebp-%WEBP%.tar.gz" 2a499607df669e40258e53d0ade8035ba4ec0175244869d1025d460562aa09b4 || goto error
+call :downloadfile "lz4-%LZ4%.zip" "https://github.com/lz4/lz4/archive/%LZ4%.zip" 0c33119688d6b180c7e760b0acd70059222389cfd581632623784bee27e51a31 || goto error
+call :downloadfile "%SDL%.zip" "https://libsdl.org/release/%SDL%.zip" c5d78a9e0346c6695f03df8ba25e5e111a1e23c8aefa8372a1c5a0dd79acaf10 || goto error
+call :downloadfile "qtbase-everywhere-src-%QT%.zip" "https://download.qt.io/official_releases/qt/%QTMINOR%/%QT%/submodules/qtbase-everywhere-src-%QT%.zip" 3027fb990cb66436b5476b9dd17cd58f23b55a42eb1c1bcf9c7d78bca3ad7d63 || goto error
+call :downloadfile "qtimageformats-everywhere-src-%QT%.zip" "https://download.qt.io/official_releases/qt/%QTMINOR%/%QT%/submodules/qtimageformats-everywhere-src-%QT%.zip" f30065289517847d721467827ee446a5f606f6d1c750e166cbfb0ed5bf066c5e || goto error
+call :downloadfile "qtsvg-everywhere-src-%QT%.zip" "https://download.qt.io/official_releases/qt/%QTMINOR%/%QT%/submodules/qtsvg-everywhere-src-%QT%.zip" 882d1db58d35155bd92e4ed92b485d7d713b6aff0d7cf78655de0b414a980689 || goto error
+call :downloadfile "qttools-everywhere-src-%QT%.zip" "https://download.qt.io/official_releases/qt/%QTMINOR%/%QT%/submodules/qttools-everywhere-src-%QT%.zip" 93a31892ca8a4f38464e923328788ce3da881d82016fe18fa1ed12dd43ce486c || goto error
+call :downloadfile "qttranslations-everywhere-src-%QT%.zip" "https://download.qt.io/official_releases/qt/%QTMINOR%/%QT%/submodules/qttranslations-everywhere-src-%QT%.zip" 102ca62fa682c0d3e700ba89069fd3b6663b9f0c2890b058e97998b6e8971fb3 || goto error
+call :downloadfile "zlib%ZLIBSHORT%.zip" "https://zlib.net/zlib%ZLIBSHORT%.zip" 72af66d44fcc14c22013b46b814d5d2514673dda3d115e64b690c1ad636e7b17 || goto error
+call :downloadfile "zstd-%ZSTD%.zip" "https://github.com/facebook/zstd/archive/refs/tags/v%ZSTD%.zip" c5c8daa1d40dabc51790c62a5b86af2b36dfc4e1a738ff10dc4a46ea4e68ee51 || goto error
+
+call :downloadfile "shaderc-%SHADERC%.zip" "https://github.com/google/shaderc/archive/refs/tags/v%SHADERC%.zip" 6c9f42ed6bf42750f5369b089909abfdcf0101488b4a1f41116d5159d00af8e7 || goto error
+call :downloadfile "shaderc-glslang-%SHADERC_GLSLANG%.zip" "https://github.com/KhronosGroup/glslang/archive/%SHADERC_GLSLANG%.zip" 03ad8a6fa987af4653d0cfe6bdaed41bcf617f1366a151fb1574da75950cd3e8 || goto error
+call :downloadfile "shaderc-spirv-headers-%SHADERC_SPIRVHEADERS%.zip" "https://github.com/KhronosGroup/SPIRV-Headers/archive/%SHADERC_SPIRVHEADERS%.zip" fa59a54334feaba5702b9c25724c3f4746123865769b36dd5a28d9ef5e9d39ab || goto error
+call :downloadfile "shaderc-spirv-tools-%SHADERC_SPIRVTOOLS%.zip" "https://github.com/KhronosGroup/SPIRV-Tools/archive/%SHADERC_SPIRVTOOLS%.zip" bf385994c20293485b378c27dfdbd77a31b949deabccd9218a977f173eda9f6f || goto error
+
+if %DEBUG%==1 (
+  echo Building debug and release libraries...
+) else (
+  echo Building release libraries...
+)
+
+set FORCEPDB=-DCMAKE_SHARED_LINKER_FLAGS_RELEASE="/DEBUG"
+set ARM64TOOLCHAIN=-DCMAKE_TOOLCHAIN_FILE="%SCRIPTDIR%\cmake-toolchain-windows-arm64.cmake"
+
+echo Building Zlib...
+rmdir /S /Q "zlib-%ZLIB%"
+%SEVENZIP% x "zlib%ZLIBSHORT%.zip" || goto error
+cd "zlib-%ZLIB%" || goto error
+cmake %ARM64TOOLCHAIN% -DCMAKE_BUILD_TYPE=Release -DCMAKE_PREFIX_PATH="%INSTALLDIR%" -DCMAKE_INSTALL_PREFIX="%INSTALLDIR%" -DBUILD_SHARED_LIBS=ON -DZLIB_BUILD_EXAMPLES=OFF -B build -G Ninja || goto error
+cmake --build build --parallel || goto error
+ninja -C build install || goto error
+cd .. || goto error
+
+echo Building libpng...
+rmdir /S /Q "lpng%LIBPNG%"
+%SEVENZIP% x "lpng%LIBPNG%.zip" || goto error
+cd "lpng%LIBPNG%" || goto error
+cmake %ARM64TOOLCHAIN% -DCMAKE_BUILD_TYPE=Release -DCMAKE_PREFIX_PATH="%INSTALLDIR%" -DCMAKE_INSTALL_PREFIX="%INSTALLDIR%" -DBUILD_SHARED_LIBS=ON -DBUILD_SHARED_LIBS=ON -DPNG_TESTS=OFF -DPNG_STATIC=OFF -DPNG_SHARED=ON -DPNG_TOOLS=OFF -B build -G Ninja || goto error
+cmake --build build --parallel || goto error
+ninja -C build install || goto error
+cd .. || goto error
+
+echo Building libjpeg...
+%SEVENZIP% x "jpegsr%LIBJPEG%.zip" || goto error
+cd "jpeg-%LIBJPEG%" || goto error
+%PATCH% -p1 < "%SCRIPTDIR%\libjpeg-cmake.patch" || goto error
+cmake %ARM64TOOLCHAIN% -DCMAKE_BUILD_TYPE=Release -DCMAKE_PREFIX_PATH="%INSTALLDIR%" -DCMAKE_INSTALL_PREFIX="%INSTALLDIR%" -DBUILD_SHARED_LIBS=ON -DBUILD_STATIC_LIBS=OFF -B build -G Ninja || goto error
+cmake --build build --parallel || goto error
+ninja -C build install || goto error
+cd .. || goto error
+
+echo Building LZ4...
+rmdir /S /Q "lz4"
+%SEVENZIP% x "lz4-%LZ4%.zip" || goto error
+rename "lz4-%LZ4%" "lz4" || goto error
+cd "lz4" || goto error
+cmake %ARM64TOOLCHAIN% -DCMAKE_BUILD_TYPE=Release -DCMAKE_PREFIX_PATH="%INSTALLDIR%" -DCMAKE_INSTALL_PREFIX="%INSTALLDIR%" -DBUILD_SHARED_LIBS=ON -DLZ4_BUILD_CLI=OFF -DLZ4_BUILD_LEGACY_LZ4C=OFF -DCMAKE_C_FLAGS="/wd4711 /wd5045" -B build-dir -G Ninja build/cmake || goto error
+cmake --build build-dir --parallel || goto error
+ninja -C build-dir install || goto error
+cd ..
+
+echo Building FreeType without HarfBuzz...
+rmdir /S /Q "freetype-%FREETYPE%"
+tar -xf "freetype-%FREETYPE%.tar.gz" || goto error
+cd "freetype-%FREETYPE%" || goto error
+cmake %ARM64TOOLCHAIN% -DCMAKE_BUILD_TYPE=Release -DCMAKE_PREFIX_PATH="%INSTALLDIR%" -DCMAKE_INSTALL_PREFIX="%INSTALLDIR%" -DBUILD_SHARED_LIBS=ON -DFT_REQUIRE_ZLIB=TRUE -DFT_REQUIRE_PNG=TRUE -DFT_DISABLE_BZIP2=TRUE -DFT_DISABLE_BROTLI=TRUE -DFT_DISABLE_HARFBUZZ=TRUE -B build -G Ninja || goto error
+cmake --build build --parallel || goto error
+ninja -C build install || goto error
+cd .. || goto error
+
+echo Building HarfBuzz...
+rmdir /S /Q "harfbuzz-%HARFBUZZ%"
+%SEVENZIP% x "-x^!harfbuzz-%HARFBUZZ%\README" "harfbuzz-%HARFBUZZ%.zip" || goto error
+cd "harfbuzz-%HARFBUZZ%" || goto error
+cmake %ARM64TOOLCHAIN% -DCMAKE_BUILD_TYPE=Release -DCMAKE_PREFIX_PATH="%INSTALLDIR%" -DCMAKE_INSTALL_PREFIX="%INSTALLDIR%" -DBUILD_SHARED_LIBS=ON -DHB_BUILD_UTILS=OFF -B build -G Ninja || goto error
+cmake --build build --parallel || goto error
+ninja -C build install || goto error
+cd .. || goto error
+
+echo Building FreeType with HarfBuzz...
+rmdir /S /Q "freetype-%FREETYPE%"
+tar -xf "freetype-%FREETYPE%.tar.gz" || goto error
+cd "freetype-%FREETYPE%" || goto error
+cmake %ARM64TOOLCHAIN% -DCMAKE_BUILD_TYPE=Release -DCMAKE_PREFIX_PATH="%INSTALLDIR%" -DCMAKE_INSTALL_PREFIX="%INSTALLDIR%" -DBUILD_SHARED_LIBS=ON -DFT_REQUIRE_ZLIB=TRUE -DFT_REQUIRE_PNG=TRUE -DFT_DISABLE_BZIP2=TRUE -DFT_DISABLE_BROTLI=TRUE -DFT_REQUIRE_HARFBUZZ=TRUE -B build -G Ninja || goto error
+cmake --build build --parallel || goto error
+ninja -C build install || goto error
+cd .. || goto error
+
+echo Building Zstandard...
+rmdir /S /Q "zstd-%ZSTD%"
+%SEVENZIP% x "-x^!zstd-1.5.5\tests\cli-tests\bin" "zstd-%ZSTD%.zip" || goto error
+cd "zstd-%ZSTD%"
+cmake %ARM64TOOLCHAIN% -DCMAKE_BUILD_TYPE=Release -DCMAKE_PREFIX_PATH="%INSTALLDIR%" -DCMAKE_INSTALL_PREFIX="%INSTALLDIR%" -DBUILD_SHARED_LIBS=ON -DZSTD_BUILD_SHARED=ON -DZSTD_BUILD_STATIC=OFF -DZSTD_BUILD_PROGRAMS=OFF -B build -G Ninja build/cmake
+cmake --build build --parallel || goto error
+ninja -C build install || goto error
+cd .. || goto error
+
+echo Building WebP...
+rmdir /S /Q "libwebp-%WEBP%"
+tar -xf "libwebp-%WEBP%.tar.gz" || goto error
+cd "libwebp-%WEBP%" || goto error
+cmake -B build %ARM64TOOLCHAIN% -DCMAKE_BUILD_TYPE=Release -DCMAKE_PREFIX_PATH="%INSTALLDIR%" -DCMAKE_INSTALL_PREFIX="%INSTALLDIR%" -DWEBP_BUILD_ANIM_UTILS=OFF -DWEBP_BUILD_CWEBP=OFF -DWEBP_BUILD_DWEBP=OFF -DWEBP_BUILD_GIF2WEBP=OFF -DWEBP_BUILD_IMG2WEBP=OFF -DWEBP_BUILD_VWEBP=OFF -DWEBP_BUILD_WEBPINFO=OFF -DWEBP_BUILD_WEBPMUX=OFF -DWEBP_BUILD_EXTRAS=OFF -DBUILD_SHARED_LIBS=ON -G Ninja || goto error
+cmake --build build --parallel || goto error
+ninja -C build install || goto error
+cd .. || goto error
+
+echo Building SDL...
+rmdir /S /Q "%SDL%"
+%SEVENZIP% x "%SDL%.zip" || goto error
+cd "%SDL%" || goto error
+cmake -B build %ARM64TOOLCHAIN% -DCMAKE_BUILD_TYPE=Release %FORCEPDB% -DCMAKE_INSTALL_PREFIX="%INSTALLDIR%" -DBUILD_SHARED_LIBS=ON -DSDL_SHARED=ON -DSDL_STATIC=OFF -G Ninja || goto error
+cmake --build build --parallel || goto error
+ninja -C build install || goto error
+copy build\SDL2.pdb "%INSTALLDIR%\bin" || goto error
+cd .. || goto error
+
+if %DEBUG%==1 (
+  set QTBUILDSPEC=-DCMAKE_CONFIGURATION_TYPES="Release;Debug" -G "Ninja Multi-Config"
+) else (
+  set QTBUILDSPEC=-DCMAKE_BUILD_TYPE=Release -G Ninja
+)
+
+echo Building Qt base...
+rmdir /S /Q "qtbase-everywhere-src-%QT%"
+%SEVENZIP% x "qtbase-everywhere-src-%QT%.zip" || goto error
+cd "qtbase-everywhere-src-%QT%" || goto error
+cmake -B build %ARM64TOOLCHAIN% -DFEATURE_sql=OFF -DCMAKE_INSTALL_PREFIX="%INSTALLDIR%" -DQT_HOST_PATH="%X64INSTALLDIR%" %FORCEPDB% -DINPUT_gui=yes -DINPUT_widgets=yes -DINPUT_ssl=yes -DINPUT_openssl=no -DINPUT_schannel=yes -DFEATURE_system_png=ON -DFEATURE_system_jpeg=ON -DFEATURE_system_zlib=ON -DFEATURE_system_freetype=ON -DFEATURE_system_harfbuzz=ON %QTBUILDSPEC% || goto error
+cmake --build build --parallel || goto error
+ninja -C build install || goto error
+cd .. || goto error
+
+echo Building Qt SVG...
+rmdir /S /Q "qtsvg-everywhere-src-%QT%"
+%SEVENZIP% x "qtsvg-everywhere-src-%QT%.zip" || goto error
+cd "qtsvg-everywhere-src-%QT%" || goto error
+mkdir build || goto error
+cd build || goto error
+call "%INSTALLDIR%\bin\qt-configure-module.bat" .. -- %FORCEPDB% -DCMAKE_PREFIX_PATH="%INSTALLDIR%" || goto error
+cmake --build . --parallel || goto error
+ninja install || goto error
+cd ..\.. || goto error
+
+echo Building Qt Image Formats...
+rmdir /S /Q "qtimageformats-everywhere-src-%QT%"
+%SEVENZIP% x "qtimageformats-everywhere-src-%QT%.zip" || goto error
+cd "qtimageformats-everywhere-src-%QT%" || goto error
+mkdir build || goto error
+cd build || goto error
+call "%INSTALLDIR%\bin\qt-configure-module.bat" .. -- %FORCEPDB% -DCMAKE_PREFIX_PATH="%INSTALLDIR%" -DFEATURE_system_webp=ON || goto error
+cmake --build . --parallel || goto error
+ninja install || goto error
+cd ..\.. || goto error
+
+echo Building Qt Tools...
+rmdir /S /Q "qtimageformats-everywhere-src-%QT%"
+%SEVENZIP% x "qttools-everywhere-src-%QT%.zip" || goto error
+cd "qttools-everywhere-src-%QT%" || goto error
+mkdir build || goto error
+cd build || goto error
+call "%INSTALLDIR%\bin\qt-configure-module.bat" .. -- %FORCEPDB% -DFEATURE_assistant=OFF -DFEATURE_clang=OFF -DFEATURE_designer=OFF -DFEATURE_kmap2qmap=OFF -DFEATURE_pixeltool=OFF -DFEATURE_pkg_config=OFF -DFEATURE_qev=OFF -DFEATURE_qtattributionsscanner=OFF -DFEATURE_qtdiag=OFF -DFEATURE_qtplugininfo=OFF || goto error
+cmake --build . --parallel || goto error
+ninja install || goto error
+cd ..\.. || goto error
+
+echo Building Qt Translations...
+rmdir /S /Q "qttranslations-everywhere-src-%QT%"
+%SEVENZIP% x "qttranslations-everywhere-src-%QT%.zip" || goto error
+cd "qttranslations-everywhere-src-%QT%" || goto error
+mkdir build || goto error
+cd build || goto error
+call "%INSTALLDIR%\bin\qt-configure-module.bat" .. -- %FORCEPDB% || goto error
+cmake --build . --parallel || goto error
+ninja install || goto error
+cd ..\.. || goto error
+
+echo Building shaderc...
+rmdir /S /Q "shaderc-%SHADERC%"
+%SEVENZIP% x "shaderc-%SHADERC%.zip" || goto error
+cd "shaderc-%SHADERC%" || goto error
+cd third_party || goto error
+%SEVENZIP% x "..\..\shaderc-glslang-%SHADERC_GLSLANG%.zip" || goto error
+rename "glslang-%SHADERC_GLSLANG%" "glslang" || goto error
+%SEVENZIP% x "..\..\shaderc-spirv-headers-%SHADERC_SPIRVHEADERS%.zip" || goto error
+rename "SPIRV-Headers-%SHADERC_SPIRVHEADERS%" "spirv-headers" || goto error
+%SEVENZIP% x "..\..\shaderc-spirv-tools-%SHADERC_SPIRVTOOLS%.zip" || goto error
+rename "SPIRV-Tools-%SHADERC_SPIRVTOOLS%" "spirv-tools" || goto error
+cd .. || goto error
+%PATCH% -p1 < "%SCRIPTDIR%\..\common\shaderc-changes.patch" || goto error
+cmake %ARM64TOOLCHAIN% -DCMAKE_BUILD_TYPE=Release -DCMAKE_PREFIX_PATH="%INSTALLDIR%" -DCMAKE_INSTALL_PREFIX="%INSTALLDIR%" -DSHADERC_SKIP_TESTS=ON -DSHADERC_SKIP_EXAMPLES=ON -DSHADERC_SKIP_COPYRIGHT_CHECK=ON -DSHADERC_ENABLE_SHARED_CRT=ON -B build -G Ninja || goto error
+cmake --build build --parallel || goto error
+ninja -C build install || goto error
+cd .. || goto error
+
+echo Cleaning up...
+cd ..
+rd /S /Q deps-build
+
+echo Exiting with success.
+exit 0
+
+:error
+echo Failed with error #%errorlevel%.
+pause
+exit %errorlevel%
+
+:downloadfile
+if not exist "%~1" (
+  echo Downloading %~1 from %~2...
+  curl -L -o "%~1" "%~2" || goto error
+)
+
+rem based on https://gist.github.com/gsscoder/e22daefaff9b5d8ac16afb070f1a7971
+set idx=0
+for /f %%F in ('certutil -hashfile "%~1" SHA256') do (
+    set "out!idx!=%%F"
+    set /a idx += 1
+)
+set filechecksum=%out1%
+
+if /i %~3==%filechecksum% (
+    echo Validated %~1.
+    exit /B 0
+) else (
+    echo Expected %~3 got %filechecksum%.
+    exit /B 1
+)

.github/workflows/scripts/windows/build-dependencies.bat

@@ -12,6 +12,7 @@ if exist "%ProgramFiles%\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Bu
 )
 
 set SEVENZIP="C:\Program Files\7-Zip\7z.exe"
+set PATCH="C:\Program Files\Git\usr\bin\patch.exe"
 
 if defined DEBUG (
   echo DEBUG=%DEBUG%
@@ -35,18 +36,48 @@ echo SCRIPTDIR=%SCRIPTDIR%
 echo BUILDDIR=%BUILDDIR%
 echo INSTALLDIR=%INSTALLDIR%
 
+set "PATH=%PATH%;%INSTALLDIR%\bin"
+
 cd "%BUILDDIR%"
 
-set QT=6.6.1
-set QTMINOR=6.6
-set SDL=SDL2-2.28.5
+set FREETYPE=2.13.2
+set HARFBUZZ=8.3.1
+set LIBJPEG=9f
+set LIBPNG=1643
+set LZ4=b8fd2d15309dd4e605070bd4486e26b6ef814e29
+set QT=6.7.2
+set QTMINOR=6.7
+set SDL=SDL2-2.30.5
+set WEBP=1.4.0
+set ZLIB=1.3.1
+set ZLIBSHORT=131
+set ZSTD=1.5.6
 
-call :downloadfile "%SDL%.zip" "https://libsdl.org/release/%SDL%.zip" 97bd14ee0ec67494d2b93f1a4f7da2bf891103c57090d96fdcc2b019d885c76a || goto error
-call :downloadfile "qtbase-everywhere-src-%QT%.zip" "https://download.qt.io/official_releases/qt/%QTMINOR%/%QT%/submodules/qtbase-everywhere-src-%QT%.zip" 818f92518d1a89ee98ae818891a7d2f0e41aa45b933d55215da2df6d5459428e || goto error
-call :downloadfile "qtimageformats-everywhere-src-%QT%.zip" "https://download.qt.io/official_releases/qt/%QTMINOR%/%QT%/submodules/qtimageformats-everywhere-src-%QT%.zip" 03f01042f86b4dbf7329a179f20835817c660a183178c11570cc0535b3c3ba58 || goto error
-call :downloadfile "qtsvg-everywhere-src-%QT%.zip" "https://download.qt.io/official_releases/qt/%QTMINOR%/%QT%/submodules/qtsvg-everywhere-src-%QT%.zip" d44d5ead8d4682f54c91687b5e32f2735f086419e3889e05609feae1a7f02da9 || goto error
-call :downloadfile "qttools-everywhere-src-%QT%.zip" "https://download.qt.io/official_releases/qt/%QTMINOR%/%QT%/submodules/qttools-everywhere-src-%QT%.zip" a17eba4e1c00dbd62c13d708c2bc918c2954b2b25a94d3c05e891d62e8f187c8 || goto error
-call :downloadfile "qttranslations-everywhere-src-%QT%.zip" "https://download.qt.io/official_releases/qt/%QTMINOR%/%QT%/submodules/qttranslations-everywhere-src-%QT%.zip" e5ccf0eefd6b1ef9604fdf57f6d16ad8484d07fb141ca3a2d9c3f1771296ae25 || goto error
+set SHADERC=2024.1
+set SHADERC_GLSLANG=142052fa30f9eca191aa9dcf65359fcaed09eeec
+set SHADERC_SPIRVHEADERS=5e3ad389ee56fca27c9705d093ae5387ce404df4
+set SHADERC_SPIRVTOOLS=dd4b663e13c07fea4fbb3f70c1c91c86731099f7
+
+call :downloadfile "freetype-%FREETYPE%.tar.gz" https://sourceforge.net/projects/freetype/files/freetype2/%FREETYPE%/freetype-%FREETYPE%.tar.gz/download 1ac27e16c134a7f2ccea177faba19801131116fd682efc1f5737037c5db224b5 || goto error
+call :downloadfile "harfbuzz-%HARFBUZZ%.zip" https://github.com/harfbuzz/harfbuzz/archive/refs/tags/%HARFBUZZ%.zip b2bc56184ae37324bc4829fde7d3f9e6916866ad711ee85792e457547c9fd127 || goto error
+call :downloadfile "lpng%LIBPNG%.zip" https://download.sourceforge.net/libpng/lpng1643.zip fc466a1e638e635d6c66363bdf3f38555b81b0141d0b06ba45b49ccca327436d || goto error
+call :downloadfile "jpegsr%LIBJPEG%.zip" https://ijg.org/files/jpegsr%LIBJPEG%.zip 6255da8c89e09d694e6800688c76145eb6870a76ac0d36c74fccd61b3940aafa || goto error
+call :downloadfile "libwebp-%WEBP%.tar.gz" "https://storage.googleapis.com/downloads.webmproject.org/releases/webp/libwebp-%WEBP%.tar.gz" 61f873ec69e3be1b99535634340d5bde750b2e4447caa1db9f61be3fd49ab1e5 || goto error
+call :downloadfile "lz4-%LZ4%.zip" "https://github.com/lz4/lz4/archive/%LZ4%.zip" 0c33119688d6b180c7e760b0acd70059222389cfd581632623784bee27e51a31 || goto error
+call :downloadfile "%SDL%.zip" "https://libsdl.org/release/%SDL%.zip" 688d3da2bf7e887d0ba8e0f81c926119f85029544f4f6da8dea96db70f9d28e3 || goto error
+call :downloadfile "qtbase-everywhere-src-%QT%.zip" "https://download.qt.io/official_releases/qt/%QTMINOR%/%QT%/submodules/qtbase-everywhere-src-%QT%.zip" 488119aad60719a085a1e45c31641ac2406ef86fc088a3c99885c18e9d6b4bb9 || goto error
+call :downloadfile "qtimageformats-everywhere-src-%QT%.zip" "https://download.qt.io/official_releases/qt/%QTMINOR%/%QT%/submodules/qtimageformats-everywhere-src-%QT%.zip" 8e736b02db7dd67dbe834d56503b242344ce85d3532da692f1812b30ccf80997 || goto error
+call :downloadfile "qtsvg-everywhere-src-%QT%.zip" "https://download.qt.io/official_releases/qt/%QTMINOR%/%QT%/submodules/qtsvg-everywhere-src-%QT%.zip" 85a22142270a92be0dd0ab5d27cc53617b2a2f1a45fc0a3890024164032f8475 || goto error
+call :downloadfile "qttools-everywhere-src-%QT%.zip" "https://download.qt.io/official_releases/qt/%QTMINOR%/%QT%/submodules/qttools-everywhere-src-%QT%.zip" 9e15f1fdbd83e4123e733bff20aff1b45921c09056c3790fa42eb71d0a5cd01f || goto error
+call :downloadfile "qttranslations-everywhere-src-%QT%.zip" "https://download.qt.io/official_releases/qt/%QTMINOR%/%QT%/submodules/qttranslations-everywhere-src-%QT%.zip" d1f25e0f68a1282feffdd5fe795a027ee5f16ad19e3b1fa2e04a51cea19110ec || goto error
+call :downloadfile "zlib%ZLIBSHORT%.zip" "https://zlib.net/zlib%ZLIBSHORT%.zip" 72af66d44fcc14c22013b46b814d5d2514673dda3d115e64b690c1ad636e7b17 || goto error
+call :downloadfile "zstd-%ZSTD%.zip" "https://github.com/facebook/zstd/archive/refs/tags/v%ZSTD%.zip" 3b1c3b46e416d36931efd34663122d7f51b550c87f74de2d38249516fe7d8be5 || goto error
+call :downloadfile "zstd-fd5f8106a58601a963ee816e6a57aa7c61fafc53.patch" https://github.com/facebook/zstd/commit/fd5f8106a58601a963ee816e6a57aa7c61fafc53.patch 675f144b11f8ab2424b64bed8ccdca5d3f35b9326046fa7a883925dd180f0651 || goto error
+
+call :downloadfile "shaderc-%SHADERC%.zip" "https://github.com/google/shaderc/archive/refs/tags/v%SHADERC%.zip" 6c9f42ed6bf42750f5369b089909abfdcf0101488b4a1f41116d5159d00af8e7 || goto error
+call :downloadfile "shaderc-glslang-%SHADERC_GLSLANG%.zip" "https://github.com/KhronosGroup/glslang/archive/%SHADERC_GLSLANG%.zip" 03ad8a6fa987af4653d0cfe6bdaed41bcf617f1366a151fb1574da75950cd3e8 || goto error
+call :downloadfile "shaderc-spirv-headers-%SHADERC_SPIRVHEADERS%.zip" "https://github.com/KhronosGroup/SPIRV-Headers/archive/%SHADERC_SPIRVHEADERS%.zip" fa59a54334feaba5702b9c25724c3f4746123865769b36dd5a28d9ef5e9d39ab || goto error
+call :downloadfile "shaderc-spirv-tools-%SHADERC_SPIRVTOOLS%.zip" "https://github.com/KhronosGroup/SPIRV-Tools/archive/%SHADERC_SPIRVTOOLS%.zip" bf385994c20293485b378c27dfdbd77a31b949deabccd9218a977f173eda9f6f || goto error
 
 if %DEBUG%==1 (
   echo Building debug and release libraries...
@@ -54,18 +85,100 @@ if %DEBUG%==1 (
   echo Building release libraries...
 )
 
+set FORCEPDB=-DCMAKE_SHARED_LINKER_FLAGS_RELEASE="/DEBUG"
+
+echo Building Zlib...
+rmdir /S /Q "zlib-%ZLIB%"
+%SEVENZIP% x "zlib%ZLIBSHORT%.zip" || goto error
+cd "zlib-%ZLIB%" || goto error
+cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_PREFIX_PATH="%INSTALLDIR%" -DCMAKE_INSTALL_PREFIX="%INSTALLDIR%" -DBUILD_SHARED_LIBS=ON -DZLIB_BUILD_EXAMPLES=OFF -B build -G Ninja || goto error
+cmake --build build --parallel || goto error
+ninja -C build install || goto error
+cd .. || goto error
+
+echo Building libpng...
+rmdir /S /Q "lpng%LIBPNG%"
+%SEVENZIP% x "lpng%LIBPNG%.zip" || goto error
+cd "lpng%LIBPNG%" || goto error
+cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_PREFIX_PATH="%INSTALLDIR%" -DCMAKE_INSTALL_PREFIX="%INSTALLDIR%" -DBUILD_SHARED_LIBS=ON -DBUILD_SHARED_LIBS=ON -DPNG_TESTS=OFF -DPNG_STATIC=OFF -DPNG_SHARED=ON -DPNG_TOOLS=OFF -B build -G Ninja || goto error
+cmake --build build --parallel || goto error
+ninja -C build install || goto error
+cd .. || goto error
+
+echo Building libjpeg...
+rmdir /S /Q "jpeg-%LIBJPEG%"
+%SEVENZIP% x "jpegsr%LIBJPEG%.zip" || goto error
+cd "jpeg-%LIBJPEG%" || goto error
+%PATCH% -p1 < "%SCRIPTDIR%\libjpeg-cmake.patch" || goto error
+cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_PREFIX_PATH="%INSTALLDIR%" -DCMAKE_INSTALL_PREFIX="%INSTALLDIR%" -DBUILD_SHARED_LIBS=ON -DBUILD_STATIC_LIBS=OFF -B build -G Ninja || goto error
+cmake --build build --parallel || goto error
+ninja -C build install || goto error
+cd .. || goto error
+
+echo Building LZ4...
+rmdir /S /Q "lz4"
+%SEVENZIP% x "lz4-%LZ4%.zip" || goto error
+rename "lz4-%LZ4%" "lz4" || goto error
+cd "lz4" || goto error
+cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_PREFIX_PATH="%INSTALLDIR%" -DCMAKE_INSTALL_PREFIX="%INSTALLDIR%" -DBUILD_SHARED_LIBS=ON -DLZ4_BUILD_CLI=OFF -DLZ4_BUILD_LEGACY_LZ4C=OFF -DCMAKE_C_FLAGS="/wd4711 /wd5045" -B build-dir -G Ninja build/cmake || goto error
+cmake --build build-dir --parallel || goto error
+ninja -C build-dir install || goto error
+cd ..
+
+echo Building FreeType without HarfBuzz...
+rmdir /S /Q "freetype-%FREETYPE%"
+tar -xf "freetype-%FREETYPE%.tar.gz" || goto error
+cd "freetype-%FREETYPE%" || goto error
+cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_PREFIX_PATH="%INSTALLDIR%" -DCMAKE_INSTALL_PREFIX="%INSTALLDIR%" -DBUILD_SHARED_LIBS=ON -DFT_REQUIRE_ZLIB=TRUE -DFT_REQUIRE_PNG=TRUE -DFT_DISABLE_BZIP2=TRUE -DFT_DISABLE_BROTLI=TRUE -DFT_DISABLE_HARFBUZZ=TRUE -B build -G Ninja || goto error
+cmake --build build --parallel || goto error
+ninja -C build install || goto error
+cd .. || goto error
+
+echo Building HarfBuzz...
+rmdir /S /Q "harfbuzz-%HARFBUZZ%"
+%SEVENZIP% x "-x^!harfbuzz-%HARFBUZZ%\README" "harfbuzz-%HARFBUZZ%.zip" || goto error
+cd "harfbuzz-%HARFBUZZ%" || goto error
+cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_PREFIX_PATH="%INSTALLDIR%" -DCMAKE_INSTALL_PREFIX="%INSTALLDIR%" -DBUILD_SHARED_LIBS=ON -DHB_BUILD_UTILS=OFF -B build -G Ninja || goto error
+cmake --build build --parallel || goto error
+ninja -C build install || goto error
+cd .. || goto error
+
+echo Building FreeType with HarfBuzz...
+rmdir /S /Q "freetype-%FREETYPE%"
+tar -xf "freetype-%FREETYPE%.tar.gz" || goto error
+cd "freetype-%FREETYPE%" || goto error
+cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_PREFIX_PATH="%INSTALLDIR%" -DCMAKE_INSTALL_PREFIX="%INSTALLDIR%" -DBUILD_SHARED_LIBS=ON -DFT_REQUIRE_ZLIB=TRUE -DFT_REQUIRE_PNG=TRUE -DFT_DISABLE_BZIP2=TRUE -DFT_DISABLE_BROTLI=TRUE -DFT_REQUIRE_HARFBUZZ=TRUE -B build -G Ninja || goto error
+cmake --build build --parallel || goto error
+ninja -C build install || goto error
+cd .. || goto error
+
+echo Building Zstandard...
+rmdir /S /Q "zstd-%ZSTD%"
+%SEVENZIP% x "-x^!zstd-1.5.6\tests\cli-tests\bin" "zstd-%ZSTD%.zip" || goto error
+cd "zstd-%ZSTD%"
+%PATCH% -p1 < "..\zstd-fd5f8106a58601a963ee816e6a57aa7c61fafc53.patch" || goto error
+cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_PREFIX_PATH="%INSTALLDIR%" -DCMAKE_INSTALL_PREFIX="%INSTALLDIR%" -DBUILD_SHARED_LIBS=ON -DZSTD_BUILD_SHARED=ON -DZSTD_BUILD_STATIC=OFF -DZSTD_BUILD_PROGRAMS=OFF -B build -G Ninja build/cmake
+cmake --build build --parallel || goto error
+ninja -C build install || goto error
+cd .. || goto error
+
+echo Building WebP...
+rmdir /S /Q "libwebp-%WEBP%"
+tar -xf "libwebp-%WEBP%.tar.gz" || goto error
+cd "libwebp-%WEBP%" || goto error
+cmake -B build -DCMAKE_BUILD_TYPE=Release -DCMAKE_PREFIX_PATH="%INSTALLDIR%" -DCMAKE_INSTALL_PREFIX="%INSTALLDIR%" -DWEBP_BUILD_ANIM_UTILS=OFF -DWEBP_BUILD_CWEBP=OFF -DWEBP_BUILD_DWEBP=OFF -DWEBP_BUILD_GIF2WEBP=OFF -DWEBP_BUILD_IMG2WEBP=OFF -DWEBP_BUILD_VWEBP=OFF -DWEBP_BUILD_WEBPINFO=OFF -DWEBP_BUILD_WEBPMUX=OFF -DWEBP_BUILD_EXTRAS=OFF -DBUILD_SHARED_LIBS=ON -G Ninja || goto error
+cmake --build build --parallel || goto error
+ninja -C build install || goto error
+cd .. || goto error
+
 echo Building SDL...
 rmdir /S /Q "%SDL%"
 %SEVENZIP% x "%SDL%.zip" || goto error
 cd "%SDL%" || goto error
-if %DEBUG%==1 (
-  cmake -B build-debug -DCMAKE_BUILD_TYPE=Debug -DCMAKE_INSTALL_PREFIX="%INSTALLDIR%" -DBUILD_SHARED_LIBS=ON -DSDL_SHARED=ON -DSDL_STATIC=OFF -G Ninja || goto error
-  cmake --build build-debug --parallel || goto error
-  ninja -C build-debug install || goto error
-)
-cmake -B build -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX="%INSTALLDIR%" -DBUILD_SHARED_LIBS=ON -DSDL_SHARED=ON -DSDL_STATIC=OFF -G Ninja || goto error
+cmake -B build -DCMAKE_BUILD_TYPE=Release %FORCEPDB% -DCMAKE_INSTALL_PREFIX="%INSTALLDIR%" -DBUILD_SHARED_LIBS=ON -DSDL_SHARED=ON -DSDL_STATIC=OFF -G Ninja || goto error
 cmake --build build --parallel || goto error
 ninja -C build install || goto error
+copy build\SDL2.pdb "%INSTALLDIR%\bin" || goto error
 cd .. || goto error
 
 if %DEBUG%==1 (
@@ -78,7 +191,11 @@ echo Building Qt base...
 rmdir /S /Q "qtbase-everywhere-src-%QT%"
 %SEVENZIP% x "qtbase-everywhere-src-%QT%.zip" || goto error
 cd "qtbase-everywhere-src-%QT%" || goto error
-cmake -B build -DFEATURE_sql=OFF -DCMAKE_INSTALL_PREFIX="%INSTALLDIR%" -DINPUT_gui=yes -DINPUT_widgets=yes -DINPUT_ssl=yes -DINPUT_openssl=no -DINPUT_schannel=yes %QTBUILDSPEC% || goto error
+
+rem Disable the PCRE2 JIT, it doesn't properly verify AVX2 support.
+%PATCH% -p1 < "%SCRIPTDIR%\qtbase-disable-pcre2-jit.patch" || goto error
+
+cmake -B build -DFEATURE_sql=OFF -DCMAKE_INSTALL_PREFIX="%INSTALLDIR%" %FORCEPDB% -DINPUT_gui=yes -DINPUT_widgets=yes -DINPUT_ssl=yes -DINPUT_openssl=no -DINPUT_schannel=yes -DFEATURE_system_png=ON -DFEATURE_system_jpeg=ON -DFEATURE_system_zlib=ON -DFEATURE_system_freetype=ON -DFEATURE_system_harfbuzz=ON %QTBUILDSPEC% || goto error
 cmake --build build --parallel || goto error
 ninja -C build install || goto error
 cd .. || goto error
@@ -89,7 +206,7 @@ rmdir /S /Q "qtsvg-everywhere-src-%QT%"
 cd "qtsvg-everywhere-src-%QT%" || goto error
 mkdir build || goto error
 cd build || goto error
-call "%INSTALLDIR%\bin\qt-configure-module.bat" .. || goto error
+call "%INSTALLDIR%\bin\qt-configure-module.bat" .. -- %FORCEPDB% -DCMAKE_PREFIX_PATH="%INSTALLDIR%" || goto error
 cmake --build . --parallel || goto error
 ninja install || goto error
 cd ..\.. || goto error
@@ -100,7 +217,7 @@ rmdir /S /Q "qtimageformats-everywhere-src-%QT%"
 cd "qtimageformats-everywhere-src-%QT%" || goto error
 mkdir build || goto error
 cd build || goto error
-call "%INSTALLDIR%\bin\qt-configure-module.bat" .. || goto error
+call "%INSTALLDIR%\bin\qt-configure-module.bat" .. -- %FORCEPDB% -DCMAKE_PREFIX_PATH="%INSTALLDIR%" -DFEATURE_system_webp=ON || goto error
 cmake --build . --parallel || goto error
 ninja install || goto error
 cd ..\.. || goto error
@@ -111,7 +228,7 @@ rmdir /S /Q "qtimageformats-everywhere-src-%QT%"
 cd "qttools-everywhere-src-%QT%" || goto error
 mkdir build || goto error
 cd build || goto error
-call "%INSTALLDIR%\bin\qt-configure-module.bat" .. -- -DFEATURE_assistant=OFF -DFEATURE_clang=OFF -DFEATURE_designer=OFF -DFEATURE_kmap2qmap=OFF -DFEATURE_pixeltool=OFF -DFEATURE_pkg_config=OFF -DFEATURE_qev=OFF -DFEATURE_qtattributionsscanner=OFF -DFEATURE_qtdiag=OFF -DFEATURE_qtplugininfo=OFF || goto error
+call "%INSTALLDIR%\bin\qt-configure-module.bat" .. -- %FORCEPDB% -DFEATURE_assistant=OFF -DFEATURE_clang=OFF -DFEATURE_designer=ON -DFEATURE_kmap2qmap=OFF -DFEATURE_pixeltool=OFF -DFEATURE_pkg_config=OFF -DFEATURE_qev=OFF -DFEATURE_qtattributionsscanner=OFF -DFEATURE_qtdiag=OFF -DFEATURE_qtplugininfo=OFF || goto error
 cmake --build . --parallel || goto error
 ninja install || goto error
 cd ..\.. || goto error
@@ -122,11 +239,29 @@ rmdir /S /Q "qttranslations-everywhere-src-%QT%"
 cd "qttranslations-everywhere-src-%QT%" || goto error
 mkdir build || goto error
 cd build || goto error
-call "%INSTALLDIR%\bin\qt-configure-module.bat" .. || goto error
+call "%INSTALLDIR%\bin\qt-configure-module.bat" .. -- %FORCEPDB% || goto error
 cmake --build . --parallel || goto error
 ninja install || goto error
 cd ..\.. || goto error
 
+echo Building shaderc...
+rmdir /S /Q "shaderc-%SHADERC%"
+%SEVENZIP% x "shaderc-%SHADERC%.zip" || goto error
+cd "shaderc-%SHADERC%" || goto error
+cd third_party || goto error
+%SEVENZIP% x "..\..\shaderc-glslang-%SHADERC_GLSLANG%.zip" || goto error
+rename "glslang-%SHADERC_GLSLANG%" "glslang" || goto error
+%SEVENZIP% x "..\..\shaderc-spirv-headers-%SHADERC_SPIRVHEADERS%.zip" || goto error
+rename "SPIRV-Headers-%SHADERC_SPIRVHEADERS%" "spirv-headers" || goto error
+%SEVENZIP% x "..\..\shaderc-spirv-tools-%SHADERC_SPIRVTOOLS%.zip" || goto error
+rename "SPIRV-Tools-%SHADERC_SPIRVTOOLS%" "spirv-tools" || goto error
+cd .. || goto error
+%PATCH% -p1 < "%SCRIPTDIR%\..\common\shaderc-changes.patch" || goto error
+cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_PREFIX_PATH="%INSTALLDIR%" -DCMAKE_INSTALL_PREFIX="%INSTALLDIR%" -DSHADERC_SKIP_TESTS=ON -DSHADERC_SKIP_EXAMPLES=ON -DSHADERC_SKIP_COPYRIGHT_CHECK=ON -DSHADERC_ENABLE_SHARED_CRT=ON -B build -G Ninja || goto error
+cmake --build build --parallel || goto error
+ninja -C build install || goto error
+cd .. || goto error
+
 echo Cleaning up...
 cd ..
 rd /S /Q deps-build

.github/workflows/scripts/windows/cmake-toolchain-windows-arm64.cmake

@@ -0,0 +1,4 @@
+set(CMAKE_CROSSCOMPILING TRUE)
+set(CMAKE_SYSTEM_NAME Windows)
+set(CMAKE_SYSTEM_VERSION 10)
+set(CMAKE_SYSTEM_PROCESSOR arm64)

.github/workflows/scripts/windows/libjpeg-cmake.patch

@@ -0,0 +1,422 @@
+diff -ruN jpeg-9f/CMakeLists.txt jpeg-9f-new/CMakeLists.txt
+--- jpeg-9f/CMakeLists.txt	1970-01-01 10:00:00.000000000 +1000
++++ jpeg-9f-new/CMakeLists.txt	2024-03-23 21:29:37.969221600 +1000
+@@ -0,0 +1,110 @@
++# CMake configuration for IJG libjpeg
++# Modified from https://github.com/csparker247/jpeg-cmake/blob/develop/resources/CMakeLists.txt
++# To install, copy this file and jconfig.h.in into a libjpeg source directory
++# Adapted from LuaDist's CMakeLists
++# https://github.com/LuaDist/libjpeg/blob/master/CMakeLists.txt
++
++cmake_minimum_required(VERSION 3.5)
++
++### Setup the project ###
++file(READ "configure.ac" ac)
++string(REGEX MATCH "AC_INIT\\(\\[libjpeg\\],\ \\[([0-9]*\\.[0-9]*\\.[0-9]*)\\]\\)" _ ${ac})
++set(version ${CMAKE_MATCH_1})
++project(libjpeg VERSION ${version} LANGUAGES C)
++set(C_STANDARD 99)
++
++### Include extra packages ###
++include(CMakeDependentOption)
++include(GNUInstallDirs)
++
++### Options ###
++option(BUILD_SHARED_LIBS "Build shared libraries" ON)
++option(BUILD_STATIC_LIBS "Build static libraries" ON)
++
++# Make sure we build at least one library
++if(NOT(BUILD_SHARED_LIBS OR BUILD_STATIC_LIBS))
++  message(FATAL_ERROR "Both static and shared libraries are disabled. Nothing will be built.")
++endif()
++
++### Configure jconfig.h ###
++include(ConfigureJConfig.cmake)
++
++### Build the object library ###
++set(PUBLIC_HDRS
++  jconfig.h
++  jerror.h
++  jmorecfg.h
++  jpeglib.h
++)
++
++set(SRCS
++  jaricom.c jcapimin.c jcapistd.c jcarith.c jccoefct.c jccolor.c
++  jcdctmgr.c jchuff.c jcinit.c jcmainct.c jcmarker.c jcmaster.c jcomapi.c
++  jcparam.c jcprepct.c jcsample.c jctrans.c jdapimin.c jdapistd.c jdarith.c
++  jdatadst.c jdatasrc.c jdcoefct.c jdcolor.c jddctmgr.c jdhuff.c jdinput.c
++  jdmainct.c jdmarker.c jdmaster.c jdmerge.c jdpostct.c jdsample.c jdtrans.c
++  jerror.c jfdctflt.c jfdctfst.c jfdctint.c jidctflt.c jidctfst.c jidctint.c
++  jmemmgr.c jmemnobs.c jquant1.c jquant2.c jutils.c
++)
++
++### Create static and shared libs ###
++if(BUILD_SHARED_LIBS)
++  add_library(libjpeg SHARED ${SRCS})
++  target_compile_definitions(libjpeg PRIVATE COMPILING_LIBJPEG)
++  target_include_directories(libjpeg
++    PUBLIC
++      $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
++      $<INSTALL_INTERFACE:include>
++  )
++  set_target_properties(libjpeg
++    PROPERTIES
++      VERSION ${PROJECT_VERSION_MAJOR}
++      POSITION_INDEPENDENT_CODE ON
++      CLEAN_DIRECT_OUTPUT ON
++      PUBLIC_HEADER "${PUBLIC_HDRS}"
++  )
++  install(TARGETS libjpeg
++    RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
++    LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
++    ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
++    PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
++  )
++endif()
++
++if(BUILD_STATIC_LIBS)
++  add_library(libjpeg_static STATIC $<TARGET_OBJECTS:jpeg_objs>)
++  target_include_directories(libjpeg_static
++    PUBLIC
++      $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
++      $<INSTALL_INTERFACE:include>
++  )
++  set_target_properties(libjpeg_static
++    PROPERTIES
++      OUTPUT_NAME jpeg
++      VERSION ${PROJECT_VERSION_MAJOR}
++      POSITION_INDEPENDENT_CODE ON
++      CLEAN_DIRECT_OUTPUT ON
++      PUBLIC_HEADER "${PUBLIC_HDRS}"
++  )
++  install(TARGETS libjpeg_static
++    LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
++    ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
++    PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
++  )
++endif()
++
++# Configure and install pkg-config and libtool files
++if(BUILD_STATIC_LIBS OR BUILD_SHARED_LIBS)
++  # Compute the la file's weird version number
++  math(EXPR JPEG_CONF_VER_MAJOR "${PROJECT_VERSION_MAJOR} + ${PROJECT_VERSION_MINOR}")
++  set(JPEG_LIB_VERSION_MAJOR ${PROJECT_VERSION_MAJOR})
++  set(JPEG_LIB_VERSION_MINOR ${PROJECT_VERSION_MINOR})
++
++  # Configure and install
++  configure_file(libjpeg.pc.cmakein libjpeg.pc @ONLY)
++  install(FILES
++    ${CMAKE_CURRENT_BINARY_DIR}/libjpeg.pc
++    DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/pkgconfig
++  )
++endif()
++
+diff -ruN jpeg-9f/ConfigureJConfig.cmake jpeg-9f-new/ConfigureJConfig.cmake
+--- jpeg-9f/ConfigureJConfig.cmake	1970-01-01 10:00:00.000000000 +1000
++++ jpeg-9f-new/ConfigureJConfig.cmake	2024-03-23 21:09:37.223882900 +1000
+@@ -0,0 +1,95 @@
++include(CheckIncludeFile)
++include(CheckSymbolExists)
++include(CheckTypeSize)
++
++# Define this if your system has an ANSI-conforming <stddef.h> file.
++check_include_file(stddef.h HAVE_STDDEF_H)
++
++# Define this if your system has an ANSI-conforming <stdlib.h> file.
++check_include_file(stdlib.h HAVE_STDLIB_H)
++
++# Does your compiler support function prototypes?
++# (If not, you also need to use ansi2knr, see install.txt)
++set(HAVE_PROTOTYPES true CACHE BOOL "Does your compiler support function prototypes?")
++
++# Does your compiler support the declaration "unsigned char" ?
++# How about "unsigned short" ?
++check_type_size("unsigned char" UNSIGNED_CHAR LANGUAGE C)
++check_type_size("unsigned short" UNSIGNED_SHORT LANGUAGE C)
++
++# Define "void" as "char" if your compiler doesn't know about type void.
++# NOTE: be sure to define void such that "void *" represents the most general
++# pointer type, e.g., that returned by malloc().
++# NOT IMPLEMENTED: Modify in jconfig.h.in #
++
++# Define "const" as empty if your compiler doesn't know the "const" keyword.
++# NOT IMPLEMENTED: Modify in jconfig.h.in #
++
++# Define this if an ordinary "char" type is unsigned.
++# If you're not sure, leaving it undefined will work at some cost in speed.
++# If you defined HAVE_UNSIGNED_CHAR then the speed difference is minimal.
++set(CHAR_IS_UNSIGNED false CACHE BOOL "char type is unsigned")
++
++# Define this if your system does not have an ANSI/SysV <string.h>,
++# but does have a BSD-style <strings.h>.
++set(NEED_BSD_STRINGS false CACHE BOOL "Use BSD <strings.h>. Use only if system lacks ANSI/SysV <strings.h>")
++
++# Define this if your system does not provide typedef size_t in any of the
++# ANSI-standard places (stddef.h, stdlib.h, or stdio.h), but places it in
++# <sys/types.h> instead.
++set(NEED_SYS_TYPES_H false CACHE BOOL "size_t defined in <sys/types.h>")
++
++# For 80x86 machines, you need to define NEED_FAR_POINTERS,
++# unless you are using a large-data memory model or 80386 flat-memory mode.
++# On less brain-damaged CPUs this symbol must not be defined.
++# (Defining this symbol causes large data structures to be referenced through
++# "far" pointers and to be allocated with a special version of malloc.)
++set(NEED_FAR_POINTERS false CACHE BOOL "Reference large data structures through 'far' pointers allocated with a special version of malloc")
++
++# Define this if your linker needs global names to be unique in less
++# than the first 15 characters.
++set(NEED_SHORT_EXTERNAL_NAMES false CACHE BOOL "Global names must be unique in less than the first 15 characters")
++
++# Although a real ANSI C compiler can deal perfectly well with pointers to
++# unspecified structures (see "incomplete types" in the spec), a few pre-ANSI
++# and pseudo-ANSI compilers get confused.  To keep one of these bozos happy,
++# define INCOMPLETE_TYPES_BROKEN.  This is not recommended unless you
++# actually get "missing structure definition" warnings or errors while
++# compiling the JPEG code.
++set(INCOMPLETE_TYPES_BROKEN false CACHE BOOL "Disable pointers to unspecified structures")
++
++# Define "boolean" as unsigned char, not enum, on Windows systems.
++# NOT IMPLEMENTED: Modify in jconfig.h.in #
++
++# The following options affect code selection within the JPEG library,
++# but they don't need to be visible to applications using the library.
++# To minimize application namespace pollution, the symbols won't be
++# defined unless JPEG_INTERNALS has been defined.
++#
++
++# Define this if your compiler implements ">>" on signed values as a logical
++# (unsigned) shift; leave it undefined if ">>" is a signed (arithmetic) shift,
++# which is the normal and rational definition.
++set(RIGHT_SHIFT_IS_UNSIGNED false CACHE BOOL "Compiler implements >> on signed values as a logical (unsigned) shift")
++
++# The remaining options do not affect the JPEG library proper,
++# but only the sample applications cjpeg/djpeg (see cjpeg.c, djpeg.c).
++# Other applications can ignore these.
++#
++
++mark_as_advanced(FORCE
++  HAVE_PROTOTYPES
++  HAVE_UNSIGNED_CHAR
++  HAVE_UNSIGNED_SHORT
++  CHAR_IS_UNSIGNED
++  HAVE_STDDEF_H
++  HAVE_STDLIB_H
++  NEED_BSD_STRINGS
++  NEED_SYS_TYPES_H
++  NEED_FAR_POINTERS
++  NEED_SHORT_EXTERNAL_NAMES
++  INCOMPLETE_TYPES_BROKEN
++  RIGHT_SHIFT_IS_UNSIGNED
++)
++
++configure_file(jconfig.h.in ${CMAKE_CURRENT_SOURCE_DIR}/jconfig.h)
+diff -ruN jpeg-9f/jconfig.h.in jpeg-9f-new/jconfig.h.in
+--- jpeg-9f/jconfig.h.in	1970-01-01 10:00:00.000000000 +1000
++++ jpeg-9f-new/jconfig.h.in	2024-03-23 21:06:05.204994600 +1000
+@@ -0,0 +1,173 @@
++/*
++ * jconfig.h.in
++ *
++ * Copyright (C) 1991-1994, Thomas G. Lane.
++ * Modified 2009-2013 by Guido Vollbeding.
++ * This file is part of the Independent JPEG Group's software.
++ * For conditions of distribution and use, see the accompanying README file.
++ *
++ * This file is a modification of jconfig.txt from libjpeg. In addition to
++ * documenting the configuration options that are required to customize the
++ * JPEG software for a particular system, it is used by jpeg-cmake to configure
++ * jconfig.h
++ */
++
++
++/*
++ * These symbols indicate the properties of your machine or compiler.
++ * #define the symbol if yes, #undef it if no.
++ */
++
++/* Does your compiler support function prototypes?
++ * (If not, you also need to use ansi2knr, see install.txt)
++ */
++#cmakedefine HAVE_PROTOTYPES
++
++/* Does your compiler support the declaration "unsigned char" ?
++ * How about "unsigned short" ?
++ */
++#cmakedefine HAVE_UNSIGNED_CHAR
++#cmakedefine HAVE_UNSIGNED_SHORT
++
++/* Define "void" as "char" if your compiler doesn't know about type void.
++ * NOTE: be sure to define void such that "void *" represents the most general
++ * pointer type, e.g., that returned by malloc().
++ */
++/* #define void char */
++
++/* Define "const" as empty if your compiler doesn't know the "const" keyword.
++ */
++/* #define const */
++
++/* Define this if an ordinary "char" type is unsigned.
++ * If you're not sure, leaving it undefined will work at some cost in speed.
++ * If you defined HAVE_UNSIGNED_CHAR then the speed difference is minimal.
++ */
++#cmakedefine CHAR_IS_UNSIGNED
++
++/* Define this if your system has an ANSI-conforming <stddef.h> file.
++ */
++#cmakedefine HAVE_STDDEF_H
++
++/* Define this if your system has an ANSI-conforming <stdlib.h> file.
++ */
++#cmakedefine HAVE_STDLIB_H
++
++/* Define this if your system does not have an ANSI/SysV <string.h>,
++ * but does have a BSD-style <strings.h>.
++ */
++#cmakedefine NEED_BSD_STRINGS
++
++/* Define this if your system does not provide typedef size_t in any of the
++ * ANSI-standard places (stddef.h, stdlib.h, or stdio.h), but places it in
++ * <sys/types.h> instead.
++ */
++#cmakedefine NEED_SYS_TYPES_H
++
++/* For 80x86 machines, you need to define NEED_FAR_POINTERS,
++ * unless you are using a large-data memory model or 80386 flat-memory mode.
++ * On less brain-damaged CPUs this symbol must not be defined.
++ * (Defining this symbol causes large data structures to be referenced through
++ * "far" pointers and to be allocated with a special version of malloc.)
++ */
++#cmakedefine NEED_FAR_POINTERS
++
++/* Define this if your linker needs global names to be unique in less
++ * than the first 15 characters.
++ */
++#cmakedefine NEED_SHORT_EXTERNAL_NAMES
++
++/* Although a real ANSI C compiler can deal perfectly well with pointers to
++ * unspecified structures (see "incomplete types" in the spec), a few pre-ANSI
++ * and pseudo-ANSI compilers get confused.  To keep one of these bozos happy,
++ * define INCOMPLETE_TYPES_BROKEN.  This is not recommended unless you
++ * actually get "missing structure definition" warnings or errors while
++ * compiling the JPEG code.
++ */
++#cmakedefine INCOMPLETE_TYPES_BROKEN
++
++/* Define "boolean" as unsigned char, not enum, on Windows systems.
++ */
++#ifdef _WIN32
++#ifndef __RPCNDR_H__		/* don't conflict if rpcndr.h already read */
++typedef unsigned char boolean;
++#endif
++#ifndef FALSE			/* in case these macros already exist */
++#define FALSE	0		/* values of boolean */
++#endif
++#ifndef TRUE
++#define TRUE	1
++#endif
++#define HAVE_BOOLEAN		/* prevent jmorecfg.h from redefining it */
++#endif
++
++
++/*
++ * The following options affect code selection within the JPEG library,
++ * but they don't need to be visible to applications using the library.
++ * To minimize application namespace pollution, the symbols won't be
++ * defined unless JPEG_INTERNALS has been defined.
++ */
++
++#ifdef JPEG_INTERNALS
++
++/* Define this if your compiler implements ">>" on signed values as a logical
++ * (unsigned) shift; leave it undefined if ">>" is a signed (arithmetic) shift,
++ * which is the normal and rational definition.
++ */
++#cmakedefine RIGHT_SHIFT_IS_UNSIGNED
++
++
++#endif /* JPEG_INTERNALS */
++
++
++/*
++ * The remaining options do not affect the JPEG library proper,
++ * but only the sample applications cjpeg/djpeg (see cjpeg.c, djpeg.c).
++ * Other applications can ignore these.
++ */
++
++#ifdef JPEG_CJPEG_DJPEG
++
++/* These defines indicate which image (non-JPEG) file formats are allowed. */
++
++#cmakedefine BMP_SUPPORTED		/* BMP image file format */
++#cmakedefine GIF_SUPPORTED		/* GIF image file format */
++#cmakedefine PPM_SUPPORTED		/* PBMPLUS PPM/PGM image file format */
++#cmakedefine RLE_SUPPORTED		/* Utah RLE image file format */
++#cmakedefine TARGA_SUPPORTED		/* Targa image file format */
++
++/*
++ * This defines the default output format for djpeg. Must be one of the FMT_*
++ * enums found in djpeg.c or djpegalt.c
++ */
++#cmakedefine DEFAULT_FMT @DEFAULT_FMT@
++
++/* Define this if you want to name both input and output files on the command
++ * line, rather than using stdout and optionally stdin.  You MUST do this if
++ * your system can't cope with binary I/O to stdin/stdout.  See comments at
++ * head of cjpeg.c or djpeg.c.
++ */
++#cmakedefine TWO_FILE_COMMANDLINE
++
++/* Define this if your system needs explicit cleanup of temporary files.
++ * This is crucial under MS-DOS, where the temporary "files" may be areas
++ * of extended memory; on most other systems it's not as important.
++ */
++#cmakedefine NEED_SIGNAL_CATCHER
++
++/* By default, we open image files with fopen(...,"rb") or fopen(...,"wb").
++ * This is necessary on systems that distinguish text files from binary files,
++ * and is harmless on most systems that don't.  If you have one of the rare
++ * systems that complains about the "b" spec, define this symbol.
++ */
++#cmakedefine DONT_USE_B_MODE
++
++/* Define this if you want percent-done progress reports from cjpeg/djpeg.
++ */
++#cmakedefine PROGRESS_REPORT
++
++/* Define this if you *don't* want overwrite confirmation */
++#cmakedefine NO_OVERWRITE_CHECK
++
++#endif /* JPEG_CJPEG_DJPEG */
+diff -ruN jpeg-9f/jmorecfg.h jpeg-9f-new/jmorecfg.h
+--- jpeg-9f/jmorecfg.h	2022-03-31 19:41:26.000000000 +1000
++++ jpeg-9f-new/jmorecfg.h	2024-03-23 21:20:25.514814400 +1000
+@@ -244,8 +244,13 @@
+ #define LOCAL(type)		static type
+ /* a function referenced thru EXTERNs: */
+ #define GLOBAL(type)		type
++
+ /* a reference to a GLOBAL function: */
+-#define EXTERN(type)		extern type
++#ifdef COMPILING_LIBJPEG
++#define EXTERN(type)		__declspec(dllexport) extern type
++#else
++#define EXTERN(type)		__declspec(dllimport) extern type
++#endif
+ 
+ 
+ /* This macro is used to declare a "method", that is, a function pointer.
+diff -ruN jpeg-9f/libjpeg.pc.cmakein jpeg-9f-new/libjpeg.pc.cmakein
+--- jpeg-9f/libjpeg.pc.cmakein	1970-01-01 10:00:00.000000000 +1000
++++ jpeg-9f-new/libjpeg.pc.cmakein	2024-03-23 21:06:13.922695100 +1000
+@@ -0,0 +1,10 @@
++prefix=@CMAKE_INSTALL_PREFIX@
++exec_prefix=${prefix}
++libdir=${exec_prefix}/@CMAKE_INSTALL_LIBDIR@
++includedir=${prefix}/@CMAKE_INSTALL_INCLUDEDIR@
++
++Name: libjpeg
++Description: Reads and writes JPEG files
++Version: @JPEG_LIB_VERSION_MAJOR@.@JPEG_LIB_VERSION_MINOR@.0
++Libs: -L${libdir} -ljpeg
++Cflags: -I${includedir}

.github/workflows/scripts/windows/qtbase-disable-pcre2-jit.patch

@@ -0,0 +1,35 @@
+--- qtbase/src/3rdparty/pcre2/CMakeLists.txt	2024-03-19 08:46:43.000000000 -0700
++++ qtbase/src/3rdparty/pcre2/CMakeLists.txt	2024-06-06 21:52:20.539619500 -0700
+@@ -41,6 +41,7 @@
+         src/pcre2_xclass.c
+     DEFINES
+         HAVE_CONFIG_H
++        PCRE2_DISABLE_JIT
+     PUBLIC_DEFINES
+         PCRE2_CODE_UNIT_WIDTH=16
+     PUBLIC_INCLUDE_DIRECTORIES
+@@ -52,23 +53,8 @@
+ ## Scopes:
+ #####################################################################
+ 
+-qt_internal_extend_target(BundledPcre2 CONDITION QNX OR UIKIT
+-    DEFINES
+-        PCRE2_DISABLE_JIT
+-)
+-
+-qt_internal_extend_target(BundledPcre2 CONDITION (TEST_architecture_arch STREQUAL "arm") AND WIN32
+-    DEFINES
+-        PCRE2_DISABLE_JIT
+-)
+-
+-qt_internal_extend_target(BundledPcre2 CONDITION (TEST_architecture_arch STREQUAL "arm64") AND WIN32
+-    DEFINES
+-        PCRE2_DISABLE_JIT
+-)
+-
+ if (APPLE)
+-    target_compile_options(BundledPcre2 PRIVATE "SHELL:-Xarch_arm64 -DPCRE2_DISABLE_JIT")
++    target_compile_options(BundledPcre2 PRIVATE "SHELL:-Xarch_arm64")
+ endif()
+ 
+ qt_internal_extend_target(BundledPcre2 CONDITION WIN32

.github/workflows/triage_pr.yml

@@ -8,7 +8,7 @@ jobs:
     if: github.repository == 'PCSX2/pcsx2'
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/labeler@main
+    - uses: actions/labeler@v5
       with:
         repo-token: ${{ secrets.GITHUB_TOKEN }}
 

.github/workflows/windows_build_matrix.yml

@@ -27,6 +27,7 @@ jobs:
     uses: ./.github/workflows/windows_build_qt.yml
     with:
       jobName: "MSVC SSE4"
+      artifactPrefixName: "PCSX2-windows-Qt-x64-sse4-msvc"
       configuration: Release
       simd: "SSE4"
     secrets: inherit
@@ -38,6 +39,7 @@ jobs:
     uses: ./.github/workflows/windows_build_qt.yml
     with:
       jobName: "MSVC AVX2"
+      artifactPrefixName: "PCSX2-windows-Qt-x64-avx2-msvc"
       configuration: Release AVX2
     secrets: inherit
 
@@ -47,6 +49,7 @@ jobs:
     uses: ./.github/workflows/windows_build_qt.yml
     with:
       jobName: "CMake MSVC"
+      artifactPrefixName: "PCSX2-windows-Qt-x64-cmake-msvc"
       configuration: CMake
       buildSystem: cmake
     secrets: inherit
@@ -58,6 +61,7 @@ jobs:
     uses: ./.github/workflows/windows_build_qt.yml
     with:
       jobName: "Clang SSE4"
+      artifactPrefixName: "PCSX2-windows-Qt-x64-sse4-clang"
       configuration: Release Clang
       simd: "SSE4"
     secrets: inherit
@@ -69,6 +73,7 @@ jobs:
     uses: ./.github/workflows/windows_build_qt.yml
     with:
       jobName: "Clang AVX2"
+      artifactPrefixName: "PCSX2-windows-Qt-x64-avx2-clang"
       configuration: Release Clang AVX2
     secrets: inherit
 
@@ -78,6 +83,7 @@ jobs:
     uses: ./.github/workflows/windows_build_qt.yml
     with:
       jobName: "CMake Clang"
+      artifactPrefixName: "PCSX2-windows-Qt-x64-cmake-clang"
       configuration: CMake
       buildSystem: cmake
       cmakeFlags: -DCMAKE_C_COMPILER=clang-cl -DCMAKE_CXX_COMPILER=clang-cl -DPCSX2_EXE_NAME=pcsx2-qt-clang

.github/workflows/windows_build_qt.yml

@@ -6,6 +6,9 @@ on:
       jobName:
         required: true
         type: string
+      artifactPrefixName:
+        required: true
+        type: string
       os:
         required: false
         type: string
@@ -37,6 +40,10 @@ on:
         required: false
         type: boolean
         default: false
+      stableBuild:
+        required: false
+        type: boolean
+        default: false
 
 jobs:
   build_windows_qt:
@@ -48,24 +55,30 @@ jobs:
       POWERSHELL_TELEMETRY_OPTOUT: 1
 
     steps:
+      - name: Tempfix Clang
+        if: inputs.configuration == 'CMake'
+        run: choco uninstall llvm
+        
       - name: Checkout Repository
         uses: actions/checkout@v4
-        with:
-          submodules: recursive
 
       # actions/checkout elides tags, fetch them primarily for releases
       - name: Fetch Tags
         if: ${{ inputs.fetchTags }}
         run: git fetch --tags --no-recurse-submodules
 
+      - name: Add stable release identifier file
+        if: ${{ inputs.stableBuild == true || inputs.stableBuild == 'true' }}
+        shell: bash
+        run: |
+          echo "#define DEFAULT_UPDATER_CHANNEL \"stable\"" > ./pcsx2-qt/DefaultUpdaterChannel.h
+          cat ./pcsx2-qt/DefaultUpdaterChannel.h
+
       - name: Prepare Artifact Metadata
         id: artifact-metadata
         shell: bash
         env:
-          OS: windows
-          BUILD_SYSTEM: ${{ inputs.buildSystem }}
-          ARCH: ${{ inputs.platform }}
-          SIMD: ${{ inputs.simd }}
+          PREFIX: ${{ inputs.artifactPrefixName }}
           EVENT_NAME: ${{ github.event_name }}
           PR_TITLE: ${{ github.event.pull_request.title }}
           PR_NUM: ${{ github.event.pull_request.number }}
@@ -74,7 +87,7 @@ jobs:
 
       - name: Setup msbuild
         if: inputs.configuration != 'CMake'
-        uses: microsoft/setup-msbuild@v1
+        uses: microsoft/setup-msbuild@v2
 
       - name: Download patches
         shell: cmd
@@ -84,7 +97,7 @@ jobs:
 
       - name: Cache Dependencies
         id: cache-deps
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: deps
           key: ${{ inputs.os }} ${{ inputs.platform }} deps ${{ hashFiles('.github/workflows/scripts/windows/build-dependencies.bat') }}
@@ -119,10 +132,11 @@ jobs:
         shell: cmd
         run: |
           call "%ProgramFiles%\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvars64.bat"
+          set PATH=%PATH%;%GITHUB_WORKSPACE%\bin
           cmake --build build --config Release --target unittests
 
       - name: Upload artifact
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: ${{ steps.artifact-metadata.outputs.artifact-name }}
           path: |
@@ -136,7 +150,7 @@ jobs:
             !./bin/**/*.lib
 
       - name: Upload artifact - with symbols
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: ${{ steps.artifact-metadata.outputs.artifact-name }}-symbols
           path: ./bin/**/*.pdb

.gitignore

@@ -56,6 +56,13 @@ oprofile_data/
 /UpgradeLog*.htm
 /.vscode*
 
+# Jetbrains Rider
+/.idea*
+
+# KDevelop 4 Workspace Configuration Files
+*.kdev4
+/.kdev4*
+
 /bin/**/*.dll
 /bin/**/*.dmp
 /bin/**/*.exp
@@ -67,11 +74,13 @@ oprofile_data/
 /bin/bios
 /bin/cache
 /bin/cheats
+/bin/patches
 /bin/covers
 /bin/dumps
 /bin/gamesettings
 /bin/help
 /bin/inis
+/bin/inis/debuggersettings
 /bin/logs
 /bin/memcards
 /bin/plugins
@@ -80,7 +89,22 @@ oprofile_data/
 /bin/textures
 /bin/translations
 /bin/inputprofiles
+/bin/videos
+/bin/portable.ini
+/bin/portable.txt
+
+# Manually added by user.
+/bin/resources/patches.zip
+
+# Resources that are runtime downloaded.
+/bin/resources/fonts/NotoSansJP-Regular.ttf
+/bin/resources/fonts/NotoSansKR-Regular.ttf
+/bin/resources/fonts/NotoSansSC-Regular.ttf
+/bin/resources/fonts/NotoSansTC-Regular.ttf
+
+/deps-build
 /deps
+/deps-arm64
 /ipch
 
 !/3rdparty/libjpeg/change.log

.gitmodules

@@ -1,32 +0,0 @@
-[submodule "3rdparty/xz/xz"]
-	path = 3rdparty/xz/xz
-	url = https://github.com/PCSX2/xz.git
-[submodule "3rdparty/gtest"]
-	path = 3rdparty/gtest
-	url = https://github.com/google/googletest.git
-[submodule "3rdparty/fmt/fmt"]
-	path = 3rdparty/fmt/fmt
-	url = https://github.com/fmtlib/fmt.git
-[submodule "3rdparty/wil"]
-	path = 3rdparty/wil
-	url = https://github.com/microsoft/wil.git
-	branch = master
-[submodule "3rdparty/rapidyaml/rapidyaml"]
-	path = 3rdparty/rapidyaml/rapidyaml
-	url = https://github.com/biojppm/rapidyaml.git
-	branch = master
-[submodule "3rdparty/glslang/glslang"]
-	path = 3rdparty/glslang/glslang
-	url = https://github.com/KhronosGroup/glslang.git
-[submodule "3rdparty/vulkan-headers"]
-	path = 3rdparty/vulkan-headers
-	url = https://github.com/KhronosGroup/Vulkan-Headers.git
-[submodule "3rdparty/zstd/zstd"]
-	path = 3rdparty/zstd/zstd
-	url = https://github.com/facebook/zstd.git
-[submodule "3rdparty/rcheevos/rcheevos"]
-	path = 3rdparty/rcheevos/rcheevos
-	url = https://github.com/RetroAchievements/rcheevos.git
-[submodule "3rdparty/libwebp/libwebp"]
-	path = 3rdparty/libwebp/libwebp
-	url = https://github.com/webmproject/libwebp

3rdparty/3rdparty.props

@@ -16,6 +16,23 @@
       <WarningLevel>TurnOffAllWarnings</WarningLevel>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
       <CompileAs>Default</CompileAs>
+      <LanguageStandard>stdcpp20</LanguageStandard>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+      <MinimalRebuild>false</MinimalRebuild>
+      <ConformanceMode>true</ConformanceMode>
+
+      <!-- MSVC automatically adds __AVX__ and __AVX2__ appropriately -->
+      <PreprocessorDefinitions>_M_X86;__SSE4_1__;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <EnableEnhancedInstructionSet Condition="!$(Configuration.Contains(AVX2)) Or $(Configuration.Contains(Clang))">NotSet</EnableEnhancedInstructionSet>
+      <EnableEnhancedInstructionSet Condition="$(Configuration.Contains(AVX2)) And !$(Configuration.Contains(Clang))">AdvancedVectorExtensions2</EnableEnhancedInstructionSet>
+      <AdditionalOptions Condition="'$(Platform)'=='x64' And $(Configuration.Contains(Clang)) And !$(Configuration.Contains(AVX2))"> -march=nehalem %(AdditionalOptions)</AdditionalOptions>
+      <AdditionalOptions Condition="'$(Platform)'=='x64' And $(Configuration.Contains(Clang)) And $(Configuration.Contains(AVX2))"> -march=haswell %(AdditionalOptions)</AdditionalOptions>
+      <AdditionalOptions Condition="'$(Platform)'=='ARM64' And $(Configuration.Contains(Clang))"> -march=armv8.4-a %(AdditionalOptions)</AdditionalOptions>
+      <AdditionalOptions Condition="!$(Configuration.Contains(Clang))">%(AdditionalOptions) /Zc:externConstexpr /Zc:__cplusplus /Zo /utf-8</AdditionalOptions>
+
+      <!-- Force ThinLTO for Release builds, MSVC doesn't seem to do it otherwise. -->
+      <!-- Also due to include order, needs to be set here, rather than in CodeGen_Release.props -->
+      <AdditionalOptions Condition="$(Configuration.Contains(Clang)) And $(Configuration.Contains(Release))"> -flto=thin %(AdditionalOptions)</AdditionalOptions>
     </ClCompile>
   </ItemDefinitionGroup>
 </Project>

3rdparty/cpuinfo/CMakeLists.txt

@@ -67,6 +67,9 @@ ENDIF()
 
 # -- [ Determine target processor
 SET(CPUINFO_TARGET_PROCESSOR "${CMAKE_SYSTEM_PROCESSOR}")
+IF(CMAKE_SYSTEM_NAME MATCHES "FreeBSD" AND CPUINFO_TARGET_PROCESSOR STREQUAL "amd64")
+  SET(CPUINFO_TARGET_PROCESSOR "AMD64")
+ENDIF()
 IF(IS_APPLE_OS AND CMAKE_OSX_ARCHITECTURES MATCHES "^(x86_64|arm64.*)$")
   SET(CPUINFO_TARGET_PROCESSOR "${CMAKE_OSX_ARCHITECTURES}")
 ELSEIF(CMAKE_GENERATOR MATCHES "^Visual Studio " AND CMAKE_VS_PLATFORM_NAME)
@@ -105,7 +108,7 @@ IF(NOT CMAKE_SYSTEM_NAME)
       "Target operating system is not specified. "
       "cpuinfo will compile, but cpuinfo_initialize() will always fail.")
   SET(CPUINFO_SUPPORTED_PLATFORM FALSE)
-ELSEIF(NOT CMAKE_SYSTEM_NAME MATCHES "^(Windows|WindowsStore|CYGWIN|MSYS|Darwin|Linux|Android)$")
+ELSEIF(NOT CMAKE_SYSTEM_NAME MATCHES "^(Windows|WindowsStore|CYGWIN|MSYS|Darwin|Linux|Android|FreeBSD)$")
   IF(${CMAKE_VERSION} VERSION_GREATER_EQUAL "3.14" AND NOT IS_APPLE_OS)
     MESSAGE(WARNING
       "Target operating system \"${CMAKE_SYSTEM_NAME}\" is not supported in cpuinfo. "
@@ -178,6 +181,8 @@ IF(CPUINFO_SUPPORTED_PLATFORM)
       LIST(APPEND CPUINFO_SRCS src/x86/mach/init.c)
     ELSEIF(CMAKE_SYSTEM_NAME MATCHES "^(Windows|WindowsStore|CYGWIN|MSYS)$")
       LIST(APPEND CPUINFO_SRCS src/x86/windows/init.c)
+    ELSEIF(CMAKE_SYSTEM_NAME STREQUAL "FreeBSD")
+      LIST(APPEND CPUINFO_SRCS src/x86/freebsd/init.c)
     ENDIF()
   ELSEIF(CMAKE_SYSTEM_NAME MATCHES "^Windows" AND CPUINFO_TARGET_PROCESSOR MATCHES "^(ARM64|arm64)$")
     LIST(APPEND CPUINFO_SRCS
@@ -234,9 +239,11 @@ IF(CPUINFO_SUPPORTED_PLATFORM)
       src/linux/processors.c)
   ELSEIF(IS_APPLE_OS)
     LIST(APPEND CPUINFO_SRCS src/mach/topology.c)
+  ELSEIF(CMAKE_SYSTEM_NAME STREQUAL "FreeBSD")
+    LIST(APPEND CPUINFO_SRCS src/freebsd/topology.c)
   ENDIF()
 
-  IF(CMAKE_SYSTEM_NAME STREQUAL "Linux" OR CMAKE_SYSTEM_NAME STREQUAL "Android")
+  IF(CMAKE_SYSTEM_NAME STREQUAL "Linux" OR CMAKE_SYSTEM_NAME STREQUAL "Android" OR CMAKE_SYSTEM_NAME STREQUAL "FreeBSD")
     SET(CMAKE_THREAD_PREFER_PTHREAD TRUE)
     SET(THREADS_PREFER_PTHREAD_FLAG TRUE)
     FIND_PACKAGE(Threads REQUIRED)
@@ -301,6 +308,9 @@ IF(CPUINFO_SUPPORTED_PLATFORM)
     TARGET_LINK_LIBRARIES(cpuinfo_internals PUBLIC ${CMAKE_THREAD_LIBS_INIT})
     TARGET_COMPILE_DEFINITIONS(cpuinfo PRIVATE _GNU_SOURCE=1)
     TARGET_COMPILE_DEFINITIONS(cpuinfo_internals PRIVATE _GNU_SOURCE=1)
+  ELSEIF(CMAKE_SYSTEM_NAME STREQUAL "FreeBSD")
+    TARGET_LINK_LIBRARIES(cpuinfo PUBLIC ${CMAKE_THREAD_LIBS_INIT})
+    TARGET_LINK_LIBRARIES(cpuinfo_internals PUBLIC ${CMAKE_THREAD_LIBS_INIT})
   ENDIF()
 ELSE()
   TARGET_COMPILE_DEFINITIONS(cpuinfo INTERFACE CPUINFO_SUPPORTED_PLATFORM=0)

3rdparty/cpuinfo/cpuinfo.vcxproj

@@ -30,32 +30,78 @@
     <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
   </PropertyGroup>
   <ItemGroup>
+    <ClCompile Include="..\..\..\duckstation\dep\cpuinfo\src\arm\cache.c">
+      <ExcludedFromBuild Condition="'$(Platform)'!='ARM64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="..\..\..\duckstation\dep\cpuinfo\src\arm\uarch.c">
+      <ExcludedFromBuild Condition="'$(Platform)'!='ARM64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="..\..\..\duckstation\dep\cpuinfo\src\arm\windows\init.c">
+      <ExcludedFromBuild Condition="'$(Platform)'!='ARM64'">true</ExcludedFromBuild>
+    </ClCompile>
     <ClCompile Include="deps\clog\src\clog.c" />
     <ClCompile Include="src\api.c" />
     <ClCompile Include="src\cache.c" />
     <ClCompile Include="src\init.c" />
-    <ClCompile Include="src\x86\cache\descriptor.c" />
-    <ClCompile Include="src\x86\cache\deterministic.c" />
-    <ClCompile Include="src\x86\cache\init.c" />
-    <ClCompile Include="src\x86\info.c" />
-    <ClCompile Include="src\x86\init.c" />
-    <ClCompile Include="src\x86\isa.c" />
-    <ClCompile Include="src\x86\name.c" />
-    <ClCompile Include="src\x86\topology.c" />
-    <ClCompile Include="src\x86\uarch.c" />
-    <ClCompile Include="src\x86\vendor.c" />
-    <ClCompile Include="src\x86\windows\init.c" />
+    <ClCompile Include="src\x86\cache\descriptor.c">
+      <ExcludedFromBuild Condition="'$(Platform)'!='x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="src\x86\cache\deterministic.c">
+      <ExcludedFromBuild Condition="'$(Platform)'!='x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="src\x86\cache\init.c">
+      <ExcludedFromBuild Condition="'$(Platform)'!='x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="src\x86\info.c">
+      <ExcludedFromBuild Condition="'$(Platform)'!='x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="src\x86\init.c">
+      <ExcludedFromBuild Condition="'$(Platform)'!='x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="src\x86\isa.c">
+      <ExcludedFromBuild Condition="'$(Platform)'!='x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="src\x86\name.c">
+      <ExcludedFromBuild Condition="'$(Platform)'!='x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="src\x86\topology.c">
+      <ExcludedFromBuild Condition="'$(Platform)'!='x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="src\x86\uarch.c">
+      <ExcludedFromBuild Condition="'$(Platform)'!='x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="src\x86\vendor.c">
+      <ExcludedFromBuild Condition="'$(Platform)'!='x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="src\x86\windows\init.c">
+      <ExcludedFromBuild Condition="'$(Platform)'!='x64'">true</ExcludedFromBuild>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
+    <ClInclude Include="..\..\..\duckstation\dep\cpuinfo\src\arm\api.h">
+      <ExcludedFromBuild Condition="'$(Platform)'!='ARM64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\duckstation\dep\cpuinfo\src\arm\midr.h">
+      <ExcludedFromBuild Condition="'$(Platform)'!='ARM64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\..\duckstation\dep\cpuinfo\src\arm\windows\api.h">
+      <ExcludedFromBuild Condition="'$(Platform)'!='ARM64'">true</ExcludedFromBuild>
+    </ClInclude>
     <ClInclude Include="deps\clog\include\clog.h" />
     <ClInclude Include="include\cpuinfo.h" />
     <ClInclude Include="src\cpuinfo\common.h" />
     <ClInclude Include="src\cpuinfo\internal-api.h" />
     <ClInclude Include="src\cpuinfo\log.h" />
     <ClInclude Include="src\cpuinfo\utils.h" />
-    <ClInclude Include="src\x86\api.h" />
-    <ClInclude Include="src\x86\cpuid.h" />
-    <ClInclude Include="src\x86\windows\api.h" />
+    <ClInclude Include="src\x86\api.h">
+      <ExcludedFromBuild Condition="'$(Platform)'!='x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="src\x86\cpuid.h">
+      <ExcludedFromBuild Condition="'$(Platform)'!='x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="src\x86\windows\api.h">
+      <ExcludedFromBuild Condition="'$(Platform)'!='x64'">true</ExcludedFromBuild>
+    </ClInclude>
   </ItemGroup>
   <ItemDefinitionGroup>
     <ClCompile>

3rdparty/cpuinfo/cpuinfo.vcxproj.filters

@@ -16,6 +16,12 @@
     <Filter Include="clog">
       <UniqueIdentifier>{7f0aba4c-ca06-4a7b-aed1-4f1e6976e839}</UniqueIdentifier>
     </Filter>
+    <Filter Include="arm">
+      <UniqueIdentifier>{ac4549d3-f60f-4e60-bf43-86d1c253cf3f}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="arm\windows">
+      <UniqueIdentifier>{41fcb23a-e77b-4b5c-8238-e9b92bf1f3c6}</UniqueIdentifier>
+    </Filter>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="src\x86\isa.c">
@@ -57,6 +63,15 @@
     <ClCompile Include="deps\clog\src\clog.c">
       <Filter>clog</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\..\duckstation\dep\cpuinfo\src\arm\cache.c">
+      <Filter>arm</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\duckstation\dep\cpuinfo\src\arm\uarch.c">
+      <Filter>arm</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\duckstation\dep\cpuinfo\src\arm\windows\init.c">
+      <Filter>arm\windows</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="src\x86\api.h">
@@ -84,5 +99,14 @@
     <ClInclude Include="deps\clog\include\clog.h">
       <Filter>clog</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\..\duckstation\dep\cpuinfo\src\arm\api.h">
+      <Filter>arm</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\duckstation\dep\cpuinfo\src\arm\midr.h">
+      <Filter>arm</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\duckstation\dep\cpuinfo\src\arm\windows\api.h">
+      <Filter>arm\windows</Filter>
+    </ClInclude>
   </ItemGroup>
 </Project>

3rdparty/cpuinfo/include/cpuinfo-mock.h

@@ -7,37 +7,35 @@
 
 #include <cpuinfo.h>
 #if defined(__linux__)
-	#include <sys/types.h>
+#include <sys/types.h>
 #endif
 
 #if !defined(CPUINFO_MOCK) || !(CPUINFO_MOCK)
-	#error This header is intended only for test use
+#error This header is intended only for test use
 #endif
 
-
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-
 #if CPUINFO_ARCH_ARM
-	void CPUINFO_ABI cpuinfo_set_fpsid(uint32_t fpsid);
-	void CPUINFO_ABI cpuinfo_set_wcid(uint32_t wcid);
+void CPUINFO_ABI cpuinfo_set_fpsid(uint32_t fpsid);
+void CPUINFO_ABI cpuinfo_set_wcid(uint32_t wcid);
 #endif /* CPUINFO_ARCH_ARM */
 
 #if CPUINFO_ARCH_X86 || CPUINFO_ARCH_X86_64
-	struct cpuinfo_mock_cpuid {
-		uint32_t input_eax;
-		uint32_t input_ecx;
-		uint32_t eax;
-		uint32_t ebx;
-		uint32_t ecx;
-		uint32_t edx;
-	};
+struct cpuinfo_mock_cpuid {
+	uint32_t input_eax;
+	uint32_t input_ecx;
+	uint32_t eax;
+	uint32_t ebx;
+	uint32_t ecx;
+	uint32_t edx;
+};
 
-	void CPUINFO_ABI cpuinfo_mock_set_cpuid(struct cpuinfo_mock_cpuid* dump, size_t entries);
-	void CPUINFO_ABI cpuinfo_mock_get_cpuid(uint32_t eax, uint32_t regs[4]);
-	void CPUINFO_ABI cpuinfo_mock_get_cpuidex(uint32_t eax, uint32_t ecx, uint32_t regs[4]);
+void CPUINFO_ABI cpuinfo_mock_set_cpuid(struct cpuinfo_mock_cpuid* dump, size_t entries);
+void CPUINFO_ABI cpuinfo_mock_get_cpuid(uint32_t eax, uint32_t regs[4]);
+void CPUINFO_ABI cpuinfo_mock_get_cpuidex(uint32_t eax, uint32_t ecx, uint32_t regs[4]);
 #endif /* CPUINFO_ARCH_X86 || CPUINFO_ARCH_X86_64 */
 
 struct cpuinfo_mock_file {
@@ -53,22 +51,22 @@ struct cpuinfo_mock_property {
 };
 
 #if defined(__linux__)
-	void CPUINFO_ABI cpuinfo_mock_filesystem(struct cpuinfo_mock_file* files);
-	int CPUINFO_ABI cpuinfo_mock_open(const char* path, int oflag);
-	int CPUINFO_ABI cpuinfo_mock_close(int fd);
-	ssize_t CPUINFO_ABI cpuinfo_mock_read(int fd, void* buffer, size_t capacity);
+void CPUINFO_ABI cpuinfo_mock_filesystem(struct cpuinfo_mock_file* files);
+int CPUINFO_ABI cpuinfo_mock_open(const char* path, int oflag);
+int CPUINFO_ABI cpuinfo_mock_close(int fd);
+ssize_t CPUINFO_ABI cpuinfo_mock_read(int fd, void* buffer, size_t capacity);
 
-	#if CPUINFO_ARCH_ARM || CPUINFO_ARCH_ARM64
-		void CPUINFO_ABI cpuinfo_set_hwcap(uint32_t hwcap);
-	#endif
-	#if CPUINFO_ARCH_ARM
-		void CPUINFO_ABI cpuinfo_set_hwcap2(uint32_t hwcap2);
-	#endif
+#if CPUINFO_ARCH_ARM || CPUINFO_ARCH_ARM64
+void CPUINFO_ABI cpuinfo_set_hwcap(uint32_t hwcap);
+#endif
+#if CPUINFO_ARCH_ARM
+void CPUINFO_ABI cpuinfo_set_hwcap2(uint32_t hwcap2);
+#endif
 #endif
 
 #if defined(__ANDROID__)
-	void CPUINFO_ABI cpuinfo_mock_android_properties(struct cpuinfo_mock_property* properties);
-	void CPUINFO_ABI cpuinfo_mock_gl_renderer(const char* renderer);
+void CPUINFO_ABI cpuinfo_mock_android_properties(struct cpuinfo_mock_property* properties);
+void CPUINFO_ABI cpuinfo_mock_gl_renderer(const char* renderer);
 #endif
 
 #ifdef __cplusplus

3rdparty/cpuinfo/src/api.c

@@ -6,13 +6,13 @@
 #include <cpuinfo/log.h>
 
 #ifdef __linux__
-	#include <linux/api.h>
+#include <linux/api.h>
 
-	#include <unistd.h>
-	#include <sys/syscall.h>
-	#if !defined(__NR_getcpu)
-		#include <asm-generic/unistd.h>
-	#endif
+#include <sys/syscall.h>
+#include <unistd.h>
+#if !defined(__NR_getcpu)
+#include <asm-generic/unistd.h>
+#endif
 #endif
 
 bool cpuinfo_is_initialized = false;
@@ -21,57 +21,54 @@ struct cpuinfo_processor* cpuinfo_processors = NULL;
 struct cpuinfo_core* cpuinfo_cores = NULL;
 struct cpuinfo_cluster* cpuinfo_clusters = NULL;
 struct cpuinfo_package* cpuinfo_packages = NULL;
-struct cpuinfo_cache* cpuinfo_cache[cpuinfo_cache_level_max] = { NULL };
+struct cpuinfo_cache* cpuinfo_cache[cpuinfo_cache_level_max] = {NULL};
 
 uint32_t cpuinfo_processors_count = 0;
 uint32_t cpuinfo_cores_count = 0;
 uint32_t cpuinfo_clusters_count = 0;
 uint32_t cpuinfo_packages_count = 0;
-uint32_t cpuinfo_cache_count[cpuinfo_cache_level_max] = { 0 };
+uint32_t cpuinfo_cache_count[cpuinfo_cache_level_max] = {0};
 uint32_t cpuinfo_max_cache_size = 0;
 
-#if CPUINFO_ARCH_ARM || CPUINFO_ARCH_ARM64 \
-    || CPUINFO_ARCH_RISCV32 || CPUINFO_ARCH_RISCV64
-	struct cpuinfo_uarch_info* cpuinfo_uarchs = NULL;
-	uint32_t cpuinfo_uarchs_count = 0;
+#if CPUINFO_ARCH_ARM || CPUINFO_ARCH_ARM64 || CPUINFO_ARCH_RISCV32 || CPUINFO_ARCH_RISCV64
+struct cpuinfo_uarch_info* cpuinfo_uarchs = NULL;
+uint32_t cpuinfo_uarchs_count = 0;
 #else
-	struct cpuinfo_uarch_info cpuinfo_global_uarch = { cpuinfo_uarch_unknown };
+struct cpuinfo_uarch_info cpuinfo_global_uarch = {cpuinfo_uarch_unknown};
 #endif
 
 #ifdef __linux__
-	uint32_t cpuinfo_linux_cpu_max = 0;
-	const struct cpuinfo_processor** cpuinfo_linux_cpu_to_processor_map = NULL;
-	const struct cpuinfo_core** cpuinfo_linux_cpu_to_core_map = NULL;
-	#if CPUINFO_ARCH_ARM || CPUINFO_ARCH_ARM64 \
-            || CPUINFO_ARCH_RISCV32 || CPUINFO_ARCH_RISCV64
-		const uint32_t* cpuinfo_linux_cpu_to_uarch_index_map = NULL;
-	#endif
+uint32_t cpuinfo_linux_cpu_max = 0;
+const struct cpuinfo_processor** cpuinfo_linux_cpu_to_processor_map = NULL;
+const struct cpuinfo_core** cpuinfo_linux_cpu_to_core_map = NULL;
+#if CPUINFO_ARCH_ARM || CPUINFO_ARCH_ARM64 || CPUINFO_ARCH_RISCV32 || CPUINFO_ARCH_RISCV64
+const uint32_t* cpuinfo_linux_cpu_to_uarch_index_map = NULL;
+#endif
 #endif
 
-
 const struct cpuinfo_processor* cpuinfo_get_processors(void) {
-	if CPUINFO_UNLIKELY(!cpuinfo_is_initialized) {
+	if CPUINFO_UNLIKELY (!cpuinfo_is_initialized) {
 		cpuinfo_log_fatal("cpuinfo_get_%s called before cpuinfo is initialized", "processors");
 	}
 	return cpuinfo_processors;
 }
 
 const struct cpuinfo_core* cpuinfo_get_cores(void) {
-	if CPUINFO_UNLIKELY(!cpuinfo_is_initialized) {
+	if CPUINFO_UNLIKELY (!cpuinfo_is_initialized) {
 		cpuinfo_log_fatal("cpuinfo_get_%s called before cpuinfo is initialized", "core");
 	}
 	return cpuinfo_cores;
 }
 
 const struct cpuinfo_cluster* cpuinfo_get_clusters(void) {
-	if CPUINFO_UNLIKELY(!cpuinfo_is_initialized) {
+	if CPUINFO_UNLIKELY (!cpuinfo_is_initialized) {
 		cpuinfo_log_fatal("cpuinfo_get_%s called before cpuinfo is initialized", "clusters");
 	}
 	return cpuinfo_clusters;
 }
 
 const struct cpuinfo_package* cpuinfo_get_packages(void) {
-	if CPUINFO_UNLIKELY(!cpuinfo_is_initialized) {
+	if CPUINFO_UNLIKELY (!cpuinfo_is_initialized) {
 		cpuinfo_log_fatal("cpuinfo_get_%s called before cpuinfo is initialized", "packages");
 	}
 	return cpuinfo_packages;
@@ -81,49 +78,48 @@ const struct cpuinfo_uarch_info* cpuinfo_get_uarchs() {
 	if (!cpuinfo_is_initialized) {
 		cpuinfo_log_fatal("cpuinfo_get_%s called before cpuinfo is initialized", "uarchs");
 	}
-	#if CPUINFO_ARCH_ARM || CPUINFO_ARCH_ARM64 \
-		|| CPUINFO_ARCH_RISCV32 || CPUINFO_ARCH_RISCV64
-		return cpuinfo_uarchs;
-	#else
-		return &cpuinfo_global_uarch;
-	#endif
+#if CPUINFO_ARCH_ARM || CPUINFO_ARCH_ARM64 || CPUINFO_ARCH_RISCV32 || CPUINFO_ARCH_RISCV64
+	return cpuinfo_uarchs;
+#else
+	return &cpuinfo_global_uarch;
+#endif
 }
 
 const struct cpuinfo_processor* cpuinfo_get_processor(uint32_t index) {
-	if CPUINFO_UNLIKELY(!cpuinfo_is_initialized) {
+	if CPUINFO_UNLIKELY (!cpuinfo_is_initialized) {
 		cpuinfo_log_fatal("cpuinfo_get_%s called before cpuinfo is initialized", "processor");
 	}
-	if CPUINFO_UNLIKELY(index >= cpuinfo_processors_count) {
+	if CPUINFO_UNLIKELY (index >= cpuinfo_processors_count) {
 		return NULL;
 	}
 	return &cpuinfo_processors[index];
 }
 
 const struct cpuinfo_core* cpuinfo_get_core(uint32_t index) {
-	if CPUINFO_UNLIKELY(!cpuinfo_is_initialized) {
+	if CPUINFO_UNLIKELY (!cpuinfo_is_initialized) {
 		cpuinfo_log_fatal("cpuinfo_get_%s called before cpuinfo is initialized", "core");
 	}
-	if CPUINFO_UNLIKELY(index >= cpuinfo_cores_count) {
+	if CPUINFO_UNLIKELY (index >= cpuinfo_cores_count) {
 		return NULL;
 	}
 	return &cpuinfo_cores[index];
 }
 
 const struct cpuinfo_cluster* cpuinfo_get_cluster(uint32_t index) {
-	if CPUINFO_UNLIKELY(!cpuinfo_is_initialized) {
+	if CPUINFO_UNLIKELY (!cpuinfo_is_initialized) {
 		cpuinfo_log_fatal("cpuinfo_get_%s called before cpuinfo is initialized", "cluster");
 	}
-	if CPUINFO_UNLIKELY(index >= cpuinfo_clusters_count) {
+	if CPUINFO_UNLIKELY (index >= cpuinfo_clusters_count) {
 		return NULL;
 	}
 	return &cpuinfo_clusters[index];
 }
 
 const struct cpuinfo_package* cpuinfo_get_package(uint32_t index) {
-	if CPUINFO_UNLIKELY(!cpuinfo_is_initialized) {
+	if CPUINFO_UNLIKELY (!cpuinfo_is_initialized) {
 		cpuinfo_log_fatal("cpuinfo_get_%s called before cpuinfo is initialized", "package");
 	}
-	if CPUINFO_UNLIKELY(index >= cpuinfo_packages_count) {
+	if CPUINFO_UNLIKELY (index >= cpuinfo_packages_count) {
 		return NULL;
 	}
 	return &cpuinfo_packages[index];
@@ -133,43 +129,42 @@ const struct cpuinfo_uarch_info* cpuinfo_get_uarch(uint32_t index) {
 	if (!cpuinfo_is_initialized) {
 		cpuinfo_log_fatal("cpuinfo_get_%s called before cpuinfo is initialized", "uarch");
 	}
-	#if CPUINFO_ARCH_ARM || CPUINFO_ARCH_ARM64 \
-		|| CPUINFO_ARCH_RISCV32 || CPUINFO_ARCH_RISCV64
-		if CPUINFO_UNLIKELY(index >= cpuinfo_uarchs_count) {
-			return NULL;
-		}
-		return &cpuinfo_uarchs[index];
-	#else
-		if CPUINFO_UNLIKELY(index != 0) {
-			return NULL;
-		}
-		return &cpuinfo_global_uarch;
-	#endif
+#if CPUINFO_ARCH_ARM || CPUINFO_ARCH_ARM64 || CPUINFO_ARCH_RISCV32 || CPUINFO_ARCH_RISCV64
+	if CPUINFO_UNLIKELY (index >= cpuinfo_uarchs_count) {
+		return NULL;
+	}
+	return &cpuinfo_uarchs[index];
+#else
+	if CPUINFO_UNLIKELY (index != 0) {
+		return NULL;
+	}
+	return &cpuinfo_global_uarch;
+#endif
 }
 
 uint32_t cpuinfo_get_processors_count(void) {
-	if CPUINFO_UNLIKELY(!cpuinfo_is_initialized) {
+	if CPUINFO_UNLIKELY (!cpuinfo_is_initialized) {
 		cpuinfo_log_fatal("cpuinfo_get_%s called before cpuinfo is initialized", "processors_count");
 	}
 	return cpuinfo_processors_count;
 }
 
 uint32_t cpuinfo_get_cores_count(void) {
-	if CPUINFO_UNLIKELY(!cpuinfo_is_initialized) {
+	if CPUINFO_UNLIKELY (!cpuinfo_is_initialized) {
 		cpuinfo_log_fatal("cpuinfo_get_%s called before cpuinfo is initialized", "cores_count");
 	}
 	return cpuinfo_cores_count;
 }
 
 uint32_t cpuinfo_get_clusters_count(void) {
-	if CPUINFO_UNLIKELY(!cpuinfo_is_initialized) {
+	if CPUINFO_UNLIKELY (!cpuinfo_is_initialized) {
 		cpuinfo_log_fatal("cpuinfo_get_%s called before cpuinfo is initialized", "clusters_count");
 	}
 	return cpuinfo_clusters_count;
 }
 
 uint32_t cpuinfo_get_packages_count(void) {
-	if CPUINFO_UNLIKELY(!cpuinfo_is_initialized) {
+	if CPUINFO_UNLIKELY (!cpuinfo_is_initialized) {
 		cpuinfo_log_fatal("cpuinfo_get_%s called before cpuinfo is initialized", "packages_count");
 	}
 	return cpuinfo_packages_count;
@@ -179,239 +174,243 @@ uint32_t cpuinfo_get_uarchs_count(void) {
 	if (!cpuinfo_is_initialized) {
 		cpuinfo_log_fatal("cpuinfo_get_%s called before cpuinfo is initialized", "uarchs_count");
 	}
-	#if CPUINFO_ARCH_ARM || CPUINFO_ARCH_ARM64 \
-		|| CPUINFO_ARCH_RISCV32 || CPUINFO_ARCH_RISCV64
-		return cpuinfo_uarchs_count;
-	#else
-		return 1;
-	#endif
+#if CPUINFO_ARCH_ARM || CPUINFO_ARCH_ARM64 || CPUINFO_ARCH_RISCV32 || CPUINFO_ARCH_RISCV64
+	return cpuinfo_uarchs_count;
+#else
+	return 1;
+#endif
 }
 
 const struct cpuinfo_cache* CPUINFO_ABI cpuinfo_get_l1i_caches(void) {
-	if CPUINFO_UNLIKELY(!cpuinfo_is_initialized) {
+	if CPUINFO_UNLIKELY (!cpuinfo_is_initialized) {
 		cpuinfo_log_fatal("cpuinfo_get_%s called before cpuinfo is initialized", "l1i_caches");
 	}
 	return cpuinfo_cache[cpuinfo_cache_level_1i];
 }
 
 const struct cpuinfo_cache* CPUINFO_ABI cpuinfo_get_l1d_caches(void) {
-	if CPUINFO_UNLIKELY(!cpuinfo_is_initialized) {
+	if CPUINFO_UNLIKELY (!cpuinfo_is_initialized) {
 		cpuinfo_log_fatal("cpuinfo_get_%s called before cpuinfo is initialized", "l1d_caches");
 	}
 	return cpuinfo_cache[cpuinfo_cache_level_1d];
 }
 
 const struct cpuinfo_cache* CPUINFO_ABI cpuinfo_get_l2_caches(void) {
-	if CPUINFO_UNLIKELY(!cpuinfo_is_initialized) {
+	if CPUINFO_UNLIKELY (!cpuinfo_is_initialized) {
 		cpuinfo_log_fatal("cpuinfo_get_%s called before cpuinfo is initialized", "l2_caches");
 	}
 	return cpuinfo_cache[cpuinfo_cache_level_2];
 }
 
 const struct cpuinfo_cache* CPUINFO_ABI cpuinfo_get_l3_caches(void) {
-	if CPUINFO_UNLIKELY(!cpuinfo_is_initialized) {
+	if CPUINFO_UNLIKELY (!cpuinfo_is_initialized) {
 		cpuinfo_log_fatal("cpuinfo_get_%s called before cpuinfo is initialized", "l3_caches");
 	}
 	return cpuinfo_cache[cpuinfo_cache_level_3];
 }
 
 const struct cpuinfo_cache* CPUINFO_ABI cpuinfo_get_l4_caches(void) {
-	if CPUINFO_UNLIKELY(!cpuinfo_is_initialized) {
+	if CPUINFO_UNLIKELY (!cpuinfo_is_initialized) {
 		cpuinfo_log_fatal("cpuinfo_get_%s called before cpuinfo is initialized", "l4_caches");
 	}
 	return cpuinfo_cache[cpuinfo_cache_level_4];
 }
 
 const struct cpuinfo_cache* CPUINFO_ABI cpuinfo_get_l1i_cache(uint32_t index) {
-	if CPUINFO_UNLIKELY(!cpuinfo_is_initialized) {
+	if CPUINFO_UNLIKELY (!cpuinfo_is_initialized) {
 		cpuinfo_log_fatal("cpuinfo_get_%s called before cpuinfo is initialized", "l1i_cache");
 	}
-	if CPUINFO_UNLIKELY(index >= cpuinfo_cache_count[cpuinfo_cache_level_1i]) {
+	if CPUINFO_UNLIKELY (index >= cpuinfo_cache_count[cpuinfo_cache_level_1i]) {
 		return NULL;
 	}
 	return &cpuinfo_cache[cpuinfo_cache_level_1i][index];
 }
 
 const struct cpuinfo_cache* CPUINFO_ABI cpuinfo_get_l1d_cache(uint32_t index) {
-	if CPUINFO_UNLIKELY(!cpuinfo_is_initialized) {
+	if CPUINFO_UNLIKELY (!cpuinfo_is_initialized) {
 		cpuinfo_log_fatal("cpuinfo_get_%s called before cpuinfo is initialized", "l1d_cache");
 	}
-	if CPUINFO_UNLIKELY(index >= cpuinfo_cache_count[cpuinfo_cache_level_1d]) {
+	if CPUINFO_UNLIKELY (index >= cpuinfo_cache_count[cpuinfo_cache_level_1d]) {
 		return NULL;
 	}
 	return &cpuinfo_cache[cpuinfo_cache_level_1d][index];
 }
 
 const struct cpuinfo_cache* CPUINFO_ABI cpuinfo_get_l2_cache(uint32_t index) {
-	if CPUINFO_UNLIKELY(!cpuinfo_is_initialized) {
+	if CPUINFO_UNLIKELY (!cpuinfo_is_initialized) {
 		cpuinfo_log_fatal("cpuinfo_get_%s called before cpuinfo is initialized", "l2_cache");
 	}
-	if CPUINFO_UNLIKELY(index >= cpuinfo_cache_count[cpuinfo_cache_level_2]) {
+	if CPUINFO_UNLIKELY (index >= cpuinfo_cache_count[cpuinfo_cache_level_2]) {
 		return NULL;
 	}
 	return &cpuinfo_cache[cpuinfo_cache_level_2][index];
 }
 
 const struct cpuinfo_cache* CPUINFO_ABI cpuinfo_get_l3_cache(uint32_t index) {
-	if CPUINFO_UNLIKELY(!cpuinfo_is_initialized) {
+	if CPUINFO_UNLIKELY (!cpuinfo_is_initialized) {
 		cpuinfo_log_fatal("cpuinfo_get_%s called before cpuinfo is initialized", "l3_cache");
 	}
-	if CPUINFO_UNLIKELY(index >= cpuinfo_cache_count[cpuinfo_cache_level_3]) {
+	if CPUINFO_UNLIKELY (index >= cpuinfo_cache_count[cpuinfo_cache_level_3]) {
 		return NULL;
 	}
 	return &cpuinfo_cache[cpuinfo_cache_level_3][index];
 }
 
 const struct cpuinfo_cache* CPUINFO_ABI cpuinfo_get_l4_cache(uint32_t index) {
-	if CPUINFO_UNLIKELY(!cpuinfo_is_initialized) {
+	if CPUINFO_UNLIKELY (!cpuinfo_is_initialized) {
 		cpuinfo_log_fatal("cpuinfo_get_%s called before cpuinfo is initialized", "l4_cache");
 	}
-	if CPUINFO_UNLIKELY(index >= cpuinfo_cache_count[cpuinfo_cache_level_4]) {
+	if CPUINFO_UNLIKELY (index >= cpuinfo_cache_count[cpuinfo_cache_level_4]) {
 		return NULL;
 	}
 	return &cpuinfo_cache[cpuinfo_cache_level_4][index];
 }
 
 uint32_t CPUINFO_ABI cpuinfo_get_l1i_caches_count(void) {
-	if CPUINFO_UNLIKELY(!cpuinfo_is_initialized) {
+	if CPUINFO_UNLIKELY (!cpuinfo_is_initialized) {
 		cpuinfo_log_fatal("cpuinfo_get_%s called before cpuinfo is initialized", "l1i_caches_count");
 	}
 	return cpuinfo_cache_count[cpuinfo_cache_level_1i];
 }
 
 uint32_t CPUINFO_ABI cpuinfo_get_l1d_caches_count(void) {
-	if CPUINFO_UNLIKELY(!cpuinfo_is_initialized) {
+	if CPUINFO_UNLIKELY (!cpuinfo_is_initialized) {
 		cpuinfo_log_fatal("cpuinfo_get_%s called before cpuinfo is initialized", "l1d_caches_count");
 	}
 	return cpuinfo_cache_count[cpuinfo_cache_level_1d];
 }
 
 uint32_t CPUINFO_ABI cpuinfo_get_l2_caches_count(void) {
-	if CPUINFO_UNLIKELY(!cpuinfo_is_initialized) {
+	if CPUINFO_UNLIKELY (!cpuinfo_is_initialized) {
 		cpuinfo_log_fatal("cpuinfo_get_%s called before cpuinfo is initialized", "l2_caches_count");
 	}
 	return cpuinfo_cache_count[cpuinfo_cache_level_2];
 }
 
 uint32_t CPUINFO_ABI cpuinfo_get_l3_caches_count(void) {
-	if CPUINFO_UNLIKELY(!cpuinfo_is_initialized) {
+	if CPUINFO_UNLIKELY (!cpuinfo_is_initialized) {
 		cpuinfo_log_fatal("cpuinfo_get_%s called before cpuinfo is initialized", "l3_caches_count");
 	}
 	return cpuinfo_cache_count[cpuinfo_cache_level_3];
 }
 
 uint32_t CPUINFO_ABI cpuinfo_get_l4_caches_count(void) {
-	if CPUINFO_UNLIKELY(!cpuinfo_is_initialized) {
+	if CPUINFO_UNLIKELY (!cpuinfo_is_initialized) {
 		cpuinfo_log_fatal("cpuinfo_get_%s called before cpuinfo is initialized", "l4_caches_count");
 	}
 	return cpuinfo_cache_count[cpuinfo_cache_level_4];
 }
 
 uint32_t CPUINFO_ABI cpuinfo_get_max_cache_size(void) {
-	if CPUINFO_UNLIKELY(!cpuinfo_is_initialized) {
+	if CPUINFO_UNLIKELY (!cpuinfo_is_initialized) {
 		cpuinfo_log_fatal("cpuinfo_get_%s called before cpuinfo is initialized", "max_cache_size");
 	}
 	return cpuinfo_max_cache_size;
 }
 
 const struct cpuinfo_processor* CPUINFO_ABI cpuinfo_get_current_processor(void) {
-	if CPUINFO_UNLIKELY(!cpuinfo_is_initialized) {
+	if CPUINFO_UNLIKELY (!cpuinfo_is_initialized) {
 		cpuinfo_log_fatal("cpuinfo_get_%s called before cpuinfo is initialized", "current_processor");
 	}
-	#ifdef __linux__
-		/* Initializing this variable silences a MemorySanitizer error. */
-		unsigned cpu = 0;
-		if CPUINFO_UNLIKELY(syscall(__NR_getcpu, &cpu, NULL, NULL) != 0) {
-			return 0;
-		}
-		if CPUINFO_UNLIKELY((uint32_t) cpu >= cpuinfo_linux_cpu_max) {
-			return 0;
-		}
-		return cpuinfo_linux_cpu_to_processor_map[cpu];
-	#else
-		return NULL;
-	#endif
+#ifdef __linux__
+	/* Initializing this variable silences a MemorySanitizer error. */
+	unsigned cpu = 0;
+	if CPUINFO_UNLIKELY (syscall(__NR_getcpu, &cpu, NULL, NULL) != 0) {
+		return 0;
+	}
+	if CPUINFO_UNLIKELY ((uint32_t)cpu >= cpuinfo_linux_cpu_max) {
+		return 0;
+	}
+	return cpuinfo_linux_cpu_to_processor_map[cpu];
+#else
+	return NULL;
+#endif
 }
 
 const struct cpuinfo_core* CPUINFO_ABI cpuinfo_get_current_core(void) {
-	if CPUINFO_UNLIKELY(!cpuinfo_is_initialized) {
+	if CPUINFO_UNLIKELY (!cpuinfo_is_initialized) {
 		cpuinfo_log_fatal("cpuinfo_get_%s called before cpuinfo is initialized", "current_core");
 	}
-	#ifdef __linux__
-		/* Initializing this variable silences a MemorySanitizer error. */
-		unsigned cpu = 0;
-		if CPUINFO_UNLIKELY(syscall(__NR_getcpu, &cpu, NULL, NULL) != 0) {
-			return 0;
-		}
-		if CPUINFO_UNLIKELY((uint32_t) cpu >= cpuinfo_linux_cpu_max) {
-			return 0;
-		}
-		return cpuinfo_linux_cpu_to_core_map[cpu];
-	#else
-		return NULL;
-	#endif
+#ifdef __linux__
+	/* Initializing this variable silences a MemorySanitizer error. */
+	unsigned cpu = 0;
+	if CPUINFO_UNLIKELY (syscall(__NR_getcpu, &cpu, NULL, NULL) != 0) {
+		return 0;
+	}
+	if CPUINFO_UNLIKELY ((uint32_t)cpu >= cpuinfo_linux_cpu_max) {
+		return 0;
+	}
+	return cpuinfo_linux_cpu_to_core_map[cpu];
+#else
+	return NULL;
+#endif
 }
 
 uint32_t CPUINFO_ABI cpuinfo_get_current_uarch_index(void) {
-	if CPUINFO_UNLIKELY(!cpuinfo_is_initialized) {
+	if CPUINFO_UNLIKELY (!cpuinfo_is_initialized) {
 		cpuinfo_log_fatal("cpuinfo_get_%s called before cpuinfo is initialized", "current_uarch_index");
 	}
-	#if CPUINFO_ARCH_ARM || CPUINFO_ARCH_ARM64 \
-		|| CPUINFO_ARCH_RISCV32 || CPUINFO_ARCH_RISCV64
-		#ifdef __linux__
-			if (cpuinfo_linux_cpu_to_uarch_index_map == NULL) {
-				/* Special case: avoid syscall on systems with only a single type of cores */
-				return 0;
-			}
-
-			/* General case */
-			/* Initializing this variable silences a MemorySanitizer error. */
-			unsigned cpu = 0;
-			if CPUINFO_UNLIKELY(syscall(__NR_getcpu, &cpu, NULL, NULL) != 0) {
-				return 0;
-			}
-			if CPUINFO_UNLIKELY((uint32_t) cpu >= cpuinfo_linux_cpu_max) {
-				return 0;
-			}
-			return cpuinfo_linux_cpu_to_uarch_index_map[cpu];
-		#else
-			/* Fallback: pretend to be on the big core. */
-			return 0;
-		#endif
-	#else
-		/* Only ARM/ARM64/RISCV processors may include cores of different types in the same package. */
+#if CPUINFO_ARCH_ARM || CPUINFO_ARCH_ARM64 || CPUINFO_ARCH_RISCV32 || CPUINFO_ARCH_RISCV64
+#ifdef __linux__
+	if (cpuinfo_linux_cpu_to_uarch_index_map == NULL) {
+		/* Special case: avoid syscall on systems with only a single
+		 * type of cores
+		 */
 		return 0;
-	#endif
+	}
+
+	/* General case */
+	/* Initializing this variable silences a MemorySanitizer error. */
+	unsigned cpu = 0;
+	if CPUINFO_UNLIKELY (syscall(__NR_getcpu, &cpu, NULL, NULL) != 0) {
+		return 0;
+	}
+	if CPUINFO_UNLIKELY ((uint32_t)cpu >= cpuinfo_linux_cpu_max) {
+		return 0;
+	}
+	return cpuinfo_linux_cpu_to_uarch_index_map[cpu];
+#else
+	/* Fallback: pretend to be on the big core. */
+	return 0;
+#endif
+#else
+	/* Only ARM/ARM64/RISCV processors may include cores of different types
+	 * in the same package. */
+	return 0;
+#endif
 }
 
 uint32_t CPUINFO_ABI cpuinfo_get_current_uarch_index_with_default(uint32_t default_uarch_index) {
-	if CPUINFO_UNLIKELY(!cpuinfo_is_initialized) {
-		cpuinfo_log_fatal("cpuinfo_get_%s called before cpuinfo is initialized", "current_uarch_index_with_default");
+	if CPUINFO_UNLIKELY (!cpuinfo_is_initialized) {
+		cpuinfo_log_fatal(
+			"cpuinfo_get_%s called before cpuinfo is initialized", "current_uarch_index_with_default");
 	}
-	#if CPUINFO_ARCH_ARM || CPUINFO_ARCH_ARM64 \
-		|| CPUINFO_ARCH_RISCV32 || CPUINFO_ARCH_RISCV64
-		#ifdef __linux__
-			if (cpuinfo_linux_cpu_to_uarch_index_map == NULL) {
-				/* Special case: avoid syscall on systems with only a single type of cores */
-				return 0;
-			}
-
-			/* General case */
-			/* Initializing this variable silences a MemorySanitizer error. */
-			unsigned cpu = 0;
-			if CPUINFO_UNLIKELY(syscall(__NR_getcpu, &cpu, NULL, NULL) != 0) {
-				return default_uarch_index;
-			}
-			if CPUINFO_UNLIKELY((uint32_t) cpu >= cpuinfo_linux_cpu_max) {
-				return default_uarch_index;
-			}
-			return cpuinfo_linux_cpu_to_uarch_index_map[cpu];
-		#else
-			/* Fallback: no API to query current core, use default uarch index. */
-			return default_uarch_index;
-		#endif
-	#else
-		/* Only ARM/ARM64/RISCV processors may include cores of different types in the same package. */
+#if CPUINFO_ARCH_ARM || CPUINFO_ARCH_ARM64 || CPUINFO_ARCH_RISCV32 || CPUINFO_ARCH_RISCV64
+#ifdef __linux__
+	if (cpuinfo_linux_cpu_to_uarch_index_map == NULL) {
+		/* Special case: avoid syscall on systems with only a single
+		 * type of cores
+		 */
 		return 0;
-	#endif
+	}
+
+	/* General case */
+	/* Initializing this variable silences a MemorySanitizer error. */
+	unsigned cpu = 0;
+	if CPUINFO_UNLIKELY (syscall(__NR_getcpu, &cpu, NULL, NULL) != 0) {
+		return default_uarch_index;
+	}
+	if CPUINFO_UNLIKELY ((uint32_t)cpu >= cpuinfo_linux_cpu_max) {
+		return default_uarch_index;
+	}
+	return cpuinfo_linux_cpu_to_uarch_index_map[cpu];
+#else
+	/* Fallback: no API to query current core, use default uarch index. */
+	return default_uarch_index;
+#endif
+#else
+	/* Only ARM/ARM64/RISCV processors may include cores of different types
+	 * in the same package. */
+	return 0;
+#endif
 }

3rdparty/cpuinfo/src/arm/android/api.h

@@ -1,9 +1,9 @@
 #pragma once
 
-#include <cpuinfo.h>
-#include <cpuinfo/common.h>
 #include <arm/api.h>
 #include <arm/linux/api.h>
+#include <cpuinfo.h>
+#include <cpuinfo/common.h>
 
 enum cpuinfo_android_chipset_property {
 	cpuinfo_android_chipset_property_proc_cpuinfo_hardware = 0,

3rdparty/cpuinfo/src/arm/android/properties.c

@@ -1,42 +1,42 @@
 #include <stdbool.h>
+#include <stddef.h>
 #include <stdint.h>
 #include <stdlib.h>
-#include <stddef.h>
 #include <string.h>
 
 #include <sys/system_properties.h>
 
-#include <linux/api.h>
 #include <arm/android/api.h>
 #include <arm/linux/api.h>
 #include <cpuinfo/log.h>
+#include <linux/api.h>
 
 #if CPUINFO_MOCK
-	#include <cpuinfo-mock.h>
+#include <cpuinfo-mock.h>
 
-	static struct cpuinfo_mock_property* cpuinfo_mock_properties = NULL;
+static struct cpuinfo_mock_property* cpuinfo_mock_properties = NULL;
 
-	void CPUINFO_ABI cpuinfo_mock_android_properties(struct cpuinfo_mock_property* properties) {
-		cpuinfo_log_info("Android properties mocking enabled");
-		cpuinfo_mock_properties = properties;
-	}
+void CPUINFO_ABI cpuinfo_mock_android_properties(struct cpuinfo_mock_property* properties) {
+	cpuinfo_log_info("Android properties mocking enabled");
+	cpuinfo_mock_properties = properties;
+}
 
-	static int cpuinfo_android_property_get(const char* key, char* value) {
-		if (cpuinfo_mock_properties != NULL) {
-			for (const struct cpuinfo_mock_property* prop = cpuinfo_mock_properties; prop->key != NULL; prop++) {
-				if (strncmp(key, prop->key, CPUINFO_BUILD_PROP_NAME_MAX) == 0) {
-					strncpy(value, prop->value, CPUINFO_BUILD_PROP_VALUE_MAX);
-					return (int) strnlen(prop->value, CPUINFO_BUILD_PROP_VALUE_MAX);
-				}
+static int cpuinfo_android_property_get(const char* key, char* value) {
+	if (cpuinfo_mock_properties != NULL) {
+		for (const struct cpuinfo_mock_property* prop = cpuinfo_mock_properties; prop->key != NULL; prop++) {
+			if (strncmp(key, prop->key, CPUINFO_BUILD_PROP_NAME_MAX) == 0) {
+				strncpy(value, prop->value, CPUINFO_BUILD_PROP_VALUE_MAX);
+				return (int)strnlen(prop->value, CPUINFO_BUILD_PROP_VALUE_MAX);
 			}
 		}
-		*value = '\0';
-		return 0;
 	}
+	*value = '\0';
+	return 0;
+}
 #else
-	static inline int cpuinfo_android_property_get(const char* key, char* value) {
-		return __system_property_get(key, value);
-	}
+static inline int cpuinfo_android_property_get(const char* key, char* value) {
+	return __system_property_get(key, value);
+}
 #endif
 
 void cpuinfo_arm_android_parse_properties(struct cpuinfo_android_properties properties[restrict static 1]) {
@@ -50,18 +50,17 @@ void cpuinfo_arm_android_parse_properties(struct cpuinfo_android_properties prop
 
 	const int ro_mediatek_platform_length =
 		cpuinfo_android_property_get("ro.mediatek.platform", properties->ro_mediatek_platform);
-	cpuinfo_log_debug("read ro.mediatek.platform = \"%.*s\"",
-		ro_mediatek_platform_length, properties->ro_mediatek_platform);
+	cpuinfo_log_debug(
+		"read ro.mediatek.platform = \"%.*s\"", ro_mediatek_platform_length, properties->ro_mediatek_platform);
 
-	const int ro_arch_length =
-		cpuinfo_android_property_get("ro.arch", properties->ro_arch);
+	const int ro_arch_length = cpuinfo_android_property_get("ro.arch", properties->ro_arch);
 	cpuinfo_log_debug("read ro.arch = \"%.*s\"", ro_arch_length, properties->ro_arch);
 
-	const int ro_chipname_length =
-		cpuinfo_android_property_get("ro.chipname", properties->ro_chipname);
+	const int ro_chipname_length = cpuinfo_android_property_get("ro.chipname", properties->ro_chipname);
 	cpuinfo_log_debug("read ro.chipname = \"%.*s\"", ro_chipname_length, properties->ro_chipname);
 
 	const int ro_hardware_chipname_length =
 		cpuinfo_android_property_get("ro.hardware.chipname", properties->ro_hardware_chipname);
-	cpuinfo_log_debug("read ro.hardware.chipname = \"%.*s\"", ro_hardware_chipname_length, properties->ro_hardware_chipname);
+	cpuinfo_log_debug(
+		"read ro.hardware.chipname = \"%.*s\"", ro_hardware_chipname_length, properties->ro_hardware_chipname);
 }

3rdparty/cpuinfo/src/arm/api.h

@@ -80,45 +80,47 @@ struct cpuinfo_arm_chipset {
 #define CPUINFO_ARM_CHIPSET_NAME_MAX CPUINFO_PACKAGE_NAME_MAX
 
 #ifndef __cplusplus
-	CPUINFO_INTERNAL void cpuinfo_arm_chipset_to_string(
-		const struct cpuinfo_arm_chipset chipset[restrict static 1],
-		char name[restrict static CPUINFO_ARM_CHIPSET_NAME_MAX]);
+CPUINFO_INTERNAL void cpuinfo_arm_chipset_to_string(
+	const struct cpuinfo_arm_chipset chipset[restrict static 1],
+	char name[restrict static CPUINFO_ARM_CHIPSET_NAME_MAX]);
 
-	CPUINFO_INTERNAL void cpuinfo_arm_fixup_chipset(
-		struct cpuinfo_arm_chipset chipset[restrict static 1], uint32_t cores, uint32_t max_cpu_freq_max);
+CPUINFO_INTERNAL void cpuinfo_arm_fixup_chipset(
+	struct cpuinfo_arm_chipset chipset[restrict static 1],
+	uint32_t cores,
+	uint32_t max_cpu_freq_max);
 
-	CPUINFO_INTERNAL void cpuinfo_arm_decode_vendor_uarch(
-		uint32_t midr,
-	#if CPUINFO_ARCH_ARM
-		bool has_vfpv4,
-	#endif
-		enum cpuinfo_vendor vendor[restrict static 1],
-		enum cpuinfo_uarch uarch[restrict static 1]);
-
-	CPUINFO_INTERNAL void cpuinfo_arm_decode_cache(
-		enum cpuinfo_uarch uarch,
-		uint32_t cluster_cores,
-		uint32_t midr,
-		const struct cpuinfo_arm_chipset chipset[restrict static 1],
-		uint32_t cluster_id,
-		uint32_t arch_version,
-		struct cpuinfo_cache l1i[restrict static 1],
-		struct cpuinfo_cache l1d[restrict static 1],
-		struct cpuinfo_cache l2[restrict static 1],
-		struct cpuinfo_cache l3[restrict static 1]);
-
-	CPUINFO_INTERNAL uint32_t cpuinfo_arm_compute_max_cache_size(
-		const struct cpuinfo_processor processor[restrict static 1]);
-#else /* defined(__cplusplus) */
-	CPUINFO_INTERNAL void cpuinfo_arm_decode_cache(
-		enum cpuinfo_uarch uarch,
-		uint32_t cluster_cores,
-		uint32_t midr,
-		const struct cpuinfo_arm_chipset chipset[1],
-		uint32_t cluster_id,
-		uint32_t arch_version,
-		struct cpuinfo_cache l1i[1],
-		struct cpuinfo_cache l1d[1],
-		struct cpuinfo_cache l2[1],
-		struct cpuinfo_cache l3[1]);
+CPUINFO_INTERNAL void cpuinfo_arm_decode_vendor_uarch(
+	uint32_t midr,
+#if CPUINFO_ARCH_ARM
+	bool has_vfpv4,
+#endif
+	enum cpuinfo_vendor vendor[restrict static 1],
+	enum cpuinfo_uarch uarch[restrict static 1]);
+
+CPUINFO_INTERNAL void cpuinfo_arm_decode_cache(
+	enum cpuinfo_uarch uarch,
+	uint32_t cluster_cores,
+	uint32_t midr,
+	const struct cpuinfo_arm_chipset chipset[restrict static 1],
+	uint32_t cluster_id,
+	uint32_t arch_version,
+	struct cpuinfo_cache l1i[restrict static 1],
+	struct cpuinfo_cache l1d[restrict static 1],
+	struct cpuinfo_cache l2[restrict static 1],
+	struct cpuinfo_cache l3[restrict static 1]);
+
+CPUINFO_INTERNAL uint32_t
+cpuinfo_arm_compute_max_cache_size(const struct cpuinfo_processor processor[restrict static 1]);
+#else /* defined(__cplusplus) */
+CPUINFO_INTERNAL void cpuinfo_arm_decode_cache(
+	enum cpuinfo_uarch uarch,
+	uint32_t cluster_cores,
+	uint32_t midr,
+	const struct cpuinfo_arm_chipset chipset[1],
+	uint32_t cluster_id,
+	uint32_t arch_version,
+	struct cpuinfo_cache l1i[1],
+	struct cpuinfo_cache l1d[1],
+	struct cpuinfo_cache l2[1],
+	struct cpuinfo_cache l3[1]);
 #endif

3rdparty/cpuinfo/src/arm/linux/aarch32-isa.c

@@ -1,29 +1,27 @@
 #include <stdint.h>
 
 #if CPUINFO_MOCK
-	#include <cpuinfo-mock.h>
+#include <cpuinfo-mock.h>
 #endif
 #include <arm/linux/api.h>
 #include <arm/linux/cp.h>
 #include <arm/midr.h>
 #include <cpuinfo/log.h>
 
-
 #if CPUINFO_MOCK
-	uint32_t cpuinfo_arm_fpsid = 0;
-	uint32_t cpuinfo_arm_mvfr0 = 0;
-	uint32_t cpuinfo_arm_wcid = 0;
+uint32_t cpuinfo_arm_fpsid = 0;
+uint32_t cpuinfo_arm_mvfr0 = 0;
+uint32_t cpuinfo_arm_wcid = 0;
 
-	void cpuinfo_set_fpsid(uint32_t fpsid) {
-		cpuinfo_arm_fpsid = fpsid;
-	}
+void cpuinfo_set_fpsid(uint32_t fpsid) {
+	cpuinfo_arm_fpsid = fpsid;
+}
 
-	void cpuinfo_set_wcid(uint32_t wcid) {
-		cpuinfo_arm_wcid = wcid;
-	}
+void cpuinfo_set_wcid(uint32_t wcid) {
+	cpuinfo_arm_wcid = wcid;
+}
 #endif
 
-
 void cpuinfo_arm_linux_decode_isa_from_proc_cpuinfo(
 	uint32_t features,
 	uint32_t features2,
@@ -31,27 +29,27 @@ void cpuinfo_arm_linux_decode_isa_from_proc_cpuinfo(
 	uint32_t architecture_version,
 	uint32_t architecture_flags,
 	const struct cpuinfo_arm_chipset chipset[restrict static 1],
-	struct cpuinfo_arm_isa isa[restrict static 1])
-{
+	struct cpuinfo_arm_isa isa[restrict static 1]) {
 	if (architecture_version < 8) {
-		const uint32_t armv8_features2_mask = CPUINFO_ARM_LINUX_FEATURE2_AES | CPUINFO_ARM_LINUX_FEATURE2_PMULL |
-			CPUINFO_ARM_LINUX_FEATURE2_SHA1 | CPUINFO_ARM_LINUX_FEATURE2_SHA2 | CPUINFO_ARM_LINUX_FEATURE2_CRC32;
+		const uint32_t armv8_features2_mask = CPUINFO_ARM_LINUX_FEATURE2_AES |
+			CPUINFO_ARM_LINUX_FEATURE2_PMULL | CPUINFO_ARM_LINUX_FEATURE2_SHA1 |
+			CPUINFO_ARM_LINUX_FEATURE2_SHA2 | CPUINFO_ARM_LINUX_FEATURE2_CRC32;
 		if (features2 & armv8_features2_mask) {
 			architecture_version = 8;
 		}
 	}
 	if (architecture_version >= 8) {
 		/*
-		 * ARMv7 code running on ARMv8: IDIV, VFP, NEON are always supported,
-		 * but may be not reported in /proc/cpuinfo features.
+		 * ARMv7 code running on ARMv8: IDIV, VFP, NEON are always
+		 * supported, but may be not reported in /proc/cpuinfo features.
 		 */
-		isa->armv5e  = true;
-		isa->armv6   = true;
-		isa->armv6k  = true;
-		isa->armv7   = true;
+		isa->armv5e = true;
+		isa->armv6 = true;
+		isa->armv6k = true;
+		isa->armv7 = true;
 		isa->armv7mp = true;
-		isa->armv8   = true;
-		isa->thumb  = true;
+		isa->armv8 = true;
+		isa->thumb = true;
 		isa->thumb2 = true;
 		isa->idiv = true;
 		isa->vfpv3 = true;
@@ -61,8 +59,10 @@ void cpuinfo_arm_linux_decode_isa_from_proc_cpuinfo(
 		isa->neon = true;
 
 		/*
-		 * NEON FP16 compute extension and VQRDMLAH/VQRDMLSH instructions are not indicated in /proc/cpuinfo.
-		 * Use a MIDR-based heuristic to whitelist processors known to support it:
+		 * NEON FP16 compute extension and VQRDMLAH/VQRDMLSH
+		 * instructions are not indicated in /proc/cpuinfo. Use a
+		 * MIDR-based heuristic to whitelist processors known to support
+		 * it:
 		 * - Processors with Cortex-A55 cores
 		 * - Processors with Cortex-A75 cores
 		 * - Processors with Cortex-A76 cores
@@ -82,8 +82,10 @@ void cpuinfo_arm_linux_decode_isa_from_proc_cpuinfo(
 		 * - Neoverse V2 cores
 		 */
 		if (chipset->series == cpuinfo_arm_chipset_series_samsung_exynos && chipset->model == 9810) {
-			/* Only little cores of Exynos 9810 support FP16 & RDM */
-			cpuinfo_log_warning("FP16 arithmetics and RDM disabled: only little cores in Exynos 9810 support these extensions");
+			/* Only little cores of Exynos 9810 support FP16 & RDM
+			 */
+			cpuinfo_log_warning(
+				"FP16 arithmetics and RDM disabled: only little cores in Exynos 9810 support these extensions");
 		} else {
 			switch (midr & (CPUINFO_ARM_MIDR_IMPLEMENTER_MASK | CPUINFO_ARM_MIDR_PART_MASK)) {
 				case UINT32_C(0x4100D050): /* Cortex-A55 */
@@ -102,11 +104,16 @@ void cpuinfo_arm_linux_decode_isa_from_proc_cpuinfo(
 				case UINT32_C(0x4100D4D0): /* Cortex-A715 */
 				case UINT32_C(0x4100D4E0): /* Cortex-X3 */
 				case UINT32_C(0x4100D4F0): /* Neoverse V2 */
-				case UINT32_C(0x4800D400): /* Cortex-A76 (HiSilicon) */
-				case UINT32_C(0x51008020): /* Kryo 385 Gold (Cortex-A75) */
-				case UINT32_C(0x51008030): /* Kryo 385 Silver (Cortex-A55) */
-				case UINT32_C(0x51008040): /* Kryo 485 Gold (Cortex-A76) */
-				case UINT32_C(0x51008050): /* Kryo 485 Silver (Cortex-A55) */
+				case UINT32_C(0x4800D400): /* Cortex-A76
+							      (HiSilicon) */
+				case UINT32_C(0x51008020): /* Kryo 385 Gold
+							      (Cortex-A75) */
+				case UINT32_C(0x51008030): /* Kryo 385 Silver
+							      (Cortex-A55) */
+				case UINT32_C(0x51008040): /* Kryo 485 Gold
+							      (Cortex-A76) */
+				case UINT32_C(0x51008050): /* Kryo 485 Silver
+							      (Cortex-A55) */
 				case UINT32_C(0x53000030): /* Exynos M4 */
 				case UINT32_C(0x53000040): /* Exynos M5 */
 					isa->fp16arith = true;
@@ -117,7 +124,8 @@ void cpuinfo_arm_linux_decode_isa_from_proc_cpuinfo(
 
 		/*
 		 * NEON VDOT instructions are not indicated in /proc/cpuinfo.
-		 * Use a MIDR-based heuristic to whitelist processors known to support it:
+		 * Use a MIDR-based heuristic to whitelist processors known to
+		 * support it:
 		 * - Processors with Cortex-A76 cores
 		 * - Processors with Cortex-A77 cores
 		 * - Processors with Cortex-A78 cores
@@ -135,7 +143,8 @@ void cpuinfo_arm_linux_decode_isa_from_proc_cpuinfo(
 		 * - Neoverse V2 cores
 		 */
 		if (chipset->series == cpuinfo_arm_chipset_series_spreadtrum_sc && chipset->model == 9863) {
-			cpuinfo_log_warning("VDOT instructions disabled: cause occasional SIGILL on Spreadtrum SC9863A");
+			cpuinfo_log_warning(
+				"VDOT instructions disabled: cause occasional SIGILL on Spreadtrum SC9863A");
 		} else if (chipset->series == cpuinfo_arm_chipset_series_unisoc_t && chipset->model == 310) {
 			cpuinfo_log_warning("VDOT instructions disabled: cause occasional SIGILL on Unisoc T310");
 		} else {
@@ -154,41 +163,52 @@ void cpuinfo_arm_linux_decode_isa_from_proc_cpuinfo(
 				case UINT32_C(0x4100D4D0): /* Cortex-A715 */
 				case UINT32_C(0x4100D4E0): /* Cortex-X3 */
 				case UINT32_C(0x4100D4F0): /* Neoverse V2 */
-				case UINT32_C(0x4800D400): /* Cortex-A76 (HiSilicon) */
-				case UINT32_C(0x51008040): /* Kryo 485 Gold (Cortex-A76) */
-				case UINT32_C(0x51008050): /* Kryo 485 Silver (Cortex-A55) */
+				case UINT32_C(0x4800D400): /* Cortex-A76
+							      (HiSilicon) */
+				case UINT32_C(0x51008040): /* Kryo 485 Gold
+							      (Cortex-A76) */
+				case UINT32_C(0x51008050): /* Kryo 485 Silver
+							      (Cortex-A55) */
 				case UINT32_C(0x53000030): /* Exynos M4 */
 				case UINT32_C(0x53000040): /* Exynos M5 */
 					isa->dot = true;
 					break;
-				case UINT32_C(0x4100D050): /* Cortex A55: revision 1 or later only */
+				case UINT32_C(0x4100D050): /* Cortex A55: revision 1
+							      or later only */
 					isa->dot = !!(midr_get_variant(midr) >= 1);
 					break;
-				case UINT32_C(0x4100D0A0): /* Cortex A75: revision 2 or later only */
+				case UINT32_C(0x4100D0A0): /* Cortex A75: revision 2
+							      or later only */
 					isa->dot = !!(midr_get_variant(midr) >= 2);
 					break;
 			}
 		}
 	} else {
-		/* ARMv7 or lower: use feature flags to detect optional features */
+		/* ARMv7 or lower: use feature flags to detect optional features
+		 */
 
 		/*
-		 * ARM11 (ARM 1136/1156/1176/11 MPCore) processors can report v7 architecture
-		 * even though they support only ARMv6 instruction set.
+		 * ARM11 (ARM 1136/1156/1176/11 MPCore) processors can report v7
+		 * architecture even though they support only ARMv6 instruction
+		 * set.
 		 */
 		if (architecture_version == 7 && midr_is_arm11(midr)) {
-			cpuinfo_log_warning("kernel-reported architecture ARMv7 ignored due to mismatch with processor microarchitecture (ARM11)");
+			cpuinfo_log_warning(
+				"kernel-reported architecture ARMv7 ignored due to mismatch with processor microarchitecture (ARM11)");
 			architecture_version = 6;
 		}
 
 		if (architecture_version < 7) {
-			const uint32_t armv7_features_mask = CPUINFO_ARM_LINUX_FEATURE_VFPV3 | CPUINFO_ARM_LINUX_FEATURE_VFPV3D16 | CPUINFO_ARM_LINUX_FEATURE_VFPD32 |
-				CPUINFO_ARM_LINUX_FEATURE_VFPV4 | CPUINFO_ARM_LINUX_FEATURE_NEON | CPUINFO_ARM_LINUX_FEATURE_IDIVT | CPUINFO_ARM_LINUX_FEATURE_IDIVA;
+			const uint32_t armv7_features_mask = CPUINFO_ARM_LINUX_FEATURE_VFPV3 |
+				CPUINFO_ARM_LINUX_FEATURE_VFPV3D16 | CPUINFO_ARM_LINUX_FEATURE_VFPD32 |
+				CPUINFO_ARM_LINUX_FEATURE_VFPV4 | CPUINFO_ARM_LINUX_FEATURE_NEON |
+				CPUINFO_ARM_LINUX_FEATURE_IDIVT | CPUINFO_ARM_LINUX_FEATURE_IDIVA;
 			if (features & armv7_features_mask) {
 				architecture_version = 7;
 			}
 		}
-		if ((architecture_version >= 6) || (features & CPUINFO_ARM_LINUX_FEATURE_EDSP) || (architecture_flags & CPUINFO_ARM_LINUX_ARCH_E)) {
+		if ((architecture_version >= 6) || (features & CPUINFO_ARM_LINUX_FEATURE_EDSP) ||
+		    (architecture_flags & CPUINFO_ARM_LINUX_ARCH_E)) {
 			isa->armv5e = true;
 		}
 		if (architecture_version >= 6) {
@@ -199,13 +219,16 @@ void cpuinfo_arm_linux_decode_isa_from_proc_cpuinfo(
 			isa->armv7 = true;
 
 			/*
-			 * ARMv7 MP extension (PLDW instruction) is not indicated in /proc/cpuinfo.
-			 * Use heuristic list of supporting processors:
-			 * - Processors supporting UDIV/SDIV instructions ("idiva" + "idivt" features in /proc/cpuinfo)
+			 * ARMv7 MP extension (PLDW instruction) is not
+			 * indicated in /proc/cpuinfo. Use heuristic list of
+			 * supporting processors:
+			 * - Processors supporting UDIV/SDIV instructions
+			 * ("idiva" + "idivt" features in /proc/cpuinfo)
 			 * - Cortex-A5
 			 * - Cortex-A9
 			 * - Dual-Core Scorpion
-			 * - Krait (supports UDIV/SDIV, but kernels may not report it in /proc/cpuinfo)
+			 * - Krait (supports UDIV/SDIV, but kernels may not
+			 * report it in /proc/cpuinfo)
 			 *
 			 * TODO: check single-core Qualcomm Scorpion.
 			 */
@@ -218,31 +241,35 @@ void cpuinfo_arm_linux_decode_isa_from_proc_cpuinfo(
 					isa->armv7mp = true;
 					break;
 				default:
-					/* In practice IDIV instruction implies ARMv7+MP ISA */
-					isa->armv7mp = (features & CPUINFO_ARM_LINUX_FEATURE_IDIV) == CPUINFO_ARM_LINUX_FEATURE_IDIV;
+					/* In practice IDIV instruction implies
+					 * ARMv7+MP ISA */
+					isa->armv7mp = (features & CPUINFO_ARM_LINUX_FEATURE_IDIV) ==
+						CPUINFO_ARM_LINUX_FEATURE_IDIV;
 					break;
 			}
 		}
 
 		if (features & CPUINFO_ARM_LINUX_FEATURE_IWMMXT) {
-			#if !defined(__ARM_ARCH_8A__) && !(defined(__ARM_ARCH) && (__ARM_ARCH >= 8))
-				const uint32_t wcid = read_wcid();
-				cpuinfo_log_debug("WCID = 0x%08"PRIx32, wcid);
-				const uint32_t coprocessor_type = (wcid >> 8) & UINT32_C(0xFF);
-				if (coprocessor_type >= 0x10) {
-					isa->wmmx = true;
-					if (coprocessor_type >= 0x20) {
-						isa->wmmx2 = true;
-					}
-				} else {
-					cpuinfo_log_warning("WMMX ISA disabled: OS reported iwmmxt feature, "
-						"but WCID coprocessor type 0x%"PRIx32" indicates no WMMX support",
-						coprocessor_type);
+#if !defined(__ARM_ARCH_8A__) && !(defined(__ARM_ARCH) && (__ARM_ARCH >= 8))
+			const uint32_t wcid = read_wcid();
+			cpuinfo_log_debug("WCID = 0x%08" PRIx32, wcid);
+			const uint32_t coprocessor_type = (wcid >> 8) & UINT32_C(0xFF);
+			if (coprocessor_type >= 0x10) {
+				isa->wmmx = true;
+				if (coprocessor_type >= 0x20) {
+					isa->wmmx2 = true;
 				}
-			#else
-				cpuinfo_log_warning("WMMX ISA disabled: OS reported iwmmxt feature, "
-					"but there is no iWMMXt coprocessor");
-			#endif
+			} else {
+				cpuinfo_log_warning(
+					"WMMX ISA disabled: OS reported iwmmxt feature, "
+					"but WCID coprocessor type 0x%" PRIx32 " indicates no WMMX support",
+					coprocessor_type);
+			}
+#else
+			cpuinfo_log_warning(
+				"WMMX ISA disabled: OS reported iwmmxt feature, "
+				"but there is no iWMMXt coprocessor");
+#endif
 		}
 
 		if ((features & CPUINFO_ARM_LINUX_FEATURE_THUMB) || (architecture_flags & CPUINFO_ARM_LINUX_ARCH_T)) {
@@ -263,35 +290,39 @@ void cpuinfo_arm_linux_decode_isa_from_proc_cpuinfo(
 			isa->jazelle = true;
 		}
 
-		/* Qualcomm Krait may have buggy kernel configuration that doesn't report IDIV */
-		if ((features & CPUINFO_ARM_LINUX_FEATURE_IDIV) == CPUINFO_ARM_LINUX_FEATURE_IDIV || midr_is_krait(midr)) {
+		/* Qualcomm Krait may have buggy kernel configuration that
+		 * doesn't report IDIV */
+		if ((features & CPUINFO_ARM_LINUX_FEATURE_IDIV) == CPUINFO_ARM_LINUX_FEATURE_IDIV ||
+		    midr_is_krait(midr)) {
 			isa->idiv = true;
 		}
 
-		const uint32_t vfp_mask = \
-			CPUINFO_ARM_LINUX_FEATURE_VFP | CPUINFO_ARM_LINUX_FEATURE_VFPV3 | CPUINFO_ARM_LINUX_FEATURE_VFPV3D16 | \
-			CPUINFO_ARM_LINUX_FEATURE_VFPD32 | CPUINFO_ARM_LINUX_FEATURE_VFPV4 | CPUINFO_ARM_LINUX_FEATURE_NEON;
+		const uint32_t vfp_mask = CPUINFO_ARM_LINUX_FEATURE_VFP | CPUINFO_ARM_LINUX_FEATURE_VFPV3 |
+			CPUINFO_ARM_LINUX_FEATURE_VFPV3D16 | CPUINFO_ARM_LINUX_FEATURE_VFPD32 |
+			CPUINFO_ARM_LINUX_FEATURE_VFPV4 | CPUINFO_ARM_LINUX_FEATURE_NEON;
 		if (features & vfp_mask) {
-			const uint32_t vfpv3_mask = CPUINFO_ARM_LINUX_FEATURE_VFPV3 | CPUINFO_ARM_LINUX_FEATURE_VFPV3D16 | \
-				CPUINFO_ARM_LINUX_FEATURE_VFPD32 | CPUINFO_ARM_LINUX_FEATURE_VFPV4 | CPUINFO_ARM_LINUX_FEATURE_NEON;
+			const uint32_t vfpv3_mask = CPUINFO_ARM_LINUX_FEATURE_VFPV3 |
+				CPUINFO_ARM_LINUX_FEATURE_VFPV3D16 | CPUINFO_ARM_LINUX_FEATURE_VFPD32 |
+				CPUINFO_ARM_LINUX_FEATURE_VFPV4 | CPUINFO_ARM_LINUX_FEATURE_NEON;
 			if ((architecture_version >= 7) || (features & vfpv3_mask)) {
 				isa->vfpv3 = true;
 
-				const uint32_t d32_mask = CPUINFO_ARM_LINUX_FEATURE_VFPD32 | CPUINFO_ARM_LINUX_FEATURE_NEON;
+				const uint32_t d32_mask =
+					CPUINFO_ARM_LINUX_FEATURE_VFPD32 | CPUINFO_ARM_LINUX_FEATURE_NEON;
 				if (features & d32_mask) {
 					isa->d32 = true;
 				}
 			} else {
-				#if defined(__ARM_ARCH_7A__) || defined(__ARM_ARCH_8A__) || defined(__ARM_ARCH) && (__ARM_ARCH >= 7)
-					isa->vfpv3 = true;
-				#else
-					const uint32_t fpsid = read_fpsid();
-					cpuinfo_log_debug("FPSID = 0x%08"PRIx32, fpsid);
-					const uint32_t subarchitecture = (fpsid >> 16) & UINT32_C(0x7F);
-					if (subarchitecture >= 0x01) {
-						isa->vfpv2 = true;
-					}
-				#endif
+#if defined(__ARM_ARCH_7A__) || defined(__ARM_ARCH_8A__) || defined(__ARM_ARCH) && (__ARM_ARCH >= 7)
+				isa->vfpv3 = true;
+#else
+				const uint32_t fpsid = read_fpsid();
+				cpuinfo_log_debug("FPSID = 0x%08" PRIx32, fpsid);
+				const uint32_t subarchitecture = (fpsid >> 16) & UINT32_C(0x7F);
+				if (subarchitecture >= 0x01) {
+					isa->vfpv2 = true;
+				}
+#endif
 			}
 		}
 		if (features & CPUINFO_ARM_LINUX_FEATURE_NEON) {
@@ -300,8 +331,9 @@ void cpuinfo_arm_linux_decode_isa_from_proc_cpuinfo(
 
 		/*
 		 * There is no separate feature flag for FP16 support.
-		 * VFPv4 implies VFPv3-FP16 support (and in practice, NEON-HP as well).
-		 * Additionally, ARM Cortex-A9 and Qualcomm Scorpion support FP16.
+		 * VFPv4 implies VFPv3-FP16 support (and in practice, NEON-HP as
+		 * well). Additionally, ARM Cortex-A9 and Qualcomm Scorpion
+		 * support FP16.
 		 */
 		if ((features & CPUINFO_ARM_LINUX_FEATURE_VFPV4) || midr_is_cortex_a9(midr) || midr_is_scorpion(midr)) {
 			isa->fp16 = true;

3rdparty/cpuinfo/src/arm/linux/aarch64-isa.c

@@ -3,14 +3,12 @@
 #include <arm/linux/api.h>
 #include <cpuinfo/log.h>
 
-
 void cpuinfo_arm64_linux_decode_isa_from_proc_cpuinfo(
 	uint32_t features,
 	uint32_t features2,
 	uint32_t midr,
 	const struct cpuinfo_arm_chipset chipset[restrict static 1],
-	struct cpuinfo_arm_isa isa[restrict static 1])
-{
+	struct cpuinfo_arm_isa isa[restrict static 1]) {
 	if (features & CPUINFO_ARM_LINUX_FEATURE_AES) {
 		isa->aes = true;
 	}
@@ -31,8 +29,10 @@ void cpuinfo_arm64_linux_decode_isa_from_proc_cpuinfo(
 	}
 
 	/*
-	 * Some phones ship with an old kernel configuration that doesn't report NEON FP16 compute extension and SQRDMLAH/SQRDMLSH/UQRDMLAH/UQRDMLSH instructions.
-	 * Use a MIDR-based heuristic to whitelist processors known to support it:
+	 * Some phones ship with an old kernel configuration that doesn't report
+	 * NEON FP16 compute extension and SQRDMLAH/SQRDMLSH/UQRDMLAH/UQRDMLSH
+	 * instructions. Use a MIDR-based heuristic to whitelist processors
+	 * known to support it:
 	 * - Processors with Cortex-A55 cores
 	 * - Processors with Cortex-A65 cores
 	 * - Processors with Cortex-A75 cores
@@ -46,8 +46,10 @@ void cpuinfo_arm64_linux_decode_isa_from_proc_cpuinfo(
 	 * - Neoverse V2 cores
 	 */
 	if (chipset->series == cpuinfo_arm_chipset_series_samsung_exynos && chipset->model == 9810) {
-		/* Exynos 9810 reports that it supports FP16 compute, but in fact only little cores do */
-		cpuinfo_log_warning("FP16 arithmetics and RDM disabled: only little cores in Exynos 9810 support these extensions");
+		/* Exynos 9810 reports that it supports FP16 compute, but in
+		 * fact only little cores do */
+		cpuinfo_log_warning(
+			"FP16 arithmetics and RDM disabled: only little cores in Exynos 9810 support these extensions");
 	} else {
 		const uint32_t fp16arith_mask = CPUINFO_ARM_LINUX_FEATURE_FPHP | CPUINFO_ARM_LINUX_FEATURE_ASIMDHP;
 		switch (midr & (CPUINFO_ARM_MIDR_IMPLEMENTER_MASK | CPUINFO_ARM_MIDR_PART_MASK)) {
@@ -75,9 +77,11 @@ void cpuinfo_arm64_linux_decode_isa_from_proc_cpuinfo(
 				if ((features & fp16arith_mask) == fp16arith_mask) {
 					isa->fp16arith = true;
 				} else if (features & CPUINFO_ARM_LINUX_FEATURE_FPHP) {
-					cpuinfo_log_warning("FP16 arithmetics disabled: detected support only for scalar operations");
+					cpuinfo_log_warning(
+						"FP16 arithmetics disabled: detected support only for scalar operations");
 				} else if (features & CPUINFO_ARM_LINUX_FEATURE_ASIMDHP) {
-					cpuinfo_log_warning("FP16 arithmetics disabled: detected support only for SIMD operations");
+					cpuinfo_log_warning(
+						"FP16 arithmetics disabled: detected support only for SIMD operations");
 				}
 				if (features & CPUINFO_ARM_LINUX_FEATURE_ASIMDRDM) {
 					isa->rdm = true;
@@ -90,8 +94,9 @@ void cpuinfo_arm64_linux_decode_isa_from_proc_cpuinfo(
 	}
 
 	/*
-	 * Many phones ship with an old kernel configuration that doesn't report UDOT/SDOT instructions.
-	 * Use a MIDR-based heuristic to whitelist processors known to support it.
+	 * Many phones ship with an old kernel configuration that doesn't report
+	 * UDOT/SDOT instructions. Use a MIDR-based heuristic to whitelist
+	 * processors known to support it.
 	 */
 	switch (midr & (CPUINFO_ARM_MIDR_IMPLEMENTER_MASK | CPUINFO_ARM_MIDR_PART_MASK)) {
 		case UINT32_C(0x4100D060): /* Cortex-A65 */
@@ -137,8 +142,9 @@ void cpuinfo_arm64_linux_decode_isa_from_proc_cpuinfo(
 	if (features2 & CPUINFO_ARM_LINUX_FEATURE2_SVE2) {
 		isa->sve2 = true;
 	}
-	// SVEBF16 is set iff SVE and BF16 are both supported, but the SVEBF16 feature flag
-	// was added in Linux kernel before the BF16 feature flag, so we check for either.
+	// SVEBF16 is set iff SVE and BF16 are both supported, but the SVEBF16
+	// feature flag was added in Linux kernel before the BF16 feature flag,
+	// so we check for either.
 	if (features2 & (CPUINFO_ARM_LINUX_FEATURE2_BF16 | CPUINFO_ARM_LINUX_FEATURE2_SVEBF16)) {
 		isa->bf16 = true;
 	}
@@ -146,4 +152,3 @@ void cpuinfo_arm64_linux_decode_isa_from_proc_cpuinfo(
 		isa->fhm = true;
 	}
 }
-

3rdparty/cpuinfo/src/arm/linux/api.h

@@ -3,38 +3,40 @@
 #include <stdbool.h>
 #include <stdint.h>
 
+#include <arm/api.h>
+#include <arm/midr.h>
 #include <cpuinfo.h>
 #include <cpuinfo/common.h>
-#include <arm/midr.h>
-#include <arm/api.h>
 #include <linux/api.h>
 
-/* No hard limit in the kernel, maximum length observed on non-rogue kernels is 64 */
+/* No hard limit in the kernel, maximum length observed on non-rogue kernels is
+ * 64 */
 #define CPUINFO_HARDWARE_VALUE_MAX 64
-/* No hard limit in the kernel, maximum length on Raspberry Pi is 8. Add 1 symbol to detect overly large revision strings */
+/* No hard limit in the kernel, maximum length on Raspberry Pi is 8. Add 1
+ * symbol to detect overly large revision strings */
 #define CPUINFO_REVISION_VALUE_MAX 9
 
 #ifdef __ANDROID__
-	/* As per include/sys/system_properties.h in Android NDK */
-	#define CPUINFO_BUILD_PROP_NAME_MAX  32
-	#define CPUINFO_BUILD_PROP_VALUE_MAX 92
+/* As per include/sys/system_properties.h in Android NDK */
+#define CPUINFO_BUILD_PROP_NAME_MAX 32
+#define CPUINFO_BUILD_PROP_VALUE_MAX 92
 
-	struct cpuinfo_android_properties {
-		char proc_cpuinfo_hardware[CPUINFO_HARDWARE_VALUE_MAX];
-		char ro_product_board[CPUINFO_BUILD_PROP_VALUE_MAX];
-		char ro_board_platform[CPUINFO_BUILD_PROP_VALUE_MAX];
-		char ro_mediatek_platform[CPUINFO_BUILD_PROP_VALUE_MAX];
-		char ro_arch[CPUINFO_BUILD_PROP_VALUE_MAX];
-		char ro_chipname[CPUINFO_BUILD_PROP_VALUE_MAX];
-		char ro_hardware_chipname[CPUINFO_BUILD_PROP_VALUE_MAX];
-	};
+struct cpuinfo_android_properties {
+	char proc_cpuinfo_hardware[CPUINFO_HARDWARE_VALUE_MAX];
+	char ro_product_board[CPUINFO_BUILD_PROP_VALUE_MAX];
+	char ro_board_platform[CPUINFO_BUILD_PROP_VALUE_MAX];
+	char ro_mediatek_platform[CPUINFO_BUILD_PROP_VALUE_MAX];
+	char ro_arch[CPUINFO_BUILD_PROP_VALUE_MAX];
+	char ro_chipname[CPUINFO_BUILD_PROP_VALUE_MAX];
+	char ro_hardware_chipname[CPUINFO_BUILD_PROP_VALUE_MAX];
+};
 #endif
 
-#define CPUINFO_ARM_LINUX_ARCH_T   UINT32_C(0x00000001)
-#define CPUINFO_ARM_LINUX_ARCH_E   UINT32_C(0x00000002)
-#define CPUINFO_ARM_LINUX_ARCH_J   UINT32_C(0x00000004)
+#define CPUINFO_ARM_LINUX_ARCH_T UINT32_C(0x00000001)
+#define CPUINFO_ARM_LINUX_ARCH_E UINT32_C(0x00000002)
+#define CPUINFO_ARM_LINUX_ARCH_J UINT32_C(0x00000004)
 
-#define CPUINFO_ARM_LINUX_ARCH_TE  UINT32_C(0x00000003)
+#define CPUINFO_ARM_LINUX_ARCH_TE UINT32_C(0x00000003)
 #define CPUINFO_ARM_LINUX_ARCH_TEJ UINT32_C(0x00000007)
 
 struct cpuinfo_arm_linux_proc_cpuinfo_cache {
@@ -49,116 +51,118 @@ struct cpuinfo_arm_linux_proc_cpuinfo_cache {
 };
 
 #if CPUINFO_ARCH_ARM
-	/* arch/arm/include/uapi/asm/hwcap.h */
+/* arch/arm/include/uapi/asm/hwcap.h */
 
-	#define CPUINFO_ARM_LINUX_FEATURE_SWP      UINT32_C(0x00000001)
-	#define CPUINFO_ARM_LINUX_FEATURE_HALF     UINT32_C(0x00000002)
-	#define CPUINFO_ARM_LINUX_FEATURE_THUMB    UINT32_C(0x00000004)
-	#define CPUINFO_ARM_LINUX_FEATURE_26BIT    UINT32_C(0x00000008)
-	#define CPUINFO_ARM_LINUX_FEATURE_FASTMULT UINT32_C(0x00000010)
-	#define CPUINFO_ARM_LINUX_FEATURE_FPA      UINT32_C(0x00000020)
-	#define CPUINFO_ARM_LINUX_FEATURE_VFP      UINT32_C(0x00000040)
-	#define CPUINFO_ARM_LINUX_FEATURE_EDSP     UINT32_C(0x00000080)
-	#define CPUINFO_ARM_LINUX_FEATURE_JAVA     UINT32_C(0x00000100)
-	#define CPUINFO_ARM_LINUX_FEATURE_IWMMXT   UINT32_C(0x00000200)
-	#define CPUINFO_ARM_LINUX_FEATURE_CRUNCH   UINT32_C(0x00000400)
-	#define CPUINFO_ARM_LINUX_FEATURE_THUMBEE  UINT32_C(0x00000800)
-	#define CPUINFO_ARM_LINUX_FEATURE_NEON     UINT32_C(0x00001000)
-	#define CPUINFO_ARM_LINUX_FEATURE_VFPV3    UINT32_C(0x00002000)
-	#define CPUINFO_ARM_LINUX_FEATURE_VFPV3D16 UINT32_C(0x00004000) /* Also set for VFPv4 with 16 double-precision registers */
-	#define CPUINFO_ARM_LINUX_FEATURE_TLS      UINT32_C(0x00008000)
-	#define CPUINFO_ARM_LINUX_FEATURE_VFPV4    UINT32_C(0x00010000)
-	#define CPUINFO_ARM_LINUX_FEATURE_IDIVA    UINT32_C(0x00020000)
-	#define CPUINFO_ARM_LINUX_FEATURE_IDIVT    UINT32_C(0x00040000)
-	#define CPUINFO_ARM_LINUX_FEATURE_IDIV     UINT32_C(0x00060000)
-	#define CPUINFO_ARM_LINUX_FEATURE_VFPD32   UINT32_C(0x00080000)
-	#define CPUINFO_ARM_LINUX_FEATURE_LPAE     UINT32_C(0x00100000)
-	#define CPUINFO_ARM_LINUX_FEATURE_EVTSTRM  UINT32_C(0x00200000)
+#define CPUINFO_ARM_LINUX_FEATURE_SWP UINT32_C(0x00000001)
+#define CPUINFO_ARM_LINUX_FEATURE_HALF UINT32_C(0x00000002)
+#define CPUINFO_ARM_LINUX_FEATURE_THUMB UINT32_C(0x00000004)
+#define CPUINFO_ARM_LINUX_FEATURE_26BIT UINT32_C(0x00000008)
+#define CPUINFO_ARM_LINUX_FEATURE_FASTMULT UINT32_C(0x00000010)
+#define CPUINFO_ARM_LINUX_FEATURE_FPA UINT32_C(0x00000020)
+#define CPUINFO_ARM_LINUX_FEATURE_VFP UINT32_C(0x00000040)
+#define CPUINFO_ARM_LINUX_FEATURE_EDSP UINT32_C(0x00000080)
+#define CPUINFO_ARM_LINUX_FEATURE_JAVA UINT32_C(0x00000100)
+#define CPUINFO_ARM_LINUX_FEATURE_IWMMXT UINT32_C(0x00000200)
+#define CPUINFO_ARM_LINUX_FEATURE_CRUNCH UINT32_C(0x00000400)
+#define CPUINFO_ARM_LINUX_FEATURE_THUMBEE UINT32_C(0x00000800)
+#define CPUINFO_ARM_LINUX_FEATURE_NEON UINT32_C(0x00001000)
+#define CPUINFO_ARM_LINUX_FEATURE_VFPV3 UINT32_C(0x00002000)
+#define CPUINFO_ARM_LINUX_FEATURE_VFPV3D16                                  \
+	UINT32_C(0x00004000) /* Also set for VFPv4 with 16 double-precision \
+				registers */
+#define CPUINFO_ARM_LINUX_FEATURE_TLS UINT32_C(0x00008000)
+#define CPUINFO_ARM_LINUX_FEATURE_VFPV4 UINT32_C(0x00010000)
+#define CPUINFO_ARM_LINUX_FEATURE_IDIVA UINT32_C(0x00020000)
+#define CPUINFO_ARM_LINUX_FEATURE_IDIVT UINT32_C(0x00040000)
+#define CPUINFO_ARM_LINUX_FEATURE_IDIV UINT32_C(0x00060000)
+#define CPUINFO_ARM_LINUX_FEATURE_VFPD32 UINT32_C(0x00080000)
+#define CPUINFO_ARM_LINUX_FEATURE_LPAE UINT32_C(0x00100000)
+#define CPUINFO_ARM_LINUX_FEATURE_EVTSTRM UINT32_C(0x00200000)
 
-	#define CPUINFO_ARM_LINUX_FEATURE2_AES   UINT32_C(0x00000001)
-	#define CPUINFO_ARM_LINUX_FEATURE2_PMULL UINT32_C(0x00000002)
-	#define CPUINFO_ARM_LINUX_FEATURE2_SHA1  UINT32_C(0x00000004)
-	#define CPUINFO_ARM_LINUX_FEATURE2_SHA2  UINT32_C(0x00000008)
-	#define CPUINFO_ARM_LINUX_FEATURE2_CRC32 UINT32_C(0x00000010)
+#define CPUINFO_ARM_LINUX_FEATURE2_AES UINT32_C(0x00000001)
+#define CPUINFO_ARM_LINUX_FEATURE2_PMULL UINT32_C(0x00000002)
+#define CPUINFO_ARM_LINUX_FEATURE2_SHA1 UINT32_C(0x00000004)
+#define CPUINFO_ARM_LINUX_FEATURE2_SHA2 UINT32_C(0x00000008)
+#define CPUINFO_ARM_LINUX_FEATURE2_CRC32 UINT32_C(0x00000010)
 #elif CPUINFO_ARCH_ARM64
-	/* arch/arm64/include/uapi/asm/hwcap.h */
-	#define CPUINFO_ARM_LINUX_FEATURE_FP       UINT32_C(0x00000001)
-	#define CPUINFO_ARM_LINUX_FEATURE_ASIMD    UINT32_C(0x00000002)
-	#define CPUINFO_ARM_LINUX_FEATURE_EVTSTRM  UINT32_C(0x00000004)
-	#define CPUINFO_ARM_LINUX_FEATURE_AES      UINT32_C(0x00000008)
-	#define CPUINFO_ARM_LINUX_FEATURE_PMULL    UINT32_C(0x00000010)
-	#define CPUINFO_ARM_LINUX_FEATURE_SHA1     UINT32_C(0x00000020)
-	#define CPUINFO_ARM_LINUX_FEATURE_SHA2     UINT32_C(0x00000040)
-	#define CPUINFO_ARM_LINUX_FEATURE_CRC32    UINT32_C(0x00000080)
-	#define CPUINFO_ARM_LINUX_FEATURE_ATOMICS  UINT32_C(0x00000100)
-	#define CPUINFO_ARM_LINUX_FEATURE_FPHP     UINT32_C(0x00000200)
-	#define CPUINFO_ARM_LINUX_FEATURE_ASIMDHP  UINT32_C(0x00000400)
-	#define CPUINFO_ARM_LINUX_FEATURE_CPUID    UINT32_C(0x00000800)
-	#define CPUINFO_ARM_LINUX_FEATURE_ASIMDRDM UINT32_C(0x00001000)
-	#define CPUINFO_ARM_LINUX_FEATURE_JSCVT    UINT32_C(0x00002000)
-	#define CPUINFO_ARM_LINUX_FEATURE_FCMA     UINT32_C(0x00004000)
-	#define CPUINFO_ARM_LINUX_FEATURE_LRCPC    UINT32_C(0x00008000)
-	#define CPUINFO_ARM_LINUX_FEATURE_DCPOP    UINT32_C(0x00010000)
-	#define CPUINFO_ARM_LINUX_FEATURE_SHA3     UINT32_C(0x00020000)
-	#define CPUINFO_ARM_LINUX_FEATURE_SM3      UINT32_C(0x00040000)
-	#define CPUINFO_ARM_LINUX_FEATURE_SM4      UINT32_C(0x00080000)
-	#define CPUINFO_ARM_LINUX_FEATURE_ASIMDDP  UINT32_C(0x00100000)
-	#define CPUINFO_ARM_LINUX_FEATURE_SHA512   UINT32_C(0x00200000)
-	#define CPUINFO_ARM_LINUX_FEATURE_SVE      UINT32_C(0x00400000)
-	#define CPUINFO_ARM_LINUX_FEATURE_ASIMDFHM UINT32_C(0x00800000)
-	#define CPUINFO_ARM_LINUX_FEATURE_DIT      UINT32_C(0x01000000)
-	#define CPUINFO_ARM_LINUX_FEATURE_USCAT    UINT32_C(0x02000000)
-	#define CPUINFO_ARM_LINUX_FEATURE_ILRCPC   UINT32_C(0x04000000)
-	#define CPUINFO_ARM_LINUX_FEATURE_FLAGM    UINT32_C(0x08000000)
-	#define CPUINFO_ARM_LINUX_FEATURE_SSBS     UINT32_C(0x10000000)
-	#define CPUINFO_ARM_LINUX_FEATURE_SB       UINT32_C(0x20000000)
-	#define CPUINFO_ARM_LINUX_FEATURE_PACA     UINT32_C(0x40000000)
-	#define CPUINFO_ARM_LINUX_FEATURE_PACG     UINT32_C(0x80000000)
+/* arch/arm64/include/uapi/asm/hwcap.h */
+#define CPUINFO_ARM_LINUX_FEATURE_FP UINT32_C(0x00000001)
+#define CPUINFO_ARM_LINUX_FEATURE_ASIMD UINT32_C(0x00000002)
+#define CPUINFO_ARM_LINUX_FEATURE_EVTSTRM UINT32_C(0x00000004)
+#define CPUINFO_ARM_LINUX_FEATURE_AES UINT32_C(0x00000008)
+#define CPUINFO_ARM_LINUX_FEATURE_PMULL UINT32_C(0x00000010)
+#define CPUINFO_ARM_LINUX_FEATURE_SHA1 UINT32_C(0x00000020)
+#define CPUINFO_ARM_LINUX_FEATURE_SHA2 UINT32_C(0x00000040)
+#define CPUINFO_ARM_LINUX_FEATURE_CRC32 UINT32_C(0x00000080)
+#define CPUINFO_ARM_LINUX_FEATURE_ATOMICS UINT32_C(0x00000100)
+#define CPUINFO_ARM_LINUX_FEATURE_FPHP UINT32_C(0x00000200)
+#define CPUINFO_ARM_LINUX_FEATURE_ASIMDHP UINT32_C(0x00000400)
+#define CPUINFO_ARM_LINUX_FEATURE_CPUID UINT32_C(0x00000800)
+#define CPUINFO_ARM_LINUX_FEATURE_ASIMDRDM UINT32_C(0x00001000)
+#define CPUINFO_ARM_LINUX_FEATURE_JSCVT UINT32_C(0x00002000)
+#define CPUINFO_ARM_LINUX_FEATURE_FCMA UINT32_C(0x00004000)
+#define CPUINFO_ARM_LINUX_FEATURE_LRCPC UINT32_C(0x00008000)
+#define CPUINFO_ARM_LINUX_FEATURE_DCPOP UINT32_C(0x00010000)
+#define CPUINFO_ARM_LINUX_FEATURE_SHA3 UINT32_C(0x00020000)
+#define CPUINFO_ARM_LINUX_FEATURE_SM3 UINT32_C(0x00040000)
+#define CPUINFO_ARM_LINUX_FEATURE_SM4 UINT32_C(0x00080000)
+#define CPUINFO_ARM_LINUX_FEATURE_ASIMDDP UINT32_C(0x00100000)
+#define CPUINFO_ARM_LINUX_FEATURE_SHA512 UINT32_C(0x00200000)
+#define CPUINFO_ARM_LINUX_FEATURE_SVE UINT32_C(0x00400000)
+#define CPUINFO_ARM_LINUX_FEATURE_ASIMDFHM UINT32_C(0x00800000)
+#define CPUINFO_ARM_LINUX_FEATURE_DIT UINT32_C(0x01000000)
+#define CPUINFO_ARM_LINUX_FEATURE_USCAT UINT32_C(0x02000000)
+#define CPUINFO_ARM_LINUX_FEATURE_ILRCPC UINT32_C(0x04000000)
+#define CPUINFO_ARM_LINUX_FEATURE_FLAGM UINT32_C(0x08000000)
+#define CPUINFO_ARM_LINUX_FEATURE_SSBS UINT32_C(0x10000000)
+#define CPUINFO_ARM_LINUX_FEATURE_SB UINT32_C(0x20000000)
+#define CPUINFO_ARM_LINUX_FEATURE_PACA UINT32_C(0x40000000)
+#define CPUINFO_ARM_LINUX_FEATURE_PACG UINT32_C(0x80000000)
 
-	#define CPUINFO_ARM_LINUX_FEATURE2_DCPODP     UINT32_C(0x00000001)
-	#define CPUINFO_ARM_LINUX_FEATURE2_SVE2       UINT32_C(0x00000002)
-	#define CPUINFO_ARM_LINUX_FEATURE2_SVEAES     UINT32_C(0x00000004)
-	#define CPUINFO_ARM_LINUX_FEATURE2_SVEPMULL   UINT32_C(0x00000008)
-	#define CPUINFO_ARM_LINUX_FEATURE2_SVEBITPERM UINT32_C(0x00000010)
-	#define CPUINFO_ARM_LINUX_FEATURE2_SVESHA3    UINT32_C(0x00000020)
-	#define CPUINFO_ARM_LINUX_FEATURE2_SVESM4     UINT32_C(0x00000040)
-	#define CPUINFO_ARM_LINUX_FEATURE2_FLAGM2     UINT32_C(0x00000080)
-	#define CPUINFO_ARM_LINUX_FEATURE2_FRINT      UINT32_C(0x00000100)
-	#define CPUINFO_ARM_LINUX_FEATURE2_SVEI8MM    UINT32_C(0x00000200)
-	#define CPUINFO_ARM_LINUX_FEATURE2_SVEF32MM   UINT32_C(0x00000400)
-	#define CPUINFO_ARM_LINUX_FEATURE2_SVEF64MM   UINT32_C(0x00000800)
-	#define CPUINFO_ARM_LINUX_FEATURE2_SVEBF16    UINT32_C(0x00001000)
-	#define CPUINFO_ARM_LINUX_FEATURE2_I8MM       UINT32_C(0x00002000)
-	#define CPUINFO_ARM_LINUX_FEATURE2_BF16       UINT32_C(0x00004000)
-	#define CPUINFO_ARM_LINUX_FEATURE2_DGH        UINT32_C(0x00008000)
-	#define CPUINFO_ARM_LINUX_FEATURE2_RNG        UINT32_C(0x00010000)
-	#define CPUINFO_ARM_LINUX_FEATURE2_BTI        UINT32_C(0x00020000)
+#define CPUINFO_ARM_LINUX_FEATURE2_DCPODP UINT32_C(0x00000001)
+#define CPUINFO_ARM_LINUX_FEATURE2_SVE2 UINT32_C(0x00000002)
+#define CPUINFO_ARM_LINUX_FEATURE2_SVEAES UINT32_C(0x00000004)
+#define CPUINFO_ARM_LINUX_FEATURE2_SVEPMULL UINT32_C(0x00000008)
+#define CPUINFO_ARM_LINUX_FEATURE2_SVEBITPERM UINT32_C(0x00000010)
+#define CPUINFO_ARM_LINUX_FEATURE2_SVESHA3 UINT32_C(0x00000020)
+#define CPUINFO_ARM_LINUX_FEATURE2_SVESM4 UINT32_C(0x00000040)
+#define CPUINFO_ARM_LINUX_FEATURE2_FLAGM2 UINT32_C(0x00000080)
+#define CPUINFO_ARM_LINUX_FEATURE2_FRINT UINT32_C(0x00000100)
+#define CPUINFO_ARM_LINUX_FEATURE2_SVEI8MM UINT32_C(0x00000200)
+#define CPUINFO_ARM_LINUX_FEATURE2_SVEF32MM UINT32_C(0x00000400)
+#define CPUINFO_ARM_LINUX_FEATURE2_SVEF64MM UINT32_C(0x00000800)
+#define CPUINFO_ARM_LINUX_FEATURE2_SVEBF16 UINT32_C(0x00001000)
+#define CPUINFO_ARM_LINUX_FEATURE2_I8MM UINT32_C(0x00002000)
+#define CPUINFO_ARM_LINUX_FEATURE2_BF16 UINT32_C(0x00004000)
+#define CPUINFO_ARM_LINUX_FEATURE2_DGH UINT32_C(0x00008000)
+#define CPUINFO_ARM_LINUX_FEATURE2_RNG UINT32_C(0x00010000)
+#define CPUINFO_ARM_LINUX_FEATURE2_BTI UINT32_C(0x00020000)
 #endif
 
 #define CPUINFO_ARM_LINUX_VALID_ARCHITECTURE UINT32_C(0x00010000)
-#define CPUINFO_ARM_LINUX_VALID_IMPLEMENTER  UINT32_C(0x00020000)
-#define CPUINFO_ARM_LINUX_VALID_VARIANT      UINT32_C(0x00040000)
-#define CPUINFO_ARM_LINUX_VALID_PART         UINT32_C(0x00080000)
-#define CPUINFO_ARM_LINUX_VALID_REVISION     UINT32_C(0x00100000)
-#define CPUINFO_ARM_LINUX_VALID_PROCESSOR    UINT32_C(0x00200000)
-#define CPUINFO_ARM_LINUX_VALID_FEATURES     UINT32_C(0x00400000)
+#define CPUINFO_ARM_LINUX_VALID_IMPLEMENTER UINT32_C(0x00020000)
+#define CPUINFO_ARM_LINUX_VALID_VARIANT UINT32_C(0x00040000)
+#define CPUINFO_ARM_LINUX_VALID_PART UINT32_C(0x00080000)
+#define CPUINFO_ARM_LINUX_VALID_REVISION UINT32_C(0x00100000)
+#define CPUINFO_ARM_LINUX_VALID_PROCESSOR UINT32_C(0x00200000)
+#define CPUINFO_ARM_LINUX_VALID_FEATURES UINT32_C(0x00400000)
 #if CPUINFO_ARCH_ARM
-	#define CPUINFO_ARM_LINUX_VALID_ICACHE_SIZE UINT32_C(0x01000000)
-	#define CPUINFO_ARM_LINUX_VALID_ICACHE_SETS UINT32_C(0x02000000)
-	#define CPUINFO_ARM_LINUX_VALID_ICACHE_WAYS UINT32_C(0x04000000)
-	#define CPUINFO_ARM_LINUX_VALID_ICACHE_LINE UINT32_C(0x08000000)
-	#define CPUINFO_ARM_LINUX_VALID_DCACHE_SIZE UINT32_C(0x10000000)
-	#define CPUINFO_ARM_LINUX_VALID_DCACHE_SETS UINT32_C(0x20000000)
-	#define CPUINFO_ARM_LINUX_VALID_DCACHE_WAYS UINT32_C(0x40000000)
-	#define CPUINFO_ARM_LINUX_VALID_DCACHE_LINE UINT32_C(0x80000000)
+#define CPUINFO_ARM_LINUX_VALID_ICACHE_SIZE UINT32_C(0x01000000)
+#define CPUINFO_ARM_LINUX_VALID_ICACHE_SETS UINT32_C(0x02000000)
+#define CPUINFO_ARM_LINUX_VALID_ICACHE_WAYS UINT32_C(0x04000000)
+#define CPUINFO_ARM_LINUX_VALID_ICACHE_LINE UINT32_C(0x08000000)
+#define CPUINFO_ARM_LINUX_VALID_DCACHE_SIZE UINT32_C(0x10000000)
+#define CPUINFO_ARM_LINUX_VALID_DCACHE_SETS UINT32_C(0x20000000)
+#define CPUINFO_ARM_LINUX_VALID_DCACHE_WAYS UINT32_C(0x40000000)
+#define CPUINFO_ARM_LINUX_VALID_DCACHE_LINE UINT32_C(0x80000000)
 #endif
 
-#define CPUINFO_ARM_LINUX_VALID_INFO          UINT32_C(0x007F0000)
-#define CPUINFO_ARM_LINUX_VALID_MIDR          UINT32_C(0x003F0000)
+#define CPUINFO_ARM_LINUX_VALID_INFO UINT32_C(0x007F0000)
+#define CPUINFO_ARM_LINUX_VALID_MIDR UINT32_C(0x003F0000)
 #if CPUINFO_ARCH_ARM
-	#define CPUINFO_ARM_LINUX_VALID_ICACHE     UINT32_C(0x0F000000)
-	#define CPUINFO_ARM_LINUX_VALID_DCACHE     UINT32_C(0xF0000000)
-	#define CPUINFO_ARM_LINUX_VALID_CACHE_LINE UINT32_C(0x88000000)
+#define CPUINFO_ARM_LINUX_VALID_ICACHE UINT32_C(0x0F000000)
+#define CPUINFO_ARM_LINUX_VALID_DCACHE UINT32_C(0xF0000000)
+#define CPUINFO_ARM_LINUX_VALID_CACHE_LINE UINT32_C(0x88000000)
 #endif
 
 struct cpuinfo_arm_linux_processor {
@@ -178,13 +182,15 @@ struct cpuinfo_arm_linux_processor {
 	uint32_t uarch_index;
 	/**
 	 * ID of the physical package which includes this logical processor.
-	 * The value is parsed from /sys/devices/system/cpu/cpu<N>/topology/physical_package_id
+	 * The value is parsed from
+	 * /sys/devices/system/cpu/cpu<N>/topology/physical_package_id
 	 */
 	uint32_t package_id;
 	/**
-	 * Minimum processor ID on the package which includes this logical processor.
-	 * This value can serve as an ID for the cluster of logical processors: it is the
-	 * same for all logical processors on the same package.
+	 * Minimum processor ID on the package which includes this logical
+	 * processor. This value can serve as an ID for the cluster of logical
+	 * processors: it is the same for all logical processors on the same
+	 * package.
 	 */
 	uint32_t package_leader_id;
 	/**
@@ -193,14 +199,16 @@ struct cpuinfo_arm_linux_processor {
 	uint32_t package_processor_count;
 	/**
 	 * Maximum frequency, in kHZ.
-	 * The value is parsed from /sys/devices/system/cpu/cpu<N>/cpufreq/cpuinfo_max_freq
-	 * If failed to read or parse the file, the value is 0.
+	 * The value is parsed from
+	 * /sys/devices/system/cpu/cpu<N>/cpufreq/cpuinfo_max_freq If failed to
+	 * read or parse the file, the value is 0.
 	 */
 	uint32_t max_frequency;
 	/**
 	 * Minimum frequency, in kHZ.
-	 * The value is parsed from /sys/devices/system/cpu/cpu<N>/cpufreq/cpuinfo_min_freq
-	 * If failed to read or parse the file, the value is 0.
+	 * The value is parsed from
+	 * /sys/devices/system/cpu/cpu<N>/cpufreq/cpuinfo_min_freq If failed to
+	 * read or parse the file, the value is 0.
 	 */
 	uint32_t min_frequency;
 	/** Linux processor ID */
@@ -216,8 +224,7 @@ struct cpuinfo_arm_linux_cluster {
 /* Returns true if the two processors do belong to the same cluster */
 static inline bool cpuinfo_arm_linux_processor_equals(
 	struct cpuinfo_arm_linux_processor processor_i[restrict static 1],
-	struct cpuinfo_arm_linux_processor processor_j[restrict static 1])
-{
+	struct cpuinfo_arm_linux_processor processor_j[restrict static 1]) {
 	const uint32_t joint_flags = processor_i->flags & processor_j->flags;
 
 	bool same_max_frequency = false;
@@ -251,11 +258,11 @@ static inline bool cpuinfo_arm_linux_processor_equals(
 	return same_max_frequency && same_min_frequency;
 }
 
-/* Returns true if the two processors certainly don't belong to the same cluster */
+/* Returns true if the two processors certainly don't belong to the same cluster
+ */
 static inline bool cpuinfo_arm_linux_processor_not_equals(
 	struct cpuinfo_arm_linux_processor processor_i[restrict static 1],
-	struct cpuinfo_arm_linux_processor processor_j[restrict static 1])
-{
+	struct cpuinfo_arm_linux_processor processor_j[restrict static 1]) {
 	const uint32_t joint_flags = processor_i->flags & processor_j->flags;
 
 	if (joint_flags & CPUINFO_LINUX_FLAG_MAX_FREQUENCY) {
@@ -286,79 +293,73 @@ CPUINFO_INTERNAL bool cpuinfo_arm_linux_parse_proc_cpuinfo(
 	struct cpuinfo_arm_linux_processor processors[restrict static max_processors_count]);
 
 #if CPUINFO_ARCH_ARM
-	CPUINFO_INTERNAL bool cpuinfo_arm_linux_hwcap_from_getauxval(
-		uint32_t hwcap[restrict static 1],
-		uint32_t hwcap2[restrict static 1]);
-	CPUINFO_INTERNAL bool cpuinfo_arm_linux_hwcap_from_procfs(
-		uint32_t hwcap[restrict static 1],
-		uint32_t hwcap2[restrict static 1]);
+CPUINFO_INTERNAL bool cpuinfo_arm_linux_hwcap_from_getauxval(
+	uint32_t hwcap[restrict static 1],
+	uint32_t hwcap2[restrict static 1]);
+CPUINFO_INTERNAL bool cpuinfo_arm_linux_hwcap_from_procfs(
+	uint32_t hwcap[restrict static 1],
+	uint32_t hwcap2[restrict static 1]);
 
-	CPUINFO_INTERNAL void cpuinfo_arm_linux_decode_isa_from_proc_cpuinfo(
-		uint32_t features,
-		uint32_t features2,
-		uint32_t midr,
-		uint32_t architecture_version,
-		uint32_t architecture_flags,
-		const struct cpuinfo_arm_chipset chipset[restrict static 1],
-		struct cpuinfo_arm_isa isa[restrict static 1]);
+CPUINFO_INTERNAL void cpuinfo_arm_linux_decode_isa_from_proc_cpuinfo(
+	uint32_t features,
+	uint32_t features2,
+	uint32_t midr,
+	uint32_t architecture_version,
+	uint32_t architecture_flags,
+	const struct cpuinfo_arm_chipset chipset[restrict static 1],
+	struct cpuinfo_arm_isa isa[restrict static 1]);
 #elif CPUINFO_ARCH_ARM64
-	CPUINFO_INTERNAL void cpuinfo_arm_linux_hwcap_from_getauxval(
-		uint32_t hwcap[restrict static 1],
-		uint32_t hwcap2[restrict static 1]);
+CPUINFO_INTERNAL void cpuinfo_arm_linux_hwcap_from_getauxval(
+	uint32_t hwcap[restrict static 1],
+	uint32_t hwcap2[restrict static 1]);
 
-	CPUINFO_INTERNAL void cpuinfo_arm64_linux_decode_isa_from_proc_cpuinfo(
-		uint32_t features,
-		uint32_t features2,
-		uint32_t midr,
-		const struct cpuinfo_arm_chipset chipset[restrict static 1],
-		struct cpuinfo_arm_isa isa[restrict static 1]);
+CPUINFO_INTERNAL void cpuinfo_arm64_linux_decode_isa_from_proc_cpuinfo(
+	uint32_t features,
+	uint32_t features2,
+	uint32_t midr,
+	const struct cpuinfo_arm_chipset chipset[restrict static 1],
+	struct cpuinfo_arm_isa isa[restrict static 1]);
 #endif
 
 #if defined(__ANDROID__)
-	CPUINFO_INTERNAL struct cpuinfo_arm_chipset
-		cpuinfo_arm_android_decode_chipset(
-			const struct cpuinfo_android_properties properties[restrict static 1],
-			uint32_t cores,
-			uint32_t max_cpu_freq_max);
+CPUINFO_INTERNAL struct cpuinfo_arm_chipset cpuinfo_arm_android_decode_chipset(
+	const struct cpuinfo_android_properties properties[restrict static 1],
+	uint32_t cores,
+	uint32_t max_cpu_freq_max);
 #else
-	CPUINFO_INTERNAL struct cpuinfo_arm_chipset
-		cpuinfo_arm_linux_decode_chipset(
-			const char hardware[restrict static CPUINFO_HARDWARE_VALUE_MAX],
-			const char revision[restrict static CPUINFO_REVISION_VALUE_MAX],
-			uint32_t cores,
-			uint32_t max_cpu_freq_max);
+CPUINFO_INTERNAL struct cpuinfo_arm_chipset cpuinfo_arm_linux_decode_chipset(
+	const char hardware[restrict static CPUINFO_HARDWARE_VALUE_MAX],
+	const char revision[restrict static CPUINFO_REVISION_VALUE_MAX],
+	uint32_t cores,
+	uint32_t max_cpu_freq_max);
 #endif
 
-CPUINFO_INTERNAL struct cpuinfo_arm_chipset
-	cpuinfo_arm_linux_decode_chipset_from_proc_cpuinfo_hardware(
-		const char proc_cpuinfo_hardware[restrict static CPUINFO_HARDWARE_VALUE_MAX],
-		uint32_t cores, uint32_t max_cpu_freq_max, bool is_tegra);
+CPUINFO_INTERNAL struct cpuinfo_arm_chipset cpuinfo_arm_linux_decode_chipset_from_proc_cpuinfo_hardware(
+	const char proc_cpuinfo_hardware[restrict static CPUINFO_HARDWARE_VALUE_MAX],
+	uint32_t cores,
+	uint32_t max_cpu_freq_max,
+	bool is_tegra);
 
 #ifdef __ANDROID__
-	CPUINFO_INTERNAL struct cpuinfo_arm_chipset
-		cpuinfo_arm_android_decode_chipset_from_ro_product_board(
-			const char ro_product_board[restrict static CPUINFO_BUILD_PROP_VALUE_MAX],
-			uint32_t cores, uint32_t max_cpu_freq_max);
-	CPUINFO_INTERNAL struct cpuinfo_arm_chipset
-		cpuinfo_arm_android_decode_chipset_from_ro_board_platform(
-			const char ro_board_platform[restrict static CPUINFO_BUILD_PROP_VALUE_MAX],
-			uint32_t cores, uint32_t max_cpu_freq_max);
-	CPUINFO_INTERNAL struct cpuinfo_arm_chipset
-		cpuinfo_arm_android_decode_chipset_from_ro_mediatek_platform(
-			const char ro_mediatek_platform[restrict static CPUINFO_BUILD_PROP_VALUE_MAX]);
-	CPUINFO_INTERNAL struct cpuinfo_arm_chipset
-		cpuinfo_arm_android_decode_chipset_from_ro_arch(
-			const char ro_arch[restrict static CPUINFO_BUILD_PROP_VALUE_MAX]);
-	CPUINFO_INTERNAL struct cpuinfo_arm_chipset
-		cpuinfo_arm_android_decode_chipset_from_ro_chipname(
-			const char ro_chipname[restrict static CPUINFO_BUILD_PROP_VALUE_MAX]);
-	CPUINFO_INTERNAL struct cpuinfo_arm_chipset
-		cpuinfo_arm_android_decode_chipset_from_ro_hardware_chipname(
-			const char ro_hardware_chipname[restrict static CPUINFO_BUILD_PROP_VALUE_MAX]);
+CPUINFO_INTERNAL struct cpuinfo_arm_chipset cpuinfo_arm_android_decode_chipset_from_ro_product_board(
+	const char ro_product_board[restrict static CPUINFO_BUILD_PROP_VALUE_MAX],
+	uint32_t cores,
+	uint32_t max_cpu_freq_max);
+CPUINFO_INTERNAL struct cpuinfo_arm_chipset cpuinfo_arm_android_decode_chipset_from_ro_board_platform(
+	const char ro_board_platform[restrict static CPUINFO_BUILD_PROP_VALUE_MAX],
+	uint32_t cores,
+	uint32_t max_cpu_freq_max);
+CPUINFO_INTERNAL struct cpuinfo_arm_chipset cpuinfo_arm_android_decode_chipset_from_ro_mediatek_platform(
+	const char ro_mediatek_platform[restrict static CPUINFO_BUILD_PROP_VALUE_MAX]);
+CPUINFO_INTERNAL struct cpuinfo_arm_chipset cpuinfo_arm_android_decode_chipset_from_ro_arch(
+	const char ro_arch[restrict static CPUINFO_BUILD_PROP_VALUE_MAX]);
+CPUINFO_INTERNAL struct cpuinfo_arm_chipset cpuinfo_arm_android_decode_chipset_from_ro_chipname(
+	const char ro_chipname[restrict static CPUINFO_BUILD_PROP_VALUE_MAX]);
+CPUINFO_INTERNAL struct cpuinfo_arm_chipset cpuinfo_arm_android_decode_chipset_from_ro_hardware_chipname(
+	const char ro_hardware_chipname[restrict static CPUINFO_BUILD_PROP_VALUE_MAX]);
 #else
-	CPUINFO_INTERNAL struct cpuinfo_arm_chipset
-		cpuinfo_arm_linux_decode_chipset_from_proc_cpuinfo_revision(
-			const char proc_cpuinfo_revision[restrict static CPUINFO_REVISION_VALUE_MAX]);
+CPUINFO_INTERNAL struct cpuinfo_arm_chipset cpuinfo_arm_linux_decode_chipset_from_proc_cpuinfo_revision(
+	const char proc_cpuinfo_revision[restrict static CPUINFO_REVISION_VALUE_MAX]);
 #endif
 
 CPUINFO_INTERNAL bool cpuinfo_arm_linux_detect_core_clusters_by_heuristic(

3rdparty/cpuinfo/src/arm/linux/clusters.c

@@ -1,63 +1,74 @@
-#include <stdint.h>
 #include <stddef.h>
+#include <stdint.h>
 #include <stdlib.h>
 #include <string.h>
 
-#include <cpuinfo.h>
 #include <arm/linux/api.h>
+#include <cpuinfo.h>
 #if defined(__ANDROID__)
-	#include <arm/android/api.h>
+#include <arm/android/api.h>
 #endif
 #include <arm/api.h>
 #include <arm/midr.h>
-#include <linux/api.h>
 #include <cpuinfo/internal-api.h>
 #include <cpuinfo/log.h>
+#include <linux/api.h>
 
 static inline bool bitmask_all(uint32_t bitfield, uint32_t mask) {
 	return (bitfield & mask) == mask;
 }
 
 /*
- * Assigns logical processors to clusters of cores using heuristic based on the typical configuration of clusters for
- * 5, 6, 8, and 10 cores:
+ * Assigns logical processors to clusters of cores using heuristic based on the
+ * typical configuration of clusters for 5, 6, 8, and 10 cores:
  * - 5 cores (ARM32 Android only): 2 clusters of 4+1 cores
  * - 6 cores: 2 clusters of 4+2 cores
  * - 8 cores: 2 clusters of 4+4 cores
  * - 10 cores: 3 clusters of 4+4+2 cores
  *
- * The function must be called after parsing OS-provided information on core clusters.
- * Its purpose is to detect clusters of cores when OS-provided information is lacking or incomplete, i.e.
- * - Linux kernel is not configured to report information in sysfs topology leaf.
- * - Linux kernel reports topology information only for online cores, and only cores on one cluster are online, e.g.:
- *   - Exynos 8890 has 8 cores in 4+4 clusters, but only the first cluster of 4 cores is reported, and cluster
- *     configuration of logical processors 4-7 is not reported (all remaining processors 4-7 form cluster 1)
- *   - MT6797 has 10 cores in 4+4+2, but only the first cluster of 4 cores is reported, and cluster configuration
- *     of logical processors 4-9 is not reported (processors 4-7 form cluster 1, and processors 8-9 form cluster 2).
+ * The function must be called after parsing OS-provided information on core
+ * clusters. Its purpose is to detect clusters of cores when OS-provided
+ * information is lacking or incomplete, i.e.
+ * - Linux kernel is not configured to report information in sysfs topology
+ * leaf.
+ * - Linux kernel reports topology information only for online cores, and only
+ * cores on one cluster are online, e.g.:
+ *   - Exynos 8890 has 8 cores in 4+4 clusters, but only the first cluster of 4
+ * cores is reported, and cluster configuration of logical processors 4-7 is not
+ * reported (all remaining processors 4-7 form cluster 1)
+ *   - MT6797 has 10 cores in 4+4+2, but only the first cluster of 4 cores is
+ * reported, and cluster configuration of logical processors 4-9 is not reported
+ * (processors 4-7 form cluster 1, and processors 8-9 form cluster 2).
  *
- * Heuristic assignment of processors to the above pre-defined clusters fails if such assignment would contradict
- * information provided by the operating system:
- * - Any of the OS-reported processor clusters is different than the corresponding heuristic cluster.
- * - Processors in a heuristic cluster have no OS-provided cluster siblings information, but have known and different
- *   minimum/maximum frequency.
- * - Processors in a heuristic cluster have no OS-provided cluster siblings information, but have known and different
- *   MIDR components.
+ * Heuristic assignment of processors to the above pre-defined clusters fails if
+ * such assignment would contradict information provided by the operating
+ * system:
+ * - Any of the OS-reported processor clusters is different than the
+ * corresponding heuristic cluster.
+ * - Processors in a heuristic cluster have no OS-provided cluster siblings
+ * information, but have known and different minimum/maximum frequency.
+ * - Processors in a heuristic cluster have no OS-provided cluster siblings
+ * information, but have known and different MIDR components.
  *
- * If the heuristic assignment of processors to clusters of cores fails, all processors' clusters are unchanged.
+ * If the heuristic assignment of processors to clusters of cores fails, all
+ * processors' clusters are unchanged.
  *
- * @param usable_processors - number of processors in the @p processors array with CPUINFO_LINUX_FLAG_VALID flags.
+ * @param usable_processors - number of processors in the @p processors array
+ * with CPUINFO_LINUX_FLAG_VALID flags.
  * @param max_processors - number of elements in the @p processors array.
- * @param[in,out] processors - processor descriptors with pre-parsed POSSIBLE and PRESENT flags, minimum/maximum
- *                             frequency, MIDR information, and core cluster (package siblings list) information.
+ * @param[in,out] processors - processor descriptors with pre-parsed POSSIBLE
+ * and PRESENT flags, minimum/maximum frequency, MIDR information, and core
+ * cluster (package siblings list) information.
  *
- * @retval true if the heuristic successfully assigned all processors into clusters of cores.
- * @retval false if known details about processors contradict the heuristic configuration of core clusters.
+ * @retval true if the heuristic successfully assigned all processors into
+ * clusters of cores.
+ * @retval false if known details about processors contradict the heuristic
+ * configuration of core clusters.
  */
 bool cpuinfo_arm_linux_detect_core_clusters_by_heuristic(
 	uint32_t usable_processors,
 	uint32_t max_processors,
-	struct cpuinfo_arm_linux_processor processors[restrict static max_processors])
-{
+	struct cpuinfo_arm_linux_processor processors[restrict static max_processors]) {
 	uint32_t cluster_processors[3];
 	switch (usable_processors) {
 		case 10:
@@ -76,8 +87,9 @@ bool cpuinfo_arm_linux_detect_core_clusters_by_heuristic(
 #if defined(__ANDROID__) && CPUINFO_ARCH_ARM
 		case 5:
 			/*
-			 * The only processor with 5 cores is Leadcore L1860C (ARMv7, mobile),
-			 * but this configuration is not too unreasonable for a virtualized ARM server.
+			 * The only processor with 5 cores is Leadcore L1860C
+			 * (ARMv7, mobile), but this configuration is not too
+			 * unreasonable for a virtualized ARM server.
 			 */
 			cluster_processors[0] = 4;
 			cluster_processors[1] = 1;
@@ -89,7 +101,8 @@ bool cpuinfo_arm_linux_detect_core_clusters_by_heuristic(
 
 	/*
 	 * Assignment of processors to core clusters is done in two passes:
-	 * 1. Verify that the clusters proposed by heuristic are compatible with known details about processors.
+	 * 1. Verify that the clusters proposed by heuristic are compatible with
+	 * known details about processors.
 	 * 2. If verification passed, update core clusters for the processors.
 	 */
 
@@ -100,16 +113,22 @@ bool cpuinfo_arm_linux_detect_core_clusters_by_heuristic(
 	for (uint32_t i = 0; i < max_processors; i++) {
 		if (bitmask_all(processors[i].flags, CPUINFO_LINUX_FLAG_VALID)) {
 			if (expected_cluster_processors == 0) {
-				/* Expect this processor to start a new cluster */
+				/* Expect this processor to start a new cluster
+				 */
 
 				expected_cluster_exists = !!(processors[i].flags & CPUINFO_LINUX_FLAG_PACKAGE_CLUSTER);
 				if (expected_cluster_exists) {
 					if (processors[i].package_leader_id != i) {
 						cpuinfo_log_debug(
 							"heuristic detection of core clusters failed: "
-							"processor %"PRIu32" is expected to start a new cluster #%"PRIu32" with %"PRIu32" cores, "
-							"but system siblings lists reported it as a sibling of processor %"PRIu32,
-							i, cluster, cluster_processors[cluster], processors[i].package_leader_id);
+							"processor %" PRIu32
+							" is expected to start a new cluster #%" PRIu32 " with %" PRIu32
+							" cores, "
+							"but system siblings lists reported it as a sibling of processor %" PRIu32,
+							i,
+							cluster,
+							cluster_processors[cluster],
+							processors[i].package_leader_id);
 						return false;
 					}
 				} else {
@@ -119,48 +138,73 @@ bool cpuinfo_arm_linux_detect_core_clusters_by_heuristic(
 				cluster_start = i;
 				expected_cluster_processors = cluster_processors[cluster++];
 			} else {
-				/* Expect this processor to belong to the same cluster as processor */
+				/* Expect this processor to belong to the same
+				 * cluster as processor */
 
 				if (expected_cluster_exists) {
 					/*
-					 * The cluster suggested by the heuristic was already parsed from system siblings lists.
-					 * For all processors we expect in the cluster, check that:
-					 * - They have pre-assigned cluster from siblings lists (CPUINFO_LINUX_FLAG_PACKAGE_CLUSTER flag).
-					 * - They were assigned to the same cluster based on siblings lists
-					 *   (package_leader_id points to the first processor in the cluster).
+					 * The cluster suggested by the
+					 * heuristic was already parsed from
+					 * system siblings lists. For all
+					 * processors we expect in the cluster,
+					 * check that:
+					 * - They have pre-assigned cluster from
+					 * siblings lists
+					 * (CPUINFO_LINUX_FLAG_PACKAGE_CLUSTER
+					 * flag).
+					 * - They were assigned to the same
+					 * cluster based on siblings lists
+					 *   (package_leader_id points to the
+					 * first processor in the cluster).
 					 */
 
 					if ((processors[i].flags & CPUINFO_LINUX_FLAG_PACKAGE_CLUSTER) == 0) {
 						cpuinfo_log_debug(
 							"heuristic detection of core clusters failed: "
-							"processor %"PRIu32" is expected to belong to the cluster of processor %"PRIu32", "
-							"but system siblings lists did not report it as a sibling of processor %"PRIu32,
-							i, cluster_start, cluster_start);
+							"processor %" PRIu32
+							" is expected to belong to the cluster of processor %" PRIu32
+							", "
+							"but system siblings lists did not report it as a sibling of processor %" PRIu32,
+							i,
+							cluster_start,
+							cluster_start);
 						return false;
 					}
 					if (processors[i].package_leader_id != cluster_start) {
 						cpuinfo_log_debug(
 							"heuristic detection of core clusters failed: "
-							"processor %"PRIu32" is expected to belong to the cluster of processor %"PRIu32", "
-							"but system siblings lists reported it to belong to the cluster of processor %"PRIu32,
-							i, cluster_start, cluster_start);
+							"processor %" PRIu32
+							" is expected to belong to the cluster of processor %" PRIu32
+							", "
+							"but system siblings lists reported it to belong to the cluster of processor %" PRIu32,
+							i,
+							cluster_start,
+							cluster_start);
 						return false;
 					}
 				} else {
 					/*
-					 * The cluster suggest by the heuristic was not parsed from system siblings lists.
-					 * For all processors we expect in the cluster, check that:
-					 * - They have no pre-assigned cluster from siblings lists.
-					 * - If their min/max CPU frequency is known, it is the same.
-					 * - If any part of their MIDR (Implementer, Variant, Part, Revision) is known, it is the same.
+					 * The cluster suggest by the heuristic
+					 * was not parsed from system siblings
+					 * lists. For all processors we expect
+					 * in the cluster, check that:
+					 * - They have no pre-assigned cluster
+					 * from siblings lists.
+					 * - If their min/max CPU frequency is
+					 * known, it is the same.
+					 * - If any part of their MIDR
+					 * (Implementer, Variant, Part,
+					 * Revision) is known, it is the same.
 					 */
 
 					if (processors[i].flags & CPUINFO_LINUX_FLAG_PACKAGE_CLUSTER) {
 						cpuinfo_log_debug(
 							"heuristic detection of core clusters failed: "
-							"processor %"PRIu32" is expected to be unassigned to any cluster, "
-							"but system siblings lists reported it to belong to the cluster of processor %"PRIu32,
-							i, processors[i].package_leader_id);
+							"processor %" PRIu32
+							" is expected to be unassigned to any cluster, "
+							"but system siblings lists reported it to belong to the cluster of processor %" PRIu32,
+							i,
+							processors[i].package_leader_id);
 						return false;
 					}
 
@@ -169,8 +213,13 @@ bool cpuinfo_arm_linux_detect_core_clusters_by_heuristic(
 							if (cluster_min_frequency != processors[i].min_frequency) {
 								cpuinfo_log_debug(
 									"heuristic detection of core clusters failed: "
-									"minimum frequency of processor %"PRIu32" (%"PRIu32" KHz) is different than of its expected cluster (%"PRIu32" KHz)",
-									i, processors[i].min_frequency, cluster_min_frequency);
+									"minimum frequency of processor %" PRIu32
+									" (%" PRIu32
+									" KHz) is different than of its expected cluster (%" PRIu32
+									" KHz)",
+									i,
+									processors[i].min_frequency,
+									cluster_min_frequency);
 								return false;
 							}
 						} else {
@@ -184,8 +233,13 @@ bool cpuinfo_arm_linux_detect_core_clusters_by_heuristic(
 							if (cluster_max_frequency != processors[i].max_frequency) {
 								cpuinfo_log_debug(
 									"heuristic detection of core clusters failed: "
-									"maximum frequency of processor %"PRIu32" (%"PRIu32" KHz) is different than of its expected cluster (%"PRIu32" KHz)",
-									i, processors[i].max_frequency, cluster_max_frequency);
+									"maximum frequency of processor %" PRIu32
+									" (%" PRIu32
+									" KHz) is different than of its expected cluster (%" PRIu32
+									" KHz)",
+									i,
+									processors[i].max_frequency,
+									cluster_max_frequency);
 								return false;
 							}
 						} else {
@@ -196,41 +250,61 @@ bool cpuinfo_arm_linux_detect_core_clusters_by_heuristic(
 
 					if (processors[i].flags & CPUINFO_ARM_LINUX_VALID_IMPLEMENTER) {
 						if (cluster_flags & CPUINFO_ARM_LINUX_VALID_IMPLEMENTER) {
-							if ((cluster_midr & CPUINFO_ARM_MIDR_IMPLEMENTER_MASK) != (processors[i].midr & CPUINFO_ARM_MIDR_IMPLEMENTER_MASK)) {
+							if ((cluster_midr & CPUINFO_ARM_MIDR_IMPLEMENTER_MASK) !=
+							    (processors[i].midr & CPUINFO_ARM_MIDR_IMPLEMENTER_MASK)) {
 								cpuinfo_log_debug(
 									"heuristic detection of core clusters failed: "
-									"CPU Implementer of processor %"PRIu32" (0x%02"PRIx32") is different than of its expected cluster (0x%02"PRIx32")",
-									i, midr_get_implementer(processors[i].midr), midr_get_implementer(cluster_midr));
+									"CPU Implementer of processor %" PRIu32
+									" (0x%02" PRIx32
+									") is different than of its expected cluster (0x%02" PRIx32
+									")",
+									i,
+									midr_get_implementer(processors[i].midr),
+									midr_get_implementer(cluster_midr));
 								return false;
 							}
 						} else {
-							cluster_midr = midr_copy_implementer(cluster_midr, processors[i].midr);
+							cluster_midr =
+								midr_copy_implementer(cluster_midr, processors[i].midr);
 							cluster_flags |= CPUINFO_ARM_LINUX_VALID_IMPLEMENTER;
 						}
 					}
 
 					if (processors[i].flags & CPUINFO_ARM_LINUX_VALID_VARIANT) {
 						if (cluster_flags & CPUINFO_ARM_LINUX_VALID_VARIANT) {
-							if ((cluster_midr & CPUINFO_ARM_MIDR_VARIANT_MASK) != (processors[i].midr & CPUINFO_ARM_MIDR_VARIANT_MASK)) {
+							if ((cluster_midr & CPUINFO_ARM_MIDR_VARIANT_MASK) !=
+							    (processors[i].midr & CPUINFO_ARM_MIDR_VARIANT_MASK)) {
 								cpuinfo_log_debug(
 									"heuristic detection of core clusters failed: "
-									"CPU Variant of processor %"PRIu32" (0x%"PRIx32") is different than of its expected cluster (0x%"PRIx32")",
-									i, midr_get_variant(processors[i].midr), midr_get_variant(cluster_midr));
+									"CPU Variant of processor %" PRIu32
+									" (0x%" PRIx32
+									") is different than of its expected cluster (0x%" PRIx32
+									")",
+									i,
+									midr_get_variant(processors[i].midr),
+									midr_get_variant(cluster_midr));
 								return false;
 							}
 						} else {
-							cluster_midr = midr_copy_variant(cluster_midr, processors[i].midr);
+							cluster_midr =
+								midr_copy_variant(cluster_midr, processors[i].midr);
 							cluster_flags |= CPUINFO_ARM_LINUX_VALID_VARIANT;
 						}
 					}
 
 					if (processors[i].flags & CPUINFO_ARM_LINUX_VALID_PART) {
 						if (cluster_flags & CPUINFO_ARM_LINUX_VALID_PART) {
-							if ((cluster_midr & CPUINFO_ARM_MIDR_PART_MASK) != (processors[i].midr & CPUINFO_ARM_MIDR_PART_MASK)) {
+							if ((cluster_midr & CPUINFO_ARM_MIDR_PART_MASK) !=
+							    (processors[i].midr & CPUINFO_ARM_MIDR_PART_MASK)) {
 								cpuinfo_log_debug(
 									"heuristic detection of core clusters failed: "
-									"CPU Part of processor %"PRIu32" (0x%03"PRIx32") is different than of its expected cluster (0x%03"PRIx32")",
-									i, midr_get_part(processors[i].midr), midr_get_part(cluster_midr));
+									"CPU Part of processor %" PRIu32
+									" (0x%03" PRIx32
+									") is different than of its expected cluster (0x%03" PRIx32
+									")",
+									i,
+									midr_get_part(processors[i].midr),
+									midr_get_part(cluster_midr));
 								return false;
 							}
 						} else {
@@ -241,15 +315,22 @@ bool cpuinfo_arm_linux_detect_core_clusters_by_heuristic(
 
 					if (processors[i].flags & CPUINFO_ARM_LINUX_VALID_REVISION) {
 						if (cluster_flags & CPUINFO_ARM_LINUX_VALID_REVISION) {
-							if ((cluster_midr & CPUINFO_ARM_MIDR_REVISION_MASK) != (processors[i].midr & CPUINFO_ARM_MIDR_REVISION_MASK)) {
+							if ((cluster_midr & CPUINFO_ARM_MIDR_REVISION_MASK) !=
+							    (processors[i].midr & CPUINFO_ARM_MIDR_REVISION_MASK)) {
 								cpuinfo_log_debug(
 									"heuristic detection of core clusters failed: "
-									"CPU Revision of processor %"PRIu32" (0x%"PRIx32") is different than of its expected cluster (0x%"PRIx32")",
-									i, midr_get_revision(cluster_midr), midr_get_revision(processors[i].midr));
+									"CPU Revision of processor %" PRIu32
+									" (0x%" PRIx32
+									") is different than of its expected cluster (0x%" PRIx32
+									")",
+									i,
+									midr_get_revision(cluster_midr),
+									midr_get_revision(processors[i].midr));
 								return false;
 							}
 						} else {
-							cluster_midr = midr_copy_revision(cluster_midr, processors[i].midr);
+							cluster_midr =
+								midr_copy_revision(cluster_midr, processors[i].midr);
 							cluster_flags |= CPUINFO_ARM_LINUX_VALID_REVISION;
 						}
 					}
@@ -265,16 +346,21 @@ bool cpuinfo_arm_linux_detect_core_clusters_by_heuristic(
 	for (uint32_t i = 0; i < max_processors; i++) {
 		if (bitmask_all(processors[i].flags, CPUINFO_LINUX_FLAG_VALID)) {
 			if (expected_cluster_processors == 0) {
-				/* Expect this processor to start a new cluster */
+				/* Expect this processor to start a new cluster
+				 */
 
 				cluster_start = i;
 				expected_cluster_processors = cluster_processors[cluster++];
 			} else {
-				/* Expect this processor to belong to the same cluster as processor */
+				/* Expect this processor to belong to the same
+				 * cluster as processor */
 
 				if (!(processors[i].flags & CPUINFO_LINUX_FLAG_PACKAGE_CLUSTER)) {
-					cpuinfo_log_debug("assigned processor %"PRIu32" to cluster of processor %"PRIu32" based on heuristic",
-						i, cluster_start);
+					cpuinfo_log_debug(
+						"assigned processor %" PRIu32 " to cluster of processor %" PRIu32
+						" based on heuristic",
+						i,
+						cluster_start);
 				}
 
 				processors[i].package_leader_id = cluster_start;
@@ -291,38 +377,49 @@ bool cpuinfo_arm_linux_detect_core_clusters_by_heuristic(
  * - Clusters detected from OS-provided information are unchanged:
  *   - Processors assigned to these clusters stay assigned to the same clusters
  *   - No new processors are added to these clusters
- * - Processors without pre-assigned cluster are clustered in one sequential scan:
- *   - If known details (min/max frequency, MIDR components) of a processor are compatible with a preceding
- *     processor, without pre-assigned cluster, the processor is assigned to the cluster of the preceding processor.
- *   - If known details (min/max frequency, MIDR components) of a processor are not compatible with a preceding
- *     processor, the processor is assigned to a newly created cluster.
+ * - Processors without pre-assigned cluster are clustered in one sequential
+ * scan:
+ *   - If known details (min/max frequency, MIDR components) of a processor are
+ * compatible with a preceding processor, without pre-assigned cluster, the
+ * processor is assigned to the cluster of the preceding processor.
+ *   - If known details (min/max frequency, MIDR components) of a processor are
+ * not compatible with a preceding processor, the processor is assigned to a
+ * newly created cluster.
  *
- * The function must be called after parsing OS-provided information on core clusters, and usually is called only
- * if heuristic assignment of processors to clusters (cpuinfo_arm_linux_cluster_processors_by_heuristic) failed.
+ * The function must be called after parsing OS-provided information on core
+ * clusters, and usually is called only if heuristic assignment of processors to
+ * clusters (cpuinfo_arm_linux_cluster_processors_by_heuristic) failed.
  *
- * Its purpose is to detect clusters of cores when OS-provided information is lacking or incomplete, i.e.
- * - Linux kernel is not configured to report information in sysfs topology leaf.
- * - Linux kernel reports topology information only for online cores, and all cores on some of the clusters are offline.
+ * Its purpose is to detect clusters of cores when OS-provided information is
+ * lacking or incomplete, i.e.
+ * - Linux kernel is not configured to report information in sysfs topology
+ * leaf.
+ * - Linux kernel reports topology information only for online cores, and all
+ * cores on some of the clusters are offline.
  *
- * Sequential assignment of processors to clusters always succeeds, and upon exit, all usable processors in the
+ * Sequential assignment of processors to clusters always succeeds, and upon
+ * exit, all usable processors in the
  * @p processors array have cluster information.
  *
  * @param max_processors - number of elements in the @p processors array.
- * @param[in,out] processors - processor descriptors with pre-parsed POSSIBLE and PRESENT flags, minimum/maximum
- *                             frequency, MIDR information, and core cluster (package siblings list) information.
+ * @param[in,out] processors - processor descriptors with pre-parsed POSSIBLE
+ * and PRESENT flags, minimum/maximum frequency, MIDR information, and core
+ * cluster (package siblings list) information.
  *
- * @retval true if the heuristic successfully assigned all processors into clusters of cores.
- * @retval false if known details about processors contradict the heuristic configuration of core clusters.
+ * @retval true if the heuristic successfully assigned all processors into
+ * clusters of cores.
+ * @retval false if known details about processors contradict the heuristic
+ * configuration of core clusters.
  */
 void cpuinfo_arm_linux_detect_core_clusters_by_sequential_scan(
 	uint32_t max_processors,
-	struct cpuinfo_arm_linux_processor processors[restrict static max_processors])
-{
+	struct cpuinfo_arm_linux_processor processors[restrict static max_processors]) {
 	uint32_t cluster_flags = 0;
 	uint32_t cluster_processors = 0;
 	uint32_t cluster_start, cluster_midr, cluster_max_frequency, cluster_min_frequency;
 	for (uint32_t i = 0; i < max_processors; i++) {
-		if ((processors[i].flags & (CPUINFO_LINUX_FLAG_VALID | CPUINFO_LINUX_FLAG_PACKAGE_CLUSTER)) == CPUINFO_LINUX_FLAG_VALID) {
+		if ((processors[i].flags & (CPUINFO_LINUX_FLAG_VALID | CPUINFO_LINUX_FLAG_PACKAGE_CLUSTER)) ==
+		    CPUINFO_LINUX_FLAG_VALID) {
 			if (cluster_processors == 0) {
 				goto new_cluster;
 			}
@@ -331,9 +428,14 @@ void cpuinfo_arm_linux_detect_core_clusters_by_sequential_scan(
 				if (cluster_flags & CPUINFO_LINUX_FLAG_MIN_FREQUENCY) {
 					if (cluster_min_frequency != processors[i].min_frequency) {
 						cpuinfo_log_info(
-							"minimum frequency of processor %"PRIu32" (%"PRIu32" KHz) is different than of preceding cluster (%"PRIu32" KHz); "
-							"processor %"PRIu32" starts to a new cluster",
-							i, processors[i].min_frequency, cluster_min_frequency, i);
+							"minimum frequency of processor %" PRIu32 " (%" PRIu32
+							" KHz) is different than of preceding cluster (%" PRIu32
+							" KHz); "
+							"processor %" PRIu32 " starts to a new cluster",
+							i,
+							processors[i].min_frequency,
+							cluster_min_frequency,
+							i);
 						goto new_cluster;
 					}
 				} else {
@@ -346,9 +448,14 @@ void cpuinfo_arm_linux_detect_core_clusters_by_sequential_scan(
 				if (cluster_flags & CPUINFO_LINUX_FLAG_MAX_FREQUENCY) {
 					if (cluster_max_frequency != processors[i].max_frequency) {
 						cpuinfo_log_debug(
-							"maximum frequency of processor %"PRIu32" (%"PRIu32" KHz) is different than of preceding cluster (%"PRIu32" KHz); "
-							"processor %"PRIu32" starts a new cluster",
-							i, processors[i].max_frequency, cluster_max_frequency, i);
+							"maximum frequency of processor %" PRIu32 " (%" PRIu32
+							" KHz) is different than of preceding cluster (%" PRIu32
+							" KHz); "
+							"processor %" PRIu32 " starts a new cluster",
+							i,
+							processors[i].max_frequency,
+							cluster_max_frequency,
+							i);
 						goto new_cluster;
 					}
 				} else {
@@ -359,11 +466,17 @@ void cpuinfo_arm_linux_detect_core_clusters_by_sequential_scan(
 
 			if (processors[i].flags & CPUINFO_ARM_LINUX_VALID_IMPLEMENTER) {
 				if (cluster_flags & CPUINFO_ARM_LINUX_VALID_IMPLEMENTER) {
-					if ((cluster_midr & CPUINFO_ARM_MIDR_IMPLEMENTER_MASK) != (processors[i].midr & CPUINFO_ARM_MIDR_IMPLEMENTER_MASK)) {
+					if ((cluster_midr & CPUINFO_ARM_MIDR_IMPLEMENTER_MASK) !=
+					    (processors[i].midr & CPUINFO_ARM_MIDR_IMPLEMENTER_MASK)) {
 						cpuinfo_log_debug(
-							"CPU Implementer of processor %"PRIu32" (0x%02"PRIx32") is different than of preceding cluster (0x%02"PRIx32"); "
-							"processor %"PRIu32" starts to a new cluster",
-							i, midr_get_implementer(processors[i].midr), midr_get_implementer(cluster_midr), i);
+							"CPU Implementer of processor %" PRIu32 " (0x%02" PRIx32
+							") is different than of preceding cluster (0x%02" PRIx32
+							"); "
+							"processor %" PRIu32 " starts to a new cluster",
+							i,
+							midr_get_implementer(processors[i].midr),
+							midr_get_implementer(cluster_midr),
+							i);
 						goto new_cluster;
 					}
 				} else {
@@ -374,11 +487,17 @@ void cpuinfo_arm_linux_detect_core_clusters_by_sequential_scan(
 
 			if (processors[i].flags & CPUINFO_ARM_LINUX_VALID_VARIANT) {
 				if (cluster_flags & CPUINFO_ARM_LINUX_VALID_VARIANT) {
-					if ((cluster_midr & CPUINFO_ARM_MIDR_VARIANT_MASK) != (processors[i].midr & CPUINFO_ARM_MIDR_VARIANT_MASK)) {
+					if ((cluster_midr & CPUINFO_ARM_MIDR_VARIANT_MASK) !=
+					    (processors[i].midr & CPUINFO_ARM_MIDR_VARIANT_MASK)) {
 						cpuinfo_log_debug(
-							"CPU Variant of processor %"PRIu32" (0x%"PRIx32") is different than of its expected cluster (0x%"PRIx32")"
-							"processor %"PRIu32" starts to a new cluster",
-							i, midr_get_variant(processors[i].midr), midr_get_variant(cluster_midr), i);
+							"CPU Variant of processor %" PRIu32 " (0x%" PRIx32
+							") is different than of its expected cluster (0x%" PRIx32
+							")"
+							"processor %" PRIu32 " starts to a new cluster",
+							i,
+							midr_get_variant(processors[i].midr),
+							midr_get_variant(cluster_midr),
+							i);
 						goto new_cluster;
 					}
 				} else {
@@ -389,11 +508,17 @@ void cpuinfo_arm_linux_detect_core_clusters_by_sequential_scan(
 
 			if (processors[i].flags & CPUINFO_ARM_LINUX_VALID_PART) {
 				if (cluster_flags & CPUINFO_ARM_LINUX_VALID_PART) {
-					if ((cluster_midr & CPUINFO_ARM_MIDR_PART_MASK) != (processors[i].midr & CPUINFO_ARM_MIDR_PART_MASK)) {
+					if ((cluster_midr & CPUINFO_ARM_MIDR_PART_MASK) !=
+					    (processors[i].midr & CPUINFO_ARM_MIDR_PART_MASK)) {
 						cpuinfo_log_debug(
-							"CPU Part of processor %"PRIu32" (0x%03"PRIx32") is different than of its expected cluster (0x%03"PRIx32")"
-							"processor %"PRIu32" starts to a new cluster",
-							i, midr_get_part(processors[i].midr), midr_get_part(cluster_midr), i);
+							"CPU Part of processor %" PRIu32 " (0x%03" PRIx32
+							") is different than of its expected cluster (0x%03" PRIx32
+							")"
+							"processor %" PRIu32 " starts to a new cluster",
+							i,
+							midr_get_part(processors[i].midr),
+							midr_get_part(cluster_midr),
+							i);
 						goto new_cluster;
 					}
 				} else {
@@ -404,11 +529,17 @@ void cpuinfo_arm_linux_detect_core_clusters_by_sequential_scan(
 
 			if (processors[i].flags & CPUINFO_ARM_LINUX_VALID_REVISION) {
 				if (cluster_flags & CPUINFO_ARM_LINUX_VALID_REVISION) {
-					if ((cluster_midr & CPUINFO_ARM_MIDR_REVISION_MASK) != (processors[i].midr & CPUINFO_ARM_MIDR_REVISION_MASK)) {
+					if ((cluster_midr & CPUINFO_ARM_MIDR_REVISION_MASK) !=
+					    (processors[i].midr & CPUINFO_ARM_MIDR_REVISION_MASK)) {
 						cpuinfo_log_debug(
-							"CPU Revision of processor %"PRIu32" (0x%"PRIx32") is different than of its expected cluster (0x%"PRIx32")"
-							"processor %"PRIu32" starts to a new cluster",
-							i, midr_get_revision(cluster_midr), midr_get_revision(processors[i].midr), i);
+							"CPU Revision of processor %" PRIu32 " (0x%" PRIx32
+							") is different than of its expected cluster (0x%" PRIx32
+							")"
+							"processor %" PRIu32 " starts to a new cluster",
+							i,
+							midr_get_revision(cluster_midr),
+							midr_get_revision(processors[i].midr),
+							i);
 						goto new_cluster;
 					}
 				} else {
@@ -417,21 +548,26 @@ void cpuinfo_arm_linux_detect_core_clusters_by_sequential_scan(
 				}
 			}
 
-			/* All checks passed, attach processor to the preceding cluster */
+			/* All checks passed, attach processor to the preceding
+			 * cluster */
 			cluster_processors++;
 			processors[i].package_leader_id = cluster_start;
 			processors[i].flags |= CPUINFO_LINUX_FLAG_PACKAGE_CLUSTER;
-			cpuinfo_log_debug("assigned processor %"PRIu32" to preceding cluster of processor %"PRIu32, i, cluster_start);
+			cpuinfo_log_debug(
+				"assigned processor %" PRIu32 " to preceding cluster of processor %" PRIu32,
+				i,
+				cluster_start);
 			continue;
 
-new_cluster:
+		new_cluster:
 			/* Create a new cluster starting with processor i */
 			cluster_start = i;
 			processors[i].package_leader_id = i;
 			processors[i].flags |= CPUINFO_LINUX_FLAG_PACKAGE_CLUSTER;
 			cluster_processors = 1;
 
-			/* Copy known information from processor to cluster, and set the flags accordingly */
+			/* Copy known information from processor to cluster, and
+			 * set the flags accordingly */
 			cluster_flags = 0;
 			if (processors[i].flags & CPUINFO_LINUX_FLAG_MIN_FREQUENCY) {
 				cluster_min_frequency = processors[i].min_frequency;
@@ -463,27 +599,30 @@ new_cluster:
 
 /*
  * Counts the number of logical processors in each core cluster.
- * This function should be called after all processors are assigned to core clusters.
+ * This function should be called after all processors are assigned to core
+ * clusters.
  *
  * @param max_processors - number of elements in the @p processors array.
- * @param[in,out] processors - processor descriptors with pre-parsed POSSIBLE and PRESENT flags,
- *                             and decoded core cluster (package_leader_id) information.
- *                             The function expects the value of processors[i].package_processor_count to be zero.
- *                             Upon return, processors[i].package_processor_count will contain the number of logical
+ * @param[in,out] processors - processor descriptors with pre-parsed POSSIBLE
+ * and PRESENT flags, and decoded core cluster (package_leader_id) information.
+ *                             The function expects the value of
+ * processors[i].package_processor_count to be zero. Upon return,
+ * processors[i].package_processor_count will contain the number of logical
  *                             processors in the respective core cluster.
  */
 void cpuinfo_arm_linux_count_cluster_processors(
 	uint32_t max_processors,
-	struct cpuinfo_arm_linux_processor processors[restrict static max_processors])
-{
-	/* First pass: accumulate the number of processors at the group leader's package_processor_count */
+	struct cpuinfo_arm_linux_processor processors[restrict static max_processors]) {
+	/* First pass: accumulate the number of processors at the group leader's
+	 * package_processor_count */
 	for (uint32_t i = 0; i < max_processors; i++) {
 		if (bitmask_all(processors[i].flags, CPUINFO_LINUX_FLAG_VALID)) {
 			const uint32_t package_leader_id = processors[i].package_leader_id;
 			processors[package_leader_id].package_processor_count += 1;
 		}
 	}
-	/* Second pass: copy the package_processor_count from the group leader processor */
+	/* Second pass: copy the package_processor_count from the group leader
+	 * processor */
 	for (uint32_t i = 0; i < max_processors; i++) {
 		if (bitmask_all(processors[i].flags, CPUINFO_LINUX_FLAG_VALID)) {
 			const uint32_t package_leader_id = processors[i].package_leader_id;

3rdparty/cpuinfo/src/arm/linux/cp.h

@@ -1,50 +1,49 @@
 #include <stdint.h>
 
-
 #if CPUINFO_MOCK
-	extern uint32_t cpuinfo_arm_fpsid;
-	extern uint32_t cpuinfo_arm_mvfr0;
-	extern uint32_t cpuinfo_arm_wcid;
+extern uint32_t cpuinfo_arm_fpsid;
+extern uint32_t cpuinfo_arm_mvfr0;
+extern uint32_t cpuinfo_arm_wcid;
 
-	static inline uint32_t read_fpsid(void) {
-		return cpuinfo_arm_fpsid;
-	}
+static inline uint32_t read_fpsid(void) {
+	return cpuinfo_arm_fpsid;
+}
 
-	static inline uint32_t read_mvfr0(void) {
-		return cpuinfo_arm_mvfr0;
-	}
+static inline uint32_t read_mvfr0(void) {
+	return cpuinfo_arm_mvfr0;
+}
 
-	static inline uint32_t read_wcid(void) {
-		return cpuinfo_arm_wcid;
-	}
+static inline uint32_t read_wcid(void) {
+	return cpuinfo_arm_wcid;
+}
 #else
-	#if !defined(__ARM_ARCH_7A__) && !defined(__ARM_ARCH_8A__) && !(defined(__ARM_ARCH) && (__ARM_ARCH >= 7))
-		/*
-		 * CoProcessor 10 is inaccessible from user mode since ARMv7,
-		 * and clang refuses to compile inline assembly when targeting ARMv7+
-		 */
-		static inline uint32_t read_fpsid(void) {
-			uint32_t fpsid;
-			__asm__ __volatile__("MRC p10, 0x7, %[fpsid], cr0, cr0, 0" : [fpsid] "=r" (fpsid));
-			return fpsid;
-		}
+#if !defined(__ARM_ARCH_7A__) && !defined(__ARM_ARCH_8A__) && !(defined(__ARM_ARCH) && (__ARM_ARCH >= 7))
+/*
+ * CoProcessor 10 is inaccessible from user mode since ARMv7,
+ * and clang refuses to compile inline assembly when targeting ARMv7+
+ */
+static inline uint32_t read_fpsid(void) {
+	uint32_t fpsid;
+	__asm__ __volatile__("MRC p10, 0x7, %[fpsid], cr0, cr0, 0" : [fpsid] "=r"(fpsid));
+	return fpsid;
+}
 
-		static inline uint32_t read_mvfr0(void) {
-			uint32_t mvfr0;
-			__asm__ __volatile__("MRC p10, 0x7, %[mvfr0], cr7, cr0, 0" : [mvfr0] "=r" (mvfr0));
-			return mvfr0;
-		}
-	#endif
-	#if !defined(__ARM_ARCH_8A__) && !(defined(__ARM_ARCH) && (__ARM_ARCH >= 8))
-		/*
-		 * In ARMv8, AArch32 state supports only conceptual coprocessors CP10, CP11, CP14, and CP15.
-		 * AArch64 does not support the concept of coprocessors.
-		 * and clang refuses to compile inline assembly when targeting ARMv8+
-		 */
-		static inline uint32_t read_wcid(void) {
-			uint32_t wcid;
-			__asm__ __volatile__("MRC p1, 0, %[wcid], c0, c0" : [wcid] "=r" (wcid));
-			return wcid;
-		}
-	#endif
+static inline uint32_t read_mvfr0(void) {
+	uint32_t mvfr0;
+	__asm__ __volatile__("MRC p10, 0x7, %[mvfr0], cr7, cr0, 0" : [mvfr0] "=r"(mvfr0));
+	return mvfr0;
+}
+#endif
+#if !defined(__ARM_ARCH_8A__) && !(defined(__ARM_ARCH) && (__ARM_ARCH >= 8))
+/*
+ * In ARMv8, AArch32 state supports only conceptual coprocessors CP10, CP11,
+ * CP14, and CP15. AArch64 does not support the concept of coprocessors. and
+ * clang refuses to compile inline assembly when targeting ARMv8+
+ */
+static inline uint32_t read_wcid(void) {
+	uint32_t wcid;
+	__asm__ __volatile__("MRC p1, 0, %[wcid], c0, c0" : [wcid] "=r"(wcid));
+	return wcid;
+}
+#endif
 #endif

3rdparty/cpuinfo/src/arm/linux/cpuinfo.c

@@ -1,26 +1,22 @@
 #include <stdbool.h>
+#include <stddef.h>
 #include <stdint.h>
 #include <stdlib.h>
-#include <stddef.h>
 #include <string.h>
 
-#include <linux/api.h>
 #include <arm/linux/api.h>
 #include <arm/midr.h>
 #include <cpuinfo/log.h>
+#include <linux/api.h>
 
 /*
- * Size, in chars, of the on-stack buffer used for parsing lines of /proc/cpuinfo.
- * This is also the limit on the length of a single line.
+ * Size, in chars, of the on-stack buffer used for parsing lines of
+ * /proc/cpuinfo. This is also the limit on the length of a single line.
  */
 #define BUFFER_SIZE 1024
 
-
-static uint32_t parse_processor_number(
-	const char* processor_start,
-	const char* processor_end)
-{
-	const size_t processor_length = (size_t) (processor_end - processor_start);
+static uint32_t parse_processor_number(const char* processor_start, const char* processor_end) {
+	const size_t processor_length = (size_t)(processor_end - processor_start);
 
 	if (processor_length == 0) {
 		cpuinfo_log_warning("Processor number in /proc/cpuinfo is ignored: string is empty");
@@ -29,10 +25,12 @@ static uint32_t parse_processor_number(
 
 	uint32_t processor_number = 0;
 	for (const char* digit_ptr = processor_start; digit_ptr != processor_end; digit_ptr++) {
-		const uint32_t digit = (uint32_t) (*digit_ptr - '0');
+		const uint32_t digit = (uint32_t)(*digit_ptr - '0');
 		if (digit > 10) {
-			cpuinfo_log_warning("non-decimal suffix %.*s in /proc/cpuinfo processor number is ignored",
-				(int) (processor_end - digit_ptr), digit_ptr);
+			cpuinfo_log_warning(
+				"non-decimal suffix %.*s in /proc/cpuinfo processor number is ignored",
+				(int)(processor_end - digit_ptr),
+				digit_ptr);
 			break;
 		}
 
@@ -45,42 +43,48 @@ static uint32_t parse_processor_number(
 /*
  *	Full list of ARM features reported in /proc/cpuinfo:
  *
- *	* swp - support for SWP instruction (deprecated in ARMv7, can be removed in future)
- *	* half - support for half-word loads and stores. These instruction are part of ARMv4,
- *	         so no need to check it on supported CPUs.
- *	* thumb - support for 16-bit Thumb instruction set. Note that BX instruction is detected
- *	          by ARMv4T architecture, not by this flag.
- *	* 26bit - old CPUs merged 26-bit PC and program status register (flags) into 32-bit PC
- *	          and had special instructions for working with packed PC. Now it is all deprecated.
- *	* fastmult - most old ARM CPUs could only compute 2 bits of multiplication result per clock
- *	             cycle, but CPUs with M suffix (e.g. ARM7TDMI) could compute 4 bits per cycle.
- *	             Of course, now it makes no sense.
- *	* fpa - floating point accelerator available. On original ARM ABI all floating-point operations
- *	        generated FPA instructions. If FPA was not available, these instructions generated
- *	        "illegal operation" interrupts, and the OS processed them by emulating the FPA instructions.
- *	        Debian used this ABI before it switched to EABI. Now FPA is deprecated.
- *	* vfp - vector floating point instructions. Available on most modern CPUs (as part of VFPv3).
- *	        Required by Android ARMv7A ABI and by Ubuntu on ARM.
+ *	* swp - support for SWP instruction (deprecated in ARMv7, can be removed
+ *in future)
+ *	* half - support for half-word loads and stores. These instruction are
+ *part of ARMv4, so no need to check it on supported CPUs.
+ *	* thumb - support for 16-bit Thumb instruction set. Note that BX
+ *instruction is detected by ARMv4T architecture, not by this flag.
+ *	* 26bit - old CPUs merged 26-bit PC and program status register (flags)
+ *into 32-bit PC and had special instructions for working with packed PC. Now it
+ *is all deprecated.
+ *	* fastmult - most old ARM CPUs could only compute 2 bits of
+ *multiplication result per clock cycle, but CPUs with M suffix (e.g. ARM7TDMI)
+ *could compute 4 bits per cycle. Of course, now it makes no sense.
+ *	* fpa - floating point accelerator available. On original ARM ABI all
+ *floating-point operations generated FPA instructions. If FPA was not
+ *available, these instructions generated "illegal operation" interrupts, and
+ *the OS processed them by emulating the FPA instructions. Debian used this ABI
+ *before it switched to EABI. Now FPA is deprecated.
+ *	* vfp - vector floating point instructions. Available on most modern
+ *CPUs (as part of VFPv3). Required by Android ARMv7A ABI and by Ubuntu on ARM.
  *              Note: there is no flag for VFPv2.
- *	* edsp - V5E instructions: saturating add/sub and 16-bit x 16-bit -> 32/64-bit multiplications.
- *	         Required on Android, supported by all CPUs in production.
+ *	* edsp - V5E instructions: saturating add/sub and 16-bit x 16-bit ->
+ *32/64-bit multiplications. Required on Android, supported by all CPUs in
+ *production.
  *	* java - Jazelle extension. Supported on most CPUs.
  *	* iwmmxt - Intel/Marvell Wireless MMX instructions. 64-bit integer SIMD.
- *	           Supported on XScale (Since PXA270) and Sheeva (PJ1, PJ4) architectures.
- *	           Note that there is no flag for WMMX2 instructions.
+ *	           Supported on XScale (Since PXA270) and Sheeva (PJ1, PJ4)
+ *architectures. Note that there is no flag for WMMX2 instructions.
  *	* crunch - Maverick Crunch instructions. Junk.
  *	* thumbee - ThumbEE instructions. Almost no documentation is available.
- *	* neon - NEON instructions (aka Advanced SIMD). MVFR1 register gives more
- *	         fine-grained information on particular supported features, but
- *	         the Linux kernel exports only a single flag for all of them.
- *	         According to ARMv7A docs it also implies the availability of VFPv3
- *	         (with 32 double-precision registers d0-d31).
- *	* vfpv3 - VFPv3 instructions. Available on most modern CPUs. Augment VFPv2 by
- *	          conversion to/from integers and load constant instructions.
- *	          Required by Android ARMv7A ABI and by Ubuntu on ARM.
- *	* vfpv3d16 - VFPv3 instructions with only 16 double-precision registers (d0-d15).
+ *	* neon - NEON instructions (aka Advanced SIMD). MVFR1 register gives
+ *more fine-grained information on particular supported features, but the Linux
+ *kernel exports only a single flag for all of them. According to ARMv7A docs it
+ *also implies the availability of VFPv3 (with 32 double-precision registers
+ *d0-d31).
+ *	* vfpv3 - VFPv3 instructions. Available on most modern CPUs. Augment
+ *VFPv2 by conversion to/from integers and load constant instructions. Required
+ *by Android ARMv7A ABI and by Ubuntu on ARM.
+ *	* vfpv3d16 - VFPv3 instructions with only 16 double-precision registers
+ *(d0-d15).
  *	* tls - software thread ID registers.
- *	        Used by kernel (and likely libc) for efficient implementation of TLS.
+ *	        Used by kernel (and likely libc) for efficient implementation of
+ *TLS.
  *	* vfpv4 - fused multiply-add instructions.
  *	* idiva - DIV instructions available in ARM mode.
  *	* idivt - DIV instructions available in Thumb mode.
@@ -93,15 +97,15 @@ static uint32_t parse_processor_number(
  *  * sha2 - SHA2 instructions.
  *  * crc32 - CRC32 instructions.
  *
- *	/proc/cpuinfo on ARM is populated in file arch/arm/kernel/setup.c in Linux kernel
- *	Note that some devices may use patched Linux kernels with different feature names.
- *	However, the names above were checked on a large number of /proc/cpuinfo listings.
+ *	/proc/cpuinfo on ARM is populated in file arch/arm/kernel/setup.c in
+ *Linux kernel Note that some devices may use patched Linux kernels with
+ *different feature names. However, the names above were checked on a large
+ *number of /proc/cpuinfo listings.
  */
 static void parse_features(
 	const char* features_start,
 	const char* features_end,
-	struct cpuinfo_arm_linux_processor processor[restrict static 1])
-{
+	struct cpuinfo_arm_linux_processor processor[restrict static 1]) {
 	const char* feature_start = features_start;
 	const char* feature_end;
 
@@ -115,7 +119,7 @@ static void parse_features(
 				break;
 			}
 		}
-		const size_t feature_length = (size_t) (feature_end - feature_start);
+		const size_t feature_length = (size_t)(feature_end - feature_start);
 
 		switch (feature_length) {
 			case 2:
@@ -126,8 +130,9 @@ static void parse_features(
 #if CPUINFO_ARCH_ARM
 				} else if (memcmp(feature_start, "wp", feature_length) == 0) {
 					/*
-					 * Some AArch64 kernels, including the one on Nexus 5X,
-					 * erroneously report "swp" as "wp" to AArch32 programs
+					 * Some AArch64 kernels, including the
+					 * one on Nexus 5X, erroneously report
+					 * "swp" as "wp" to AArch32 programs
 					 */
 					processor->features |= CPUINFO_ARM_LINUX_FEATURE_SWP;
 #endif
@@ -137,11 +142,11 @@ static void parse_features(
 				break;
 			case 3:
 				if (memcmp(feature_start, "aes", feature_length) == 0) {
-					#if CPUINFO_ARCH_ARM
-						processor->features2 |= CPUINFO_ARM_LINUX_FEATURE2_AES;
-					#elif CPUINFO_ARCH_ARM64
-						processor->features |= CPUINFO_ARM_LINUX_FEATURE_AES;
-					#endif
+#if CPUINFO_ARCH_ARM
+					processor->features2 |= CPUINFO_ARM_LINUX_FEATURE2_AES;
+#elif CPUINFO_ARCH_ARM64
+					processor->features |= CPUINFO_ARM_LINUX_FEATURE_AES;
+#endif
 #if CPUINFO_ARCH_ARM
 				} else if (memcmp(feature_start, "swp", feature_length) == 0) {
 					processor->features |= CPUINFO_ARM_LINUX_FEATURE_SWP;
@@ -158,29 +163,29 @@ static void parse_features(
 				break;
 			case 4:
 				if (memcmp(feature_start, "sha1", feature_length) == 0) {
-					#if CPUINFO_ARCH_ARM
-						processor->features2 |= CPUINFO_ARM_LINUX_FEATURE2_SHA1;
-					#elif CPUINFO_ARCH_ARM64
-						processor->features |= CPUINFO_ARM_LINUX_FEATURE_SHA1;
-					#endif
+#if CPUINFO_ARCH_ARM
+					processor->features2 |= CPUINFO_ARM_LINUX_FEATURE2_SHA1;
+#elif CPUINFO_ARCH_ARM64
+					processor->features |= CPUINFO_ARM_LINUX_FEATURE_SHA1;
+#endif
 				} else if (memcmp(feature_start, "sha2", feature_length) == 0) {
-					#if CPUINFO_ARCH_ARM
-						processor->features2 |= CPUINFO_ARM_LINUX_FEATURE2_SHA2;
-					#elif CPUINFO_ARCH_ARM64
-						processor->features |= CPUINFO_ARM_LINUX_FEATURE_SHA2;
-					#endif
+#if CPUINFO_ARCH_ARM
+					processor->features2 |= CPUINFO_ARM_LINUX_FEATURE2_SHA2;
+#elif CPUINFO_ARCH_ARM64
+					processor->features |= CPUINFO_ARM_LINUX_FEATURE_SHA2;
+#endif
 				} else if (memcmp(feature_start, "fphp", feature_length) == 0) {
-					#if CPUINFO_ARCH_ARM64
-						processor->features |= CPUINFO_ARM_LINUX_FEATURE_FPHP;
-					#endif
+#if CPUINFO_ARCH_ARM64
+					processor->features |= CPUINFO_ARM_LINUX_FEATURE_FPHP;
+#endif
 				} else if (memcmp(feature_start, "fcma", feature_length) == 0) {
-					#if CPUINFO_ARCH_ARM64
-						processor->features |= CPUINFO_ARM_LINUX_FEATURE_FCMA;
-					#endif
+#if CPUINFO_ARCH_ARM64
+					processor->features |= CPUINFO_ARM_LINUX_FEATURE_FCMA;
+#endif
 				} else if (memcmp(feature_start, "i8mm", feature_length) == 0) {
-					#if CPUINFO_ARCH_ARM64
-						processor->features2 |= CPUINFO_ARM_LINUX_FEATURE2_I8MM;
-					#endif
+#if CPUINFO_ARCH_ARM64
+					processor->features2 |= CPUINFO_ARM_LINUX_FEATURE2_I8MM;
+#endif
 #if CPUINFO_ARCH_ARM
 				} else if (memcmp(feature_start, "half", feature_length) == 0) {
 					processor->features |= CPUINFO_ARM_LINUX_FEATURE_HALF;
@@ -194,8 +199,9 @@ static void parse_features(
 					processor->features |= CPUINFO_ARM_LINUX_FEATURE_LPAE;
 				} else if (memcmp(feature_start, "tlsi", feature_length) == 0) {
 					/*
-					 * Some AArch64 kernels, including the one on Nexus 5X,
-					 * erroneously report "tls" as "tlsi" to AArch32 programs
+					 * Some AArch64 kernels, including the
+					 * one on Nexus 5X, erroneously report
+					 * "tls" as "tlsi" to AArch32 programs
 					 */
 					processor->features |= CPUINFO_ARM_LINUX_FEATURE_TLS;
 #endif /* CPUINFO_ARCH_ARM */
@@ -205,33 +211,33 @@ static void parse_features(
 				break;
 			case 5:
 				if (memcmp(feature_start, "pmull", feature_length) == 0) {
-					#if CPUINFO_ARCH_ARM
-						processor->features2 |= CPUINFO_ARM_LINUX_FEATURE2_PMULL;
-					#elif CPUINFO_ARCH_ARM64
-						processor->features |= CPUINFO_ARM_LINUX_FEATURE_PMULL;
-					#endif
+#if CPUINFO_ARCH_ARM
+					processor->features2 |= CPUINFO_ARM_LINUX_FEATURE2_PMULL;
+#elif CPUINFO_ARCH_ARM64
+					processor->features |= CPUINFO_ARM_LINUX_FEATURE_PMULL;
+#endif
 				} else if (memcmp(feature_start, "crc32", feature_length) == 0) {
-					#if CPUINFO_ARCH_ARM
-						processor->features2 |= CPUINFO_ARM_LINUX_FEATURE2_CRC32;
-					#elif CPUINFO_ARCH_ARM64
-						processor->features |= CPUINFO_ARM_LINUX_FEATURE_CRC32;
-					#endif
+#if CPUINFO_ARCH_ARM
+					processor->features2 |= CPUINFO_ARM_LINUX_FEATURE2_CRC32;
+#elif CPUINFO_ARCH_ARM64
+					processor->features |= CPUINFO_ARM_LINUX_FEATURE_CRC32;
+#endif
 				} else if (memcmp(feature_start, "asimd", feature_length) == 0) {
-					#if CPUINFO_ARCH_ARM64
-						processor->features |= CPUINFO_ARM_LINUX_FEATURE_ASIMD;
-					#endif
+#if CPUINFO_ARCH_ARM64
+					processor->features |= CPUINFO_ARM_LINUX_FEATURE_ASIMD;
+#endif
 				} else if (memcmp(feature_start, "cpuid", feature_length) == 0) {
-					#if CPUINFO_ARCH_ARM64
-						processor->features |= CPUINFO_ARM_LINUX_FEATURE_CPUID;
-					#endif
+#if CPUINFO_ARCH_ARM64
+					processor->features |= CPUINFO_ARM_LINUX_FEATURE_CPUID;
+#endif
 				} else if (memcmp(feature_start, "jscvt", feature_length) == 0) {
-					#if CPUINFO_ARCH_ARM64
-						processor->features |= CPUINFO_ARM_LINUX_FEATURE_JSCVT;
-					#endif
+#if CPUINFO_ARCH_ARM64
+					processor->features |= CPUINFO_ARM_LINUX_FEATURE_JSCVT;
+#endif
 				} else if (memcmp(feature_start, "lrcpc", feature_length) == 0) {
-					#if CPUINFO_ARCH_ARM64
-						processor->features |= CPUINFO_ARM_LINUX_FEATURE_LRCPC;
-					#endif
+#if CPUINFO_ARCH_ARM64
+					processor->features |= CPUINFO_ARM_LINUX_FEATURE_LRCPC;
+#endif
 #if CPUINFO_ARCH_ARM
 				} else if (memcmp(feature_start, "thumb", feature_length) == 0) {
 					processor->features |= CPUINFO_ARM_LINUX_FEATURE_THUMB;
@@ -249,7 +255,7 @@ static void parse_features(
 				} else {
 					goto unexpected;
 				}
- 				break;
+				break;
 #if CPUINFO_ARCH_ARM
 			case 6:
 				if (memcmp(feature_start, "iwmmxt", feature_length) == 0) {
@@ -267,13 +273,13 @@ static void parse_features(
 				if (memcmp(feature_start, "evtstrm", feature_length) == 0) {
 					processor->features |= CPUINFO_ARM_LINUX_FEATURE_EVTSTRM;
 				} else if (memcmp(feature_start, "atomics", feature_length) == 0) {
-					#if CPUINFO_ARCH_ARM64
-						processor->features |= CPUINFO_ARM_LINUX_FEATURE_ATOMICS;
-					#endif
+#if CPUINFO_ARCH_ARM64
+					processor->features |= CPUINFO_ARM_LINUX_FEATURE_ATOMICS;
+#endif
 				} else if (memcmp(feature_start, "asimdhp", feature_length) == 0) {
-					#if CPUINFO_ARCH_ARM64
-						processor->features |= CPUINFO_ARM_LINUX_FEATURE_ASIMDHP;
-					#endif
+#if CPUINFO_ARCH_ARM64
+					processor->features |= CPUINFO_ARM_LINUX_FEATURE_ASIMDHP;
+#endif
 #if CPUINFO_ARCH_ARM
 				} else if (memcmp(feature_start, "thumbee", feature_length) == 0) {
 					processor->features |= CPUINFO_ARM_LINUX_FEATURE_THUMBEE;
@@ -284,13 +290,13 @@ static void parse_features(
 				break;
 			case 8:
 				if (memcmp(feature_start, "asimdrdm", feature_length) == 0) {
-					#if CPUINFO_ARCH_ARM64
-						processor->features |= CPUINFO_ARM_LINUX_FEATURE_ASIMDRDM;
-					#endif
+#if CPUINFO_ARCH_ARM64
+					processor->features |= CPUINFO_ARM_LINUX_FEATURE_ASIMDRDM;
+#endif
 				} else if (memcmp(feature_start, "asimdfhm", feature_length) == 0) {
-					#if CPUINFO_ARCH_ARM64
-						processor->features |= CPUINFO_ARM_LINUX_FEATURE_ASIMDFHM;
-					#endif
+#if CPUINFO_ARCH_ARM64
+					processor->features |= CPUINFO_ARM_LINUX_FEATURE_ASIMDFHM;
+#endif
 #if CPUINFO_ARCH_ARM
 				} else if (memcmp(feature_start, "fastmult", feature_length) == 0) {
 					processor->features |= CPUINFO_ARM_LINUX_FEATURE_FASTMULT;
@@ -303,8 +309,10 @@ static void parse_features(
 				break;
 			default:
 			unexpected:
-				cpuinfo_log_warning("unexpected /proc/cpuinfo feature \"%.*s\" is ignored",
-					(int) feature_length, feature_start);
+				cpuinfo_log_warning(
+					"unexpected /proc/cpuinfo feature \"%.*s\" is ignored",
+					(int)feature_length,
+					feature_start);
 				break;
 		}
 		feature_start = feature_end;
@@ -319,10 +327,10 @@ static void parse_features(
 static void parse_cpu_architecture(
 	const char* cpu_architecture_start,
 	const char* cpu_architecture_end,
-	struct cpuinfo_arm_linux_processor processor[restrict static 1])
-{
-	const size_t cpu_architecture_length = (size_t) (cpu_architecture_end - cpu_architecture_start);
-	/* Early AArch64 kernels report "CPU architecture: AArch64" instead of a numeric value 8 */
+	struct cpuinfo_arm_linux_processor processor[restrict static 1]) {
+	const size_t cpu_architecture_length = (size_t)(cpu_architecture_end - cpu_architecture_start);
+	/* Early AArch64 kernels report "CPU architecture: AArch64" instead of a
+	 * numeric value 8 */
 	if (cpu_architecture_length == 7) {
 		if (memcmp(cpu_architecture_start, "AArch64", cpu_architecture_length) == 0) {
 			processor->midr = midr_set_architecture(processor->midr, UINT32_C(0xF));
@@ -332,7 +340,6 @@ static void parse_cpu_architecture(
 		}
 	}
 
-
 	uint32_t architecture = 0;
 	const char* cpu_architecture_ptr = cpu_architecture_start;
 	for (; cpu_architecture_ptr != cpu_architecture_end; cpu_architecture_ptr++) {
@@ -347,8 +354,10 @@ static void parse_cpu_architecture(
 	}
 
 	if (cpu_architecture_ptr == cpu_architecture_start) {
-		cpuinfo_log_warning("CPU architecture %.*s in /proc/cpuinfo is ignored due to non-digit at the beginning of the string",
-			(int) cpu_architecture_length, cpu_architecture_start);
+		cpuinfo_log_warning(
+			"CPU architecture %.*s in /proc/cpuinfo is ignored due to non-digit at the beginning of the string",
+			(int)cpu_architecture_length,
+			cpu_architecture_start);
 	} else {
 		if (architecture != 0) {
 			processor->architecture_version = architecture;
@@ -370,17 +379,22 @@ static void parse_cpu_architecture(
 #endif /* CPUINFO_ARCH_ARM */
 					case ' ':
 					case '\t':
-						/* Ignore whitespace at the end */
+						/* Ignore whitespace at the end
+						 */
 						break;
 					default:
-						cpuinfo_log_warning("skipped unknown architectural feature '%c' for ARMv%"PRIu32,
-							feature, architecture);
+						cpuinfo_log_warning(
+							"skipped unknown architectural feature '%c' for ARMv%" PRIu32,
+							feature,
+							architecture);
 						break;
 				}
 			}
 		} else {
-			cpuinfo_log_warning("CPU architecture %.*s in /proc/cpuinfo is ignored due to invalid value (0)",
-				(int) cpu_architecture_length, cpu_architecture_start);
+			cpuinfo_log_warning(
+				"CPU architecture %.*s in /proc/cpuinfo is ignored due to invalid value (0)",
+				(int)cpu_architecture_length,
+				cpu_architecture_start);
 		}
 	}
 
@@ -391,9 +405,12 @@ static void parse_cpu_architecture(
 			midr_architecture = UINT32_C(0x7); /* ARMv6 */
 			break;
 		case 5:
-			if ((processor->architecture_flags & CPUINFO_ARM_LINUX_ARCH_TEJ) == CPUINFO_ARM_LINUX_ARCH_TEJ) {
+			if ((processor->architecture_flags & CPUINFO_ARM_LINUX_ARCH_TEJ) ==
+			    CPUINFO_ARM_LINUX_ARCH_TEJ) {
 				midr_architecture = UINT32_C(0x6); /* ARMv5TEJ */
-			} else if ((processor->architecture_flags & CPUINFO_ARM_LINUX_ARCH_TE) == CPUINFO_ARM_LINUX_ARCH_TE) {
+			} else if (
+				(processor->architecture_flags & CPUINFO_ARM_LINUX_ARCH_TE) ==
+				CPUINFO_ARM_LINUX_ARCH_TE) {
 				midr_architecture = UINT32_C(0x5); /* ARMv5TE */
 			} else {
 				midr_architecture = UINT32_C(0x4); /* ARMv5T */
@@ -407,9 +424,8 @@ static void parse_cpu_architecture(
 static void parse_cpu_part(
 	const char* cpu_part_start,
 	const char* cpu_part_end,
-	struct cpuinfo_arm_linux_processor processor[restrict static 1])
-{
-	const size_t cpu_part_length = (size_t) (cpu_part_end - cpu_part_start);
+	struct cpuinfo_arm_linux_processor processor[restrict static 1]) {
+	const size_t cpu_part_length = (size_t)(cpu_part_end - cpu_part_start);
 
 	/*
 	 * CPU part should contain hex prefix (0x) and one to three hex digits.
@@ -419,32 +435,42 @@ static void parse_cpu_part(
 	 * Main ID Register (MIDR) assigns only a 12-bit value for CPU part.
 	 */
 	if (cpu_part_length < 3 || cpu_part_length > 5) {
-		cpuinfo_log_warning("CPU part %.*s in /proc/cpuinfo is ignored due to unexpected length (%zu)",
-			(int) cpu_part_length, cpu_part_start, cpu_part_length);
+		cpuinfo_log_warning(
+			"CPU part %.*s in /proc/cpuinfo is ignored due to unexpected length (%zu)",
+			(int)cpu_part_length,
+			cpu_part_start,
+			cpu_part_length);
 		return;
 	}
 
 	/* Verify the presence of hex prefix */
 	if (cpu_part_start[0] != '0' || cpu_part_start[1] != 'x') {
-		cpuinfo_log_warning("CPU part %.*s in /proc/cpuinfo is ignored due to lack of 0x prefix",
-			(int) cpu_part_length, cpu_part_start);
+		cpuinfo_log_warning(
+			"CPU part %.*s in /proc/cpuinfo is ignored due to lack of 0x prefix",
+			(int)cpu_part_length,
+			cpu_part_start);
 		return;
 	}
 
-	/* Verify that characters after hex prefix are hexadecimal digits and decode them */
+	/* Verify that characters after hex prefix are hexadecimal digits and
+	 * decode them */
 	uint32_t cpu_part = 0;
 	for (const char* digit_ptr = cpu_part_start + 2; digit_ptr != cpu_part_end; digit_ptr++) {
 		const char digit_char = *digit_ptr;
 		uint32_t digit;
 		if (digit_char >= '0' && digit_char <= '9') {
 			digit = digit_char - '0';
-		} else if ((uint32_t) (digit_char - 'A') < 6) {
+		} else if ((uint32_t)(digit_char - 'A') < 6) {
 			digit = 10 + (digit_char - 'A');
-		} else if ((uint32_t) (digit_char - 'a') < 6) {
+		} else if ((uint32_t)(digit_char - 'a') < 6) {
 			digit = 10 + (digit_char - 'a');
 		} else {
-			cpuinfo_log_warning("CPU part %.*s in /proc/cpuinfo is ignored due to unexpected non-hex character %c at offset %zu",
-				(int) cpu_part_length, cpu_part_start, digit_char, (size_t) (digit_ptr - cpu_part_start));
+			cpuinfo_log_warning(
+				"CPU part %.*s in /proc/cpuinfo is ignored due to unexpected non-hex character %c at offset %zu",
+				(int)cpu_part_length,
+				cpu_part_start,
+				digit_char,
+				(size_t)(digit_ptr - cpu_part_start));
 			return;
 		}
 		cpu_part = cpu_part * 16 + digit;
@@ -457,8 +483,7 @@ static void parse_cpu_part(
 static void parse_cpu_implementer(
 	const char* cpu_implementer_start,
 	const char* cpu_implementer_end,
-	struct cpuinfo_arm_linux_processor processor[restrict static 1])
-{
+	struct cpuinfo_arm_linux_processor processor[restrict static 1]) {
 	const size_t cpu_implementer_length = cpu_implementer_end - cpu_implementer_start;
 
 	/*
@@ -466,39 +491,50 @@ static void parse_cpu_implementer(
 	 * I have never seen single hex digit as a value of this field,
 	 * but I don't think it is impossible in future.
 	 * Value can not contain more than two hex digits since
-	 * Main ID Register (MIDR) assigns only an 8-bit value for CPU implementer.
+	 * Main ID Register (MIDR) assigns only an 8-bit value for CPU
+	 * implementer.
 	 */
 	switch (cpu_implementer_length) {
 		case 3:
 		case 4:
 			break;
 		default:
-		cpuinfo_log_warning("CPU implementer %.*s in /proc/cpuinfo is ignored due to unexpected length (%zu)",
-			(int) cpu_implementer_length, cpu_implementer_start, cpu_implementer_length);
-		return;
+			cpuinfo_log_warning(
+				"CPU implementer %.*s in /proc/cpuinfo is ignored due to unexpected length (%zu)",
+				(int)cpu_implementer_length,
+				cpu_implementer_start,
+				cpu_implementer_length);
+			return;
 	}
 
 	/* Verify the presence of hex prefix */
 	if (cpu_implementer_start[0] != '0' || cpu_implementer_start[1] != 'x') {
-		cpuinfo_log_warning("CPU implementer %.*s in /proc/cpuinfo is ignored due to lack of 0x prefix",
-			(int) cpu_implementer_length, cpu_implementer_start);
+		cpuinfo_log_warning(
+			"CPU implementer %.*s in /proc/cpuinfo is ignored due to lack of 0x prefix",
+			(int)cpu_implementer_length,
+			cpu_implementer_start);
 		return;
 	}
 
-	/* Verify that characters after hex prefix are hexadecimal digits and decode them */
+	/* Verify that characters after hex prefix are hexadecimal digits and
+	 * decode them */
 	uint32_t cpu_implementer = 0;
 	for (const char* digit_ptr = cpu_implementer_start + 2; digit_ptr != cpu_implementer_end; digit_ptr++) {
 		const char digit_char = *digit_ptr;
 		uint32_t digit;
 		if (digit_char >= '0' && digit_char <= '9') {
 			digit = digit_char - '0';
-		} else if ((uint32_t) (digit_char - 'A') < 6) {
+		} else if ((uint32_t)(digit_char - 'A') < 6) {
 			digit = 10 + (digit_char - 'A');
-		} else if ((uint32_t) (digit_char - 'a') < 6) {
+		} else if ((uint32_t)(digit_char - 'a') < 6) {
 			digit = 10 + (digit_char - 'a');
 		} else {
-			cpuinfo_log_warning("CPU implementer %.*s in /proc/cpuinfo is ignored due to unexpected non-hex character '%c' at offset %zu",
-				(int) cpu_implementer_length, cpu_implementer_start, digit_char, (size_t) (digit_ptr - cpu_implementer_start));
+			cpuinfo_log_warning(
+				"CPU implementer %.*s in /proc/cpuinfo is ignored due to unexpected non-hex character '%c' at offset %zu",
+				(int)cpu_implementer_length,
+				cpu_implementer_start,
+				digit_char,
+				(size_t)(digit_ptr - cpu_implementer_start));
 			return;
 		}
 		cpu_implementer = cpu_implementer * 16 + digit;
@@ -511,8 +547,7 @@ static void parse_cpu_implementer(
 static void parse_cpu_variant(
 	const char* cpu_variant_start,
 	const char* cpu_variant_end,
-	struct cpuinfo_arm_linux_processor processor[restrict static 1])
-{
+	struct cpuinfo_arm_linux_processor processor[restrict static 1]) {
 	const size_t cpu_variant_length = cpu_variant_end - cpu_variant_start;
 
 	/*
@@ -521,30 +556,39 @@ static void parse_cpu_variant(
 	 * Main ID Register (MIDR) assigns only a 4-bit value for CPU variant.
 	 */
 	if (cpu_variant_length != 3) {
-		cpuinfo_log_warning("CPU variant %.*s in /proc/cpuinfo is ignored due to unexpected length (%zu)",
-			(int) cpu_variant_length, cpu_variant_start, cpu_variant_length);
+		cpuinfo_log_warning(
+			"CPU variant %.*s in /proc/cpuinfo is ignored due to unexpected length (%zu)",
+			(int)cpu_variant_length,
+			cpu_variant_start,
+			cpu_variant_length);
 		return;
 	}
 
 	/* Skip if there is no hex prefix (0x) */
 	if (cpu_variant_start[0] != '0' || cpu_variant_start[1] != 'x') {
-		cpuinfo_log_warning("CPU variant %.*s in /proc/cpuinfo is ignored due to lack of 0x prefix",
-			(int) cpu_variant_length, cpu_variant_start);
+		cpuinfo_log_warning(
+			"CPU variant %.*s in /proc/cpuinfo is ignored due to lack of 0x prefix",
+			(int)cpu_variant_length,
+			cpu_variant_start);
 		return;
 	}
 
-	/* Check if the value after hex prefix is indeed a hex digit and decode it. */
+	/* Check if the value after hex prefix is indeed a hex digit and decode
+	 * it. */
 	const char digit_char = cpu_variant_start[2];
 	uint32_t cpu_variant;
-	if ((uint32_t) (digit_char - '0') < 10) {
-		cpu_variant = (uint32_t) (digit_char - '0');
-	} else if ((uint32_t) (digit_char - 'A') < 6) {
-		cpu_variant = 10 + (uint32_t) (digit_char - 'A');
-	} else if ((uint32_t) (digit_char - 'a') < 6) {
-		cpu_variant = 10 + (uint32_t) (digit_char - 'a');
+	if ((uint32_t)(digit_char - '0') < 10) {
+		cpu_variant = (uint32_t)(digit_char - '0');
+	} else if ((uint32_t)(digit_char - 'A') < 6) {
+		cpu_variant = 10 + (uint32_t)(digit_char - 'A');
+	} else if ((uint32_t)(digit_char - 'a') < 6) {
+		cpu_variant = 10 + (uint32_t)(digit_char - 'a');
 	} else {
-		cpuinfo_log_warning("CPU variant %.*s in /proc/cpuinfo is ignored due to unexpected non-hex character '%c'",
-			(int) cpu_variant_length, cpu_variant_start, digit_char);
+		cpuinfo_log_warning(
+			"CPU variant %.*s in /proc/cpuinfo is ignored due to unexpected non-hex character '%c'",
+			(int)cpu_variant_length,
+			cpu_variant_start,
+			digit_char);
 		return;
 	}
 
@@ -555,17 +599,20 @@ static void parse_cpu_variant(
 static void parse_cpu_revision(
 	const char* cpu_revision_start,
 	const char* cpu_revision_end,
-	struct cpuinfo_arm_linux_processor processor[restrict static 1])
-{
+	struct cpuinfo_arm_linux_processor processor[restrict static 1]) {
 	uint32_t cpu_revision = 0;
 	for (const char* digit_ptr = cpu_revision_start; digit_ptr != cpu_revision_end; digit_ptr++) {
-		const uint32_t digit = (uint32_t) (*digit_ptr - '0');
+		const uint32_t digit = (uint32_t)(*digit_ptr - '0');
 
-		/* Verify that the character in CPU revision is a decimal digit */
+		/* Verify that the character in CPU revision is a decimal digit
+		 */
 		if (digit >= 10) {
-			cpuinfo_log_warning("CPU revision %.*s in /proc/cpuinfo is ignored due to unexpected non-digit character '%c' at offset %zu",
-				(int) (cpu_revision_end - cpu_revision_start), cpu_revision_start,
-				*digit_ptr, (size_t) (digit_ptr - cpu_revision_start));
+			cpuinfo_log_warning(
+				"CPU revision %.*s in /proc/cpuinfo is ignored due to unexpected non-digit character '%c' at offset %zu",
+				(int)(cpu_revision_end - cpu_revision_start),
+				cpu_revision_start,
+				*digit_ptr,
+				(size_t)(digit_ptr - cpu_revision_start));
 			return;
 		}
 
@@ -598,15 +645,18 @@ static void parse_cache_number(
 	const char* number_name,
 	uint32_t number_ptr[restrict static 1],
 	uint32_t flags[restrict static 1],
-	uint32_t number_mask)
-{
+	uint32_t number_mask) {
 	uint32_t number = 0;
 	for (const char* digit_ptr = number_start; digit_ptr != number_end; digit_ptr++) {
 		const uint32_t digit = *digit_ptr - '0';
 		if (digit >= 10) {
-			cpuinfo_log_warning("%s %.*s in /proc/cpuinfo is ignored due to unexpected non-digit character '%c' at offset %zu",
-				number_name, (int) (number_end - number_start), number_start,
-				*digit_ptr, (size_t) (digit_ptr - number_start));
+			cpuinfo_log_warning(
+				"%s %.*s in /proc/cpuinfo is ignored due to unexpected non-digit character '%c' at offset %zu",
+				number_name,
+				(int)(number_end - number_start),
+				number_start,
+				*digit_ptr,
+				(size_t)(digit_ptr - number_start));
 			return;
 		}
 
@@ -614,11 +664,15 @@ static void parse_cache_number(
 	}
 
 	if (number == 0) {
-		cpuinfo_log_warning("%s %.*s in /proc/cpuinfo is ignored due to invalid value of zero reported by the kernel",
-			number_name, (int) (number_end - number_start), number_start);
+		cpuinfo_log_warning(
+			"%s %.*s in /proc/cpuinfo is ignored due to invalid value of zero reported by the kernel",
+			number_name,
+			(int)(number_end - number_start),
+			number_start);
 	}
 
-	/* If the number specifies a cache line size, verify that is a reasonable power of 2 */
+	/* If the number specifies a cache line size, verify that is a
+	 * reasonable power of 2 */
 	if (number_mask & CPUINFO_ARM_LINUX_VALID_CACHE_LINE) {
 		switch (number) {
 			case 16:
@@ -627,8 +681,11 @@ static void parse_cache_number(
 			case 128:
 				break;
 			default:
-				cpuinfo_log_warning("invalid %s %.*s is ignored: a value of 16, 32, 64, or 128 expected",
-					number_name, (int) (number_end - number_start), number_start);
+				cpuinfo_log_warning(
+					"invalid %s %.*s is ignored: a value of 16, 32, 64, or 128 expected",
+					number_name,
+					(int)(number_end - number_start),
+					number_start);
 		}
 	}
 
@@ -658,12 +715,9 @@ struct proc_cpuinfo_parser_state {
  *		processor       : 1
  *		BogoMIPS        : 1363.33
  *
- *		Features        : swp half thumb fastmult vfp edsp thumbee neon vfpv3
- *		CPU implementer : 0x41
- *		CPU architecture: 7
- *		CPU variant     : 0x2
- *		CPU part        : 0xc09
- *		CPU revision    : 10
+ *		Features        : swp half thumb fastmult vfp edsp thumbee neon
+ *vfpv3 CPU implementer : 0x41 CPU architecture: 7 CPU variant     : 0x2 CPU
+ *part        : 0xc09 CPU revision    : 10
  *
  *		Hardware        : OMAP4 Panda board
  *		Revision        : 0020
@@ -673,8 +727,7 @@ static bool parse_line(
 	const char* line_start,
 	const char* line_end,
 	struct proc_cpuinfo_parser_state state[restrict static 1],
-	uint64_t line_number)
-{
+	uint64_t line_number) {
 	/* Empty line. Skip. */
 	if (line_start == line_end) {
 		return true;
@@ -689,8 +742,10 @@ static bool parse_line(
 	}
 	/* Skip line if no ':' separator was found. */
 	if (separator == line_end) {
-		cpuinfo_log_info("Line %.*s in /proc/cpuinfo is ignored: key/value separator ':' not found",
-			(int) (line_end - line_start), line_start);
+		cpuinfo_log_debug(
+			"Line %.*s in /proc/cpuinfo is ignored: key/value separator ':' not found",
+			(int)(line_end - line_start),
+			line_start);
 		return true;
 	}
 
@@ -703,8 +758,10 @@ static bool parse_line(
 	}
 	/* Skip line if key contains nothing but spaces. */
 	if (key_end == line_start) {
-		cpuinfo_log_info("Line %.*s in /proc/cpuinfo is ignored: key contains only spaces",
-			(int) (line_end - line_start), line_start);
+		cpuinfo_log_debug(
+			"Line %.*s in /proc/cpuinfo is ignored: key contains only spaces",
+			(int)(line_end - line_start),
+			line_start);
 		return true;
 	}
 
@@ -717,8 +774,10 @@ static bool parse_line(
 	}
 	/* Value part contains nothing but spaces. Skip line. */
 	if (value_start == line_end) {
-		cpuinfo_log_info("Line %.*s in /proc/cpuinfo is ignored: value contains only spaces",
-			(int) (line_end - line_start), line_start);
+		cpuinfo_log_debug(
+			"Line %.*s in /proc/cpuinfo is ignored: value contains only spaces",
+			(int)(line_end - line_start),
+			line_start);
 		return true;
 	}
 
@@ -730,10 +789,10 @@ static bool parse_line(
 		}
 	}
 
-	const uint32_t processor_index      = state->processor_index;
+	const uint32_t processor_index = state->processor_index;
 	const uint32_t max_processors_count = state->max_processors_count;
 	struct cpuinfo_arm_linux_processor* processors = state->processors;
-	struct cpuinfo_arm_linux_processor* processor  = &state->dummy_processor;
+	struct cpuinfo_arm_linux_processor* processor = &state->dummy_processor;
 	if (processor_index < max_processors_count) {
 		processor = &processors[processor_index];
 	}
@@ -745,21 +804,37 @@ static bool parse_line(
 				/* Usually contains just zeros, useless */
 #if CPUINFO_ARCH_ARM
 			} else if (memcmp(line_start, "I size", key_length) == 0) {
-				parse_cache_number(value_start, value_end,
-					"instruction cache size", &processor->proc_cpuinfo_cache.i_size,
-					&processor->flags, CPUINFO_ARM_LINUX_VALID_ICACHE_SIZE);
+				parse_cache_number(
+					value_start,
+					value_end,
+					"instruction cache size",
+					&processor->proc_cpuinfo_cache.i_size,
+					&processor->flags,
+					CPUINFO_ARM_LINUX_VALID_ICACHE_SIZE);
 			} else if (memcmp(line_start, "I sets", key_length) == 0) {
-				parse_cache_number(value_start, value_end,
-					"instruction cache sets", &processor->proc_cpuinfo_cache.i_sets,
-					&processor->flags, CPUINFO_ARM_LINUX_VALID_ICACHE_SETS);
+				parse_cache_number(
+					value_start,
+					value_end,
+					"instruction cache sets",
+					&processor->proc_cpuinfo_cache.i_sets,
+					&processor->flags,
+					CPUINFO_ARM_LINUX_VALID_ICACHE_SETS);
 			} else if (memcmp(line_start, "D size", key_length) == 0) {
-				parse_cache_number(value_start, value_end,
-					"data cache size", &processor->proc_cpuinfo_cache.d_size,
-					&processor->flags, CPUINFO_ARM_LINUX_VALID_DCACHE_SIZE);
+				parse_cache_number(
+					value_start,
+					value_end,
+					"data cache size",
+					&processor->proc_cpuinfo_cache.d_size,
+					&processor->flags,
+					CPUINFO_ARM_LINUX_VALID_DCACHE_SIZE);
 			} else if (memcmp(line_start, "D sets", key_length) == 0) {
-				parse_cache_number(value_start, value_end,
-					"data cache sets", &processor->proc_cpuinfo_cache.d_sets,
-					&processor->flags, CPUINFO_ARM_LINUX_VALID_DCACHE_SETS);
+				parse_cache_number(
+					value_start,
+					value_end,
+					"data cache sets",
+					&processor->proc_cpuinfo_cache.d_sets,
+					&processor->flags,
+					CPUINFO_ARM_LINUX_VALID_DCACHE_SETS);
 #endif /* CPUINFO_ARCH_ARM */
 			} else {
 				goto unknown;
@@ -768,13 +843,21 @@ static bool parse_line(
 #if CPUINFO_ARCH_ARM
 		case 7:
 			if (memcmp(line_start, "I assoc", key_length) == 0) {
-				parse_cache_number(value_start, value_end,
-					"instruction cache associativity", &processor->proc_cpuinfo_cache.i_assoc,
-					&processor->flags, CPUINFO_ARM_LINUX_VALID_ICACHE_WAYS);
+				parse_cache_number(
+					value_start,
+					value_end,
+					"instruction cache associativity",
+					&processor->proc_cpuinfo_cache.i_assoc,
+					&processor->flags,
+					CPUINFO_ARM_LINUX_VALID_ICACHE_WAYS);
 			} else if (memcmp(line_start, "D assoc", key_length) == 0) {
-				parse_cache_number(value_start, value_end,
-					"data cache associativity", &processor->proc_cpuinfo_cache.d_assoc,
-					&processor->flags, CPUINFO_ARM_LINUX_VALID_DCACHE_WAYS);
+				parse_cache_number(
+					value_start,
+					value_end,
+					"data cache associativity",
+					&processor->proc_cpuinfo_cache.d_assoc,
+					&processor->flags,
+					CPUINFO_ARM_LINUX_VALID_DCACHE_WAYS);
 			} else {
 				goto unknown;
 			}
@@ -790,27 +873,33 @@ static bool parse_line(
 			} else if (memcmp(line_start, "Hardware", key_length) == 0) {
 				size_t value_length = value_end - value_start;
 				if (value_length > CPUINFO_HARDWARE_VALUE_MAX) {
-					cpuinfo_log_info(
+					cpuinfo_log_warning(
 						"length of Hardware value \"%.*s\" in /proc/cpuinfo exceeds limit (%d): truncating to the limit",
-						(int) value_length, value_start, CPUINFO_HARDWARE_VALUE_MAX);
+						(int)value_length,
+						value_start,
+						CPUINFO_HARDWARE_VALUE_MAX);
 					value_length = CPUINFO_HARDWARE_VALUE_MAX;
 				} else {
 					state->hardware[value_length] = '\0';
 				}
 				memcpy(state->hardware, value_start, value_length);
-				cpuinfo_log_debug("parsed /proc/cpuinfo Hardware = \"%.*s\"", (int) value_length, value_start);
+				cpuinfo_log_debug(
+					"parsed /proc/cpuinfo Hardware = \"%.*s\"", (int)value_length, value_start);
 			} else if (memcmp(line_start, "Revision", key_length) == 0) {
 				size_t value_length = value_end - value_start;
 				if (value_length > CPUINFO_REVISION_VALUE_MAX) {
-					cpuinfo_log_info(
+					cpuinfo_log_warning(
 						"length of Revision value \"%.*s\" in /proc/cpuinfo exceeds limit (%d): truncating to the limit",
-						(int) value_length, value_start, CPUINFO_REVISION_VALUE_MAX);
+						(int)value_length,
+						value_start,
+						CPUINFO_REVISION_VALUE_MAX);
 					value_length = CPUINFO_REVISION_VALUE_MAX;
 				} else {
 					state->revision[value_length] = '\0';
 				}
 				memcpy(state->revision, value_start, value_length);
-				cpuinfo_log_debug("parsed /proc/cpuinfo Revision = \"%.*s\"", (int) value_length, value_start);
+				cpuinfo_log_debug(
+					"parsed /proc/cpuinfo Revision = \"%.*s\"", (int)value_length, value_start);
 			} else {
 				goto unknown;
 			}
@@ -819,28 +908,39 @@ static bool parse_line(
 			if (memcmp(line_start, "processor", key_length) == 0) {
 				const uint32_t new_processor_index = parse_processor_number(value_start, value_end);
 				if (new_processor_index < processor_index) {
-					/* Strange: decreasing processor number */
+					/* Strange: decreasing processor number
+					 */
 					cpuinfo_log_warning(
-						"unexpectedly low processor number %"PRIu32" following processor %"PRIu32" in /proc/cpuinfo",
-						new_processor_index, processor_index);
+						"unexpectedly low processor number %" PRIu32
+						" following processor %" PRIu32 " in /proc/cpuinfo",
+						new_processor_index,
+						processor_index);
 				} else if (new_processor_index > processor_index + 1) {
-					/* Strange, but common: skipped processor $(processor_index + 1) */
-					cpuinfo_log_info(
-						"unexpectedly high processor number %"PRIu32" following processor %"PRIu32" in /proc/cpuinfo",
-						new_processor_index, processor_index);
+					/* Strange, but common: skipped
+					 * processor $(processor_index + 1) */
+					cpuinfo_log_warning(
+						"unexpectedly high processor number %" PRIu32
+						" following processor %" PRIu32 " in /proc/cpuinfo",
+						new_processor_index,
+						processor_index);
 				}
 				if (new_processor_index < max_processors_count) {
-					/* Record that the processor was mentioned in /proc/cpuinfo */
+					/* Record that the processor was
+					 * mentioned in /proc/cpuinfo */
 					processors[new_processor_index].flags |= CPUINFO_ARM_LINUX_VALID_PROCESSOR;
 				} else {
 					/* Log and ignore processor */
-					cpuinfo_log_warning("processor %"PRIu32" in /proc/cpuinfo is ignored: index exceeds system limit %"PRIu32,
-						new_processor_index, max_processors_count - 1);
+					cpuinfo_log_warning(
+						"processor %" PRIu32
+						" in /proc/cpuinfo is ignored: index exceeds system limit %" PRIu32,
+						new_processor_index,
+						max_processors_count - 1);
 				}
 				state->processor_index = new_processor_index;
 				return true;
 			} else if (memcmp(line_start, "Processor", key_length) == 0) {
-				/* TODO: parse to fix misreported architecture, similar to Android's cpufeatures */
+				/* TODO: parse to fix misreported architecture,
+				 * similar to Android's cpufeatures */
 			} else {
 				goto unknown;
 			}
@@ -862,13 +962,21 @@ static bool parse_line(
 #if CPUINFO_ARCH_ARM
 		case 13:
 			if (memcmp(line_start, "I line length", key_length) == 0) {
-				parse_cache_number(value_start, value_end,
-					"instruction cache line size", &processor->proc_cpuinfo_cache.i_line_length,
-					&processor->flags, CPUINFO_ARM_LINUX_VALID_ICACHE_LINE);
+				parse_cache_number(
+					value_start,
+					value_end,
+					"instruction cache line size",
+					&processor->proc_cpuinfo_cache.i_line_length,
+					&processor->flags,
+					CPUINFO_ARM_LINUX_VALID_ICACHE_LINE);
 			} else if (memcmp(line_start, "D line length", key_length) == 0) {
-				parse_cache_number(value_start, value_end,
-					"data cache line size", &processor->proc_cpuinfo_cache.d_line_length,
-					&processor->flags, CPUINFO_ARM_LINUX_VALID_DCACHE_LINE);
+				parse_cache_number(
+					value_start,
+					value_end,
+					"data cache line size",
+					&processor->proc_cpuinfo_cache.d_line_length,
+					&processor->flags,
+					CPUINFO_ARM_LINUX_VALID_DCACHE_LINE);
 			} else {
 				goto unknown;
 			}
@@ -892,8 +1000,7 @@ static bool parse_line(
 			break;
 		default:
 		unknown:
-			cpuinfo_log_debug("unknown /proc/cpuinfo key: %.*s", (int) key_length, line_start);
-
+			cpuinfo_log_debug("unknown /proc/cpuinfo key: %.*s", (int)key_length, line_start);
 	}
 	return true;
 }
@@ -902,8 +1009,7 @@ bool cpuinfo_arm_linux_parse_proc_cpuinfo(
 	char hardware[restrict static CPUINFO_HARDWARE_VALUE_MAX],
 	char revision[restrict static CPUINFO_REVISION_VALUE_MAX],
 	uint32_t max_processors_count,
-	struct cpuinfo_arm_linux_processor processors[restrict static max_processors_count])
-{
+	struct cpuinfo_arm_linux_processor processors[restrict static max_processors_count]) {
 	hardware[0] = '\0';
 	struct proc_cpuinfo_parser_state state = {
 		.hardware = hardware,
@@ -912,6 +1018,6 @@ bool cpuinfo_arm_linux_parse_proc_cpuinfo(
 		.max_processors_count = max_processors_count,
 		.processors = processors,
 	};
-	return cpuinfo_linux_parse_multiline_file("/proc/cpuinfo", BUFFER_SIZE,
-		(cpuinfo_line_callback) parse_line, &state);
+	return cpuinfo_linux_parse_multiline_file(
+		"/proc/cpuinfo", BUFFER_SIZE, (cpuinfo_line_callback)parse_line, &state);
 }

3rdparty/cpuinfo/src/arm/linux/hwcap.c

@@ -1,163 +1,154 @@
 #include <limits.h>
 #include <string.h>
 
-#include <unistd.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <fcntl.h>
-#include <errno.h>
 #include <dlfcn.h>
 #include <elf.h>
+#include <errno.h>
+#include <fcntl.h>
+#include <sys/stat.h>
+#include <sys/types.h>
+#include <unistd.h>
 
 #if CPUINFO_MOCK
-	#include <cpuinfo-mock.h>
+#include <cpuinfo-mock.h>
 #endif
-#include <cpuinfo.h>
 #include <arm/linux/api.h>
+#include <cpuinfo.h>
 #include <cpuinfo/log.h>
 
-#if CPUINFO_ARCH_ARM64 || CPUINFO_ARCH_ARM && \
-		defined(__GLIBC__) && defined(__GLIBC_MINOR__) && (__GLIBC__ > 2 || __GLIBC__ == 2 && __GLIBC_MINOR__ >= 16)
-	#include <sys/auxv.h>
+#if CPUINFO_ARCH_ARM64 ||                                                     \
+	CPUINFO_ARCH_ARM && defined(__GLIBC__) && defined(__GLIBC_MINOR__) && \
+		(__GLIBC__ > 2 || __GLIBC__ == 2 && __GLIBC_MINOR__ >= 16)
+#include <sys/auxv.h>
 #else
-	#define AT_HWCAP 16
-	#define AT_HWCAP2 26
+#define AT_HWCAP 16
+#define AT_HWCAP2 26
 #endif
 
-
 #if CPUINFO_MOCK
-	static uint32_t mock_hwcap = 0;
-	void cpuinfo_set_hwcap(uint32_t hwcap) {
-		mock_hwcap = hwcap;
-	}
+static uint32_t mock_hwcap = 0;
+void cpuinfo_set_hwcap(uint32_t hwcap) {
+	mock_hwcap = hwcap;
+}
 
-	static uint32_t mock_hwcap2 = 0;
-	void cpuinfo_set_hwcap2(uint32_t hwcap2) {
-		mock_hwcap2 = hwcap2;
-	}
+static uint32_t mock_hwcap2 = 0;
+void cpuinfo_set_hwcap2(uint32_t hwcap2) {
+	mock_hwcap2 = hwcap2;
+}
 #endif
 
-
 #if CPUINFO_ARCH_ARM
-	typedef unsigned long (*getauxval_function_t)(unsigned long);
+typedef unsigned long (*getauxval_function_t)(unsigned long);
 
-	bool cpuinfo_arm_linux_hwcap_from_getauxval(
-		uint32_t hwcap[restrict static 1],
-		uint32_t hwcap2[restrict static 1])
-	{
-		#if CPUINFO_MOCK
-			*hwcap  = mock_hwcap;
-			*hwcap2 = mock_hwcap2;
-			return true;
-		#elif defined(__ANDROID__)
-			/* Android: dynamically check if getauxval is supported */
-			void* libc = NULL;
-			getauxval_function_t getauxval = NULL;
+bool cpuinfo_arm_linux_hwcap_from_getauxval(uint32_t hwcap[restrict static 1], uint32_t hwcap2[restrict static 1]) {
+#if CPUINFO_MOCK
+	*hwcap = mock_hwcap;
+	*hwcap2 = mock_hwcap2;
+	return true;
+#elif defined(__ANDROID__)
+	/* Android: dynamically check if getauxval is supported */
+	void* libc = NULL;
+	getauxval_function_t getauxval = NULL;
 
-			dlerror();
-			libc = dlopen("libc.so", RTLD_LAZY);
-			if (libc == NULL) {
-				cpuinfo_log_warning("failed to load libc.so: %s", dlerror());
-				goto cleanup;
-			}
-
-			getauxval = (getauxval_function_t) dlsym(libc, "getauxval");
-			if (getauxval == NULL) {
-				cpuinfo_log_info("failed to locate getauxval in libc.so: %s", dlerror());
-				goto cleanup;
-			}
-
-			*hwcap  = getauxval(AT_HWCAP);
-			*hwcap2 = getauxval(AT_HWCAP2);
-
-		cleanup:
-			if (libc != NULL) {
-				dlclose(libc);
-				libc = NULL;
-			}
-			return getauxval != NULL;
-		#elif defined(__GLIBC__) && defined(__GLIBC_MINOR__) && (__GLIBC__ > 2 || __GLIBC__ == 2 && __GLIBC_MINOR__ >= 16)
-			/* GNU/Linux: getauxval is supported since glibc-2.16 */
-			*hwcap  = getauxval(AT_HWCAP);
-			*hwcap2 = getauxval(AT_HWCAP2);
-			return true;
-		#else
-			return false;
-		#endif
+	dlerror();
+	libc = dlopen("libc.so", RTLD_LAZY);
+	if (libc == NULL) {
+		cpuinfo_log_warning("failed to load libc.so: %s", dlerror());
+		goto cleanup;
 	}
 
-	#ifdef __ANDROID__
-		bool cpuinfo_arm_linux_hwcap_from_procfs(
-			uint32_t hwcap[restrict static 1],
-			uint32_t hwcap2[restrict static 1])
-		{
-			#if CPUINFO_MOCK
-				*hwcap  = mock_hwcap;
-				*hwcap2 = mock_hwcap2;
-				return true;
-			#else
-				uint32_t hwcaps[2] = { 0, 0 };
-				bool result = false;
-				int file = -1;
-
-				file = open("/proc/self/auxv", O_RDONLY);
-				if (file == -1) {
-					cpuinfo_log_warning("failed to open /proc/self/auxv: %s", strerror(errno));
-					goto cleanup;
-				}
-
-				ssize_t bytes_read;
-				do {
-					Elf32_auxv_t elf_auxv;
-					bytes_read = read(file, &elf_auxv, sizeof(Elf32_auxv_t));
-					if (bytes_read < 0) {
-						cpuinfo_log_warning("failed to read /proc/self/auxv: %s", strerror(errno));
-						goto cleanup;
-					} else if (bytes_read > 0) {
-						if (bytes_read == sizeof(elf_auxv)) {
-							switch (elf_auxv.a_type) {
-								case AT_HWCAP:
-									hwcaps[0] = (uint32_t) elf_auxv.a_un.a_val;
-									break;
-								case AT_HWCAP2:
-									hwcaps[1] = (uint32_t) elf_auxv.a_un.a_val;
-									break;
-							}
-						} else {
-							cpuinfo_log_warning(
-								"failed to read %zu bytes from /proc/self/auxv: %zu bytes available",
-								sizeof(elf_auxv), (size_t) bytes_read);
-							goto cleanup;
-						}
-					}
-				} while (bytes_read == sizeof(Elf32_auxv_t));
-
-				/* Success, commit results */
-				*hwcap  = hwcaps[0];
-				*hwcap2 = hwcaps[1];
-				result = true;
-
-			cleanup:
-				if (file != -1) {
-					close(file);
-					file = -1;
-				}
-				return result;
-			#endif
-		}
-	#endif /* __ANDROID__ */
-#elif CPUINFO_ARCH_ARM64
-	void cpuinfo_arm_linux_hwcap_from_getauxval(
-		uint32_t hwcap[restrict static 1],
-		uint32_t hwcap2[restrict static 1])
-	{
-		#if CPUINFO_MOCK
-			*hwcap  = mock_hwcap;
-			*hwcap2 = mock_hwcap2;
-		#else
-			*hwcap  = (uint32_t) getauxval(AT_HWCAP);
-			*hwcap2 = (uint32_t) getauxval(AT_HWCAP2);
-			return ;
-		#endif
+	getauxval = (getauxval_function_t)dlsym(libc, "getauxval");
+	if (getauxval == NULL) {
+		cpuinfo_log_info("failed to locate getauxval in libc.so: %s", dlerror());
+		goto cleanup;
 	}
+
+	*hwcap = getauxval(AT_HWCAP);
+	*hwcap2 = getauxval(AT_HWCAP2);
+
+cleanup:
+	if (libc != NULL) {
+		dlclose(libc);
+		libc = NULL;
+	}
+	return getauxval != NULL;
+#elif defined(__GLIBC__) && defined(__GLIBC_MINOR__) && (__GLIBC__ > 2 || __GLIBC__ == 2 && __GLIBC_MINOR__ >= 16)
+	/* GNU/Linux: getauxval is supported since glibc-2.16 */
+	*hwcap = getauxval(AT_HWCAP);
+	*hwcap2 = getauxval(AT_HWCAP2);
+	return true;
+#else
+	return false;
+#endif
+}
+
+#ifdef __ANDROID__
+bool cpuinfo_arm_linux_hwcap_from_procfs(uint32_t hwcap[restrict static 1], uint32_t hwcap2[restrict static 1]) {
+#if CPUINFO_MOCK
+	*hwcap = mock_hwcap;
+	*hwcap2 = mock_hwcap2;
+	return true;
+#else
+	uint32_t hwcaps[2] = {0, 0};
+	bool result = false;
+	int file = -1;
+
+	file = open("/proc/self/auxv", O_RDONLY);
+	if (file == -1) {
+		cpuinfo_log_warning("failed to open /proc/self/auxv: %s", strerror(errno));
+		goto cleanup;
+	}
+
+	ssize_t bytes_read;
+	do {
+		Elf32_auxv_t elf_auxv;
+		bytes_read = read(file, &elf_auxv, sizeof(Elf32_auxv_t));
+		if (bytes_read < 0) {
+			cpuinfo_log_warning("failed to read /proc/self/auxv: %s", strerror(errno));
+			goto cleanup;
+		} else if (bytes_read > 0) {
+			if (bytes_read == sizeof(elf_auxv)) {
+				switch (elf_auxv.a_type) {
+					case AT_HWCAP:
+						hwcaps[0] = (uint32_t)elf_auxv.a_un.a_val;
+						break;
+					case AT_HWCAP2:
+						hwcaps[1] = (uint32_t)elf_auxv.a_un.a_val;
+						break;
+				}
+			} else {
+				cpuinfo_log_warning(
+					"failed to read %zu bytes from /proc/self/auxv: %zu bytes available",
+					sizeof(elf_auxv),
+					(size_t)bytes_read);
+				goto cleanup;
+			}
+		}
+	} while (bytes_read == sizeof(Elf32_auxv_t));
+
+	/* Success, commit results */
+	*hwcap = hwcaps[0];
+	*hwcap2 = hwcaps[1];
+	result = true;
+
+cleanup:
+	if (file != -1) {
+		close(file);
+		file = -1;
+	}
+	return result;
+#endif
+}
+#endif /* __ANDROID__ */
+#elif CPUINFO_ARCH_ARM64
+void cpuinfo_arm_linux_hwcap_from_getauxval(uint32_t hwcap[restrict static 1], uint32_t hwcap2[restrict static 1]) {
+#if CPUINFO_MOCK
+	*hwcap = mock_hwcap;
+	*hwcap2 = mock_hwcap2;
+#else
+	*hwcap = (uint32_t)getauxval(AT_HWCAP);
+	*hwcap2 = (uint32_t)getauxval(AT_HWCAP2);
+	return;
+#endif
+}
 #endif

3rdparty/cpuinfo/src/arm/linux/init.c

@@ -1,23 +1,22 @@
-#include <stdint.h>
 #include <stddef.h>
+#include <stdint.h>
 #include <stdlib.h>
 #include <string.h>
 
-#include <cpuinfo.h>
 #include <arm/linux/api.h>
+#include <cpuinfo.h>
 #if defined(__ANDROID__)
-	#include <arm/android/api.h>
+#include <arm/android/api.h>
 #endif
 #include <arm/api.h>
 #include <arm/midr.h>
-#include <linux/api.h>
 #include <cpuinfo/internal-api.h>
 #include <cpuinfo/log.h>
+#include <linux/api.h>
 
+struct cpuinfo_arm_isa cpuinfo_isa = {0};
 
-struct cpuinfo_arm_isa cpuinfo_isa = { 0 };
-
-static struct cpuinfo_package package = { { 0 } };
+static struct cpuinfo_package package = {{0}};
 
 static inline bool bitmask_all(uint32_t bitfield, uint32_t mask) {
 	return (bitfield & mask) == mask;
@@ -32,16 +31,19 @@ static inline int cmp(uint32_t a, uint32_t b) {
 }
 
 static bool cluster_siblings_parser(
-	uint32_t processor, uint32_t siblings_start, uint32_t siblings_end,
-	struct cpuinfo_arm_linux_processor* processors)
-{
+	uint32_t processor,
+	uint32_t siblings_start,
+	uint32_t siblings_end,
+	struct cpuinfo_arm_linux_processor* processors) {
 	processors[processor].flags |= CPUINFO_LINUX_FLAG_PACKAGE_CLUSTER;
 	uint32_t package_leader_id = processors[processor].package_leader_id;
 
 	for (uint32_t sibling = siblings_start; sibling < siblings_end; sibling++) {
 		if (!bitmask_all(processors[sibling].flags, CPUINFO_LINUX_FLAG_VALID)) {
-			cpuinfo_log_info("invalid processor %"PRIu32" reported as a sibling for processor %"PRIu32,
-				sibling, processor);
+			cpuinfo_log_info(
+				"invalid processor %" PRIu32 " reported as a sibling for processor %" PRIu32,
+				sibling,
+				processor);
 			continue;
 		}
 
@@ -60,14 +62,14 @@ static bool cluster_siblings_parser(
 }
 
 static int cmp_arm_linux_processor(const void* ptr_a, const void* ptr_b) {
-	const struct cpuinfo_arm_linux_processor* processor_a = (const struct cpuinfo_arm_linux_processor*) ptr_a;
-	const struct cpuinfo_arm_linux_processor* processor_b = (const struct cpuinfo_arm_linux_processor*) ptr_b;
+	const struct cpuinfo_arm_linux_processor* processor_a = (const struct cpuinfo_arm_linux_processor*)ptr_a;
+	const struct cpuinfo_arm_linux_processor* processor_b = (const struct cpuinfo_arm_linux_processor*)ptr_b;
 
 	/* Move usable processors towards the start of the array */
 	const bool usable_a = bitmask_all(processor_a->flags, CPUINFO_LINUX_FLAG_VALID);
 	const bool usable_b = bitmask_all(processor_b->flags, CPUINFO_LINUX_FLAG_VALID);
 	if (usable_a != usable_b) {
-		return (int) usable_b - (int) usable_a;
+		return (int)usable_b - (int)usable_a;
 	}
 
 	/* Compare based on core type (e.g. Cortex-A57 < Cortex-A53) */
@@ -95,7 +97,8 @@ static int cmp_arm_linux_processor(const void* ptr_a, const void* ptr_b) {
 		return cluster_a > cluster_b ? -1 : 1;
 	}
 
-	/* Compare based on system processor id (i.e. processor 0 < processor 1) */
+	/* Compare based on system processor id (i.e. processor 0 < processor 1)
+	 */
 	const uint32_t id_a = processor_a->system_processor_id;
 	const uint32_t id_b = processor_b->system_processor_id;
 	return cmp(id_a, id_b);
@@ -116,14 +119,13 @@ void cpuinfo_arm_linux_init(void) {
 	uint32_t* linux_cpu_to_uarch_index_map = NULL;
 
 	const uint32_t max_processors_count = cpuinfo_linux_get_max_processors_count();
-	cpuinfo_log_debug("system maximum processors count: %"PRIu32, max_processors_count);
+	cpuinfo_log_debug("system maximum processors count: %" PRIu32, max_processors_count);
 
-	const uint32_t max_possible_processors_count = 1 +
-		cpuinfo_linux_get_max_possible_processor(max_processors_count);
-	cpuinfo_log_debug("maximum possible processors count: %"PRIu32, max_possible_processors_count);
-	const uint32_t max_present_processors_count = 1 +
-		cpuinfo_linux_get_max_present_processor(max_processors_count);
-	cpuinfo_log_debug("maximum present processors count: %"PRIu32, max_present_processors_count);
+	const uint32_t max_possible_processors_count =
+		1 + cpuinfo_linux_get_max_possible_processor(max_processors_count);
+	cpuinfo_log_debug("maximum possible processors count: %" PRIu32, max_possible_processors_count);
+	const uint32_t max_present_processors_count = 1 + cpuinfo_linux_get_max_present_processor(max_processors_count);
+	cpuinfo_log_debug("maximum present processors count: %" PRIu32, max_present_processors_count);
 
 	uint32_t valid_processor_mask = 0;
 	uint32_t arm_linux_processors_count = max_processors_count;
@@ -143,7 +145,7 @@ void cpuinfo_arm_linux_init(void) {
 	arm_linux_processors = calloc(arm_linux_processors_count, sizeof(struct cpuinfo_arm_linux_processor));
 	if (arm_linux_processors == NULL) {
 		cpuinfo_log_error(
-			"failed to allocate %zu bytes for descriptions of %"PRIu32" ARM logical processors",
+			"failed to allocate %zu bytes for descriptions of %" PRIu32 " ARM logical processors",
 			arm_linux_processors_count * sizeof(struct cpuinfo_arm_linux_processor),
 			arm_linux_processors_count);
 		return;
@@ -151,14 +153,16 @@ void cpuinfo_arm_linux_init(void) {
 
 	if (max_possible_processors_count) {
 		cpuinfo_linux_detect_possible_processors(
-			arm_linux_processors_count, &arm_linux_processors->flags,
+			arm_linux_processors_count,
+			&arm_linux_processors->flags,
 			sizeof(struct cpuinfo_arm_linux_processor),
 			CPUINFO_LINUX_FLAG_POSSIBLE);
 	}
 
 	if (max_present_processors_count) {
 		cpuinfo_linux_detect_present_processors(
-			arm_linux_processors_count, &arm_linux_processors->flags,
+			arm_linux_processors_count,
+			&arm_linux_processors->flags,
 			sizeof(struct cpuinfo_arm_linux_processor),
 			CPUINFO_LINUX_FLAG_PRESENT);
 	}
@@ -173,13 +177,13 @@ void cpuinfo_arm_linux_init(void) {
 
 	if (!cpuinfo_arm_linux_parse_proc_cpuinfo(
 #if defined(__ANDROID__)
-			android_properties.proc_cpuinfo_hardware,
+		    android_properties.proc_cpuinfo_hardware,
 #else
-			proc_cpuinfo_hardware,
+		    proc_cpuinfo_hardware,
 #endif
-			proc_cpuinfo_revision,
-			arm_linux_processors_count,
-			arm_linux_processors)) {
+		    proc_cpuinfo_revision,
+		    arm_linux_processors_count,
+		    arm_linux_processors)) {
 		cpuinfo_log_error("failed to parse processor information from /proc/cpuinfo");
 		return;
 	}
@@ -187,45 +191,49 @@ void cpuinfo_arm_linux_init(void) {
 	for (uint32_t i = 0; i < arm_linux_processors_count; i++) {
 		if (bitmask_all(arm_linux_processors[i].flags, valid_processor_mask)) {
 			arm_linux_processors[i].flags |= CPUINFO_LINUX_FLAG_VALID;
-			cpuinfo_log_debug("parsed processor %"PRIu32" MIDR 0x%08"PRIx32,
-				i, arm_linux_processors[i].midr);
+			cpuinfo_log_debug(
+				"parsed processor %" PRIu32 " MIDR 0x%08" PRIx32, i, arm_linux_processors[i].midr);
 		}
 	}
 
 	uint32_t valid_processors = 0, last_midr = 0;
-	#if CPUINFO_ARCH_ARM
+#if CPUINFO_ARCH_ARM
 	uint32_t last_architecture_version = 0, last_architecture_flags = 0;
-	#endif
+#endif
 	for (uint32_t i = 0; i < arm_linux_processors_count; i++) {
 		arm_linux_processors[i].system_processor_id = i;
 		if (bitmask_all(arm_linux_processors[i].flags, CPUINFO_LINUX_FLAG_VALID)) {
 			if (arm_linux_processors[i].flags & CPUINFO_ARM_LINUX_VALID_PROCESSOR) {
 				/*
-				 * Processor is in possible and present lists, and also reported in /proc/cpuinfo.
-				 * This processor is availble for compute.
+				 * Processor is in possible and present lists,
+				 * and also reported in /proc/cpuinfo. This
+				 * processor is availble for compute.
 				 */
 				valid_processors += 1;
 			} else {
 				/*
-				 * Processor is in possible and present lists, but not reported in /proc/cpuinfo.
-				 * This is fairly common: high-index processors can be not reported if they are offline.
+				 * Processor is in possible and present lists,
+				 * but not reported in /proc/cpuinfo. This is
+				 * fairly common: high-index processors can be
+				 * not reported if they are offline.
 				 */
-				cpuinfo_log_info("processor %"PRIu32" is not listed in /proc/cpuinfo", i);
+				cpuinfo_log_info("processor %" PRIu32 " is not listed in /proc/cpuinfo", i);
 			}
 
 			if (bitmask_all(arm_linux_processors[i].flags, CPUINFO_ARM_LINUX_VALID_MIDR)) {
 				last_midr = arm_linux_processors[i].midr;
 			}
-			#if CPUINFO_ARCH_ARM
-				if (bitmask_all(arm_linux_processors[i].flags, CPUINFO_ARM_LINUX_VALID_ARCHITECTURE)) {
-					last_architecture_version = arm_linux_processors[i].architecture_version;
-					last_architecture_flags   = arm_linux_processors[i].architecture_flags;
-				}
-			#endif
+#if CPUINFO_ARCH_ARM
+			if (bitmask_all(arm_linux_processors[i].flags, CPUINFO_ARM_LINUX_VALID_ARCHITECTURE)) {
+				last_architecture_version = arm_linux_processors[i].architecture_version;
+				last_architecture_flags = arm_linux_processors[i].architecture_flags;
+			}
+#endif
 		} else {
-			/* Processor reported in /proc/cpuinfo, but not in possible and/or present lists: log and ignore */
+			/* Processor reported in /proc/cpuinfo, but not in
+			 * possible and/or present lists: log and ignore */
 			if (!(arm_linux_processors[i].flags & CPUINFO_ARM_LINUX_VALID_PROCESSOR)) {
-				cpuinfo_log_warning("invalid processor %"PRIu32" reported in /proc/cpuinfo", i);
+				cpuinfo_log_warning("invalid processor %" PRIu32 " reported in /proc/cpuinfo", i);
 			}
 		}
 	}
@@ -238,55 +246,65 @@ void cpuinfo_arm_linux_init(void) {
 		cpuinfo_arm_linux_decode_chipset(proc_cpuinfo_hardware, proc_cpuinfo_revision, valid_processors, 0);
 #endif
 
-	#if CPUINFO_ARCH_ARM
-		uint32_t isa_features = 0, isa_features2 = 0;
-		#ifdef __ANDROID__
+#if CPUINFO_ARCH_ARM
+	uint32_t isa_features = 0, isa_features2 = 0;
+#ifdef __ANDROID__
+	/*
+	 * On Android before API 20, libc.so does not provide getauxval
+	 * function. Thus, we try to dynamically find it, or use two fallback
+	 * mechanisms:
+	 * 1. dlopen libc.so, and try to find getauxval
+	 * 2. Parse /proc/self/auxv procfs file
+	 * 3. Use features reported in /proc/cpuinfo
+	 */
+	if (!cpuinfo_arm_linux_hwcap_from_getauxval(&isa_features, &isa_features2)) {
+		/* getauxval can't be used, fall back to parsing /proc/self/auxv
+		 */
+		if (!cpuinfo_arm_linux_hwcap_from_procfs(&isa_features, &isa_features2)) {
 			/*
-			 * On Android before API 20, libc.so does not provide getauxval function.
-			 * Thus, we try to dynamically find it, or use two fallback mechanisms:
-			 * 1. dlopen libc.so, and try to find getauxval
-			 * 2. Parse /proc/self/auxv procfs file
-			 * 3. Use features reported in /proc/cpuinfo
+			 * Reading /proc/self/auxv failed, probably due to file
+			 * permissions. Use information from /proc/cpuinfo to
+			 * detect ISA.
+			 *
+			 * If different processors report different ISA
+			 * features, take the intersection.
 			 */
-			if (!cpuinfo_arm_linux_hwcap_from_getauxval(&isa_features, &isa_features2)) {
-				/* getauxval can't be used, fall back to parsing /proc/self/auxv */
-				if (!cpuinfo_arm_linux_hwcap_from_procfs(&isa_features, &isa_features2)) {
-					/*
-					 * Reading /proc/self/auxv failed, probably due to file permissions.
-					 * Use information from /proc/cpuinfo to detect ISA.
-					 *
-					 * If different processors report different ISA features, take the intersection.
-					 */
-					uint32_t processors_with_features = 0;
-					for (uint32_t i = 0; i < arm_linux_processors_count; i++) {
-						if (bitmask_all(arm_linux_processors[i].flags, CPUINFO_LINUX_FLAG_VALID | CPUINFO_ARM_LINUX_VALID_FEATURES)) {
-							if (processors_with_features == 0) {
-								isa_features = arm_linux_processors[i].features;
-								isa_features2 = arm_linux_processors[i].features2;
-							} else {
-								isa_features &= arm_linux_processors[i].features;
-								isa_features2 &= arm_linux_processors[i].features2;
-							}
-							processors_with_features += 1;
-						}
+			uint32_t processors_with_features = 0;
+			for (uint32_t i = 0; i < arm_linux_processors_count; i++) {
+				if (bitmask_all(
+					    arm_linux_processors[i].flags,
+					    CPUINFO_LINUX_FLAG_VALID | CPUINFO_ARM_LINUX_VALID_FEATURES)) {
+					if (processors_with_features == 0) {
+						isa_features = arm_linux_processors[i].features;
+						isa_features2 = arm_linux_processors[i].features2;
+					} else {
+						isa_features &= arm_linux_processors[i].features;
+						isa_features2 &= arm_linux_processors[i].features2;
 					}
+					processors_with_features += 1;
 				}
 			}
-		#else
-			/* On GNU/Linux getauxval is always available */
-			cpuinfo_arm_linux_hwcap_from_getauxval(&isa_features, &isa_features2);
-		#endif
-		cpuinfo_arm_linux_decode_isa_from_proc_cpuinfo(
-			isa_features, isa_features2,
-			last_midr, last_architecture_version, last_architecture_flags,
-			&chipset, &cpuinfo_isa);
-	#elif CPUINFO_ARCH_ARM64
-		uint32_t isa_features = 0, isa_features2 = 0;
-		/* getauxval is always available on ARM64 Android */
-		cpuinfo_arm_linux_hwcap_from_getauxval(&isa_features, &isa_features2);
-		cpuinfo_arm64_linux_decode_isa_from_proc_cpuinfo(
-			isa_features, isa_features2, last_midr, &chipset, &cpuinfo_isa);
-	#endif
+		}
+	}
+#else
+	/* On GNU/Linux getauxval is always available */
+	cpuinfo_arm_linux_hwcap_from_getauxval(&isa_features, &isa_features2);
+#endif
+	cpuinfo_arm_linux_decode_isa_from_proc_cpuinfo(
+		isa_features,
+		isa_features2,
+		last_midr,
+		last_architecture_version,
+		last_architecture_flags,
+		&chipset,
+		&cpuinfo_isa);
+#elif CPUINFO_ARCH_ARM64
+	uint32_t isa_features = 0, isa_features2 = 0;
+	/* getauxval is always available on ARM64 Android */
+	cpuinfo_arm_linux_hwcap_from_getauxval(&isa_features, &isa_features2);
+	cpuinfo_arm64_linux_decode_isa_from_proc_cpuinfo(
+		isa_features, isa_features2, last_midr, &chipset, &cpuinfo_isa);
+#endif
 
 	/* Detect min/max frequency and package ID */
 	for (uint32_t i = 0; i < arm_linux_processors_count; i++) {
@@ -322,8 +340,9 @@ void cpuinfo_arm_linux_init(void) {
 
 		if (arm_linux_processors[i].flags & CPUINFO_LINUX_FLAG_PACKAGE_ID) {
 			cpuinfo_linux_detect_core_siblings(
-				arm_linux_processors_count, i,
-				(cpuinfo_siblings_callback) cluster_siblings_parser,
+				arm_linux_processors_count,
+				i,
+				(cpuinfo_siblings_callback)cluster_siblings_parser,
 				arm_linux_processors);
 		}
 	}
@@ -331,79 +350,107 @@ void cpuinfo_arm_linux_init(void) {
 	/* Propagate all cluster IDs */
 	uint32_t clustered_processors = 0;
 	for (uint32_t i = 0; i < arm_linux_processors_count; i++) {
-		if (bitmask_all(arm_linux_processors[i].flags, CPUINFO_LINUX_FLAG_VALID | CPUINFO_LINUX_FLAG_PACKAGE_CLUSTER)) {
+		if (bitmask_all(
+			    arm_linux_processors[i].flags,
+			    CPUINFO_LINUX_FLAG_VALID | CPUINFO_LINUX_FLAG_PACKAGE_CLUSTER)) {
 			clustered_processors += 1;
 
 			const uint32_t package_leader_id = arm_linux_processors[i].package_leader_id;
 			if (package_leader_id < i) {
-				arm_linux_processors[i].package_leader_id = arm_linux_processors[package_leader_id].package_leader_id;
+				arm_linux_processors[i].package_leader_id =
+					arm_linux_processors[package_leader_id].package_leader_id;
 			}
 
-			cpuinfo_log_debug("processor %"PRIu32" clustered with processor %"PRIu32" as inferred from system siblings lists",
-				i, arm_linux_processors[i].package_leader_id);
+			cpuinfo_log_debug(
+				"processor %" PRIu32 " clustered with processor %" PRIu32
+				" as inferred from system siblings lists",
+				i,
+				arm_linux_processors[i].package_leader_id);
 		}
 	}
 
 	if (clustered_processors != valid_processors) {
 		/*
-		 * Topology information about some or all logical processors may be unavailable, for the following reasons:
-		 * - Linux kernel is too old, or configured without support for topology information in sysfs.
-		 * - Core is offline, and Linux kernel is configured to not report topology for offline cores.
+		 * Topology information about some or all logical processors may
+		 * be unavailable, for the following reasons:
+		 * - Linux kernel is too old, or configured without support for
+		 * topology information in sysfs.
+		 * - Core is offline, and Linux kernel is configured to not
+		 * report topology for offline cores.
 		 *
-		 * In this case, we assign processors to clusters using two methods:
-		 * - Try heuristic cluster configurations (e.g. 6-core SoC usually has 4+2 big.LITTLE configuration).
-		 * - If heuristic failed, assign processors to core clusters in a sequential scan.
+		 * In this case, we assign processors to clusters using two
+		 * methods:
+		 * - Try heuristic cluster configurations (e.g. 6-core SoC
+		 * usually has 4+2 big.LITTLE configuration).
+		 * - If heuristic failed, assign processors to core clusters in
+		 * a sequential scan.
 		 */
-		if (!cpuinfo_arm_linux_detect_core_clusters_by_heuristic(valid_processors, arm_linux_processors_count, arm_linux_processors)) {
-			cpuinfo_arm_linux_detect_core_clusters_by_sequential_scan(arm_linux_processors_count, arm_linux_processors);
+		if (!cpuinfo_arm_linux_detect_core_clusters_by_heuristic(
+			    valid_processors, arm_linux_processors_count, arm_linux_processors)) {
+			cpuinfo_arm_linux_detect_core_clusters_by_sequential_scan(
+				arm_linux_processors_count, arm_linux_processors);
 		}
 	}
 
 	cpuinfo_arm_linux_count_cluster_processors(arm_linux_processors_count, arm_linux_processors);
 
 	const uint32_t cluster_count = cpuinfo_arm_linux_detect_cluster_midr(
-		&chipset,
-		arm_linux_processors_count, valid_processors, arm_linux_processors);
+		&chipset, arm_linux_processors_count, valid_processors, arm_linux_processors);
 
-	/* Initialize core vendor, uarch, MIDR, and frequency for every logical processor */
+	/* Initialize core vendor, uarch, MIDR, and frequency for every logical
+	 * processor */
 	for (uint32_t i = 0; i < arm_linux_processors_count; i++) {
 		if (bitmask_all(arm_linux_processors[i].flags, CPUINFO_LINUX_FLAG_VALID)) {
 			const uint32_t cluster_leader = arm_linux_processors[i].package_leader_id;
 			if (cluster_leader == i) {
-				/* Cluster leader: decode core vendor and uarch */
+				/* Cluster leader: decode core vendor and uarch
+				 */
 				cpuinfo_arm_decode_vendor_uarch(
-				arm_linux_processors[cluster_leader].midr,
+					arm_linux_processors[cluster_leader].midr,
 #if CPUINFO_ARCH_ARM
-				!!(arm_linux_processors[cluster_leader].features & CPUINFO_ARM_LINUX_FEATURE_VFPV4),
+					!!(arm_linux_processors[cluster_leader].features &
+					   CPUINFO_ARM_LINUX_FEATURE_VFPV4),
 #endif
-				&arm_linux_processors[cluster_leader].vendor,
-				&arm_linux_processors[cluster_leader].uarch);
+					&arm_linux_processors[cluster_leader].vendor,
+					&arm_linux_processors[cluster_leader].uarch);
 			} else {
-				/* Cluster non-leader: copy vendor, uarch, MIDR, and frequency from cluster leader */
+				/* Cluster non-leader: copy vendor, uarch, MIDR,
+				 * and frequency from cluster leader */
 				arm_linux_processors[i].flags |= arm_linux_processors[cluster_leader].flags &
 					(CPUINFO_ARM_LINUX_VALID_MIDR | CPUINFO_LINUX_FLAG_MAX_FREQUENCY);
 				arm_linux_processors[i].midr = arm_linux_processors[cluster_leader].midr;
 				arm_linux_processors[i].vendor = arm_linux_processors[cluster_leader].vendor;
 				arm_linux_processors[i].uarch = arm_linux_processors[cluster_leader].uarch;
-				arm_linux_processors[i].max_frequency = arm_linux_processors[cluster_leader].max_frequency;
+				arm_linux_processors[i].max_frequency =
+					arm_linux_processors[cluster_leader].max_frequency;
 			}
 		}
 	}
 
 	for (uint32_t i = 0; i < arm_linux_processors_count; i++) {
 		if (bitmask_all(arm_linux_processors[i].flags, CPUINFO_LINUX_FLAG_VALID)) {
-			cpuinfo_log_debug("post-analysis processor %"PRIu32": MIDR %08"PRIx32" frequency %"PRIu32,
-				i, arm_linux_processors[i].midr, arm_linux_processors[i].max_frequency);
+			cpuinfo_log_debug(
+				"post-analysis processor %" PRIu32 ": MIDR %08" PRIx32 " frequency %" PRIu32,
+				i,
+				arm_linux_processors[i].midr,
+				arm_linux_processors[i].max_frequency);
 		}
 	}
 
-	qsort(arm_linux_processors, arm_linux_processors_count,
-		sizeof(struct cpuinfo_arm_linux_processor), cmp_arm_linux_processor);
+	qsort(arm_linux_processors,
+	      arm_linux_processors_count,
+	      sizeof(struct cpuinfo_arm_linux_processor),
+	      cmp_arm_linux_processor);
 
 	for (uint32_t i = 0; i < arm_linux_processors_count; i++) {
 		if (bitmask_all(arm_linux_processors[i].flags, CPUINFO_LINUX_FLAG_VALID)) {
-			cpuinfo_log_debug("post-sort processor %"PRIu32": system id %"PRIu32" MIDR %08"PRIx32" frequency %"PRIu32,
-				i, arm_linux_processors[i].system_processor_id, arm_linux_processors[i].midr, arm_linux_processors[i].max_frequency);
+			cpuinfo_log_debug(
+				"post-sort processor %" PRIu32 ": system id %" PRIu32 " MIDR %08" PRIx32
+				" frequency %" PRIu32,
+				i,
+				arm_linux_processors[i].system_processor_id,
+				arm_linux_processors[i].midr,
+				arm_linux_processors[i].max_frequency);
 		}
 	}
 
@@ -422,8 +469,10 @@ void cpuinfo_arm_linux_init(void) {
 	/*
 	 * Assumptions:
 	 * - No SMP (i.e. each core supports only one hardware thread).
-	 * - Level 1 instruction and data caches are private to the core clusters.
-	 * - Level 2 and level 3 cache is shared between cores in the same cluster.
+	 * - Level 1 instruction and data caches are private to the core
+	 * clusters.
+	 * - Level 2 and level 3 cache is shared between cores in the same
+	 * cluster.
 	 */
 	cpuinfo_arm_chipset_to_string(&chipset, package.name);
 	package.processor_count = valid_processors;
@@ -432,66 +481,84 @@ void cpuinfo_arm_linux_init(void) {
 
 	processors = calloc(valid_processors, sizeof(struct cpuinfo_processor));
 	if (processors == NULL) {
-		cpuinfo_log_error("failed to allocate %zu bytes for descriptions of %"PRIu32" logical processors",
-			valid_processors * sizeof(struct cpuinfo_processor), valid_processors);
+		cpuinfo_log_error(
+			"failed to allocate %zu bytes for descriptions of %" PRIu32 " logical processors",
+			valid_processors * sizeof(struct cpuinfo_processor),
+			valid_processors);
 		goto cleanup;
 	}
 
 	cores = calloc(valid_processors, sizeof(struct cpuinfo_core));
 	if (cores == NULL) {
-		cpuinfo_log_error("failed to allocate %zu bytes for descriptions of %"PRIu32" cores",
-			valid_processors * sizeof(struct cpuinfo_core), valid_processors);
+		cpuinfo_log_error(
+			"failed to allocate %zu bytes for descriptions of %" PRIu32 " cores",
+			valid_processors * sizeof(struct cpuinfo_core),
+			valid_processors);
 		goto cleanup;
 	}
 
 	clusters = calloc(cluster_count, sizeof(struct cpuinfo_cluster));
 	if (clusters == NULL) {
-		cpuinfo_log_error("failed to allocate %zu bytes for descriptions of %"PRIu32" core clusters",
-			cluster_count * sizeof(struct cpuinfo_cluster), cluster_count);
+		cpuinfo_log_error(
+			"failed to allocate %zu bytes for descriptions of %" PRIu32 " core clusters",
+			cluster_count * sizeof(struct cpuinfo_cluster),
+			cluster_count);
 		goto cleanup;
 	}
 
 	uarchs = calloc(uarchs_count, sizeof(struct cpuinfo_uarch_info));
 	if (uarchs == NULL) {
-		cpuinfo_log_error("failed to allocate %zu bytes for descriptions of %"PRIu32" microarchitectures",
-			uarchs_count * sizeof(struct cpuinfo_uarch_info), uarchs_count);
+		cpuinfo_log_error(
+			"failed to allocate %zu bytes for descriptions of %" PRIu32 " microarchitectures",
+			uarchs_count * sizeof(struct cpuinfo_uarch_info),
+			uarchs_count);
 		goto cleanup;
 	}
 
 	linux_cpu_to_processor_map = calloc(arm_linux_processors_count, sizeof(struct cpuinfo_processor*));
 	if (linux_cpu_to_processor_map == NULL) {
-		cpuinfo_log_error("failed to allocate %zu bytes for %"PRIu32" logical processor mapping entries",
-			arm_linux_processors_count * sizeof(struct cpuinfo_processor*), arm_linux_processors_count);
+		cpuinfo_log_error(
+			"failed to allocate %zu bytes for %" PRIu32 " logical processor mapping entries",
+			arm_linux_processors_count * sizeof(struct cpuinfo_processor*),
+			arm_linux_processors_count);
 		goto cleanup;
 	}
 
 	linux_cpu_to_core_map = calloc(arm_linux_processors_count, sizeof(struct cpuinfo_core*));
 	if (linux_cpu_to_core_map == NULL) {
-		cpuinfo_log_error("failed to allocate %zu bytes for %"PRIu32" core mapping entries",
-			arm_linux_processors_count * sizeof(struct cpuinfo_core*), arm_linux_processors_count);
+		cpuinfo_log_error(
+			"failed to allocate %zu bytes for %" PRIu32 " core mapping entries",
+			arm_linux_processors_count * sizeof(struct cpuinfo_core*),
+			arm_linux_processors_count);
 		goto cleanup;
 	}
 
 	if (uarchs_count > 1) {
 		linux_cpu_to_uarch_index_map = calloc(arm_linux_processors_count, sizeof(uint32_t));
 		if (linux_cpu_to_uarch_index_map == NULL) {
-			cpuinfo_log_error("failed to allocate %zu bytes for %"PRIu32" uarch index mapping entries",
-				arm_linux_processors_count * sizeof(uint32_t), arm_linux_processors_count);
+			cpuinfo_log_error(
+				"failed to allocate %zu bytes for %" PRIu32 " uarch index mapping entries",
+				arm_linux_processors_count * sizeof(uint32_t),
+				arm_linux_processors_count);
 			goto cleanup;
 		}
 	}
 
 	l1i = calloc(valid_processors, sizeof(struct cpuinfo_cache));
 	if (l1i == NULL) {
-		cpuinfo_log_error("failed to allocate %zu bytes for descriptions of %"PRIu32" L1I caches",
-			valid_processors * sizeof(struct cpuinfo_cache), valid_processors);
+		cpuinfo_log_error(
+			"failed to allocate %zu bytes for descriptions of %" PRIu32 " L1I caches",
+			valid_processors * sizeof(struct cpuinfo_cache),
+			valid_processors);
 		goto cleanup;
 	}
 
 	l1d = calloc(valid_processors, sizeof(struct cpuinfo_cache));
 	if (l1d == NULL) {
-		cpuinfo_log_error("failed to allocate %zu bytes for descriptions of %"PRIu32" L1D caches",
-			valid_processors * sizeof(struct cpuinfo_cache), valid_processors);
+		cpuinfo_log_error(
+			"failed to allocate %zu bytes for descriptions of %" PRIu32 " L1D caches",
+			valid_processors * sizeof(struct cpuinfo_cache),
+			valid_processors);
 		goto cleanup;
 	}
 
@@ -500,7 +567,7 @@ void cpuinfo_arm_linux_init(void) {
 		if (bitmask_all(arm_linux_processors[i].flags, CPUINFO_LINUX_FLAG_VALID)) {
 			if (uarchs_index == 0 || arm_linux_processors[i].uarch != last_uarch) {
 				last_uarch = arm_linux_processors[i].uarch;
-				uarchs[uarchs_index] = (struct cpuinfo_uarch_info) {
+				uarchs[uarchs_index] = (struct cpuinfo_uarch_info){
 					.uarch = arm_linux_processors[i].uarch,
 					.midr = arm_linux_processors[i].midr,
 				};
@@ -518,7 +585,7 @@ void cpuinfo_arm_linux_init(void) {
 	for (uint32_t i = 0; i < valid_processors; i++) {
 		if (arm_linux_processors[i].package_leader_id == arm_linux_processors[i].system_processor_id) {
 			cluster_id += 1;
-			clusters[cluster_id] = (struct cpuinfo_cluster) {
+			clusters[cluster_id] = (struct cpuinfo_cluster){
 				.processor_start = i,
 				.processor_count = arm_linux_processors[i].package_processor_count,
 				.core_start = i,
@@ -535,7 +602,7 @@ void cpuinfo_arm_linux_init(void) {
 		processors[i].core = cores + i;
 		processors[i].cluster = clusters + cluster_id;
 		processors[i].package = &package;
-		processors[i].linux_id = (int) arm_linux_processors[i].system_processor_id;
+		processors[i].linux_id = (int)arm_linux_processors[i].system_processor_id;
 		processors[i].cache.l1i = l1i + i;
 		processors[i].cache.l1d = l1d + i;
 		linux_cpu_to_processor_map[arm_linux_processors[i].system_processor_id] = &processors[i];
@@ -555,7 +622,7 @@ void cpuinfo_arm_linux_init(void) {
 				arm_linux_processors[i].uarch_index;
 		}
 
-		struct cpuinfo_cache temp_l2 = { 0 }, temp_l3 = { 0 };
+		struct cpuinfo_cache temp_l2 = {0}, temp_l3 = {0};
 		cpuinfo_arm_decode_cache(
 			arm_linux_processors[i].uarch,
 			arm_linux_processors[i].package_processor_count,
@@ -563,38 +630,40 @@ void cpuinfo_arm_linux_init(void) {
 			&chipset,
 			cluster_id,
 			arm_linux_processors[i].architecture_version,
-			&l1i[i], &l1d[i], &temp_l2, &temp_l3);
+			&l1i[i],
+			&l1d[i],
+			&temp_l2,
+			&temp_l3);
 		l1i[i].processor_start = l1d[i].processor_start = i;
 		l1i[i].processor_count = l1d[i].processor_count = 1;
-		#if CPUINFO_ARCH_ARM
-			/* L1I reported in /proc/cpuinfo overrides defaults */
-			if (bitmask_all(arm_linux_processors[i].flags, CPUINFO_ARM_LINUX_VALID_ICACHE)) {
-				l1i[i] = (struct cpuinfo_cache) {
-					.size = arm_linux_processors[i].proc_cpuinfo_cache.i_size,
-					.associativity = arm_linux_processors[i].proc_cpuinfo_cache.i_assoc,
-					.sets = arm_linux_processors[i].proc_cpuinfo_cache.i_sets,
-					.partitions = 1,
-					.line_size = arm_linux_processors[i].proc_cpuinfo_cache.i_line_length
-				};
-			}
-			/* L1D reported in /proc/cpuinfo overrides defaults */
-			if (bitmask_all(arm_linux_processors[i].flags, CPUINFO_ARM_LINUX_VALID_DCACHE)) {
-				l1d[i] = (struct cpuinfo_cache) {
-					.size = arm_linux_processors[i].proc_cpuinfo_cache.d_size,
-					.associativity = arm_linux_processors[i].proc_cpuinfo_cache.d_assoc,
-					.sets = arm_linux_processors[i].proc_cpuinfo_cache.d_sets,
-					.partitions = 1,
-					.line_size = arm_linux_processors[i].proc_cpuinfo_cache.d_line_length
-				};
-			}
-		#endif
+#if CPUINFO_ARCH_ARM
+		/* L1I reported in /proc/cpuinfo overrides defaults */
+		if (bitmask_all(arm_linux_processors[i].flags, CPUINFO_ARM_LINUX_VALID_ICACHE)) {
+			l1i[i] = (struct cpuinfo_cache){
+				.size = arm_linux_processors[i].proc_cpuinfo_cache.i_size,
+				.associativity = arm_linux_processors[i].proc_cpuinfo_cache.i_assoc,
+				.sets = arm_linux_processors[i].proc_cpuinfo_cache.i_sets,
+				.partitions = 1,
+				.line_size = arm_linux_processors[i].proc_cpuinfo_cache.i_line_length};
+		}
+		/* L1D reported in /proc/cpuinfo overrides defaults */
+		if (bitmask_all(arm_linux_processors[i].flags, CPUINFO_ARM_LINUX_VALID_DCACHE)) {
+			l1d[i] = (struct cpuinfo_cache){
+				.size = arm_linux_processors[i].proc_cpuinfo_cache.d_size,
+				.associativity = arm_linux_processors[i].proc_cpuinfo_cache.d_assoc,
+				.sets = arm_linux_processors[i].proc_cpuinfo_cache.d_sets,
+				.partitions = 1,
+				.line_size = arm_linux_processors[i].proc_cpuinfo_cache.d_line_length};
+		}
+#endif
 
 		if (temp_l3.size != 0) {
 			/*
 			 * Assumptions:
 			 * - L2 is private to each core
 			 * - L3 is shared by cores in the same cluster
-			 * - If cores in different clusters report the same L3, it is shared between all cores.
+			 * - If cores in different clusters report the same L3,
+			 * it is shared between all cores.
 			 */
 			l2_count += 1;
 			if (arm_linux_processors[i].package_leader_id == arm_linux_processors[i].system_processor_id) {
@@ -602,17 +671,22 @@ void cpuinfo_arm_linux_init(void) {
 					big_l3_size = temp_l3.size;
 					l3_count = 1;
 				} else if (temp_l3.size != big_l3_size) {
-					/* If some cores have different L3 size, L3 is not shared between all cores */
+					/* If some cores have different L3 size,
+					 * L3 is not shared between all cores */
 					shared_l3 = false;
 					l3_count += 1;
 				}
 			}
 		} else {
-			/* If some cores don't have L3 cache, L3 is not shared between all cores */
+			/* If some cores don't have L3 cache, L3 is not shared
+			 * between all cores
+			 */
 			shared_l3 = false;
 			if (temp_l2.size != 0) {
-				/* Assume L2 is shared by cores in the same cluster */
-				if (arm_linux_processors[i].package_leader_id == arm_linux_processors[i].system_processor_id) {
+				/* Assume L2 is shared by cores in the same
+				 * cluster */
+				if (arm_linux_processors[i].package_leader_id ==
+				    arm_linux_processors[i].system_processor_id) {
 					l2_count += 1;
 				}
 			}
@@ -622,16 +696,20 @@ void cpuinfo_arm_linux_init(void) {
 	if (l2_count != 0) {
 		l2 = calloc(l2_count, sizeof(struct cpuinfo_cache));
 		if (l2 == NULL) {
-			cpuinfo_log_error("failed to allocate %zu bytes for descriptions of %"PRIu32" L2 caches",
-				l2_count * sizeof(struct cpuinfo_cache), l2_count);
+			cpuinfo_log_error(
+				"failed to allocate %zu bytes for descriptions of %" PRIu32 " L2 caches",
+				l2_count * sizeof(struct cpuinfo_cache),
+				l2_count);
 			goto cleanup;
 		}
 
 		if (l3_count != 0) {
 			l3 = calloc(l3_count, sizeof(struct cpuinfo_cache));
 			if (l3 == NULL) {
-				cpuinfo_log_error("failed to allocate %zu bytes for descriptions of %"PRIu32" L3 caches",
-					l3_count * sizeof(struct cpuinfo_cache), l3_count);
+				cpuinfo_log_error(
+					"failed to allocate %zu bytes for descriptions of %" PRIu32 " L3 caches",
+					l3_count * sizeof(struct cpuinfo_cache),
+					l3_count);
 				goto cleanup;
 			}
 		}
@@ -644,7 +722,7 @@ void cpuinfo_arm_linux_init(void) {
 			cluster_id++;
 		}
 
-		struct cpuinfo_cache dummy_l1i, dummy_l1d, temp_l2 = { 0 }, temp_l3 = { 0 };
+		struct cpuinfo_cache dummy_l1i, dummy_l1d, temp_l2 = {0}, temp_l3 = {0};
 		cpuinfo_arm_decode_cache(
 			arm_linux_processors[i].uarch,
 			arm_linux_processors[i].package_processor_count,
@@ -652,23 +730,27 @@ void cpuinfo_arm_linux_init(void) {
 			&chipset,
 			cluster_id,
 			arm_linux_processors[i].architecture_version,
-			&dummy_l1i, &dummy_l1d, &temp_l2, &temp_l3);
+			&dummy_l1i,
+			&dummy_l1d,
+			&temp_l2,
+			&temp_l3);
 
 		if (temp_l3.size != 0) {
 			/*
 			 * Assumptions:
 			 * - L2 is private to each core
 			 * - L3 is shared by cores in the same cluster
-			 * - If cores in different clusters report the same L3, it is shared between all cores.
+			 * - If cores in different clusters report the same L3,
+			 * it is shared between all cores.
 			 */
 			l2_index += 1;
-			l2[l2_index] = (struct cpuinfo_cache) {
-				.size            = temp_l2.size,
-				.associativity   = temp_l2.associativity,
-				.sets            = temp_l2.sets,
-				.partitions      = 1,
-				.line_size       = temp_l2.line_size,
-				.flags           = temp_l2.flags,
+			l2[l2_index] = (struct cpuinfo_cache){
+				.size = temp_l2.size,
+				.associativity = temp_l2.associativity,
+				.sets = temp_l2.sets,
+				.partitions = 1,
+				.line_size = temp_l2.line_size,
+				.flags = temp_l2.flags,
 				.processor_start = i,
 				.processor_count = 1,
 			};
@@ -676,16 +758,17 @@ void cpuinfo_arm_linux_init(void) {
 			if (arm_linux_processors[i].package_leader_id == arm_linux_processors[i].system_processor_id) {
 				l3_index += 1;
 				if (l3_index < l3_count) {
-					l3[l3_index] = (struct cpuinfo_cache) {
-						.size            = temp_l3.size,
-						.associativity   = temp_l3.associativity,
-						.sets            = temp_l3.sets,
-						.partitions      = 1,
-						.line_size       = temp_l3.line_size,
-						.flags           = temp_l3.flags,
+					l3[l3_index] = (struct cpuinfo_cache){
+						.size = temp_l3.size,
+						.associativity = temp_l3.associativity,
+						.sets = temp_l3.sets,
+						.partitions = 1,
+						.line_size = temp_l3.line_size,
+						.flags = temp_l3.flags,
 						.processor_start = i,
-						.processor_count =
-							shared_l3 ? valid_processors : arm_linux_processors[i].package_processor_count,
+						.processor_count = shared_l3
+							? valid_processors
+							: arm_linux_processors[i].package_processor_count,
 					};
 				}
 			}
@@ -698,13 +781,13 @@ void cpuinfo_arm_linux_init(void) {
 			/* Assume L2 is shared by cores in the same cluster */
 			if (arm_linux_processors[i].package_leader_id == arm_linux_processors[i].system_processor_id) {
 				l2_index += 1;
-				l2[l2_index] = (struct cpuinfo_cache) {
-					.size            = temp_l2.size,
-					.associativity   = temp_l2.associativity,
-					.sets            = temp_l2.sets,
-					.partitions      = 1,
-					.line_size       = temp_l2.line_size,
-					.flags           = temp_l2.flags,
+				l2[l2_index] = (struct cpuinfo_cache){
+					.size = temp_l2.size,
+					.associativity = temp_l2.associativity,
+					.sets = temp_l2.sets,
+					.partitions = 1,
+					.line_size = temp_l2.line_size,
+					.flags = temp_l2.flags,
 					.processor_start = i,
 					.processor_count = arm_linux_processors[i].package_processor_count,
 				};
@@ -721,8 +804,8 @@ void cpuinfo_arm_linux_init(void) {
 	cpuinfo_uarchs = uarchs;
 	cpuinfo_cache[cpuinfo_cache_level_1i] = l1i;
 	cpuinfo_cache[cpuinfo_cache_level_1d] = l1d;
-	cpuinfo_cache[cpuinfo_cache_level_2]  = l2;
-	cpuinfo_cache[cpuinfo_cache_level_3]  = l3;
+	cpuinfo_cache[cpuinfo_cache_level_2] = l2;
+	cpuinfo_cache[cpuinfo_cache_level_3] = l3;
 
 	cpuinfo_processors_count = valid_processors;
 	cpuinfo_cores_count = valid_processors;
@@ -731,8 +814,8 @@ void cpuinfo_arm_linux_init(void) {
 	cpuinfo_uarchs_count = uarchs_count;
 	cpuinfo_cache_count[cpuinfo_cache_level_1i] = valid_processors;
 	cpuinfo_cache_count[cpuinfo_cache_level_1d] = valid_processors;
-	cpuinfo_cache_count[cpuinfo_cache_level_2]  = l2_count;
-	cpuinfo_cache_count[cpuinfo_cache_level_3]  = l3_count;
+	cpuinfo_cache_count[cpuinfo_cache_level_2] = l2_count;
+	cpuinfo_cache_count[cpuinfo_cache_level_3] = l3_count;
 	cpuinfo_max_cache_size = cpuinfo_arm_compute_max_cache_size(&processors[0]);
 
 	cpuinfo_linux_cpu_max = arm_linux_processors_count;

3rdparty/cpuinfo/src/arm/mach/init.c

@@ -1,31 +1,31 @@
-#include <stdio.h>
+#include <alloca.h>
 #include <stdint.h>
+#include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <alloca.h>
 
 #include <errno.h>
-#include <sys/types.h>
-#include <sys/sysctl.h>
 #include <mach/machine.h>
+#include <sys/sysctl.h>
+#include <sys/types.h>
 
 #include <cpuinfo.h>
-#include <mach/api.h>
 #include <cpuinfo/internal-api.h>
 #include <cpuinfo/log.h>
+#include <mach/api.h>
 
 /* Polyfill recent CPUFAMILY_ARM_* values for older SDKs */
 #ifndef CPUFAMILY_ARM_VORTEX_TEMPEST
-	#define CPUFAMILY_ARM_VORTEX_TEMPEST     0x07D34B9F
+#define CPUFAMILY_ARM_VORTEX_TEMPEST 0x07D34B9F
 #endif
 #ifndef CPUFAMILY_ARM_LIGHTNING_THUNDER
-	#define CPUFAMILY_ARM_LIGHTNING_THUNDER  0x462504D2
+#define CPUFAMILY_ARM_LIGHTNING_THUNDER 0x462504D2
 #endif
 #ifndef CPUFAMILY_ARM_FIRESTORM_ICESTORM
-	#define CPUFAMILY_ARM_FIRESTORM_ICESTORM 0x1B588BB3
+#define CPUFAMILY_ARM_FIRESTORM_ICESTORM 0x1B588BB3
 #endif
 #ifndef CPUFAMILY_ARM_AVALANCHE_BLIZZARD
-	#define CPUFAMILY_ARM_AVALANCHE_BLIZZARD 0xDA33D83D
+#define CPUFAMILY_ARM_AVALANCHE_BLIZZARD 0xDA33D83D
 #endif
 
 struct cpuinfo_arm_isa cpuinfo_isa = {
@@ -39,12 +39,12 @@ struct cpuinfo_arm_isa cpuinfo_isa = {
 static uint32_t get_sys_info(int type_specifier, const char* name) {
 	size_t size = 0;
 	uint32_t result = 0;
-	int mib[2] = { CTL_HW, type_specifier };
+	int mib[2] = {CTL_HW, type_specifier};
 	if (sysctl(mib, 2, NULL, &size, NULL, 0) != 0) {
 		cpuinfo_log_info("sysctl(\"%s\") failed: %s", name, strerror(errno));
 	} else if (size == sizeof(uint32_t)) {
 		sysctl(mib, 2, &result, &size, NULL, 0);
-		cpuinfo_log_debug("%s: %"PRIu32 ", size = %lu", name, result, size);
+		cpuinfo_log_debug("%s: %" PRIu32 ", size = %lu", name, result, size);
 	} else {
 		cpuinfo_log_info("sysctl does not support non-integer lookup for (\"%s\")", name);
 	}
@@ -58,7 +58,7 @@ static uint32_t get_sys_info_by_name(const char* type_specifier) {
 		cpuinfo_log_info("sysctlbyname(\"%s\") failed: %s", type_specifier, strerror(errno));
 	} else if (size == sizeof(uint32_t)) {
 		sysctlbyname(type_specifier, &result, &size, NULL, 0);
-		cpuinfo_log_debug("%s: %"PRIu32 ", size = %lu", type_specifier, result, size);
+		cpuinfo_log_debug("%s: %" PRIu32 ", size = %lu", type_specifier, result, size);
 	} else {
 		cpuinfo_log_info("sysctl does not support non-integer lookup for (\"%s\")", type_specifier);
 	}
@@ -79,13 +79,16 @@ static enum cpuinfo_uarch decode_uarch(uint32_t cpu_family, uint32_t core_index,
 			/* 2x Monsoon + 4x Mistral cores */
 			return core_index < 2 ? cpuinfo_uarch_monsoon : cpuinfo_uarch_mistral;
 		case CPUFAMILY_ARM_VORTEX_TEMPEST:
-			/* Hexa-core: 2x Vortex + 4x Tempest; Octa-core: 4x Cortex + 4x Tempest */
+			/* Hexa-core: 2x Vortex + 4x Tempest; Octa-core: 4x
+			 * Cortex + 4x Tempest */
 			return core_index + 4 < core_count ? cpuinfo_uarch_vortex : cpuinfo_uarch_tempest;
 		case CPUFAMILY_ARM_LIGHTNING_THUNDER:
-			/* Hexa-core: 2x Lightning + 4x Thunder; Octa-core (presumed): 4x Lightning + 4x Thunder */
+			/* Hexa-core: 2x Lightning + 4x Thunder; Octa-core
+			 * (presumed): 4x Lightning + 4x Thunder */
 			return core_index + 4 < core_count ? cpuinfo_uarch_lightning : cpuinfo_uarch_thunder;
 		case CPUFAMILY_ARM_FIRESTORM_ICESTORM:
-			/* Hexa-core: 2x Firestorm + 4x Icestorm; Octa-core: 4x Firestorm + 4x Icestorm */
+			/* Hexa-core: 2x Firestorm + 4x Icestorm; Octa-core: 4x
+			 * Firestorm + 4x Icestorm */
 			return core_index + 4 < core_count ? cpuinfo_uarch_firestorm : cpuinfo_uarch_icestorm;
 		case CPUFAMILY_ARM_AVALANCHE_BLIZZARD:
 			/* Hexa-core: 2x Avalanche + 4x Blizzard */
@@ -105,7 +108,7 @@ static void decode_package_name(char* package_name) {
 		return;
 	}
 
-	char *machine_name = alloca(size);
+	char* machine_name = alloca(size);
 	if (sysctlbyname("hw.machine", machine_name, &size, NULL, 0) != 0) {
 		cpuinfo_log_warning("sysctlbyname(\"hw.machine\") failed: %s", strerror(errno));
 		return;
@@ -114,7 +117,7 @@ static void decode_package_name(char* package_name) {
 
 	char name[10];
 	uint32_t major = 0, minor = 0;
-	if (sscanf(machine_name, "%9[^,0123456789]%"SCNu32",%"SCNu32, name, &major, &minor) != 3) {
+	if (sscanf(machine_name, "%9[^,0123456789]%" SCNu32 ",%" SCNu32, name, &major, &minor) != 3) {
 		cpuinfo_log_warning("parsing \"hw.machine\" failed: %s", strerror(errno));
 		return;
 	}
@@ -149,8 +152,9 @@ static void decode_package_name(char* package_name) {
 			/* iPad 2 and up are supported */
 			case 2:
 				/*
-				 * iPad 2    [A5]: iPad2,1, iPad2,2, iPad2,3, iPad2,4
-				 * iPad mini [A5]: iPad2,5, iPad2,6, iPad2,7
+				 * iPad 2    [A5]: iPad2,1, iPad2,2, iPad2,3,
+				 * iPad2,4 iPad mini [A5]: iPad2,5, iPad2,6,
+				 * iPad2,7
 				 */
 				chip_model = major + 3;
 				break;
@@ -164,9 +168,10 @@ static void decode_package_name(char* package_name) {
 				break;
 			case 4:
 				/*
-				 * iPad Air         [A7]: iPad4,1, iPad4,2, iPad4,3
-				 * iPad mini Retina [A7]: iPad4,4, iPad4,5, iPad4,6
-				 * iPad mini 3      [A7]: iPad4,7, iPad4,8, iPad4,9
+				 * iPad Air         [A7]: iPad4,1, iPad4,2,
+				 * iPad4,3 iPad mini Retina [A7]: iPad4,4,
+				 * iPad4,5, iPad4,6 iPad mini 3      [A7]:
+				 * iPad4,7, iPad4,8, iPad4,9
 				 */
 				chip_model = major + 3;
 				break;
@@ -218,7 +223,7 @@ static void decode_package_name(char* package_name) {
 		cpuinfo_log_info("unknown device: %s", machine_name);
 	}
 	if (chip_model != 0) {
-		snprintf(package_name, CPUINFO_PACKAGE_NAME_MAX, "Apple A%"PRIu32"%c", chip_model, suffix);
+		snprintf(package_name, CPUINFO_PACKAGE_NAME_MAX, "Apple A%" PRIu32 "%c", chip_model, suffix);
 	}
 }
 
@@ -236,20 +241,26 @@ void cpuinfo_arm_mach_init(void) {
 	struct cpuinfo_mach_topology mach_topology = cpuinfo_mach_detect_topology();
 	processors = calloc(mach_topology.threads, sizeof(struct cpuinfo_processor));
 	if (processors == NULL) {
-		cpuinfo_log_error("failed to allocate %zu bytes for descriptions of %"PRIu32" logical processors",
-			mach_topology.threads * sizeof(struct cpuinfo_processor), mach_topology.threads);
+		cpuinfo_log_error(
+			"failed to allocate %zu bytes for descriptions of %" PRIu32 " logical processors",
+			mach_topology.threads * sizeof(struct cpuinfo_processor),
+			mach_topology.threads);
 		goto cleanup;
 	}
 	cores = calloc(mach_topology.cores, sizeof(struct cpuinfo_core));
 	if (cores == NULL) {
-		cpuinfo_log_error("failed to allocate %zu bytes for descriptions of %"PRIu32" cores",
-			mach_topology.cores * sizeof(struct cpuinfo_core), mach_topology.cores);
+		cpuinfo_log_error(
+			"failed to allocate %zu bytes for descriptions of %" PRIu32 " cores",
+			mach_topology.cores * sizeof(struct cpuinfo_core),
+			mach_topology.cores);
 		goto cleanup;
 	}
 	packages = calloc(mach_topology.packages, sizeof(struct cpuinfo_package));
 	if (packages == NULL) {
-		cpuinfo_log_error("failed to allocate %zu bytes for descriptions of %"PRIu32" packages",
-			mach_topology.packages * sizeof(struct cpuinfo_package), mach_topology.packages);
+		cpuinfo_log_error(
+			"failed to allocate %zu bytes for descriptions of %" PRIu32 " packages",
+			mach_topology.packages * sizeof(struct cpuinfo_package),
+			mach_topology.packages);
 		goto cleanup;
 	}
 
@@ -258,7 +269,7 @@ void cpuinfo_arm_mach_init(void) {
 	const uint32_t cores_per_package = mach_topology.cores / mach_topology.packages;
 
 	for (uint32_t i = 0; i < mach_topology.packages; i++) {
-		packages[i] = (struct cpuinfo_package) {
+		packages[i] = (struct cpuinfo_package){
 			.processor_start = i * threads_per_package,
 			.processor_count = threads_per_package,
 			.core_start = i * cores_per_package,
@@ -267,18 +278,19 @@ void cpuinfo_arm_mach_init(void) {
 		decode_package_name(packages[i].name);
 	}
 
-
 	const uint32_t cpu_family = get_sys_info_by_name("hw.cpufamily");
 
 	/*
-	 * iOS 15 and macOS 12 added sysctls for ARM features, use them where possible.
-	 * Otherwise, fallback to hardcoded set of CPUs with known support.
+	 * iOS 15 and macOS 12 added sysctls for ARM features, use them where
+	 * possible. Otherwise, fallback to hardcoded set of CPUs with known
+	 * support.
 	 */
 	const uint32_t has_feat_lse = get_sys_info_by_name("hw.optional.arm.FEAT_LSE");
 	if (has_feat_lse != 0) {
 		cpuinfo_isa.atomics = true;
 	} else {
-		// Mandatory in ARMv8.1-A, list only cores released before iOS 15 / macOS 12
+		// Mandatory in ARMv8.1-A, list only cores released before iOS
+		// 15 / macOS 12
 		switch (cpu_family) {
 			case CPUFAMILY_ARM_MONSOON_MISTRAL:
 			case CPUFAMILY_ARM_VORTEX_TEMPEST:
@@ -327,8 +339,9 @@ void cpuinfo_arm_mach_init(void) {
 		if (has_feat_fhm_legacy != 0) {
 			cpuinfo_isa.fhm = true;
 		} else {
-			// Mandatory in ARMv8.4-A when FP16 arithmetics is implemented,
-			// list only cores released before iOS 15 / macOS 12
+			// Mandatory in ARMv8.4-A when FP16 arithmetics is
+			// implemented, list only cores released before iOS 15 /
+			// macOS 12
 			switch (cpu_family) {
 				case CPUFAMILY_ARM_LIGHTNING_THUNDER:
 				case CPUFAMILY_ARM_FIRESTORM_ICESTORM:
@@ -346,7 +359,8 @@ void cpuinfo_arm_mach_init(void) {
 	if (has_feat_fcma != 0) {
 		cpuinfo_isa.fcma = true;
 	} else {
-		// Mandatory in ARMv8.3-A, list only cores released before iOS 15 / macOS 12
+		// Mandatory in ARMv8.3-A, list only cores released before iOS
+		// 15 / macOS 12
 		switch (cpu_family) {
 			case CPUFAMILY_ARM_LIGHTNING_THUNDER:
 			case CPUFAMILY_ARM_FIRESTORM_ICESTORM:
@@ -358,7 +372,8 @@ void cpuinfo_arm_mach_init(void) {
 	if (has_feat_jscvt != 0) {
 		cpuinfo_isa.jscvt = true;
 	} else {
-		// Mandatory in ARMv8.3-A, list only cores released before iOS 15 / macOS 12
+		// Mandatory in ARMv8.3-A, list only cores released before iOS
+		// 15 / macOS 12
 		switch (cpu_family) {
 			case CPUFAMILY_ARM_LIGHTNING_THUNDER:
 			case CPUFAMILY_ARM_FIRESTORM_ICESTORM:
@@ -370,7 +385,8 @@ void cpuinfo_arm_mach_init(void) {
 	if (has_feat_dotprod != 0) {
 		cpuinfo_isa.dot = true;
 	} else {
-		// Mandatory in ARMv8.4-A, list only cores released before iOS 15 / macOS 12
+		// Mandatory in ARMv8.4-A, list only cores released before iOS
+		// 15 / macOS 12
 		switch (cpu_family) {
 			case CPUFAMILY_ARM_LIGHTNING_THUNDER:
 			case CPUFAMILY_ARM_FIRESTORM_ICESTORM:
@@ -385,7 +401,7 @@ void cpuinfo_arm_mach_init(void) {
 
 	uint32_t num_clusters = 1;
 	for (uint32_t i = 0; i < mach_topology.cores; i++) {
-		cores[i] = (struct cpuinfo_core) {
+		cores[i] = (struct cpuinfo_core){
 			.processor_start = i * threads_per_core,
 			.processor_count = threads_per_core,
 			.core_id = i % cores_per_package,
@@ -410,27 +426,29 @@ void cpuinfo_arm_mach_init(void) {
 	clusters = calloc(num_clusters, sizeof(struct cpuinfo_cluster));
 	if (clusters == NULL) {
 		cpuinfo_log_error(
-			"failed to allocate %zu bytes for descriptions of %"PRIu32" clusters",
-			num_clusters * sizeof(struct cpuinfo_cluster), num_clusters);
+			"failed to allocate %zu bytes for descriptions of %" PRIu32 " clusters",
+			num_clusters * sizeof(struct cpuinfo_cluster),
+			num_clusters);
 		goto cleanup;
 	}
 	uarchs = calloc(num_clusters, sizeof(struct cpuinfo_uarch_info));
 	if (uarchs == NULL) {
 		cpuinfo_log_error(
-			"failed to allocate %zu bytes for descriptions of %"PRIu32" uarchs",
-			num_clusters * sizeof(enum cpuinfo_uarch), num_clusters);
+			"failed to allocate %zu bytes for descriptions of %" PRIu32 " uarchs",
+			num_clusters * sizeof(enum cpuinfo_uarch),
+			num_clusters);
 		goto cleanup;
 	}
 	uint32_t cluster_idx = UINT32_MAX;
 	for (uint32_t i = 0; i < mach_topology.cores; i++) {
 		if (i == 0 || cores[i].uarch != cores[i - 1].uarch) {
 			cluster_idx++;
-			uarchs[cluster_idx] = (struct cpuinfo_uarch_info) {
+			uarchs[cluster_idx] = (struct cpuinfo_uarch_info){
 				.uarch = cores[i].uarch,
 				.processor_count = 1,
 				.core_count = 1,
 			};
-			clusters[cluster_idx] = (struct cpuinfo_cluster) {
+			clusters[cluster_idx] = (struct cpuinfo_cluster){
 				.processor_start = i * threads_per_core,
 				.processor_count = 1,
 				.core_start = i,
@@ -475,7 +493,7 @@ void cpuinfo_arm_mach_init(void) {
 		/* Assume L1 caches are private to each core */
 		threads_per_l1 = 1;
 		l1_count = mach_topology.threads / threads_per_l1;
-		cpuinfo_log_debug("detected %"PRIu32" L1 caches", l1_count);
+		cpuinfo_log_debug("detected %" PRIu32 " L1 caches", l1_count);
 	}
 
 	uint32_t threads_per_l2 = 0, l2_count = 0;
@@ -483,7 +501,7 @@ void cpuinfo_arm_mach_init(void) {
 		/* Assume L2 cache is shared between all cores */
 		threads_per_l2 = mach_topology.cores;
 		l2_count = 1;
-		cpuinfo_log_debug("detected %"PRIu32" L2 caches", l2_count);
+		cpuinfo_log_debug("detected %" PRIu32 " L2 caches", l2_count);
 	}
 
 	uint32_t threads_per_l3 = 0, l3_count = 0;
@@ -491,24 +509,26 @@ void cpuinfo_arm_mach_init(void) {
 		/* Assume L3 cache is shared between all cores */
 		threads_per_l3 = mach_topology.cores;
 		l3_count = 1;
-		cpuinfo_log_debug("detected %"PRIu32" L3 caches", l3_count);
+		cpuinfo_log_debug("detected %" PRIu32 " L3 caches", l3_count);
 	}
 
 	if (l1i_cache_size != 0) {
 		l1i = calloc(l1_count, sizeof(struct cpuinfo_cache));
 		if (l1i == NULL) {
-			cpuinfo_log_error("failed to allocate %zu bytes for descriptions of %"PRIu32" L1I caches",
-				l1_count * sizeof(struct cpuinfo_cache), l1_count);
+			cpuinfo_log_error(
+				"failed to allocate %zu bytes for descriptions of %" PRIu32 " L1I caches",
+				l1_count * sizeof(struct cpuinfo_cache),
+				l1_count);
 			goto cleanup;
 		}
 		for (uint32_t c = 0; c < l1_count; c++) {
-			l1i[c] = (struct cpuinfo_cache) {
-				.size            = l1i_cache_size,
-				.associativity   = l1_cache_associativity,
-				.sets            = l1i_cache_size / (l1_cache_associativity * cacheline_size),
-				.partitions      = cache_partitions,
-				.line_size       = cacheline_size,
-				.flags           = cache_flags,
+			l1i[c] = (struct cpuinfo_cache){
+				.size = l1i_cache_size,
+				.associativity = l1_cache_associativity,
+				.sets = l1i_cache_size / (l1_cache_associativity * cacheline_size),
+				.partitions = cache_partitions,
+				.line_size = cacheline_size,
+				.flags = cache_flags,
 				.processor_start = c * threads_per_l1,
 				.processor_count = threads_per_l1,
 			};
@@ -521,18 +541,20 @@ void cpuinfo_arm_mach_init(void) {
 	if (l1d_cache_size != 0) {
 		l1d = calloc(l1_count, sizeof(struct cpuinfo_cache));
 		if (l1d == NULL) {
-			cpuinfo_log_error("failed to allocate %zu bytes for descriptions of %"PRIu32" L1D caches",
-				l1_count * sizeof(struct cpuinfo_cache), l1_count);
+			cpuinfo_log_error(
+				"failed to allocate %zu bytes for descriptions of %" PRIu32 " L1D caches",
+				l1_count * sizeof(struct cpuinfo_cache),
+				l1_count);
 			goto cleanup;
 		}
 		for (uint32_t c = 0; c < l1_count; c++) {
-			l1d[c] = (struct cpuinfo_cache) {
-				.size            = l1d_cache_size,
-				.associativity   = l1_cache_associativity,
-				.sets            = l1d_cache_size / (l1_cache_associativity * cacheline_size),
-				.partitions      = cache_partitions,
-				.line_size       = cacheline_size,
-				.flags           = cache_flags,
+			l1d[c] = (struct cpuinfo_cache){
+				.size = l1d_cache_size,
+				.associativity = l1_cache_associativity,
+				.sets = l1d_cache_size / (l1_cache_associativity * cacheline_size),
+				.partitions = cache_partitions,
+				.line_size = cacheline_size,
+				.flags = cache_flags,
 				.processor_start = c * threads_per_l1,
 				.processor_count = threads_per_l1,
 			};
@@ -545,18 +567,20 @@ void cpuinfo_arm_mach_init(void) {
 	if (l2_count != 0) {
 		l2 = calloc(l2_count, sizeof(struct cpuinfo_cache));
 		if (l2 == NULL) {
-			cpuinfo_log_error("failed to allocate %zu bytes for descriptions of %"PRIu32" L2 caches",
-				l2_count * sizeof(struct cpuinfo_cache), l2_count);
+			cpuinfo_log_error(
+				"failed to allocate %zu bytes for descriptions of %" PRIu32 " L2 caches",
+				l2_count * sizeof(struct cpuinfo_cache),
+				l2_count);
 			goto cleanup;
 		}
 		for (uint32_t c = 0; c < l2_count; c++) {
-			l2[c] = (struct cpuinfo_cache) {
-				.size            = l2_cache_size,
-				.associativity   = l2_cache_associativity,
-				.sets            = l2_cache_size / (l2_cache_associativity * cacheline_size),
-				.partitions      = cache_partitions,
-				.line_size       = cacheline_size,
-				.flags           = cache_flags,
+			l2[c] = (struct cpuinfo_cache){
+				.size = l2_cache_size,
+				.associativity = l2_cache_associativity,
+				.sets = l2_cache_size / (l2_cache_associativity * cacheline_size),
+				.partitions = cache_partitions,
+				.line_size = cacheline_size,
+				.flags = cache_flags,
 				.processor_start = c * threads_per_l2,
 				.processor_count = threads_per_l2,
 			};
@@ -569,18 +593,20 @@ void cpuinfo_arm_mach_init(void) {
 	if (l3_count != 0) {
 		l3 = calloc(l3_count, sizeof(struct cpuinfo_cache));
 		if (l3 == NULL) {
-			cpuinfo_log_error("failed to allocate %zu bytes for descriptions of %"PRIu32" L3 caches",
-												l3_count * sizeof(struct cpuinfo_cache), l3_count);
+			cpuinfo_log_error(
+				"failed to allocate %zu bytes for descriptions of %" PRIu32 " L3 caches",
+				l3_count * sizeof(struct cpuinfo_cache),
+				l3_count);
 			goto cleanup;
 		}
 		for (uint32_t c = 0; c < l3_count; c++) {
-			l3[c] = (struct cpuinfo_cache) {
-				.size            = l3_cache_size,
-				.associativity   = l3_cache_associativity,
-				.sets            = l3_cache_size / (l3_cache_associativity * cacheline_size),
-				.partitions      = cache_partitions,
-				.line_size       = cacheline_size,
-				.flags           = cache_flags,
+			l3[c] = (struct cpuinfo_cache){
+				.size = l3_cache_size,
+				.associativity = l3_cache_associativity,
+				.sets = l3_cache_size / (l3_cache_associativity * cacheline_size),
+				.partitions = cache_partitions,
+				.line_size = cacheline_size,
+				.flags = cache_flags,
 				.processor_start = c * threads_per_l3,
 				.processor_count = threads_per_l3,
 			};
@@ -598,8 +624,8 @@ void cpuinfo_arm_mach_init(void) {
 	cpuinfo_uarchs = uarchs;
 	cpuinfo_cache[cpuinfo_cache_level_1i] = l1i;
 	cpuinfo_cache[cpuinfo_cache_level_1d] = l1d;
-	cpuinfo_cache[cpuinfo_cache_level_2]  = l2;
-	cpuinfo_cache[cpuinfo_cache_level_3]  = l3;
+	cpuinfo_cache[cpuinfo_cache_level_2] = l2;
+	cpuinfo_cache[cpuinfo_cache_level_3] = l3;
 
 	cpuinfo_processors_count = mach_topology.threads;
 	cpuinfo_cores_count = mach_topology.cores;
@@ -608,8 +634,8 @@ void cpuinfo_arm_mach_init(void) {
 	cpuinfo_uarchs_count = num_clusters;
 	cpuinfo_cache_count[cpuinfo_cache_level_1i] = l1_count;
 	cpuinfo_cache_count[cpuinfo_cache_level_1d] = l1_count;
-	cpuinfo_cache_count[cpuinfo_cache_level_2]  = l2_count;
-	cpuinfo_cache_count[cpuinfo_cache_level_3]  = l3_count;
+	cpuinfo_cache_count[cpuinfo_cache_level_2] = l2_count;
+	cpuinfo_cache_count[cpuinfo_cache_level_3] = l3_count;
 	cpuinfo_max_cache_size = cpuinfo_compute_max_cache_size(&processors[0]);
 
 	__sync_synchronize();

3rdparty/cpuinfo/src/arm/midr.h

@@ -1,40 +1,39 @@
 #pragma once
 #include <stdint.h>
 
-
-#define CPUINFO_ARM_MIDR_IMPLEMENTER_MASK  UINT32_C(0xFF000000)
-#define CPUINFO_ARM_MIDR_VARIANT_MASK      UINT32_C(0x00F00000)
+#define CPUINFO_ARM_MIDR_IMPLEMENTER_MASK UINT32_C(0xFF000000)
+#define CPUINFO_ARM_MIDR_VARIANT_MASK UINT32_C(0x00F00000)
 #define CPUINFO_ARM_MIDR_ARCHITECTURE_MASK UINT32_C(0x000F0000)
-#define CPUINFO_ARM_MIDR_PART_MASK         UINT32_C(0x0000FFF0)
-#define CPUINFO_ARM_MIDR_REVISION_MASK     UINT32_C(0x0000000F)
+#define CPUINFO_ARM_MIDR_PART_MASK UINT32_C(0x0000FFF0)
+#define CPUINFO_ARM_MIDR_REVISION_MASK UINT32_C(0x0000000F)
 
-#define CPUINFO_ARM_MIDR_IMPLEMENTER_OFFSET  24
-#define CPUINFO_ARM_MIDR_VARIANT_OFFSET      20
+#define CPUINFO_ARM_MIDR_IMPLEMENTER_OFFSET 24
+#define CPUINFO_ARM_MIDR_VARIANT_OFFSET 20
 #define CPUINFO_ARM_MIDR_ARCHITECTURE_OFFSET 16
-#define CPUINFO_ARM_MIDR_PART_OFFSET          4
-#define CPUINFO_ARM_MIDR_REVISION_OFFSET      0
+#define CPUINFO_ARM_MIDR_PART_OFFSET 4
+#define CPUINFO_ARM_MIDR_REVISION_OFFSET 0
 
-#define CPUINFO_ARM_MIDR_ARM1156         UINT32_C(0x410FB560)
-#define CPUINFO_ARM_MIDR_CORTEX_A7       UINT32_C(0x410FC070)
-#define CPUINFO_ARM_MIDR_CORTEX_A9       UINT32_C(0x410FC090)
-#define CPUINFO_ARM_MIDR_CORTEX_A15      UINT32_C(0x410FC0F0)
-#define CPUINFO_ARM_MIDR_CORTEX_A17      UINT32_C(0x410FC0E0)
-#define CPUINFO_ARM_MIDR_CORTEX_A35      UINT32_C(0x410FD040)
-#define CPUINFO_ARM_MIDR_CORTEX_A53      UINT32_C(0x410FD030)
-#define CPUINFO_ARM_MIDR_CORTEX_A55      UINT32_C(0x410FD050)
-#define CPUINFO_ARM_MIDR_CORTEX_A57      UINT32_C(0x410FD070)
-#define CPUINFO_ARM_MIDR_CORTEX_A72      UINT32_C(0x410FD080)
-#define CPUINFO_ARM_MIDR_CORTEX_A73      UINT32_C(0x410FD090)
-#define CPUINFO_ARM_MIDR_CORTEX_A75      UINT32_C(0x410FD0A0)
-#define CPUINFO_ARM_MIDR_KRYO280_GOLD    UINT32_C(0x51AF8001)
-#define CPUINFO_ARM_MIDR_KRYO280_SILVER  UINT32_C(0x51AF8014)
-#define CPUINFO_ARM_MIDR_KRYO385_GOLD    UINT32_C(0x518F802D)
-#define CPUINFO_ARM_MIDR_KRYO385_SILVER  UINT32_C(0x518F803C)
+#define CPUINFO_ARM_MIDR_ARM1156 UINT32_C(0x410FB560)
+#define CPUINFO_ARM_MIDR_CORTEX_A7 UINT32_C(0x410FC070)
+#define CPUINFO_ARM_MIDR_CORTEX_A9 UINT32_C(0x410FC090)
+#define CPUINFO_ARM_MIDR_CORTEX_A15 UINT32_C(0x410FC0F0)
+#define CPUINFO_ARM_MIDR_CORTEX_A17 UINT32_C(0x410FC0E0)
+#define CPUINFO_ARM_MIDR_CORTEX_A35 UINT32_C(0x410FD040)
+#define CPUINFO_ARM_MIDR_CORTEX_A53 UINT32_C(0x410FD030)
+#define CPUINFO_ARM_MIDR_CORTEX_A55 UINT32_C(0x410FD050)
+#define CPUINFO_ARM_MIDR_CORTEX_A57 UINT32_C(0x410FD070)
+#define CPUINFO_ARM_MIDR_CORTEX_A72 UINT32_C(0x410FD080)
+#define CPUINFO_ARM_MIDR_CORTEX_A73 UINT32_C(0x410FD090)
+#define CPUINFO_ARM_MIDR_CORTEX_A75 UINT32_C(0x410FD0A0)
+#define CPUINFO_ARM_MIDR_KRYO280_GOLD UINT32_C(0x51AF8001)
+#define CPUINFO_ARM_MIDR_KRYO280_SILVER UINT32_C(0x51AF8014)
+#define CPUINFO_ARM_MIDR_KRYO385_GOLD UINT32_C(0x518F802D)
+#define CPUINFO_ARM_MIDR_KRYO385_SILVER UINT32_C(0x518F803C)
 #define CPUINFO_ARM_MIDR_KRYO_SILVER_821 UINT32_C(0x510F2010)
-#define CPUINFO_ARM_MIDR_KRYO_GOLD       UINT32_C(0x510F2050)
+#define CPUINFO_ARM_MIDR_KRYO_GOLD UINT32_C(0x510F2050)
 #define CPUINFO_ARM_MIDR_KRYO_SILVER_820 UINT32_C(0x510F2110)
-#define CPUINFO_ARM_MIDR_EXYNOS_M1_M2    UINT32_C(0x530F0010)
-#define CPUINFO_ARM_MIDR_DENVER2         UINT32_C(0x4E0F0030)
+#define CPUINFO_ARM_MIDR_EXYNOS_M1_M2 UINT32_C(0x530F0010)
+#define CPUINFO_ARM_MIDR_DENVER2 UINT32_C(0x4E0F0030)
 
 inline static uint32_t midr_set_implementer(uint32_t midr, uint32_t implementer) {
 	return (midr & ~CPUINFO_ARM_MIDR_IMPLEMENTER_MASK) |
@@ -176,7 +175,9 @@ inline static uint32_t midr_score_core(uint32_t midr) {
 		case UINT32_C(0x4100D440): /* Cortex-X1 */
 		case UINT32_C(0x4100D480): /* Cortex-X2 */
 		case UINT32_C(0x4100D4E0): /* Cortex-X3 */
-			/* These cores are in big role w.r.t Cortex-A75/-A76/-A77/-A78/-A710/-A715 */
+			/* These cores are in big role w.r.t
+			 * Cortex-A75/-A76/-A77/-A78/-A710/-A715
+			 */
 			return 6;
 		case UINT32_C(0x4100D080): /* Cortex-A72 */
 		case UINT32_C(0x4100D090): /* Cortex-A73 */
@@ -204,7 +205,8 @@ inline static uint32_t midr_score_core(uint32_t midr) {
 			/* These cores are always in big role */
 			return 5;
 		case UINT32_C(0x4100D070): /* Cortex-A57 */
-			/* Cortex-A57 can be in LITTLE role w.r.t. Denver 2, or in big role w.r.t. Cortex-A53 */
+			/* Cortex-A57 can be in LITTLE role w.r.t. Denver 2, or
+			 * in big role w.r.t. Cortex-A53 */
 			return 4;
 #if CPUINFO_ARCH_ARM64
 		case UINT32_C(0x4100D060): /* Cortex-A65 */
@@ -212,7 +214,8 @@ inline static uint32_t midr_score_core(uint32_t midr) {
 		case UINT32_C(0x4100D030): /* Cortex-A53 */
 		case UINT32_C(0x4100D050): /* Cortex-A55 */
 		case UINT32_C(0x4100D460): /* Cortex-A510 */
-			/* Cortex-A53 is usually in LITTLE role, but can be in big role w.r.t. Cortex-A35 */
+			/* Cortex-A53 is usually in LITTLE role, but can be in
+			 * big role w.r.t. Cortex-A35 */
 			return 2;
 		case UINT32_C(0x4100D040): /* Cortex-A35 */
 #if CPUINFO_ARCH_ARM
@@ -227,10 +230,12 @@ inline static uint32_t midr_score_core(uint32_t midr) {
 			return 1;
 		default:
 			/*
-			 * Unknown cores, or cores which do not have big/LITTLE roles.
-			 * To be future-proof w.r.t. cores not yet recognized in cpuinfo, assume position between
-			 * Cortex-A57/A72/A73/A75 and Cortex-A53/A55. Then at least future cores paired with
-			 * one of these known cores will be properly scored.
+			 * Unknown cores, or cores which do not have big/LITTLE
+			 * roles. To be future-proof w.r.t. cores not yet
+			 * recognized in cpuinfo, assume position between
+			 * Cortex-A57/A72/A73/A75 and Cortex-A53/A55. Then at
+			 * least future cores paired with one of these known
+			 * cores will be properly scored.
 			 */
 			return 3;
 	}

3rdparty/cpuinfo/src/arm/tlb.c

@@ -5,23 +5,24 @@ switch (uarch) {
 		/*
 		 * Cortex-A5 Technical Reference Manual:
 		 * 6.3.1. Micro TLB
-		 *   The first level of caching for the page table information is a micro TLB of
-		 *   10 entries that is implemented on each of the instruction and data sides.
-		 * 6.3.2. Main TLB
-		 *   Misses from the instruction and data micro TLBs are handled by a unified main TLB.
-		 *   The main TLB is 128-entry two-way set-associative.
+		 *   The first level of caching for the page table information
+		 * is a micro TLB of 10 entries that is implemented on each of
+		 * the instruction and data sides. 6.3.2. Main TLB Misses from
+		 * the instruction and data micro TLBs are handled by a unified
+		 * main TLB. The main TLB is 128-entry two-way set-associative.
 		 */
 		break;
 	case cpuinfo_uarch_cortex_a7:
 		/*
 		 * Cortex-A7 MPCore Technical Reference Manual:
 		 * 5.3.1. Micro TLB
-		 *   The first level of caching for the page table information is a micro TLB of
-		 *   10 entries that is implemented on each of the instruction and data sides.
-		 * 5.3.2. Main TLB
-		 *   Misses from the micro TLBs are handled by a unified main TLB. This is a 256-entry 2-way
-		 *   set-associative structure. The main TLB supports all the VMSAv7 page sizes of
-		 *   4KB, 64KB, 1MB and 16MB in addition to the LPAE page sizes of 2MB and 1G.
+		 *   The first level of caching for the page table information
+		 * is a micro TLB of 10 entries that is implemented on each of
+		 * the instruction and data sides. 5.3.2. Main TLB Misses from
+		 * the micro TLBs are handled by a unified main TLB. This is a
+		 * 256-entry 2-way set-associative structure. The main TLB
+		 * supports all the VMSAv7 page sizes of 4KB, 64KB, 1MB and 16MB
+		 * in addition to the LPAE page sizes of 2MB and 1G.
 		 */
 		break;
 	case cpuinfo_uarch_cortex_a8:
@@ -29,7 +30,8 @@ switch (uarch) {
 		 * Cortex-A8 Technical Reference Manual:
 		 * 6.1. About the MMU
 		 *    The MMU features include the following:
-		 *     - separate, fully-associative, 32-entry data and instruction TLBs
+		 *     - separate, fully-associative, 32-entry data and
+		 * instruction TLBs
 		 *     - TLB entries that support 4KB, 64KB, 1MB, and 16MB pages
 		 */
 		break;
@@ -37,51 +39,63 @@ switch (uarch) {
 		/*
 		 * ARM Cortex‑A9 Technical Reference Manual:
 		 * 6.2.1 Micro TLB
-		 *    The first level of caching for the page table information is a micro TLB of 32 entries on the data side,
-		 *    and configurable 32 or 64 entries on the instruction side.
-		 * 6.2.2 Main TLB
-		 *    The main TLB is implemented as a combination of:
+		 *    The first level of caching for the page table information
+		 * is a micro TLB of 32 entries on the data side, and
+		 * configurable 32 or 64 entries on the instruction side. 6.2.2
+		 * Main TLB The main TLB is implemented as a combination of:
 		 *     - A fully-associative, lockable array of four elements.
-		 *     - A 2-way associative structure of 2x32, 2x64, 2x128 or 2x256 entries.
+		 *     - A 2-way associative structure of 2x32, 2x64, 2x128 or
+		 * 2x256 entries.
 		 */
 		break;
 	case cpuinfo_uarch_cortex_a15:
 		/*
 		 * ARM Cortex-A15 MPCore Processor Technical Reference Manual:
 		 * 5.2.1. L1 instruction TLB
-		 *    The L1 instruction TLB is a 32-entry fully-associative structure. This TLB caches entries at the 4KB
-		 *    granularity of Virtual Address (VA) to Physical Address (PA) mapping only. If the page tables map the
-		 *    memory region to a larger granularity than 4K, it only allocates one mapping for the particular 4K region
-		 *    to which the current access corresponds.
-		 * 5.2.2. L1 data TLB
-		 *    There are two separate 32-entry fully-associative TLBs that are used for data loads and stores,
-		 *    respectively. Similar to the L1 instruction TLB, both of these cache entries at the 4KB granularity of
-		 *    VA to PA mappings only. At implementation time, the Cortex-A15 MPCore processor can be configured with
-		 *    the -l1tlb_1m option, to have the L1 data TLB cache entries at both the 4KB and 1MB granularity.
-		 *    With this configuration, any translation that results in a 1MB or larger page is cached in the L1 data
-		 *    TLB as a 1MB entry. Any translation that results in a page smaller than 1MB is cached in the L1 data TLB
-		 *    as a 4KB entry. By default, all translations are cached in the L1 data TLB as a 4KB entry.
-		 * 5.2.3. L2 TLB
-		 *    Misses from the L1 instruction and data TLBs are handled by a unified L2 TLB. This is a 512-entry 4-way
-		 *    set-associative structure. The L2 TLB supports all the VMSAv7 page sizes of 4K, 64K, 1MB and 16MB in
-		 *    addition to the LPAE page sizes of 2MB and 1GB.
+		 *    The L1 instruction TLB is a 32-entry fully-associative
+		 * structure. This TLB caches entries at the 4KB granularity of
+		 * Virtual Address (VA) to Physical Address (PA) mapping only.
+		 * If the page tables map the memory region to a larger
+		 * granularity than 4K, it only allocates one mapping for the
+		 * particular 4K region to which the current access
+		 * corresponds. 5.2.2. L1 data TLB There are two separate
+		 * 32-entry fully-associative TLBs that are used for data loads
+		 * and stores, respectively. Similar to the L1 instruction TLB,
+		 * both of these cache entries at the 4KB granularity of VA to
+		 * PA mappings only. At implementation time, the Cortex-A15
+		 * MPCore processor can be configured with the -l1tlb_1m option,
+		 * to have the L1 data TLB cache entries at both the 4KB and 1MB
+		 * granularity. With this configuration, any translation that
+		 * results in a 1MB or larger page is cached in the L1 data TLB
+		 * as a 1MB entry. Any translation that results in a page
+		 * smaller than 1MB is cached in the L1 data TLB as a 4KB entry.
+		 * By default, all translations are cached in the L1 data TLB as
+		 * a 4KB entry. 5.2.3. L2 TLB Misses from the L1 instruction and
+		 * data TLBs are handled by a unified L2 TLB. This is a
+		 * 512-entry 4-way set-associative structure. The L2 TLB
+		 * supports all the VMSAv7 page sizes of 4K, 64K, 1MB and 16MB
+		 * in addition to the LPAE page sizes of 2MB and 1GB.
 		 */
 		break;
 	case cpuinfo_uarch_cortex_a17:
 		/*
 		 * ARM Cortex-A17 MPCore Processor Technical Reference Manual:
 		 * 5.2.1. Instruction micro TLB
-		 *    The instruction micro TLB is implemented as a 32, 48 or 64 entry, fully-associative structure. This TLB
-		 *    caches entries at the 4KB and 1MB granularity of Virtual Address (VA) to Physical Address (PA) mapping
-		 *    only. If the translation tables map the memory region to a larger granularity than 4KB or 1MB, it only
-		 *    allocates one mapping for the particular 4KB region to which the current access corresponds.
-		 * 5.2.2. Data micro TLB
-		 *    The data micro TLB is a 32 entry fully-associative TLB that is used for data loads and stores. The cache
-		 *    entries have a 4KB and 1MB granularity of VA to PA mappings only.
-		 * 5.2.3. Unified main TLB
-		 *    Misses from the instruction and data micro TLBs are handled by a unified main TLB. This is a 1024 entry
-		 *    4-way set-associative structure. The main TLB supports all the VMSAv7 page sizes of 4K, 64K, 1MB and 16MB
-		 *    in addition to the LPAE page sizes of 2MB and 1GB.
+		 *    The instruction micro TLB is implemented as a 32, 48 or 64
+		 * entry, fully-associative structure. This TLB caches entries
+		 * at the 4KB and 1MB granularity of Virtual Address (VA) to
+		 * Physical Address (PA) mapping only. If the translation tables
+		 * map the memory region to a larger granularity than 4KB or
+		 * 1MB, it only allocates one mapping for the particular 4KB
+		 * region to which the current access corresponds. 5.2.2. Data
+		 * micro TLB The data micro TLB is a 32 entry fully-associative
+		 * TLB that is used for data loads and stores. The cache entries
+		 * have a 4KB and 1MB granularity of VA to PA mappings
+		 * only. 5.2.3. Unified main TLB Misses from the instruction and
+		 * data micro TLBs are handled by a unified main TLB. This is a
+		 * 1024 entry 4-way set-associative structure. The main TLB
+		 * supports all the VMSAv7 page sizes of 4K, 64K, 1MB and 16MB
+		 * in addition to the LPAE page sizes of 2MB and 1GB.
 		 */
 		break;
 	case cpuinfo_uarch_cortex_a35:
@@ -89,45 +103,52 @@ switch (uarch) {
 		 * ARM Cortex‑A35 Processor Technical Reference Manual:
 		 * A6.2 TLB Organization
 		 *   Micro TLB
-		 *     The first level of caching for the translation table information is a micro TLB of ten entries that
-		 *     is implemented on each of the instruction and data sides.
-		 *   Main TLB
-		 *     A unified main TLB handles misses from the micro TLBs. It has a 512-entry, 2-way, set-associative
-		 *     structure and supports all VMSAv8 block sizes, except 1GB. If it fetches a 1GB block, the TLB splits
-		 *     it into 512MB blocks and stores the appropriate block for the lookup.
+		 *     The first level of caching for the translation table
+		 * information is a micro TLB of ten entries that is implemented
+		 * on each of the instruction and data sides. Main TLB A unified
+		 * main TLB handles misses from the micro TLBs. It has a
+		 * 512-entry, 2-way, set-associative structure and supports all
+		 * VMSAv8 block sizes, except 1GB. If it fetches a 1GB block,
+		 * the TLB splits it into 512MB blocks and stores the
+		 * appropriate block for the lookup.
 		 */
 		break;
 	case cpuinfo_uarch_cortex_a53:
 		/*
 		 * ARM Cortex-A53 MPCore Processor Technical Reference Manual:
 		 * 5.2.1. Micro TLB
-		 *    The first level of caching for the translation table information is a micro TLB of ten entries that is
-		 *    implemented on each of the instruction and data sides.
-		 * 5.2.2. Main TLB
-		 *    A unified main TLB handles misses from the micro TLBs. This is a 512-entry, 4-way, set-associative
-		 *    structure. The main TLB supports all VMSAv8 block sizes, except 1GB. If a 1GB block is fetched, it is
-		 *    split into 512MB blocks and the appropriate block for the lookup stored.
+		 *    The first level of caching for the translation table
+		 * information is a micro TLB of ten entries that is implemented
+		 * on each of the instruction and data sides. 5.2.2. Main TLB A
+		 * unified main TLB handles misses from the micro TLBs. This is
+		 * a 512-entry, 4-way, set-associative structure. The main TLB
+		 * supports all VMSAv8 block sizes, except 1GB. If a 1GB block
+		 * is fetched, it is split into 512MB blocks and the appropriate
+		 * block for the lookup stored.
 		 */
 		break;
 	case cpuinfo_uarch_cortex_a57:
 		/*
 		 * ARM® Cortex-A57 MPCore Processor Technical Reference Manual:
 		 * 5.2.1 L1 instruction TLB
-		 *    The L1 instruction TLB is a 48-entry fully-associative structure. This TLB caches entries of three
-		 *    different page sizes, natively 4KB, 64KB, and 1MB, of VA to PA mappings. If the page tables map the memory
-		 *    region to a larger granularity than 1MB, it only allocates one mapping for the particular 1MB region to
-		 *    which the current access corresponds.
-		 * 5.2.2 L1 data TLB
-		 *    The L1 data TLB is a 32-entry fully-associative TLB that is used for data loads and stores. This TLB
-		 *    caches entries of three different page sizes, natively 4KB, 64KB, and 1MB, of VA to PA mappings.
-		 * 5.2.3 L2 TLB
-		 *    Misses from the L1 instruction and data TLBs are handled by a unified L2 TLB. This is a 1024-entry 4-way
-		 *    set-associative structure. The L2 TLB supports the page sizes of 4K, 64K, 1MB and 16MB. It also supports
-		 *    page sizes of 2MB and 1GB for the long descriptor format translation in AArch32 state and in AArch64 state
-		 *    when using the 4KB translation granule. In addition, the L2 TLB supports the 512MB page map size defined
-		 *    for the AArch64 translations that use a 64KB translation granule.
+		 *    The L1 instruction TLB is a 48-entry fully-associative
+		 * structure. This TLB caches entries of three different page
+		 * sizes, natively 4KB, 64KB, and 1MB, of VA to PA mappings. If
+		 * the page tables map the memory region to a larger granularity
+		 * than 1MB, it only allocates one mapping for the particular
+		 * 1MB region to which the current access corresponds. 5.2.2 L1
+		 * data TLB The L1 data TLB is a 32-entry fully-associative TLB
+		 * that is used for data loads and stores. This TLB caches
+		 * entries of three different page sizes, natively 4KB, 64KB,
+		 * and 1MB, of VA to PA mappings. 5.2.3 L2 TLB Misses from the
+		 * L1 instruction and data TLBs are handled by a unified L2 TLB.
+		 * This is a 1024-entry 4-way set-associative structure. The L2
+		 * TLB supports the page sizes of 4K, 64K, 1MB and 16MB. It also
+		 * supports page sizes of 2MB and 1GB for the long descriptor
+		 * format translation in AArch32 state and in AArch64 state when
+		 * using the 4KB translation granule. In addition, the L2 TLB
+		 * supports the 512MB page map size defined for the AArch64
+		 * translations that use a 64KB translation granule.
 		 */
 		break;
 }
-
-

3rdparty/cpuinfo/src/arm/uarch.c

@@ -4,15 +4,13 @@
 #include <arm/midr.h>
 #include <cpuinfo/log.h>
 
-
 void cpuinfo_arm_decode_vendor_uarch(
 	uint32_t midr,
 #if CPUINFO_ARCH_ARM
 	bool has_vfpv4,
 #endif /* CPUINFO_ARCH_ARM */
 	enum cpuinfo_vendor vendor[restrict static 1],
-	enum cpuinfo_uarch uarch[restrict static 1])
-{
+	enum cpuinfo_uarch uarch[restrict static 1]) {
 	switch (midr_get_implementer(midr)) {
 		case 'A':
 			*vendor = cpuinfo_vendor_arm;
@@ -39,8 +37,9 @@ void cpuinfo_arm_decode_vendor_uarch(
 				case 0xC0D:
 					/*
 					 * Rockchip RK3288 only.
-					 * Core information is ambiguous: some sources specify Cortex-A12, others - Cortex-A17.
-					 * Assume it is Cortex-A12.
+					 * Core information is ambiguous: some
+					 * sources specify Cortex-A12, others -
+					 * Cortex-A17. Assume it is Cortex-A12.
 					 */
 					*uarch = cpuinfo_uarch_cortex_a12;
 					break;
@@ -58,9 +57,11 @@ void cpuinfo_arm_decode_vendor_uarch(
 					*uarch = cpuinfo_uarch_cortex_a35;
 					break;
 				case 0xD05:
-					// Note: use Variant, not Revision, field
-					*uarch = (midr & CPUINFO_ARM_MIDR_VARIANT_MASK) == 0 ?
-						cpuinfo_uarch_cortex_a55r0 : cpuinfo_uarch_cortex_a55;
+					// Note: use Variant, not Revision,
+					// field
+					*uarch = (midr & CPUINFO_ARM_MIDR_VARIANT_MASK) == 0
+						? cpuinfo_uarch_cortex_a55r0
+						: cpuinfo_uarch_cortex_a55;
 					break;
 				case 0xD06:
 					*uarch = cpuinfo_uarch_cortex_a65;
@@ -138,7 +139,9 @@ void cpuinfo_arm_decode_vendor_uarch(
 							break;
 #endif /* CPUINFO_ARCH_ARM */
 						default:
-							cpuinfo_log_warning("unknown ARM CPU part 0x%03"PRIx32" ignored", midr_get_part(midr));
+							cpuinfo_log_warning(
+								"unknown ARM CPU part 0x%03" PRIx32 " ignored",
+								midr_get_part(midr));
 					}
 			}
 			break;
@@ -153,13 +156,17 @@ void cpuinfo_arm_decode_vendor_uarch(
 					break;
 #if CPUINFO_ARCH_ARM64
 				case 0x516:
-					/* Broadcom Vulkan was sold to Cavium before it reached the market, so we identify it as Cavium ThunderX2 */
+					/* Broadcom Vulkan was sold to Cavium
+					 * before it reached the market, so we
+					 * identify it as Cavium ThunderX2 */
 					*vendor = cpuinfo_vendor_cavium;
 					*uarch = cpuinfo_uarch_thunderx2;
 					break;
 #endif /* CPUINFO_ARCH_ARM64 */
 				default:
-					cpuinfo_log_warning("unknown Broadcom CPU part 0x%03"PRIx32" ignored", midr_get_part(midr));
+					cpuinfo_log_warning(
+						"unknown Broadcom CPU part 0x%03" PRIx32 " ignored",
+						midr_get_part(midr));
 			}
 			break;
 #if CPUINFO_ARCH_ARM64
@@ -176,7 +183,8 @@ void cpuinfo_arm_decode_vendor_uarch(
 					*uarch = cpuinfo_uarch_thunderx2;
 					break;
 				default:
-					cpuinfo_log_warning("unknown Cavium CPU part 0x%03"PRIx32" ignored", midr_get_part(midr));
+					cpuinfo_log_warning(
+						"unknown Cavium CPU part 0x%03" PRIx32 " ignored", midr_get_part(midr));
 			}
 			break;
 #endif /* CPUINFO_ARCH_ARM64 */
@@ -188,12 +196,14 @@ void cpuinfo_arm_decode_vendor_uarch(
 					*uarch = cpuinfo_uarch_taishan_v110;
 					break;
 #endif /* CPUINFO_ARCH_ARM64 */
-				case 0xD40: /* Kirin 980 Big/Medium cores -> Cortex-A76 */
+				case 0xD40: /* Kirin 980 Big/Medium cores ->
+					       Cortex-A76 */
 					*vendor = cpuinfo_vendor_arm;
 					*uarch = cpuinfo_uarch_cortex_a76;
 					break;
 				default:
-					cpuinfo_log_warning("unknown Huawei CPU part 0x%03"PRIx32" ignored", midr_get_part(midr));
+					cpuinfo_log_warning(
+						"unknown Huawei CPU part 0x%03" PRIx32 " ignored", midr_get_part(midr));
 			}
 			break;
 #if CPUINFO_ARCH_ARM
@@ -206,7 +216,8 @@ void cpuinfo_arm_decode_vendor_uarch(
 					*uarch = cpuinfo_uarch_xscale;
 					break;
 				default:
-					cpuinfo_log_warning("unknown Intel CPU part 0x%03"PRIx32" ignored", midr_get_part(midr));
+					cpuinfo_log_warning(
+						"unknown Intel CPU part 0x%03" PRIx32 " ignored", midr_get_part(midr));
 			}
 			break;
 #endif /* CPUINFO_ARCH_ARM */
@@ -223,7 +234,8 @@ void cpuinfo_arm_decode_vendor_uarch(
 					*uarch = cpuinfo_uarch_carmel;
 					break;
 				default:
-					cpuinfo_log_warning("unknown Nvidia CPU part 0x%03"PRIx32" ignored", midr_get_part(midr));
+					cpuinfo_log_warning(
+						"unknown Nvidia CPU part 0x%03" PRIx32 " ignored", midr_get_part(midr));
 			}
 			break;
 		case 'P':
@@ -233,7 +245,9 @@ void cpuinfo_arm_decode_vendor_uarch(
 					*uarch = cpuinfo_uarch_xgene;
 					break;
 				default:
-					cpuinfo_log_warning("unknown Applied Micro CPU part 0x%03"PRIx32" ignored", midr_get_part(midr));
+					cpuinfo_log_warning(
+						"unknown Applied Micro CPU part 0x%03" PRIx32 " ignored",
+						midr_get_part(midr));
 			}
 			break;
 		case 'Q':
@@ -241,9 +255,12 @@ void cpuinfo_arm_decode_vendor_uarch(
 			switch (midr_get_part(midr)) {
 #if CPUINFO_ARCH_ARM
 				case 0x00F:
-					/* Mostly Scorpions, but some Cortex A5 may report this value as well */
+					/* Mostly Scorpions, but some Cortex A5
+					 * may report this value as well
+					 */
 					if (has_vfpv4) {
-						/* Unlike Scorpion, Cortex-A5 comes with VFPv4 */
+						/* Unlike Scorpion, Cortex-A5
+						 * comes with VFPv4 */
 						*vendor = cpuinfo_vendor_arm;
 						*uarch = cpuinfo_uarch_cortex_a5;
 					} else {
@@ -266,39 +283,51 @@ void cpuinfo_arm_decode_vendor_uarch(
 					 * - r0p1 -> Krait 200
 					 * - r0p2 -> Krait 200
 					 * - r1p0 -> Krait 300
-					 * - r2p0 -> Krait 400 (Snapdragon 800 MSMxxxx)
-					 * - r2p1 -> Krait 400 (Snapdragon 801 MSMxxxxPRO)
+					 * - r2p0 -> Krait 400 (Snapdragon 800
+					 * MSMxxxx)
+					 * - r2p1 -> Krait 400 (Snapdragon 801
+					 * MSMxxxxPRO)
 					 * - r3p1 -> Krait 450
 					 */
 					*uarch = cpuinfo_uarch_krait;
 					break;
 #endif /* CPUINFO_ARCH_ARM */
-				case 0x201: /* Qualcomm Snapdragon 821: Low-power Kryo "Silver" */
-				case 0x205: /* Qualcomm Snapdragon 820 & 821: High-performance Kryo "Gold" */
-				case 0x211: /* Qualcomm Snapdragon 820: Low-power Kryo "Silver" */
+				case 0x201: /* Qualcomm Snapdragon 821:
+					       Low-power Kryo "Silver" */
+				case 0x205: /* Qualcomm Snapdragon 820 & 821:
+					       High-performance Kryo "Gold" */
+				case 0x211: /* Qualcomm Snapdragon 820:
+					       Low-power Kryo "Silver" */
 					*uarch = cpuinfo_uarch_kryo;
 					break;
-				case 0x800: /* High-performance Kryo 260 (r10p2) / Kryo 280 (r10p1) "Gold" -> Cortex-A73 */
+				case 0x800: /* High-performance Kryo 260 (r10p2)
+					       / Kryo 280 (r10p1) "Gold" ->
+					       Cortex-A73 */
 					*vendor = cpuinfo_vendor_arm;
 					*uarch = cpuinfo_uarch_cortex_a73;
 					break;
-				case 0x801: /* Low-power Kryo 260 / 280 "Silver" -> Cortex-A53 */
+				case 0x801: /* Low-power Kryo 260 / 280 "Silver"
+					       -> Cortex-A53 */
 					*vendor = cpuinfo_vendor_arm;
 					*uarch = cpuinfo_uarch_cortex_a53;
 					break;
-				case 0x802: /* High-performance Kryo 385 "Gold" -> Cortex-A75 */
+				case 0x802: /* High-performance Kryo 385 "Gold"
+					       -> Cortex-A75 */
 					*vendor = cpuinfo_vendor_arm;
 					*uarch = cpuinfo_uarch_cortex_a75;
 					break;
-				case 0x803: /* Low-power Kryo 385 "Silver" -> Cortex-A55r0 */
+				case 0x803: /* Low-power Kryo 385 "Silver" ->
+					       Cortex-A55r0 */
 					*vendor = cpuinfo_vendor_arm;
 					*uarch = cpuinfo_uarch_cortex_a55r0;
 					break;
-				case 0x804: /* High-performance Kryo 485 "Gold" / "Gold Prime" -> Cortex-A76 */
+				case 0x804: /* High-performance Kryo 485 "Gold"
+					       / "Gold Prime" -> Cortex-A76 */
 					*vendor = cpuinfo_vendor_arm;
 					*uarch = cpuinfo_uarch_cortex_a76;
 					break;
-				case 0x805: /* Low-performance Kryo 485 "Silver" -> Cortex-A55 */
+				case 0x805: /* Low-performance Kryo 485 "Silver"
+					       -> Cortex-A55 */
 					*vendor = cpuinfo_vendor_arm;
 					*uarch = cpuinfo_uarch_cortex_a55;
 					break;
@@ -311,7 +340,9 @@ void cpuinfo_arm_decode_vendor_uarch(
 					break;
 #endif /* CPUINFO_ARCH_ARM64 */
 				default:
-					cpuinfo_log_warning("unknown Qualcomm CPU part 0x%03"PRIx32" ignored", midr_get_part(midr));
+					cpuinfo_log_warning(
+						"unknown Qualcomm CPU part 0x%03" PRIx32 " ignored",
+						midr_get_part(midr));
 			}
 			break;
 		case 'S':
@@ -319,7 +350,8 @@ void cpuinfo_arm_decode_vendor_uarch(
 			switch (midr & (CPUINFO_ARM_MIDR_VARIANT_MASK | CPUINFO_ARM_MIDR_PART_MASK)) {
 				case 0x00100010:
 					/*
-					 * Exynos 8890 MIDR = 0x531F0011, assume Exynos M1 has:
+					 * Exynos 8890 MIDR = 0x531F0011, assume
+					 * Exynos M1 has:
 					 * - CPU variant 0x1
 					 * - CPU part 0x001
 					 */
@@ -327,7 +359,8 @@ void cpuinfo_arm_decode_vendor_uarch(
 					break;
 				case 0x00400010:
 					/*
-					 * Exynos 8895 MIDR = 0x534F0010, assume Exynos M2 has:
+					 * Exynos 8895 MIDR = 0x534F0010, assume
+					 * Exynos M2 has:
 					 * - CPU variant 0x4
 					 * - CPU part 0x001
 					 */
@@ -335,7 +368,8 @@ void cpuinfo_arm_decode_vendor_uarch(
 					break;
 				case 0x00100020:
 					/*
-					 * Exynos 9810 MIDR = 0x531F0020, assume Exynos M3 has:
+					 * Exynos 9810 MIDR = 0x531F0020, assume
+					 * Exynos M3 has:
 					 * - CPU variant 0x1
 					 * - CPU part 0x002
 					 */
@@ -343,7 +377,8 @@ void cpuinfo_arm_decode_vendor_uarch(
 					break;
 				case 0x00100030:
 					/*
-					 * Exynos 9820 MIDR = 0x531F0030, assume Exynos M4 has:
+					 * Exynos 9820 MIDR = 0x531F0030, assume
+					 * Exynos M4 has:
 					 * - CPU variant 0x1
 					 * - CPU part 0x003
 					 */
@@ -351,15 +386,19 @@ void cpuinfo_arm_decode_vendor_uarch(
 					break;
 				case 0x00100040:
 					/*
-					 * Exynos 9820 MIDR = 0x531F0040, assume Exynos M5 has:
+					 * Exynos 9820 MIDR = 0x531F0040, assume
+					 * Exynos M5 has:
 					 * - CPU variant 0x1
 					 * - CPU part 0x004
 					 */
 					*uarch = cpuinfo_uarch_exynos_m5;
 					break;
 				default:
-					cpuinfo_log_warning("unknown Samsung CPU variant 0x%01"PRIx32" part 0x%03"PRIx32" ignored",
-						midr_get_variant(midr), midr_get_part(midr));
+					cpuinfo_log_warning(
+						"unknown Samsung CPU variant 0x%01" PRIx32 " part 0x%03" PRIx32
+						" ignored",
+						midr_get_variant(midr),
+						midr_get_part(midr));
 			}
 			break;
 #if CPUINFO_ARCH_ARM
@@ -371,12 +410,17 @@ void cpuinfo_arm_decode_vendor_uarch(
 					*uarch = cpuinfo_uarch_pj4;
 					break;
 				default:
-					cpuinfo_log_warning("unknown Marvell CPU part 0x%03"PRIx32" ignored", midr_get_part(midr));
+					cpuinfo_log_warning(
+						"unknown Marvell CPU part 0x%03" PRIx32 " ignored",
+						midr_get_part(midr));
 			}
 			break;
 #endif /* CPUINFO_ARCH_ARM */
 		default:
-			cpuinfo_log_warning("unknown CPU implementer '%c' (0x%02"PRIx32") with CPU part 0x%03"PRIx32" ignored",
-				(char) midr_get_implementer(midr), midr_get_implementer(midr), midr_get_part(midr));
+			cpuinfo_log_warning(
+				"unknown CPU implementer '%c' (0x%02" PRIx32 ") with CPU part 0x%03" PRIx32 " ignored",
+				(char)midr_get_implementer(midr),
+				midr_get_implementer(midr),
+				midr_get_part(midr));
 	}
 }

3rdparty/cpuinfo/src/arm/windows/init-by-logical-sys-info.c

@@ -1,9 +1,9 @@
-#include <stdio.h>
+#include <errno.h>
+#include <malloc.h>
 #include <stdint.h>
+#include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <malloc.h>
-#include <errno.h>
 #include <sys/types.h>
 
 #include <cpuinfo.h>
@@ -12,7 +12,7 @@
 
 #include "windows-arm-init.h"
 
-#define MAX_NR_OF_CACHES	(cpuinfo_cache_level_max - 1)
+#define MAX_NR_OF_CACHES (cpuinfo_cache_level_max - 1)
 
 /* Call chain:
  * cpu_info_init_by_logical_sys_info
@@ -27,30 +27,28 @@
  * 					store_cache_info_per_processor
  */
 
-static uint32_t count_logical_processors(
-	const uint32_t max_group_count,
-	uint32_t* global_proc_index_per_group);
+static uint32_t count_logical_processors(const uint32_t max_group_count, uint32_t* global_proc_index_per_group);
 
 static uint32_t read_packages_for_processors(
 	struct cpuinfo_processor* processors,
 	const uint32_t number_of_processors,
 	const uint32_t* global_proc_index_per_group,
-	const struct woa_chip_info *chip_info);
+	const struct woa_chip_info* chip_info);
 
 static uint32_t read_cores_for_processors(
 	struct cpuinfo_processor* processors,
 	const uint32_t number_of_processors,
 	const uint32_t* global_proc_index_per_group,
 	struct cpuinfo_core* cores,
-	const struct woa_chip_info *chip_info);
+	const struct woa_chip_info* chip_info);
 
 static uint32_t read_caches_for_processors(
-	struct cpuinfo_processor *processors,
+	struct cpuinfo_processor* processors,
 	const uint32_t number_of_processors,
-	struct cpuinfo_cache *caches,
+	struct cpuinfo_cache* caches,
 	uint32_t* numbers_of_caches,
 	const uint32_t* global_proc_index_per_group,
-	const struct woa_chip_info *chip_info);
+	const struct woa_chip_info* chip_info);
 
 static uint32_t read_all_logical_processor_info_of_relation(
 	LOGICAL_PROCESSOR_RELATIONSHIP info_type,
@@ -60,7 +58,7 @@ static uint32_t read_all_logical_processor_info_of_relation(
 	uint32_t* numbers_of_caches,
 	struct cpuinfo_core* cores,
 	const uint32_t* global_proc_index_per_group,
-	const struct woa_chip_info *chip_info);
+	const struct woa_chip_info* chip_info);
 
 static bool parse_relation_processor_info(
 	struct cpuinfo_processor* processors,
@@ -69,7 +67,7 @@ static bool parse_relation_processor_info(
 	PSYSTEM_LOGICAL_PROCESSOR_INFORMATION_EX info,
 	const uint32_t info_id,
 	struct cpuinfo_core* cores,
-	const struct woa_chip_info *chip_info);
+	const struct woa_chip_info* chip_info);
 
 static bool parse_relation_cache_info(
 	struct cpuinfo_processor* processors,
@@ -91,7 +89,7 @@ static void store_core_info_per_processor(
 	const uint32_t core_id,
 	PSYSTEM_LOGICAL_PROCESSOR_INFORMATION_EX core_info,
 	struct cpuinfo_core* cores,
-	const struct woa_chip_info *chip_info);
+	const struct woa_chip_info* chip_info);
 
 static void store_cache_info_per_processor(
 	struct cpuinfo_processor* processors,
@@ -112,11 +110,7 @@ static bool connect_packages_cores_clusters_by_processors(
 
 static inline uint32_t low_index_from_kaffinity(KAFFINITY kaffinity);
 
-
-bool cpu_info_init_by_logical_sys_info(
-	const struct woa_chip_info *chip_info,
-	const enum cpuinfo_vendor vendor)
-{
+bool cpu_info_init_by_logical_sys_info(const struct woa_chip_info* chip_info, const enum cpuinfo_vendor vendor) {
 	struct cpuinfo_processor* processors = NULL;
 	struct cpuinfo_package* packages = NULL;
 	struct cpuinfo_cluster* clusters = NULL;
@@ -128,147 +122,156 @@ bool cpu_info_init_by_logical_sys_info(
 	uint32_t nr_of_cores = 0;
 	uint32_t nr_of_all_caches = 0;
 	uint32_t numbers_of_caches[MAX_NR_OF_CACHES] = {0};
-	
+
 	uint32_t nr_of_uarchs = 0;
 	bool result = false;
-	
+
 	HANDLE heap = GetProcessHeap();
 
 	/* 1. Count available logical processor groups and processors */
-	const uint32_t max_group_count = (uint32_t) GetMaximumProcessorGroupCount();
-	cpuinfo_log_debug("detected %"PRIu32" processor group(s)", max_group_count);
-	/* We need to store the absolute processor ID offsets for every groups, because
+	const uint32_t max_group_count = (uint32_t)GetMaximumProcessorGroupCount();
+	cpuinfo_log_debug("detected %" PRIu32 " processor group(s)", max_group_count);
+	/* We need to store the absolute processor ID offsets for every groups,
+	 * because
 	 *  1. We can't assume every processor groups include the same number of
 	 *     logical processors.
-	 *  2. Every processor groups know its group number and processor IDs within
-	 *     the group, but not the global processor IDs.
+	 *  2. Every processor groups know its group number and processor IDs
+	 * within the group, but not the global processor IDs.
 	 *  3. We need to list every logical processors by global IDs.
-	*/
-	uint32_t* global_proc_index_per_group =
-		(uint32_t*) HeapAlloc(heap, 0, max_group_count * sizeof(uint32_t));
+	 */
+	uint32_t* global_proc_index_per_group = (uint32_t*)HeapAlloc(heap, 0, max_group_count * sizeof(uint32_t));
 	if (global_proc_index_per_group == NULL) {
 		cpuinfo_log_error(
-			"failed to allocate %zu bytes for descriptions of %"PRIu32" processor groups",
-			max_group_count * sizeof(struct cpuinfo_processor), max_group_count);
-		goto clean_up;
-	}
-	
-	uint32_t nr_of_processors =
-		count_logical_processors(max_group_count, global_proc_index_per_group);
-	processors = HeapAlloc(heap, HEAP_ZERO_MEMORY, nr_of_processors * sizeof(struct cpuinfo_processor));
-	if (processors == NULL) {
-		cpuinfo_log_error(
-			"failed to allocate %zu bytes for descriptions of %"PRIu32" logical processors",
-			nr_of_processors * sizeof(struct cpuinfo_processor), nr_of_processors);
+			"failed to allocate %zu bytes for descriptions of %" PRIu32 " processor groups",
+			max_group_count * sizeof(struct cpuinfo_processor),
+			max_group_count);
 		goto clean_up;
 	}
 
-	/* 2. Read topology information via MSDN API: packages, cores and caches*/
-	nr_of_packages = read_packages_for_processors(
-						processors, nr_of_processors,
-						global_proc_index_per_group,
-						chip_info);
+	uint32_t nr_of_processors = count_logical_processors(max_group_count, global_proc_index_per_group);
+	processors = HeapAlloc(heap, HEAP_ZERO_MEMORY, nr_of_processors * sizeof(struct cpuinfo_processor));
+	if (processors == NULL) {
+		cpuinfo_log_error(
+			"failed to allocate %zu bytes for descriptions of %" PRIu32 " logical processors",
+			nr_of_processors * sizeof(struct cpuinfo_processor),
+			nr_of_processors);
+		goto clean_up;
+	}
+
+	/* 2. Read topology information via MSDN API: packages, cores and
+	 * caches*/
+	nr_of_packages =
+		read_packages_for_processors(processors, nr_of_processors, global_proc_index_per_group, chip_info);
 	if (!nr_of_packages) {
 		cpuinfo_log_error("error in reading package information");
 		goto clean_up;
 	}
-	cpuinfo_log_debug("detected %"PRIu32" processor package(s)", nr_of_packages);
+	cpuinfo_log_debug("detected %" PRIu32 " processor package(s)", nr_of_packages);
 
 	/* We need the EfficiencyClass to parse uarch from the core information,
 	 * but we need to iterate first to count cores and allocate memory then
-	 * we will iterate again to read and store data to cpuinfo_core structures.
+	 * we will iterate again to read and store data to cpuinfo_core
+	 * structures.
 	 */
-	nr_of_cores = read_cores_for_processors(
-					processors, nr_of_processors,
-					global_proc_index_per_group, NULL,
-					chip_info);
+	nr_of_cores =
+		read_cores_for_processors(processors, nr_of_processors, global_proc_index_per_group, NULL, chip_info);
 	if (!nr_of_cores) {
 		cpuinfo_log_error("error in reading core information");
 		goto clean_up;
 	}
-	cpuinfo_log_debug("detected %"PRIu32" processor core(s)", nr_of_cores);
+	cpuinfo_log_debug("detected %" PRIu32 " processor core(s)", nr_of_cores);
 
-	/* There is no API to read number of caches, so we need to iterate twice on caches:
+	/* There is no API to read number of caches, so we need to iterate twice
+	   on caches:
 		1. Count all type of caches -> allocate memory
 		2. Read out cache data and store to allocated memory
 	 */
 	nr_of_all_caches = read_caches_for_processors(
-						processors, nr_of_processors,
-						caches, numbers_of_caches,
-						global_proc_index_per_group, chip_info);
+		processors, nr_of_processors, caches, numbers_of_caches, global_proc_index_per_group, chip_info);
 	if (!nr_of_all_caches) {
 		cpuinfo_log_error("error in reading cache information");
 		goto clean_up;
 	}
-	cpuinfo_log_debug("detected %"PRIu32" processor cache(s)", nr_of_all_caches);
+	cpuinfo_log_debug("detected %" PRIu32 " processor cache(s)", nr_of_all_caches);
 
 	/* 3. Allocate memory for package, cluster, core and cache structures */
 	packages = HeapAlloc(heap, HEAP_ZERO_MEMORY, nr_of_packages * sizeof(struct cpuinfo_package));
 	if (packages == NULL) {
-		cpuinfo_log_error("failed to allocate %zu bytes for descriptions of %"PRIu32" physical packages",
-			nr_of_packages * sizeof(struct cpuinfo_package), nr_of_packages);
+		cpuinfo_log_error(
+			"failed to allocate %zu bytes for descriptions of %" PRIu32 " physical packages",
+			nr_of_packages * sizeof(struct cpuinfo_package),
+			nr_of_packages);
 		goto clean_up;
 	}
 
-	/* We don't have cluster information so we explicitly set clusters to equal to cores. */
+	/* We don't have cluster information so we explicitly set clusters to
+	 * equal to cores. */
 	clusters = HeapAlloc(heap, HEAP_ZERO_MEMORY, nr_of_cores * sizeof(struct cpuinfo_cluster));
 	if (clusters == NULL) {
-		cpuinfo_log_error("failed to allocate %zu bytes for descriptions of %"PRIu32" core clusters",
-			nr_of_cores * sizeof(struct cpuinfo_cluster), nr_of_cores);
+		cpuinfo_log_error(
+			"failed to allocate %zu bytes for descriptions of %" PRIu32 " core clusters",
+			nr_of_cores * sizeof(struct cpuinfo_cluster),
+			nr_of_cores);
 		goto clean_up;
 	}
 
 	cores = HeapAlloc(heap, HEAP_ZERO_MEMORY, nr_of_cores * sizeof(struct cpuinfo_core));
 	if (cores == NULL) {
-		cpuinfo_log_error("failed to allocate %zu bytes for descriptions of %"PRIu32" cores",
-			nr_of_cores * sizeof(struct cpuinfo_core), nr_of_cores);
+		cpuinfo_log_error(
+			"failed to allocate %zu bytes for descriptions of %" PRIu32 " cores",
+			nr_of_cores * sizeof(struct cpuinfo_core),
+			nr_of_cores);
 		goto clean_up;
 	}
 
-	/* We allocate one contiguous cache array for all caches, then use offsets per cache type. */
+	/* We allocate one contiguous cache array for all caches, then use
+	 * offsets per cache type. */
 	caches = HeapAlloc(heap, HEAP_ZERO_MEMORY, nr_of_all_caches * sizeof(struct cpuinfo_cache));
 	if (caches == NULL) {
-		cpuinfo_log_error("failed to allocate %zu bytes for descriptions of %"PRIu32" caches",
-			nr_of_all_caches * sizeof(struct cpuinfo_cache), nr_of_all_caches);
+		cpuinfo_log_error(
+			"failed to allocate %zu bytes for descriptions of %" PRIu32 " caches",
+			nr_of_all_caches * sizeof(struct cpuinfo_cache),
+			nr_of_all_caches);
 		goto clean_up;
 	}
 
-	/* 4.Read missing topology information that can't be saved without counted
-	 *   allocate structures in the first round.
+	/* 4.Read missing topology information that can't be saved without
+	 * counted allocate structures in the first round.
 	 */
 	nr_of_all_caches = read_caches_for_processors(
-						processors, nr_of_processors,
-						caches, numbers_of_caches, global_proc_index_per_group, chip_info);
+		processors, nr_of_processors, caches, numbers_of_caches, global_proc_index_per_group, chip_info);
 	if (!nr_of_all_caches) {
 		cpuinfo_log_error("error in reading cache information");
 		goto clean_up;
 	}
 
-	nr_of_cores = read_cores_for_processors(
-		processors, nr_of_processors,
-		global_proc_index_per_group, cores,
-		chip_info);
+	nr_of_cores =
+		read_cores_for_processors(processors, nr_of_processors, global_proc_index_per_group, cores, chip_info);
 	if (!nr_of_cores) {
 		cpuinfo_log_error("error in reading core information");
 		goto clean_up;
 	}
 
-	/* 5. Now that we read out everything from the system we can, fill the package, cluster
-	 *    and core structures respectively.
+	/* 5. Now that we read out everything from the system we can, fill the
+	 * package, cluster and core structures respectively.
 	 */
 	result = connect_packages_cores_clusters_by_processors(
-				processors, nr_of_processors,
-				packages, nr_of_packages,
-				clusters,
-				cores, nr_of_cores,
-				chip_info,
-				vendor);
-	if(!result) {
+		processors,
+		nr_of_processors,
+		packages,
+		nr_of_packages,
+		clusters,
+		cores,
+		nr_of_cores,
+		chip_info,
+		vendor);
+	if (!result) {
 		cpuinfo_log_error("error in connecting information");
 		goto clean_up;
 	}
 
-	/* 6. Count and store uarchs of cores, assuming same uarchs are neighbors */
+	/* 6. Count and store uarchs of cores, assuming same uarchs are
+	 * neighbors */
 	enum cpuinfo_uarch prev_uarch = cpuinfo_uarch_unknown;
 	for (uint32_t i = 0; i < nr_of_cores; i++) {
 		if (prev_uarch != cores[i].uarch) {
@@ -278,8 +281,10 @@ bool cpu_info_init_by_logical_sys_info(
 	}
 	uarchs = HeapAlloc(heap, HEAP_ZERO_MEMORY, nr_of_uarchs * sizeof(struct cpuinfo_uarch_info));
 	if (uarchs == NULL) {
-		cpuinfo_log_error("failed to allocate %zu bytes for descriptions of %"PRIu32" uarchs",
-			nr_of_uarchs * sizeof(struct cpuinfo_uarch_info), nr_of_uarchs);
+		cpuinfo_log_error(
+			"failed to allocate %zu bytes for descriptions of %" PRIu32 " uarchs",
+			nr_of_uarchs * sizeof(struct cpuinfo_uarch_info),
+			nr_of_uarchs);
 		goto clean_up;
 	}
 	prev_uarch = cpuinfo_uarch_unknown;
@@ -318,10 +323,14 @@ bool cpu_info_init_by_logical_sys_info(
 		cpuinfo_cache_count[i] = numbers_of_caches[i];
 	}
 	cpuinfo_cache[cpuinfo_cache_level_1i] = caches;
-	cpuinfo_cache[cpuinfo_cache_level_1d] = cpuinfo_cache[cpuinfo_cache_level_1i] + cpuinfo_cache_count[cpuinfo_cache_level_1i];
-	cpuinfo_cache[cpuinfo_cache_level_2]  = cpuinfo_cache[cpuinfo_cache_level_1d] + cpuinfo_cache_count[cpuinfo_cache_level_1d];
-	cpuinfo_cache[cpuinfo_cache_level_3]  = cpuinfo_cache[cpuinfo_cache_level_2]  + cpuinfo_cache_count[cpuinfo_cache_level_2];
-	cpuinfo_cache[cpuinfo_cache_level_4]  = cpuinfo_cache[cpuinfo_cache_level_3]  + cpuinfo_cache_count[cpuinfo_cache_level_3];
+	cpuinfo_cache[cpuinfo_cache_level_1d] =
+		cpuinfo_cache[cpuinfo_cache_level_1i] + cpuinfo_cache_count[cpuinfo_cache_level_1i];
+	cpuinfo_cache[cpuinfo_cache_level_2] =
+		cpuinfo_cache[cpuinfo_cache_level_1d] + cpuinfo_cache_count[cpuinfo_cache_level_1d];
+	cpuinfo_cache[cpuinfo_cache_level_3] =
+		cpuinfo_cache[cpuinfo_cache_level_2] + cpuinfo_cache_count[cpuinfo_cache_level_2];
+	cpuinfo_cache[cpuinfo_cache_level_4] =
+		cpuinfo_cache[cpuinfo_cache_level_3] + cpuinfo_cache_count[cpuinfo_cache_level_3];
 	cpuinfo_max_cache_size = cpuinfo_compute_max_cache_size(&processors[0]);
 
 	result = true;
@@ -363,16 +372,13 @@ clean_up:
 	return result;
 }
 
-static uint32_t count_logical_processors(
-	const uint32_t max_group_count,
-	uint32_t* global_proc_index_per_group)
-{
+static uint32_t count_logical_processors(const uint32_t max_group_count, uint32_t* global_proc_index_per_group) {
 	uint32_t nr_of_processors = 0;
 
 	for (uint32_t i = 0; i < max_group_count; i++) {
-		uint32_t nr_of_processors_per_group = GetMaximumProcessorCount((WORD) i);
-		cpuinfo_log_debug("detected %"PRIu32" processor(s) in group %"PRIu32"",
-			nr_of_processors_per_group, i);
+		uint32_t nr_of_processors_per_group = GetMaximumProcessorCount((WORD)i);
+		cpuinfo_log_debug(
+			"detected %" PRIu32 " processor(s) in group %" PRIu32 "", nr_of_processors_per_group, i);
 		global_proc_index_per_group[i] = nr_of_processors;
 		nr_of_processors += nr_of_processors_per_group;
 	}
@@ -383,8 +389,7 @@ static uint32_t read_packages_for_processors(
 	struct cpuinfo_processor* processors,
 	const uint32_t number_of_processors,
 	const uint32_t* global_proc_index_per_group,
-	const struct woa_chip_info *chip_info)
-{
+	const struct woa_chip_info* chip_info) {
 	return read_all_logical_processor_info_of_relation(
 		RelationProcessorPackage,
 		processors,
@@ -401,8 +406,7 @@ uint32_t read_cores_for_processors(
 	const uint32_t number_of_processors,
 	const uint32_t* global_proc_index_per_group,
 	struct cpuinfo_core* cores,
-	const struct woa_chip_info *chip_info)
-{
+	const struct woa_chip_info* chip_info) {
 	return read_all_logical_processor_info_of_relation(
 		RelationProcessorCore,
 		processors,
@@ -420,8 +424,7 @@ static uint32_t read_caches_for_processors(
 	struct cpuinfo_cache* caches,
 	uint32_t* numbers_of_caches,
 	const uint32_t* global_proc_index_per_group,
-	const struct woa_chip_info *chip_info)
-{
+	const struct woa_chip_info* chip_info) {
 	/* Reset processor start indexes */
 	if (caches) {
 		uint32_t cache_offset = 0;
@@ -452,8 +455,7 @@ static uint32_t read_all_logical_processor_info_of_relation(
 	uint32_t* numbers_of_caches,
 	struct cpuinfo_core* cores,
 	const uint32_t* global_proc_index_per_group,
-	const struct woa_chip_info* chip_info)
-{
+	const struct woa_chip_info* chip_info) {
 	PSYSTEM_LOGICAL_PROCESSOR_INFORMATION_EX infos = NULL;
 	uint32_t nr_of_structs = 0;
 	DWORD info_size = 0;
@@ -465,76 +467,74 @@ static uint32_t read_all_logical_processor_info_of_relation(
 		const DWORD last_error = GetLastError();
 		if (last_error != ERROR_INSUFFICIENT_BUFFER) {
 			cpuinfo_log_error(
-				"failed to query size of processor %"PRIu32" information information: error %"PRIu32"",
-				(uint32_t)info_type, (uint32_t) last_error);
+				"failed to query size of processor %" PRIu32 " information information: error %" PRIu32
+				"",
+				(uint32_t)info_type,
+				(uint32_t)last_error);
 			goto clean_up;
 		}
 	}
 	/* 2. Allocate memory for the information structure */
 	infos = HeapAlloc(heap, 0, info_size);
 	if (infos == NULL) {
-		cpuinfo_log_error("failed to allocate %"PRIu32" bytes for logical processor information",
-			(uint32_t) info_size);
+		cpuinfo_log_error(
+			"failed to allocate %" PRIu32 " bytes for logical processor information", (uint32_t)info_size);
 		goto clean_up;
 	}
 	/* 3. Read the information structure */
 	if (GetLogicalProcessorInformationEx(info_type, infos, &info_size) == FALSE) {
-		cpuinfo_log_error("failed to query processor %"PRIu32" information: error %"PRIu32"",
-			(uint32_t)info_type, (uint32_t) GetLastError());
+		cpuinfo_log_error(
+			"failed to query processor %" PRIu32 " information: error %" PRIu32 "",
+			(uint32_t)info_type,
+			(uint32_t)GetLastError());
 		goto clean_up;
 	}
 
 	/* 4. Parse the structure and store relevant data */
 	PSYSTEM_LOGICAL_PROCESSOR_INFORMATION_EX info_end =
-		(PSYSTEM_LOGICAL_PROCESSOR_INFORMATION_EX) ((uintptr_t) infos + info_size);
-	for (PSYSTEM_LOGICAL_PROCESSOR_INFORMATION_EX info = infos;
-		info < info_end;
-		info = (PSYSTEM_LOGICAL_PROCESSOR_INFORMATION_EX) ((uintptr_t) info + info->Size))
-	{
+		(PSYSTEM_LOGICAL_PROCESSOR_INFORMATION_EX)((uintptr_t)infos + info_size);
+	for (PSYSTEM_LOGICAL_PROCESSOR_INFORMATION_EX info = infos; info < info_end;
+	     info = (PSYSTEM_LOGICAL_PROCESSOR_INFORMATION_EX)((uintptr_t)info + info->Size)) {
 		if (info->Relationship != info_type) {
 			cpuinfo_log_warning(
-				"unexpected processor info type (%"PRIu32") for processor information",
-				(uint32_t) info->Relationship);
+				"unexpected processor info type (%" PRIu32 ") for processor information",
+				(uint32_t)info->Relationship);
 			continue;
 		}
 
 		const uint32_t info_id = nr_of_structs++;
 
-		switch(info_type) {
+		switch (info_type) {
 			case RelationProcessorPackage:
 				result = parse_relation_processor_info(
-							processors,
-							number_of_processors,
-							global_proc_index_per_group,
-							info,
-							info_id,
-							cores,
-							chip_info);
-			break;
+					processors,
+					number_of_processors,
+					global_proc_index_per_group,
+					info,
+					info_id,
+					cores,
+					chip_info);
+				break;
 			case RelationProcessorCore:
 				result = parse_relation_processor_info(
-							processors,
-							number_of_processors,
-							global_proc_index_per_group,
-							info,
-							info_id,
-							cores,
-							chip_info);
-			break;
+					processors,
+					number_of_processors,
+					global_proc_index_per_group,
+					info,
+					info_id,
+					cores,
+					chip_info);
+				break;
 			case RelationCache:
 				result = parse_relation_cache_info(
-							processors,
-							caches,
-							numbers_of_caches,
-							global_proc_index_per_group,
-							info);
-			break;
+					processors, caches, numbers_of_caches, global_proc_index_per_group, info);
+				break;
 			default:
 				cpuinfo_log_error(
-					"unexpected processor info type (%"PRIu32") for processor information",
-					(uint32_t) info->Relationship);
+					"unexpected processor info type (%" PRIu32 ") for processor information",
+					(uint32_t)info->Relationship);
 				result = false;
-			break;
+				break;
 		}
 		if (!result) {
 			nr_of_structs = 0;
@@ -555,43 +555,45 @@ static bool parse_relation_processor_info(
 	PSYSTEM_LOGICAL_PROCESSOR_INFORMATION_EX info,
 	const uint32_t info_id,
 	struct cpuinfo_core* cores,
-	const struct woa_chip_info *chip_info)
-{
+	const struct woa_chip_info* chip_info) {
 	for (uint32_t i = 0; i < info->Processor.GroupCount; i++) {
 		const uint32_t group_id = info->Processor.GroupMask[i].Group;
-		/* Bitmask representing processors in this group belonging to this package */
+		/* Bitmask representing processors in this group belonging to
+		 * this package
+		 */
 		KAFFINITY group_processors_mask = info->Processor.GroupMask[i].Mask;
 		while (group_processors_mask != 0) {
-			const uint32_t processor_id_in_group =
-				low_index_from_kaffinity(group_processors_mask);
+			const uint32_t processor_id_in_group = low_index_from_kaffinity(group_processors_mask);
 			const uint32_t processor_global_index =
 				global_proc_index_per_group[group_id] + processor_id_in_group;
 
-			if(processor_global_index >= nr_of_processors) {
-				cpuinfo_log_error("unexpected processor index %"PRIu32"",
-					processor_global_index);
+			if (processor_global_index >= nr_of_processors) {
+				cpuinfo_log_error("unexpected processor index %" PRIu32 "", processor_global_index);
 				return false;
 			}
 
-			switch(info->Relationship) {
+			switch (info->Relationship) {
 				case RelationProcessorPackage:
 					store_package_info_per_processor(
-						processors, processor_global_index, info_id,
-						group_id, processor_id_in_group);
-				break;
+						processors,
+						processor_global_index,
+						info_id,
+						group_id,
+						processor_id_in_group);
+					break;
 				case RelationProcessorCore:
 					store_core_info_per_processor(
-						processors, processor_global_index,
-						info_id, info,
-						cores, chip_info);
-				break;
+						processors, processor_global_index, info_id, info, cores, chip_info);
+					break;
 				default:
 					cpuinfo_log_error(
-						"unexpected processor info type (%"PRIu32") for processor information",
-						(uint32_t) info->Relationship);
-				break;
+						"unexpected processor info type (%" PRIu32
+						") for processor information",
+						(uint32_t)info->Relationship);
+					break;
 			}
-			/* Clear the bits in affinity mask, lower the least set bit. */
+			/* Clear the bits in affinity mask, lower the least set
+			 * bit. */
 			group_processors_mask &= (group_processors_mask - 1);
 		}
 	}
@@ -603,8 +605,7 @@ static bool parse_relation_cache_info(
 	struct cpuinfo_cache* caches,
 	uint32_t* numbers_of_caches,
 	const uint32_t* global_proc_index_per_group,
-	PSYSTEM_LOGICAL_PROCESSOR_INFORMATION_EX info)
-{
+	PSYSTEM_LOGICAL_PROCESSOR_INFORMATION_EX info) {
 	static uint32_t l1i_counter = 0;
 	static uint32_t l1d_counter = 0;
 	static uint32_t l2_counter = 0;
@@ -612,45 +613,52 @@ static bool parse_relation_cache_info(
 
 	/* Count cache types for allocation at first. */
 	if (caches == NULL) {
-		switch(info->Cache.Level) {
+		switch (info->Cache.Level) {
 			case 1:
 				switch (info->Cache.Type) {
 					case CacheInstruction:
 						numbers_of_caches[cpuinfo_cache_level_1i]++;
-					break;
+						break;
 					case CacheData:
 						numbers_of_caches[cpuinfo_cache_level_1d]++;
-					break;
+						break;
 					case CacheUnified:
-					break;
+						break;
 					case CacheTrace:
-					break;
+						break;
 					default:
-					break;
+						break;
 				}
-			break;
+				break;
 			case 2:
 				numbers_of_caches[cpuinfo_cache_level_2]++;
-			break;
+				break;
 			case 3:
 				numbers_of_caches[cpuinfo_cache_level_3]++;
-			break;
+				break;
 		}
 		return true;
 	}
 	struct cpuinfo_cache* l1i_base = caches;
 	struct cpuinfo_cache* l1d_base = l1i_base + numbers_of_caches[cpuinfo_cache_level_1i];
-	struct cpuinfo_cache* l2_base  = l1d_base + numbers_of_caches[cpuinfo_cache_level_1d];
-	struct cpuinfo_cache* l3_base  = l2_base  + numbers_of_caches[cpuinfo_cache_level_2];
+	struct cpuinfo_cache* l2_base = l1d_base + numbers_of_caches[cpuinfo_cache_level_1d];
+	struct cpuinfo_cache* l3_base = l2_base + numbers_of_caches[cpuinfo_cache_level_2];
 
 	cpuinfo_log_debug(
-		"info->Cache.GroupCount:%"PRIu32", info->Cache.GroupMask:%"PRIu32","
-		"info->Cache.Level:%"PRIu32", info->Cache.Associativity:%"PRIu32","
-		"info->Cache.LineSize:%"PRIu32","
-		"info->Cache.CacheSize:%"PRIu32", info->Cache.Type:%"PRIu32"",
-		info->Cache.GroupCount, (unsigned int)info->Cache.GroupMask.Mask,
-		info->Cache.Level, info->Cache.Associativity, info->Cache.LineSize,
-		info->Cache.CacheSize, info->Cache.Type);
+		"info->Cache.GroupCount:%" PRIu32 ", info->Cache.GroupMask:%" PRIu32
+		","
+		"info->Cache.Level:%" PRIu32 ", info->Cache.Associativity:%" PRIu32
+		","
+		"info->Cache.LineSize:%" PRIu32
+		","
+		"info->Cache.CacheSize:%" PRIu32 ", info->Cache.Type:%" PRIu32 "",
+		info->Cache.GroupCount,
+		(unsigned int)info->Cache.GroupMask.Mask,
+		info->Cache.Level,
+		info->Cache.Associativity,
+		info->Cache.LineSize,
+		info->Cache.CacheSize,
+		info->Cache.Type);
 
 	struct cpuinfo_cache* current_cache = NULL;
 	switch (info->Cache.Level) {
@@ -659,27 +667,27 @@ static bool parse_relation_cache_info(
 				case CacheInstruction:
 					current_cache = l1i_base + l1i_counter;
 					l1i_counter++;
-				break;
+					break;
 				case CacheData:
 					current_cache = l1d_base + l1d_counter;
 					l1d_counter++;
-				break;
+					break;
 				case CacheUnified:
-				break;
+					break;
 				case CacheTrace:
-				break;
+					break;
 				default:
-				break;
+					break;
 			}
-		break;
+			break;
 		case 2:
 			current_cache = l2_base + l2_counter;
 			l2_counter++;
-		break;
+			break;
 		case 3:
 			current_cache = l3_base + l3_counter;
 			l3_counter++;
-		break;
+			break;
 	}
 	current_cache->size = info->Cache.CacheSize;
 	current_cache->line_size = info->Cache.LineSize;
@@ -688,28 +696,28 @@ static bool parse_relation_cache_info(
 	 * so we set partitions to 1 and calculate the expected sets.
 	 */
 	current_cache->partitions = 1;
-	current_cache->sets =
-		current_cache->size / current_cache->line_size / current_cache->associativity;
+	current_cache->sets = current_cache->size / current_cache->line_size / current_cache->associativity;
 	if (info->Cache.Type == CacheUnified) {
 		current_cache->flags = CPUINFO_CACHE_UNIFIED;
 	}
 
 	for (uint32_t i = 0; i < info->Cache.GroupCount; i++) {
-	/* Zero GroupCount is valid, GroupMask still can store bits set. */
+		/* Zero GroupCount is valid, GroupMask still can store bits set.
+		 */
 		const uint32_t group_id = info->Cache.GroupMasks[i].Group;
-		/* Bitmask representing processors in this group belonging to this package */
+		/* Bitmask representing processors in this group belonging to
+		 * this package
+		 */
 		KAFFINITY group_processors_mask = info->Cache.GroupMasks[i].Mask;
 		while (group_processors_mask != 0) {
-			const uint32_t processor_id_in_group =
-				low_index_from_kaffinity(group_processors_mask);
+			const uint32_t processor_id_in_group = low_index_from_kaffinity(group_processors_mask);
 			const uint32_t processor_global_index =
 				global_proc_index_per_group[group_id] + processor_id_in_group;
 
-			store_cache_info_per_processor(
-				processors, processor_global_index,
-				info, current_cache);
+			store_cache_info_per_processor(processors, processor_global_index, info, current_cache);
 
-			/* Clear the bits in affinity mask, lower the least set bit. */
+			/* Clear the bits in affinity mask, lower the least set
+			 * bit. */
 			group_processors_mask &= (group_processors_mask - 1);
 		}
 	}
@@ -721,18 +729,15 @@ static void store_package_info_per_processor(
 	const uint32_t processor_global_index,
 	const uint32_t package_id,
 	const uint32_t group_id,
-	const uint32_t processor_id_in_group)
-{
-	processors[processor_global_index].windows_group_id =
-		(uint16_t) group_id;
-	processors[processor_global_index].windows_processor_id =
-		(uint16_t) processor_id_in_group;
+	const uint32_t processor_id_in_group) {
+	processors[processor_global_index].windows_group_id = (uint16_t)group_id;
+	processors[processor_global_index].windows_processor_id = (uint16_t)processor_id_in_group;
 
-	/* As we're counting the number of packages now, we haven't allocated memory for
-	 * cpuinfo_packages yet, so we only set the package pointer's offset now.
+	/* As we're counting the number of packages now, we haven't allocated
+	 * memory for cpuinfo_packages yet, so we only set the package pointer's
+	 * offset now.
 	 */
-	processors[processor_global_index].package =
-		(const struct cpuinfo_package*) NULL + package_id;
+	processors[processor_global_index].package = (const struct cpuinfo_package*)NULL + package_id;
 }
 
 void store_core_info_per_processor(
@@ -741,22 +746,22 @@ void store_core_info_per_processor(
 	const uint32_t core_id,
 	PSYSTEM_LOGICAL_PROCESSOR_INFORMATION_EX core_info,
 	struct cpuinfo_core* cores,
-	const struct woa_chip_info *chip_info)
-{
+	const struct woa_chip_info* chip_info) {
 	if (cores) {
 		processors[processor_global_index].core = cores + core_id;
 		cores[core_id].core_id = core_id;
 		get_core_uarch_for_efficiency(
-			chip_info->chip_name, core_info->Processor.EfficiencyClass,
-			&(cores[core_id].uarch), &(cores[core_id].frequency));
+			chip_info->chip_name,
+			core_info->Processor.EfficiencyClass,
+			&(cores[core_id].uarch),
+			&(cores[core_id].frequency));
 
 		/* We don't have cluster information, so we handle it as
 		 * fixed 1 to (cluster / cores).
 		 * Set the cluster offset ID now, as soon as we have the
 		 * cluster base address, we'll set the absolute address.
 		 */
-		processors[processor_global_index].cluster =
-			(const struct cpuinfo_cluster*) NULL + core_id;
+		processors[processor_global_index].cluster = (const struct cpuinfo_cluster*)NULL + core_id;
 	}
 }
 
@@ -764,36 +769,35 @@ static void store_cache_info_per_processor(
 	struct cpuinfo_processor* processors,
 	const uint32_t processor_global_index,
 	PSYSTEM_LOGICAL_PROCESSOR_INFORMATION_EX info,
-	struct cpuinfo_cache* current_cache)
-{
+	struct cpuinfo_cache* current_cache) {
 	if (current_cache->processor_start > processor_global_index) {
 		current_cache->processor_start = processor_global_index;
 	}
 	current_cache->processor_count++;
 
-	switch(info->Cache.Level) {
+	switch (info->Cache.Level) {
 		case 1:
 			switch (info->Cache.Type) {
 				case CacheInstruction:
 					processors[processor_global_index].cache.l1i = current_cache;
-				break;
+					break;
 				case CacheData:
 					processors[processor_global_index].cache.l1d = current_cache;
-				break;
+					break;
 				case CacheUnified:
-				break;
+					break;
 				case CacheTrace:
-				break;
+					break;
 				default:
-				break;
+					break;
 			}
-		break;
+			break;
 		case 2:
 			processors[processor_global_index].cache.l2 = current_cache;
-		break;
+			break;
 		case 3:
 			processors[processor_global_index].cache.l3 = current_cache;
-		break;
+			break;
 	}
 }
 
@@ -806,8 +810,7 @@ static bool connect_packages_cores_clusters_by_processors(
 	struct cpuinfo_core* cores,
 	const uint32_t nr_of_cores,
 	const struct woa_chip_info* chip_info,
-	enum cpuinfo_vendor vendor)
-{
+	enum cpuinfo_vendor vendor) {
 	/* Adjust core and package pointers for all logical processors. */
 	for (uint32_t i = nr_of_processors; i != 0; i--) {
 		const uint32_t processor_id = i - 1;
@@ -815,22 +818,21 @@ static bool connect_packages_cores_clusters_by_processors(
 
 		struct cpuinfo_core* core = (struct cpuinfo_core*)processor->core;
 
-		/* We stored the offset of pointers when we haven't allocated memory
-		 * for packages and clusters, so now add offsets to base addresses.
+		/* We stored the offset of pointers when we haven't allocated
+		 * memory for packages and clusters, so now add offsets to base
+		 * addresses.
 		 */
 		struct cpuinfo_package* package =
-			(struct cpuinfo_package*) ((uintptr_t) packages + (uintptr_t) processor->package);
-		if (package < packages ||
-			package >= (packages + nr_of_packages)) {
+			(struct cpuinfo_package*)((uintptr_t)packages + (uintptr_t)processor->package);
+		if (package < packages || package >= (packages + nr_of_packages)) {
 			cpuinfo_log_error("invalid package indexing");
 			return false;
 		}
 		processor->package = package;
 
 		struct cpuinfo_cluster* cluster =
-			(struct cpuinfo_cluster*) ((uintptr_t) clusters + (uintptr_t) processor->cluster);
-		if (cluster < clusters ||
-			cluster >= (clusters + nr_of_cores)) {
+			(struct cpuinfo_cluster*)((uintptr_t)clusters + (uintptr_t)processor->cluster);
+		if (cluster < clusters || cluster >= (clusters + nr_of_cores)) {
 			cpuinfo_log_error("invalid cluster indexing");
 			return false;
 		}
@@ -839,30 +841,34 @@ static bool connect_packages_cores_clusters_by_processors(
 		if (chip_info) {
 			size_t converted_chars = 0;
 			if (!WideCharToMultiByte(
-					CP_UTF8,
-					WC_ERR_INVALID_CHARS,
-					chip_info->chip_name_string,
-					-1,
-					package->name,
-					CPUINFO_PACKAGE_NAME_MAX,
-					NULL,
-					NULL)) {
+				    CP_UTF8,
+				    WC_ERR_INVALID_CHARS,
+				    chip_info->chip_name_string,
+				    -1,
+				    package->name,
+				    CPUINFO_PACKAGE_NAME_MAX,
+				    NULL,
+				    NULL)) {
 				cpuinfo_log_error("cpu name character conversion error");
 				return false;
 			};
 		}
 
-		/* Set start indexes and counts per packages / clusters / cores - going backwards */
+		/* Set start indexes and counts per packages / clusters / cores
+		 * - going backwards */
 
-		/* This can be overwritten by lower-index processors on the same package. */
+		/* This can be overwritten by lower-index processors on the same
+		 * package. */
 		package->processor_start = processor_id;
 		package->processor_count++;
 
-		/* This can be overwritten by lower-index processors on the same cluster. */
+		/* This can be overwritten by lower-index processors on the same
+		 * cluster. */
 		cluster->processor_start = processor_id;
 		cluster->processor_count++;
 
-		/* This can be overwritten by lower-index processors on the same core. */
+		/* This can be overwritten by lower-index processors on the same
+		 * core. */
 		core->processor_start = processor_id;
 		core->processor_count++;
 	}
@@ -871,14 +877,16 @@ static bool connect_packages_cores_clusters_by_processors(
 		const uint32_t global_core_id = i - 1;
 		struct cpuinfo_core* core = cores + global_core_id;
 		const struct cpuinfo_processor* processor = processors + core->processor_start;
-		struct cpuinfo_package* package = (struct cpuinfo_package*) processor->package;
-		struct cpuinfo_cluster* cluster = (struct cpuinfo_cluster*) processor->cluster;
+		struct cpuinfo_package* package = (struct cpuinfo_package*)processor->package;
+		struct cpuinfo_cluster* cluster = (struct cpuinfo_cluster*)processor->cluster;
 
 		core->package = package;
 		core->cluster = cluster;
 		core->vendor = vendor;
 
-		/* This can be overwritten by lower-index cores on the same cluster/package. */
+		/* This can be overwritten by lower-index cores on the same
+		 * cluster/package.
+		 */
 		cluster->core_start = global_core_id;
 		cluster->core_count++;
 		package->core_start = global_core_id;
@@ -896,6 +904,6 @@ static bool connect_packages_cores_clusters_by_processors(
 
 static inline uint32_t low_index_from_kaffinity(KAFFINITY kaffinity) {
 	unsigned long index;
-	_BitScanForward64(&index, (unsigned __int64) kaffinity);
-	return (uint32_t) index;
+	_BitScanForward64(&index, (unsigned __int64)kaffinity);
+	return (uint32_t)index;
 }

3rdparty/cpuinfo/src/arm/windows/init.c

@@ -1,7 +1,7 @@
-#include <stdio.h>
-#include <stdint.h>
-#include <stdlib.h>
 #include <errno.h>
+#include <stdint.h>
+#include <stdio.h>
+#include <stdlib.h>
 
 #include <cpuinfo.h>
 #include <cpuinfo/internal-api.h>
@@ -17,88 +17,64 @@ static struct woa_chip_info* get_system_info_from_registry(void);
 static struct woa_chip_info woa_chip_unknown = {
 	L"Unknown",
 	woa_chip_name_unknown,
-	{
-		{
-			cpuinfo_vendor_unknown,
-			cpuinfo_uarch_unknown,
-			0
-		}
-	}
-};
+	{{cpuinfo_vendor_unknown, cpuinfo_uarch_unknown, 0}}};
 
 /* Please add new SoC/chip info here! */
-static struct woa_chip_info woa_chips[] = {
+static struct woa_chip_info woa_chips[woa_chip_name_last] = {
 	/* Microsoft SQ1 Kryo 495 4 + 4 cores (3 GHz + 1.80 GHz) */
-	{
-		L"Microsoft SQ1",
-		woa_chip_name_microsoft_sq_1,
-		{
-			{
-				cpuinfo_vendor_arm,
-				cpuinfo_uarch_cortex_a55,
-				1800000000,
-			},
-			{
-				cpuinfo_vendor_arm,
-				cpuinfo_uarch_cortex_a76,
-				3000000000,
-			}
-		}
-	},
+	[woa_chip_name_microsoft_sq_1] =
+		{L"Microsoft SQ1",
+		 woa_chip_name_microsoft_sq_1,
+		 {{
+			  cpuinfo_vendor_arm,
+			  cpuinfo_uarch_cortex_a55,
+			  1800000000,
+		  },
+		  {
+			  cpuinfo_vendor_arm,
+			  cpuinfo_uarch_cortex_a76,
+			  3000000000,
+		  }}},
 	/* Microsoft SQ2 Kryo 495 4 + 4 cores (3.15 GHz + 2.42 GHz) */
-	{
-		L"Microsoft SQ2",
-		woa_chip_name_microsoft_sq_2,
-		{
-			{
-				cpuinfo_vendor_arm,
-				cpuinfo_uarch_cortex_a55,
-				2420000000,
-			},
-			{
-				cpuinfo_vendor_arm,
-				cpuinfo_uarch_cortex_a76,
-				3150000000
-			}
-		}
-	},
+	[woa_chip_name_microsoft_sq_2] =
+		{L"Microsoft SQ2",
+		 woa_chip_name_microsoft_sq_2,
+		 {{
+			  cpuinfo_vendor_arm,
+			  cpuinfo_uarch_cortex_a55,
+			  2420000000,
+		  },
+		  {cpuinfo_vendor_arm, cpuinfo_uarch_cortex_a76, 3150000000}}},
+	/* Snapdragon (TM) 8cx Gen 3 @ 3.0 GHz */
+	[woa_chip_name_microsoft_sq_3] =
+		{L"Snapdragon (TM) 8cx Gen 3",
+		 woa_chip_name_microsoft_sq_3,
+		 {{
+			  cpuinfo_vendor_arm,
+			  cpuinfo_uarch_cortex_a78,
+			  2420000000,
+		  },
+		  {cpuinfo_vendor_arm, cpuinfo_uarch_cortex_x1, 3000000000}}},
 	/* Microsoft Windows Dev Kit 2023 */
-	{
-		L"Snapdragon Compute Platform",
-		woa_chip_name_microsoft_sq_3,
-		{
-			{
-				cpuinfo_vendor_arm,
-				cpuinfo_uarch_cortex_a78,
-				2420000000,
-			},
-			{
-				cpuinfo_vendor_arm,
-				cpuinfo_uarch_cortex_x1,
-				3000000000
-			}
-		}
-	},
+	[woa_chip_name_microsoft_sq_3_devkit] =
+		{L"Snapdragon Compute Platform",
+		 woa_chip_name_microsoft_sq_3_devkit,
+		 {{
+			  cpuinfo_vendor_arm,
+			  cpuinfo_uarch_cortex_a78,
+			  2420000000,
+		  },
+		  {cpuinfo_vendor_arm, cpuinfo_uarch_cortex_x1, 3000000000}}},
 	/* Ampere Altra */
-	{
+	[woa_chip_name_ampere_altra] = {
 		L"Ampere(R) Altra(R) Processor",
 		woa_chip_name_ampere_altra,
-		{
-			{
-				cpuinfo_vendor_arm,
-				cpuinfo_uarch_neoverse_n1,
-				3000000000
-			}
-		}
-	}
-};
+		{{cpuinfo_vendor_arm, cpuinfo_uarch_neoverse_n1, 3000000000}}}};
 
-BOOL CALLBACK cpuinfo_arm_windows_init(
-	PINIT_ONCE init_once, PVOID parameter, PVOID* context)
-{
-	struct woa_chip_info *chip_info = NULL;
+BOOL CALLBACK cpuinfo_arm_windows_init(PINIT_ONCE init_once, PVOID parameter, PVOID* context) {
+	struct woa_chip_info* chip_info = NULL;
 	enum cpuinfo_vendor vendor = cpuinfo_vendor_unknown;
-	
+
 	set_cpuinfo_isa_fields();
 
 	chip_info = get_system_info_from_registry();
@@ -112,15 +88,15 @@ BOOL CALLBACK cpuinfo_arm_windows_init(
 }
 
 bool get_core_uarch_for_efficiency(
-	enum woa_chip_name chip, BYTE EfficiencyClass,
-	enum cpuinfo_uarch* uarch, uint64_t* frequency)
-{
+	enum woa_chip_name chip,
+	BYTE EfficiencyClass,
+	enum cpuinfo_uarch* uarch,
+	uint64_t* frequency) {
 	/* For currently supported WoA chips, the Efficiency class selects
 	 * the pre-defined little and big core.
 	 * Any further supported SoC's logic should be implemented here.
 	 */
-	if (uarch && frequency && chip < woa_chip_name_last &&
-		EfficiencyClass < MAX_WOA_VALID_EFFICIENCY_CLASSES) {
+	if (uarch && frequency && chip < woa_chip_name_last && EfficiencyClass < MAX_WOA_VALID_EFFICIENCY_CLASSES) {
 		*uarch = woa_chips[chip].uarchs[EfficiencyClass].uarch;
 		*frequency = woa_chips[chip].uarchs[EfficiencyClass].frequency;
 		return true;
@@ -130,14 +106,11 @@ bool get_core_uarch_for_efficiency(
 
 /* Static helper functions */
 
-static wchar_t* read_registry(
-	LPCWSTR subkey,
-	LPCWSTR value)
-{
+static wchar_t* read_registry(LPCWSTR subkey, LPCWSTR value) {
 	DWORD key_type = 0;
 	DWORD data_size = 0;
 	const DWORD flags = RRF_RT_REG_SZ; /* Only read strings (REG_SZ) */
-	wchar_t *text_buffer = NULL;
+	wchar_t* text_buffer = NULL;
 	LSTATUS result = 0;
 	HANDLE heap = GetProcessHeap();
 
@@ -176,8 +149,7 @@ static wchar_t* read_registry(
 	return text_buffer;
 }
 
-static struct woa_chip_info* get_system_info_from_registry(void)
-{
+static struct woa_chip_info* get_system_info_from_registry(void) {
 	wchar_t* text_buffer = NULL;
 	LPCWSTR cpu0_subkey = L"HARDWARE\\DESCRIPTION\\System\\CentralProcessor\\0";
 	LPCWSTR chip_name_value = L"ProcessorNameString";
@@ -185,23 +157,27 @@ static struct woa_chip_info* get_system_info_from_registry(void)
 
 	HANDLE heap = GetProcessHeap();
 
-	/* Read processor model name from registry and find in the hard-coded list. */
+	/* Read processor model name from registry and find in the hard-coded
+	 * list. */
 	text_buffer = read_registry(cpu0_subkey, chip_name_value);
 	if (text_buffer == NULL) {
 		cpuinfo_log_error("Registry read error");
 		return NULL;
 	}
-	for (uint32_t i = 0; i < (uint32_t) woa_chip_name_last; i++) {
+	for (uint32_t i = 0; i < (uint32_t)woa_chip_name_last; i++) {
 		size_t compare_length = wcsnlen(woa_chips[i].chip_name_string, CPUINFO_PACKAGE_NAME_MAX);
 		int compare_result = wcsncmp(text_buffer, woa_chips[i].chip_name_string, compare_length);
 		if (compare_result == 0) {
-			chip_info = woa_chips+i;
+			chip_info = woa_chips + i;
 			break;
 		}
 	}
 	if (chip_info == NULL) {
-		/* No match was found, so print a warning and assign the unknown case. */
-		cpuinfo_log_error("Unknown chip model name '%ls'.\nPlease add new Windows on Arm SoC/chip support to arm/windows/init.c!", text_buffer);
+		/* No match was found, so print a warning and assign the unknown
+		 * case. */
+		cpuinfo_log_error(
+			"Unknown chip model name '%ls'.\nPlease add new Windows on Arm SoC/chip support to arm/windows/init.c!",
+			text_buffer);
 	} else {
 		cpuinfo_log_debug("detected chip model name: %s", chip_info->chip_name_string);
 	}
@@ -210,8 +186,7 @@ static struct woa_chip_info* get_system_info_from_registry(void)
 	return chip_info;
 }
 
-static void set_cpuinfo_isa_fields(void)
-{
+static void set_cpuinfo_isa_fields(void) {
 	cpuinfo_isa.atomics = IsProcessorFeaturePresent(PF_ARM_V81_ATOMIC_INSTRUCTIONS_AVAILABLE) != 0;
 
 	const bool dotprod = IsProcessorFeaturePresent(PF_ARM_V82_DP_INSTRUCTIONS_AVAILABLE) != 0;
@@ -220,13 +195,14 @@ static void set_cpuinfo_isa_fields(void)
 	SYSTEM_INFO system_info;
 	GetSystemInfo(&system_info);
 	switch (system_info.wProcessorLevel) {
-		case 0x803:  // Kryo 385 Silver (Snapdragon 850)
+		case 0x803: // Kryo 385 Silver (Snapdragon 850)
 			cpuinfo_isa.fp16arith = dotprod;
 			cpuinfo_isa.rdm = dotprod;
 			break;
 		default:
-			// Assume that Dot Product support implies FP16 arithmetics and RDM support.
-			// ARM manuals don't guarantee that, but it holds in practice.
+			// Assume that Dot Product support implies FP16
+			// arithmetics and RDM support. ARM manuals don't
+			// guarantee that, but it holds in practice.
 			cpuinfo_isa.fp16arith = dotprod;
 			cpuinfo_isa.rdm = dotprod;
 			break;

3rdparty/cpuinfo/src/arm/windows/windows-arm-init.h

@@ -1,15 +1,16 @@
 #pragma once
 
 /* Efficiency class = 0 means little core, while 1 means big core for now. */
-#define MAX_WOA_VALID_EFFICIENCY_CLASSES                2
+#define MAX_WOA_VALID_EFFICIENCY_CLASSES 2
 
 /* List of known and supported Windows on Arm SoCs/chips. */
 enum woa_chip_name {
 	woa_chip_name_microsoft_sq_1 = 0,
 	woa_chip_name_microsoft_sq_2 = 1,
 	woa_chip_name_microsoft_sq_3 = 2,
-	woa_chip_name_ampere_altra = 3,
-	woa_chip_name_unknown = 4,
+	woa_chip_name_microsoft_sq_3_devkit = 3,
+	woa_chip_name_ampere_altra = 4,
+	woa_chip_name_unknown = 5,
 	woa_chip_name_last = woa_chip_name_unknown
 };
 
@@ -30,9 +31,9 @@ struct woa_chip_info {
 };
 
 bool get_core_uarch_for_efficiency(
-	enum woa_chip_name chip, BYTE EfficiencyClass,
-	enum cpuinfo_uarch* uarch, uint64_t* frequency);
+	enum woa_chip_name chip,
+	BYTE EfficiencyClass,
+	enum cpuinfo_uarch* uarch,
+	uint64_t* frequency);
 
-bool cpu_info_init_by_logical_sys_info(
-	const struct woa_chip_info *chip_info,
-	enum cpuinfo_vendor vendor);
+bool cpu_info_init_by_logical_sys_info(const struct woa_chip_info* chip_info, enum cpuinfo_vendor vendor);

3rdparty/cpuinfo/src/cache.c

@@ -3,16 +3,15 @@
 #include <cpuinfo.h>
 #include <cpuinfo/internal-api.h>
 
-
 uint32_t cpuinfo_compute_max_cache_size(const struct cpuinfo_processor* processor) {
-  if (processor->cache.l4 != NULL) {
-    return processor->cache.l4->size;
-  } else if (processor->cache.l3 != NULL) {
-    return processor->cache.l3->size;
-  } else if (processor->cache.l2 != NULL) {
-    return processor->cache.l2->size;
-  } else if (processor->cache.l1d != NULL) {
-    return processor->cache.l1d->size;
-  }
-  return 0;
+	if (processor->cache.l4 != NULL) {
+		return processor->cache.l4->size;
+	} else if (processor->cache.l3 != NULL) {
+		return processor->cache.l3->size;
+	} else if (processor->cache.l2 != NULL) {
+		return processor->cache.l2->size;
+	} else if (processor->cache.l1d != NULL) {
+		return processor->cache.l1d->size;
+	}
+	return 0;
 }

3rdparty/cpuinfo/src/cpuinfo/common.h

@@ -8,33 +8,32 @@
 
 #pragma once
 
-
-#define CPUINFO_COUNT_OF(array) (sizeof(array) / sizeof(0[array]))
+#define CPUINFO_COUNT_OF(array) (sizeof(array) / sizeof(0 [array]))
 
 #if defined(__GNUC__)
-	#define CPUINFO_LIKELY(condition) (__builtin_expect(!!(condition), 1))
-	#define CPUINFO_UNLIKELY(condition) (__builtin_expect(!!(condition), 0))
+#define CPUINFO_LIKELY(condition) (__builtin_expect(!!(condition), 1))
+#define CPUINFO_UNLIKELY(condition) (__builtin_expect(!!(condition), 0))
 #else
-	#define CPUINFO_LIKELY(condition) (!!(condition))
-	#define CPUINFO_UNLIKELY(condition) (!!(condition))
+#define CPUINFO_LIKELY(condition) (!!(condition))
+#define CPUINFO_UNLIKELY(condition) (!!(condition))
 #endif
 
 #ifndef CPUINFO_INTERNAL
-	#if defined(__ELF__)
-		#define CPUINFO_INTERNAL __attribute__((__visibility__("internal")))
-	#elif defined(__MACH__)
-		#define CPUINFO_INTERNAL __attribute__((__visibility__("hidden")))
-	#else
-		#define CPUINFO_INTERNAL
-	#endif
+#if defined(__ELF__)
+#define CPUINFO_INTERNAL __attribute__((__visibility__("internal")))
+#elif defined(__MACH__)
+#define CPUINFO_INTERNAL __attribute__((__visibility__("hidden")))
+#else
+#define CPUINFO_INTERNAL
+#endif
 #endif
 
 #ifndef CPUINFO_PRIVATE
-	#if defined(__ELF__)
-		#define CPUINFO_PRIVATE __attribute__((__visibility__("hidden")))
-	#elif defined(__MACH__)
-		#define CPUINFO_PRIVATE __attribute__((__visibility__("hidden")))
-	#else
-		#define CPUINFO_PRIVATE
-	#endif
+#if defined(__ELF__)
+#define CPUINFO_PRIVATE __attribute__((__visibility__("hidden")))
+#elif defined(__MACH__)
+#define CPUINFO_PRIVATE __attribute__((__visibility__("hidden")))
+#else
+#define CPUINFO_PRIVATE
+#endif
 #endif

3rdparty/cpuinfo/src/cpuinfo/internal-api.h

@@ -1,22 +1,21 @@
 #pragma once
 
-#include <stdint.h>
 #include <stdbool.h>
+#include <stdint.h>
 
 #if defined(_WIN32) || defined(__CYGWIN__)
-	#include <windows.h>
+#include <windows.h>
 #endif
 
 #include <cpuinfo.h>
 #include <cpuinfo/common.h>
 
-
 enum cpuinfo_cache_level {
-	cpuinfo_cache_level_1i  = 0,
-	cpuinfo_cache_level_1d  = 1,
-	cpuinfo_cache_level_2   = 2,
-	cpuinfo_cache_level_3   = 3,
-	cpuinfo_cache_level_4   = 4,
+	cpuinfo_cache_level_1i = 0,
+	cpuinfo_cache_level_1d = 1,
+	cpuinfo_cache_level_2 = 2,
+	cpuinfo_cache_level_3 = 3,
+	cpuinfo_cache_level_4 = 4,
 	cpuinfo_cache_level_max = 5,
 };
 
@@ -36,26 +35,27 @@ extern CPUINFO_INTERNAL uint32_t cpuinfo_cache_count[cpuinfo_cache_level_max];
 extern CPUINFO_INTERNAL uint32_t cpuinfo_max_cache_size;
 
 #if CPUINFO_ARCH_ARM || CPUINFO_ARCH_ARM64 || CPUINFO_ARCH_RISCV32 || CPUINFO_ARCH_RISCV64
-	extern CPUINFO_INTERNAL struct cpuinfo_uarch_info* cpuinfo_uarchs;
-	extern CPUINFO_INTERNAL uint32_t cpuinfo_uarchs_count;
+extern CPUINFO_INTERNAL struct cpuinfo_uarch_info* cpuinfo_uarchs;
+extern CPUINFO_INTERNAL uint32_t cpuinfo_uarchs_count;
 #else
-	extern CPUINFO_INTERNAL struct cpuinfo_uarch_info cpuinfo_global_uarch;
+extern CPUINFO_INTERNAL struct cpuinfo_uarch_info cpuinfo_global_uarch;
 #endif
 
 #ifdef __linux__
-	extern CPUINFO_INTERNAL uint32_t cpuinfo_linux_cpu_max;
-	extern CPUINFO_INTERNAL const struct cpuinfo_processor** cpuinfo_linux_cpu_to_processor_map;
-	extern CPUINFO_INTERNAL const struct cpuinfo_core** cpuinfo_linux_cpu_to_core_map;
+extern CPUINFO_INTERNAL uint32_t cpuinfo_linux_cpu_max;
+extern CPUINFO_INTERNAL const struct cpuinfo_processor** cpuinfo_linux_cpu_to_processor_map;
+extern CPUINFO_INTERNAL const struct cpuinfo_core** cpuinfo_linux_cpu_to_core_map;
 #endif
 
 CPUINFO_PRIVATE void cpuinfo_x86_mach_init(void);
 CPUINFO_PRIVATE void cpuinfo_x86_linux_init(void);
+CPUINFO_PRIVATE void cpuinfo_x86_freebsd_init(void);
 #if defined(_WIN32) || defined(__CYGWIN__)
-	#if CPUINFO_ARCH_ARM64
-		CPUINFO_PRIVATE BOOL CALLBACK cpuinfo_arm_windows_init(PINIT_ONCE init_once, PVOID parameter, PVOID* context);
-	#else
-		CPUINFO_PRIVATE BOOL CALLBACK cpuinfo_x86_windows_init(PINIT_ONCE init_once, PVOID parameter, PVOID* context);
-	#endif
+#if CPUINFO_ARCH_ARM64
+CPUINFO_PRIVATE BOOL CALLBACK cpuinfo_arm_windows_init(PINIT_ONCE init_once, PVOID parameter, PVOID* context);
+#else
+CPUINFO_PRIVATE BOOL CALLBACK cpuinfo_x86_windows_init(PINIT_ONCE init_once, PVOID parameter, PVOID* context);
+#endif
 #endif
 CPUINFO_PRIVATE void cpuinfo_arm_mach_init(void);
 CPUINFO_PRIVATE void cpuinfo_arm_linux_init(void);

3rdparty/cpuinfo/src/cpuinfo/log.h

@@ -5,7 +5,7 @@
 #include <stdlib.h>
 
 #ifndef CPUINFO_LOG_LEVEL
-	#error "Undefined CPUINFO_LOG_LEVEL"
+#error "Undefined CPUINFO_LOG_LEVEL"
 #endif
 
 #define CPUINFO_LOG_NONE 0
@@ -16,88 +16,87 @@
 #define CPUINFO_LOG_DEBUG 5
 
 #ifndef CPUINFO_LOG_DEBUG_PARSERS
-	#define CPUINFO_LOG_DEBUG_PARSERS 0
+#define CPUINFO_LOG_DEBUG_PARSERS 0
 #endif
 
-
 #ifdef __cplusplus
 extern "C" {
 #endif
 
 #if CPUINFO_LOG_LEVEL >= CPUINFO_LOG_DEBUG
-	void cpuinfo_vlog_debug(const char* format, va_list args);
+void cpuinfo_vlog_debug(const char* format, va_list args);
 #endif
 
 #if CPUINFO_LOG_LEVEL >= CPUINFO_LOG_INFO
-	void cpuinfo_vlog_info(const char* format, va_list args);
+void cpuinfo_vlog_info(const char* format, va_list args);
 #endif
 
 #if CPUINFO_LOG_LEVEL >= CPUINFO_LOG_WARNING
-	void cpuinfo_vlog_warning(const char* format, va_list args);
+void cpuinfo_vlog_warning(const char* format, va_list args);
 #endif
 
 #if CPUINFO_LOG_LEVEL >= CPUINFO_LOG_ERROR
-	void cpuinfo_vlog_error(const char* format, va_list args);
+void cpuinfo_vlog_error(const char* format, va_list args);
 #endif
 
 #if CPUINFO_LOG_LEVEL >= CPUINFO_LOG_FATAL
-	void cpuinfo_vlog_fatal(const char* format, va_list args);
+void cpuinfo_vlog_fatal(const char* format, va_list args);
 #endif
 
 #ifdef __cplusplus
-}  // extern "C"
+} // extern "C"
 #endif
 
 #ifndef CPUINFO_LOG_ARGUMENTS_FORMAT
-	#ifdef __GNUC__
-		#define CPUINFO_LOG_ARGUMENTS_FORMAT __attribute__((__format__(__printf__, 1, 2)))
-	#else
-		#define CPUINFO_LOG_ARGUMENTS_FORMAT
-	#endif
+#ifdef __GNUC__
+#define CPUINFO_LOG_ARGUMENTS_FORMAT __attribute__((__format__(__printf__, 1, 2)))
+#else
+#define CPUINFO_LOG_ARGUMENTS_FORMAT
+#endif
 #endif
 
 CPUINFO_LOG_ARGUMENTS_FORMAT inline static void cpuinfo_log_debug(const char* format, ...) {
-	#if CPUINFO_LOG_LEVEL >= CPUINFO_LOG_DEBUG
-		va_list args;
-		va_start(args, format);
-		cpuinfo_vlog_debug(format, args);
-		va_end(args);
-	#endif
+#if CPUINFO_LOG_LEVEL >= CPUINFO_LOG_DEBUG
+	va_list args;
+	va_start(args, format);
+	cpuinfo_vlog_debug(format, args);
+	va_end(args);
+#endif
 }
 
 CPUINFO_LOG_ARGUMENTS_FORMAT inline static void cpuinfo_log_info(const char* format, ...) {
-	#if CPUINFO_LOG_LEVEL >= CPUINFO_LOG_INFO
-		va_list args;
-		va_start(args, format);
-		cpuinfo_vlog_info(format, args);
-		va_end(args);
-	#endif
+#if CPUINFO_LOG_LEVEL >= CPUINFO_LOG_INFO
+	va_list args;
+	va_start(args, format);
+	cpuinfo_vlog_info(format, args);
+	va_end(args);
+#endif
 }
 
 CPUINFO_LOG_ARGUMENTS_FORMAT inline static void cpuinfo_log_warning(const char* format, ...) {
-	#if CPUINFO_LOG_LEVEL >= CPUINFO_LOG_WARNING
-		va_list args;
-		va_start(args, format);
-		cpuinfo_vlog_warning(format, args);
-		va_end(args);
-	#endif
+#if CPUINFO_LOG_LEVEL >= CPUINFO_LOG_WARNING
+	va_list args;
+	va_start(args, format);
+	cpuinfo_vlog_warning(format, args);
+	va_end(args);
+#endif
 }
 
 CPUINFO_LOG_ARGUMENTS_FORMAT inline static void cpuinfo_log_error(const char* format, ...) {
-	#if CPUINFO_LOG_LEVEL >= CPUINFO_LOG_ERROR
-		va_list args;
-		va_start(args, format);
-		cpuinfo_vlog_error(format, args);
-		va_end(args);
-	#endif
+#if CPUINFO_LOG_LEVEL >= CPUINFO_LOG_ERROR
+	va_list args;
+	va_start(args, format);
+	cpuinfo_vlog_error(format, args);
+	va_end(args);
+#endif
 }
 
 CPUINFO_LOG_ARGUMENTS_FORMAT inline static void cpuinfo_log_fatal(const char* format, ...) {
-	#if CPUINFO_LOG_LEVEL >= CPUINFO_LOG_FATAL
-		va_list args;
-		va_start(args, format);
-		cpuinfo_vlog_fatal(format, args);
-		va_end(args);
-	#endif
+#if CPUINFO_LOG_LEVEL >= CPUINFO_LOG_FATAL
+	va_list args;
+	va_start(args, format);
+	cpuinfo_vlog_fatal(format, args);
+	va_end(args);
+#endif
 	abort();
 }

3rdparty/cpuinfo/src/cpuinfo/utils.h

@@ -5,18 +5,17 @@
 #endif
 #include <stdint.h>
 
-
 inline static uint32_t bit_length(uint32_t n) {
 	const uint32_t n_minus_1 = n - 1;
 	if (n_minus_1 == 0) {
 		return 0;
 	} else {
-		#ifdef _MSC_VER
-			unsigned long bsr;
-			_BitScanReverse(&bsr, n_minus_1);
-			return bsr + 1;
-		#else
-			return 32 - __builtin_clz(n_minus_1);
-		#endif
+#ifdef _MSC_VER
+		unsigned long bsr;
+		_BitScanReverse(&bsr, n_minus_1);
+		return bsr + 1;
+#else
+		return 32 - __builtin_clz(n_minus_1);
+#endif
 	}
 }

3rdparty/cpuinfo/src/emscripten/init.c

@@ -1,8 +1,8 @@
+#include <math.h>
 #include <stdbool.h>
 #include <stdint.h>
 #include <stdlib.h>
 #include <string.h>
-#include <math.h>
 
 #include <emscripten/threading.h>
 
@@ -10,10 +10,9 @@
 #include <cpuinfo/internal-api.h>
 #include <cpuinfo/log.h>
 
-
 static const volatile float infinity = INFINITY;
 
-static struct cpuinfo_package static_package = { };
+static struct cpuinfo_package static_package = {};
 
 static struct cpuinfo_cache static_x86_l3 = {
 	.size = 2 * 1024 * 1024,
@@ -37,7 +36,7 @@ void cpuinfo_emscripten_init(void) {
 	if (logical_cores_count <= 0) {
 		logical_cores_count = 1;
 	}
-	uint32_t processor_count = (uint32_t) logical_cores_count;
+	uint32_t processor_count = (uint32_t)logical_cores_count;
 	uint32_t core_count = processor_count;
 	uint32_t cluster_count = 1;
 	uint32_t big_cluster_core_count = core_count;
@@ -60,41 +59,53 @@ void cpuinfo_emscripten_init(void) {
 
 	processors = calloc(processor_count, sizeof(struct cpuinfo_processor));
 	if (processors == NULL) {
-		cpuinfo_log_error("failed to allocate %zu bytes for descriptions of %"PRIu32" logical processors",
-			processor_count * sizeof(struct cpuinfo_processor), processor_count);
+		cpuinfo_log_error(
+			"failed to allocate %zu bytes for descriptions of %" PRIu32 " logical processors",
+			processor_count * sizeof(struct cpuinfo_processor),
+			processor_count);
 		goto cleanup;
 	}
 	cores = calloc(processor_count, sizeof(struct cpuinfo_core));
 	if (cores == NULL) {
-		cpuinfo_log_error("failed to allocate %zu bytes for descriptions of %"PRIu32" cores",
-			processor_count * sizeof(struct cpuinfo_core), processor_count);
+		cpuinfo_log_error(
+			"failed to allocate %zu bytes for descriptions of %" PRIu32 " cores",
+			processor_count * sizeof(struct cpuinfo_core),
+			processor_count);
 		goto cleanup;
 	}
 	clusters = calloc(cluster_count, sizeof(struct cpuinfo_cluster));
 	if (clusters == NULL) {
-		cpuinfo_log_error("failed to allocate %zu bytes for descriptions of %"PRIu32" clusters",
-			cluster_count * sizeof(struct cpuinfo_cluster), cluster_count);
+		cpuinfo_log_error(
+			"failed to allocate %zu bytes for descriptions of %" PRIu32 " clusters",
+			cluster_count * sizeof(struct cpuinfo_cluster),
+			cluster_count);
 		goto cleanup;
 	}
 
 	l1i = calloc(core_count, sizeof(struct cpuinfo_cache));
 	if (l1i == NULL) {
-		cpuinfo_log_error("failed to allocate %zu bytes for descriptions of %"PRIu32" L1I caches",
-			core_count * sizeof(struct cpuinfo_cache), core_count);
+		cpuinfo_log_error(
+			"failed to allocate %zu bytes for descriptions of %" PRIu32 " L1I caches",
+			core_count * sizeof(struct cpuinfo_cache),
+			core_count);
 		goto cleanup;
 	}
 
 	l1d = calloc(core_count, sizeof(struct cpuinfo_cache));
 	if (l1d == NULL) {
-		cpuinfo_log_error("failed to allocate %zu bytes for descriptions of %"PRIu32" L1D caches",
-			core_count * sizeof(struct cpuinfo_cache), core_count);
+		cpuinfo_log_error(
+			"failed to allocate %zu bytes for descriptions of %" PRIu32 " L1D caches",
+			core_count * sizeof(struct cpuinfo_cache),
+			core_count);
 		goto cleanup;
 	}
 
 	l2 = calloc(l2_count, sizeof(struct cpuinfo_cache));
 	if (l2 == NULL) {
-		cpuinfo_log_error("failed to allocate %zu bytes for descriptions of %"PRIu32" L2 caches",
-			l2_count * sizeof(struct cpuinfo_cache), l2_count);
+		cpuinfo_log_error(
+			"failed to allocate %zu bytes for descriptions of %" PRIu32 " L2 caches",
+			l2_count * sizeof(struct cpuinfo_cache),
+			l2_count);
 		goto cleanup;
 	}
 
@@ -109,30 +120,30 @@ void cpuinfo_emscripten_init(void) {
 
 	for (uint32_t i = 0; i < core_count; i++) {
 		for (uint32_t j = 0; j < processors_per_core; j++) {
-			processors[i * processors_per_core + j] = (struct cpuinfo_processor) {
+			processors[i * processors_per_core + j] = (struct cpuinfo_processor){
 				.smt_id = j,
 				.core = cores + i,
-				.cluster = clusters + (uint32_t) (i >= big_cluster_core_count),
+				.cluster = clusters + (uint32_t)(i >= big_cluster_core_count),
 				.package = &static_package,
 				.cache.l1i = l1i + i,
 				.cache.l1d = l1d + i,
-				.cache.l2 = is_x86 ? l2 + i : l2 + (uint32_t) (i >= big_cluster_core_count),
+				.cache.l2 = is_x86 ? l2 + i : l2 + (uint32_t)(i >= big_cluster_core_count),
 				.cache.l3 = is_x86 ? &static_x86_l3 : NULL,
 			};
 		}
 
-		cores[i] = (struct cpuinfo_core) {
+		cores[i] = (struct cpuinfo_core){
 			.processor_start = i * processors_per_core,
 			.processor_count = processors_per_core,
 			.core_id = i,
-			.cluster = clusters + (uint32_t) (i >= big_cluster_core_count),
+			.cluster = clusters + (uint32_t)(i >= big_cluster_core_count),
 			.package = &static_package,
 			.vendor = cpuinfo_vendor_unknown,
 			.uarch = cpuinfo_uarch_unknown,
 			.frequency = 0,
 		};
 
-		l1i[i] = (struct cpuinfo_cache) {
+		l1i[i] = (struct cpuinfo_cache){
 			.size = 32 * 1024,
 			.associativity = 4,
 			.sets = 128,
@@ -142,7 +153,7 @@ void cpuinfo_emscripten_init(void) {
 			.processor_count = processors_per_core,
 		};
 
-		l1d[i] = (struct cpuinfo_cache) {
+		l1d[i] = (struct cpuinfo_cache){
 			.size = 32 * 1024,
 			.associativity = 4,
 			.sets = 128,
@@ -153,7 +164,7 @@ void cpuinfo_emscripten_init(void) {
 		};
 
 		if (is_x86) {
-			l2[i] = (struct cpuinfo_cache) {
+			l2[i] = (struct cpuinfo_cache){
 				.size = 256 * 1024,
 				.associativity = 8,
 				.sets = 512,
@@ -166,7 +177,7 @@ void cpuinfo_emscripten_init(void) {
 	}
 
 	if (is_x86) {
-		clusters[0] = (struct cpuinfo_cluster) {
+		clusters[0] = (struct cpuinfo_cluster){
 			.processor_start = 0,
 			.processor_count = processor_count,
 			.core_start = 0,
@@ -180,7 +191,7 @@ void cpuinfo_emscripten_init(void) {
 
 		static_x86_l3.processor_count = processor_count;
 	} else {
-		clusters[0] = (struct cpuinfo_cluster) {
+		clusters[0] = (struct cpuinfo_cluster){
 			.processor_start = 0,
 			.processor_count = big_cluster_core_count,
 			.core_start = 0,
@@ -192,7 +203,7 @@ void cpuinfo_emscripten_init(void) {
 			.frequency = 0,
 		};
 
-		l2[0] = (struct cpuinfo_cache) {
+		l2[0] = (struct cpuinfo_cache){
 			.size = 1024 * 1024,
 			.associativity = 8,
 			.sets = 2048,
@@ -203,7 +214,7 @@ void cpuinfo_emscripten_init(void) {
 		};
 
 		if (cluster_count > 1) {
-			l2[1] = (struct cpuinfo_cache) {
+			l2[1] = (struct cpuinfo_cache){
 				.size = 256 * 1024,
 				.associativity = 8,
 				.sets = 512,
@@ -213,7 +224,7 @@ void cpuinfo_emscripten_init(void) {
 				.processor_count = processor_count - big_cluster_core_count,
 			};
 
-			clusters[1] = (struct cpuinfo_cluster) {
+			clusters[1] = (struct cpuinfo_cluster){
 				.processor_start = big_cluster_core_count,
 				.processor_count = processor_count - big_cluster_core_count,
 				.core_start = big_cluster_core_count,
@@ -230,9 +241,9 @@ void cpuinfo_emscripten_init(void) {
 	/* Commit changes */
 	cpuinfo_cache[cpuinfo_cache_level_1i] = l1i;
 	cpuinfo_cache[cpuinfo_cache_level_1d] = l1d;
-	cpuinfo_cache[cpuinfo_cache_level_2]  = l2;
+	cpuinfo_cache[cpuinfo_cache_level_2] = l2;
 	if (is_x86) {
-		cpuinfo_cache[cpuinfo_cache_level_3]  = &static_x86_l3;
+		cpuinfo_cache[cpuinfo_cache_level_3] = &static_x86_l3;
 	}
 
 	cpuinfo_processors = processors;
@@ -242,12 +253,12 @@ void cpuinfo_emscripten_init(void) {
 
 	cpuinfo_cache_count[cpuinfo_cache_level_1i] = processor_count;
 	cpuinfo_cache_count[cpuinfo_cache_level_1d] = processor_count;
-	cpuinfo_cache_count[cpuinfo_cache_level_2]  = l2_count;
+	cpuinfo_cache_count[cpuinfo_cache_level_2] = l2_count;
 	if (is_x86) {
-		cpuinfo_cache_count[cpuinfo_cache_level_3]  = 1;
+		cpuinfo_cache_count[cpuinfo_cache_level_3] = 1;
 	}
 
-	cpuinfo_global_uarch = (struct cpuinfo_uarch_info) {
+	cpuinfo_global_uarch = (struct cpuinfo_uarch_info){
 		.uarch = cpuinfo_uarch_unknown,
 		.processor_count = processor_count,
 		.core_count = core_count,

3rdparty/cpuinfo/src/freebsd/api.h

@@ -0,0 +1,12 @@
+#pragma once
+
+#include <stdint.h>
+
+struct cpuinfo_freebsd_topology {
+	uint32_t packages;
+	uint32_t cores;
+	uint32_t threads;
+	uint32_t threads_per_core;
+};
+
+struct cpuinfo_freebsd_topology cpuinfo_freebsd_detect_topology(void);

3rdparty/cpuinfo/src/freebsd/topology.c

@@ -0,0 +1,104 @@
+#include <errno.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include <sys/sysctl.h>
+#include <sys/types.h>
+
+#include <cpuinfo/log.h>
+#include <freebsd/api.h>
+
+static int sysctl_int(const char* name) {
+	int value = 0;
+	size_t value_size = sizeof(value);
+	if (sysctlbyname(name, &value, &value_size, NULL, 0) != 0) {
+		cpuinfo_log_error("sysctlbyname(\"%s\") failed: %s", name, strerror(errno));
+	} else if (value <= 0) {
+		cpuinfo_log_error("sysctlbyname(\"%s\") returned invalid value %d %zu", name, value, value_size);
+		value = 0;
+	}
+	return value;
+}
+
+static char* sysctl_str(const char* name) {
+	size_t value_size = 0;
+	if (sysctlbyname(name, NULL, &value_size, NULL, 0) != 0) {
+		cpuinfo_log_error("sysctlbyname(\"%s\") failed: %s", name, strerror(errno));
+	} else if (value_size <= 0) {
+		cpuinfo_log_error("sysctlbyname(\"%s\") returned invalid value size %zu", name, value_size);
+	}
+	value_size += 1;
+	char* value = calloc(value_size, 1);
+	if (!value) {
+		cpuinfo_log_error("calloc %zu bytes failed", value_size);
+		return NULL;
+	}
+	if (sysctlbyname(name, value, &value_size, NULL, 0) != 0) {
+		cpuinfo_log_error("sysctlbyname(\"%s\") failed: %s", name, strerror(errno));
+		free(value);
+		return NULL;
+	}
+	return value;
+}
+
+struct cpuinfo_freebsd_topology cpuinfo_freebsd_detect_topology(void) {
+	struct cpuinfo_freebsd_topology topology = {
+		.packages = 0,
+		.cores = 0,
+		.threads_per_core = 0,
+		.threads = 0,
+	};
+	char* topology_spec = sysctl_str("kern.sched.topology_spec");
+	if (!topology_spec) {
+		return topology;
+	}
+	const char* group_tag = "<group level=\"1\" cache-level=\"0\">";
+	char* p = strstr(topology_spec, group_tag);
+	while (p) {
+		const char* cpu_tag = "cpu count=\"";
+		char* q = strstr(p, cpu_tag);
+		if (q) {
+			p = q + strlen(cpu_tag);
+			topology.packages += atoi(p);
+		} else {
+			break;
+		}
+	}
+	if (topology.packages == 0) {
+		const char* group_tag = "<group level=\"1\"";
+		char* p = strstr(topology_spec, group_tag);
+		while (p) {
+			topology.packages += 1;
+			p++;
+			p = strstr(p, group_tag);
+		}
+	}
+	if (topology.packages == 0) {
+		cpuinfo_log_error("failed to parse topology_spec:%s", topology_spec);
+		free(topology_spec);
+		goto fail;
+	}
+	free(topology_spec);
+	topology.cores = sysctl_int("kern.smp.cores");
+	if (topology.cores == 0) {
+		goto fail;
+	}
+	if (topology.cores < topology.packages) {
+		goto fail;
+	}
+	topology.threads_per_core = sysctl_int("kern.smp.threads_per_core");
+	if (topology.threads_per_core == 0) {
+		goto fail;
+	}
+	cpuinfo_log_debug(
+		"freebsd topology: packages = %d, cores = %d, "
+		"threads_per_core = %d",
+		topology.packages,
+		topology.cores,
+		topology.threads_per_core);
+	topology.threads = topology.threads_per_core * topology.cores;
+	return topology;
+fail:
+	topology.packages = 0;
+	return topology;
+}

3rdparty/cpuinfo/src/init.c

@@ -1,7 +1,7 @@
 #if defined(_WIN32) || defined(__CYGWIN__)
-	#include <windows.h>
+#include <windows.h>
 #elif !defined(__EMSCRIPTEN__) || defined(__EMSCRIPTEN_PTHREADS__)
-	#include <pthread.h>
+#include <pthread.h>
 #endif
 
 #include <cpuinfo.h>
@@ -9,59 +9,59 @@
 #include <cpuinfo/log.h>
 
 #ifdef __APPLE__
-	#include "TargetConditionals.h"
+#include "TargetConditionals.h"
 #endif
 
-
 #if defined(_WIN32) || defined(__CYGWIN__)
-	static INIT_ONCE init_guard = INIT_ONCE_STATIC_INIT;
+static INIT_ONCE init_guard = INIT_ONCE_STATIC_INIT;
 #elif !defined(__EMSCRIPTEN__) || defined(__EMSCRIPTEN_PTHREADS__)
-	static pthread_once_t init_guard = PTHREAD_ONCE_INIT;
+static pthread_once_t init_guard = PTHREAD_ONCE_INIT;
 #else
-	static bool init_guard = false;
+static bool init_guard = false;
 #endif
 
 bool CPUINFO_ABI cpuinfo_initialize(void) {
 #if CPUINFO_ARCH_X86 || CPUINFO_ARCH_X86_64
-	#if defined(__MACH__) && defined(__APPLE__)
-		pthread_once(&init_guard, &cpuinfo_x86_mach_init);
-	#elif defined(__linux__)
-		pthread_once(&init_guard, &cpuinfo_x86_linux_init);
-	#elif defined(_WIN32) || defined(__CYGWIN__)
-		InitOnceExecuteOnce(&init_guard, &cpuinfo_x86_windows_init, NULL, NULL);
-	#else
-		cpuinfo_log_error("operating system is not supported in cpuinfo");
-	#endif
+#if defined(__MACH__) && defined(__APPLE__)
+	pthread_once(&init_guard, &cpuinfo_x86_mach_init);
+#elif defined(__FreeBSD__)
+	pthread_once(&init_guard, &cpuinfo_x86_freebsd_init);
+#elif defined(__linux__)
+	pthread_once(&init_guard, &cpuinfo_x86_linux_init);
+#elif defined(_WIN32) || defined(__CYGWIN__)
+	InitOnceExecuteOnce(&init_guard, &cpuinfo_x86_windows_init, NULL, NULL);
+#else
+	cpuinfo_log_error("operating system is not supported in cpuinfo");
+#endif
 #elif CPUINFO_ARCH_ARM || CPUINFO_ARCH_ARM64
-	#if defined(__linux__)
-		pthread_once(&init_guard, &cpuinfo_arm_linux_init);
-	#elif defined(__MACH__) && defined(__APPLE__)
-		pthread_once(&init_guard, &cpuinfo_arm_mach_init);
-	#elif defined(_WIN32)
-		InitOnceExecuteOnce(&init_guard, &cpuinfo_arm_windows_init, NULL, NULL);
-	#else
-		cpuinfo_log_error("operating system is not supported in cpuinfo");
-	#endif
+#if defined(__linux__)
+	pthread_once(&init_guard, &cpuinfo_arm_linux_init);
+#elif defined(__MACH__) && defined(__APPLE__)
+	pthread_once(&init_guard, &cpuinfo_arm_mach_init);
+#elif defined(_WIN32)
+	InitOnceExecuteOnce(&init_guard, &cpuinfo_arm_windows_init, NULL, NULL);
+#else
+	cpuinfo_log_error("operating system is not supported in cpuinfo");
+#endif
 #elif CPUINFO_ARCH_RISCV32 || CPUINFO_ARCH_RISCV64
-	#if defined(__linux__)
-		pthread_once(&init_guard, &cpuinfo_riscv_linux_init);
-	#else
-		cpuinfo_log_error("operating system is not supported in cpuinfo");
-	#endif
+#if defined(__linux__)
+	pthread_once(&init_guard, &cpuinfo_riscv_linux_init);
+#else
+	cpuinfo_log_error("operating system is not supported in cpuinfo");
+#endif
 #elif CPUINFO_ARCH_ASMJS || CPUINFO_ARCH_WASM || CPUINFO_ARCH_WASMSIMD
-	#if defined(__EMSCRIPTEN_PTHREADS__)
-		pthread_once(&init_guard, &cpuinfo_emscripten_init);
-	#else
-		if (!init_guard) {
-			cpuinfo_emscripten_init();
-		}
-		init_guard = true;
-	#endif
+#if defined(__EMSCRIPTEN_PTHREADS__)
+	pthread_once(&init_guard, &cpuinfo_emscripten_init);
+#else
+	if (!init_guard) {
+		cpuinfo_emscripten_init();
+	}
+	init_guard = true;
+#endif
 #else
 	cpuinfo_log_error("processor architecture is not supported in cpuinfo");
 #endif
 	return cpuinfo_is_initialized;
 }
 
-void CPUINFO_ABI cpuinfo_deinitialize(void) {
-}
+void CPUINFO_ABI cpuinfo_deinitialize(void) {}

3rdparty/cpuinfo/src/linux/api.h

@@ -1,35 +1,45 @@
 #pragma once
 
 #include <stdbool.h>
-#include <stdint.h>
 #include <stddef.h>
+#include <stdint.h>
 
 #include <cpuinfo.h>
 #include <cpuinfo/common.h>
 
-
-#define CPUINFO_LINUX_FLAG_PRESENT            UINT32_C(0x00000001)
-#define CPUINFO_LINUX_FLAG_POSSIBLE           UINT32_C(0x00000002)
-#define CPUINFO_LINUX_FLAG_MAX_FREQUENCY      UINT32_C(0x00000004)
-#define CPUINFO_LINUX_FLAG_MIN_FREQUENCY      UINT32_C(0x00000008)
-#define CPUINFO_LINUX_FLAG_SMT_ID             UINT32_C(0x00000010)
-#define CPUINFO_LINUX_FLAG_CORE_ID            UINT32_C(0x00000020)
-#define CPUINFO_LINUX_FLAG_PACKAGE_ID         UINT32_C(0x00000040)
-#define CPUINFO_LINUX_FLAG_APIC_ID            UINT32_C(0x00000080)
-#define CPUINFO_LINUX_FLAG_SMT_CLUSTER        UINT32_C(0x00000100)
-#define CPUINFO_LINUX_FLAG_CORE_CLUSTER       UINT32_C(0x00000200)
-#define CPUINFO_LINUX_FLAG_PACKAGE_CLUSTER    UINT32_C(0x00000400)
-#define CPUINFO_LINUX_FLAG_PROC_CPUINFO       UINT32_C(0x00000800)
-#define CPUINFO_LINUX_FLAG_VALID              UINT32_C(0x00001000)
-#define CPUINFO_LINUX_FLAG_CUR_FREQUENCY      UINT32_C(0x00002000)
-#define CPUINFO_LINUX_FLAG_CLUSTER_CLUSTER    UINT32_C(0x00004000)
+#define CPUINFO_LINUX_FLAG_PRESENT UINT32_C(0x00000001)
+#define CPUINFO_LINUX_FLAG_POSSIBLE UINT32_C(0x00000002)
+#define CPUINFO_LINUX_FLAG_MAX_FREQUENCY UINT32_C(0x00000004)
+#define CPUINFO_LINUX_FLAG_MIN_FREQUENCY UINT32_C(0x00000008)
+#define CPUINFO_LINUX_FLAG_SMT_ID UINT32_C(0x00000010)
+#define CPUINFO_LINUX_FLAG_CORE_ID UINT32_C(0x00000020)
+#define CPUINFO_LINUX_FLAG_PACKAGE_ID UINT32_C(0x00000040)
+#define CPUINFO_LINUX_FLAG_APIC_ID UINT32_C(0x00000080)
+#define CPUINFO_LINUX_FLAG_SMT_CLUSTER UINT32_C(0x00000100)
+#define CPUINFO_LINUX_FLAG_CORE_CLUSTER UINT32_C(0x00000200)
+#define CPUINFO_LINUX_FLAG_PACKAGE_CLUSTER UINT32_C(0x00000400)
+#define CPUINFO_LINUX_FLAG_PROC_CPUINFO UINT32_C(0x00000800)
+#define CPUINFO_LINUX_FLAG_VALID UINT32_C(0x00001000)
+#define CPUINFO_LINUX_FLAG_CUR_FREQUENCY UINT32_C(0x00002000)
+#define CPUINFO_LINUX_FLAG_CLUSTER_CLUSTER UINT32_C(0x00004000)
 
 typedef bool (*cpuinfo_cpulist_callback)(uint32_t, uint32_t, void*);
-CPUINFO_INTERNAL bool cpuinfo_linux_parse_cpulist(const char* filename, cpuinfo_cpulist_callback callback, void* context);
-typedef bool (*cpuinfo_smallfile_callback)(const char*, const char*, void*);
-CPUINFO_INTERNAL bool cpuinfo_linux_parse_small_file(const char* filename, size_t buffer_size, cpuinfo_smallfile_callback, void* context);
+CPUINFO_INTERNAL bool cpuinfo_linux_parse_cpulist(
+	const char* filename,
+	cpuinfo_cpulist_callback callback,
+	void* context);
+typedef bool (*cpuinfo_smallfile_callback)(const char*, const char*, const char*, void*);
+CPUINFO_INTERNAL bool cpuinfo_linux_parse_small_file(
+	const char* filename,
+	size_t buffer_size,
+	cpuinfo_smallfile_callback,
+	void* context);
 typedef bool (*cpuinfo_line_callback)(const char*, const char*, void*, uint64_t);
-CPUINFO_INTERNAL bool cpuinfo_linux_parse_multiline_file(const char* filename, size_t buffer_size, cpuinfo_line_callback, void* context);
+CPUINFO_INTERNAL bool cpuinfo_linux_parse_multiline_file(
+	const char* filename,
+	size_t buffer_size,
+	cpuinfo_line_callback,
+	void* context);
 
 CPUINFO_INTERNAL uint32_t cpuinfo_linux_get_max_processors_count(void);
 CPUINFO_INTERNAL uint32_t cpuinfo_linux_get_max_possible_processor(uint32_t max_processors_count);
@@ -37,13 +47,21 @@ CPUINFO_INTERNAL uint32_t cpuinfo_linux_get_max_present_processor(uint32_t max_p
 CPUINFO_INTERNAL uint32_t cpuinfo_linux_get_processor_cur_frequency(uint32_t processor);
 CPUINFO_INTERNAL uint32_t cpuinfo_linux_get_processor_min_frequency(uint32_t processor);
 CPUINFO_INTERNAL uint32_t cpuinfo_linux_get_processor_max_frequency(uint32_t processor);
-CPUINFO_INTERNAL bool cpuinfo_linux_get_processor_package_id(uint32_t processor, uint32_t package_id[restrict static 1]);
+CPUINFO_INTERNAL bool cpuinfo_linux_get_processor_package_id(
+	uint32_t processor,
+	uint32_t package_id[restrict static 1]);
 CPUINFO_INTERNAL bool cpuinfo_linux_get_processor_core_id(uint32_t processor, uint32_t core_id[restrict static 1]);
 
-CPUINFO_INTERNAL bool cpuinfo_linux_detect_possible_processors(uint32_t max_processors_count,
-	uint32_t* processor0_flags, uint32_t processor_struct_size, uint32_t possible_flag);
-CPUINFO_INTERNAL bool cpuinfo_linux_detect_present_processors(uint32_t max_processors_count,
-	uint32_t* processor0_flags, uint32_t processor_struct_size, uint32_t present_flag);
+CPUINFO_INTERNAL bool cpuinfo_linux_detect_possible_processors(
+	uint32_t max_processors_count,
+	uint32_t* processor0_flags,
+	uint32_t processor_struct_size,
+	uint32_t possible_flag);
+CPUINFO_INTERNAL bool cpuinfo_linux_detect_present_processors(
+	uint32_t max_processors_count,
+	uint32_t* processor0_flags,
+	uint32_t processor_struct_size,
+	uint32_t present_flag);
 
 typedef bool (*cpuinfo_siblings_callback)(uint32_t, uint32_t, uint32_t, void*);
 CPUINFO_INTERNAL bool cpuinfo_linux_detect_core_siblings(

3rdparty/cpuinfo/src/linux/cpulist.c

@@ -1,21 +1,20 @@
+#include <errno.h>
 #include <stdbool.h>
 #include <stdint.h>
 #include <stdlib.h>
 #include <string.h>
-#include <errno.h>
 
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <unistd.h>
 #include <fcntl.h>
 #include <sched.h>
+#include <sys/stat.h>
+#include <sys/types.h>
+#include <unistd.h>
 
 #if CPUINFO_MOCK
-	#include <cpuinfo-mock.h>
+#include <cpuinfo-mock.h>
 #endif
-#include <linux/api.h>
 #include <cpuinfo/log.h>
-
+#include <linux/api.h>
 
 /*
  * Size, in chars, of the on-stack buffer used for parsing cpu lists.
@@ -25,7 +24,6 @@
  */
 #define BUFFER_SIZE 256
 
-
 /* Locale-independent */
 inline static bool is_whitespace(char c) {
 	switch (c) {
@@ -42,7 +40,7 @@ inline static bool is_whitespace(char c) {
 inline static const char* parse_number(const char* string, const char* end, uint32_t number_ptr[restrict static 1]) {
 	uint32_t number = 0;
 	while (string != end) {
-		const uint32_t digit = (uint32_t) (*string) - (uint32_t) '0';
+		const uint32_t digit = (uint32_t)(*string) - (uint32_t)'0';
 		if (digit >= 10) {
 			break;
 		}
@@ -53,7 +51,11 @@ inline static const char* parse_number(const char* string, const char* end, uint
 	return string;
 }
 
-inline static bool parse_entry(const char* entry_start, const char* entry_end, cpuinfo_cpulist_callback callback, void* context) {
+inline static bool parse_entry(
+	const char* entry_start,
+	const char* entry_end,
+	cpuinfo_cpulist_callback callback,
+	void* context) {
 	/* Skip whitespace at the beginning of an entry */
 	for (; entry_start != entry_end; entry_start++) {
 		if (!is_whitespace(*entry_start)) {
@@ -67,36 +69,44 @@ inline static bool parse_entry(const char* entry_start, const char* entry_end, c
 		}
 	}
 
-	const size_t entry_length = (size_t) (entry_end - entry_start);
+	const size_t entry_length = (size_t)(entry_end - entry_start);
 	if (entry_length == 0) {
 		cpuinfo_log_warning("unexpected zero-length cpu list entry ignored");
 		return false;
 	}
 
-	#if CPUINFO_LOG_DEBUG_PARSERS
-		cpuinfo_log_debug("parse cpu list entry \"%.*s\" (%zu chars)", (int) entry_length, entry_start, entry_length);
-	#endif
+#if CPUINFO_LOG_DEBUG_PARSERS
+	cpuinfo_log_debug("parse cpu list entry \"%.*s\" (%zu chars)", (int)entry_length, entry_start, entry_length);
+#endif
 	uint32_t first_cpu, last_cpu;
 
 	const char* number_end = parse_number(entry_start, entry_end, &first_cpu);
 	if (number_end == entry_start) {
 		/* Failed to parse the number; ignore the entry */
-		cpuinfo_log_warning("invalid character '%c' in the cpu list entry \"%.*s\": entry is ignored",
-			entry_start[0], (int) entry_length, entry_start);
+		cpuinfo_log_warning(
+			"invalid character '%c' in the cpu list entry \"%.*s\": entry is ignored",
+			entry_start[0],
+			(int)entry_length,
+			entry_start);
 		return false;
 	} else if (number_end == entry_end) {
-		/* Completely parsed the entry */
-		#if CPUINFO_LOG_DEBUG_PARSERS
-			cpuinfo_log_debug("cpulist: call callback with list_start = %"PRIu32", list_end = %"PRIu32,
-				first_cpu, first_cpu + 1);
-		#endif
+/* Completely parsed the entry */
+#if CPUINFO_LOG_DEBUG_PARSERS
+		cpuinfo_log_debug(
+			"cpulist: call callback with list_start = %" PRIu32 ", list_end = %" PRIu32,
+			first_cpu,
+			first_cpu + 1);
+#endif
 		return callback(first_cpu, first_cpu + 1, context);
 	}
 
 	/* Parse the second part of the entry */
 	if (*number_end != '-') {
-		cpuinfo_log_warning("invalid character '%c' in the cpu list entry \"%.*s\": entry is ignored",
-			*number_end, (int) entry_length, entry_start);
+		cpuinfo_log_warning(
+			"invalid character '%c' in the cpu list entry \"%.*s\": entry is ignored",
+			*number_end,
+			(int)entry_length,
+			entry_start);
 		return false;
 	}
 
@@ -104,28 +114,40 @@ inline static bool parse_entry(const char* entry_start, const char* entry_end, c
 	number_end = parse_number(number_start, entry_end, &last_cpu);
 	if (number_end == number_start) {
 		/* Failed to parse the second number; ignore the entry */
-		cpuinfo_log_warning("invalid character '%c' in the cpu list entry \"%.*s\": entry is ignored",
-			*number_start, (int) entry_length, entry_start);
+		cpuinfo_log_warning(
+			"invalid character '%c' in the cpu list entry \"%.*s\": entry is ignored",
+			*number_start,
+			(int)entry_length,
+			entry_start);
 		return false;
 	}
 
 	if (number_end != entry_end) {
-		/* Partially parsed the entry; ignore unparsed characters and continue with the parsed part */
-		cpuinfo_log_warning("ignored invalid characters \"%.*s\" at the end of cpu list entry \"%.*s\"",
-			(int) (entry_end - number_end), number_start, (int) entry_length, entry_start);
+		/* Partially parsed the entry; ignore unparsed characters and
+		 * continue with the parsed part */
+		cpuinfo_log_warning(
+			"ignored invalid characters \"%.*s\" at the end of cpu list entry \"%.*s\"",
+			(int)(entry_end - number_end),
+			number_start,
+			(int)entry_length,
+			entry_start);
 	}
 
 	if (last_cpu < first_cpu) {
-		cpuinfo_log_warning("ignored cpu list entry \"%.*s\": invalid range %"PRIu32"-%"PRIu32,
-			(int) entry_length, entry_start, first_cpu, last_cpu);
+		cpuinfo_log_warning(
+			"ignored cpu list entry \"%.*s\": invalid range %" PRIu32 "-%" PRIu32,
+			(int)entry_length,
+			entry_start,
+			first_cpu,
+			last_cpu);
 		return false;
 	}
 
-	/* Parsed both parts of the entry; update CPU set */
-	#if CPUINFO_LOG_DEBUG_PARSERS
-		cpuinfo_log_debug("cpulist: call callback with list_start = %"PRIu32", list_end = %"PRIu32,
-			first_cpu, last_cpu + 1);
-	#endif
+/* Parsed both parts of the entry; update CPU set */
+#if CPUINFO_LOG_DEBUG_PARSERS
+	cpuinfo_log_debug(
+		"cpulist: call callback with list_start = %" PRIu32 ", list_end = %" PRIu32, first_cpu, last_cpu + 1);
+#endif
 	return callback(first_cpu, last_cpu + 1, context);
 }
 
@@ -133,9 +155,9 @@ bool cpuinfo_linux_parse_cpulist(const char* filename, cpuinfo_cpulist_callback
 	bool status = true;
 	int file = -1;
 	char buffer[BUFFER_SIZE];
-	#if CPUINFO_LOG_DEBUG_PARSERS
-		cpuinfo_log_debug("parsing cpu list from file %s", filename);
-	#endif
+#if CPUINFO_LOG_DEBUG_PARSERS
+	cpuinfo_log_debug("parsing cpu list from file %s", filename);
+#endif
 
 #if CPUINFO_MOCK
 	file = cpuinfo_mock_open(filename, O_RDONLY);
@@ -154,29 +176,32 @@ bool cpuinfo_linux_parse_cpulist(const char* filename, cpuinfo_cpulist_callback
 	ssize_t bytes_read;
 	do {
 #if CPUINFO_MOCK
-		bytes_read = cpuinfo_mock_read(file, data_start, (size_t) (buffer_end - data_start));
+		bytes_read = cpuinfo_mock_read(file, data_start, (size_t)(buffer_end - data_start));
 #else
-		bytes_read = read(file, data_start, (size_t) (buffer_end - data_start));
+		bytes_read = read(file, data_start, (size_t)(buffer_end - data_start));
 #endif
 		if (bytes_read < 0) {
-			cpuinfo_log_info("failed to read file %s at position %zu: %s", filename, position, strerror(errno));
+			cpuinfo_log_info(
+				"failed to read file %s at position %zu: %s", filename, position, strerror(errno));
 			status = false;
 			goto cleanup;
 		}
 
-		position += (size_t) bytes_read;
-		const char* data_end = data_start + (size_t) bytes_read;
+		position += (size_t)bytes_read;
+		const char* data_end = data_start + (size_t)bytes_read;
 		const char* entry_start = buffer;
 
 		if (bytes_read == 0) {
-			/* No more data in the file: process the remaining text in the buffer as a single entry */
+			/* No more data in the file: process the remaining text
+			 * in the buffer as a single entry */
 			const char* entry_end = data_end;
 			const bool entry_status = parse_entry(entry_start, entry_end, callback, context);
 			status &= entry_status;
 		} else {
 			const char* entry_end;
 			do {
-				/* Find the end of the entry, as indicated by a comma (',') */
+				/* Find the end of the entry, as indicated by a
+				 * comma (',') */
 				for (entry_end = entry_start; entry_end != data_end; entry_end++) {
 					if (*entry_end == ',') {
 						break;
@@ -184,18 +209,21 @@ bool cpuinfo_linux_parse_cpulist(const char* filename, cpuinfo_cpulist_callback
 				}
 
 				/*
-				 * If we located separator at the end of the entry, parse it.
-				 * Otherwise, there may be more data at the end; read the file once again.
+				 * If we located separator at the end of the
+				 * entry, parse it. Otherwise, there may be more
+				 * data at the end; read the file once again.
 				 */
 				if (entry_end != data_end) {
-					const bool entry_status = parse_entry(entry_start, entry_end, callback, context);
+					const bool entry_status =
+						parse_entry(entry_start, entry_end, callback, context);
 					status &= entry_status;
 					entry_start = entry_end + 1;
 				}
 			} while (entry_end != data_end);
 
-			/* Move remaining partial entry data at the end to the beginning of the buffer */
-			const size_t entry_length = (size_t) (entry_end - entry_start);
+			/* Move remaining partial entry data at the end to the
+			 * beginning of the buffer */
+			const size_t entry_length = (size_t)(entry_end - entry_start);
 			memmove(buffer, entry_start, entry_length);
 			data_start = &buffer[entry_length];
 		}

3rdparty/cpuinfo/src/linux/mockfile.c

@@ -1,30 +1,28 @@
+#include <errno.h>
 #include <stdbool.h>
+#include <stddef.h>
 #include <stdint.h>
 #include <stdlib.h>
-#include <stddef.h>
 #include <string.h>
-#include <errno.h>
 
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <unistd.h>
 #include <fcntl.h>
 #include <sched.h>
+#include <sys/stat.h>
+#include <sys/types.h>
+#include <unistd.h>
 
 #if !CPUINFO_MOCK
-	#error This file should be built only in mock mode
+#error This file should be built only in mock mode
 #endif
 
-#include <cpuinfo-mock.h>
 #include <arm/linux/api.h>
 #include <arm/midr.h>
+#include <cpuinfo-mock.h>
 #include <cpuinfo/log.h>
 
-
 static struct cpuinfo_mock_file* cpuinfo_mock_files = NULL;
 static uint32_t cpuinfo_mock_file_count = 0;
 
-
 void CPUINFO_ABI cpuinfo_mock_filesystem(struct cpuinfo_mock_file* files) {
 	cpuinfo_log_info("filesystem mocking enabled");
 	uint32_t file_count = 0;
@@ -54,7 +52,7 @@ int CPUINFO_ABI cpuinfo_mock_open(const char* path, int oflag) {
 				return -1;
 			}
 			cpuinfo_mock_files[i].offset = 0;
-			return (int) i;
+			return (int)i;
 		}
 	}
 	errno = ENOENT;
@@ -67,7 +65,7 @@ int CPUINFO_ABI cpuinfo_mock_close(int fd) {
 		return close(fd);
 	}
 
-	if ((unsigned int) fd >= cpuinfo_mock_file_count) {
+	if ((unsigned int)fd >= cpuinfo_mock_file_count) {
 		errno = EBADF;
 		return -1;
 	}
@@ -85,7 +83,7 @@ ssize_t CPUINFO_ABI cpuinfo_mock_read(int fd, void* buffer, size_t capacity) {
 		return read(fd, buffer, capacity);
 	}
 
-	if ((unsigned int) fd >= cpuinfo_mock_file_count) {
+	if ((unsigned int)fd >= cpuinfo_mock_file_count) {
 		errno = EBADF;
 		return -1;
 	}
@@ -99,7 +97,7 @@ ssize_t CPUINFO_ABI cpuinfo_mock_read(int fd, void* buffer, size_t capacity) {
 	if (count > capacity) {
 		count = capacity;
 	}
-	memcpy(buffer, (void*) cpuinfo_mock_files[fd].content + offset, count);
+	memcpy(buffer, (void*)cpuinfo_mock_files[fd].content + offset, count);
 	cpuinfo_mock_files[fd].offset += count;
-	return (ssize_t) count;
+	return (ssize_t)count;
 }

3rdparty/cpuinfo/src/linux/multiline.c

@@ -1,27 +1,29 @@
+#include <alloca.h>
+#include <errno.h>
 #include <stdbool.h>
 #include <stdint.h>
 #include <stdlib.h>
 #include <string.h>
-#include <alloca.h>
-#include <errno.h>
 
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <unistd.h>
 #include <fcntl.h>
+#include <sys/stat.h>
+#include <sys/types.h>
+#include <unistd.h>
 
 #if CPUINFO_MOCK
-	#include <cpuinfo-mock.h>
+#include <cpuinfo-mock.h>
 #endif
-#include <linux/api.h>
 #include <cpuinfo/log.h>
+#include <linux/api.h>
 
-
-bool cpuinfo_linux_parse_multiline_file(const char* filename, size_t buffer_size, cpuinfo_line_callback callback, void* context)
-{
+bool cpuinfo_linux_parse_multiline_file(
+	const char* filename,
+	size_t buffer_size,
+	cpuinfo_line_callback callback,
+	void* context) {
 	int file = -1;
 	bool status = false;
-	char* buffer = (char*) alloca(buffer_size);
+	char* buffer = (char*)alloca(buffer_size);
 
 #if CPUINFO_MOCK
 	file = cpuinfo_mock_open(filename, O_RDONLY);
@@ -41,22 +43,23 @@ bool cpuinfo_linux_parse_multiline_file(const char* filename, size_t buffer_size
 	ssize_t bytes_read;
 	do {
 #if CPUINFO_MOCK
-		bytes_read = cpuinfo_mock_read(file, data_start, (size_t) (buffer_end - data_start));
+		bytes_read = cpuinfo_mock_read(file, data_start, (size_t)(buffer_end - data_start));
 #else
-		bytes_read = read(file, data_start, (size_t) (buffer_end - data_start));
+		bytes_read = read(file, data_start, (size_t)(buffer_end - data_start));
 #endif
 		if (bytes_read < 0) {
-			cpuinfo_log_info("failed to read file %s at position %zu: %s",
-				filename, position, strerror(errno));
+			cpuinfo_log_info(
+				"failed to read file %s at position %zu: %s", filename, position, strerror(errno));
 			goto cleanup;
 		}
 
-		position += (size_t) bytes_read;
-		const char* data_end = data_start + (size_t) bytes_read;
+		position += (size_t)bytes_read;
+		const char* data_end = data_start + (size_t)bytes_read;
 		const char* line_start = buffer;
 
 		if (bytes_read == 0) {
-			/* No more data in the file: process the remaining text in the buffer as a single entry */
+			/* No more data in the file: process the remaining text
+			 * in the buffer as a single entry */
 			const char* line_end = data_end;
 			if (!callback(line_start, line_end, context, line_number)) {
 				goto cleanup;
@@ -64,7 +67,9 @@ bool cpuinfo_linux_parse_multiline_file(const char* filename, size_t buffer_size
 		} else {
 			const char* line_end;
 			do {
-				/* Find the end of the entry, as indicated by newline character ('\n') */
+				/* Find the end of the entry, as indicated by
+				 * newline character ('\n')
+				 */
 				for (line_end = line_start; line_end != data_end; line_end++) {
 					if (*line_end == '\n') {
 						break;
@@ -72,8 +77,9 @@ bool cpuinfo_linux_parse_multiline_file(const char* filename, size_t buffer_size
 				}
 
 				/*
-				 * If we located separator at the end of the entry, parse it.
-				 * Otherwise, there may be more data at the end; read the file once again.
+				 * If we located separator at the end of the
+				 * entry, parse it. Otherwise, there may be more
+				 * data at the end; read the file once again.
 				 */
 				if (line_end != data_end) {
 					if (!callback(line_start, line_end, context, line_number++)) {
@@ -83,8 +89,9 @@ bool cpuinfo_linux_parse_multiline_file(const char* filename, size_t buffer_size
 				}
 			} while (line_end != data_end);
 
-			/* Move remaining partial line data at the end to the beginning of the buffer */
-			const size_t line_length = (size_t) (line_end - line_start);
+			/* Move remaining partial line data at the end to the
+			 * beginning of the buffer */
+			const size_t line_length = (size_t)(line_end - line_start);
 			memmove(buffer, line_start, line_length);
 			data_start = &buffer[line_length];
 		}

3rdparty/cpuinfo/src/linux/processors.c

@@ -1,31 +1,32 @@
 #include <stdbool.h>
 #include <stdint.h>
-#include <stdlib.h>
 #include <stdio.h>
+#include <stdlib.h>
 #include <string.h>
 
 #if !defined(__ANDROID__)
-	/*
-	 * sched.h is only used for CPU_SETSIZE constant.
-	 * Android NDK headers before platform 21 do have this constant in sched.h
-	 */
-	#include <sched.h>
+/*
+ * sched.h is only used for CPU_SETSIZE constant.
+ * Android NDK headers before platform 21 do have this constant in sched.h
+ */
+#include <sched.h>
 #endif
 
-#include <linux/api.h>
 #include <cpuinfo/log.h>
-
+#include <linux/api.h>
 
 #define STRINGIFY(token) #token
 
 #define KERNEL_MAX_FILENAME "/sys/devices/system/cpu/kernel_max"
 #define KERNEL_MAX_FILESIZE 32
-#define FREQUENCY_FILENAME_SIZE (sizeof("/sys/devices/system/cpu/cpu" STRINGIFY(UINT32_MAX) "/cpufreq/cpuinfo_max_freq"))
+#define FREQUENCY_FILENAME_SIZE \
+	(sizeof("/sys/devices/system/cpu/cpu" STRINGIFY(UINT32_MAX) "/cpufreq/cpuinfo_max_freq"))
 #define CUR_FREQUENCY_FILENAME_FORMAT "/sys/devices/system/cpu/cpu%" PRIu32 "/cpufreq/cpuinfo_cur_freq"
 #define MAX_FREQUENCY_FILENAME_FORMAT "/sys/devices/system/cpu/cpu%" PRIu32 "/cpufreq/cpuinfo_max_freq"
 #define MIN_FREQUENCY_FILENAME_FORMAT "/sys/devices/system/cpu/cpu%" PRIu32 "/cpufreq/cpuinfo_min_freq"
 #define FREQUENCY_FILESIZE 32
-#define PACKAGE_ID_FILENAME_SIZE (sizeof("/sys/devices/system/cpu/cpu" STRINGIFY(UINT32_MAX) "/topology/physical_package_id"))
+#define PACKAGE_ID_FILENAME_SIZE \
+	(sizeof("/sys/devices/system/cpu/cpu" STRINGIFY(UINT32_MAX) "/topology/physical_package_id"))
 #define PACKAGE_ID_FILENAME_FORMAT "/sys/devices/system/cpu/cpu%" PRIu32 "/topology/physical_package_id"
 #define PACKAGE_ID_FILESIZE 32
 #define CORE_ID_FILENAME_SIZE (sizeof("/sys/devices/system/cpu/cpu" STRINGIFY(UINT32_MAX) "/topology/core_id"))
@@ -34,24 +35,27 @@
 
 #define CORE_CPUS_FILENAME_SIZE (sizeof("/sys/devices/system/cpu/cpu" STRINGIFY(UINT32_MAX) "/topology/core_cpus_list"))
 #define CORE_CPUS_FILENAME_FORMAT "/sys/devices/system/cpu/cpu%" PRIu32 "/topology/core_cpus_list"
-#define CORE_SIBLINGS_FILENAME_SIZE (sizeof("/sys/devices/system/cpu/cpu" STRINGIFY(UINT32_MAX) "/topology/core_siblings_list"))
+#define CORE_SIBLINGS_FILENAME_SIZE \
+	(sizeof("/sys/devices/system/cpu/cpu" STRINGIFY(UINT32_MAX) "/topology/core_siblings_list"))
 #define CORE_SIBLINGS_FILENAME_FORMAT "/sys/devices/system/cpu/cpu%" PRIu32 "/topology/core_siblings_list"
-#define CLUSTER_CPUS_FILENAME_SIZE (sizeof("/sys/devices/system/cpu/cpu" STRINGIFY(UINT32_MAX) "/topology/cluster_cpus_list"))
+#define CLUSTER_CPUS_FILENAME_SIZE \
+	(sizeof("/sys/devices/system/cpu/cpu" STRINGIFY(UINT32_MAX) "/topology/cluster_cpus_list"))
 #define CLUSTER_CPUS_FILENAME_FORMAT "/sys/devices/system/cpu/cpu%" PRIu32 "/topology/cluster_cpus_list"
-#define PACKAGE_CPUS_FILENAME_SIZE (sizeof("/sys/devices/system/cpu/cpu" STRINGIFY(UINT32_MAX) "/topology/package_cpus_list"))
+#define PACKAGE_CPUS_FILENAME_SIZE \
+	(sizeof("/sys/devices/system/cpu/cpu" STRINGIFY(UINT32_MAX) "/topology/package_cpus_list"))
 #define PACKAGE_CPUS_FILENAME_FORMAT "/sys/devices/system/cpu/cpu%" PRIu32 "/topology/package_cpus_list"
-#define THREAD_SIBLINGS_FILENAME_SIZE (sizeof("/sys/devices/system/cpu/cpu" STRINGIFY(UINT32_MAX) "/topology/thread_siblings_list"))
+#define THREAD_SIBLINGS_FILENAME_SIZE \
+	(sizeof("/sys/devices/system/cpu/cpu" STRINGIFY(UINT32_MAX) "/topology/thread_siblings_list"))
 #define THREAD_SIBLINGS_FILENAME_FORMAT "/sys/devices/system/cpu/cpu%" PRIu32 "/topology/thread_siblings_list"
 
 #define POSSIBLE_CPULIST_FILENAME "/sys/devices/system/cpu/possible"
 #define PRESENT_CPULIST_FILENAME "/sys/devices/system/cpu/present"
 
-
 inline static const char* parse_number(const char* start, const char* end, uint32_t number_ptr[restrict static 1]) {
 	uint32_t number = 0;
 	const char* parsed = start;
 	for (; parsed != end; parsed++) {
-		const uint32_t digit = (uint32_t) (uint8_t) (*parsed) - (uint32_t) '0';
+		const uint32_t digit = (uint32_t)(uint8_t)(*parsed) - (uint32_t)'0';
 		if (digit >= 10) {
 			break;
 		}
@@ -75,20 +79,20 @@ inline static bool is_whitespace(char c) {
 }
 
 #if defined(__ANDROID__) && !defined(CPU_SETSIZE)
-	/*
-	 * Android NDK headers before platform 21 do not define CPU_SETSIZE,
-	 * so we hard-code its value, as defined in platform 21 headers
-	 */
-	#if defined(__LP64__)
-		static const uint32_t default_max_processors_count = 1024;
-	#else
-		static const uint32_t default_max_processors_count = 32;
-	#endif
+/*
+ * Android NDK headers before platform 21 do not define CPU_SETSIZE,
+ * so we hard-code its value, as defined in platform 21 headers
+ */
+#if defined(__LP64__)
+static const uint32_t default_max_processors_count = 1024;
 #else
-	static const uint32_t default_max_processors_count = CPU_SETSIZE;
+static const uint32_t default_max_processors_count = 32;
+#endif
+#else
+static const uint32_t default_max_processors_count = CPU_SETSIZE;
 #endif
 
-static bool uint32_parser(const char* text_start, const char* text_end, void* context) {
+static bool uint32_parser(const char* filename, const char* text_start, const char* text_end, void* context) {
 	if (text_start == text_end) {
 		cpuinfo_log_error("failed to parse file %s: file is empty", KERNEL_MAX_FILENAME);
 		return false;
@@ -97,20 +101,26 @@ static bool uint32_parser(const char* text_start, const char* text_end, void* co
 	uint32_t kernel_max = 0;
 	const char* parsed_end = parse_number(text_start, text_end, &kernel_max);
 	if (parsed_end == text_start) {
-		cpuinfo_log_error("failed to parse file %s: \"%.*s\" is not an unsigned number",
-			KERNEL_MAX_FILENAME, (int) (text_end - text_start), text_start);
+		cpuinfo_log_error(
+			"failed to parse file %s: \"%.*s\" is not an unsigned number",
+			filename,
+			(int)(text_end - text_start),
+			text_start);
 		return false;
 	} else {
 		for (const char* char_ptr = parsed_end; char_ptr != text_end; char_ptr++) {
 			if (!is_whitespace(*char_ptr)) {
-				cpuinfo_log_warning("non-whitespace characters \"%.*s\" following number in file %s are ignored",
-					(int) (text_end - char_ptr), char_ptr, KERNEL_MAX_FILENAME);
+				cpuinfo_log_warning(
+					"non-whitespace characters \"%.*s\" following number in file %s are ignored",
+					(int)(text_end - char_ptr),
+					char_ptr,
+					filename);
 				break;
 			}
 		}
 	}
 
-	uint32_t* kernel_max_ptr = (uint32_t*) context;
+	uint32_t* kernel_max_ptr = (uint32_t*)context;
 	*kernel_max_ptr = kernel_max;
 	return true;
 }
@@ -118,133 +128,160 @@ static bool uint32_parser(const char* text_start, const char* text_end, void* co
 uint32_t cpuinfo_linux_get_max_processors_count(void) {
 	uint32_t kernel_max;
 	if (cpuinfo_linux_parse_small_file(KERNEL_MAX_FILENAME, KERNEL_MAX_FILESIZE, uint32_parser, &kernel_max)) {
-		cpuinfo_log_debug("parsed kernel_max value of %"PRIu32" from %s", kernel_max, KERNEL_MAX_FILENAME);
+		cpuinfo_log_debug("parsed kernel_max value of %" PRIu32 " from %s", kernel_max, KERNEL_MAX_FILENAME);
 
 		if (kernel_max >= default_max_processors_count) {
-			cpuinfo_log_warning("kernel_max value of %"PRIu32" parsed from %s exceeds platform-default limit %"PRIu32,
-				kernel_max, KERNEL_MAX_FILENAME, default_max_processors_count - 1);
+			cpuinfo_log_warning(
+				"kernel_max value of %" PRIu32
+				" parsed from %s exceeds platform-default limit %" PRIu32,
+				kernel_max,
+				KERNEL_MAX_FILENAME,
+				default_max_processors_count - 1);
 		}
 
 		return kernel_max + 1;
 	} else {
-		cpuinfo_log_warning("using platform-default max processors count = %"PRIu32, default_max_processors_count);
+		cpuinfo_log_warning(
+			"using platform-default max processors count = %" PRIu32, default_max_processors_count);
 		return default_max_processors_count;
 	}
 }
 
 uint32_t cpuinfo_linux_get_processor_cur_frequency(uint32_t processor) {
 	char cur_frequency_filename[FREQUENCY_FILENAME_SIZE];
-	const int chars_formatted = snprintf(
-		cur_frequency_filename, FREQUENCY_FILENAME_SIZE, CUR_FREQUENCY_FILENAME_FORMAT, processor);
-	if ((unsigned int) chars_formatted >= FREQUENCY_FILENAME_SIZE) {
-		cpuinfo_log_warning("failed to format filename for current frequency of processor %"PRIu32, processor);
+	const int chars_formatted =
+		snprintf(cur_frequency_filename, FREQUENCY_FILENAME_SIZE, CUR_FREQUENCY_FILENAME_FORMAT, processor);
+	if ((unsigned int)chars_formatted >= FREQUENCY_FILENAME_SIZE) {
+		cpuinfo_log_warning("failed to format filename for current frequency of processor %" PRIu32, processor);
 		return 0;
 	}
 
 	uint32_t cur_frequency;
 	if (cpuinfo_linux_parse_small_file(cur_frequency_filename, FREQUENCY_FILESIZE, uint32_parser, &cur_frequency)) {
-		cpuinfo_log_debug("parsed currrent frequency value of %"PRIu32" KHz for logical processor %"PRIu32" from %s",
-			cur_frequency, processor, cur_frequency_filename);
+		cpuinfo_log_debug(
+			"parsed currrent frequency value of %" PRIu32 " KHz for logical processor %" PRIu32 " from %s",
+			cur_frequency,
+			processor,
+			cur_frequency_filename);
 		return cur_frequency;
 	} else {
-		cpuinfo_log_warning("failed to parse current frequency for processor %"PRIu32" from %s",
-			processor, cur_frequency_filename);
+		cpuinfo_log_warning(
+			"failed to parse current frequency for processor %" PRIu32 " from %s",
+			processor,
+			cur_frequency_filename);
 		return 0;
 	}
 }
 
 uint32_t cpuinfo_linux_get_processor_max_frequency(uint32_t processor) {
 	char max_frequency_filename[FREQUENCY_FILENAME_SIZE];
-	const int chars_formatted = snprintf(
-		max_frequency_filename, FREQUENCY_FILENAME_SIZE, MAX_FREQUENCY_FILENAME_FORMAT, processor);
-	if ((unsigned int) chars_formatted >= FREQUENCY_FILENAME_SIZE) {
-		cpuinfo_log_warning("failed to format filename for max frequency of processor %"PRIu32, processor);
+	const int chars_formatted =
+		snprintf(max_frequency_filename, FREQUENCY_FILENAME_SIZE, MAX_FREQUENCY_FILENAME_FORMAT, processor);
+	if ((unsigned int)chars_formatted >= FREQUENCY_FILENAME_SIZE) {
+		cpuinfo_log_warning("failed to format filename for max frequency of processor %" PRIu32, processor);
 		return 0;
 	}
 
 	uint32_t max_frequency;
 	if (cpuinfo_linux_parse_small_file(max_frequency_filename, FREQUENCY_FILESIZE, uint32_parser, &max_frequency)) {
-		cpuinfo_log_debug("parsed max frequency value of %"PRIu32" KHz for logical processor %"PRIu32" from %s",
-			max_frequency, processor, max_frequency_filename);
+		cpuinfo_log_debug(
+			"parsed max frequency value of %" PRIu32 " KHz for logical processor %" PRIu32 " from %s",
+			max_frequency,
+			processor,
+			max_frequency_filename);
 		return max_frequency;
 	} else {
-		cpuinfo_log_warning("failed to parse max frequency for processor %"PRIu32" from %s",
-			processor, max_frequency_filename);
+		cpuinfo_log_warning(
+			"failed to parse max frequency for processor %" PRIu32 " from %s",
+			processor,
+			max_frequency_filename);
 		return 0;
 	}
 }
 
 uint32_t cpuinfo_linux_get_processor_min_frequency(uint32_t processor) {
 	char min_frequency_filename[FREQUENCY_FILENAME_SIZE];
-	const int chars_formatted = snprintf(
-		min_frequency_filename, FREQUENCY_FILENAME_SIZE, MIN_FREQUENCY_FILENAME_FORMAT, processor);
-	if ((unsigned int) chars_formatted >= FREQUENCY_FILENAME_SIZE) {
-		cpuinfo_log_warning("failed to format filename for min frequency of processor %"PRIu32, processor);
+	const int chars_formatted =
+		snprintf(min_frequency_filename, FREQUENCY_FILENAME_SIZE, MIN_FREQUENCY_FILENAME_FORMAT, processor);
+	if ((unsigned int)chars_formatted >= FREQUENCY_FILENAME_SIZE) {
+		cpuinfo_log_warning("failed to format filename for min frequency of processor %" PRIu32, processor);
 		return 0;
 	}
 
 	uint32_t min_frequency;
 	if (cpuinfo_linux_parse_small_file(min_frequency_filename, FREQUENCY_FILESIZE, uint32_parser, &min_frequency)) {
-		cpuinfo_log_debug("parsed min frequency value of %"PRIu32" KHz for logical processor %"PRIu32" from %s",
-			min_frequency, processor, min_frequency_filename);
+		cpuinfo_log_debug(
+			"parsed min frequency value of %" PRIu32 " KHz for logical processor %" PRIu32 " from %s",
+			min_frequency,
+			processor,
+			min_frequency_filename);
 		return min_frequency;
 	} else {
 		/*
-		 * This error is less severe than parsing max frequency, because min frequency is only useful for clustering,
-		 * while max frequency is also needed for peak FLOPS calculation.
+		 * This error is less severe than parsing max frequency, because
+		 * min frequency is only useful for clustering, while max
+		 * frequency is also needed for peak FLOPS calculation.
 		 */
-		cpuinfo_log_info("failed to parse min frequency for processor %"PRIu32" from %s",
-			processor, min_frequency_filename);
+		cpuinfo_log_info(
+			"failed to parse min frequency for processor %" PRIu32 " from %s",
+			processor,
+			min_frequency_filename);
 		return 0;
 	}
 }
 
 bool cpuinfo_linux_get_processor_core_id(uint32_t processor, uint32_t core_id_ptr[restrict static 1]) {
 	char core_id_filename[PACKAGE_ID_FILENAME_SIZE];
-	const int chars_formatted = snprintf(
-		core_id_filename, CORE_ID_FILENAME_SIZE, CORE_ID_FILENAME_FORMAT, processor);
-	if ((unsigned int) chars_formatted >= CORE_ID_FILENAME_SIZE) {
-		cpuinfo_log_warning("failed to format filename for core id of processor %"PRIu32, processor);
+	const int chars_formatted =
+		snprintf(core_id_filename, CORE_ID_FILENAME_SIZE, CORE_ID_FILENAME_FORMAT, processor);
+	if ((unsigned int)chars_formatted >= CORE_ID_FILENAME_SIZE) {
+		cpuinfo_log_warning("failed to format filename for core id of processor %" PRIu32, processor);
 		return 0;
 	}
 
 	uint32_t core_id;
 	if (cpuinfo_linux_parse_small_file(core_id_filename, CORE_ID_FILESIZE, uint32_parser, &core_id)) {
-		cpuinfo_log_debug("parsed core id value of %"PRIu32" for logical processor %"PRIu32" from %s",
-			core_id, processor, core_id_filename);
+		cpuinfo_log_debug(
+			"parsed core id value of %" PRIu32 " for logical processor %" PRIu32 " from %s",
+			core_id,
+			processor,
+			core_id_filename);
 		*core_id_ptr = core_id;
 		return true;
 	} else {
-		cpuinfo_log_info("failed to parse core id for processor %"PRIu32" from %s",
-			processor, core_id_filename);
+		cpuinfo_log_info(
+			"failed to parse core id for processor %" PRIu32 " from %s", processor, core_id_filename);
 		return false;
 	}
 }
 
 bool cpuinfo_linux_get_processor_package_id(uint32_t processor, uint32_t package_id_ptr[restrict static 1]) {
 	char package_id_filename[PACKAGE_ID_FILENAME_SIZE];
-	const int chars_formatted = snprintf(
-		package_id_filename, PACKAGE_ID_FILENAME_SIZE, PACKAGE_ID_FILENAME_FORMAT, processor);
-	if ((unsigned int) chars_formatted >= PACKAGE_ID_FILENAME_SIZE) {
-		cpuinfo_log_warning("failed to format filename for package id of processor %"PRIu32, processor);
+	const int chars_formatted =
+		snprintf(package_id_filename, PACKAGE_ID_FILENAME_SIZE, PACKAGE_ID_FILENAME_FORMAT, processor);
+	if ((unsigned int)chars_formatted >= PACKAGE_ID_FILENAME_SIZE) {
+		cpuinfo_log_warning("failed to format filename for package id of processor %" PRIu32, processor);
 		return 0;
 	}
 
 	uint32_t package_id;
 	if (cpuinfo_linux_parse_small_file(package_id_filename, PACKAGE_ID_FILESIZE, uint32_parser, &package_id)) {
-		cpuinfo_log_debug("parsed package id value of %"PRIu32" for logical processor %"PRIu32" from %s",
-			package_id, processor, package_id_filename);
+		cpuinfo_log_debug(
+			"parsed package id value of %" PRIu32 " for logical processor %" PRIu32 " from %s",
+			package_id,
+			processor,
+			package_id_filename);
 		*package_id_ptr = package_id;
 		return true;
 	} else {
-		cpuinfo_log_info("failed to parse package id for processor %"PRIu32" from %s",
-			processor, package_id_filename);
+		cpuinfo_log_info(
+			"failed to parse package id for processor %" PRIu32 " from %s", processor, package_id_filename);
 		return false;
 	}
 }
 
 static bool max_processor_number_parser(uint32_t processor_list_start, uint32_t processor_list_end, void* context) {
-	uint32_t* processor_number_ptr = (uint32_t*) context;
+	uint32_t* processor_number_ptr = (uint32_t*)context;
 	const uint32_t processor_list_last = processor_list_end - 1;
 	if (*processor_number_ptr < processor_list_last) {
 		*processor_number_ptr = processor_list_last;
@@ -254,18 +291,21 @@ static bool max_processor_number_parser(uint32_t processor_list_start, uint32_t
 
 uint32_t cpuinfo_linux_get_max_possible_processor(uint32_t max_processors_count) {
 	uint32_t max_possible_processor = 0;
-	if (!cpuinfo_linux_parse_cpulist(POSSIBLE_CPULIST_FILENAME, max_processor_number_parser, &max_possible_processor)) {
-		#if CPUINFO_ARCH_ARM || CPUINFO_ARCH_ARM64
-			cpuinfo_log_error("failed to parse the list of possible processors in %s", POSSIBLE_CPULIST_FILENAME);
-		#else
-			cpuinfo_log_warning("failed to parse the list of possible processors in %s", POSSIBLE_CPULIST_FILENAME);
-		#endif
+	if (!cpuinfo_linux_parse_cpulist(
+		    POSSIBLE_CPULIST_FILENAME, max_processor_number_parser, &max_possible_processor)) {
+#if CPUINFO_ARCH_ARM || CPUINFO_ARCH_ARM64
+		cpuinfo_log_error("failed to parse the list of possible processors in %s", POSSIBLE_CPULIST_FILENAME);
+#else
+		cpuinfo_log_warning("failed to parse the list of possible processors in %s", POSSIBLE_CPULIST_FILENAME);
+#endif
 		return UINT32_MAX;
 	}
 	if (max_possible_processor >= max_processors_count) {
 		cpuinfo_log_warning(
-			"maximum possible processor number %"PRIu32" exceeds system limit %"PRIu32": truncating to the latter",
-			max_possible_processor, max_processors_count - 1);
+			"maximum possible processor number %" PRIu32 " exceeds system limit %" PRIu32
+			": truncating to the latter",
+			max_possible_processor,
+			max_processors_count - 1);
 		max_possible_processor = max_processors_count - 1;
 	}
 	return max_possible_processor;
@@ -273,18 +313,21 @@ uint32_t cpuinfo_linux_get_max_possible_processor(uint32_t max_processors_count)
 
 uint32_t cpuinfo_linux_get_max_present_processor(uint32_t max_processors_count) {
 	uint32_t max_present_processor = 0;
-	if (!cpuinfo_linux_parse_cpulist(PRESENT_CPULIST_FILENAME, max_processor_number_parser, &max_present_processor)) {
-		#if CPUINFO_ARCH_ARM || CPUINFO_ARCH_ARM64
-			cpuinfo_log_error("failed to parse the list of present processors in %s", PRESENT_CPULIST_FILENAME);
-		#else
-			cpuinfo_log_warning("failed to parse the list of present processors in %s", PRESENT_CPULIST_FILENAME);
-		#endif
+	if (!cpuinfo_linux_parse_cpulist(
+		    PRESENT_CPULIST_FILENAME, max_processor_number_parser, &max_present_processor)) {
+#if CPUINFO_ARCH_ARM || CPUINFO_ARCH_ARM64
+		cpuinfo_log_error("failed to parse the list of present processors in %s", PRESENT_CPULIST_FILENAME);
+#else
+		cpuinfo_log_warning("failed to parse the list of present processors in %s", PRESENT_CPULIST_FILENAME);
+#endif
 		return UINT32_MAX;
 	}
 	if (max_present_processor >= max_processors_count) {
 		cpuinfo_log_warning(
-			"maximum present processor number %"PRIu32" exceeds system limit %"PRIu32": truncating to the latter",
-			max_present_processor, max_processors_count - 1);
+			"maximum present processor number %" PRIu32 " exceeds system limit %" PRIu32
+			": truncating to the latter",
+			max_present_processor,
+			max_processors_count - 1);
 		max_present_processor = max_processors_count - 1;
 	}
 	return max_present_processor;
@@ -298,22 +341,25 @@ struct detect_processors_context {
 };
 
 static bool detect_processor_parser(uint32_t processor_list_start, uint32_t processor_list_end, void* context) {
-	const uint32_t max_processors_count   = ((struct detect_processors_context*) context)->max_processors_count;
-	const uint32_t* processor0_flags      = ((struct detect_processors_context*) context)->processor0_flags;
-	const uint32_t processor_struct_size  = ((struct detect_processors_context*) context)->processor_struct_size;
-	const uint32_t detected_flag          = ((struct detect_processors_context*) context)->detected_flag;
+	const uint32_t max_processors_count = ((struct detect_processors_context*)context)->max_processors_count;
+	const uint32_t* processor0_flags = ((struct detect_processors_context*)context)->processor0_flags;
+	const uint32_t processor_struct_size = ((struct detect_processors_context*)context)->processor_struct_size;
+	const uint32_t detected_flag = ((struct detect_processors_context*)context)->detected_flag;
 
 	for (uint32_t processor = processor_list_start; processor < processor_list_end; processor++) {
 		if (processor >= max_processors_count) {
 			break;
 		}
-		*((uint32_t*) ((uintptr_t) processor0_flags + processor_struct_size * processor)) |= detected_flag;
+		*((uint32_t*)((uintptr_t)processor0_flags + processor_struct_size * processor)) |= detected_flag;
 	}
 	return true;
 }
 
-bool cpuinfo_linux_detect_possible_processors(uint32_t max_processors_count,
-	uint32_t* processor0_flags, uint32_t processor_struct_size, uint32_t possible_flag) {
+bool cpuinfo_linux_detect_possible_processors(
+	uint32_t max_processors_count,
+	uint32_t* processor0_flags,
+	uint32_t processor_struct_size,
+	uint32_t possible_flag) {
 	struct detect_processors_context context = {
 		.max_processors_count = max_processors_count,
 		.processor0_flags = processor0_flags,
@@ -328,8 +374,11 @@ bool cpuinfo_linux_detect_possible_processors(uint32_t max_processors_count,
 	}
 }
 
-bool cpuinfo_linux_detect_present_processors(uint32_t max_processors_count,
-	uint32_t* processor0_flags, uint32_t processor_struct_size, uint32_t present_flag) {
+bool cpuinfo_linux_detect_present_processors(
+	uint32_t max_processors_count,
+	uint32_t* processor0_flags,
+	uint32_t processor_struct_size,
+	uint32_t present_flag) {
 	struct detect_processors_context context = {
 		.max_processors_count = max_processors_count,
 		.processor0_flags = processor0_flags,
@@ -353,13 +402,17 @@ struct siblings_context {
 };
 
 static bool siblings_parser(uint32_t sibling_list_start, uint32_t sibling_list_end, struct siblings_context* context) {
-	const char* group_name                   = context->group_name;
-	const uint32_t max_processors_count      = context->max_processors_count;
-	const uint32_t processor                 = context->processor;
+	const char* group_name = context->group_name;
+	const uint32_t max_processors_count = context->max_processors_count;
+	const uint32_t processor = context->processor;
 
 	if (sibling_list_end > max_processors_count) {
-		cpuinfo_log_warning("ignore %s siblings %"PRIu32"-%"PRIu32" of processor %"PRIu32,
-			group_name, max_processors_count, sibling_list_end - 1, processor);
+		cpuinfo_log_warning(
+			"ignore %s siblings %" PRIu32 "-%" PRIu32 " of processor %" PRIu32,
+			group_name,
+			max_processors_count,
+			sibling_list_end - 1,
+			processor);
 		sibling_list_end = max_processors_count;
 	}
 
@@ -372,10 +425,10 @@ bool cpuinfo_linux_detect_core_cpus(
 	cpuinfo_siblings_callback callback,
 	void* context) {
 	char core_cpus_filename[CORE_CPUS_FILENAME_SIZE];
-	const int chars_formatted = snprintf(
-		core_cpus_filename, CORE_CPUS_FILENAME_SIZE, CORE_CPUS_FILENAME_FORMAT, processor);
-	if ((unsigned int) chars_formatted >= CORE_CPUS_FILENAME_SIZE) {
-		cpuinfo_log_warning("failed to format filename for core cpus of processor %"PRIu32, processor);
+	const int chars_formatted =
+		snprintf(core_cpus_filename, CORE_CPUS_FILENAME_SIZE, CORE_CPUS_FILENAME_FORMAT, processor);
+	if ((unsigned int)chars_formatted >= CORE_CPUS_FILENAME_SIZE) {
+		cpuinfo_log_warning("failed to format filename for core cpus of processor %" PRIu32, processor);
 		return false;
 	}
 
@@ -386,12 +439,14 @@ bool cpuinfo_linux_detect_core_cpus(
 		.callback = callback,
 		.callback_context = context,
 	};
-	if (cpuinfo_linux_parse_cpulist(core_cpus_filename,
-		(cpuinfo_cpulist_callback) siblings_parser, &siblings_context)) {
+	if (cpuinfo_linux_parse_cpulist(
+		    core_cpus_filename, (cpuinfo_cpulist_callback)siblings_parser, &siblings_context)) {
 		return true;
 	} else {
-		cpuinfo_log_info("failed to parse the list of core cpus for processor %"PRIu32" from %s",
-			processor, core_cpus_filename);
+		cpuinfo_log_info(
+			"failed to parse the list of core cpus for processor %" PRIu32 " from %s",
+			processor,
+			core_cpus_filename);
 		return false;
 	}
 }
@@ -402,10 +457,10 @@ bool cpuinfo_linux_detect_core_siblings(
 	cpuinfo_siblings_callback callback,
 	void* context) {
 	char core_siblings_filename[CORE_SIBLINGS_FILENAME_SIZE];
-	const int chars_formatted = snprintf(
-		core_siblings_filename, CORE_SIBLINGS_FILENAME_SIZE, CORE_SIBLINGS_FILENAME_FORMAT, processor);
-	if ((unsigned int) chars_formatted >= CORE_SIBLINGS_FILENAME_SIZE) {
-		cpuinfo_log_warning("failed to format filename for core siblings of processor %"PRIu32, processor);
+	const int chars_formatted =
+		snprintf(core_siblings_filename, CORE_SIBLINGS_FILENAME_SIZE, CORE_SIBLINGS_FILENAME_FORMAT, processor);
+	if ((unsigned int)chars_formatted >= CORE_SIBLINGS_FILENAME_SIZE) {
+		cpuinfo_log_warning("failed to format filename for core siblings of processor %" PRIu32, processor);
 		return false;
 	}
 
@@ -416,12 +471,14 @@ bool cpuinfo_linux_detect_core_siblings(
 		.callback = callback,
 		.callback_context = context,
 	};
-	if (cpuinfo_linux_parse_cpulist(core_siblings_filename,
-		(cpuinfo_cpulist_callback) siblings_parser, &siblings_context)) {
+	if (cpuinfo_linux_parse_cpulist(
+		    core_siblings_filename, (cpuinfo_cpulist_callback)siblings_parser, &siblings_context)) {
 		return true;
 	} else {
-		cpuinfo_log_info("failed to parse the list of core siblings for processor %"PRIu32" from %s",
-			processor, core_siblings_filename);
+		cpuinfo_log_info(
+			"failed to parse the list of core siblings for processor %" PRIu32 " from %s",
+			processor,
+			core_siblings_filename);
 		return false;
 	}
 }
@@ -434,8 +491,8 @@ bool cpuinfo_linux_detect_thread_siblings(
 	char thread_siblings_filename[THREAD_SIBLINGS_FILENAME_SIZE];
 	const int chars_formatted = snprintf(
 		thread_siblings_filename, THREAD_SIBLINGS_FILENAME_SIZE, THREAD_SIBLINGS_FILENAME_FORMAT, processor);
-	if ((unsigned int) chars_formatted >= THREAD_SIBLINGS_FILENAME_SIZE) {
-		cpuinfo_log_warning("failed to format filename for thread siblings of processor %"PRIu32, processor);
+	if ((unsigned int)chars_formatted >= THREAD_SIBLINGS_FILENAME_SIZE) {
+		cpuinfo_log_warning("failed to format filename for thread siblings of processor %" PRIu32, processor);
 		return false;
 	}
 
@@ -446,12 +503,14 @@ bool cpuinfo_linux_detect_thread_siblings(
 		.callback = callback,
 		.callback_context = context,
 	};
-	if (cpuinfo_linux_parse_cpulist(thread_siblings_filename,
-		(cpuinfo_cpulist_callback) siblings_parser, &siblings_context)) {
+	if (cpuinfo_linux_parse_cpulist(
+		    thread_siblings_filename, (cpuinfo_cpulist_callback)siblings_parser, &siblings_context)) {
 		return true;
 	} else {
-		cpuinfo_log_info("failed to parse the list of thread siblings for processor %"PRIu32" from %s",
-			processor, thread_siblings_filename);
+		cpuinfo_log_info(
+			"failed to parse the list of thread siblings for processor %" PRIu32 " from %s",
+			processor,
+			thread_siblings_filename);
 		return false;
 	}
 }
@@ -462,10 +521,10 @@ bool cpuinfo_linux_detect_cluster_cpus(
 	cpuinfo_siblings_callback callback,
 	void* context) {
 	char cluster_cpus_filename[CLUSTER_CPUS_FILENAME_SIZE];
-	const int chars_formatted = snprintf(
-		cluster_cpus_filename, CLUSTER_CPUS_FILENAME_SIZE, CLUSTER_CPUS_FILENAME_FORMAT, processor);
-	if ((unsigned int) chars_formatted >= CLUSTER_CPUS_FILENAME_SIZE) {
-		cpuinfo_log_warning("failed to format filename for cluster cpus of processor %"PRIu32, processor);
+	const int chars_formatted =
+		snprintf(cluster_cpus_filename, CLUSTER_CPUS_FILENAME_SIZE, CLUSTER_CPUS_FILENAME_FORMAT, processor);
+	if ((unsigned int)chars_formatted >= CLUSTER_CPUS_FILENAME_SIZE) {
+		cpuinfo_log_warning("failed to format filename for cluster cpus of processor %" PRIu32, processor);
 		return false;
 	}
 
@@ -476,12 +535,14 @@ bool cpuinfo_linux_detect_cluster_cpus(
 		.callback = callback,
 		.callback_context = context,
 	};
-	if (cpuinfo_linux_parse_cpulist(cluster_cpus_filename,
-		(cpuinfo_cpulist_callback) siblings_parser, &siblings_context)) {
+	if (cpuinfo_linux_parse_cpulist(
+		    cluster_cpus_filename, (cpuinfo_cpulist_callback)siblings_parser, &siblings_context)) {
 		return true;
 	} else {
-		cpuinfo_log_info("failed to parse the list of cluster cpus for processor %"PRIu32" from %s",
-			processor, cluster_cpus_filename);
+		cpuinfo_log_info(
+			"failed to parse the list of cluster cpus for processor %" PRIu32 " from %s",
+			processor,
+			cluster_cpus_filename);
 		return false;
 	}
 }
@@ -492,10 +553,10 @@ bool cpuinfo_linux_detect_package_cpus(
 	cpuinfo_siblings_callback callback,
 	void* context) {
 	char package_cpus_filename[PACKAGE_CPUS_FILENAME_SIZE];
-	const int chars_formatted = snprintf(
-		package_cpus_filename, PACKAGE_CPUS_FILENAME_SIZE, PACKAGE_CPUS_FILENAME_FORMAT, processor);
-	if ((unsigned int) chars_formatted >= PACKAGE_CPUS_FILENAME_SIZE) {
-		cpuinfo_log_warning("failed to format filename for package cpus of processor %"PRIu32, processor);
+	const int chars_formatted =
+		snprintf(package_cpus_filename, PACKAGE_CPUS_FILENAME_SIZE, PACKAGE_CPUS_FILENAME_FORMAT, processor);
+	if ((unsigned int)chars_formatted >= PACKAGE_CPUS_FILENAME_SIZE) {
+		cpuinfo_log_warning("failed to format filename for package cpus of processor %" PRIu32, processor);
 		return false;
 	}
 
@@ -506,12 +567,14 @@ bool cpuinfo_linux_detect_package_cpus(
 		.callback = callback,
 		.callback_context = context,
 	};
-	if (cpuinfo_linux_parse_cpulist(package_cpus_filename,
-		(cpuinfo_cpulist_callback) siblings_parser, &siblings_context)) {
+	if (cpuinfo_linux_parse_cpulist(
+		    package_cpus_filename, (cpuinfo_cpulist_callback)siblings_parser, &siblings_context)) {
 		return true;
 	} else {
-		cpuinfo_log_info("failed to parse the list of package cpus for processor %"PRIu32" from %s",
-			processor, package_cpus_filename);
+		cpuinfo_log_info(
+			"failed to parse the list of package cpus for processor %" PRIu32 " from %s",
+			processor,
+			package_cpus_filename);
 		return false;
 	}
 }

3rdparty/cpuinfo/src/linux/smallfile.c

@@ -1,30 +1,33 @@
+#include <alloca.h>
+#include <errno.h>
 #include <stdbool.h>
 #include <stdint.h>
 #include <stdlib.h>
 #include <string.h>
-#include <alloca.h>
-#include <errno.h>
 
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <unistd.h>
 #include <fcntl.h>
+#include <sys/stat.h>
+#include <sys/types.h>
+#include <unistd.h>
 
 #if CPUINFO_MOCK
-	#include <cpuinfo-mock.h>
+#include <cpuinfo-mock.h>
 #endif
-#include <linux/api.h>
 #include <cpuinfo/log.h>
+#include <linux/api.h>
 
-
-bool cpuinfo_linux_parse_small_file(const char* filename, size_t buffer_size, cpuinfo_smallfile_callback callback, void* context) {
+bool cpuinfo_linux_parse_small_file(
+	const char* filename,
+	size_t buffer_size,
+	cpuinfo_smallfile_callback callback,
+	void* context) {
 	int file = -1;
 	bool status = false;
-	char* buffer = (char*) alloca(buffer_size);
+	char* buffer = (char*)alloca(buffer_size);
 
-	#if CPUINFO_LOG_DEBUG_PARSERS
-		cpuinfo_log_debug("parsing small file %s", filename);
-	#endif
+#if CPUINFO_LOG_DEBUG_PARSERS
+	cpuinfo_log_debug("parsing small file %s", filename);
+#endif
 
 #if CPUINFO_MOCK
 	file = cpuinfo_mock_open(filename, O_RDONLY);
@@ -45,17 +48,22 @@ bool cpuinfo_linux_parse_small_file(const char* filename, size_t buffer_size, cp
 		bytes_read = read(file, &buffer[buffer_position], buffer_size - buffer_position);
 #endif
 		if (bytes_read < 0) {
-			cpuinfo_log_info("failed to read file %s at position %zu: %s", filename, buffer_position, strerror(errno));
+			cpuinfo_log_info(
+				"failed to read file %s at position %zu: %s",
+				filename,
+				buffer_position,
+				strerror(errno));
 			goto cleanup;
 		}
-		buffer_position += (size_t) bytes_read;
+		buffer_position += (size_t)bytes_read;
 		if (buffer_position >= buffer_size) {
-			cpuinfo_log_error("failed to read file %s: insufficient buffer of size %zu", filename, buffer_size);
+			cpuinfo_log_error(
+				"failed to read file %s: insufficient buffer of size %zu", filename, buffer_size);
 			goto cleanup;
 		}
 	} while (bytes_read != 0);
 
-	status = callback(buffer, &buffer[buffer_position], context);
+	status = callback(filename, buffer, &buffer[buffer_position], context);
 
 cleanup:
 	if (file != -1) {

3rdparty/cpuinfo/src/log.c

@@ -1,192 +1,203 @@
 #include <assert.h>
 #include <stdarg.h>
-#include <string.h>
-#include <stdlib.h>
 #include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
 #ifdef _WIN32
-  #include <windows.h>
+#include <windows.h>
 #else
-  #include <unistd.h>
+#include <unistd.h>
 #endif
 #if defined(__ANDROID__)
-  #include <android/log.h>
+#include <android/log.h>
 #endif
 #if defined(__hexagon__)
-  #include <qurt_printf.h>
+#include <qurt_printf.h>
 #endif
 
 #ifndef CPUINFO_LOG_TO_STDIO
-  #if defined(__ANDROID__)
-    #define CPUINFO_LOG_TO_STDIO 0
-  #else
-    #define CPUINFO_LOG_TO_STDIO 1
-  #endif
+#if defined(__ANDROID__)
+#define CPUINFO_LOG_TO_STDIO 0
+#else
+#define CPUINFO_LOG_TO_STDIO 1
+#endif
 #endif
 
 #include <cpuinfo/log.h>
 
-
-/* Messages up to this size are formatted entirely on-stack, and don't allocate heap memory */
+/* Messages up to this size are formatted entirely on-stack, and don't allocate
+ * heap memory */
 #define CPUINFO_LOG_STACK_BUFFER_SIZE 1024
 
 #ifdef _WIN32
-  #define CPUINFO_LOG_NEWLINE_LENGTH 2
+#define CPUINFO_LOG_NEWLINE_LENGTH 2
 
-  #define CPUINFO_LOG_STDERR STD_ERROR_HANDLE
-  #define CPUINFO_LOG_STDOUT STD_OUTPUT_HANDLE
+#define CPUINFO_LOG_STDERR STD_ERROR_HANDLE
+#define CPUINFO_LOG_STDOUT STD_OUTPUT_HANDLE
 #elif defined(__hexagon__)
-  #define CPUINFO_LOG_NEWLINE_LENGTH 1
+#define CPUINFO_LOG_NEWLINE_LENGTH 1
 
-  #define CPUINFO_LOG_STDERR 0
-  #define CPUINFO_LOG_STDOUT 0
+#define CPUINFO_LOG_STDERR 0
+#define CPUINFO_LOG_STDOUT 0
 #else
-  #define CPUINFO_LOG_NEWLINE_LENGTH 1
+#define CPUINFO_LOG_NEWLINE_LENGTH 1
 
-  #define CPUINFO_LOG_STDERR STDERR_FILENO
-  #define CPUINFO_LOG_STDOUT STDOUT_FILENO
+#define CPUINFO_LOG_STDERR STDERR_FILENO
+#define CPUINFO_LOG_STDOUT STDOUT_FILENO
 #endif
 
 #if CPUINFO_LOG_TO_STDIO
-static void cpuinfo_vlog(int output_handle, const char* prefix, size_t prefix_length, const char* format, va_list args) {
-  char stack_buffer[CPUINFO_LOG_STACK_BUFFER_SIZE];
-  char* heap_buffer = NULL;
-  char* out_buffer = &stack_buffer[0];
+static void cpuinfo_vlog(
+	int output_handle,
+	const char* prefix,
+	size_t prefix_length,
+	const char* format,
+	va_list args) {
+	char stack_buffer[CPUINFO_LOG_STACK_BUFFER_SIZE];
+	char* heap_buffer = NULL;
+	char* out_buffer = &stack_buffer[0];
 
-  /* The first call to vsnprintf will clobber args, thus need a copy in case a second vsnprintf call is needed */
-  va_list args_copy;
-  va_copy(args_copy, args);
+	/* The first call to vsnprintf will clobber args, thus need a copy in
+	 * case a second vsnprintf call is needed */
+	va_list args_copy;
+	va_copy(args_copy, args);
 
-  memcpy(stack_buffer, prefix, prefix_length * sizeof(char));
-  assert((prefix_length + CPUINFO_LOG_NEWLINE_LENGTH) * sizeof(char) <= CPUINFO_LOG_STACK_BUFFER_SIZE);
+	memcpy(stack_buffer, prefix, prefix_length * sizeof(char));
+	assert((prefix_length + CPUINFO_LOG_NEWLINE_LENGTH) * sizeof(char) <= CPUINFO_LOG_STACK_BUFFER_SIZE);
 
-  const int format_chars = vsnprintf(
-    &stack_buffer[prefix_length],
-    CPUINFO_LOG_STACK_BUFFER_SIZE - (prefix_length + CPUINFO_LOG_NEWLINE_LENGTH) * sizeof(char),
-    format,
-    args);
-  if (format_chars < 0) {
-    /* Format error in the message: silently ignore this particular message. */
-    goto cleanup;
-  }
-  const size_t format_length = (size_t) format_chars;
-  if ((prefix_length + format_length + CPUINFO_LOG_NEWLINE_LENGTH) * sizeof(char) > CPUINFO_LOG_STACK_BUFFER_SIZE) {
-    /* Allocate a buffer on heap, and vsnprintf to this buffer */
-    const size_t heap_buffer_size = (prefix_length + format_length + CPUINFO_LOG_NEWLINE_LENGTH) * sizeof(char);
-    #if _WIN32
-      heap_buffer = HeapAlloc(GetProcessHeap(), 0, heap_buffer_size);
-    #else
-      heap_buffer = malloc(heap_buffer_size);
-    #endif
-    if (heap_buffer == NULL) {
-      goto cleanup;
-    }
+	const int format_chars = vsnprintf(
+		&stack_buffer[prefix_length],
+		CPUINFO_LOG_STACK_BUFFER_SIZE - (prefix_length + CPUINFO_LOG_NEWLINE_LENGTH) * sizeof(char),
+		format,
+		args);
+	if (format_chars < 0) {
+		/* Format error in the message: silently ignore this particular
+		 * message. */
+		goto cleanup;
+	}
+	const size_t format_length = (size_t)format_chars;
+	if ((prefix_length + format_length + CPUINFO_LOG_NEWLINE_LENGTH) * sizeof(char) >
+	    CPUINFO_LOG_STACK_BUFFER_SIZE) {
+		/* Allocate a buffer on heap, and vsnprintf to this buffer */
+		const size_t heap_buffer_size =
+			(prefix_length + format_length + CPUINFO_LOG_NEWLINE_LENGTH) * sizeof(char);
+#if _WIN32
+		heap_buffer = HeapAlloc(GetProcessHeap(), 0, heap_buffer_size);
+#else
+		heap_buffer = malloc(heap_buffer_size);
+#endif
+		if (heap_buffer == NULL) {
+			goto cleanup;
+		}
 
-    /* Copy pre-formatted prefix into the on-heap buffer */
-    memcpy(heap_buffer, prefix, prefix_length * sizeof(char));
-    vsnprintf(&heap_buffer[prefix_length], (format_length + CPUINFO_LOG_NEWLINE_LENGTH) * sizeof(char), format, args_copy);
-    out_buffer = heap_buffer;
-  }
-  #ifdef _WIN32
-    out_buffer[prefix_length + format_length] = '\r';
-    out_buffer[prefix_length + format_length + 1] = '\n';
+		/* Copy pre-formatted prefix into the on-heap buffer */
+		memcpy(heap_buffer, prefix, prefix_length * sizeof(char));
+		vsnprintf(
+			&heap_buffer[prefix_length],
+			(format_length + CPUINFO_LOG_NEWLINE_LENGTH) * sizeof(char),
+			format,
+			args_copy);
+		out_buffer = heap_buffer;
+	}
+#ifdef _WIN32
+	out_buffer[prefix_length + format_length] = '\r';
+	out_buffer[prefix_length + format_length + 1] = '\n';
 
-    DWORD bytes_written;
-    WriteFile(
-      GetStdHandle((DWORD) output_handle),
-      out_buffer, (prefix_length + format_length + CPUINFO_LOG_NEWLINE_LENGTH) * sizeof(char),
-      &bytes_written, NULL);
-  #elif defined(__hexagon__)
-    qurt_printf("%s", out_buffer);
-  #else
-    out_buffer[prefix_length + format_length] = '\n';
+	DWORD bytes_written;
+	WriteFile(
+		GetStdHandle((DWORD)output_handle),
+		out_buffer,
+		(prefix_length + format_length + CPUINFO_LOG_NEWLINE_LENGTH) * sizeof(char),
+		&bytes_written,
+		NULL);
+#elif defined(__hexagon__)
+	qurt_printf("%s", out_buffer);
+#else
+	out_buffer[prefix_length + format_length] = '\n';
 
-    ssize_t bytes_written = write(output_handle, out_buffer, (prefix_length + format_length + CPUINFO_LOG_NEWLINE_LENGTH) * sizeof(char));
-    (void) bytes_written;
-  #endif
+	ssize_t bytes_written = write(
+		output_handle, out_buffer, (prefix_length + format_length + CPUINFO_LOG_NEWLINE_LENGTH) * sizeof(char));
+	(void)bytes_written;
+#endif
 
 cleanup:
-  #ifdef _WIN32
-    HeapFree(GetProcessHeap(), 0, heap_buffer);
-  #else
-    free(heap_buffer);
-  #endif
-  va_end(args_copy);
+#ifdef _WIN32
+	HeapFree(GetProcessHeap(), 0, heap_buffer);
+#else
+	free(heap_buffer);
+#endif
+	va_end(args_copy);
 }
 #elif defined(__ANDROID__) && CPUINFO_LOG_LEVEL > CPUINFO_LOG_NONE
-  static const char cpuinfo_module[] = "XNNPACK";
+static const char cpuinfo_module[] = "XNNPACK";
 #endif
 
 #if CPUINFO_LOG_LEVEL >= CPUINFO_LOG_DEBUG
-  void cpuinfo_vlog_debug(const char* format, va_list args) {
-    #if CPUINFO_LOG_TO_STDIO
-      static const char debug_prefix[17] = {
-        'D', 'e', 'b', 'u', 'g', ' ', '(', 'c', 'p', 'u', 'i', 'n', 'f', 'o', ')', ':', ' '
-      };
-      cpuinfo_vlog(CPUINFO_LOG_STDOUT, debug_prefix, 17, format, args);
-    #elif defined(__ANDROID__)
-      __android_log_vprint(ANDROID_LOG_DEBUG, cpuinfo_module, format, args);
-    #else
-      #error "Platform-specific implementation required"
-    #endif
-  }
+void cpuinfo_vlog_debug(const char* format, va_list args) {
+#if CPUINFO_LOG_TO_STDIO
+	static const char debug_prefix[17] = {
+		'D', 'e', 'b', 'u', 'g', ' ', '(', 'c', 'p', 'u', 'i', 'n', 'f', 'o', ')', ':', ' '};
+	cpuinfo_vlog(CPUINFO_LOG_STDOUT, debug_prefix, 17, format, args);
+#elif defined(__ANDROID__)
+	__android_log_vprint(ANDROID_LOG_DEBUG, cpuinfo_module, format, args);
+#else
+#error "Platform-specific implementation required"
+#endif
+}
 #endif
 
 #if CPUINFO_LOG_LEVEL >= CPUINFO_LOG_INFO
-  void cpuinfo_vlog_info(const char* format, va_list args) {
-    #if CPUINFO_LOG_TO_STDIO
-      static const char info_prefix[16] = {
-        'N', 'o', 't', 'e', ' ', '(', 'c', 'p', 'u', 'i', 'n', 'f', 'o', ')', ':', ' '
-      };
-      cpuinfo_vlog(CPUINFO_LOG_STDOUT, info_prefix, 16, format, args);
-    #elif defined(__ANDROID__)
-      __android_log_vprint(ANDROID_LOG_INFO, cpuinfo_module, format, args);
-    #else
-      #error "Platform-specific implementation required"
-    #endif
-  }
+void cpuinfo_vlog_info(const char* format, va_list args) {
+#if CPUINFO_LOG_TO_STDIO
+	static const char info_prefix[16] = {
+		'N', 'o', 't', 'e', ' ', '(', 'c', 'p', 'u', 'i', 'n', 'f', 'o', ')', ':', ' '};
+	cpuinfo_vlog(CPUINFO_LOG_STDOUT, info_prefix, 16, format, args);
+#elif defined(__ANDROID__)
+	__android_log_vprint(ANDROID_LOG_INFO, cpuinfo_module, format, args);
+#else
+#error "Platform-specific implementation required"
+#endif
+}
 #endif
 
 #if CPUINFO_LOG_LEVEL >= CPUINFO_LOG_WARNING
-  void cpuinfo_vlog_warning(const char* format, va_list args) {
-    #if CPUINFO_LOG_TO_STDIO
-      static const char warning_prefix[20] = {
-        'W', 'a', 'r', 'n', 'i', 'n', 'g', ' ', 'i', 'n', ' ', 'c', 'p', 'u', 'i', 'n', 'f', 'o', ':', ' '
-      };
-      cpuinfo_vlog(CPUINFO_LOG_STDERR, warning_prefix, 20, format, args);
-    #elif defined(__ANDROID__)
-      __android_log_vprint(ANDROID_LOG_WARN, cpuinfo_module, format, args);
-    #else
-      #error "Platform-specific implementation required"
-    #endif
-  }
+void cpuinfo_vlog_warning(const char* format, va_list args) {
+#if CPUINFO_LOG_TO_STDIO
+	static const char warning_prefix[20] = {'W', 'a', 'r', 'n', 'i', 'n', 'g', ' ', 'i', 'n',
+						' ', 'c', 'p', 'u', 'i', 'n', 'f', 'o', ':', ' '};
+	cpuinfo_vlog(CPUINFO_LOG_STDERR, warning_prefix, 20, format, args);
+#elif defined(__ANDROID__)
+	__android_log_vprint(ANDROID_LOG_WARN, cpuinfo_module, format, args);
+#else
+#error "Platform-specific implementation required"
+#endif
+}
 #endif
 
 #if CPUINFO_LOG_LEVEL >= CPUINFO_LOG_ERROR
-  void cpuinfo_vlog_error(const char* format, va_list args) {
-    #if CPUINFO_LOG_TO_STDIO
-      static const char error_prefix[18] = {
-        'E', 'r', 'r', 'o', 'r', ' ', 'i', 'n', ' ', 'c', 'p', 'u', 'i', 'n', 'f', 'o', ':', ' '
-      };
-      cpuinfo_vlog(CPUINFO_LOG_STDERR, error_prefix, 18, format, args);
-    #elif defined(__ANDROID__)
-      __android_log_vprint(ANDROID_LOG_ERROR, cpuinfo_module, format, args);
-    #else
-      #error "Platform-specific implementation required"
-    #endif
-  }
+void cpuinfo_vlog_error(const char* format, va_list args) {
+#if CPUINFO_LOG_TO_STDIO
+	static const char error_prefix[18] = {
+		'E', 'r', 'r', 'o', 'r', ' ', 'i', 'n', ' ', 'c', 'p', 'u', 'i', 'n', 'f', 'o', ':', ' '};
+	cpuinfo_vlog(CPUINFO_LOG_STDERR, error_prefix, 18, format, args);
+#elif defined(__ANDROID__)
+	__android_log_vprint(ANDROID_LOG_ERROR, cpuinfo_module, format, args);
+#else
+#error "Platform-specific implementation required"
+#endif
+}
 #endif
 
 #if CPUINFO_LOG_LEVEL >= CPUINFO_LOG_FATAL
-  void cpuinfo_vlog_fatal(const char* format, va_list args) {
-    #if CPUINFO_LOG_TO_STDIO
-      static const char fatal_prefix[24] = {
-        'F', 'a', 't', 'a', 'l', ' ', 'e', 'r', 'r', 'o', 'r', ' ', 'i', 'n', ' ', 'c', 'p', 'u', 'i', 'n', 'f', 'o', ':', ' '
-      };
-      cpuinfo_vlog(CPUINFO_LOG_STDERR, fatal_prefix, 24, format, args);
-    #elif defined(__ANDROID__)
-      __android_log_vprint(ANDROID_LOG_FATAL, cpuinfo_module, format, args);
-    #else
-      #error "Platform-specific implementation required"
-    #endif
-  }
+void cpuinfo_vlog_fatal(const char* format, va_list args) {
+#if CPUINFO_LOG_TO_STDIO
+	static const char fatal_prefix[24] = {'F', 'a', 't', 'a', 'l', ' ', 'e', 'r', 'r', 'o', 'r', ' ',
+					      'i', 'n', ' ', 'c', 'p', 'u', 'i', 'n', 'f', 'o', ':', ' '};
+	cpuinfo_vlog(CPUINFO_LOG_STDERR, fatal_prefix, 24, format, args);
+#elif defined(__ANDROID__)
+	__android_log_vprint(ANDROID_LOG_FATAL, cpuinfo_module, format, args);
+#else
+#error "Platform-specific implementation required"
+#endif
+}
 #endif

3rdparty/cpuinfo/src/mach/api.h

@@ -4,7 +4,6 @@
 
 #define CPUINFO_MACH_MAX_CACHE_LEVELS 8
 
-
 struct cpuinfo_mach_topology {
 	uint32_t packages;
 	uint32_t cores;
@@ -12,5 +11,4 @@ struct cpuinfo_mach_topology {
 	uint32_t threads_per_cache[CPUINFO_MACH_MAX_CACHE_LEVELS];
 };
 
-
 struct cpuinfo_mach_topology cpuinfo_mach_detect_topology(void);

3rdparty/cpuinfo/src/mach/topology.c

@@ -1,16 +1,15 @@
-#include <string.h>
 #include <alloca.h>
 #include <errno.h>
+#include <string.h>
 
-#include <sys/types.h>
 #include <sys/sysctl.h>
+#include <sys/types.h>
 
 #include <cpuinfo/log.h>
 #include <mach/api.h>
 
 #include <TargetConditionals.h>
 
-
 struct cpuinfo_mach_topology cpuinfo_mach_detect_topology(void) {
 	int cores = 1;
 	size_t sizeof_cores = sizeof(cores);
@@ -41,12 +40,9 @@ struct cpuinfo_mach_topology cpuinfo_mach_detect_topology(void) {
 	}
 #endif
 
-	cpuinfo_log_debug("mach topology: packages = %d, cores = %d, threads = %d", packages, (int) cores, (int) threads);
+	cpuinfo_log_debug("mach topology: packages = %d, cores = %d, threads = %d", packages, (int)cores, (int)threads);
 	struct cpuinfo_mach_topology topology = {
-		.packages = (uint32_t) packages,
-		.cores = (uint32_t) cores,
-		.threads = (uint32_t) threads
-	};
+		.packages = (uint32_t)packages, .cores = (uint32_t)cores, .threads = (uint32_t)threads};
 
 #if !TARGET_OS_IPHONE
 	size_t cacheconfig_size = 0;
@@ -63,7 +59,7 @@ struct cpuinfo_mach_topology cpuinfo_mach_detect_topology(void) {
 				cache_configs = CPUINFO_MACH_MAX_CACHE_LEVELS;
 			}
 			for (size_t i = 0; i < cache_configs; i++) {
-				cpuinfo_log_debug("mach hw.cacheconfig[%zu]: %"PRIu64, i, cacheconfig[i]);
+				cpuinfo_log_debug("mach hw.cacheconfig[%zu]: %" PRIu64, i, cacheconfig[i]);
 				topology.threads_per_cache[i] = cacheconfig[i];
 			}
 		}

3rdparty/cpuinfo/src/riscv/api.h

@@ -8,7 +8,7 @@
 /* RISC-V Vendor IDs. */
 enum cpuinfo_riscv_chipset_vendor {
 	cpuinfo_riscv_chipset_vendor_unknown = 0,
-	cpuinfo_riscv_chipset_sifive = 0x489,
+	cpuinfo_riscv_chipset_vendor_sifive = 0x489,
 	cpuinfo_riscv_chipset_vendor_max,
 };
 
@@ -35,8 +35,8 @@ enum cpuinfo_riscv_chipset_impl {
  * @param[uarch] - Reference to the cpuinfo_uarch to populate.
  */
 CPUINFO_INTERNAL void cpuinfo_riscv_decode_vendor_uarch(
-		uint32_t vendor_id,
-		uint32_t arch_id,
-		uint32_t imp_id,
-		enum cpuinfo_vendor vendor[restrict static 1],
-		enum cpuinfo_uarch uarch[restrict static 1]);
+	uint32_t vendor_id,
+	uint32_t arch_id,
+	uint32_t imp_id,
+	enum cpuinfo_vendor vendor[restrict static 1],
+	enum cpuinfo_uarch uarch[restrict static 1]);

3rdparty/cpuinfo/src/riscv/linux/api.h

@@ -22,23 +22,26 @@ struct cpuinfo_riscv_linux_processor {
 	uint32_t flags;
 
 	/**
-	 * Minimum processor ID on the cluster which includes this logical processor.
-	 * This value can serve as an ID for the cluster of logical processors: it is the
-	 * same for all logical processors on the same package.
+	 * Minimum processor ID on the cluster which includes this logical
+	 * processor. This value can serve as an ID for the cluster of logical
+	 * processors: it is the same for all logical processors on the same
+	 * package.
 	 */
 	uint32_t cluster_leader_id;
 
 	/**
-	 * Minimum processor ID on the core which includes this logical processor.
-	 * This value can serve as an ID for the core of logical processors: it
-	 * is the same for all logical processors on the same core.
+	 * Minimum processor ID on the core which includes this logical
+	 * processor. This value can serve as an ID for the core of logical
+	 * processors: it is the same for all logical processors on the same
+	 * core.
 	 */
 	uint32_t core_leader_id;
 
 	/**
-	 * Minimum processor ID on the package which includes this logical processor.
-	 * This value can serve as an ID for the package of logical processors: it
-	 * is the same for all logical processors on the same package.
+	 * Minimum processor ID on the package which includes this logical
+	 * processor. This value can serve as an ID for the package of logical
+	 * processors: it is the same for all logical processors on the same
+	 * package.
 	 */
 	uint32_t package_leader_id;
 };
@@ -49,8 +52,7 @@ struct cpuinfo_riscv_linux_processor {
  *
  * @param[isa] - Reference to cpuinfo_riscv_isa structure to populate.
  */
-CPUINFO_INTERNAL void cpuinfo_riscv_linux_decode_isa_from_hwcap(
-	struct cpuinfo_riscv_isa isa[restrict static 1]);
+CPUINFO_INTERNAL void cpuinfo_riscv_linux_decode_isa_from_hwcap(struct cpuinfo_riscv_isa isa[restrict static 1]);
 
 /**
  * Reads `sys_riscv_hwprobe` and determines the processor vendor and

3rdparty/cpuinfo/src/riscv/linux/init.c

@@ -10,7 +10,7 @@ struct cpuinfo_riscv_isa cpuinfo_isa;
 
 /* Helper function to bitmask flags and ensure operator precedence. */
 static inline bool bitmask_all(uint32_t flags, uint32_t mask) {
-  return (flags & mask) == mask;
+	return (flags & mask) == mask;
 }
 
 static int compare_riscv_linux_processors(const void* a, const void* b) {
@@ -18,8 +18,8 @@ static int compare_riscv_linux_processors(const void* a, const void* b) {
 	 * For our purposes, it is only relevant that the list is sorted by
 	 * micro-architecture, so the nature of ordering is irrelevant.
 	 */
-	return ((const struct cpuinfo_riscv_linux_processor*)a)->core.uarch
-			- ((const struct cpuinfo_riscv_linux_processor*)b)->core.uarch;
+	return ((const struct cpuinfo_riscv_linux_processor*)a)->core.uarch -
+		((const struct cpuinfo_riscv_linux_processor*)b)->core.uarch;
 }
 
 /**
@@ -37,10 +37,11 @@ static int compare_riscv_linux_processors(const void* a, const void* b) {
 
  * E.g. processors[0].core_leader_id = 0.
  */
-static bool core_cpus_parser(uint32_t processor,
-			     uint32_t core_cpus_start,
-			     uint32_t core_cpus_end,
-			     struct cpuinfo_riscv_linux_processor* processors) {
+static bool core_cpus_parser(
+	uint32_t processor,
+	uint32_t core_cpus_start,
+	uint32_t core_cpus_end,
+	struct cpuinfo_riscv_linux_processor* processors) {
 	uint32_t processor_start = UINT32_MAX;
 	uint32_t processor_count = 0;
 
@@ -70,8 +71,8 @@ static bool core_cpus_parser(uint32_t processor,
 	 *
 	 * e.g. core_cpu_list=1,10-12
 	 */
-	if (!bitmask_all(processors[processor].flags, CPUINFO_LINUX_FLAG_CORE_CLUSTER)
-	    || processors[processor].core.processor_start > processor_start) {
+	if (!bitmask_all(processors[processor].flags, CPUINFO_LINUX_FLAG_CORE_CLUSTER) ||
+	    processors[processor].core.processor_start > processor_start) {
 		processors[processor].core.processor_start = processor_start;
 		processors[processor].core_leader_id = processor_start;
 	}
@@ -92,10 +93,11 @@ static bool core_cpus_parser(uint32_t processor,
  * their 'cluster_leader_id' to their index in the list.
  * E.g. processors[0].cluster_leader_id = 0.
  */
-static bool cluster_cpus_parser(uint32_t processor,
-				uint32_t cluster_cpus_start,
-				uint32_t cluster_cpus_end,
-				struct cpuinfo_riscv_linux_processor* processors) {
+static bool cluster_cpus_parser(
+	uint32_t processor,
+	uint32_t cluster_cpus_start,
+	uint32_t cluster_cpus_end,
+	struct cpuinfo_riscv_linux_processor* processors) {
 	uint32_t processor_start = UINT32_MAX;
 	uint32_t processor_count = 0;
 	uint32_t core_count = 0;
@@ -133,8 +135,8 @@ static bool cluster_cpus_parser(uint32_t processor,
 	 *
 	 * e.g. cluster_cpus_list=1,10-12
 	 */
-	if (!bitmask_all(processors[processor].flags, CPUINFO_LINUX_FLAG_CLUSTER_CLUSTER)
-	    || processors[processor].cluster.processor_start > processor_start) {
+	if (!bitmask_all(processors[processor].flags, CPUINFO_LINUX_FLAG_CLUSTER_CLUSTER) ||
+	    processors[processor].cluster.processor_start > processor_start) {
 		processors[processor].cluster.processor_start = processor_start;
 		processors[processor].cluster.core_start = processor_start;
 		processors[processor].cluster.cluster_id = processor_start;
@@ -160,10 +162,11 @@ static bool cluster_cpus_parser(uint32_t processor,
  * their 'package_leader_id' to their index in the list.
  * E.g. processors[0].package_leader_id = 0.
  */
-static bool package_cpus_parser(uint32_t processor,
-			     uint32_t package_cpus_start,
-			     uint32_t package_cpus_end,
-			     struct cpuinfo_riscv_linux_processor* processors) {
+static bool package_cpus_parser(
+	uint32_t processor,
+	uint32_t package_cpus_start,
+	uint32_t package_cpus_end,
+	struct cpuinfo_riscv_linux_processor* processors) {
 	uint32_t processor_start = UINT32_MAX;
 	uint32_t processor_count = 0;
 	uint32_t cluster_count = 0;
@@ -205,8 +208,8 @@ static bool package_cpus_parser(uint32_t processor,
 	 *
 	 * e.g. package_cpus_list=1,10-12
 	 */
-	if (!bitmask_all(processors[processor].flags, CPUINFO_LINUX_FLAG_PACKAGE_CLUSTER)
-	    || processors[processor].package.processor_start > processor_start) {
+	if (!bitmask_all(processors[processor].flags, CPUINFO_LINUX_FLAG_PACKAGE_CLUSTER) ||
+	    processors[processor].package.processor_start > processor_start) {
 		processors[processor].package.processor_start = processor_start;
 		processors[processor].package.cluster_start = processor_start;
 		processors[processor].package.core_start = processor_start;
@@ -233,8 +236,9 @@ void cpuinfo_riscv_linux_init(void) {
 
 	/**
 	 * The interesting set of processors are the number of 'present'
-	 * processors on the system. There may be more 'possible' processors, but
-	 * processor information cannot be gathered on non-present processors.
+	 * processors on the system. There may be more 'possible' processors,
+	 * but processor information cannot be gathered on non-present
+	 * processors.
 	 *
 	 * Note: For SoCs, it is largely the case that all processors are known
 	 * at boot and no processors are hotplugged at runtime, so the
@@ -244,9 +248,8 @@ void cpuinfo_riscv_linux_init(void) {
 	 * processors. It is not a count of the number of processors on the
 	 * system.
 	 */
-	const uint32_t max_processor_id = 1 +
-		cpuinfo_linux_get_max_present_processor(
-				cpuinfo_linux_get_max_processors_count());
+	const uint32_t max_processor_id =
+		1 + cpuinfo_linux_get_max_present_processor(cpuinfo_linux_get_max_processors_count());
 	if (max_processor_id == 0) {
 		cpuinfo_log_error("failed to discover any processors");
 		return;
@@ -257,35 +260,36 @@ void cpuinfo_riscv_linux_init(void) {
 	 * sized to the max processor ID as opposed to the number of 'present'
 	 * processors, to leverage pointer math in the common utility functions.
 	 */
-	riscv_linux_processors = calloc(max_processor_id,
-					sizeof(struct cpuinfo_riscv_linux_processor));
+	riscv_linux_processors = calloc(max_processor_id, sizeof(struct cpuinfo_riscv_linux_processor));
 	if (riscv_linux_processors == NULL) {
-		cpuinfo_log_error("failed to allocate %zu bytes for %"PRIu32" processors.",
+		cpuinfo_log_error(
+			"failed to allocate %zu bytes for %" PRIu32 " processors.",
 			max_processor_id * sizeof(struct cpuinfo_riscv_linux_processor),
 			max_processor_id);
 		goto cleanup;
-        }
+	}
 
 	/**
 	 * Attempt to detect all processors and apply the corresponding flag to
 	 * each processor struct that we find.
 	 */
-	if (!cpuinfo_linux_detect_present_processors(max_processor_id,
-						     &riscv_linux_processors->flags,
-						     sizeof(struct cpuinfo_riscv_linux_processor),
-						     CPUINFO_LINUX_FLAG_PRESENT | CPUINFO_LINUX_FLAG_VALID)) {
+	if (!cpuinfo_linux_detect_present_processors(
+		    max_processor_id,
+		    &riscv_linux_processors->flags,
+		    sizeof(struct cpuinfo_riscv_linux_processor),
+		    CPUINFO_LINUX_FLAG_PRESENT | CPUINFO_LINUX_FLAG_VALID)) {
 		cpuinfo_log_error("failed to detect present processors");
 		goto cleanup;
 	}
 
-        /* Populate processor information. */
-        for (size_t processor = 0; processor < max_processor_id; processor++) {
+	/* Populate processor information. */
+	for (size_t processor = 0; processor < max_processor_id; processor++) {
 		if (!bitmask_all(riscv_linux_processors[processor].flags, CPUINFO_LINUX_FLAG_VALID)) {
 			continue;
-                }
-                /* TODO: Determine if an 'smt_id' is available. */
-                riscv_linux_processors[processor].processor.linux_id = processor;
-        }
+		}
+		/* TODO: Determine if an 'smt_id' is available. */
+		riscv_linux_processors[processor].processor.linux_id = processor;
+	}
 
 	/* Populate core information. */
 	for (size_t processor = 0; processor < max_processor_id; processor++) {
@@ -295,18 +299,16 @@ void cpuinfo_riscv_linux_init(void) {
 
 		/* Populate processor start and count information. */
 		if (!cpuinfo_linux_detect_core_cpus(
-				max_processor_id,
-				processor,
-				(cpuinfo_siblings_callback) core_cpus_parser,
-				riscv_linux_processors)) {
+			    max_processor_id,
+			    processor,
+			    (cpuinfo_siblings_callback)core_cpus_parser,
+			    riscv_linux_processors)) {
 			cpuinfo_log_error("failed to detect core cpus for processor %zu.", processor);
 			goto cleanup;
 		}
 
 		/* Populate core ID information. */
-		if (cpuinfo_linux_get_processor_core_id(
-				processor,
-				&riscv_linux_processors[processor].core.core_id)) {
+		if (cpuinfo_linux_get_processor_core_id(processor, &riscv_linux_processors[processor].core.core_id)) {
 			riscv_linux_processors[processor].flags |= CPUINFO_LINUX_FLAG_CORE_ID;
 		}
 
@@ -316,9 +318,9 @@ void cpuinfo_riscv_linux_init(void) {
 		 * the values from the core leader will be honored.
 		 */
 		cpuinfo_riscv_linux_decode_vendor_uarch_from_hwprobe(
-				processor,
-				&riscv_linux_processors[processor].core.vendor,
-				&riscv_linux_processors[processor].core.uarch);
+			processor,
+			&riscv_linux_processors[processor].core.vendor,
+			&riscv_linux_processors[processor].core.uarch);
 
 		/* Populate frequency information of this core. */
 		uint32_t frequency = cpuinfo_linux_get_processor_cur_frequency(processor);
@@ -334,25 +336,23 @@ void cpuinfo_riscv_linux_init(void) {
 			continue;
 		}
 		if (!cpuinfo_linux_detect_cluster_cpus(
-				max_processor_id,
-				processor,
-				(cpuinfo_siblings_callback) cluster_cpus_parser,
-				riscv_linux_processors)) {
+			    max_processor_id,
+			    processor,
+			    (cpuinfo_siblings_callback)cluster_cpus_parser,
+			    riscv_linux_processors)) {
 			cpuinfo_log_warning("failed to detect cluster cpus for processor %zu.", processor);
 			goto cleanup;
 		}
 
 		/**
 		 * Populate the vendor, uarch and frequency of this cluster from
-		 * this logical processor. When the 'clusters' list is constructed,
-		 * only the values from the cluster leader will be honored.
+		 * this logical processor. When the 'clusters' list is
+		 * constructed, only the values from the cluster leader will be
+		 * honored.
 		 */
-		riscv_linux_processors[processor].cluster.vendor =
-				riscv_linux_processors[processor].core.vendor;
-		riscv_linux_processors[processor].cluster.uarch =
-				riscv_linux_processors[processor].core.uarch;
-		riscv_linux_processors[processor].cluster.frequency =
-				riscv_linux_processors[processor].core.frequency;
+		riscv_linux_processors[processor].cluster.vendor = riscv_linux_processors[processor].core.vendor;
+		riscv_linux_processors[processor].cluster.uarch = riscv_linux_processors[processor].core.uarch;
+		riscv_linux_processors[processor].cluster.frequency = riscv_linux_processors[processor].core.frequency;
 	}
 
 	/* Populate package information. */
@@ -361,10 +361,10 @@ void cpuinfo_riscv_linux_init(void) {
 			continue;
 		}
 		if (!cpuinfo_linux_detect_package_cpus(
-				max_processor_id,
-				processor,
-				(cpuinfo_siblings_callback) package_cpus_parser,
-				riscv_linux_processors)) {
+			    max_processor_id,
+			    processor,
+			    (cpuinfo_siblings_callback)package_cpus_parser,
+			    riscv_linux_processors)) {
 			cpuinfo_log_warning("failed to detect package cpus for processor %zu.", processor);
 			goto cleanup;
 		}
@@ -424,45 +424,44 @@ void cpuinfo_riscv_linux_init(void) {
 		 * As we've sorted by micro-architecture, when the uarch differs
 		 * between two entries, a unique uarch has been observed.
 		 */
-		if (last_uarch != riscv_linux_processors[processor].core.uarch
-			|| valid_uarchs_count == 0) {
+		if (last_uarch != riscv_linux_processors[processor].core.uarch || valid_uarchs_count == 0) {
 			valid_uarchs_count++;
 			last_uarch = riscv_linux_processors[processor].core.uarch;
 		}
 	}
 
 	/* Allocate and populate final public ABI structures. */
-	processors = calloc(valid_processors_count,
-			    sizeof(struct cpuinfo_processor));
+	processors = calloc(valid_processors_count, sizeof(struct cpuinfo_processor));
 	if (processors == NULL) {
-		cpuinfo_log_error("failed to allocate %zu bytes for %zu processors.",
+		cpuinfo_log_error(
+			"failed to allocate %zu bytes for %zu processors.",
 			valid_processors_count * sizeof(struct cpuinfo_processor),
 			valid_processors_count);
 		goto cleanup;
 	}
 
-	cores = calloc(valid_cores_count,
-			    sizeof(struct cpuinfo_core));
+	cores = calloc(valid_cores_count, sizeof(struct cpuinfo_core));
 	if (cores == NULL) {
-		cpuinfo_log_error("failed to allocate %zu bytes for %zu cores.",
+		cpuinfo_log_error(
+			"failed to allocate %zu bytes for %zu cores.",
 			valid_cores_count * sizeof(struct cpuinfo_core),
 			valid_cores_count);
 		goto cleanup;
 	}
 
-	clusters = calloc(valid_clusters_count,
-			    sizeof(struct cpuinfo_cluster));
+	clusters = calloc(valid_clusters_count, sizeof(struct cpuinfo_cluster));
 	if (clusters == NULL) {
-		cpuinfo_log_error("failed to allocate %zu bytes for %zu clusters.",
+		cpuinfo_log_error(
+			"failed to allocate %zu bytes for %zu clusters.",
 			valid_clusters_count * sizeof(struct cpuinfo_cluster),
 			valid_clusters_count);
 		goto cleanup;
 	}
 
-	packages = calloc(valid_packages_count,
-			    sizeof(struct cpuinfo_package));
+	packages = calloc(valid_packages_count, sizeof(struct cpuinfo_package));
 	if (packages == NULL) {
-		cpuinfo_log_error("failed to allocate %zu bytes for %zu packages.",
+		cpuinfo_log_error(
+			"failed to allocate %zu bytes for %zu packages.",
 			valid_packages_count * sizeof(struct cpuinfo_package),
 			valid_packages_count);
 		goto cleanup;
@@ -470,36 +469,37 @@ void cpuinfo_riscv_linux_init(void) {
 
 	uarchs = calloc(valid_uarchs_count, sizeof(struct cpuinfo_uarch_info));
 	if (uarchs == NULL) {
-		cpuinfo_log_error("failed to allocate %zu bytes for %zu packages.",
+		cpuinfo_log_error(
+			"failed to allocate %zu bytes for %zu packages.",
 			valid_uarchs_count * sizeof(struct cpuinfo_uarch_info),
 			valid_uarchs_count);
 		goto cleanup;
 	}
 
-	linux_cpu_to_processor_map = calloc(max_processor_id,
-					    sizeof(struct cpuinfo_processor*));
+	linux_cpu_to_processor_map = calloc(max_processor_id, sizeof(struct cpuinfo_processor*));
 	if (linux_cpu_to_processor_map == NULL) {
-		cpuinfo_log_error("failed to allocate %zu bytes for %"PRIu32" processor map.",
-				  max_processor_id * sizeof(struct cpuinfo_processor*),
-				  max_processor_id);
+		cpuinfo_log_error(
+			"failed to allocate %zu bytes for %" PRIu32 " processor map.",
+			max_processor_id * sizeof(struct cpuinfo_processor*),
+			max_processor_id);
 		goto cleanup;
 	}
 
-	linux_cpu_to_core_map = calloc(max_processor_id,
-				       sizeof(struct cpuinfo_core*));
+	linux_cpu_to_core_map = calloc(max_processor_id, sizeof(struct cpuinfo_core*));
 	if (linux_cpu_to_core_map == NULL) {
-		cpuinfo_log_error("failed to allocate %zu bytes for %"PRIu32" core map.",
-				  max_processor_id * sizeof(struct cpuinfo_core*),
-				  max_processor_id);
+		cpuinfo_log_error(
+			"failed to allocate %zu bytes for %" PRIu32 " core map.",
+			max_processor_id * sizeof(struct cpuinfo_core*),
+			max_processor_id);
 		goto cleanup;
 	}
 
-	linux_cpu_to_uarch_index_map = calloc(max_processor_id,
-					      sizeof(struct cpuinfo_uarch_info*));
+	linux_cpu_to_uarch_index_map = calloc(max_processor_id, sizeof(struct cpuinfo_uarch_info*));
 	if (linux_cpu_to_uarch_index_map == NULL) {
-		cpuinfo_log_error("failed to allocate %zu bytes for %"PRIu32" uarch map.",
-				  max_processor_id * sizeof(struct cpuinfo_uarch_info*),
-				  max_processor_id);
+		cpuinfo_log_error(
+			"failed to allocate %zu bytes for %" PRIu32 " uarch map.",
+			max_processor_id * sizeof(struct cpuinfo_uarch_info*),
+			max_processor_id);
 		goto cleanup;
 	}
 
@@ -524,17 +524,15 @@ void cpuinfo_riscv_linux_init(void) {
 		uint32_t linux_id = riscv_linux_processors[processor].processor.linux_id;
 
 		/* Create uarch entry if this uarch has not been seen before. */
-		if (last_uarch != riscv_linux_processors[processor].core.uarch
-		    || valid_uarchs_index == 0) {
-			uarchs[valid_uarchs_index++].uarch =
-					riscv_linux_processors[processor].core.uarch;
+		if (last_uarch != riscv_linux_processors[processor].core.uarch || valid_uarchs_index == 0) {
+			uarchs[valid_uarchs_index++].uarch = riscv_linux_processors[processor].core.uarch;
 			last_uarch = riscv_linux_processors[processor].core.uarch;
 		}
 
 		/* Copy cpuinfo_processor information. */
 		memcpy(&processors[valid_processors_index++],
 		       &riscv_linux_processors[processor].processor,
-			sizeof(struct cpuinfo_processor));
+		       sizeof(struct cpuinfo_processor));
 
 		/* Update uarch processor count. */
 		uarchs[valid_uarchs_index - 1].processor_count++;
@@ -598,7 +596,8 @@ void cpuinfo_riscv_linux_init(void) {
 
 	cpuinfo_is_initialized = true;
 
-	/* Mark all public structures NULL to prevent cleanup from erasing them. */
+	/* Mark all public structures NULL to prevent cleanup from erasing them.
+	 */
 	processors = NULL;
 	cores = NULL;
 	clusters = NULL;

3rdparty/cpuinfo/src/riscv/linux/riscv-hw.c

@@ -1,18 +1,88 @@
+/*
+ * Only enable the C standard library hwprobe interface on Android for now.
+ * Patches to add a compatible hwprobe API to glibc are available but not
+ * merged at the time of writing and so cannot easily be tested.  The
+ * #ifdef __ANDROID__ check will be removed in the future.
+ */
+#ifdef __ANDROID__
+#ifdef __has_include
+#if __has_include(<sys/hwprobe.h>)
+#define CPUINFO_RISCV_LINUX_HAVE_C_HWPROBE
 #include <sys/hwprobe.h>
+#endif
+#endif
+#endif
+
 #include <sched.h>
 
 #include <cpuinfo/log.h>
 #include <riscv/api.h>
 #include <riscv/linux/api.h>
 
+#ifndef CPUINFO_RISCV_LINUX_HAVE_C_HWPROBE
+
+#include <stdint.h>
+#include <sys/syscall.h>
+#include <unistd.h>
+
+struct riscv_hwprobe {
+	int64_t key;
+	uint64_t value;
+};
+
+/*
+ * The standard C library our binary was compiled with does not support
+ * hwprobe but the kernel on which we are running might do.  The
+ * constants below are copied from
+ * /usr/include/riscv64-linux-gnu/asm/hwprobe.h.  They allow us to
+ * invoke the hwprobe syscall directly.  We duplicate the constants
+ * rather than including the kernel hwprobe.h header, as this header
+ * will only be present if we're building Linux 6.4 or greater.
+ */
+
+#define RISCV_HWPROBE_KEY_MVENDORID 0
+#define RISCV_HWPROBE_KEY_MARCHID 1
+#define RISCV_HWPROBE_KEY_MIMPID 2
+#define RISCV_HWPROBE_KEY_BASE_BEHAVIOR 3
+#define RISCV_HWPROBE_BASE_BEHAVIOR_IMA (1 << 0)
+#define RISCV_HWPROBE_KEY_IMA_EXT_0 4
+#define RISCV_HWPROBE_IMA_FD (1 << 0)
+#define RISCV_HWPROBE_IMA_C (1 << 1)
+#define RISCV_HWPROBE_IMA_V (1 << 2)
+#define RISCV_HWPROBE_EXT_ZBA (1 << 3)
+#define RISCV_HWPROBE_EXT_ZBB (1 << 4)
+#define RISCV_HWPROBE_EXT_ZBS (1 << 5)
+#define RISCV_HWPROBE_EXT_ZICBOZ (1 << 6)
+#define RISCV_HWPROBE_KEY_CPUPERF_0 5
+#define RISCV_HWPROBE_MISALIGNED_UNKNOWN (0 << 0)
+#define RISCV_HWPROBE_MISALIGNED_EMULATED (1 << 0)
+#define RISCV_HWPROBE_MISALIGNED_SLOW (2 << 0)
+#define RISCV_HWPROBE_MISALIGNED_FAST (3 << 0)
+#define RISCV_HWPROBE_MISALIGNED_UNSUPPORTED (4 << 0)
+#define RISCV_HWPROBE_MISALIGNED_MASK (7 << 0)
+
+#ifndef NR_riscv_hwprobe
+#ifndef NR_arch_specific_syscall
+#define NR_arch_specific_syscall 244
+#endif
+#define NR_riscv_hwprobe (NR_arch_specific_syscall + 14)
+#endif
+#endif
+
 void cpuinfo_riscv_linux_decode_vendor_uarch_from_hwprobe(
-		uint32_t processor,
-		enum cpuinfo_vendor vendor[restrict static 1],
-		enum cpuinfo_uarch uarch[restrict static 1]) {
+	uint32_t processor,
+	enum cpuinfo_vendor vendor[restrict static 1],
+	enum cpuinfo_uarch uarch[restrict static 1]) {
 	struct riscv_hwprobe pairs[] = {
-		{ .key = RISCV_HWPROBE_KEY_MVENDORID, },
-		{ .key = RISCV_HWPROBE_KEY_MARCHID, },
-		{ .key = RISCV_HWPROBE_KEY_MIMPID, },
+		{
+			.key = RISCV_HWPROBE_KEY_MVENDORID,
+		},
+		{
+			.key = RISCV_HWPROBE_KEY_MARCHID,
+		},
+		{
+			.key = RISCV_HWPROBE_KEY_MIMPID,
+		},
 	};
 	const size_t pairs_count = sizeof(pairs) / sizeof(struct riscv_hwprobe);
 
@@ -21,17 +91,34 @@ void cpuinfo_riscv_linux_decode_vendor_uarch_from_hwprobe(
 	*uarch = cpuinfo_uarch_unknown;
 
 	/* Create a CPU set with this processor flagged. */
-	const size_t cpu_set_size = processor + 1;
-	cpu_set_t* cpu_set = CPU_ALLOC(cpu_set_size);
-	CPU_SET(processor, cpu_set);
+	const size_t cpu_count = processor + 1;
+	cpu_set_t* cpu_set = CPU_ALLOC(cpu_count);
+	if (cpu_set == NULL) {
+		cpuinfo_log_warning("failed to allocate space for cpu_set");
+		return;
+	}
+
+	const size_t cpu_set_size = CPU_ALLOC_SIZE(cpu_count);
+	CPU_ZERO_S(cpu_set_size, cpu_set);
+	CPU_SET_S(processor, cpu_set_size, cpu_set);
 
 	/* Request all available information from hwprobe. */
-	int ret = __riscv_hwprobe(pairs, pairs_count,
-                                  cpu_set_size, (unsigned long*)cpu_set,
-                                  0 /* flags */);
+#ifndef CPUINFO_RISCV_LINUX_HAVE_C_HWPROBE
+	/*
+	 * No standard library support for hwprobe.  We'll need to invoke the
+	 * syscall directly.  See
+	 *
+	 * https://docs.kernel.org/arch/riscv/hwprobe.html
+	 *
+	 * for more details.
+	 */
+	int ret = syscall(NR_riscv_hwprobe, pairs, pairs_count, cpu_set_size, (unsigned long*)cpu_set, 0 /* flags */);
+#else
+	int ret = __riscv_hwprobe(pairs, pairs_count, cpu_set_size, (unsigned long*)cpu_set, 0 /* flags */);
+#endif
 	if (ret < 0) {
 		cpuinfo_log_warning("failed to get hwprobe information, err: %d", ret);
-		return;
+		goto cleanup;
 	}
 
 	/**
@@ -57,6 +144,8 @@ void cpuinfo_riscv_linux_decode_vendor_uarch_from_hwprobe(
 				break;
 		}
 	}
-	cpuinfo_riscv_decode_vendor_uarch(vendor_id, arch_id, imp_id,
-					  vendor, uarch);
+	cpuinfo_riscv_decode_vendor_uarch(vendor_id, arch_id, imp_id, vendor, uarch);
+
+cleanup:
+	CPU_FREE(cpu_set);
 }

3rdparty/cpuinfo/src/riscv/linux/riscv-isa.c

@@ -8,16 +8,15 @@
  *
  * This must be kept in sync with the upstream kernel header.
  */
-#define COMPAT_HWCAP_ISA_I	(1 << ('I' - 'A'))
-#define COMPAT_HWCAP_ISA_M	(1 << ('M' - 'A'))
-#define COMPAT_HWCAP_ISA_A	(1 << ('A' - 'A'))
-#define COMPAT_HWCAP_ISA_F	(1 << ('F' - 'A'))
-#define COMPAT_HWCAP_ISA_D	(1 << ('D' - 'A'))
-#define COMPAT_HWCAP_ISA_C	(1 << ('C' - 'A'))
-#define COMPAT_HWCAP_ISA_V	(1 << ('V' - 'A'))
+#define COMPAT_HWCAP_ISA_I (1 << ('I' - 'A'))
+#define COMPAT_HWCAP_ISA_M (1 << ('M' - 'A'))
+#define COMPAT_HWCAP_ISA_A (1 << ('A' - 'A'))
+#define COMPAT_HWCAP_ISA_F (1 << ('F' - 'A'))
+#define COMPAT_HWCAP_ISA_D (1 << ('D' - 'A'))
+#define COMPAT_HWCAP_ISA_C (1 << ('C' - 'A'))
+#define COMPAT_HWCAP_ISA_V (1 << ('V' - 'A'))
 
-void cpuinfo_riscv_linux_decode_isa_from_hwcap(
-		struct cpuinfo_riscv_isa isa[restrict static 1]) {
+void cpuinfo_riscv_linux_decode_isa_from_hwcap(struct cpuinfo_riscv_isa isa[restrict static 1]) {
 	const unsigned long hwcap = getauxval(AT_HWCAP);
 
 	if (hwcap & COMPAT_HWCAP_ISA_I) {

3rdparty/cpuinfo/src/riscv/uarch.c

@@ -10,13 +10,13 @@ void cpuinfo_riscv_decode_vendor_uarch(
 	enum cpuinfo_vendor vendor[restrict static 1],
 	enum cpuinfo_uarch uarch[restrict static 1]) {
 	/* The vendor ID is sufficient to determine the cpuinfo_vendor. */
-	switch(vendor_id) {
-		case cpuinfo_riscv_chipset_sifive:
+	switch (vendor_id) {
+		case cpuinfo_riscv_chipset_vendor_sifive:
 			*vendor = cpuinfo_vendor_sifive;
 			break;
 		default:
 			*vendor = cpuinfo_vendor_unknown;
-			cpuinfo_log_warning("unknown vendor ID: %"PRIu32, vendor_id);
+			cpuinfo_log_warning("unknown vendor ID: %" PRIu32, vendor_id);
 			break;
 	}
 	/**

3rdparty/cpuinfo/src/x86/api.h

@@ -6,7 +6,6 @@
 #include <cpuinfo.h>
 #include <cpuinfo/common.h>
 
-
 struct cpuid_regs {
 	uint32_t eax;
 	uint32_t ebx;
@@ -90,9 +89,12 @@ CPUINFO_INTERNAL enum cpuinfo_uarch cpuinfo_x86_decode_uarch(
 	const struct cpuinfo_x86_model_info* model_info);
 
 CPUINFO_INTERNAL struct cpuinfo_x86_isa cpuinfo_x86_detect_isa(
-	const struct cpuid_regs basic_info, const struct cpuid_regs extended_info,
-	uint32_t max_base_index, uint32_t max_extended_index,
-	enum cpuinfo_vendor vendor, enum cpuinfo_uarch uarch);
+	const struct cpuid_regs basic_info,
+	const struct cpuid_regs extended_info,
+	uint32_t max_base_index,
+	uint32_t max_extended_index,
+	enum cpuinfo_vendor vendor,
+	enum cpuinfo_uarch uarch);
 
 CPUINFO_INTERNAL void cpuinfo_x86_detect_topology(
 	uint32_t max_base_index,
@@ -101,7 +103,8 @@ CPUINFO_INTERNAL void cpuinfo_x86_detect_topology(
 	struct cpuinfo_x86_topology* topology);
 
 CPUINFO_INTERNAL void cpuinfo_x86_detect_cache(
-	uint32_t max_base_index, uint32_t max_extended_index,
+	uint32_t max_base_index,
+	uint32_t max_extended_index,
 	bool amd_topology_extensions,
 	enum cpuinfo_vendor vendor,
 	const struct cpuinfo_x86_model_info* model_info,
@@ -122,7 +125,8 @@ CPUINFO_INTERNAL void cpuinfo_x86_detect_cache(
 	uint32_t* log2_package_cores_max);
 
 CPUINFO_INTERNAL void cpuinfo_x86_decode_cache_descriptor(
-	uint8_t descriptor, enum cpuinfo_vendor vendor,
+	uint8_t descriptor,
+	enum cpuinfo_vendor vendor,
 	const struct cpuinfo_x86_model_info* model_info,
 	struct cpuinfo_x86_caches* cache,
 	struct cpuinfo_tlb* itlb_4KB,
@@ -145,13 +149,9 @@ CPUINFO_INTERNAL bool cpuinfo_x86_decode_deterministic_cache_parameters(
 	struct cpuinfo_x86_caches* cache,
 	uint32_t* package_cores_max);
 
-CPUINFO_INTERNAL bool cpuinfo_x86_decode_cache_properties(
-	struct cpuid_regs regs,
-	struct cpuinfo_x86_caches* cache);
+CPUINFO_INTERNAL bool cpuinfo_x86_decode_cache_properties(struct cpuid_regs regs, struct cpuinfo_x86_caches* cache);
 
-CPUINFO_INTERNAL uint32_t cpuinfo_x86_normalize_brand_string(
-	const char raw_name[48],
-	char normalized_name[48]);
+CPUINFO_INTERNAL uint32_t cpuinfo_x86_normalize_brand_string(const char raw_name[48], char normalized_name[48]);
 
 CPUINFO_INTERNAL uint32_t cpuinfo_x86_format_package_name(
 	enum cpuinfo_vendor vendor,

3rdparty/cpuinfo/src/x86/cache/deterministic.c

@@ -1,10 +1,9 @@
 #include <stdint.h>
 
 #include <cpuinfo.h>
-#include <x86/cpuid.h>
-#include <cpuinfo/utils.h>
 #include <cpuinfo/log.h>
-
+#include <cpuinfo/utils.h>
+#include <x86/cpuid.h>
 
 enum cache_type {
 	cache_type_none = 0,
@@ -16,8 +15,7 @@ enum cache_type {
 bool cpuinfo_x86_decode_deterministic_cache_parameters(
 	struct cpuid_regs regs,
 	struct cpuinfo_x86_caches* cache,
-	uint32_t* package_cores_max)
-{
+	uint32_t* package_cores_max) {
 	const uint32_t type = regs.eax & UINT32_C(0x1F);
 	if (type == cache_type_none) {
 		return false;
@@ -46,112 +44,106 @@ bool cpuinfo_x86_decode_deterministic_cache_parameters(
 		case 1:
 			switch (type) {
 				case cache_type_unified:
-					cache->l1d = cache->l1i = (struct cpuinfo_x86_cache) {
+					cache->l1d = cache->l1i = (struct cpuinfo_x86_cache){
 						.size = associativity * partitions * line_size * sets,
 						.associativity = associativity,
 						.sets = sets,
 						.partitions = partitions,
 						.line_size = line_size,
 						.flags = flags | CPUINFO_CACHE_UNIFIED,
-						.apic_bits = apic_bits
-					};
+						.apic_bits = apic_bits};
 					break;
 				case cache_type_data:
-					cache->l1d = (struct cpuinfo_x86_cache) {
+					cache->l1d = (struct cpuinfo_x86_cache){
 						.size = associativity * partitions * line_size * sets,
 						.associativity = associativity,
 						.sets = sets,
 						.partitions = partitions,
 						.line_size = line_size,
 						.flags = flags,
-						.apic_bits = apic_bits
-					};
+						.apic_bits = apic_bits};
 					break;
 				case cache_type_instruction:
-					cache->l1i = (struct cpuinfo_x86_cache) {
+					cache->l1i = (struct cpuinfo_x86_cache){
 						.size = associativity * partitions * line_size * sets,
 						.associativity = associativity,
 						.sets = sets,
 						.partitions = partitions,
 						.line_size = line_size,
 						.flags = flags,
-						.apic_bits = apic_bits
-					};
+						.apic_bits = apic_bits};
 					break;
 			}
 			break;
 		case 2:
 			switch (type) {
 				case cache_type_instruction:
-					cpuinfo_log_warning("unexpected L2 instruction cache reported in leaf 0x00000004 is ignored");
+					cpuinfo_log_warning(
+						"unexpected L2 instruction cache reported in leaf 0x00000004 is ignored");
 					break;
 				case cache_type_unified:
 					flags |= CPUINFO_CACHE_UNIFIED;
 				case cache_type_data:
-					cache->l2 = (struct cpuinfo_x86_cache) {
+					cache->l2 = (struct cpuinfo_x86_cache){
 						.size = associativity * partitions * line_size * sets,
 						.associativity = associativity,
 						.sets = sets,
 						.partitions = partitions,
 						.line_size = line_size,
 						.flags = flags,
-						.apic_bits = apic_bits
-					};
+						.apic_bits = apic_bits};
 					break;
 			}
 			break;
 		case 3:
 			switch (type) {
 				case cache_type_instruction:
-					cpuinfo_log_warning("unexpected L3 instruction cache reported in leaf 0x00000004 is ignored");
+					cpuinfo_log_warning(
+						"unexpected L3 instruction cache reported in leaf 0x00000004 is ignored");
 					break;
 				case cache_type_unified:
 					flags |= CPUINFO_CACHE_UNIFIED;
 				case cache_type_data:
-					cache->l3 = (struct cpuinfo_x86_cache) {
+					cache->l3 = (struct cpuinfo_x86_cache){
 						.size = associativity * partitions * line_size * sets,
 						.associativity = associativity,
 						.sets = sets,
 						.partitions = partitions,
 						.line_size = line_size,
 						.flags = flags,
-						.apic_bits = apic_bits
-					};
+						.apic_bits = apic_bits};
 					break;
 			}
 			break;
 		case 4:
 			switch (type) {
 				case cache_type_instruction:
-					cpuinfo_log_warning("unexpected L4 instruction cache reported in leaf 0x00000004 is ignored");
+					cpuinfo_log_warning(
+						"unexpected L4 instruction cache reported in leaf 0x00000004 is ignored");
 					break;
 				case cache_type_unified:
 					flags |= CPUINFO_CACHE_UNIFIED;
 				case cache_type_data:
-					cache->l4 = (struct cpuinfo_x86_cache) {
+					cache->l4 = (struct cpuinfo_x86_cache){
 						.size = associativity * partitions * line_size * sets,
 						.associativity = associativity,
 						.sets = sets,
 						.partitions = partitions,
 						.line_size = line_size,
 						.flags = flags,
-						.apic_bits = apic_bits
-					};
+						.apic_bits = apic_bits};
 					break;
 			}
 			break;
 		default:
-			cpuinfo_log_warning("unexpected L%"PRIu32" cache reported in leaf 0x00000004 is ignored", level);
+			cpuinfo_log_warning(
+				"unexpected L%" PRIu32 " cache reported in leaf 0x00000004 is ignored", level);
 			break;
 	}
 	return true;
 }
 
-
-bool cpuinfo_x86_decode_cache_properties(
-	struct cpuid_regs regs,
-	struct cpuinfo_x86_caches* cache)
-{
+bool cpuinfo_x86_decode_cache_properties(struct cpuid_regs regs, struct cpuinfo_x86_caches* cache) {
 	const uint32_t type = regs.eax & UINT32_C(0x1F);
 	if (type == cache_type_none) {
 		return false;
@@ -175,82 +167,80 @@ bool cpuinfo_x86_decode_cache_properties(
 		case 1:
 			switch (type) {
 				case cache_type_unified:
-					cache->l1d = cache->l1i = (struct cpuinfo_x86_cache) {
+					cache->l1d = cache->l1i = (struct cpuinfo_x86_cache){
 						.size = associativity * partitions * line_size * sets,
 						.associativity = associativity,
 						.sets = sets,
 						.partitions = partitions,
 						.line_size = line_size,
 						.flags = flags | CPUINFO_CACHE_UNIFIED,
-						.apic_bits = apic_bits
-					};
+						.apic_bits = apic_bits};
 					break;
 				case cache_type_data:
-					cache->l1d = (struct cpuinfo_x86_cache) {
+					cache->l1d = (struct cpuinfo_x86_cache){
 						.size = associativity * partitions * line_size * sets,
 						.associativity = associativity,
 						.sets = sets,
 						.partitions = partitions,
 						.line_size = line_size,
 						.flags = flags,
-						.apic_bits = apic_bits
-					};
+						.apic_bits = apic_bits};
 					break;
 				case cache_type_instruction:
-					cache->l1i = (struct cpuinfo_x86_cache) {
+					cache->l1i = (struct cpuinfo_x86_cache){
 						.size = associativity * partitions * line_size * sets,
 						.associativity = associativity,
 						.sets = sets,
 						.partitions = partitions,
 						.line_size = line_size,
 						.flags = flags,
-						.apic_bits = apic_bits
-					};
+						.apic_bits = apic_bits};
 					break;
 			}
 			break;
 		case 2:
 			switch (type) {
 				case cache_type_instruction:
-					cpuinfo_log_warning("unexpected L2 instruction cache reported in leaf 0x8000001D is ignored");
+					cpuinfo_log_warning(
+						"unexpected L2 instruction cache reported in leaf 0x8000001D is ignored");
 					break;
 				case cache_type_unified:
 					flags |= CPUINFO_CACHE_UNIFIED;
 				case cache_type_data:
-					cache->l2 = (struct cpuinfo_x86_cache) {
+					cache->l2 = (struct cpuinfo_x86_cache){
 						.size = associativity * partitions * line_size * sets,
 						.associativity = associativity,
 						.sets = sets,
 						.partitions = partitions,
 						.line_size = line_size,
 						.flags = flags,
-						.apic_bits = apic_bits
-					};
+						.apic_bits = apic_bits};
 					break;
 			}
 			break;
 		case 3:
 			switch (type) {
 				case cache_type_instruction:
-					cpuinfo_log_warning("unexpected L3 instruction cache reported in leaf 0x8000001D is ignored");
+					cpuinfo_log_warning(
+						"unexpected L3 instruction cache reported in leaf 0x8000001D is ignored");
 					break;
 				case cache_type_unified:
 					flags |= CPUINFO_CACHE_UNIFIED;
 				case cache_type_data:
-					cache->l3 = (struct cpuinfo_x86_cache) {
+					cache->l3 = (struct cpuinfo_x86_cache){
 						.size = associativity * partitions * line_size * sets,
 						.associativity = associativity,
 						.sets = sets,
 						.partitions = partitions,
 						.line_size = line_size,
 						.flags = flags,
-						.apic_bits = apic_bits
-					};
+						.apic_bits = apic_bits};
 					break;
 			}
 			break;
 		default:
-			cpuinfo_log_warning("unexpected L%"PRIu32" cache reported in leaf 0x8000001D is ignored", level);
+			cpuinfo_log_warning(
+				"unexpected L%" PRIu32 " cache reported in leaf 0x8000001D is ignored", level);
 			break;
 	}
 	return true;

3rdparty/cpuinfo/src/x86/cache/init.c

@@ -1,11 +1,10 @@
 #include <stdint.h>
 
 #include <cpuinfo.h>
-#include <cpuinfo/utils.h>
 #include <cpuinfo/log.h>
-#include <x86/cpuid.h>
+#include <cpuinfo/utils.h>
 #include <x86/api.h>
-
+#include <x86/cpuid.h>
 
 union cpuinfo_x86_cache_descriptors {
 	struct cpuid_regs regs;
@@ -20,7 +19,8 @@ enum cache_type {
 };
 
 void cpuinfo_x86_detect_cache(
-	uint32_t max_base_index, uint32_t max_extended_index,
+	uint32_t max_base_index,
+	uint32_t max_extended_index,
 	bool amd_topology_extensions,
 	enum cpuinfo_vendor vendor,
 	const struct cpuinfo_x86_model_info* model_info,
@@ -38,24 +38,34 @@ void cpuinfo_x86_detect_cache(
 	struct cpuinfo_tlb* stlb2_4KB,
 	struct cpuinfo_tlb* stlb2_2MB,
 	struct cpuinfo_tlb* stlb2_1GB,
-	uint32_t* log2_package_cores_max)
-{
+	uint32_t* log2_package_cores_max) {
 	if (max_base_index >= 2) {
 		union cpuinfo_x86_cache_descriptors descriptors;
 		descriptors.regs = cpuid(2);
-		uint32_t iterations = (uint8_t) descriptors.as_bytes[0];
+		uint32_t iterations = (uint8_t)descriptors.as_bytes[0];
 		if (iterations != 0) {
-iterate_descriptors:
+		iterate_descriptors:
 			for (uint32_t i = 1 /* note: not 0 */; i < 16; i++) {
 				const uint8_t descriptor = descriptors.as_bytes[i];
 				if (descriptor != 0) {
 					cpuinfo_x86_decode_cache_descriptor(
-						descriptor, vendor, model_info,
+						descriptor,
+						vendor,
+						model_info,
 						cache,
-						itlb_4KB, itlb_2MB, itlb_4MB,
-						dtlb0_4KB, dtlb0_2MB, dtlb0_4MB,
-						dtlb_4KB, dtlb_2MB, dtlb_4MB, dtlb_1GB,
-						stlb2_4KB, stlb2_2MB, stlb2_1GB,
+						itlb_4KB,
+						itlb_2MB,
+						itlb_4MB,
+						dtlb0_4KB,
+						dtlb0_2MB,
+						dtlb0_4MB,
+						dtlb_4KB,
+						dtlb_2MB,
+						dtlb_4MB,
+						dtlb_1GB,
+						stlb2_4KB,
+						stlb2_2MB,
+						stlb2_1GB,
 						&cache->prefetch_size);
 				}
 			}
@@ -71,8 +81,7 @@ iterate_descriptors:
 			uint32_t package_cores_max = 0;
 			do {
 				leaf4 = cpuidex(4, input_ecx++);
-			} while (cpuinfo_x86_decode_deterministic_cache_parameters(
-				leaf4, cache, &package_cores_max));
+			} while (cpuinfo_x86_decode_deterministic_cache_parameters(leaf4, cache, &package_cores_max));
 			if (package_cores_max != 0) {
 				*log2_package_cores_max = bit_length(package_cores_max);
 			}

3rdparty/cpuinfo/src/x86/cpuid.h

@@ -2,78 +2,76 @@
 #include <stdint.h>
 
 #if defined(__GNUC__)
-	#include <cpuid.h>
+#include <cpuid.h>
 #elif defined(_MSC_VER)
-	#include <intrin.h>
+#include <intrin.h>
 #endif
 
 #if CPUINFO_MOCK
-	#include <cpuinfo-mock.h>
+#include <cpuinfo-mock.h>
 #endif
 #include <x86/api.h>
 
-
 #if defined(__GNUC__) || defined(_MSC_VER)
-	static inline struct cpuid_regs cpuid(uint32_t eax) {
-		#if CPUINFO_MOCK
-			uint32_t regs_array[4];
-			cpuinfo_mock_get_cpuid(eax, regs_array);
-			return (struct cpuid_regs) {
-				.eax = regs_array[0],
-				.ebx = regs_array[1],
-				.ecx = regs_array[2],
-				.edx = regs_array[3],
-			};
-		#else
-			struct cpuid_regs regs;
-			#if defined(__GNUC__)
-				__cpuid(eax, regs.eax, regs.ebx, regs.ecx, regs.edx);
-			#else
-				int regs_array[4];
-				__cpuid(regs_array, (int) eax);
-				regs.eax = regs_array[0];
-				regs.ebx = regs_array[1];
-				regs.ecx = regs_array[2];
-				regs.edx = regs_array[3];
-			#endif
-			return regs;
-		#endif
-	}
+static inline struct cpuid_regs cpuid(uint32_t eax) {
+#if CPUINFO_MOCK
+	uint32_t regs_array[4];
+	cpuinfo_mock_get_cpuid(eax, regs_array);
+	return (struct cpuid_regs){
+		.eax = regs_array[0],
+		.ebx = regs_array[1],
+		.ecx = regs_array[2],
+		.edx = regs_array[3],
+	};
+#else
+	struct cpuid_regs regs;
+#if defined(__GNUC__)
+	__cpuid(eax, regs.eax, regs.ebx, regs.ecx, regs.edx);
+#else
+	int regs_array[4];
+	__cpuid(regs_array, (int)eax);
+	regs.eax = regs_array[0];
+	regs.ebx = regs_array[1];
+	regs.ecx = regs_array[2];
+	regs.edx = regs_array[3];
+#endif
+	return regs;
+#endif
+}
 
-	static inline struct cpuid_regs cpuidex(uint32_t eax, uint32_t ecx) {
-		#if CPUINFO_MOCK
-			uint32_t regs_array[4];
-			cpuinfo_mock_get_cpuidex(eax, ecx, regs_array);
-			return (struct cpuid_regs) {
-				.eax = regs_array[0],
-				.ebx = regs_array[1],
-				.ecx = regs_array[2],
-				.edx = regs_array[3],
-			};
-		#else
-			struct cpuid_regs regs;
-			#if defined(__GNUC__)
-				__cpuid_count(eax, ecx, regs.eax, regs.ebx, regs.ecx, regs.edx);
-			#else
-				int regs_array[4];
-				__cpuidex(regs_array, (int) eax, (int) ecx);
-				regs.eax = regs_array[0];
-				regs.ebx = regs_array[1];
-				regs.ecx = regs_array[2];
-				regs.edx = regs_array[3];
-			#endif
-			return regs;
-		#endif
-	}
+static inline struct cpuid_regs cpuidex(uint32_t eax, uint32_t ecx) {
+#if CPUINFO_MOCK
+	uint32_t regs_array[4];
+	cpuinfo_mock_get_cpuidex(eax, ecx, regs_array);
+	return (struct cpuid_regs){
+		.eax = regs_array[0],
+		.ebx = regs_array[1],
+		.ecx = regs_array[2],
+		.edx = regs_array[3],
+	};
+#else
+	struct cpuid_regs regs;
+#if defined(__GNUC__)
+	__cpuid_count(eax, ecx, regs.eax, regs.ebx, regs.ecx, regs.edx);
+#else
+	int regs_array[4];
+	__cpuidex(regs_array, (int)eax, (int)ecx);
+	regs.eax = regs_array[0];
+	regs.ebx = regs_array[1];
+	regs.ecx = regs_array[2];
+	regs.edx = regs_array[3];
+#endif
+	return regs;
+#endif
+}
 #endif
 
 static inline uint64_t xgetbv(uint32_t ext_ctrl_reg) {
-	#ifdef _MSC_VER
-		return (uint64_t)_xgetbv((unsigned int)ext_ctrl_reg);
-	#else
-		uint32_t lo, hi;
-		__asm__(".byte 0x0F, 0x01, 0xD0" : "=a" (lo), "=d" (hi) : "c" (ext_ctrl_reg));
-		return ((uint64_t) hi << 32) | (uint64_t) lo;
-	#endif
+#ifdef _MSC_VER
+	return (uint64_t)_xgetbv((unsigned int)ext_ctrl_reg);
+#else
+	uint32_t lo, hi;
+	__asm__(".byte 0x0F, 0x01, 0xD0" : "=a"(lo), "=d"(hi) : "c"(ext_ctrl_reg));
+	return ((uint64_t)hi << 32) | (uint64_t)lo;
+#endif
 }
-

3rdparty/cpuinfo/src/x86/freebsd/init.c

@@ -0,0 +1,382 @@
+#include <stdint.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include <cpuinfo.h>
+#include <cpuinfo/internal-api.h>
+#include <cpuinfo/log.h>
+#include <freebsd/api.h>
+#include <x86/api.h>
+
+static inline uint32_t max(uint32_t a, uint32_t b) {
+	return a > b ? a : b;
+}
+
+static inline uint32_t bit_mask(uint32_t bits) {
+	return (UINT32_C(1) << bits) - UINT32_C(1);
+}
+
+void cpuinfo_x86_freebsd_init(void) {
+	struct cpuinfo_processor* processors = NULL;
+	struct cpuinfo_core* cores = NULL;
+	struct cpuinfo_cluster* clusters = NULL;
+	struct cpuinfo_package* packages = NULL;
+	struct cpuinfo_cache* l1i = NULL;
+	struct cpuinfo_cache* l1d = NULL;
+	struct cpuinfo_cache* l2 = NULL;
+	struct cpuinfo_cache* l3 = NULL;
+	struct cpuinfo_cache* l4 = NULL;
+
+	struct cpuinfo_freebsd_topology freebsd_topology = cpuinfo_freebsd_detect_topology();
+	if (freebsd_topology.packages == 0) {
+		cpuinfo_log_error("failed to detect topology");
+		goto cleanup;
+	}
+	processors = calloc(freebsd_topology.threads, sizeof(struct cpuinfo_processor));
+	if (processors == NULL) {
+		cpuinfo_log_error(
+			"failed to allocate %zu bytes for descriptions of %" PRIu32 " logical processors",
+			freebsd_topology.threads * sizeof(struct cpuinfo_processor),
+			freebsd_topology.threads);
+		goto cleanup;
+	}
+	cores = calloc(freebsd_topology.cores, sizeof(struct cpuinfo_core));
+	if (cores == NULL) {
+		cpuinfo_log_error(
+			"failed to allocate %zu bytes for descriptions of %" PRIu32 " cores",
+			freebsd_topology.cores * sizeof(struct cpuinfo_core),
+			freebsd_topology.cores);
+		goto cleanup;
+	}
+	/* On x86 a cluster of cores is the biggest group of cores that shares a
+	 * cache. */
+	clusters = calloc(freebsd_topology.packages, sizeof(struct cpuinfo_cluster));
+	if (clusters == NULL) {
+		cpuinfo_log_error(
+			"failed to allocate %zu bytes for descriptions of %" PRIu32 " core clusters",
+			freebsd_topology.packages * sizeof(struct cpuinfo_cluster),
+			freebsd_topology.packages);
+		goto cleanup;
+	}
+	packages = calloc(freebsd_topology.packages, sizeof(struct cpuinfo_package));
+	if (packages == NULL) {
+		cpuinfo_log_error(
+			"failed to allocate %zu bytes for descriptions of %" PRIu32 " physical packages",
+			freebsd_topology.packages * sizeof(struct cpuinfo_package),
+			freebsd_topology.packages);
+		goto cleanup;
+	}
+
+	struct cpuinfo_x86_processor x86_processor;
+	memset(&x86_processor, 0, sizeof(x86_processor));
+	cpuinfo_x86_init_processor(&x86_processor);
+	char brand_string[48];
+	cpuinfo_x86_normalize_brand_string(x86_processor.brand_string, brand_string);
+
+	const uint32_t threads_per_core = freebsd_topology.threads_per_core;
+	const uint32_t threads_per_package = freebsd_topology.threads / freebsd_topology.packages;
+	const uint32_t cores_per_package = freebsd_topology.cores / freebsd_topology.packages;
+	for (uint32_t i = 0; i < freebsd_topology.packages; i++) {
+		clusters[i] = (struct cpuinfo_cluster){
+			.processor_start = i * threads_per_package,
+			.processor_count = threads_per_package,
+			.core_start = i * cores_per_package,
+			.core_count = cores_per_package,
+			.cluster_id = 0,
+			.package = packages + i,
+			.vendor = x86_processor.vendor,
+			.uarch = x86_processor.uarch,
+			.cpuid = x86_processor.cpuid,
+		};
+		packages[i].processor_start = i * threads_per_package;
+		packages[i].processor_count = threads_per_package;
+		packages[i].core_start = i * cores_per_package;
+		packages[i].core_count = cores_per_package;
+		packages[i].cluster_start = i;
+		packages[i].cluster_count = 1;
+		cpuinfo_x86_format_package_name(x86_processor.vendor, brand_string, packages[i].name);
+	}
+	for (uint32_t i = 0; i < freebsd_topology.cores; i++) {
+		cores[i] = (struct cpuinfo_core){
+			.processor_start = i * threads_per_core,
+			.processor_count = threads_per_core,
+			.core_id = i % cores_per_package,
+			.cluster = clusters + i / cores_per_package,
+			.package = packages + i / cores_per_package,
+			.vendor = x86_processor.vendor,
+			.uarch = x86_processor.uarch,
+			.cpuid = x86_processor.cpuid,
+		};
+	}
+	for (uint32_t i = 0; i < freebsd_topology.threads; i++) {
+		const uint32_t smt_id = i % threads_per_core;
+		const uint32_t core_id = i / threads_per_core;
+		const uint32_t package_id = i / threads_per_package;
+
+		/* Reconstruct APIC IDs from topology components */
+		const uint32_t thread_bits_mask = bit_mask(x86_processor.topology.thread_bits_length);
+		const uint32_t core_bits_mask = bit_mask(x86_processor.topology.core_bits_length);
+		const uint32_t package_bits_offset =
+			max(x86_processor.topology.thread_bits_offset + x86_processor.topology.thread_bits_length,
+			    x86_processor.topology.core_bits_offset + x86_processor.topology.core_bits_length);
+		const uint32_t apic_id = ((smt_id & thread_bits_mask) << x86_processor.topology.thread_bits_offset) |
+			((core_id & core_bits_mask) << x86_processor.topology.core_bits_offset) |
+			(package_id << package_bits_offset);
+		cpuinfo_log_debug("reconstructed APIC ID 0x%08" PRIx32 " for thread %" PRIu32, apic_id, i);
+
+		processors[i].smt_id = smt_id;
+		processors[i].core = cores + i / threads_per_core;
+		processors[i].cluster = clusters + i / threads_per_package;
+		processors[i].package = packages + i / threads_per_package;
+		processors[i].apic_id = apic_id;
+	}
+
+	uint32_t threads_per_l1 = 0, l1_count = 0;
+	if (x86_processor.cache.l1i.size != 0 || x86_processor.cache.l1d.size != 0) {
+		/* Assume that threads on the same core share L1 */
+		threads_per_l1 = freebsd_topology.threads / freebsd_topology.cores;
+		cpuinfo_log_warning(
+			"freebsd kernel did not report number of "
+			"threads sharing L1 cache; assume %" PRIu32,
+			threads_per_l1);
+		l1_count = freebsd_topology.threads / threads_per_l1;
+		cpuinfo_log_debug("detected %" PRIu32 " L1 caches", l1_count);
+	}
+
+	uint32_t threads_per_l2 = 0, l2_count = 0;
+	if (x86_processor.cache.l2.size != 0) {
+		if (x86_processor.cache.l3.size != 0) {
+			/* This is not a last-level cache; assume that threads
+			 * on the same core share L2 */
+			threads_per_l2 = freebsd_topology.threads / freebsd_topology.cores;
+		} else {
+			/* This is a last-level cache; assume that threads on
+			 * the same package share L2 */
+			threads_per_l2 = freebsd_topology.threads / freebsd_topology.packages;
+		}
+		cpuinfo_log_warning(
+			"freebsd kernel did not report number of "
+			"threads sharing L2 cache; assume %" PRIu32,
+			threads_per_l2);
+		l2_count = freebsd_topology.threads / threads_per_l2;
+		cpuinfo_log_debug("detected %" PRIu32 " L2 caches", l2_count);
+	}
+
+	uint32_t threads_per_l3 = 0, l3_count = 0;
+	if (x86_processor.cache.l3.size != 0) {
+		/*
+		 * Assume that threads on the same package share L3.
+		 * However, is it not necessarily the last-level cache (there
+		 * may be L4 cache as well)
+		 */
+		threads_per_l3 = freebsd_topology.threads / freebsd_topology.packages;
+		cpuinfo_log_warning(
+			"freebsd kernel did not report number of "
+			"threads sharing L3 cache; assume %" PRIu32,
+			threads_per_l3);
+		l3_count = freebsd_topology.threads / threads_per_l3;
+		cpuinfo_log_debug("detected %" PRIu32 " L3 caches", l3_count);
+	}
+
+	uint32_t threads_per_l4 = 0, l4_count = 0;
+	if (x86_processor.cache.l4.size != 0) {
+		/*
+		 * Assume that all threads share this L4.
+		 * As of now, L4 cache exists only on notebook x86 CPUs, which
+		 * are single-package, but multi-socket systems could have
+		 * shared L4 (like on IBM POWER8).
+		 */
+		threads_per_l4 = freebsd_topology.threads;
+		cpuinfo_log_warning(
+			"freebsd kernel did not report number of "
+			"threads sharing L4 cache; assume %" PRIu32,
+			threads_per_l4);
+		l4_count = freebsd_topology.threads / threads_per_l4;
+		cpuinfo_log_debug("detected %" PRIu32 " L4 caches", l4_count);
+	}
+
+	if (x86_processor.cache.l1i.size != 0) {
+		l1i = calloc(l1_count, sizeof(struct cpuinfo_cache));
+		if (l1i == NULL) {
+			cpuinfo_log_error(
+				"failed to allocate %zu bytes for descriptions of "
+				"%" PRIu32 " L1I caches",
+				l1_count * sizeof(struct cpuinfo_cache),
+				l1_count);
+			return;
+		}
+		for (uint32_t c = 0; c < l1_count; c++) {
+			l1i[c] = (struct cpuinfo_cache){
+				.size = x86_processor.cache.l1i.size,
+				.associativity = x86_processor.cache.l1i.associativity,
+				.sets = x86_processor.cache.l1i.sets,
+				.partitions = x86_processor.cache.l1i.partitions,
+				.line_size = x86_processor.cache.l1i.line_size,
+				.flags = x86_processor.cache.l1i.flags,
+				.processor_start = c * threads_per_l1,
+				.processor_count = threads_per_l1,
+			};
+		}
+		for (uint32_t t = 0; t < freebsd_topology.threads; t++) {
+			processors[t].cache.l1i = &l1i[t / threads_per_l1];
+		}
+	}
+
+	if (x86_processor.cache.l1d.size != 0) {
+		l1d = calloc(l1_count, sizeof(struct cpuinfo_cache));
+		if (l1d == NULL) {
+			cpuinfo_log_error(
+				"failed to allocate %zu bytes for descriptions of "
+				"%" PRIu32 " L1D caches",
+				l1_count * sizeof(struct cpuinfo_cache),
+				l1_count);
+			return;
+		}
+		for (uint32_t c = 0; c < l1_count; c++) {
+			l1d[c] = (struct cpuinfo_cache){
+				.size = x86_processor.cache.l1d.size,
+				.associativity = x86_processor.cache.l1d.associativity,
+				.sets = x86_processor.cache.l1d.sets,
+				.partitions = x86_processor.cache.l1d.partitions,
+				.line_size = x86_processor.cache.l1d.line_size,
+				.flags = x86_processor.cache.l1d.flags,
+				.processor_start = c * threads_per_l1,
+				.processor_count = threads_per_l1,
+			};
+		}
+		for (uint32_t t = 0; t < freebsd_topology.threads; t++) {
+			processors[t].cache.l1d = &l1d[t / threads_per_l1];
+		}
+	}
+
+	if (l2_count != 0) {
+		l2 = calloc(l2_count, sizeof(struct cpuinfo_cache));
+		if (l2 == NULL) {
+			cpuinfo_log_error(
+				"failed to allocate %zu bytes for descriptions of "
+				"%" PRIu32 " L2 caches",
+				l2_count * sizeof(struct cpuinfo_cache),
+				l2_count);
+			return;
+		}
+		for (uint32_t c = 0; c < l2_count; c++) {
+			l2[c] = (struct cpuinfo_cache){
+				.size = x86_processor.cache.l2.size,
+				.associativity = x86_processor.cache.l2.associativity,
+				.sets = x86_processor.cache.l2.sets,
+				.partitions = x86_processor.cache.l2.partitions,
+				.line_size = x86_processor.cache.l2.line_size,
+				.flags = x86_processor.cache.l2.flags,
+				.processor_start = c * threads_per_l2,
+				.processor_count = threads_per_l2,
+			};
+		}
+		for (uint32_t t = 0; t < freebsd_topology.threads; t++) {
+			processors[t].cache.l2 = &l2[t / threads_per_l2];
+		}
+	}
+
+	if (l3_count != 0) {
+		l3 = calloc(l3_count, sizeof(struct cpuinfo_cache));
+		if (l3 == NULL) {
+			cpuinfo_log_error(
+				"failed to allocate %zu bytes for descriptions of "
+				"%" PRIu32 " L3 caches",
+				l3_count * sizeof(struct cpuinfo_cache),
+				l3_count);
+			return;
+		}
+		for (uint32_t c = 0; c < l3_count; c++) {
+			l3[c] = (struct cpuinfo_cache){
+				.size = x86_processor.cache.l3.size,
+				.associativity = x86_processor.cache.l3.associativity,
+				.sets = x86_processor.cache.l3.sets,
+				.partitions = x86_processor.cache.l3.partitions,
+				.line_size = x86_processor.cache.l3.line_size,
+				.flags = x86_processor.cache.l3.flags,
+				.processor_start = c * threads_per_l3,
+				.processor_count = threads_per_l3,
+			};
+		}
+		for (uint32_t t = 0; t < freebsd_topology.threads; t++) {
+			processors[t].cache.l3 = &l3[t / threads_per_l3];
+		}
+	}
+
+	if (l4_count != 0) {
+		l4 = calloc(l4_count, sizeof(struct cpuinfo_cache));
+		if (l4 == NULL) {
+			cpuinfo_log_error(
+				"failed to allocate %zu bytes for descriptions of "
+				"%" PRIu32 " L4 caches",
+				l4_count * sizeof(struct cpuinfo_cache),
+				l4_count);
+			return;
+		}
+		for (uint32_t c = 0; c < l4_count; c++) {
+			l4[c] = (struct cpuinfo_cache){
+				.size = x86_processor.cache.l4.size,
+				.associativity = x86_processor.cache.l4.associativity,
+				.sets = x86_processor.cache.l4.sets,
+				.partitions = x86_processor.cache.l4.partitions,
+				.line_size = x86_processor.cache.l4.line_size,
+				.flags = x86_processor.cache.l4.flags,
+				.processor_start = c * threads_per_l4,
+				.processor_count = threads_per_l4,
+			};
+		}
+		for (uint32_t t = 0; t < freebsd_topology.threads; t++) {
+			processors[t].cache.l4 = &l4[t / threads_per_l4];
+		}
+	}
+
+	/* Commit changes */
+	cpuinfo_processors = processors;
+	cpuinfo_cores = cores;
+	cpuinfo_clusters = clusters;
+	cpuinfo_packages = packages;
+	cpuinfo_cache[cpuinfo_cache_level_1i] = l1i;
+	cpuinfo_cache[cpuinfo_cache_level_1d] = l1d;
+	cpuinfo_cache[cpuinfo_cache_level_2] = l2;
+	cpuinfo_cache[cpuinfo_cache_level_3] = l3;
+	cpuinfo_cache[cpuinfo_cache_level_4] = l4;
+
+	cpuinfo_processors_count = freebsd_topology.threads;
+	cpuinfo_cores_count = freebsd_topology.cores;
+	cpuinfo_clusters_count = freebsd_topology.packages;
+	cpuinfo_packages_count = freebsd_topology.packages;
+	cpuinfo_cache_count[cpuinfo_cache_level_1i] = l1_count;
+	cpuinfo_cache_count[cpuinfo_cache_level_1d] = l1_count;
+	cpuinfo_cache_count[cpuinfo_cache_level_2] = l2_count;
+	cpuinfo_cache_count[cpuinfo_cache_level_3] = l3_count;
+	cpuinfo_cache_count[cpuinfo_cache_level_4] = l4_count;
+	cpuinfo_max_cache_size = cpuinfo_compute_max_cache_size(&processors[0]);
+
+	cpuinfo_global_uarch = (struct cpuinfo_uarch_info){
+		.uarch = x86_processor.uarch,
+		.cpuid = x86_processor.cpuid,
+		.processor_count = freebsd_topology.threads,
+		.core_count = freebsd_topology.cores,
+	};
+
+	__sync_synchronize();
+
+	cpuinfo_is_initialized = true;
+
+	processors = NULL;
+	cores = NULL;
+	clusters = NULL;
+	packages = NULL;
+	l1i = l1d = l2 = l3 = l4 = NULL;
+
+cleanup:
+	free(processors);
+	free(cores);
+	free(clusters);
+	free(packages);
+	free(l1i);
+	free(l1d);
+	free(l2);
+	free(l3);
+	free(l4);
+}

3rdparty/cpuinfo/src/x86/info.c

@@ -3,17 +3,16 @@
 #include <cpuinfo.h>
 #include <x86/api.h>
 
-
 struct cpuinfo_x86_model_info cpuinfo_x86_decode_model_info(uint32_t eax) {
 	struct cpuinfo_x86_model_info model_info;
-	model_info.stepping        =  eax        & 0xF;
-	model_info.base_model      = (eax >> 4)  & 0xF;
-	model_info.base_family     = (eax >> 8)  & 0xF;
-	model_info.processor_type  = (eax >> 12) & 0x3;
-	model_info.extended_model  = (eax >> 16) & 0xF;
+	model_info.stepping = eax & 0xF;
+	model_info.base_model = (eax >> 4) & 0xF;
+	model_info.base_family = (eax >> 8) & 0xF;
+	model_info.processor_type = (eax >> 12) & 0x3;
+	model_info.extended_model = (eax >> 16) & 0xF;
 	model_info.extended_family = (eax >> 20) & 0xFF;
 
 	model_info.family = model_info.base_family + model_info.extended_family;
-	model_info.model  = model_info.base_model + (model_info.extended_model << 4);
+	model_info.model = model_info.base_model + (model_info.extended_model << 4);
 	return model_info;
 }