Merge branch 'master' into entropytest

2026-01-21 07:11:16 +00:00 · 2025-03-09 18:25:58 -07:00 · 2025-03-09 18:25:58 -07:00 · 86e53e700a
commit 86e53e700a
parent f8d1a10888 fbf71990c9
2 changed files with 199 additions and 140 deletions
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@ -2,10 +2,6 @@ name: Build

 on: [push, pull_request]

-concurrency:
-  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
-  cancel-in-progress: true
-
 jobs:
  fetch-deps:
    name: Download original binaries
@ -104,111 +100,11 @@ jobs:
          build/LEGO1.DLL
          build/LEGO1.PDB

-  build-with-entropy:
-    name: 'MSVC 4.20 with entropy'
-    needs: [fetch-deps]
-    runs-on: windows-latest
-    strategy:
-      matrix:
-        instance: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9,
-                   10, 11, 12, 13, 14, 15, 16, 17, 18, 19,
-                   20, 21, 22, 23, 24, 25, 26, 27, 28, 29,
-                   30, 31, 32, 33, 34, 35, 36, 37, 38, 39,
-                   40, 41, 42, 43, 44, 45, 46, 47, 48, 49,
-                   50, 51, 52, 53, 54, 55, 56, 57, 58, 59,
-                   60, 61, 62, 63, 64, 65, 66, 67, 68, 69,
-                   70, 71, 72, 73, 74, 75, 76, 77, 78, 79,
-                   80, 81, 82, 83, 84, 85, 86, 87, 88, 89,
-                   90, 91, 92, 93, 94, 95, 96, 97, 98, 99]

-    steps:
-    - uses: actions/checkout@v4
+  verify:
+    name: Verify decomp
+    needs: [build, fetch-deps]

-    - uses: actions/setup-python@v5
-      with:
-        python-version: '3.12'
-
-    - uses: actions/checkout@v4
-      with:
-        repository: itsmattkc/msvc420
-        path: msvc420
-
-    - name: Setup cmake
-      uses: jwlawson/actions-setup-cmake@v2
-      with:
-        # Use minimum supported version
-        cmake-version: '3.15.x'
-
-    - name: Patch MSVC 4.2
-      run: |
-        tools/patch_c2.py msvc420/bin/C2.EXE
-
-    - name: Generate Entropy
-      shell: bash
-      run: |
-        # Get the first 8 characters of the SHA (enough for a decent seed)
-        SHA_PREFIX=$(echo "${{ github.sha }}" | cut -c 1-8)
-        ENTROPY_SEED=$((16#$SHA_PREFIX + ${{ matrix.instance }}))
-
-        echo "Using seed: $ENTROPY_SEED"
-        python3 tools/entropy.py $ENTROPY_SEED > entropy.h
-
-    - name: Build
-      shell: cmd
-      run: |
-        call .\msvc420\bin\VCVARS32.BAT x86
-        cmake -B build -DCMAKE_BUILD_TYPE=RelWithDebInfo -DISLE_INCLUDE_ENTROPY=ON -G "NMake Makefiles"
-        cmake --build build
-
-    - name: Restore cached original binaries
-      id: cache-original-binaries
-      uses: actions/cache/restore@v4
-      with:
-        enableCrossOsArchive: true
-        path: legobin
-        key: legobin
-        
-    - name: Install python packages
-      shell: bash
-      run: |
-        pip install -r tools/requirements.txt
-  
-    - name: Detect binaries
-      run: |
-        reccmp-project detect --what original   --search-path legobin
-        reccmp-project detect --what recompiled --search-path build
-
-    - name: Summarize Accuracy
-      shell: bash
-      run: |
-        reccmp-reccmp --target CONFIG --json CONFIGPROGRESS.json
-        reccmp-reccmp --target ISLE --json ISLEPROGRESS.json
-        reccmp-reccmp --target LEGO1 --json LEGO1PROGRESS.json
-
-    - name: Upload Artifact
-      uses: actions/upload-artifact@main
-      with:
-        name: Win32-Entropy-${{ matrix.instance }}
-        path: |
-          CONFIGPROGRESS.json
-          ISLEPROGRESS.json
-          LEGO1PROGRESS.json
-
-  merge-entropy-artifacts:
-    name: 'Merge entropy artifacts'
-    runs-on: ubuntu-latest
-    needs: build-with-entropy
-    steps:
-      - name: Merge Artifacts
-        uses: actions/upload-artifact/merge@v4
-        with:
-          name: Win32-Entropy
-          pattern: Win32-Entropy-*
-          separate-directories: true
-          
-  compare:
-    name: Compare with master
-    needs: [build, merge-entropy-artifacts, fetch-deps]
    runs-on: windows-latest
    steps:
    - uses: actions/checkout@main
@ -219,13 +115,8 @@ jobs:

    - uses: actions/download-artifact@main
      with:
-        name: Win32
-        path: build
-
-    - uses: actions/download-artifact@main
-      with:
-        name: Win32-Entropy
-        path: build-entropy
+       name: Win32
+       path: build

    - name: Restore cached original binaries
      id: cache-original-binaries
@ -267,28 +158,6 @@ jobs:
        reccmp-reccmp --target ISLE --diff ISLEPROGRESS-old.json || echo "Current master not found"
        reccmp-reccmp --target LEGO1 --diff LEGO1PROGRESS-old.json || echo "Current master not found"

-    - name: Aggregate Accuracy
-      shell: bash
-      run: |
-        reccmp-aggregate --samples $(find build-entropy -type f -name "CONFIGPROGRESS.json") --output CONFIGPROGRESS-agg.json
-        reccmp-aggregate --samples $(find build-entropy -type f -name "ISLEPROGRESS.json") --output ISLEPROGRESS-agg.json
-        reccmp-aggregate --samples $(find build-entropy -type f -name "LEGO1PROGRESS.json") --output LEGO1PROGRESS-agg.json
-
-    - name: Compare Aggregate Accuracy With Current Master
-      shell: bash
-      env:
-        RELEASE_URL: https://github.com/isledecomp/isle/releases/download/continuous
-      run: |
-        # Download the current master state
-        curl -fLSs -o CONFIGPROGRESS-agg-old.json $RELEASE_URL/CONFIGPROGRESS-agg.json || echo "" >CONFIGPROGRESS-agg-old.json
-        curl -fLSs -o ISLEPROGRESS-agg-old.json $RELEASE_URL/ISLEPROGRESS-agg.json || echo "" >ISLEPROGRESS-agg-old.json
-        curl -fLSs -o LEGO1PROGRESS-agg-old.json $RELEASE_URL/LEGO1PROGRESS-agg.json || echo "" >LEGO1PROGRESS-agg-old.json
-        
-        # Compare with current master
-        reccmp-aggregate --diff CONFIGPROGRESS-agg-old.json CONFIGPROGRESS-agg.json || echo "Current master not found"
-        reccmp-aggregate --diff ISLEPROGRESS-agg-old.json ISLEPROGRESS-agg.json || echo "Current master not found"
-        reccmp-aggregate --diff LEGO1PROGRESS-agg-old.json LEGO1PROGRESS-agg.json || echo "Current master not found"
-
    - name: Test Exports
      shell: bash
      run: |
@ -304,9 +173,9 @@ jobs:
    - name: Check Variables
      shell: bash
      run: |
-       reccmp-datacmp --target CONFIG
-       reccmp-datacmp --target ISLE
-       reccmp-datacmp --target LEGO1
+        reccmp-datacmp --target CONFIG
+        reccmp-datacmp --target ISLE
+        reccmp-datacmp --target LEGO1

    - name: Upload Artifact
      uses: actions/upload-artifact@main
@ -319,7 +188,7 @@ jobs:

  upload:
    name: Upload artifacts
-    needs: [build, compare]
+    needs: [verify]
    runs-on: ubuntu-latest
    if: ${{ github.event_name == 'push' && github.ref == 'refs/heads/master' && github.repository == 'isledecomp/isle' }}
    steps:
--- a/.github/workflows/compare.yml
+++ b/.github/workflows/compare.yml
@ -0,0 +1,190 @@
+name: Compare
+
+on:
+  push:
+    branches:
+      - master
+  workflow_dispatch:
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
+  cancel-in-progress: true
+
+jobs:
+  fetch-deps:
+    name: Download original binaries
+    uses: ./.github/workflows/legobin.yml
+
+  build:
+    name: 'MSVC 4.20'
+    needs: [fetch-deps]
+    runs-on: windows-latest
+    strategy:
+      matrix:
+        high: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15]
+        low: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15]
+
+    steps:
+    - uses: actions/checkout@v4
+
+    - uses: actions/setup-python@v5
+      with:
+        python-version: '3.12'
+
+    - uses: actions/checkout@v4
+      with:
+        repository: itsmattkc/msvc420
+        path: msvc420
+
+    - name: Setup cmake
+      uses: jwlawson/actions-setup-cmake@v2
+      with:
+        # Use minimum supported version
+        cmake-version: '3.15.x'
+
+    - name: Patch MSVC 4.2
+      run: |
+        tools/patch_c2.py msvc420/bin/C2.EXE
+
+    - name: Generate Entropy
+      shell: bash
+      run: |
+        # Calculate instance number based on matrix inputs
+        INSTANCE=$((${{ matrix.high }} << 4 | ${{ matrix.low }}))
+
+        # Get the first 8 characters of the SHA (enough for a decent seed)
+        SHA_PREFIX=$(echo "${{ github.sha }}" | cut -c 1-8)
+        ENTROPY_SEED=$((16#$SHA_PREFIX + $INSTANCE))
+
+        echo "Using seed: $ENTROPY_SEED (instance $INSTANCE)"
+        python3 tools/entropy.py $ENTROPY_SEED > entropy.h
+
+    - name: Build
+      shell: cmd
+      run: |
+        call .\msvc420\bin\VCVARS32.BAT x86
+        cmake -B build -DCMAKE_BUILD_TYPE=RelWithDebInfo -DISLE_INCLUDE_ENTROPY=ON -G "NMake Makefiles"
+        cmake --build build
+
+    - name: Restore cached original binaries
+      id: cache-original-binaries
+      uses: actions/cache/restore@v4
+      with:
+        enableCrossOsArchive: true
+        path: legobin
+        key: legobin
+        
+    - name: Install python packages
+      shell: bash
+      run: |
+        pip install -r tools/requirements.txt
+  
+    - name: Detect binaries
+      run: |
+        reccmp-project detect --what original   --search-path legobin
+        reccmp-project detect --what recompiled --search-path build
+
+    - name: Summarize Accuracy
+      shell: bash
+      run: |
+        reccmp-reccmp --target CONFIG --json CONFIGPROGRESS.json
+        reccmp-reccmp --target ISLE --json ISLEPROGRESS.json
+        reccmp-reccmp --target LEGO1 --json LEGO1PROGRESS.json
+
+    - name: Upload Artifact
+      uses: actions/upload-artifact@main
+      with:
+        name: Win32-Entropy-${{ matrix.high }}-${{ matrix.low }}
+        path: |
+          CONFIGPROGRESS.json
+          ISLEPROGRESS.json
+          LEGO1PROGRESS.json
+
+  merge-artifacts:
+    name: 'Merge entropy artifacts'
+    runs-on: ubuntu-latest
+    needs: build
+    steps:
+      - name: Merge Artifacts
+        uses: actions/upload-artifact/merge@v4
+        with:
+          name: Win32-Entropy
+          pattern: Win32-Entropy-*
+          separate-directories: true
+          
+  compare:
+    name: Compare with master
+    needs: [merge-artifacts]
+    runs-on: windows-latest
+    steps:
+    - uses: actions/checkout@main
+
+    - uses: actions/setup-python@v5
+      with:
+        python-version: '3.12'
+
+    - uses: actions/download-artifact@main
+      with:
+        name: Win32-Entropy
+        path: build-entropy
+
+    - name: Install python packages
+      shell: bash
+      run: |
+        pip install -r tools/requirements.txt
+
+    - name: Aggregate Accuracy
+      shell: bash
+      run: |
+        reccmp-aggregate --samples $(find build-entropy -type f -name "CONFIGPROGRESS.json") --output CONFIGPROGRESS-agg.json --html CONFIGPROGRESS-agg.html
+        reccmp-aggregate --samples $(find build-entropy -type f -name "ISLEPROGRESS.json") --output ISLEPROGRESS-agg.json --html ISLEPROGRESS-agg.html
+        reccmp-aggregate --samples $(find build-entropy -type f -name "LEGO1PROGRESS.json") --output LEGO1PROGRESS-agg.json --html LEGO1PROGRESS-agg.html
+
+    - name: Compare Aggregate Accuracy With Current Master
+      shell: bash
+      env:
+        RELEASE_URL: https://github.com/isledecomp/isle/releases/download/continuous-accuracy
+      run: |
+        # Download the current master state
+        curl -fLSs -o CONFIGPROGRESS-agg-old.json $RELEASE_URL/CONFIGPROGRESS-agg.json || echo "" >CONFIGPROGRESS-agg-old.json
+        curl -fLSs -o ISLEPROGRESS-agg-old.json $RELEASE_URL/ISLEPROGRESS-agg.json || echo "" >ISLEPROGRESS-agg-old.json
+        curl -fLSs -o LEGO1PROGRESS-agg-old.json $RELEASE_URL/LEGO1PROGRESS-agg.json || echo "" >LEGO1PROGRESS-agg-old.json
+        
+        # Compare with current master
+        reccmp-aggregate --diff CONFIGPROGRESS-agg-old.json CONFIGPROGRESS-agg.json || echo "Current master not found"
+        reccmp-aggregate --diff ISLEPROGRESS-agg-old.json ISLEPROGRESS-agg.json || echo "Current master not found"
+        reccmp-aggregate --diff LEGO1PROGRESS-agg-old.json LEGO1PROGRESS-agg.json || echo "Current master not found"
+
+    - name: Upload Artifact
+      uses: actions/upload-artifact@main
+      with:
+        name: Accuracy Report
+        path: |
+          CONFIGPROGRESS*
+          ISLEPROGRESS*
+          LEGO1PROGRESS*
+
+  upload:
+    name: Upload artifacts
+    needs: [compare]
+    runs-on: ubuntu-latest
+    if: ${{ github.event_name == 'push' && github.ref == 'refs/heads/master' && github.repository == 'isledecomp/isle' }}
+    steps:
+    - uses: actions/checkout@v4
+      with:
+        repository: probonopd/uploadtool
+
+    - uses: actions/download-artifact@main
+      with:
+        name: Accuracy Report
+
+    - name: Upload Continuous Release
+      env:
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        UPLOAD_KEY: ${{ secrets.UPLOAD_KEY }}
+      run: |
+        export UPLOADTOOL_SUFFIX=accuracy
+        ./upload.sh \
+          CONFIGPROGRESS* \
+          ISLEPROGRESS* \
+          LEGO1PROGRESS*