Update ASTC encoder to 5.3.0 (#1036)

5.3.0 is a minor maintenance release.

git subrepo commit (merge) external/astc-encoder

subrepo:
  subdir:   "external/astc-encoder"
  merged:   "1c5233bf0"
upstream:
  origin:   "https://github.com/ARM-software/astc-encoder.git"
  branch:   "5.3.0"
  commit:   "30aabb3f4"
git-subrepo:
  version:  "0.4.9"
  origin:   "https://github.com/MarkCallow/git-subrepo.git"
  commit:   "4f60dd7"

Author: MarkCallow

external/astc-encoder/.github/workflows/build_test.yaml

@@ -17,8 +17,11 @@ jobs:
         with:
           submodules: 'true'
 
+      - name: Update apt packages
+        run: sudo apt-get update
+
       - name: Install ImageMagick
-        run: sudo apt install imagemagick
+        run: sudo apt-get install imagemagick
 
       - name: Build release
         run: |
@@ -55,18 +58,16 @@ jobs:
           pip install numpy Pillow
 
       - name: Run system tests
-        # GitHub is using Cobalt-100, which has 128-bit SVE so we cannot test sve_256 here
+        # Disable SVE for now
         run: |
           python ./Test/astc_test_functional.py --encoder none
           python ./Test/astc_test_functional.py --encoder neon
-          python ./Test/astc_test_functional.py --encoder sve_128
           python ./Test/astc_test_image.py --encoder none --test-set Small
           python ./Test/astc_test_image.py --encoder neon --test-set Small
-          python ./Test/astc_test_image.py --encoder sve_128 --test-set Small
 
       - name: Run unit tests
-        # GitHub is using Cobalt-100, which has 128-bit SVE so we cannot test sve_256 here
-        run: ctest -E test-unit-sve_256 --rerun-failed --output-on-failure
+        # Disable SVE for now
+        run: ctest -E "test-unit-sve_128|test-unit-sve_256" --rerun-failed --output-on-failure
         working-directory: build_rel
 
   build-ubuntu-arm64-gcc:
@@ -78,13 +79,14 @@ jobs:
         with:
           submodules: 'true'
 
+      - name: Update apt packages
+        run: sudo apt-get update
+
       - name: Install ImageMagick
-        run: sudo apt install imagemagick
+        run: sudo apt-get install imagemagick
 
       - name: Install GCC 14
-        run: |
-          sudo apt-get update
-          sudo apt-get install -y gcc-14
+        run: sudo apt-get install -y gcc-14
 
       - name: Build release
         run: |
@@ -113,18 +115,16 @@ jobs:
           pip install numpy Pillow
 
       - name: Run system tests
-        # GitHub is using Cobalt-100, which has 128-bit SVE so we cannot test sve_256 here
+        # Disable SVE for now
         run: |
           python ./Test/astc_test_functional.py --encoder none
           python ./Test/astc_test_functional.py --encoder neon
-          python ./Test/astc_test_functional.py --encoder sve_128
           python ./Test/astc_test_image.py --encoder none --test-set Small
           python ./Test/astc_test_image.py --encoder neon --test-set Small
-          python ./Test/astc_test_image.py --encoder sve_128 --test-set Small
 
       - name: Run unit tests
-        # GitHub is using Cobalt-100, which has 128-bit SVE so we cannot test sve_256 here
-        run: ctest -E test-unit-sve_256 --rerun-failed --output-on-failure
+        # Disable SVE for now
+        run: ctest -E "test-unit-sve_128|test-unit-sve_256" --rerun-failed --output-on-failure
         working-directory: build_rel
 
   build-ubuntu-x64-clang:

external/astc-encoder/.github/workflows/post_weekly_release.yaml

@@ -71,8 +71,11 @@ jobs:
         with:
           submodules: 'true'
 
+      - name: Update apt packages
+        run: sudo apt-get update
+
       - name: Install ImageMagick
-        run: sudo apt install imagemagick
+        run: sudo apt-get install imagemagick
 
       - name: Build release
         run: |
@@ -101,12 +104,10 @@ jobs:
           pip install numpy Pillow
 
       - name: Run system tests
-        # GitHub is using Cobalt-100, which has 128-bit SVE so we cannot test sve_256 here
+        # Disable SVE testing for now
         run: |
           python ./Test/astc_test_functional.py --encoder neon
-          python ./Test/astc_test_functional.py --encoder sve_128
           python ./Test/astc_test_image.py --encoder neon --test-set Small
-          python ./Test/astc_test_image.py --encoder sve_128 --test-set Small
 
   build-ubuntu-x64:
     name: Ubuntu x64

external/astc-encoder/.gitignore

@@ -1,4 +1,5 @@
 # Editor and engineering scratch files
+.cache
 .vs
 .vscode
 .DS_Store

external/astc-encoder/.gitrepo

@@ -5,8 +5,8 @@
 ;
 [subrepo]
 	remote = https://github.com/ARM-software/astc-encoder.git
-	branch = 5.2.0
-	commit = 2319d9c4d4af53a7fc7c52985e264ce6e8a02a9b
-	parent = 7475bc1bc0411e672a0a833e19f1f53bde30b588
+	branch = 5.3.0
+	commit = 30aabb3f42406df45a910d8496f9bee17eeba9bb
+	parent = f9c73388a58de9b83f260f11008b043d8f7c0954
 	method = merge
-	cmdver = 0.4.3
+	cmdver = 0.4.9

external/astc-encoder/CMakeLists.txt

@@ -25,7 +25,7 @@ if(MSVC)
     add_compile_options("/wd4324")
 endif()
 
-project(astcencoder VERSION 5.2.0)
+project(astcencoder VERSION 5.3.0)
 
 set(CMAKE_CXX_STANDARD 14)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
@@ -45,13 +45,15 @@ option(ASTCENC_ISA_NONE "Enable astcenc builds for no SIMD")
 option(ASTCENC_ISA_NATIVE "Enable astcenc builds for native SIMD")
 option(ASTCENC_DECOMPRESSOR "Enable astcenc builds for decompression only")
 option(ASTCENC_SHAREDLIB "Enable astcenc builds with core library shared objects")
+option(ASTCENC_BIG_ENDIAN "Enable astcenc big-endian support")
 option(ASTCENC_DIAGNOSTICS "Enable astcenc builds with diagnostic trace")
 option(ASTCENC_ASAN "Enable astcenc builds with address sanitizer")
 option(ASTCENC_UBSAN "Enable astcenc builds with undefined behavior sanitizer")
 option(ASTCENC_UNITTEST "Enable astcenc builds with unit tests")
 option(ASTCENC_INVARIANCE "Enable astcenc floating point invariance" ON)
 option(ASTCENC_CLI "Enable build of astcenc command line tools" ON)
 option(ASTCENC_X86_GATHERS "Enable use of native x86 gathers" ON)
+option(ASTCENC_WERROR "Force builds to treat warnings as errors" ON)
 
 # Preflight for some macOS-specific build options
 if("${CMAKE_SYSTEM_NAME}" STREQUAL "Darwin")
@@ -137,6 +139,9 @@ if("${CMAKE_SYSTEM_NAME}" STREQUAL "Darwin")
     printopt("Universal bin      " ${ASTCENC_UNIVERSAL_BUILD})
 endif()
 printopt("Invariance         " ${ASTCENC_INVARIANCE})
+if(${ASTCENC_BIG_ENDIAN})
+    printopt("Big endian         " ${ASTCENC_BIG_ENDIAN})
+endif()
 printopt("Shared libs        " ${ASTCENC_SHAREDLIB})
 printopt("Decompressor       " ${ASTCENC_DECOMPRESSOR})
 message(STATUS "Developer options")

external/astc-encoder/Docs/ChangeLog-5x.md

@@ -6,6 +6,26 @@ release of the 5.x series.
 All performance data on this page is measured on an Intel Core i5-9600K
 clocked at 4.2 GHz, running `astcenc` using AVX2 and 6 threads.
 
+<!-- ---------------------------------------------------------------------- -->
+## 5.3.0
+
+**Status:** March 2025
+
+The 5.3.0 release is a minor maintenance release.
+
+* **General:**
+  * **Feature:** Reference C builds (`ASTCENC_ISA_NONE`) now support compiling
+    for big-endian CPUs. Compile with `-DASTCENC_BIG_ENDIAN=ON` when compiling
+    for a big-endian target; it is not auto-detected.
+  * **Improvement:** Builds using GCC now specify `-flto=auto` to allow
+    parallel link steps, and remove the log warnings about not setting a CPU
+    count parameter value.
+  * **Bug fix:** Builds using MSVC `cl.exe` that do not specify an explicit
+    ISA using the preprocessor configuration defines will now correctly
+    default to the SSE2 backend on x86-64 and the NEON backend on Arm64. Previously they would have defaulted to the reference C implementation,
+    which is around 3.25 times slower.
+
+
 <!-- ---------------------------------------------------------------------- -->
 ## 5.2.0
 

external/astc-encoder/README.md

@@ -77,10 +77,16 @@ The x86-64 SSE2 builds will work on all x86-64 machines, but it is the slowest
 of the three. The other two require extended CPU instruction set support which
 is not universally available, but each step gains ~15% more performance.
 
-For Arm, if binaries are available, we provide:
+For Arm we provide, in order of increasing performance:
 
+* `astcenc-sve_256` - uses 256-bit SVE
+* `astcenc-sve_128` - uses 128-bit SVE
 * `astcenc-neon` - uses NEON
 
+Note: The Arm Scalable Vector Extensions (SVE) allow CPUs to have a variable
+vector length. The astcenc implementation is not written in a length-agnostic
+style and requires the binary to match the vector length on the host CPU.
+
 ## macOS
 
 For macOS devices we provide a single universal binary `astcenc`, which allows
@@ -235,10 +241,10 @@ or general mobile graphics development or technology please submit them on the
 
 - - -
 
-_Copyright © 2013-2024, Arm Limited and contributors. All rights reserved._
+_Copyright © 2013-2025, Arm Limited and contributors. All rights reserved._
 
 [1]: ./Docs/FormatOverview.md
-[2]: https://www.khronos.org/registry/DataFormat/specs/1.3/dataformat.1.3.html#ASTC
+[2]: https://www.khronos.org/registry/DataFormat/specs/1.4/dataformat.1.4.html#ASTC
 [3]: https://github.com/ARM-software/astc-encoder/releases
 [4]: https://community.arm.com/support-forums/f/graphics-gaming-and-vr-forum/
 [5]: https://developer.arm.com/documentation/102162/latest/?lang=en

external/astc-encoder/Source/CMakeLists.txt

@@ -17,10 +17,14 @@
 
 # Overwrite the LTO flags to force fat LTO; worth 3-4% performance
 # See https://gitlab.kitware.com/cmake/cmake/-/issues/16808
-if(CMAKE_CXX_COMPILER_ID MATCHES "GNU|Clang" AND ${ASTCENC_CLI})
+if(CMAKE_CXX_COMPILER_ID MATCHES "Clang" AND ${ASTCENC_CLI})
     set(CMAKE_CXX_COMPILE_OPTIONS_IPO "-flto")
 endif()
 
+if(CMAKE_CXX_COMPILER_ID MATCHES "GNU" AND ${ASTCENC_CLI})
+    set(CMAKE_CXX_COMPILE_OPTIONS_IPO "-flto=auto")
+endif()
+
 if(${ASTCENC_DECOMPRESSOR})
     set(ASTCENC_CODEC dec)
 else()

external/astc-encoder/Source/UnitTest/cmake_core.cmake

@@ -15,10 +15,16 @@
 #  under the License.
 #  ----------------------------------------------------------------------------
 
+include(../cmake_compiler.cmake)
+
 set(ASTCENC_TEST test-unit-${ASTCENC_ISA_SIMD})
 
 add_executable(${ASTCENC_TEST})
 
+set_property(TARGET ${ASTCENC_TEST}
+    PROPERTY
+        CXX_STANDARD 17)
+
 # Enable LTO under the conditions where the codec library will use LTO.
 # The library link will fail if the settings don't match
 if(${ASTCENC_CLI})
@@ -32,6 +38,7 @@ set_property(TARGET ${ASTCENC_TEST}
     PROPERTY
         MSVC_RUNTIME_LIBRARY "MultiThreaded$<$<CONFIG:Debug>:Debug>")
 
+
 target_sources(${ASTCENC_TEST}
     PRIVATE
         test_simd.cpp
@@ -52,27 +59,34 @@ target_compile_options(${ASTCENC_TEST}
         $<$<PLATFORM_ID:Linux,Darwin>:-pthread>
 
         # MSVC compiler defines
-        $<$<CXX_COMPILER_ID:MSVC>:/EHsc>
+        $<${is_msvc_fe}:/EHsc>
+        $<$<AND:$<BOOL:${ASTCENC_WERROR}>,${is_msvc_fe}>:/WX>
+        $<${is_msvccl}:/wd4324>
 
         # G++ and Clang++ compiler defines
-        $<$<NOT:$<CXX_COMPILER_ID:MSVC>>:-Wall>
-        $<$<NOT:$<CXX_COMPILER_ID:MSVC>>:-Wextra>
-        $<$<NOT:$<CXX_COMPILER_ID:MSVC>>:-Wpedantic>
-        $<$<NOT:$<CXX_COMPILER_ID:MSVC>>:-Werror>
-        $<$<NOT:$<CXX_COMPILER_ID:MSVC>>:-Wshadow>
-        $<$<NOT:$<CXX_COMPILER_ID:MSVC>>:-Wno-c++98-compat-pedantic>
-        $<$<NOT:$<CXX_COMPILER_ID:MSVC>>:-Wno-c++98-c++11-compat-pedantic>
-        $<$<NOT:$<CXX_COMPILER_ID:MSVC>>:-Wno-float-equal>
-        $<$<NOT:$<CXX_COMPILER_ID:MSVC>>:-Wno-overriding-option>
-        $<$<NOT:$<CXX_COMPILER_ID:MSVC>>:-Wno-unsafe-buffer-usage>
-        $<$<NOT:$<CXX_COMPILER_ID:MSVC>>:-Wno-switch-default>
+        $<${is_gnu_fe}:-Wall>
+        $<${is_gnu_fe}:-Wextra>
+        $<${is_gnu_fe}:-Wpedantic>
+        $<$<AND:$<BOOL:${ASTCENC_WERROR}>,${is_gnu_fe}>:-Werror>
+        $<${is_gnu_fe}:-Wshadow>
+        $<${is_gnu_fe}:-Wdouble-promotion>
+        $<${is_clang}:-Wdocumentation>
+
+        # Hide noise thrown up by Clang 10 and clang-cl
+        $<${is_gnu_fe}:-Wno-unknown-warning-option>
+        $<${is_gnu_fe}:-Wno-c++98-compat-pedantic>
+        $<${is_gnu_fe}:-Wno-c++98-c++11-compat-pedantic>
+        $<${is_gnu_fe}:-Wno-float-equal>
+        $<${is_gnu_fe}:-Wno-overriding-option>
+        $<${is_gnu_fe}:-Wno-unsafe-buffer-usage>
+        $<${is_clang}:-Wno-switch-default>
 
         # Ignore things that the googletest build triggers
-        $<$<NOT:$<CXX_COMPILER_ID:MSVC>>:-Wno-unknown-warning-option>
-        $<$<NOT:$<CXX_COMPILER_ID:MSVC>>:-Wno-double-promotion>
-        $<$<NOT:$<CXX_COMPILER_ID:MSVC>>:-Wno-undef>
-        $<$<NOT:$<CXX_COMPILER_ID:MSVC>>:-Wno-reserved-identifier>
-        $<$<NOT:$<CXX_COMPILER_ID:MSVC>>:-Wno-global-constructors>)
+        $<${is_gnu_fe}:-Wno-unknown-warning-option>
+        $<${is_gnu_fe}:-Wno-double-promotion>
+        $<${is_gnu_fe}:-Wno-undef>
+        $<${is_gnu_fe}:-Wno-reserved-identifier>
+        $<${is_gnu_fe}:-Wno-global-constructors>)
 
 # Set up configuration for SIMD ISA builds
 if(${ASTCENC_ISA_SIMD} MATCHES "none")
@@ -85,6 +99,12 @@ if(${ASTCENC_ISA_SIMD} MATCHES "none")
             ASTCENC_POPCNT=0
             ASTCENC_F16C=0)
 
+    if(${ASTCENC_BIG_ENDIAN})
+        target_compile_definitions(${ASTCENC_TEST}
+            PRIVATE
+                ASTCENC_BIG_ENDIAN=1)
+    endif()
+
 elseif(${ASTCENC_ISA_SIMD} MATCHES "neon")
     target_compile_definitions(${ASTCENC_TEST}
         PRIVATE